summaryrefslogtreecommitdiff
path: root/lisp/cedet/ede
diff options
context:
space:
mode:
authorGlenn Morris <rgm@gnu.org>2018-03-16 20:34:27 -0400
committerGlenn Morris <rgm@gnu.org>2018-03-16 20:34:27 -0400
commit9c4ee531158960d3aae50e950b48ca8dce18c0d1 (patch)
tree6f63477b6532628024ec4e75b3cda87c549590d6 /lisp/cedet/ede
parent165803c69136229aaf426bf7655eacbe94425138 (diff)
downloademacs-9c4ee531158960d3aae50e950b48ca8dce18c0d1.tar.gz
cedet: remove obsolete name args to constructors
* lisp/cedet/ede/proj-archive.el, lisp/cedet/ede/proj-aux.el: * lisp/cedet/ede/proj-elisp.el, lisp/cedet/ede/proj-info.el: * lisp/cedet/ede/proj-misc.el, lisp/cedet/ede/proj-obj.el: * lisp/cedet/ede/proj-shared.el, lisp/cedet/ede/simple.el: * lisp/cedet/ede/source.el, lisp/cedet/semantic/: * lisp/cedet/semantic/analyze.el, lisp/cedet/semantic/complete.el: * lisp/cedet/semantic/db-javascript.el: * lisp/cedet/semantic/db-ref.el, lisp/cedet/semantic/debug.el: * lisp/cedet/semantic/ede-grammar.el: * lisp/cedet/semantic/mru-bookmark.el, lisp/cedet/semantic/scope.el: * lisp/cedet/semantic/texi.el, lisp/cedet/semantic/bovine/: * lisp/cedet/semantic/bovine/c.el: * lisp/cedet/semantic/bovine/debug.el, lisp/cedet/srecode/: * lisp/cedet/srecode/extract.el, lisp/cedet/srecode/map.el: * lisp/cedet/srecode/srt-mode.el: Remove obsolete name args to constructors.
Diffstat (limited to 'lisp/cedet/ede')
-rw-r--r--lisp/cedet/ede/proj-archive.el1
-rw-r--r--lisp/cedet/ede/proj-aux.el3
-rw-r--r--lisp/cedet/ede/proj-elisp.el10
-rw-r--r--lisp/cedet/ede/proj-info.el5
-rw-r--r--lisp/cedet/ede/proj-misc.el6
-rw-r--r--lisp/cedet/ede/proj-obj.el31
-rw-r--r--lisp/cedet/ede/proj-shared.el2
-rw-r--r--lisp/cedet/ede/simple.el2
-rw-r--r--lisp/cedet/ede/source.el6
9 files changed, 16 insertions, 50 deletions
diff --git a/lisp/cedet/ede/proj-archive.el b/lisp/cedet/ede/proj-archive.el
index ad2355a8512..553f918f9ec 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 091ea1741b7..f75006d6c57 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 2ef91e767bb..d9b8989ec74 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)) \
@@ -103,7 +100,7 @@ For Emacs Lisp, return addsuffix command on source files."
"Compile Emacs Lisp programs.")
(defvar ede-xemacs-compiler
- (clone ede-emacs-compiler "ede-xemacs-compiler"
+ (clone ede-emacs-compiler
:name "xemacs"
:variables '(("EMACS" . "xemacs")))
"Compile Emacs Lisp programs with XEmacs.")
@@ -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 849ef14352b..992996a9355 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 d85300c3123..7bc02faccaf 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 a34d209375b..b087c29cfe6 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 $<'; \\"
@@ -242,7 +226,6 @@ No garbage pattern since it creates C or C++ code.")
(defvar ede-gfortran-module-compiler
(clone ede-gfortran-compiler
- "ede-f90-module-compiler-gfortran"
:name "gfortranmod"
:sourcetype '(ede-source-f90)
:commands '("$(F90_COMPILE) -c $^")
@@ -253,7 +236,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 +247,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 5d6ca95d7c5..75d02eccbcb 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 b945d690f95..3931cf63483 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 b616af3a430..71a1c38a522 100644
--- a/lisp/cedet/ede/source.el
+++ b/lisp/cedet/ede/source.el
@@ -156,14 +156,12 @@ 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.")
;;(defvar ede-source-
-;; (ede-sourcecode "ede-source-"
-;; :name ""
+;; (ede-sourcecode :name ""
;; :sourcepattern "\\.$"
;; :garbagepattern '("*."))
;; " source code definition.")