This is an automated email from the git hooks/post-receive script. eugen pushed a commit to branch master in repository coccinelle.
commit 7828720f409a301e030f1a875642f4c4ca04bcca Merge: d42539b c73dbce Author: Eugeniy Meshcheryakov <eu...@debian.org> Date: Sun Sep 6 23:04:52 2015 +0200 Merge tag 'upstream/1.0.2.deb' Upstream version 1.0.2.deb Makefile | 93 ++- Makefile.config.in | 4 +- Makefile.dev | 1 - Makefile.release | 2 +- authors.txt | 4 +- autogen | 5 + changes.txt | 88 ++- cocci.ml | 68 +- cocci.mli | 9 +- commons/bytes.mli | 2 +- commons/common.ml | 394 +++-------- commons/common.mli | 73 +- commons/copyright.txt | 1 - commons/credits.txt | 4 +- commons/features.ml.cpp | 22 +- commons/glimpse.ml | 3 +- commons/oarray.ml | 1 - commons/ocamlextra/enum.ml | 10 +- commons/ocamlextra/enum.mli | 22 +- commons/ocamlextra/setb.ml | 3 - commons/ocamlextra/suffix_tree.ml | 3 - commons/ocamlextra/suffix_tree_ext.ml | 3 - commons/ocollection.ml | 1 - commons/ocollection/oassoc_buffer.ml | 2 - commons/ocollection/oassoc_cache.ml | 2 - commons/ocollection/oassocb.ml | 3 +- commons/ocollection/oassocbdb.ml | 3 +- commons/ocollection/oassocbdb_string.ml | 1 - commons/ocollection/oassocdbm.ml | 1 - commons/ocollection/oassoch.ml | 1 - commons/ocollection/oseth.ml | 2 - commons/osequence.ml | 1 - commons/oset.ml | 7 +- commons/readme.txt | 7 +- commons/seti.ml | 33 +- configure | 50 +- configure.ac | 9 +- credits.txt | 4 +- ctl/ctl_engine.ml | 121 ++-- ctl/ctl_engine.mli | 1 - demos/camltococci.cocci | 4 +- docs/Coccilib.3cocci | 102 ++- docs/developer.txt | 134 ---- docs/manual/cocci_syntax.tex | 26 +- docs/manual/hevea.sty | 2 +- docs/manual/installing.tex | 6 +- docs/manual/introduction.tex | 20 +- docs/manual/macros.tex | 1 - docs/manual/macros_options.tex | 1 - docs/manual/spatch_options.tex | 6 +- docs/manual/tutorial.tex | 1 - docs/manual/workflow.tex | 1 - docs/pycocci.1 | 217 ++++++ docs/spatch.1.in | 47 +- editors/emacs/cocci-ediff.el | 108 +-- engine/asttoctl2.ml | 13 +- engine/asttomember.ml | 1 - engine/c_vs_c.ml | 38 +- engine/check_exhaustive_pattern.ml | 10 +- engine/cocci_vs_c.ml | 398 ++++++----- engine/cocci_vs_c.mli | 12 +- engine/ctlcocci_integration.ml | 20 +- engine/ctltotex.ml | 1 - engine/externalanalysis.ml | 4 +- engine/flag_matcher.ml | 1 - engine/isomorphisms_c_c.ml | 1 - engine/pattern_c.ml | 76 +- engine/postprocess_transinfo.ml | 4 +- engine/pretty_print_engine.ml | 5 +- engine/pretty_print_engine.mli | 1 - engine/transformation_c.ml | 26 +- env.sh | 1 - extra/classic_patch.ml | 4 +- extra/kbuild.ml | 6 +- extra/maintainers.ml | 5 +- extra/maintainers.mli | 2 - globals/config.ml.in | 2 +- globals/flag.ml | 2 +- globals/iteration.ml | 2 +- install.txt | 2 +- main.ml | 148 ++-- ocaml/coccilib.ml | 76 +- ocaml/no_prepare_ocamlcocci.ml | 1 - ocaml/ocamlcocci_aux.ml | 4 +- ocaml/run_ocamlcocci.ml | 7 +- ocaml/run_ocamlcocci.mli | 3 +- ocaml/yes_prepare_ocamlcocci.ml | 1 + parsing_c/ast_c.ml | 27 +- parsing_c/comment_annotater_c.ml | 4 +- parsing_c/compare_c.ml | 8 +- parsing_c/control_flow_c.ml | 2 +- parsing_c/control_flow_c_build.ml | 24 +- parsing_c/copyright.txt | 4 +- parsing_c/cpp_analysis_c.ml | 11 +- parsing_c/cpp_ast_c.ml | 6 +- parsing_c/cpp_ast_c.mli | 1 - parsing_c/cpp_token_c.ml | 8 +- parsing_c/credits.txt | 1 - parsing_c/flag_parsing_c.ml | 11 - parsing_c/lexer_c.mll | 118 ++-- parsing_c/lexer_parser.ml | 4 +- parsing_c/lexer_parser.mli | 3 - parsing_c/lib_parsing_c.ml | 7 +- parsing_c/parse_c.ml | 136 ++-- parsing_c/parse_c.mli | 5 +- parsing_c/parse_string_c.ml | 1 - parsing_c/parser_c.mly | 158 +++-- parsing_c/parsing_consistency_c.ml | 7 +- parsing_c/parsing_hacks.ml | 44 +- parsing_c/parsing_recovery_c.ml | 8 +- parsing_c/pretty_print_c.ml | 47 +- parsing_c/test_parsing_c.ml | 19 +- parsing_c/token_helpers.ml | 167 ++++- parsing_c/token_helpers.mli | 3 + parsing_c/token_views_c.ml | 15 +- parsing_c/token_views_c.mli | 1 - parsing_c/type_annoter_c.ml | 13 +- parsing_c/type_annoter_c.mli | 1 - parsing_c/type_c.ml | 4 +- parsing_c/unparse_c.ml | 118 ++-- parsing_c/unparse_cocci.ml | 178 +++-- parsing_c/unparse_hrule.ml | 9 +- parsing_c/unparse_hrule.mli | 1 - parsing_c/visitor_c.ml | 22 +- parsing_cocci/Makefile | 2 +- parsing_cocci/adjacency.ml | 1 - parsing_cocci/adjust_pragmas.ml | 24 +- parsing_cocci/arity.ml | 30 +- parsing_cocci/ast0_cocci.ml | 24 +- parsing_cocci/ast0_cocci.mli | 13 +- parsing_cocci/ast0toast.ml | 24 +- parsing_cocci/ast_cocci.ml | 16 +- parsing_cocci/ast_cocci.mli | 13 +- parsing_cocci/check_meta.ml | 24 +- parsing_cocci/cocci_grep.ml | 2 +- parsing_cocci/command_line.ml | 2 +- parsing_cocci/commas_on_lists.ml | 2 +- parsing_cocci/compute_lines.ml | 35 +- parsing_cocci/context_neg.ml | 14 +- parsing_cocci/data.ml | 2 +- parsing_cocci/data.mli | 4 +- parsing_cocci/disjdistr.ml | 15 +- parsing_cocci/free_vars.ml | 65 +- parsing_cocci/get_constants2.ml | 98 +-- parsing_cocci/get_constants2.mli | 3 +- parsing_cocci/get_metas.ml | 33 +- parsing_cocci/{iso_compile.mli => git_grep.ml} | 19 +- parsing_cocci/{iso_compile.mli => git_grep.mli} | 5 +- parsing_cocci/index.ml | 9 +- parsing_cocci/insert_plus.ml | 1 + parsing_cocci/iso_compile.mli | 1 - parsing_cocci/iso_pattern.ml | 205 +++--- parsing_cocci/lexer_cli.mll | 1 - parsing_cocci/lexer_cocci.mll | 48 +- parsing_cocci/parse_aux.ml | 62 +- parsing_cocci/parse_cocci.ml | 55 +- parsing_cocci/parse_cocci.mli | 5 +- parsing_cocci/parser_cocci_menhir.mly | 80 ++- parsing_cocci/pretty_print_cocci.ml | 28 +- parsing_cocci/single_statement.ml | 16 +- parsing_cocci/test.cocci | 14 +- parsing_cocci/test2.cocci | 10 +- parsing_cocci/test_exps.ml | 1 - parsing_cocci/type_cocci.ml | 9 + parsing_cocci/type_cocci.mli | 2 + parsing_cocci/type_infer.ml | 12 +- parsing_cocci/unify_ast.ml | 30 +- parsing_cocci/unitary_ast0.ml | 37 +- parsing_cocci/unparse_ast0.ml | 15 +- parsing_cocci/visitor_ast.ml | 108 +-- parsing_cocci/visitor_ast0.ml | 48 +- parsing_cocci/visitor_ast0_types.ml | 2 +- popl/pretty_print_popl.ml | 1 - popl09/ast_popl.ml | 1 - popl09/popltoctl.ml | 2 +- popl09/pretty_print_popl.ml | 1 - python/Makefile | 2 +- python/coccipython.a | Bin 32462 -> 0 bytes python/coccipython.cmxa | Bin 2679 -> 2679 bytes python/pycocci.mli | 7 +- python/pycocci_aux.ml | 4 +- python/yes_pycocci.ml | 14 +- readme.txt | 10 +- release.nix | 18 +- scripts/coccicheck/README | 3 +- scripts/extract_c_and_res.pl | 26 +- scripts/extract_examples.pl | 8 +- scripts/extractor.awk | 10 +- scripts/extractor_README.pl | 4 +- scripts/gather_failed.pl | 2 +- scripts/glimpseindex_cocci.sh | 1 - scripts/readme.pl | 4 +- scripts/setlocalversion | 117 ++++ scripts/spatch.sh.in | 12 +- scripts/stat_directories.pl | 12 +- scripts/stat_directories_complete.pl | 6 +- scripts/stat_directory_complete.pl | 74 +- setup/Makefile.in | 4 +- setup/cocci.m4 | 2 +- setup/fake-subst.sh | 4 +- setup/pkg.m4 | 4 +- standard.h | 80 +-- standard.iso | 158 ++--- testing.ml | 13 +- testing.mli | 2 +- tests/SCORE_expected.sexp | Bin 16078 -> 16531 bytes tests/SCORE_expected_orig.sexp | Bin 16078 -> 16531 bytes tests/addifdef.c | 10 + tests/addifdef.cocci | 7 + tests/addifdef.res | 14 + tests/addtrace.c | 14 + tests/addtrace.cocci | 6 + tests/as_stm.c | 3 + tests/as_stm.cocci | 13 + tests/as_stm.res | 5 + tests/as_stm_pos.c | 3 + tests/as_stm_pos.cocci | 16 + tests/attrs2groups.c | 29 + tests/attrs2groups.cocci | 15 + tests/attrs2groups.res | 35 + tests/bad_parsing.c | 2 + tests/binop.c | 11 + tests/binop.cocci | 12 + tests/binop.res | 13 + tests/changei.c | 7 + tests/changei.cocci | 6 + tests/changei.res | 7 + tests/declinv.c | 4 - tests/declinv.res | 4 - tests/extra.cocci | 4 +- tests/filtercst.cocci | 29 + tests/fortest.c | 18 + tests/fortest.cocci | 13 + tests/fortest.res | 18 + tests/{ifdefmeta4.res => invert.c} | 2 +- tests/invert.cocci | 7 + tests/{ifdefmeta4.res => invert.res} | 2 +- tests/isoif.c | 4 + tests/isoif.cocci | 7 + tests/{ifdefmeta4.res => isoif.res} | 1 - tests/mdecl.c | 5 + tests/mdecl.cocci | 29 + tests/mdecl.res | 4 + tests/mdeclp.c | 2 + tests/mdeclp.cocci | 12 + tests/mdeclp.res | 2 + tests/mdeclp2.c | 2 + tests/mdeclp2.cocci | 29 + tests/mdeclp2.res | 2 + tests/miniswap.c | 5 + tests/miniswap.cocci | 17 + tests/miniswap.res | 5 + tests/param_to_exp.c | 3 + tests/param_to_exp.cocci | 9 + tests/remaft.cocci | 5 + tests/swap3.c | 17 + tests/swap3.cocci | 24 + tests/swap3.res | 17 + tools/cstripenv.ml | 4 +- tools/dir_stats.ml | 2 - tools/extract_c_and_res.ml | 1 - tools/gitsort.ml | 3 - tools/pycocci | 497 +++++++++++++- tools/sgen/Makefile | 1 - tools/sgen/README.md | 20 +- tools/sgen/documentation/documentation.tex | 2 +- tools/sgen/documentation/future.tex | 1 - tools/sgen/documentation/implementation.tex | 5 +- tools/sgen/documentation/usage.tex | 4 +- tools/sgen/examples/README.md | 6 + tools/sgen/examples/addvoid.config | 2 +- tools/sgen/examples/addvoid_.cocci | 1 - tools/sgen/examples/{local.c => context.c} | 0 tools/sgen/examples/{local.cocci => context.cocci} | 0 .../sgen/examples/{local.config => context.config} | 0 .../sgen/examples/{local_.cocci => context_.cocci} | 0 tools/sgen/examples/disj.config | 2 +- tools/sgen/examples/disj_.cocci | 2 +- tools/sgen/examples/test.sh | 36 - tools/sgen/examples/tiny.c | 4 - tools/sgen/scripts/sgen.sh.in | 2 +- tools/sgen/source/Makefile | 13 +- tools/sgen/source/README.md | 14 +- tools/sgen/source/ast_tostring.ml | 30 +- tools/sgen/source/ast_tostring.mli | 3 +- tools/sgen/source/context_rule.ml | 29 +- tools/sgen/source/context_rule.mli | 5 +- tools/sgen/source/detect_patch.ml | 20 +- tools/sgen/source/detect_patch.mli | 4 +- tools/sgen/source/disj_generator.ml | 2 +- tools/sgen/source/file_transform.ml | 12 +- tools/sgen/source/file_transform.mli | 14 +- tools/sgen/source/globals.ml | 15 - tools/sgen/source/globals.mli | 9 - tools/sgen/source/main.ml | 44 +- tools/sgen/source/meta_variable.ml | 99 ++- tools/sgen/source/meta_variable.mli | 4 +- tools/sgen/source/position_generator.ml | 763 +++++++++++---------- tools/sgen/source/position_generator.mli | 21 +- tools/sgen/source/rule_body.ml | 6 +- tools/sgen/source/sgen.ml | 14 +- tools/sgen/source/sgen_config.ml | 7 +- tools/sgen/source/sgen_interactive.ml | 5 +- tools/sgen/source/sgen_test.ml | 199 ++++++ tools/sgen/source/sgen_test.mli | 1 + tools/sgen/source/snapshot.ml | 2 +- tools/sgen/source/user_input.ml | 6 +- tools/sgen/source/user_input.mli | 8 +- tools/sgen/tests/addvoid.cocci | 7 + tools/sgen/{examples => tests}/addvoid.config | 0 .../addvoid_.cocci => tests/addvoid.expected} | 0 tools/sgen/tests/disj.cocci | 22 + tools/sgen/{examples => tests}/disj.config | 2 +- .../{examples/disj_.cocci => tests/disj.expected} | 2 +- tools/sgen/tests/include.cocci | 43 ++ tools/sgen/tests/include.config | 18 + tools/sgen/tests/include.expected | 164 +++++ tools/sgen/tests/inherited.cocci | 29 + tools/sgen/tests/inherited.config | 17 + tools/sgen/tests/inherited.expected | 118 ++++ tools/sgen/tests/interleaved.cocci | 45 ++ tools/sgen/tests/interleaved.config | 9 + tools/sgen/tests/interleaved.expected | 112 +++ tools/sgen/{examples => tests}/local.cocci | 0 tools/sgen/{examples => tests}/local.config | 0 .../local_.cocci => tests/local.expected} | 0 tools/sgen/tests/metaops.cocci | 21 + tools/sgen/tests/metaops.config | 10 + tools/sgen/tests/metaops.expected | 85 +++ tools/sgen/{examples => tests}/tiny.cocci | 0 tools/sgen/{examples => tests}/tiny.config | 0 .../{examples/tiny_.cocci => tests/tiny.expected} | 0 tools/splitpatch.ml | 15 +- version | 2 +- version.sh | 5 + 335 files changed, 5751 insertions(+), 3137 deletions(-) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ocaml-maint/packages/coccinelle.git _______________________________________________ Pkg-ocaml-maint-commits mailing list Pkg-ocaml-maint-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-ocaml-maint-commits