Matitaweb:

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

diff --git a/matitaB/components/grafite_parser/grafiteParser.ml b/matitaB/components/grafite_parser/grafiteParser.ml
index 1010e2c83975fb7616bca27e58353b15887a3da1..b72fecb76656bdace9c41fb35bcd220849629129 100644 (file)
--- a/matitaB/components/grafite_parser/grafiteParser.ml
+++ b/matitaB/components/grafite_parser/grafiteParser.ml
@@ -211,13 +211,13 @@ EXTEND
        | None -> 
                 G.NTactic(loc,
             [G.NAuto(loc,(None,["depth",depth]@params))])
-       | Some (`Univ univ) ->
+       | Some (b,`Univ univ) ->
                 G.NTactic(loc,
-            [G.NAuto(loc,(Some univ,["depth",depth]@params))])
-       | Some `EmptyUniv ->
+            [G.NAuto(loc,(Some (b,univ),["depth",depth]@params))])
+       | Some (b,`EmptyUniv) ->
                 G.NTactic(loc,
-            [G.NAuto(loc,(Some [],["depth",depth]@params))])
-       | Some `Trace ->
+            [G.NAuto(loc,(Some (b,[]),["depth",depth]@params))])
+       | Some (b,`Trace) ->
                 G.NMacro(loc,
              G.NAutoInteractive (loc, (None,["depth",depth]@params))))
     | IDENT "intros" -> G.NMacro (loc, G.NIntroGuess loc)
@@ -293,10 +293,13 @@ EXTEND
          i = auto_fixed_param -> i,""
        | i = auto_fixed_param ; SYMBOL "="; v = [ v = int ->
               string_of_int v | v = IDENT -> v ] -> i,v ]; 
-      just = OPT [ IDENT "by"; by = 
-        [ univ = tactic_term_list1 -> `Univ univ
-        | SYMBOL "{"; SYMBOL "}" -> `EmptyUniv
-        | SYMBOL "_" -> `Trace ] -> by ] -> just,params
+      just = OPT [ is_user_trace = 
+              [ IDENT "by" -> true
+              | IDENT "trace" -> false ]; 
+          by = 
+           [ univ = tactic_term_list1 -> `Univ univ
+           | SYMBOL "{"; SYMBOL "}" -> `EmptyUniv
+           | SYMBOL "_" -> `Trace ] -> is_user_trace,by ] -> just,params
    ]
 ];