[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] scratch/last-cedet-merge 439fe7c: CEDET: Fix "obsolete nam
|
From: |
David Engster |
|
Subject: |
[Emacs-diffs] scratch/last-cedet-merge 439fe7c: CEDET: Fix "obsolete name arg [...] to constructor" warnings |
|
Date: |
Wed, 25 Jan 2017 21:58:35 +0000 (UTC) |
branch: scratch/last-cedet-merge
commit 439fe7c215b96f3750ce33e1c4d9d96dc0b1873d
Author: David Engster <address@hidden>
Commit: David Engster <address@hidden>
CEDET: Fix "obsolete name arg [...] to constructor" warnings
Add ':name' where it makes sense.
---
lisp/cedet/ede/proj-archive.el | 1 -
lisp/cedet/ede/proj-aux.el | 3 +--
lisp/cedet/ede/proj-elisp.el | 8 ++------
lisp/cedet/ede/proj-info.el | 5 +----
lisp/cedet/ede/proj-misc.el | 6 ++----
lisp/cedet/ede/proj-obj.el | 30 ++++++------------------------
lisp/cedet/ede/proj-shared.el | 2 --
lisp/cedet/ede/simple.el | 2 +-
lisp/cedet/ede/source.el | 3 +--
lisp/cedet/semantic/analyze.el | 3 ---
lisp/cedet/semantic/bovine/c.el | 2 +-
lisp/cedet/semantic/bovine/debug.el | 4 ++--
lisp/cedet/semantic/complete.el | 12 ++++++------
lisp/cedet/semantic/db-global.el | 4 ++--
lisp/cedet/semantic/db-javascript.el | 4 ++--
lisp/cedet/semantic/db-ref.el | 3 +--
lisp/cedet/semantic/debug.el | 1 -
lisp/cedet/semantic/ede-grammar.el | 10 ++--------
lisp/cedet/semantic/mru-bookmark.el | 1 -
lisp/cedet/semantic/scope.el | 6 +++---
lisp/cedet/semantic/texi.el | 2 +-
lisp/cedet/srecode/extract.el | 2 +-
lisp/cedet/srecode/map.el | 8 +++-----
lisp/cedet/srecode/srt-mode.el | 4 ++--
24 files changed, 40 insertions(+), 86 deletions(-)
diff --git a/lisp/cedet/ede/proj-archive.el b/lisp/cedet/ede/proj-archive.el
index 460df69..58505ac 100644
--- a/lisp/cedet/ede/proj-archive.el
+++ b/lisp/cedet/ede/proj-archive.el
@@ -34,7 +34,6 @@
(defvar ede-archive-linker
(ede-linker
- "ede-archive-linker"
:name "ar"
:variables '(("AR" . "ar")
("AR_CMD" . "$(AR) cr"))
diff --git a/lisp/cedet/ede/proj-aux.el b/lisp/cedet/ede/proj-aux.el
index 3b60eea..8c6fffc 100644
--- a/lisp/cedet/ede/proj-aux.el
+++ b/lisp/cedet/ede/proj-aux.el
@@ -34,8 +34,7 @@
"This target consists of aux files such as READMEs and COPYING.")
(defvar ede-aux-source
- (ede-sourcecode "ede-aux-source-txt"
- :name "Auxiliary Text"
+ (ede-sourcecode :name "Auxiliary Text"
:sourcepattern "^[A-Z]+$\\|\\.txt$")
"Miscellaneous fields definition.")
diff --git a/lisp/cedet/ede/proj-elisp.el b/lisp/cedet/ede/proj-elisp.el
index 9f4e69f..a4fc4af 100644
--- a/lisp/cedet/ede/proj-elisp.el
+++ b/lisp/cedet/ede/proj-elisp.el
@@ -77,21 +77,18 @@ For Emacs Lisp, return addsuffix command on source files."
(ede-proj-makefile-sourcevar this)))
(defvar ede-source-emacs
- (ede-sourcecode "ede-emacs-source"
- :name "Emacs Lisp"
+ (ede-sourcecode :name "Emacs Lisp"
:sourcepattern "\\.el$"
:garbagepattern '("*.elc"))
"Emacs Lisp source code definition.")
(defvar ede-emacs-compiler
(ede-compiler
- "ede-emacs-compiler"
:name "emacs"
:variables '(("EMACS" . "emacs")
("EMACSFLAGS" . "-batch --no-site-file --eval '(setq
debug-on-error t)'")
("require" . "$(foreach r,$(1),(require (quote $(r))))"))
:rules (list (ede-makefile-rule
- "elisp-inference-rule"
:target "%.elc"
:dependencies "%.el"
:rules '("$(EMACS) $(EMACSFLAGS) $(addprefix -L ,$(LOADPATH)) \
@@ -324,7 +321,6 @@ Lays claim to all .elc files that match .el files in this
target."
;; Compilers
(defvar ede-emacs-cedet-autogen-compiler
(ede-compiler
- "ede-emacs-autogen-compiler"
:name "emacs"
:variables '(("EMACS" . "emacs")
("EMACSFLAGS" . "-batch --no-site-file --eval '(setq
debug-on-error t)'")
@@ -333,7 +329,7 @@ Lays claim to all .elc files that match .el files in this
target."
'("$(EMACS) $(EMACSFLAGS) $(addprefix -L ,$(LOADPATH)) \
--eval '(setq generated-autoload-file \"$(abspath $(LOADDEFS))\")' \
-f batch-update-autoloads $(abspath $(LOADDIRS))")
- :rules (list (ede-makefile-rule "clean-autoloads" :target "clean-autoloads"
:phony t :rules '("rm -f $(LOADDEFS)")))
+ :rules (list (ede-makefile-rule :target "clean-autoloads" :phony t :rules
'("rm -f $(LOADDEFS)")))
:sourcetype '(ede-source-emacs)
)
"Build an autoloads file.")
diff --git a/lisp/cedet/ede/proj-info.el b/lisp/cedet/ede/proj-info.el
index d430e08..ba9b3c2 100644
--- a/lisp/cedet/ede/proj-info.el
+++ b/lisp/cedet/ede/proj-info.el
@@ -43,15 +43,13 @@ All other sources should be included independently."))
"Target for a single info file.")
(defvar ede-makeinfo-source
- (ede-sourcecode "ede-makeinfo-source"
- :name "Texinfo"
+ (ede-sourcecode :name "Texinfo"
:sourcepattern "\\.texi?$"
:garbagepattern '("*.info*" "*.html"))
"Texinfo source code definition.")
(defvar ede-makeinfo-compiler
(ede-compiler
- "ede-makeinfo-compiler"
:name "makeinfo"
:variables '(("MAKEINFO" . "makeinfo"))
:commands '("$(MAKEINFO) $<")
@@ -62,7 +60,6 @@ All other sources should be included independently."))
(defvar ede-texi2html-compiler
(ede-compiler
- "ede-texi2html-compiler"
:name "texi2html"
:variables '(("TEXI2HTML" . "makeinfo -html"))
:commands '("makeinfo -o $@ $<")
diff --git a/lisp/cedet/ede/proj-misc.el b/lisp/cedet/ede/proj-misc.el
index 6d1070a..9d40768 100644
--- a/lisp/cedet/ede/proj-misc.el
+++ b/lisp/cedet/ede/proj-misc.el
@@ -49,14 +49,12 @@ A user-written makefile is used to build this target.
All listed sources are included in the distribution.")
(defvar ede-misc-source
- (ede-sourcecode "ede-misc-source"
- :name "Miscellaneous"
+ (ede-sourcecode :name "Miscellaneous"
:sourcepattern ".*")
"Miscellaneous field definition.")
(defvar ede-misc-compile
- (ede-compiler "ede-misc-compile"
- :name "Sub Makefile"
+ (ede-compiler :name "Sub Makefile"
:commands
'(
)
diff --git a/lisp/cedet/ede/proj-obj.el b/lisp/cedet/ede/proj-obj.el
index e7fa773..a85f4de 100644
--- a/lisp/cedet/ede/proj-obj.el
+++ b/lisp/cedet/ede/proj-obj.el
@@ -83,8 +83,7 @@ file.")
;;; C/C++ Compilers and Linkers
;;
(defvar ede-source-c
- (ede-sourcecode "ede-source-c"
- :name "C"
+ (ede-sourcecode :name "C"
:sourcepattern "\\.c$"
:auxsourcepattern "\\.h$"
:garbagepattern '("*.o" "*.obj" ".deps/*.P" ".lo"))
@@ -92,14 +91,12 @@ file.")
(defvar ede-gcc-compiler
(ede-object-compiler
- "ede-c-compiler-gcc"
:name "gcc"
:dependencyvar '("C_DEPENDENCIES" . "-Wp,-MD,.deps/$(*F).P")
:variables '(("CC" . "gcc")
("C_COMPILE" .
"$(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS)"))
:rules (list (ede-makefile-rule
- "c-inference-rule"
:target "%.o"
:dependencies "%.c"
:rules '("@echo '$(C_COMPILE) -c $<'; \\"
@@ -115,7 +112,6 @@ file.")
(defvar ede-cc-linker
(ede-linker
- "ede-cc-linker"
:name "cc"
:sourcetype '(ede-source-c)
:variables '(("C_LINK" . "$(CC) $(CFLAGS) $(LDFLAGS) -L."))
@@ -124,8 +120,7 @@ file.")
"Linker for C sourcecode.")
(defvar ede-source-c++
- (ede-sourcecode "ede-source-c++"
- :name "C++"
+ (ede-sourcecode :name "C++"
:sourcepattern
"\\.\\(c\\(pp?\\|c\\|xx\\|++\\)\\|C\\(PP\\)?\\)$"
:auxsourcepattern "\\.\\(hpp?\\|hh?\\|hxx\\|H\\)$"
:garbagepattern '("*.o" "*.obj" ".deps/*.P" ".lo"))
@@ -133,7 +128,6 @@ file.")
(defvar ede-g++-compiler
(ede-object-compiler
- "ede-c-compiler-g++"
:name "g++"
:dependencyvar '("CXX_DEPENDENCIES" . "-Wp,-MD,.deps/$(*F).P")
:variables '(("CXX" "g++")
@@ -141,7 +135,6 @@ file.")
"$(CXX) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS)")
)
:rules (list (ede-makefile-rule
- "c++-inference-rule"
:target "%.o"
:dependencies "%.cpp"
:rules '("@echo '$(CXX_COMPILE) -c $<'; \\"
@@ -157,7 +150,6 @@ file.")
(defvar ede-g++-linker
(ede-linker
- "ede-g++-linker"
:name "g++"
;; Only use this linker when c++ exists.
:sourcetype '(ede-source-c++)
@@ -169,15 +161,13 @@ file.")
;;; LEX
(defvar ede-source-lex
- (ede-sourcecode "ede-source-lex"
- :name "lex"
+ (ede-sourcecode :name "lex"
:sourcepattern "\\.l\\(l\\|pp\\|++\\)")
"Lex source code definition.
No garbage pattern since it creates C or C++ code.")
(defvar ede-lex-compiler
(ede-object-compiler
- "ede-lex-compiler"
;; Can we support regular makefiles too??
:autoconf '("AC_PROG_LEX")
:sourcetype '(ede-source-lex))
@@ -185,15 +175,13 @@ No garbage pattern since it creates C or C++ code.")
;;; YACC
(defvar ede-source-yacc
- (ede-sourcecode "ede-source-yacc"
- :name "yacc"
+ (ede-sourcecode :name "yacc"
:sourcepattern "\\.y\\(y\\|pp\\|++\\)")
"Yacc source code definition.
No garbage pattern since it creates C or C++ code.")
(defvar ede-yacc-compiler
(ede-object-compiler
- "ede-yacc-compiler"
;; Can we support regular makefiles too??
:autoconf '("AC_PROG_YACC")
:sourcetype '(ede-source-yacc))
@@ -203,16 +191,14 @@ No garbage pattern since it creates C or C++ code.")
;;
;; Contributed by David Engster
(defvar ede-source-f90
- (ede-sourcecode "ede-source-f90"
- :name "Fortran 90/95"
+ (ede-sourcecode :name "Fortran 90/95"
:sourcepattern "\\.[fF]9[05]$"
:auxsourcepattern "\\.incf$"
:garbagepattern '("*.o" "*.mod" ".deps/*.P"))
"Fortran 90/95 source code definition.")
(defvar ede-source-f77
- (ede-sourcecode "ede-source-f77"
- :name "Fortran 77"
+ (ede-sourcecode :name "Fortran 77"
:sourcepattern "\\.\\([fF]\\|for\\)$"
:auxsourcepattern "\\.incf$"
:garbagepattern '("*.o" ".deps/*.P"))
@@ -220,14 +206,12 @@ No garbage pattern since it creates C or C++ code.")
(defvar ede-gfortran-compiler
(ede-object-compiler
- "ede-f90-compiler-gfortran"
:name "gfortran"
:dependencyvar '("F90_DEPENDENCIES" . "-Wp,-MD,.deps/$(*F).P")
:variables '(("F90" . "gfortran")
("F90_COMPILE" .
"$(F90) $(DEFS) $(INCLUDES) $(F90FLAGS)"))
:rules (list (ede-makefile-rule
- "f90-inference-rule"
:target "%.o"
:dependencies "%.f90"
:rules '("@echo '$(F90_COMPILE) -c $<'; \\"
@@ -253,7 +237,6 @@ No garbage pattern since it creates C or C++ code.")
(defvar ede-gfortran-linker
(ede-linker
- "ede-gfortran-linker"
:name "gfortran"
:sourcetype '(ede-source-f90 ede-source-f77)
:variables '(("F90_LINK" . "$(F90) $(CFLAGS) $(LDFLAGS) -L."))
@@ -265,7 +248,6 @@ No garbage pattern since it creates C or C++ code.")
;;
(defvar ede-ld-linker
(ede-linker
- "ede-ld-linker"
:name "ld"
:variables '(("LD" . "ld")
("LD_LINK" . "$(LD) $(LDFLAGS) -L."))
diff --git a/lisp/cedet/ede/proj-shared.el b/lisp/cedet/ede/proj-shared.el
index 6c17504..86116fe 100644
--- a/lisp/cedet/ede/proj-shared.el
+++ b/lisp/cedet/ede/proj-shared.el
@@ -75,7 +75,6 @@ Use ldlibs to add addition libraries.")
("LTLINK" . "$(LIBTOOL) --mode=link $(CC) $(CFLAGS)
$(LDFLAGS) -L. -o $@")
)
:rules (list (ede-makefile-rule
- "cc-inference-rule-libtool"
:target "%.o"
:dependencies "%.c"
:rules '("@echo '$(LTCOMPILE) -o $@ $<'; \\"
@@ -122,7 +121,6 @@ Use ldlibs to add addition libraries.")
("LTCOMPILE" . "$(LIBTOOL) --tag=CXX --mode=compile
$(CXX) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS)")
)
:rules (list (ede-makefile-rule
- "c++-inference-rule-libtool"
:target "%.o"
:dependencies "%.cpp"
:rules '("@echo '$(LTCOMPILE) -o $@ $<'; \\"
diff --git a/lisp/cedet/ede/simple.el b/lisp/cedet/ede/simple.el
index d618b93..b24e7e5 100644
--- a/lisp/cedet/ede/simple.el
+++ b/lisp/cedet/ede/simple.el
@@ -46,7 +46,7 @@
;;; Code:
(add-to-list 'ede-project-class-files
- (ede-project-autoload "simple-overlay"
+ (ede-project-autoload
:name "Simple" :file 'ede/simple
:proj-file 'ede-simple-projectfile-for-dir
:load-type 'ede-simple-load
diff --git a/lisp/cedet/ede/source.el b/lisp/cedet/ede/source.el
index d72d0db..039a6f4 100644
--- a/lisp/cedet/ede/source.el
+++ b/lisp/cedet/ede/source.el
@@ -156,8 +156,7 @@ Used to guess header files, but uses the auxsource regular
expression."
;;
;; This must appear at the end so that the init method will work.
(defvar ede-source-scheme
- (ede-sourcecode "ede-source-scheme"
- :name "Scheme"
+ (ede-sourcecode :name "Scheme"
:sourcepattern "\\.scm$")
"Scheme source code definition.")
diff --git a/lisp/cedet/semantic/analyze.el b/lisp/cedet/semantic/analyze.el
index 70a5bad..9918aac 100644
--- a/lisp/cedet/semantic/analyze.el
+++ b/lisp/cedet/semantic/analyze.el
@@ -662,7 +662,6 @@ Returns an object based on symbol
`semantic-analyze-context'."
;; for the argument.
(setq context-return
(semantic-analyze-context-functionarg
- "functionargument"
:buffer (current-buffer)
:function fntag
:index arg
@@ -685,7 +684,6 @@ Returns an object based on symbol
`semantic-analyze-context'."
(setq context-return
(semantic-analyze-context-assignment
- "assignment"
:buffer (current-buffer)
:assignee asstag
:scope scope
@@ -703,7 +701,6 @@ Returns an object based on symbol
`semantic-analyze-context'."
;; Nothing in particular
(setq context-return
(semantic-analyze-context
- "context"
:buffer (current-buffer)
:scope scope
:bounds bounds
diff --git a/lisp/cedet/semantic/bovine/c.el b/lisp/cedet/semantic/bovine/c.el
index 8739f8d..6fb505d 100644
--- a/lisp/cedet/semantic/bovine/c.el
+++ b/lisp/cedet/semantic/bovine/c.el
@@ -2035,7 +2035,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 :name "include with context"))
(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 f7bc206..4e43366 100644
--- a/lisp/cedet/semantic/bovine/debug.el
+++ b/lisp/cedet/semantic/bovine/debug.el
@@ -73,7 +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"
+ (let ((frame (semantic-bovine-debug-frame :name "frame"
:nonterm nonterm
:rule rule
:match match
@@ -119,7 +119,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"
+ (let ((frame (semantic-bovine-debug-error-frame :name "frame"
:condition condition)))
(semantic-debug-set-frame semantic-debug-current-interface
frame)
diff --git a/lisp/cedet/semantic/complete.el b/lisp/cedet/semantic/complete.el
index ba640a2..60ae3c9 100644
--- a/lisp/cedet/semantic/complete.el
+++ b/lisp/cedet/semantic/complete.el
@@ -1896,7 +1896,7 @@ If INITIAL-INPUT is non-nil, insert it in the minibuffer
initially.
HISTORY is a symbol representing a variable to store the history in."
(semantic-complete-read-tag-engine
(semantic-collector-buffer-deep prompt :buffer (current-buffer))
- (semantic-displayor-traditional-with-focus-highlight "simple")
+ (semantic-displayor-traditional-with-focus-highlight :name "simple")
;;(semantic-displayor-tooltip "simple")
prompt
default-tag
@@ -1918,7 +1918,7 @@ If INITIAL-INPUT is non-nil, insert it in the minibuffer
initially.
HISTORY is a symbol representing a variable to store the history in."
(semantic-complete-read-tag-engine
(semantic-collector-local-members prompt :buffer (current-buffer))
- (semantic-displayor-traditional-with-focus-highlight "simple")
+ (semantic-displayor-traditional-with-focus-highlight :name "simple")
;;(semantic-displayor-tooltip "simple")
prompt
default-tag
@@ -1943,7 +1943,7 @@ HISTORY is a symbol representing a variable to store the
history in."
:buffer (current-buffer)
:path (current-buffer)
)
- (semantic-displayor-traditional-with-focus-highlight "simple")
+ (semantic-displayor-traditional-with-focus-highlight :name "simple")
prompt
default-tag
initial-input
@@ -1960,7 +1960,7 @@ to control how completion options are displayed.
See `semantic-complete-inline-tag-engine' for details on how
completion works."
(let* ((collector (semantic-collector-project-brutish
- "inline"
+ :name "inline"
:buffer (current-buffer)
:path (current-buffer)))
(sbounds (semantic-ctxt-current-symbol-and-bounds))
@@ -2019,7 +2019,7 @@ prompts. these are calculated from the CONTEXT variable
passed in."
prompt
:buffer (oref context buffer)
:context context)
- (semantic-displayor-traditional-with-focus-highlight "simple")
+ (semantic-displayor-traditional-with-focus-highlight :name "simple")
(with-current-buffer (oref context buffer)
(goto-char (cdr (oref context bounds)))
(concat prompt (mapconcat 'identity syms ".")
@@ -2043,7 +2043,7 @@ completion works."
(if (not context) (setq context (semantic-analyze-current-context (point))))
(if (not context) (error "Nothing to complete on here"))
(let* ((collector (semantic-collector-analyze-completions
- "inline"
+ :name "inline"
:buffer (oref context buffer)
:context context))
(syms (semantic-ctxt-current-symbol (point)))
diff --git a/lisp/cedet/semantic/db-global.el b/lisp/cedet/semantic/db-global.el
index f9309a8..442e5f9 100644
--- a/lisp/cedet/semantic/db-global.el
+++ b/lisp/cedet/semantic/db-global.el
@@ -95,7 +95,7 @@ if optional DONT-ERR-IF-NOT-AVAILABLE is non-nil; else throw
an error."
(setq
;; Add to the system database list.
semanticdb-project-system-databases
- (cons (semanticdb-project-database-global "global")
+ (cons (semanticdb-project-database-global)
semanticdb-project-system-databases)
;; Apply the throttle.
semanticdb-find-default-throttle
@@ -133,7 +133,7 @@ For each file hit, get the traditional semantic table from
that file."
;; We need to return something since there is always the "master table"
;; The table can then answer file name type questions.
(when (not (slot-boundp obj 'tables))
- (let ((newtable (semanticdb-table-global "GNU Global Search Table")))
+ (let ((newtable (semanticdb-table-global :name "GNU Global Search Table")))
(oset obj tables (list newtable))
(oset newtable parent-db obj)
(oset newtable tags nil)
diff --git a/lisp/cedet/semantic/db-javascript.el
b/lisp/cedet/semantic/db-javascript.el
index e8a3edc..0570cbf 100644
--- a/lisp/cedet/semantic/db-javascript.el
+++ b/lisp/cedet/semantic/db-javascript.el
@@ -98,7 +98,7 @@ See bottom of this file for instructions on managing this
list.")
;; Create the database, and add it to searchable databases for javascript mode.
(defvar-mode-local javascript-mode semanticdb-project-system-databases
(list
- (semanticdb-project-database-javascript "Javascript"))
+ (semanticdb-project-database-javascript))
"Search javascript for symbols.")
;; NOTE: Be sure to modify this to the best advantage of your
@@ -121,7 +121,7 @@ Create one of our special tables that can act as an
intermediary."
;; We need to return something since there is always the "master table"
;; The table can then answer file name type questions.
(when (not (slot-boundp obj 'tables))
- (let ((newtable (semanticdb-table-javascript "tmp")))
+ (let ((newtable (semanticdb-table-javascript)))
(oset obj tables (list newtable))
(oset newtable parent-db obj)
(oset newtable tags nil)
diff --git a/lisp/cedet/semantic/db-ref.el b/lisp/cedet/semantic/db-ref.el
index a75a73c..1dac334 100644
--- a/lisp/cedet/semantic/db-ref.el
+++ b/lisp/cedet/semantic/db-ref.el
@@ -162,8 +162,7 @@ refreshed before dumping the result."
(let* ((tab semanticdb-current-table)
(myrefs (oref tab db-refs))
(myinc (semanticdb-includes-in-table tab))
- (adbc (semanticdb-ref-adebug "DEBUG"
- :i-depend-on myrefs
+ (adbc (semanticdb-ref-adebug :i-depend-on myrefs
:local-table tab
:i-include myinc)))
(data-debug-new-buffer "*References ADEBUG*")
diff --git a/lisp/cedet/semantic/debug.el b/lisp/cedet/semantic/debug.el
index 5c793e4..180db3a 100644
--- a/lisp/cedet/semantic/debug.el
+++ b/lisp/cedet/semantic/debug.el
@@ -361,7 +361,6 @@ Argument ONOFF is non-nil when we are entering debug mode.
(semantic-debug-current-interface
(let ((parserb (semantic-debug-find-parser-source)))
(semantic-debug-interface
- "Debug Interface"
:parser-buffer parserb
:parser-local-map (with-current-buffer parserb
(current-local-map))
diff --git a/lisp/cedet/semantic/ede-grammar.el
b/lisp/cedet/semantic/ede-grammar.el
index 22de1d0..d129861 100644
--- a/lisp/cedet/semantic/ede-grammar.el
+++ b/lisp/cedet/semantic/ede-grammar.el
@@ -67,8 +67,7 @@ For Emacs Lisp, return addsuffix command on source files."
(ede-proj-makefile-sourcevar this))))))
(defvar semantic-ede-source-grammar-wisent
- (ede-sourcecode "semantic-ede-grammar-source-wisent"
- :name "Wisent Grammar"
+ (ede-sourcecode :name "Wisent Grammar"
:sourcepattern "\\.wy$"
:garbagepattern '("*-wy.el")
)
@@ -80,13 +79,11 @@ For Emacs Lisp, return addsuffix command on source files."
(defvar semantic-ede-grammar-compiler-wisent
(semantic-ede-grammar-compiler-class
- "ede-emacs-wisent-compiler"
:name "emacs"
:variables '(("EMACS" . "emacs")
("EMACSFLAGS" . "-batch --no-site-file --eval '(setq
debug-on-error t)'")
("require" . "$(foreach r,$(1),(require (quote $(r))))"))
:rules (list (ede-makefile-rule
- "elisp-inference-rule"
:target "%-wy.el"
:dependencies "%.wy"
:rules '("$(EMACS) $(EMACSFLAGS) $(addprefix -L ,$(LOADPATH)) \
@@ -98,8 +95,7 @@ For Emacs Lisp, return addsuffix command on source files."
(defvar semantic-ede-source-grammar-bovine
- (ede-sourcecode "semantic-ede-grammar-source-bovine"
- :name "Bovine Grammar"
+ (ede-sourcecode :name "Bovine Grammar"
:sourcepattern "\\.by$"
:garbagepattern '("*-by.el")
)
@@ -107,13 +103,11 @@ For Emacs Lisp, return addsuffix command on source files."
(defvar semantic-ede-grammar-compiler-bovine
(semantic-ede-grammar-compiler-class
- "ede-emacs-wisent-compiler"
:name "emacs"
:variables '(("EMACS" . "emacs")
("EMACSFLAGS" . "-batch --no-site-file --eval '(setq
debug-on-error t)'")
("require" . "$(foreach r,$(1),(require (quote $(r))))"))
:rules (list (ede-makefile-rule
- "elisp-inference-rule"
:target "%-by.el"
:dependencies "%.by"
:rules '("$(EMACS) $(EMACSFLAGS) $(addprefix -L ,$(LOADPATH)) \
diff --git a/lisp/cedet/semantic/mru-bookmark.el
b/lisp/cedet/semantic/mru-bookmark.el
index 067439d..4fd2a86 100644
--- a/lisp/cedet/semantic/mru-bookmark.el
+++ b/lisp/cedet/semantic/mru-bookmark.el
@@ -166,7 +166,6 @@ We can't use the built-in ring data structure because we
need
to delete some items from the ring when we don't have the data.")
(defvar semantic-mru-bookmark-ring (semantic-bookmark-ring
- "Ring"
:ring (make-ring 20))
"The MRU bookmark ring.
This ring tracks the most recent active tags of interest.")
diff --git a/lisp/cedet/semantic/scope.el b/lisp/cedet/semantic/scope.el
index 8139196..7c54d12 100644
--- a/lisp/cedet/semantic/scope.el
+++ b/lisp/cedet/semantic/scope.el
@@ -309,7 +309,7 @@ are from nesting data types."
(list searchname)))
(fullsearchname nil)
- (miniscope (semantic-scope-cache "mini"))
+ (miniscope (semantic-scope-cache :name "mini"))
ptag)
;; Find the next entry in the referenced type for
@@ -368,7 +368,7 @@ and PROTECTION is the level of protection offered by the
relationship.
Optional SCOPETYPES are additional scoped entities in which our parent might
be found."
(let ((lineage nil)
- (miniscope (semantic-scope-cache "mini"))
+ (miniscope (semantic-scope-cache :name "mini"))
)
(oset miniscope parents parents)
(oset miniscope scope scopetypes)
@@ -647,7 +647,7 @@ whose tags can be searched when needed, OR it may be a
scope object."
;; We need to make a mini scope, and only include the misc bits
;; that will help in finding the parent. We don't really need
;; to do any of the stuff related to variables and what-not.
- (setq tmpscope (semantic-scope-cache "mini"))
+ (setq tmpscope (semantic-scope-cache :name "mini"))
(let* ( ;; Step 1:
(scopetypes (cons type (semantic-analyze-scoped-types
(point))))
(parents (semantic-analyze-scope-nested-tags (point)
scopetypes))
diff --git a/lisp/cedet/semantic/texi.el b/lisp/cedet/semantic/texi.el
index d630856..d9a5058 100644
--- a/lisp/cedet/semantic/texi.el
+++ b/lisp/cedet/semantic/texi.el
@@ -376,7 +376,7 @@ Optional argument POINT is where to look for the
environment."
(when prefix
(require 'semantic/analyze)
(semantic-analyze-context
- "Context-for-texinfo"
+ :name "Context-for-texinfo"
:buffer (current-buffer)
:scope nil
:bounds bounds
diff --git a/lisp/cedet/srecode/extract.el b/lisp/cedet/srecode/extract.el
index 3477185..cd41afe 100644
--- a/lisp/cedet/srecode/extract.el
+++ b/lisp/cedet/srecode/extract.el
@@ -88,7 +88,7 @@ the dictionary entries were for that block of text."
(save-restriction
(narrow-to-region start end)
(let ((dict (srecode-create-dictionary t))
- (state (srecode-extract-state "state"))
+ (state (srecode-extract-state :name "state"))
)
(goto-char start)
(srecode-extract-method template dict state)
diff --git a/lisp/cedet/srecode/map.el b/lisp/cedet/srecode/map.el
index d5b4c5f..051e4cd 100644
--- a/lisp/cedet/srecode/map.el
+++ b/lisp/cedet/srecode/map.el
@@ -271,7 +271,7 @@ if that file is NEW, otherwise assume the mode has not
changed."
(if (not srecode-map-save-file)
;; 0) Create a MAP when in no save file mode.
(when (not srecode-current-map)
- (setq srecode-current-map (srecode-map "SRecode Map"))
+ (setq srecode-current-map (srecode-map))
(message "SRecode map created in non-save mode.")
)
@@ -291,8 +291,7 @@ if that file is NEW, otherwise assume the mode has not
changed."
(error "Change your SRecode map file"))))
;; Have a dir. Make the object.
(setq srecode-current-map
- (srecode-map "SRecode Map"
- :file srecode-map-save-file)))
+ (srecode-map :file srecode-map-save-file)))
;; 2) Do we not have a current map? If so load.
(when (not srecode-current-map)
@@ -302,8 +301,7 @@ if that file is NEW, otherwise assume the mode has not
changed."
(error
;; There was an error loading the old map. Create a new one.
(setq srecode-current-map
- (srecode-map "SRecode Map"
- :file srecode-map-save-file))))
+ (srecode-map :file srecode-map-save-file))))
)
)
diff --git a/lisp/cedet/srecode/srt-mode.el b/lisp/cedet/srecode/srt-mode.el
index 78ddb7f..1a5a656 100644
--- a/lisp/cedet/srecode/srt-mode.el
+++ b/lisp/cedet/srecode/srt-mode.el
@@ -494,7 +494,7 @@ section or ? for an ask variable."
(let* ((macroend (match-beginning 0))
(raw (buffer-substring-no-properties
macrostart macroend))
- (STATE (srecode-compile-state "TMP"))
+ (STATE (srecode-compile-state))
(inserter (condition-case nil
(srecode-compile-parse-inserter
raw STATE)
@@ -605,7 +605,7 @@ section or ? for an ask variable."
(setq context-return
(semantic-analyze-context-functionarg
- "context-for-srecode"
+ :name "context-for-srecode"
:buffer (current-buffer)
:scope scope
:bounds bounds
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] scratch/last-cedet-merge 439fe7c: CEDET: Fix "obsolete name arg [...] to constructor" warnings,
David Engster <=