diff options
| author | Lars Ingebrigtsen <larsi@gnus.org> | 2019-06-18 16:08:47 +0200 |
|---|---|---|
| committer | Lars Ingebrigtsen <larsi@gnus.org> | 2019-06-18 16:08:47 +0200 |
| commit | 4956e7610c782cace51943ee41f4c357703bdae1 (patch) | |
| tree | 3bb474932b696a8db3ecb4831ed55a2f25d0e115 /lisp/cedet/semantic/wisent/comp.el | |
| parent | f21ec24524c705e18674a2e9e4db37b11fa3ebab (diff) | |
| download | emacs-4956e7610c782cace51943ee41f4c357703bdae1.tar.gz | |
Revert "Add a mechanism to specify expected shift/reduce .wy conflicts"
This reverts commit f21ec24524c705e18674a2e9e4db37b11fa3ebab.
*sigh* Revert again because this created a bootstrap problem in a different part of the process.
Diffstat (limited to 'lisp/cedet/semantic/wisent/comp.el')
| -rw-r--r-- | lisp/cedet/semantic/wisent/comp.el | 18 |
1 files changed, 7 insertions, 11 deletions
diff --git a/lisp/cedet/semantic/wisent/comp.el b/lisp/cedet/semantic/wisent/comp.el index ff434f555da..051b898ed78 100644 --- a/lisp/cedet/semantic/wisent/comp.el +++ b/lisp/cedet/semantic/wisent/comp.el @@ -2264,28 +2264,24 @@ there are any reduce/reduce conflicts." :group 'wisent :type '(choice (const nil) integer)) -(declare-function semantic-grammar-expected-conflicts "semantic/grammar") - (defun wisent-total-conflicts () "Report the total number of conflicts." - (require 'semantic/grammar) (unless (and (zerop rrc-total) (or (zerop src-total) (= src-total (or wisent-expected-conflicts 0)))) (let* ((src (wisent-source)) (src (if src (concat " in " src) "")) (msg (format "Grammar%s contains" src))) - (when (and (> src-total 0) - (not (= rrc-total (semantic-grammar-expected-conflicts)))) - (setq msg (format "%s %d shift/reduce conflict%s" - msg src-total (if (> src-total 1) - "s" "")))) + (if (> src-total 0) + (setq msg (format "%s %d shift/reduce conflict%s" + msg src-total (if (> src-total 1) + "s" "")))) (if (and (> src-total 0) (> rrc-total 0)) (setq msg (format "%s and" msg))) (if (> rrc-total 0) - (setq msg (format "%s %d reduce/reduce conflict%s" - msg rrc-total (if (> rrc-total 1) - "s" "")))) + (setq msg (format "%s %d reduce/reduce conflict%s" + msg rrc-total (if (> rrc-total 1) + "s" "")))) (message msg)))) (defun wisent-print-conflicts () |