Release coccinelle-0.1.9-rc1

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

diff --git a/parsing_cocci/get_constants.ml b/parsing_cocci/get_constants.ml
index e191e32..814e9c1 100644 (file)
--- a/parsing_cocci/get_constants.ml
+++ b/parsing_cocci/get_constants.ml
@@ -83,7 +83,7 @@ let get_minus_constants bind orbind =
        if !Flag.sgrep_mode2
        then
          match ty with
-           (_,_,Ast.MINUS(_,_),_) -> [Ast.unwrap_mcode ty]
+           (_,_,Ast.MINUS(_,_,_,_),_) -> [Ast.unwrap_mcode ty]
          | _ -> []
        else [Ast.unwrap_mcode ty]
     | _ -> k e in
@@ -130,7 +130,7 @@ let get_all_minus_constants =
   let option_default = [] in
   let mcode r (x,_,mcodekind,_) =
     match mcodekind with
-      Ast.MINUS(_,_) -> [x]
+      Ast.MINUS(_,_,_,_) -> [x]
     | _ -> [] in
   let other r (x,_,mcodekind,_) = [] in
 
@@ -156,7 +156,7 @@ let get_plus_constants =
               bind (fn.V.combiner_anything cur) prev))
        [] l in
     match mcodekind with
-      Ast.MINUS(_,anythings) -> recurse anythings
+      Ast.MINUS(_,_,_,anythings) -> recurse anythings
     | Ast.CONTEXT(_,Ast.BEFORE(a)) -> recurse a
     | Ast.CONTEXT(_,Ast.AFTER(a)) -> recurse a
     | Ast.CONTEXT(_,Ast.BEFOREAFTER(a1,a2)) ->
@@ -301,7 +301,9 @@ let get_constants rules =
         (function (rest_info,in_plus) ->
           function r ->
             match r with
-              Ast.ScriptRule (_,mv,deps,_) -> (rest_info, in_plus)
+              Ast.ScriptRule (_,_,_,_)
+           | Ast.InitialScriptRule (_,_) | Ast.FinalScriptRule (_,_) ->
+               (rest_info, in_plus)
             | Ast.CocciRule (nm, (dep,_,_), cur, _, _) ->
                 let (cur_info,cur_plus) = rule_fn cur in_plus in
                let cur_info =