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.

1 files changed, 1 insertions, 8 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))))