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
......
2014-11-09 Eric Ludlam <zappo@gnu.org>
* 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.
2014-11-09 David Engster <dengste@eml.cc>
* 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.
2014-10-29 Paul Eggert <eggert@cs.ucla.edu> 2014-10-29 Paul Eggert <eggert@cs.ucla.edu>
Simplify use of current-time and friends. Simplify use of current-time and friends.
......
...@@ -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)
......
...@@ -45,6 +45,7 @@ ...@@ -45,6 +45,7 @@
(require 'ede/source) (require 'ede/source)
(require 'ede/base) (require 'ede/base)
(require 'ede/auto) (require 'ede/auto)
(require 'ede/detect)
(eval-and-compile (eval-and-compile
(load "ede/loaddefs" nil 'nomessage)) (load "ede/loaddefs" nil 'nomessage))
...@@ -61,7 +62,7 @@ ...@@ -61,7 +62,7 @@
(declare-function ede-up-directory "ede/files") (declare-function ede-up-directory "ede/files")
(declare-function semantic-lex-make-spp-table "semantic/lex-spp") (declare-function semantic-lex-make-spp-table "semantic/lex-spp")
(defconst ede-version "1.2" (defconst ede-version "2.0"
"Current version of the Emacs EDE.") "Current version of the Emacs EDE.")
;;; Code: ;;; Code:
...@@ -500,42 +501,50 @@ Sets buffer local variables for EDE." ...@@ -500,42 +501,50 @@ Sets buffer local variables for EDE."
;; Init the buffer. ;; Init the buffer.
(let* ((ROOT nil) (let* ((ROOT nil)
(proj (ede-directory-get-open-project default-directory (proj (ede-directory-get-open-project default-directory
'ROOT)) 'ROOT)))
(projauto nil))
(when (not proj)
(when (or proj ROOT ;; If there is no open project, look up the project
;; If there is no open project, look up the project ;; autoloader to see if we should initialize.
;; autoloader to see if we should initialize. (let ((projdetect (ede-directory-project-cons default-directory)))
(setq projauto (ede-directory-project-p default-directory t)))
(when projdetect
(when (and (not proj) projauto) ;; No project was loaded, but we have a project description
;; object. This means that we try to load it.
;; No project was loaded, but we have a project description ;;
;; object. This means that we can check if it is a safe ;; Before loading, we need to check if it is a safe
;; project to load before requesting it to be loaded. ;; project to load before requesting it to be loaded.
(when (or (oref projauto safe-p) (when (or (oref (cdr projdetect) safe-p)
;; The project style is not safe, so check if it is ;; The project style is not safe, so check if it is
;; in `ede-project-directories'. ;; in `ede-project-directories'.
(let ((top (ede-toplevel-project default-directory))) (let ((top (car projdetect)))
(ede-directory-safe-p top))) (ede-directory-safe-p top)))
;; The project is safe, so load it in. ;; The project is safe, so load it in.
(setq proj (ede-load-project-file default-directory 'ROOT)))) (setq proj (ede-load-project-file default-directory projdetect 'ROOT))))))
;; Only initialize EDE state in this buffer if we found a project. ;; If PROJ is now loaded in, we can initialize our buffer to it.
(when proj (when proj
(setq ede-object (ede-buffer-object (current-buffer) ;; ede-object represents the specific EDE related class that best
;; represents this buffer. It could be a project (for a project file)
;; or a target. Also save off ede-object-project, the project that
;; the buffer belongs to for the case where ede-object is a target.
(setq ede-object (ede-buffer-object (current-buffer)
'ede-object-project)) 'ede-object-project))
(setq ede-object-root-project ;; Every project has a root. It might be the same as ede-object.
(or ROOT (ede-project-root ede-object-project))) ;; Cache that also as the root is a very common thing to need.
(setq ede-object-root-project
(or ROOT (ede-project-root ede-object-project)))
(if (and (not ede-object) ede-object-project) ;; Check to see if we want to add this buffer to a target.
(ede-auto-add-to-target)) (if (and (not ede-object) ede-object-project)
(ede-auto-add-to-target))
(ede-apply-target-options))))) ;; Apply any options from the found target.
(ede-apply-target-options))))
(defun ede-reset-all-buffers () (defun ede-reset-all-buffers ()
"Reset all the buffers due to change in EDE."