Coccinelle release 1.0.0-rc14

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

diff --git a/parsing_cocci/unitary_ast0.ml b/parsing_cocci/unitary_ast0.ml
index 35e9261..976914a 100644 (file)
--- a/parsing_cocci/unitary_ast0.ml
+++ b/parsing_cocci/unitary_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
@@ -22,6 +24,7 @@
  *)
 
 
+# 0 "./unitary_ast0.ml"
 (* find unitary metavariables *)
 module Ast0 = Ast0_cocci
 module Ast = Ast_cocci
@@ -87,8 +90,10 @@ let get_free checker t =
 
   let ident r k i =
     match Ast0.unwrap i with
-      Ast0.MetaId(name,_,_) | Ast0.MetaFunc(name,_,_)
+      Ast0.MetaId(name,_,_,_) | Ast0.MetaFunc(name,_,_)
     | Ast0.MetaLocalFunc(name,_,_) -> checker name
+    | Ast0.DisjId(starter,id_list,mids,ender) ->
+       detect_unitary_frees(List.map r.VT0.combiner_rec_ident id_list)
     | _ -> k i in
 
   let expression r k e =
@@ -113,7 +118,9 @@ let get_free checker t =
 
   let declaration r k d =
     match Ast0.unwrap d with
-      Ast0.DisjDecl(starter,decls,mids,ender) ->
+      Ast0.MetaDecl(name,_) | Ast0.MetaField(name,_)
+    | Ast0.MetaFieldList(name,_,_) -> checker name
+    | Ast0.DisjDecl(starter,decls,mids,ender) ->
        detect_unitary_frees(List.map r.VT0.combiner_rec_declaration decls)
     | _ -> k d in
 
@@ -174,8 +181,8 @@ let update_unitary unitary =
 
   let ident r k i =
     match Ast0.unwrap i with
-      Ast0.MetaId(name,constraints,_) ->
-       Ast0.rewrap i (Ast0.MetaId(name,constraints,is_unitary name))
+      Ast0.MetaId(name,constraints,seed,_) ->
+       Ast0.rewrap i (Ast0.MetaId(name,constraints,seed,is_unitary name))
     | Ast0.MetaFunc(name,constraints,_) ->
        Ast0.rewrap i (Ast0.MetaFunc(name,constraints,is_unitary name))
     | Ast0.MetaLocalFunc(name,constraints,_) ->
@@ -243,8 +250,8 @@ let do_unitary rules =
       [] -> ([],[])
     | (r::rules) ->
       match r with
-        Ast0.ScriptRule (_,_,_,_)
-      | Ast0.InitialScriptRule (_,_,_) | Ast0.FinalScriptRule (_,_,_) ->
+        Ast0.ScriptRule (_,_,_,_,_,_)
+      | Ast0.InitialScriptRule (_,_,_,_) | Ast0.FinalScriptRule (_,_,_,_) ->
           let (x,rules) = loop rules in
           (x, r::rules)
       | Ast0.CocciRule ((minus,metavars,chosen_isos),((plus,_) as plusz),rt) ->