Bad variable name fixed.

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

diff --git a/helm/software/components/grafite_engine/grafiteEngine.mli b/helm/software/components/grafite_engine/grafiteEngine.mli
index b1df5728112816f7cd3114b9cdef3743b46219c3..0b263157f63b162ca13664bb19f74eb26c98fb6b 100644 (file)
--- a/helm/software/components/grafite_engine/grafiteEngine.mli
+++ b/helm/software/components/grafite_engine/grafiteEngine.mli
@@ -24,13 +24,14 @@
  *)
 
 exception Drop
-exception IncludedFileNotCompiled of string
+exception IncludedFileNotCompiled of string * string
 exception Macro of
  GrafiteAst.loc *
-  (Cic.context -> GrafiteTypes.status * Cic.term GrafiteAst.macro)
+  (Cic.context -> GrafiteTypes.status * (Cic.term,Cic.lazy_term) GrafiteAst.macro)
+exception NMacro of GrafiteAst.loc * GrafiteAst.nmacro
 
 type 'a disambiguator_input = string * int * 'a
-  
+
 val eval_ast :
   disambiguate_tactic:
    (GrafiteTypes.status ->
@@ -42,18 +43,17 @@ val eval_ast :
 
   disambiguate_command:
    (GrafiteTypes.status ->
-    ('obj GrafiteAst.command) disambiguator_input ->
-    GrafiteTypes.status * Cic.obj GrafiteAst.command) ->
+    (('term,'obj) GrafiteAst.command) disambiguator_input ->
+    GrafiteTypes.status * (Cic.term, Cic.obj) GrafiteAst.command) ->
 
   disambiguate_macro:
    (GrafiteTypes.status ->
-    ('term GrafiteAst.macro) disambiguator_input ->
-    Cic.context -> GrafiteTypes.status * Cic.term GrafiteAst.macro) ->
+    (('term,'lazy_term) GrafiteAst.macro) disambiguator_input ->
+    Cic.context -> GrafiteTypes.status * (Cic.term,Cic.lazy_term) GrafiteAst.macro) ->
 
   ?do_heavy_checks:bool ->
-  ?clean_baseuri:bool ->
   GrafiteTypes.status ->
   (('term, 'lazy_term, 'reduction, 'obj, 'ident) GrafiteAst.statement)
   disambiguator_input ->
    (* the new status and generated objects, if any *)
-   GrafiteTypes.status * UriManager.uri list
+   GrafiteTypes.status * [`Old of UriManager.uri list | `New of NUri.uri list]