procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Revert "Add a mechanism to specify expected shift/reduce .wy conflicts"

Browse source 
This reverts commit d715ae8788.

This commit led to a build error, so revert for now.
This commit is contained in:
Lars Ingebrigtsen 2019-06-18 15:59:16 +02:00
parent d715ae8788
commit 90b44f336c
3 changed files with 8 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
admin/grammars/python.wy
View file

@ -88,7 +88,6 @@
%package wisent-python-wy
%provide semantic/wisent/python-wy
%expectedconflicts 4
%{
(declare-function wisent-python-reconstitute-function-tag

9
lisp/cedet/semantic/grammar.el
View file

@ -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))))

16
lisp/cedet/semantic/wisent/comp.el
View file

@ -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 ()