Coccinelle release 1.0.0-rc4

[bpt/coccinelle.git] / popl09 / pretty_print_popl.ml

diff --git a/popl09/pretty_print_popl.ml b/popl09/pretty_print_popl.ml
index c083cd0..e76b8fc 100644 (file)
--- a/popl09/pretty_print_popl.ml
+++ b/popl09/pretty_print_popl.ml
@@ -1,3 +1,27 @@
+(*
+ * Copyright 2010, INRIA, University of Copenhagen
+ * Julia Lawall, Rene Rydhof Hansen, Gilles Muller, Nicolas Palix
+ * Copyright 2005-2009, 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 Format
 module Past = Ast_popl
 module Ast = Ast_cocci
@@ -23,7 +47,10 @@ let print_around printer term = function
 let mcode fn = function
     (x, _, Ast.MINUS(_,_,_,plus_stream), pos) ->
       print_string "-"; fn x;
-      Pretty_print_cocci.print_anything ">>> " plus_stream
+      (match plus_stream with
+       Ast.NOREPLACEMENT -> ()
+      | Ast.REPLACEMENT(plus_stream,_) ->
+         Pretty_print_cocci.print_anything ">>> " plus_stream)
   | (x, _, Ast.CONTEXT(_,plus_streams), pos) ->
        print_around fn x plus_streams
   | (x, info, Ast.PLUS _, pos) -> fn x
@@ -40,7 +67,7 @@ and print_term = function
     Past.Atomic(term) -> Pretty_print_cocci.rule_elem "" term
   | Past.IfThen(test,thn,(_,_,_,aft)) ->
       print_term test; print_term thn;
-      mcode (function _ -> ()) ((),Ast.no_info,aft,Ast.NoMetaPos)
+      mcode (function _ -> ()) ((),Ast.no_info,aft,[])
   | Past.TExists((_,v),term) -> print_string "exists "; print_string v;
       print_string " ."; force_newline(); print_term term