Mercurial > hg > xemacs-beta
view lisp/win32-native.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 | ecf1ebac70d8 |
children | 308d34e9f07d |
line wrap: on
line source
;;; win32-native.el --- Lisp routines when running on native MS Windows. ;; Copyright (C) 1994 Free Software Foundation, Inc. ;; Copyright (C) 2000, 2004 Ben Wing. ;; Maintainer: XEmacs Development Team ;; Keywords: mouse, 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, 59 Temple Place - Suite 330, ;; Boston, MA 02111-1307, USA. ;;; Synched up with: Not in FSF. ;;; (FSF has stuff in w32-fns.el and term/w32-win.el.) ;;; Commentary: ;; This file is dumped with XEmacs for MS Windows (without cygwin). ;; It is for stuff that is used specifically when `system-type' eq ;; `windows-nt' (i.e. also applies to MinGW), and has nothing to do ;; with the `mswindows' device type. Thus, it probably applies in ;; non-interactive mode as well, and it DOES NOT APPLY to Cygwin. ;; Based (originally) on NT Emacs version by Geoff Voelker ;; (voelker@cs.washington.edu) ;; Ported to XEmacs by Marc Paquette <marcpa@cam.org> ;; Largely modified by Kirill M. Katsnelson <kkm@kis.ru> ;; Rewritten from scratch by Ben Wing <ben@xemacs.org>. No code in common ;; with FSF. ;;; Code: ;; For appending suffixes to directories and files in shell ;; completions. This screws up cygwin users so we leave it out for ;; now. Uncomment this if you only ever want to use cmd. ;(defun nt-shell-mode-hook () ; (setq comint-completion-addsuffix '("\\" . " ") ; comint-process-echoes t)) ;(add-hook 'shell-mode-hook 'nt-shell-mode-hook) ;; Use ";" instead of ":" as a path separator (from files.el). (setq path-separator ";") ;; Set the grep regexp to match entries with drive letters. (defvar grep-regexp-alist) (setq grep-regexp-alist '(("^\\(\\([a-zA-Z]:\\)?[^:( \t\n]+\\)[:( \t]+\\([0-9]+\\)[:) \t]" 1 3))) (defvar mswindows-system-shells '("cmd" "cmd.exe" "command" "command.com" "4nt" "4nt.exe" "4dos" "4dos.exe" "ndos" "ndos.exe") "List of strings recognized as Windows NT/9X system shells. These are shells with native semantics, e.g. they use `/c', not '-c', to pass a command in.") (defun mswindows-system-shell-p (shell-name) (member (downcase (file-name-nondirectory shell-name)) mswindows-system-shells)) (defun init-mswindows-at-startup () ;; shell-file-name is initialized in the C code (callproc.c) from ;; SHELL or COMSPEC. ;; #### If only shell-command-switch could be a function. But there ;; is code littered around that uses it. ;; #### Maybe we should set a symbol-value handler on `shell-file-name' ;; that automatically sets shell-command-switch? (if (mswindows-system-shell-p shell-file-name) (setq shell-command-switch "/c"))) ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;; ;; ;; Quoting process args ;; ;; ;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;; Converting a bunch of args into a single command line or vice-versa is ;; extremely hairy due to the quoting conventions needed. There is in fact ;; code that does this in the CRT, and perhaps we should look at it and ;; follow the logic. ;; Here is some further info from MSDN, discovered *AFTER* the actual code ;; below was written, and hence the code may not follow what it should. ;; !!#### But this is definitely something to be fixed up. The article is ;; called "Parsing C++ Command-Line Arguments", Visual Tools and Langs -> ;; Visual Studio -> Visual C++ -> Reference -> C/C++ Lang and ... -> C++ ;; Lang Ref -> Basic Concepts -> Startup and Termination -> Program ;; Startup: the main Function. ;; Microsoft Specific ;; ;; Microsoft C/C++ startup code uses the following rules when interpreting ;; arguments given on the operating system command line: ;; ;; Arguments are delimited by white space, which is either a space or a tab. ;; ;; The caret character (^) is not recognized as an escape character or ;; delimiter. The character is handled completely by the command-line parser ;; in the operating system before being passed to the argv array in the ;; program. ;; ;; A string surrounded by double quotation marks ("string") is interpreted as ;; a single argument, regardless of white space contained within. A quoted ;; string can be embedded in an argument. ;; ;; A double quotation mark preceded by a backslash ( \") is interpreted as a ;; literal double quotation mark character ("). ;; ;; Backslashes are interpreted literally, unless they immediately precede a ;; double quotation mark. ;; ;; If an even number of backslashes is followed by a double quotation mark, ;; one backslash is placed in the argv array for every pair of backslashes, ;; and the double quotation mark is interpreted as a string delimiter. ;; ;; If an odd number of backslashes is followed by a double quotation mark, one ;; backslash is placed in the argv array for every pair of backslashes, and ;; the double quotation mark is "escaped" by the remaining backslash, ;; causing a literal double quotation mark (") to be placed in argv. ;; ;; The following program demonstrates how command-line arguments are passed: ;; ;; include <iostream.h> ;; ;; void main( int argc, // Number of strings in array argv ;; char *argv[], // Array of command-line argument strings ;; char *envp[] ) // Array of environment variable strings ;; { ;; int count; ;; ;; // Display each command-line argument. ;; cout << "\nCommand-line arguments:\n"; ;; for( count = 0; count < argc; count++ ) ;; cout << " argv[" << count << "] " ;; << argv[count] << "\n"; ;; } ;; ;; Table 2.2 shows example input and expected output, demonstrating the rules ;; in the preceding list. ;; ;; Table 2.2 ;; ;; Command-Line Input argv[1] argv[2] argv[3] ;; ------------------------------------------ ;; "abc" d e abc d e ;; ;; a\\\b d"e f"g h a\\\b de fg h ;; ;; a\\\"b c d a\"b c d ;; ;; a\\\\"b c" d e a\\b c d e ;; ;; END Microsoft Specific ;; ;; note: for pulling apart an arg: ;; each arg consists of either ;; something surrounded by single quotes ;; or ;; one or more of ;; 1. a non-ws, non-" char ;; 2. a section of double-quoted text ;; 3. a section of double-quoted text with end-of-string instead of the final ;; quote. ;; 2 and 3 get handled together. ;; quoted text is one of ;; ;; 1. quote + even number of backslashes + quote, or ;; 2. quote + non-greedy anything + non-backslash + even number of ;; backslashes + quote. ;; we need to separate the two because we unfortunately have no non-greedy ;; ? operator. (urk! we actually do, but it wasn't documented.) --ben ;; if you want to mess around, keep this test case in mind: ;; this string ;; " as'f 'FOO BAR' '' \"\" \"asdf \\ \\\" \\\\\\\" asdfasdf\\\\\" foo\" " ;; should tokenize into this: ;; (" " "as'f" " " "'FOO BAR' " "'' " "\"\"" " " "\"asdf \\ \\\" \\\\\\\" asdfasdf\\\\\"" " " "foo" "\" ") (defvar debug-mswindows-process-command-lines nil "If non-nil, output debug information about the command lines constructed. This can be useful if you are getting process errors where the arguments to the process appear to be getting passed incorrectly.") ;; properly quotify one arg for the vc runtime argv constructor. (defun mswindows-quote-one-vc-runtime-arg (arg &optional quote-shell) ;; we mess with any arg with whitespace, quotes, or globbing chars in it. ;; we also include shell metachars if asked. ;; note that \ is NOT included! it's perfectly OK to include an ;; arg like c:\ or c:\foo. (cond ((equal arg "") "\"\"") ((string-match (if quote-shell "[ \t\n\r\f*?\"<>|&^%]" "[ \t\n\r\f*?\"]") arg) ;; handle nested quotes, possibly preceded by backslashes (setq arg (replace-in-string arg "\\([\\]*\\)\"" "\\1\\1\\\\\"")) ;; handle trailing backslashes (setq arg (replace-in-string arg "\\([\\]+\\)$" "\\1\\1")) (concat "\"" arg "\"")) (t arg))) (defun mswindows-quote-one-simple-arg (arg &optional quote-shell) ;; just put double quotes around args with spaces (and maybe shell ;; metachars). (cond ((equal arg "") "\"\"") ((string-match (if quote-shell "[ \t\n\r\f*?\"<>|&^%]" "[ \t\n\r\f*?]") arg) (concat "\"" arg "\"")) (t arg))) (defun mswindows-quote-one-command-arg (arg) ;; quote an arg to get it past COMMAND.COM/CMD.EXE: need to quote shell ;; metachars with ^. (cond ((equal arg "") "\"\"") (t (replace-in-string "[<>|&^%]" "^\\1" arg)))) (defun mswindows-construct-verbatim-command-line (program args) (mapconcat #'identity args " ")) ;; for use with either standard VC++ compiled programs or Cygwin programs, ;; which emulate the same behavior. (defun mswindows-construct-vc-runtime-command-line (program args) (mapconcat #'mswindows-quote-one-vc-runtime-arg args " ")) ;; this regexp actually separates the arg into individual args, like a ;; shell (such as sh) does, but using vc-runtime rules. it's easy to ;; derive the tokenizing regexp from it, and that's exactly what i did. ;; but oh was it hard to get this first regexp right. --ben ;(defvar mswindows-match-one-cmd-exe-arg-regexp ; (concat ; "^\\(" ; "'\\([\\]*\\)\\2'" "\\|" ; "'.*?[^\\]\\(\\([\\]*\\)\\4'\\)" "\\|" ; "\\(" ; "[^ \t\n\r\f\v\"]" "\\|" ; "\"\\([\\]*\\)\\6\"" "\\|" ; "\".*?[^\\]\\(\\([\\]*\\)\\8\"\\|$\\)" ; "\\)+" ; "\\)" ; "\\([ \t\n\r\f\v]+\\|$\\)")) (defvar mswindows-match-one-cmd-exe-token-regexp (concat "^\\(" "[ \t\n\r\f\v]+" "\\|" "'\\([\\]*\\)\\2'" "\\([ \t\n\r\f\v]+\\|$\\)" "\\|" "'.*?[^\\]\\(\\([\\]*\\)\\5'\\)" "\\([ \t\n\r\f\v]+\\|$\\)" "\\|" "[^ \t\n\r\f\v\"]+" "\\|" "\"\\([\\]*\\)\\7\"" "\\|" "\".*?[^\\]\\(\\([\\]*\\)\\9\"\\|$\\)" "\\)")) (defun mswindows-construct-command-command-line (program args) ;; for use with COMMAND.COM and CMD.EXE: ;; for each arg, tokenize it into quoted and non-quoted sections; ;; then quote all the shell meta-chars with ^; then put everything ;; back together. the truly hard part is the tokenizing -- typically ;; we get a single argument (the command to execute) and we have to ;; worry about quotes that are backslash-quoted and such. (mapconcat #'(lambda (arg) (mapconcat #'(lambda (part) (if (string-match "^'" part) (replace-in-string part "\\([<>|^&%]\\)" "^\\1") part)) (let (parts) (while (and (> (length arg) 0) (string-match mswindows-match-one-cmd-exe-token-regexp arg)) (push (match-string 0 arg) parts) (setq arg (substring arg (match-end 0)))) (if (> (length arg) 0) (push arg parts)) (nreverse parts)) "")) args " ")) (defvar mswindows-construct-process-command-line-alist '( ;; at one point (pre-1.0), this was required for Cygwin bash. ;; evidently, Cygwin changed its arg handling to work just like ;; any standard VC program, so we no longer need it. ;;("[\\/].?.?sh\\." . mswindows-construct-verbatim-command-line) ("[\\/]command\\.com$" . mswindows-construct-command-command-line) ("[\\/]cmd\\.exe$" . mswindows-construct-command-command-line) ("" . mswindows-construct-vc-runtime-command-line)) "An alist for determining proper argument quoting given executable file name. Car of each cons should be a string, a regexp against which the file name is matched. Matching is case-insensitive but does include the directory, so you should begin your regexp with [\\\\/] if you don't want the directory to matter. Alternatively, the car can be a function of one arg, which is called with the executable's name and should return t if this entry should be processed. Cdr is a function symbol, which is called with two args, the executable name and a list of the args passed to it. It should return a string, which includes the executable's args (but not the executable name itself) properly quoted and pasted together. The list is matched in order, and the first matching entry specifies how the processing will happen.") (defun mswindows-construct-process-command-line (args) ;;Properly quote process ARGS for executing (car ARGS). ;;Called from the C code. (let ((fname (car args)) (alist mswindows-construct-process-command-line-alist) (case-fold-search t) (return-me nil) (assoc nil)) (while (and alist (null return-me)) (setq assoc (pop alist)) (if (if (stringp (car assoc)) (string-match (car assoc) fname) (funcall (car assoc) fname)) (setq return-me (cdr assoc)))) (let* ((called-fun (or return-me #'mswindows-construct-vc-runtime-command-line)) (retval (let ((str (funcall called-fun fname (cdr args))) (quoted-fname (mswindows-quote-one-simple-arg fname))) (if (and str (> (length str) 0)) (concat quoted-fname " " str) quoted-fname)))) (when debug-mswindows-process-command-lines (debug-print "mswindows-construct-process-command-line called:\n") (debug-print "received args: \n%s" (let ((n -1)) (mapconcat #'(lambda (arg) (incf n) (format " %d %s\n" n arg)) args ""))) (debug-print "called fun %s\n" called-fun) (debug-print "resulting command line: %s\n" retval)) retval))) ;;; win32-native.el ends here