*** empty log message ***

[helm.git] / helm / matita / matitaEngine.ml

diff --git a/helm/matita/matitaEngine.ml b/helm/matita/matitaEngine.ml
index 707e31d988fff576c60795d8a257b6f1ec380179..b065040523bc2d46d3fa2b4f3db89d91a9611ca9 100644 (file)
--- a/helm/matita/matitaEngine.ml
+++ b/helm/matita/matitaEngine.ml
@@ -597,14 +597,19 @@ let eval_coercion status coercion =
   { status with proof_status = No_proof }
 
 let generate_elimination_principles uri status =
- let elim sort status =
-   try
-    let uri,obj = CicElim.elim_of ~sort uri 0 in
-     MatitaSync.add_obj uri obj status
-   with CicElim.Can_t_eliminate -> status
- in
- List.fold_left (fun status sort -> elim sort status) status
-  [ Cic.Prop; Cic.Set; (Cic.Type (CicUniv.fresh ())) ]
+  let status' = ref status in
+  let elim sort =
+    try
+      let uri,obj = CicElim.elim_of ~sort uri 0 in
+      status' := MatitaSync.add_obj uri obj !status'
+    with CicElim.Can_t_eliminate -> ()
+  in
+  try
+    List.iter elim [ Cic.Prop; Cic.Set; (Cic.Type (CicUniv.fresh ())) ];
+    !status'
+  with exn ->
+    MatitaSync.time_travel ~present:!status' ~past:status;
+    raise exn
 
 let generate_projections uri fields status =
  let projections = CicRecord.projections_of uri fields in
@@ -629,7 +634,7 @@ let generate_projections uri fields status =
   ) status projections
 
 (* to avoid a long list of recursive functions *)
-let eval_from_stream_ref = ref (fun _ _ _ -> assert false);;
+let eval_from_moo_ref = ref (fun _ _ _ -> assert false);;
  
 let disambiguate_obj status obj =
   let uri =
@@ -691,8 +696,6 @@ let make_absolute paths path =
    with Unix.Unix_error _ as exc -> raise (UnableToInclude path)
 ;;
        
-let profiler_include = CicUtil.profile "include"
-
 let eval_command opts status cmd =
   let status,cmd = disambiguate_command status cmd in
   let cmd,notation_ids' = CicNotation.process_notation cmd in
@@ -706,15 +709,11 @@ let eval_command opts status cmd =
   | GrafiteAst.Include (loc, path) ->
      let absolute_path = make_absolute opts.include_paths path in
      let moopath = MatitaMisc.obj_file_of_script absolute_path in
-     let ic =
-      try open_in moopath with Sys_error _ -> 
-        raise (IncludedFileNotCompiled moopath) in
-     let stream = Ulexing.from_utf8_channel ic in
      let status = ref status in
-      profiler_include.CicUtil.profile
-       (!eval_from_stream_ref status stream) (fun _ _ -> ());
-      close_in ic;
-      !status
+     if not (Sys.file_exists moopath) then
+       raise (IncludedFileNotCompiled moopath);
+     !eval_from_moo_ref status moopath (fun _ _ -> ());
+     !status
   | GrafiteAst.Set (loc, name, value) -> 
       let value = 
         if name = "baseuri" then
@@ -754,8 +753,7 @@ let eval_command opts status cmd =
       let name = UriManager.name_of_uri uri in
       let obj = Cic.Constant (name,Some bo,ty,[],[]) in
       MatitaSync.add_obj uri obj status
-  | GrafiteAst.Coercion (loc, coercion) -> 
-      eval_coercion status coercion
+  | GrafiteAst.Coercion (loc, coercion) -> eval_coercion status coercion
   | GrafiteAst.Alias (loc, spec) -> 
      let diff =
       (*CSC: Warning: this code should be factorized with the corresponding
@@ -839,22 +837,29 @@ let eval_command opts status cmd =
           command_error (
             "metasenv not empty while giving a definition with body: " ^
             CicMetaSubst.ppmetasenv [] metasenv);
-         let status = MatitaSync.add_obj uri obj status in
-          match obj with
-             Cic.Constant _ -> status
+         let status' = ref status in
+         (try
+           status' := MatitaSync.add_obj uri obj !status';
+           (match obj with
+           | Cic.Constant _ -> ()
            | Cic.InductiveDefinition (_,_,_,attrs) ->
-              let status = generate_elimination_principles uri status in
-              let rec get_record_attrs =
-               function
-                  [] -> None
-                | (`Class (`Record fields))::_ -> Some fields
-                | _::tl -> get_record_attrs tl
-              in
+               status' := generate_elimination_principles uri !status';
+               let rec get_record_attrs =
+                 function
+                 | [] -> None
+                 | (`Class (`Record fields))::_ -> Some fields
+                 | _::tl -> get_record_attrs tl
+               in
                (match get_record_attrs attrs with
-                   None -> status (* not a record *)
-                 | Some fields -> generate_projections uri fields status)
+               | None -> () (* not a record *)
+               | Some fields ->
+                   status' := generate_projections uri fields !status')
            | Cic.CurrentProof _
-           | Cic.Variable _ -> assert false
+           | Cic.Variable _ -> assert false);
+           !status'
+         with exn ->
+           MatitaSync.time_travel ~present:!status' ~past:status;
+           raise exn)
 
 let eval_executable opts status ex =
   match ex with
@@ -879,6 +884,22 @@ let eval_ast
   | GrafiteAst.Executable (_,ex) -> eval_executable opts status ex
   | GrafiteAst.Comment (_,c) -> eval_comment status c
 
+let eval_from_moo ?do_heavy_checks ?include_paths ?clean_baseuri status fname
+  cb
+=
+  let moo = MatitaMoo.load_moo fname in
+  List.iter 
+    (fun ast -> 
+      let ast =
+        GrafiteAst.Executable (DisambiguateTypes.dummy_floc,
+          GrafiteAst.Command (DisambiguateTypes.dummy_floc,
+            (GrafiteAst.reash_cmd_uris ast)))
+      in
+      cb !status ast;
+      status :=
+        eval_ast ?do_heavy_checks ?include_paths ?clean_baseuri !status ast)
+    moo
+
 let eval_from_stream 
   ?do_heavy_checks ?include_paths ?clean_baseuri status str cb 
 =
@@ -886,12 +907,13 @@ let eval_from_stream
     while true do
       let ast = GrafiteParser.parse_statement str in
       cb !status ast;
-      status := eval_ast ?do_heavy_checks ?include_paths ?clean_baseuri !status ast
+      status :=
+        eval_ast ?do_heavy_checks ?include_paths ?clean_baseuri !status ast
     done
   with End_of_file -> ()
 
 (* to avoid a long list of recursive functions *)
-let _ = eval_from_stream_ref := eval_from_stream
+let _ = eval_from_moo_ref := eval_from_moo
   
 let eval_from_stream_greedy 
   ?do_heavy_checks ?include_paths ?clean_baseuri status str cb