1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-01-03 10:31:37 -08:00

cedet: replace cl with cl-lib

* lisp/cedet/ede/linux.el, lisp/cedet/semantic/decorate/mode.el:
* lisp/cedet/semantic/wisent/comp.el: Replace cl with cl-lib.
* lisp/cedet/cedet.el, lisp/cedet/mode-local.el:
* lisp/cedet/ede/dired.el, lisp/cedet/ede/pmake.el:
* lisp/cedet/ede/proj-comp.el, lisp/cedet/ede/proj-misc.el:
* lisp/cedet/ede/proj-obj.el, lisp/cedet/ede/proj-prog.el:
* lisp/cedet/ede/speedbar.el, lisp/cedet/semantic/analyze.el:
* lisp/cedet/semantic/complete.el:
* lisp/cedet/semantic/mru-bookmark.el, lisp/cedet/semantic/debug.el:
* lisp/cedet/semantic/wisent/python.el:
* lisp/cedet/srecode/compile.el, lisp/cedet/srecode/dictionary.el:
* lisp/cedet/srecode/srt.el: No need for cl.
This commit is contained in:
Glenn Morris 2018-03-23 16:13:40 -04:00
parent 4a05f85f5a
commit 3a34c076b9
20 changed files with 17 additions and 37 deletions

View file

@ -30,9 +30,6 @@
;; load them all by doing (require 'cedet). This is mostly for ;; load them all by doing (require 'cedet). This is mostly for
;; compatibility with the upstream, stand-alone CEDET distribution. ;; compatibility with the upstream, stand-alone CEDET distribution.
(eval-when-compile
(require 'cl))
(declare-function inversion-find-version "inversion") (declare-function inversion-find-version "inversion")
(defconst cedet-version "2.0" (defconst cedet-version "2.0"

View file

@ -27,12 +27,13 @@
;; This provides a dired interface to EDE, allowing users to modify ;; This provides a dired interface to EDE, allowing users to modify
;; their project file by adding files (or whatever) directly from a ;; their project file by adding files (or whatever) directly from a
;; dired buffer. ;; dired buffer.
(eval-when-compile (require 'cl))
;;; Code:
(require 'easymenu) (require 'easymenu)
(require 'dired) (require 'dired)
(require 'ede) (require 'ede)
;;; Code:
(defvar ede-dired-keymap (defvar ede-dired-keymap
(let ((map (make-sparse-keymap))) (let ((map (make-sparse-keymap)))
(define-key map ".a" 'ede-dired-add-to-target) (define-key map ".a" 'ede-dired-add-to-target)

View file

@ -34,7 +34,7 @@
(require 'ede) (require 'ede)
(require 'ede/make) (require 'ede/make)
(eval-when-compile (require 'cl)) (eval-when-compile (require 'cl-lib))
(declare-function semanticdb-file-table-object "semantic/db") (declare-function semanticdb-file-table-object "semantic/db")
(declare-function semanticdb-needs-refresh-p "semantic/db") (declare-function semanticdb-needs-refresh-p "semantic/db")
@ -115,7 +115,7 @@ If DIR has not been used as a build directory, fall back to
;; detected build on source directory ;; detected build on source directory
(and (file-exists-p (expand-file-name ".config" dir)) dir) (and (file-exists-p (expand-file-name ".config" dir)) dir)
;; use configuration ;; use configuration
(case project-linux-build-directory-default (cl-case project-linux-build-directory-default
(same dir) (same dir)
(ask (read-directory-name "Select Linux' build directory: " dir))))) (ask (read-directory-name "Select Linux' build directory: " dir)))))
@ -164,7 +164,7 @@ Uses `ede-linux--detect-architecture' for the auto-detection. If
the result is `ask', let the user choose from architectures found the result is `ask', let the user choose from architectures found
in DIR." in DIR."
(let ((arch (ede-linux--detect-architecture bdir))) (let ((arch (ede-linux--detect-architecture bdir)))
(case arch (cl-case arch
(ask (ask
(completing-read "Select target architecture: " (completing-read "Select target architecture: "
(ede-linux--get-archs dir))) (ede-linux--get-archs dir)))
@ -175,7 +175,7 @@ in DIR."
"Returns a list with include directories. "Returns a list with include directories.
Returned directories might not exist, since they are not created Returned directories might not exist, since they are not created
until Linux is built for the first time." until Linux is built for the first time."
(map 'list (cl-map 'list
(lambda (elem) (format (concat (car elem) "/" (cdr elem)) arch)) (lambda (elem) (format (concat (car elem) "/" (cdr elem)) arch))
;; XXX: taken from the output of "make V=1" ;; XXX: taken from the output of "make V=1"
(list (cons dir "arch/%s/include") (list (cons dir "arch/%s/include")

View file

@ -43,7 +43,6 @@
;; 1) Insert distribution source variables for targets ;; 1) Insert distribution source variables for targets
;; 2) Insert user requested rules ;; 2) Insert user requested rules
(eval-when-compile (require 'cl))
(require 'ede/proj) (require 'ede/proj)
(require 'ede/proj-obj) (require 'ede/proj-obj)
(require 'ede/proj-comp) (require 'ede/proj-comp)

View file

@ -44,7 +44,6 @@
;; To write a method that inserts a variable or rule for a compiler ;; To write a method that inserts a variable or rule for a compiler
;; based object, wrap the body of your call in `ede-compiler-only-once' ;; based object, wrap the body of your call in `ede-compiler-only-once'
(eval-when-compile (require 'cl))
(require 'ede) ;source object (require 'ede) ;source object
(require 'ede/autoconf-edit) (require 'ede/autoconf-edit)

View file

@ -26,7 +26,6 @@
;; This misc target lets the user link in custom makefiles to an EDE ;; This misc target lets the user link in custom makefiles to an EDE
;; project. ;; project.
(eval-when-compile (require 'cl))
(require 'ede/pmake) (require 'ede/pmake)
(require 'ede/proj-comp) (require 'ede/proj-comp)

View file

@ -26,7 +26,6 @@
;; Handles a superclass of target types which create object code in ;; Handles a superclass of target types which create object code in
;; and EDE Project file. ;; and EDE Project file.
(eval-when-compile (require 'cl))
(require 'ede/proj) (require 'ede/proj)
(declare-function ede-pmake-varname "ede/pmake") (declare-function ede-pmake-varname "ede/pmake")

View file

@ -25,7 +25,6 @@
;; ;;
;; Handle building programs from object files in and EDE Project file. ;; Handle building programs from object files in and EDE Project file.
(eval-when-compile (require 'cl))
(require 'ede/pmake) (require 'ede/pmake)
(require 'ede/proj-obj) (require 'ede/proj-obj)

View file

@ -28,7 +28,6 @@
;;; Code: ;;; Code:
(eval-when-compile (require 'cl))
(require 'speedbar) (require 'speedbar)
(require 'eieio-speedbar) (require 'eieio-speedbar)
(require 'ede) (require 'ede)

View file

@ -46,8 +46,6 @@
;;; Code: ;;; Code:
(eval-when-compile (require 'cl))
(require 'find-func) (require 'find-func)
;; For find-function-regexp-alist. It is tempting to replace this ;; For find-function-regexp-alist. It is tempting to replace this
;; require by (defvar find-function-regexp-alist) and ;; require by (defvar find-function-regexp-alist) and

View file

@ -63,7 +63,6 @@
;; constant. These need to be returned as there would be no ;; constant. These need to be returned as there would be no
;; other possible completions. ;; other possible completions.
(eval-when-compile (require 'cl))
(require 'semantic) (require 'semantic)
(require 'semantic/format) (require 'semantic/format)
(require 'semantic/ctxt) (require 'semantic/ctxt)

View file

@ -106,7 +106,6 @@
;; `semantic-complete-inline-tag-engine' will complete text in ;; `semantic-complete-inline-tag-engine' will complete text in
;; a buffer. ;; a buffer.
(eval-when-compile (require 'cl))
(require 'semantic) (require 'semantic)
(require 'eieio-opt) (require 'eieio-opt)
(require 'semantic/analyze) (require 'semantic/analyze)

View file

@ -36,7 +36,6 @@
;; Each parser must implement the interface and override any methods as needed. ;; Each parser must implement the interface and override any methods as needed.
;; ;;
(eval-when-compile (require 'cl))
(require 'semantic) (require 'semantic)
(require 'eieio) (require 'eieio)
(require 'cl-generic) (require 'cl-generic)

View file

@ -35,7 +35,7 @@
;; ;;
;;; Code: ;;; Code:
(eval-when-compile (require 'cl)) (eval-when-compile (require 'cl-lib))
(require 'semantic) (require 'semantic)
(require 'semantic/decorate) (require 'semantic/decorate)
(require 'semantic/tag-ls) (require 'semantic/tag-ls)
@ -82,13 +82,13 @@ add items to this list."
(defsubst semantic-decoration-set-property (deco property value) (defsubst semantic-decoration-set-property (deco property value)
"Set the DECO decoration's PROPERTY to VALUE. "Set the DECO decoration's PROPERTY to VALUE.
Return DECO." Return DECO."
(assert (semantic-decoration-p deco)) (cl-assert (semantic-decoration-p deco))
(semantic-overlay-put deco property value) (semantic-overlay-put deco property value)
deco) deco)
(defsubst semantic-decoration-get-property (deco property) (defsubst semantic-decoration-get-property (deco property)
"Return the DECO decoration's PROPERTY value." "Return the DECO decoration's PROPERTY value."
(assert (semantic-decoration-p deco)) (cl-assert (semantic-decoration-p deco))
(semantic-overlay-get deco property)) (semantic-overlay-get deco property))
(defsubst semantic-decoration-set-face (deco face) (defsubst semantic-decoration-set-face (deco face)
@ -103,7 +103,7 @@ Return DECO."
(defsubst semantic-decoration-set-priority (deco priority) (defsubst semantic-decoration-set-priority (deco priority)
"Set the priority of the decoration DECO to PRIORITY. "Set the priority of the decoration DECO to PRIORITY.
Return DECO." Return DECO."
(assert (natnump priority)) (cl-assert (natnump priority))
(semantic-decoration-set-property deco 'priority priority)) (semantic-decoration-set-property deco 'priority priority))
(defsubst semantic-decoration-priority (deco) (defsubst semantic-decoration-priority (deco)
@ -113,7 +113,7 @@ Return DECO."
(defsubst semantic-decoration-move (deco begin end) (defsubst semantic-decoration-move (deco begin end)
"Move the decoration DECO on the region between BEGIN and END. "Move the decoration DECO on the region between BEGIN and END.
Return DECO." Return DECO."
(assert (semantic-decoration-p deco)) (cl-assert (semantic-decoration-p deco))
(semantic-overlay-move deco begin end) (semantic-overlay-move deco begin end)
deco) deco)
@ -135,7 +135,7 @@ Return the overlay that makes up the new decoration."
(defun semantic-decorate-clear-tag (tag &optional deco) (defun semantic-decorate-clear-tag (tag &optional deco)
"Remove decorations from TAG. "Remove decorations from TAG.
If optional argument DECO is non-nil, remove only that decoration." If optional argument DECO is non-nil, remove only that decoration."
(assert (or (null deco) (semantic-decoration-p deco))) (cl-assert (or (null deco) (semantic-decoration-p deco)))
;; Clear primary decorations. ;; Clear primary decorations.
;; For now, just unhighlight the tag. How to deal with other ;; For now, just unhighlight the tag. How to deal with other
;; primary decorations like invisibility, etc. ? Maybe just ;; primary decorations like invisibility, etc. ? Maybe just

View file

@ -45,7 +45,6 @@
;;; Code: ;;; Code:
(eval-when-compile (require 'cl))
(require 'semantic) (require 'semantic)
(require 'eieio-base) (require 'eieio-base)
(require 'ring) (require 'ring)

View file

@ -41,7 +41,7 @@
;;; Code: ;;; Code:
(require 'semantic/wisent) (require 'semantic/wisent)
(eval-when-compile (require 'cl)) (eval-when-compile (require 'cl-lib))
;;;; ------------------- ;;;; -------------------
;;;; Misc. useful things ;;;; Misc. useful things
@ -2906,7 +2906,7 @@ references found in BODY, and XBODY is BODY expression with
(progn (progn
(if (wisent-check-$N body n) (if (wisent-check-$N body n)
;; Accumulate $i symbol ;; Accumulate $i symbol
(pushnew body found :test #'equal)) (cl-pushnew body found :test #'equal))
(cons found body)) (cons found body))
;; BODY is a list, expand inside it ;; BODY is a list, expand inside it
(let (xbody sexpr) (let (xbody sexpr)
@ -2926,7 +2926,7 @@ references found in BODY, and XBODY is BODY expression with
;; $i symbol ;; $i symbol
((wisent-check-$N sexpr n) ((wisent-check-$N sexpr n)
;; Accumulate $i symbol ;; Accumulate $i symbol
(pushnew sexpr found :test #'equal)) (cl-pushnew sexpr found :test #'equal))
) )
;; Accumulate expanded forms ;; Accumulate expanded forms
(setq xbody (nconc xbody (list sexpr)))) (setq xbody (nconc xbody (list sexpr))))

View file

@ -41,9 +41,6 @@
(require 'semantic/ctxt) (require 'semantic/ctxt)
(require 'semantic/format) (require 'semantic/format)
(eval-when-compile
(require 'cl))
;;; Customization ;;; Customization
;; ;;
@ -358,7 +355,7 @@ Set attributes for constructors, special, private and static methods."
;; + first argument is self ;; + first argument is self
(when (and (> (length (semantic-tag-function-arguments tag)) 0) (when (and (> (length (semantic-tag-function-arguments tag)) 0)
(string= (semantic-tag-name (string= (semantic-tag-name
(first (semantic-tag-function-arguments tag))) (car (semantic-tag-function-arguments tag)))
"self")) "self"))
(semantic-tag-put-attribute tag :parent "dummy")) (semantic-tag-put-attribute tag :parent "dummy"))

View file

@ -31,7 +31,6 @@
;; The output are a series of EIEIO objects which represent the ;; The output are a series of EIEIO objects which represent the
;; templates in a way that could be inserted later. ;; templates in a way that could be inserted later.
(eval-when-compile (require 'cl))
(require 'semantic) (require 'semantic)
(require 'eieio) (require 'eieio)
(require 'cl-generic) (require 'cl-generic)

View file

@ -28,7 +28,6 @@
;;; CLASSES ;;; CLASSES
(eval-when-compile (require 'cl))
(require 'eieio) (require 'eieio)
(require 'cl-generic) (require 'cl-generic)
(require 'srecode) (require 'srecode)

View file

@ -25,7 +25,6 @@
;;; Code: ;;; Code:
(eval-when-compile (require 'cl))
(require 'eieio) (require 'eieio)
(require 'srecode/dictionary) (require 'srecode/dictionary)
(require 'srecode/insert) (require 'srecode/insert)