Mercurial > hg > xemacs-beta
annotate lisp/package-net.el @ 4677:8f1ee2d15784
Support full Common Lisp multiple values in C.
lisp/ChangeLog
2009-08-11 Aidan Kehoe <kehoea@parhasard.net>
* bytecomp.el :
Update this file to support full C-level multiple values. This
involves:
-- Four new bytecodes, and special compiler functions to compile
multiple-value-call, multiple-value-list-internal, values,
values-list, and, since it now needs to pass back multiple values
and is a special form, throw.
-- There's a new compiler variable, byte-compile-checks-on-load,
which is a list of forms that are evaluated at the very start of a
file, with an error thrown if any of them give nil.
-- The header is now inserted *after* compilation, giving a chance
for the compilation process to influence what those checks
are. There is still a check done before compilation for non-ASCII
characters, to try to turn off dynamic docstrings if appopriate,
in `byte-compile-maybe-reset-coding'.
Space is reserved for checks; comments describing the version of
the byte compiler generating the file are inserted if space
remains for them.
* bytecomp.el (byte-compile-version):
Update this, we're a newer version of the byte compiler.
* byte-optimize.el (byte-optimize-funcall):
Correct a comment.
* bytecomp.el (byte-compile-lapcode):
Discard the arg with byte-multiple-value-call.
* bytecomp.el (byte-compile-checks-and-comments-space):
New variable, describe how many octets to reserve for checks at
the start of byte-compiled files.
* cl-compat.el:
Remove the fake multiple-value implementation. Have the functions
that use it use the real multiple-value implementation instead.
* cl-macs.el (cl-block-wrapper, cl-block-throw):
Revise the byte-compile properties of these symbols to work now
we've made throw into a special form; keep the byte-compile
properties as anonymous lambdas, since we don't have docstrings
for them.
* cl-macs.el (multiple-value-bind, multiple-value-setq)
(multiple-value-list, nth-value):
Update these functions to work with the C support for multiple
values.
* cl-macs.el (values):
Modify the setf handler for this to call
#'multiple-value-list-internal appropriately.
* cl-macs.el (cl-setf-do-store):
If the store form is a cons, treat it specially as wrapping the
store value.
* cl.el (cl-block-wrapper):
Make this an alias of #'and, not #'identity, since it needs to
pass back multiple values.
* cl.el (multiple-value-apply):
We no longer support this, mark it obsolete.
* lisp-mode.el (eval-interactive-verbose):
Remove a useless space in the docstring.
* lisp-mode.el (eval-interactive):
Update this function and its docstring. It now passes back a list,
basically wrapping any eval calls with multiple-value-list. This
allows multiple values to be printed by default in *scratch*.
* lisp-mode.el (prin1-list-as-multiple-values):
New function, printing a list as multiple values in the manner of
Bruno Haible's clisp, separating each entry with " ;\n".
* lisp-mode.el (eval-last-sexp):
Call #'prin1-list-as-multiple-values on the return value of
#'eval-interactive.
* lisp-mode.el (eval-defun):
Call #'prin1-list-as-multiple-values on the return value of
#'eval-interactive.
* mouse.el (mouse-eval-sexp):
Deal with lists corresponding to multiple values from
#'eval-interactive. Call #'cl-prettyprint, which is always
available, instead of sometimes calling #'pprint and sometimes
falling back to prin1.
* obsolete.el (obsolete-throw):
New function, called from eval.c when #'funcall encounters an
attempt to call #'throw (now a special form) as a function. Only
needed for compatibility with 21.4 byte-code.
man/ChangeLog addition:
2009-08-11 Aidan Kehoe <kehoea@parhasard.net>
* cl.texi (Organization):
Remove references to the obsolete multiple-value emulating code.
src/ChangeLog addition:
2009-08-11 Aidan Kehoe <kehoea@parhasard.net>
* bytecode.c (enum Opcode /* Byte codes */):
Add four new bytecodes, to deal with multiple values.
(POP_WITH_MULTIPLE_VALUES): New macro.
(POP): Modify this macro to ignore multiple values.
(DISCARD_PRESERVING_MULTIPLE_VALUES): New macro.
(DISCARD): Modify this macro to ignore multiple values.
(TOP_WITH_MULTIPLE_VALUES): New macro.
(TOP_ADDRESS): New macro.
(TOP): Modify this macro to ignore multiple values.
(TOP_LVALUE): New macro.
(Bcall): Ignore multiple values where appropriate.
(Breturn): Pass back multiple values.
(Bdup): Preserve multiple values.
Use TOP_LVALUE with most bytecodes that assign anything to
anything.
(Bbind_multiple_value_limits, Bmultiple_value_call,
Bmultiple_value_list_internal, Bthrow): Implement the new
bytecodes.
(Bgotoifnilelsepop, Bgotoifnonnilelsepop, BRgotoifnilelsepop,
BRgotoifnonnilelsepop):
Discard any multiple values.
* callint.c (Fcall_interactively):
Ignore multiple values when calling #'eval, in two places.
* device-x.c (x_IO_error_handler):
* macros.c (pop_kbd_macro_event):
* eval.c (Fsignal):
* eval.c (flagged_a_squirmer):
Call throw_or_bomb_out, not Fthrow, now that the latter is a
special form.
* eval.c:
Make Qthrow, Qobsolete_throw available as symbols.
Provide multiple_value_current_limit, multiple-values-limit (the
latter as specified by Common Lisp.
* eval.c (For):
Ignore multiple values when comparing with Qnil, but pass any
multiple values back for the last arg.
* eval.c (Fand):
Ditto.
* eval.c (Fif):
Ignore multiple values when examining the result of the
condition.
* eval.c (Fcond):
Ignore multiple values when comparing what the clauses give, but
pass them back if a clause gave non-nil.
* eval.c (Fprog2):
Never pass back multiple values.
* eval.c (FletX, Flet):
Ignore multiple when evaluating what exactly symbols should be
bound to.
* eval.c (Fwhile):
Ignore multiple values when evaluating the test.
* eval.c (Fsetq, Fdefvar, Fdefconst):
Ignore multiple values.
* eval.c (Fthrow):
Declare this as a special form; ignore multiple values for TAG,
preserve them for VALUE.
* eval.c (throw_or_bomb_out):
Make this available to other files, now Fthrow is a special form.
* eval.c (Feval):
Ignore multiple values when calling a compiled function, a
non-special-form subr, or a lambda expression.
* eval.c (Ffuncall):
If we attempt to call #'throw (now a special form) as a function,
don't error, call #'obsolete-throw instead.
* eval.c (make_multiple_value, multiple_value_aset)
(multiple_value_aref, print_multiple_value, mark_multiple_value)
(size_multiple_value):
Implement the multiple_value type. Add a long comment describing
our implementation.
* eval.c (bind_multiple_value_limits):
New function, used by the bytecode and by #'multiple-value-call,
#'multiple-value-list-internal.
* eval.c (multiple_value_call):
New function, used by the bytecode and #'multiple-value-call.
* eval.c (Fmultiple_value_call):
New special form.
* eval.c (multiple_value_list_internal):
New function, used by the byte code and
#'multiple-value-list-internal.
* eval.c (Fmultiple_value_list_internal, Fmultiple_value_prog1):
New special forms.
* eval.c (Fvalues, Fvalues_list):
New Lisp functions.
* eval.c (values2):
New function, for C code returning multiple values.
* eval.c (syms_of_eval):
Make our new Lisp functions and symbols available.
* eval.c (multiple-values-limit):
Make this available to Lisp.
* event-msw.c (dde_eval_string):
* event-stream.c (execute_help_form):
* glade.c (connector):
* glyphs-widget.c (glyph_instantiator_to_glyph):
* glyphs.c (evaluate_xpm_color_symbols):
* gui-x.c (wv_set_evalable_slot, button_item_to_widget_value):
* gui.c (gui_item_value, gui_item_display_flush_left):
* lread.c (check_if_suppressed):
* menubar-gtk.c (menu_convert, menu_descriptor_to_widget_1):
* menubar-msw.c (populate_menu_add_item):
* print.c (Fwith_output_to_temp_buffer):
* symbols.c (Fsetq_default):
Ignore multiple values when calling Feval.
* symeval.h:
Add the header declarations necessary for the multiple-values
implementation.
* inline.c:
#include symeval.h, now that it has some inline functions.
* lisp.h:
Update Fthrow's declaration. Make throw_or_bomb_out available to
all files.
* lrecord.h (enum lrecord_type):
Add the multiple_value type here.
author | Aidan Kehoe <kehoea@parhasard.net> |
---|---|
date | Sun, 16 Aug 2009 20:55:49 +0100 |
parents | 44de306310b8 |
children | 308d34e9f07d |
rev | line source |
---|---|
448 | 1 ;;; package-net.el --- Installation and Maintenance of XEmacs packages |
2 | |
3 ;; Copyright (C) 2000 Andy Piper. | |
4 | |
5 ;; Keywords: internal | |
6 | |
7 ;; This file is part of XEmacs. | |
8 | |
9 ;; XEmacs is free software; you can redistribute it and/or modify it | |
10 ;; under the terms of the GNU General Public License as published by | |
11 ;; the Free Software Foundation; either version 2, or (at your option) | |
12 ;; any later version. | |
13 | |
14 ;; XEmacs is distributed in the hope that it will be useful, but | |
15 ;; WITHOUT ANY WARRANTY; without even the implied warranty of | |
16 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | |
17 ;; General Public License for more details. | |
18 | |
19 ;; You should have received a copy of the GNU General Public License | |
20 ;; along with XEmacs; see the file COPYING. If not, write to the Free | |
21 ;; Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA | |
22 ;; 02111-1307, USA. | |
23 | |
24 ;;; Synched up with: Not in FSF | |
25 | |
26 ;;; Commentary: | |
27 | |
28 ;; Manipulate packages for the netinstall setup utility | |
29 | |
452 | 30 ;; The process should be so: |
31 | |
32 ;; 1. The package maintainer or release manager makes a release | |
33 ;; announcement. | |
34 ;; | |
35 ;; 2. For a new package releases the netinstall maintainer simply | |
36 ;; needs to update `ftp://ftp.xemacs.org/pub/xemacs/setup.ini'. This is | |
37 ;; harder than it sounds because the file also includes information | |
38 ;; about the binary releases. At the moment going to the netinstall | |
39 ;; directory and typing: | |
40 ;; | |
41 ;; `make XEMACS=<current executable location> setup.ini' | |
42 ;; | |
43 ;; will do the right thing provided that: | |
44 ;; | |
45 ;; (a) `package-net-cygwin32-binary-size' and | |
46 ;; `package-net-win32-binary-size' are set correctly. | |
47 ;; | |
48 ;; (b) The binary pointed to by `XEMACS' has a current | |
49 ;; `package-index.LATEST.pgp' file. If you don't specify the XEMACS= | |
50 ;; part then you will get whatever is current for your build tree - | |
51 ;; which is probably not what you want. | |
52 ;; | |
53 ;; You can run `package-net-convert-index-to-ini' manually and specify | |
54 ;; REMOTE but I generally found that to be inconvenient and error-prone. | |
55 ;; | |
56 ;; 3. For package releases that's all you need to do. For binary | |
57 ;; releases you need to build both cygwin and win32 binaries and put | |
673 | 58 ;; them in appropriate tarballs: This can be achieved by running |
59 ;; build-msw-release.sh | |
452 | 60 ;; |
61 | |
448 | 62 (require 'package-admin) |
63 (require 'package-get) | |
64 | |
65 ;; What path should we use from the myriad available? | |
66 ;; For netinstall we just want something simple, and anyway this is only to | |
67 ;; bootstrap the process. This will be: | |
68 ;; <root>/setup/ for native windows | |
69 ;; <root>/lib/xemacs/setup for cygwin. | |
452 | 70 ;; |
71 ;;; To Do: | |
72 ;; | |
73 ;; 1. Package update functions should also update the installed | |
74 ;; database so that running setup.exe again does not reinstall | |
75 ;; packages. | |
76 ;; | |
77 ;; 2. Generating setup.ini should be more automatic. | |
78 | |
673 | 79 (defvar package-net-cygwin32-binary-size 0 |
452 | 80 "The size in bytes of the cygwin32 binary distribution.") |
81 | |
673 | 82 (defvar package-net-win32-binary-size 0 |
452 | 83 "The size in bytes of the win32 binary distribution.") |
84 | |
707 | 85 (defvar package-net-kit-version "" |
86 "XEmacs kitting revision, usually empty.") | |
87 | |
673 | 88 (defvar package-net-setup-version "1.0" |
89 "The version string of setup.") | |
90 | |
452 | 91 ;;;###autoload |
448 | 92 (defun package-net-setup-directory () |
93 (file-truename (concat data-directory "../../" (if (eq system-type 'cygwin32) | |
94 "xemacs/setup/" "setup/")))) | |
95 | |
673 | 96 (defun package-net-generate-bin-ini (&optional version) |
97 "Convert the package index to ini file format in the current directory." | |
98 (let ((buf (get-buffer-create "*setup-bin.ini*"))) | |
99 (unwind-protect | |
100 (save-excursion | |
101 (set-buffer buf) | |
102 (erase-buffer buf) | |
103 (goto-char (point-min)) | |
104 (insert "# This file is automatically generated. If you edit it, your\n") | |
105 (insert "# edits will be discarded next time the file is generated.\n") | |
106 (insert "#\n\n") | |
107 (insert (format "setup-timestamp: %d\n" | |
108 (+ (* (car (current-time)) 65536) (car (cdr (current-time)))))) | |
109 (insert (format "setup-version: %s\n\n" (or version "1.0"))) | |
110 ;; Native version | |
111 (insert (format "@ %s\n" "xemacs-i586-pc-win32")) | |
707 | 112 (insert (format "version: %s%s\n" emacs-program-version |
113 package-net-kit-version)) | |
673 | 114 (insert "type: native\n") |
115 (insert (format "install: win32/%s %d\n\n" | |
116 (concat emacs-program-name | |
117 "-i586-pc-win32-" | |
707 | 118 emacs-program-version package-net-kit-version |
119 ".tar.gz") | |
673 | 120 package-net-win32-binary-size)) |
121 ;; Cygwin version | |
122 (insert (format "@ %s\n" "xemacs-i686-pc-cygwin")) | |
707 | 123 (insert (format "version: %s%s\n" emacs-program-version |
124 package-net-kit-version)) | |
673 | 125 (insert "type: cygwin\n") |
126 (insert (format "install: cygwin32/%s %d\n\n" | |
127 (concat emacs-program-name | |
128 "-i686-pc-cygwin-" | |
707 | 129 emacs-program-version package-net-kit-version |
130 ".tar.gz") | |
673 | 131 package-net-cygwin32-binary-size)) |
132 (insert "# setup.ini file ends here\n") | |
133 (write-region (point-min) (point-max) "setup-bin.ini"))) | |
134 (kill-buffer buf))) | |
135 | |
136 (defun package-net-batch-generate-bin-ini () | |
452 | 137 "Convert the package index to ini file format." |
138 (unless noninteractive | |
1410 | 139 (error 'invalid-operation |
140 "`package-net-batch-generate-bin-ini' is to be used only with -batch")) | |
673 | 141 (package-net-generate-bin-ini package-net-setup-version)) |
452 | 142 |
143 ;;;###autoload | |
448 | 144 (defun package-net-update-installed-db (&optional destdir) |
145 "Write out the installed package index in a net install suitable format. | |
146 If DESTDIR is non-nil then use that as the destination directory. | |
147 DESTDIR defaults to the value of `package-net-setup-directory'." | |
148 | |
454 | 149 (when (or (eq system-type 'cygwin32) |
150 (eq system-type 'window-nt)) | |
151 (setq destdir (file-name-as-directory | |
152 (or destdir (package-net-setup-directory)))) | |
153 (let ((buf (get-buffer-create "*installed.db*"))) | |
154 (unwind-protect | |
155 (save-excursion | |
156 (set-buffer buf) | |
157 (erase-buffer buf) | |
158 (goto-char (point-min)) | |
159 ;; we use packages-package-list here as we actually want to | |
160 ;; update relative to the installed reality | |
161 (let ((entries packages-package-list) entry version) | |
162 (while entries | |
163 (setq entry (car entries)) | |
164 (setq version (plist-get (cdr entry) :version)) | |
165 ;; Unfortunately we can't read the size from this | |
166 (insert (format "%s %s-%3.2f-pkg.tar.gz 0\n" (symbol-name (car entry)) | |
167 (symbol-name (car entry)) | |
168 version)) | |
169 (setq entries (cdr entries)))) | |
170 (make-directory-path destdir) | |
171 (write-region (point-min) (point-max) (concat destdir "installed.db"))) | |
172 (kill-buffer buf))))) | |
448 | 173 |
174 (defun package-net-convert-download-sites-to-mirrors (&optional destdir) | |
175 "Write out the download site list in a net install suitable format. | |
176 If DESTDIR is non-nil then use that as the destination directory. | |
177 DESTDIR defaults to the value of `data-directory'." | |
178 | |
179 (setq destdir (file-name-as-directory (or destdir data-directory))) | |
180 (let ((buf (get-buffer-create "*mirrors.lst*"))) | |
181 (unwind-protect | |
182 (save-excursion | |
183 (set-buffer buf) | |
184 (erase-buffer buf) | |
185 (goto-char (point-min)) | |
186 (let ((entries package-get-download-sites) entry) | |
187 (while entries | |
188 (setq entry (car entries)) | |
189 (insert (format "ftp://%s/%s;%s;%s\n" | |
190 (nth 1 entry) (substring (nth 2 entry) 0 -9) | |
191 (nth 0 entry) (nth 0 entry))) | |
192 (setq entries (cdr entries)))) | |
193 (write-region (point-min) (point-max) (concat destdir "mirrors.lst"))) | |
194 (kill-buffer buf)))) |