Environment replaced by lists of domain and codomain items.

diff --git a/helm/ocaml/cic_disambiguation/disambiguatePp.ml b/helm/ocaml/cic_disambiguation/disambiguatePp.ml
index 4bf917bb8a9a4e5a2f757884d7484dd2690936c3..1f25e1f95ea6860044eb4d421c91b949cf2ed9ee 100644 (file)
--- a/helm/ocaml/cic_disambiguation/disambiguatePp.ml
+++ b/helm/ocaml/cic_disambiguation/disambiguatePp.ml
@@ -57,22 +57,28 @@ 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 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 commands_of_environment env =
+let commands_of_domain_and_codomain_items_list l =
   List.map
     (fun alias -> GrafiteAst.Alias (dummy_floc, alias))
-    (aliases_of_environment env)
+    (aliases_of_domain_and_codomain_items_list l)
 
 let pp_environment env =
   let aliases = aliases_of_environment env in
@@ -80,4 +86,3 @@ let pp_environment env =
     List.map (fun alias -> GrafiteAstPp.pp_alias alias ^ ".") aliases
   in
   String.concat "\n" (List.sort compare strings)
-

diff --git a/helm/ocaml/cic_disambiguation/disambiguatePp.mli b/helm/ocaml/cic_disambiguation/disambiguatePp.mli
index e5a656d22998ce045678517a3d93a00343162712..9c3b506619af230cd21866a942a9bbc77eba81d2 100644 (file)
--- a/helm/ocaml/cic_disambiguation/disambiguatePp.mli
+++ b/helm/ocaml/cic_disambiguation/disambiguatePp.mli
@@ -27,8 +27,8 @@ val parse_environment:
   string ->
    DisambiguateTypes.environment * DisambiguateTypes.multiple_environment
 
-val commands_of_environment:
-  DisambiguateTypes.environment ->
-    (CicNotationPt.term, GrafiteAst.obj) GrafiteAst.command list
+val commands_of_domain_and_codomain_items_list:
+ (DisambiguateTypes.domain_item * DisambiguateTypes.codomain_item) list ->
+  (CicNotationPt.term, GrafiteAst.obj) GrafiteAst.command list
 
 val pp_environment: DisambiguateTypes.environment -> string