diff options
author | Samuel Mimram <smimram@debian.org> | 2006-01-19 22:34:29 +0000 |
---|---|---|
committer | Samuel Mimram <smimram@debian.org> | 2006-01-19 22:34:29 +0000 |
commit | 018ee3b0c2be79eb81b1f65c3f3fa142d24129c8 (patch) | |
tree | fbb91e2f74c73bb867ab62c58f248a704bbe6dec /parsing/egrammar.ml | |
parent | 6497f27021fec4e01f2182014f2bb1989b4707f9 (diff) |
Imported Upstream version 8.0pl3upstream/8.0pl3
Diffstat (limited to 'parsing/egrammar.ml')
-rw-r--r-- | parsing/egrammar.ml | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/parsing/egrammar.ml b/parsing/egrammar.ml index 7a151c1a..09889d40 100644 --- a/parsing/egrammar.ml +++ b/parsing/egrammar.ml @@ -6,7 +6,7 @@ (* * GNU Lesser General Public License Version 2.1 *) (************************************************************************) -(* $Id: egrammar.ml,v 1.48.2.3 2004/11/26 19:37:59 herbelin Exp $ *) +(* $Id: egrammar.ml,v 1.48.2.4 2005/12/23 22:16:46 herbelin Exp $ *) open Pp open Util @@ -30,12 +30,13 @@ type all_grammar_command = | TacticGrammar of (string * (string * grammar_production list) * (Names.dir_path * Tacexpr.raw_tactic_expr)) - list + list * (string * Genarg.argument_type list * + (string * Pptactic.grammar_terminals)) list let subst_all_grammar_command subst = function | Notation _ -> anomaly "Notation not in GRAMMAR summary" | Grammar gc -> Grammar (subst_grammar_command subst gc) - | TacticGrammar g -> TacticGrammar g (* TODO ... *) + | TacticGrammar (g,p) -> TacticGrammar (g,p) (* TODO ... *) let (grammar_state : all_grammar_command list ref) = ref [] @@ -419,7 +420,7 @@ let extend_grammar gram = (match gram with | Notation (_,a) -> extend_constr_notation a | Grammar g -> extend_grammar_rules g - | TacticGrammar l -> add_tactic_entries l); + | TacticGrammar (l,_) -> add_tactic_entries l); grammar_state := gram :: !grammar_state let reset_extend_grammars_v8 () = |