Mercurial > hg > xemacs-beta
annotate src/glade.c @ 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 | 91d4c8c65a0f |
children | db7068430402 |
rev | line source |
---|---|
462 | 1 /* glade.c |
2 ** | |
3 ** Description: Interface to `libglade' for XEmacs/GTK | |
4 ** | |
5 ** Created by: William M. Perry <wmperry@gnu.org> | |
6 ** | |
7 ** Copyright (C) 1999 John Harper <john@dcs.warwick.ac.uk> | |
8 ** Copyright (c) 2000 Free Software Foundation | |
9 ** | |
10 */ | |
11 | |
12 #if defined(HAVE_GLADE_H) || defined(HAVE_GLADE_GLADE_H) | |
13 | |
14 /* For COMPILED_FUNCTIONP */ | |
15 #include "bytecode.h" | |
16 | |
17 #ifdef HAVE_GLADE_GLADE_H | |
18 #include <glade/glade.h> | |
19 #endif | |
20 | |
21 #ifdef HAVE_GLADE_H | |
22 #include <glade.h> | |
23 #endif | |
24 | |
25 /* This is based on the code from rep-gtk 0.11 in libglade-support.c */ | |
26 | |
27 static void | |
28 connector (const gchar *handler_name, GtkObject *object, | |
29 const gchar *signal_name, const gchar *signal_data, | |
30 GtkObject *connect_object, gboolean after, gpointer user_data) | |
31 { | |
32 Lisp_Object func; | |
33 Lisp_Object lisp_data = Qnil; | |
34 | |
826 | 35 func = VOID_TO_LISP (user_data); |
462 | 36 |
37 if (NILP (func)) | |
38 { | |
39 /* Look for a lisp function called HANDLER_NAME */ | |
40 func = intern (handler_name); | |
41 } | |
42 | |
43 if (signal_data && signal_data[0]) | |
44 { | |
4677
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
2054
diff
changeset
|
45 lisp_data |
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
2054
diff
changeset
|
46 = IGNORE_MULTIPLE_VALUES (Feval (Fread (build_string (signal_data)))); |
462 | 47 } |
48 | |
49 /* obj, name, func, cb_data, object_signal, after_p */ | |
50 Fgtk_signal_connect (build_gtk_object (object), | |
51 intern (signal_name), | |
52 func, | |
53 lisp_data, | |
54 connect_object ? Qt : Qnil, | |
55 after ? Qt : Qnil); | |
56 } | |
57 | |
58 /* This differs from lisp/subr.el (functionp) definition by allowing | |
59 ** symbol names that may not necessarily be fboundp yet. | |
60 */ | |
61 static int __almost_functionp (Lisp_Object obj) | |
62 { | |
63 return (SYMBOLP (obj) || | |
64 SUBRP (obj) || | |
65 COMPILED_FUNCTIONP (obj) || | |
66 EQ (Fcar_safe (obj), Qlambda)); | |
67 } | |
68 | |
69 DEFUN ("glade-xml-signal-connect", Fglade_xml_signal_connect, 3, 3, 0, /* | |
70 Connect a glade handler. | |
71 */ | |
72 (xml, handler_name, func)) | |
73 { | |
74 CHECK_GTK_OBJECT (xml); | |
75 CHECK_STRING (handler_name); | |
76 | |
77 if (!__almost_functionp (func)) | |
78 { | |
79 func = wrong_type_argument (intern ("functionp"), func); | |
80 } | |
81 | |
82 glade_xml_signal_connect_full (GLADE_XML (XGTK_OBJECT (xml)->object), | |
2054 | 83 (char*) XSTRING_DATA (handler_name), |
462 | 84 connector, LISP_TO_VOID (func)); |
85 return (Qt); | |
86 } | |
87 | |
88 DEFUN ("glade-xml-signal-autoconnect", Fglade_xml_signal_autoconnect, 1, 1, 0, /* | |
89 Connect all glade handlers. | |
90 */ | |
91 (xml)) | |
92 { | |
93 CHECK_GTK_OBJECT (xml); | |
94 | |
95 glade_xml_signal_autoconnect_full (GLADE_XML (XGTK_OBJECT (xml)->object), | |
96 connector, LISP_TO_VOID (Qnil)); | |
97 return (Qt); | |
98 } | |
99 | |
100 DEFUN ("glade-xml-textdomain", Fglade_xml_textdomain, 1, 1, 0, /* | |
101 Return the textdomain of a GladeXML object. | |
102 */ | |
103 (xml)) | |
104 { | |
105 gchar *the_domain = NULL; | |
106 | |
107 CHECK_GTK_OBJECT (xml); | |
108 | |
109 if (!GLADE_IS_XML (XGTK_OBJECT (xml)->object)) | |
110 { | |
563 | 111 wtaerror ("Object is not a GladeXML type.", xml); |
462 | 112 } |
113 | |
114 #ifdef LIBGLADE_XML_TXTDOMAIN | |
115 the_domain = GLADE_XML (XGTK_OBJECT (xml)->object)->txtdomain; | |
116 #else | |
117 the_domain = GLADE_XML (XGTK_OBJECT (xml)->object)->textdomain; | |
118 #endif | |
119 return (build_string (the_domain)); | |
120 } | |
121 | |
122 void syms_of_glade (void) | |
123 { | |
124 DEFSUBR (Fglade_xml_signal_connect); | |
125 DEFSUBR (Fglade_xml_signal_autoconnect); | |
126 DEFSUBR (Fglade_xml_textdomain); | |
127 } | |
128 | |
129 void vars_of_glade (void) | |
130 { | |
131 Fprovide (intern ("glade")); | |
132 } | |
133 | |
134 #else /* !(HAVE_GLADE_H || HAVE_GLADE_GLADE_H) */ | |
135 #define syms_of_glade() | |
136 #define vars_of_glade() | |
137 #endif |