Mercurial > emacs
view lisp/emacs-lisp/cl-specs.el @ 10219:d97313bb6f39
(bibtex-string, bibtex-preamble): Use forward-line.
(sort-subr): Don't call autload for this--that's done in loaddefs.el.
(bibtex-mode): Add autoload cookie.
Changed keybinding for bibtex-print-help-message
(from \C-ch to \C-c?). Therefore, describe-mode is not longer on
\C-c?. Also, changed prefix \C-cn for bibtex-narrow functions to
\C-c\C-r.
(bibtex-string-files): Changed documentation.
(bibtex-mode-map): Inscriptions of menu bar changed from "Entry
Types" to "Entry-Types" and "Bibtex Edit" to "BibTeX-Edit".
(bibtex-string-files): Changed documentation.
(bibtex-mode): If environment variable BIBINPUTS isn't defined,
string files are searched in the current directory.
(bibtex-completion-candidates): Now buffer-local to allow
evaluation of different bibtex-string-files in different buffers.
(bibtex-autokey-edit-before-use, bibtex-clean-entry): New variable
that determines, if the user is allowed to edit auto-generated
reference keys before they are used.
(bibtex-generate-autokey, bibtex-clean-entry): New function to
generate an autokey if necessary.
(bibtex-autokey-names, bibtex-autokey-name-change-strings,
bibtex-autokey-name-length, bibtex-autokey-name-separator,
bibtex-autokey-year-length, bibtex-autokey-titlewords,
bibtex-autokey-title-terminators,
bibtex-autokey-titlewords-stretch,
bibtex-autokey-titleword-first-ignore,
bibtex-autokey-titleword-abbrevs,
bibtex-autokey-titleword-change-strings,
bibtex-autokey-titleword-length,
bibtex-autokey-titleword-separator,
bibtex-autokey-name-year-separator,
bibtex-autokey-year-title-separator): New variables related to
bibtex-generate-autokey.
(bibtex-find-entry-location): Optional second parameter maybedup
to tell it that entering a duplicate entry isn't to report by an
error but by the return value of the function (necessary for
bibtex-clean-entry to find the correct position of an entry with
an autogenerated key without disturbing the user with unwanted
messages).
(bibtex-help-message): New variable to avoid printing of help
messages in the echo area.
(assoc-of-regexp): New function to match an alist of regexps.
(bibtex-string-files, bibtex-completion-candidates, bibtex-mode):
New variables to allow bibtex-complete-string to work on strings
initialized from a variable and from @String definitions in a list
of files, too.
(bibtex-predefined-strings, bibtex-entry-field-alist): Changed to
user options.
(bibtex-mode): Changed doc string.
(many functions and variables): Changed documentation strings of
variables and functions to hold a complete sentence in the first
line.
(bibtex-print-help-message): Now line dependent and reports if it
is called outside a BibTeX field.
(validate-bibtex-buffer): Completely rewritten to validate, if
buffer is syntactically correct.
(find-bibtex-duplicates): Moved into validate-bibtex-buffer.
(ispell-abstract, bibtex-ispell-abstract, ispell-bibtex-entry,
bibtex-ispell-entry, beginning-of-bibtex-entry,
bibtex-beginning-of-entry, end-of-bibtex-entry,
bibtex-end-of-entry, hide-bibtex-entry-bodies,
bibtex-hide-entry-bodies, narrow-to-bibtex-entry,
bibtex-narrow-to-entry, sort-bibtex-entries, bibtex-sort-entries,
validate-bibtex-buffer, bibtex-validate-buffer,
find-bibtex-entry-location, bibtex-find-entry-location): All
interactive functions are renamed, so that any interface function
begins with "bibtex-". Mapping:
ispell-abstract --> bibtex-ispell-abstract
ispell-bibtex-entry --> bibtex-ispell-entry
beginning-of-bibtex-entry --> bibtex-beginning-of-entry
end-of-bibtex-entry --> bibtex-end-of-entry
hide-bibtex-entry-bodies --> bibtex-hide-entry-bodies
narrow-to-bibtex-entry --> bibtex-narrow-to-entry
sort-bibtex-entries --> bibtex-sort-entries
validate-bibtex-buffer --> bibtex-validate-buffer
find-bibtex-entry-location --> bibtex-find-entry-location
(bibtex-maintain-sorted-entries,
bibtex-sort-ignore-string-entries): Default is now t.
(bibtex-complete-string): String list is built from additional
string list bibtex-predefined-string and current strings in file.
(string-equalp): Deleted and substituted by string-equal.
(assoc-string-equalp): Renamed to assoc-ignore-case.
(bibtex-entry): Reference key can be entered with completion. All
reference keys that are defined in buffer and all labels that
appear in crossreference entries are object to completion.
(Entry types): Changed order of entries in menu "entry types".
(bibtex-entry-field-alist): Changed order of entries slightly to
be more conform with standard BibTeX style layouts.
(bibtex-mode-map): Uniform keybindings for \C-c\C-e prefix (often
used types on control keys, sometimes used types on normal keys,
rarely used types on shift keys, almost never used types on meta
keys).
(bibtex-mode-map): Function narrow-to-bibtex-entry and counterpart
widen and function hide-bibtex-entry-bodies and counterpart
show-all bounded to appropriate local keys.
(bibtex-abbrev-table): Deleted
(bibtex-current-entry-label, put-string-on-kill-ring): Deleted
(AUCTeX provides all the functionality needed for citation
completion).
(bibtex-enclosing-reference, bibtex-pop-previous, bibtex-pop-next,
bibtex-clean-entry): Hacked for speed (bibtex-pop-previous and
bibtex-pop-next were to slow for larger BibTeX files).
(bibtex-pop-previous, bibtex-pop-next): Delimiters from previous
or next entry are changed to actual delimters if necessary.
(bibtex-entry): Fixed bug (False entry wasn't reported in error
message if bibtex-entry was called with undefined reference name).
(bibtex-entry-field-alist, bibtex-entry, bibtex-make-field,
bibtex-next-field, bibtex-clean-entry): Every reference entry now
contains a comment in addition to the name of the reference. This
comment appears in the echo area if you start editing that field
(after calling bibtex-next-field).
(bibtex-include-OPTcrossref, bibtex-entry): Changed
bibtex-include-OPTcrossref from single boolean variable to hold a
list of reference names which should have a crossref field.
(bibtex-complete-word): New function, which completes word
fragment before point to the longest prefix of predefined strings
in the buffer in the same way that ispell-complete-word operates
for words found in the dictionary.
(bibtex-reference-head): Start of bibtex-reference-head changed
from "^[ \t]*\\(" to "^\\( \\|\t\\)*\\(" (bibtex-pop-previous and
bibtex-pop-next didn't work, probably due to a bug in
re-search-forward).
(several functions): Added support for {} as field delimiters
(better than '"' for accented characters.
(bibtex-clean-entry): If optional field crossref is empty or
missing, former optional fields (if bibtex-include-OPTcrossref was
t) are necessary again. bibtex-clean-entry complains if they are
empty but not if they are missing, so you can intenionally omit
them, e. g. for a pseudo @Journal entry (needed for
crossreferences) made out of an @article with missing non-optional
fields.
Menu bar entries aren't centered anymore.
author | Richard M. Stallman <rms@gnu.org> |
---|---|
date | Fri, 23 Dec 1994 04:18:29 +0000 |
parents | a817a0ed7f42 |
children | cfb899623032 |
line wrap: on
line source
;;; cl-specs.el - Edebug specs for cl.el ;; Copyright (C) 1993 Free Software Foundation, Inc. ;; Author: Daniel LaLiberte <liberte@cs.uiuc.edu> ;; Keywords: lisp, tools, maint ;; LCD Archive Entry: ;; cl-specs.el|Daniel LaLiberte|liberte@cs.uiuc.edu ;; |Edebug specs for cl.el ;; |$Date: 1994/03/23 22:09:57 $|1.1| ;; 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 2, 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; see the file COPYING. If not, write to ;; the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. ;;;; Commentary: ;; These specs are to be used with edebug.el version 3.3 or later and ;; cl.el version 2.03 or later, by Dave Gillespie <daveg@synaptics.com>. ;; This file need not be byte-compiled, but it shouldnt hurt. (provide 'cl-specs) ;; Do the above provide before the following require. ;; Otherwise if you load this before edebug if cl is already loaded ;; an infinite loading loop would occur. (require 'edebug) ;; Blocks (def-edebug-spec block (symbolp body)) (def-edebug-spec return (&optional form)) (def-edebug-spec return-from (symbolp &optional form)) ;; Loops (def-edebug-spec when t) (def-edebug-spec unless t) (def-edebug-spec case (form &rest (sexp body))) (def-edebug-spec ecase case) (def-edebug-spec do ((&rest &or symbolp (symbolp &optional form form)) (form body) cl-declarations body)) (def-edebug-spec do* do) (def-edebug-spec dolist ((symbolp form &optional form) cl-declarations body)) (def-edebug-spec dotimes dolist) (def-edebug-spec do-symbols ((symbolp &optional form form) cl-declarations body)) (def-edebug-spec do-all-symbols ((symbolp &optional form) cl-declarations body)) ;; Multiple values (def-edebug-spec multiple-value-list (form)) (def-edebug-spec multiple-value-call (function-form body)) (def-edebug-spec multiple-value-bind ((&rest symbolp) form cl-declarations body)) (def-edebug-spec multiple-value-setq ((&rest symbolp) form)) (def-edebug-spec multiple-value-prog1 (form body)) ;; Bindings (def-edebug-spec lexical-let let) (def-edebug-spec lexical-let* let) (def-edebug-spec psetq setq) (def-edebug-spec progv (form form body)) (def-edebug-spec flet ((&rest (defun*)) cl-declarations body)) (def-edebug-spec labels flet) (def-edebug-spec macrolet ((&rest (&define name (&rest arg) cl-declarations-or-string def-body)) cl-declarations body)) (def-edebug-spec symbol-macrolet ((&rest (symbol sexp)) cl-declarations body)) (def-edebug-spec destructuring-bind (&define cl-macro-list form cl-declarations def-body)) ;; Setf (def-edebug-spec setf (&rest [place form])) ;; sexp is not specific enough (def-edebug-spec psetf setf) (def-edebug-spec letf ;; *not* available in Common Lisp ((&rest (gate place &optional form)) body)) (def-edebug-spec letf* letf) (def-edebug-spec defsetf (&define name [&or [symbolp &optional stringp] [cl-lambda-list (symbolp)]] cl-declarations-or-string def-body)) (def-edebug-spec define-setf-method (&define name cl-lambda-list cl-declarations-or-string def-body)) (def-edebug-spec define-modify-macro (&define name cl-lambda-list ;; should exclude &key symbolp &optional stringp)) (def-edebug-spec callf (function* place &rest form)) (def-edebug-spec callf2 (function* form place &rest form)) ;; Other operations on places (def-edebug-spec remf (place form)) (def-edebug-spec incf (place &optional form)) (def-edebug-spec decf incf) (def-edebug-spec push (form place)) (def-edebug-spec pushnew (form place &rest &or [[&or ":test" ":test-not" ":key"] function-form] [keywordp form])) (def-edebug-spec pop (place)) (def-edebug-spec shiftf (&rest place)) ;; really [&rest place] form (def-edebug-spec rotatef (&rest place)) ;; Functions with function args. These are only useful if the ;; function arg is quoted with ' instead of function. (def-edebug-spec some (function-form form &rest form)) (def-edebug-spec every some) (def-edebug-spec notany some) (def-edebug-spec notevery some) ;; Mapping (def-edebug-spec map (form function-form form &rest form)) (def-edebug-spec maplist (function-form form &rest form)) (def-edebug-spec mapc maplist) (def-edebug-spec mapl maplist) (def-edebug-spec mapcan maplist) (def-edebug-spec mapcon maplist) ;; Sequences (def-edebug-spec reduce (function-form form &rest form)) ;; Types and assertions (def-edebug-spec cl-type-spec (sexp)) ;; not worth the trouble to specify, yet. (def-edebug-spec deftype defmacro*) (def-edebug-spec check-type (place cl-type-spec &optional stringp)) ;; (def-edebug-spec assert (form &optional form stringp &rest form)) (def-edebug-spec assert (form &rest form)) (def-edebug-spec typecase (form &rest ([&or cl-type-spec "otherwise"] body))) (def-edebug-spec etypecase typecase) (def-edebug-spec ignore-errors t) ;; Time of Evaluation (def-edebug-spec eval-when ((&rest &or "compile" "load" "eval") body)) (def-edebug-spec load-time-value (form &optional &or "t" "nil")) ;; Declarations (def-edebug-spec cl-decl-spec ((symbolp &rest sexp))) (def-edebug-spec cl-declarations (&rest ("declare" &rest cl-decl-spec))) (def-edebug-spec cl-declarations-or-string (&or stringp cl-declarations)) (def-edebug-spec declaim (&rest cl-decl-spec)) (def-edebug-spec declare (&rest cl-decl-spec)) ;; probably not needed. (def-edebug-spec locally (cl-declarations &rest form)) (def-edebug-spec the (cl-type-spec form)) ;;====================================================== ;; Lambda things (def-edebug-spec cl-lambda-list (([&rest arg] [&optional ["&optional" cl-&optional-arg &rest cl-&optional-arg]] [&optional ["&rest" arg]] [&optional ["&key" [cl-&key-arg &rest cl-&key-arg] &optional "&allow-other-keywords"]] [&optional ["&aux" &rest &or (symbolp &optional def-form) symbolp]] ))) (def-edebug-spec cl-&optional-arg (&or (arg &optional def-form arg) arg)) (def-edebug-spec cl-&key-arg (&or ([&or (symbolp arg) arg] &optional def-form arg) arg)) ;; The lambda list for macros is different from that of normal lambdas. ;; Note that &environment is only allowed as first or last items in the ;; top level list. (def-edebug-spec cl-macro-list (([&optional "&environment" arg] [&rest cl-macro-arg] [&optional ["&optional" &rest &or (cl-macro-arg &optional def-form cl-macro-arg) arg]] [&optional [[&or "&rest" "&body"] cl-macro-arg]] [&optional ["&key" [&rest [&or ([&or (symbolp cl-macro-arg) arg] &optional def-form cl-macro-arg) arg]] &optional "&allow-other-keywords"]] [&optional ["&aux" &rest &or (symbolp &optional def-form) symbolp]] [&optional "&environment" arg] ))) (def-edebug-spec cl-macro-arg (&or arg cl-macro-list1)) (def-edebug-spec cl-macro-list1 (([&optional "&whole" arg] ;; only allowed at lower levels [&rest cl-macro-arg] [&optional ["&optional" &rest &or (cl-macro-arg &optional def-form cl-macro-arg) arg]] [&optional [[&or "&rest" "&body"] cl-macro-arg]] [&optional ["&key" [&rest [&or ([&or (symbolp cl-macro-arg) arg] &optional def-form cl-macro-arg) arg]] &optional "&allow-other-keywords"]] [&optional ["&aux" &rest &or (symbolp &optional def-form) symbolp]] . [&or arg nil]))) (def-edebug-spec defun* ;; Same as defun but use cl-lambda-list. (&define [&or name ("setf" :name setf name)] cl-lambda-list cl-declarations-or-string [&optional ("interactive" interactive)] def-body)) (def-edebug-spec defsubst* defun*) (def-edebug-spec defmacro* (&define name cl-macro-list cl-declarations-or-string def-body)) (def-edebug-spec define-compiler-macro defmacro*) (def-edebug-spec function* (&or symbolp cl-lambda-expr)) (def-edebug-spec cl-lambda-expr (&define ("lambda" cl-lambda-list ;;cl-declarations-or-string ;;[&optional ("interactive" interactive)] def-body))) ;; Redefine function-form to also match function* (def-edebug-spec function-form ;; form at the end could also handle "function", ;; but recognize it specially to avoid wrapping function forms. (&or ([&or "quote" "function"] &or symbolp lambda-expr) ("function*" cl-lambda-expr) form)) ;;====================================================== ;; Structures ;; (def-edebug-spec defstruct (&rest sexp)) would be sufficient, but... ;; defstruct may contain forms that are evaluated when a structure is created. (def-edebug-spec defstruct (&define ; makes top-level form not be wrapped [&or symbolp (gate symbolp &rest (&or [":conc-name" &or stringp "nil"] [":constructor" symbolp &optional cl-lambda-list] [":copier" symbolp] [":predicate" symbolp] [":include" symbolp &rest sexp];; not finished ;; The following are not supported. ;; [":print-function" ...] ;; [":type" ...] ;; [":initial-offset" ...] ))] [&optional stringp] ;; All the above is for the following def-form. &rest &or symbolp (symbolp def-form &optional ":read-only" sexp))) ;;====================================================== ;; Loop ;; The loop macro is very complex, and a full spec is found below. ;; The following spec only minimally specifies that ;; parenthesized forms are executable, but single variables used as ;; expressions will be missed. You may want to use this if the full ;; spec causes problems for you. (def-edebug-spec loop (&rest &or symbolp form)) ;; Below is a complete spec for loop, in several parts that correspond ;; to the syntax given in CLtL2. The specs do more than specify where ;; the forms are; it also specifies, as much as Edebug allows, all the ;; syntactically legal loop clauses. The disadvantage of this ;; completeness is rigidity, but the "for ... being" clause allows ;; arbitrary extensions of the form: [symbolp &rest &or symbolp form]. (def-edebug-spec loop ([&optional ["named" symbolp]] [&rest &or ["repeat" form] loop-for-as loop-with loop-initial-final] [&rest loop-clause] )) (def-edebug-spec loop-with ("with" loop-var loop-type-spec [&optional ["=" form]] &rest ["and" loop-var loop-type-spec [&optional ["=" form]]])) (def-edebug-spec loop-for-as ([&or "for" "as"] loop-for-as-subclause &rest ["and" loop-for-as-subclause])) (def-edebug-spec loop-for-as-subclause (loop-var loop-type-spec &or [[&or "in" "on" "in-ref" "across-ref"] form &optional ["by" function-form]] ["=" form &optional ["then" form]] ["across" form] ["being" [&or "the" "each"] &or [[&or "element" "elements"] [&or "of" "in" "of-ref"] form &optional "using" ["index" symbolp]];; is this right? [[&or "hash-key" "hash-keys" "hash-value" "hash-values"] [&or "of" "in"] hash-table-p &optional ["using" ([&or "hash-value" "hash-values" "hash-key" "hash-keys"] sexp)]] [[&or "symbol" "present-symbol" "external-symbol" "symbols" "present-symbols" "external-symbols"] [&or "in" "of"] package-p] ;; Extensions for Emacs Lisp, including Lucid Emacs. [[&or "frame" "frames" "screen" "screens" "buffer" "buffers"]] [[&or "window" "windows"] [&or "of" "in"] form] [[&or "overlay" "overlays" "extent" "extents"] [&or "of" "in"] form &optional [[&or "from" "to"] form]] [[&or "interval" "intervals"] [&or "in" "of"] form &optional [[&or "from" "to"] form] ["property" form]] [[&or "key-code" "key-codes" "key-seq" "key-seqs" "key-binding" "key-bindings"] [&or "in" "of"] form &optional ["using" ([&or "key-code" "key-codes" "key-seq" "key-seqs" "key-binding" "key-bindings"] sexp)]] ;; For arbitrary extensions, recognize anything else. [symbolp &rest &or symbolp form] ] ;; arithmetic - must be last since all parts are optional. [[&optional [[&or "from" "downfrom" "upfrom"] form]] [&optional [[&or "to" "downto" "upto" "below" "above"] form]] [&optional ["by" form]] ])) (def-edebug-spec loop-initial-final (&or ["initially" ;; [&optional &or "do" "doing"] ;; CLtL2 doesnt allow this. &rest loop-non-atomic-expr] ["finally" &or [[&optional &or "do" "doing"] &rest loop-non-atomic-expr] ["return" form]])) (def-edebug-spec loop-and-clause (loop-clause &rest ["and" loop-clause])) (def-edebug-spec loop-clause (&or [[&or "while" "until" "always" "never" "thereis"] form] [[&or "collect" "collecting" "append" "appending" "nconc" "nconcing" "concat" "vconcat"] form [&optional ["into" loop-var]]] [[&or "count" "counting" "sum" "summing" "maximize" "maximizing" "minimize" "minimizing"] form [&optional ["into" loop-var]] loop-type-spec] [[&or "if" "when" "unless"] form loop-and-clause [&optional ["else" loop-and-clause]] [&optional "end"]] [[&or "do" "doing"] &rest loop-non-atomic-expr] ["return" form] loop-initial-final )) (def-edebug-spec loop-non-atomic-expr ([¬ atom] form)) (def-edebug-spec loop-var ;; The symbolp must be last alternative to recognize e.g. (a b . c) ;; loop-var => ;; (loop-var . [&or nil loop-var]) ;; (symbolp . [&or nil loop-var]) ;; (symbolp . loop-var) ;; (symbolp . (symbolp . [&or nil loop-var])) ;; (symbolp . (symbolp . loop-var)) ;; (symbolp . (symbolp . symbolp)) == (symbolp symbolp . symbolp) (&or (loop-var . [&or nil loop-var]) [gate symbolp])) (def-edebug-spec loop-type-spec (&optional ["of-type" loop-d-type-spec])) (def-edebug-spec loop-d-type-spec (&or (loop-d-type-spec . [&or nil loop-d-type-spec]) cl-type-spec))