X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=matita%2Fcomponents%2Fgrafite_parser%2FgrafiteParser.ml;h=5b092a6d310fc2dc3641374cc026a2a73118d194;hb=39b205d12af34c0c8d6e691da2628bc386b70cf2;hp=23d5b5d740e4d850f7f66ef71278071e478e224c;hpb=f68f58e17f9be1d3760dd79064fb950d1aa885e1;p=helm.git diff --git a/matita/components/grafite_parser/grafiteParser.ml b/matita/components/grafite_parser/grafiteParser.ml index 23d5b5d74..5b092a6d3 100644 --- a/matita/components/grafite_parser/grafiteParser.ml +++ b/matita/components/grafite_parser/grafiteParser.ml @@ -27,54 +27,37 @@ module N = NotationPt module G = GrafiteAst -module L = LexiconAst module LE = LexiconEngine -exception NoInclusionPerformed of string (* full path *) - type 'a localized_option = LSome of 'a | LNone of G.loc type ast_statement = G.statement -type 'status statement = - ?never_include:bool -> - (* do not call LexiconEngine to do includes, always raise NoInclusionPerformed *) - include_paths:string list -> (#LE.status as 'status) -> - 'status * ast_statement localized_option - -type 'status parser_status = { - grammar : Grammar.g; - term : N.term Grammar.Entry.e; - statement : #LE.status as 'status statement Grammar.Entry.e; -} - -let grafite_callback = ref (fun _ -> ()) -let set_grafite_callback cb = grafite_callback := cb - -let lexicon_callback = ref (fun _ -> ()) -let set_lexicon_callback cb = lexicon_callback := cb - -let initial_parser () = - let grammar = CicNotationParser.level2_ast_grammar () in - let term = CicNotationParser.term () in - let statement = Grammar.Entry.create grammar "statement" in - { grammar = grammar; term = term; statement = statement } -;; +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 (HExtlib.Localized (floc,CicNotationParser.Parse_error msg)) + | Stdpp.Exc_located (floc, HExtlib.Localized(_,exn)) -> + raise (HExtlib.Localized + (floc,CicNotationParser.Parse_error (Printexc.to_string exn))) + | Stdpp.Exc_located (floc, exn) -> + raise (HExtlib.Localized + (floc,CicNotationParser.Parse_error (Printexc.to_string exn))) -let grafite_parser = ref (initial_parser ()) +let parse_statement grafite_parser lexbuf = + exc_located_wrapper + (fun () -> (Grammar.Entry.parse (Obj.magic grafite_parser) (Obj.magic lexbuf))) let add_raw_attribute ~text t = N.AttributedTerm (`Raw text, t) let default_associativity = Gramext.NonA let mk_rec_corec ind_kind defs loc = - (* In case of mutual definitions here we produce just - the syntax tree for the first one. The others will be - generated from the completely specified term just before - insertion in the environment. We use the flavour - `MutualDefinition to rememer this. *) let name,ty = match defs with | (params,(N.Ident (name, None), ty),_,_) :: _ -> @@ -88,13 +71,7 @@ let mk_rec_corec ind_kind defs loc = | _ -> assert false in let body = N.Ident (name,None) in - let flavour = - if List.length defs = 1 then - `Definition - else - `MutualDefinition - in - (loc, N.Theorem(flavour, name, ty, Some (N.LetRec (ind_kind, defs, body)), `Regular)) + (loc, N.Theorem(`Definition, name, ty, Some (N.LetRec (ind_kind, defs, body)), `Regular)) let nmk_rec_corec ind_kind defs loc = let loc,t = mk_rec_corec ind_kind defs loc in @@ -107,49 +84,38 @@ let nnon_punct_of_punct = function | G.Focus (loc,l) -> G.NFocus (loc,l) ;; *) -let cons_ntac t p = - match t with - | G.NTactic(loc,[t]) -> G.NTactic(loc,[t;p]) - | x -> x -;; - type by_continuation = BYC_done | BYC_weproved of N.term * string option * N.term option | BYC_letsuchthat of string * N.term * string * N.term | BYC_wehaveand of string * N.term * string * N.term -let initialize_parser () = +let mk_parser statement lstatus = +(* let grammar = CicNotationParser.level2_ast_grammar lstatus in *) + let term = CicNotationParser.term lstatus in + let let_defs = CicNotationParser.let_defs lstatus in + let protected_binder_vars = CicNotationParser.protected_binder_vars lstatus in (* {{{ parser initialization *) - let term = !grafite_parser.term in - let statement = !grafite_parser.statement in - let let_defs = CicNotationParser.let_defs () in - let protected_binder_vars = CicNotationParser.protected_binder_vars () in EXTEND GLOBAL: term statement; constructor: [ [ name = IDENT; SYMBOL ":"; typ = term -> (name, typ) ] ]; tactic_term: [ [ t = term LEVEL "90" -> t ] ]; +(* MATITA 1.0 new_name: [ [ SYMBOL "_" -> None | id = IDENT -> Some id ] ]; - ident_list0: [ [ LPAREN; idents = LIST0 new_name; RPAREN -> idents ] ]; +*) ident_list1: [ [ LPAREN; idents = LIST1 IDENT; RPAREN -> idents ] ]; tactic_term_list1: [ [ tactic_terms = LIST1 tactic_term SEP SYMBOL "," -> tactic_terms ] ]; - reduction_kind: [ - [ IDENT "normalize" -> `Normalize - | IDENT "simplify" -> `Simpl - | IDENT "unfold"; t = OPT tactic_term -> `Unfold t - | IDENT "whd" -> `Whd ] - ]; nreduction_kind: [ - [ IDENT "nnormalize" ; delta = OPT [ IDENT "nodelta" -> () ] -> + [ IDENT "normalize" ; delta = OPT [ IDENT "nodelta" -> () ] -> let delta = match delta with None -> true | _ -> false in `Normalize delta (*| IDENT "unfold"; t = OPT tactic_term -> `Unfold t*) - | IDENT "nwhd" ; delta = OPT [ IDENT "nodelta" -> () ] -> + | IDENT "whd" ; delta = OPT [ IDENT "nodelta" -> () ] -> let delta = match delta with None -> true | _ -> false in `Whd delta] ]; @@ -208,11 +174,7 @@ EXTEND | SYMBOL "<" -> `RightToLeft ] ]; int: [ [ num = NUMBER -> int_of_string num ] ]; - intros_names: [ - [ idents = OPT ident_list0 -> - match idents with None -> [] | Some idents -> idents - ] - ]; +(* MATITA 1.0 intros_spec: [ [ OPT [ IDENT "names" ]; num = OPT [ num = int -> num ]; @@ -220,11 +182,13 @@ EXTEND num, idents ] ]; - using: [ [ using = OPT [ IDENT "using"; t = tactic_term -> t ] -> using ] ]; +*) +(* MATITA 1.0 using: [ [ using = OPT [ IDENT "using"; t = tactic_term -> t ] -> using ] ]; *) ntactic: [ - [ 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"; + [ SYMBOL "@"; t = tactic_term -> G.NTactic(loc,[G.NApply (loc, t)]) + | IDENT "apply"; t = tactic_term -> G.NTactic(loc,[G.NApply (loc, t)]) + | IDENT "applyS"; t = tactic_term -> G.NTactic(loc,[G.NSmartApply(loc, t)]) + | IDENT "assert"; seqs = LIST0 [ hyps = LIST0 [ id = IDENT ; SYMBOL ":" ; ty = tactic_term -> id,`Decl ty @@ -234,63 +198,62 @@ EXTEND SYMBOL <:unicode>; concl = tactic_term -> (List.rev hyps,concl) ] -> G.NTactic(loc,[G.NAssert (loc, seqs)]) - | IDENT "nauto"; 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)))) - | IDENT "nintros" -> G.NMacro (loc, G.NIntroGuess loc) - | IDENT "ncheck"; t = term -> G.NMacro(loc,G.NCheck (loc,t)) + 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 -> G.NMacro(loc,G.Screenshot (loc, fname)) - | IDENT "ncases"; what = tactic_term ; where = pattern_spec -> + | IDENT "cases"; what = tactic_term ; where = pattern_spec -> G.NTactic(loc,[G.NCases (loc, what, where)]) - | IDENT "nchange"; what = pattern_spec; "with"; with_what = tactic_term -> + | IDENT "change"; what = pattern_spec; "with"; with_what = tactic_term -> G.NTactic(loc,[G.NChange (loc, what, with_what)]) | SYMBOL "@"; num = OPT NUMBER; l = LIST0 tactic_term -> 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"; just = OPT [ dom = ident_list1 -> dom ]; + | IDENT "cut"; t = tactic_term -> G.NTactic(loc,[G.NCut (loc, t)]) +(* | IDENT "discriminate"; t = tactic_term -> G.NDiscriminate (loc, t) + | IDENT "subst"; t = tactic_term -> G.NSubst (loc, t) *) + | IDENT "destruct"; just = OPT [ dom = ident_list1 -> dom ]; exclude = OPT [ IDENT "skip"; skip = ident_list1 -> skip ] -> let exclude' = match exclude with None -> [] | Some l -> l in G.NTactic(loc,[G.NDestruct (loc,just,exclude')]) - | IDENT "nelim"; what = tactic_term ; where = pattern_spec -> + | IDENT "elim"; what = tactic_term ; where = pattern_spec -> G.NTactic(loc,[G.NElim (loc, what, where)]) - | IDENT "ngeneralize"; p=pattern_spec -> + | IDENT "generalize"; p=pattern_spec -> G.NTactic(loc,[G.NGeneralize (loc, p)]) - | IDENT "ninversion"; what = tactic_term ; where = pattern_spec -> + | IDENT "inversion"; what = tactic_term ; where = pattern_spec -> 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> ; t = tactic_term; + | IDENT "lapply"; t = tactic_term -> G.NTactic(loc,[G.NLApply (loc, t)]) + | IDENT "letin"; name = IDENT ; SYMBOL <:unicode> ; t = tactic_term; where = pattern_spec -> G.NTactic(loc,[G.NLetIn (loc,where,t,name)]) | kind = nreduction_kind; p = pattern_spec -> G.NTactic(loc,[G.NReduce (loc, kind, p)]) - | IDENT "nrewrite"; dir = direction; what = tactic_term ; where = pattern_spec -> + | dir = direction; what = tactic_term ; where = pattern_spec -> G.NTactic(loc,[G.NRewrite (loc, dir, what, where)]) - | IDENT "ntry"; tac = SELF -> + | IDENT "rewrite"; dir = direction; what = tactic_term ; where = pattern_spec -> + G.NTactic(loc,[G.NRewrite (loc, dir, what, where)]) + | IDENT "try"; 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 -> + | IDENT "repeat"; 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 -> @@ -298,8 +261,8 @@ EXTEND 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 "#"; ns=LIST0 IDENT -> G.NTactic(loc,[ G.NIntros (loc,ns)]) + | IDENT "assumption" -> G.NTactic(loc,[ G.NAssumption loc]) + | SYMBOL "#"; ns=IDENT -> G.NTactic(loc,[ G.NIntros (loc,[ns])]) | 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)]) @@ -324,21 +287,14 @@ 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 ] ]; +(* MATITA 1.0 by_continuation: [ [ WEPROVED; ty = tactic_term ; LPAREN ; id = IDENT ; RPAREN ; t1 = OPT [IDENT "that" ; IDENT "is" ; IDENT "equivalent" ; "to" ; t2 = tactic_term -> t2] -> BYC_weproved (ty,Some id,t1) | WEPROVED; ty = tactic_term ; t1 = OPT [IDENT "that" ; IDENT "is" ; IDENT "equivalent" ; "to" ; t2 = tactic_term -> t2] ; @@ -351,11 +307,14 @@ EXTEND BYC_wehaveand (id1,t1,id2,t2) ] ]; +*) +(* MATITA 1.0 rewriting_step_continuation : [ [ "done" -> true | -> false ] ]; +*) (* MATITA 1.0 atomic_tactical: [ "sequence" LEFTA @@ -411,27 +370,14 @@ EXTEND ] ]; ntheorem_flavour: [ - [ [ IDENT "ndefinition" ] -> `Definition - | [ IDENT "nfact" ] -> `Fact - | [ IDENT "nlemma" ] -> `Lemma - | [ IDENT "nremark" ] -> `Remark - | [ IDENT "ntheorem" ] -> `Theorem - ] - ]; - theorem_flavour: [ [ [ IDENT "definition" ] -> `Definition | [ IDENT "fact" ] -> `Fact | [ IDENT "lemma" ] -> `Lemma - | [ IDENT "remark" ] -> `Remark + | [ IDENT "example" ] -> `Example | [ IDENT "theorem" ] -> `Theorem + | [ IDENT "corollary" ] -> `Corollary ] ]; - inline_flavour: [ - [ attr = theorem_flavour -> attr - | [ IDENT "axiom" ] -> `Axiom - | [ IDENT "variant" ] -> `Variant - ] - ]; inductive_spec: [ [ fst_name = IDENT; params = LIST0 protected_binder_vars; @@ -488,12 +434,10 @@ EXTEND let ident = "\\("^alpha^ident_cont^"*"^decoration^"*\\|_"^ident_cont^"+"^decoration^"*\\)" in let rex = Str.regexp ("^"^ident^"$") in if Str.string_match rex id 0 then - if (try ignore (UriManager.uri_of_string uri); true - with UriManager.IllFormedUri _ -> false) || - (try ignore (NReference.reference_of_string uri); true + if (try ignore (NReference.reference_of_string uri); true with NReference.IllFormedReference _ -> false) then - L.Ident_alias (id, uri) + G.Ident_alias (id, uri) else raise (HExtlib.Localized (loc, CicNotationParser.Parse_error (Printf.sprintf "Not a valid uri: %s" uri))) @@ -506,14 +450,14 @@ EXTEND let instance = match instance with Some i -> i | None -> 0 in - L.Symbol_alias (symbol, instance, dsc) + G.Symbol_alias (symbol, instance, dsc) | IDENT "num"; instance = OPT [ LPAREN; IDENT "instance"; n = int; RPAREN -> n ]; SYMBOL "="; dsc = QSTRING -> let instance = match instance with Some i -> i | None -> 0 in - L.Number_alias (instance, dsc) + G.Number_alias (instance, dsc) ] ]; argument: [ @@ -538,11 +482,11 @@ EXTEND p2 = [ blob = UNPARSED_AST -> add_raw_attribute ~text:(Printf.sprintf "@{%s}" blob) - (CicNotationParser.parse_level2_ast + (CicNotationParser.parse_level2_ast lstatus (Ulexing.from_utf8_string blob)) | blob = UNPARSED_META -> add_raw_attribute ~text:(Printf.sprintf "${%s}" blob) - (CicNotationParser.parse_level2_meta + (CicNotationParser.parse_level2_meta lstatus (Ulexing.from_utf8_string blob)) ] -> let assoc = @@ -552,15 +496,14 @@ EXTEND in let p1 = add_raw_attribute ~text:s - (CicNotationParser.parse_level1_pattern prec + (CicNotationParser.parse_level1_pattern lstatus prec (Ulexing.from_utf8_string s)) in (dir, p1, assoc, prec, p2) ] ]; level3_term: [ - [ u = URI -> N.UriPattern (UriManager.uri_of_string u) - | r = NREF -> N.NRefPattern (NReference.reference_of_string r) + [ r = NREF -> N.NRefPattern (NReference.reference_of_string r) | IMPLICIT -> N.ImplicitPattern | id = IDENT -> N.VarPattern id | LPAREN; terms = LIST1 SELF; RPAREN -> @@ -578,25 +521,23 @@ EXTEND include_command: [ [ IDENT "include" ; path = QSTRING -> - loc,path,true,L.WithPreferences - | IDENT "include" ; IDENT "source" ; path = QSTRING -> - loc,path,false,L.WithPreferences + loc,path,G.WithPreferences | IDENT "include'" ; path = QSTRING -> - loc,path,true,L.WithoutPreferences + loc,path,G.WithoutPreferences ]]; grafite_ncommand: [ [ - IDENT "nqed" -> G.NQed loc + IDENT "qed" -> G.NQed loc | nflavour = ntheorem_flavour; name = IDENT; SYMBOL ":"; typ = term; body = OPT [ SYMBOL <:unicode> (* ≝ *); body = term -> body ] -> G.NObj (loc, N.Theorem (nflavour, name, typ, body,`Regular)) | nflavour = ntheorem_flavour; name = IDENT; SYMBOL <:unicode> (* ≝ *); body = term -> G.NObj (loc, N.Theorem (nflavour, name, N.Implicit `JustOne, Some body,`Regular)) - | IDENT "naxiom"; name = IDENT; SYMBOL ":"; typ = term -> + | IDENT "axiom"; name = IDENT; SYMBOL ":"; typ = term -> G.NObj (loc, N.Theorem (`Axiom, name, typ, None, `Regular)) - | IDENT "ndiscriminator" ; indty = tactic_term -> G.NDiscriminator (loc,indty) - | IDENT "ninverter"; name = IDENT; IDENT "for" ; indty = tactic_term ; + | IDENT "discriminator" ; indty = tactic_term -> G.NDiscriminator (loc,indty) + | IDENT "inverter"; name = IDENT; IDENT "for" ; indty = tactic_term ; paramspec = OPT inverter_param_list ; outsort = OPT [ SYMBOL ":" ; outsort = term -> outsort ] -> G.NInverter (loc,name,indty,paramspec,outsort) @@ -604,10 +545,10 @@ EXTEND nmk_rec_corec `CoInductive defs loc | NLETREC ; defs = let_defs -> nmk_rec_corec `Inductive defs loc - | IDENT "ninductive"; spec = inductive_spec -> + | IDENT "inductive"; spec = inductive_spec -> let (params, ind_types) = spec in G.NObj (loc, N.Inductive (params, ind_types)) - | IDENT "ncoinductive"; spec = inductive_spec -> + | IDENT "coinductive"; spec = inductive_spec -> let (params, ind_types) = spec in let ind_types = (* set inductive flags to false (coinductive) *) List.map (fun (name, _, term, ctors) -> (name, false, term, ctors)) @@ -626,40 +567,41 @@ EXTEND G.NUnivConstraint (loc,u1,u2) | IDENT "unification"; IDENT "hint"; n = int; t = tactic_term -> G.UnificationHint (loc, t, n) - | IDENT "ncoercion"; name = IDENT; SYMBOL ":"; ty = term; + | IDENT "coercion"; name = IDENT; SYMBOL ":"; ty = term; SYMBOL <:unicode>; t = term; "on"; id = [ IDENT | PIDENT ]; SYMBOL ":"; source = term; "to"; target = term -> G.NCoercion(loc,name,t,ty,(id,source),target) - | IDENT "nrecord" ; (params,name,ty,fields) = record_spec -> + | IDENT "record" ; (params,name,ty,fields) = record_spec -> G.NObj (loc, N.Record (params,name,ty,fields)) - | IDENT "ncopy" ; s = IDENT; IDENT "from"; u = URI; "with"; + | IDENT "copy" ; s = IDENT; IDENT "from"; u = URI; "with"; m = LIST0 [ u1 = URI; SYMBOL <:unicode>; u2 = URI -> u1,u2 ] -> G.NCopy (loc,s,NUri.uri_of_string u, List.map (fun a,b -> NUri.uri_of_string a, NUri.uri_of_string b) m) + | lc = lexicon_command -> lc ]]; lexicon_command: [ [ IDENT "alias" ; spec = alias_spec -> - L.Alias (loc, spec) + G.Alias (loc, spec) | IDENT "notation"; (dir, l1, assoc, prec, l2) = notation -> - L.Notation (loc, dir, l1, assoc, prec, l2) + G.Notation (loc, dir, l1, assoc, prec, l2) | IDENT "interpretation"; id = QSTRING; (symbol, args, l3) = interpretation -> - L.Interpretation (loc, id, (symbol, args), l3) + G.Interpretation (loc, id, (symbol, args), l3) ]]; executable: [ [ ncmd = grafite_ncommand; SYMBOL "." -> G.NCommand (loc, ncmd) - | tac = ntactic; OPT [ SYMBOL "#" ; SYMBOL "#" ] ; - punct = npunctuation_tactical -> cons_ntac tac punct - | SYMBOL "#" ; SYMBOL "#" ; punct = npunctuation_tactical -> - G.NTactic (loc, [punct]) - | SYMBOL "#" ; SYMBOL "#" ; tac = nnon_punctuation_tactical; - SYMBOL "#" ; SYMBOL "#" ; punct = npunctuation_tactical -> - G.NTactic (loc, [tac; punct]) - | SYMBOL "#" ; SYMBOL "#" ; tac = nnon_punctuation_tactical; + | punct = npunctuation_tactical -> G.NTactic (loc, [punct]) + | tac = nnon_punctuation_tactical(*; punct = npunctuation_tactical*) -> + G.NTactic (loc, [tac]) + | tac = ntactic (*; punct = npunctuation_tactical*) -> + tac +(* + | tac = nnon_punctuation_tactical; punct = npunctuation_tactical -> G.NTactic (loc, [tac; punct]) +*) ] ]; comment: [ @@ -671,86 +613,50 @@ EXTEND ]; statement: [ [ ex = executable -> - fun ?(never_include=false) ~include_paths status -> - let stm = G.Executable (loc, ex) in - !grafite_callback stm; - status, LSome stm + LSome (G.Executable (loc, ex)) | com = comment -> - fun ?(never_include=false) ~include_paths status -> - let stm = G.Comment (loc, com) in - !grafite_callback stm; - status, LSome stm - | (iloc,fname,normal,mode) = include_command ; SYMBOL "." -> - fun ?(never_include=false) ~include_paths status -> - let _root, buri, fullpath, _rrelpath = - Librarian.baseuri_of_script ~include_paths fname in - if never_include then raise (NoInclusionPerformed fullpath) - else - begin - let stm = - G.Executable - (loc, G.Command (loc, G.Include (iloc,fname))) in - !grafite_callback stm; - let status = - LE.eval_command status (L.Include (iloc,buri,mode,fullpath)) in - let stm = - G.Executable - (loc,G.Command (loc,G.Include (iloc,buri))) - in - status, LSome stm - end - | scom = lexicon_command ; SYMBOL "." -> - fun ?(never_include=false) ~include_paths status -> - !lexicon_callback scom; - let status = LE.eval_command status scom in - status, LNone loc + LSome (G.Comment (loc, com)) + | (iloc,fname,mode) = include_command ; SYMBOL "." -> + LSome (G.Executable (loc,G.NCommand (loc,G.Include (iloc,mode,fname)))) | EOI -> raise End_of_file ] ]; -END + END; (* }}} *) + statement ;; -let _ = initialize_parser () ;; - -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 (HExtlib.Localized (floc,CicNotationParser.Parse_error msg)) - | Stdpp.Exc_located (floc, HExtlib.Localized(_,exn)) -> - raise - (HExtlib.Localized (floc,CicNotationParser.Parse_error (Printexc.to_string exn))) - | Stdpp.Exc_located (floc, exn) -> - raise - (HExtlib.Localized (floc,CicNotationParser.Parse_error (Printexc.to_string exn))) - -let parse_statement lexbuf = - exc_located_wrapper - (fun () -> (Grammar.Entry.parse (Obj.magic !grafite_parser.statement) (Obj.magic lexbuf))) - -let statement () = Obj.magic !grafite_parser.statement - -let history = ref [] ;; - -let push () = - LexiconSync.push (); - history := !grafite_parser :: !history; - grafite_parser := initial_parser (); - initialize_parser () +type db = ast_statement localized_option Grammar.Entry.e ;; + +class type g_status = + object + inherit CicNotationParser.g_status + method parser_db: db + end + +class status = + object(self) + inherit CicNotationParser.status ~keywords:[] + val mutable db = None + method parser_db = match db with None -> assert false | Some x -> x + method set_parser_db v = {< db = Some v >} + method set_parser_status + : 'status. #g_status as 'status -> 'self + = fun o -> {< db = Some o#parser_db >}#set_notation_parser_status o + initializer + let grammar = CicNotationParser.level2_ast_grammar self in + db <- Some (mk_parser (Grammar.Entry.create grammar "statement") self) + end + +let extend status l1 action = + let status = CicNotationParser.extend status l1 action in + let grammar = CicNotationParser.level2_ast_grammar status in + status#set_parser_db + (mk_parser (Grammar.Entry.create grammar "statement") status) ;; -let pop () = - LexiconSync.pop (); - match !history with - | [] -> assert false - | gp :: tail -> - grafite_parser := gp; - history := tail -;; - -(* vim:set foldmethod=marker: *) +let parse_statement status = + parse_statement status#parser_db +(* vim:set foldmethod=marker: *)