...

[helm.git] / components / acic_procedural / proceduralClassify.ml

diff --git a/components/acic_procedural/proceduralClassify.ml b/components/acic_procedural/proceduralClassify.ml
index 6c1e482c2ff4d86aee5ee01cb988e50ece825630..4c0014d2e320e4e214aa511f66f1694ee9b6ac59 100644 (file)
--- a/components/acic_procedural/proceduralClassify.ml
+++ b/components/acic_procedural/proceduralClassify.ml
@@ -23,14 +23,17 @@
  * http://cs.unibo.it/helm/.
  *)
 
+module UM  = UriManager
 module C   = Cic
 module D   = Deannotate
 module I   = CicInspect
 module PEH = ProofEngineHelpers
 
+module H   = ProceduralHelpers
+
 type dependence = I.S.t * bool
 
-type conclusion = (int * int) option
+type conclusion = (int * int * UM.uri * int) option
 
 (* debugging ****************************************************************)
 
@@ -41,8 +44,8 @@ let string_of_entry (inverse, b) =
 let to_string (classes, rc) =
    let linearize = String.concat " " (List.map string_of_entry classes) in
    match rc with
-      | None        -> linearize
-      | Some (i, j) -> Printf.sprintf "%s %u %u" linearize i j
+      | None              -> linearize
+      | Some (i, j, _, _) -> Printf.sprintf "%s %u %u" linearize i j
 
 let out_table b =
    let map i (_, inverse) =
@@ -52,12 +55,8 @@ let out_table b =
    in
    Array.iteri map b;
    prerr_newline ()
-   
-(****************************************************************************)
-
-let identity x = x
 
-let fst3 (x, _, _) = x
+(* classification ***********************************************************)
 
 let classify_conclusion vs = 
    let rec get_argsno = function
@@ -69,26 +68,28 @@ let classify_conclusion vs =
    let inside i = i > 1 && i <= List.length vs in
    match vs with
       | v0 :: v1 :: _ ->
-         let hd0, argsno0 = get_argsno v0 in
-        let hd1, argsno1 = get_argsno v1 in
+         let hd0, a0 = get_argsno v0 in
+        let hd1, a1 = get_argsno v1 in
         begin match hd0, hd1 with
-           | C.Rel i, C.MutInd _ when inside i -> Some (i, argsno0)
-           | _                                 -> None
+           | C.Rel i, C.MutInd (u, n, _) when inside i -> Some (i, a0, u, n)
+           | _                                         -> None
         end
       | _             -> None
  
 let classify c t =
 try   
-   let vs, h = PEH.split_with_whd (c, t) in
+   let vs, h = PEH.split_with_normalize (c, t) in
    let rc = classify_conclusion vs in
    let map (b, h) (c, v) = 
       let _, argsno = PEH.split_with_whd (c, v) in
-      (I.get_rels_from_premise h v, I.S.empty, argsno > 0) :: b, succ h
+      let isf = argsno > 0 || H.is_sort v in
+      let iu = H.is_unsafe h (List.hd vs) in
+      (I.get_rels_from_premise h v, I.S.empty, isf && iu) :: b, succ h
    in
    let l, h = List.fold_left map ([], 0) vs in
    let b = Array.of_list (List.rev l) in
    let mk_closure b h =
-      let map j = if j < h then I.S.union (fst3 b.(j)) else identity in 
+      let map j = if j < h then I.S.union (H.fst3 b.(j)) else H.identity in 
       for i = pred h downto 0 do
          let direct, unused, fa = b.(i) in
         b.(i) <- I.S.fold map direct direct, unused, fa