X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=matita%2Fmatita%2FmatitaEngine.ml;h=c1c1cd9078a52cd86c98ea96e4a01ebaa756224b;hb=87f57ddc367303c33e19c83cd8989cd561f3185b;hp=06b0da338eeefdcee65ed2df5e3e6dc104adba22;hpb=4539aee6408cdc8efdfc981138c280c2dac79202;p=helm.git diff --git a/matita/matita/matitaEngine.ml b/matita/matita/matitaEngine.ml index 06b0da338..c1c1cd907 100644 --- a/matita/matita/matitaEngine.ml +++ b/matita/matita/matitaEngine.ml @@ -241,6 +241,9 @@ and compile ~compiling ~asserted ~include_paths fname = if Http_getter_storage.is_read_only baseuri then assert false; (* MATITA 1.0: debbo fare time_travel sulla ng_library? *) let status = new status baseuri in + (*CSC: bad, one imperative bit is still there! + to be moved into functional status *) + NCicMetaSubst.pushmaxmeta (); let ocamldirname = Filename.dirname fname in let ocamlfname = Filename.chop_extension (Filename.basename fname) in let status,ocamlfname = @@ -305,17 +308,23 @@ and compile ~compiling ~asserted ~include_paths fname = HLog.message (sprintf "execution of %s completed in %s." fname (hou^min^sec)); pp_times s fname true big_bang big_bang_u big_bang_s; - asserted + (*CSC: bad, one imperative bit is still there! + to be moved into functional status *) + NCicMetaSubst.pushmaxmeta (); (* MATITA 1.0: debbo fare time_travel sulla ng_library? LexiconSync.time_travel ~present:lexicon_status ~past:initial_lexicon_status; -*)) +*) + asserted) with (* all exceptions should be wrapped to allow lexicon-undo (LS.time_travel) *) | exn when not matita_debug -> (* MATITA 1.0: debbo fare time_travel sulla ng_library? LexiconSync.time_travel ~present:lexicon ~past:initial_lexicon_status; * *) + (*CSC: bad, one imperative bit is still there! + to be moved into functional status *) + NCicMetaSubst.pushmaxmeta (); pp_times s fname false big_bang big_bang_u big_bang_s; clean_exit baseuri exn @@ -351,10 +360,13 @@ and assert_ng ~already_included ~compiling ~asserted ~include_paths mapath = let preamble = GrafiteTypes.Serializer.dependencies_of baseuri in let asserted,children_bad = List.fold_left - (fun (asserted,b) mapath -> - let asserted,b1 = - assert_ng ~already_included ~compiling ~asserted ~include_paths - mapath + (fun (asserted,b) mapath -> + let asserted,b1 = + try + assert_ng ~already_included ~compiling ~asserted ~include_paths + mapath + with Librarian.NoRootFor _ | Librarian.FileNotFound _ -> + asserted, true in asserted, b || b1 || let _,baseuri,_,_ =