Commit 5d4da32d authored by David Engster's avatar David Engster Committed by David Engster

Update from CEDET trunk.

* grammars/c.by (template-type): Add :template-specifier and
:typevar to capture extra details about the template.
(opt-post-fcn-modifiers): Splice in the found symbol into the
return value correctly.
(QUESTION): New punctuation.
(expression): Add ternary conditional support.

* grammars/scheme.by (MODULE): New token.
(scheme): Handle expanding the MODULE tag.
(scheme-list): Remove closeparen required match.
(scheme-in-list): Remove extraneous matches for DEFINE.  Add
support for MODULE Simplify matching for code & make work.
(name-args, name-arg-list, name-arg-expand): Make it work.

* semantic.el (semantic-mode): Add/remove 3
completion-at-point-functions.
(semantic-completion-at-point-function): Removed.
(semantic-analyze-completion-at-point-function)
(semantic-analyze-notc-completion-at-point-function)
(semantic-analyze-nolongprefix-completion-at-point-function): New
completion at point functions.

* semantic/doc.el (semantic-doc-snarf-comment-for-tag): Fix case
when comment-end is empty string.

* semantic/debug.el
(semantic-debug-parser-debugger-source): New buffer local
variable.
(semantic-debug-interface): Add 'nil' initform to overlays.
(semantic-debug-mode): Remove read-only tags from buffers on exit.
(semantic-debug): Add autoload cookie.  Force the language
specific debugger to load.

* semantic/db.el (generic::semanticdb-full-filename): New generic
method to allow this method to be used on buffer names via an
associated database.

* semantic/symref.el
(semantic-symref-cleanup-recent-buffers-fcn): When cleaning up
buffers, don't clean up buffers that are being used (i.e., in a
window) when the hook fires.
(semantic-symref-recently-opened-buffers): New tracking variable.
(semantic-symref-cleanup-recent-buffers-fcn): New hook fcn.
(semantic-symref-result-get-tags): Move logic into
`semantic-symref-hit-to-tag-via-buffer', and cleanup buffers via
the symref cleanup function in post-command-hook.
(semantic-symref-hit-to-tag-via-buffer): Logic that used to be
from above.
(semantic-symref-hit-to-tag-via-db): New.

* semantic/analyze.el:
(semantic-analyze-find-tag-sequence-default): If first entry in
sequence is the only one, apply tagclass filter.
(semantic-analyze-princ-sequence): Show slot even if empty.
(semantic-analyze-find-tag-sequence)
(semantic-analyze-find-tag-sequence-default): Add flags argument.
Add support for forcing the final entry of the sequence to be of
class variable.
(semantic-analyze-find-tag): Fix bug where input class filter was
ignored if there was a typecache match.
(semantic-analyze-current-context-default): For assignments, the
assignee now must be of class variable.

* semantic/analyze/complete.el
(semantic-analyze-possible-completions-default): Add
'no-longprefix' flag.  When used, the prefix and prefixtypes are
shortened to just the last symbol.

* semantic/bovine/c.el (semantic-c-do-lex-if): Catch errors from
'hideif', and push to the parser warning stack.
(semantic-lex-cpp-define): When a comment is at the end of a
macro, do not subtract an extra 1 from the found position.  Fixes
bug with: #define foo (a)/**/ adding an extra ')' to the stream.

* semantic/bovine/scm.el (semantic-lex-scheme-symbol): Allow
symbols to be one char long.

* semantic/bovine/grammar.el
(bovine-grammar-calculate-source-on-path): New.
(bovine-grammar-setupcode-builder): Use it.

* ede.el (ede/detect): New require.
(ede-version): Bump version
(ede-initialize-state-current-buffer): Use new
`ede-detect-directory-for-project' to detect projects first
instead of depending on currente dir only.
(ede-delete-project-from-global-list): New.
(ede-flush-deleted-projects): Use above.
(ede-check-project-query-fcn): New variable
(ede-check-project-directory): Use above when querying the user.
Added to support unit testing of this security measure.
(ede-initialize-state-current-buffer): Use
`ede-directory-project-cons' instead of the -detect- fcn to take
advantage of the cache.  Pass found project into
`ede-load-project-file'.
(ede-load-project-file): Add new input DETECTIN.
(ede-rescan-toplevel): Get the proj root a better way.
(ede-load-project-file): Return the loaded object.  When asking
for existing project, ask for an exact match.
(ede-initialize-state-current-buffer): Simplify some conditional
logic.
(ede-load-project-file): Simplify conditional logic.
(ede-global-list-sanity-check): New Testing fcn.
(ede-parent-project): Replace old code with call to faster
`ede-find-subproject-for-directory'.
(ede-load-project-file): Use
`ede-directory-get-toplevel-open-project' instead of above
deleted.  Rename "pfc" to "autoloader".  Use
`ede-directory-project-cons' to detect a project.  Delete no
project found case where we search up the tree.

* ede/auto.el (ede-project-autoload): Fix doc typo.  Add
`:root-only' slot.
(ede-auto-load-project): Doc update: warn to not use.
(ede-dir-to-projectfile): Deleted.
(ede-project-autoload-dirmatch): Add subdir-only slot.  Make
configdatastash unbound by default.
(ede-do-dirmatch): If subdir-only is true, then don't allow exact
matches.  Account for configdatastash as unbound.  Assume value of
nil means no tool installed.  Make sure loaded path matches from
beginning.  Stash the regexp, not the raw string.
(ede-project-class-files): Note that makefile and automake are not
root only.
(ede-auto-detect-in-dir): New (for use with `ede/detect.el').
(ede-project-dirmatch-p): Deleted.
(ede-project-root-directory): Remove body, return nil.
(ede-project-autoload): :proj-root-dirmatch can be null & doc fix.
(ede-auto-detect-in-dir): If there is no :proj-file, check for a
dirmatch.

* ede/generic.el (ede/config): Replace require of ede.
(ede-generic-new-autoloader): Generic projects are now safe by
default.  Note this is NOT a root only project.
(project-rescan, ede-project-root, ede-generic-target-java)
(ede-java-classpath, ede-find-subproject-for-directory): New.
(ede-enable-generic-projects): Add new autoloaders for git, bzr,
hg, sv, CVS.
(ede-generic-vc-project)
(ede-generic-vc-project::ede-generic-setup-configuration): New.
(ede-generic-config): Remove slots: c-include-path,
c-preprocessor-table, c-preprocessor-files, classpath,
build-command, debug-command, run command.  Inherit from
ede-extra-config-build, ede-extra-config-program.  Make
run-command :value match :custom so only strings are accepted.
Add some more :group slot specifiers.
(ede-generic-project): Add mixins `ede-project-with-config-c' and
`ede-project-with-config-java'. Inherit from
`ede-project-with-config-build',
`ede-project-with-config-program'.  Subclass
`ede-project-with-config'.  Remove duplication from new baseclass.
(ede-generic-target): Inherit from `ede-target-with-config-build',
`ede-target-with-config-program'. Subclass `ede-target-with-config'.
(ede-generic-target-c-cpp): Add mixin `ede-target-with-config-c'.
(ede-generic-target-java): Add mixin `ede-target-with-config-java'.
(ede-preprocessor-map, ede-system-include-path)
(edejava-classpath): Deleted, moved to config.el.
(project-compile-project, project-compile-target)
(project-debug-target, project-run-target): Deleted.
(ede-generic-get-configuration, ede-generic-setup-configuration)
(ede-commit-project, project-rescan)
(ede-generic-project::ede-customize)
(ede-generic-target::ede-customize)
(ede-generic-config::eieio-done-customizing)
(ede-generic-config::ede-commit): Deleted.  Subsumed by new
baseclass.
(ede-preprocessor-map, ede-system-include-path)
(project-debug-target, project-run-target): Call new
`ede-config-get-configuration' instead of old version.
(ede-generic-load): Do not add to global list here.

* ede/files.el (ede-find-project-root)
(ede-files-find-existing)
(ede-directory-get-toplevel-open-project-new): Deleted.
(ede-project-root-directory): Use `ede-project-root' first.
(ede-project-directory-remove-hash)
(ede--directory-project-from-hash)
(ede--directory-project-add-description-to-hash): Rename to make
internal symbols (via --).  Expand input dir first.
(ede-directory-project-p): Doc fix (note obsoleted.)
(ede-toplevel-project-or-nil): Alias to `ede-toplevel-project'.
(ede-toplevel-project): Doc Fix.  Delete commented out old code.
Simplify returning result from ede-detect-directory-for-project.
(ede-directory-get-open-project): Support when
inodes are disabled.  If disabled to str compare on root project.
(ede-directory-get-toplevel-open-project): Enabled nested
projects.  When doing directory name matching, save the 'short'
version of an answer (non-exact match) and eventually select the
shortest answer at the end.  Expand the filename of tested
projects.  Better support for when inodes are disabled.  Add
'exact' option so that it will return a project that is an exact
match.
(ede-find-subproject-for-directory): Small optimization to run
`file-truename' less often.
(ede-directory-project-p): Move content, then use
`ede-directory-project-cons'.  Use
`ede-detect-directory-for-project', replacing old detection loop.
(ede-directory-project-cons): New, from above.
(ede-toplevel-project): Toss old scanning code.  Use
`ede-detect-directory-for-project' instead.
(ede-directory-get-toplevel-open-project-new): New.

* ede/linux.el (ede-linux-project-root): Deleted.
(ede-project-autoload): Remove dirmatch entry - it is no longer
needed.

* lisp/cedet/ede/proj.el (project-rescan): Replace direct
manipulation of `ede-projects' with equivalent and better
functions.
(ede-proj-load): Replace call to test if dir has project to
explicity ask filesystem if Project.ede is there.

* ede/config.el:
* ede/detect.el: New files.

* ede/project-am.el (project-run-target): Add "./" to program to
run for systems where '.' isn't in PATH.
(project-am-load): Remove old code regarding `ede-constructing'.
Just read in the makefiles.

* ede/linux.el (ede-linux-load): Do not add to global list here.
Don't check for existing anymore.
(project-rescan): New.
(ede-linux-project-list, ede-linux-file-existing): Deleted.
(ede-linux-project-root): Delete body.  Need symbol for autoloads
for now.
(ede-linux-project): No longer instance tracker.
(ede-project-autoload): Don't provide :proj-root

* ede/emacs.el (ede-emacs-load): Do not add project to global list
here.  Don't look for existing first.
(ede-project-autoload): Remove dirmatch entry - it is no longer
needed.  Don't provide proj-root anymore.
(ede-emacs-project-list, ede-emacs-file-existing): Delete.
(ede-emacs-project-root): Remove body (need symbol for loaddefs
still).
(ede-emacs-project): Do not instance track anymore.

* ede/cpp-root.el (initialize-instance): Remove commented code.
Add note about why we are adding the project to the master list.
Make sure if we are replacing a prev version, remove from global
list.
(ede-cpp-root-file-existing)
(ede-cpp-root-project-file-for-dir)
(ede-cpp-root-count, ede-cpp-root-project-root, ede-cpp-root-load)
(ede-project-autoload cpp-root): Deleted.
(ede-project-root-directory): Return :directory instead of
calculating from :file.
(project-rescan): New.

* ede/base.el (ede-toplevel): Only use buffer cached value if
subproj not passed in.

* srecode/java.el (srecode-semantic-handle-:java): Fix case when
an EDE project didn't support java paths.

* lisp/cedet/ede/proj-elisp.el
(ede-proj-target-elisp::ede-proj-tweak-autoconf): Kill buffer
after saving modified elisp-comp script, as to avoid "file has
changed on disk; really edit the buffer" questions when script
gets rewritten.

* emacs-lisp/eieio-custom.el (eieio-customize-object): Set
eieio-cog (current group) to g, which is an improved form of input
group.

* srecode/doc-cpp.srt (mode): Set to c mode so this works with
both C and C++.
parent d3dba954
2014-11-09 Eric Ludlam <zappo@gnu.org>
* grammars/c.by (template-type): Add :template-specifier and
:typevar to capture extra details about the template.
(opt-post-fcn-modifiers): Splice in the found symbol into the
return value correctly.
(QUESTION): New punctuation.
(expression): Add ternary conditional support.
* grammars/scheme.by (MODULE): New token.
(scheme): Handle expanding the MODULE tag.
(scheme-list): Remove closeparen required match.
(scheme-in-list): Remove extraneous matches for DEFINE. Add
support for MODULE Simplify matching for code & make work.
(name-args, name-arg-list, name-arg-expand): Make it work.
2014-11-09 David Engster <dengste@eml.cc>
* lisp/cedet/sematic/bovine/c.by
(opt-brackets-after-symbol): New.
(multi-stage-dereference): Use it. Add rules for explicit
matching the last dereference. We cannot just juse
'namespace-symbol' as a single rule, since this would match too
greedy and mess with parsing default values of variables.
2014-11-09 Glenn Morris <rgm@gnu.org> 2014-11-09 Glenn Morris <rgm@gnu.org>
* admin.el (make-manuals-dist-output-variables) * admin.el (make-manuals-dist-output-variables)
......
...@@ -64,6 +64,7 @@ ...@@ -64,6 +64,7 @@
%token <punctuation> PLUS "\\`[+]\\'" %token <punctuation> PLUS "\\`[+]\\'"
%token <punctuation> MINUS "\\`[-]\\'" %token <punctuation> MINUS "\\`[-]\\'"
%token <punctuation> BANG "\\`[!]\\'" %token <punctuation> BANG "\\`[!]\\'"
%token <punctuation> QUESTION "\\`[?]\\'"
%token <punctuation> EQUAL "\\`[=]\\'" %token <punctuation> EQUAL "\\`[=]\\'"
%token <punctuation> LESS "\\`[<]\\'" %token <punctuation> LESS "\\`[<]\\'"
%token <punctuation> GREATER "\\`[>]\\'" %token <punctuation> GREATER "\\`[>]\\'"
...@@ -590,10 +591,12 @@ template-type ...@@ -590,10 +591,12 @@ template-type
| declmods typeformbase cv-declmods opt-stars | declmods typeformbase cv-declmods opt-stars
opt-ref variablearg-opt-name opt-ref variablearg-opt-name
(TYPE-TAG (car $2) nil nil nil (TYPE-TAG (car $2) nil nil nil
:template-specifier (plist-get (nth 2 $2) :template-specifier)
:constant-flag (if (member "const" (append $1 $3)) t nil) :constant-flag (if (member "const" (append $1 $3)) t nil)
:typemodifiers (delete "const" (append $1 $3)) :typemodifiers (delete "const" (append $1 $3))
:reference (car ,$5) :reference (car ,$5)
:pointer (car $4) :pointer (car $4)
:typevar (car $6)
) )
; ;
...@@ -832,7 +835,7 @@ opt-initializers ...@@ -832,7 +835,7 @@ opt-initializers
opt-post-fcn-modifiers opt-post-fcn-modifiers
: post-fcn-modifiers opt-post-fcn-modifiers : post-fcn-modifiers opt-post-fcn-modifiers
( ,(cons ,$1 $2) ) ( ,(cons ,(car $1) $2) )
| ;;EMPTY | ;;EMPTY
( nil ) ( nil )
; ;
...@@ -1206,7 +1209,9 @@ expr-binop ...@@ -1206,7 +1209,9 @@ expr-binop
;; Use expression for parsing only. Don't actually return anything ;; Use expression for parsing only. Don't actually return anything
;; for now. Hopefully we can fix this later. ;; for now. Hopefully we can fix this later.
expression expression
: unaryexpression expr-binop unaryexpression : unaryexpression QUESTION unaryexpression COLON unaryexpression
( (identity start) (identity end) )
| unaryexpression expr-binop unaryexpression
( (identity start) (identity end) ) ( (identity start) (identity end) )
| unaryexpression | unaryexpression
( (identity start) (identity end) ) ( (identity start) (identity end) )
......
...@@ -25,6 +25,7 @@ ...@@ -25,6 +25,7 @@
%token DEFINE "define" %token DEFINE "define"
%token DEFINE-MODULE "define-module" %token DEFINE-MODULE "define-module"
%token MODULE "module"
%token LOAD "load" %token LOAD "load"
%put DEFINE summary "Function: (define symbol expression)" %put DEFINE summary "Function: (define symbol expression)"
...@@ -37,36 +38,50 @@ ...@@ -37,36 +38,50 @@
%% %%
scheme : semantic-list scheme : semantic-list
(EXPAND $1 scheme-list) ( ,(let ((expand (EXPAND $1 scheme-list)))
(cond
((semantic-tag-of-class-p expand 'module)
(TYPE-TAG (semantic-tag-name expand)
"module"
(EXPANDFULL $1 scheme)
nil) ;; Module contains more definitions like a type
)
(t
expand))))
; ;
scheme-list : OPENPAREN scheme-in-list CLOSEPAREN scheme-list : OPENPAREN scheme-in-list
( ,$2 ) ( ,$2 )
; ;
scheme-in-list: DEFINE symbol expression scheme-in-list: DEFINE symbol expression
(VARIABLE-TAG $2 nil $3 ) (VARIABLE-TAG $2 nil $3 )
| DEFINE name-args opt-doc sequence | DEFINE name-args opt-doc
(FUNCTION-TAG (car ,$2) nil (cdr ,$2) ) (FUNCTION-TAG (car ,$2) nil (cdr ,$2) )
| DEFINE-MODULE name-args | DEFINE-MODULE name-args
(PACKAGE-TAG (nth (length $2) $2 ) nil) (PACKAGE-TAG (nth (length $2) $2 ) nil)
| MODULE symbol
(TAG $1 'module :members nil)
| LOAD string | LOAD string
(INCLUDE-TAG (file-name-nondirectory (read $2)) (read $2) ) (INCLUDE-TAG (file-name-nondirectory (read $2)) (read $2) )
| symbol | symbol sequence
(CODE-TAG $1 nil) (CODE-TAG $1 nil)
; ;
name-args: semantic-list name-args: semantic-list
(EXPAND $1 name-arg-expand) (EXPAND $1 name-arg-list)
; ;
name-arg-expand : open-paren name-arg-expand name-arg-list : OPENPAREN name-arg-expand
( ,$2 ) ( ,$2 )
| symbol name-arg-expand ;
( ,(cons $1 ,$2) )
| ;; EMPTY name-arg-expand: symbol name-arg-expand
( ) ( ,(cons $1 ,$2) )
; | ;; EMPTY
( )
;
opt-doc : string opt-doc : string
| ;; EMPTY | ;; EMPTY
...@@ -83,3 +98,4 @@ expression : symbol ...@@ -83,3 +98,4 @@ expression : symbol
; ;
;;; scheme.by ends here ;;; scheme.by ends here
2014-11-09 Eric Ludlam <zappo@gnu.org>
* srecode/doc-cpp.srt (mode): Set to c mode so this works with
both C and C++.
2014-11-05 Teodor Zlatanov <tzz@lifelogs.com> 2014-11-05 Teodor Zlatanov <tzz@lifelogs.com>
* NEWS: Mention `url-user-agent'. (Bug#16498) * NEWS: Mention `url-user-agent'. (Bug#16498)
......
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
;; You should have received a copy of the GNU General Public License ;; You should have received a copy of the GNU General Public License
;; along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. ;; along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>.
set mode "c++-mode" set mode "c-mode"
set application "document" set application "document"
context declaration context declaration
......
2014-11-09 Eric Ludlam <zappo@gnu.org>
* emacs-lisp/eieio-custom.el (eieio-customize-object): Set
eieio-cog (current group) to g, which is an improved form of input
group.
2014-11-09 Juri Linkov <juri@jurta.org> 2014-11-09 Juri Linkov <juri@jurta.org>
* isearch.el (isearch-message-prefix): Show "Multi-file" and * isearch.el (isearch-message-prefix): Show "Multi-file" and
......
This diff is collapsed.
...@@ -93,6 +93,13 @@ SCOPE is the scope of the search, such as 'project or 'subdirs." ...@@ -93,6 +93,13 @@ SCOPE is the scope of the search, such as 'project or 'subdirs."
(apply 'call-process cedet-global-gtags-command (apply 'call-process cedet-global-gtags-command
nil b nil nil b nil
flags) flags)
;; Check for warnings.
(with-current-buffer b
(goto-char (point-min))
(when (re-search-forward "Error\\|Warning" nil t)
(error "Output:\n%S" (buffer-string))))
b)) b))
(defun cedet-gnu-global-expand-filename (filename) (defun cedet-gnu-global-expand-filename (filename)
...@@ -181,8 +188,10 @@ If a database already exists, then just update it." ...@@ -181,8 +188,10 @@ If a database already exists, then just update it."
(let ((default-directory dir)) (let ((default-directory dir))
(cedet-gnu-global-gtags-call (cedet-gnu-global-gtags-call
(when root (when root
'("-i");; Incremental update flag. '("-u");; Incremental update flag.
))))) ))
)
))
(provide 'cedet-global) (provide 'cedet-global)
......
This diff is collapsed.
...@@ -47,8 +47,13 @@ ...@@ -47,8 +47,13 @@
:initform nil :initform nil
:documentation :documentation
"An index into the match-data of `configregex'.") "An index into the match-data of `configregex'.")
(configdatastash :initform nil (subdir-only :initarg :subdir-only
:documentation :initform t
:documentation
"Non-nil means an exact match to the found directory is a non-match.
This implies projects exist only in subdirectories of the configuration path.
If `:subdir-only' is nil, then the directory from the configuration file is the project.")
(configdatastash :documentation
"Save discovered match string.") "Save discovered match string.")
) )
"Support complex matches for projects that live in named directories. "Support complex matches for projects that live in named directories.
...@@ -80,8 +85,11 @@ into memory.") ...@@ -80,8 +85,11 @@ into memory.")
;; If the thing to match is stored in a config file. ;; If the thing to match is stored in a config file.
((stringp fc) ((stringp fc)
(when (file-exists-p fc) (when (file-exists-p fc)
(let ((matchstring (oref dirmatch configdatastash))) (let ((matchstring
(unless matchstring (if (slot-boundp dirmatch 'configdatastash)
(oref dirmatch configdatastash)
nil)))
(when (and (not matchstring) (not (slot-boundp dirmatch 'configdatastash)))
(save-current-buffer (save-current-buffer
(let* ((buff (get-file-buffer fc)) (let* ((buff (get-file-buffer fc))
(readbuff (readbuff
...@@ -94,12 +102,27 @@ into memory.") ...@@ -94,12 +102,27 @@ into memory.")
(setq matchstring (setq matchstring
(match-string (or (oref dirmatch configregexidx) 0))))) (match-string (or (oref dirmatch configregexidx) 0)))))
(if (not buff) (kill-buffer readbuff)))) (if (not buff) (kill-buffer readbuff))))
;; Save what we find in our cache. (when matchstring
(oset dirmatch configdatastash matchstring)) ;; If this dirmatch only finds subdirs of matchstring, then
;; force matchstring to be a directory.
(when (oref dirmatch subdir-only)
(setq matchstring (file-name-as-directory matchstring)))
;; Convert matchstring to a regexp
(setq matchstring (concat "^" (regexp-quote matchstring)))
;; Stash it for later.
(oset dirmatch configdatastash matchstring))
;; Debug
;;(message "Stashing config data for dirmatch %S as %S" (eieio-object-name dirmatch) matchstring)
)
;;(message "dirmatch %s against %s" matchstring (expand-file-name file))
;; Match against our discovered string ;; Match against our discovered string
(and matchstring (string-match (regexp-quote matchstring) file)) (setq file (file-name-as-directory (expand-file-name file)))
(and matchstring (string-match matchstring (expand-file-name file))
(or (not (oref dirmatch subdir-only))
(not (= (match-end 0) (length file))))
)
))) )))
;; Add new matches here ;; Add new matches here
;; ((stringp somenewslot ...) ;; ((stringp somenewslot ...)
;; ) ;; )
...@@ -119,13 +142,21 @@ into memory.") ...@@ -119,13 +142,21 @@ into memory.")
:documentation "The lisp file belonging to this class.") :documentation "The lisp file belonging to this class.")
(proj-file :initarg :proj-file (proj-file :initarg :proj-file
:documentation "Name of a project file of this type.") :documentation "Name of a project file of this type.")
(root-only :initarg :root-only
:initform t ;; Default - majority case.
:documentation
"Non-nil if project detection only finds proj-file @ project root.")
(proj-root-dirmatch :initarg :proj-root-dirmatch (proj-root-dirmatch :initarg :proj-root-dirmatch
:initform "" :initform nil
:type (or string ede-project-autoload-dirmatch) :type (or null string ede-project-autoload-dirmatch)
:documentation :documentation
"To avoid loading a project, check if the directory matches this. "To avoid loading a project, check if the directory matches this.
For projects that use directory name matches, a function would load that project. Specifying this matcher object will allow EDE to perform a complex
Specifying this matcher will allow EDE to check without loading the project.") check without loading the project.
NOTE: If you use dirmatch, you may need to set :root-only to `nil'.
While it may be a root based project, all subdirs will happen to return
true for the dirmatch, so for scanning purposes, set it to `nil'.")
(proj-root :initarg :proj-root (proj-root :initarg :proj-root
:type function :type function
:documentation "A function symbol to call for the project root. :documentation "A function symbol to call for the project root.
...@@ -168,12 +199,14 @@ type is required and the load function used.") ...@@ -168,12 +199,14 @@ type is required and the load function used.")
(ede-project-autoload "edeproject-makefile" (ede-project-autoload "edeproject-makefile"
:name "Make" :file 'ede/proj :name "Make" :file 'ede/proj
:proj-file "Project.ede" :proj-file "Project.ede"
:root-only nil
:load-type 'ede-proj-load :load-type 'ede-proj-load
:class-sym 'ede-proj-project :class-sym 'ede-proj-project
:safe-p nil) :safe-p nil)
(ede-project-autoload "edeproject-automake" (ede-project-autoload "edeproject-automake"
:name "Automake" :file 'ede/proj :name "Automake" :file 'ede/proj
:proj-file "Project.ede" :proj-file "Project.ede"
:root-only nil
:initializers '(:makefile-type Makefile.am) :initializers '(:makefile-type Makefile.am)
:load-type 'ede-proj-load :load-type 'ede-proj-load
:class-sym 'ede-proj-project :class-sym 'ede-proj-project
...@@ -181,6 +214,7 @@ type is required and the load function used.") ...@@ -181,6 +214,7 @@ type is required and the load function used.")
(ede-project-autoload "automake" (ede-project-autoload "automake"
:name "automake" :file 'ede/project-am :name "automake" :file 'ede/project-am
:proj-file "Makefile.am" :proj-file "Makefile.am"
:root-only nil
:load-type 'project-am-load :load-type 'project-am-load
:class-sym 'project-am-makefile :class-sym 'project-am-makefile
:new-p nil :new-p nil
...@@ -233,97 +267,33 @@ added. Possible values are: ...@@ -233,97 +267,33 @@ added. Possible values are:
;; Splice into the list. ;; Splice into the list.
(setcdr prev (cons projauto next)))))))) (setcdr prev (cons projauto next))))))))
;;; EDE project-autoload methods ;;; Project Autoload Methods
;; ;;
(defmethod ede-project-root ((this ede-project-autoload))
"If a project knows its root, return it here.
Allows for one-project-object-for-a-tree type systems."
nil)
(defun ede-project-dirmatch-p (file dirmatch)
"Return non-nil if FILE matches DIRMATCH.
DIRMATCH could be nil (no match), a string (regexp match),
or an `ede-project-autoload-dirmatch' object."
;; If dirmatch is a string, then we simply match it against
;; the file we are testing.
(if (stringp dirmatch)
(string-match dirmatch file)
;; if dirmatch is instead a dirmatch object, we test against
;; that object instead.
(if (ede-project-autoload-dirmatch-p dirmatch)
(ede-do-dirmatch dirmatch file)
(error "Unknown project directory match type."))
))
(defmethod ede-project-root-directory ((this ede-project-autoload) ;; New method using detect.el
&optional file) (defmethod ede-auto-detect-in-dir ((this ede-project-autoload) dir)
"If a project knows its root, return it here. "Return non-nil if THIS project autoload is found in DIR."
Allows for one-project-object-for-a-tree type systems.
Optional FILE is the file to test. If there is no FILE, use
the current buffer."
(when (not file)
(setq file default-directory))
(when (slot-boundp this :proj-root)
(let ((dirmatch (oref this proj-root-dirmatch))
(rootfcn (oref this proj-root))
(callfcn t))
(when rootfcn
(if ;; If the dirmatch (an object) is not installed, then we
;; always skip doing a match.
(and (ede-project-autoload-dirmatch-p dirmatch)
(not (ede-dirmatch-installed dirmatch)))
(setq callfcn nil)
;; Other types of dirmatch:
(when (and
;; If the Emacs Lisp file handling this project hasn't
;; been loaded, we will use the quick dirmatch feature.
(not (featurep (oref this file)))
;; If the dirmatch is an empty string, then we always
;; skip doing a match.
(not (and (stringp dirmatch) (string= dirmatch "")))
)
;; If this file DOES NOT match dirmatch, we set the callfcn
;; to nil, meaning don't load the ede support file for this
;; type of project. If it does match, we will load the file
;; and use a more accurate programmatic match from there.
(unless (ede-project-dirmatch-p file dirmatch)
(setq callfcn nil))))
;; Call into the project support file for a match.
(when callfcn
(condition-case nil
(funcall rootfcn file)
(error
(funcall rootfcn))))
))))
(defmethod ede-dir-to-projectfile ((this ede-project-autoload) dir)
"Return a full file name of project THIS found in DIR.
Return nil if the project file does not exist."
(let* ((d (file-name-as-directory dir)) (let* ((d (file-name-as-directory dir))
(root (ede-project-root-directory this d))
(pf (oref this proj-file)) (pf (oref this proj-file))
(dm (oref this proj-root-dirmatch)) (f (when (stringp pf) (expand-file-name pf d))))
(f (cond ((stringp pf) (if f
(expand-file-name pf (or root d))) (and f (file-exists-p f))
((and (symbolp pf) (fboundp pf)) (let ((dirmatch (oref this proj-root-dirmatch)))
;; If there is a symbol to call, lets make extra (cond
;; sure we really can call it without loading in ((stringp dirmatch)
;; other EDE projects. This happens if the file is nil) ; <- do something here - maybe obsolete the option?
;; already loaded, or if there is a dirmatch, but ((ede-project-autoload-dirmatch-p dirmatch)
;; root is empty. (if (and dirmatch (ede-dirmatch-installed dirmatch))
(when (and (featurep (oref this file)) (ede-do-dirmatch dirmatch dir)
(or (not (stringp dm)) ;(message "Dirmatch %S not installed." dirmatch)
(not (string= dm ""))) )))))))
root)
(funcall pf (or root d))))))
)
(when (and f (file-exists-p f))
f)))
(defmethod ede-auto-load-project ((this ede-project-autoload) dir) (defmethod ede-auto-load-project ((this ede-project-autoload) dir)
"Load in the project associated with THIS project autoload description. "Load in the project associated with THIS project autoload description.
THIS project description should be valid for DIR, where the project will THIS project description should be valid for DIR, where the project will
be loaded." be loaded.
NOTE: Do not call this - it should only be called from `ede-load-project-file'."
;; Last line of defense: don't load unsafe projects. ;; Last line of defense: don't load unsafe projects.
(when (not (or (oref this :safe-p) (when (not (or (oref this :safe-p)
(ede-directory-safe-p dir))) (ede-directory-safe-p dir)))
...@@ -332,7 +302,27 @@ be loaded." ...@@ -332,7 +302,27 @@ be loaded."
(let ((o (funcall (oref this load-type) dir))) (let ((o (funcall (oref this load-type) dir)))
(when (not o) (when (not o)
(error "Project type error: :load-type failed to create a project")) (error "Project type error: :load-type failed to create a project"))
(ede-add-project-to-global-list o))) (ede-add-project-to-global-list o)
;; @TODO - Add to hash over at `ede-inode-directory-hash'.
))
;;; -------- Old Methods
;; See if we can do without them.
;; @FIXME - delete from loaddefs to remove this.
(defmethod ede-project-root ((this ede-project-autoload))
"If a project knows its root, return it here.
Allows for one-project-object-for-a-tree type systems."
nil)
;; @FIXME - delete from loaddefs to remove this.
(defmethod ede-project-root-directory ((this ede-project-autoload) &optional file)
"" nil)
(provide 'ede/auto) (provide 'ede/auto)
......
...@@ -60,6 +60,7 @@ configure the initial configure script using `autoconf-new-automake-string'" ...@@ -60,6 +60,7 @@ configure the initial configure script using `autoconf-new-automake-string'"
(defvar autoconf-preferred-macro-order (defvar autoconf-preferred-macro-order
'("AC_INIT" '("AC_INIT"
"AC_CONFIG_SRCDIR"
"AM_INIT_AUTOMAKE" "AM_INIT_AUTOMAKE"
"AM_CONFIG_HEADER" "AM_CONFIG_HEADER"
;; Arg parsing ;; Arg parsing
......
...@@ -605,7 +605,7 @@ Display the results as a debug list." ...@@ -605,7 +605,7 @@ Display the results as a debug list."
"Return the ede project which is the root of the current project. "Return the ede project which is the root of the current project.
Optional argument SUBPROJ indicates a subproject to start from Optional argument SUBPROJ indicates a subproject to start from
instead of the current project." instead of the current project."
(or ede-object-root-project (or (when (not subproj) ede-object-root-project)
(let* ((cp (or subproj (ede-current-project)))) (let* ((cp (or subproj (ede-current-project))))
(or (and cp (ede-project-root cp)) (or (and cp (ede-project-root cp))
(progn (progn
......
This diff is collapsed.
...@@ -116,11 +116,6 @@ ...@@ -116,11 +116,6 @@
;; <write your code here, or return nil> ;; <write your code here, or return nil>
;; ) ;; )
;; ;;
;; (defun MY-ROOT-FCN ()
;; "Return the root directory for `default-directory'"
;; ;; You might be able to use `ede-cpp-root-project-root'.
;; )
;;
;; (defun MY-LOAD (dir) ;; (defun MY-LOAD (dir)
;; "Load a project of type `cpp-root' for the directory DIR. ;; "Load a project of type `cpp-root' for the directory DIR.
;; Return nil if there isn't one." ;; Return nil if there isn't one."
...@@ -128,16 +123,14 @@ ...@@ -128,16 +123,14 @@
;; :locate-fcn 'MYFCN) ;; :locate-fcn 'MYFCN)
;; ) ;; )
;; ;;
;; (add-to-list 'ede-project-class-files ;; (ede-add-project-autoload
;; (ede-project-autoload "cpp-root" ;; (ede-project-autoload "cpp-root"
;; :name "CPP ROOT" ;; :name "CPP ROOT"
;; :file 'ede/cpp-root ;; :file 'ede/cpp-root
;; :proj-file 'MY-FILE-FOR-DIR ;; :proj-file 'MY-FILE-FOR-DIR
;; :proj-root 'MY-ROOT-FCN
;; :load-type 'MY-LOAD ;; :load-type 'MY-LOAD
;; :class-sym 'ede-cpp-root-project ;; :class-sym 'ede-cpp-root-project
;; :safe-p t) ;; :safe-p t))
;; t)
;; ;;
;;; TODO ;;; TODO