Mercurial > hg > xemacs-beta
view src/number.c @ 5353:38e24b8be4ea
Improve the lexical scoping in #'block, #'return-from.
lisp/ChangeLog addition:
2011-02-07 Aidan Kehoe <kehoea@parhasard.net>
* bytecomp.el:
* bytecomp.el (byte-compile-initial-macro-environment):
Shadow `block', `return-from' here, we implement them differently
when byte-compiling.
* bytecomp.el (byte-compile-active-blocks): New.
* bytecomp.el (byte-compile-block-1): New.
* bytecomp.el (byte-compile-return-from-1): New.
* bytecomp.el (return-from-1): New.
* bytecomp.el (block-1): New.
These are two aliases that exist to have their own associated
byte-compile functions, which functions implement `block' and
`return-from'.
* cl-extra.el (cl-macroexpand-all):
Fix a bug here when macros in the environment have been compiled.
* cl-macs.el (block):
* cl-macs.el (return):
* cl-macs.el (return-from):
Be more careful about lexical scope in these macros.
* cl.el:
* cl.el ('cl-block-wrapper): Removed.
* cl.el ('cl-block-throw): Removed.
These aren't needed in code generated by this XEmacs. They
shouldn't be needed in code generated by XEmacs 21.4, but if it
turns out the packages do need them, we can put them back.
2011-01-30 Mike Sperber <mike@xemacs.org>
* font-lock.el (font-lock-fontify-pending-extents): Don't fail if
`font-lock-mode' is unset, which can happen in the middle of
`revert-buffer'.
2011-01-23 Aidan Kehoe <kehoea@parhasard.net>
* cl-macs.el (delete):
* cl-macs.el (delq):
* cl-macs.el (remove):
* cl-macs.el (remq):
Don't use the compiler macro if these functions were given the
wrong number of arguments, as happens in lisp-tests.el.
* cl-seq.el (remove, remq): Removed.
I added these to subr.el, and forgot to remove them from here.
2011-01-22 Aidan Kehoe <kehoea@parhasard.net>
* bytecomp.el (byte-compile-setq, byte-compile-set):
Remove kludge allowing keywords' values to be set, all the code
that does that is gone.
* cl-compat.el (elt-satisfies-test-p):
* faces.el (set-face-parent):
* faces.el (face-doc-string):
* gtk-font-menu.el:
* gtk-font-menu.el (gtk-reset-device-font-menus):
* msw-font-menu.el:
* msw-font-menu.el (mswindows-reset-device-font-menus):
* package-get.el (package-get-installedp):
* select.el (select-convert-from-image-data):
* sound.el:
* sound.el (load-sound-file):
* x-font-menu.el (x-reset-device-font-menus-core):
Don't quote keywords, they're self-quoting, and the
win from backward-compatibility is sufficiently small now that the
style problem overrides it.
2011-01-22 Aidan Kehoe <kehoea@parhasard.net>
* cl-macs.el (block, return-from): Require that NAME be a symbol
in these macros, as always documented in the #'block docstring and
as required by Common Lisp.
* descr-text.el (unidata-initialize-unihan-database):
Correct the use of non-symbols in #'block and #'return-from in
this function.
2011-01-15 Aidan Kehoe <kehoea@parhasard.net>
* cl-extra.el (concatenate): Accept more complicated TYPEs in this
function, handing the sequences over to #'coerce if we don't
understand them here.
* cl-macs.el (inline): Don't proclaim #'concatenate as inline, its
compiler macro is more useful than doing that.
2011-01-11 Aidan Kehoe <kehoea@parhasard.net>
* subr.el (delete, delq, remove, remq): Move #'remove, #'remq
here, they don't belong in cl-seq.el; move #'delete, #'delq here
from fns.c, implement them in terms of #'delete*, allowing support
for sequences generally.
* update-elc.el (do-autoload-commands): Use #'delete*, not #'delq
here, now the latter's no longer dumped.
* cl-macs.el (delete, delq): Add compiler macros transforming
#'delete and #'delq to #'delete* calls.
2011-01-10 Aidan Kehoe <kehoea@parhasard.net>
* dialog.el (make-dialog-box): Correct a misplaced parenthesis
here, thank you Mats Lidell in 87zkr9gqrh.fsf@mail.contactor.se !
2011-01-02 Aidan Kehoe <kehoea@parhasard.net>
* dialog.el (make-dialog-box):
* list-mode.el (display-completion-list):
These functions used to use cl-parsing-keywords; change them to
use defun* instead, fixing the build. (Not sure what led to me
not including this change in d1b17a33450b!)
2011-01-02 Aidan Kehoe <kehoea@parhasard.net>
* cl-macs.el (define-star-compiler-macros):
Make sure the form has ITEM and LIST specified before attempting
to change to calls with explicit tests; necessary for some tests
in lisp-tests.el to compile correctly.
(stable-union, stable-intersection): Add compiler macros for these
functions, in the same way we do for most of the other functions
in cl-seq.el.
2011-01-01 Aidan Kehoe <kehoea@parhasard.net>
* cl-macs.el (dolist, dotimes, do-symbols, macrolet)
(symbol-macrolet):
Define these macros with defmacro* instead of parsing the argument
list by hand, for the sake of style and readability; use backquote
where appropriate, instead of calling #'list and and friends, for
the same reason.
2010-12-30 Aidan Kehoe <kehoea@parhasard.net>
* x-misc.el (device-x-display):
Provide this function, documented in the Lispref for years, but
not existing previously. Thank you Julian Bradfield, thank you
Jeff Mincy.
2010-12-30 Aidan Kehoe <kehoea@parhasard.net>
* cl-seq.el:
Move the heavy lifting from this file to C. Dump the
cl-parsing-keywords macro, but don't use defun* for the functions
we define that do take keywords, dynamic scope lossage makes that
not practical.
* subr.el (sort, fillarray): Move these aliases here.
(map-plist): #'nsublis is now built-in, but at this point #'eql
isn't necessarily available as a test; use #'eq.
* obsolete.el (cl-delete-duplicates): Make this available for old
compiler macros and old code.
(memql): Document that this is equivalent to #'member*, and worse.
* cl.el (adjoin, subst): Removed. These are in C.
2010-12-30 Aidan Kehoe <kehoea@parhasard.net>
* simple.el (assoc-ignore-case): Remove a duplicate definition of
this function (it's already in subr.el).
* iso8859-1.el (char-width):
On non-Mule, make this function equivalent to that produced by
(constantly 1), but preserve its docstring.
* subr.el (subst-char-in-string): Define this in terms of
#'substitute, #'nsubstitute.
(string-width): Define this using #'reduce and #'char-width.
(char-width): Give this a simpler definition, it makes far more
sense to check for mule at load time and redefine, as we do in
iso8859-1.el.
(store-substring): Implement this in terms of #'replace, now
#'replace is cheap.
2010-12-30 Aidan Kehoe <kehoea@parhasard.net>
* update-elc.el (lisp-files-needed-for-byte-compilation)
(lisp-files-needing-early-byte-compilation):
cl-macs belongs in the former, not the latter, it is as
fundamental as bytecomp.el.
2010-12-30 Aidan Kehoe <kehoea@parhasard.net>
* cl.el:
Provde the Common Lisp program-error, type-error as error
symbols. This doesn't nearly go far enough for anyone using the
Common Lisp errors.
2010-12-29 Aidan Kehoe <kehoea@parhasard.net>
* cl-macs.el (delete-duplicates):
If the form has an incorrect number of arguments, don't attempt a
compiler macroexpansion.
2010-12-29 Aidan Kehoe <kehoea@parhasard.net>
* cl-macs.el (cl-safe-expr-p):
Forms that start with the symbol lambda are also safe.
2010-12-29 Aidan Kehoe <kehoea@parhasard.net>
* cl-macs.el (= < > <= >=):
For these functions' compiler macros, the optimisation is safe
even if the first and the last arguments have side effects, since
they're only used the once.
2010-12-29 Aidan Kehoe <kehoea@parhasard.net>
* cl-macs.el (inline-side-effect-free-compiler-macros):
Unroll a loop here at macro-expansion time, so these compiler
macros are compiled. Use #'eql instead of #'eq in a couple of
places for better style.
2010-12-29 Aidan Kehoe <kehoea@parhasard.net>
* cl-extra.el (notany, notevery): Avoid some dynamic scope
stupidity with local variable names in these functions, when they
weren't prefixed with cl-; go into some more detail in the doc
strings.
2010-12-29 Aidan Kehoe <kehoea@parhasard.net>
* byte-optimize.el (side-effect-free-fns): #'remove, #'remq are
free of side-effects.
(side-effect-and-error-free-fns):
Drop dot, dot-marker from the list.
2010-11-17 Aidan Kehoe <kehoea@parhasard.net>
* cl-extra.el (coerce):
In the argument list, name the first argument OBJECT, not X; the
former name was always used in the doc string and is clearer.
Handle vector type specifications which include the length of the
target sequence, error if there's a mismatch.
* cl-macs.el (cl-make-type-test): Handle type specifications
starting with the symbol 'eql.
2010-11-14 Aidan Kehoe <kehoea@parhasard.net>
* cl-macs.el (eql): Don't remove the byte-compile property of this
symbol. That was necessary to override a bug in bytecomp.el where
#'eql was confused with #'eq, which bug we no longer have.
If neither expression is constant, don't attempt to handle the
expression in this compiler macro, leave it to byte-compile-eql,
which produces better code anyway.
* bytecomp.el (eq): #'eql is not the function associated with the
byte-eq byte code.
(byte-compile-eql): Add an explicit compile method for this
function, for cases where the cl-macs compiler macro hasn't
reduced it to #'eq or #'equal.
2010-10-25 Aidan Kehoe <kehoea@parhasard.net>
Add compiler macros and compilation sanity-checking for various
functions that take keywords.
* byte-optimize.el (side-effect-free-fns): #'symbol-value is
side-effect free and not error free.
* bytecomp.el (byte-compile-normal-call): Check keyword argument
lists for sanity; store information about the positions where
keyword arguments start using the new byte-compile-keyword-start
property.
* cl-macs.el (cl-const-expr-val): Take a new optional argument,
cl-not-constant, defaulting to nil, in this function; return it if
the expression is not constant.
(cl-non-fixnum-number-p): Make this into a separate function, we
want to pass it to #'every.
(eql): Use it.
(define-star-compiler-macros): Use the same code to generate the
member*, assoc* and rassoc* compiler macros; special-case some
code in #'add-to-list in subr.el.
(remove, remq): Add compiler macros for these two functions, in
preparation for #'remove being in C.
(define-foo-if-compiler-macros): Transform (remove-if-not ...) calls to
(remove ... :if-not) at compile time, which will be a real win
once the latter is in C.
(define-substitute-if-compiler-macros)
(define-subst-if-compiler-macros): Similarly for these functions.
(delete-duplicates): Change this compiler macro to use
#'plists-equal; if we don't have information about the type of
SEQUENCE at compile time, don't bother attempting to inline the
call, the function will be in C soon enough.
(equalp): Remove an old commented-out compiler macro for this, if
we want to see it it's in version control.
(subst-char-in-string): Transform this to a call to nsubstitute or
nsubstitute, if that is appropriate.
* cl.el (ldiff): Don't call setf here, this makes for a load-time
dependency problem in cl-macs.el
2010-06-14 Stephen J. Turnbull <stephen@xemacs.org>
* term/vt100.el:
Refer to XEmacs, not GNU Emacs, in permissions.
* term/bg-mouse.el:
* term/sup-mouse.el:
Put copyright notice in canonical "Copyright DATE AUTHOR" form.
Refer to XEmacs, not GNU Emacs, in permissions.
* site-load.el:
Add permission boilerplate.
* mule/canna-leim.el:
* alist.el:
Refer to XEmacs, not APEL/this program, in permissions.
* mule/canna-leim.el:
Remove my copyright, I've assigned it to the FSF.
2010-06-14 Stephen J. Turnbull <stephen@xemacs.org>
* gtk.el:
* gtk-widget-accessors.el:
* gtk-package.el:
* gtk-marshal.el:
* gtk-compose.el:
* gnome.el:
Add copyright notice based on internal evidence.
2010-06-14 Stephen J. Turnbull <stephen@xemacs.org>
* easymenu.el: Add reference to COPYING to permission notice.
* gutter.el:
* gutter-items.el:
* menubar-items.el:
Fix typo "Xmacs" in permissions notice.
2010-06-14 Stephen J. Turnbull <stephen@xemacs.org>
* auto-save.el:
* font.el:
* fontconfig.el:
* mule/kinsoku.el:
Add "part of XEmacs" text to permission notice.
2010-10-14 Aidan Kehoe <kehoea@parhasard.net>
* byte-optimize.el (side-effect-free-fns):
* cl-macs.el (remf, getf):
* cl-extra.el (tailp, cl-set-getf, cl-do-remf):
* cl.el (ldiff, endp):
Tighten up Common Lisp compatibility for #'ldiff, #'endp, #'tailp;
add circularity checking for the first two.
#'cl-set-getf and #'cl-do-remf were Lisp implementations of
#'plist-put and #'plist-remprop; change the names to aliases,
changes the macros that use them to using #'plist-put and
#'plist-remprop directly.
2010-10-12 Aidan Kehoe <kehoea@parhasard.net>
* abbrev.el (fundamental-mode-abbrev-table, global-abbrev-table):
Create both these abbrev tables using the usual
#'define-abbrev-table calls, rather than attempting to
special-case them.
* cl-extra.el: Force cl-macs to be loaded here, if cl-extra.el is
being loaded interpreted. Previously other, later files would
redundantly call (load "cl-macs") when interpreted, it's more
reasonable to do it here, once.
* cmdloop.el (read-quoted-char-radix): Use defcustom here, we
don't have any dump-order dependencies that would prevent that.
* custom.el (eval-when-compile): Don't load cl-macs when
interpreted or when byte-compiling, rely on cl-extra.el in the
former case and the appropriate entry in bytecomp-load-hook in the
latter. Get rid of custom-declare-variable-list, we have no
dump-time dependencies that would require it.
* faces.el (eval-when-compile): Don't load cl-macs when
interpreted or when byte-compiling.
* packages.el: Remove some inaccurate comments.
* post-gc.el (cleanup-simple-finalizers): Use #'delete-if-not
here, now the order of preloaded-file-list has been changed to
make it available.
* subr.el (custom-declare-variable-list): Remove. No need for it.
Also remove a stub define-abbrev-table from this file, given the
current order of preloaded-file-list there's no need for it.
2010-10-10 Aidan Kehoe <kehoea@parhasard.net>
* bytecomp.el (byte-compile-constp) Forms quoted with FUNCTION are
also constant.
(byte-compile-initial-macro-environment): In #'the, if FORM is
constant and does not match TYPE, warn at byte-compile time.
2010-10-10 Aidan Kehoe <kehoea@parhasard.net>
* backquote.el (bq-vector-contents, bq-list*): Remove; the former
is equivalent to (append VECTOR nil), the latter to (list* ...).
(bq-process-2): Use (append VECTOR nil) instead of using
#'bq-vector-contents to convert to a list.
(bq-process-1): Now we use list* instead of bq-list
* subr.el (list*): Moved from cl.el, since it is now required to
be available the first time a backquoted form is encountered.
* cl.el (list*): Move to subr.el.
2010-09-16 Aidan Kehoe <kehoea@parhasard.net>
* test-harness.el (Check-Message):
Add an omitted comma here, thank you the buildbot.
2010-09-16 Aidan Kehoe <kehoea@parhasard.net>
* hash-table.el (hash-table-key-list, hash-table-value-list)
(hash-table-key-value-alist, hash-table-key-value-plist):
Remove some useless #'nreverse calls in these files; our hash
tables have no order, it's not helpful to pretend they do.
* behavior.el (read-behavior):
Do the same in this file, in some code evidently copied from
hash-table.el.
2010-09-16 Aidan Kehoe <kehoea@parhasard.net>
* info.el (Info-insert-dir):
* format.el (format-deannotate-region):
* files.el (cd, save-buffers-kill-emacs):
Use #'some, #'every and related functions for applying boolean
operations to lists, instead of rolling our own ones that cons and
don't short-circuit.
2010-09-16 Aidan Kehoe <kehoea@parhasard.net>
* bytecomp.el (byte-compile-initial-macro-environment):
* cl-macs.el (the):
Rephrase the docstring, make its implementation when compiling
files a little nicer.
2010-09-16 Aidan Kehoe <kehoea@parhasard.net>
* descr-text.el (unidata-initialize-unicodedata-database)
(unidata-initialize-unihan-database, describe-char-unicode-data)
(describe-char-unicode-data):
Wrap calls to the database functions with (with-fboundp ...),
avoiding byte compile warnings on builds without support for the
database functions.
(describe-char): (reduce #'max ...), not (apply #'max ...), no
need to cons needlessly.
(describe-char): Remove a redundant lambda wrapping
#'extent-properties.
(describe-char-unicode-data): Call #'nsubst when replacing "" with
nil in the result of #'split-string, instead of consing inside
mapcar.
2010-09-16 Aidan Kehoe <kehoea@parhasard.net>
* x-faces.el (x-available-font-sizes):
* specifier.el (let-specifier):
* package-ui.el (pui-add-required-packages):
* msw-faces.el (mswindows-available-font-sizes):
* modeline.el (modeline-minor-mode-menu):
* minibuf.el (minibuf-directory-files):
Replace the O2N (delq nil (mapcar (lambda (W) (and X Y)) Z)) with
the ON (mapcan (lambda (W) (and X (list Y))) Z) in these files.
2010-09-16 Aidan Kehoe <kehoea@parhasard.net>
* cl-macs.el (= < > <= >=):
When these functions are handed more than two arguments, and those
arguments have no side effects, transform to a series of two
argument calls, avoiding funcall in the byte-compiled code.
* mule/mule-cmds.el (finish-set-language-environment):
Take advantage of this change in a function called 256 times at
startup.
2010-09-16 Aidan Kehoe <kehoea@parhasard.net>
* bytecomp.el (byte-compile-function-form, byte-compile-quote)
(byte-compile-quote-form):
Warn at compile time, and error at runtime, if a (quote ...) or a
(function ...) form attempts to quote more than one object.
2010-09-16 Aidan Kehoe <kehoea@parhasard.net>
* byte-optimize.el (byte-optimize-apply): Transform (apply 'nconc
(mapcar ...)) to (mapcan ...); warn about use of the first idiom.
* update-elc.el (do-autoload-commands):
* packages.el (packages-find-package-library-path):
* frame.el (frame-list):
* extents.el (extent-descendants):
* etags.el (buffer-tag-table-files):
* dumped-lisp.el (preloaded-file-list):
* device.el (device-list):
* bytecomp-runtime.el (proclaim-inline, proclaim-notinline)
Use #'mapcan, not (apply #'nconc (mapcar ...) in all these files.
* bytecomp-runtime.el (eval-when-compile, eval-and-compile):
In passing, mention that these macros also evaluate the body when
interpreted.
tests/ChangeLog addition:
2011-02-07 Aidan Kehoe <kehoea@parhasard.net>
* automated/lisp-tests.el:
Test lexical scope for `block', `return-from'; add a
Known-Bug-Expect-Failure for a contorted example that fails when
byte-compiled.
author | Aidan Kehoe <kehoea@parhasard.net> |
---|---|
date | Mon, 07 Feb 2011 12:01:24 +0000 |
parents | ba07c880114a |
children | 2aa9cd456ae7 |
line wrap: on
line source
/* Numeric types for XEmacs. Copyright (C) 2004 Jerry James. Copyright (C) 2010 Ben Wing. 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., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA. */ /* Synched up with: Not in FSF. */ #include <config.h> #include <limits.h> #include "lisp.h" #ifdef HAVE_BIGFLOAT #define USED_IF_BIGFLOAT(decl) decl #else #define USED_IF_BIGFLOAT(decl) UNUSED (decl) #endif Lisp_Object Qrationalp, Qfloatingp, Qrealp; Lisp_Object Vdefault_float_precision; static Lisp_Object Qunsupported_type; static Lisp_Object Vbigfloat_max_prec; static int number_initialized; #ifdef HAVE_BIGNUM bignum scratch_bignum, scratch_bignum2; #endif #ifdef HAVE_RATIO ratio scratch_ratio, scratch_ratio2; #endif #ifdef HAVE_BIGFLOAT bigfloat scratch_bigfloat, scratch_bigfloat2; #endif /********************************* Bignums **********************************/ #ifdef HAVE_BIGNUM static void bignum_print (Lisp_Object obj, Lisp_Object printcharfun, int UNUSED (escapeflag)) { Ascbyte *bstr = bignum_to_string (XBIGNUM_DATA (obj), 10); write_ascstring (printcharfun, bstr); xfree (bstr); } #ifdef NEW_GC static void bignum_finalize (Lisp_Object obj) { struct Lisp_Bignum *num = XBIGNUM (obj); /* #### WARNING: It would be better to put some sort of check to make sure this doesn't happen more than once, just in case --- e.g. checking if it's zero before finalizing and then setting it to zero after finalizing. */ bignum_fini (num->data); } #endif static int bignum_equal (Lisp_Object obj1, Lisp_Object obj2, int UNUSED (depth), int UNUSED (foldcase)) { return bignum_eql (XBIGNUM_DATA (obj1), XBIGNUM_DATA (obj2)); } static Hashcode bignum_hash (Lisp_Object obj, int UNUSED (depth), Boolint equalp) { if (equalp) { return FLOAT_HASHCODE_FROM_DOUBLE (bignum_to_double (XBIGNUM_DATA (obj))); } else { return bignum_hashcode (XBIGNUM_DATA (obj)); } } static void bignum_convert (const void *object, void **data, Bytecount *size) { CIbyte *bstr = bignum_to_string (*(bignum *)object, 10); *data = bstr; *size = strlen(bstr)+1; } static void bignum_convfree (const void * UNUSED (object), void *data, Bytecount UNUSED (size)) { xfree (data); } static void * bignum_deconvert (void *object, void *data, Bytecount UNUSED (size)) { bignum *b = (bignum *) object; bignum_init(*b); bignum_set_string(*b, (const char *) data, 10); return object; } static const struct opaque_convert_functions bignum_opc = { bignum_convert, bignum_convfree, bignum_deconvert }; static const struct memory_description bignum_description[] = { { XD_OPAQUE_DATA_CONVERTIBLE, offsetof (Lisp_Bignum, data), 0, { &bignum_opc }, XD_FLAG_NO_KKCC }, { XD_END } }; DEFINE_DUMPABLE_FROB_BLOCK_LISP_OBJECT ("bignum", bignum, 0, bignum_print, IF_NEW_GC (bignum_finalize), bignum_equal, bignum_hash, bignum_description, Lisp_Bignum); #endif /* HAVE_BIGNUM */ Lisp_Object Qbignump; DEFUN ("bignump", Fbignump, 1, 1, 0, /* Return t if OBJECT is a bignum, nil otherwise. */ (object)) { return BIGNUMP (object) ? Qt : Qnil; } /********************************** Ratios **********************************/ #ifdef HAVE_RATIO static void ratio_print (Lisp_Object obj, Lisp_Object printcharfun, int UNUSED (escapeflag)) { CIbyte *rstr = ratio_to_string (XRATIO_DATA (obj), 10); write_ascstring (printcharfun, rstr); xfree (rstr); } #ifdef NEW_GC static void ratio_finalize (Lisp_Object obj) { struct Lisp_Ratio *num = XRATIO (obj); /* #### WARNING: It would be better to put some sort of check to make sure this doesn't happen more than once, just in case --- e.g. checking if it's zero before finalizing and then setting it to zero after finalizing. */ ratio_fini (num->data); } #endif /* not NEW_GC */ static int ratio_equal (Lisp_Object obj1, Lisp_Object obj2, int UNUSED (depth), int UNUSED (foldcase)) { return ratio_eql (XRATIO_DATA (obj1), XRATIO_DATA (obj2)); } static Hashcode ratio_hash (Lisp_Object obj, int UNUSED (depth), Boolint equalp) { if (equalp) { return FLOAT_HASHCODE_FROM_DOUBLE (ratio_to_double (XRATIO_DATA (obj))); } else { return ratio_hashcode (XRATIO_DATA (obj)); } } static const struct memory_description ratio_description[] = { { XD_OPAQUE_PTR, offsetof (Lisp_Ratio, data) }, { XD_END } }; DEFINE_NODUMP_FROB_BLOCK_LISP_OBJECT ("ratio", ratio, 0, ratio_print, IF_NEW_GC (ratio_finalize), ratio_equal, ratio_hash, ratio_description, Lisp_Ratio); #endif /* HAVE_RATIO */ Lisp_Object Qratiop; DEFUN ("ratiop", Fratiop, 1, 1, 0, /* Return t if OBJECT is a ratio, nil otherwise. */ (object)) { return RATIOP (object) ? Qt : Qnil; } /******************************** Rationals *********************************/ DEFUN ("rationalp", Frationalp, 1, 1, 0, /* Return t if OBJECT is a rational, nil otherwise. */ (object)) { return RATIONALP (object) ? Qt : Qnil; } DEFUN ("numerator", Fnumerator, 1, 1, 0, /* Return the numerator of the canonical form of RATIONAL. If RATIONAL is an integer, RATIONAL is returned. */ (rational)) { CONCHECK_RATIONAL (rational); #ifdef HAVE_RATIO if (RATIOP (rational)) { return Fcanonicalize_number (make_bignum_bg (XRATIO_NUMERATOR (rational))); } #endif return rational; } DEFUN ("denominator", Fdenominator, 1, 1, 0, /* Return the denominator of the canonical form of RATIONAL. If RATIONAL is an integer, 1 is returned. */ (rational)) { CONCHECK_RATIONAL (rational); #ifdef HAVE_RATIO if (RATIOP (rational)) { return Fcanonicalize_number (make_bignum_bg (XRATIO_DENOMINATOR (rational))); } #endif return make_int (1); } /******************************** Bigfloats *********************************/ #ifdef HAVE_BIGFLOAT static void bigfloat_print (Lisp_Object obj, Lisp_Object printcharfun, int UNUSED (escapeflag)) { Ascbyte *fstr = bigfloat_to_string (XBIGFLOAT_DATA (obj), 10); write_ascstring (printcharfun, fstr); xfree (fstr); } #ifdef NEW_GC static void bigfloat_finalize (Lisp_Object obj) { struct Lisp_Bigfloat *num = XBIGFLOAT (obj); /* #### WARNING: It would be better to put some sort of check to make sure this doesn't happen more than once, just in case --- e.g. checking if it's zero before finalizing and then setting it to zero after finalizing. */ bigfloat_fini (num->bf); } #endif /* not NEW_GC */ static int bigfloat_equal (Lisp_Object obj1, Lisp_Object obj2, int UNUSED (depth), int UNUSED (foldcase)) { return bigfloat_eql (XBIGFLOAT_DATA (obj1), XBIGFLOAT_DATA (obj2)); } static Hashcode bigfloat_hash (Lisp_Object obj, int UNUSED (depth), Boolint equalp) { if (equalp) { return FLOAT_HASHCODE_FROM_DOUBLE (bigfloat_to_double (XBIGFLOAT_DATA (obj))); } else { return bigfloat_hashcode (XBIGFLOAT_DATA (obj)); } } static const struct memory_description bigfloat_description[] = { { XD_OPAQUE_PTR, offsetof (Lisp_Bigfloat, bf) }, { XD_END } }; DEFINE_DUMPABLE_FROB_BLOCK_LISP_OBJECT ("bigfloat", bigfloat, 0, bigfloat_print, IF_NEW_GC (bigfloat_finalize), bigfloat_equal, bigfloat_hash, bigfloat_description, Lisp_Bigfloat); #endif /* HAVE_BIGFLOAT */ Lisp_Object Qbigfloatp; DEFUN ("bigfloatp", Fbigfloatp, 1, 1, 0, /* Return t if OBJECT is a bigfloat, nil otherwise. */ (object)) { return BIGFLOATP (object) ? Qt : Qnil; } DEFUN ("bigfloat-get-precision", Fbigfloat_get_precision, 1, 1, 0, /* Return the precision of bigfloat F as an integer. */ (f)) { CHECK_BIGFLOAT (f); #ifdef HAVE_BIGNUM bignum_set_ulong (scratch_bignum, XBIGFLOAT_GET_PREC (f)); return Fcanonicalize_number (make_bignum_bg (scratch_bignum)); #else return make_int ((int) XBIGFLOAT_GET_PREC (f)); #endif } DEFUN ("bigfloat-set-precision", Fbigfloat_set_precision, 2, 2, 0, /* Set the precision of F, a bigfloat, to PRECISION, a nonnegative integer. The new precision of F is returned. Note that the return value may differ from PRECISION if the underlying library is unable to support exactly PRECISION bits of precision. */ (f, precision)) { unsigned long prec; CHECK_BIGFLOAT (f); if (INTP (precision)) { prec = (XINT (precision) <= 0) ? 1UL : (unsigned long) XINT (precision); } #ifdef HAVE_BIGNUM else if (BIGNUMP (precision)) { prec = bignum_fits_ulong_p (XBIGNUM_DATA (precision)) ? bignum_to_ulong (XBIGNUM_DATA (precision)) : UINT_MAX; } #endif else { dead_wrong_type_argument (Qintegerp, f); return Qnil; } XBIGFLOAT_SET_PREC (f, prec); return Fbigfloat_get_precision (f); } static int default_float_precision_changed (Lisp_Object UNUSED (sym), Lisp_Object *val, Lisp_Object UNUSED (in_object), int UNUSED (flags)) { unsigned long prec; CONCHECK_INTEGER (*val); #ifdef HAVE_BIGFLOAT if (INTP (*val)) prec = XINT (*val); else { if (!bignum_fits_ulong_p (XBIGNUM_DATA (*val))) args_out_of_range_3 (*val, Qzero, Vbigfloat_max_prec); prec = bignum_to_ulong (XBIGNUM_DATA (*val)); } if (prec != 0UL) bigfloat_set_default_prec (prec); #endif return 0; } /********************************* Floating *********************************/ Lisp_Object make_floating (double d) { #ifdef HAVE_BIGFLOAT if (ZEROP (Vdefault_float_precision)) #endif return make_float (d); #ifdef HAVE_BIGFLOAT else return make_bigfloat (d, 0UL); #endif } DEFUN ("floatingp", Ffloatingp, 1, 1, 0, /* Return t if OBJECT is a floating point number of any kind, nil otherwise. */ (object)) { return FLOATINGP (object) ? Qt : Qnil; } /********************************** Reals ***********************************/ DEFUN ("realp", Frealp, 1, 1, 0, /* Return t if OBJECT is a real, nil otherwise. */ (object)) { return REALP (object) ? Qt : Qnil; } /********************************* Numbers **********************************/ DEFUN ("canonicalize-number", Fcanonicalize_number, 1, 1, 0, /* Return the canonical form of NUMBER. */ (number)) { /* The tests should go in order from larger, more expressive, or more complex types to smaller, less expressive, or simpler types so that a number can cascade all the way down to the simplest type if appropriate. */ #ifdef HAVE_RATIO if (RATIOP (number) && bignum_fits_long_p (XRATIO_DENOMINATOR (number)) && bignum_to_long (XRATIO_DENOMINATOR (number)) == 1L) number = Fcanonicalize_number (make_bignum_bg (XRATIO_NUMERATOR (number))); #endif #ifdef HAVE_BIGNUM if (BIGNUMP (number) && bignum_fits_emacs_int_p (XBIGNUM_DATA (number))) { EMACS_INT n = bignum_to_emacs_int (XBIGNUM_DATA (number)); if (NUMBER_FITS_IN_AN_EMACS_INT (n)) number = make_int (n); } #endif return number; } enum number_type get_number_type (Lisp_Object arg) { if (INTP (arg)) return FIXNUM_T; #ifdef HAVE_BIGNUM if (BIGNUMP (arg)) return BIGNUM_T; #endif #ifdef HAVE_RATIO if (RATIOP (arg)) return RATIO_T; #endif if (FLOATP (arg)) return FLOAT_T; #ifdef HAVE_BIGFLOAT if (BIGFLOATP (arg)) return BIGFLOAT_T; #endif /* Catch unintentional bad uses of this function */ ABORT (); /* NOTREACHED */ return FIXNUM_T; } /* Convert NUMBER to type TYPE. If TYPE is BIGFLOAT_T then use the indicated PRECISION; otherwise, PRECISION is ignored. */ static Lisp_Object internal_coerce_number (Lisp_Object number, enum number_type type, #ifdef HAVE_BIGFLOAT unsigned long precision #else unsigned long UNUSED (precision) #endif ) { enum number_type current_type; if (CHARP (number)) number = make_int (XCHAR (number)); else if (MARKERP (number)) number = make_int (marker_position (number)); /* Note that CHECK_NUMBER ensures that NUMBER is a supported type. Hence, we ABORT() in the #else sections below, because it shouldn't be possible to arrive there. */ CHECK_NUMBER (number); current_type = get_number_type (number); switch (current_type) { case FIXNUM_T: switch (type) { case FIXNUM_T: return number; case BIGNUM_T: #ifdef HAVE_BIGNUM return make_bignum (XREALINT (number)); #else ABORT (); #endif /* HAVE_BIGNUM */ case RATIO_T: #ifdef HAVE_RATIO return make_ratio (XREALINT (number), 1UL); #else ABORT (); #endif /* HAVE_RATIO */ case FLOAT_T: return make_float (XREALINT (number)); case BIGFLOAT_T: #ifdef HAVE_BIGFLOAT return make_bigfloat (XREALINT (number), precision); #else ABORT (); #endif /* HAVE_BIGFLOAT */ } case BIGNUM_T: #ifdef HAVE_BIGNUM switch (type) { case FIXNUM_T: return make_int (bignum_to_long (XBIGNUM_DATA (number))); case BIGNUM_T: return number; case RATIO_T: #ifdef HAVE_RATIO bignum_set_long (scratch_bignum, 1L); return make_ratio_bg (XBIGNUM_DATA (number), scratch_bignum); #else ABORT (); #endif /* HAVE_RATIO */ case FLOAT_T: return make_float (bignum_to_double (XBIGNUM_DATA (number))); case BIGFLOAT_T: #ifdef HAVE_BIGFLOAT { Lisp_Object temp; temp = make_bigfloat (0.0, precision); bigfloat_set_bignum (XBIGFLOAT_DATA (temp), XBIGNUM_DATA (number)); return temp; } #else ABORT (); #endif /* HAVE_BIGFLOAT */ } #else ABORT (); #endif /* HAVE_BIGNUM */ case RATIO_T: #ifdef HAVE_RATIO switch (type) { case FIXNUM_T: bignum_div (scratch_bignum, XRATIO_NUMERATOR (number), XRATIO_DENOMINATOR (number)); return make_int (bignum_to_long (scratch_bignum)); case BIGNUM_T: bignum_div (scratch_bignum, XRATIO_NUMERATOR (number), XRATIO_DENOMINATOR (number)); return make_bignum_bg (scratch_bignum); case RATIO_T: return number; case FLOAT_T: return make_float (ratio_to_double (XRATIO_DATA (number))); case BIGFLOAT_T: #ifdef HAVE_BIGFLOAT { Lisp_Object temp; temp = make_bigfloat (0.0, precision); bigfloat_set_ratio (XBIGFLOAT_DATA (temp), XRATIO_DATA (number)); return temp; } #else ABORT (); #endif /* HAVE_BIGFLOAT */ } #else ABORT (); #endif /* HAVE_RATIO */ case FLOAT_T: switch (type) { case FIXNUM_T: return Ftruncate (number, Qnil); case BIGNUM_T: #ifdef HAVE_BIGNUM bignum_set_double (scratch_bignum, XFLOAT_DATA (number)); return make_bignum_bg (scratch_bignum); #else ABORT (); #endif /* HAVE_BIGNUM */ case RATIO_T: #ifdef HAVE_RATIO ratio_set_double (scratch_ratio, XFLOAT_DATA (number)); return make_ratio_rt (scratch_ratio); #else ABORT (); #endif /* HAVE_RATIO */ case FLOAT_T: return number; case BIGFLOAT_T: #ifdef HAVE_BIGFLOAT bigfloat_set_prec (scratch_bigfloat, precision); bigfloat_set_double (scratch_bigfloat, XFLOAT_DATA (number)); return make_bigfloat_bf (scratch_bigfloat); #else ABORT (); #endif /* HAVE_BIGFLOAT */ } case BIGFLOAT_T: #ifdef HAVE_BIGFLOAT switch (type) { case FIXNUM_T: return make_int (bigfloat_to_long (XBIGFLOAT_DATA (number))); case BIGNUM_T: #ifdef HAVE_BIGNUM bignum_set_bigfloat (scratch_bignum, XBIGFLOAT_DATA (number)); return make_bignum_bg (scratch_bignum); #else ABORT (); #endif /* HAVE_BIGNUM */ case RATIO_T: #ifdef HAVE_RATIO ratio_set_bigfloat (scratch_ratio, XBIGFLOAT_DATA (number)); return make_ratio_rt (scratch_ratio); #else ABORT (); #endif case FLOAT_T: return make_float (bigfloat_to_double (XBIGFLOAT_DATA (number))); case BIGFLOAT_T: /* FIXME: Do we need to change the precision? */ return number; } #else ABORT (); #endif /* HAVE_BIGFLOAT */ } ABORT (); /* NOTREACHED */ return Qzero; } /* This function promotes its arguments as necessary to make them both the same type. It destructively modifies its arguments to do so. Characters and markers are ALWAYS converted to integers. */ enum number_type promote_args (Lisp_Object *arg1, Lisp_Object *arg2) { enum number_type type1, type2; if (CHARP (*arg1)) *arg1 = make_int (XCHAR (*arg1)); else if (MARKERP (*arg1)) *arg1 = make_int (marker_position (*arg1)); if (CHARP (*arg2)) *arg2 = make_int (XCHAR (*arg2)); else if (MARKERP (*arg2)) *arg2 = make_int (marker_position (*arg2)); CHECK_NUMBER (*arg1); CHECK_NUMBER (*arg2); type1 = get_number_type (*arg1); type2 = get_number_type (*arg2); if (type1 < type2) { *arg1 = internal_coerce_number (*arg1, type2, #ifdef HAVE_BIGFLOAT type2 == BIGFLOAT_T ? XBIGFLOAT_GET_PREC (*arg2) : #endif 0UL); return type2; } if (type2 < type1) { *arg2 = internal_coerce_number (*arg2, type1, #ifdef HAVE_BIGFLOAT type1 == BIGFLOAT_T ? XBIGFLOAT_GET_PREC (*arg1) : #endif 0UL); return type1; } /* No conversion necessary */ return type1; } DEFUN ("coerce-number", Fcoerce_number, 2, 3, 0, /* Convert NUMBER to the indicated type, possibly losing information. Do not call this function. Use `coerce' instead. TYPE is one of the symbols `fixnum', `integer', `ratio', `float', or `bigfloat'. Not all of these types may be supported. PRECISION is the number of bits of precision to use when converting to bigfloat; it is ignored otherwise. If nil, the default precision is used. Note that some conversions lose information. No error is signaled in such cases; the information is silently lost. */ (number, type, USED_IF_BIGFLOAT (precision))) { CHECK_SYMBOL (type); if (EQ (type, Qfixnum)) return internal_coerce_number (number, FIXNUM_T, 0UL); else if (EQ (type, Qinteger)) { /* If bignums are available, we always convert to one first, then downgrade to a fixnum if possible. */ #ifdef HAVE_BIGNUM return Fcanonicalize_number (internal_coerce_number (number, BIGNUM_T, 0UL)); #else return internal_coerce_number (number, FIXNUM_T, 0UL); #endif } #ifdef HAVE_RATIO else if (EQ (type, Qratio)) return internal_coerce_number (number, RATIO_T, 0UL); #endif else if (EQ (type, Qfloat)) return internal_coerce_number (number, FLOAT_T, 0UL); #ifdef HAVE_BIGFLOAT else if (EQ (type, Qbigfloat)) { unsigned long prec; if (NILP (precision)) prec = bigfloat_get_default_prec (); else { CHECK_INTEGER (precision); #ifdef HAVE_BIGNUM if (INTP (precision)) #endif /* HAVE_BIGNUM */ prec = (unsigned long) XREALINT (precision); #ifdef HAVE_BIGNUM else { if (!bignum_fits_ulong_p (XBIGNUM_DATA (precision))) args_out_of_range (precision, Vbigfloat_max_prec); prec = bignum_to_ulong (XBIGNUM_DATA (precision)); } #endif /* HAVE_BIGNUM */ } return internal_coerce_number (number, BIGFLOAT_T, prec); } #endif /* HAVE_BIGFLOAT */ Fsignal (Qunsupported_type, type); /* NOTREACHED */ return Qnil; } void syms_of_number (void) { #ifdef HAVE_BIGNUM INIT_LISP_OBJECT (bignum); #endif #ifdef HAVE_RATIO INIT_LISP_OBJECT (ratio); #endif #ifdef HAVE_BIGFLOAT INIT_LISP_OBJECT (bigfloat); #endif /* Type predicates */ DEFSYMBOL (Qrationalp); DEFSYMBOL (Qfloatingp); DEFSYMBOL (Qrealp); DEFSYMBOL (Qbignump); DEFSYMBOL (Qratiop); DEFSYMBOL (Qbigfloatp); /* Functions */ DEFSUBR (Fbignump); DEFSUBR (Fratiop); DEFSUBR (Frationalp); DEFSUBR (Fnumerator); DEFSUBR (Fdenominator); DEFSUBR (Fbigfloatp); DEFSUBR (Fbigfloat_get_precision); DEFSUBR (Fbigfloat_set_precision); DEFSUBR (Ffloatingp); DEFSUBR (Frealp); DEFSUBR (Fcanonicalize_number); DEFSUBR (Fcoerce_number); /* Errors */ DEFERROR_STANDARD (Qunsupported_type, Qwrong_type_argument); } void vars_of_number (void) { /* These variables are Lisp variables rather than number variables so that we can put bignums in them. */ DEFVAR_LISP_MAGIC ("default-float-precision", &Vdefault_float_precision, /* The default floating-point precision for newly created floating point values. This should be 0 to create Lisp float types, or an unsigned integer no greater than `bigfloat-maximum-precision' to create Lisp bigfloat types with the indicated precision. */ default_float_precision_changed); Vdefault_float_precision = make_int (0); DEFVAR_CONST_LISP ("bigfloat-maximum-precision", &Vbigfloat_max_prec /* The maximum number of bits of precision a bigfloat can have. This is determined by the underlying library used to implement bigfloats. */); #ifdef HAVE_BIGFLOAT /* Don't create a bignum here. Otherwise, we lose with NEW_GC + pdump. See reinit_vars_of_number(). */ Vbigfloat_max_prec = make_int (EMACS_INT_MAX); #else Vbigfloat_max_prec = make_int (0); #endif /* HAVE_BIGFLOAT */ Fprovide (intern ("number-types")); #ifdef HAVE_BIGNUM Fprovide (intern ("bignum")); #endif #ifdef HAVE_RATIO Fprovide (intern ("ratio")); #endif #ifdef HAVE_BIGFLOAT Fprovide (intern ("bigfloat")); #endif } void reinit_vars_of_number (void) { #if defined(HAVE_BIGFLOAT) && defined(HAVE_BIGNUM) Vbigfloat_max_prec = make_bignum (0L); bignum_set_ulong (XBIGNUM_DATA (Vbigfloat_max_prec), ULONG_MAX); #endif } void init_number (void) { if (!number_initialized) { number_initialized = 1; #ifdef WITH_GMP init_number_gmp (); #endif #ifdef WITH_MP init_number_mp (); #endif #ifdef HAVE_BIGNUM bignum_init (scratch_bignum); bignum_init (scratch_bignum2); #endif #ifdef HAVE_RATIO ratio_init (scratch_ratio); ratio_init (scratch_ratio2); #endif #ifdef HAVE_BIGFLOAT bigfloat_init (scratch_bigfloat); bigfloat_init (scratch_bigfloat2); #endif #ifndef PDUMP reinit_vars_of_number (); #endif } }