Initial implementation of statuses using objects in place of nested records.

[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..214a2d10e92d81b930945461993e8fcb7c5c2d9f 100644 (file)
--- a/helm/software/components/grafite_parser/grafiteParser.ml
+++ b/helm/software/components/grafite_parser/grafiteParser.ml
@@ -76,15 +76,14 @@ let mk_rec_corec ng ind_kind defs loc =
     `MutualDefinition to rememer this. *)
   let name,ty = 
     match defs with
-    | (params,(N.Ident (name, None), Some ty),_,_) :: _ ->
+    | (params,(N.Ident (name, None), ty),_,_) :: _ ->
+        let ty = match ty with Some ty -> ty | None -> N.Implicit in
         let ty =
          List.fold_right
           (fun var ty -> N.Binder (`Pi,var,ty)
           ) params ty
         in
          name,ty
-    | (_,(N.Ident (name, None), None),_,_) :: _ ->
-        name, N.Implicit
     | _ -> assert false 
   in
   let body = N.Ident (name,None) in
@@ -101,6 +100,30 @@ let mk_rec_corec ng ind_kind defs loc =
     G.Obj (loc, N.Theorem(flavour, name, ty,
      Some (N.LetRec (ind_kind, defs, body))))
 
+let npunct_of_punct = function
+  | G.Branch loc -> G.NBranch loc
+  | G.Shift loc -> G.NShift loc
+  | G.Pos (loc, i) -> G.NPos (loc, i)
+  | G.Wildcard loc -> G.NWildcard loc
+  | G.Merge loc -> G.NMerge loc
+  | G.Semicolon loc -> G.NSemicolon loc
+  | G.Dot loc -> G.NDot loc
+;;
+let nnon_punct_of_punct = function
+  | G.Skip loc -> G.NSkip loc
+  | G.Unfocus loc -> G.NUnfocus loc
+  | G.Focus (loc,l) -> G.NFocus (loc,l)
+;;
+let npunct_of_punct = function
+  | G.Branch loc -> G.NBranch loc
+  | G.Shift loc -> G.NShift loc
+  | G.Pos (loc, i) -> G.NPos (loc, i)
+  | G.Wildcard loc -> G.NWildcard loc
+  | G.Merge loc -> G.NMerge loc
+  | G.Semicolon loc -> G.NSemicolon loc
+  | G.Dot loc -> G.NDot loc
+;;
+
 type by_continuation =
    BYC_done
  | BYC_weproved of N.term * string option * N.term option
@@ -220,6 +243,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 -> 
@@ -461,10 +485,14 @@ EXTEND
    [ params = LIST0 
       [ IDENT "prefix"; SYMBOL "="; prefix = QSTRING -> G.IPPrefix prefix  
       | flavour = inline_flavour -> G.IPAs flavour
+      | IDENT "coercions" -> G.IPCoercions
+      | IDENT "debug"; SYMBOL "="; debug = int -> G.IPDebug debug 
       | IDENT "procedural" -> G.IPProcedural
       | 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 "cr" -> G.IPCR
       ] -> params
    ]
 ];
@@ -518,6 +546,17 @@ EXTEND
       | tac = tactic -> tac
         ]
       ];
+  npunctuation_tactical:
+    [
+      [ SYMBOL "[" -> G.NBranch loc
+      | SYMBOL "|" -> G.NShift loc
+      | i = LIST1 int SEP SYMBOL ","; SYMBOL ":" -> G.NPos (loc, i)
+      | SYMBOL "*"; SYMBOL ":" -> G.NWildcard loc
+      | SYMBOL "]" -> G.NMerge loc
+      | SYMBOL ";" -> G.NSemicolon loc
+      | SYMBOL "." -> G.NDot loc
+      ]
+    ];
   punctuation_tactical:
     [
       [ SYMBOL "[" -> G.Branch loc
@@ -709,6 +748,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 +766,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 +788,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))
@@ -858,14 +901,20 @@ EXTEND
     | tac = atomic_tactical LEVEL "loops"; punct = punctuation_tactical ->
         G.Tactic (loc, Some tac, punct)
     | punct = punctuation_tactical -> G.Tactic (loc, None, punct)
+    | tac = ntactic; SYMBOL "#" ; SYMBOL "#" ; punct = punctuation_tactical ->
+        G.NTactic (loc, [tac; npunct_of_punct punct])
     | tac = ntactic; punct = punctuation_tactical ->
-        G.NTactic (loc, tac, punct)
-    | SYMBOL "#" ; SYMBOL "#" ; punct = punctuation_tactical ->
-        G.NTactic (loc, G.NId loc, punct)
+        G.NTactic (loc, [tac; npunct_of_punct punct])
+    | SYMBOL "#" ; SYMBOL "#" ; punct = npunctuation_tactical ->
+        G.NTactic (loc, [punct])
     | tac = non_punctuation_tactical; punct = punctuation_tactical ->
         G.NonPunctuationTactical (loc, tac, punct)
-    | SYMBOL "#" ; SYMBOL "#" ; tac = non_punctuation_tactical; punct = punctuation_tactical ->
-        G.NNonPunctuationTactical (loc, tac, punct)
+    | SYMBOL "#" ; SYMBOL "#" ; tac = non_punctuation_tactical; 
+        SYMBOL "#" ; SYMBOL "#" ; punct = punctuation_tactical ->
+          G.NTactic (loc, [nnon_punct_of_punct tac; npunct_of_punct punct])
+    | SYMBOL "#" ; SYMBOL "#" ; tac = non_punctuation_tactical; 
+        punct = punctuation_tactical ->
+          G.NTactic (loc, [nnon_punct_of_punct tac; npunct_of_punct punct])
     | mac = macro; SYMBOL "." -> G.Macro (loc, mac)
     ]
   ];
@@ -887,22 +936,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 ->