diff options
| author | Lars Ingebrigtsen <larsi@gnus.org> | 2019-06-13 18:01:42 +0200 |
|---|---|---|
| committer | Lars Ingebrigtsen <larsi@gnus.org> | 2019-06-14 14:24:18 +0200 |
| commit | 7b837cd707753919dea0c14207c11643f7a88e87 (patch) | |
| tree | 63146c38abe7b66778ebd40e8a05a4f1a7cc1152 /lisp/cedet/ede/files.el | |
| parent | 07df91d45a950d7bef323b57dc7e46b34997143f (diff) | |
| download | emacs-7b837cd707753919dea0c14207c11643f7a88e87.tar.gz | |
Use CLOS-style accessors in oref/oset
* lisp/cedet/srecode/texi.el (srecode-semantic-handle-:texitag):
* lisp/cedet/srecode/table.el (srecode-mode-table-new):
(srecode-dump):
* lisp/cedet/srecode/srt-mode.el (srecode-parse-this-macro):
(semantic-analyze-possible-completions):
* lisp/cedet/srecode/semantic.el (srecode-compound-toString):
(srecode-semantic-apply-tag-to-dict-default):
* lisp/cedet/srecode/mode.el (srecode-minor-mode-templates-menu):
(srecode-edit):
* lisp/cedet/srecode/insert.el (srecode-insert-method):
(srecode-inserter-apply-state):
(srecode-insert-ask-default):
(srecode-insert-method-ask):
(srecode-insert-method-field):
(srecode-insert-method-helper):
(srecode-parse-input):
(srecode-match-end):
(srecode-insert-include-lookup):
(srecode-insert-method):
* lisp/cedet/srecode/find.el (srecode-template-table-in-project-p):
(srecode-template-get-table):
(srecode-template-get-table-for-binding):
(srecode-all-template-hash):
* lisp/cedet/srecode/extract.el (srecode-inserter-extract):
(srecode-inserter-extract):
* lisp/cedet/srecode/el.el (srecode-semantic-apply-tag-to-dict):
* lisp/cedet/srecode/dictionary.el (initialize-instance):
(srecode-dictionary-add-template-table):
(srecode-compound-toString):
* lisp/cedet/srecode/cpp.el (srecode-semantic-apply-tag-to-dict):
* lisp/cedet/srecode/compile.el (srecode-compile-template-table):
(srecode-dump):
* lisp/cedet/srecode/args.el (srecode-semantic-handle-:project):
* lisp/cedet/semantic/texi.el (semantic-analyze-possible-completions):
* lisp/cedet/semantic/symref/list.el (semantic-symref-results-dump):
(semantic-symref-list-create-macro-on-open-hit):
(semantic-symref-list-rename-open-hits):
(semantic-symref-list-map-open-hits):
* lisp/cedet/semantic/symref/idutils.el
(semantic-symref-perform-search):
(semantic-symref-parse-tool-output-one-line):
* lisp/cedet/semantic/symref/global.el (semantic-symref-perform-search):
(semantic-symref-parse-tool-output-one-line):
* lisp/cedet/semantic/symref/cscope.el (semantic-symref-perform-search):
(semantic-symref-parse-tool-output-one-line):
* lisp/cedet/semantic/mru-bookmark.el
(semantic-mrub-ring-to-assoc-list):
* lisp/cedet/semantic/grammar.el
(semantic-analyze-possible-completions):
* lisp/cedet/semantic/decorate/include.el
(semantic-decoration-include-describe):
* lisp/cedet/semantic/debug.el (semantic-debug-highlight-lexical-token):
(semantic-debug-highlight-rule):
* lisp/cedet/semantic/db-typecache.el
(semanticdb-typecache-for-database):
* lisp/cedet/semantic/complete.el
(semantic-collector-calculate-completions-raw):
* lisp/cedet/semantic/bovine/make.el
(semantic-analyze-possible-completions):
* lisp/cedet/semantic/analyze/refs.el (semantic-analyze-refs-impl):
(semantic-analyze-refs-proto):
* lisp/cedet/semantic/analyze/debug.el
(semantic-analyzer-debug-describe-scope):
* lisp/cedet/semantic/analyze.el (semantic-analyze-interesting-tag):
(semantic-analyze-interesting-tag):
(semantic-analyze-pulse):
* lisp/cedet/ede/util.el (ede-update-version):
* lisp/cedet/ede/shell.el (ede-shell-run-something):
* lisp/cedet/ede/project-am.el (project-am-load-makefile):
(project-rescan):
(project-am-macro):
(ede-buffer-mine):
(project-compile-target-command):
(project-am-package-info):
* lisp/cedet/ede/files.el (ede--project-inode):
(ede-directory-get-open-project):
(ede-directory-get-toplevel-open-project):
(ede-find-subproject-for-directory):
(ede-toplevel-project):
* lisp/cedet/ede/cpp-root.el (initialize-instance):
(project-compile-project):
(project-compile-target):
* lisp/cedet/ede/config.el (ede-config-get-configuration):
(project-debug-target):
(project-run-target):
(project-compile-project):
(ede-preprocessor-map):
(ede-java-classpath):
* lisp/cedet/ede/base.el (ede-normalize-file/directory): Use
CLOS-style oref/oset accessors instead of eieio-style :colon
accessors. This avoids compilation warnings and is allegedly
faster.
Diffstat (limited to 'lisp/cedet/ede/files.el')
| -rw-r--r-- | lisp/cedet/ede/files.el | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/lisp/cedet/ede/files.el b/lisp/cedet/ede/files.el index fc74c0a07e9..a6a0af100f5 100644 --- a/lisp/cedet/ede/files.el +++ b/lisp/cedet/ede/files.el @@ -120,7 +120,7 @@ of the anchor file for the project." "Get the inode of the directory project PROJ is in." (if (slot-boundp proj 'dirinode) (oref proj dirinode) - (oset proj dirinode (ede--inode-for-dir (oref proj :directory))))) + (oset proj dirinode (ede--inode-for-dir (oref proj directory))))) (defun ede--inode-get-toplevel-open-project (inode) "Return an already open toplevel project that is managing INODE. @@ -159,7 +159,8 @@ If DIR is the root project, then it is the same." (when rootreturn (set rootreturn proj)) ;; Find subprojects. (when (and proj (if ede--disable-inode - (not (string= ft (expand-file-name (oref proj :directory)))) + (not (string= ft (expand-file-name + (oref proj directory)))) (not (equal inode (ede--project-inode proj))))) (setq ans (ede-find-subproject-for-directory proj ft))) ans)) @@ -175,8 +176,7 @@ If optional EXACT is non-nil, only return exact matches for DIR." (shortans nil)) (while (and all (not ans)) ;; Do the check. - (let ((pd (expand-file-name (oref (car all) :directory))) - ) + (let ((pd (expand-file-name (oref (car all) directory)))) (cond ;; Exact text match. ((string= pd ft) @@ -187,7 +187,7 @@ If optional EXACT is non-nil, only return exact matches for DIR." (setq shortans (car all)) ;; We already have a short answer, so see if pd (the match we found) ;; is longer. If it is longer, then it is more precise. - (when (< (length (oref shortans :directory)) + (when (< (length (oref shortans directory)) (length pd)) (setq shortans (car all)))) ) @@ -208,7 +208,7 @@ If optional EXACT is non-nil, only return exact matches for DIR." (setq shortans (car all)) ;; We already have a short answer, so see if pd (the match we found) ;; is longer. If it is longer, then it is more precise. - (when (< (length (expand-file-name (oref shortans :directory))) + (when (< (length (expand-file-name (oref shortans directory))) (length pd)) (setq shortans (car all)))) ))) @@ -228,7 +228,7 @@ If optional EXACT is non-nil, only return exact matches for DIR." proj (lambda (SP) (when (not ans) - (if (string= fulldir (file-truename (oref SP :directory))) + (if (string= fulldir (file-truename (oref SP directory))) (setq ans SP) (ede-find-subproject-for-directory SP dir))))) ans) @@ -358,11 +358,11 @@ If DIR is not part of a project, return nil." ((and (string= dir default-directory) ede-object-root-project) ;; Try the local buffer cache first. - (oref ede-object-root-project :directory)) + (oref ede-object-root-project directory)) ;; See if there is an existing project in DIR. ((setq ans (ede-directory-get-toplevel-open-project dir)) - (oref ans :directory)) + (oref ans directory)) ;; Detect using our file system detector. ((setq ans (ede-detect-directory-for-project dir)) |
