diff options
Diffstat (limited to 'lisp/cedet/semantic/symref')
| -rw-r--r-- | lisp/cedet/semantic/symref/cscope.el | 16 | ||||
| -rw-r--r-- | lisp/cedet/semantic/symref/global.el | 14 | ||||
| -rw-r--r-- | lisp/cedet/semantic/symref/grep.el | 12 | ||||
| -rw-r--r-- | lisp/cedet/semantic/symref/idutils.el | 14 | ||||
| -rw-r--r-- | lisp/cedet/semantic/symref/list.el | 2 |
5 files changed, 29 insertions, 29 deletions
diff --git a/lisp/cedet/semantic/symref/cscope.el b/lisp/cedet/semantic/symref/cscope.el index 181e3997681..42d5dcbb7fe 100644 --- a/lisp/cedet/semantic/symref/cscope.el +++ b/lisp/cedet/semantic/symref/cscope.el @@ -51,10 +51,10 @@ See the function `cedet-cscope-search' for more details.") default-directory)) ;; CScope has to be run from the project root where ;; cscope.out is. - (b (cedet-cscope-search (oref tool :searchfor) - (oref tool :searchtype) - (oref tool :resulttype) - (oref tool :searchscope) + (b (cedet-cscope-search (slot-value tool 'searchfor) + (slot-value tool 'searchtype) + (slot-value tool 'resulttype) + (slot-value tool 'searchscope) )) ) (semantic-symref-parse-tool-output tool b) @@ -66,22 +66,22 @@ See the function `cedet-cscope-search' for more details.") (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) + (cond ((eq (slot-value tool 'resulttype) 'file) ;; Search for files (when (re-search-forward "^\\([^\n]+\\)$" nil t) (match-string 1))) - ((eq (oref tool :searchtype) 'tagcompletions) + ((eq (slot-value tool 'searchtype) 'tagcompletions) ;; Search for files (when (re-search-forward "^[^ ]+ [^ ]+ [^ ]+ \\(.*\\)$" nil t) (let ((subtxt (match-string 1)) - (searchtxt (oref tool :searchfor))) + (searchtxt (slot-value tool 'searchfor))) (if (string-match (concat "\\<" searchtxt "\\(\\w\\|\\s_\\)*\\>") subtxt) (match-string 0 subtxt) ;; We have to return something at this point. subtxt))) ) - ((eq (oref tool :resulttype) 'line-and-text) + ((eq (slot-value tool 'resulttype) 'line-and-text) (when (re-search-forward semantic-symref-cscope--line-re nil t) (list (string-to-number (match-string 2)) (expand-file-name (match-string 1)) diff --git a/lisp/cedet/semantic/symref/global.el b/lisp/cedet/semantic/symref/global.el index e91ecf07bcc..f3a5b57c551 100644 --- a/lisp/cedet/semantic/symref/global.el +++ b/lisp/cedet/semantic/symref/global.el @@ -40,10 +40,10 @@ See the function `cedet-gnu-global-search' for more details.") (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) - (oref tool :resulttype) - (oref tool :searchscope) + (let ((b (cedet-gnu-global-search (slot-value tool 'searchfor) + (slot-value tool 'searchtype) + (slot-value tool 'resulttype) + (slot-value tool 'searchscope) )) ) (semantic-symref-parse-tool-output tool b) @@ -55,12 +55,12 @@ See the function `cedet-gnu-global-search' for more details.") (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) - (eq (oref tool :searchtype) 'tagcompletions)) + (cond ((or (eq (slot-value tool 'resulttype) 'file) + (eq (slot-value tool 'searchtype) 'tagcompletions)) ;; Search for files (when (re-search-forward "^\\([^\n]+\\)$" nil t) (match-string 1))) - ((eq (oref tool :resulttype) 'line-and-text) + ((eq (slot-value tool 'resulttype) 'line-and-text) (when (re-search-forward semantic-symref-global--line-re nil t) (list (string-to-number (match-string 2)) (match-string 3) diff --git a/lisp/cedet/semantic/symref/grep.el b/lisp/cedet/semantic/symref/grep.el index 42dc40cce04..ecb93dd6084 100644 --- a/lisp/cedet/semantic/symref/grep.el +++ b/lisp/cedet/semantic/symref/grep.el @@ -137,7 +137,7 @@ This shell should support pipe redirect syntax." (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))) + (let ((st (slot-value tool 'searchtype))) (when (not (memq st '(symbol regexp))) (error "Symref impl GREP does not support searchtype of %s" st)) ) @@ -147,13 +147,13 @@ This shell should support pipe redirect syntax." (filepatterns (semantic-symref-derive-find-filepatterns)) (filepattern (mapconcat #'shell-quote-argument filepatterns " ")) ;; Grep based flags. - (grepflags (cond ((eq (oref tool :resulttype) 'file) + (grepflags (cond ((eq (slot-value tool 'resulttype) 'file) "-l ") - ((eq (oref tool :searchtype) 'regexp) + ((eq (slot-value tool 'searchtype) 'regexp) "-nE ") (t "-n "))) (greppat (shell-quote-argument - (cond ((eq (oref tool :searchtype) 'regexp) + (cond ((eq (slot-value tool 'searchtype) 'regexp) (oref tool searchfor)) (t ;; Can't use the word boundaries: Grep @@ -195,11 +195,11 @@ This shell should support pipe redirect syntax." (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) + (cond ((eq (slot-value tool 'resulttype) 'file) ;; Search for files (when (re-search-forward "^\\([^\n]+\\)$" nil t) (match-string 1))) - ((eq (oref tool :resulttype) 'line-and-text) + ((eq (slot-value tool 'resulttype) 'line-and-text) (when (re-search-forward semantic-symref-grep--line-re nil t) (list (string-to-number (match-string 2)) (match-string 1) diff --git a/lisp/cedet/semantic/symref/idutils.el b/lisp/cedet/semantic/symref/idutils.el index 3c94f01c6d9..f5d6de5fa60 100644 --- a/lisp/cedet/semantic/symref/idutils.el +++ b/lisp/cedet/semantic/symref/idutils.el @@ -40,10 +40,10 @@ See the function `cedet-idutils-search' for more details.") (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) - (oref tool :resulttype) - (oref tool :searchscope) + (let ((b (cedet-idutils-search (slot-value tool 'searchfor) + (slot-value tool 'searchtype) + (slot-value tool 'resulttype) + (slot-value tool 'searchscope) )) ) (semantic-symref-parse-tool-output tool b) @@ -55,14 +55,14 @@ See the function `cedet-idutils-search' for more details.") (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) + (cond ((eq (slot-value tool 'resulttype) 'file) ;; Search for files (when (re-search-forward "^\\([^\n]+\\)$" nil t) (match-string 1))) - ((eq (oref tool :searchtype) 'tagcompletions) + ((eq (slot-value tool 'searchtype) 'tagcompletions) (when (re-search-forward "^\\([^ ]+\\) " nil t) (match-string 1))) - ((eq (oref tool :resulttype) 'line-and-text) + ((eq (slot-value tool 'resulttype) 'line-and-text) (when (re-search-forward semantic-symref-idutils--line-re nil t) (list (string-to-number (match-string 2)) (expand-file-name (match-string 1) default-directory) diff --git a/lisp/cedet/semantic/symref/list.el b/lisp/cedet/semantic/symref/list.el index e1a789d673a..d48b61246ce 100644 --- a/lisp/cedet/semantic/symref/list.el +++ b/lisp/cedet/semantic/symref/list.el @@ -210,7 +210,7 @@ Some useful functions are found in `semantic-format-tag-functions'." (erase-buffer) ;; Insert the contents. (let ((lastfile nil)) - (dolist (T (oref results :hit-tags)) + (dolist (T (slot-value results 'hit-tags)) (unless (equal lastfile (semantic-tag-file-name T)) (setq lastfile (semantic-tag-file-name T)) (insert-button lastfile |