type idinfo = Ast.meta_name * Data.iconstraints * Ast0.pure * Data.clt
type expinfo = Ast.meta_name * Data.econstraints * Ast0.pure * Data.clt
type tyinfo = Ast.meta_name * Ast0.typeC list * Ast0.pure * Data.clt
-type list_info = Ast.meta_name * Ast.meta_name option * Ast0.pure * Data.clt
+type list_info = Ast.meta_name * Ast.list_len * Ast0.pure * Data.clt
type typed_expinfo =
Ast.meta_name * Data.econstraints * Ast0.pure *
Type_cocci.typeC list option * Data.clt
| ("...",Some [w]) -> Ast0.wrap(Ast0.Ddots(clt2mcode str dot, Some w))
| _ -> failwith "cannot happen"
+let mkddots_one str (dot,whencode) =
+ match str with
+ "..." -> Ast0.wrap(Ast0.Ddots(clt2mcode str dot, whencode))
+ | _ -> failwith "cannot happen"
+
let mkpdots str dot =
match str with
"..." -> Ast0.wrap(Ast0.Pdots(clt2mcode str dot))
(function inner -> function cur -> Type_cocci.Pointer(inner))
ty m
+let arrayify ty ar =
+ List.fold_right
+ (function (l,i,r) ->
+ function rest ->
+ Ast0.wrap (Ast0.Array(rest,clt2mcode "[" l,i,clt2mcode "]" r)))
+ ar ty
+
(* Left is <=>, Right is =>. Collect <=>s. *)
(* The parser should have done this, with precedences. But whatever... *)
let iso_adjust first_fn fn first rest =
front::after -> (first_fn first::front)::after
| _ -> failwith "not possible"
-let check_meta_tyopt type_irrelevant tok =
- let lookup rule name =
- try
- let info = Hashtbl.find Data.all_metadecls rule in
- List.find (function mv -> Ast.get_meta_name mv = (rule,name)) info
- with
- Not_found ->
- raise
- (Semantic_cocci.Semantic
- ("bad rule "^rule^" or bad variable "^name)) in
- match tok with
- Ast.MetaIdDecl(Ast.NONE,(rule,name)) ->
+let lookup rule name =
+ try
+ let info = Hashtbl.find Data.all_metadecls rule in
+ List.find (function mv -> Ast.get_meta_name mv = (rule,name)) info
+ with
+ Not_found ->
+ raise
+ (Semantic_cocci.Semantic("bad rule "^rule^" or bad variable "^name))
+
+let check_meta_tyopt type_irrelevant = function
+ Ast.MetaMetaDecl(Ast.NONE,(rule,name)) ->
+ (match lookup rule name with
+ Ast.MetaMetaDecl(_,_) -> ()
+ | _ ->
+ raise
+ (Semantic_cocci.Semantic
+ ("incompatible inheritance declaration "^name)))
+ | Ast.MetaIdDecl(Ast.NONE,(rule,name)) ->
(match lookup rule name with
Ast.MetaIdDecl(_,_) | Ast.MetaFreshIdDecl(_,_) -> ()
| _ ->
ids)
let create_len_metadec ar ispure kindfn lenid ids current_rule =
- let lendec =
- create_metadec Ast.NONE Ast0.Impure
- (fun _ name _ check_meta -> check_meta(Ast.MetaListlenDecl(name)))
- [lenid] current_rule in
- let lenname =
- match lendec with
- [Common.Left (Ast.MetaListlenDecl(x))] -> x
- | [Common.Right (Ast.MetaListlenDecl(x))] -> x
- | _ -> failwith "unexpected length declaration" in
+ let (lendec,lenname) =
+ match lenid with
+ Common.Left lenid ->
+ let lendec =
+ create_metadec Ast.NONE Ast0.Impure
+ (fun _ name _ check_meta -> check_meta(Ast.MetaListlenDecl(name)))
+ [lenid] current_rule in
+ let lenname =
+ match lendec with
+ [Common.Left (Ast.MetaListlenDecl(x))] -> Ast.MetaLen x
+ | [Common.Right (Ast.MetaListlenDecl(x))] -> Ast.MetaLen x
+ | _ -> failwith "unexpected length declaration" in
+ (lendec,lenname)
+ | Common.Right n -> ([],Ast.CstLen n) in
lendec@(create_metadec ar ispure (kindfn lenname) ids current_rule)
(* ---------------------------------------------------------------------- *)
List.map (function "..." -> Ast.IncDots | s -> Ast.IncPath s) elements
(* ---------------------------------------------------------------------- *)
-(* statements *)
+(* declarations and statements *)
+
+let meta_decl name =
+ let (nm,pure,clt) = name in
+ Ast0.wrap(Ast0.MetaDecl(clt2mcode nm clt,pure))
+
+let meta_field name =
+ let (nm,pure,clt) = name in
+ Ast0.wrap(Ast0.MetaField(clt2mcode nm clt,pure))
+
+let meta_field_list name =
+ let (nm,lenname,pure,clt) = name in
+ let lenname =
+ match lenname with
+ Ast.AnyLen -> Ast0.AnyListLen
+ | Ast.MetaLen nm -> Ast0.MetaListLen(clt2mcode nm clt)
+ | Ast.CstLen n -> Ast0.CstListLen n in
+ Ast0.wrap(Ast0.MetaFieldList(clt2mcode nm clt,lenname,pure))
let meta_stm name =
let (nm,pure,clt) = name in
(* ---------------------------------------------------------------------- *)
-let make_iso_rule_name_result n =
- (try let _ = Hashtbl.find Data.all_metadecls n in
- raise (Semantic_cocci.Semantic ("repeated rule name"))
- with Not_found -> ());
- Ast.CocciRulename (Some n,Ast.NoDep,[],[],Ast.Undetermined,false (*discarded*))
-
-let make_cocci_rule_name_result nm d i a e ee =
- match nm with
+let check_rule_name = function
Some nm ->
let n = id2name nm in
(try let _ = Hashtbl.find Data.all_metadecls n in
raise (Semantic_cocci.Semantic ("repeated rule name"))
- with Not_found -> ());
- Ast.CocciRulename (Some n,d,i,a,e,ee)
- | None -> Ast.CocciRulename (None,d,i,a,e,ee)
+ with Not_found -> Some n)
+ | None -> None
+
+let make_iso_rule_name_result n =
+ (try let _ = Hashtbl.find Data.all_metadecls n in
+ raise (Semantic_cocci.Semantic ("repeated rule name"))
+ with Not_found -> ());
+ Ast.CocciRulename
+ (Some n,Ast.NoDep,[],[],Ast.Undetermined,false (*discarded*))
+
+let make_cocci_rule_name_result nm d i a e ee =
+ Ast.CocciRulename (check_rule_name nm,d,i,a,e,ee)
let make_generated_rule_name_result nm d i a e ee =
- match nm with
- Some nm ->
- let n = id2name nm in
- (try let _ = Hashtbl.find Data.all_metadecls n in
- raise (Semantic_cocci.Semantic ("repeated rule name"))
- with Not_found -> ());
- Ast.GeneratedRulename (Some n,d,i,a,e,ee)
- | None -> Ast.GeneratedRulename (None,d,i,a,e,ee)
+ Ast.GeneratedRulename (check_rule_name nm,d,i,a,e,ee)
-let make_script_rule_name_result lang deps =
+let make_script_rule_name_result lang nm deps =
let l = id2name lang in
- Ast.ScriptRulename (l,deps)
+ Ast.ScriptRulename (check_rule_name nm,l,deps)
let make_initial_script_rule_name_result lang deps =
let l = id2name lang in
- Ast.InitialScriptRulename(l,deps)
+ Ast.InitialScriptRulename(None,l,deps)
let make_final_script_rule_name_result lang deps =
let l = id2name lang in
- Ast.FinalScriptRulename(l,deps)
+ Ast.FinalScriptRulename(None,l,deps)
(* Allows type alone only when it is void and only when there is only one
parameter. This avoids ambiguity problems in the parser. *)
(Ast0.get_line t))
| _ -> ())
l
+
+(* ---------------------------------------------------------------------- *)
+(* decide whether an init list is ordered or unordered *)
+
+let struct_initializer initlist =
+ let rec loop i =
+ match Ast0.unwrap i with
+ Ast0.InitGccExt _ -> true
+ | Ast0.InitGccName _ -> true
+ | Ast0.OptIni i | Ast0.UniqueIni i -> loop i
+ | Ast0.MetaInit _ -> true (* ambiguous... *)
+ | _ -> false in
+ let l = Ast0.undots initlist in
+ (l = []) or (List.exists loop l)
+
+let drop_dot_commas initlist =
+ match Ast0.unwrap initlist with
+ Ast0.DOTS(l) ->
+ let rec loop after_comma = function
+ [] -> []
+ | x::xs ->
+ (match Ast0.unwrap x with
+ Ast0.Idots(dots,whencode) -> x :: (loop true xs)
+ | Ast0.IComma(comma) when after_comma -> (*drop*) loop false xs
+ | _ -> x :: (loop false xs)) in
+ Ast0.rewrap initlist (Ast0.DOTS(loop false l))
+ | _ -> failwith "not supported"
HCoop / bpt / coccinelle.git / blobdiff