diff options
| author | Maxime Dénès | 2016-06-16 13:29:59 +0200 |
|---|---|---|
| committer | Maxime Dénès | 2016-06-16 13:29:59 +0200 |
| commit | dac047eacc4038beb2f05c7458970051f689f20e (patch) | |
| tree | 06ca0a8e503e5af7f86bce933dba4300b3df2989 /intf | |
| parent | a8c6eeeaa321a84063e8492aca25942a07c00ddb (diff) | |
| parent | d7737ba9b3a811b8415ce87d8e3e091c9e49d32e (diff) | |
Merge remote-tracking branch 'github/pr/194' into trunk
Diffstat (limited to 'intf')
| -rw-r--r-- | intf/notation_term.mli | 16 | ||||
| -rw-r--r-- | intf/vernacexpr.mli | 1 |
2 files changed, 17 insertions, 0 deletions
diff --git a/intf/notation_term.mli b/intf/notation_term.mli index 7c5d7657be..883b017727 100644 --- a/intf/notation_term.mli +++ b/intf/notation_term.mli @@ -78,3 +78,19 @@ type notation_interp_env = { ninterp_rec_vars : Id.t Id.Map.t; mutable ninterp_only_parse : bool; } + +type grammar_constr_prod_item = + | GramConstrTerminal of Tok.t + | GramConstrNonTerminal of Extend.constr_prod_entry_key * Id.t option + | GramConstrListMark of int * bool + (* tells action rule to make a list of the n previous parsed items; + concat with last parsed list if true *) + +type notation_grammar = { + notgram_level : int; + notgram_assoc : Extend.gram_assoc option; + notgram_notation : Constrexpr.notation; + notgram_prods : grammar_constr_prod_item list list; + notgram_typs : notation_var_internalization_type list; + notgram_onlyprinting : bool; +} diff --git a/intf/vernacexpr.mli b/intf/vernacexpr.mli index 6ce15a7c5a..cfa30a4d54 100644 --- a/intf/vernacexpr.mli +++ b/intf/vernacexpr.mli @@ -206,6 +206,7 @@ type syntax_modifier = | SetAssoc of Extend.gram_assoc | SetEntryType of string * Extend.simple_constr_prod_entry_key | SetOnlyParsing of Flags.compat_version + | SetOnlyPrinting | SetFormat of string * string located type proof_end = |