| 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 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
| "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
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))))
+ | Ref (u, Ind (_,i,l)) ->
+ reference_of_string (string_of_reference (Ref (u, Con (i,j,l))))
| _ -> assert false
;;