Coccinelle release 1.0.0-rc3

[bpt/coccinelle.git] / parsing_cocci / unparse_ast0.ml

diff --git a/parsing_cocci/unparse_ast0.ml b/parsing_cocci/unparse_ast0.ml
index da8db30..9ac3697 100644 (file)
--- a/parsing_cocci/unparse_ast0.ml
+++ b/parsing_cocci/unparse_ast0.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 Ast = Ast_cocci
 module Ast0 = Ast0_cocci
@@ -19,12 +43,14 @@ let print_between = Common.print_between
 (* --------------------------------------------------------------------- *)
 (* Positions *)
 
-let meta_pos = function
-    Ast0.MetaPos(name,_,_) ->
-      print_string "@";
-      let (_,name) = Ast0.unwrap_mcode name in
-      print_string name
-  | Ast0.NoMetaPos -> ()
+let meta_pos l =
+  List.iter
+    (function
+       Ast0.MetaPos(name,_,_) ->
+         print_string "@";
+         let (_,name) = Ast0.unwrap_mcode name in
+         print_string name)
+    l
 
 (* --------------------------------------------------------------------- *)
 (* Modified code *)
@@ -47,7 +73,9 @@ let mcodekind brackets fn x info mc =
       then fn x
       else (print_string "-";
            print_string lb; fn x; print_string rb);
-      U.print_anything ">>> " plus_stream
+      (match plus_stream with
+       Ast.NOREPLACEMENT -> ()
+      | Ast.REPLACEMENT(plus_stream,_) -> U.print_anything ">>> " plus_stream)
   | Ast0.CONTEXT(plus_streams) ->
       let (lb,rb) =
        if !quiet
@@ -127,7 +155,7 @@ let rec ident i =
     (function _ ->
       match Ast0.unwrap i with
        Ast0.Id(name) -> mcode print_string name
-      | Ast0.MetaId(name,_,_) -> mcode print_meta name
+      | Ast0.MetaId(name,_,_,_) -> mcode print_meta name
       | Ast0.MetaFunc(name,_,_) -> mcode print_meta name
       | Ast0.MetaLocalFunc(name,_,_) -> mcode print_meta name
       | Ast0.DisjId(_,id_list,_,_) -> do_disj id_list ident
@@ -349,6 +377,7 @@ and initialiser i =
     (function _ ->
       match Ast0.unwrap i with
        Ast0.MetaInit(name,_)-> mcode print_meta name; print_string " "
+      |        Ast0.MetaInitList(name,_,_)-> mcode print_meta name; print_string " "
       |        Ast0.InitExpr(exp) -> expression exp
       | Ast0.InitList(lb,initlist,rb,ordered) ->
           (*doesn't show commas dropped in unordered case*)
@@ -420,13 +449,14 @@ and statement arity s =
          dots force_newline (statement arity) body;
          end_block(); print_string arity; mcode print_string rbrace
       | Ast0.ExprStatement(exp,sem) ->
-         print_string arity; expression exp; mcode print_string sem
+         print_string arity; print_option expression exp;
+         mcode print_string sem
       | Ast0.IfThen(iff,lp,exp,rp,branch1,(info,aft)) ->
          print_string arity;
          mcode print_string iff; print_string " "; mcode print_string_box lp;
          expression exp; close_box(); mcode print_string rp; print_string " ";
          statement arity branch1;
-         mcode (function _ -> ()) ((),(),info,aft,ref Ast0.NoMetaPos,-1)
+         mcode (function _ -> ()) ((),(),info,aft,ref [],-1)
       | Ast0.IfThenElse(iff,lp,exp,rp,branch1,els,branch2,(info,aft)) ->
          print_string arity;
          mcode print_string iff; print_string " "; mcode print_string_box lp;
@@ -434,13 +464,13 @@ and statement arity s =
          statement arity branch1;
          print_string arity; mcode print_string els; print_string " ";
          statement arity branch2;
-         mcode (function _ -> ()) ((),(),info,aft,ref Ast0.NoMetaPos,-1)
+         mcode (function _ -> ()) ((),(),info,aft,ref [],-1)
       | Ast0.While(whl,lp,exp,rp,body,(info,aft)) ->
          print_string arity;
          mcode print_string whl; print_string " "; mcode print_string_box lp;
          expression exp; close_box(); mcode print_string rp; print_string " ";
          statement arity body;
-         mcode (function _ -> ()) ((),(),info,aft,ref Ast0.NoMetaPos,-1)
+         mcode (function _ -> ()) ((),(),info,aft,ref [],-1)
       | Ast0.Do(d,body,whl,lp,exp,rp,sem) ->
          print_string arity; mcode print_string d; print_string " ";
          statement arity body;
@@ -455,14 +485,14 @@ and statement arity s =
          print_option expression e2; mcode print_string sem2;
          print_option expression e3; close_box();
          mcode print_string rp; print_string " "; statement arity body;
-         mcode (function _ -> ()) ((),(),info,aft,ref Ast0.NoMetaPos,-1)
+         mcode (function _ -> ()) ((),(),info,aft,ref [],-1)
       | Ast0.Iterator(nm,lp,args,rp,body,(info,aft)) ->
          print_string arity;
          ident nm; print_string " "; mcode print_string_box lp;
          let _ = dots (function _ -> ()) expression args in
          close_box(); mcode print_string rp; print_string " ";
          statement arity body;
-         mcode (function _ -> ()) ((),(),info,aft,ref Ast0.NoMetaPos,-1)
+         mcode (function _ -> ()) ((),(),info,aft,ref [],-1)
       |        Ast0.Switch(switch,lp,exp,rp,lb,decls,cases,rb) ->
          print_string arity;
          mcode print_string switch; print_string " ";
@@ -601,8 +631,8 @@ let top_level t =
        Ast0.FILEINFO(old_file,new_file) ->
          print_string "--- "; mcode print_string old_file; force_newline();
          print_string "+++ "; mcode print_string new_file
-      | Ast0.DECL(stmt) -> statement "" stmt
-      | Ast0.CODE(stmt_dots) ->
+      | Ast0.NONDECL(stmt) -> statement "" stmt
+      | Ast0.CODE(stmt_dots) | Ast0.TOPCODE(stmt_dots) ->
          dots force_newline (statement "") stmt_dots
       | Ast0.ERRORWORDS(exps) ->
          print_string "error words = [";
@@ -646,7 +676,7 @@ let unparse_anything x =
   | Ast0.IsoWhenTag(x)   -> U.print_when_modif x
   | Ast0.IsoWhenTTag(e)  -> expression e
   | Ast0.IsoWhenFTag(e)  -> expression e
-  | Ast0.MetaPosTag(var) -> meta_pos var);
+  | Ast0.MetaPosTag(var) -> meta_pos [var]);
   quiet := q;
   print_newline()