diff options
| author | Pierre Letouzey | 2014-05-05 18:54:09 +0200 |
|---|---|---|
| committer | Pierre Letouzey | 2015-01-11 09:49:32 +0100 |
| commit | e135bbb71b0e496c016aa89701bd4050cba49f5e (patch) | |
| tree | 520565c1ceb2719d2d07b771591be363b150f59f /lib | |
| parent | 063fbe9077e6b75f327dd105774c3b3b77bda5c9 (diff) | |
Extraction: no more ascii blob in type variables (fix #3227)
Since type variables are local to the definition, we simply rename
them in case of unicode chars. We also get rid of any ' to avoid
Ocaml illegal 'a' type var (clash with char litteral).
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/unicode.ml | 12 | ||||
| -rw-r--r-- | lib/unicode.mli | 1 |
2 files changed, 7 insertions, 6 deletions
diff --git a/lib/unicode.ml b/lib/unicode.ml index 0764531c1a..1765e93dcd 100644 --- a/lib/unicode.ml +++ b/lib/unicode.ml @@ -222,13 +222,13 @@ let lowercase_first_char s = (** For extraction, we need to encode unicode character into ascii ones *) +let is_basic_ascii s = + let ok = ref true in + String.iter (fun c -> if Char.code c >= 128 then ok := false) s; + !ok + let ascii_of_ident s = - let check_ascii s = - let ok = ref true in - String.iter (fun c -> if Char.code c >= 128 then ok := false) s; - !ok - in - if check_ascii s then s else + if is_basic_ascii s then s else let i = ref 0 and out = ref "" in begin try while true do let j, n = next_utf8 s !i in diff --git a/lib/unicode.mli b/lib/unicode.mli index 763123306f..2c6b0a7963 100644 --- a/lib/unicode.mli +++ b/lib/unicode.mli @@ -24,4 +24,5 @@ val ident_refutation : string -> (bool * string) option val lowercase_first_char : string -> string (** For extraction, turn a unicode string into an ascii-only one *) +val is_basic_ascii : string -> bool val ascii_of_ident : string -> string |