Release coccinelle-0.2.1

** Language:
   - Add virtual identifiers
   - Add coccilib.report and coccilib.trac Python modules
   - coccilib.org and coccilib.report are imported by default but not loaded
     in the current scope.

** Features:
   - Parse_error_msg now more helpful.  New option -verbose_parsing for even
     more information.
   - Improve Python import handling. They are imported once during script
     initialization.

** Bugfix:
   - correct treatment of depends on with || for virtual rules

diff --git a/changes.txt b/changes.txt
index 8db554f..308db3c 100644 (file)
--- a/changes.txt
+++ b/changes.txt
@@ -1,5 +1,17 @@
 -*- org -*-
 
+* upcoming/planned/todo
+** Language:
+- Semantic patch for other languages
+- Support metavariables, virtual rules and virtual identifiers
+  in initialize and finalize rules
+
+** Features:
+- New scripting languages
+
+** Bugfix:
+- Add more information in documentation, man pages and wiki
+
 * 0.2.1
 ** Language:
 - Add virtual identifiers

diff --git a/commitmsg b/commitmsg
dissimilarity index 98%
index c988220..e458d9f 100644 (file)
--- a/commitmsg
+++ b/commitmsg
@@ -1,3 +1,16 @@
-Release coccinelle-0.2.1-rc1
-
-Relese Candidate 1 for coccinelle-0.2.1
+Release coccinelle-0.2.1
+
+** Language:
+   - Add virtual identifiers
+   - Add coccilib.report and coccilib.trac Python modules
+   - coccilib.org and coccilib.report are imported by default but not loaded
+     in the current scope.
+
+** Features:
+   - Parse_error_msg now more helpful.  New option -verbose_parsing for even
+     more information.
+   - Improve Python import handling. They are imported once during script
+     initialization.
+
+** Bugfix:
+   - correct treatment of depends on with || for virtual rules

diff --git a/docs/manual/cocci_syntax.tex b/docs/manual/cocci_syntax.tex
index ddb36b4..c10585b 100644 (file)
--- a/docs/manual/cocci_syntax.tex
+++ b/docs/manual/cocci_syntax.tex
@@ -194,15 +194,14 @@ constrained by its type.
   \CASE{\NT{pmid} \OPT{!= \T{id}}}
   \CASE{\NT{pmid} \OPT{!= \ttlb~\NT{COMMA\_LIST}\mth{(}\T{id}\mth{)} \ttrb}}
 
-  \RULE{\rt{pmid\_with\_not\_ceq}}
+  \RULE{\rt{pmid\_with\_virt\_or\_not\_eq}}
   \CASE{virtual.\T{id}}
+  \CASE{\NT{pmid\_with\_not\_eq}}
+
+  \RULE{\rt{pmid\_with\_not\_ceq}}
   \CASE{\NT{pmid} \OPT{!= \NT{id\_or\_cst}}}
   \CASE{\NT{pmid} \OPT{!= \ttlb~\NT{COMMA\_LIST}\mth{(}\NT{id\_or\_cst}\mth{)} \ttrb}}
 
-  \RULE{\rt{pmid\_with\_virt\_or\_not\_ceq}}
-  \CASE{virtual.\T{id}}
-  \CASE{\rt{pmid\_with\_not\_ceq}}
-
   \RULE{\rt{id\_or\_cst}}
   \CASE{\T{id}}
   \CASE{\T{integer}}

diff --git a/docs/manual/macros.tex b/docs/manual/macros.tex
index 3a008b6..0f44e3d 100644 (file)
--- a/docs/manual/macros.tex
+++ b/docs/manual/macros.tex
@@ -4,4 +4,4 @@
 \newcommand{\cpp}{\texttt{cpp}\xspace}
 
 
-\newcommand{\cocciversion}{0.1.8\xspace}
+\newcommand{\cocciversion}{0.2.1\xspace}

diff --git a/docs/manual/main_grammar.pdf b/docs/manual/main_grammar.pdf
index dd2eafc..12f1d09 100644 (file)
Binary files a/docs/manual/main_grammar.pdf and b/docs/manual/main_grammar.pdf differ

diff --git a/docs/manual/main_grammar.tex b/docs/manual/main_grammar.tex
index e44a168..38c628d 100644 (file)
--- a/docs/manual/main_grammar.tex
+++ b/docs/manual/main_grammar.tex
@@ -20,6 +20,7 @@
 \input{macros_grammar}
 \input{macros_common}
 
+\input{macros}
 
 \ifhevea
 \newcommand{\phantom}{}
@@ -28,7 +29,8 @@
 \newcommand{\air}{\phantom{xxx}}
 \fi
 
-\title{The SmPL Grammar (version 0.1.11)}
+% Update version in macros.tex
+\title{The SmPL Grammar (version \cocciversion)}
 \author{Research group on Coccinelle}
 \date{\today}
 

diff --git a/docs/manual/main_options.tex b/docs/manual/main_options.tex
index aa09319..8e9a787 100644 (file)
--- a/docs/manual/main_options.tex
+++ b/docs/manual/main_options.tex
@@ -6,12 +6,16 @@
 \usepackage{amsmath}
 \usepackage{amssymb}
 
+\usepackage{xspace}
+
 % fancy symbol, but require latex-extra-fonts (huge) package
 \usepackage[geometry]{ifsym}
 
 \input{macros_options}
+\input{macros}
 
-\title{Coccinelle Usage (version 0.2.1)}
+% Update version in macros.tex
+\title{Coccinelle Usage (version \cocciversion)}
 
 \begin{document}
 \maketitle

diff --git a/docs/manual/manual.pdf b/docs/manual/manual.pdf
index 0ca2297..9c54b35 100644 (file)
Binary files a/docs/manual/manual.pdf and b/docs/manual/manual.pdf differ

diff --git a/docs/manual/options.pdf b/docs/manual/options.pdf
index 690d718..c15d6c0 100644 (file)
Binary files a/docs/manual/options.pdf and b/docs/manual/options.pdf differ

diff --git a/globals/config.ml.in b/globals/config.ml.in
index db11f2e..9e01659 100644 (file)
--- a/globals/config.ml.in
+++ b/globals/config.ml.in
@@ -1,4 +1,4 @@
-let version = "0.2.1-rc1"
+let version = "0.2.1"
 
 let path =
   try (Sys.getenv "COCCINELLE_HOME")

diff --git a/python/yes_pycocci.ml b/python/yes_pycocci.ml
index 41281f5..50bd32c 100644 (file)
--- a/python/yes_pycocci.ml
+++ b/python/yes_pycocci.ml
@@ -20,28 +20,6 @@
  *)
 
 
-(*
- * Copyright 2005-2010, Ecole des Mines de Nantes, University of Copenhagen
- * Yoann Padioleau, Julia Lawall, Rene Rydhof Hansen, Henrik Stuart, Gilles Muller, Nicolas Palix
- * This file is part of Coccinelle.
- *
- * Coccinelle is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, according to version 2 of the License.
- *
- * Coccinelle is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with Coccinelle.  If not, see <http://www.gnu.org/licenses/>.
- *
- * The authors reserve the right to distribute this or future versions of
- * Coccinelle under other licenses.
- *)
-
-
 open Ast_c
 open Common
 open Pycaml

diff --git a/python/yes_pycocci_aux.ml b/python/yes_pycocci_aux.ml
index 779d6c6..da73321 100644 (file)
--- a/python/yes_pycocci_aux.ml
+++ b/python/yes_pycocci_aux.ml
@@ -20,28 +20,6 @@
  *)
 
 
-(*
- * Copyright 2005-2010, Ecole des Mines de Nantes, University of Copenhagen
- * Yoann Padioleau, Julia Lawall, Rene Rydhof Hansen, Henrik Stuart, Gilles Muller, Nicolas Palix
- * This file is part of Coccinelle.
- *
- * Coccinelle is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, according to version 2 of the License.
- *
- * Coccinelle is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with Coccinelle.  If not, see <http://www.gnu.org/licenses/>.
- *
- * The authors reserve the right to distribute this or future versions of
- * Coccinelle under other licenses.
- *)
-
-
 open Ast_c
 open Common
 open Pycaml

diff --git a/test.ml b/test.ml
index 58a274b..0f3486f 100644 (file)
--- a/test.ml
+++ b/test.ml
@@ -20,6 +20,28 @@
  *)
 
 
+(*
+ * Copyright 2005-2010, Ecole des Mines de Nantes, University of Copenhagen
+ * Yoann Padioleau, Julia Lawall, Rene Rydhof Hansen, Henrik Stuart, Gilles Muller, Nicolas Palix
+ * This file is part of Coccinelle.
+ *
+ * Coccinelle is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, according to version 2 of the License.
+ *
+ * Coccinelle is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Coccinelle.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * The authors reserve the right to distribute this or future versions of
+ * Coccinelle under other licenses.
+ *)
+
+
 (*
  * Copyright 2005-2009, Ecole des Mines de Nantes, University of Copenhagen
  * Yoann Padioleau, Julia Lawall, Rene Rydhof Hansen, Henrik Stuart, Gilles Muller, Nicolas Palix