diff options
| author | Jacques-Henri Jourdan <jacques-henri.jourdan@inria.fr> | 2015-11-04 03:04:21 +0100 |
|---|---|---|
| committer | Jacques-Henri Jourdan <jacques-henri.jourdan@inria.fr> | 2015-11-04 03:04:21 +0100 |
| commit | 5664fddcab15ef4482d583673c75e07bd1e96d0a (patch) | |
| tree | 878b22860e69405ba5cf6fd2798731dac8ce660c /tools | |
| parent | b960c83725d7e185ac5c6e3c0d6043c7dcd2f556 (diff) | |
| parent | fe73ed58ef80da7c53c124302a608948fb190229 (diff) | |
| download | compcert-5664fddcab15ef4482d583673c75e07bd1e96d0a.tar.gz compcert-5664fddcab15ef4482d583673c75e07bd1e96d0a.zip | |
Merge remote-tracking branch 'origin/master' into parser_fix
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) |