type combine =
And of combine list | Or of combine list | Elem of string | False | True
+(* glimpse often fails on large queries. We can safely remove arguments of
+&& as long as we don't remove all of them (note that there is no negation).
+This tries just removing one of them and then orders the results by
+increasing number of ors (ors are long, increasing the chance of failure,
+and are less restrictive, possibly increasing the chance of irrelevant
+code. *)
+let reduce_glimpse x =
+ let rec loop x k q =
+ match x with
+ Elem _ -> q()
+ | And [x] -> loop x (function changed_l -> k (And [changed_l])) q
+ | And l ->
+ kloop l
+ (function changed_l -> k (And changed_l))
+ (function _ ->
+ let rec rloop l k =
+ match l with
+ [] -> q()
+ | x::xs ->
+ (k xs) ::
+ rloop xs (function changed_xs -> k (x :: changed_xs)) in
+ rloop l (function changed_l -> k (And changed_l)))
+ | Or l -> kloop l (function changed_l -> k (Or changed_l)) q
+ | _ -> failwith "not possible"
+ and kloop l k q =
+ match l with
+ [] -> q()
+ | x::xs ->
+ loop x
+ (function changed_x -> k (changed_x::xs))
+ (function _ ->
+ kloop xs
+ (function changed_xs -> k (x :: changed_xs))
+ q) in
+ let rec count_ors = function
+ Elem _ -> 0
+ | And l -> List.fold_left (+) 0 (List.map count_ors l)
+ | Or l ->
+ ((List.length l) - 1) +
+ (List.fold_left (+) 0 (List.map count_ors l))
+ | _ -> failwith "not possible" in
+ let res = loop x (function x -> x) (function _ -> []) in
+ let res = List.map (function x -> (count_ors x,x)) res in
+ let res = List.sort compare res in
+ List.map (function (_,x) -> x) res
+
let interpret_glimpse strict x =
let rec loop = function
Elem x -> x
True -> None
| False when strict ->
failwith "False should not be in the final result. Perhaps your rule doesn't contain any +/-/* code"
- | _ -> Some [(loop x)]
+ | _ ->
+ Some (if strict then List.map loop (x::reduce_glimpse x) else [loop x])
(* grep only does or *)
let interpret_grep strict x =
| TC.MetaType(tyname,_,_) ->
inherited tyname
| TC.TypeName(s) -> constants s
- | TC.EnumName(false,s) -> constants s
- | TC.StructUnionName(_,false,s) -> constants s
+ | TC.EnumName(TC.Name s) -> constants s
+ | TC.StructUnionName(_,TC.Name s) -> constants s
| ty -> res in
(* no point to do anything special for records because glimpse is
bind (k e) (bind (minherited name) types)
| Ast.MetaErr(name,_,_,_) | Ast.MetaExpr(name,_,_,_,_,_) ->
bind (k e) (minherited name)
- | Ast.MetaExprList(name,None,_,_) -> minherited name
- | Ast.MetaExprList(name,Some (lenname,_,_),_,_) ->
+ | Ast.MetaExprList(name,Ast.MetaListLen (lenname,_,_),_,_) ->
bind (k e) (bind (minherited name) (minherited lenname))
+ | Ast.MetaExprList(name,_,_,_) -> minherited name
| Ast.SizeOfExpr(sizeof,exp) -> bind (keywords "sizeof") (k e)
| Ast.SizeOfType(sizeof,lp,ty,rp) -> bind (keywords "sizeof") (k e)
| Ast.NestExpr(starter,expr_dots,ender,wc,false) -> option_default
| Ast.IntType -> keywords "int "
| Ast.DoubleType -> keywords "double "
| Ast.FloatType -> keywords "float "
- | Ast.LongType | Ast.LongLongType -> keywords "long " in
+ | Ast.LongType | Ast.LongLongType -> keywords "long "
+ | Ast.SizeType -> keywords "size_t "
+ | Ast.SSizeType -> keywords "ssize_t "
+ | Ast.PtrDiffType -> keywords "ptrdiff_t " in
let typeC r k ty =
match Ast.unwrap ty with
let declaration r k d =
match Ast.unwrap d with
- Ast.DisjDecl(decls) ->
+ Ast.MetaDecl(name,_,_) | Ast.MetaField(name,_,_) ->
+ bind (k d) (minherited name)
+ | Ast.DisjDecl(decls) ->
disj_union_all (List.map r.V.combiner_declaration decls)
| Ast.OptDecl(decl) -> option_default
| Ast.Ddots(dots,whencode) -> option_default
match Ast.unwrap p with
Ast.OptParam(param) -> option_default
| Ast.MetaParam(name,_,_) -> bind (k p) (minherited name)
- | Ast.MetaParamList(name,None,_,_) -> bind (k p) (minherited name)
- | Ast.MetaParamList(name,Some(lenname,_,_),_,_) ->
+ | Ast.MetaParamList(name,Ast.MetaListLen(lenname,_,_),_,_) ->
bind (minherited name) (bind (minherited lenname) (k p))
+ | Ast.MetaParamList(name,_,_,_) -> bind (k p) (minherited name)
| _ -> k p in
let rule_elem r k re =
V.combiner bind option_default
mcode mcode mcode mcode mcode mcode mcode mcode mcode mcode mcode mcode
- donothing donothing donothing donothing
+ donothing donothing donothing donothing donothing
ident expression fullType typeC initialiser parameter declaration
rule_elem statement donothing donothing donothing
V.combiner bind option_default
other mcode other other other other other other other other other other
- donothing donothing donothing donothing
+ donothing donothing donothing donothing donothing
donothing donothing donothing donothing donothing donothing donothing
donothing donothing donothing donothing donothing
V.combiner bind option_default
mcode mcode mcode mcode mcode mcode mcode mcode mcode mcode mcode mcode
- donothing donothing donothing donothing
+ donothing donothing donothing donothing donothing
donothing donothing donothing donothing donothing donothing donothing
rule_elem statement donothing donothing donothing
let initialiser r k e =
match Ast.unwrap e with
- Ast.InitList(all_minus,_,_,_,_) ->
+ Ast.StrInitList(all_minus,_,_,_,_) ->
not all_minus && k e
| _ -> k e in
V.combiner bind option_default
mcode mcode mcode mcode mcode mcode mcode mcode mcode mcode mcode mcode
- donothing donothing donothing donothing
+ donothing donothing donothing donothing donothing
donothing donothing donothing donothing initialiser donothing
donothing rule_elem statement donothing donothing donothing
List.fold_left
(function (rest_info,in_plus,env,locals(*dom of env*)) ->
function
- (Ast.ScriptRule (_,deps,mv,_),_) ->
+ (Ast.ScriptRule (nm,_,deps,mv,_,_),_) ->
let extra_deps =
List.fold_left
(function prev ->
- function (_,(rule,_)) ->
+ function (_,(rule,_),_) ->
if rule = "virtual"
then prev
else Ast.AndDep (Ast.Dep rule,prev))
deps mv in
(match dependencies env extra_deps with
- False -> (rest_info, in_plus, env, locals)
+ False -> (rest_info, in_plus, (nm,True)::env, nm::locals)
| dependencies ->
(build_or dependencies rest_info, in_plus, env, locals))
- | (Ast.InitialScriptRule (_,deps,_),_)
- | (Ast.FinalScriptRule (_,deps,_),_) ->
+ | (Ast.InitialScriptRule (_,_,deps,_),_)
+ | (Ast.FinalScriptRule (_,_,deps,_),_) ->
(* initialize and finalize dependencies are irrelevant to
get_constants *)
(rest_info, in_plus, env, locals)
let get_constants rules neg_pos_vars =
match !Flag.scanner with
- Flag.NoScanner -> (None,None)
+ Flag.NoScanner -> (None,None,None)
| Flag.Grep ->
let res = run rules neg_pos_vars in
- (interpret_grep true res,None)
+ (interpret_grep true res,None,None)
| Flag.Glimpse ->
let res = run rules neg_pos_vars in
- (interpret_grep true res,interpret_glimpse true res)
+ (interpret_grep true res,interpret_glimpse true res,None)
| Flag.Google _ ->
let res = run rules neg_pos_vars in
- (interpret_grep true res,interpret_google true res)
+ (interpret_grep true res,interpret_google true res,None)
+ | Flag.IdUtils ->
+ let res = run rules neg_pos_vars in
+ (interpret_grep true res,None,Some res)
HCoop / bpt / coccinelle.git / blobdiff