ocaml 3.09 transition

[helm.git] / helm / ocaml / cic_notation / cicNotationEnv.ml

diff --git a/helm/ocaml/cic_notation/cicNotationEnv.ml b/helm/ocaml/cic_notation/cicNotationEnv.ml
index 749e9148b979e7d7a137fef76f4968f556767afb..62212f92fba871d7462d1b3ac80bb13d0574a193 100644 (file)
--- a/helm/ocaml/cic_notation/cicNotationEnv.ml
+++ b/helm/ocaml/cic_notation/cicNotationEnv.ml
@@ -23,12 +23,10 @@
  * http://helm.cs.unibo.it/
  *)
 
-open CicNotationPt
-
-exception Value_not_found of string
+module Ast = CicNotationPt
 
 type value =
-  | TermValue of term
+  | TermValue of Ast.term
   | StringValue of string
   | NumValue of string
   | OptValue of value option
@@ -41,31 +39,52 @@ type value_type =
   | OptType of value_type
   | ListType of value_type
 
+exception Value_not_found of string
+exception Type_mismatch of string * value_type
+
 type declaration = string * value_type
 type binding = string * (value_type * value)
-type t = (string * (value_type * value)) list
+type t = binding list
+
+let lookup env name =
+  try
+    List.assoc name env
+  with Not_found -> raise (Value_not_found name)
 
 let lookup_value env name =
   try
     snd (List.assoc name env)
   with Not_found -> raise (Value_not_found name)
 
-let remove env name = List.remove_assoc name env
+let remove_name env name = List.remove_assoc name env
+
+let remove_names env names =
+  List.filter (fun name, _ -> not (List.mem name names)) env
 
 let lookup_term env name =
-  match lookup_value env name with
-  | TermValue x -> x
-  | _ -> raise (Value_not_found name)
+  match lookup env name with
+  | _, TermValue x -> x
+  | ty, _ -> raise (Type_mismatch (name, ty))
 
 let lookup_num env name =
-  match lookup_value env name with
-  | NumValue x -> x
-  | _ -> raise (Value_not_found name)
+  match lookup env name with
+  | _, NumValue x -> x
+  | ty, _ -> raise (Type_mismatch (name, ty))
 
 let lookup_string env name =
-  match lookup_value env name with
-  | StringValue x -> x
-  | _ -> raise (Value_not_found name)
+  match lookup env name with
+  | _, StringValue x -> x
+  | ty, _ -> raise (Type_mismatch (name, ty))
+
+let lookup_opt env name =
+  match lookup env name with
+  | _, OptValue x -> x
+  | ty, _ -> raise (Type_mismatch (name, ty))
+
+let lookup_list env name =
+  match lookup env name with
+  | _, ListValue x -> x
+  | ty, _ -> raise (Type_mismatch (name, ty))
 
 let opt_binding_some (n, (ty, v)) = (n, (OptType ty, OptValue (Some v)))
 let opt_binding_none (n, (ty, v)) = (n, (OptType ty, OptValue None))
@@ -75,19 +94,19 @@ let opt_declaration (n, ty) = (n, OptType ty)
 let list_declaration (n, ty) = (n, ListType ty)
 
 let declaration_of_var = function
-  | NumVar s -> s, NumType
-  | IdentVar s -> s, StringType
-  | TermVar s -> s, TermType
+  | Ast.NumVar s -> s, NumType
+  | Ast.IdentVar s -> s, StringType
+  | Ast.TermVar s -> s, TermType
   | _ -> assert false
 
 let value_of_term = function
-  | Num (s, _) -> NumValue s
-  | Ident (s, None) -> StringValue s
+  | Ast.Num (s, _) -> NumValue s
+  | Ast.Ident (s, None) -> StringValue s
   | t -> TermValue t
 
 let term_of_value = function
-  | NumValue s -> Num (s, 0)
-  | StringValue s -> Ident (s, None)
+  | NumValue s -> Ast.Num (s, 0)
+  | StringValue s -> Ast.Ident (s, None)
   | TermValue t -> t
   | _ -> assert false (* TO BE UNDERSTOOD *)
 
@@ -103,6 +122,15 @@ let rec well_typed ty value =
   | _ -> false
 
 let declarations_of_env = List.map (fun (name, (ty, _)) -> (name, ty))
+let declarations_of_term p =
+  List.map declaration_of_var (CicNotationUtil.variables_of_term p)
+
+let rec combine decls values =
+  match decls, values with
+  | [], [] -> []
+  | (name, ty) :: decls, v :: values ->
+      (name, (ty, v)) :: (combine decls values)
+  | _ -> assert false
 
 let coalesce_env declarations env_list =
   let env0 = List.map list_binding_of_name declarations in