diff options
| author | Lars Ingebrigtsen | 2019-06-19 13:47:22 +0200 |
|---|---|---|
| committer | Lars Ingebrigtsen | 2019-06-19 13:48:49 +0200 |
| commit | 390b4bc1e25fe691548d7ec982eb2f7027fe26a3 (patch) | |
| tree | 3355d4c19e87fbe9814339a7f82cb30bd458fadd /admin/grammars/python.wy | |
| parent | eef48e124da251605ea05579aac196f2f8e2f534 (diff) | |
| download | emacs-390b4bc1e25fe691548d7ec982eb2f7027fe26a3.tar.gz emacs-390b4bc1e25fe691548d7ec982eb2f7027fe26a3.zip | |
Allow specifying the expected number of shift/reduce conflicts
* admin/grammars/grammar.wy: Add %expectedconflicts.
* lisp/cedet/semantic/grammar-wy.el
(semantic-grammar-wy--keyword-table): Ditto.
* lisp/cedet/semantic/grammar.el
(semantic-grammar-expected-conflicts): New function.
(semantic-grammar-insert-defconst-with-eval): New function.
(semantic-grammar-create-package): Output the number of expected
shift/reduce conflicts.
* lisp/cedet/semantic/wisent/comp.el (wisent-total-conflicts):
Don't output the warning if the number of shift/reduce conflicts
is expected.
(wisent-expected-conflicts): Made obsolete.
Diffstat (limited to 'admin/grammars/python.wy')
| -rw-r--r-- | admin/grammars/python.wy | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/admin/grammars/python.wy b/admin/grammars/python.wy index 082850df59c..0e926ad3636 100644 --- a/admin/grammars/python.wy +++ b/admin/grammars/python.wy | |||
| @@ -88,6 +88,7 @@ | |||
| 88 | 88 | ||
| 89 | %package wisent-python-wy | 89 | %package wisent-python-wy |
| 90 | %provide semantic/wisent/python-wy | 90 | %provide semantic/wisent/python-wy |
| 91 | %expectedconflicts 4 | ||
| 91 | 92 | ||
| 92 | %{ | 93 | %{ |
| 93 | (declare-function wisent-python-reconstitute-function-tag | 94 | (declare-function wisent-python-reconstitute-function-tag |