diff options
author | François Pottier <francois.pottier@inria.fr> | 2015-10-23 15:08:33 +0200 |
---|---|---|
committer | François Pottier <francois.pottier@inria.fr> | 2015-10-23 15:17:50 +0200 |
commit | 136986c204af19341aeb455d72fe817b16fa6fff (patch) | |
tree | 02e9178d9f2cf942bd32366891d480ff161406f6 /tools | |
parent | c46723c0169145d41d1879c236f53314456f1ba1 (diff) | |
parent | 1cb3d93ff278ebbd0c6967c5f9401a97f9b618b4 (diff) | |
download | compcert-136986c204af19341aeb455d72fe817b16fa6fff.tar.gz compcert-136986c204af19341aeb455d72fe817b16fa6fff.zip |
Merge remote branch 'upstream/master' into clean
Conflicts:
Makefile.extr
Diffstat (limited to 'tools')
-rw-r--r-- | tools/ndfun.ml | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tools/ndfun.ml b/tools/ndfun.ml index 4ee07e54..2b8bcb19 100644 --- a/tools/ndfun.ml +++ b/tools/ndfun.ml @@ -33,7 +33,7 @@ let oneline s = let re_trim_1 = Str.regexp "^[ \t]+\\|[ \t]+$" let re_trim_2 = Str.regexp " +" -let trim s = +let trim s = Str.global_replace re_trim_2 " " (Str.global_replace re_trim_1 "" s) (* A nicer interface to Str.match_string, with automatic trimming *) @@ -70,7 +70,7 @@ let re_arg = Str.regexp "\\([a-z][a-z0-9_]*\\)" let match_args args = let n = ref 0 in - let subst s = + let subst s = incr n; sprintf "%s as zz%d" (Str.matched_group 1 s) !n in Str.global_substitute re_arg subst args @@ -78,7 +78,7 @@ let match_args args = let match_temps args = let n = ref 0 in - let subst s = + let subst s = incr n; sprintf "zz%d" !n in Str.global_substitute re_arg subst (remove_commas args) |