diff options
| author |  Pierre-Marie Pédrot <pierre-marie.pedrot@inria.fr> | 2016-05-09 16:08:50 +0200 |
|---|---|---|
| committer | Pierre-Marie Pédrot <pierre-marie.pedrot@inria.fr> | 2016-05-10 19:28:24 +0200 |
| commit | 6150d15647afc739329019f7e9de595187ecc282 (patch) | |
| tree | 9dd5b05f3063e9ae0a0660089e6edb8c17e727b2 /grammar | |
| parent | 9891f2321f13861e3f48ddb28abcd5a77be30791 (diff) | |
Removing the Entry module now that rules need not be marshalled.
Diffstat (limited to 'grammar')
| -rw-r--r-- | grammar/argextend.ml4 | 2 | ||||
| -rw-r--r-- | grammar/q_util.ml4 | 4 | ||||
| -rw-r--r-- | grammar/vernacextend.ml4 | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/grammar/argextend.ml4 b/grammar/argextend.ml4 index 0e52dc948..9be6c6bc4 100644 --- a/grammar/argextend.ml4 +++ b/grammar/argextend.ml4 @@ -42,7 +42,7 @@ let make_act loc act pil = let make_prod_item = function | ExtTerminal s -> <:expr< Extend.Atoken (CLexer.terminal $mlexpr_of_string s$) >> | ExtNonTerminal (g, _) -> - let base s = <:expr< Pcoq.name_of_entry $lid:s$ >> in + let base s = <:expr< $lid:s$ >> in mlexpr_of_prod_entry_key base g let rec make_prod = function diff --git a/grammar/q_util.ml4 b/grammar/q_util.ml4 index c529260e9..05c94394d 100644 --- a/grammar/q_util.ml4 +++ b/grammar/q_util.ml4 @@ -71,8 +71,8 @@ let rec mlexpr_of_prod_entry_key f = function | Uentryl (e, l) -> (** Keep in sync with Pcoq! *) assert (e = "tactic"); - if l = 5 then <:expr< Extend.Aentry (Pcoq.name_of_entry Pcoq.Tactic.binder_tactic) >> - else <:expr< Extend.Aentryl (Pcoq.name_of_entry Pcoq.Tactic.tactic_expr) $mlexpr_of_int l$ >> + if l = 5 then <:expr< Extend.Aentry (Pcoq.Tactic.binder_tactic) >> + else <:expr< Extend.Aentryl (Pcoq.Tactic.tactic_expr) $mlexpr_of_int l$ >> let rec type_of_user_symbol = function | Ulist1 s | Ulist1sep (s, _) | Ulist0 s | Ulist0sep (s, _) -> diff --git a/grammar/vernacextend.ml4 b/grammar/vernacextend.ml4 index 0d4bec69d..904662ea1 100644 --- a/grammar/vernacextend.ml4 +++ b/grammar/vernacextend.ml4 @@ -106,7 +106,7 @@ let make_prod_item = function | ExtTerminal s -> <:expr< Egramml.GramTerminal $str:s$ >> | ExtNonTerminal (g, id) -> let nt = type_of_user_symbol g in - let base s = <:expr< Pcoq.name_of_entry (Pcoq.genarg_grammar $mk_extraarg loc s$) >> in + let base s = <:expr< Pcoq.genarg_grammar ($mk_extraarg loc s$) >> in <:expr< Egramml.GramNonTerminal $default_loc$ $make_rawwit loc nt$ $mlexpr_of_prod_entry_key base g$ >> |