Mercurial > hg > xemacs-beta
view src/number.h @ 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 | 639cdee384e4 |
children | b5e1d4f6b66f |
line wrap: on
line source
/* Definitions of numeric types for XEmacs. Copyright (C) 2004 Jerry James. 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, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /* Synched up with: Not in FSF. */ #ifndef INCLUDED_number_h_ #define INCLUDED_number_h_ /* The following types are always defined in the same manner: fixnum = whatever fits in the Lisp_Object type integer = union (fixnum, bignum) rational = union (integer, ratio) float = C double floating = union(float, bigfloat) Anybody got a better name? real = union (rational, floating) number = real (should be union(real, complex) but no complex yet) It is up to the library-specific code to define the remaining types, namely: bignum, ratio, and bigfloat. Not all of these types may be available. The top-level configure script should define the symbols HAVE_BIGNUM, HAVE_RATIO, and HAVE_BIGFLOAT to indicate which it provides. If some type is not defined by the library, this is what happens: - bignum: bignump(x) is false for all x; any attempt to create a bignum causes an error to be raised. - ratio: we define our own structure consisting of two Lisp_Objects, which are presumed to be integers (i.e., either fixnums or bignums). We do our own GCD calculation, which is bound to be slow, to keep the ratios reduced to canonical form. (FIXME: Not yet implemented.) - bigfloat: bigfloat(x) is false for all x; any attempt to create a bigfloat causes an error to be raised. We (provide) the following symbols, so that Lisp code has some hope of using this correctly: - (provide 'bignum) if HAVE_BIGNUM - (provde 'ratio) if HAVE_RATIO - (provide 'bigfloat) if HAVE_BIGFLOAT */ /* Load the library definitions */ #ifdef WITH_GMP #include "number-gmp.h" #endif #ifdef WITH_MP #include "number-mp.h" #endif /********************************* Bignums **********************************/ #ifdef HAVE_BIGNUM struct Lisp_Bignum { struct lrecord_header lheader; bignum data; }; typedef struct Lisp_Bignum Lisp_Bignum; DECLARE_LRECORD (bignum, Lisp_Bignum); #define XBIGNUM(x) XRECORD (x, bignum, Lisp_Bignum) #define wrap_bignum(p) wrap_record (p, bignum) #define BIGNUMP(x) RECORDP (x, bignum) #define CHECK_BIGNUM(x) CHECK_RECORD (x, bignum) #define CONCHECK_BIGNUM(x) CONCHECK_RECORD (x, bignum) #define bignum_data(b) (b)->data #define XBIGNUM_DATA(x) bignum_data (XBIGNUM (x)) #define BIGNUM_ARITH_RETURN(b,op) do \ { \ Lisp_Object retval = make_bignum (0); \ bignum_##op (XBIGNUM_DATA (retval), XBIGNUM_DATA (b)); \ return Fcanonicalize_number (retval); \ } while (0) #define BIGNUM_ARITH_RETURN1(b,op,arg) do \ { \ Lisp_Object retval = make_bignum(0); \ bignum_##op (XBIGNUM_DATA (retval), XBIGNUM_DATA (b), arg); \ return Fcanonicalize_number (retval); \ } while (0) #if SIZEOF_EMACS_INT == SIZEOF_LONG # define bignum_fits_emacs_int_p(b) bignum_fits_long_p(b) # define bignum_to_emacs_int(b) bignum_to_long(b) #elif SIZEOF_EMACS_INT == SIZEOF_INT # define bignum_fits_emacs_int_p(b) bignum_fits_int_p(b) # define bignum_to_emacs_int(b) bignum_to_int(b) #else # error Bignums currently do not work with long long Emacs integers. #endif extern Lisp_Object make_bignum (long); extern Lisp_Object make_bignum_bg (bignum); extern bignum scratch_bignum, scratch_bignum2; #else /* !HAVE_BIGNUM */ #define BIGNUMP(x) 0 #define CHECK_BIGNUM(x) dead_wrong_type_argument (Qbignump, x) #define CONCHECK_BIGNUM(x) dead_wrong_type_argument (Qbignump, x) typedef void bignum; #define make_bignum(l) This XEmacs does not support bignums #define make_bignum_bg(b) This XEmacs does not support bignums #endif /* HAVE_BIGNUM */ extern Lisp_Object Qbignump; EXFUN (Fbignump, 1); /********************************* Integers *********************************/ extern Lisp_Object Qintegerp; #define INTEGERP(x) (INTP(x) || BIGNUMP(x)) #define CHECK_INTEGER(x) do { \ if (!INTEGERP (x)) \ dead_wrong_type_argument (Qintegerp, x); \ } while (0) #define CONCHECK_INTEGER(x) do { \ if (!INTEGERP (x)) \ x = wrong_type_argument (Qintegerp, x); \ } while (0) #ifdef HAVE_BIGNUM #define make_integer(x) \ (NUMBER_FITS_IN_AN_EMACS_INT (x) ? make_int (x) : make_bignum (x)) #else #define make_integer(x) make_int (x) #endif extern Fixnum Vmost_negative_fixnum, Vmost_positive_fixnum; EXFUN (Fintegerp, 1); EXFUN (Fevenp, 1); EXFUN (Foddp, 1); /********************************** Ratios **********************************/ #ifdef HAVE_RATIO struct Lisp_Ratio { struct lrecord_header lheader; ratio data; }; typedef struct Lisp_Ratio Lisp_Ratio; DECLARE_LRECORD (ratio, Lisp_Ratio); #define XRATIO(x) XRECORD (x, ratio, Lisp_Ratio) #define wrap_ratio(p) wrap_record (p, ratio) #define RATIOP(x) RECORDP (x, ratio) #define CHECK_RATIO(x) CHECK_RECORD (x, ratio) #define CONCHECK_RATIO(x) CONCHECK_RECORD (x, ratio) #define ratio_data(r) (r)->data #define XRATIO_DATA(r) ratio_data (XRATIO (r)) #define XRATIO_NUMERATOR(r) ratio_numerator (XRATIO_DATA (r)) #define XRATIO_DENOMINATOR(r) ratio_denominator (XRATIO_DATA (r)) #define RATIO_ARITH_RETURN(r,op) do \ { \ Lisp_Object retval = make_ratio (0L, 1UL); \ ratio_##op (XRATIO_DATA (retval), XRATIO_DATA (r)); \ return Fcanonicalize_number (retval); \ } while (0) #define RATIO_ARITH_RETURN1(r,op,arg) do \ { \ Lisp_Object retval = make_ratio (0L, 1UL); \ ratio_##op (XRATIO_DATA (retval), XRATIO_DATA (r), arg); \ return Fcanonicalize_number (retval); \ } while (0) extern Lisp_Object make_ratio (long, unsigned long); extern Lisp_Object make_ratio_bg (bignum, bignum); extern Lisp_Object make_ratio_rt (ratio); extern ratio scratch_ratio; #else /* !HAVE_RATIO */ #define RATIOP(x) 0 #define CHECK_RATIO(x) dead_wrong_type_argument (Qratiop, x) #define CONCHECK_RATIO(x) dead_wrong_type_argument (Qratiop, x) typedef void ratio; #define make_ratio(n,d) This XEmacs does not support ratios #define make_ratio_bg(n,d) This XEmacs does not support ratios #endif /* HAVE_RATIO */ extern Lisp_Object Qratiop; EXFUN (Fratiop, 1); /******************************** Rationals *********************************/ extern Lisp_Object Qrationalp; #define RATIONALP(x) (INTEGERP(x) || RATIOP(x)) #define CHECK_RATIONAL(x) do { \ if (!RATIONALP (x)) \ dead_wrong_type_argument (Qrationalp, x); \ } while (0) #define CONCHECK_RATIONAL(x) do { \ if (!RATIONALP (x)) \ x = wrong_type_argument (Qrationalp, x); \ } while (0) EXFUN (Frationalp, 1); EXFUN (Fnumerator, 1); EXFUN (Fdenominator, 1); /******************************** Bigfloats *********************************/ #ifdef HAVE_BIGFLOAT struct Lisp_Bigfloat { struct lrecord_header lheader; bigfloat bf; }; typedef struct Lisp_Bigfloat Lisp_Bigfloat; DECLARE_LRECORD (bigfloat, Lisp_Bigfloat); #define XBIGFLOAT(x) XRECORD (x, bigfloat, Lisp_Bigfloat) #define wrap_bigfloat(p) wrap_record (p, bigfloat) #define BIGFLOATP(x) RECORDP (x, bigfloat) #define CHECK_BIGFLOAT(x) CHECK_RECORD (x, bigfloat) #define CONCHECK_BIGFLOAT(x) CONCHECK_RECORD (x, bigfloat) #define bigfloat_data(f) ((f)->bf) #define XBIGFLOAT_DATA(x) bigfloat_data (XBIGFLOAT (x)) #define XBIGFLOAT_GET_PREC(x) bigfloat_get_prec (XBIGFLOAT_DATA (x)) #define XBIGFLOAT_SET_PREC(x,p) bigfloat_set_prec (XBIGFLOAT_DATA (x), p) #define BIGFLOAT_ARITH_RETURN(f,op) do \ { \ Lisp_Object retval = make_bigfloat_bf (f); \ bigfloat_##op (XBIGFLOAT_DATA (retval), XBIGFLOAT_DATA (f)); \ return retval; \ } while (0) #define BIGFLOAT_ARITH_RETURN1(f,op,arg) do \ { \ Lisp_Object retval = make_bigfloat_bf (f); \ bigfloat_##op (XBIGFLOAT_DATA (retval), XBIGFLOAT_DATA (f), arg); \ return retval; \ } while (0) extern Lisp_Object make_bigfloat (double, unsigned long); extern Lisp_Object make_bigfloat_bf (bigfloat); extern Lisp_Object Vdefault_float_precision; extern bigfloat scratch_bigfloat, scratch_bigfloat2; #else /* !HAVE_BIGFLOAT */ #define BIGFLOATP(x) 0 #define CHECK_BIGFLOAT(x) dead_wrong_type_argument (Qbigfloatp, x) #define CONCHECK_BIGFLOAT(x) dead_wrong_type_argument (Qbigfloatp, x) typedef void bigfloat; #define make_bigfloat(f) This XEmacs does not support bigfloats #define make_bigfloat_bf(f) This XEmacs does not support bigfloast #endif /* HAVE_BIGFLOAT */ extern Lisp_Object Qbigfloatp; EXFUN (Fbigfloatp, 1); /********************************* Floating *********************************/ extern Lisp_Object Qfloatingp, Qbigfloat; extern Lisp_Object Qread_default_float_format, Vread_default_float_format; #define FLOATINGP(x) (FLOATP (x) || BIGFLOATP (x)) #define CHECK_FLOATING(x) do { \ if (!FLOATINGP (x)) \ dead_wrong_type_argument (Qfloatingp, x); \ } while (0) #define CONCHECK_FLOATING(x) do { \ if (!FLOATINGP (x)) \ x = wrong_type_argument (Qfloating, x); \ } while (0) extern Lisp_Object make_floating (double); EXFUN (Ffloatp, 1); /********************************** Reals ***********************************/ extern Lisp_Object Qrealp; #define REALP(x) (RATIONALP (x) || FLOATINGP (x)) #define CHECK_REAL(x) do { \ if (!REALP (x)) \ dead_wrong_type_argument (Qrealp, x); \ } while (0) #define CONCHECK_REAL(x) do { \ if (!REALP (x)) \ x = wrong_type_argument (Qrealp, x); \ } while (0) EXFUN (Frealp, 1); /********************************* Numbers **********************************/ extern Lisp_Object Qnumberp; #define NUMBERP(x) REALP (x) #define CHECK_NUMBER(x) do { \ if (!NUMBERP (x)) \ dead_wrong_type_argument (Qnumberp, x); \ } while (0) #define CONCHECK_NUMBER(x) do { \ if (!NUMBERP (x)) \ x = wrong_type_argument (Qnumberp, x); \ } while (0) EXFUN (Fcanonicalize_number, 1); enum number_type {FIXNUM_T, BIGNUM_T, RATIO_T, FLOAT_T, BIGFLOAT_T}; extern enum number_type get_number_type (Lisp_Object); extern enum number_type promote_args (Lisp_Object *, Lisp_Object *); #endif /* INCLUDED_number_h_ */