Mercurial > hg > xemacs-beta
view lisp/backquote.el @ 4477:e34711681f30
Don't determine whether to call general device-type code at startup,
rather decide in the device-specific code itself.
lisp/ChangeLog addition:
2008-07-07 Aidan Kehoe <kehoea@parhasard.net>
Patch to make it up to the device-specific code whether
various Lisp functions should be called during device creation,
not relying on the startup code to decide this. Also, rename
initial-window-system to initial-device-type (which makes more
sense in this scheme), always set it.
* startup.el (command-line):
Use initial-device-type, not initial-window-system; just call
#'make-device, leave the special behaviour to be done the first
time a console type is initialised to be decided on by the
respective console code.
* x-init.el (x-app-defaults-directory): Declare that it should be
bound.
(x-define-dead-key): Have the macro take a DEVICE argument.
(x-initialize-compose): Have the function take a DEVICE argument,
and use it when checking if various keysyms are available on the
keyboard.
(x-initialize-keyboard): Have the function take a DEVICE argument,
allowing device-specific keyboard initialisation.
(make-device-early-x-entry-point-called-p): New.
(make-device-late-x-entry-point-called-p): New. Rename
pre-x-win-initted, x-win-initted.
(make-device-early-x-entry-point): Rename init-pre-x-win, take the
call to make-x-device out (it should be called from the
device-creation code, not vice-versa).
(make-device-late-x-entry-point): Rename init-post-x-win, have it
take a DEVICE argument, use that DEVICE argument when working out
what device-specific things need doing. Don't use
create-console-hook in core code.
* x-win-xfree86.el (x-win-init-xfree86): Take a DEVICE argument;
use it.
* x-win-sun.el (x-win-init-sun): Take a DEVICE argument; use it.
* mule/mule-x-init.el: Remove #'init-mule-x-win, an empty
function.
* tty-init.el (make-device-early-tty-entry-point-called-p): New.
Rename pre-tty-win-initted.
(make-device-early-tty-entry-point): New.
Rename init-pre-tty-win.
(make-frame-after-init-entry-point): New.
Rename init-post-tty-win to better reflect when it's called.
* gtk-init.el (gtk-early-lisp-options-file): New.
Move this path to a documented variable.
(gtk-command-switch-alist): Wrap the docstring to fewer than 79
columns.
(make-device-early-gtk-entry-point-called-p): New.
(make-device-late-gtk-entry-point-called-p): New.
Renamed gtk-pre-win-initted, gtk-post-win-initted to these.
(make-device-early-gtk-entry-point): New.
(make-device-late-gtk-entry-point): New.
Renamed init-pre-gtk-win, init-post-gtk-win to these.
Have make-device-late-gtk-entry-point take a device argument, and use
it; have make-device-early-gtk-entry-point load the GTK-specific
startup code, instead of doing that in C.
(init-gtk-win): Deleted, functionality moved to the GTK device
creation code.
(gtk-define-dead-key): Have it take a DEVICE argument; use this
argument.
(gtk-initialize-compose): Ditto.
* coding.el (set-terminal-coding-system):
Correct the docstring; the function isn't broken.
src/ChangeLog addition:
2008-07-07 Aidan Kehoe <kehoea@parhasard.net>
Patch to make it up to the device-specific code whether
various Lisp functions should be called during device creation,
not relying on the startup code to decide this. Also, rename
initial-window-system to initial-device-type (which makes more
sense in this scheme), always set it.
* redisplay.c (Vinitial_device_type): New.
(Vinitial_window_system): Removed.
Rename initial-window-system to initial-device type, making it
a stream if we're noninteractive. Update its docstring.
* device-x.c (Qmake_device_early_x_entry_point,
Qmake_device_late_x_entry_point): New.
Rename Qinit_pre_x_win, Qinit_post_x_win.
(x_init_device): Call #'make-device-early-x-entry-point earlier,
now we rely on it to find the application class and the
app-defaults directory.
(x_finish_init_device): Call #'make-device-late-x-entry-point with
the created device.
(Vx_app_defaults_directory): Always make this available, to
simplify code in x-init.el.
* device-tty.c (Qmake_device_early_tty_entry_point): New.
Rename Qinit_pre_tty_win, rename Qinit_post_tty_win and move to
frame-tty.c as Qmake_frame_after_init_entry_point.
(tty_init_device): Call #'make-device-early-tty-entry-point before
doing anything.
* frame-tty.c (Qmake_frame_after_init_entry_point): New.
* frame-tty.c (tty_after_init_frame): Have it call the
better-named #'make-frame-after-init-entry-point function
instead of #'init-post-tty-win (since it's called after frame, not
device, creation).
* device-msw.c (Qmake_device_early_mswindows_entry_point,
Qmake_device_late_mswindows_entry_point): New.
Rename Qinit_pre_mswindows_win, Qinit_post_mswindows_win.
(mswindows_init_device): Call
#'make-device-early-mswindows-entry-point here, instead of having
its predecessor call us.
(mswindows_finish_init_device): Call
#'make-device-early-mswindows-entry-point, for symmetry with the
other device types (though it's an empty function).
* device-gtk.c (Qmake_device_early_gtk_entry_point,
Qmake_device_late_gtk_entry_point): New.
Rename Qinit_pre_gtk_win, Qinit_post_gtk_win.
(gtk_init_device): Call #'make-device-early-gtk-entry-point; don't
load ~/.xemacs/gtk-options.el ourselves, leave that to lisp.
(gtk_finish_init_device): Call #'make-device-late-gtk-entry-point
with the created device as an argument.
author | Aidan Kehoe <kehoea@parhasard.net> |
---|---|
date | Wed, 09 Jul 2008 20:46:22 +0200 |
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