X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;ds=sidebyside;f=helm%2Focaml%2Fcic_notation%2FgrafiteParser.ml;h=4a21e10b5a9e6334ce022bbb430b6ba6739fb08f;hb=33a02e0b639217093eb63f30169aaa6ac8c78907;hp=41c3fd054bb411936e8289f386addbfe93933e5e;hpb=34113d572c334c351ba66f4b05db503eed4d48f2;p=helm.git diff --git a/helm/ocaml/cic_notation/grafiteParser.ml b/helm/ocaml/cic_notation/grafiteParser.ml index 41c3fd054..4a21e10b5 100644 --- a/helm/ocaml/cic_notation/grafiteParser.ml +++ b/helm/ocaml/cic_notation/grafiteParser.ml @@ -25,18 +25,24 @@ open Printf +module Ast = CicNotationPt + let grammar = CicNotationParser.level2_ast_grammar let term = CicNotationParser.term let statement = Grammar.Entry.create grammar "statement" -let statements = Grammar.Entry.create grammar "statements" + +let add_raw_attribute ~text t = Ast.AttributedTerm (`Raw text, t) + +let default_precedence = 50 +let default_associativity = Gramext.NonA EXTEND - GLOBAL: term statement statements; + GLOBAL: term statement; arg: [ [ LPAREN; names = LIST1 IDENT SEP SYMBOL ","; SYMBOL ":"; ty = term; RPAREN -> names,ty - | name = IDENT -> [name],CicNotationPt.Implicit + | name = IDENT -> [name],Ast.Implicit ] ]; constructor: [ [ name = IDENT; SYMBOL ":"; typ = term -> (name, typ) ] ]; @@ -48,23 +54,25 @@ EXTEND [ tactic_terms = LIST1 tactic_term SEP SYMBOL "," -> tactic_terms ] ]; reduction_kind: [ - [ IDENT "reduce" -> `Reduce + [ IDENT "normalize" -> `Normalize + | IDENT "reduce" -> `Reduce | IDENT "simplify" -> `Simpl - | IDENT "whd" -> `Whd - | IDENT "normalize" -> `Normalize ] + | IDENT "unfold"; t = OPT term -> `Unfold t + | IDENT "whd" -> `Whd ] ]; sequent_pattern_spec: [ [ hyp_paths = LIST0 [ id = IDENT ; path = OPT [SYMBOL ":" ; path = term -> path ] -> - (id,match path with Some p -> p | None -> CicNotationPt.UserInput) ] + (id,match path with Some p -> p | None -> Ast.UserInput) ] SEP SYMBOL ";"; goal_path = OPT [ SYMBOL <:unicode>; term = term -> term ] -> let goal_path = - match goal_path with - None -> CicNotationPt.UserInput - | Some goal_path -> goal_path + match goal_path, hyp_paths with + None, [] -> Ast.UserInput + | None, _::_ -> Ast.Implicit + | Some goal_path, _ -> goal_path in hyp_paths,goal_path ] @@ -81,12 +89,12 @@ EXTEND ] -> let wanted,hyp_paths,goal_path = match wanted_and_sps with - wanted,None -> wanted, [], CicNotationPt.UserInput + wanted,None -> wanted, [], Ast.UserInput | wanted,Some (hyp_paths,goal_path) -> wanted,hyp_paths,goal_path in wanted, hyp_paths, goal_path ] -> match res with - None -> None,[],CicNotationPt.UserInput + None -> None,[],Ast.UserInput | Some ps -> ps] ]; direction: [ @@ -103,8 +111,9 @@ EXTEND GrafiteAst.Assumption loc | IDENT "auto"; depth = OPT [ IDENT "depth"; SYMBOL "="; i = int -> i ]; - width = OPT [ IDENT "width"; SYMBOL "="; i = int -> i ] -> - GrafiteAst.Auto (loc,depth,width) + width = OPT [ IDENT "width"; SYMBOL "="; i = int -> i ]; + paramodulation = OPT [ IDENT "paramodulation" ] -> (* ALB *) + GrafiteAst.Auto (loc,depth,width,paramodulation) | IDENT "clear"; id = IDENT -> GrafiteAst.Clear (loc,id) | IDENT "clearbody"; id = IDENT -> @@ -121,8 +130,13 @@ EXTEND GrafiteAst.Cut (loc, ident, t) | IDENT "decide"; IDENT "equality" -> GrafiteAst.DecideEquality loc - | IDENT "decompose"; where = tactic_term -> - GrafiteAst.Decompose (loc, where) + | IDENT "decompose"; types = OPT ident_list0; what = IDENT; + OPT "names"; num = OPT [num = int -> num]; + idents = OPT ident_list0 -> + let idents = match idents with None -> [] | Some idents -> idents in + let types = match types with None -> [] | Some types -> types in + let to_spec id = GrafiteAst.Ident id in + GrafiteAst.Decompose (loc, List.rev_map to_spec types, what, idents) | IDENT "discriminate"; t = tactic_term -> GrafiteAst.Discriminate (loc, t) | IDENT "elim"; what = tactic_term; @@ -338,10 +352,10 @@ EXTEND ] ]; argument: [ - [ id = IDENT -> GrafiteAst.IdentArg (0, id) + [ id = IDENT -> Ast.IdentArg (0, id) | l = LIST1 [ SYMBOL <:unicode> (* η *) -> () ] SEP SYMBOL "."; SYMBOL "."; id = IDENT -> - GrafiteAst.IdentArg (List.length l, id) + Ast.IdentArg (List.length l, id) ] ]; associativity: [ @@ -354,30 +368,47 @@ EXTEND [ "with"; IDENT "precedence"; n = NUMBER -> int_of_string n ] ]; notation: [ - [ s = QSTRING; + [ dir = OPT direction; s = QSTRING; assoc = OPT associativity; prec = OPT precedence; IDENT "for"; p2 = [ blob = UNPARSED_AST -> - CicNotationParser.parse_level2_ast (Stream.of_string blob) + add_raw_attribute ~text:(sprintf "@{%s}" blob) + (CicNotationParser.parse_level2_ast (Stream.of_string blob)) | blob = UNPARSED_META -> - CicNotationParser.parse_level2_meta (Stream.of_string blob) ] - -> - (CicNotationParser.parse_level1_pattern (Stream.of_string s), assoc, prec, p2) + add_raw_attribute ~text:(sprintf "${%s}" blob) + (CicNotationParser.parse_level2_meta (Stream.of_string blob)) + ] -> + let assoc = + match assoc with + | None -> default_associativity + | Some assoc -> assoc + in + let prec = + match prec with + | None -> default_precedence + | Some prec -> prec + in + let p1 = + add_raw_attribute ~text:s + (CicNotationParser.parse_level1_pattern (Stream.of_string s)) + in + (dir, p1, assoc, prec, p2) ] ]; level3_term: [ - [ u = URI -> GrafiteAst.UriPattern (UriManager.uri_of_string u) - | id = IDENT -> GrafiteAst.VarPattern id + [ u = URI -> Ast.UriPattern (UriManager.uri_of_string u) + | id = IDENT -> Ast.VarPattern id + | SYMBOL "_" -> Ast.ImplicitPattern | LPAREN; terms = LIST1 SELF; RPAREN -> (match terms with | [] -> assert false | [term] -> term - | terms -> GrafiteAst.ApplPattern terms) + | terms -> Ast.ApplPattern terms) ] ]; interpretation: [ - [ s = CSYMBOL; args = LIST1 argument; SYMBOL "="; t = level3_term -> + [ s = CSYMBOL; args = LIST0 argument; SYMBOL "="; t = level3_term -> (s, args, t) ] ]; @@ -390,26 +421,26 @@ EXTEND typ = term; SYMBOL <:unicode> ; newname = IDENT -> GrafiteAst.Obj (loc, GrafiteAst.Theorem - (`Variant,name,typ,Some (CicNotationPt.Ident (newname, None)))) + (`Variant,name,typ,Some (Ast.Ident (newname, None)))) | flavour = theorem_flavour; name = IDENT; SYMBOL ":"; typ = term; body = OPT [ SYMBOL <:unicode> (* ≝ *); body = term -> body ] -> GrafiteAst.Obj (loc,GrafiteAst.Theorem (flavour, name, typ, body)) | flavour = theorem_flavour; name = IDENT; body = OPT [ SYMBOL <:unicode> (* ≝ *); body = term -> body ] -> GrafiteAst.Obj (loc, - GrafiteAst.Theorem (flavour, name, CicNotationPt.Implicit, body)) + GrafiteAst.Theorem (flavour, name, Ast.Implicit, body)) | "let"; ind_kind = [ "corec" -> `CoInductive | "rec"-> `Inductive ]; defs = CicNotationParser.let_defs -> let name,ty = match defs with - | ((CicNotationPt.Ident (name, None), Some ty),_,_) :: _ -> name,ty - | ((CicNotationPt.Ident (name, None), None),_,_) :: _ -> - name, CicNotationPt.Implicit + | ((Ast.Ident (name, None), Some ty),_,_) :: _ -> name,ty + | ((Ast.Ident (name, None), None),_,_) :: _ -> + name, Ast.Implicit | _ -> assert false in - let body = CicNotationPt.Ident (name,None) in + let body = Ast.Ident (name,None) in GrafiteAst.Obj (loc,GrafiteAst.Theorem(`Definition, name, ty, - Some (CicNotationPt.LetRec (ind_kind, defs, body)))) + Some (Ast.LetRec (ind_kind, defs, body)))) | [ IDENT "inductive" ]; spec = inductive_spec -> let (params, ind_types) = spec in GrafiteAst.Obj (loc,GrafiteAst.Inductive (params, ind_types)) @@ -421,9 +452,9 @@ EXTEND in GrafiteAst.Obj (loc,GrafiteAst.Inductive (params, ind_types)) | IDENT "coercion" ; name = IDENT -> - GrafiteAst.Coercion (loc, CicNotationPt.Ident (name,Some [])) + GrafiteAst.Coercion (loc, Ast.Ident (name,Some [])) | IDENT "coercion" ; name = URI -> - GrafiteAst.Coercion (loc, CicNotationPt.Uri (name,Some [])) + GrafiteAst.Coercion (loc, Ast.Uri (name,Some [])) | IDENT "alias" ; spec = alias_spec -> GrafiteAst.Alias (loc, spec) | IDENT "record" ; (params,name,ty,fields) = record_spec -> @@ -433,13 +464,15 @@ EXTEND | IDENT "default" ; what = QSTRING ; uris = LIST1 URI -> let uris = List.map UriManager.uri_of_string uris in GrafiteAst.Default (loc,what,uris) - | IDENT "notation"; (l1, assoc, prec, l2) = notation -> - GrafiteAst.Notation (loc, l1, assoc, prec, l2) - | IDENT "interpretation"; (symbol, args, l3) = interpretation -> - GrafiteAst.Interpretation (loc, (symbol, args), l3) + | IDENT "notation"; (dir, l1, assoc, prec, l2) = notation -> + GrafiteAst.Notation (loc, dir, l1, assoc, prec, l2) + | IDENT "interpretation"; id = QSTRING; + (symbol, args, l3) = interpretation -> + GrafiteAst.Interpretation (loc, id, (symbol, args), l3) | IDENT "dump" -> GrafiteAst.Dump loc - | IDENT "render"; u = URI -> GrafiteAst.Render (loc, UriManager.uri_of_string u) + | IDENT "render"; u = URI -> + GrafiteAst.Render (loc, UriManager.uri_of_string u) ]]; executable: [ [ cmd = command; SYMBOL "." -> GrafiteAst.Command (loc, cmd) @@ -457,18 +490,16 @@ EXTEND statement: [ [ ex = executable -> GrafiteAst.Executable (loc,ex) | com = comment -> GrafiteAst.Comment (loc, com) + | EOI -> raise End_of_file ] ]; - statements: [ - [ l = LIST0 statement ; EOI -> l - ] - ]; END let exc_located_wrapper f = try f () with + | Stdpp.Exc_located (_, End_of_file) -> raise End_of_file | Stdpp.Exc_located (floc, Stream.Error msg) -> raise (CicNotationParser.Parse_error (floc, msg)) | Stdpp.Exc_located (floc, exn) -> @@ -476,6 +507,4 @@ let exc_located_wrapper f = let parse_statement stream = exc_located_wrapper (fun () -> (Grammar.Entry.parse statement stream)) -let parse_statements stream = - exc_located_wrapper (fun () -> (Grammar.Entry.parse statements stream))