(*
-* Copyright 2005-2009, Ecole des Mines de Nantes, University of Copenhagen
-* Yoann Padioleau, Julia Lawall, Rene Rydhof Hansen, Henrik Stuart, Gilles Muller
-* This file is part of Coccinelle.
-*
-* Coccinelle is free software: you can redistribute it and/or modify
-* it under the terms of the GNU General Public License as published by
-* the Free Software Foundation, according to version 2 of the License.
-*
-* Coccinelle is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-* GNU General Public License for more details.
-*
-* You should have received a copy of the GNU General Public License
-* along with Coccinelle. If not, see <http://www.gnu.org/licenses/>.
-*
-* The authors reserve the right to distribute this or future versions of
-* Coccinelle under other licenses.
-*)
-
-
+ * 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.
+ *
+ * Coccinelle is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, according to version 2 of the License.
+ *
+ * Coccinelle is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Coccinelle. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * The authors reserve the right to distribute this or future versions of
+ * Coccinelle under other licenses.
+ *)
+
+
+# 0 "./unitary_ast0.ml"
(* find unitary metavariables *)
module Ast0 = Ast0_cocci
module Ast = Ast_cocci
(* take only what is in the plus code *)
let plus_checker (nm,_,_,mc,_,_) =
- match mc with Ast0.PLUS -> [nm] | _ -> []
+ match mc with Ast0.PLUS _ -> [nm] | _ -> []
let get_free checker t =
let bind x y = x @ y in
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 =
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
+ let case_line r k c =
+ match Ast0.unwrap c with
+ Ast0.DisjCase(starter,case_lines,mids,ender) ->
+ detect_unitary_frees(List.map r.VT0.combiner_rec_case_line case_lines)
+ | _ -> k c in
+
let statement r k s =
match Ast0.unwrap s with
Ast0.MetaStmt(name,_) | Ast0.MetaStmtList(name,_) -> checker name
(detect_unitary_frees
(List.map
(whencode
- r.VT0.combiner_rec_statement_dots
+ r.VT0.combiner_rec_statement_dots
r.VT0.combiner_rec_statement
r.VT0.combiner_rec_expression)
whn))
VT0.combiner_tyfn = typeC;
VT0.combiner_paramfn = parameter;
VT0.combiner_declfn = declaration;
- VT0.combiner_stmtfn = statement} in
+ VT0.combiner_stmtfn = statement;
+ VT0.combiner_casefn = case_line} in
collect_unitary_nonunitary
(List.concat (List.map res.VT0.combiner_rec_top_level t))
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,_) ->
[] -> ([],[])
| (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) ->