Update to 1.0.0rc15

Changelog:

* 1.0.0
** Language:
- Addition of initializer list metavariables.  Thanks to Michael Stefaniuc
  for noticing the need for them.
- Allow multiple position variables per token
- ++ can now be associated with - code
- Allow /* */ comments as smpl comments, not only as + code
- Add support for && (label addresses)
- local idexpression metavariable no longer matches static local x
- Consider using to be a comment in C++ code.  Patch submitted by Jani Monoses.
- Command line cocci
- print_main etc for ocaml Coccilib
- =~ not ~= is used to indicate a regular expression constraint on an
  identifier.  And !~ for a nonmatch.
- allow long double, short int, long int, and long long int in SmPL code.
- gcc constructors allowed in SmPL.  Thanks to Uwe Kleine-Koenig for
  pointing out the problem.
- Allow ! to appear before () in depends.  Thanks to SF Markus Elfring for
  noticing the problem.
- Can add code containing #pragma or #line.
- Multicharacter command-line options now begin with -- and contain -
  rather than _.
- Allow multiple types of hidden metavariables, each preceded by @.
  Position variables can be attached to these.
- Python code now receives a structure containing a list of matched
  elements for list metavariables.  Thanks to Michael Stefaniuc for
  suggesting this features.
- Python code now receives expressions and identifiers as ordinary strings,
  not as elements of specific structures.
- Allow size_t as the type of an array index in smpl code.  Reported by
  Mansour Moufid.
- Allow renaming an expression as an identifier (@i)
- Support const/volatile after *.  Thanks to Lars-Peter Clausen for
  pointing out the problem.
- Support variable declarations in the first element of a for loop header.

** Features:
- Preserve spacing before // comments when not at the beginning of a line
- Adjusted parsing of endif to put it after jump code
- Improve warning message when using -use_cache
- More helpful initial value for exported variables in python
- Support - on expression nests
- Better handling of the case of a matched declaration that should only
  be replaced by other top level things.
- Allow a semantic patch beginning and ending with braces to match the
  complete body of a function if the braces are not removed and if nothing
  is added before the first brace or after the last one.
- Add -cache_prefix option, to specify where to put cached files.
- Allow module_init(foo); to match module_init(foo) (or likewise for any
  declarer), when no transformation is specified on the semicolon.
- Add Coccilib.exit() for ocaml code and cocci.exit() for python code,
  to abort the treatment of the current file.
- Don't multiply print the same patch for the same file
- Drop date in diff
- Don't repeat smpl type warnings
- -sp_file/-cocci_file are now optional.  If not present an argument that
  ends in .cocci is assumed to be the name of the file containing the
  semantic patch.
- Allow limiting the size of a named cache using -cache_limit
- Cache name specified with -cache_prefix is extended according to the
  index (parallelism), if any.
- Allow multi-character constants in C code and SmPL code.  Thanks to Kamil
  Pilch for pointing out the problem.
- Better parsing of K&R C functions.  No longer convert all parameters to
  typedefs.
- Implement newes as a hash table, for more efficiency on big sets of
  environments.
- A local variable that is declared without a type is not considered to be
  a local variable.  Actually, such a variable is probably really a macro
  that expends to a declaration, and this macro is not the variable name.
- Allow iteration to make modifications when the modifications are done
  inplace.
- -debug gives information about defined virtual rules and about virtual
  identifier bindings.
- no more crashing on c++-like code without the c++ argument.
- dependencies can have ! on ()
- Give ocaml code access to Flag and thus the current file name.
- Slightly more efficient handling of lists.
- Slightly better error message in the case of inconsistent paths
- Improve limited size caching
- Remove zero #ifdefs when everything else is removed
- Mac OSX compatibility (tested on OSX Lion)
- 'Make depend' is called automatically when starting from a cleaned source
- Configure flag --enable-release makes 'make' build the optimized version of
  coccinelle if possible.
- The installed 'bin/spatch' calls spatch.opt or spatch with default parameters
  for iso/headers/python. 'bin/spatch.opt' and 'bin/spatch.byte'
- The bundled packages are now in the 'bundles' subdirectory and in the
  form of their original tarballs. These are extracted and used on-demand.
- Compatibility with python 2 and python 3. Also, a small bug is fixed in the order
  of library includes that caused sometimes trouble when building the pycaml library.
- Dropped the dependency on Perl in the Makefiles
- The conre script uses pkg-config and ocaml findlib and provides many
  flags for tuning/overriding the build process (including the ocaml
  compiler and the C compiler and preprocessor).
- Add line number directives to the .ml file generated from a .cocci file
-ative to 'make test'. It can run after
  building spatch, checks whether some featues work (python and ocaml scripts,
  regexes) if these features are enabled, and then launches the test suite
  with a 75% success rate requirement. It also does not ask fo input
  and can be used in autonomous builds.
- Added an experimental --reverse flag to invert the semantic patch before application.
  Note that not all patches can be inverted, nor is it guaranteed that applying
  a patch followed by applying its inver is an identity operation.
- Cache prefix takes distribution index into account.
- Add --defined and --undefined options allowing some code not to be
  touched.  Suggested by Eric Leblond.
- Dropped the need for the ocaml-extlib and ocaml-sexplib packagesed the file format of the regression test results. Files in the old format
  are no longer readable by spatch.
- Added a crude mechanism for integrating the results of external analyses with
  coccinelle, using positions to connect them together. This is xperimental
  feature. See demos/external_ana.{c,cocci,data}.

** Bugfix:
- Corrected parsing of script strings delimited by a single quote.  Thanks
  to Eugeniy Meshcheryakov for reporting the problem.
- Improved indentation of added ifdefs.
- Allow added comments and #ifdefs to precede other added code.  Thanks to
  Jani Monoses for noticing the problem.
- Corrected failure to due missing ocamlfind. Thanks to Derek M. Jones for
  reporting the problem.
- Allow fake nodes to be - in the allminus case, toop tokens related to
  a function definition or forward declaration but before the first code
  mentioned in the semantic patch.
- Drop __init etc when deleting a whole function.
- Cause appropriate newlines to be preserved when multiple matches (trees)
  contain adjacent modifications derived from the same SmPL code.
- check_meta takes into account fresh identifier seed information.
- Types for worth-trying optimization should not be followed by space
- Improved filtering of result of matching atomic patterns
- Drop positions before creating function prototype rules
- Adjust position of { introduced by adding multiple statements in a
  single-statement position
- Drop newline after function call ( when all arguments on that line are
  eliminated
- Accept removal of a single declaration, replaced by arbitrary,
  non-declaration code
- smpl_spacing takes into account newlines, indentation
- Improved prevention of transformations on toplevel { ... } from causing
  changes outside function boundaries; also otside ifs, whiles, etc.
  Changes are still allowed on { ... } present for other reasons.
- Fix bug in include_match that caused everything to halt when all matches
  were discarded
- Don't call Insert_plus on rules that cannot be evaluated due to failed
  dependencies.
- Allow variable declaration right after a case in switch.
- The top of a loop is also after the body of a loop, for ... in loop body
- Do not anchor Str regexp at the beginning of the string to check
- Type annotation for C code uses most recent env for typedefs when
  possible.  Thanks to Andrea Canciani for pointing out the problem.
- Pretty print pointer types without a trailing space.  Thanks to Michael
  Stefaniuc for pointing out the problem.
- Propagate dependencies further in get_constants2
- Make lexer more dos friendly
- slightly better handling of long long
- Strip constraints from metavariables in function prototype treatment
  before comparison, due to incomparability of pcre regexps.
- Fixed obsolete regexp doc, thanks to Dmitry Osmakov
- Improved x || ... || y to avoid double modification
- Transparently allow \( \| and \) to be on lines beginning with -.  The -
  has no effect.
- Remove memory leak related to pr2_once management.  Thanks to Robert
  Gomulka for helping to solve the problem.  Don't use once hashtable if
  messages won't be printed anyway.
- Change the type of subtraction mixing pointer and array to have int result.
  Thanks to Robert Gomulka for noticing the problem.
- Fix interpretation of dependencies in  presence of virtual rules.
  Ignore constraints on inherited position metavariables in a rule that
  will be ignored.
- Better support meta iterator and meta declarer tokens, and symid tokens.
- Better indentation after added noindent.
- Fixed length bug in the treatment of structures.
- Allow inheriting declaration/field metavariables.
- Don't drop spaces after parentheses in when no minus code present.
  Thanks to Terry Wilson for reporting the problem.
- Keep inherited metavariables in asttomember (preprocessing for matching)
- allminus for types, to allow removing const, not just matching it
- improved pretty printing when something is added before a closed brace
- Allow matching on nameless structs.  Thanks to Ron Minnich for reporting
  the problem.
- Pretty printing of const/volatile arrays in smpl code.
- Don't allow just dropping an exp or type
- Avoid removing #endif when surrounded by - code
- Print some important error messages even with the --very-quiet flag.
- Fixed parallel building in the Makefiles
- Fixed the compilation of the "pure bytecode" version. If you use the
  bundled pycaml or ocaml-pcre, you'll need their stub libraries in
  your LD_LIBRARY_PATH.
- For get_constants, virtuals should be false, not true
- C parsing of top-level declarers with initializations.
- Remove constraints in predicates in match result, to avoid PCRE equality
  problems
- Enum assignment matching an enum value shouldn't cause a
  crash. Likewise, an identifier matching an initialized enum field
  shouldn't cause a crash.
- Make when forall in an exists rule behave (more) like forall
- Ocaml 4.00.0 compatibility fixes
- Drop inlines, reduce parser code size
- Bind const_vol in the right order in Ast0 visitor

5 files changed, 36 insertions, 30 deletions

diff --git a/devel/coccinelle/Makefile b/devel/coccinelle/Makefile
index ba0342654a9..b9f1f6ab8e1 100644
--- a/devel/coccinelle/Makefile
+++ b/devel/coccinelle/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.17 2012/10/31 11:16:47 asau Exp $
+# $NetBSD: Makefile,v 1.18 2012/11/17 11:50:14 ryoon Exp $
 
-DISTNAME=	coccinelle-0.2.5
-PKGREVISION=	4
+DISTNAME=	coccinelle-1.0.0-rc15
+PKGNAME=	${DISTNAME:S/-rc/rc/}
 CATEGORIES=	devel
 MASTER_SITES=	http://coccinelle.lip6.fr/distrib/
 EXTRACT_SUFX=	.tgz
@@ -16,14 +16,11 @@ DEPENDS+=	menhir>=20071212:../../devel/menhir
 
 MAKE_JOBS_SAFE=		no
 
-HAS_CONFIGURE=	yes
-USE_TOOLS+=	gmake perl
+GNU_CONFIGURE=	yes
+USE_TOOLS+=	gmake pkg-config
 REPLACE_PERL=	configure
 BUILD_TARGET=	all all.opt
 
-CONFIGURE_ARGS+=	--prefix=${PREFIX}
-CONFIG_SHELL=	${PERL5}
-
 SUBST_CLASSES+=		man
 SUBST_FILES.man+=	configure
 SUBST_SED.man+=		-e "s,$${prefix}/man,$${prefix}/${PKGMANDIR},g"
diff --git a/devel/coccinelle/PLIST b/devel/coccinelle/PLIST
index 51326a98774..d2aa6250907 100644
--- a/devel/coccinelle/PLIST
+++ b/devel/coccinelle/PLIST
@@ -1,8 +1,10 @@
-@comment $NetBSD: PLIST,v 1.6 2011/10/14 09:06:35 obache Exp $
+@comment $NetBSD: PLIST,v 1.7 2012/11/17 11:50:14 ryoon Exp $
 bin/spatch
+bin/spatch.byte
 bin/spatch.opt
-lib/dllpycaml_stubs.so
 man/man1/spatch.1
+man/man3/Coccilib.3
+share/coccinelle/commons/commands.cmi
 share/coccinelle/commons/common.cmi
 share/coccinelle/commons/common_extra.cmi
 share/coccinelle/commons/glimpse.cmi
@@ -11,7 +13,6 @@ share/coccinelle/commons/oarray.cmi
 share/coccinelle/commons/oassoc.cmi
 share/coccinelle/commons/objet.cmi
 share/coccinelle/commons/ocollection.cmi
-share/coccinelle/commons/ofullcommon.cmi
 share/coccinelle/commons/ograph.cmi
 share/coccinelle/commons/ograph_extended.cmi
 share/coccinelle/commons/ograph_simple.cmi
@@ -19,7 +20,6 @@ share/coccinelle/commons/osequence.cmi
 share/coccinelle/commons/oset.cmi
 share/coccinelle/commons/parser_combinators.cmi
 share/coccinelle/commons/seti.cmi
-share/coccinelle/commons/sexp_common.cmi
 share/coccinelle/globals/iteration.cmi
 share/coccinelle/ocaml/coccilib.cmi
 share/coccinelle/parsing_c/ast_c.cmi
diff --git a/devel/coccinelle/distinfo b/devel/coccinelle/distinfo
index fde8b2f9e71..008963604eb 100644
--- a/devel/coccinelle/distinfo
+++ b/devel/coccinelle/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.9 2012/04/22 20:29:47 joerg Exp $
+$NetBSD: distinfo,v 1.10 2012/11/17 11:50:14 ryoon Exp $
 
-SHA1 (coccinelle-0.2.5.tgz) = fa9aed17ee23a253cf01a8571b61d1320082751b
-RMD160 (coccinelle-0.2.5.tgz) = a0811ba0a2c50b70fc52155cc062af6ba383d0d2
-Size (coccinelle-0.2.5.tgz) = 2295665 bytes
-SHA1 (patch-pycaml_pycaml__ml.c) = b7148ec22a8148ae6583ab1c1a7e8e44f69502da
+SHA1 (coccinelle-1.0.0-rc15.tgz) = 6af06856d895a9e83dfaae42db4f648335eda66d
+RMD160 (coccinelle-1.0.0-rc15.tgz) = 6f819c1490fec0e9e73ef579beb68ef1491ae5bb
+Size (coccinelle-1.0.0-rc15.tgz) = 3328556 bytes
+SHA1 (patch-Makefile) = 5708ac8ee4af869e8b9b03d309daf5ca67e3f162
diff --git a/devel/coccinelle/patches/patch-Makefile b/devel/coccinelle/patches/patch-Makefile
new file mode 100644
index 00000000000..3575c16da41
--- /dev/null
+++ b/devel/coccinelle/patches/patch-Makefile
@@ -0,0 +1,22 @@
+$NetBSD: patch-Makefile,v 1.1 2012/11/17 11:50:14 ryoon Exp $
+
+--- Makefile.orig	2012-08-16 16:52:07.000000000 +0000
++++ Makefile
+@@ -358,7 +358,7 @@ install-man:
+ 	$(MKDIR_P) $(DESTDIR)$(MANDIR)/man1
+ 	$(MKDIR_P) $(DESTDIR)$(MANDIR)/man3
+ 	$(INSTALL_DATA) docs/spatch.1 $(DESTDIR)$(MANDIR)/man1/
+-	$(INSTALL_DATA) docs/Coccilib.3cocci $(DESTDIR)$(MANDIR)/man3/
++	$(INSTALL_DATA) docs/Coccilib.3cocci $(DESTDIR)$(MANDIR)/man3/Coccilib.3
+ 
+ install-bash:
+ 	@echo "Installing bash completion in: ${DESTDIR}${BASH_COMPLETION_DIR}"
+@@ -388,8 +388,6 @@ install-python:
+ 
+ install-stubs:
+ 	$(MKDIR_P) $(DESTDIR)$(SHAREDIR)
+-	@if test -f ./bundles/pycaml/dllpycaml_stubs.so; then \
+-		cp -fv ./bundles/pycaml/dllpycaml_stubs.so $(DESTDIR)$(SHAREDIR); fi
+ 	@if test -f ./bundles/pcre/dllpcre_stubs.so; then \
+ 		cp -fv ./bundles/pcre/dllpcre_stubs.so $(DESTDIR)$(SHAREDIR); fi
+ 
diff --git a/devel/coccinelle/patches/patch-pycaml_pycaml__ml.c b/devel/coccinelle/patches/patch-pycaml_pycaml__ml.c
deleted file mode 100644
index e8e9b3545e9..00000000000
--- a/devel/coccinelle/patches/patch-pycaml_pycaml__ml.c
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-pycaml_pycaml__ml.c,v 1.1 2012/04/22 20:29:47 joerg Exp $
-
---- pycaml/pycaml_ml.c.orig	2012-04-20 15:37:19.000000000 +0000
-+++ pycaml/pycaml_ml.c
-@@ -1468,7 +1468,7 @@ value pycaml_setargs(value argv) {
- 
-   PySys_SetArgv(1, cargv);
- 
--  CAMLreturn0; 
-+  CAMLreturn(Val_unit);
- }
- 
- value pytrue( value unit ) {