diff options
| author | Maxime Dénès | 2017-09-15 10:50:11 +0200 |
|---|---|---|
| committer | Maxime Dénès | 2017-09-15 10:50:11 +0200 |
| commit | 4e2f3ff7d2f790435c9e1d3dfc4f26beff47ae8a (patch) | |
| tree | 12243f22532754ff89addf963679d034184e3602 /vernac | |
| parent | 9e6b192adcaadcdb1935a68f39ce5ea877562188 (diff) | |
| parent | 028de158153de94adfcb9d1e995259d833968951 (diff) | |
Merge PR #939: [general] Merge parsing with highparsing, put toplevel at the top of the linking chain.
Diffstat (limited to 'vernac')
| -rw-r--r-- | vernac/vernacentries.ml | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/vernac/vernacentries.ml b/vernac/vernacentries.ml index 22306ac5bf..4fd08b42d4 100644 --- a/vernac/vernacentries.ml +++ b/vernac/vernacentries.ml @@ -409,9 +409,10 @@ let dump_global r = (**********) (* Syntax *) -let vernac_syntax_extension locality local = +let vernac_syntax_extension locality local infix l = let local = enforce_module_locality locality local in - Metasyntax.add_syntax_extension local + if infix then Metasyntax.check_infix_modifiers (snd l); + Metasyntax.add_syntax_extension local l let vernac_delimiters sc = function | Some lr -> Metasyntax.add_delimiters sc lr @@ -1950,8 +1951,8 @@ let interp ?proof ?loc locality poly c = | VernacLocal _ -> assert false (* Syntax *) - | VernacSyntaxExtension (local,sl) -> - vernac_syntax_extension locality local sl + | VernacSyntaxExtension (infix, local,sl) -> + vernac_syntax_extension locality local infix sl | VernacDelimiters (sc,lr) -> vernac_delimiters sc lr | VernacBindScope (sc,rl) -> vernac_bind_scope sc rl | VernacOpenCloseScope (local, s) -> vernac_open_close_scope locality local s |