diff options
Diffstat (limited to 'lisp/cedet/semantic')
| -rw-r--r-- | lisp/cedet/semantic/grammar.el | 9 | ||||
| -rw-r--r-- | lisp/cedet/semantic/wisent/comp.el | 16 |
2 files changed, 8 insertions, 17 deletions
diff --git a/lisp/cedet/semantic/grammar.el b/lisp/cedet/semantic/grammar.el index 39161420f98..8ffa4c6d83e 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 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 () |