acic_procedural: bug fix:

[helm.git] / components / grafite_engine / grafiteTypes.ml

diff --git a/components/grafite_engine/grafiteTypes.ml b/components/grafite_engine/grafiteTypes.ml
index 0c02e1b6c38d86fdfcfb69ca51283dab32c5c677..6e8be22bbe0367d149bdf148fbea77d8d9421395 100644 (file)
--- a/components/grafite_engine/grafiteTypes.ml
+++ b/components/grafite_engine/grafiteTypes.ml
@@ -57,18 +57,20 @@ type status = {
   options: options;
   objects: UriManager.uri list;
   coercions: UriManager.uri list;
+  universe:Universe.universe;  
 }
 
 let get_current_proof status =
   match status.proof_status with
   | Incomplete_proof { proof = p } -> p
+  | Proof p -> p
   | _ -> raise (Statement_error "no ongoing proof")
 
 let get_proof_metasenv status =
   match status.proof_status with
   | No_proof -> []
-  | Proof (_, metasenv, _, _)
-  | Incomplete_proof { proof = (_, metasenv, _, _) }
+  | Proof (_, metasenv, _, _, _, _)
+  | Incomplete_proof { proof = (_, metasenv, _, _, _, _) }
   | Intermediate metasenv ->
       metasenv
 
@@ -91,11 +93,11 @@ let set_metasenv metasenv status =
   let proof_status =
     match status.proof_status with
     | No_proof -> Intermediate metasenv
-    | Incomplete_proof ({ proof = (uri, _, proof, ty) } as incomplete_proof) ->
+    | Incomplete_proof ({ proof = (uri, _, subst, proof, ty, attrs) } as incomplete_proof) ->
         Incomplete_proof
-          { incomplete_proof with proof = (uri, metasenv, proof, ty) }
+          { incomplete_proof with proof = (uri, metasenv, subst, proof, ty, attrs) }
     | Intermediate _ -> Intermediate metasenv 
-    | Proof (_, metasenv', _, _) ->
+    | Proof (_, metasenv', _, _, _, _) ->
        assert (metasenv = metasenv');
        status.proof_status
   in
@@ -103,14 +105,14 @@ let set_metasenv metasenv status =
 
 let get_proof_context status goal =
   match status.proof_status with
-  | Incomplete_proof { proof = (_, metasenv, _, _) } ->
+  | Incomplete_proof { proof = (_, metasenv, _, _, _, _) } ->
       let (_, context, _) = CicUtil.lookup_meta goal metasenv in
       context
   | _ -> []
 
 let get_proof_conclusion status goal =
   match status.proof_status with
-  | Incomplete_proof { proof = (_, metasenv, _, _) } ->
+  | Incomplete_proof { proof = (_, metasenv, _, _, _, _) } ->
       let (_, _, conclusion) = CicUtil.lookup_meta goal metasenv in
       conclusion
   | _ -> raise (Statement_error "no ongoing proof")
@@ -122,7 +124,9 @@ let add_moo_content cmds status =
       (fun cmd acc ->
 (*         prerr_endline ("adding to moo command: " ^ GrafiteAstPp.pp_command cmd); *)
         match cmd with
-        | GrafiteAst.Default _ ->
+        | GrafiteAst.Default _ 
+        | GrafiteAst.Index _
+        | GrafiteAst.Coercion _ ->
             if List.mem cmd content then acc
             else cmd :: acc
         | _ -> cmd :: acc)