Mercurial > emacs
annotate lisp/emacs-lisp/assoc.el @ 110523:a5ad4f188e19
Synch Semantic to CEDET 1.0.
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.
author | Chong Yidong <cyd@stupidchicken.com> |
---|---|
date | Sat, 18 Sep 2010 22:49:54 -0400 |
parents | f611f11aaf1f |
children | 376148b31b5e |
rev | line source |
---|---|
2567 | 1 ;;; assoc.el --- insert/delete/sort functions on association lists |
2 | |
106970
f611f11aaf1f
(aelement): Fix typo in previous.
Glenn Morris <rgm@gnu.org>
parents:
106964
diff
changeset
|
3 ;; Copyright (C) 1996, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, |
f611f11aaf1f
(aelement): Fix typo in previous.
Glenn Morris <rgm@gnu.org>
parents:
106964
diff
changeset
|
4 ;; 2009, 2010 Free Software Foundation, Inc. |
14169 | 5 |
2567 | 6 ;; Author: Barry A. Warsaw <bwarsaw@cen.com> |
7 ;; Keywords: extensions | |
8 | |
14169 | 9 ;; This file is part of GNU Emacs. |
10 | |
94655
90a2847062be
Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents:
93975
diff
changeset
|
11 ;; GNU Emacs is free software: you can redistribute it and/or modify |
14169 | 12 ;; it under the terms of the GNU General Public License as published by |
94655
90a2847062be
Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents:
93975
diff
changeset
|
13 ;; the Free Software Foundation, either version 3 of the License, or |
90a2847062be
Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents:
93975
diff
changeset
|
14 ;; (at your option) any later version. |
2567 | 15 |
14169 | 16 ;; GNU Emacs is distributed in the hope that it will be useful, |
17 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of | |
18 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
19 ;; GNU General Public License for more details. | |
20 | |
21 ;; You should have received a copy of the GNU General Public License | |
94655
90a2847062be
Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents:
93975
diff
changeset
|
22 ;; along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. |
2567 | 23 |
24 ;;; Commentary: | |
25 | |
26 ;; Association list utilities providing insertion, deletion, sorting | |
27 ;; fetching off key-value pairs in association lists. | |
28 | |
29 ;;; Code: | |
106963
a1f2277cc409
* emacs-lisp/assoc.el (aput, adelete, amake): Use lexical-let (Bug#5450).
Chong Yidong <cyd@stupidchicken.com>
parents:
106815
diff
changeset
|
30 (eval-when-compile (require 'cl)) |
2567 | 31 |
4098
0a02227f8417
* assoc.el (asort): First argument should be named alist-symbol,
Jim Blandy <jimb@redhat.com>
parents:
3768
diff
changeset
|
32 (defun asort (alist-symbol key) |
2567 | 33 "Move a specified key-value pair to the head of an alist. |
99298
225286546090
Fix typos in docstrings.
Juanma Barranquero <lekktu@gmail.com>
parents:
94655
diff
changeset
|
34 The alist is referenced by ALIST-SYMBOL. Key-value pair to move to |
2567 | 35 head is one matching KEY. Returns the sorted list and doesn't affect |
36 the order of any other key-value pair. Side effect sets alist to new | |
37 sorted list." | |
38 (set alist-symbol | |
39 (sort (copy-alist (eval alist-symbol)) | |
40 (function (lambda (a b) (equal (car a) key)))))) | |
41 | |
42 | |
43 (defun aelement (key value) | |
99298
225286546090
Fix typos in docstrings.
Juanma Barranquero <lekktu@gmail.com>
parents:
94655
diff
changeset
|
44 "Make a list of a cons cell containing car of KEY and cdr of VALUE. |
106970
f611f11aaf1f
(aelement): Fix typo in previous.
Glenn Morris <rgm@gnu.org>
parents:
106964
diff
changeset
|
45 The returned list is suitable for concatenating with an existing |
106964
6c7e1a272e9e
* emacs-lisp/assoc.el (aelement): Doc fix.
Chong Yidong <cyd@stupidchicken.com>
parents:
106963
diff
changeset
|
46 alist, via `nconc'." |
2567 | 47 (list (cons key value))) |
48 | |
49 | |
50 (defun aheadsym (alist) | |
51 "Return the key symbol at the head of ALIST." | |
52 (car (car alist))) | |
53 | |
54 | |
55 (defun anot-head-p (alist key) | |
56 "Find out if a specified key-value pair is not at the head of an alist. | |
57 The alist to check is specified by ALIST and the key-value pair is the | |
58 one matching the supplied KEY. Returns nil if ALIST is nil, or if | |
59 key-value pair is at the head of the alist. Returns t if key-value | |
60 pair is not at the head of alist. ALIST is not altered." | |
61 (not (equal (aheadsym alist) key))) | |
62 | |
63 | |
64 (defun aput (alist-symbol key &optional value) | |
65 "Inserts a key-value pair into an alist. | |
99298
225286546090
Fix typos in docstrings.
Juanma Barranquero <lekktu@gmail.com>
parents:
94655
diff
changeset
|
66 The alist is referenced by ALIST-SYMBOL. The key-value pair is made |
225286546090
Fix typos in docstrings.
Juanma Barranquero <lekktu@gmail.com>
parents:
94655
diff
changeset
|
67 from KEY and optionally, VALUE. Returns the altered alist or nil if |
2567 | 68 ALIST is nil. |
69 | |
70 If the key-value pair referenced by KEY can be found in the alist, and | |
71 VALUE is supplied non-nil, then the value of KEY will be set to VALUE. | |
72 If VALUE is not supplied, or is nil, the key-value pair will not be | |
99298
225286546090
Fix typos in docstrings.
Juanma Barranquero <lekktu@gmail.com>
parents:
94655
diff
changeset
|
73 modified, but will be moved to the head of the alist. If the key-value |
2567 | 74 pair cannot be found in the alist, it will be inserted into the head |
75 of the alist (with value nil if VALUE is nil or not supplied)." | |
106963
a1f2277cc409
* emacs-lisp/assoc.el (aput, adelete, amake): Use lexical-let (Bug#5450).
Chong Yidong <cyd@stupidchicken.com>
parents:
106815
diff
changeset
|
76 (lexical-let ((elem (aelement key value)) |
a1f2277cc409
* emacs-lisp/assoc.el (aput, adelete, amake): Use lexical-let (Bug#5450).
Chong Yidong <cyd@stupidchicken.com>
parents:
106815
diff
changeset
|
77 alist) |
2567 | 78 (asort alist-symbol key) |
79 (setq alist (eval alist-symbol)) | |
80 (cond ((null alist) (set alist-symbol elem)) | |
81 ((anot-head-p alist key) (set alist-symbol (nconc elem alist))) | |
82 (value (setcar alist (car elem))) | |
83 (t alist)))) | |
84 | |
85 | |
86 (defun adelete (alist-symbol key) | |
87 "Delete a key-value pair from the alist. | |
88 Alist is referenced by ALIST-SYMBOL and the key-value pair to remove | |
89 is pair matching KEY. Returns the altered alist." | |
90 (asort alist-symbol key) | |
106963
a1f2277cc409
* emacs-lisp/assoc.el (aput, adelete, amake): Use lexical-let (Bug#5450).
Chong Yidong <cyd@stupidchicken.com>
parents:
106815
diff
changeset
|
91 (lexical-let ((alist (eval alist-symbol))) |
2567 | 92 (cond ((null alist) nil) |
93 ((anot-head-p alist key) alist) | |
94 (t (set alist-symbol (cdr alist)))))) | |
95 | |
96 | |
97 (defun aget (alist key &optional keynil-p) | |
99298
225286546090
Fix typos in docstrings.
Juanma Barranquero <lekktu@gmail.com>
parents:
94655
diff
changeset
|
98 "Return the value in ALIST that is associated with KEY. |
2567 | 99 Optional KEYNIL-P describes what to do if the value associated with |
100 KEY is nil. If KEYNIL-P is not supplied or is nil, and the value is | |
101 nil, then KEY is returned. If KEYNIL-P is non-nil, then nil would be | |
102 returned. | |
103 | |
104 If no key-value pair matching KEY could be found in ALIST, or ALIST is | |
99298
225286546090
Fix typos in docstrings.
Juanma Barranquero <lekktu@gmail.com>
parents:
94655
diff
changeset
|
105 nil then nil is returned. ALIST is not altered." |
2567 | 106 (let ((copy (copy-alist alist))) |
107 (cond ((null alist) nil) | |
108 ((progn (asort 'copy key) | |
109 (anot-head-p copy key)) nil) | |
110 ((cdr (car copy))) | |
111 (keynil-p nil) | |
112 ((car (car copy))) | |
113 (t nil)))) | |
114 | |
115 | |
116 (defun amake (alist-symbol keylist &optional valuelist) | |
117 "Make an association list. | |
118 The association list is attached to the alist referenced by | |
99298
225286546090
Fix typos in docstrings.
Juanma Barranquero <lekktu@gmail.com>
parents:
94655
diff
changeset
|
119 ALIST-SYMBOL. Each element in the KEYLIST becomes a key and is |
225286546090
Fix typos in docstrings.
Juanma Barranquero <lekktu@gmail.com>
parents:
94655
diff
changeset
|
120 associated with the value in VALUELIST with the same index. If |
2567 | 121 VALUELIST is not supplied or is nil, then each key in KEYLIST is |
122 associated with nil. | |
123 | |
124 KEYLIST and VALUELIST should have the same number of elements, but | |
125 this isn't enforced. If VALUELIST is smaller than KEYLIST, remaining | |
126 keys are associated with nil. If VALUELIST is larger than KEYLIST, | |
127 extra values are ignored. Returns the created alist." | |
106963
a1f2277cc409
* emacs-lisp/assoc.el (aput, adelete, amake): Use lexical-let (Bug#5450).
Chong Yidong <cyd@stupidchicken.com>
parents:
106815
diff
changeset
|
128 (lexical-let ((keycar (car keylist)) |
a1f2277cc409
* emacs-lisp/assoc.el (aput, adelete, amake): Use lexical-let (Bug#5450).
Chong Yidong <cyd@stupidchicken.com>
parents:
106815
diff
changeset
|
129 (keycdr (cdr keylist)) |
a1f2277cc409
* emacs-lisp/assoc.el (aput, adelete, amake): Use lexical-let (Bug#5450).
Chong Yidong <cyd@stupidchicken.com>
parents:
106815
diff
changeset
|
130 (valcar (car valuelist)) |
a1f2277cc409
* emacs-lisp/assoc.el (aput, adelete, amake): Use lexical-let (Bug#5450).
Chong Yidong <cyd@stupidchicken.com>
parents:
106815
diff
changeset
|
131 (valcdr (cdr valuelist))) |
2567 | 132 (cond ((null keycdr) |
133 (aput alist-symbol keycar valcar)) | |
134 (t | |
135 (amake alist-symbol keycdr valcdr) | |
136 (aput alist-symbol keycar valcar)))) | |
137 (eval alist-symbol)) | |
138 | |
139 (provide 'assoc) | |
140 | |
93975
1e3a407766b9
Fix up comment convention on the arch-tag lines.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
79704
diff
changeset
|
141 ;; arch-tag: 3e58bd89-d912-4b74-a0dc-6ed9735922bc |
2567 | 142 ;;; assoc.el ends here |