-debug improved

diff --git a/helm/software/matita/matitaEngine.ml b/helm/software/matita/matitaEngine.ml
index 5f8a1b7a7e6cc74d9d074a5f3d1d8aacf0d95762..8772fd03bb0ee35ca47d57b89d49d8cdbe536a5b 100644 (file)
--- a/helm/software/matita/matitaEngine.ml
+++ b/helm/software/matita/matitaEngine.ml
@@ -154,7 +154,7 @@ let eval_from_stream ~first_statement_only ~include_paths
             in
              watch_statuses lexicon_status grafite_status ;
              false, lexicon_status, grafite_status, (new_statuses @ statuses))
-   with exn ->
+   with exn when (not (Helm_registry.get_bool "matita.debug")) ->
      raise (EnrichedWithLexiconStatus (exn, lexicon_status))
   in
   if stop then s else loop l g s

diff --git a/helm/software/matita/matitacLib.ml b/helm/software/matita/matitacLib.ml
index e5a8efe8ff31b2407d3b5cace81b1aebf3e8ce73..8808aea22bc71f2c088bab3b6a682c7af9384580 100644 (file)
--- a/helm/software/matita/matitacLib.ml
+++ b/helm/software/matita/matitacLib.ml
@@ -248,13 +248,13 @@ let compile options fname =
      LexiconSync.time_travel 
        ~present:lexicon_status ~past:initial_lexicon_status;
      clean_exit baseuri false
-  | MatitaEngine.EnrichedWithLexiconStatus (exn, lex_stat) ->
+  | MatitaEngine.EnrichedWithLexiconStatus (exn, lex_stat) as exn' ->
       (match exn with
       | Sys.Break -> HLog.error "user break!"
       | HExtlib.Localized (floc,CicNotationParser.Parse_error err) ->
           let (x, y) = HExtlib.loc_of_floc floc in
           HLog.error (sprintf "Parse error at %d-%d: %s" x y err)
-      | exn when matita_debug -> raise exn
+      | exn when matita_debug -> raise exn'
       | exn -> HLog.error (snd (MatitaExcPp.to_string exn)));
       LexiconSync.time_travel ~present:lex_stat ~past:initial_lexicon_status;
       pp_times fname false big_bang big_bang_u big_bang_s;