X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Fsoftware%2Fcomponents%2Fgrafite_parser%2FgrafiteParser.ml;h=aa10bdcf315e2e436b4f45479df51bd5397cda33;hb=4e3d7b4b47f66f0745333bfd4efcb27b4528f4c3;hp=e480efd34f1cbfbc77656716ee0f4f9ff0b59f66;hpb=55b82bd235d82ff7f0a40d980effe1efde1f5073;p=helm.git diff --git a/helm/software/components/grafite_parser/grafiteParser.ml b/helm/software/components/grafite_parser/grafiteParser.ml index e480efd34..aa10bdcf3 100644 --- a/helm/software/components/grafite_parser/grafiteParser.ml +++ b/helm/software/components/grafite_parser/grafiteParser.ml @@ -31,15 +31,17 @@ module Ast = CicNotationPt type 'a localized_option = LSome of 'a - | LNone of Token.flocation + | LNone of GrafiteAst.loc -type statement = - include_paths:string list -> - LexiconEngine.status -> - LexiconEngine.status * +type ast_statement = (CicNotationPt.term, CicNotationPt.term, CicNotationPt.term GrafiteAst.reduction, CicNotationPt.obj, string) - GrafiteAst.statement localized_option + GrafiteAst.statement + +type statement = + include_paths:string list -> + LexiconEngine.status -> + LexiconEngine.status * ast_statement localized_option let grammar = CicNotationParser.level2_ast_grammar @@ -140,16 +142,12 @@ EXTEND GrafiteAst.ClearBody (loc,id) | IDENT "change"; what = pattern_spec; "with"; t = tactic_term -> GrafiteAst.Change (loc, what, t) - | IDENT "compare"; t = tactic_term -> - GrafiteAst.Compare (loc,t) | IDENT "constructor"; n = int -> GrafiteAst.Constructor (loc, n) | IDENT "contradiction" -> GrafiteAst.Contradiction loc | IDENT "cut"; t = tactic_term; ident = OPT [ "as"; id = IDENT -> id] -> GrafiteAst.Cut (loc, ident, t) - | IDENT "decide"; IDENT "equality" -> - GrafiteAst.DecideEquality loc | IDENT "decompose"; types = OPT ident_list0; what = IDENT; (num, idents) = intros_spec -> let types = match types with None -> [] | Some types -> types in