
Move CEDET ChangeLog entries to new file lisp/cedet/ChangeLog. * semantic.el (semantic-version): Update to 2.0. (semantic-mode-map): Add "," and "m" bindings. (navigate-menu): Update. * semantic/symref.el (semantic-symref-calculate-rootdir): New function. (semantic-symref-detect-symref-tool): Use it. * semantic/symref/grep.el (semantic-symref-grep-shell): New var. (semantic-symref-perform-search): Use it. Calculate root dir with semantic-symref-calculate-rootdir. (semantic-symref-derive-find-filepatterns): Improve error message. * semantic/symref/list.el (semantic-symref-results-mode-map): New bindings. (semantic-symref-auto-expand-results): New option. (semantic-symref-results-dump): Obey auto-expand. (semantic-symref-list-expand-all, semantic-symref-regexp) (semantic-symref-list-contract-all) (semantic-symref-list-map-open-hits) (semantic-symref-list-update-open-hits) (semantic-symref-list-create-macro-on-open-hit) (semantic-symref-list-call-macro-on-open-hits): New functions. (semantic-symref-list-menu-entries) (semantic-symref-list-menu): New vars. (semantic-symref-list-map-open-hits): Move cursor to beginning of match before calling the mapped function. * semantic/doc.el (semantic-documentation-comment-preceeding-tag): Do nothing if the mode doesn't provide comment-start-skip. * semantic/scope.el (semantic-analyze-scope-nested-tags-default): Strip duplicates. (semantic-analyze-scoped-inherited-tag-map): Take the tag we are looking for as part of the scoped tags list. * semantic/html.el (semantic-default-html-setup): Add senator-step-at-tag-classes. * semantic/decorate/include.el (semantic-decoration-on-unknown-includes): Change light bgcolor. (semantic-decoration-on-includes-highlight-default): Check that the include tag has a postion. * semantic/complete.el (semantic-collector-local-members): (semantic-complete-read-tag-local-members) (semantic-complete-jump-local-members): New class and functions. (semantic-complete-self-insert): Save excursion before completing. * semantic/analyze/complete.el (semantic-analyze-possible-completions-default): If no completions are found, return the raw by-name-only completion list. Add FLAGS arguments. Add support for 'no-tc (type constraint) and 'no-unique, or no stripping duplicates. (semantic-analyze-possible-completions-default): Add FLAGS arg. * semantic/util-modes.el (semantic-stickyfunc-show-only-functions-p): New option. (semantic-stickyfunc-fetch-stickyline): Don't show stickytext for the very first line in a buffer. * semantic/util.el (semantic-hack-search) (semantic-recursive-find-nonterminal-by-name) (semantic-current-tag-interactive): Deleted. (semantic-describe-buffer): Fix expand-nonterminal. Add lex-syntax-mods, type relation separator char, and command separation char. (semantic-sanity-check): Only message if called interactively. * semantic/tag.el (semantic-tag-deep-copy-one-tag): Copy the :filename property and the tag position. * semantic/lex-spp.el (semantic-lex-spp-lex-text-string): Add recursion limit. * semantic/imenu.el (semantic-imenu-bucketize-type-members): Make this buffer local, not the obsoleted variable. * semantic/idle.el: Add breadcrumbs support. (semantic-idle-summary-current-symbol-info-default) (semantic-idle-tag-highlight) (semantic-idle-completion-list-default): Use semanticdb-without-unloaded-file-searches for speed, and to conform to the controls that specify if the idle timer is supposed to be parsing unparsed includes. (semantic-idle-symbol-highlight-face) (semantic-idle-symbol-maybe-highlight): Rename from *-summary-*. Callers changed. (semantic-idle-work-parse-neighboring-files-flag): Default to nil. (semantic-idle-work-update-headers-flag): New var. (semantic-idle-work-for-one-buffer): Use it. (semantic-idle-local-symbol-highlight): Rename from semantic-idle-tag-highlight. (semantic-idle-truncate-long-summaries): New option. * semantic/ia.el (semantic-ia-cache) (semantic-ia-get-completions): Deleted. Callers changed. (semantic-ia-show-variants): New command. (semantic-ia-show-doc): If doc is empty, don't make a temp buffer. (semantic-ia-show-summary): If there isn't anything to show, say so. * semantic/grammar.el (semantic-grammar-create-package): Save the buffer even in batch mode. * semantic/fw.el (semanticdb-without-unloaded-file-searches): New macro. * semantic/dep.el (semantic-dependency-find-file-on-path): Fix case dereferencing ede-object when it is a list. * semantic/db-typecache.el (semanticdb-expand-nested-tag) (semanticdb-typecache-faux-namespace): New functions. (semanticdb-typecache-file-tags) (semanticdb-typecache-merge-streams): Use them. (semanticdb-typecache-file-tags): When deriving tags from a file, give the mode a chance to monkey with the tag copy. (semanticdb-typecache-find-default): Wrap find in save-excursion. (semanticdb-typecache-find-by-name-helper): Merge found names down. * semantic/db-global.el (semanticdb-enable-gnu-global-in-buffer): Don't show messages if GNU Global is not available and we don't want to throw an error. * semantic/db-find.el (semanticdb-find-result-nth-in-buffer): When trying to normalize the tag to a buffer, don't error if set-buffer method doesn't exist. * semantic/db-file.el (semanticdb-save-db): Simplify msg. * semantic/db.el (semanticdb-refresh-table): If forcing a refresh on a file not in a buffer, use semantic-find-file-noselect and delete the buffer after use. (semanticdb-current-database-list): When calculating root via hooks, force it through true-filename and skip the list of possible roots. * semantic/ctxt.el (semantic-ctxt-imported-packages): New. * semantic/analyze/debug.el (semantic-analyzer-debug-insert-tag): Reset standard output to current buffer. (semantic-analyzer-debug-global-symbol) (semantic-analyzer-debug-missing-innertype): Change "prefix" to "symbol" in messages. * semantic/analyze/refs.el: (semantic-analyze-refs-impl) (semantic-analyze-refs-proto): When calculating value, make sure the found tag is 'similar' to the originating tag. (semantic--analyze-refs-find-tags-with-parent): Attempt to identify matches via imported symbols of parents. (semantic--analyze-refs-full-lookup-with-parents): Do a deep search during the brute search. * semantic/analyze.el (semantic-analyze-find-tag-sequence-default): Be robust to calculated scopes being nil. * semantic/bovine/c.el (semantic-c-describe-environment): Add project macro symbol array. (semantic-c-parse-lexical-token): Add recursion limit. (semantic-ctxt-imported-packages, semanticdb-expand-nested-tag): New overrides. (semantic-expand-c-tag-namelist): Split a full type from a typedef out to its own tag. (semantic-expand-c-tag-namelist): Do not split out a typedef'd inline type if it is an anonymous type. (semantic-c-reconstitute-token): Use the optional initializers as a clue that some function is probably a constructor. When defining the type of these constructors, split the parent name, and use only the class part, if applicable. * semantic/bovine/c-by.el: * semantic/wisent/python-wy.el: Regenerate.
191 lines
6.5 KiB
EmacsLisp
191 lines
6.5 KiB
EmacsLisp
;;; semantic/symref/grep.el --- Symref implementation using find/grep
|
|
|
|
;; Copyright (C) 2008, 2009, 2010 Free Software Foundation, Inc.
|
|
|
|
;; Author: Eric M. Ludlam <eric@siege-engine.com>
|
|
|
|
;; This file is part of GNU Emacs.
|
|
|
|
;; GNU Emacs is free software: you can redistribute it and/or modify
|
|
;; it under the terms of the GNU General Public License as published by
|
|
;; the Free Software Foundation, either version 3 of the License, or
|
|
;; (at your option) any later version.
|
|
|
|
;; GNU Emacs is distributed in the hope that it will be useful,
|
|
;; but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
;; GNU General Public License for more details.
|
|
|
|
;; You should have received a copy of the GNU General Public License
|
|
;; along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>.
|
|
|
|
;;; Commentary:
|
|
;;
|
|
;; Implement the symref tool API using the external tools find/grep.
|
|
;;
|
|
;; The symref GREP tool uses grep in a project to find symbol references.
|
|
;; This is a lowest-common-denominator tool with sucky performance that
|
|
;; can be used in small projects to find symbol references.
|
|
|
|
(require 'semantic/symref)
|
|
(require 'grep)
|
|
|
|
;;; Code:
|
|
|
|
;;; GREP
|
|
;;;###autoload
|
|
(defclass semantic-symref-tool-grep (semantic-symref-tool-baseclass)
|
|
(
|
|
)
|
|
"A symref tool implementation using grep.
|
|
This tool uses EDE to find he root of the project, then executes
|
|
find-grep in the project. The output is parsed for hits
|
|
and those hits returned.")
|
|
|
|
(defvar semantic-symref-filepattern-alist
|
|
'((c-mode "*.[ch]")
|
|
(c++-mode "*.[chCH]" "*.[ch]pp" "*.cc" "*.hh")
|
|
(html-mode "*.s?html" "*.php")
|
|
)
|
|
"List of major modes and file extension pattern regexp.
|
|
See find -regex man page for format.")
|
|
|
|
(defun semantic-symref-derive-find-filepatterns (&optional mode)
|
|
"Derive a list of file patterns for the current buffer.
|
|
Looks first in `semantic-symref-filepattern-alist'. If it is not
|
|
there, it then looks in `auto-mode-alist', and attempts to derive something
|
|
from that.
|
|
Optional argument MODE specifies the `major-mode' to test."
|
|
;; First, try the filepattern alist.
|
|
(let* ((mode (or mode major-mode))
|
|
(pat (cdr (assoc mode semantic-symref-filepattern-alist))))
|
|
(when (not pat)
|
|
;; No hit, try auto-mode-alist.
|
|
(dolist (X auto-mode-alist)
|
|
(when (eq (cdr X) mode)
|
|
;; Only take in simple patterns, so try to convert this one.
|
|
(let ((Xp
|
|
(cond ((string-match "\\\\\\.\\([^\\'>]+\\)\\\\'" (car X))
|
|
(concat "*." (match-string 1 (car X))))
|
|
(t nil))))
|
|
(when Xp
|
|
(setq pat (cons Xp pat))))
|
|
)))
|
|
;; Convert the list into some find-flags.
|
|
(cond ((= (length pat) 1)
|
|
(concat "-name \"" (car pat) "\""))
|
|
((consp pat)
|
|
(concat "\\( "
|
|
(mapconcat (lambda (s)
|
|
(concat "-name \"" s "\""))
|
|
pat
|
|
" -o ")
|
|
" \\)"))
|
|
(t
|
|
(error "Customize `semantic-symref-filepattern-alist' for %s" major-mode))
|
|
)))
|
|
|
|
(defvar semantic-symref-grep-expand-keywords
|
|
(condition-case nil
|
|
(let* ((kw (copy-alist grep-expand-keywords))
|
|
(C (assoc "<C>" kw))
|
|
(R (assoc "<R>" kw)))
|
|
(setcdr C 'grepflags)
|
|
(setcdr R 'greppattern)
|
|
kw)
|
|
(error nil))
|
|
"Grep expand keywords used when expanding templates for symref.")
|
|
|
|
(defun semantic-symref-grep-use-template (rootdir filepattern grepflags greppattern)
|
|
"Use the grep template expand feature to create a grep command.
|
|
ROOTDIR is the root location to run the `find' from.
|
|
FILEPATTERN is a string representing find flags for searching file patterns.
|
|
GREPFLAGS are flags passed to grep, such as -n or -l.
|
|
GREPPATTERN is the pattern used by grep."
|
|
;; We have grep-compute-defaults. Lets use it.
|
|
(grep-compute-defaults)
|
|
(let* ((grep-expand-keywords semantic-symref-grep-expand-keywords)
|
|
(cmd (grep-expand-template grep-find-template
|
|
greppattern
|
|
filepattern
|
|
rootdir)))
|
|
;; For some reason, my default has no <D> in it.
|
|
(when (string-match "find \\(\\.\\)" cmd)
|
|
(setq cmd (replace-match rootdir t t cmd 1)))
|
|
;;(message "New command: %s" cmd)
|
|
cmd))
|
|
|
|
(defcustom semantic-symref-grep-shell "sh"
|
|
"The shell command to use for executing find/grep.
|
|
This shell should support pipe redirect syntax."
|
|
:group 'semantic
|
|
:type 'string)
|
|
|
|
(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)))
|
|
(when (not (eq st 'symbol))
|
|
(error "Symref impl GREP does not support searchtype of %s" st))
|
|
)
|
|
;; Find the root of the project, and do a find-grep...
|
|
(let* (;; Find the file patterns to use.
|
|
(pat (cdr (assoc major-mode semantic-symref-filepattern-alist)))
|
|
(rootdir (semantic-symref-calculate-rootdir))
|
|
(filepattern (semantic-symref-derive-find-filepatterns))
|
|
;; Grep based flags.
|
|
(grepflags (cond ((eq (oref tool :resulttype) 'file)
|
|
"-l ")
|
|
(t "-n ")))
|
|
(greppat (cond ((eq (oref tool :searchtype) 'regexp)
|
|
(oref tool searchfor))
|
|
(t
|
|
(concat "'\\<" (oref tool searchfor) "\\>'"))))
|
|
;; Misc
|
|
(b (get-buffer-create "*Semantic SymRef*"))
|
|
(ans nil)
|
|
)
|
|
|
|
(with-current-buffer b
|
|
(erase-buffer)
|
|
(setq default-directory rootdir)
|
|
|
|
(if (not (fboundp 'grep-compute-defaults))
|
|
|
|
;; find . -type f -print0 | xargs -0 -e grep -nH -e
|
|
;; Note : I removed -e as it is not posix, nor necessary it seems.
|
|
|
|
(let ((cmd (concat "find " default-directory " -type f " filepattern " -print0 "
|
|
"| xargs -0 grep -H " grepflags "-e " greppat)))
|
|
;;(message "Old command: %s" cmd)
|
|
(call-process semantic-symref-grep-shell nil b nil "-c" cmd)
|
|
)
|
|
(let ((cmd (semantic-symref-grep-use-template rootdir filepattern grepflags greppat)))
|
|
(call-process semantic-symref-grep-shell nil b nil "-c" cmd))
|
|
))
|
|
(setq ans (semantic-symref-parse-tool-output tool b))
|
|
;; Return the answer
|
|
ans))
|
|
|
|
(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)
|
|
;; Search for files
|
|
(when (re-search-forward "^\\([^\n]+\\)$" nil t)
|
|
(match-string 1)))
|
|
(t
|
|
(when (re-search-forward "^\\(\\(?:[a-zA-Z]:\\)?[^:\n]+\\):\\([0-9]+\\):" nil t)
|
|
(cons (string-to-number (match-string 2))
|
|
(match-string 1))
|
|
))))
|
|
|
|
(provide 'semantic/symref/grep)
|
|
|
|
;; Local variables:
|
|
;; generated-autoload-file: "../loaddefs.el"
|
|
;; generated-autoload-load-name: "semantic/symref/grep"
|
|
;; End:
|
|
|
|
;; arch-tag: 43d4469d-963c-4094-ac6f-99f7490973ce
|
|
;;; semantic/symref/grep.el ends here
|