Release coccinelle-0.2.5-rc2

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

diff --git a/parsing_cocci/unparse_ast0.ml b/parsing_cocci/unparse_ast0.ml
index e62a412..2f6417f 100644 (file)
--- a/parsing_cocci/unparse_ast0.ml
+++ b/parsing_cocci/unparse_ast0.ml
@@ -1,5 +1,7 @@
 (*
- * Copyright 2005-2010, Ecole des Mines de Nantes, University of Copenhagen
+ * 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.
  *
@@ -52,7 +54,8 @@ let meta_pos = function
 (* Modified code *)
 
 let mcodekind brackets fn x info mc =
-  List.iter (function (s,_) -> print_string s) info.Ast0.strings_before;
+  let print = function Ast.Noindent s | Ast.Indent s -> print_string s in
+  List.iter (function (s,_) -> print s) info.Ast0.strings_before;
   (match mc with
     Ast0.MINUS(plus_stream) ->
       let (lb,rb) =
@@ -92,7 +95,7 @@ let mcodekind brackets fn x info mc =
       let (plus_streams,_,_) = !plus_streams in
       U.print_around (function x -> print_string lb; fn x; print_string rb)
        x plus_streams);
-  List.iter (function (s,_) -> print_string s) info.Ast0.strings_after
+  List.iter (function (s,_) -> print s) info.Ast0.strings_after
 
 let mcode fn (x,_,info,mc,pos,adj) =
   let fn x = fn x; meta_pos !pos in
@@ -270,8 +273,13 @@ and typeC t =
       | Ast0.Array(ty,lb,size,rb) ->
          typeC ty; mcode print_string lb; print_option expression size;
          mcode print_string rb
-      | Ast0.EnumName(kind,name) -> mcode print_string kind; print_string " ";
-         ident name
+      | Ast0.EnumName(kind,name) ->
+         mcode print_string kind;
+         print_option (function x -> ident x; print_string " ") name
+      | Ast0.EnumDef(ty,lb,ids,rb) ->
+         typeC ty; mcode print_string lb;
+         dots force_newline expression ids;
+         mcode print_string rb
       | Ast0.StructUnionName(kind,name) ->
          mcode U.structUnion kind;
          print_option (function x -> ident x; print_string " ") name
@@ -321,7 +329,8 @@ and declaration d =
   print_context d
     (function _ ->
       match Ast0.unwrap d with
-       Ast0.Init(stg,ty,id,eq,ini,sem) ->
+       Ast0.MetaDecl(name,_) | Ast0.MetaField(name,_) -> mcode print_meta name
+      |        Ast0.Init(stg,ty,id,eq,ini,sem) ->
          print_option (mcode U.storage) stg;
          print_named_type ty id;
          print_string " ";
@@ -362,7 +371,8 @@ and initialiser i =
       match Ast0.unwrap i with
        Ast0.MetaInit(name,_)-> mcode print_meta name; print_string " "
       |        Ast0.InitExpr(exp) -> expression exp
-      | Ast0.InitList(lb,initlist,rb) ->
+      | Ast0.InitList(lb,initlist,rb,ordered) ->
+          (*doesn't show commas dropped in unordered case*)
          mcode print_string lb; open_box 0;
          let _ = dots (function _ -> ()) initialiser initlist in
          close_box(); mcode print_string rb
@@ -535,6 +545,8 @@ and statement arity s =
            whn
       | Ast0.Include(inc,s) ->
          mcode print_string inc; print_string " "; mcode U.inc_file s
+      | Ast0.Undef(def,id) ->
+         mcode print_string def; print_string " "; ident id
       | Ast0.Define(def,id,params,body) ->
          mcode print_string def; print_string " "; ident id;
          print_define_parameters params;
@@ -637,33 +649,24 @@ let unparse_anything x =
   | Ast0.DotsStmtTag(d) ->
       print_string "StmDots:"; force_newline();
       statement_dots d
-  | Ast0.DotsDeclTag(d) ->
-      declaration_dots d
-  | Ast0.DotsCaseTag(d) ->
-      case_dots d
-  | Ast0.IdentTag(d) ->
-      ident d
+  | Ast0.DotsDeclTag(d) -> declaration_dots d
+  | Ast0.DotsCaseTag(d) -> case_dots d
+  | Ast0.IdentTag(d)    -> ident d
   | Ast0.ExprTag(d) | Ast0.ArgExprTag(d) | Ast0.TestExprTag(d) ->
       print_string "Exp:"; force_newline();
       expression d
-  | Ast0.TypeCTag(d) ->
-      typeC d
-  | Ast0.ParamTag(d) ->
-      parameterTypeDef d
-  | Ast0.InitTag(d) ->
-      initialiser d
-  | Ast0.DeclTag(d) ->
-      declaration d
-  | Ast0.StmtTag(d) ->
+  | Ast0.TypeCTag(d) -> typeC d
+  | Ast0.ParamTag(d) -> parameterTypeDef d
+  | Ast0.InitTag(d)  -> initialiser d
+  | Ast0.DeclTag(d)  -> declaration d
+  | Ast0.StmtTag(d)  ->
       print_string "Stm:"; force_newline();
       statement "" d
-  | Ast0.CaseLineTag(d) ->
-      case_line "" d
-  | Ast0.TopTag(d) ->
-      top_level d
-  | Ast0.IsoWhenTag(x) -> U.print_when_modif x
-  | Ast0.IsoWhenTTag(e) -> expression e
-  | Ast0.IsoWhenFTag(e) -> expression e
+  | Ast0.CaseLineTag(d)  -> case_line "" d
+  | Ast0.TopTag(d)       -> top_level d
+  | Ast0.IsoWhenTag(x)   -> U.print_when_modif x
+  | Ast0.IsoWhenTTag(e)  -> expression e
+  | Ast0.IsoWhenFTag(e)  -> expression e
   | Ast0.MetaPosTag(var) -> meta_pos var);
   quiet := q;
   print_newline()