- Procedural convertible rewrites in the conclusion are now detected and replaced...

[helm.git] / helm / software / components / grafite_parser / grafiteParser.ml

diff --git a/helm/software/components/grafite_parser/grafiteParser.ml b/helm/software/components/grafite_parser/grafiteParser.ml
index d0a97072c0d1c1c2b7a1ee366863e5992d80d93c..06a753f88d42f4b2e4475f06883b56e86e4ee08e 100644 (file)
--- a/helm/software/components/grafite_parser/grafiteParser.ml
+++ b/helm/software/components/grafite_parser/grafiteParser.ml
@@ -220,6 +220,7 @@ EXTEND
         SYMBOL <:unicode<vdash>>;
         concl = tactic_term -> (List.rev hyps,concl) ] ->
          G.NAssert (loc, seqs)
+    | IDENT "nauto"; params = auto_params -> G.NAuto (loc, params)
     | IDENT "ncases"; what = tactic_term ; where = pattern_spec ->
         G.NCases (loc, what, where)
     | IDENT "nchange"; what = pattern_spec; "with"; with_what = tactic_term -> 
@@ -465,6 +466,9 @@ EXTEND
       | IDENT "nodefaults" -> G.IPNoDefaults
       | IDENT "depth"; SYMBOL "="; depth = int -> G.IPDepth depth 
       | IDENT "level"; SYMBOL "="; level = int -> G.IPLevel level 
+      | IDENT "comments" -> G.IPComments
+      | IDENT "coercions" -> G.IPCoercions
+      | IDENT "debug"; SYMBOL "="; debug = int -> G.IPDebug debug 
       ] -> params
    ]
 ];
@@ -709,6 +713,7 @@ EXTEND
     ];
     level3_term: [
       [ u = URI -> N.UriPattern (UriManager.uri_of_string u)
+      | r = NREF -> N.NRefPattern (NReference.reference_of_string r)
       | IMPLICIT -> N.ImplicitPattern
       | id = IDENT -> N.VarPattern id
       | LPAREN; terms = LIST1 SELF; RPAREN ->
@@ -726,11 +731,11 @@ EXTEND
     
     include_command: [ [
         IDENT "include" ; path = QSTRING -> 
-          loc,path,false,L.WithPreferences
+          loc,path,true,L.WithPreferences
       | IDENT "include" ; IDENT "source" ; path = QSTRING -> 
-          loc,path,true,L.WithPreferences        
+          loc,path,false,L.WithPreferences       
       | IDENT "include'" ; path = QSTRING -> 
-          loc,path,false,L.WithoutPreferences
+          loc,path,true,L.WithoutPreferences
      ]];
 
   grafite_command: [ [
@@ -748,6 +753,9 @@ EXTEND
     | nflavour = ntheorem_flavour; name = IDENT; SYMBOL ":"; typ = term;
       body = OPT [ SYMBOL <:unicode<def>> (* ≝ *); body = term -> body ] ->
         G.NObj (loc, N.Theorem (nflavour, name, typ, body))
+    | nflavour = ntheorem_flavour; name = IDENT; SYMBOL <:unicode<def>> (* ≝ *);
+      body = term ->
+        G.NObj (loc, N.Theorem (nflavour, name, N.Implicit, Some body))
     | flavour = theorem_flavour; name = IDENT; SYMBOL ":"; typ = term;
       body = OPT [ SYMBOL <:unicode<def>> (* ≝ *); body = term -> body ] ->
         G.Obj (loc, N.Theorem (flavour, name, typ, body))
@@ -887,22 +895,22 @@ EXTEND
           let stm = G.Comment (loc, com) in
           !grafite_callback status stm;
          status, LSome stm
-    | (iloc,fname,source,mode) = include_command ; SYMBOL "."  ->
+    | (iloc,fname,normal,mode) = include_command ; SYMBOL "."  ->
        fun ?(never_include=false) ~include_paths status ->
          let stm =
-            G.Executable (loc, G.Command (loc, G.Include (iloc, source, fname)))
+            G.Executable (loc, G.Command (loc, G.Include (iloc, normal, fname)))
          in
           !grafite_callback status stm;
          let _root, buri, fullpath, _rrelpath = 
             Librarian.baseuri_of_script ~include_paths fname 
           in
-          let stm =
-            G.Executable (loc, G.Command (loc, G.Include (iloc, source, buri)))
-         in
          let status =
             if never_include then raise (NoInclusionPerformed fullpath)
             else LE.eval_command status (L.Include (iloc,buri,mode,fullpath))
           in
+          let stm =
+            G.Executable (loc, G.Command (loc, G.Include (iloc, normal, buri)))
+         in
          status, LSome stm
     | scom = lexicon_command ; SYMBOL "." ->
        fun ?(never_include=false) ~include_paths status ->