CEDET: Fix "unknown slot [...]" warningsscratch/last-cedet-merge

Replace (oref OBJECT :SLOT) with (slot-value OBJECT 'SLOT).

TODO: ChangeLog

17 files changed, 52 insertions, 52 deletions

diff --git a/lisp/cedet/semantic/analyze.el b/lisp/cedet/semantic/analyze.el
index 9918aacadd1..696b864cd20 100644
--- a/lisp/cedet/semantic/analyze.el
+++ b/lisp/cedet/semantic/analyze.el
@@ -202,7 +202,7 @@ Optional argument DESIRED-TYPE may be a non-type tag to analyze."
 (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))))
+  (let ((prefix (reverse (slot-value context 'prefix))))
     ;; Go back through the prefix until we find a tag we can return.
     (while (and prefix (not (semantic-tag-p (car prefix))))
       (setq prefix (cdr prefix)))
@@ -212,12 +212,12 @@ Optional argument DESIRED-TYPE may be a non-type tag to analyze."
 (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 (cl-call-next-method) (car-safe (oref context :function))))
+  (or (cl-call-next-method) (car-safe (slot-value context 'function))))
 
 (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 (cl-call-next-method) (car-safe (oref context :assignee))))
+  (or (cl-call-next-method) (car-safe (slot-value context 'assignee))))
 
 ;;; TYPE MEMBERS
 ;;
@@ -760,8 +760,8 @@ Optional argument CTXT is the context to show."
 (cl-defmethod semantic-analyze-pulse ((context semantic-analyze-context))
   "Pulse the region that CONTEXT affects."
   (require 'pulse)
-  (with-current-buffer (oref context :buffer)
-    (let ((bounds (oref context :bounds)))
+  (with-current-buffer (slot-value context 'buffer)
+    (let ((bounds (slot-value context 'bounds)))
       (when bounds
 	(pulse-momentary-highlight-region (car bounds) (cdr bounds))))))
 
diff --git a/lisp/cedet/semantic/analyze/debug.el b/lisp/cedet/semantic/analyze/debug.el
index 6255bdf3005..adbd00d6187 100644
--- a/lisp/cedet/semantic/analyze/debug.el
+++ b/lisp/cedet/semantic/analyze/debug.el
@@ -478,7 +478,7 @@ variable `semantic-dependency-system-include-path'."))
 (defun semantic-analyzer-debug-describe-scope (ctxt &optional classconstraint)
   "Describe the scope in CTXT for finding a global symbol.
 Optional argument CLASSCONSTRAINT says to output to tags of that class."
-  (let* ((scope (oref ctxt :scope))
+  (let* ((scope (slot-value ctxt 'scope))
 	 (parents (oref scope parents))
 	 (cc (or classconstraint (oref ctxt prefixclass)))
 	 )
diff --git a/lisp/cedet/semantic/analyze/refs.el b/lisp/cedet/semantic/analyze/refs.el
index 7fbaa2ce974..d0c84ac1dfd 100644
--- a/lisp/cedet/semantic/analyze/refs.el
+++ b/lisp/cedet/semantic/analyze/refs.el
@@ -104,7 +104,7 @@ Use `semantic-analyze-current-tag' to debug this fcn."
   "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))
-	(tag (oref refs :tag))
+	(tag (slot-value refs 'tag))
 	(impl nil)
 	)
     (semanticdb-find-result-mapc
@@ -129,7 +129,7 @@ Optional argument IN-BUFFER indicates that the returned tag should be in an acti
   "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))
-	(tag (oref refs :tag))
+	(tag (slot-value refs 'tag))
 	(proto nil))
     (semanticdb-find-result-mapc
      (lambda (T DB)
diff --git a/lisp/cedet/semantic/bovine/make.el b/lisp/cedet/semantic/bovine/make.el
index 78a0926ea33..33b0f6762b4 100644
--- a/lisp/cedet/semantic/bovine/make.el
+++ b/lisp/cedet/semantic/bovine/make.el
@@ -182,10 +182,10 @@ Any extra FLAGS are ignored."
   (require 'semantic/analyze/complete)
   (with-current-buffer (oref context buffer)
     (let* ((normal (semantic-analyze-possible-completions-default context))
-	   (classes (oref context :prefixclass))
+	   (classes (slot-value context 'prefixclass))
 	   (filetags nil))
       (when (memq 'filename classes)
-	(let* ((prefix (car (oref context :prefix)))
+	(let* ((prefix (car (slot-value context 'prefix)))
 	       (completetext (cond ((semantic-tag-p prefix)
 				    (semantic-tag-name prefix))
 				   ((stringp prefix)
diff --git a/lisp/cedet/semantic/complete.el b/lisp/cedet/semantic/complete.el
index 60ae3c984d6..dd4c3cc55a9 100644
--- a/lisp/cedet/semantic/complete.el
+++ b/lisp/cedet/semantic/complete.el
@@ -1288,7 +1288,7 @@ Uses semanticdb for searching all tags in the current project."
 	 (localstuff (oref scope scope)))
     (list
      (cons
-      (oref scope :table)
+      (slot-value scope 'table)
       (semantic-find-tags-for-completion prefix localstuff)))))
     ;(semanticdb-brute-deep-find-tags-for-completion prefix (oref obj path))))
 
diff --git a/lisp/cedet/semantic/db-global.el b/lisp/cedet/semantic/db-global.el
index 442e5f93b2a..a43e6fad831 100644
--- a/lisp/cedet/semantic/db-global.el
+++ b/lisp/cedet/semantic/db-global.el
@@ -192,7 +192,7 @@ Returns a table of all matching tags."
 	   (faketags nil)
 	   )
       (when result
-	(dolist (T (oref result :hit-text))
+	(dolist (T (slot-value result 'hit-text))
 	  ;; We should look up each tag one at a time, but I'm lazy!
 	  ;; Doing this may be good enough.
 	  (setq faketags (cons
diff --git a/lisp/cedet/semantic/db-typecache.el b/lisp/cedet/semantic/db-typecache.el
index 48e439e54f9..083b643b624 100644
--- a/lisp/cedet/semantic/db-typecache.el
+++ b/lisp/cedet/semantic/db-typecache.el
@@ -556,7 +556,7 @@ If there isn't one, create it.
 	(stream nil)
 	)
     (dolist (table (semanticdb-get-database-tables db))
-      (when (eq lmode (oref table :major-mode))
+      (when (eq lmode (slot-value table 'major-mode))
 	(setq stream
 	      (semanticdb-typecache-merge-streams
 	       stream
diff --git a/lisp/cedet/semantic/debug.el b/lisp/cedet/semantic/debug.el
index 180db3ab1fd..641974545cd 100644
--- a/lisp/cedet/semantic/debug.el
+++ b/lisp/cedet/semantic/debug.el
@@ -171,7 +171,7 @@ These buffers are brought into view when layout occurs.")
 (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))
+  (set-buffer (slot-value iface 'source-buffer))
 
   (object-add-to-list iface 'overlays
 		      (semantic-lex-highlight-token token))
@@ -184,7 +184,7 @@ TOKEN is a lexical token."
 NONTERM is the name of the rule currently being processed that shows up
 as a nonterminal (or tag) in the source buffer.
 If RULE and MATCH indices are specified, highlight those also."
-  (set-buffer (oref iface :parser-buffer))
+  (set-buffer (slot-value iface 'parser-buffer))
 
   (let* ((rules (semantic-find-tags-by-class 'nonterminal (current-buffer)))
 	 (nt (semantic-find-first-tag-by-name nonterm rules))
diff --git a/lisp/cedet/semantic/decorate/include.el b/lisp/cedet/semantic/decorate/include.el
index c7b5eb55ef1..d66bd995bbf 100644
--- a/lisp/cedet/semantic/decorate/include.el
+++ b/lisp/cedet/semantic/decorate/include.el
@@ -437,11 +437,11 @@ its contents.
       ;; Get the semanticdb statement, and display it's contents.
       (princ "\nDetails for header file...\n")
       (princ "\nMajor Mode:          ")
-      (princ (oref table :major-mode))
+      (princ (slot-value table 'major-mode))
       (princ "\nTags:                ")
-      (princ (format "%s entries" (length (oref table :tags))))
+      (princ (format "%s entries" (length (slot-value table 'tags))))
       (princ "\nFile Size:           ")
-      (princ (format "%s chars" (oref table :pointmax)))
+      (princ (format "%s chars" (slot-value table 'pointmax)))
       (princ "\nSave State:          ")
       (cond ((oref table dirty)
 	     (princ "Table needs to be saved."))
diff --git a/lisp/cedet/semantic/grammar.el b/lisp/cedet/semantic/grammar.el
index 5cd49326c99..6f642671b19 100644
--- a/lisp/cedet/semantic/grammar.el
+++ b/lisp/cedet/semantic/grammar.el
@@ -1903,7 +1903,7 @@ Optional FLAGS are ignored."
       (with-mode-local emacs-lisp-mode
 	(semantic-analyze-possible-completions context))
     (with-current-buffer (oref context buffer)
-      (let* ((prefix (car (reverse (oref context :prefix))))
+      (let* ((prefix (car (reverse (slot-value context 'prefix))))
 	     (completetext (cond ((semantic-tag-p prefix)
 				  (semantic-tag-name prefix))
 				 ((stringp prefix)
diff --git a/lisp/cedet/semantic/mru-bookmark.el b/lisp/cedet/semantic/mru-bookmark.el
index 4fd2a869f28..434cca847a0 100644
--- a/lisp/cedet/semantic/mru-bookmark.el
+++ b/lisp/cedet/semantic/mru-bookmark.el
@@ -318,7 +318,7 @@ minor mode is enabled."
 	(al nil))
     (while (< idx len)
       (let ((r (ring-ref ring idx)))
-	(setq al (cons (cons (oref r :object-name) r)
+	(setq al (cons (cons (slot-value r 'object-name) r)
 		       al)))
       (setq idx (1+ idx)))
     (nreverse al)))
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
diff --git a/lisp/cedet/semantic/texi.el b/lisp/cedet/semantic/texi.el
index d9a5058e55c..fb7c9928d63 100644
--- a/lisp/cedet/semantic/texi.el
+++ b/lisp/cedet/semantic/texi.el
@@ -419,9 +419,9 @@ useful.  Instead, look at the current symbol.  If it is a command
 do primitive texinfo built ins.  If not, use ispell to lookup words
 that start with that symbol.
 Any extra FLAGS are currently ignored."
-  (let ((prefix (car (oref context :prefix)))
+  (let ((prefix (car (slot-value context 'prefix)))
 	)
-    (cond ((member 'function (oref context :prefixclass))
+    (cond ((member 'function (slot-value context 'prefixclass))
 	   ;; Do completion for texinfo commands
 	   (let* ((cmd (substring prefix 1))
 		  (lst (all-completions
@@ -429,7 +429,7 @@ Any extra FLAGS are currently ignored."
 	     (mapcar (lambda (f) (semantic-tag (concat "@" f) 'function))
 		     lst))
 	   )
-	  ((member 'word (oref context :prefixclass))
+	  ((member 'word (slot-value context 'prefixclass))
 	   ;; Do completion for words via ispell.
 	   (require 'ispell)
 	   (let ((word-list (ispell-lookup-words prefix)))