Mercurial > hg > xemacs-beta
annotate netinstall/splash.cc @ 4995:8431b52e43b1
Move the various map* functions to C; add #'map-into.
src/ChangeLog addition:
2010-01-31 Aidan Kehoe <kehoea@parhasard.net>
Move #'mapcar*, #'mapcan, #'mapc, #'map, #'mapl, #'mapcon to C;
extend #'mapvector, #'mapconcat, #'mapcar to support more
SEQUENCES; have them all error with circular lists.
* fns.c (Fsubseq): Call CHECK_SEQUENCE here; Flength can return
from the debugger if it errors with a non-sequence, leading to a
crash in Fsubseq if sequence really is *not* a sequence.
(mapcarX): Rename mapcar1 to mapcarX; rework it comprehensively to
take an optional lisp output argument, and a varying number of
sequences.
Special-case a single list argument, as we used to, saving its
elements in the stack space for the results before calling
FUNCTION, so FUNCTION can corrupt the list all it
wants. dead_wrong_type_argument() in the other cases if we
encounter a non-cons where we expected a cons.
(Fmapconcat):
Accept further SEQUENCES after separator here. Special-case
the idiom (mapconcat 'identity SEQUENCE), don't even funcall.
(FmapcarX): Rename this from Fmapcar. Accept optional SEQUENCES.
(Fmapvector): Accept optional SEQUENCES.
(Fmapcan, Fmapc, Fmap): Move these here from cl-extra.el.
(Fmap_into): New function, as specified by Common Lisp.
(maplist): New function, the guts of the implementation of
Fmaplist and Fmapl.
(Fmaplist, Fmapl, Fmapcon): Move these from cl-extra.el.
(syms_of_fns):
Add a few needed symbols here, for the type tests
used by #'map. Add the new subrs, with aliases for #'mapc-internal
and #'mapcar.
* general-slots.h: Declare Qcoerce here, now it's used in both
indent.c and fns.c
* indent.c (syms_of_indent): Qcoerce is gone from here.
* lisp.h: Add ARRAYP(), SEQUENCEP(), and the corresponding CHECK_*
macros. Declare Fbit_vector, Fstring, FmapcarX, now other files
need to use them.
* data.c (Farrayp, Fsequencep): Use ARRAYP and SEQUENCEP, just
added to lisp.h
* buffer.c (Fbuffer_list): Now Fmapcar has been renamed FmapcarX
and takes MANY arguments, update this function to reflect that.
lisp/ChangeLog addition:
2010-01-31 Aidan Kehoe <kehoea@parhasard.net>
* cl.el (mapcar*): Delete; this is now in fns.c.
Use #'mapc, not #'mapc-internal in a couple of places.
* cl-macs.el (mapc, mapcar*, map): Delete these compiler macros
now the corresponding functions are in fns.c; there's no run-time
advantage to the macros.
* cl-extra.el (coerce): Extend the possible conversions here a
little; it's not remotely comprehensive yet, though it does allow
running slightly more Common Lisp code than previously.
(cl-mapcar-many): Delete.
(map, maplist, mapc, mapl, mapcan, mapcon): Move these to fns.c.
* bytecomp.el (byte-compile-maybe-mapc):
Use #'mapc itself, not #'mapc-internal, now the former is in C.
(mapcar*): Use #'byte-compile-maybe-mapc as this function's
byte-compile method, now a #'mapc that can take more than one
sequence is in C.
* obsolete.el (cl-mapc): Move this compatibility alias to this file.
* update-elc.el (do-autoload-commands): Use #'mapc, not
#'mapc-internal here.
| author | Aidan Kehoe <kehoea@parhasard.net> |
|---|---|
| date | Sun, 31 Jan 2010 18:29:48 +0000 |
| parents | ce0b3f2eff35 |
| children |
| rev | line source |
|---|---|
| 448 | 1 /* |
| 2 * Copyright (c) 2000, Red Hat, Inc. | |
| 3 * | |
| 4 * This program is free software; you can redistribute it and/or modify | |
| 5 * it under the terms of the GNU General Public License as published by | |
| 6 * the Free Software Foundation; either version 2 of the License, or | |
| 7 * (at your option) any later version. | |
| 8 * | |
| 9 * A copy of the GNU General Public License can be found at | |
| 10 * http://www.gnu.org/ | |
| 11 * | |
| 12 * Written by DJ Delorie <dj@cygnus.com> | |
| 13 * | |
| 14 */ | |
| 15 | |
| 16 /* The purpose of this file is to display the program name, version, | |
| 17 copyright notice, and project URL. */ | |
| 18 | |
| 19 #include "win32.h" | |
| 20 #include <stdio.h> | |
| 21 #include "dialog.h" | |
| 22 #include "resource.h" | |
| 23 #include "msg.h" | |
| 24 #include "version.h" | |
| 25 | |
| 26 static void | |
| 27 load_dialog (HWND h) | |
| 28 { | |
| 29 char buffer[100]; | |
| 30 HWND v = GetDlgItem (h, IDC_VERSION); | |
| 31 sprintf (buffer, "Setup.exe version %s", | |
| 32 version[0] ? version : "[unknown]"); | |
| 33 SetWindowText (v, buffer); | |
| 34 } | |
| 35 | |
| 36 static BOOL | |
| 37 dialog_cmd (HWND h, int id, HWND hwndctl, UINT code) | |
| 38 { | |
| 39 switch (id) | |
| 40 { | |
| 41 | |
| 42 case IDOK: | |
| 43 NEXT (IDD_SOURCE); | |
| 44 break; | |
| 45 | |
| 46 case IDCANCEL: | |
| 47 NEXT (0); | |
| 48 break; | |
| 49 } | |
| 50 return FALSE; | |
| 51 } | |
| 52 | |
| 53 static BOOL CALLBACK | |
| 54 dialog_proc (HWND h, UINT message, WPARAM wParam, LPARAM lParam) | |
| 55 { | |
| 56 switch (message) | |
| 57 { | |
| 58 case WM_INITDIALOG: | |
| 59 load_dialog (h); | |
| 60 return FALSE; | |
| 61 case WM_COMMAND: | |
| 62 return HANDLE_WM_COMMAND (h, wParam, lParam, dialog_cmd); | |
| 63 } | |
| 64 return FALSE; | |
| 65 } | |
| 66 | |
| 67 void | |
| 68 do_splash (HINSTANCE h) | |
| 69 { | |
| 70 int rv = 0; | |
| 71 rv = DialogBox (h, MAKEINTRESOURCE (IDD_SPLASH), 0, dialog_proc); | |
| 72 if (rv == -1) | |
| 73 fatal (IDS_DIALOG_FAILED); | |
| 74 } | |
| 75 |