Mercurial > hg > xemacs-beta
view src/number-gmp.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 | ee35a8fdcfcd |
| children | 2fc0e2f18322 |
line wrap: on
line source
/* Definitions of numeric types for XEmacs using the GNU MP library. 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. */ /* This library defines the following types: bignum = mpz_t ratio = mpq_t bigfloat = mpf_t */ #ifndef INCLUDED_number_gmp_h_ #define INCLUDED_number_gmp_h_ #ifdef UNO /* Uno complains about several inline functions that include conditions with assignments and side effects if we don't do this */ #undef __GNUC__ #endif #ifdef _MSC_VER /* "unary minus operator applied to unsigned type, result still unsigned": Occurs on line 1596 of gmp.h in version 4.1.4. */ #pragma warning ( disable : 4146 ) #endif #include <gmp.h> #ifdef _MSC_VER #pragma warning ( default : 4146 ) #endif typedef mpz_t bignum; typedef mpq_t ratio; typedef mpf_t bigfloat; extern void init_number_gmp(void); /********************************* Bignums **********************************/ #define HAVE_BIGNUM 1 extern gmp_randstate_t random_state; /***** Bignum: basic functions *****/ #define bignum_init(b) mpz_init (b) #define bignum_fini(b) mpz_clear (b) #define bignum_hashcode(b) mpz_get_ui (b) #define bignum_sign(b) mpz_sgn (b) #define bignum_evenp(b) mpz_even_p (b) #define bignum_oddp(b) mpz_odd_p (b) /***** Bignum: size *****/ #define bignum_fits_int_p(b) mpz_fits_sint_p (b) #define bignum_fits_uint_p(b) mpz_fits_uint_p (b) #define bignum_fits_long_p(b) mpz_fits_slong_p (b) #define bignum_fits_ulong_p(b) mpz_fits_ulong_p (b) /***** Bignum: conversions *****/ #define bignum_to_string(b,base) mpz_get_str (NULL, base, b) #define bignum_to_int(b) ((int) mpz_get_si (b)) #define bignum_to_uint(b) ((unsigned int) mpz_get_ui (b)) #define bignum_to_long(b) mpz_get_si (b) #define bignum_to_ulong(b) mpz_get_ui (b) #define bignum_to_double(b) mpz_get_d (b) /***** Bignum: converting assignments *****/ #define bignum_set(b1,b2) mpz_set (b1, b2) #define bignum_set_string(b,s,base) mpz_set_str (b, s, base) #define bignum_set_long(b,l) mpz_set_si (b, l) #define bignum_set_ulong(b,l) mpz_set_ui (b, l) #define bignum_set_double(b,f) mpz_set_d (b, f) #define bignum_set_ratio(b,r) mpz_set_q (b, r) #define bignum_set_bigfloat(b,f) mpz_set_f (b, f) /***** Bignum: comparisons *****/ #define bignum_cmp(b1,b2) mpz_cmp (b1, b2) #define bignum_lt(b1,b2) (mpz_cmp (b1, b2) < 0) #define bignum_le(b1,b2) (mpz_cmp (b1, b2) <= 0) #define bignum_eql(b1,b2) (mpz_cmp (b1, b2) == 0) #define bignum_ge(b1,b2) (mpz_cmp (b1, b2) >= 0) #define bignum_gt(b1,b2) (mpz_cmp (b1, b2) > 0) /***** Bignum: arithmetic *****/ #define bignum_neg(b,b2) mpz_neg (b, b2) #define bignum_abs(b,b2) mpz_abs (b, b2) #define bignum_add(b,b1,b2) mpz_add (b, b1, b2) #define bignum_sub(b,b1,b2) mpz_sub (b, b1, b2) #define bignum_mul(b,b1,b2) mpz_mul (b, b1, b2) #define bignum_divisible_p(b1,b2) mpz_divisible_p (b1, b2) #define bignum_div(b,b1,b2) mpz_tdiv_q (b, b1, b2) #define bignum_ceil(b,b1,b2) mpz_cdiv_q (b, b1, b2) #define bignum_floor(b,b1,b2) mpz_fdiv_q (b, b1, b2) #define bignum_mod(b,b1,b2) mpz_mod (b, b1, b2) #define bignum_pow(res,b,pow) mpz_pow_ui (res, b, pow) #define bignum_gcd(res,b1,b2) mpz_gcd (res, b1, b2) #define bignum_lcm(res,b1,b2) mpz_lcm (res, b1, b2) /***** Bignum: bit manipulations *****/ #define bignum_and(res,b1,b2) mpz_and (res, b1, b2) #define bignum_ior(res,b1,b2) mpz_ior (res, b1, b2) #define bignum_xor(res,b1,b2) mpz_xor (res, b1, b2) #define bignum_not(res,b) mpz_com (res, b) #define bignum_setbit(b,bit) mpz_setbit (b, bit) #define bignum_clrbit(b,bit) mpz_clrbit (b, bit) #define bignum_testbit(b,bit) mpz_tstbit (b, bit) #define bignum_lshift(res,b,bits) mpz_mul_2exp (res, b, bits) #define bignum_rshift(res,b,bits) mpz_fdiv_q_2exp (res, b, bits) /***** Bignum: random numbers *****/ #define bignum_random_seed(seed) gmp_randseed_ui (random_state, seed) #define bignum_random(res,limit) mpz_urandomm (res, random_state, limit) /********************************** Ratios **********************************/ #define HAVE_RATIO 1 /***** Ratio: basic functions *****/ #define ratio_init(r) mpq_init (r) #define ratio_fini(r) mpq_clear (r) #define ratio_hashcode(r) \ (mpz_get_ui (mpq_denref (r)) * mpz_get_ui (mpq_numref (r))) #define ratio_sign(r) mpq_sgn (r) #define ratio_numerator(r) mpq_numref (r) #define ratio_denominator(r) mpq_denref (r) #define ratio_canonicalize(r) mpq_canonicalize (r) /***** Ratio: conversions *****/ #define ratio_to_string(r,base) mpq_get_str (NULL, base, r) #define ratio_to_int(r) ((int) (mpq_get_d (r))) #define ratio_to_uint(r) ((unsigned int) (mpq_get_d (r))) #define ratio_to_long(r) ((long) (mpq_get_d (r))) #define ratio_to_ulong(r) ((unsigned long) (mpq_get_d (r))) #define ratio_to_double(r) mpq_get_d (r) /***** Ratio: converting assignments *****/ #define ratio_set(r1,r2) mpq_set (r1, r2) #define ratio_set_string(r,s,base) mpq_set_str (r, s, base) #define ratio_set_long(r,l) mpq_set_si (r, l, 1UL) #define ratio_set_ulong(r,l) mpq_set_ui (r, l, 1UL) #define ratio_set_double(r,f) mpq_set_d (r, f) #define ratio_set_bignum(r,b) mpq_set_z (r, b) #define ratio_set_bigfloat(r,f) mpq_set_f (r, f) #define ratio_set_long_ulong(r,num,den) mpq_set_si (r, num, den) #define ratio_set_ulong_ulong(r,num,den) mpq_set_ui (r, num, den) /* FIXME: Why does this canonicalize, but the previous 2 don't? */ #define ratio_set_bignum_bignum(r,num,den) do { \ mpz_set (mpq_numref (r), num); \ mpz_set (mpq_denref (r), den); \ mpq_canonicalize (r); \ } while (0) /***** Ratio: comparisons *****/ #define ratio_cmp(r1,r2) mpq_cmp (r1, r2) #define ratio_lt(r1,r2) (mpq_cmp (r1, r2) < 0) #define ratio_le(r1,r2) (mpq_cmp (r1, r2) <= 0) #define ratio_eql(r1,r2) mpq_equal (r1, r2) #define ratio_ge(r1,r2) (mpq_cmp (r1, r2) >= 0) #define ratio_gt(r1,r2) (mpq_cmp (r1, r2) > 0) /***** Ratio: arithmetic *****/ #define ratio_neg(q,q2) mpq_neg (q, q2) #define ratio_abs(q,q2) mpq_abs (q, q2) #define ratio_inv(q,q2) mpq_inv (q, q2) #define ratio_add(res,q1,q2) mpq_add (res, q1, q2) #define ratio_sub(res,q1,q2) mpq_sub (res, q1, q2) #define ratio_mul(res,q1,q2) mpq_mul (res, q1, q2) #define ratio_div(res,q1,q2) mpq_div (res, q1, q2) /******************************** Bigfloats *********************************/ #define HAVE_BIGFLOAT 1 /***** Bigfloat: basic functions *****/ #define bigfloat_init(f) mpf_init (f) #define bigfloat_init_prec(f,prec) mpf_init2 (f, prec) #define bigfloat_fini(f) mpf_clear (f) #define bigfloat_hashcode(f) mpf_get_ui (f) #define bigfloat_sign(f) mpf_sgn (f) #define bigfloat_get_prec(f) mpf_get_prec (f) #define bigfloat_set_prec(f, prec) mpf_set_prec (f, prec) #define bigfloat_set_default_prec(prec) mpf_set_default_prec(prec) #define bigfloat_get_default_prec() mpf_get_default_prec () /***** Bigfloat: conversions *****/ extern CIbyte *bigfloat_to_string (bigfloat f, int base); #define bigfloat_to_int(f) ((int) mpf_get_si (f)) #define bigfloat_to_uint(f) ((unsigned int) mpf_get_ui (f)) #define bigfloat_to_long(f) mpf_get_si (f) #define bigfloat_to_ulong(f) mpf_get_ui (f) #define bigfloat_to_double(f) mpf_get_d (f) /***** Bigfloat: converting assignments *****/ #define bigfloat_set(f1,f2) mpf_set (f1, f2) #define bigfloat_set_string(f,str,base) mpf_set_str (f, str, base) #define bigfloat_set_long(f,l) mpf_set_si (f, l) #define bigfloat_set_ulong(f,l) mpf_set_ui (f, l) #define bigfloat_set_double(d,f) mpf_set_d (d, f) #define bigfloat_set_bignum(f,b) mpf_set_z (f, b) #define bigfloat_set_ratio(f,r) mpf_set_q (f, r) /***** Bigfloat: comparisons *****/ #define bigfloat_cmp(f1,f2) mpf_cmp (f1, f2) #define bigfloat_lt(f1,f2) (mpf_cmp (f1, f2) < 0) #define bigfloat_le(f1,f2) (mpf_cmp (f1, f2) <= 0) #define bigfloat_eql(f1,f2) (mpf_cmp (f1, f2) == 0) #define bigfloat_eql_bits(f1,f2,bits) mpf_eq (f1, f2, bits) #define bigfloat_ge(f1,f2) (mpf_cmp (f1, f2) >= 0) #define bigfloat_gt(f1,f2) (mpf_cmp (f1, f2) > 0) /***** Bigfloat: arithmetic *****/ #define bigfloat_neg(f,f2) mpf_neg (f, f2) #define bigfloat_abs(f,f2) mpf_abs (f, f2) #define bigfloat_add(res,f1,f2) mpf_add (res, f1, f2) #define bigfloat_sub(res,f1,f2) mpf_sub (res, f1, f2) #define bigfloat_mul(res,f1,f2) mpf_mul (res, f1, f2) #define bigfloat_div(res,f1,f2) mpf_div (res, f1, f2) #define bigfloat_ceil(res,f) mpf_ceil (res, f) #define bigfloat_floor(res,f) mpf_floor (res, f) #define bigfloat_trunc(res,f) mpf_trunc (res, f) #define bigfloat_sqrt(res,f) mpf_sqrt (res, f) #define bigfloat_pow(res,f,exp) mpf_pow_ui (res, f, exp) #endif /* INCLUDED_number_gmp_h_ */