Mercurial > hg > xemacs-beta
view lisp/backquote.el @ 826:6728e641994e
[xemacs-hg @ 2002-05-05 11:30:15 by ben]
syntax cache, 8-bit-format, lots of code cleanup
README.packages: Update info about --package-path.
i.c: Create an inheritable event and pass it on to XEmacs, so that ^C
can be handled properly. Intercept ^C and signal the event.
"Stop Build" in VC++ now works.
bytecomp-runtime.el: Doc string changes.
compat.el: Some attempts to redo this to
make it truly useful and fix the "multiple versions interacting
with each other" problem. Not yet done. Currently doesn't work.
files.el: Use with-obsolete-variable to avoid warnings in new revert-buffer code.
xemacs.mak: Split up CFLAGS into a version without flags specifying the C
library. The problem seems to be that minitar depends on zlib,
which depends specifically on libc.lib, not on any of the other C
libraries. Unless you compile with libc.lib, you get errors --
specifically, no _errno in the other libraries, which must make it
something other than an int. (#### But this doesn't seem to obtain
in XEmacs, which also uses zlib, and can be linked with any of the
C libraries. Maybe zlib is used differently and doesn't need
errno, or maybe XEmacs provides an int errno; ... I don't
understand.
Makefile.in.in: Fix so that packages are around when testing.
abbrev.c, alloc.c, buffer.c, buffer.h, bytecode.c, callint.c, casefiddle.c, casetab.c, casetab.h, charset.h, chartab.c, chartab.h, cmds.c, console-msw.h, console-stream.c, console-x.c, console.c, console.h, data.c, device-msw.c, device.c, device.h, dialog-msw.c, dialog-x.c, dired-msw.c, dired.c, doc.c, doprnt.c, dumper.c, editfns.c, elhash.c, emacs.c, eval.c, event-Xt.c, event-gtk.c, event-msw.c, event-stream.c, events.c, events.h, extents.c, extents.h, faces.c, file-coding.c, file-coding.h, fileio.c, fns.c, font-lock.c, frame-gtk.c, frame-msw.c, frame-x.c, frame.c, frame.h, glade.c, glyphs-gtk.c, glyphs-msw.c, glyphs-msw.h, glyphs-x.c, glyphs.c, glyphs.h, gui-msw.c, gui-x.c, gui.h, gutter.h, hash.h, indent.c, insdel.c, intl-win32.c, intl.c, keymap.c, lisp-disunion.h, lisp-union.h, lisp.h, lread.c, lrecord.h, lstream.c, lstream.h, marker.c, menubar-gtk.c, menubar-msw.c, menubar-x.c, menubar.c, minibuf.c, mule-ccl.c, mule-charset.c, mule-coding.c, mule-wnnfns.c, nas.c, objects-msw.c, objects-x.c, opaque.c, postgresql.c, print.c, process-nt.c, process-unix.c, process.c, process.h, profile.c, rangetab.c, redisplay-gtk.c, redisplay-msw.c, redisplay-output.c, redisplay-x.c, redisplay.c, redisplay.h, regex.c, regex.h, scrollbar-msw.c, search.c, select-x.c, specifier.c, specifier.h, symbols.c, symsinit.h, syntax.c, syntax.h, syswindows.h, tests.c, text.c, text.h, tooltalk.c, ui-byhand.c, ui-gtk.c, unicode.c, win32.c, window.c: Another big Ben patch.
-- FUNCTIONALITY CHANGES:
add partial support for 8-bit-fixed, 16-bit-fixed, and
32-bit-fixed formats. not quite done yet. (in particular, needs
functions to actually convert the buffer.) NOTE: lots of changes
to regex.c here. also, many new *_fmt() inline funs that take an
Internal_Format argument.
redo syntax cache code. make the cache per-buffer; keep the cache
valid across calls to functions that use it. also keep it valid
across insertions/deletions and extent changes, as much as is
possible. eliminate the junky regex-reentrancy code by passing in
the relevant lisp info to the regex routines as local vars.
add general mechanism in extents code for signalling extent changes.
fix numerous problems with the case-table implementation; yoshiki
never properly transferred many algorithms from old-style to
new-style case tables.
redo char tables to support a default argument, so that mapping
only occurs over changed args. change many chartab functions to
accept Lisp_Object instead of Lisp_Char_Table *.
comment out the code in font-lock.c by default, because
font-lock.el no longer uses it. we should consider eliminating it
entirely.
Don't output bell as ^G in console-stream when not a TTY.
add -mswindows-termination-handle to interface with i.c, so we can
properly kill a build.
add more error-checking to buffer/string macros.
add some additional buffer_or_string_() funs.
-- INTERFACE CHANGES AFFECTING MORE CODE:
switch the arguments of write_c_string and friends to be
consistent with write_fmt_string, which must have printcharfun
first.
change BI_* macros to BYTE_* for increased clarity; similarly for
bi_* local vars.
change VOID_TO_LISP to be a one-argument function. eliminate
no-longer-needed CVOID_TO_LISP.
-- char/string macro changes:
rename MAKE_CHAR() to make_emchar() for slightly less confusion
with make_char(). (The former generates an Emchar, the latter a
Lisp object. Conceivably we should rename make_char() -> wrap_char()
and similarly for make_int(), make_float().)
Similar changes for other *CHAR* macros -- we now consistently use
names with `emchar' whenever we are working with Emchars. Any
remaining name with just `char' always refers to a Lisp object.
rename macros with XSTRING_* to string_* except for those that
reference actual fields in the Lisp_String object, following
conventions used elsewhere.
rename set_string_{data,length} macros (the only ones to work with
a Lisp_String_* instead of a Lisp_Object) to set_lispstringp_*
to make the difference clear.
try to be consistent about caps vs. lowercase in macro/inline-fun
names for chars and such, which wasn't the case before. we now
reserve caps either for XFOO_ macros that reference object fields
(e.g. XSTRING_DATA) or for things that have non-function semantics,
e.g. directly modifying an arg (BREAKUP_EMCHAR) or evaluating an
arg (any arg) more than once. otherwise, use lowercase.
here is a summary of most of the macros/inline funs changed by all
of the above changes:
BYTE_*_P -> byte_*_p
XSTRING_BYTE -> string_byte
set_string_data/length -> set_lispstringp_data/length
XSTRING_CHAR_LENGTH -> string_char_length
XSTRING_CHAR -> string_emchar
INTBYTE_FIRST_BYTE_P -> intbyte_first_byte_p
INTBYTE_LEADING_BYTE_P -> intbyte_leading_byte_p
charptr_copy_char -> charptr_copy_emchar
LEADING_BYTE_* -> leading_byte_*
CHAR_* -> EMCHAR_*
*_CHAR_* -> *_EMCHAR_*
*_CHAR -> *_EMCHAR
CHARSET_BY_ -> charset_by_*
BYTE_SHIFT_JIS* -> byte_shift_jis*
BYTE_BIG5* -> byte_big5*
REP_BYTES_BY_FIRST_BYTE -> rep_bytes_by_first_byte
char_to_unicode -> emchar_to_unicode
valid_char_p -> valid_emchar_p
Change intbyte_strcmp -> qxestrcmp_c (duplicated functionality).
-- INTERFACE CHANGES AFFECTING LESS CODE:
use DECLARE_INLINE_HEADER in various places.
remove '#ifdef emacs' from XEmacs-only files.
eliminate CHAR_TABLE_VALUE(), which duplicated the functionality
of get_char_table().
add BUFFER_TEXT_LOOP to simplify iterations over buffer text.
define typedefs for signed and unsigned types of fixed sizes
(INT_32_BIT, UINT_32_BIT, etc.).
create ALIGN_FOR_TYPE as a higher-level interface onto ALIGN_SIZE;
fix code to use it.
add charptr_emchar_len to return the text length of the character
pointed to by a ptr; use it in place of
charcount_to_bytecount(..., 1). add emchar_len to return the text
length of a given character.
add types Bytexpos and Charxpos to generalize Bytebpos/Bytecount
and Charbpos/Charcount, in code (particularly, the extents code
and redisplay code) that works with either kind of index. rename
redisplay struct params with names such as `charbpos' to
e.g. `charpos' when they are e.g. a Charxpos, not a Charbpos.
eliminate xxDEFUN in place of DEFUN; no longer necessary with
changes awhile back to doc.c.
split up big ugly combined list of EXFUNs in lisp.h on a
file-by-file basis, since other prototypes are similarly split.
rewrite some "*_UNSAFE" macros as inline funs and eliminate the
_UNSAFE suffix.
move most string code from lisp.h to text.h; the string code and
text.h code is now intertwined in such a fashion that they need
to be in the same place and partially interleaved. (you can't
create forward references for inline funs)
automated/lisp-tests.el, automated/symbol-tests.el, automated/test-harness.el: Fix test harness to output FAIL messages to stderr when in
batch mode.
Fix up some problems in lisp-tests/symbol-tests that were
causing spurious failures.
author | ben |
---|---|
date | Sun, 05 May 2002 11:33:57 +0000 |
parents | 3ecd8885ac67 |
children | aa20a889ff14 91b3aa59f49b |
line wrap: on
line source
;;; backquote.el --- Full backquote support for elisp. Reverse compatible too. ;; Copyright (C) 1997 Free Software Foundation, Inc. ;; Maintainer: XEmacs Development Team ;; Keywords: extensions, dumped ;; This file is part of XEmacs. ;; XEmacs 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. ;; XEmacs 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 XEmacs; see the file COPYING. If not, write to the Free ;; Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA ;; 02111-1307, USA. ;;; Synched up with: Not synched with FSF. ;;; Commentary: ;; This file is dumped with XEmacs. ;; The bulk of the code is originally from CMU Common Lisp (original notice ;; below). ;; It correctly supports nested backquotes and backquoted vectors. ;; Converted to work with elisp by Miles Bader <miles@cogsci.ed.ac.uk> ;; Changes by Jonathan Stigelman <Stig@hackvan.com>: ;; - Documentation added ;; - support for old-backquote-compatibility-hook nixed because the ;; old-backquote compatibility is now done in the reader... ;; - nixed support for |,.| because ;; (a) it's not in CLtl2 ;; (b) ",.foo" is the same as ". ,foo" ;; (c) because RMS isn't interested in using this version of backquote.el ;; ;; ben@xemacs.org added ,. support back in: ;; (a) yes, it is in CLtl2. Read closely on page 529. ;; (b) RMS in 19.30 adds C support for ,. even if it's not really ;; handled. ;; ;; ********************************************************************** ;; This code was written as part of the CMU Common Lisp project at ;; Carnegie Mellon University, and has been placed in the public domain. ;; If you want to use this code or any part of CMU Common Lisp, please contact ;; Scott Fahlman or slisp-group@cs.cmu.edu. ;; ;; ********************************************************************** ;; ;; BACKQUOTE: Code Spice Lispified by Lee Schumacher. ;; ;; The flags passed back by BQ-PROCESS-2 can be interpreted as follows: ;; ;; |`,|: [a] => a ;; NIL: [a] => a ;the NIL flag is used only when a is NIL ;; T: [a] => a ;the T flag is used when a is self-evaluating ;; QUOTE: [a] => (QUOTE a) ;; APPEND: [a] => (APPEND . a) ;; NCONC: [a] => (NCONC . a) ;; LIST: [a] => (LIST . a) ;; LIST*: [a] => (LIST* . a) ;; ;; The flags are combined according to the following set of rules: ;; ([a] means that a should be converted according to the previous table) ;; ;; \ car || otherwise | QUOTE or | |`,@| | |`,.| ;;cdr \ || | T or NIL | | ;;============================================================================ ;; |`,| ||LIST* ([a] [d]) |LIST* ([a] [d]) |APPEND (a [d]) |NCONC (a [d]) ;; NIL ||LIST ([a]) |QUOTE (a) |<hair> a |<hair> a ;;QUOTE or T||LIST* ([a] [d]) |QUOTE (a . d) |APPEND (a [d]) |NCONC (a [d]) ;; APPEND ||LIST* ([a] [d]) |LIST* ([a] [d]) |APPEND (a . d) |NCONC (a [d]) ;; NCONC ||LIST* ([a] [d]) |LIST* ([a] [d]) |APPEND (a [d]) |NCONC (a . d) ;; LIST ||LIST ([a] . d) |LIST ([a] . d) |APPEND (a [d]) |NCONC (a [d]) ;; LIST* ||LIST* ([a] . d) |LIST* ([a] . d) |APPEND (a [d]) |NCONC (a [d]) ;; ;;<hair> involves starting over again pretending you had read ".,a)" instead ;; of ",@a)" ;; ;; These are the forms it expects: |backquote| |`| |,| |,@| and |,.|. ;;; Code: (defconst bq-backquote-marker 'backquote) (defconst bq-backtick-marker '\`) ; remnant of the old lossage (defconst bq-comma-marker '\,) (defconst bq-at-marker '\,@) (defconst bq-dot-marker '\,\.) ;;; ---------------------------------------------------------------- (fset '\` 'backquote) (defmacro backquote (template) "Expand the internal representation of a backquoted TEMPLATE into a lisp form. The backquote character is like the quote character in that it prevents the template which follows it from being evaluated, except that backquote permits you to evaluate portions of the quoted template. A comma character inside TEMPLATE indicates that the following item should be evaluated. A comma character may be followed by an at-sign, which indicates that the form which follows should be evaluated and inserted and \"spliced\" into the template. Forms following ,@ must evaluate to lists. Here is how to use backquotes: (setq p 'b q '(c d e)) `(a ,p ,@q) -> (a b c d e) `(a . b) -> (a . b) `(a . ,p) -> (a . b) The XEmacs lisp reader expands lisp backquotes as it reads them. Examples: `atom is read as (backquote atom) `(a ,b ,@(c d e)) is read as (backquote (a (\\, b) (\\,\\@ (c d e)))) `(a . ,p) is read as (backquote (a \\, p)) \(backquote TEMPLATE) is a macro that produces code to construct TEMPLATE. Note that this is very slow in interpreted code, but fast if you compile. TEMPLATE is one or more nested lists or vectors, which are `almost quoted'. They are copied recursively, with elements preceded by comma evaluated. (backquote (a b)) == (list 'a 'b) (backquote (a [b c])) == (list 'a (vector 'b 'c)) However, certain special lists are not copied. They specify substitution. Lists that look like (\\, EXP) are evaluated and the result is substituted. (backquote (a (\\, (+ x 5)))) == (list 'a (+ x 5)) Elements of the form (\\,\\@ EXP) are evaluated and then all the elements of the result are substituted. This result must be a list; it may be `nil'. Elements of the form (\\,\\. EXP) are evaluated and then all the elements of the result are concatenated to the list of preceding elements in the list. They must occur as the last element of a list (not a vector). EXP may evaluate to nil. As an example, a simple macro `push' could be written: (defmacro push (v l) `(setq ,l (cons ,@(list v l)))) or as (defmacro push (v l) `(setq ,l (cons ,v ,l))) For backwards compatibility, old-style emacs-lisp backquotes are still read. OLD STYLE NEW STYLE (` (foo (, bar) (,@ bing))) `(foo ,bar ,@bing) Because of the old-style backquote support, you cannot use a new-style backquoted form as the first element of a list. Perhaps some day this restriction will go away, but for now you should be wary of it: (`(this ,will ,@fail)) ((` (but (, this) will (,@ work)))) This is an extremely rare thing to need to do in lisp." (bq-process template)) ;;; ---------------------------------------------------------------- (defconst bq-comma-flag 'unquote) (defconst bq-at-flag 'unquote-splicing) (defconst bq-dot-flag 'unquote-nconc-splicing) (defun bq-process (form) (let* ((flag-result (bq-process-2 form)) (flag (car flag-result)) (result (cdr flag-result))) (cond ((eq flag bq-at-flag) (error ",@ after ` in form: %s" form)) ((eq flag bq-dot-flag) (error ",. after ` in form: %s" form)) (t (bq-process-1 flag result))))) ;;; ---------------------------------------------------------------- (defun bq-vector-contents (vec) (let ((contents nil) (n (length vec))) (while (> n 0) (setq n (1- n)) (setq contents (cons (aref vec n) contents))) contents)) ;;; This does the expansion from table 2. (defun bq-process-2 (code) (cond ((vectorp code) (let* ((dflag-d (bq-process-2 (bq-vector-contents code)))) (cons 'vector (bq-process-1 (car dflag-d) (cdr dflag-d))))) ((atom code) (cond ((null code) (cons nil nil)) ((or (numberp code) (eq code t)) (cons t code)) (t (cons 'quote code)))) ((eq (car code) bq-at-marker) (cons bq-at-flag (nth 1 code))) ((eq (car code) bq-dot-marker) (cons bq-dot-flag (nth 1 code))) ((eq (car code) bq-comma-marker) (bq-comma (nth 1 code))) ((or (eq (car code) bq-backquote-marker) (eq (car code) bq-backtick-marker)) ; old lossage (bq-process-2 (bq-process (nth 1 code)))) (t (let* ((aflag-a (bq-process-2 (car code))) (aflag (car aflag-a)) (a (cdr aflag-a))) (let* ((dflag-d (bq-process-2 (cdr code))) (dflag (car dflag-d)) (d (cdr dflag-d))) (if (eq dflag bq-at-flag) ;; get the errors later. (error ",@ after dot in %s" code)) (if (eq dflag bq-dot-flag) (error ",. after dot in %s" code)) (cond ((eq aflag bq-at-flag) (if (null dflag) (bq-comma a) (cons 'append (cond ((eq dflag 'append) (cons a d )) (t (list a (bq-process-1 dflag d))))))) ((eq aflag bq-dot-flag) (if (null dflag) (bq-comma a) (cons 'nconc (cond ((eq dflag 'nconc) (cons a d)) (t (list a (bq-process-1 dflag d))))))) ((null dflag) (if (memq aflag '(quote t nil)) (cons 'quote (list a)) (cons 'list (list (bq-process-1 aflag a))))) ((memq dflag '(quote t)) (if (memq aflag '(quote t nil)) (cons 'quote (cons a d )) (cons 'list* (list (bq-process-1 aflag a) (bq-process-1 dflag d))))) (t (setq a (bq-process-1 aflag a)) (if (memq dflag '(list list*)) (cons dflag (cons a d)) (cons 'list* (list a (bq-process-1 dflag d))))))))))) ;;; This handles the <hair> cases (defun bq-comma (code) (cond ((atom code) (cond ((null code) (cons nil nil)) ((or (numberp code) (eq code 't)) (cons t code)) (t (cons bq-comma-flag code)))) ((eq (car code) 'quote) (cons (car code) (car (cdr code)))) ((memq (car code) '(append list list* nconc)) (cons (car code) (cdr code))) ((eq (car code) 'cons) (cons 'list* (cdr code))) (t (cons bq-comma-flag code)))) ;;; This handles table 1. (defun bq-process-1 (flag thing) (cond ((or (eq flag bq-comma-flag) (memq flag '(t nil))) thing) ((eq flag 'quote) (list 'quote thing)) ((eq flag 'vector) (list 'apply '(function vector) thing)) (t (cons (cdr (assq flag '((cons . cons) (list* . bq-list*) (list . list) (append . append) (nconc . nconc)))) thing)))) ;;; ---------------------------------------------------------------- (defmacro bq-list* (&rest args) "Return a list of its arguments with last cons a dotted pair." (setq args (reverse args)) (let ((result (car args))) (setq args (cdr args)) (while args (setq result (list 'cons (car args) result)) (setq args (cdr args))) result)) (provide 'backquote) ;;; backquote.el ends here