summaryrefslogtreecommitdiff
path: root/lisp/cedet/semantic/bovine
diff options
context:
space:
mode:
Diffstat (limited to 'lisp/cedet/semantic/bovine')
-rw-r--r--lisp/cedet/semantic/bovine/c.el2
-rw-r--r--lisp/cedet/semantic/bovine/debug.el6
-rw-r--r--lisp/cedet/semantic/bovine/grammar.el9
3 files changed, 10 insertions, 7 deletions
diff --git a/lisp/cedet/semantic/bovine/c.el b/lisp/cedet/semantic/bovine/c.el
index 2b2cac11783..5f0ea168e25 100644
--- a/lisp/cedet/semantic/bovine/c.el
+++ b/lisp/cedet/semantic/bovine/c.el
@@ -1990,7 +1990,7 @@ have to be wrapped in that namespace."
(list (semantic-tag-new-type inside-ns "namespace" tags nil)))
;; Create new semantic-table for the wrapped tags, since we don't want
;; the namespace to actually be a part of the header file.
- (setq newtable (semanticdb-table "include with context"))
+ (setq newtable (semanticdb-table))
(oset newtable tags newtags)
(oset newtable parent-db (oref inctable parent-db))
(oset newtable file (oref inctable file)))
diff --git a/lisp/cedet/semantic/bovine/debug.el b/lisp/cedet/semantic/bovine/debug.el
index d4f04253dcb..3464e25787f 100644
--- a/lisp/cedet/semantic/bovine/debug.el
+++ b/lisp/cedet/semantic/bovine/debug.el
@@ -73,8 +73,7 @@ The RULE is for \"thing\" is 1.
The MATCH for \"thing\" is 1.
COLLECTION is a list of `things' that have been matched so far.
LEXTOKEN, is a token returned by the lexer which is being matched."
- (let ((frame (semantic-bovine-debug-frame "frame"
- :nonterm nonterm
+ (let ((frame (semantic-bovine-debug-frame :nonterm nonterm
:rule rule
:match match
:collection collection
@@ -119,8 +118,7 @@ LEXTOKEN, is a token returned by the lexer which is being matched."
(defun semantic-create-bovine-debug-error-frame (condition)
"Create an error frame for bovine debugger.
Argument CONDITION is the thrown error condition."
- (let ((frame (semantic-bovine-debug-error-frame "frame"
- :condition condition)))
+ (let ((frame (semantic-bovine-debug-error-frame :condition condition)))
(semantic-debug-set-frame semantic-debug-current-interface
frame)
frame))
diff --git a/lisp/cedet/semantic/bovine/grammar.el b/lisp/cedet/semantic/bovine/grammar.el
index 529958a8075..f77bc9db555 100644
--- a/lisp/cedet/semantic/bovine/grammar.el
+++ b/lisp/cedet/semantic/bovine/grammar.el
@@ -475,6 +475,7 @@ Menu items are appended to the common grammar menu.")
;; This is with-demoted-errors.
(condition-case err
(with-current-buffer (find-file-noselect infile)
+ (setq infile buffer-file-name)
(if outdir (setq default-directory outdir))
(semantic-grammar-create-package nil t))
(error (message "%s" (error-message-string err)) nil)))
@@ -509,8 +510,12 @@ Menu items are appended to the common grammar menu.")
;;; Commentary:
;;
-;; This file was generated from admin/grammars/"
- lang ".by.
+;; This file was generated from "
+ (if (string-match "\\(admin/grammars/.*\\.by\\)\\'" infile)
+ (match-string 1 infile)
+ (concat "admin/grammars/"
+ (if (string-equal lang "scm") "scheme" lang) ".by"))
+".
;;; Code:
")