diff options
Diffstat (limited to 'lisp/cedet/semantic')
24 files changed, 314 insertions, 312 deletions
diff --git a/lisp/cedet/semantic/analyze.el b/lisp/cedet/semantic/analyze.el index 846501e13cc..7ff69771023 100644 --- a/lisp/cedet/semantic/analyze.el +++ b/lisp/cedet/semantic/analyze.el @@ -168,7 +168,7 @@ of the parent function.") ;; ;; Simple methods against the context classes. ;; -(defmethod semantic-analyze-type-constraint +(cl-defmethod semantic-analyze-type-constraint ((context semantic-analyze-context) &optional desired-type) "Return a type constraint for completing :prefix in CONTEXT. Optional argument DESIRED-TYPE may be a non-type tag to analyze." @@ -189,17 +189,17 @@ Optional argument DESIRED-TYPE may be a non-type tag to analyze." ) desired-type)) -(defmethod semantic-analyze-type-constraint +(cl-defmethod semantic-analyze-type-constraint ((context semantic-analyze-context-functionarg)) "Return a type constraint for completing :prefix in CONTEXT." - (call-next-method context (car (oref context argument)))) + (cl-call-next-method context (car (oref context argument)))) -(defmethod semantic-analyze-type-constraint +(cl-defmethod semantic-analyze-type-constraint ((context semantic-analyze-context-assignment)) "Return a type constraint for completing :prefix in CONTEXT." - (call-next-method context (car (reverse (oref context assignee))))) + (cl-call-next-method context (car (reverse (oref context assignee))))) -(defmethod semantic-analyze-interesting-tag +(cl-defmethod semantic-analyze-interesting-tag ((context semantic-analyze-context)) "Return a tag from CONTEXT that would be most interesting to a user." (let ((prefix (reverse (oref context :prefix)))) @@ -209,15 +209,15 @@ Optional argument DESIRED-TYPE may be a non-type tag to analyze." ;; Return the found tag, or nil. (car prefix))) -(defmethod semantic-analyze-interesting-tag +(cl-defmethod semantic-analyze-interesting-tag ((context semantic-analyze-context-functionarg)) "Try the base, and if that fails, return what we are assigning into." - (or (call-next-method) (car-safe (oref context :function)))) + (or (cl-call-next-method) (car-safe (oref context :function)))) -(defmethod semantic-analyze-interesting-tag +(cl-defmethod semantic-analyze-interesting-tag ((context semantic-analyze-context-assignment)) "Try the base, and if that fails, return what we are assigning into." - (or (call-next-method) (car-safe (oref context :assignee)))) + (or (cl-call-next-method) (car-safe (oref context :assignee)))) ;;; ANALYSIS ;; @@ -743,7 +743,7 @@ Optional argument CTXT is the context to show." ;; (declare-function pulse-momentary-highlight-region "pulse") -(defmethod semantic-analyze-pulse ((context semantic-analyze-context)) +(cl-defmethod semantic-analyze-pulse ((context semantic-analyze-context)) "Pulse the region that CONTEXT affects." (require 'pulse) (with-current-buffer (oref context :buffer) @@ -782,7 +782,7 @@ Use BUFF as a source of override methods." (setq prefix (make-string (length prefix) ? )) )) -(defmethod semantic-analyze-show ((context semantic-analyze-context)) +(cl-defmethod semantic-analyze-show ((context semantic-analyze-context)) "Insert CONTEXT into the current buffer in a nice way." (semantic-analyze-princ-sequence (oref context prefix) "Prefix: " ) (semantic-analyze-princ-sequence (oref context prefixclass) "Prefix Classes: ") @@ -796,19 +796,19 @@ Use BUFF as a source of override methods." (semantic-analyze-show (oref context scope))) ) -(defmethod semantic-analyze-show ((context semantic-analyze-context-assignment)) +(cl-defmethod semantic-analyze-show ((context semantic-analyze-context-assignment)) "Insert CONTEXT into the current buffer in a nice way." (semantic-analyze-princ-sequence (oref context assignee) "Assignee: ") - (call-next-method)) + (cl-call-next-method)) -(defmethod semantic-analyze-show ((context semantic-analyze-context-functionarg)) +(cl-defmethod semantic-analyze-show ((context semantic-analyze-context-functionarg)) "Insert CONTEXT into the current buffer in a nice way." (semantic-analyze-princ-sequence (oref context function) "Function: ") (princ "Argument Index: ") (princ (oref context index)) (princ "\n") (semantic-analyze-princ-sequence (oref context argument) "Argument: ") - (call-next-method)) + (cl-call-next-method)) (defun semantic-analyze-pop-to-context (context) "Display CONTEXT in a temporary buffer. diff --git a/lisp/cedet/semantic/analyze/refs.el b/lisp/cedet/semantic/analyze/refs.el index 923163cee1c..3047dab5280 100644 --- a/lisp/cedet/semantic/analyze/refs.el +++ b/lisp/cedet/semantic/analyze/refs.el @@ -100,7 +100,7 @@ Use `semantic-analyze-current-tag' to debug this fcn." ;; ;; These accessor methods will calculate the useful bits from the context, and cache values ;; into the context. -(defmethod semantic-analyze-refs-impl ((refs semantic-analyze-references) &optional in-buffer) +(cl-defmethod semantic-analyze-refs-impl ((refs semantic-analyze-references) &optional in-buffer) "Return the implementations derived in the reference analyzer REFS. Optional argument IN-BUFFER indicates that the returned tag should be in an active buffer." (let ((allhits (oref refs rawsearchdata)) @@ -125,7 +125,7 @@ Optional argument IN-BUFFER indicates that the returned tag should be in an acti allhits) impl)) -(defmethod semantic-analyze-refs-proto ((refs semantic-analyze-references) &optional in-buffer) +(cl-defmethod semantic-analyze-refs-proto ((refs semantic-analyze-references) &optional in-buffer) "Return the prototypes derived in the reference analyzer REFS. Optional argument IN-BUFFER indicates that the returned tag should be in an active buffer." (let ((allhits (oref refs rawsearchdata)) diff --git a/lisp/cedet/semantic/bovine/debug.el b/lisp/cedet/semantic/bovine/debug.el index 465a69a7341..8aebcd64eb2 100644 --- a/lisp/cedet/semantic/bovine/debug.el +++ b/lisp/cedet/semantic/bovine/debug.el @@ -83,7 +83,7 @@ LEXTOKEN, is a token returned by the lexer which is being matched." frame) frame)) -(defmethod semantic-debug-frame-highlight ((frame semantic-debug-frame)) +(cl-defmethod semantic-debug-frame-highlight ((frame semantic-debug-frame)) "Highlight one parser frame." (let* ((nonterm (oref frame nonterm)) (pb (oref semantic-debug-current-interface parser-buffer)) @@ -102,7 +102,7 @@ LEXTOKEN, is a token returned by the lexer which is being matched." (oref frame lextoken)) )) -(defmethod semantic-debug-frame-info ((frame semantic-debug-frame)) +(cl-defmethod semantic-debug-frame-info ((frame semantic-debug-frame)) "Display info about this one parser frame." (message "%S" (oref frame collection)) ) @@ -125,12 +125,12 @@ Argument CONDITION is the thrown error condition." frame) frame)) -(defmethod semantic-debug-frame-highlight ((frame semantic-bovine-debug-error-frame)) +(cl-defmethod semantic-debug-frame-highlight ((frame semantic-bovine-debug-error-frame)) "Highlight a frame from an action." ;; How do I get the location of the action in the source buffer? ) -(defmethod semantic-debug-frame-info ((frame semantic-bovine-debug-error-frame)) +(cl-defmethod semantic-debug-frame-info ((frame semantic-bovine-debug-error-frame)) "Display info about the error thrown." (message "Error: %S" (oref frame condition))) diff --git a/lisp/cedet/semantic/complete.el b/lisp/cedet/semantic/complete.el index 3f726ee56fd..ad931785aff 100644 --- a/lisp/cedet/semantic/complete.el +++ b/lisp/cedet/semantic/complete.el @@ -930,7 +930,7 @@ derive from this list.") The only options available for completion are those which can be logically inserted into the current context.") -(defmethod semantic-collector-calculate-completions-raw +(cl-defmethod semantic-collector-calculate-completions-raw ((obj semantic-collector-analyze-completions) prefix completionlist) "calculate the completions for prefix from completionlist." ;; if there are no completions yet, calculate them. @@ -945,11 +945,11 @@ inserted into the current context.") prefix (oref obj first-pass-completions))))) -(defmethod semantic-collector-cleanup ((obj semantic-collector-abstract)) +(cl-defmethod semantic-collector-cleanup ((obj semantic-collector-abstract)) "Clean up any mess this collector may have." nil) -(defmethod semantic-collector-next-action +(cl-defmethod semantic-collector-next-action ((obj semantic-collector-abstract) partial) "What should we do next? OBJ can be used to determine the next action. PARTIAL indicates if we are doing a partial completion." @@ -974,19 +974,19 @@ PARTIAL indicates if we are doing a partial completion." 'complete-whitespace))) 'complete)) -(defmethod semantic-collector-last-prefix= ((obj semantic-collector-abstract) +(cl-defmethod semantic-collector-last-prefix= ((obj semantic-collector-abstract) last-prefix) "Return non-nil if OBJ's prefix matches PREFIX." (and (slot-boundp obj 'last-prefix) (string= (oref obj last-prefix) last-prefix))) -(defmethod semantic-collector-get-cache ((obj semantic-collector-abstract)) +(cl-defmethod semantic-collector-get-cache ((obj semantic-collector-abstract)) "Get the raw cache of tags for completion. Calculate the cache if there isn't one." (or (oref obj cache) (semantic-collector-calculate-cache obj))) -(defmethod semantic-collector-calculate-completions-raw +(cl-defmethod semantic-collector-calculate-completions-raw ((obj semantic-collector-abstract) prefix completionlist) "Calculate the completions for prefix from completionlist. Output must be in semanticdb Find result format." @@ -1005,7 +1005,7 @@ Output must be in semanticdb Find result format." (if result (list (cons table result))))) -(defmethod semantic-collector-calculate-completions +(cl-defmethod semantic-collector-calculate-completions ((obj semantic-collector-abstract) prefix partial) "Calculate completions for prefix as setup for other queries." (let* ((case-fold-search semantic-case-fold) @@ -1082,7 +1082,7 @@ Output must be in semanticdb Find result format." ))) )) -(defmethod semantic-collector-try-completion-whitespace +(cl-defmethod semantic-collector-try-completion-whitespace ((obj semantic-collector-abstract) prefix) "For OBJ, do whitespace completion based on PREFIX. This implies that if there are two completions, one matching @@ -1114,7 +1114,7 @@ has been run first." ))) -(defmethod semantic-collector-current-exact-match ((obj semantic-collector-abstract)) +(cl-defmethod semantic-collector-current-exact-match ((obj semantic-collector-abstract)) "Return the active valid MATCH from the semantic collector. For now, just return the first element from our list of available matches. For semanticdb based results, make sure the file is loaded @@ -1122,12 +1122,12 @@ into a buffer." (when (slot-boundp obj 'current-exact-match) (oref obj current-exact-match))) -(defmethod semantic-collector-current-whitespace-completion ((obj semantic-collector-abstract)) +(cl-defmethod semantic-collector-current-whitespace-completion ((obj semantic-collector-abstract)) "Return the active whitespace completion value." (when (slot-boundp obj 'last-whitespace-completion) (oref obj last-whitespace-completion))) -(defmethod semantic-collector-get-match ((obj semantic-collector-abstract)) +(cl-defmethod semantic-collector-get-match ((obj semantic-collector-abstract)) "Return the active valid MATCH from the semantic collector. For now, just return the first element from our list of available matches. For semanticdb based results, make sure the file is loaded @@ -1135,7 +1135,7 @@ into a buffer." (when (slot-boundp obj 'current-exact-match) (semanticdb-find-result-nth-in-buffer (oref obj current-exact-match) 0))) -(defmethod semantic-collector-all-completions +(cl-defmethod semantic-collector-all-completions ((obj semantic-collector-abstract) prefix) "For OBJ, retrieve all completions matching PREFIX. The returned list consists of all the tags currently @@ -1143,7 +1143,7 @@ matching PREFIX." (when (slot-boundp obj 'last-all-completions) (oref obj last-all-completions))) -(defmethod semantic-collector-try-completion +(cl-defmethod semantic-collector-try-completion ((obj semantic-collector-abstract) prefix) "For OBJ, attempt to match PREFIX. See `try-completion' for details on how this works. @@ -1154,13 +1154,13 @@ with that name." (if (slot-boundp obj 'last-completion) (oref obj last-completion))) -(defmethod semantic-collector-calculate-cache +(cl-defmethod semantic-collector-calculate-cache ((obj semantic-collector-abstract)) "Calculate the completion cache for OBJ." nil ) -(defmethod semantic-collector-flush ((this semantic-collector-abstract)) +(cl-defmethod semantic-collector-flush ((this semantic-collector-abstract)) "Flush THIS collector object, clearing any caches and prefix." (oset this cache nil) (slot-makeunbound this 'last-prefix) @@ -1177,7 +1177,7 @@ with that name." These collectors track themselves on a per-buffer basis." :abstract t) -(defmethod constructor :STATIC ((this semantic-collector-buffer-abstract) +(cl-defmethod constructor ((this (subclass semantic-collector-buffer-abstract)) newname &rest fields) "Reuse previously created objects of this type in buffer." (let ((old nil) @@ -1186,7 +1186,7 @@ These collectors track themselves on a per-buffer basis." (if (eq (eieio-object-class (car bl)) this) (setq old (car bl)))) (unless old - (let ((new (call-next-method))) + (let ((new (cl-call-next-method))) (add-to-list 'semantic-collector-per-buffer-list new) (setq old new))) (slot-makeunbound old 'last-completion) @@ -1217,7 +1217,7 @@ NEWCACHE is the new tag table, but we ignore it." When searching for a tag, uses semantic deep search functions. Basics search only in the current buffer.") -(defmethod semantic-collector-calculate-cache +(cl-defmethod semantic-collector-calculate-cache ((obj semantic-collector-buffer-deep)) "Calculate the completion cache for OBJ. Uses `semantic-flatten-tags-table'" @@ -1247,7 +1247,7 @@ Uses semanticdb for searching all tags in the current project." "Completion engine for tags in a project.") -(defmethod semantic-collector-calculate-completions-raw +(cl-defmethod semantic-collector-calculate-completions-raw ((obj semantic-collector-project) prefix completionlist) "Calculate the completions for prefix from completionlist." (semanticdb-find-tags-for-completion prefix (oref obj path))) @@ -1260,7 +1260,7 @@ Uses semanticdb for searching all tags in the current project." (declare-function semanticdb-brute-deep-find-tags-for-completion "semantic/db-find") -(defmethod semantic-collector-calculate-completions-raw +(cl-defmethod semantic-collector-calculate-completions-raw ((obj semantic-collector-project-brutish) prefix completionlist) "Calculate the completions for prefix from completionlist." (require 'semantic/db-find) @@ -1274,7 +1274,7 @@ Uses semanticdb for searching all tags in the current project." "The scope the local members are being completed from.")) "Completion engine for tags in a project.") -(defmethod semantic-collector-calculate-completions-raw +(cl-defmethod semantic-collector-calculate-completions-raw ((obj semantic-collector-local-members) prefix completionlist) "Calculate the completions for prefix from completionlist." (let* ((scope (or (oref obj scope) @@ -1323,11 +1323,11 @@ Provides the basics for a displayor, including interacting with a collector, and tracking tables of completion to display." :abstract t) -(defmethod semantic-displayor-cleanup ((obj semantic-displayor-abstract)) +(cl-defmethod semantic-displayor-cleanup ((obj semantic-displayor-abstract)) "Clean up any mess this displayor may have." nil) -(defmethod semantic-displayor-next-action ((obj semantic-displayor-abstract)) +(cl-defmethod semantic-displayor-next-action ((obj semantic-displayor-abstract)) "The next action to take on the minibuffer related to display." (if (and (slot-boundp obj 'last-prefix) (or (eq this-command 'semantic-complete-inline-TAB) @@ -1336,33 +1336,33 @@ a collector, and tracking tables of completion to display." 'scroll 'display)) -(defmethod semantic-displayor-set-completions ((obj semantic-displayor-abstract) +(cl-defmethod semantic-displayor-set-completions ((obj semantic-displayor-abstract) table prefix) "Set the list of tags to be completed over to TABLE." (oset obj table table) (oset obj last-prefix prefix)) -(defmethod semantic-displayor-show-request ((obj semantic-displayor-abstract)) +(cl-defmethod semantic-displayor-show-request ((obj semantic-displayor-abstract)) "A request to show the current tags table." (ding)) -(defmethod semantic-displayor-focus-request ((obj semantic-displayor-abstract)) +(cl-defmethod semantic-displayor-focus-request ((obj semantic-displayor-abstract)) "A request to for the displayor to focus on some tag option." (ding)) -(defmethod semantic-displayor-scroll-request ((obj semantic-displayor-abstract)) +(cl-defmethod semantic-displayor-scroll-request ((obj semantic-displayor-abstract)) "A request to for the displayor to scroll the completion list (if needed)." (scroll-other-window)) -(defmethod semantic-displayor-focus-previous ((obj semantic-displayor-abstract)) +(cl-defmethod semantic-displayor-focus-previous ((obj semantic-displayor-abstract)) "Set the current focus to the previous item." nil) -(defmethod semantic-displayor-focus-next ((obj semantic-displayor-abstract)) +(cl-defmethod semantic-displayor-focus-next ((obj semantic-displayor-abstract)) "Set the current focus to the next item." nil) -(defmethod semantic-displayor-current-focus ((obj semantic-displayor-abstract)) +(cl-defmethod semantic-displayor-current-focus ((obj semantic-displayor-abstract)) "Return a single tag currently in focus. This object type doesn't do focus, so will never have a focus object." nil) @@ -1381,7 +1381,7 @@ Traditional display mechanism for a list of possible completions. Completions are showin in a new buffer and listed with the ability to click on the items to aid in completion.") -(defmethod semantic-displayor-show-request ((obj semantic-displayor-traditional)) +(cl-defmethod semantic-displayor-show-request ((obj semantic-displayor-traditional)) "A request to show the current tags table." ;; NOTE TO SELF. Find the character to type next, and emphasize it. @@ -1412,7 +1412,7 @@ Focusing is a way of differentiating among multiple tags which have the same name." :abstract t) -(defmethod semantic-displayor-next-action ((obj semantic-displayor-focus-abstract)) +(cl-defmethod semantic-displayor-next-action ((obj semantic-displayor-focus-abstract)) "The next action to take on the minibuffer related to display." (if (and (slot-boundp obj 'last-prefix) (string= (oref obj last-prefix) (semantic-completion-text)) @@ -1428,13 +1428,13 @@ which have the same name." 'focus) 'display)) -(defmethod semantic-displayor-set-completions ((obj semantic-displayor-focus-abstract) +(cl-defmethod semantic-displayor-set-completions ((obj semantic-displayor-focus-abstract) table prefix) "Set the list of tags to be completed over to TABLE." - (call-next-method) + (cl-call-next-method) (slot-makeunbound obj 'focus)) -(defmethod semantic-displayor-focus-previous ((obj semantic-displayor-focus-abstract)) +(cl-defmethod semantic-displayor-focus-previous ((obj semantic-displayor-focus-abstract)) "Set the current focus to the previous item. Not meaningful return value." (when (and (slot-boundp obj 'table) (oref obj table)) @@ -1446,7 +1446,7 @@ Not meaningful return value." ) ))) -(defmethod semantic-displayor-focus-next ((obj semantic-displayor-focus-abstract)) +(cl-defmethod semantic-displayor-focus-next ((obj semantic-displayor-focus-abstract)) "Set the current focus to the next item. Not meaningful return value." (when (and (slot-boundp obj 'table) (oref obj table)) @@ -1459,13 +1459,13 @@ Not meaningful return value." (oset obj focus 0)) ))) -(defmethod semantic-displayor-focus-tag ((obj semantic-displayor-focus-abstract)) +(cl-defmethod semantic-displayor-focus-tag ((obj semantic-displayor-focus-abstract)) "Return the next tag OBJ should focus on." (when (and (slot-boundp obj 'table) (oref obj table)) (with-slots (table) obj (semanticdb-find-result-nth table (oref obj focus))))) -(defmethod semantic-displayor-current-focus ((obj semantic-displayor-focus-abstract)) +(cl-defmethod semantic-displayor-current-focus ((obj semantic-displayor-focus-abstract)) "Return the tag currently in focus, or call parent method." (if (and (slot-boundp obj 'focus) (slot-boundp obj 'table) @@ -1481,7 +1481,7 @@ Not meaningful return value." ;; database. (car (semanticdb-find-result-nth (oref obj table) (oref obj focus)))) ;; Do whatever - (call-next-method))) + (cl-call-next-method))) ;;; Simple displayor which performs traditional display completion, ;; and also focuses with highlighting. @@ -1494,7 +1494,7 @@ Same as `semantic-displayor-traditional', but with selection between multiple tags with the same name done by 'focusing' on the source location of the different tags to differentiate them.") -(defmethod semantic-displayor-focus-request +(cl-defmethod semantic-displayor-focus-request ((obj semantic-displayor-traditional-with-focus-highlight)) "Focus in on possible tag completions. Focus is performed by cycling through the tags and highlighting @@ -1630,7 +1630,7 @@ This will not happen if you directly set this variable via `setq'." "Display completions options in a tooltip. Display mechanism using tooltip for a list of possible completions.") -(defmethod initialize-instance :AFTER ((obj semantic-displayor-tooltip) &rest args) +(cl-defmethod initialize-instance :after ((obj semantic-displayor-tooltip) &rest args) "Make sure we have tooltips required." (condition-case nil (require 'tooltip) @@ -1639,12 +1639,12 @@ Display mechanism using tooltip for a list of possible completions.") (defvar tooltip-mode) -(defmethod semantic-displayor-show-request ((obj semantic-displayor-tooltip)) +(cl-defmethod semantic-displayor-show-request ((obj semantic-displayor-tooltip)) "A request to show the current tags table." (if (or (not (featurep 'tooltip)) (not tooltip-mode)) ;; If we cannot use tooltips, then go to the normal mode with ;; a traditional completion buffer. - (call-next-method) + (cl-call-next-method) (let* ((tablelong (semanticdb-strip-find-results (oref obj table))) (table (semantic-unique-tag-table-by-name tablelong)) (completions (mapcar semantic-completion-displayor-format-tag-function table)) @@ -1752,7 +1752,7 @@ Return a cons cell (X . Y)" tooltip-frame-parameters) (tooltip-show text))) -(defmethod semantic-displayor-scroll-request ((obj semantic-displayor-tooltip)) +(cl-defmethod semantic-displayor-scroll-request ((obj semantic-displayor-tooltip)) "A request to for the displayor to scroll the completion list (if needed)." ;; Do scrolling in the tooltip. (oset obj max-tags-initial 30) @@ -1778,9 +1778,9 @@ Completion displayor using ghost chars after point for focus options. Whichever completion is currently in focus will be displayed as ghost text using overlay options.") -(defmethod semantic-displayor-next-action ((obj semantic-displayor-ghost)) +(cl-defmethod semantic-displayor-next-action ((obj semantic-displayor-ghost)) "The next action to take on the inline completion related to display." - (let ((ans (call-next-method)) + (let ((ans (cl-call-next-method)) (table (when (slot-boundp obj 'table) (oref obj table)))) (if (and (eq ans 'displayend) @@ -1790,22 +1790,22 @@ text using overlay options.") nil ans))) -(defmethod semantic-displayor-cleanup ((obj semantic-displayor-ghost)) +(cl-defmethod semantic-displayor-cleanup ((obj semantic-displayor-ghost)) "Clean up any mess this displayor may have." (when (slot-boundp obj 'ghostoverlay) (semantic-overlay-delete (oref obj ghostoverlay))) ) -(defmethod semantic-displayor-set-completions ((obj semantic-displayor-ghost) +(cl-defmethod semantic-displayor-set-completions ((obj semantic-displayor-ghost) table prefix) "Set the list of tags to be completed over to TABLE." - (call-next-method) + (cl-call-next-method) (semantic-displayor-cleanup obj) ) -(defmethod semantic-displayor-show-request ((obj semantic-displayor-ghost)) +(cl-defmethod semantic-displayor-show-request ((obj semantic-displayor-ghost)) "A request to show the current tags table." ; (if (oref obj first-show) ; (progn @@ -1816,11 +1816,11 @@ text using overlay options.") ;; Only do the traditional thing if the first show request ;; has been seen. Use the first one to start doing the ghost ;; text display. -; (call-next-method) +; (cl-call-next-method) ; ) ) -(defmethod semantic-displayor-focus-request +(cl-defmethod semantic-displayor-focus-request ((obj semantic-displayor-ghost)) "Focus in on possible tag completions. Focus is performed by cycling through the tags and showing a possible diff --git a/lisp/cedet/semantic/db-ebrowse.el b/lisp/cedet/semantic/db-ebrowse.el index 2590dd1208d..2199a7d9862 100644 --- a/lisp/cedet/semantic/db-ebrowse.el +++ b/lisp/cedet/semantic/db-ebrowse.el @@ -224,7 +224,7 @@ warn instead." () "Search Ebrowse for symbols.") -(defmethod semanticdb-needs-refresh-p ((table semanticdb-table-ebrowse)) +(cl-defmethod semanticdb-needs-refresh-p ((table semanticdb-table-ebrowse)) "EBROWSE database do not need to be refreshed. JAVE: stub for needs-refresh, because, how do we know if BROWSE files @@ -282,7 +282,7 @@ For instance: /home/<username>/.semanticdb/!usr!include!BROWSE" ;;; Methods for creating a database or tables ;; -(defmethod semanticdb-create-database :STATIC ((dbeC semanticdb-project-database-ebrowse) +(cl-defmethod semanticdb-create-database ((dbeC (subclass semanticdb-project-database-ebrowse)) directory) "Create a new semantic database for DIRECTORY based on ebrowse. If there is no database for DIRECTORY available, then @@ -325,7 +325,7 @@ If there is no database for DIRECTORY available, then db))) -(defmethod semanticdb-ebrowse-strip-trees ((dbe semanticdb-project-database-ebrowse) +(cl-defmethod semanticdb-ebrowse-strip-trees ((dbe semanticdb-project-database-ebrowse) data) "For the ebrowse database DBE, strip all tables from DATA." ;JAVE what it actually seems to do is split the original tree in "tables" associated with files @@ -479,7 +479,7 @@ Optional argument BASECLASSES specifies a baseclass to the tree being provided." ;;; ;; Overload for converting the simple faux tag into something better. ;; -(defmethod semanticdb-normalize-tags ((obj semanticdb-table-ebrowse) tags) +(cl-defmethod semanticdb-normalize-tags ((obj semanticdb-table-ebrowse) tags) "Convert in Ebrowse database OBJ a list of TAGS into a complete tag. The default tag provided by searches exclude many features of a semantic parsed tag. Look up the file for OBJ, and match TAGS @@ -521,7 +521,7 @@ return that." (setq tags (cdr tags)))) tagret)) -(defmethod semanticdb-normalize-one-tag ((obj semanticdb-table-ebrowse) tag) +(cl-defmethod semanticdb-normalize-one-tag ((obj semanticdb-table-ebrowse) tag) "Convert in Ebrowse database OBJ one TAG into a complete tag. The default tag provided by searches exclude many features of a semantic parsed tag. Look up the file for OBJ, and match TAG @@ -569,48 +569,48 @@ return that." ;; NOTE WHEN IMPLEMENTING: Be sure to add doc-string updates explaining ;; how your new search routines are implemented. ;; -(defmethod semanticdb-find-tags-by-name-method +(cl-defmethod semanticdb-find-tags-by-name-method ((table semanticdb-table-ebrowse) name &optional tags) "Find all tags named NAME in TABLE. Return a list of tags." ;;(message "semanticdb-find-tags-by-name-method name -- %s" name) (if tags ;; If TAGS are passed in, then we don't need to do work here. - (call-next-method) + (cl-call-next-method) ;; If we ever need to do something special, add here. ;; Since ebrowse tags are converted into semantic tags, we can ;; get away with this sort of thing. - (call-next-method) + (cl-call-next-method) ) ) -(defmethod semanticdb-find-tags-by-name-regexp-method +(cl-defmethod semanticdb-find-tags-by-name-regexp-method ((table semanticdb-table-ebrowse) regex &optional tags) "Find all tags with name matching REGEX in TABLE. Optional argument TAGS is a list of tags to search. Return a list of tags." - (if tags (call-next-method) + (if tags (cl-call-next-method) ;; YOUR IMPLEMENTATION HERE - (call-next-method) + (cl-call-next-method) )) -(defmethod semanticdb-find-tags-for-completion-method +(cl-defmethod semanticdb-find-tags-for-completion-method ((table semanticdb-table-ebrowse) prefix &optional tags) "In TABLE, find all occurrences of tags matching PREFIX. Optional argument TAGS is a list of tags to search. Returns a table of all matching tags." - (if tags (call-next-method) + (if tags (cl-call-next-method) ;; YOUR IMPLEMENTATION HERE - (call-next-method) + (cl-call-next-method) )) -(defmethod semanticdb-find-tags-by-class-method +(cl-defmethod semanticdb-find-tags-by-class-method ((table semanticdb-table-ebrowse) class &optional tags) "In TABLE, find all occurrences of tags of CLASS. Optional argument TAGS is a list of tags to search. Returns a table of all matching tags." - (if tags (call-next-method) - (call-next-method))) + (if tags (cl-call-next-method) + (cl-call-next-method))) ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; @@ -621,38 +621,38 @@ Returns a table of all matching tags." ;; above. ;; -(defmethod semanticdb-deep-find-tags-by-name-method +(cl-defmethod semanticdb-deep-find-tags-by-name-method ((table semanticdb-table-ebrowse) name &optional tags) "Find all tags name NAME in TABLE. Optional argument TAGS is a list of tags to search. Like `semanticdb-find-tags-by-name-method' for ebrowse." ;;(semanticdb-find-tags-by-name-method table name tags) - (call-next-method)) + (cl-call-next-method)) -(defmethod semanticdb-deep-find-tags-by-name-regexp-method +(cl-defmethod semanticdb-deep-find-tags-by-name-regexp-method ((table semanticdb-table-ebrowse) regex &optional tags) "Find all tags with name matching REGEX in TABLE. Optional argument TAGS is a list of tags to search. Like `semanticdb-find-tags-by-name-method' for ebrowse." ;;(semanticdb-find-tags-by-name-regexp-method table regex tags) - (call-next-method)) + (cl-call-next-method)) -(defmethod semanticdb-deep-find-tags-for-completion-method +(cl-defmethod semanticdb-deep-find-tags-for-completion-method ((table semanticdb-table-ebrowse) prefix &optional tags) "In TABLE, find all occurrences of tags matching PREFIX. Optional argument TAGS is a list of tags to search. Like `semanticdb-find-tags-for-completion-method' for ebrowse." ;;(semanticdb-find-tags-for-completion-method table prefix tags) - (call-next-method)) + (cl-call-next-method)) ;;; Advanced Searches ;; -(defmethod semanticdb-find-tags-external-children-of-type-method +(cl-defmethod semanticdb-find-tags-external-children-of-type-method ((table semanticdb-table-ebrowse) type &optional tags) "Find all nonterminals which are child elements of TYPE Optional argument TAGS is a list of tags to search. Return a list of tags." - (if tags (call-next-method) + (if tags (cl-call-next-method) ;; Ebrowse collects all this type of stuff together for us. ;; but we can't use it.... yet. nil diff --git a/lisp/cedet/semantic/db-el.el b/lisp/cedet/semantic/db-el.el index be9ffe31b87..e37b65a461e 100644 --- a/lisp/cedet/semantic/db-el.el +++ b/lisp/cedet/semantic/db-el.el @@ -44,16 +44,16 @@ ) "A table for returning search results from Emacs.") -(defmethod semanticdb-refresh-table ((obj semanticdb-table-emacs-lisp) &optional force) +(cl-defmethod semanticdb-refresh-table ((obj semanticdb-table-emacs-lisp) &optional force) "Do not refresh Emacs Lisp table. It does not need refreshing." nil) -(defmethod semanticdb-needs-refresh-p ((obj semanticdb-table-emacs-lisp)) +(cl-defmethod semanticdb-needs-refresh-p ((obj semanticdb-table-emacs-lisp)) "Return nil, we never need a refresh." nil) -(defmethod object-print ((obj semanticdb-table-emacs-lisp) &rest strings) +(cl-defmethod object-print ((obj semanticdb-table-emacs-lisp) &rest strings) "Pretty printer extension for `semanticdb-table-emacs-lisp'. Adds the number of tags in this file to the object print name." (apply 'call-next-method obj (cons " (proxy)" strings))) @@ -67,7 +67,7 @@ Adds the number of tags in this file to the object print name." ) "Database representing Emacs core.") -(defmethod object-print ((obj semanticdb-project-database-emacs-lisp) &rest strings) +(cl-defmethod object-print ((obj semanticdb-project-database-emacs-lisp) &rest strings) "Pretty printer extension for `semanticdb-table-emacs-lisp'. Adds the number of tags in this file to the object print name." (let ((count 0)) @@ -90,7 +90,7 @@ the omniscience database.") ;;; Filename based methods ;; -(defmethod semanticdb-get-database-tables ((obj semanticdb-project-database-emacs-lisp)) +(cl-defmethod semanticdb-get-database-tables ((obj semanticdb-project-database-emacs-lisp)) "For an Emacs Lisp database, there are no explicit tables. Create one of our special tables that can act as an intermediary." ;; We need to return something since there is always the "master table" @@ -101,34 +101,34 @@ Create one of our special tables that can act as an intermediary." (oset newtable parent-db obj) (oset newtable tags nil) )) - (call-next-method)) + (cl-call-next-method)) -(defmethod semanticdb-file-table ((obj semanticdb-project-database-emacs-lisp) filename) +(cl-defmethod semanticdb-file-table ((obj semanticdb-project-database-emacs-lisp) filename) "From OBJ, return FILENAME's associated table object. For Emacs Lisp, creates a specialized table." (car (semanticdb-get-database-tables obj)) ) -(defmethod semanticdb-get-tags ((table semanticdb-table-emacs-lisp )) +(cl-defmethod semanticdb-get-tags ((table semanticdb-table-emacs-lisp )) "Return the list of tags belonging to TABLE." ;; specialty table ? Probably derive tags at request time. nil) -(defmethod semanticdb-equivalent-mode ((table semanticdb-table-emacs-lisp) &optional buffer) +(cl-defmethod semanticdb-equivalent-mode ((table semanticdb-table-emacs-lisp) &optional buffer) "Return non-nil if TABLE's mode is equivalent to BUFFER. Equivalent modes are specified by the `semantic-equivalent-major-modes' local variable." (with-current-buffer buffer (eq (or mode-local-active-mode major-mode) 'emacs-lisp-mode))) -(defmethod semanticdb-full-filename ((obj semanticdb-table-emacs-lisp)) +(cl-defmethod semanticdb-full-filename ((obj semanticdb-table-emacs-lisp)) "Fetch the full filename that OBJ refers to. For Emacs Lisp system DB, there isn't one." nil) ;;; Conversion ;; -(defmethod semanticdb-normalize-tags ((obj semanticdb-table-emacs-lisp) tags) +(cl-defmethod semanticdb-normalize-tags ((obj semanticdb-table-emacs-lisp) tags) "Convert tags, originating from Emacs OBJ, into standardized form." (let ((newtags nil)) (dolist (T tags) @@ -138,7 +138,7 @@ For Emacs Lisp system DB, there isn't one." ;; There is no promise to have files associated. (nreverse newtags))) -(defmethod semanticdb-normalize-one-tag ((obj semanticdb-table-emacs-lisp) tag) +(cl-defmethod semanticdb-normalize-one-tag ((obj semanticdb-table-emacs-lisp) tag) "Convert one TAG, originating from Emacs OBJ, into standardized form. If Emacs cannot resolve this symbol to a particular file, then return nil." ;; Here's the idea. For each tag, get the name, then use @@ -245,12 +245,12 @@ TOKTYPE is a hint to the type of tag desired." (defvar semanticdb-elisp-mapatom-collector nil "Variable used to collect `mapatoms' output.") -(defmethod semanticdb-find-tags-by-name-method +(cl-defmethod semanticdb-find-tags-by-name-method ((table semanticdb-table-emacs-lisp) name &optional tags) "Find all tags named NAME in TABLE. Uses `intern-soft' to match NAME to Emacs symbols. Return a list of tags." - (if tags (call-next-method) + (if tags (cl-call-next-method) ;; No need to search. Use `intern-soft' which does the same thing for us. (let* ((sym (intern-soft name)) (fun (semanticdb-elisp-sym->tag sym 'function)) @@ -266,52 +266,52 @@ Return a list of tags." taglst )))) -(defmethod semanticdb-find-tags-by-name-regexp-method +(cl-defmethod semanticdb-find-tags-by-name-regexp-method ((table semanticdb-table-emacs-lisp) regex &optional tags) "Find all tags with name matching REGEX in TABLE. Optional argument TAGS is a list of tags to search. Uses `apropos-internal' to find matches. Return a list of tags." - (if tags (call-next-method) + (if tags (cl-call-next-method) (delq nil (mapcar 'semanticdb-elisp-sym->tag (apropos-internal regex))))) -(defmethod semanticdb-find-tags-for-completion-method +(cl-defmethod semanticdb-find-tags-for-completion-method ((table semanticdb-table-emacs-lisp) prefix &optional tags) "In TABLE, find all occurrences of tags matching PREFIX. Optional argument TAGS is a list of tags to search. Returns a table of all matching tags." - (if tags (call-next-method) + (if tags (cl-call-next-method) (delq nil (mapcar 'semanticdb-elisp-sym->tag (all-completions prefix obarray))))) -(defmethod semanticdb-find-tags-by-class-method +(cl-defmethod semanticdb-find-tags-by-class-method ((table semanticdb-table-emacs-lisp) class &optional tags) "In TABLE, find all occurrences of tags of CLASS. Optional argument TAGS is a list of tags to search. Returns a table of all matching tags." - (if tags (call-next-method) + (if tags (cl-call-next-method) ;; We could implement this, but it could be messy. nil)) ;;; Deep Searches ;; ;; For Emacs Lisp deep searches are like top level searches. -(defmethod semanticdb-deep-find-tags-by-name-method +(cl-defmethod semanticdb-deep-find-tags-by-name-method ((table semanticdb-table-emacs-lisp) name &optional tags) "Find all tags name NAME in TABLE. Optional argument TAGS is a list of tags to search. Like `semanticdb-find-tags-by-name-method' for Emacs Lisp." (semanticdb-find-tags-by-name-method table name tags)) -(defmethod semanticdb-deep-find-tags-by-name-regexp-method +(cl-defmethod semanticdb-deep-find-tags-by-name-regexp-method ((table semanticdb-table-emacs-lisp) regex &optional tags) "Find all tags with name matching REGEX in TABLE. Optional argument TAGS is a list of tags to search. Like `semanticdb-find-tags-by-name-method' for Emacs Lisp." (semanticdb-find-tags-by-name-regexp-method table regex tags)) -(defmethod semanticdb-deep-find-tags-for-completion-method +(cl-defmethod semanticdb-deep-find-tags-for-completion-method ((table semanticdb-table-emacs-lisp) prefix &optional tags) "In TABLE, find all occurrences of tags matching PREFIX. Optional argument TAGS is a list of tags to search. @@ -320,12 +320,12 @@ Like `semanticdb-find-tags-for-completion-method' for Emacs Lisp." ;;; Advanced Searches ;; -(defmethod semanticdb-find-tags-external-children-of-type-method +(cl-defmethod semanticdb-find-tags-external-children-of-type-method ((table semanticdb-table-emacs-lisp) type &optional tags) "Find all nonterminals which are child elements of TYPE Optional argument TAGS is a list of tags to search. Return a list of tags." - (if tags (call-next-method) + (if tags (cl-call-next-method) ;; EIEIO is the only time this matters (when (featurep 'eieio) (let* ((class (intern-soft type)) diff --git a/lisp/cedet/semantic/db-file.el b/lisp/cedet/semantic/db-file.el index 0360e0680e7..f38153b18c1 100644 --- a/lisp/cedet/semantic/db-file.el +++ b/lisp/cedet/semantic/db-file.el @@ -123,7 +123,7 @@ To save the version number, we must hand-set this version string.") ;;; Code: ;; -(defmethod semanticdb-create-database :STATIC ((dbc semanticdb-project-database-file) +(cl-defmethod semanticdb-create-database ((dbc (subclass semanticdb-project-database-file)) directory) "Create a new semantic database for DIRECTORY and return it. If a database for DIRECTORY has already been loaded, return it. @@ -197,7 +197,7 @@ If DIRECTORY doesn't exist, create a new one." "Return the project belonging to FILENAME if it was already loaded." (eieio-instance-tracker-find filename 'file 'semanticdb-database-list)) -(defmethod semanticdb-file-directory-exists-p ((DB semanticdb-project-database-file) +(cl-defmethod semanticdb-file-directory-exists-p ((DB semanticdb-project-database-file) &optional suppress-questions) "Does the directory the database DB needs to write to exist? If SUPPRESS-QUESTIONS, then do not ask to create the directory." @@ -219,7 +219,7 @@ If SUPPRESS-QUESTIONS, then do not ask to create the directory." (setq semanticdb--inhibit-make-directory t)) nil)))) -(defmethod semanticdb-save-db ((DB semanticdb-project-database-file) +(cl-defmethod semanticdb-save-db ((DB semanticdb-project-database-file) &optional suppress-questions) "Write out the database DB to its file. @@ -259,13 +259,13 @@ If DB is not specified, then use the current database." ) )) -(defmethod semanticdb-live-p ((obj semanticdb-project-database)) +(cl-defmethod semanticdb-live-p ((obj semanticdb-project-database)) "Return non-nil if the file associated with OBJ is live. Live databases are objects associated with existing directories." (and (slot-boundp obj 'reference-directory) (file-exists-p (oref obj reference-directory)))) -(defmethod semanticdb-live-p ((obj semanticdb-table)) +(cl-defmethod semanticdb-live-p ((obj semanticdb-table)) "Return non-nil if the file associated with OBJ is live. Live files are either buffers in Emacs, or files existing on the filesystem." (let ((full-filename (semanticdb-full-filename obj))) @@ -279,7 +279,7 @@ to prevent overload.") (declare-function data-debug-insert-thing "data-debug") -(defmethod object-write ((obj semanticdb-table)) +(cl-defmethod object-write ((obj semanticdb-table)) "When writing a table, we have to make sure we deoverlay it first. Restore the overlays after writing. Argument OBJ is the object to write." @@ -312,7 +312,7 @@ Argument OBJ is the object to write." ;; Do it! (condition-case tableerror - (call-next-method) + (cl-call-next-method) (error (when semanticdb-data-debug-on-write-error (require 'data-debug) @@ -328,7 +328,7 @@ Argument OBJ is the object to write." ;;; State queries ;; -(defmethod semanticdb-write-directory-p ((obj semanticdb-project-database-file)) +(cl-defmethod semanticdb-write-directory-p ((obj semanticdb-project-database-file)) "Return non-nil if OBJ should be written to disk. Uses `semanticdb-persistent-path' to determine the return value." (let ((path semanticdb-persistent-path)) @@ -360,25 +360,25 @@ Uses `semanticdb-persistent-path' to determine the return value." (throw 'found t)) (t (error "Invalid path %S" (car path)))) (setq path (cdr path))) - (call-next-method)) + (cl-call-next-method)) )) ;;; Filename manipulation ;; -(defmethod semanticdb-file-table ((obj semanticdb-project-database-file) filename) +(cl-defmethod semanticdb-file-table ((obj semanticdb-project-database-file) filename) "From OBJ, return FILENAME's associated table object." ;; Cheater option. In this case, we always have files directly ;; under ourselves. The main project type may not. (object-assoc (file-name-nondirectory filename) 'file (oref obj tables))) -(defmethod semanticdb-file-name-non-directory :STATIC - ((dbclass semanticdb-project-database-file)) +(cl-defmethod semanticdb-file-name-non-directory + ((dbclass (subclass semanticdb-project-database-file))) "Return the file name DBCLASS will use. File name excludes any directory part." semanticdb-default-file-name) -(defmethod semanticdb-file-name-directory :STATIC - ((dbclass semanticdb-project-database-file) directory) +(cl-defmethod semanticdb-file-name-directory + ((dbclass (subclass semanticdb-project-database-file)) directory) "Return the relative directory to where DBCLASS will save its cache file. The returned path is related to DIRECTORY." (if semanticdb-default-save-directory @@ -389,8 +389,8 @@ The returned path is related to DIRECTORY." file (file-name-as-directory semanticdb-default-save-directory))) directory)) -(defmethod semanticdb-cache-filename :STATIC - ((dbclass semanticdb-project-database-file) path) +(cl-defmethod semanticdb-cache-filename + ((dbclass (subclass semanticdb-project-database-file)) path) "For DBCLASS, return a file to a cache file belonging to PATH. This could be a cache file in the current directory, or an encoded file name in a secondary directory." @@ -399,7 +399,7 @@ name in a secondary directory." (concat (semanticdb-file-name-directory dbclass path) (semanticdb-file-name-non-directory dbclass))) -(defmethod semanticdb-full-filename ((obj semanticdb-project-database-file)) +(cl-defmethod semanticdb-full-filename ((obj semanticdb-project-database-file)) "Fetch the full filename that OBJ refers to." (oref obj file)) diff --git a/lisp/cedet/semantic/db-find.el b/lisp/cedet/semantic/db-find.el index dd36cc1a01e..ff3431a17cf 100644 --- a/lisp/cedet/semantic/db-find.el +++ b/lisp/cedet/semantic/db-find.el @@ -196,7 +196,7 @@ expunge duplicates.") "Concrete search index for `semanticdb-find'. This class will cache data derived during various searches.") -(defmethod semantic-reset ((idx semanticdb-find-search-index)) +(cl-defmethod semantic-reset ((idx semanticdb-find-search-index)) "Reset the object IDX." (require 'semantic/scope) ;; Clear the include path. @@ -208,7 +208,7 @@ This class will cache data derived during various searches.") (semantic-scope-reset-cache) ) -(defmethod semanticdb-synchronize ((idx semanticdb-find-search-index) +(cl-defmethod semanticdb-synchronize ((idx semanticdb-find-search-index) new-tags) "Synchronize the search index IDX with some NEW-TAGS." ;; Reset our parts. @@ -220,7 +220,7 @@ This class will cache data derived during various searches.") (semantic-reset (semanticdb-get-table-index tab)))) ) -(defmethod semanticdb-partial-synchronize ((idx semanticdb-find-search-index) +(cl-defmethod semanticdb-partial-synchronize ((idx semanticdb-find-search-index) new-tags) "Synchronize the search index IDX with some changed NEW-TAGS." ;; Only reset if include statements changed. @@ -1304,25 +1304,25 @@ associated with that tag should be loaded into a buffer." ;; Override these with system databases to as new types of back ends. ;;; Top level Searches -(defmethod semanticdb-find-tags-by-name-method ((table semanticdb-abstract-table) name &optional tags) +(cl-defmethod semanticdb-find-tags-by-name-method ((table semanticdb-abstract-table) name &optional tags) "In TABLE, find all occurrences of tags with NAME. Optional argument TAGS is a list of tags to search. Returns a table of all matching tags." (semantic-find-tags-by-name name (or tags (semanticdb-get-tags table)))) -(defmethod semanticdb-find-tags-by-name-regexp-method ((table semanticdb-abstract-table) regexp &optional tags) +(cl-defmethod semanticdb-find-tags-by-name-regexp-method ((table semanticdb-abstract-table) regexp &optional tags) "In TABLE, find all occurrences of tags matching REGEXP. Optional argument TAGS is a list of tags to search. Returns a table of all matching tags." (semantic-find-tags-by-name-regexp regexp (or tags (semanticdb-get-tags table)))) -(defmethod semanticdb-find-tags-for-completion-method ((table semanticdb-abstract-table) prefix &optional tags) +(cl-defmethod semanticdb-find-tags-for-completion-method ((table semanticdb-abstract-table) prefix &optional tags) "In TABLE, find all occurrences of tags matching PREFIX. Optional argument TAGS is a list of tags to search. Returns a table of all matching tags." (semantic-find-tags-for-completion prefix (or tags (semanticdb-get-tags table)))) -(defmethod semanticdb-find-tags-by-class-method ((table semanticdb-abstract-table) class &optional tags) +(cl-defmethod semanticdb-find-tags-by-class-method ((table semanticdb-abstract-table) class &optional tags) "In TABLE, find all occurrences of tags of CLASS. Optional argument TAGS is a list of tags to search. Returns a table of all matching tags." @@ -1333,14 +1333,14 @@ Returns a table of all matching tags." (semantic-find-tags-included (or tags (semanticdb-get-tags table))) (semantic-find-tags-by-class class (or tags (semanticdb-get-tags table))))) -(defmethod semanticdb-find-tags-external-children-of-type-method ((table semanticdb-abstract-table) parent &optional tags) +(cl-defmethod semanticdb-find-tags-external-children-of-type-method ((table semanticdb-abstract-table) parent &optional tags) "In TABLE, find all occurrences of tags whose parent is the PARENT type. Optional argument TAGS is a list of tags to search. Returns a table of all matching tags." (require 'semantic/find) (semantic-find-tags-external-children-of-type parent (or tags (semanticdb-get-tags table)))) -(defmethod semanticdb-find-tags-subclasses-of-type-method ((table semanticdb-abstract-table) parent &optional tags) +(cl-defmethod semanticdb-find-tags-subclasses-of-type-method ((table semanticdb-abstract-table) parent &optional tags) "In TABLE, find all occurrences of tags whose parent is the PARENT type. Optional argument TAGS is a list of tags to search. Returns a table of all matching tags." @@ -1348,7 +1348,7 @@ Returns a table of all matching tags." (semantic-find-tags-subclasses-of-type parent (or tags (semanticdb-get-tags table)))) ;;; Deep Searches -(defmethod semanticdb-deep-find-tags-by-name-method ((table semanticdb-abstract-table) name &optional tags) +(cl-defmethod semanticdb-deep-find-tags-by-name-method ((table semanticdb-abstract-table) name &optional tags) "In TABLE, find all occurrences of tags with NAME. Search in all tags in TABLE, and all components of top level tags in TABLE. @@ -1356,7 +1356,7 @@ Optional argument TAGS is a list of tags to search. Return a table of all matching tags." (semantic-find-tags-by-name name (semantic-flatten-tags-table (or tags (semanticdb-get-tags table))))) -(defmethod semanticdb-deep-find-tags-by-name-regexp-method ((table semanticdb-abstract-table) regexp &optional tags) +(cl-defmethod semanticdb-deep-find-tags-by-name-regexp-method ((table semanticdb-abstract-table) regexp &optional tags) "In TABLE, find all occurrences of tags matching REGEXP. Search in all tags in TABLE, and all components of top level tags in TABLE. @@ -1364,7 +1364,7 @@ Optional argument TAGS is a list of tags to search. Return a table of all matching tags." (semantic-find-tags-by-name-regexp regexp (semantic-flatten-tags-table (or tags (semanticdb-get-tags table))))) -(defmethod semanticdb-deep-find-tags-for-completion-method ((table semanticdb-abstract-table) prefix &optional tags) +(cl-defmethod semanticdb-deep-find-tags-for-completion-method ((table semanticdb-abstract-table) prefix &optional tags) "In TABLE, find all occurrences of tags matching PREFIX. Search in all tags in TABLE, and all components of top level tags in TABLE. diff --git a/lisp/cedet/semantic/db-global.el b/lisp/cedet/semantic/db-global.el index b042b49ec6e..b95fa34cb3c 100644 --- a/lisp/cedet/semantic/db-global.el +++ b/lisp/cedet/semantic/db-global.el @@ -112,12 +112,12 @@ if optional DONT-ERR-IF-NOT-AVAILABLE is non-nil; else throw an error." ) "A table for returning search results from GNU Global.") -(defmethod object-print ((obj semanticdb-table-global) &rest strings) +(cl-defmethod object-print ((obj semanticdb-table-global) &rest strings) "Pretty printer extension for `semanticdb-table-global'. Adds the number of tags in this file to the object print name." (apply 'call-next-method obj (cons " (proxy)" strings))) -(defmethod semanticdb-equivalent-mode ((table semanticdb-table-global) &optional buffer) +(cl-defmethod semanticdb-equivalent-mode ((table semanticdb-table-global) &optional buffer) "Return t, pretend that this table's mode is equivalent to BUFFER. Equivalent modes are specified by the `semantic-equivalent-major-modes' local variable." @@ -126,7 +126,7 @@ local variable." ;;; Filename based methods ;; -(defmethod semanticdb-get-database-tables ((obj semanticdb-project-database-global)) +(cl-defmethod semanticdb-get-database-tables ((obj semanticdb-project-database-global)) "For a global database, there are no explicit tables. For each file hit, get the traditional semantic table from that file." ;; We need to return something since there is always the "master table" @@ -138,9 +138,9 @@ For each file hit, get the traditional semantic table from that file." (oset newtable tags nil) )) - (call-next-method)) + (cl-call-next-method)) -(defmethod semanticdb-file-table ((obj semanticdb-project-database-global) filename) +(cl-defmethod semanticdb-file-table ((obj semanticdb-project-database-global) filename) "From OBJ, return FILENAME's associated table object." ;; We pass in "don't load". I wonder if we need to avoid that or not? (car (semanticdb-get-database-tables obj)) @@ -150,13 +150,13 @@ For each file hit, get the traditional semantic table from that file." ;; ;; Only NAME based searches work with GLOBAL as that is all it tracks. ;; -(defmethod semanticdb-find-tags-by-name-method +(cl-defmethod semanticdb-find-tags-by-name-method ((table semanticdb-table-global) name &optional tags) "Find all tags named NAME in TABLE. Return a list of tags." (if tags ;; If TAGS are passed in, then we don't need to do work here. - (call-next-method) + (cl-call-next-method) ;; Call out to GNU Global for some results. (let* ((semantic-symref-tool 'global) (result (semantic-symref-find-tags-by-name name 'project)) @@ -167,12 +167,12 @@ Return a list of tags." (semantic-symref-result-get-tags result)) ))) -(defmethod semanticdb-find-tags-by-name-regexp-method +(cl-defmethod semanticdb-find-tags-by-name-regexp-method ((table semanticdb-table-global) regex &optional tags) "Find all tags with name matching REGEX in TABLE. Optional argument TAGS is a list of tags to search. Return a list of tags." - (if tags (call-next-method) + (if tags (cl-call-next-method) (let* ((semantic-symref-tool 'global) (result (semantic-symref-find-tags-by-regexp regex 'project)) ) @@ -180,12 +180,12 @@ Return a list of tags." (semantic-symref-result-get-tags result)) ))) -(defmethod semanticdb-find-tags-for-completion-method +(cl-defmethod semanticdb-find-tags-for-completion-method ((table semanticdb-table-global) prefix &optional tags) "In TABLE, find all occurrences of tags matching PREFIX. Optional argument TAGS is a list of tags to search. Returns a table of all matching tags." - (if tags (call-next-method) + (if tags (cl-call-next-method) (let* ((semantic-symref-tool 'global) (result (semantic-symref-find-tags-by-completion prefix 'project)) (faketags nil) @@ -206,21 +206,21 @@ Returns a table of all matching tags." ;; alone, otherwise replace with implementations similar to those ;; above. ;; -(defmethod semanticdb-deep-find-tags-by-name-method +(cl-defmethod semanticdb-deep-find-tags-by-name-method ((table semanticdb-table-global) name &optional tags) "Find all tags name NAME in TABLE. Optional argument TAGS is a list of tags to search. Like `semanticdb-find-tags-by-name-method' for global." (semanticdb-find-tags-by-name-method table name tags)) -(defmethod semanticdb-deep-find-tags-by-name-regexp-method +(cl-defmethod semanticdb-deep-find-tags-by-name-regexp-method ((table semanticdb-table-global) regex &optional tags) "Find all tags with name matching REGEX in TABLE. Optional argument TAGS is a list of tags to search. Like `semanticdb-find-tags-by-name-method' for global." (semanticdb-find-tags-by-name-regexp-method table regex tags)) -(defmethod semanticdb-deep-find-tags-for-completion-method +(cl-defmethod semanticdb-deep-find-tags-for-completion-method ((table semanticdb-table-global) prefix &optional tags) "In TABLE, find all occurrences of tags matching PREFIX. Optional argument TAGS is a list of tags to search. diff --git a/lisp/cedet/semantic/db-javascript.el b/lisp/cedet/semantic/db-javascript.el index 24aa6b702cd..4aced34d8ef 100644 --- a/lisp/cedet/semantic/db-javascript.el +++ b/lisp/cedet/semantic/db-javascript.el @@ -111,7 +111,7 @@ the omniscience database.") ;;; Filename based methods ;; -(defmethod semanticdb-get-database-tables ((obj semanticdb-project-database-javascript)) +(cl-defmethod semanticdb-get-database-tables ((obj semanticdb-project-database-javascript)) "For a javascript database, there are no explicit tables. Create one of our special tables that can act as an intermediary." ;; NOTE: This method overrides an accessor for the `tables' slot in @@ -126,23 +126,23 @@ Create one of our special tables that can act as an intermediary." (oset newtable parent-db obj) (oset newtable tags nil) )) - (call-next-method) + (cl-call-next-method) ) -(defmethod semanticdb-file-table ((obj semanticdb-project-database-javascript) filename) +(cl-defmethod semanticdb-file-table ((obj semanticdb-project-database-javascript) filename) "From OBJ, return FILENAME's associated table object." ;; NOTE: See not for `semanticdb-get-database-tables'. (car (semanticdb-get-database-tables obj)) ) -(defmethod semanticdb-get-tags ((table semanticdb-table-javascript )) +(cl-defmethod semanticdb-get-tags ((table semanticdb-table-javascript )) "Return the list of tags belonging to TABLE." ;; NOTE: Omniscient databases probably don't want to keep large tables ;; lolly-gagging about. Keep internal Emacs tables empty and ;; refer to alternate databases when you need something. semanticdb-javascript-tags) -(defmethod semanticdb-equivalent-mode ((table semanticdb-table-javascript) &optional buffer) +(cl-defmethod semanticdb-equivalent-mode ((table semanticdb-table-javascript) &optional buffer) "Return non-nil if TABLE's mode is equivalent to BUFFER. Equivalent modes are specified by the `semantic-equivalent-major-modes' local variable." @@ -192,43 +192,43 @@ database (if available.)" (setq tags (cdr tags))) result)) -(defmethod semanticdb-find-tags-by-name-method +(cl-defmethod semanticdb-find-tags-by-name-method ((table semanticdb-table-javascript) name &optional tags) "Find all tags named NAME in TABLE. Return a list of tags." (if tags ;; If TAGS are passed in, then we don't need to do work here. - (call-next-method) + (cl-call-next-method) (assoc-string name semanticdb-javascript-tags) )) -(defmethod semanticdb-find-tags-by-name-regexp-method +(cl-defmethod semanticdb-find-tags-by-name-regexp-method ((table semanticdb-table-javascript) regex &optional tags) "Find all tags with name matching REGEX in TABLE. Optional argument TAGS is a list of tags to search. Return a list of tags." - (if tags (call-next-method) + (if tags (cl-call-next-method) ;; YOUR IMPLEMENTATION HERE (semanticdb-javascript-regexp-search regex) )) -(defmethod semanticdb-find-tags-for-completion-method +(cl-defmethod semanticdb-find-tags-for-completion-method ((table semanticdb-table-javascript) prefix &optional tags) "In TABLE, find all occurrences of tags matching PREFIX. Optional argument TAGS is a list of tags to search. Returns a table of all matching tags." - (if tags (call-next-method) + (if tags (cl-call-next-method) ;; YOUR IMPLEMENTATION HERE (semanticdb-javascript-regexp-search (concat "^" prefix ".*")) )) -(defmethod semanticdb-find-tags-by-class-method +(cl-defmethod semanticdb-find-tags-by-class-method ((table semanticdb-table-javascript) class &optional tags) "In TABLE, find all occurrences of tags of CLASS. Optional argument TAGS is a list of tags to search. Returns a table of all matching tags." - (if tags (call-next-method) + (if tags (cl-call-next-method) ;; YOUR IMPLEMENTATION HERE ;; ;; Note: This search method could be considered optional in an @@ -244,21 +244,21 @@ Returns a table of all matching tags." ;; alone, otherwise replace with implementations similar to those ;; above. ;; -(defmethod semanticdb-deep-find-tags-by-name-method +(cl-defmethod semanticdb-deep-find-tags-by-name-method ((table semanticdb-table-javascript) name &optional tags) "Find all tags name NAME in TABLE. Optional argument TAGS is a list of tags to search. Like `semanticdb-find-tags-by-name-method' for javascript." (semanticdb-find-tags-by-name-method table name tags)) -(defmethod semanticdb-deep-find-tags-by-name-regexp-method +(cl-defmethod semanticdb-deep-find-tags-by-name-regexp-method ((table semanticdb-table-javascript) regex &optional tags) "Find all tags with name matching REGEX in TABLE. Optional argument TAGS is a list of tags to search. Like `semanticdb-find-tags-by-name-method' for javascript." (semanticdb-find-tags-by-name-regexp-method table regex tags)) -(defmethod semanticdb-deep-find-tags-for-completion-method +(cl-defmethod semanticdb-deep-find-tags-for-completion-method ((table semanticdb-table-javascript) prefix &optional tags) "In TABLE, find all occurrences of tags matching PREFIX. Optional argument TAGS is a list of tags to search. @@ -267,12 +267,12 @@ Like `semanticdb-find-tags-for-completion-method' for javascript." ;;; Advanced Searches ;; -(defmethod semanticdb-find-tags-external-children-of-type-method +(cl-defmethod semanticdb-find-tags-external-children-of-type-method ((table semanticdb-table-javascript) type &optional tags) "Find all nonterminals which are child elements of TYPE. Optional argument TAGS is a list of tags to search. Return a list of tags." - (if tags (call-next-method) + (if tags (cl-call-next-method) ;; YOUR IMPLEMENTATION HERE ;; ;; OPTIONAL: This could be considered an optional function. It is diff --git a/lisp/cedet/semantic/db-ref.el b/lisp/cedet/semantic/db-ref.el index d2fe67bbf84..445dcfe5c20 100644 --- a/lisp/cedet/semantic/db-ref.el +++ b/lisp/cedet/semantic/db-ref.el @@ -37,6 +37,7 @@ ;;; Code: (require 'eieio) +(require 'cl-generic) (require 'semantic) (require 'semantic/db) (require 'semantic/tag) @@ -44,7 +45,7 @@ ;; For the semantic-find-tags-by-name-regexp macro. (eval-when-compile (require 'semantic/find)) -(defmethod semanticdb-add-reference ((dbt semanticdb-abstract-table) +(cl-defmethod semanticdb-add-reference ((dbt semanticdb-abstract-table) include-tag) "Add a reference for the database table DBT based on INCLUDE-TAG. DBT is the database table that owns the INCLUDE-TAG. The reference @@ -66,18 +67,18 @@ will be added to the database that INCLUDE-TAG refers to." (object-add-to-list refdbt 'db-refs dbt) t))) -(defmethod semanticdb-check-references ((dbt semanticdb-abstract-table)) +(cl-defmethod semanticdb-check-references ((dbt semanticdb-abstract-table)) "Check and cleanup references in the database DBT. Abstract tables would be difficult to reference." ;; Not sure how an abstract table can have references. nil) -(defmethod semanticdb-includes-in-table ((dbt semanticdb-abstract-table)) +(cl-defmethod semanticdb-includes-in-table ((dbt semanticdb-abstract-table)) "Return a list of direct includes in table DBT." (semantic-find-tags-by-class 'include (semanticdb-get-tags dbt))) -(defmethod semanticdb-check-references ((dbt semanticdb-table)) +(cl-defmethod semanticdb-check-references ((dbt semanticdb-table)) "Check and cleanup references in the database DBT. Any reference to a file that cannot be found, or whos file no longer refers to DBT will be removed." @@ -108,13 +109,13 @@ refers to DBT will be removed." )) (setq refs (cdr refs))))) -(defmethod semanticdb-refresh-references ((dbt semanticdb-abstract-table)) +(cl-defmethod semanticdb-refresh-references ((dbt semanticdb-abstract-table)) "Refresh references to DBT in other files." ;; alternate tables can't be edited, so can't be changed. nil ) -(defmethod semanticdb-refresh-references ((dbt semanticdb-table)) +(cl-defmethod semanticdb-refresh-references ((dbt semanticdb-table)) "Refresh references to DBT in other files." (let ((refs (semanticdb-includes-in-table dbt)) ) @@ -127,7 +128,7 @@ refers to DBT will be removed." (setq refs (cdr refs))) )) -(defmethod semanticdb-notify-references ((dbt semanticdb-table) +(cl-defmethod semanticdb-notify-references ((dbt semanticdb-table) method) "Notify all references of the table DBT using method. METHOD takes two arguments. diff --git a/lisp/cedet/semantic/db-typecache.el b/lisp/cedet/semantic/db-typecache.el index 723b7bd28bc..20b5b3f9ea0 100644 --- a/lisp/cedet/semantic/db-typecache.el +++ b/lisp/cedet/semantic/db-typecache.el @@ -67,7 +67,7 @@ Said object must support `semantic-reset' methods.") ) "Structure for maintaining a typecache.") -(defmethod semantic-reset ((tc semanticdb-typecache)) +(cl-defmethod semantic-reset ((tc semanticdb-typecache)) "Reset the object IDX." (oset tc filestream nil) (oset tc includestream nil) @@ -78,14 +78,14 @@ Said object must support `semantic-reset' methods.") (oset tc dependants nil) ) -(defmethod semanticdb-typecache-notify-reset ((tc semanticdb-typecache)) +(cl-defmethod semanticdb-typecache-notify-reset ((tc semanticdb-typecache)) "Do a reset from a notify from a table we depend on." (oset tc includestream nil) (mapc 'semantic-reset (oref tc dependants)) (oset tc dependants nil) ) -(defmethod semanticdb-partial-synchronize ((tc semanticdb-typecache) +(cl-defmethod semanticdb-partial-synchronize ((tc semanticdb-typecache) new-tags) "Reset the typecache based on a partial reparse." (when (semantic-find-tags-by-class 'include new-tags) @@ -125,7 +125,7 @@ Debugging function." (t -1) )) -(defmethod semanticdb-get-typecache ((table semanticdb-abstract-table)) +(cl-defmethod semanticdb-get-typecache ((table semanticdb-abstract-table)) "Retrieve the typecache from the semanticdb TABLE. If there is no table, create one, and fill it in." (semanticdb-refresh-table table) @@ -141,7 +141,7 @@ If there is no table, create one, and fill it in." cache)) -(defmethod semanticdb-have-typecache-p ((table semanticdb-abstract-table)) +(cl-defmethod semanticdb-have-typecache-p ((table semanticdb-abstract-table)) "Return non-nil (the typecache) if TABLE has a pre-calculated typecache." (let* ((idx (semanticdb-get-table-index table))) (oref idx type-cache))) @@ -162,22 +162,22 @@ If there is no table, create one, and fill it in." ) "Structure for maintaining a typecache.") -(defmethod semantic-reset ((tc semanticdb-database-typecache)) +(cl-defmethod semantic-reset ((tc semanticdb-database-typecache)) "Reset the object IDX." (oset tc stream nil) ) -(defmethod semanticdb-synchronize ((cache semanticdb-database-typecache) +(cl-defmethod semanticdb-synchronize ((cache semanticdb-database-typecache) new-tags) "Synchronize a CACHE with some NEW-TAGS." ) -(defmethod semanticdb-partial-synchronize ((cache semanticdb-database-typecache) +(cl-defmethod semanticdb-partial-synchronize ((cache semanticdb-database-typecache) new-tags) "Synchronize a CACHE with some changed NEW-TAGS." ) -(defmethod semanticdb-get-typecache ((db semanticdb-project-database)) +(cl-defmethod semanticdb-get-typecache ((db semanticdb-project-database)) "Retrieve the typecache from the semantic database DB. If there is no table, create one, and fill it in." (semanticdb-cache-get db 'semanticdb-database-typecache) @@ -312,11 +312,11 @@ If TAG has fully qualified names, expand it to a series of nested namespaces instead." tag) -(defmethod semanticdb-typecache-file-tags ((table semanticdb-abstract-table)) +(cl-defmethod semanticdb-typecache-file-tags ((table semanticdb-abstract-table)) "No tags available from non-file based tables." nil) -(defmethod semanticdb-typecache-file-tags ((table semanticdb-table)) +(cl-defmethod semanticdb-typecache-file-tags ((table semanticdb-table)) "Update the typecache for TABLE, and return the file-tags. File-tags are those that belong to this file only, and excludes all included files." @@ -338,11 +338,11 @@ all included files." (oref cache filestream) )) -(defmethod semanticdb-typecache-include-tags ((table semanticdb-abstract-table)) +(cl-defmethod semanticdb-typecache-include-tags ((table semanticdb-abstract-table)) "No tags available from non-file based tables." nil) -(defmethod semanticdb-typecache-include-tags ((table semanticdb-table)) +(cl-defmethod semanticdb-typecache-include-tags ((table semanticdb-table)) "Update the typecache for TABLE, and return the merged types from the include tags. Include-tags are the tags brought in via includes, all merged together into a master list." @@ -418,7 +418,7 @@ is of class 'type." (types (semantic-find-tags-by-class 'type nmerge))) (or (car-safe types) (car-safe nmerge)))) -(defmethod semanticdb-typecache-find-method ((table semanticdb-abstract-table) +(cl-defmethod semanticdb-typecache-find-method ((table semanticdb-abstract-table) type find-file-match) "Search the typecache in TABLE for the datatype TYPE. If type is a string, split the string, and search for the parts. @@ -544,7 +544,7 @@ found tag to be loaded." ;; ;; Routines for a typecache that crosses all tables in a given database ;; for a matching major-mode. -(defmethod semanticdb-typecache-for-database ((db semanticdb-project-database) +(cl-defmethod semanticdb-typecache-for-database ((db semanticdb-project-database) &optional mode) "Return the typecache for the project database DB. If there isn't one, create it. diff --git a/lisp/cedet/semantic/db.el b/lisp/cedet/semantic/db.el index b2c1252c502..1dba9b15701 100644 --- a/lisp/cedet/semantic/db.el +++ b/lisp/cedet/semantic/db.el @@ -115,11 +115,11 @@ This table is the root of tables, and contains the minimum needed for a new table not associated with a buffer." :abstract t) -(defmethod semanticdb-in-buffer-p ((obj semanticdb-abstract-table)) +(cl-defmethod semanticdb-in-buffer-p ((obj semanticdb-abstract-table)) "Return a nil, meaning abstract table OBJ is not in a buffer." nil) -(defmethod semanticdb-get-buffer ((obj semanticdb-abstract-table)) +(cl-defmethod semanticdb-get-buffer ((obj semanticdb-abstract-table)) "Return a buffer associated with OBJ. If the buffer is not in memory, load it with `find-file-noselect'." nil) @@ -127,7 +127,7 @@ If the buffer is not in memory, load it with `find-file-noselect'." ;; This generic method allows for sloppier coding. Many ;; functions treat "table" as something that could be a buffer, ;; file name, or other. This makes use of table more robust. -(defmethod semanticdb-full-filename (buffer-or-string) +(cl-defmethod semanticdb-full-filename (buffer-or-string) "Fetch the full filename that BUFFER-OR-STRING refers to. This uses semanticdb to get a better file name." (cond ((bufferp buffer-or-string) @@ -136,23 +136,23 @@ This uses semanticdb to get a better file name." ((and (stringp buffer-or-string) (file-exists-p buffer-or-string)) (expand-file-name buffer-or-string)))) -(defmethod semanticdb-full-filename ((obj semanticdb-abstract-table)) +(cl-defmethod semanticdb-full-filename ((obj semanticdb-abstract-table)) "Fetch the full filename that OBJ refers to. Abstract tables do not have file names associated with them." nil) -(defmethod semanticdb-dirty-p ((obj semanticdb-abstract-table)) +(cl-defmethod semanticdb-dirty-p ((obj semanticdb-abstract-table)) "Return non-nil if OBJ is 'dirty'." nil) -(defmethod semanticdb-set-dirty ((obj semanticdb-abstract-table)) +(cl-defmethod semanticdb-set-dirty ((obj semanticdb-abstract-table)) "Mark the abstract table OBJ dirty. Abstract tables can not be marked dirty, as there is nothing for them to synchronize against." ;; The abstract table can not be dirty. nil) -(defmethod semanticdb-normalize-tags ((obj semanticdb-abstract-table) tags) +(cl-defmethod semanticdb-normalize-tags ((obj semanticdb-abstract-table) tags) "For the table OBJ, convert a list of TAGS, into standardized form. The default is to return TAGS. Some databases may default to searching and providing simplified tags @@ -160,7 +160,7 @@ based on whichever technique used. This method provides a hook for them to convert TAG into a more complete form." tags) -(defmethod semanticdb-normalize-one-tag ((obj semanticdb-abstract-table) tag) +(cl-defmethod semanticdb-normalize-one-tag ((obj semanticdb-abstract-table) tag) "For the table OBJ, convert a TAG, into standardized form. This method returns a list of the form (DATABASE . NEWTAG). @@ -171,14 +171,14 @@ based on whichever technique used. This method provides a hook for them to convert TAG into a more complete form." (cons obj tag)) -(defmethod object-print ((obj semanticdb-abstract-table) &rest strings) +(cl-defmethod object-print ((obj semanticdb-abstract-table) &rest strings) "Pretty printer extension for `semanticdb-abstract-table'. Adds the number of tags in this file to the object print name." (if (or (not strings) (and (= (length strings) 1) (stringp (car strings)) (string= (car strings) ""))) ;; Else, add a tags quantifier. - (call-next-method obj (format " (%d tags)" (length (semanticdb-get-tags obj)))) + (cl-call-next-method obj (format " (%d tags)" (length (semanticdb-get-tags obj)))) ;; Pass through. (apply 'call-next-method obj strings) )) @@ -195,7 +195,7 @@ The search index will store data about which other tables might be needed, or perhaps create hash or index tables for the current buffer." :abstract t) -(defmethod semanticdb-get-table-index ((obj semanticdb-abstract-table)) +(cl-defmethod semanticdb-get-table-index ((obj semanticdb-abstract-table)) "Return the search index for the table OBJ. If one doesn't exist, create it." (if (slot-boundp obj 'index) @@ -209,13 +209,13 @@ If one doesn't exist, create it." (oset obj index idx) idx))) -(defmethod semanticdb-synchronize ((idx semanticdb-abstract-search-index) +(cl-defmethod semanticdb-synchronize ((idx semanticdb-abstract-search-index) new-tags) "Synchronize the search index IDX with some NEW-TAGS." ;; The abstract class will do... NOTHING! ) -(defmethod semanticdb-partial-synchronize ((idx semanticdb-abstract-search-index) +(cl-defmethod semanticdb-partial-synchronize ((idx semanticdb-abstract-search-index) new-tags) "Synchronize the search index IDX with some changed NEW-TAGS." ;; The abstract class will do... NOTHING! @@ -233,7 +233,7 @@ If one doesn't exist, create it." Examples include search results from external sources such as from Emacs's own symbol table, or from external libraries.") -(defmethod semanticdb-refresh-table ((obj semanticdb-search-results-table) &optional force) +(cl-defmethod semanticdb-refresh-table ((obj semanticdb-search-results-table) &optional force) "If the tag list associated with OBJ is loaded, refresh it. This will call `semantic-fetch-tags' if that file is in memory." nil) @@ -285,7 +285,7 @@ For C/C++, the C preprocessor macros can be saved here.") ) "A single table of tags derived from file.") -(defmethod semanticdb-in-buffer-p ((obj semanticdb-table)) +(cl-defmethod semanticdb-in-buffer-p ((obj semanticdb-table)) "Return a buffer associated with OBJ. If the buffer is in memory, return that buffer." (let ((buff (oref obj buffer))) @@ -293,7 +293,7 @@ If the buffer is in memory, return that buffer." buff (oset obj buffer nil)))) -(defmethod semanticdb-get-buffer ((obj semanticdb-table)) +(cl-defmethod semanticdb-get-buffer ((obj semanticdb-table)) "Return a buffer associated with OBJ. If the buffer is in memory, return that buffer. If the buffer is not in memory, load it with `find-file-noselect'." @@ -302,26 +302,26 @@ If the buffer is not in memory, load it with `find-file-noselect'." (save-match-data (find-file-noselect (semanticdb-full-filename obj) t)))) -(defmethod semanticdb-set-buffer ((obj semanticdb-table)) +(cl-defmethod semanticdb-set-buffer ((obj semanticdb-table)) "Set the current buffer to be a buffer owned by OBJ. If OBJ's file is not loaded, read it in first." (set-buffer (semanticdb-get-buffer obj))) -(defmethod semanticdb-full-filename ((obj semanticdb-table)) +(cl-defmethod semanticdb-full-filename ((obj semanticdb-table)) "Fetch the full filename that OBJ refers to." (expand-file-name (oref obj file) (oref (oref obj parent-db) reference-directory))) -(defmethod semanticdb-dirty-p ((obj semanticdb-table)) +(cl-defmethod semanticdb-dirty-p ((obj semanticdb-table)) "Return non-nil if OBJ is 'dirty'." (oref obj dirty)) -(defmethod semanticdb-set-dirty ((obj semanticdb-table)) +(cl-defmethod semanticdb-set-dirty ((obj semanticdb-table)) "Mark the abstract table OBJ dirty." (oset obj dirty t) ) -(defmethod object-print ((obj semanticdb-table) &rest strings) +(cl-defmethod object-print ((obj semanticdb-table) &rest strings) "Pretty printer extension for `semanticdb-table'. Adds the number of tags in this file to the object print name." (apply 'call-next-method obj @@ -363,12 +363,12 @@ Note: This index will not be saved in a persistent file.") :documentation "List of `semantic-db-table' objects.")) "Database of file tables.") -(defmethod semanticdb-full-filename ((obj semanticdb-project-database)) +(cl-defmethod semanticdb-full-filename ((obj semanticdb-project-database)) "Fetch the full filename that OBJ refers to. Abstract tables do not have file names associated with them." nil) -(defmethod semanticdb-dirty-p ((DB semanticdb-project-database)) +(cl-defmethod semanticdb-dirty-p ((DB semanticdb-project-database)) "Return non-nil if DB is 'dirty'. A database is dirty if the state of the database changed in a way where it may need to resynchronize with some persistent storage." @@ -379,7 +379,7 @@ where it may need to resynchronize with some persistent storage." (setq tabs (cdr tabs))) dirty)) -(defmethod object-print ((obj semanticdb-project-database) &rest strings) +(cl-defmethod object-print ((obj semanticdb-project-database) &rest strings) "Pretty printer extension for `semanticdb-project-database'. Adds the number of tables in this file to the object print name." (apply 'call-next-method obj @@ -390,7 +390,7 @@ Adds the number of tables in this file to the object print name." ) strings))) -(defmethod semanticdb-create-database :STATIC ((dbc semanticdb-project-database) directory) +(cl-defmethod semanticdb-create-database ((dbc (subclass semanticdb-project-database)) directory) "Create a new semantic database of class DBC for DIRECTORY and return it. If a database for DIRECTORY has already been created, return it. If DIRECTORY doesn't exist, create a new one." @@ -404,11 +404,11 @@ If DIRECTORY doesn't exist, create a new one." (oset db reference-directory (file-truename directory))) db)) -(defmethod semanticdb-flush-database-tables ((db semanticdb-project-database)) +(cl-defmethod semanticdb-flush-database-tables ((db semanticdb-project-database)) "Reset the tables in DB to be empty." (oset db tables nil)) -(defmethod semanticdb-create-table ((db semanticdb-project-database) file) +(cl-defmethod semanticdb-create-table ((db semanticdb-project-database) file) "Create a new table in DB for FILE and return it. The class of DB contains the class name for the type of table to create. If the table for FILE exists, return it. @@ -425,7 +425,7 @@ If the table for FILE does not exist, create one." (object-add-to-list db 'tables newtab t)) newtab)) -(defmethod semanticdb-file-table ((obj semanticdb-project-database) filename) +(cl-defmethod semanticdb-file-table ((obj semanticdb-project-database) filename) "From OBJ, return FILENAME's associated table object." (object-assoc (file-relative-name (file-truename filename) (oref obj reference-directory)) @@ -475,7 +475,7 @@ In order to keep your cache up to date, be sure to implement See the file semantic/scope.el for an example." :abstract t) -(defmethod semanticdb-cache-get ((table semanticdb-abstract-table) +(cl-defmethod semanticdb-cache-get ((table semanticdb-abstract-table) desired-class) "Get a cache object on TABLE of class DESIRED-CLASS. This method will create one if none exists with no init arguments @@ -495,18 +495,18 @@ other than :table." (object-add-to-list table 'cache obj) obj))) -(defmethod semanticdb-cache-remove ((table semanticdb-abstract-table) +(cl-defmethod semanticdb-cache-remove ((table semanticdb-abstract-table) cache) "Remove from TABLE the cache object CACHE." (object-remove-from-list table 'cache cache)) -(defmethod semanticdb-synchronize ((cache semanticdb-abstract-cache) +(cl-defmethod semanticdb-synchronize ((cache semanticdb-abstract-cache) new-tags) "Synchronize a CACHE with some NEW-TAGS." ;; The abstract class will do... NOTHING! ) -(defmethod semanticdb-partial-synchronize ((cache semanticdb-abstract-cache) +(cl-defmethod semanticdb-partial-synchronize ((cache semanticdb-abstract-cache) new-tags) "Synchronize a CACHE with some changed NEW-TAGS." ;; The abstract class will do... NOTHING! @@ -526,7 +526,7 @@ In order to keep your cache up to date, be sure to implement See the file semantic/scope.el for an example." :abstract t) -(defmethod semanticdb-cache-get ((db semanticdb-project-database) +(cl-defmethod semanticdb-cache-get ((db semanticdb-project-database) desired-class) "Get a cache object on DB of class DESIRED-CLASS. This method will create one if none exists with no init arguments @@ -546,19 +546,19 @@ other than :table." (object-add-to-list db 'cache obj) obj))) -(defmethod semanticdb-cache-remove ((db semanticdb-project-database) +(cl-defmethod semanticdb-cache-remove ((db semanticdb-project-database) cache) "Remove from TABLE the cache object CACHE." (object-remove-from-list db 'cache cache)) -(defmethod semanticdb-synchronize ((cache semanticdb-abstract-db-cache) +(cl-defmethod semanticdb-synchronize ((cache semanticdb-abstract-db-cache) new-tags) "Synchronize a CACHE with some NEW-TAGS." ;; The abstract class will do... NOTHING! ) -(defmethod semanticdb-partial-synchronize ((cache semanticdb-abstract-db-cache) +(cl-defmethod semanticdb-partial-synchronize ((cache semanticdb-abstract-db-cache) new-tags) "Synchronize a CACHE with some changed NEW-TAGS." ;; The abstract class will do... NOTHING! @@ -566,7 +566,7 @@ other than :table." ;;; REFRESH -(defmethod semanticdb-refresh-table ((obj semanticdb-table) &optional force) +(cl-defmethod semanticdb-refresh-table ((obj semanticdb-table) &optional force) "If the tag list associated with OBJ is loaded, refresh it. Optional argument FORCE will force a refresh even if the file in question is not in a buffer. Avoid using FORCE for most uses, as an old cache @@ -593,7 +593,7 @@ This will call `semantic-fetch-tags' if that file is in memory." ;; Kill off the buffer if it didn't exist when we were called. (kill-buffer buff)))))) -(defmethod semanticdb-needs-refresh-p ((obj semanticdb-table)) +(cl-defmethod semanticdb-needs-refresh-p ((obj semanticdb-table)) "Return non-nil of OBJ's tag list is out of date. The file associated with OBJ does not need to be in a buffer." (let* ((ff (semanticdb-full-filename obj)) @@ -624,7 +624,7 @@ The file associated with OBJ does not need to be in a buffer." ;;; Synchronization ;; -(defmethod semanticdb-synchronize ((table semanticdb-abstract-table) +(cl-defmethod semanticdb-synchronize ((table semanticdb-abstract-table) new-tags) "Synchronize the table TABLE with some NEW-TAGS." (oset table tags new-tags) @@ -655,7 +655,7 @@ The file associated with OBJ does not need to be in a buffer." (semanticdb-refresh-references table) ) -(defmethod semanticdb-partial-synchronize ((table semanticdb-abstract-table) +(cl-defmethod semanticdb-partial-synchronize ((table semanticdb-abstract-table) new-tags) "Synchronize the table TABLE where some NEW-TAGS changed." ;; You might think we need to reset the tags, but since the partial @@ -688,7 +688,7 @@ The file associated with OBJ does not need to be in a buffer." ;;; SAVE/LOAD ;; -(defmethod semanticdb-save-db ((DB semanticdb-project-database) +(cl-defmethod semanticdb-save-db ((DB semanticdb-project-database) &optional suppress-questions) "Cause a database to save itself. The database base class does not save itself persistently. @@ -741,7 +741,7 @@ Project Management software (such as EDE and JDE) should add their own predicates with `add-hook' to this variable, and semanticdb will save tag caches in directories controlled by them.") -(defmethod semanticdb-write-directory-p ((obj semanticdb-project-database)) +(cl-defmethod semanticdb-write-directory-p ((obj semanticdb-project-database)) "Return non-nil if OBJ should be written to disk. Uses `semanticdb-persistent-path' to determine the return value." nil) @@ -772,7 +772,7 @@ This temporarily sets `semanticdb-match-any-mode' while executing BODY." ,@body)) (put 'semanticdb-with-match-any-mode 'lisp-indent-function 0) -(defmethod semanticdb-equivalent-mode-for-search (table &optional buffer) +(cl-defmethod semanticdb-equivalent-mode-for-search (table &optional buffer) "Return non-nil if TABLE's mode is equivalent to BUFFER. See `semanticdb-equivalent-mode' for details. This version is used during searches. Major-modes that opt @@ -783,13 +783,13 @@ all files of any type." (semanticdb-equivalent-mode table buffer)) ) -(defmethod semanticdb-equivalent-mode ((table semanticdb-abstract-table) &optional buffer) +(cl-defmethod semanticdb-equivalent-mode ((table semanticdb-abstract-table) &optional buffer) "Return non-nil if TABLE's mode is equivalent to BUFFER. Equivalent modes are specified by the `semantic-equivalent-major-modes' local variable." nil) -(defmethod semanticdb-equivalent-mode ((table semanticdb-table) &optional buffer) +(cl-defmethod semanticdb-equivalent-mode ((table semanticdb-table) &optional buffer) "Return non-nil if TABLE's mode is equivalent to BUFFER. Equivalent modes are specified by the `semantic-equivalent-major-modes' local variable." diff --git a/lisp/cedet/semantic/debug.el b/lisp/cedet/semantic/debug.el index 9168af59dd4..4a3c51f4e0c 100644 --- a/lisp/cedet/semantic/debug.el +++ b/lisp/cedet/semantic/debug.el @@ -39,6 +39,7 @@ (eval-when-compile (require 'cl)) (require 'semantic) (require 'eieio) +(require 'cl-generic) (eval-when-compile (require 'semantic/find)) ;;; Code: @@ -117,13 +118,13 @@ These buffers are brought into view when layout occurs.") "Controls action when in `semantic-debug-mode'") ;; Methods -(defmethod semantic-debug-set-frame ((iface semantic-debug-interface) frame) +(cl-defmethod semantic-debug-set-frame ((iface semantic-debug-interface) frame) "Set the current frame on IFACE to FRAME." (if frame (oset iface current-frame frame) (slot-makeunbound iface 'current-frame))) -(defmethod semantic-debug-set-parser-location ((iface semantic-debug-interface) point) +(cl-defmethod semantic-debug-set-parser-location ((iface semantic-debug-interface) point) "Set the parser location in IFACE to POINT." (with-current-buffer (oref iface parser-buffer) (if (not (slot-boundp iface 'parser-location)) @@ -131,7 +132,7 @@ These buffers are brought into view when layout occurs.") (move-marker (oref iface parser-location) point)) ) -(defmethod semantic-debug-set-source-location ((iface semantic-debug-interface) point) +(cl-defmethod semantic-debug-set-source-location ((iface semantic-debug-interface) point) "Set the source location in IFACE to POINT." (with-current-buffer (oref iface source-buffer) (if (not (slot-boundp iface 'source-location)) @@ -139,7 +140,7 @@ These buffers are brought into view when layout occurs.") (move-marker (oref iface source-location) point)) ) -(defmethod semantic-debug-interface-layout ((iface semantic-debug-interface)) +(cl-defmethod semantic-debug-interface-layout ((iface semantic-debug-interface)) "Layout windows in the current frame to facilitate debugging." (delete-other-windows) ;; Deal with the data buffer @@ -167,7 +168,7 @@ These buffers are brought into view when layout occurs.") (goto-char (oref iface source-location))) ) -(defmethod semantic-debug-highlight-lexical-token ((iface semantic-debug-interface) token) +(cl-defmethod semantic-debug-highlight-lexical-token ((iface semantic-debug-interface) token) "For IFACE, highlight TOKEN in the source buffer . TOKEN is a lexical token." (set-buffer (oref iface :source-buffer)) @@ -178,7 +179,7 @@ TOKEN is a lexical token." (semantic-debug-set-source-location iface (semantic-lex-token-start token)) ) -(defmethod semantic-debug-highlight-rule ((iface semantic-debug-interface) nonterm &optional rule match) +(cl-defmethod semantic-debug-highlight-rule ((iface semantic-debug-interface) nonterm &optional rule match) "For IFACE, highlight NONTERM in the parser buffer. NONTERM is the name of the rule currently being processed that shows up as a nonterminal (or tag) in the source buffer. @@ -226,7 +227,7 @@ If RULE and MATCH indices are specified, highlight those also." )))) -(defmethod semantic-debug-unhighlight ((iface semantic-debug-interface)) +(cl-defmethod semantic-debug-unhighlight ((iface semantic-debug-interface)) "Remove all debugging overlays." (mapc 'semantic-overlay-delete (oref iface overlays)) (oset iface overlays nil)) @@ -271,12 +272,12 @@ on different types of return values." ) "One frame representation.") -(defmethod semantic-debug-frame-highlight ((frame semantic-debug-frame)) +(cl-defmethod semantic-debug-frame-highlight ((frame semantic-debug-frame)) "Highlight one parser frame." ) -(defmethod semantic-debug-frame-info ((frame semantic-debug-frame)) +(cl-defmethod semantic-debug-frame-info ((frame semantic-debug-frame)) "Display info about this one parser frame." ) @@ -521,49 +522,49 @@ by overriding one of the command methods. Be sure to use down to your parser later." :abstract t) -(defmethod semantic-debug-parser-next ((parser semantic-debug-parser)) +(cl-defmethod semantic-debug-parser-next ((parser semantic-debug-parser)) "Execute next for this PARSER." (setq semantic-debug-user-command 'next) ) -(defmethod semantic-debug-parser-step ((parser semantic-debug-parser)) +(cl-defmethod semantic-debug-parser-step ((parser semantic-debug-parser)) "Execute a step for this PARSER." (setq semantic-debug-user-command 'step) ) -(defmethod semantic-debug-parser-go ((parser semantic-debug-parser)) +(cl-defmethod semantic-debug-parser-go ((parser semantic-debug-parser)) "Continue execution in this PARSER until the next breakpoint." (setq semantic-debug-user-command 'go) ) -(defmethod semantic-debug-parser-fail ((parser semantic-debug-parser)) +(cl-defmethod semantic-debug-parser-fail ((parser semantic-debug-parser)) "Continue execution in this PARSER until the next breakpoint." (setq semantic-debug-user-command 'fail) ) -(defmethod semantic-debug-parser-quit ((parser semantic-debug-parser)) +(cl-defmethod semantic-debug-parser-quit ((parser semantic-debug-parser)) "Continue execution in this PARSER until the next breakpoint." (setq semantic-debug-user-command 'quit) ) -(defmethod semantic-debug-parser-abort ((parser semantic-debug-parser)) +(cl-defmethod semantic-debug-parser-abort ((parser semantic-debug-parser)) "Continue execution in this PARSER until the next breakpoint." (setq semantic-debug-user-command 'abort) ) -(defmethod semantic-debug-parser-print-state ((parser semantic-debug-parser)) +(cl-defmethod semantic-debug-parser-print-state ((parser semantic-debug-parser)) "Print state for this PARSER at the current breakpoint." (with-slots (current-frame) semantic-debug-current-interface (when current-frame (semantic-debug-frame-info current-frame) ))) -(defmethod semantic-debug-parser-break ((parser semantic-debug-parser)) +(cl-defmethod semantic-debug-parser-break ((parser semantic-debug-parser)) "Set a breakpoint for this PARSER." ) ;; Stack stuff -(defmethod semantic-debug-parser-frames ((parser semantic-debug-parser)) +(cl-defmethod semantic-debug-parser-frames ((parser semantic-debug-parser)) "Return a list of frames for the current parser. A frame is of the form: ( .. .what ? .. ) diff --git a/lisp/cedet/semantic/decorate/include.el b/lisp/cedet/semantic/decorate/include.el index 718669b567b..7bfca77e8c4 100644 --- a/lisp/cedet/semantic/decorate/include.el +++ b/lisp/cedet/semantic/decorate/include.el @@ -831,7 +831,7 @@ When an include's referring file is parsed, we need to undecorate any decorated referring includes.") -(defmethod semantic-reset ((obj semantic-decoration-unparsed-include-cache)) +(cl-defmethod semantic-reset ((obj semantic-decoration-unparsed-include-cache)) "Reset OBJ back to it's empty settings." (let ((table (oref obj table))) ;; This is a hack. Add in something better? @@ -841,13 +841,13 @@ any decorated referring includes.") )) )) -(defmethod semanticdb-partial-synchronize ((cache semantic-decoration-unparsed-include-cache) +(cl-defmethod semanticdb-partial-synchronize ((cache semantic-decoration-unparsed-include-cache) new-tags) "Synchronize CACHE with some NEW-TAGS." (if (semantic-find-tags-by-class 'include new-tags) (semantic-reset cache))) -(defmethod semanticdb-synchronize ((cache semantic-decoration-unparsed-include-cache) +(cl-defmethod semanticdb-synchronize ((cache semantic-decoration-unparsed-include-cache) new-tags) "Synchronize a CACHE with some NEW-TAGS." (semantic-reset cache)) diff --git a/lisp/cedet/semantic/ede-grammar.el b/lisp/cedet/semantic/ede-grammar.el index 67f0cfeea6d..eb4a98c0a2d 100644 --- a/lisp/cedet/semantic/ede-grammar.el +++ b/lisp/cedet/semantic/ede-grammar.el @@ -51,7 +51,7 @@ A grammar target consists of grammar files that build Emacs Lisp programs for parsing different languages.") -(defmethod ede-proj-makefile-dependencies ((this semantic-ede-proj-target-grammar)) +(cl-defmethod ede-proj-makefile-dependencies ((this semantic-ede-proj-target-grammar)) "Return a string representing the dependencies for THIS. Some compilers only use the first element in the dependencies, others have a list of intermediates (object files), and others don't care. @@ -124,17 +124,17 @@ For Emacs Lisp, return addsuffix command on source files." "Compile Emacs Lisp programs.") ;;; Target options. -(defmethod ede-buffer-mine ((this semantic-ede-proj-target-grammar) buffer) +(cl-defmethod ede-buffer-mine ((this semantic-ede-proj-target-grammar) buffer) "Return t if object THIS lays claim to the file in BUFFER. Lays claim to all -by.el, and -wy.el files." ;; We need to be a little more careful than this, but at the moment it ;; is common to have only one target of this class per directory. (if (string-match "-[bw]y\\.elc?$" (buffer-file-name buffer)) t - (call-next-method) ; The usual thing. + (cl-call-next-method) ; The usual thing. )) -(defmethod project-compile-target ((obj semantic-ede-proj-target-grammar)) +(cl-defmethod project-compile-target ((obj semantic-ede-proj-target-grammar)) "Compile all sources in a Lisp target OBJ." (let* ((cb (current-buffer)) (proj (ede-target-parent obj)) @@ -167,13 +167,13 @@ Lays claim to all -by.el, and -wy.el files." ;;; Makefile generation functions ;; -(defmethod ede-proj-makefile-sourcevar ((this semantic-ede-proj-target-grammar)) +(cl-defmethod ede-proj-makefile-sourcevar ((this semantic-ede-proj-target-grammar)) "Return the variable name for THIS's sources." (cond ((ede-proj-automake-p) (error "No Automake support for Semantic Grammars")) (t (concat (ede-pmake-varname this) "_SEMANTIC_GRAMMAR")))) -(defmethod ede-proj-makefile-insert-variables :AFTER ((this semantic-ede-proj-target-grammar)) +(cl-defmethod ede-proj-makefile-insert-variables :after ((this semantic-ede-proj-target-grammar)) "Insert variables needed by target THIS." (ede-proj-makefile-insert-loadpath-items (ede-proj-elisp-packages-to-loadpath @@ -192,7 +192,7 @@ Lays claim to all -by.el, and -wy.el files." " "))) ) -(defmethod ede-proj-makefile-insert-rules :after ((this semantic-ede-proj-target-grammar)) +(cl-defmethod ede-proj-makefile-insert-rules :after ((this semantic-ede-proj-target-grammar)) "Insert rules needed by THIS target. This raises `max-specpdl-size' and `max-lisp-eval-depth', which can be needed for the compilation of the resulting parsers." @@ -200,12 +200,12 @@ needed for the compilation of the resulting parsers." max-lisp-eval-depth 700)'\n" (oref this name)))) -(defmethod ede-proj-makefile-insert-dist-dependencies ((this semantic-ede-proj-target-grammar)) +(cl-defmethod ede-proj-makefile-insert-dist-dependencies ((this semantic-ede-proj-target-grammar)) "Insert dist dependencies, or intermediate targets. This makes sure that all grammar lisp files are created before the dist runs, so they are always up to date. Argument THIS is the target that should insert stuff." - (call-next-method) + (cl-call-next-method) (insert " $(" (ede-pmake-varname this) "_SEMANTIC_GRAMMAR_EL)") ) diff --git a/lisp/cedet/semantic/ia-sb.el b/lisp/cedet/semantic/ia-sb.el index 410d63acab4..fcc9c002cef 100644 --- a/lisp/cedet/semantic/ia-sb.el +++ b/lisp/cedet/semantic/ia-sb.el @@ -138,7 +138,7 @@ DIRECTORY is the current directory, which is ignored, and ZERO is 0." ))) -(defmethod semantic-ia-sb-show-doc ((context semantic-analyze-context)) +(cl-defmethod semantic-ia-sb-show-doc ((context semantic-analyze-context)) "Show documentation about CONTEXT if CONTEXT points at a complete symbol." (let ((sym (car (reverse (oref context prefix)))) (doc nil)) @@ -163,7 +163,7 @@ DIRECTORY is the current directory, which is ignored, and ZERO is 0." ;; This is from semantic-sb 'semantic-sb-token-jump)))) -(defmethod semantic-ia-sb-more-buttons ((context semantic-analyze-context)) +(cl-defmethod semantic-ia-sb-more-buttons ((context semantic-analyze-context)) "Show a set of speedbar buttons specific to CONTEXT." (let ((prefix (oref context prefix))) (when prefix @@ -173,9 +173,9 @@ DIRECTORY is the current directory, which is ignored, and ZERO is 0." 'semantic-sb-token-jump)) )) -(defmethod semantic-ia-sb-more-buttons ((context semantic-analyze-context-assignment)) +(cl-defmethod semantic-ia-sb-more-buttons ((context semantic-analyze-context-assignment)) "Show a set of speedbar buttons specific to CONTEXT." - (call-next-method) + (cl-call-next-method) (let ((assignee (oref context assignee))) (when assignee (speedbar-insert-separator "Assignee") @@ -183,9 +183,9 @@ DIRECTORY is the current directory, which is ignored, and ZERO is 0." 'speedbar-tag-face 'semantic-sb-token-jump)))) -(defmethod semantic-ia-sb-more-buttons ((context semantic-analyze-context-functionarg)) +(cl-defmethod semantic-ia-sb-more-buttons ((context semantic-analyze-context-functionarg)) "Show a set of speedbar buttons specific to CONTEXT." - (call-next-method) + (cl-call-next-method) (let ((func (oref context function))) (when func (speedbar-insert-separator "Function") diff --git a/lisp/cedet/semantic/mru-bookmark.el b/lisp/cedet/semantic/mru-bookmark.el index ddebcd627b2..b75408f6a9d 100644 --- a/lisp/cedet/semantic/mru-bookmark.el +++ b/lisp/cedet/semantic/mru-bookmark.el @@ -86,7 +86,7 @@ Nice values are 'edit, 'read, 'jump, and 'mark. ) "A single bookmark.") -(defmethod initialize-instance :AFTER ((sbm semantic-bookmark) &rest fields) +(cl-defmethod initialize-instance :after ((sbm semantic-bookmark) &rest fields) "Initialize the bookmark SBM with details about :tag." (condition-case nil (save-excursion @@ -96,7 +96,7 @@ Nice values are 'edit, 'read, 'jump, and 'mark. (error (message "Error bookmarking tag."))) ) -(defmethod semantic-mrub-visit ((sbm semantic-bookmark)) +(cl-defmethod semantic-mrub-visit ((sbm semantic-bookmark)) "Visit the semantic tag bookmark SBM. Uses `semantic-go-to-tag' and highlighting." (require 'semantic/decorate) @@ -117,7 +117,7 @@ Uses `semantic-go-to-tag' and highlighting." (semantic-momentary-highlight-tag tag) )) -(defmethod semantic-mrub-update ((sbm semantic-bookmark) point reason) +(cl-defmethod semantic-mrub-update ((sbm semantic-bookmark) point reason) "Update the existing bookmark SBM. POINT is some important location. REASON is a symbol. See slot `reason' on `semantic-bookmark'." @@ -132,7 +132,7 @@ REASON is a symbol. See slot `reason' on `semantic-bookmark'." (error nil)) ) -(defmethod semantic-mrub-preflush ((sbm semantic-bookmark)) +(cl-defmethod semantic-mrub-preflush ((sbm semantic-bookmark)) "Method called on a tag before the current buffer list of tags is flushed. If there is a buffer match, unlink the tag." (let ((tag (oref sbm tag)) @@ -183,7 +183,7 @@ Argument POINT is where to find the tag near." (when nearby (setq tag nearby)))) tag)) -(defmethod semantic-mrub-push ((sbr semantic-bookmark-ring) point +(cl-defmethod semantic-mrub-push ((sbr semantic-bookmark-ring) point &optional reason) "Add a bookmark to the ring SBR from POINT. REASON is why it is being pushed. See doc for `semantic-bookmark' diff --git a/lisp/cedet/semantic/scope.el b/lisp/cedet/semantic/scope.el index c56cbc3c126..acc6545233b 100644 --- a/lisp/cedet/semantic/scope.el +++ b/lisp/cedet/semantic/scope.el @@ -101,7 +101,7 @@ Saves scoping information between runs of the analyzer.") ;; ;; Methods for basic management of the structure in semanticdb. ;; -(defmethod semantic-reset ((obj semantic-scope-cache)) +(cl-defmethod semantic-reset ((obj semantic-scope-cache)) "Reset OBJ back to it's empty settings." (oset obj tag nil) (oset obj scopetypes nil) @@ -114,13 +114,13 @@ Saves scoping information between runs of the analyzer.") (oset obj typescope nil) ) -(defmethod semanticdb-synchronize ((cache semantic-scope-cache) +(cl-defmethod semanticdb-synchronize ((cache semantic-scope-cache) new-tags) "Synchronize a CACHE with some NEW-TAGS." (semantic-reset cache)) -(defmethod semanticdb-partial-synchronize ((cache semantic-scope-cache) +(cl-defmethod semanticdb-partial-synchronize ((cache semantic-scope-cache) new-tags) "Synchronize a CACHE with some changed NEW-TAGS." ;; If there are any includes or datatypes changed, then clear. @@ -137,7 +137,7 @@ Saves scoping information between runs of the analyzer.") 'semantic-scope-cache))) (semantic-reset co)))) -(defmethod semantic-scope-set-typecache ((cache semantic-scope-cache) +(cl-defmethod semantic-scope-set-typecache ((cache semantic-scope-cache) types-in-scope) "Set the :typescope property on CACHE to some types. TYPES-IN-SCOPE is a list of type tags whos members are @@ -829,7 +829,7 @@ hits in order, with the first tag being in the closest scope." ;;; DUMP ;; -(defmethod semantic-analyze-show ((context semantic-scope-cache)) +(cl-defmethod semantic-analyze-show ((context semantic-scope-cache)) "Insert CONTEXT into the current buffer in a nice way." (require 'semantic/analyze) (semantic-analyze-princ-sequence (oref context scopetypes) "-> ScopeTypes: " ) diff --git a/lisp/cedet/semantic/symref.el b/lisp/cedet/semantic/symref.el index 170495e5d61..10293d9496c 100644 --- a/lisp/cedet/semantic/symref.el +++ b/lisp/cedet/semantic/symref.el @@ -314,7 +314,7 @@ Use the `semantic-symref-hit-tags' method to get this list.") ) "The results from a symbol reference search.") -(defmethod semantic-symref-result-get-files ((result semantic-symref-result)) +(cl-defmethod semantic-symref-result-get-files ((result semantic-symref-result)) "Get the list of files from the symref result RESULT." (if (slot-boundp result :hit-files) (oref result hit-files) @@ -352,7 +352,7 @@ until the next command is executed." (remove-hook 'post-command-hook 'semantic-symref-cleanup-recent-buffers-fcn) ) -(defmethod semantic-symref-result-get-tags ((result semantic-symref-result) +(cl-defmethod semantic-symref-result-get-tags ((result semantic-symref-result) &optional open-buffers) "Get the list of tags from the symref result RESULT. Optional OPEN-BUFFERS indicates that the buffers that the hits are @@ -531,7 +531,7 @@ NAME is the name of the tool used in the configuration variable `semantic-symref-tool'" :abstract t) -(defmethod semantic-symref-get-result ((tool semantic-symref-tool-baseclass)) +(cl-defmethod semantic-symref-get-result ((tool semantic-symref-tool-baseclass)) "Calculate the results of a search based on TOOL. The symref TOOL should already contain the search criteria." (let ((answer (semantic-symref-perform-search tool)) @@ -549,11 +549,11 @@ The symref TOOL should already contain the search criteria." ) )) -(defmethod semantic-symref-perform-search ((tool semantic-symref-tool-baseclass)) +(cl-defmethod semantic-symref-perform-search ((tool semantic-symref-tool-baseclass)) "Base search for symref tools should throw an error." (error "Symref tool objects must implement `semantic-symref-perform-search'")) -(defmethod semantic-symref-parse-tool-output ((tool semantic-symref-tool-baseclass) +(cl-defmethod semantic-symref-parse-tool-output ((tool semantic-symref-tool-baseclass) outputbuffer) "Parse the entire OUTPUTBUFFER of a symref tool. Calls the method `semantic-symref-parse-tool-output-one-line' over and @@ -567,7 +567,7 @@ over until it returns nil." (nreverse result))) ) -(defmethod semantic-symref-parse-tool-output-one-line ((tool semantic-symref-tool-baseclass)) +(cl-defmethod semantic-symref-parse-tool-output-one-line ((tool semantic-symref-tool-baseclass)) "Base tool output parser is not implemented." (error "Symref tool objects must implement `semantic-symref-parse-tool-output-one-line'")) diff --git a/lisp/cedet/semantic/symref/cscope.el b/lisp/cedet/semantic/symref/cscope.el index 3e8c34b9832..91804f4ac9d 100644 --- a/lisp/cedet/semantic/symref/cscope.el +++ b/lisp/cedet/semantic/symref/cscope.el @@ -42,7 +42,7 @@ the hit list. See the function `cedet-cscope-search' for more details.") -(defmethod semantic-symref-perform-search ((tool semantic-symref-tool-cscope)) +(cl-defmethod semantic-symref-perform-search ((tool semantic-symref-tool-cscope)) "Perform a search with GNU Global." (let* ((rootproj (when (and (featurep 'ede) ede-minor-mode) (ede-toplevel))) @@ -60,7 +60,7 @@ See the function `cedet-cscope-search' for more details.") (semantic-symref-parse-tool-output tool b) )) -(defmethod semantic-symref-parse-tool-output-one-line ((tool semantic-symref-tool-cscope)) +(cl-defmethod semantic-symref-parse-tool-output-one-line ((tool semantic-symref-tool-cscope)) "Parse one line of grep output, and return it as a match list. Moves cursor to end of the match." (cond ((eq (oref tool :resulttype) 'file) diff --git a/lisp/cedet/semantic/symref/global.el b/lisp/cedet/semantic/symref/global.el index 1f5aecb576c..88713474d69 100644 --- a/lisp/cedet/semantic/symref/global.el +++ b/lisp/cedet/semantic/symref/global.el @@ -38,7 +38,7 @@ the hit list. See the function `cedet-gnu-global-search' for more details.") -(defmethod semantic-symref-perform-search ((tool semantic-symref-tool-global)) +(cl-defmethod semantic-symref-perform-search ((tool semantic-symref-tool-global)) "Perform a search with GNU Global." (let ((b (cedet-gnu-global-search (oref tool :searchfor) (oref tool :searchtype) @@ -49,7 +49,7 @@ See the function `cedet-gnu-global-search' for more details.") (semantic-symref-parse-tool-output tool b) )) -(defmethod semantic-symref-parse-tool-output-one-line ((tool semantic-symref-tool-global)) +(cl-defmethod semantic-symref-parse-tool-output-one-line ((tool semantic-symref-tool-global)) "Parse one line of grep output, and return it as a match list. Moves cursor to end of the match." (cond ((or (eq (oref tool :resulttype) 'file) diff --git a/lisp/cedet/semantic/symref/grep.el b/lisp/cedet/semantic/symref/grep.el index f9821b42988..981dab8a8b5 100644 --- a/lisp/cedet/semantic/symref/grep.el +++ b/lisp/cedet/semantic/symref/grep.el @@ -121,7 +121,7 @@ This shell should support pipe redirect syntax." :group 'semantic :type 'string) -(defmethod semantic-symref-perform-search ((tool semantic-symref-tool-grep)) +(cl-defmethod semantic-symref-perform-search ((tool semantic-symref-tool-grep)) "Perform a search with Grep." ;; Grep doesn't support some types of searches. (let ((st (oref tool :searchtype))) @@ -167,7 +167,7 @@ This shell should support pipe redirect syntax." ;; Return the answer ans)) -(defmethod semantic-symref-parse-tool-output-one-line ((tool semantic-symref-tool-grep)) +(cl-defmethod semantic-symref-parse-tool-output-one-line ((tool semantic-symref-tool-grep)) "Parse one line of grep output, and return it as a match list. Moves cursor to end of the match." (cond ((eq (oref tool :resulttype) 'file) diff --git a/lisp/cedet/semantic/symref/idutils.el b/lisp/cedet/semantic/symref/idutils.el index 5e9a0a42bfc..c22a6a3b7fb 100644 --- a/lisp/cedet/semantic/symref/idutils.el +++ b/lisp/cedet/semantic/symref/idutils.el @@ -38,7 +38,7 @@ the hit list. See the function `cedet-idutils-search' for more details.") -(defmethod semantic-symref-perform-search ((tool semantic-symref-tool-idutils)) +(cl-defmethod semantic-symref-perform-search ((tool semantic-symref-tool-idutils)) "Perform a search with IDUtils." (let ((b (cedet-idutils-search (oref tool :searchfor) (oref tool :searchtype) @@ -49,7 +49,7 @@ See the function `cedet-idutils-search' for more details.") (semantic-symref-parse-tool-output tool b) )) -(defmethod semantic-symref-parse-tool-output-one-line ((tool semantic-symref-tool-idutils)) +(cl-defmethod semantic-symref-parse-tool-output-one-line ((tool semantic-symref-tool-idutils)) "Parse one line of grep output, and return it as a match list. Moves cursor to end of the match." (cond ((eq (oref tool :resulttype) 'file) |