ocaml 3.09 transition

[helm.git] / helm / ocaml / cic_disambiguation / disambiguatePp.ml

diff --git a/helm/ocaml/cic_disambiguation/disambiguatePp.ml b/helm/ocaml/cic_disambiguation/disambiguatePp.ml
index b7c1012a8dc68474e2515f567320f82a4c7bbe8d..c3a48e409e885a767b4b6441d942ebff86baeab5 100644 (file)
--- a/helm/ocaml/cic_disambiguation/disambiguatePp.ml
+++ b/helm/ocaml/cic_disambiguation/disambiguatePp.ml
@@ -26,7 +26,7 @@
 open DisambiguateTypes
 
 let parse_environment str =
- let stream = Stream.of_string str in
+ let stream = Ulexing.from_utf8_string str in
  let environment = ref Environment.empty in
  let multiple_environment = ref Environment.empty in
   try
@@ -57,22 +57,23 @@ let parse_environment str =
   with End_of_file ->
    !environment, !multiple_environment
 
+let alias_of_domain_and_codomain_items domain_item (dsc,_) =
+ match domain_item with
+    Id id -> GrafiteAst.Ident_alias (id, dsc)
+  | Symbol (symb, i) -> GrafiteAst.Symbol_alias (symb, i, dsc)
+  | Num i -> GrafiteAst.Number_alias (i, dsc)
+
 let aliases_of_environment env =
   Environment.fold
-    (fun domain_item (dsc,_) acc ->
-      let s =
-        match domain_item with
-        | Id id -> GrafiteAst.Ident_alias (id, dsc)
-        | Symbol (symb, i) -> GrafiteAst.Symbol_alias (symb, i, dsc)
-        | Num i -> GrafiteAst.Number_alias (i, dsc)
-      in
-       s :: acc)
-    env []
+    (fun domain_item codomain_item acc ->
+      alias_of_domain_and_codomain_items domain_item codomain_item::acc
+    ) env []
 
-let commands_of_environment env =
-  List.map
-    (fun alias -> GrafiteAst.Alias (dummy_floc, alias))
-    (aliases_of_environment env)
+let aliases_of_domain_and_codomain_items_list l =
+  List.fold_left
+    (fun acc (domain_item,codomain_item) ->
+      alias_of_domain_and_codomain_items domain_item codomain_item::acc
+    ) [] l
 
 let pp_environment env =
   let aliases = aliases_of_environment env in
@@ -80,4 +81,3 @@ let pp_environment env =
     List.map (fun alias -> GrafiteAstPp.pp_alias alias ^ ".") aliases
   in
   String.concat "\n" (List.sort compare strings)
-