This is an automated email from the git hooks/post-receive script. eugen pushed a commit to branch master in repository coccinelle.
commit 9d308474e0d1d83d70b1dd887cca4b31efa4ee83 Merge: 6f3fd1a 9324251 Author: Eugeniy Meshcheryakov <eu...@debian.org> Date: Tue May 26 20:56:07 2015 +0200 Merge tag 'upstream/1.0.0.deb' Upstream version 1.0.0.deb Makefile | 12 +- Makefile.config.in | 21 +- Makefile.release | 2 +- autogen | 3 + changes.txt | 12 + cocci.ml | 341 ++++++++++----- cocci.mli | 2 +- commons/common.ml | 10 +- configure | 175 +++++++- configure.ac | 5 +- ctl/Makefile | 2 +- ctl/ast_ctl.ml | 2 +- ctl/ctl_engine.ml | 45 +- ctl/ctl_engine.mli | 12 +- ctl/flag_ctl.ml | 2 +- ctl/pretty_print_ctl.ml | 2 +- ctl/pretty_print_ctl.mli | 2 +- ctl/test_ctl.ml | 2 +- ctl/wrapper_ctl.ml | 22 +- ctl/wrapper_ctl.mli | 7 +- docs/manual/cocci_syntax.tex | 27 +- docs/manual/spatch_options.tex | 30 +- docs/manual/tips.tex | 2 + docs/spatch.1.in | 40 +- engine/Makefile | 2 +- engine/asttoctl.mli | 2 +- engine/asttoctl2.ml | 53 ++- engine/asttoctl2.mli | 2 +- engine/asttomember.ml | 49 ++- engine/asttomember.mli | 5 +- engine/c_vs_c.ml | 2 +- engine/c_vs_c.mli | 2 +- engine/check_exhaustive_pattern.ml | 2 +- engine/check_reachability.ml | 5 +- engine/check_reachability.mli | 2 +- engine/cocci_vs_c.ml | 297 +++++++++---- engine/cocci_vs_c.mli | 7 +- engine/ctlcocci_integration.ml | 335 +++++++++----- engine/ctlcocci_integration.mli | 3 +- engine/ctltotex.ml | 2 +- engine/ctltotex.mli | 2 +- engine/externalanalysis.ml | 2 +- engine/externalanalysis.mli | 2 +- engine/flag_engine.ml | 2 +- engine/flag_matcher.ml | 2 +- engine/isomorphisms_c_c.ml | 2 +- engine/lib_engine.ml | 7 +- engine/lib_matcher_c.ml | 2 +- engine/lib_matcher_c.mli | 2 +- engine/main.ml | 2 +- engine/pattern_c.ml | 62 +-- engine/pattern_c.mli | 2 +- engine/postprocess_transinfo.ml | 2 +- engine/postprocess_transinfo.mli | 2 +- engine/pretty_print_engine.ml | 8 +- engine/pretty_print_engine.mli | 2 +- engine/transformation_c.ml | 15 +- engine/transformation_c.mli | 2 +- flag_cocci.ml | 6 +- globals/Makefile | 2 +- globals/config.ml.in | 1 + globals/flag.ml | 2 +- globals/iteration.ml | 2 +- globals/iteration.mli | 2 +- globals/regexp_pcre.ml | 2 +- globals/regexp_str.ml | 2 +- main.ml | 52 ++- ocaml/coccilib.ml | 2 + ocaml/ocamlcocci_aux.ml | 2 + ocaml/run_ocamlcocci.ml | 3 +- ocaml/yes_prepare_ocamlcocci.ml | 6 + parsing_c/ast_c.ml | 94 ++-- parsing_c/compare_c.ml | 32 +- parsing_c/compare_c.mli | 3 + parsing_c/control_flow_c_build.ml | 2 +- parsing_c/lexer_c.mll | 33 +- parsing_c/lib_parsing_c.ml | 2 + parsing_c/parse_c.ml | 71 ++- parsing_c/parser_c.mly | 48 +- parsing_c/parsing_hacks.ml | 29 ++ parsing_c/pretty_print_c.ml | 35 +- parsing_c/pretty_print_c.mli | 16 + parsing_c/token_helpers.ml | 8 +- parsing_c/token_helpers.mli | 1 + parsing_c/type_annoter_c.ml | 12 +- parsing_c/unparse_c.ml | 484 +++++++++++---------- parsing_c/unparse_cocci.ml | 169 +++---- parsing_c/unparse_hrule.ml | 11 +- parsing_c/visitor_c.ml | 127 ++++-- parsing_c/visitor_c.mli | 10 + parsing_cocci/Makefile | 2 +- parsing_cocci/adjacency.ml | 8 +- parsing_cocci/adjacency.mli | 2 +- parsing_cocci/adjust_pragmas.ml | 2 +- parsing_cocci/adjust_pragmas.mli | 2 +- parsing_cocci/arity.ml | 25 +- parsing_cocci/arity.mli | 2 +- parsing_cocci/ast0_cocci.ml | 99 +++-- parsing_cocci/ast0_cocci.mli | 40 +- parsing_cocci/ast0toast.ml | 39 +- parsing_cocci/ast0toast.mli | 4 +- parsing_cocci/ast_cocci.ml | 93 +++- parsing_cocci/ast_cocci.mli | 46 +- parsing_cocci/check_meta.ml | 29 +- parsing_cocci/check_meta.mli | 2 +- parsing_cocci/cocci_grep.ml | 2 +- parsing_cocci/cocci_grep.mli | 2 +- parsing_cocci/comm_assoc.ml | 24 +- parsing_cocci/comm_assoc.mli | 2 +- parsing_cocci/command_line.ml | 2 +- parsing_cocci/command_line.mli | 2 +- parsing_cocci/commas_on_lists.ml | 2 +- parsing_cocci/commas_on_lists.mli | 2 +- parsing_cocci/compute_lines.ml | 43 +- parsing_cocci/compute_lines.mli | 2 +- parsing_cocci/context_neg.ml | 56 ++- parsing_cocci/context_neg.mli | 2 +- parsing_cocci/data.ml | 12 +- parsing_cocci/data.mli | 10 +- parsing_cocci/disjdistr.ml | 38 +- parsing_cocci/disjdistr.mli | 2 +- parsing_cocci/dpll.ml | 2 +- parsing_cocci/dpll.mli | 2 +- parsing_cocci/flag_parsing_cocci.ml | 2 +- parsing_cocci/free_vars.ml | 134 +++++- parsing_cocci/free_vars.mli | 2 +- parsing_cocci/function_prototypes.ml | 17 +- parsing_cocci/function_prototypes.mli | 2 +- parsing_cocci/get_constants.ml | 2 +- parsing_cocci/get_constants.mli | 2 +- parsing_cocci/get_constants2.ml | 28 +- parsing_cocci/get_constants2.mli | 2 +- parsing_cocci/get_metas.ml | 34 +- parsing_cocci/get_metas.mli | 2 +- parsing_cocci/id_utils.ml | 2 +- parsing_cocci/id_utils.mli | 2 +- parsing_cocci/index.ml | 14 +- parsing_cocci/index.mli | 4 +- parsing_cocci/insert_plus.ml | 96 ++-- parsing_cocci/insert_plus.mli | 2 +- parsing_cocci/iso_compile.ml | 8 +- parsing_cocci/iso_compile.mli | 2 +- parsing_cocci/iso_pattern.ml | 137 ++++-- parsing_cocci/iso_pattern.mli | 4 +- parsing_cocci/lexer_cli.mll | 2 +- parsing_cocci/lexer_cocci.mll | 38 +- parsing_cocci/lexer_script.mll | 2 +- parsing_cocci/main.ml | 2 +- parsing_cocci/merge.ml | 2 +- parsing_cocci/merge.mli | 2 +- parsing_cocci/parse_aux.ml | 20 +- parsing_cocci/parse_cocci.ml | 189 +++++++- parsing_cocci/parse_cocci.mli | 2 +- parsing_cocci/parse_printf.ml | 2 +- parsing_cocci/parse_printf.mli | 2 +- parsing_cocci/parser_cocci_menhir.mly | 172 ++++++-- parsing_cocci/plus.ml | 2 +- parsing_cocci/plus.mli | 2 +- parsing_cocci/pretty_print_cocci.ml | 39 +- parsing_cocci/pretty_print_cocci.mli | 6 +- parsing_cocci/safe_for_multi_decls.ml | 17 +- parsing_cocci/safe_for_multi_decls.mli | 2 +- parsing_cocci/semantic_cocci.ml | 2 +- parsing_cocci/simple_assignments.ml | 31 +- parsing_cocci/simple_assignments.mli | 2 +- parsing_cocci/single_statement.ml | 6 +- parsing_cocci/single_statement.mli | 2 +- parsing_cocci/test.cocci | 2 +- parsing_cocci/test2.cocci | 2 +- parsing_cocci/test_exps.ml | 6 +- parsing_cocci/test_exps.mli | 2 +- parsing_cocci/top_level.ml | 2 +- parsing_cocci/top_level.mli | 2 +- parsing_cocci/type_cocci.ml | 2 +- parsing_cocci/type_cocci.mli | 2 +- parsing_cocci/type_infer.ml | 23 +- parsing_cocci/type_infer.mli | 2 +- parsing_cocci/unify_ast.ml | 32 +- parsing_cocci/unify_ast.mli | 2 +- parsing_cocci/unitary_ast0.ml | 2 +- parsing_cocci/unitary_ast0.mli | 2 +- parsing_cocci/unparse_ast0.ml | 45 +- parsing_cocci/unparse_ast0.mli | 4 +- parsing_cocci/visitor_ast.ml | 80 +++- parsing_cocci/visitor_ast.mli | 22 +- parsing_cocci/visitor_ast0.ml | 150 +++++-- parsing_cocci/visitor_ast0.mli | 18 +- parsing_cocci/visitor_ast0_types.ml | 33 +- popl/Makefile | 2 +- popl/ast_popl.ml | 2 +- popl/asttopopl.ml | 2 +- popl/asttopopl.mli | 2 +- popl/insert_befaft.ml | 2 +- popl/insert_befaft.mli | 2 +- popl/insert_quantifiers.ml | 2 +- popl/insert_quantifiers.mli | 2 +- popl/popl.ml | 2 +- popl/popl.mli | 2 +- popl/popltoctl.ml | 2 +- popl/popltoctl.mli | 2 +- popl/pretty_print_popl.ml | 2 +- popl/pretty_print_popl.mli | 2 +- popl09/Makefile | 2 +- popl09/ast_popl.ml | 2 +- popl09/asttopopl.ml | 2 +- popl09/asttopopl.mli | 2 +- popl09/flag_popl.ml | 2 +- popl09/insert_quantifiers.ml | 2 +- popl09/insert_quantifiers.mli | 2 +- popl09/popl.ml | 2 +- popl09/popl.mli | 2 +- popl09/popltoctl.ml | 7 +- popl09/popltoctl.mli | 2 +- popl09/pretty_print_popl.ml | 2 +- popl09/pretty_print_popl.mli | 2 +- python/Makefile | 2 +- python/coccipython.a | Bin 29758 -> 32462 bytes python/coccipython.cmxa | Bin 2679 -> 2679 bytes python/no_pycocci.ml | 2 +- python/pycocci.mli | 2 +- python/pycocci_aux.ml | 4 +- python/pycocci_aux.mli | 2 +- python/yes_pycocci.ml | 2 +- scripts/extract_c_and_res.pl | 2 +- scripts/extract_examples.pl | 2 +- scripts/extractor_README.pl | 2 +- scripts/gather_failed.pl | 2 +- scripts/glimpseindex_cocci.sh | 12 +- scripts/readme.pl | 2 +- scripts/stat_directories.pl | 2 +- scripts/stat_directories_complete.pl | 2 +- scripts/stat_directory_complete.pl | 2 +- setup/Makefile.in | 11 + testing.ml.in => testing.ml | 112 ++++- testing.mli | 4 +- tests/SCORE_expected.sexp | Bin 15283 -> 16078 bytes tests/SCORE_expected_orig.sexp | Bin 15283 -> 16078 bytes tests/addif.res | 8 +- tests/addif1.res | 4 +- tests/addif2.res | 4 +- tests/addifelse.res | 2 +- tests/addifelse2.res | 1 - tests/anon.res | 2 +- tests/argument.res | 3 +- tests/arparam.res | 2 +- tests/b1.res | 8 +- tests/b2.res | 8 +- tests/badexp.res | 2 +- tests/befS.res | 6 +- tests/ben.res | 2 - tests/braces.res | 8 +- tests/break.res | 9 +- tests/bug1.c | 4 +- tests/bug1.res | 6 +- tests/bugloop.res | 4 + tests/bugon.res | 2 +- tests/change.c | 5 + tests/change.cocci | 5 + tests/change.res | 6 + tests/change_type.c | 4 + tests/change_type.cocci | 11 + tests/change_type.res | 4 + tests/comments.res | 2 +- tests/compare.res | 16 +- tests/cr1a.res | 6 +- tests/cst_null.res | 6 +- tests/define_exp.res | 3 +- tests/double.res | 4 +- tests/dropenderr.c | 8 + tests/dropenderr.cocci | 26 ++ tests/dropenderr.res | 6 + tests/end_commas.res | 4 +- tests/enum2.cocci | 6 + tests/failing_andany.c | 13 + tests/failing_andany.cocci | 18 + tests/failing_andany.res | 9 + tests/fun.res | 4 +- tests/gilles-question.res | 2 - tests/headers.res | 4 +- tests/ifdef3.res | 7 +- tests/ifdef5.res | 9 +- tests/ifields.res | 2 +- tests/inline.res | 1 - tests/int2bool-local.c | 73 ++++ tests/int2bool-local.cocci | 143 ++++++ tests/int2bool-local.res | 77 ++++ tests/ip.res | 9 +- tests/isococci.res | 1 - tests/julia7.res | 2 +- tests/kmalloc.res | 4 +- tests/labels_metastatement.res | 13 +- tests/labels_metastatement_ver1.res | 4 +- tests/longline2.res | 4 +- tests/lvalue.res | 2 +- tests/match_no_meta.res | 2 - tests/mdec.res | 2 +- tests/memory.res | 4 +- tests/metaops.c | 44 ++ tests/metaops.cocci | 27 ++ tests/metaops.res | 44 ++ tests/metaops0.c | 44 ++ tests/metaops0.cocci | 14 + tests/metaops0.res | 44 ++ tests/metaruleelem.res | 4 +- tests/metastatement_if.res | 1 - tests/mini_null_ref.res | 3 +- tests/minstruct.res | 4 +- tests/minusdots.res | 1 - tests/minusdots_ver1.res | 1 - tests/multistruct.c | 5 + tests/multistruct.cocci | 5 + tests/multistruct.res | 3 + tests/multitype.res | 2 +- tests/multivars.res | 2 +- tests/nest.res | 6 +- tests/of.res | 4 +- tests/operators.cocci | 235 ++++++++++ tests/opt.res | 1 - tests/param.res | 1 - tests/param_ver1.res | 1 - tests/pb_params_iso.c | 1 - tests/pcim.c | 5 + tests/pcim.cocci | 9 + tests/pcim.res | 6 + tests/pmac.c | 1 - tests/pragmatest.res | 2 +- tests/proto.res | 1 - tests/proto2.res | 3 +- tests/proto_ver1.res | 1 - tests/proto_ver2.res | 1 - tests/protoassert.res | 7 +- tests/rcu3.c | 4 +- tests/rcu3.res | 8 +- tests/regexp3.res | 34 +- tests/remparam.c | 2 +- tests/return.res | 8 +- tests/return_implicit.res | 2 +- tests/retval.cocci | 1 + tests/retval.res | 8 +- tests/shared_brace.res | 6 +- tests/sp.res | 4 +- tests/spacing.res | 2 +- tests/spl.res | 22 +- tests/static.res | 1 - tests/strangeorder.res | 4 +- tests/strid.res | 2 +- tests/struct_metavar.res | 2 - tests/switchdecl.res | 2 +- tests/test0.res | 2 - tests/test1.res | 1 + tests/test2.res | 2 +- tests/test5_ver1.res | 1 - tests/top.c | 1 - tests/toplevel_macrostmt.c | 1 - tests/toplevel_macrostmt.res | 2 +- tests/ty.res | 2 - tests/ty_tyexp.c | 1 - tests/tydisj.res | 3 +- tests/tyex.res | 6 +- tests/useless_cast.c | 1 - tests/useless_cast.res | 2 +- tests/varargs.res | 3 +- tests/varargs3.c | 14 + tests/varargs3.cocci | 8 + tests/varargs3.res | 14 + tests/void.res | 8 +- tests/vpos.res | 2 - tests/whitespace.res | 2 +- tests/wrongcheck.c | 5 + tests/wrongcheck.cocci | 17 + tests/wrongcheck.res | 3 + tests/y2.res | 1 - tools/Makefile | 2 +- tools/alloc_free.ml | 2 +- tools/bridge.ml | 2 +- tools/cstripenv.ml | 2 +- tools/dir_stats.ml | 2 +- tools/dumper.ml | 2 +- tools/dumper.mli | 2 +- tools/extract_c_and_res.ml | 2 +- tools/gitgrep.ml | 2 +- tools/gitsort.ml | 2 +- tools/licensify.ml | 4 +- tools/process_isoprofile.ml | 2 +- tools/sgen/Makefile | 10 +- tools/sgen/README.md | 123 +++++- tools/sgen/documentation/Makefile | 7 + tools/sgen/documentation/documentation.tex | 10 +- tools/sgen/documentation/future.tex | 4 +- tools/sgen/documentation/implementation.tex | 34 +- tools/sgen/documentation/knownissues.tex | 4 +- tools/sgen/documentation/usage.tex | 10 +- tools/sgen/examples/README.md | 15 + tools/sgen/examples/addvoid.c | 12 + tools/sgen/examples/addvoid.cocci | 7 + tools/sgen/examples/addvoid.config | 8 + tools/sgen/examples/addvoid_.cocci | 52 +++ tools/sgen/examples/disj.c | 43 +- tools/sgen/examples/disj_.cocci | 98 +++++ tools/sgen/examples/inherited.c | 12 +- tools/sgen/examples/inherited_.cocci | 118 +++++ tools/sgen/examples/local.c | 11 +- tools/sgen/examples/local_.cocci | 55 +++ tools/sgen/examples/test.sh | 36 ++ tools/sgen/examples/tiny.c | 4 +- tools/sgen/examples/tiny_.cocci | 55 +++ tools/sgen/source/Makefile | 46 +- tools/sgen/source/README.md | 63 ++- tools/sgen/source/ast_tostring.ml | 11 +- tools/sgen/source/ast_tostring.mli | 3 +- tools/sgen/source/context_rule.ml | 89 ++-- tools/sgen/source/context_rule.mli | 47 +- tools/sgen/source/detect_patch.ml | 88 ++-- tools/sgen/source/detect_patch.mli | 64 ++- tools/sgen/source/disj_generator.ml | 124 ++++-- tools/sgen/source/disj_generator.mli | 161 ++++--- tools/sgen/source/file_transform.ml | 255 ++++++----- tools/sgen/source/file_transform.mli | 50 ++- tools/sgen/source/globals.ml | 170 +++++--- tools/sgen/source/globals.mli | 68 ++- tools/sgen/source/main.ml | 121 ++---- tools/sgen/source/meta_variable.ml | 370 ++++++++++------ tools/sgen/source/meta_variable.mli | 39 +- tools/sgen/source/position_generator.ml | 369 +++++++++------- tools/sgen/source/position_generator.mli | 31 +- tools/sgen/source/rule_body.ml | 296 ++++++++----- tools/sgen/source/rule_body.mli | 78 +++- tools/sgen/source/rule_header.ml | 96 ++-- tools/sgen/source/rule_header.mli | 39 +- tools/sgen/source/script_rule.ml | 81 ++-- tools/sgen/source/script_rule.mli | 57 ++- tools/sgen/source/sgen.ml | 167 +++++++ tools/sgen/source/sgen.mli | 22 + tools/sgen/source/sgen_config.ml | 80 ++-- tools/sgen/source/sgen_config.mli | 47 +- tools/sgen/source/sgen_interactive.ml | 129 ++++-- tools/sgen/source/sgen_interactive.mli | 19 +- tools/sgen/source/sgen_lexer.mll | 12 +- .../source/{generator_types.ml => snapshot.ml} | 146 ++++--- .../source/{generator_types.mli => snapshot.mli} | 40 +- tools/sgen/source/user_input.ml | 196 ++++++--- tools/sgen/source/user_input.mli | 62 ++- tools/splitpatch.ml | 74 +++- tools/spp.ml | 2 +- version | 2 +- 445 files changed, 7995 insertions(+), 3186 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