Introduction of vectors of implicit (only for NG).

[helm.git] / helm / software / components / ng_kernel / nReference.ml

diff --git a/helm/software/components/ng_kernel/nReference.ml b/helm/software/components/ng_kernel/nReference.ml
index 1b2c0cc2b09eb9be7a30d27d65b0a094f05801be..e209d05bef8e8d3c28b13093addee5f4be070b69 100644 (file)
--- a/helm/software/components/ng_kernel/nReference.ml
+++ b/helm/software/components/ng_kernel/nReference.ml
@@ -18,17 +18,22 @@ type spec =
  | Def of int (* height *)
  | Fix of int * int * int (* fixno, recparamno, height *)
  | CoFix of int
- | Ind of bool * int (* inductive, indtyno *)
- | Con of int * int (* indtyno, constrno *)
+ | Ind of bool * int * int (* inductive, indtyno, leftno *)
+ | Con of int * int * int  (* indtyno, constrno, leftno  *)
 
 type reference = Ref of NUri.uri * spec
 
 let eq = (==);;
 
+let compare (Ref (u1,s1)) (Ref (u2,s2)) =
+ let res = NUri.compare u1 u2 in
+  if res = 0 then compare s1 s2 else res
+;;
+
 module OrderedStrings =
  struct
   type t = string
-  let compare (s1 : t) (s2 : t) = compare s1 s2
+  let compare (s1 : t) (s2 : t) = Pervasives.compare s1 s2
  end
 ;;
 
@@ -64,12 +69,14 @@ let reference_of_string =
     let h = int_of_string s_h in
     i,j,h
   in
+(*
   let get2 s dot =
     let comma = String.rindex s ',' in
     let i = int_of_string (String.sub s (dot+5) (comma-dot-5)) in
     let j = int_of_string (String.sub s (comma+1) (String.length s-comma-2)) in
     i,j
   in
+*)
   let get1 s dot =
     let i = int_of_string (String.sub s (dot+5) (String.length s-1-dot-5)) in
     i
@@ -88,8 +95,8 @@ fun s ->
         | "def" -> let i = get1 s dot in Ref (u, Def i)
         | "fix" -> let i,j,h = get3 s dot in Ref (u, Fix (i,j,h))
         | "cfx" -> let i = get1 s dot in Ref (u, CoFix (i))
-        | "ind" -> let b,i = get2 s dot in Ref (u, Ind (b=1,i))
-        | "con" -> let i,j = get2 s dot in Ref (u, Con (i,j))
+        | "ind" -> let b,i,l = get3 s dot in Ref (u, Ind (b=1,i,l))
+        | "con" -> let i,j,l = get3 s dot in Ref (u, Con (i,j,l))
         | _ -> raise Not_found
       with Not_found -> raise (IllFormedReference (lazy s))
     in
@@ -108,14 +115,25 @@ let string_of_reference (Ref (u,indinfo)) =
       s2 ^ ".fix(" ^ string_of_int i ^ "," ^ 
       string_of_int j ^ "," ^ string_of_int h ^ ")"
   | CoFix i -> s2 ^ ".cfx(" ^ string_of_int i ^ ")"
-  | Ind (b,i)->s2 ^".ind(" ^(if b then "1" else "0")^ "," ^ string_of_int i ^")"
-  | Con (i,j) -> s2 ^ ".con(" ^ string_of_int i ^ "," ^ string_of_int j ^ ")"
+  | Ind (b,i,l)->s2 ^".ind(" ^(if b then "1" else "0")^ "," ^ string_of_int i ^
+      "," ^ string_of_int l ^ ")"
+  | Con (i,j,l) -> s2 ^ ".con(" ^ string_of_int i ^ "," ^ string_of_int j ^ 
+      "," ^ string_of_int l ^ ")"
 ;;
 
 let mk_constructor j = function
-  | Ref (u, Ind (_,i)) -> 
-      reference_of_string (string_of_reference (Ref (u, Con (i,j))))
-  | _ -> assert false
+  | Ref (u, Ind (_,i,l)) -> 
+      reference_of_string (string_of_reference (Ref (u, Con (i,j,l))))
+  | r -> 
+      raise (IllFormedReference (lazy ("NON INDUCTIVE TYPE REFERENCE: " ^
+        string_of_reference r))); 
+;;
+let mk_indty b = function
+  | Ref (u, Con (i,_,l)) -> 
+      reference_of_string (string_of_reference (Ref (u, Ind (b,i,l))))
+  | r -> 
+      raise (IllFormedReference (lazy 
+        ("NON INDUCTIVE TYPE CONSTRUCTOR REFERENCE: " ^ string_of_reference r))); 
 ;;
 
 let mk_fix i j = function
@@ -129,3 +147,11 @@ let mk_cofix i = function
       reference_of_string (string_of_reference (Ref (u, CoFix i)))
   | _ -> assert false
 ;;
+
+let reference_of_spec u spec = 
+  reference_of_string (string_of_reference (Ref (u, spec)))
+;;
+
+
+
+