X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Fsoftware%2Fcomponents%2Fgrafite_parser%2FgrafiteParser.ml;fp=helm%2Fsoftware%2Fcomponents%2Fgrafite_parser%2FgrafiteParser.ml;h=faa17124edd09053a0634267af03ae4fdb3acb35;hb=a3417bd94b857a7f96a2221ba5b79444823b2144;hp=3d5c662ca378447e94099f129925178cffbcbb3f;hpb=86b6c02aa918e5e7115f42947428590d5f0a26e6;p=helm.git

diff --git a/helm/software/components/grafite_parser/grafiteParser.ml b/helm/software/components/grafite_parser/grafiteParser.ml
index 3d5c662ca..faa17124e 100644
--- a/helm/software/components/grafite_parser/grafiteParser.ml
+++ b/helm/software/components/grafite_parser/grafiteParser.ml
@@ -128,6 +128,11 @@ let npunct_of_punct = function
   | G.Semicolon loc -> G.NSemicolon loc
   | G.Dot loc -> G.NDot loc
 ;;
+let cons_ntac t p = 
+  match t with
+  | G.NTactic(loc,[t]) -> G.NTactic(loc,[t;p])
+  | x -> x
+;;
 
 type by_continuation =
    BYC_done
@@ -237,8 +242,8 @@ EXTEND
   ];
   using: [ [ using = OPT [ IDENT "using"; t = tactic_term -> t ] -> using ] ];
   ntactic: [
-    [ IDENT "napply"; t = tactic_term -> G.NApply (loc, t)
-    | IDENT "napplyS"; t = tactic_term -> G.NSmartApply (loc, t)
+    [ IDENT "napply"; t = tactic_term -> G.NTactic(loc,[G.NApply (loc, t)])
+    | IDENT "napplyS"; t = tactic_term -> G.NTactic(loc,[G.NSmartApply(loc, t)])
     | IDENT "nassert";
        seqs = LIST0 [
         hyps = LIST0
@@ -248,46 +253,72 @@ EXTEND
             id,`Def (bo,ty)];
         SYMBOL <:unicode<vdash>>;
         concl = tactic_term -> (List.rev hyps,concl) ] ->
-         G.NAssert (loc, seqs)
-    | IDENT "nauto"; params = auto_params -> G.NAuto (loc, params)
-    | SYMBOL "/"; num = OPT NUMBER ; SYMBOL "/" ; 
-       (univ,params) = auto_params ->
-	 let depth = match num with Some n -> n | None -> "1" in
-	   G.NAuto (loc, (univ,["slir","";"depth",depth]@params))
+         G.NTactic(loc,[G.NAssert (loc, seqs)])
+    | IDENT "nauto"; params = auto_params -> 
+        G.NTactic(loc,[G.NAuto (loc, params)])
+    | SYMBOL "/"; num = OPT NUMBER ; 
+       params = nauto_params; SYMBOL "/" ; 
+       just = OPT [ IDENT "by"; by = 
+         [ univ = tactic_term_list1 -> `Univ univ
+         | SYMBOL "{"; SYMBOL "}" -> `EmptyUniv
+         | SYMBOL "_" -> `Trace ] -> by ] ->
+       let depth = match num with Some n -> n | None -> "1" in
+       (match just with
+       | None -> 
+	   G.NTactic(loc,
+            [G.NAuto(loc,(None,["slir","";"depth",depth]@params))])
+       | Some (`Univ univ) ->
+	   G.NTactic(loc,
+            [G.NAuto(loc,(Some univ,["slir","";"depth",depth]@params))])
+       | Some `EmptyUniv ->
+	   G.NTactic(loc,
+            [G.NAuto(loc,(Some [],["slir","";"depth",depth]@params))])
+       | Some `Trace ->
+	   G.NMacro(loc,
+             G.NAutoInteractive (loc, (None,["slir","";"depth",depth]@params))))
+    | IDENT "ncheck"; t = term -> G.NMacro(loc,G.NCheck (loc,t))
+    | IDENT "screenshot"; fname = QSTRING -> 
+        G.NMacro(loc,G.Screenshot (loc, fname))
     | IDENT "ncases"; what = tactic_term ; where = pattern_spec ->
-        G.NCases (loc, what, where)
+        G.NTactic(loc,[G.NCases (loc, what, where)])
     | IDENT "nchange"; what = pattern_spec; "with"; with_what = tactic_term -> 
-        G.NChange (loc, what, with_what)
+        G.NTactic(loc,[G.NChange (loc, what, with_what)])
     | SYMBOL "@"; num = OPT NUMBER; l = LIST0 tactic_term -> 
-        G.NConstructor (loc,
-           (match num with None -> None | Some x -> Some (int_of_string x)),l)
-    | IDENT "ncut"; t = tactic_term -> G.NCut (loc, t)
+        G.NTactic(loc,[G.NConstructor (loc, (match num with None -> None | Some x -> Some (int_of_string x)),l)])
+    | IDENT "ncut"; t = tactic_term -> G.NTactic(loc,[G.NCut (loc, t)])
 (*  | IDENT "ndiscriminate"; t = tactic_term -> G.NDiscriminate (loc, t)
     | IDENT "nsubst"; t = tactic_term -> G.NSubst (loc, t) *)
-    | IDENT "ndestruct" -> G.NDestruct loc
+    | IDENT "ndestruct" -> G.NTactic(loc,[G.NDestruct loc])
     | IDENT "nelim"; what = tactic_term ; where = pattern_spec ->
-        G.NElim (loc, what, where)
+        G.NTactic(loc,[G.NElim (loc, what, where)])
     | IDENT "ngeneralize"; p=pattern_spec ->
-        G.NGeneralize (loc, p)
+        G.NTactic(loc,[G.NGeneralize (loc, p)])
     | IDENT "ninversion"; what = tactic_term ; where = pattern_spec ->
-        G.NInversion (loc, what, where)
-    | IDENT "nlapply"; t = tactic_term -> G.NLApply (loc, t)
+        G.NTactic(loc,[G.NInversion (loc, what, where)])
+    | IDENT "nlapply"; t = tactic_term -> G.NTactic(loc,[G.NLApply (loc, t)])
     | IDENT "nletin"; name = IDENT ; SYMBOL <:unicode<def>> ; t = tactic_term;
         where = pattern_spec ->
-        G.NLetIn (loc,where,t,name)
+        G.NTactic(loc,[G.NLetIn (loc,where,t,name)])
     | kind = nreduction_kind; p = pattern_spec ->
-        G.NReduce (loc, kind, p)
+        G.NTactic(loc,[G.NReduce (loc, kind, p)])
     | IDENT "nrewrite"; dir = direction; what = tactic_term ; where = pattern_spec ->	
-        G.NRewrite (loc, dir, what, where)
-    | IDENT "ntry"; tac = SELF -> G.NTry (loc,tac)
-    | IDENT "nrepeat"; tac = SELF -> G.NRepeat (loc,tac)
-    | LPAREN; l = LIST1 SELF; RPAREN -> G.NBlock (loc,l)
-    | IDENT "nassumption" -> G.NAssumption loc
-    | SYMBOL "#"; n=IDENT -> G.NIntro (loc,n)
-    | SYMBOL "#"; SYMBOL "_" -> G.NIntro (loc,"_")
-    | SYMBOL "*" -> G.NCase1 (loc,"_")
-    | SYMBOL "*"; n=IDENT ->
-        G.NCase1 (loc,n)
+        G.NTactic(loc,[G.NRewrite (loc, dir, what, where)])
+    | IDENT "ntry"; tac = SELF -> 
+        let tac = match tac with G.NTactic(_,[t]) -> t | _ -> assert false in
+        G.NTactic(loc,[ G.NTry (loc,tac)])
+    | IDENT "nrepeat"; tac = SELF -> 
+        let tac = match tac with G.NTactic(_,[t]) -> t | _ -> assert false in
+        G.NTactic(loc,[ G.NRepeat (loc,tac)])
+    | LPAREN; l = LIST1 SELF; RPAREN -> 
+        let l = 
+          List.flatten 
+            (List.map (function G.NTactic(_,t) -> t | _ -> assert false) l) in
+        G.NTactic(loc,[G.NBlock (loc,l)])
+    | IDENT "nassumption" -> G.NTactic(loc,[ G.NAssumption loc])
+    | SYMBOL "#"; n=IDENT -> G.NTactic(loc,[ G.NIntro (loc,n)])
+    | SYMBOL "#"; SYMBOL "_" -> G.NTactic(loc,[ G.NIntro (loc,"_")])
+    | SYMBOL "*" -> G.NTactic(loc,[ G.NCase1 (loc,"_")])
+    | SYMBOL "*"; n=IDENT -> G.NTactic(loc,[ G.NCase1 (loc,n)])
     ]
   ];
   tactic: [
@@ -509,6 +540,16 @@ EXTEND
       params
    ]
 ];
+  nauto_params: [
+    [ params = 
+      LIST0 [
+         i = auto_fixed_param -> i,""
+       | i = auto_fixed_param ; SYMBOL "="; v = [ v = int ->
+              string_of_int v | v = IDENT -> v ] -> i,v ] ->
+      params
+   ]
+];
+
   inline_params:[
    [ params = LIST0 
       [ IDENT "prefix"; SYMBOL "="; prefix = QSTRING -> G.IPPrefix prefix  
@@ -673,12 +714,6 @@ EXTEND
         (params,name,typ,fields)
     ] ];
 
-    nmacro: [
-      [ [ IDENT "ncheck" ]; t = term -> G.NCheck (loc,t)
-      | [ IDENT "screenshot"]; fname = QSTRING -> G.Screenshot (loc, fname)
-      ]
-    ];
-    
     macro: [
       [ [ IDENT "check"   ]; t = term ->
           G.Check (loc, t)
@@ -943,10 +978,13 @@ 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; OPT [ SYMBOL "#" ; SYMBOL "#" ] ; 
+      punct = punctuation_tactical ->
+        cons_ntac tac (npunct_of_punct punct)
+(*
     | tac = ntactic; punct = punctuation_tactical ->
-        G.NTactic (loc, [tac; npunct_of_punct punct])
+        cons_ntac tac (npunct_of_punct punct)
+*)
     | SYMBOL "#" ; SYMBOL "#" ; punct = npunctuation_tactical ->
         G.NTactic (loc, [punct])
     | tac = non_punctuation_tactical; punct = punctuation_tactical ->
@@ -958,7 +996,6 @@ EXTEND
         punct = punctuation_tactical ->
           G.NTactic (loc, [nnon_punct_of_punct tac; npunct_of_punct punct])
     | mac = macro; SYMBOL "." -> G.Macro (loc, mac)
-    | mac = nmacro; SYMBOL "." -> G.NMacro (loc, mac)
     ]
   ];
   comment: [