Release coccinelle-0.1.2

[bpt/coccinelle.git] / parsing_c / control_flow_c.mli

diff --git a/parsing_c/control_flow_c.mli b/parsing_c/control_flow_c.mli
index 0bd1ecf..3938bb4 100644 (file)
--- a/parsing_c/control_flow_c.mli
+++ b/parsing_c/control_flow_c.mli
@@ -12,7 +12,7 @@ type node = node1 * string (* For debugging. Used by print_graph *)
   | TopNode 
   | EndNode
 
-  | FunHeader     of (string * functionType * storage) wrap
+  | FunHeader     of definition (* but empty body *)
   | Decl          of declaration
 
   | SeqStart      of statement * int * info
@@ -37,6 +37,11 @@ type node = node1 * string (* For debugging. Used by print_graph *)
   | ReturnExpr    of statement * expression wrap
 
 
+  (* ------------------------ *)
+  | IfdefHeader of ifdef_directive
+  | IfdefElse of ifdef_directive
+  | IfdefEndif of ifdef_directive
+
   (* ------------------------ *)
   | DefineHeader of string wrap * define_kind
 
@@ -44,7 +49,9 @@ type node = node1 * string (* For debugging. Used by print_graph *)
   | DefineType of fullType
   | DefineDoWhileZeroHeader of unit wrap
 
-  | Include of inc_file wrap * (include_rel_pos option ref * bool)
+  | DefineTodo
+
+  | Include of includ
 
   | MacroTop of string * argument wrap2 list * il 
 
@@ -64,8 +71,6 @@ type node = node1 * string (* For debugging. Used by print_graph *)
   | Asm of statement * asmbody wrap
   | MacroStmt of statement * unit wrap
 
-  | Ifdef of statement * unit wrap
-
 
   (* ------------------------ *)
   | Enter