Coccinelle release-1.0.0-rc11

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

diff --git a/parsing_cocci/unparse_ast0.ml b/parsing_cocci/unparse_ast0.ml
index 7c244cf..4ac55e1 100644 (file)
--- a/parsing_cocci/unparse_ast0.ml
+++ b/parsing_cocci/unparse_ast0.ml
@@ -1,5 +1,7 @@
 (*
- * Copyright 2010, INRIA, University of Copenhagen
+ * Copyright 2012, INRIA
+ * Julia Lawall, Gilles Muller
+ * Copyright 2010-2011, 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
@@ -43,12 +45,15 @@ let print_between = Common.print_between
 (* --------------------------------------------------------------------- *)
 (* Positions *)
 
-let meta_pos = function
-    Ast0.MetaPos(name,_,_) ->
+let rec meta_pos l =
+  List.iter
+    (function var ->
+      let current_name = Ast0.meta_pos_name var in
+      let (_,name) = Ast0.unwrap_mcode current_name in
       print_string "@";
-      let (_,name) = Ast0.unwrap_mcode name in
-      print_string name
-  | Ast0.NoMetaPos -> ()
+      print_string name;
+      meta_pos (Ast0.get_pos current_name))
+    l
 
 (* --------------------------------------------------------------------- *)
 (* Modified code *)
@@ -71,7 +76,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
@@ -151,7 +158,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
@@ -177,6 +184,9 @@ let rec expression e =
       | Ast0.Assignment(left,op,right,_) ->
          expression left; print_string " "; mcode U.assignOp op;
          print_string " "; expression right
+      | Ast0.Sequence(left,op,right) ->
+         expression left; mcode print_string op;
+         print_string " "; expression right
       | Ast0.CondExpr(exp1,why,exp2,colon,exp3) ->
          expression exp1; print_string " "; mcode print_string why;
          print_option (function e -> print_string " "; expression e) exp2;
@@ -214,6 +224,9 @@ let rec expression e =
          mcode print_string_box lp; typeC ty; close_box();
          mcode print_string rp
       | Ast0.TypeExp(ty) -> typeC ty
+      | Ast0.Constructor(lp,ty,rp,init) ->
+         mcode print_string_box lp; typeC ty; close_box();
+         mcode print_string rp; initialiser init
       | Ast0.MetaErr(name,_,_) -> mcode print_meta name
       | Ast0.MetaExpr(name,_,ty,_,pure) ->
          mcode print_meta name; print_types ty(*;
@@ -244,7 +257,9 @@ let rec expression e =
       | Ast0.Ecircles(dots,None)
       | Ast0.Estars(dots,None) -> mcode print_string dots
       | Ast0.OptExp(exp) -> print_string "?"; expression exp
-      | Ast0.UniqueExp(exp) -> print_string "!"; expression exp)
+      | Ast0.UniqueExp(exp) -> print_string "!"; expression exp
+      |        Ast0.AsExpr(exp,asexp) -> expression exp; print_string "@";
+         expression asexp)
 
 and expression_dots x = dots (function _ -> ()) expression x
 
@@ -297,7 +312,8 @@ and typeC t =
       | Ast0.MetaType(name,_)-> mcode print_meta name; print_string " "
       | Ast0.DisjType(_,types,_,_) -> do_disj types typeC
       | Ast0.OptType(ty) -> print_string "?"; typeC ty
-      | Ast0.UniqueType(ty) -> print_string "!"; typeC ty)
+      | Ast0.UniqueType(ty) -> print_string "!"; typeC ty
+      | Ast0.AsType(ty,asty) -> typeC ty; print_string "@"; typeC asty)
 
 (* --------------------------------------------------------------------- *)
 (* Variable declaration *)
@@ -346,6 +362,13 @@ and declaration d =
          ident name; mcode print_string_box lp;
          let _ = dots (function _ -> ()) expression args in
          close_box(); mcode print_string rp; mcode print_string sem
+      | Ast0.MacroDeclInit(name,lp,args,rp,eq,ini,sem) ->
+         ident name; mcode print_string_box lp;
+         let _ = dots (function _ -> ()) expression args in
+         close_box(); mcode print_string rp;
+          print_string " ";
+          mcode print_string eq; print_string " "; initialiser ini;
+         mcode print_string sem
       | Ast0.TyDecl(ty,sem) -> typeC ty; mcode print_string sem
       | Ast0.Typedef(stg,ty,id,sem) ->
          mcode print_string stg; typeC ty; typeC id;
@@ -361,7 +384,9 @@ and declaration d =
          declaration whencode
       | Ast0.Ddots(dots,None) -> mcode print_string dots
       | Ast0.OptDecl(decl) -> print_string "?"; declaration decl
-      | Ast0.UniqueDecl(decl) -> print_string "!"; declaration decl)
+      | Ast0.UniqueDecl(decl) -> print_string "!"; declaration decl
+      | Ast0.AsDecl(decl,asdecl) ->
+         declaration decl; print_string "@"; declaration asdecl)
 
 and declaration_dots l = dots (function _ -> ()) declaration l
 
@@ -373,6 +398,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*)
@@ -390,7 +416,9 @@ and initialiser i =
          initialiser whencode
       | Ast0.Idots(d,None) -> mcode print_string d
       | Ast0.OptIni(ini) -> print_string "?"; initialiser ini
-      | Ast0.UniqueIni(ini) -> print_string "!"; initialiser ini)
+      | Ast0.UniqueIni(ini) -> print_string "!"; initialiser ini
+      | Ast0.AsInit(ini,asini) -> initialiser ini; print_string "@";
+         initialiser asini)
 
 and designator = function
       Ast0.DesignatorField(dot,id) -> mcode print_string dot; ident id
@@ -438,19 +466,25 @@ and statement arity s =
          print_string arity; mcode print_string lbrace; start_block();
          dots force_newline (statement arity) body;
          end_block(); print_string arity; mcode print_string rbrace
-      | Ast0.Decl(_,decl) -> print_string arity; declaration decl
+      | Ast0.Decl(_,decl) ->
+         Printf.printf "statement mcodekind %s\n"
+           (Dumper.dump (Ast0.get_mcodekind s));
+         Printf.printf "decl mcodekind %s\n"
+           (Dumper.dump (Ast0.get_mcodekind decl));
+         print_string arity; declaration decl
       | Ast0.Seq(lbrace,body,rbrace) ->
          print_string arity; mcode print_string lbrace; start_block();
          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;
@@ -458,13 +492,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;
@@ -479,14 +513,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 " ";
@@ -556,7 +590,9 @@ and statement arity s =
          print_string " ";
          dots force_newline (statement arity) body
       | Ast0.OptStm(re) -> statement "?" re
-      | Ast0.UniqueStm(re) -> statement "!" re)
+      | Ast0.UniqueStm(re) -> statement "!" re
+      | Ast0.AsStmt(stm,asstm) -> statement arity stm; print_string "@";
+         statement arity asstm)
 
 and print_define_parameters params =
   match Ast0.unwrap params with
@@ -625,8 +661,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 = [";
@@ -670,7 +706,8 @@ 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 [x]
+  | Ast0.HiddenVarTag(var) -> failwith "should not need to be printed");
   quiet := q;
   print_newline()