attributes now in the proof status: commit 2

[helm.git] / helm / software / components / grafite_engine / grafiteEngine.ml

diff --git a/helm/software/components/grafite_engine/grafiteEngine.ml b/helm/software/components/grafite_engine/grafiteEngine.ml
index 95e396003085b59ce219c082beac5d05274258bf..09ceecebc5d8eceefecda4d254fb7c8db863da47 100644 (file)
--- a/helm/software/components/grafite_engine/grafiteEngine.ml
+++ b/helm/software/components/grafite_engine/grafiteEngine.ml
@@ -331,7 +331,7 @@ prerr_endline("opened: " ^ String.concat ", " (List.map string_of_int opened));
 prerr_endline("closed_goals: " ^ String.concat ", " (List.map string_of_int closed_goals)); *)
  let proof, opened_goals = 
    if needs_reordering then begin
-     let uri, metasenv_after_tactic, t, ty = proof in
+     let uri, metasenv_after_tactic, t, ty, attrs = proof in
 (* prerr_endline ("goal prima del riordino: " ^ String.concat " " (List.map string_of_int (ProofEngineTypes.goals_of_proof proof))); *)
      let reordered_metasenv, opened_goals = 
        reorder_metasenv
@@ -339,7 +339,7 @@ prerr_endline("closed_goals: " ^ String.concat ", " (List.map string_of_int clos
         metasenv_after_refinement metasenv_after_tactic
         opened goal always_opens_a_goal
      in
-     let proof' = uri, reordered_metasenv, t, ty in
+     let proof' = uri, reordered_metasenv, t, ty, attrs in
 (* prerr_endline ("goal dopo il riordino: " ^ String.concat " " (List.map string_of_int (ProofEngineTypes.goals_of_proof proof'))); *)
      proof', opened_goals
    end
@@ -684,16 +684,16 @@ let rec eval_command = {ec_go = fun ~disambiguate_command opts status
 *)
      status,[]
   | GrafiteAst.Print (_,"proofterm") ->
-      let _,_,p,_ = GrafiteTypes.get_current_proof status in
+      let _,_,p,_, _ = GrafiteTypes.get_current_proof status in
       print_endline (AutoTactic.pp_proofterm p);
       status,[]
   | GrafiteAst.Print (_,_) -> status,[]
   | GrafiteAst.Qed loc ->
-      let uri, metasenv, bo, ty =
+      let uri, metasenv, bo, ty, attrs =
         match status.GrafiteTypes.proof_status with
-        | GrafiteTypes.Proof (Some uri, metasenv, body, ty) ->
-            uri, metasenv, body, ty
-        | GrafiteTypes.Proof (None, metasenv, body, ty) -> 
+        | GrafiteTypes.Proof (Some uri, metasenv, body, ty, attrs) ->
+            uri, metasenv, body, ty, attrs
+        | GrafiteTypes.Proof (None, metasenv, body, ty, attrs) -> 
             raise (GrafiteTypes.Command_error 
               ("Someone allows to start a theorem without giving the "^
                "name/uri. This should be fixed!"))
@@ -706,7 +706,7 @@ let rec eval_command = {ec_go = fun ~disambiguate_command opts status
          (GrafiteTypes.Command_error
            "Proof not completed! metasenv is not empty!");
       let name = UriManager.name_of_uri uri in
-      let obj = Cic.Constant (name,Some bo,ty,[],[]) in
+      let obj = Cic.Constant (name,Some bo,ty,[],attrs) in
       let status, lemmas = add_obj uri obj status in
        {status with 
          GrafiteTypes.proof_status = GrafiteTypes.No_proof},
@@ -758,7 +758,7 @@ let rec eval_command = {ec_go = fun ~disambiguate_command opts status
      let obj = CicRefine.pack_coercion_obj obj in
      let metasenv = GrafiteTypes.get_proof_metasenv status in
      match obj with
-     | Cic.CurrentProof (_,metasenv',bo,ty,_,_) ->
+     | Cic.CurrentProof (_,metasenv',bo,ty,_, attrs) ->
          let name = UriManager.name_of_uri uri in
          if not(CicPp.check name ty) then
            HLog.error ("Bad name: " ^ name);
@@ -790,7 +790,7 @@ let rec eval_command = {ec_go = fun ~disambiguate_command opts status
                  ("Theorem already proved: " ^ UriManager.string_of_uri x ^ 
                   "\nPlease use a variant."));
            end;
-         let initial_proof = (Some uri, metasenv', bo, ty) in
+         let initial_proof = (Some uri, metasenv', bo, ty, attrs) in
          let initial_stack = Continuationals.Stack.of_metasenv metasenv' in
          { status with GrafiteTypes.proof_status =
             GrafiteTypes.Incomplete_proof