X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=matita%2Fcomponents%2Fng_extraction%2Fcommon.ml;h=be8f3d968fb5bf0d9cb28198e2bdd49c19c7c739;hb=f31020f1ae14e28c246b6cd9cf91b5864f4f536a;hp=57a27e92b58fa29727eb05c2020420c9fc507643;hpb=95e3387af669e9a9e30dafd4d096c2741fc9041c;p=helm.git diff --git a/matita/components/ng_extraction/common.ml b/matita/components/ng_extraction/common.ml index 57a27e92b..be8f3d968 100644 --- a/matita/components/ng_extraction/common.ml +++ b/matita/components/ng_extraction/common.ml @@ -10,7 +10,7 @@ open Coq open OcamlExtractionTable -open Miniml +(*open Miniml*) open Mlutil (*s Some pretty-print utility functions. *) @@ -32,8 +32,6 @@ let pr_binding = function let fnl () = stras (1000000,"") ++ fnl () -let fnl2 () = fnl () ++ fnl () - let space_if = function true -> str " " | false -> mt () let is_invalid_id s = @@ -43,13 +41,13 @@ let rec lowercase_id id = if id = "" then "x" else if id.[0] = '_' then lowercase_id (String.sub id 1 (String.length id - 1)) else if is_invalid_id id then lowercase_id ("x" ^ id) else - String.uncapitalize id + String.uncapitalize_ascii id let rec uppercase_id id = if id = "" then "T" else if id.[0] = '_' then uppercase_id (String.sub id 1 (String.length id - 1)) else if is_invalid_id id then uppercase_id ("x" ^ id) else - String.capitalize id + String.capitalize_ascii id type kind = Term | Type | Cons @@ -110,7 +108,7 @@ let safe_name_of_reference status r = NUri.name_of_uri uri | _ -> NCicPp.r2s status true r -let maybe_capitalize b n = if b then String.capitalize n else n +let maybe_capitalize b n = if b then String.capitalize_ascii n else n let modname_of_filename status capitalize name = try @@ -118,7 +116,7 @@ let modname_of_filename status capitalize name = status, maybe_capitalize capitalize name with Not_found -> let globs = Idset.elements (get_modnames status) in - let s = next_ident_away (String.uncapitalize name) globs in + let s = next_ident_away (String.uncapitalize_ascii name) globs in let status = add_modname status s in let status = add_modname_for_filename status name s in status, maybe_capitalize capitalize s