[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] master 90b44f3: Revert "Add a mechanism to specify expecte
From: |
Lars Ingebrigtsen |
Subject: |
[Emacs-diffs] master 90b44f3: Revert "Add a mechanism to specify expected shift/reduce .wy conflicts" |
Date: |
Tue, 18 Jun 2019 09:59:43 -0400 (EDT) |
branch: master
commit 90b44f336caf7d70721f44ac2497a38ff69d6c7d
Author: Lars Ingebrigtsen <address@hidden>
Commit: Lars Ingebrigtsen <address@hidden>
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.
---
admin/grammars/python.wy | 1 -
lisp/cedet/semantic/grammar.el | 9 +--------
lisp/cedet/semantic/wisent/comp.el | 16 +++++++---------
3 files changed, 8 insertions(+), 18 deletions(-)
diff --git a/admin/grammars/python.wy b/admin/grammars/python.wy
index 0e926ad..082850d 100644
--- a/admin/grammars/python.wy
+++ b/admin/grammars/python.wy
@@ -88,7 +88,6 @@
%package wisent-python-wy
%provide semantic/wisent/python-wy
-%expectedconflicts 4
%{
(declare-function wisent-python-reconstitute-function-tag
diff --git a/lisp/cedet/semantic/grammar.el b/lisp/cedet/semantic/grammar.el
index 3916142..8ffa4c6 100644
--- a/lisp/cedet/semantic/grammar.el
+++ b/lisp/cedet/semantic/grammar.el
@@ -277,13 +277,6 @@ foo.by it is foo-by."
(i (string-match (format "\\([.]\\)%s\\'" ext) file)))
(concat (substring file 0 i) "-" ext))))
-(defun semantic-grammar-expected-conflicts ()
- "Return the number of expected shift/reduce conflicts in the package."
- (let ((conflicts (semantic-grammar-tag-symbols 'expectedconflicts)))
- (if conflicts
- (string-to-number conflicts)
- 0)))
-
(defsubst semantic-grammar-languagemode ()
"Return the %languagemode value as a list of symbols or nil."
(semantic-grammar-tag-symbols 'languagemode))
@@ -994,7 +987,7 @@ Return non-nil if there were no errors, nil if errors."
(vc-handled-backends nil))
(setq semanticdb-new-database-class
'semanticdb-project-database)
(semantic-mode 1)
- (semantic-grammar-create-package t)))
+ (semantic-grammar-create-package)))
(error
(message "%s" (error-message-string err))
nil))))
diff --git a/lisp/cedet/semantic/wisent/comp.el
b/lisp/cedet/semantic/wisent/comp.el
index 733345f..051b898 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 ()
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] master 90b44f3: Revert "Add a mechanism to specify expected shift/reduce .wy conflicts",
Lars Ingebrigtsen <=