X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=matita%2Fcomponents%2Fgrafite_parser%2FgrafiteParser.ml;h=0679c889539ebb5fe0101897c8b4d971e4273681;hb=3ce27112fe93ced5f67cc6af8fc63037eba3f322;hp=f0da64a51586c86ee93c4b71f64894127827fb9a;hpb=3f9cb46b5e167955e85b3d2544f1bed90f1a25b7;p=helm.git diff --git a/matita/components/grafite_parser/grafiteParser.ml b/matita/components/grafite_parser/grafiteParser.ml index f0da64a51..0679c8895 100644 --- a/matita/components/grafite_parser/grafiteParser.ml +++ b/matita/components/grafite_parser/grafiteParser.ml @@ -218,28 +218,25 @@ EXTEND SYMBOL <:unicode>; concl = tactic_term -> (List.rev hyps,concl) ] -> G.NTactic(loc,[G.NAssert (loc, seqs)]) - | IDENT "auto"; params = auto_params -> - G.NTactic(loc,[G.NAuto (loc, params)]) + (*| IDENT "auto"; 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 ] -> + just_and_params = auto_params; SYMBOL "/" -> + let just,params = just_and_params in 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))]) + G.NTactic(loc, + [G.NAuto(loc,(None,["depth",depth]@params))]) | Some (`Univ univ) -> - G.NTactic(loc, - [G.NAuto(loc,(Some univ,["slir","";"depth",depth]@params))]) + G.NTactic(loc, + [G.NAuto(loc,(Some univ,["depth",depth]@params))]) | Some `EmptyUniv -> - G.NTactic(loc, - [G.NAuto(loc,(Some [],["slir","";"depth",depth]@params))]) + G.NTactic(loc, + [G.NAuto(loc,(Some [],["depth",depth]@params))]) | Some `Trace -> - G.NMacro(loc, - G.NAutoInteractive (loc, (None,["slir","";"depth",depth]@params)))) + G.NMacro(loc, + G.NAutoInteractive (loc, (None,["depth",depth]@params)))) | IDENT "intros" -> G.NMacro (loc, G.NIntroGuess loc) | IDENT "check"; t = term -> G.NMacro(loc,G.NCheck (loc,t)) | IDENT "screenshot"; fname = QSTRING -> @@ -310,18 +307,10 @@ EXTEND i = auto_fixed_param -> i,"" | i = auto_fixed_param ; SYMBOL "="; v = [ v = int -> string_of_int v | v = IDENT -> v ] -> i,v ]; - tl = OPT [ IDENT "by"; tl = tactic_term_list1 -> tl] -> tl, - (* (match tl with Some l -> l | None -> []), *) - 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 + just = OPT [ IDENT "by"; by = + [ univ = tactic_term_list1 -> `Univ univ + | SYMBOL "{"; SYMBOL "}" -> `EmptyUniv + | SYMBOL "_" -> `Trace ] -> by ] -> just,params ] ];