diff options
| author | Lars Ingebrigtsen <larsi@gnus.org> | 2019-06-18 15:59:16 +0200 |
|---|---|---|
| committer | Lars Ingebrigtsen <larsi@gnus.org> | 2019-06-18 15:59:16 +0200 |
| commit | 90b44f336caf7d70721f44ac2497a38ff69d6c7d (patch) | |
| tree | 3bb474932b696a8db3ecb4831ed55a2f25d0e115 /lisp/cedet/semantic/wisent | |
| parent | d715ae8788e16b22f7f68cb82b51a40ad95c78c2 (diff) | |
| download | emacs-90b44f336caf7d70721f44ac2497a38ff69d6c7d.tar.gz emacs-90b44f336caf7d70721f44ac2497a38ff69d6c7d.tar.bz2 emacs-90b44f336caf7d70721f44ac2497a38ff69d6c7d.zip | |
Revert "Add a mechanism to specify expected shift/reduce .wy conflicts"
This reverts commit d715ae8788e16b22f7f68cb82b51a40ad95c78c2.
This commit led to a build error, so revert for now.
Diffstat (limited to 'lisp/cedet/semantic/wisent')
| -rw-r--r-- | lisp/cedet/semantic/wisent/comp.el | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/lisp/cedet/semantic/wisent/comp.el b/lisp/cedet/semantic/wisent/comp.el index 733345f593f..051b898ed78 100644 --- a/lisp/cedet/semantic/wisent/comp.el +++ b/lisp/cedet/semantic/wisent/comp.el @@ -40,7 +40,6 @@ ;;; Code: (require 'semantic/wisent) -(require 'semantic/grammar) (eval-when-compile (require 'cl-lib)) ;;;; ------------------- @@ -2273,17 +2272,16 @@ there are any reduce/reduce conflicts." (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 () |