summaryrefslogtreecommitdiff
path: root/admin
diff options
context:
space:
mode:
authorLars Ingebrigtsen <larsi@gnus.org>2019-06-18 15:56:18 +0200
committerLars Ingebrigtsen <larsi@gnus.org>2019-06-18 15:56:18 +0200
commitd715ae8788e16b22f7f68cb82b51a40ad95c78c2 (patch)
tree38dc3b3f14c2074456e909de00761d5aa57998a3 /admin
parente09fcc1ff33c0643e9100cb5eee5ff351a85fcbb (diff)
downloademacs-d715ae8788e16b22f7f68cb82b51a40ad95c78c2.tar.gz
Add a mechanism to specify expected shift/reduce .wy conflicts
* admin/grammars/python.wy: Set the expected number of shift/reduce conflicts to four. * lisp/cedet/semantic/grammar.el (semantic-grammar-expected-conflicts): New function. * lisp/cedet/semantic/wisent/comp.el (wisent-total-conflicts): Use it to suppress warnings about the expected number of shift/reduce conflicts.
Diffstat (limited to 'admin')
-rw-r--r--admin/grammars/python.wy1
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 @@
%package wisent-python-wy
%provide semantic/wisent/python-wy
+%expectedconflicts 4
%{
(declare-function wisent-python-reconstitute-function-tag