Coccinelle release-1.0.0-rc11

[bpt/coccinelle.git] / engine / lib_engine.ml

diff --git a/engine/lib_engine.ml b/engine/lib_engine.ml
index e2ff06d..0d12801 100644 (file)
--- a/engine/lib_engine.ml
+++ b/engine/lib_engine.ml
@@ -1,4 +1,8 @@
 (*
+ * 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
  * This file is part of Coccinelle.
@@ -32,7 +36,7 @@ type predicate =
   | After (* pointer to the code after an if or while *)
   | FallThrough | LoopFallThrough
   | Return (* any exit from the current function *)
-  | FunHeader | Top | Exit | ErrorExit | Goto
+  | FunHeader | UnsafeBrace | Top | Exit | ErrorExit | Goto
   | Paren of Ast_cocci.meta_name
   | Match of Ast_cocci.rule_elem
   | Label of Ast_cocci.meta_name
@@ -52,12 +56,14 @@ type ctlcocci = (predicate, Ast_cocci.meta_name) Wrapper_ctl.wrapped_ctl
 type metavars_binding = Ast_c.metavars_binding
 
 (* used in ctlcocci_integration *)
-type metavar_binding_kind2 = 
+type metavar_binding_kind2 =
   | NormalMetaVal of Ast_c.metavar_binding_kind
   | ParenVal of Ast_cocci.meta_name
-  | LabelVal of int list
+  | LabelVal of labelval
   | GoodVal | BadVal (* used to implement \+ *)
 
+and labelval = Absolute of int list | Prefix of int list
+
 and metavars_binding2 = (mvar, metavar_binding_kind2) Common.assoc
 
 
@@ -66,18 +72,18 @@ and metavars_binding2 = (mvar, metavar_binding_kind2) Common.assoc
 (* the CTL model related types *)
 (*****************************************************************************)
 (* coccionly: *)
-type label_ctlcocci = 
- predicate -> 
- (nodei * 
- (predicate * (mvar, metavar_binding_kind2) Ast_ctl.generic_substitution)) 
+type label_ctlcocci =
+ predicate ->
+ (nodei *
+ (predicate * (mvar, metavar_binding_kind2) Ast_ctl.generic_substitution))
  list
- 
+
 type model = Control_flow_c.cflow * label_ctlcocci * nodei list
 
-type transformation_info = 
+type transformation_info =
  (nodei * metavars_binding * Ast_cocci.rule_elem) list
 
-type numbered_transformation_info = 
+type numbered_transformation_info =
  (int list * (nodei * metavars_binding * Ast_cocci.rule_elem)) list
 
 
@@ -85,5 +91,5 @@ type numbered_transformation_info =
 (* comparing binding *)
 (*****************************************************************************)
 
-let equal_binding xs ys = 
+let equal_binding xs ys =
   List.sort compare xs = List.sort compare ys