LAMBDA-TYPES: mma's recommitted because inline syntax changed

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

diff --git a/helm/software/matita/matitaEngine.ml b/helm/software/matita/matitaEngine.ml
index cf8d6860b14608d60ef443ce01919a03c1483f8c..e2bb6feb9349316eb1ec5b0ef29d2e73e5da1622 100644 (file)
--- a/helm/software/matita/matitaEngine.ml
+++ b/helm/software/matita/matitaEngine.ml
@@ -103,7 +103,15 @@ let eval_ast ?do_heavy_checks lexicon_status
        UriManager.buri_of_uri (UriManager.uri_of_string v) = 
        baseuri
       with
-       UriManager.IllFormedUri _ -> false (* v is a description, not a URI *)
+       UriManager.IllFormedUri _ ->
+        try
+         (* this too! *)
+         let NReference.Ref (uri,_) = NReference.reference_of_string v in
+         let ouri = NCic2OCic.ouri_of_nuri uri in
+          UriManager.buri_of_uri ouri = baseuri
+        with
+         NReference.IllFormedReference _ ->
+          false (* v is a description, not a URI *)
      in
       if b then 
        lexicon_status,acc
@@ -121,10 +129,6 @@ let eval_ast ?do_heavy_checks lexicon_status
 exception TryingToAdd of string
 exception EnrichedWithStatus of exn * LexiconEngine.status * GrafiteTypes.status
 
-let out = ref ignore 
-
-let set_callback f = out := f
-
 let eval_from_stream ~first_statement_only ~include_paths 
  ?do_heavy_checks ?(enforce_no_new_aliases=true)
  ?(watch_statuses=fun _ _ -> ()) lexicon_status grafite_status str cb 
@@ -152,7 +156,6 @@ let eval_from_stream ~first_statement_only ~include_paths
             false, lexicon_status, grafite_status,
              (((grafite_status,lexicon_status),None)::statuses)
          | GrafiteParser.LSome ast ->
-            !out ast;
             cb grafite_status ast;
             let new_statuses =
              eval_ast ?do_heavy_checks lexicon_status