Mercurial > hg > xemacs-beta
annotate netinstall/source.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 | a307f9a2021d |
| 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 * | |
| 673 | 14 * Sync'ed with cinstall 2001-10-16 |
| 448 | 15 */ |
| 16 | |
| 17 /* The purpose of this file is to manage the dialog box that lets the | |
| 18 user choose the source of the install - from the net, from the | |
| 19 current directory, or to just download files. */ | |
| 20 | |
| 21 #include "win32.h" | |
| 22 #include <stdio.h> | |
| 23 #include "dialog.h" | |
| 24 #include "resource.h" | |
| 25 #include "state.h" | |
| 26 #include "msg.h" | |
| 27 #include "log.h" | |
| 28 | |
| 673 | 29 static int rb[] = { IDC_SOURCE_NETINST, IDC_SOURCE_DOWNLOAD, IDC_SOURCE_CWD, 0 }; |
| 448 | 30 |
| 31 static void | |
| 32 load_dialog (HWND h) | |
| 33 { | |
| 34 rbset (h, rb, source); | |
| 35 } | |
| 36 | |
| 37 static void | |
| 38 save_dialog (HWND h) | |
| 39 { | |
| 40 source = rbget (h, rb); | |
| 41 } | |
| 42 | |
| 43 static BOOL | |
| 44 dialog_cmd (HWND h, int id, HWND hwndctl, UINT code) | |
| 45 { | |
| 46 switch (id) | |
| 47 { | |
| 48 | |
| 49 case IDC_SOURCE_DOWNLOAD: | |
| 50 case IDC_SOURCE_NETINST: | |
| 51 case IDC_SOURCE_CWD: | |
| 52 save_dialog (h); | |
| 53 break; | |
| 54 | |
| 55 case IDOK: | |
| 56 save_dialog (h); | |
| 57 NEXT (IDD_LOCAL_DIR); | |
| 58 break; | |
| 59 | |
| 60 case IDC_BACK: | |
| 61 save_dialog (h); | |
| 62 NEXT (0); | |
| 63 break; | |
| 64 | |
| 65 case IDCANCEL: | |
| 66 NEXT (0); | |
| 67 break; | |
| 673 | 68 |
| 69 default: | |
| 70 break; | |
| 448 | 71 } |
| 72 } | |
| 73 | |
| 74 static BOOL CALLBACK | |
| 75 dialog_proc (HWND h, UINT message, WPARAM wParam, LPARAM lParam) | |
| 76 { | |
| 77 switch (message) | |
| 78 { | |
| 79 case WM_INITDIALOG: | |
| 80 load_dialog (h); | |
| 673 | 81 // Check to see if any radio buttons are selected. If not, select a default. |
| 82 if ((!SendMessage(GetDlgItem (h, IDC_SOURCE_DOWNLOAD), BM_GETCHECK, 0, 0) == BST_CHECKED) | |
| 83 && (!SendMessage(GetDlgItem (h, IDC_SOURCE_CWD), BM_GETCHECK, 0, 0) == BST_CHECKED)) | |
| 84 { | |
| 85 SendMessage(GetDlgItem (h, IDC_SOURCE_NETINST), BM_SETCHECK, BST_CHECKED, 0); | |
| 86 } | |
| 448 | 87 return FALSE; |
| 88 case WM_COMMAND: | |
| 89 return HANDLE_WM_COMMAND (h, wParam, lParam, dialog_cmd); | |
| 90 } | |
| 91 return FALSE; | |
| 92 } | |
| 93 | |
| 94 void | |
| 95 do_source (HINSTANCE h) | |
| 96 { | |
| 97 int rv = 0; | |
| 673 | 98 /* source = IDC_SOURCE_CWD;*/ |
| 99 source = IDC_SOURCE_NETINST; | |
| 448 | 100 rv = DialogBox (h, MAKEINTRESOURCE (IDD_SOURCE), 0, dialog_proc); |
| 101 if (rv == -1) | |
| 102 fatal (IDS_DIALOG_FAILED); | |
| 103 | |
| 104 log (0, "source: %s", | |
| 105 (source == IDC_SOURCE_DOWNLOAD) ? "download" : | |
| 106 (source == IDC_SOURCE_NETINST) ? "network install" : "from cwd"); | |
| 107 } | |
| 108 |