X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Fsoftware%2Fcomponents%2Facic_procedural%2FproceduralClassify.ml;h=755176e5c50cc4d4d280fcee4b373089ebbcb485;hb=1ca5e357b247833e561be0f0760d18d705d4f1d6;hp=4f9f99fcee76117056a100bd8f1a13dfb9fcfd24;hpb=c465c17581bf606e0330cbd89b238279c184ad35;p=helm.git diff --git a/helm/software/components/acic_procedural/proceduralClassify.ml b/helm/software/components/acic_procedural/proceduralClassify.ml index 4f9f99fce..755176e5c 100644 --- a/helm/software/components/acic_procedural/proceduralClassify.ml +++ b/helm/software/components/acic_procedural/proceduralClassify.ml @@ -23,6 +23,7 @@ * http://cs.unibo.it/helm/. *) +module UM = UriManager module C = Cic module D = Deannotate module I = CicInspect @@ -32,7 +33,7 @@ module H = ProceduralHelpers type dependence = I.S.t * bool -type conclusion = (int * int) option +type conclusion = (int * int * UM.uri * int) option (* debugging ****************************************************************) @@ -43,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) = @@ -67,11 +68,11 @@ 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