From: Jan Tojnar <jtojnar@gmail.com>
To: cocci@inria.fr
Cc: Jan Tojnar <jtojnar@gmail.com>
Subject: [cocci] [PATCH 1/2] engine/postprocess_transinfo.ml: Fix indentation
Date: Sat, 3 Sep 2022 11:38:42 +0200 [thread overview]
Message-ID: <20220903093843.2579539-1-jtojnar@gmail.com> (raw)
Previously, the file mixed tabs and spaces inconsistently,
making viewing diffs annoying.
Let’s replace tabs with eight spaces,
which appears to be the assumed value.
This Separate commit to make the successive diff cleaner.
Signed-off-by: Jan Tojnar <jtojnar@gmail.com>
---
engine/postprocess_transinfo.ml | 172 ++++++++++++++++----------------
1 file changed, 86 insertions(+), 86 deletions(-)
diff --git a/engine/postprocess_transinfo.ml b/engine/postprocess_transinfo.ml
index 5536f09c..2a00b797 100644
--- a/engine/postprocess_transinfo.ml
+++ b/engine/postprocess_transinfo.ml
@@ -51,104 +51,104 @@ let process_tree inherited_env l =
let (all_fresh,local_freshs,new_triples) =
List.fold_left
(function (all_fresh,local_freshs,new_triples) ->
- function (node,env,pred) ->
- let (other,fresh) = get_vars pred in
- let env = List.filter (function (x,_) -> List.mem x other) env in
- (Common.union_set fresh all_fresh,
- fresh::local_freshs,
- (node,env@inherited_env,pred)::new_triples))
+ function (node,env,pred) ->
+ let (other,fresh) = get_vars pred in
+ let env = List.filter (function (x,_) -> List.mem x other) env in
+ (Common.union_set fresh all_fresh,
+ fresh::local_freshs,
+ (node,env@inherited_env,pred)::new_triples))
([],[],[]) l in
let local_freshs = List.rev local_freshs in
let new_triples = List.rev new_triples in
let fresh_env =
List.map
(function
- ((r,n) as fresh,Ast.NoVal) ->
- Printf.printf "%s: name for %s: " r n; (* not debugging code!!! *)
- flush stdout;
- (fresh,let v = string2val(read_fresh_id()) in function _ -> v)
- | ((r,n) as fresh,Ast.StringSeed seed) ->
- (fresh,let v = string2val(get_seeded seed) in function _ -> v)
- | ((r,n) as fresh,Ast.ListSeed seed) ->
- (fresh,
- function env ->
- let strings =
- List.map
- (function
- Ast.SeedString s -> s
- | Ast.SeedId id ->
- try
- (match List.assoc id env with
- Lib_engine.NormalMetaVal(Ast_c.MetaIdVal str) ->
- str
- | _ -> failwith "bad id value")
- with
- Not_found ->
- failwith
- ("fresh: no binding for meta "^(Dumper.dump id)))
- seed in
- string2val(String.concat "" strings))
+ ((r,n) as fresh,Ast.NoVal) ->
+ Printf.printf "%s: name for %s: " r n; (* not debugging code!!! *)
+ flush stdout;
+ (fresh,let v = string2val(read_fresh_id()) in function _ -> v)
+ | ((r,n) as fresh,Ast.StringSeed seed) ->
+ (fresh,let v = string2val(get_seeded seed) in function _ -> v)
+ | ((r,n) as fresh,Ast.ListSeed seed) ->
+ (fresh,
+ function env ->
+ let strings =
+ List.map
+ (function
+ Ast.SeedString s -> s
+ | Ast.SeedId id ->
+ try
+ (match List.assoc id env with
+ Lib_engine.NormalMetaVal(Ast_c.MetaIdVal str) ->
+ str
+ | _ -> failwith "bad id value")
+ with
+ Not_found ->
+ failwith
+ ("fresh: no binding for meta "^(Dumper.dump id)))
+ seed in
+ string2val(String.concat "" strings))
| ((r, n) as fresh, Ast.ScriptSeed(name, lang, params, pos, body)) ->
- let res = ref None in
+ let res = ref None in
let make_fresh_id env =
- match !res with
- Some x -> x
- | None ->
- let args =
+ match !res with
+ Some x -> x
+ | None ->
+ let args =
List.map
(fun (((rule, name) as meta_name), _) ->
- try match List.assoc meta_name env with
- | Lib_engine.NormalMetaVal v -> (meta_name, v)
- | _ ->
+ try match List.assoc meta_name env with
+ | Lib_engine.NormalMetaVal v -> (meta_name, v)
+ | _ ->
failwith
(Printf.sprintf
- "Undesired metavar_binding in line %d"
- (snd pos))
- with
- | Not_found ->
+ "Undesired metavar_binding in line %d"
+ (snd pos))
+ with
+ | Not_found ->
let get_meta_names l =
List.map
- (fun (mn, _) -> Ast.string_of_meta_name mn)
- l in
+ (fun (mn, _) -> Ast.string_of_meta_name mn)
+ l in
let string_of_list l =
"[" ^ String.concat "; " l ^ "]" in
failwith
(Printf.sprintf
- "%s: script on variable %s cannot be evaluated in line %d. available: %s\nwanted: %s"
- r n (snd pos)
- (string_of_list (get_meta_names env))
- (string_of_list (get_meta_names params)))
- )
+ "%s: script on variable %s cannot be evaluated in line %d. available: %s\nwanted: %s"
+ r n (snd pos)
+ (string_of_list (get_meta_names env))
+ (string_of_list (get_meta_names params)))
+ )
params in
- let args = (fresh, Ast_c.MetaIdVal n)::args in
- let fresh_id =
+ let args = (fresh, Ast_c.MetaIdVal n)::args in
+ let fresh_id =
match lang with
| "ocaml" ->
- Run_ocamlcocci.run_fresh_id name (List.map snd args)
+ Run_ocamlcocci.run_fresh_id name (List.map snd args)
| "python" -> Pycocci.run_fresh_id args pos body
| _ ->
- failwith
- "languages other than ocaml or python not supported" in
- let r = string2val fresh_id in
- res := Some r;
- r in
+ failwith
+ "languages other than ocaml or python not supported" in
+ let r = string2val fresh_id in
+ res := Some r;
+ r in
(fresh, make_fresh_id)
)
all_fresh in
let (_,res) =
List.split
(List.fold_left
- (function freshs_node_env_preds ->
- function (fresh,fn) ->
- List.map
- (function (freshs,((node,env,pred) as cur)) ->
- try
- let _ = List.assoc fresh freshs in
- (freshs,(node,(fresh,fn env)::env,pred))
- with Not_found -> (freshs,cur))
- freshs_node_env_preds)
- (List.combine local_freshs new_triples)
- fresh_env) in
+ (function freshs_node_env_preds ->
+ function (fresh,fn) ->
+ List.map
+ (function (freshs,((node,env,pred) as cur)) ->
+ try
+ let _ = List.assoc fresh freshs in
+ (freshs,(node,(fresh,fn env)::env,pred))
+ with Not_found -> (freshs,cur))
+ freshs_node_env_preds)
+ (List.combine local_freshs new_triples)
+ fresh_env) in
(List.rev res, fresh_env)
(* ----------------------------------------------------------------------- *)
@@ -161,16 +161,16 @@ let collect_used_after used_after envs l inherited_env =
List.map2
(function env -> function l ->
let inherited_env =
- match l with
- [] -> inherited_env
- | (_,fse,_)::_ ->
- (* l represents the result from a single tree. fse is a complete
- environment in that tree. for a fresh seed, the environments
- for all leaves contain the same information *)
- fse@inherited_env in
+ match l with
+ [] -> inherited_env
+ | (_,fse,_)::_ ->
+ (* l represents the result from a single tree. fse is a complete
+ environment in that tree. for a fresh seed, the environments
+ for all leaves contain the same information *)
+ fse@inherited_env in
List.map
- (function (v,vl) -> (v,vl inherited_env))
- (List.filter (function (v,vl) -> List.mem v used_after) env))
+ (function (v,vl) -> (v,vl inherited_env))
+ (List.filter (function (v,vl) -> List.mem v used_after) env))
envs l
(* ----------------------------------------------------------------------- *)
@@ -183,24 +183,24 @@ let fold_left_with_index f acc =
let rec fold_lwi_aux acc = function
| [] -> acc
| x::xs ->
- let n = !index in
- index := !index + 1;
- fold_lwi_aux (f acc x n) xs
+ let n = !index in
+ index := !index + 1;
+ fold_lwi_aux (f acc x n) xs
in fold_lwi_aux acc
let numberify trees =
let trees =
fold_left_with_index
(function acc -> function xs -> function n ->
- (List.map (function x -> (n,x)) xs) @ acc)
+ (List.map (function x -> (n,x)) xs) @ acc)
[] trees in
List.fold_left
(function res ->
function (n,x) ->
- let (same,diff) = List.partition (function (ns,xs) -> x = xs) res in
- match same with
- [(ns,xs)] -> (n::ns,xs)::diff
- | _ -> ([n],x)::res)
+ let (same,diff) = List.partition (function (ns,xs) -> x = xs) res in
+ match same with
+ [(ns,xs)] -> (n::ns,xs)::diff
+ | _ -> ([n],x)::res)
[] trees
(* ----------------------------------------------------------------------- *)
--
2.37.2
next reply other threads:[~2022-09-03 9:39 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-09-03 9:38 Jan Tojnar [this message]
2022-09-03 9:38 ` [cocci] [PATCH 2/2] Distinguish script-based fresh ids with differing args Jan Tojnar
2022-10-22 12:44 ` Jan Tojnar
2022-10-22 12:46 ` Julia Lawall
2022-10-22 12:56 ` Jan Tojnar
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220903093843.2579539-1-jtojnar@gmail.com \
--to=jtojnar@gmail.com \
--cc=cocci@inria.fr \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).