2010-05-28 16:51:57 +02:00
|
|
|
|
/* Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004,2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
|
2002-03-11 19:10:01 +00:00
|
|
|
|
*
|
|
|
|
|
|
* Portions Copyright 1990, 1991, 1992, 1993 by AT&T Bell Laboratories
|
|
|
|
|
|
* and Bellcore. See scm_divide.
|
|
|
|
|
|
*
|
2000-03-22 20:48:18 +00:00
|
|
|
|
*
|
2003-04-05 19:15:35 +00:00
|
|
|
|
* This library is free software; you can redistribute it and/or
|
2009-06-17 00:22:09 +01:00
|
|
|
|
* modify it under the terms of the GNU Lesser General Public License
|
|
|
|
|
|
* as published by the Free Software Foundation; either version 3 of
|
|
|
|
|
|
* the License, or (at your option) any later version.
|
1996-07-25 22:56:11 +00:00
|
|
|
|
*
|
2009-06-17 00:22:09 +01:00
|
|
|
|
* This library is distributed in the hope that it will be useful, but
|
|
|
|
|
|
* WITHOUT ANY WARRANTY; without even the implied warranty of
|
2003-04-05 19:15:35 +00:00
|
|
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
|
|
|
|
* Lesser General Public License for more details.
|
1996-07-25 22:56:11 +00:00
|
|
|
|
*
|
2003-04-05 19:15:35 +00:00
|
|
|
|
* You should have received a copy of the GNU Lesser General Public
|
|
|
|
|
|
* License along with this library; if not, write to the Free Software
|
2009-06-17 00:22:09 +01:00
|
|
|
|
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
|
|
|
|
|
|
* 02110-1301 USA
|
2003-04-05 19:15:35 +00:00
|
|
|
|
*/
|
1999-12-12 02:36:16 +00:00
|
|
|
|
|
1996-07-25 22:56:11 +00:00
|
|
|
|
|
2003-04-04 21:49:44 +00:00
|
|
|
|
/* General assumptions:
|
|
|
|
|
|
* All objects satisfying SCM_COMPLEXP() have a non-zero complex component.
|
|
|
|
|
|
* All objects satisfying SCM_BIGP() are too large to fit in a fixnum.
|
|
|
|
|
|
* If an object satisfies integer?, it's either an inum, a bignum, or a real.
|
|
|
|
|
|
* If floor (r) == r, r is an int, and mpz_set_d will DTRT.
|
* print.c (scm_iprin1): Handle fractions.
* objects.h (scm_class_fraction): New.
* objects.c (scm_class_fraction): New.
(scm_class_of): Handle fractions.
* hash.c (scm_hasher): Handle fractions.
* numbers.c: New code for handling fraction all over the place.
(scm_odd_p, scm_even_p): Handle inexact integers.
(scm_rational_p): New function, same as scm_real_p.
(scm_round_number, scm_truncate_number, scm_ceiling, scm_floor):
New exact functions that replace the inexact 'dsubr'
implementations.
(scm_numerator, scm_denominator): New.
* numbers.h (SCM_NUMP): Recognize fractions.
(SCM_FRACTIONP, SCM_SLOPPY_FRACTIONP, SCM_FRACTION_NUMERATOR,
SCM_FRACTION_DENOMINATOR, SCM_FRACTION_SET_NUMERATOR,
SCM_FRACTION_SET_DENOMINATOR, SCM_FRACTION_REDUCED_BIT,
SCM_FRACTION_REDUCED_SET, SCM_FRACTION_REDUCED_CLEAR,
SCM_FRACTION_REDUCED): New.
(scm_floor, scm_ceiling, scm_truncate_number, scm_round_number):
New prototypes.
(scm_make_ratio, scm_rationalize, scm_numerator, scm_denominator,
scm_rational_p): New prototypes.
(scm_i_dbl2num, scm_i_fraction2double, scm_i_fraction_equalp,
scm_i_print_fraction): New prototypes.
* goops.c (create_standard_classes): Create "<fraction>" class.
* gc-mark.c (scm_gc_mark_dependencies): Handle fractions.
* gc-card.c (scm_i_sweep_card): Include scm_tc16_fraction as a
case in the switch, but do nothing for now.
* eval.c (SCM_CEVAL, SCM_APPLY, call_dsubr_1): Convert fractions
to doubles when calling 'dsubr' functions.
* eq.c (scm_eqv_p, scm_equal_p): Handle fractions.
2003-11-18 19:59:53 +00:00
|
|
|
|
* All objects satisfying SCM_FRACTIONP are never an integer.
|
2003-04-04 21:49:44 +00:00
|
|
|
|
*/
|
|
|
|
|
|
|
|
|
|
|
|
/* TODO:
|
|
|
|
|
|
|
|
|
|
|
|
- see if special casing bignums and reals in integer-exponent when
|
|
|
|
|
|
possible (to use mpz_pow and mpf_pow_ui) is faster.
|
|
|
|
|
|
|
|
|
|
|
|
- look in to better short-circuiting of common cases in
|
|
|
|
|
|
integer-expt and elsewhere.
|
|
|
|
|
|
|
|
|
|
|
|
- see if direct mpz operations can help in ash and elsewhere.
|
|
|
|
|
|
|
|
|
|
|
|
*/
|
1996-07-25 22:56:11 +00:00
|
|
|
|
|
2008-09-13 15:35:27 +02:00
|
|
|
|
#ifdef HAVE_CONFIG_H
|
2003-03-25 23:57:51 +00:00
|
|
|
|
# include <config.h>
|
|
|
|
|
|
#endif
|
|
|
|
|
|
|
1996-07-25 22:56:11 +00:00
|
|
|
|
#include <math.h>
|
2002-05-08 20:08:16 +00:00
|
|
|
|
#include <string.h>
|
2009-08-21 09:18:30 -07:00
|
|
|
|
#include <unicase.h>
|
|
|
|
|
|
#include <unictype.h>
|
* print.c (scm_iprin1): Handle fractions.
* objects.h (scm_class_fraction): New.
* objects.c (scm_class_fraction): New.
(scm_class_of): Handle fractions.
* hash.c (scm_hasher): Handle fractions.
* numbers.c: New code for handling fraction all over the place.
(scm_odd_p, scm_even_p): Handle inexact integers.
(scm_rational_p): New function, same as scm_real_p.
(scm_round_number, scm_truncate_number, scm_ceiling, scm_floor):
New exact functions that replace the inexact 'dsubr'
implementations.
(scm_numerator, scm_denominator): New.
* numbers.h (SCM_NUMP): Recognize fractions.
(SCM_FRACTIONP, SCM_SLOPPY_FRACTIONP, SCM_FRACTION_NUMERATOR,
SCM_FRACTION_DENOMINATOR, SCM_FRACTION_SET_NUMERATOR,
SCM_FRACTION_SET_DENOMINATOR, SCM_FRACTION_REDUCED_BIT,
SCM_FRACTION_REDUCED_SET, SCM_FRACTION_REDUCED_CLEAR,
SCM_FRACTION_REDUCED): New.
(scm_floor, scm_ceiling, scm_truncate_number, scm_round_number):
New prototypes.
(scm_make_ratio, scm_rationalize, scm_numerator, scm_denominator,
scm_rational_p): New prototypes.
(scm_i_dbl2num, scm_i_fraction2double, scm_i_fraction_equalp,
scm_i_print_fraction): New prototypes.
* goops.c (create_standard_classes): Create "<fraction>" class.
* gc-mark.c (scm_gc_mark_dependencies): Handle fractions.
* gc-card.c (scm_i_sweep_card): Include scm_tc16_fraction as a
case in the switch, but do nothing for now.
* eval.c (SCM_CEVAL, SCM_APPLY, call_dsubr_1): Convert fractions
to doubles when calling 'dsubr' functions.
* eq.c (scm_eqv_p, scm_equal_p): Handle fractions.
2003-11-18 19:59:53 +00:00
|
|
|
|
|
2006-10-09 23:40:48 +00:00
|
|
|
|
#if HAVE_COMPLEX_H
|
|
|
|
|
|
#include <complex.h>
|
|
|
|
|
|
#endif
|
|
|
|
|
|
|
2000-04-21 14:16:44 +00:00
|
|
|
|
#include "libguile/_scm.h"
|
|
|
|
|
|
#include "libguile/feature.h"
|
|
|
|
|
|
#include "libguile/ports.h"
|
|
|
|
|
|
#include "libguile/root.h"
|
|
|
|
|
|
#include "libguile/smob.h"
|
|
|
|
|
|
#include "libguile/strings.h"
|
|
|
|
|
|
|
|
|
|
|
|
#include "libguile/validate.h"
|
|
|
|
|
|
#include "libguile/numbers.h"
|
* validate.h
(SCM_NUM2{SIZE,PTRDIFF,SHORT,USHORT,BITS,UBITS,INT,UINT}[_DEF]):
new macros.
* unif.h: type renaming:
scm_array -> scm_array_t
scm_array_dim -> scm_array_dim_t
the old names are deprecated, all in-Guile uses changed.
* tags.h (scm_ubits_t): new typedef, representing unsigned
scm_bits_t.
* stacks.h: type renaming:
scm_info_frame -> scm_info_frame_t
scm_stack -> scm_stack_t
the old names are deprecated, all in-Guile uses changed.
* srcprop.h: type renaming:
scm_srcprops -> scm_srcprops_t
scm_srcprops_chunk -> scm_srcprops_chunk_t
the old names are deprecated, all in-Guile uses changed.
* gsubr.c, procs.c, print.c, ports.c, read.c, rdelim.c, ramap.c,
rw.c, smob.c, sort.c, srcprop.c, stacks.c, strings.c, strop.c,
strorder.c, strports.c, struct.c, symbols.c, unif.c, values.c,
vectors.c, vports.c, weaks.c:
various int/size_t -> size_t/scm_bits_t changes.
* random.h: type renaming:
scm_rstate -> scm_rstate_t
scm_rng -> scm_rng_t
scm_i_rstate -> scm_i_rstate_t
the old names are deprecated, all in-Guile uses changed.
* procs.h: type renaming:
scm_subr_entry -> scm_subr_entry_t
the old name is deprecated, all in-Guile uses changed.
* options.h (scm_option_t.val): unsigned long -> scm_bits_t.
type renaming:
scm_option -> scm_option_t
the old name is deprecated, all in-Guile uses changed.
* objects.c: various long -> scm_bits_t changes.
(scm_i_make_class_object): flags: unsigned long -> scm_ubits_t
* numbers.h (SCM_FIXNUM_BIT): deprecated, renamed to
SCM_I_FIXNUM_BIT.
* num2integral.i.c: new file, multiply included by numbers.c, used
to "templatize" the various integral <-> num conversion routines.
* numbers.c (scm_mkbig, scm_big2num, scm_adjbig, scm_normbig,
scm_copybig, scm_2ulong2big, scm_dbl2big, scm_big2dbl):
deprecated.
(scm_i_mkbig, scm_i_big2inum, scm_i_adjbig, scm_i_normbig,
scm_i_copybig, scm_i_short2big, scm_i_ushort2big, scm_i_int2big,
scm_i_uint2big, scm_i_long2big, scm_i_ulong2big, scm_i_bits2big,
scm_i_ubits2big, scm_i_size2big, scm_i_ptrdiff2big,
scm_i_long_long2big, scm_i_ulong_long2big, scm_i_dbl2big,
scm_i_big2dbl, scm_short2num, scm_ushort2num, scm_int2num,
scm_uint2num, scm_bits2num, scm_ubits2num, scm_size2num,
scm_ptrdiff2num, scm_num2short, scm_num2ushort, scm_num2int,
scm_num2uint, scm_num2bits, scm_num2ubits, scm_num2ptrdiff,
scm_num2size): new functions.
* modules.c (scm_module_reverse_lookup): i, n: int -> scm_bits_t.x
* load.c: change int -> size_t in various places (where the
variable is used to store a string length).
(search-path): call scm_done_free, not scm_done_malloc.
* list.c (scm_ilength): return a scm_bits_t, not long.
some other {int,long} -> scm_bits_t changes.
* hashtab.c: various [u]int -> scm_bits_t changes.
scm_ihashx_closure -> scm_ihashx_closure_t (and made a typedef).
(scm_ihashx): n: uint -> scm_bits_t
use scm_bits2num instead of scm_ulong2num.
* gsubr.c: various int -> scm_bits_t changes.
* gh_data.c (gh_scm2double): no loss of precision any more.
* gh.h (gh_str2scm): len: int -> size_t
(gh_{get,set}_substr): start: int -> scm_bits_t,
len: int -> size_t
(gh_<num>2scm): n: int -> scm_bits_t
(gh_*vector_length): return scm_[u]size_t, not unsigned long.
(gh_length): return scm_bits_t, not unsigned long.
* fports.h: type renaming:
scm_fport -> scm_fport_t
the old name is deprecated, all in-Guile uses changed.
* fports.c (fport_fill_input): count: int -> scm_bits_t
(fport_flush): init_size, remaining, count: int -> scm_bits_t
* debug.h (scm_lookup_cstr, scm_lookup_soft, scm_evstr): removed
those prototypes, as the functions they prototype don't exist.
* fports.c (default_buffer_size): int -> size_t
(scm_fport_buffer_add): read_size, write_size: int -> scm_bits_t
default_size: int -> size_t
(scm_setvbuf): csize: int -> scm_bits_t
* fluids.c (n_fluids): int -> scm_bits_t
(grow_fluids): old_length, i: int -> scm_bits_t
(next_fluid_num, scm_fluid_ref, scm_fluid_set_x): n: int ->
scm_bits_t
(scm_c_with_fluids): flen, vlen: int -> scm_bits_t
* filesys.c (s_scm_open_fdes): changed calls to SCM_NUM2LONG to
the new and shiny SCM_NUM2INT.
* extensions.c: extension -> extension_t (and made a typedef).
* eval.h (SCM_IFRAME): cast to scm_bits_t, not int. just so
there are no nasty surprises if/when the various deeply magic tag
bits move somewhere else.
* eval.c: changed the locals used to store results of SCM_IFRAME,
scm_ilength and such to be of type scm_bits_t (and not int/long).
(iqq): depth, edepth: int -> scm_bits_t
(scm_eval_stack): int -> scm_bits_t
(SCM_CEVAL): various vars are not scm_bits_t instead of int.
(check_map_args, scm_map, scm_for_each): len: long -> scm_bits_t
i: int -> scm_bits_t
* environments.c: changed the many calls to scm_ulong2num to
scm_ubits2num.
(import_environment_fold): proc_as_ul: ulong -> scm_ubits_t
* dynwind.c (scm_dowinds): delta: long -> scm_bits_t
* debug.h: type renaming:
scm_debug_info -> scm_debug_info_t
scm_debug_frame -> scm_debug_frame_t
the old names are deprecated, all in-Guile uses changed.
(scm_debug_eframe_size): int -> scm_bits_t
* debug.c (scm_init_debug): use scm_c_define instead of the
deprecated scm_define.
* continuations.h: type renaming:
scm_contregs -> scm_contregs_t
the old name is deprecated, all in-Guile uses changed.
(scm_contregs_t.num_stack_items): size_t -> scm_bits_t
(scm_contregs_t.num_stack_items): ulong -> scm_ubits_t
* continuations.c (scm_make_continuation): change the type of
stack_size form long to scm_bits_t.
* ports.h: type renaming:
scm_port_rw_active -> scm_port_rw_active_t (and made a typedef)
scm_port -> scm_port_t
scm_ptob_descriptor -> scm_ptob_descriptor_t
the old names are deprecated, all in-Guile uses changed.
(scm_port_t.entry): int -> scm_bits_t.
(scm_port_t.line_number): int -> long.
(scm_port_t.putback_buf_size): int -> size_t.
* __scm.h (long_long, ulong_long): deprecated (they pollute the
global namespace and have little value besides that).
(SCM_BITS_LENGTH): new, is the bit size of scm_bits_t (i.e. of an
SCM handle).
(ifdef spaghetti): include sys/types.h and sys/stdtypes.h, if they
exist (for size_t & ptrdiff_t)
(scm_sizet): deprecated.
* Makefile.am (noinst_HEADERS): add num2integral.i.c
2001-05-24 00:50:51 +00:00
|
|
|
|
#include "libguile/deprecation.h"
|
2000-05-03 12:35:56 +00:00
|
|
|
|
|
* print.c (scm_iprin1): Handle fractions.
* objects.h (scm_class_fraction): New.
* objects.c (scm_class_fraction): New.
(scm_class_of): Handle fractions.
* hash.c (scm_hasher): Handle fractions.
* numbers.c: New code for handling fraction all over the place.
(scm_odd_p, scm_even_p): Handle inexact integers.
(scm_rational_p): New function, same as scm_real_p.
(scm_round_number, scm_truncate_number, scm_ceiling, scm_floor):
New exact functions that replace the inexact 'dsubr'
implementations.
(scm_numerator, scm_denominator): New.
* numbers.h (SCM_NUMP): Recognize fractions.
(SCM_FRACTIONP, SCM_SLOPPY_FRACTIONP, SCM_FRACTION_NUMERATOR,
SCM_FRACTION_DENOMINATOR, SCM_FRACTION_SET_NUMERATOR,
SCM_FRACTION_SET_DENOMINATOR, SCM_FRACTION_REDUCED_BIT,
SCM_FRACTION_REDUCED_SET, SCM_FRACTION_REDUCED_CLEAR,
SCM_FRACTION_REDUCED): New.
(scm_floor, scm_ceiling, scm_truncate_number, scm_round_number):
New prototypes.
(scm_make_ratio, scm_rationalize, scm_numerator, scm_denominator,
scm_rational_p): New prototypes.
(scm_i_dbl2num, scm_i_fraction2double, scm_i_fraction_equalp,
scm_i_print_fraction): New prototypes.
* goops.c (create_standard_classes): Create "<fraction>" class.
* gc-mark.c (scm_gc_mark_dependencies): Handle fractions.
* gc-card.c (scm_i_sweep_card): Include scm_tc16_fraction as a
case in the switch, but do nothing for now.
* eval.c (SCM_CEVAL, SCM_APPLY, call_dsubr_1): Convert fractions
to doubles when calling 'dsubr' functions.
* eq.c (scm_eqv_p, scm_equal_p): Handle fractions.
2003-11-18 19:59:53 +00:00
|
|
|
|
#include "libguile/eq.h"
|
|
|
|
|
|
|
2006-10-09 23:40:48 +00:00
|
|
|
|
/* values per glibc, if not already defined */
|
|
|
|
|
|
#ifndef M_LOG10E
|
|
|
|
|
|
#define M_LOG10E 0.43429448190325182765
|
|
|
|
|
|
#endif
|
|
|
|
|
|
#ifndef M_PI
|
|
|
|
|
|
#define M_PI 3.14159265358979323846
|
|
|
|
|
|
#endif
|
|
|
|
|
|
|
1996-07-25 22:56:11 +00:00
|
|
|
|
|
2000-05-03 12:35:56 +00:00
|
|
|
|
|
2003-04-04 21:49:44 +00:00
|
|
|
|
/*
|
|
|
|
|
|
Wonder if this might be faster for some of our code? A switch on
|
|
|
|
|
|
the numtag would jump directly to the right case, and the
|
|
|
|
|
|
SCM_I_NUMTAG code might be faster than repeated SCM_FOOP tests...
|
|
|
|
|
|
|
|
|
|
|
|
#define SCM_I_NUMTAG_NOTNUM 0
|
|
|
|
|
|
#define SCM_I_NUMTAG_INUM 1
|
|
|
|
|
|
#define SCM_I_NUMTAG_BIG scm_tc16_big
|
|
|
|
|
|
#define SCM_I_NUMTAG_REAL scm_tc16_real
|
|
|
|
|
|
#define SCM_I_NUMTAG_COMPLEX scm_tc16_complex
|
|
|
|
|
|
#define SCM_I_NUMTAG(x) \
|
2004-07-23 15:43:02 +00:00
|
|
|
|
(SCM_I_INUMP(x) ? SCM_I_NUMTAG_INUM \
|
2003-04-04 21:49:44 +00:00
|
|
|
|
: (SCM_IMP(x) ? SCM_I_NUMTAG_NOTNUM \
|
This set of patches introduces a new tc7 code scm_tc7_number for
numbers. Bignums, reals and complex numbers are turned from smobs
into subtypes of scm_tc7_number.
* tags.h (scm_tc7_number): New.
* eq.c (scm_equal_p), eval.c (SCM_CEVAL), evalext.c
(scm_self_evaluating_p), gc-card.c (scm_i_sweep_card), gc-mark.c
(scm_gc_mark_dependencies), goops.c (create_smob_classes), hash.c
(scm_hasher), numbers.c, numbers.h (SCM_NUMP), objects.c
(scm_class_of), print.c (scm_iprin1), smob.c
(scm_smob_prehistory): Don't handle bignums, reals and complex
numbers as subtypes of scm_tc7_smob any more.
* numbers.h, tags.h (scm_tc16_big, scm_tc16_real,
scm_tc16_complex): Moved definitions from tags.h to numbers.h.
2003-09-18 20:55:40 +00:00
|
|
|
|
: (((0xfcff & SCM_CELL_TYPE (x)) == scm_tc7_number) ? SCM_TYP16(x) \
|
2003-04-04 21:49:44 +00:00
|
|
|
|
: SCM_I_NUMTAG_NOTNUM)))
|
|
|
|
|
|
*/
|
* print.c (scm_iprin1): Handle fractions.
* objects.h (scm_class_fraction): New.
* objects.c (scm_class_fraction): New.
(scm_class_of): Handle fractions.
* hash.c (scm_hasher): Handle fractions.
* numbers.c: New code for handling fraction all over the place.
(scm_odd_p, scm_even_p): Handle inexact integers.
(scm_rational_p): New function, same as scm_real_p.
(scm_round_number, scm_truncate_number, scm_ceiling, scm_floor):
New exact functions that replace the inexact 'dsubr'
implementations.
(scm_numerator, scm_denominator): New.
* numbers.h (SCM_NUMP): Recognize fractions.
(SCM_FRACTIONP, SCM_SLOPPY_FRACTIONP, SCM_FRACTION_NUMERATOR,
SCM_FRACTION_DENOMINATOR, SCM_FRACTION_SET_NUMERATOR,
SCM_FRACTION_SET_DENOMINATOR, SCM_FRACTION_REDUCED_BIT,
SCM_FRACTION_REDUCED_SET, SCM_FRACTION_REDUCED_CLEAR,
SCM_FRACTION_REDUCED): New.
(scm_floor, scm_ceiling, scm_truncate_number, scm_round_number):
New prototypes.
(scm_make_ratio, scm_rationalize, scm_numerator, scm_denominator,
scm_rational_p): New prototypes.
(scm_i_dbl2num, scm_i_fraction2double, scm_i_fraction_equalp,
scm_i_print_fraction): New prototypes.
* goops.c (create_standard_classes): Create "<fraction>" class.
* gc-mark.c (scm_gc_mark_dependencies): Handle fractions.
* gc-card.c (scm_i_sweep_card): Include scm_tc16_fraction as a
case in the switch, but do nothing for now.
* eval.c (SCM_CEVAL, SCM_APPLY, call_dsubr_1): Convert fractions
to doubles when calling 'dsubr' functions.
* eq.c (scm_eqv_p, scm_equal_p): Handle fractions.
2003-11-18 19:59:53 +00:00
|
|
|
|
/* the macro above will not work as is with fractions */
|
2000-05-03 12:35:56 +00:00
|
|
|
|
|
|
|
|
|
|
|
decruftify scm_sys_protects
* libguile/root.h
* libguile/root.c (scm_sys_protects): It used to be that for some reason
we'd define a special array of "protected" values. This was a little
silly, always, but with the BDW GC it's completely unnecessary. Also
many of these variables were unused, and none of them were good API.
So remove this array, and either eliminate, make static, or make
internal the various values.
* libguile/snarf.h: No need to generate calls to scm_permanent_object.
* guile-readline/readline.c (scm_init_readline): No need to call
scm_permanent_object.
* libguile/array-map.c (ramap, rafe): Remove the dubious nullvect
optimizations.
* libguile/async.c (scm_init_async): No need to init scm_asyncs, it is
no more.
* libguile/eval.c (scm_init_eval): No need to init scm_listofnull, it is
no more.
* libguile/gc.c: Make scm_protects a static var.
(scm_storage_prehistory): Change the sanity check to use the address
of protects.
(scm_init_gc_protect_object): No need to clear the scm_sys_protects,
as it is no more.
* libguile/keywords.c: Make the keyword obarray a static var.
* libguile/numbers.c: Make flo0 a static var.
* libguile/objprop.c: Make object_whash a static var.
* libguile/properties.c: Make properties_whash a static var.
* libguile/srcprop.h:
* libguile/srcprop.c: Make scm_source_whash a global with internal
linkage.
* libguile/strings.h:
* libguile/strings.c: Make scm_nullstr a global with internal linkage.
* libguile/vectors.c (scm_init_vectors): No need to init scm_nullvect,
it's unused.
2009-12-05 12:38:32 +01:00
|
|
|
|
static SCM flo0;
|
|
|
|
|
|
|
2002-07-20 14:08:34 +00:00
|
|
|
|
#define SCM_SWAP(x, y) do { SCM __t = x; x = y; y = __t; } while (0)
|
2000-04-28 17:14:49 +00:00
|
|
|
|
|
2001-05-08 10:23:17 +00:00
|
|
|
|
/* FLOBUFLEN is the maximum number of characters neccessary for the
|
2000-05-11 16:03:32 +00:00
|
|
|
|
* printed or scm_string representation of an inexact number.
|
|
|
|
|
|
*/
|
2004-05-10 20:35:39 +00:00
|
|
|
|
#define FLOBUFLEN (40+2*(sizeof(double)/sizeof(char)*SCM_CHAR_BIT*3+9)/10)
|
2000-05-11 16:03:32 +00:00
|
|
|
|
|
From John W. Eaton.
* numbers.h: Conditionally include floatingpoint.h, ieeefp.h, and
nan.h. Provide declarations for scm_inf_p, scm_nan_p, scn_inf,
and scm_nan.
* numbers.c: [SCO && ! HAVE_ISNAN] (isnan): New function.
[SCO && ! HAVE_ISINF] (isinf): New function.
(xisinf, xisnan): New functions.
(IS_INF): Delete.
(isfinite): Define in terms of xisinf.
(scm_inf_p, scm_nan_p): New functions.
(guile_Inf, guile_NaN): New file-scope vars.
(guile_ieee_init): New function.
(scm_inf, scm_nan): New functions.
(idbl2str): Handle Inf and NaN. Remove funny label and
corresponding gotos.
(ALLOW_DIVIDE_BY_ZERO): New macro.
(scm_divide): Allow division by zero to occur if
ALLOW_DIVIDE_BY_ZERO is defined.
Handle bignums and ints as special cases.
Additional stuff by me:
numbers.c (mem2ureal): Recognize "inf.0" and "nan.xxx".
(scm_even_p, scm_odd_p): Treat infinity as even and odd.
(iflo2str): Don't output a '+' for negative numbers or for Inf and
NaN. They will provide their own sign.
(scm_divide): Only allow divides by inexact zeros. Dividing by
exact zeros still signals an errors.
2002-05-06 22:33:10 +00:00
|
|
|
|
#if defined (SCO)
|
|
|
|
|
|
#if ! defined (HAVE_ISNAN)
|
|
|
|
|
|
#define HAVE_ISNAN
|
|
|
|
|
|
static int
|
|
|
|
|
|
isnan (double x)
|
|
|
|
|
|
{
|
|
|
|
|
|
return (IsNANorINF (x) && NaN (x) && ! IsINF (x)) ? 1 : 0;
|
|
|
|
|
|
}
|
1996-07-25 22:56:11 +00:00
|
|
|
|
#endif
|
From John W. Eaton.
* numbers.h: Conditionally include floatingpoint.h, ieeefp.h, and
nan.h. Provide declarations for scm_inf_p, scm_nan_p, scn_inf,
and scm_nan.
* numbers.c: [SCO && ! HAVE_ISNAN] (isnan): New function.
[SCO && ! HAVE_ISINF] (isinf): New function.
(xisinf, xisnan): New functions.
(IS_INF): Delete.
(isfinite): Define in terms of xisinf.
(scm_inf_p, scm_nan_p): New functions.
(guile_Inf, guile_NaN): New file-scope vars.
(guile_ieee_init): New function.
(scm_inf, scm_nan): New functions.
(idbl2str): Handle Inf and NaN. Remove funny label and
corresponding gotos.
(ALLOW_DIVIDE_BY_ZERO): New macro.
(scm_divide): Allow division by zero to occur if
ALLOW_DIVIDE_BY_ZERO is defined.
Handle bignums and ints as special cases.
Additional stuff by me:
numbers.c (mem2ureal): Recognize "inf.0" and "nan.xxx".
(scm_even_p, scm_odd_p): Treat infinity as even and odd.
(iflo2str): Don't output a '+' for negative numbers or for Inf and
NaN. They will provide their own sign.
(scm_divide): Only allow divides by inexact zeros. Dividing by
exact zeros still signals an errors.
2002-05-06 22:33:10 +00:00
|
|
|
|
#if ! defined (HAVE_ISINF)
|
|
|
|
|
|
#define HAVE_ISINF
|
|
|
|
|
|
static int
|
|
|
|
|
|
isinf (double x)
|
|
|
|
|
|
{
|
|
|
|
|
|
return (IsNANorINF (x) && IsINF (x)) ? 1 : 0;
|
|
|
|
|
|
}
|
1996-07-25 22:56:11 +00:00
|
|
|
|
|
From John W. Eaton.
* numbers.h: Conditionally include floatingpoint.h, ieeefp.h, and
nan.h. Provide declarations for scm_inf_p, scm_nan_p, scn_inf,
and scm_nan.
* numbers.c: [SCO && ! HAVE_ISNAN] (isnan): New function.
[SCO && ! HAVE_ISINF] (isinf): New function.
(xisinf, xisnan): New functions.
(IS_INF): Delete.
(isfinite): Define in terms of xisinf.
(scm_inf_p, scm_nan_p): New functions.
(guile_Inf, guile_NaN): New file-scope vars.
(guile_ieee_init): New function.
(scm_inf, scm_nan): New functions.
(idbl2str): Handle Inf and NaN. Remove funny label and
corresponding gotos.
(ALLOW_DIVIDE_BY_ZERO): New macro.
(scm_divide): Allow division by zero to occur if
ALLOW_DIVIDE_BY_ZERO is defined.
Handle bignums and ints as special cases.
Additional stuff by me:
numbers.c (mem2ureal): Recognize "inf.0" and "nan.xxx".
(scm_even_p, scm_odd_p): Treat infinity as even and odd.
(iflo2str): Don't output a '+' for negative numbers or for Inf and
NaN. They will provide their own sign.
(scm_divide): Only allow divides by inexact zeros. Dividing by
exact zeros still signals an errors.
2002-05-06 22:33:10 +00:00
|
|
|
|
#endif
|
1999-03-26 13:45:05 +00:00
|
|
|
|
#endif
|
|
|
|
|
|
|
2003-05-12 23:16:43 +00:00
|
|
|
|
|
implement transcendental sin, cos etc in c; deprecate $sin, $cos, etc
* libguile/deprecated.h:
* libguile/deprecated.c (scm_asinh, scm_acosh, scm_atanh): Deprecate
these stand-ins for the C99 asinh, acosh, and atanh functions. Guile
is not gnulib.
(scm_sys_atan2): Deprecate as well, in favor of scm_atan.
* libguile/numbers.h:
* libguile/numbers.c (scm_sin, scm_cos, scm_tan)
(scm_sinh, scm_cosh, scm_tanh)
(scm_asin, scm_acos, scm_atan)
(scm_sys_asinh, scm_sys_acosh, scm_sys_atanh): New functions,
replacing the combination of dsubrs and boot-9 wrappers with C subrs
that handle complex values. The latter three have _sys_ in their names
due to the name conflict with the deprecated scm_asinh et al.
Remove the $abs, $sin etc "dsubrs".
* module/ice-9/boot-9.scm: Remove transcendental functions, as this all
happens in C now.
* module/ice-9/deprecated.scm: Add aliases for $sin et al.
* test-suite/tests/ramap.test ("array-map!"): Adjust "dsubr" tests to
use sqrt, not $sqrt. They don't actually test dsubrs now. In the
two-source test, I'm pretty sure the dsubr array-map! should have been
failing, as indeed it does now; I've changed the test case to expect
the failure. I'd still like to know why it was succeeding before.
2009-09-03 22:29:10 +02:00
|
|
|
|
#if !defined (HAVE_ASINH)
|
|
|
|
|
|
static double asinh (double x) { return log (x + sqrt (x * x + 1)); }
|
|
|
|
|
|
#endif
|
|
|
|
|
|
#if !defined (HAVE_ACOSH)
|
|
|
|
|
|
static double acosh (double x) { return log (x + sqrt (x * x - 1)); }
|
|
|
|
|
|
#endif
|
|
|
|
|
|
#if !defined (HAVE_ATANH)
|
|
|
|
|
|
static double atanh (double x) { return 0.5 * log ((1 + x) / (1 - x)); }
|
|
|
|
|
|
#endif
|
|
|
|
|
|
|
2004-08-06 01:26:26 +00:00
|
|
|
|
/* mpz_cmp_d in gmp 4.1.3 doesn't recognise infinities, so xmpz_cmp_d uses
|
|
|
|
|
|
an explicit check. In some future gmp (don't know what version number),
|
|
|
|
|
|
mpz_cmp_d is supposed to do this itself. */
|
|
|
|
|
|
#if 1
|
2003-05-12 23:16:43 +00:00
|
|
|
|
#define xmpz_cmp_d(z, d) \
|
|
|
|
|
|
(xisinf (d) ? (d < 0.0 ? 1 : -1) : mpz_cmp_d (z, d))
|
|
|
|
|
|
#else
|
|
|
|
|
|
#define xmpz_cmp_d(z, d) mpz_cmp_d (z, d)
|
|
|
|
|
|
#endif
|
|
|
|
|
|
|
2004-04-15 01:24:00 +00:00
|
|
|
|
/* For reference, sparc solaris 7 has infinities (IEEE) but doesn't have
|
|
|
|
|
|
isinf. It does have finite and isnan though, hence the use of those.
|
|
|
|
|
|
fpclass would be a possibility on that system too. */
|
* print.c (scm_iprin1): Handle fractions.
* objects.h (scm_class_fraction): New.
* objects.c (scm_class_fraction): New.
(scm_class_of): Handle fractions.
* hash.c (scm_hasher): Handle fractions.
* numbers.c: New code for handling fraction all over the place.
(scm_odd_p, scm_even_p): Handle inexact integers.
(scm_rational_p): New function, same as scm_real_p.
(scm_round_number, scm_truncate_number, scm_ceiling, scm_floor):
New exact functions that replace the inexact 'dsubr'
implementations.
(scm_numerator, scm_denominator): New.
* numbers.h (SCM_NUMP): Recognize fractions.
(SCM_FRACTIONP, SCM_SLOPPY_FRACTIONP, SCM_FRACTION_NUMERATOR,
SCM_FRACTION_DENOMINATOR, SCM_FRACTION_SET_NUMERATOR,
SCM_FRACTION_SET_DENOMINATOR, SCM_FRACTION_REDUCED_BIT,
SCM_FRACTION_REDUCED_SET, SCM_FRACTION_REDUCED_CLEAR,
SCM_FRACTION_REDUCED): New.
(scm_floor, scm_ceiling, scm_truncate_number, scm_round_number):
New prototypes.
(scm_make_ratio, scm_rationalize, scm_numerator, scm_denominator,
scm_rational_p): New prototypes.
(scm_i_dbl2num, scm_i_fraction2double, scm_i_fraction_equalp,
scm_i_print_fraction): New prototypes.
* goops.c (create_standard_classes): Create "<fraction>" class.
* gc-mark.c (scm_gc_mark_dependencies): Handle fractions.
* gc-card.c (scm_i_sweep_card): Include scm_tc16_fraction as a
case in the switch, but do nothing for now.
* eval.c (SCM_CEVAL, SCM_APPLY, call_dsubr_1): Convert fractions
to doubles when calling 'dsubr' functions.
* eq.c (scm_eqv_p, scm_equal_p): Handle fractions.
2003-11-18 19:59:53 +00:00
|
|
|
|
static int
|
|
|
|
|
|
xisinf (double x)
|
|
|
|
|
|
{
|
|
|
|
|
|
#if defined (HAVE_ISINF)
|
|
|
|
|
|
return isinf (x);
|
|
|
|
|
|
#elif defined (HAVE_FINITE) && defined (HAVE_ISNAN)
|
|
|
|
|
|
return (! (finite (x) || isnan (x)));
|
|
|
|
|
|
#else
|
|
|
|
|
|
return 0;
|
|
|
|
|
|
#endif
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
static int
|
|
|
|
|
|
xisnan (double x)
|
|
|
|
|
|
{
|
|
|
|
|
|
#if defined (HAVE_ISNAN)
|
|
|
|
|
|
return isnan (x);
|
|
|
|
|
|
#else
|
|
|
|
|
|
return 0;
|
|
|
|
|
|
#endif
|
|
|
|
|
|
}
|
|
|
|
|
|
|
2008-02-11 21:20:14 +00:00
|
|
|
|
#if defined (GUILE_I)
|
2008-03-09 21:57:00 +00:00
|
|
|
|
#if HAVE_COMPLEX_DOUBLE
|
2006-10-09 23:40:48 +00:00
|
|
|
|
|
|
|
|
|
|
/* For an SCM object Z which is a complex number (ie. satisfies
|
|
|
|
|
|
SCM_COMPLEXP), return its value as a C level "complex double". */
|
|
|
|
|
|
#define SCM_COMPLEX_VALUE(z) \
|
2008-02-11 21:20:14 +00:00
|
|
|
|
(SCM_COMPLEX_REAL (z) + GUILE_I * SCM_COMPLEX_IMAG (z))
|
2006-10-09 23:40:48 +00:00
|
|
|
|
|
2008-05-07 17:43:17 +02:00
|
|
|
|
static inline SCM scm_from_complex_double (complex double z) SCM_UNUSED;
|
2006-10-09 23:40:48 +00:00
|
|
|
|
|
|
|
|
|
|
/* Convert a C "complex double" to an SCM value. */
|
2008-05-07 17:43:17 +02:00
|
|
|
|
static inline SCM
|
2006-10-09 23:40:48 +00:00
|
|
|
|
scm_from_complex_double (complex double z)
|
|
|
|
|
|
{
|
|
|
|
|
|
return scm_c_make_rectangular (creal (z), cimag (z));
|
|
|
|
|
|
}
|
2008-03-09 21:57:00 +00:00
|
|
|
|
|
2006-10-09 23:40:48 +00:00
|
|
|
|
#endif /* HAVE_COMPLEX_DOUBLE */
|
2008-03-09 21:57:00 +00:00
|
|
|
|
#endif /* GUILE_I */
|
2006-10-09 23:40:48 +00:00
|
|
|
|
|
1996-07-25 22:56:11 +00:00
|
|
|
|
|
|
|
|
|
|
|
2003-05-30 00:23:11 +00:00
|
|
|
|
static mpz_t z_negative_one;
|
2001-01-17 18:15:30 +00:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
2008-02-06 13:51:05 +00:00
|
|
|
|
SCM
|
2003-04-04 21:49:44 +00:00
|
|
|
|
scm_i_mkbig ()
|
|
|
|
|
|
{
|
|
|
|
|
|
/* Return a newly created bignum. */
|
|
|
|
|
|
SCM z = scm_double_cell (scm_tc16_big, 0, 0, 0);
|
|
|
|
|
|
mpz_init (SCM_I_BIG_MPZ (z));
|
|
|
|
|
|
return z;
|
|
|
|
|
|
}
|
|
|
|
|
|
|
2008-02-06 13:51:05 +00:00
|
|
|
|
SCM
|
* discouraged.h, discouraged.c: New files.
* deprecated.h (SCM_FALSEP, SCM_NFALSEP, SCM_BOOLP, SCM_EQ_P,
SCM_NEGATE_BOOL, SCM_BOOL, SCM_BOOT_NOT): Promoted from being
deprecated to being discouraged by moving to discouraged.h.
* numbers.h, numbers.c, discouraged.h, discouraged.c
(scm_short2num, scm_ushort2num, scm_int2num, scm_uint2num,
scm_long2num, scm_ulong2num, scm_size2num, scm_ptrdiff2num,
scm_num2short, scm_num2ushort, scm_num2int, scm_num2uint,
scm_num2long, scm_num2ulong, scm_num2size, scm_num2ptrdiff,
scm_long_long2num, scm_ulong_long2num, scm_num2long_long,
scm_num2ulong_long): Discouraged by moving to discouraged.h and
discouraged.c and reimplementing in terms of scm_from_* and
scm_to_*.
* numbers.h, numbers.c: Removed GUILE_DEBUG code.
(scm_i_short2big, scm_i_ushort2big, scm_i_int2big, scm_i_uint2big,
scm_i_size2big, scm_i_ptrdiff2big): Removed.
(scm_i_long2big, scm_i_ulong2big): New, explicit definitions.
* conv-integer.i.c, conv-uinteger.i.c: Use them instead of
explicit code.
2004-08-02 15:57:04 +00:00
|
|
|
|
scm_i_long2big (long x)
|
|
|
|
|
|
{
|
|
|
|
|
|
/* Return a newly created bignum initialized to X. */
|
|
|
|
|
|
SCM z = scm_double_cell (scm_tc16_big, 0, 0, 0);
|
|
|
|
|
|
mpz_init_set_si (SCM_I_BIG_MPZ (z), x);
|
|
|
|
|
|
return z;
|
|
|
|
|
|
}
|
|
|
|
|
|
|
2008-02-06 13:51:05 +00:00
|
|
|
|
SCM
|
* discouraged.h, discouraged.c: New files.
* deprecated.h (SCM_FALSEP, SCM_NFALSEP, SCM_BOOLP, SCM_EQ_P,
SCM_NEGATE_BOOL, SCM_BOOL, SCM_BOOT_NOT): Promoted from being
deprecated to being discouraged by moving to discouraged.h.
* numbers.h, numbers.c, discouraged.h, discouraged.c
(scm_short2num, scm_ushort2num, scm_int2num, scm_uint2num,
scm_long2num, scm_ulong2num, scm_size2num, scm_ptrdiff2num,
scm_num2short, scm_num2ushort, scm_num2int, scm_num2uint,
scm_num2long, scm_num2ulong, scm_num2size, scm_num2ptrdiff,
scm_long_long2num, scm_ulong_long2num, scm_num2long_long,
scm_num2ulong_long): Discouraged by moving to discouraged.h and
discouraged.c and reimplementing in terms of scm_from_* and
scm_to_*.
* numbers.h, numbers.c: Removed GUILE_DEBUG code.
(scm_i_short2big, scm_i_ushort2big, scm_i_int2big, scm_i_uint2big,
scm_i_size2big, scm_i_ptrdiff2big): Removed.
(scm_i_long2big, scm_i_ulong2big): New, explicit definitions.
* conv-integer.i.c, conv-uinteger.i.c: Use them instead of
explicit code.
2004-08-02 15:57:04 +00:00
|
|
|
|
scm_i_ulong2big (unsigned long x)
|
|
|
|
|
|
{
|
|
|
|
|
|
/* Return a newly created bignum initialized to X. */
|
|
|
|
|
|
SCM z = scm_double_cell (scm_tc16_big, 0, 0, 0);
|
|
|
|
|
|
mpz_init_set_ui (SCM_I_BIG_MPZ (z), x);
|
|
|
|
|
|
return z;
|
|
|
|
|
|
}
|
|
|
|
|
|
|
2008-02-06 13:51:05 +00:00
|
|
|
|
SCM
|
2003-04-04 21:49:44 +00:00
|
|
|
|
scm_i_clonebig (SCM src_big, int same_sign_p)
|
|
|
|
|
|
{
|
|
|
|
|
|
/* Copy src_big's value, negate it if same_sign_p is false, and return. */
|
|
|
|
|
|
SCM z = scm_double_cell (scm_tc16_big, 0, 0, 0);
|
|
|
|
|
|
mpz_init_set (SCM_I_BIG_MPZ (z), SCM_I_BIG_MPZ (src_big));
|
2003-07-13 16:13:57 +00:00
|
|
|
|
if (!same_sign_p)
|
|
|
|
|
|
mpz_neg (SCM_I_BIG_MPZ (z), SCM_I_BIG_MPZ (z));
|
2003-04-04 21:49:44 +00:00
|
|
|
|
return z;
|
|
|
|
|
|
}
|
|
|
|
|
|
|
2008-02-06 13:51:05 +00:00
|
|
|
|
int
|
2003-04-04 21:49:44 +00:00
|
|
|
|
scm_i_bigcmp (SCM x, SCM y)
|
|
|
|
|
|
{
|
|
|
|
|
|
/* Return neg if x < y, pos if x > y, and 0 if x == y */
|
|
|
|
|
|
/* presume we already know x and y are bignums */
|
|
|
|
|
|
int result = mpz_cmp (SCM_I_BIG_MPZ (x), SCM_I_BIG_MPZ (y));
|
|
|
|
|
|
scm_remember_upto_here_2 (x, y);
|
|
|
|
|
|
return result;
|
|
|
|
|
|
}
|
|
|
|
|
|
|
2008-02-06 13:51:05 +00:00
|
|
|
|
SCM
|
2003-04-04 21:49:44 +00:00
|
|
|
|
scm_i_dbl2big (double d)
|
|
|
|
|
|
{
|
|
|
|
|
|
/* results are only defined if d is an integer */
|
|
|
|
|
|
SCM z = scm_double_cell (scm_tc16_big, 0, 0, 0);
|
|
|
|
|
|
mpz_init_set_d (SCM_I_BIG_MPZ (z), d);
|
|
|
|
|
|
return z;
|
|
|
|
|
|
}
|
|
|
|
|
|
|
* print.c (scm_iprin1): Handle fractions.
* objects.h (scm_class_fraction): New.
* objects.c (scm_class_fraction): New.
(scm_class_of): Handle fractions.
* hash.c (scm_hasher): Handle fractions.
* numbers.c: New code for handling fraction all over the place.
(scm_odd_p, scm_even_p): Handle inexact integers.
(scm_rational_p): New function, same as scm_real_p.
(scm_round_number, scm_truncate_number, scm_ceiling, scm_floor):
New exact functions that replace the inexact 'dsubr'
implementations.
(scm_numerator, scm_denominator): New.
* numbers.h (SCM_NUMP): Recognize fractions.
(SCM_FRACTIONP, SCM_SLOPPY_FRACTIONP, SCM_FRACTION_NUMERATOR,
SCM_FRACTION_DENOMINATOR, SCM_FRACTION_SET_NUMERATOR,
SCM_FRACTION_SET_DENOMINATOR, SCM_FRACTION_REDUCED_BIT,
SCM_FRACTION_REDUCED_SET, SCM_FRACTION_REDUCED_CLEAR,
SCM_FRACTION_REDUCED): New.
(scm_floor, scm_ceiling, scm_truncate_number, scm_round_number):
New prototypes.
(scm_make_ratio, scm_rationalize, scm_numerator, scm_denominator,
scm_rational_p): New prototypes.
(scm_i_dbl2num, scm_i_fraction2double, scm_i_fraction_equalp,
scm_i_print_fraction): New prototypes.
* goops.c (create_standard_classes): Create "<fraction>" class.
* gc-mark.c (scm_gc_mark_dependencies): Handle fractions.
* gc-card.c (scm_i_sweep_card): Include scm_tc16_fraction as a
case in the switch, but do nothing for now.
* eval.c (SCM_CEVAL, SCM_APPLY, call_dsubr_1): Convert fractions
to doubles when calling 'dsubr' functions.
* eq.c (scm_eqv_p, scm_equal_p): Handle fractions.
2003-11-18 19:59:53 +00:00
|
|
|
|
/* Convert a integer in double representation to a SCM number. */
|
|
|
|
|
|
|
2008-02-06 13:51:05 +00:00
|
|
|
|
SCM
|
* print.c (scm_iprin1): Handle fractions.
* objects.h (scm_class_fraction): New.
* objects.c (scm_class_fraction): New.
(scm_class_of): Handle fractions.
* hash.c (scm_hasher): Handle fractions.
* numbers.c: New code for handling fraction all over the place.
(scm_odd_p, scm_even_p): Handle inexact integers.
(scm_rational_p): New function, same as scm_real_p.
(scm_round_number, scm_truncate_number, scm_ceiling, scm_floor):
New exact functions that replace the inexact 'dsubr'
implementations.
(scm_numerator, scm_denominator): New.
* numbers.h (SCM_NUMP): Recognize fractions.
(SCM_FRACTIONP, SCM_SLOPPY_FRACTIONP, SCM_FRACTION_NUMERATOR,
SCM_FRACTION_DENOMINATOR, SCM_FRACTION_SET_NUMERATOR,
SCM_FRACTION_SET_DENOMINATOR, SCM_FRACTION_REDUCED_BIT,
SCM_FRACTION_REDUCED_SET, SCM_FRACTION_REDUCED_CLEAR,
SCM_FRACTION_REDUCED): New.
(scm_floor, scm_ceiling, scm_truncate_number, scm_round_number):
New prototypes.
(scm_make_ratio, scm_rationalize, scm_numerator, scm_denominator,
scm_rational_p): New prototypes.
(scm_i_dbl2num, scm_i_fraction2double, scm_i_fraction_equalp,
scm_i_print_fraction): New prototypes.
* goops.c (create_standard_classes): Create "<fraction>" class.
* gc-mark.c (scm_gc_mark_dependencies): Handle fractions.
* gc-card.c (scm_i_sweep_card): Include scm_tc16_fraction as a
case in the switch, but do nothing for now.
* eval.c (SCM_CEVAL, SCM_APPLY, call_dsubr_1): Convert fractions
to doubles when calling 'dsubr' functions.
* eq.c (scm_eqv_p, scm_equal_p): Handle fractions.
2003-11-18 19:59:53 +00:00
|
|
|
|
scm_i_dbl2num (double u)
|
|
|
|
|
|
{
|
|
|
|
|
|
/* SCM_MOST_POSITIVE_FIXNUM+1 and SCM_MOST_NEGATIVE_FIXNUM are both
|
|
|
|
|
|
powers of 2, so there's no rounding when making "double" values
|
|
|
|
|
|
from them. If plain SCM_MOST_POSITIVE_FIXNUM was used it could
|
|
|
|
|
|
get rounded on a 64-bit machine, hence the "+1".
|
|
|
|
|
|
|
|
|
|
|
|
The use of floor() to force to an integer value ensures we get a
|
|
|
|
|
|
"numerically closest" value without depending on how a
|
|
|
|
|
|
double->long cast or how mpz_set_d will round. For reference,
|
|
|
|
|
|
double->long probably follows the hardware rounding mode,
|
|
|
|
|
|
mpz_set_d truncates towards zero. */
|
|
|
|
|
|
|
|
|
|
|
|
/* XXX - what happens when SCM_MOST_POSITIVE_FIXNUM etc is not
|
|
|
|
|
|
representable as a double? */
|
|
|
|
|
|
|
|
|
|
|
|
if (u < (double) (SCM_MOST_POSITIVE_FIXNUM+1)
|
|
|
|
|
|
&& u >= (double) SCM_MOST_NEGATIVE_FIXNUM)
|
2004-07-08 15:54:05 +00:00
|
|
|
|
return SCM_I_MAKINUM ((long) u);
|
* print.c (scm_iprin1): Handle fractions.
* objects.h (scm_class_fraction): New.
* objects.c (scm_class_fraction): New.
(scm_class_of): Handle fractions.
* hash.c (scm_hasher): Handle fractions.
* numbers.c: New code for handling fraction all over the place.
(scm_odd_p, scm_even_p): Handle inexact integers.
(scm_rational_p): New function, same as scm_real_p.
(scm_round_number, scm_truncate_number, scm_ceiling, scm_floor):
New exact functions that replace the inexact 'dsubr'
implementations.
(scm_numerator, scm_denominator): New.
* numbers.h (SCM_NUMP): Recognize fractions.
(SCM_FRACTIONP, SCM_SLOPPY_FRACTIONP, SCM_FRACTION_NUMERATOR,
SCM_FRACTION_DENOMINATOR, SCM_FRACTION_SET_NUMERATOR,
SCM_FRACTION_SET_DENOMINATOR, SCM_FRACTION_REDUCED_BIT,
SCM_FRACTION_REDUCED_SET, SCM_FRACTION_REDUCED_CLEAR,
SCM_FRACTION_REDUCED): New.
(scm_floor, scm_ceiling, scm_truncate_number, scm_round_number):
New prototypes.
(scm_make_ratio, scm_rationalize, scm_numerator, scm_denominator,
scm_rational_p): New prototypes.
(scm_i_dbl2num, scm_i_fraction2double, scm_i_fraction_equalp,
scm_i_print_fraction): New prototypes.
* goops.c (create_standard_classes): Create "<fraction>" class.
* gc-mark.c (scm_gc_mark_dependencies): Handle fractions.
* gc-card.c (scm_i_sweep_card): Include scm_tc16_fraction as a
case in the switch, but do nothing for now.
* eval.c (SCM_CEVAL, SCM_APPLY, call_dsubr_1): Convert fractions
to doubles when calling 'dsubr' functions.
* eq.c (scm_eqv_p, scm_equal_p): Handle fractions.
2003-11-18 19:59:53 +00:00
|
|
|
|
else
|
|
|
|
|
|
return scm_i_dbl2big (u);
|
|
|
|
|
|
}
|
|
|
|
|
|
|
2003-10-19 00:32:25 +00:00
|
|
|
|
/* scm_i_big2dbl() rounds to the closest representable double, in accordance
|
|
|
|
|
|
with R5RS exact->inexact.
|
|
|
|
|
|
|
|
|
|
|
|
The approach is to use mpz_get_d to pick out the high DBL_MANT_DIG bits
|
2004-08-06 01:26:26 +00:00
|
|
|
|
(ie. truncate towards zero), then adjust to get the closest double by
|
|
|
|
|
|
examining the next lower bit and adding 1 (to the absolute value) if
|
|
|
|
|
|
necessary.
|
|
|
|
|
|
|
|
|
|
|
|
Bignums exactly half way between representable doubles are rounded to the
|
|
|
|
|
|
next higher absolute value (ie. away from zero). This seems like an
|
|
|
|
|
|
adequate interpretation of R5RS "numerically closest", and it's easier
|
|
|
|
|
|
and faster than a full "nearest-even" style.
|
|
|
|
|
|
|
|
|
|
|
|
The bit test must be done on the absolute value of the mpz_t, which means
|
|
|
|
|
|
we need to use mpz_getlimbn. mpz_tstbit is not right, it treats
|
|
|
|
|
|
negatives as twos complement.
|
|
|
|
|
|
|
|
|
|
|
|
In current gmp 4.1.3, mpz_get_d rounding is unspecified. It ends up
|
|
|
|
|
|
following the hardware rounding mode, but applied to the absolute value
|
|
|
|
|
|
of the mpz_t operand. This is not what we want so we put the high
|
|
|
|
|
|
DBL_MANT_DIG bits into a temporary. In some future gmp, don't know when,
|
|
|
|
|
|
mpz_get_d is supposed to always truncate towards zero.
|
|
|
|
|
|
|
|
|
|
|
|
ENHANCE-ME: The temporary init+clear to force the rounding in gmp 4.1.3
|
|
|
|
|
|
is a slowdown. It'd be faster to pick out the relevant high bits with
|
|
|
|
|
|
mpz_getlimbn if we could be bothered coding that, and if the new
|
|
|
|
|
|
truncating gmp doesn't come out. */
|
2003-10-19 00:32:25 +00:00
|
|
|
|
|
|
|
|
|
|
double
|
2003-04-04 21:49:44 +00:00
|
|
|
|
scm_i_big2dbl (SCM b)
|
|
|
|
|
|
{
|
2003-10-19 00:32:25 +00:00
|
|
|
|
double result;
|
|
|
|
|
|
size_t bits;
|
|
|
|
|
|
|
|
|
|
|
|
bits = mpz_sizeinbase (SCM_I_BIG_MPZ (b), 2);
|
|
|
|
|
|
|
2004-08-06 01:26:26 +00:00
|
|
|
|
#if 1
|
2003-10-19 00:32:25 +00:00
|
|
|
|
{
|
2004-08-06 01:26:26 +00:00
|
|
|
|
/* Current GMP, eg. 4.1.3, force truncation towards zero */
|
2003-10-19 00:32:25 +00:00
|
|
|
|
mpz_t tmp;
|
|
|
|
|
|
if (bits > DBL_MANT_DIG)
|
|
|
|
|
|
{
|
|
|
|
|
|
size_t shift = bits - DBL_MANT_DIG;
|
|
|
|
|
|
mpz_init2 (tmp, DBL_MANT_DIG);
|
|
|
|
|
|
mpz_tdiv_q_2exp (tmp, SCM_I_BIG_MPZ (b), shift);
|
|
|
|
|
|
result = ldexp (mpz_get_d (tmp), shift);
|
|
|
|
|
|
mpz_clear (tmp);
|
|
|
|
|
|
}
|
|
|
|
|
|
else
|
|
|
|
|
|
{
|
|
|
|
|
|
result = mpz_get_d (SCM_I_BIG_MPZ (b));
|
|
|
|
|
|
}
|
|
|
|
|
|
}
|
|
|
|
|
|
#else
|
2004-08-06 01:26:26 +00:00
|
|
|
|
/* Future GMP */
|
2003-10-19 00:32:25 +00:00
|
|
|
|
result = mpz_get_d (SCM_I_BIG_MPZ (b));
|
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
|
|
if (bits > DBL_MANT_DIG)
|
|
|
|
|
|
{
|
|
|
|
|
|
unsigned long pos = bits - DBL_MANT_DIG - 1;
|
|
|
|
|
|
/* test bit number "pos" in absolute value */
|
|
|
|
|
|
if (mpz_getlimbn (SCM_I_BIG_MPZ (b), pos / GMP_NUMB_BITS)
|
|
|
|
|
|
& ((mp_limb_t) 1 << (pos % GMP_NUMB_BITS)))
|
|
|
|
|
|
{
|
|
|
|
|
|
result += ldexp ((double) mpz_sgn (SCM_I_BIG_MPZ (b)), pos + 1);
|
|
|
|
|
|
}
|
|
|
|
|
|
}
|
|
|
|
|
|
|
2003-04-04 21:49:44 +00:00
|
|
|
|
scm_remember_upto_here_1 (b);
|
|
|
|
|
|
return result;
|
|
|
|
|
|
}
|
|
|
|
|
|
|
2008-02-06 13:51:05 +00:00
|
|
|
|
SCM
|
2003-04-04 21:49:44 +00:00
|
|
|
|
scm_i_normbig (SCM b)
|
|
|
|
|
|
{
|
|
|
|
|
|
/* convert a big back to a fixnum if it'll fit */
|
|
|
|
|
|
/* presume b is a bignum */
|
|
|
|
|
|
if (mpz_fits_slong_p (SCM_I_BIG_MPZ (b)))
|
|
|
|
|
|
{
|
|
|
|
|
|
long val = mpz_get_si (SCM_I_BIG_MPZ (b));
|
|
|
|
|
|
if (SCM_FIXABLE (val))
|
2004-07-08 15:54:05 +00:00
|
|
|
|
b = SCM_I_MAKINUM (val);
|
2003-04-04 21:49:44 +00:00
|
|
|
|
}
|
|
|
|
|
|
return b;
|
|
|
|
|
|
}
|
1999-01-10 07:38:39 +00:00
|
|
|
|
|
* print.c (scm_iprin1): Handle fractions.
* objects.h (scm_class_fraction): New.
* objects.c (scm_class_fraction): New.
(scm_class_of): Handle fractions.
* hash.c (scm_hasher): Handle fractions.
* numbers.c: New code for handling fraction all over the place.
(scm_odd_p, scm_even_p): Handle inexact integers.
(scm_rational_p): New function, same as scm_real_p.
(scm_round_number, scm_truncate_number, scm_ceiling, scm_floor):
New exact functions that replace the inexact 'dsubr'
implementations.
(scm_numerator, scm_denominator): New.
* numbers.h (SCM_NUMP): Recognize fractions.
(SCM_FRACTIONP, SCM_SLOPPY_FRACTIONP, SCM_FRACTION_NUMERATOR,
SCM_FRACTION_DENOMINATOR, SCM_FRACTION_SET_NUMERATOR,
SCM_FRACTION_SET_DENOMINATOR, SCM_FRACTION_REDUCED_BIT,
SCM_FRACTION_REDUCED_SET, SCM_FRACTION_REDUCED_CLEAR,
SCM_FRACTION_REDUCED): New.
(scm_floor, scm_ceiling, scm_truncate_number, scm_round_number):
New prototypes.
(scm_make_ratio, scm_rationalize, scm_numerator, scm_denominator,
scm_rational_p): New prototypes.
(scm_i_dbl2num, scm_i_fraction2double, scm_i_fraction_equalp,
scm_i_print_fraction): New prototypes.
* goops.c (create_standard_classes): Create "<fraction>" class.
* gc-mark.c (scm_gc_mark_dependencies): Handle fractions.
* gc-card.c (scm_i_sweep_card): Include scm_tc16_fraction as a
case in the switch, but do nothing for now.
* eval.c (SCM_CEVAL, SCM_APPLY, call_dsubr_1): Convert fractions
to doubles when calling 'dsubr' functions.
* eq.c (scm_eqv_p, scm_equal_p): Handle fractions.
2003-11-18 19:59:53 +00:00
|
|
|
|
static SCM_C_INLINE_KEYWORD SCM
|
|
|
|
|
|
scm_i_mpz2num (mpz_t b)
|
|
|
|
|
|
{
|
|
|
|
|
|
/* convert a mpz number to a SCM number. */
|
|
|
|
|
|
if (mpz_fits_slong_p (b))
|
|
|
|
|
|
{
|
|
|
|
|
|
long val = mpz_get_si (b);
|
|
|
|
|
|
if (SCM_FIXABLE (val))
|
2004-07-08 15:54:05 +00:00
|
|
|
|
return SCM_I_MAKINUM (val);
|
* print.c (scm_iprin1): Handle fractions.
* objects.h (scm_class_fraction): New.
* objects.c (scm_class_fraction): New.
(scm_class_of): Handle fractions.
* hash.c (scm_hasher): Handle fractions.
* numbers.c: New code for handling fraction all over the place.
(scm_odd_p, scm_even_p): Handle inexact integers.
(scm_rational_p): New function, same as scm_real_p.
(scm_round_number, scm_truncate_number, scm_ceiling, scm_floor):
New exact functions that replace the inexact 'dsubr'
implementations.
(scm_numerator, scm_denominator): New.
* numbers.h (SCM_NUMP): Recognize fractions.
(SCM_FRACTIONP, SCM_SLOPPY_FRACTIONP, SCM_FRACTION_NUMERATOR,
SCM_FRACTION_DENOMINATOR, SCM_FRACTION_SET_NUMERATOR,
SCM_FRACTION_SET_DENOMINATOR, SCM_FRACTION_REDUCED_BIT,
SCM_FRACTION_REDUCED_SET, SCM_FRACTION_REDUCED_CLEAR,
SCM_FRACTION_REDUCED): New.
(scm_floor, scm_ceiling, scm_truncate_number, scm_round_number):
New prototypes.
(scm_make_ratio, scm_rationalize, scm_numerator, scm_denominator,
scm_rational_p): New prototypes.
(scm_i_dbl2num, scm_i_fraction2double, scm_i_fraction_equalp,
scm_i_print_fraction): New prototypes.
* goops.c (create_standard_classes): Create "<fraction>" class.
* gc-mark.c (scm_gc_mark_dependencies): Handle fractions.
* gc-card.c (scm_i_sweep_card): Include scm_tc16_fraction as a
case in the switch, but do nothing for now.
* eval.c (SCM_CEVAL, SCM_APPLY, call_dsubr_1): Convert fractions
to doubles when calling 'dsubr' functions.
* eq.c (scm_eqv_p, scm_equal_p): Handle fractions.
2003-11-18 19:59:53 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
{
|
|
|
|
|
|
SCM z = scm_double_cell (scm_tc16_big, 0, 0, 0);
|
|
|
|
|
|
mpz_init_set (SCM_I_BIG_MPZ (z), b);
|
|
|
|
|
|
return z;
|
|
|
|
|
|
}
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/* this is needed when we want scm_divide to make a float, not a ratio, even if passed two ints */
|
|
|
|
|
|
static SCM scm_divide2real (SCM x, SCM y);
|
|
|
|
|
|
|
2004-08-03 15:55:42 +00:00
|
|
|
|
static SCM
|
|
|
|
|
|
scm_i_make_ratio (SCM numerator, SCM denominator)
|
2003-11-19 05:12:08 +00:00
|
|
|
|
#define FUNC_NAME "make-ratio"
|
* print.c (scm_iprin1): Handle fractions.
* objects.h (scm_class_fraction): New.
* objects.c (scm_class_fraction): New.
(scm_class_of): Handle fractions.
* hash.c (scm_hasher): Handle fractions.
* numbers.c: New code for handling fraction all over the place.
(scm_odd_p, scm_even_p): Handle inexact integers.
(scm_rational_p): New function, same as scm_real_p.
(scm_round_number, scm_truncate_number, scm_ceiling, scm_floor):
New exact functions that replace the inexact 'dsubr'
implementations.
(scm_numerator, scm_denominator): New.
* numbers.h (SCM_NUMP): Recognize fractions.
(SCM_FRACTIONP, SCM_SLOPPY_FRACTIONP, SCM_FRACTION_NUMERATOR,
SCM_FRACTION_DENOMINATOR, SCM_FRACTION_SET_NUMERATOR,
SCM_FRACTION_SET_DENOMINATOR, SCM_FRACTION_REDUCED_BIT,
SCM_FRACTION_REDUCED_SET, SCM_FRACTION_REDUCED_CLEAR,
SCM_FRACTION_REDUCED): New.
(scm_floor, scm_ceiling, scm_truncate_number, scm_round_number):
New prototypes.
(scm_make_ratio, scm_rationalize, scm_numerator, scm_denominator,
scm_rational_p): New prototypes.
(scm_i_dbl2num, scm_i_fraction2double, scm_i_fraction_equalp,
scm_i_print_fraction): New prototypes.
* goops.c (create_standard_classes): Create "<fraction>" class.
* gc-mark.c (scm_gc_mark_dependencies): Handle fractions.
* gc-card.c (scm_i_sweep_card): Include scm_tc16_fraction as a
case in the switch, but do nothing for now.
* eval.c (SCM_CEVAL, SCM_APPLY, call_dsubr_1): Convert fractions
to doubles when calling 'dsubr' functions.
* eq.c (scm_eqv_p, scm_equal_p): Handle fractions.
2003-11-18 19:59:53 +00:00
|
|
|
|
{
|
2003-11-19 05:12:08 +00:00
|
|
|
|
/* First make sure the arguments are proper.
|
|
|
|
|
|
*/
|
2004-07-23 15:43:02 +00:00
|
|
|
|
if (SCM_I_INUMP (denominator))
|
* print.c (scm_iprin1): Handle fractions.
* objects.h (scm_class_fraction): New.
* objects.c (scm_class_fraction): New.
(scm_class_of): Handle fractions.
* hash.c (scm_hasher): Handle fractions.
* numbers.c: New code for handling fraction all over the place.
(scm_odd_p, scm_even_p): Handle inexact integers.
(scm_rational_p): New function, same as scm_real_p.
(scm_round_number, scm_truncate_number, scm_ceiling, scm_floor):
New exact functions that replace the inexact 'dsubr'
implementations.
(scm_numerator, scm_denominator): New.
* numbers.h (SCM_NUMP): Recognize fractions.
(SCM_FRACTIONP, SCM_SLOPPY_FRACTIONP, SCM_FRACTION_NUMERATOR,
SCM_FRACTION_DENOMINATOR, SCM_FRACTION_SET_NUMERATOR,
SCM_FRACTION_SET_DENOMINATOR, SCM_FRACTION_REDUCED_BIT,
SCM_FRACTION_REDUCED_SET, SCM_FRACTION_REDUCED_CLEAR,
SCM_FRACTION_REDUCED): New.
(scm_floor, scm_ceiling, scm_truncate_number, scm_round_number):
New prototypes.
(scm_make_ratio, scm_rationalize, scm_numerator, scm_denominator,
scm_rational_p): New prototypes.
(scm_i_dbl2num, scm_i_fraction2double, scm_i_fraction_equalp,
scm_i_print_fraction): New prototypes.
* goops.c (create_standard_classes): Create "<fraction>" class.
* gc-mark.c (scm_gc_mark_dependencies): Handle fractions.
* gc-card.c (scm_i_sweep_card): Include scm_tc16_fraction as a
case in the switch, but do nothing for now.
* eval.c (SCM_CEVAL, SCM_APPLY, call_dsubr_1): Convert fractions
to doubles when calling 'dsubr' functions.
* eq.c (scm_eqv_p, scm_equal_p): Handle fractions.
2003-11-18 19:59:53 +00:00
|
|
|
|
{
|
2004-07-27 15:41:49 +00:00
|
|
|
|
if (scm_is_eq (denominator, SCM_INUM0))
|
* print.c (scm_iprin1): Handle fractions.
* objects.h (scm_class_fraction): New.
* objects.c (scm_class_fraction): New.
(scm_class_of): Handle fractions.
* hash.c (scm_hasher): Handle fractions.
* numbers.c: New code for handling fraction all over the place.
(scm_odd_p, scm_even_p): Handle inexact integers.
(scm_rational_p): New function, same as scm_real_p.
(scm_round_number, scm_truncate_number, scm_ceiling, scm_floor):
New exact functions that replace the inexact 'dsubr'
implementations.
(scm_numerator, scm_denominator): New.
* numbers.h (SCM_NUMP): Recognize fractions.
(SCM_FRACTIONP, SCM_SLOPPY_FRACTIONP, SCM_FRACTION_NUMERATOR,
SCM_FRACTION_DENOMINATOR, SCM_FRACTION_SET_NUMERATOR,
SCM_FRACTION_SET_DENOMINATOR, SCM_FRACTION_REDUCED_BIT,
SCM_FRACTION_REDUCED_SET, SCM_FRACTION_REDUCED_CLEAR,
SCM_FRACTION_REDUCED): New.
(scm_floor, scm_ceiling, scm_truncate_number, scm_round_number):
New prototypes.
(scm_make_ratio, scm_rationalize, scm_numerator, scm_denominator,
scm_rational_p): New prototypes.
(scm_i_dbl2num, scm_i_fraction2double, scm_i_fraction_equalp,
scm_i_print_fraction): New prototypes.
* goops.c (create_standard_classes): Create "<fraction>" class.
* gc-mark.c (scm_gc_mark_dependencies): Handle fractions.
* gc-card.c (scm_i_sweep_card): Include scm_tc16_fraction as a
case in the switch, but do nothing for now.
* eval.c (SCM_CEVAL, SCM_APPLY, call_dsubr_1): Convert fractions
to doubles when calling 'dsubr' functions.
* eq.c (scm_eqv_p, scm_equal_p): Handle fractions.
2003-11-18 19:59:53 +00:00
|
|
|
|
scm_num_overflow ("make-ratio");
|
2004-07-27 15:41:49 +00:00
|
|
|
|
if (scm_is_eq (denominator, SCM_I_MAKINUM(1)))
|
* print.c (scm_iprin1): Handle fractions.
* objects.h (scm_class_fraction): New.
* objects.c (scm_class_fraction): New.
(scm_class_of): Handle fractions.
* hash.c (scm_hasher): Handle fractions.
* numbers.c: New code for handling fraction all over the place.
(scm_odd_p, scm_even_p): Handle inexact integers.
(scm_rational_p): New function, same as scm_real_p.
(scm_round_number, scm_truncate_number, scm_ceiling, scm_floor):
New exact functions that replace the inexact 'dsubr'
implementations.
(scm_numerator, scm_denominator): New.
* numbers.h (SCM_NUMP): Recognize fractions.
(SCM_FRACTIONP, SCM_SLOPPY_FRACTIONP, SCM_FRACTION_NUMERATOR,
SCM_FRACTION_DENOMINATOR, SCM_FRACTION_SET_NUMERATOR,
SCM_FRACTION_SET_DENOMINATOR, SCM_FRACTION_REDUCED_BIT,
SCM_FRACTION_REDUCED_SET, SCM_FRACTION_REDUCED_CLEAR,
SCM_FRACTION_REDUCED): New.
(scm_floor, scm_ceiling, scm_truncate_number, scm_round_number):
New prototypes.
(scm_make_ratio, scm_rationalize, scm_numerator, scm_denominator,
scm_rational_p): New prototypes.
(scm_i_dbl2num, scm_i_fraction2double, scm_i_fraction_equalp,
scm_i_print_fraction): New prototypes.
* goops.c (create_standard_classes): Create "<fraction>" class.
* gc-mark.c (scm_gc_mark_dependencies): Handle fractions.
* gc-card.c (scm_i_sweep_card): Include scm_tc16_fraction as a
case in the switch, but do nothing for now.
* eval.c (SCM_CEVAL, SCM_APPLY, call_dsubr_1): Convert fractions
to doubles when calling 'dsubr' functions.
* eq.c (scm_eqv_p, scm_equal_p): Handle fractions.
2003-11-18 19:59:53 +00:00
|
|
|
|
return numerator;
|
|
|
|
|
|
}
|
|
|
|
|
|
else
|
|
|
|
|
|
{
|
|
|
|
|
|
if (!(SCM_BIGP(denominator)))
|
|
|
|
|
|
SCM_WRONG_TYPE_ARG (2, denominator);
|
|
|
|
|
|
}
|
2004-07-23 15:43:02 +00:00
|
|
|
|
if (!SCM_I_INUMP (numerator) && !SCM_BIGP (numerator))
|
2003-11-19 05:12:08 +00:00
|
|
|
|
SCM_WRONG_TYPE_ARG (1, numerator);
|
|
|
|
|
|
|
|
|
|
|
|
/* Then flip signs so that the denominator is positive.
|
|
|
|
|
|
*/
|
(scm_is_integer, scm_is_signed_integer, scm_is_unsigned_integer,
scm_to_signed_integer, scm_to_unsigned_integer, scm_to_schar,
scm_to_uchar, scm_to_char, scm_to_short, scm_to_ushort, scm_to_long,
scm_to_ulong, scm_to_size_t, scm_to_ssize_t, scm_from_schar,
scm_from_uchar, scm_from_char, scm_from_short, scm_from_ushort,
scm_from_int, scm_from_uint, scm_from_long, scm_from_ulong,
scm_from_size_t, scm_from_ssize_t, scm_is_real, scm_to_double,
scm_from_double): New.
* deprecated.h, boolean.h (SCM_FALSEP, SCM_NFALSEP, SCM_BOOL,
SCM_NEGATE_BOOL, SCM_BOOLP): Deprecated by moving into "deprecated.h".
Replaced all uses with scm_is_false, scm_is_true, scm_from_bool, and
scm_is_bool, respectively.
2004-07-06 10:23:30 +00:00
|
|
|
|
if (scm_is_true (scm_negative_p (denominator)))
|
2003-11-19 05:12:08 +00:00
|
|
|
|
{
|
|
|
|
|
|
numerator = scm_difference (numerator, SCM_UNDEFINED);
|
|
|
|
|
|
denominator = scm_difference (denominator, SCM_UNDEFINED);
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/* Now consider for each of the four fixnum/bignum combinations
|
|
|
|
|
|
whether the rational number is really an integer.
|
|
|
|
|
|
*/
|
2004-07-23 15:43:02 +00:00
|
|
|
|
if (SCM_I_INUMP (numerator))
|
* print.c (scm_iprin1): Handle fractions.
* objects.h (scm_class_fraction): New.
* objects.c (scm_class_fraction): New.
(scm_class_of): Handle fractions.
* hash.c (scm_hasher): Handle fractions.
* numbers.c: New code for handling fraction all over the place.
(scm_odd_p, scm_even_p): Handle inexact integers.
(scm_rational_p): New function, same as scm_real_p.
(scm_round_number, scm_truncate_number, scm_ceiling, scm_floor):
New exact functions that replace the inexact 'dsubr'
implementations.
(scm_numerator, scm_denominator): New.
* numbers.h (SCM_NUMP): Recognize fractions.
(SCM_FRACTIONP, SCM_SLOPPY_FRACTIONP, SCM_FRACTION_NUMERATOR,
SCM_FRACTION_DENOMINATOR, SCM_FRACTION_SET_NUMERATOR,
SCM_FRACTION_SET_DENOMINATOR, SCM_FRACTION_REDUCED_BIT,
SCM_FRACTION_REDUCED_SET, SCM_FRACTION_REDUCED_CLEAR,
SCM_FRACTION_REDUCED): New.
(scm_floor, scm_ceiling, scm_truncate_number, scm_round_number):
New prototypes.
(scm_make_ratio, scm_rationalize, scm_numerator, scm_denominator,
scm_rational_p): New prototypes.
(scm_i_dbl2num, scm_i_fraction2double, scm_i_fraction_equalp,
scm_i_print_fraction): New prototypes.
* goops.c (create_standard_classes): Create "<fraction>" class.
* gc-mark.c (scm_gc_mark_dependencies): Handle fractions.
* gc-card.c (scm_i_sweep_card): Include scm_tc16_fraction as a
case in the switch, but do nothing for now.
* eval.c (SCM_CEVAL, SCM_APPLY, call_dsubr_1): Convert fractions
to doubles when calling 'dsubr' functions.
* eq.c (scm_eqv_p, scm_equal_p): Handle fractions.
2003-11-18 19:59:53 +00:00
|
|
|
|
{
|
2004-07-23 15:43:02 +00:00
|
|
|
|
long x = SCM_I_INUM (numerator);
|
2004-07-27 15:41:49 +00:00
|
|
|
|
if (scm_is_eq (numerator, SCM_INUM0))
|
* print.c (scm_iprin1): Handle fractions.
* objects.h (scm_class_fraction): New.
* objects.c (scm_class_fraction): New.
(scm_class_of): Handle fractions.
* hash.c (scm_hasher): Handle fractions.
* numbers.c: New code for handling fraction all over the place.
(scm_odd_p, scm_even_p): Handle inexact integers.
(scm_rational_p): New function, same as scm_real_p.
(scm_round_number, scm_truncate_number, scm_ceiling, scm_floor):
New exact functions that replace the inexact 'dsubr'
implementations.
(scm_numerator, scm_denominator): New.
* numbers.h (SCM_NUMP): Recognize fractions.
(SCM_FRACTIONP, SCM_SLOPPY_FRACTIONP, SCM_FRACTION_NUMERATOR,
SCM_FRACTION_DENOMINATOR, SCM_FRACTION_SET_NUMERATOR,
SCM_FRACTION_SET_DENOMINATOR, SCM_FRACTION_REDUCED_BIT,
SCM_FRACTION_REDUCED_SET, SCM_FRACTION_REDUCED_CLEAR,
SCM_FRACTION_REDUCED): New.
(scm_floor, scm_ceiling, scm_truncate_number, scm_round_number):
New prototypes.
(scm_make_ratio, scm_rationalize, scm_numerator, scm_denominator,
scm_rational_p): New prototypes.
(scm_i_dbl2num, scm_i_fraction2double, scm_i_fraction_equalp,
scm_i_print_fraction): New prototypes.
* goops.c (create_standard_classes): Create "<fraction>" class.
* gc-mark.c (scm_gc_mark_dependencies): Handle fractions.
* gc-card.c (scm_i_sweep_card): Include scm_tc16_fraction as a
case in the switch, but do nothing for now.
* eval.c (SCM_CEVAL, SCM_APPLY, call_dsubr_1): Convert fractions
to doubles when calling 'dsubr' functions.
* eq.c (scm_eqv_p, scm_equal_p): Handle fractions.
2003-11-18 19:59:53 +00:00
|
|
|
|
return SCM_INUM0;
|
2004-07-23 15:43:02 +00:00
|
|
|
|
if (SCM_I_INUMP (denominator))
|
* print.c (scm_iprin1): Handle fractions.
* objects.h (scm_class_fraction): New.
* objects.c (scm_class_fraction): New.
(scm_class_of): Handle fractions.
* hash.c (scm_hasher): Handle fractions.
* numbers.c: New code for handling fraction all over the place.
(scm_odd_p, scm_even_p): Handle inexact integers.
(scm_rational_p): New function, same as scm_real_p.
(scm_round_number, scm_truncate_number, scm_ceiling, scm_floor):
New exact functions that replace the inexact 'dsubr'
implementations.
(scm_numerator, scm_denominator): New.
* numbers.h (SCM_NUMP): Recognize fractions.
(SCM_FRACTIONP, SCM_SLOPPY_FRACTIONP, SCM_FRACTION_NUMERATOR,
SCM_FRACTION_DENOMINATOR, SCM_FRACTION_SET_NUMERATOR,
SCM_FRACTION_SET_DENOMINATOR, SCM_FRACTION_REDUCED_BIT,
SCM_FRACTION_REDUCED_SET, SCM_FRACTION_REDUCED_CLEAR,
SCM_FRACTION_REDUCED): New.
(scm_floor, scm_ceiling, scm_truncate_number, scm_round_number):
New prototypes.
(scm_make_ratio, scm_rationalize, scm_numerator, scm_denominator,
scm_rational_p): New prototypes.
(scm_i_dbl2num, scm_i_fraction2double, scm_i_fraction_equalp,
scm_i_print_fraction): New prototypes.
* goops.c (create_standard_classes): Create "<fraction>" class.
* gc-mark.c (scm_gc_mark_dependencies): Handle fractions.
* gc-card.c (scm_i_sweep_card): Include scm_tc16_fraction as a
case in the switch, but do nothing for now.
* eval.c (SCM_CEVAL, SCM_APPLY, call_dsubr_1): Convert fractions
to doubles when calling 'dsubr' functions.
* eq.c (scm_eqv_p, scm_equal_p): Handle fractions.
2003-11-18 19:59:53 +00:00
|
|
|
|
{
|
2003-12-02 21:21:14 +00:00
|
|
|
|
long y;
|
2004-07-23 15:43:02 +00:00
|
|
|
|
y = SCM_I_INUM (denominator);
|
* print.c (scm_iprin1): Handle fractions.
* objects.h (scm_class_fraction): New.
* objects.c (scm_class_fraction): New.
(scm_class_of): Handle fractions.
* hash.c (scm_hasher): Handle fractions.
* numbers.c: New code for handling fraction all over the place.
(scm_odd_p, scm_even_p): Handle inexact integers.
(scm_rational_p): New function, same as scm_real_p.
(scm_round_number, scm_truncate_number, scm_ceiling, scm_floor):
New exact functions that replace the inexact 'dsubr'
implementations.
(scm_numerator, scm_denominator): New.
* numbers.h (SCM_NUMP): Recognize fractions.
(SCM_FRACTIONP, SCM_SLOPPY_FRACTIONP, SCM_FRACTION_NUMERATOR,
SCM_FRACTION_DENOMINATOR, SCM_FRACTION_SET_NUMERATOR,
SCM_FRACTION_SET_DENOMINATOR, SCM_FRACTION_REDUCED_BIT,
SCM_FRACTION_REDUCED_SET, SCM_FRACTION_REDUCED_CLEAR,
SCM_FRACTION_REDUCED): New.
(scm_floor, scm_ceiling, scm_truncate_number, scm_round_number):
New prototypes.
(scm_make_ratio, scm_rationalize, scm_numerator, scm_denominator,
scm_rational_p): New prototypes.
(scm_i_dbl2num, scm_i_fraction2double, scm_i_fraction_equalp,
scm_i_print_fraction): New prototypes.
* goops.c (create_standard_classes): Create "<fraction>" class.
* gc-mark.c (scm_gc_mark_dependencies): Handle fractions.
* gc-card.c (scm_i_sweep_card): Include scm_tc16_fraction as a
case in the switch, but do nothing for now.
* eval.c (SCM_CEVAL, SCM_APPLY, call_dsubr_1): Convert fractions
to doubles when calling 'dsubr' functions.
* eq.c (scm_eqv_p, scm_equal_p): Handle fractions.
2003-11-18 19:59:53 +00:00
|
|
|
|
if (x == y)
|
2004-07-08 15:54:05 +00:00
|
|
|
|
return SCM_I_MAKINUM(1);
|
* print.c (scm_iprin1): Handle fractions.
* objects.h (scm_class_fraction): New.
* objects.c (scm_class_fraction): New.
(scm_class_of): Handle fractions.
* hash.c (scm_hasher): Handle fractions.
* numbers.c: New code for handling fraction all over the place.
(scm_odd_p, scm_even_p): Handle inexact integers.
(scm_rational_p): New function, same as scm_real_p.
(scm_round_number, scm_truncate_number, scm_ceiling, scm_floor):
New exact functions that replace the inexact 'dsubr'
implementations.
(scm_numerator, scm_denominator): New.
* numbers.h (SCM_NUMP): Recognize fractions.
(SCM_FRACTIONP, SCM_SLOPPY_FRACTIONP, SCM_FRACTION_NUMERATOR,
SCM_FRACTION_DENOMINATOR, SCM_FRACTION_SET_NUMERATOR,
SCM_FRACTION_SET_DENOMINATOR, SCM_FRACTION_REDUCED_BIT,
SCM_FRACTION_REDUCED_SET, SCM_FRACTION_REDUCED_CLEAR,
SCM_FRACTION_REDUCED): New.
(scm_floor, scm_ceiling, scm_truncate_number, scm_round_number):
New prototypes.
(scm_make_ratio, scm_rationalize, scm_numerator, scm_denominator,
scm_rational_p): New prototypes.
(scm_i_dbl2num, scm_i_fraction2double, scm_i_fraction_equalp,
scm_i_print_fraction): New prototypes.
* goops.c (create_standard_classes): Create "<fraction>" class.
* gc-mark.c (scm_gc_mark_dependencies): Handle fractions.
* gc-card.c (scm_i_sweep_card): Include scm_tc16_fraction as a
case in the switch, but do nothing for now.
* eval.c (SCM_CEVAL, SCM_APPLY, call_dsubr_1): Convert fractions
to doubles when calling 'dsubr' functions.
* eq.c (scm_eqv_p, scm_equal_p): Handle fractions.
2003-11-18 19:59:53 +00:00
|
|
|
|
if ((x % y) == 0)
|
2004-07-08 15:54:05 +00:00
|
|
|
|
return SCM_I_MAKINUM (x / y);
|
* print.c (scm_iprin1): Handle fractions.
* objects.h (scm_class_fraction): New.
* objects.c (scm_class_fraction): New.
(scm_class_of): Handle fractions.
* hash.c (scm_hasher): Handle fractions.
* numbers.c: New code for handling fraction all over the place.
(scm_odd_p, scm_even_p): Handle inexact integers.
(scm_rational_p): New function, same as scm_real_p.
(scm_round_number, scm_truncate_number, scm_ceiling, scm_floor):
New exact functions that replace the inexact 'dsubr'
implementations.
(scm_numerator, scm_denominator): New.
* numbers.h (SCM_NUMP): Recognize fractions.
(SCM_FRACTIONP, SCM_SLOPPY_FRACTIONP, SCM_FRACTION_NUMERATOR,
SCM_FRACTION_DENOMINATOR, SCM_FRACTION_SET_NUMERATOR,
SCM_FRACTION_SET_DENOMINATOR, SCM_FRACTION_REDUCED_BIT,
SCM_FRACTION_REDUCED_SET, SCM_FRACTION_REDUCED_CLEAR,
SCM_FRACTION_REDUCED): New.
(scm_floor, scm_ceiling, scm_truncate_number, scm_round_number):
New prototypes.
(scm_make_ratio, scm_rationalize, scm_numerator, scm_denominator,
scm_rational_p): New prototypes.
(scm_i_dbl2num, scm_i_fraction2double, scm_i_fraction_equalp,
scm_i_print_fraction): New prototypes.
* goops.c (create_standard_classes): Create "<fraction>" class.
* gc-mark.c (scm_gc_mark_dependencies): Handle fractions.
* gc-card.c (scm_i_sweep_card): Include scm_tc16_fraction as a
case in the switch, but do nothing for now.
* eval.c (SCM_CEVAL, SCM_APPLY, call_dsubr_1): Convert fractions
to doubles when calling 'dsubr' functions.
* eq.c (scm_eqv_p, scm_equal_p): Handle fractions.
2003-11-18 19:59:53 +00:00
|
|
|
|
}
|
2003-12-02 21:21:14 +00:00
|
|
|
|
else
|
|
|
|
|
|
{
|
|
|
|
|
|
/* When x == SCM_MOST_NEGATIVE_FIXNUM we could have the negative
|
2004-04-05 23:31:20 +00:00
|
|
|
|
of that value for the denominator, as a bignum. Apart from
|
|
|
|
|
|
that case, abs(bignum) > abs(inum) so inum/bignum is not an
|
|
|
|
|
|
integer. */
|
|
|
|
|
|
if (x == SCM_MOST_NEGATIVE_FIXNUM
|
|
|
|
|
|
&& mpz_cmp_ui (SCM_I_BIG_MPZ (denominator),
|
|
|
|
|
|
- SCM_MOST_NEGATIVE_FIXNUM) == 0)
|
2004-07-08 15:54:05 +00:00
|
|
|
|
return SCM_I_MAKINUM(-1);
|
2003-12-02 21:21:14 +00:00
|
|
|
|
}
|
* print.c (scm_iprin1): Handle fractions.
* objects.h (scm_class_fraction): New.
* objects.c (scm_class_fraction): New.
(scm_class_of): Handle fractions.
* hash.c (scm_hasher): Handle fractions.
* numbers.c: New code for handling fraction all over the place.
(scm_odd_p, scm_even_p): Handle inexact integers.
(scm_rational_p): New function, same as scm_real_p.
(scm_round_number, scm_truncate_number, scm_ceiling, scm_floor):
New exact functions that replace the inexact 'dsubr'
implementations.
(scm_numerator, scm_denominator): New.
* numbers.h (SCM_NUMP): Recognize fractions.
(SCM_FRACTIONP, SCM_SLOPPY_FRACTIONP, SCM_FRACTION_NUMERATOR,
SCM_FRACTION_DENOMINATOR, SCM_FRACTION_SET_NUMERATOR,
SCM_FRACTION_SET_DENOMINATOR, SCM_FRACTION_REDUCED_BIT,
SCM_FRACTION_REDUCED_SET, SCM_FRACTION_REDUCED_CLEAR,
SCM_FRACTION_REDUCED): New.
(scm_floor, scm_ceiling, scm_truncate_number, scm_round_number):
New prototypes.
(scm_make_ratio, scm_rationalize, scm_numerator, scm_denominator,
scm_rational_p): New prototypes.
(scm_i_dbl2num, scm_i_fraction2double, scm_i_fraction_equalp,
scm_i_print_fraction): New prototypes.
* goops.c (create_standard_classes): Create "<fraction>" class.
* gc-mark.c (scm_gc_mark_dependencies): Handle fractions.
* gc-card.c (scm_i_sweep_card): Include scm_tc16_fraction as a
case in the switch, but do nothing for now.
* eval.c (SCM_CEVAL, SCM_APPLY, call_dsubr_1): Convert fractions
to doubles when calling 'dsubr' functions.
* eq.c (scm_eqv_p, scm_equal_p): Handle fractions.
2003-11-18 19:59:53 +00:00
|
|
|
|
}
|
2003-11-19 05:12:08 +00:00
|
|
|
|
else if (SCM_BIGP (numerator))
|
* print.c (scm_iprin1): Handle fractions.
* objects.h (scm_class_fraction): New.
* objects.c (scm_class_fraction): New.
(scm_class_of): Handle fractions.
* hash.c (scm_hasher): Handle fractions.
* numbers.c: New code for handling fraction all over the place.
(scm_odd_p, scm_even_p): Handle inexact integers.
(scm_rational_p): New function, same as scm_real_p.
(scm_round_number, scm_truncate_number, scm_ceiling, scm_floor):
New exact functions that replace the inexact 'dsubr'
implementations.
(scm_numerator, scm_denominator): New.
* numbers.h (SCM_NUMP): Recognize fractions.
(SCM_FRACTIONP, SCM_SLOPPY_FRACTIONP, SCM_FRACTION_NUMERATOR,
SCM_FRACTION_DENOMINATOR, SCM_FRACTION_SET_NUMERATOR,
SCM_FRACTION_SET_DENOMINATOR, SCM_FRACTION_REDUCED_BIT,
SCM_FRACTION_REDUCED_SET, SCM_FRACTION_REDUCED_CLEAR,
SCM_FRACTION_REDUCED): New.
(scm_floor, scm_ceiling, scm_truncate_number, scm_round_number):
New prototypes.
(scm_make_ratio, scm_rationalize, scm_numerator, scm_denominator,
scm_rational_p): New prototypes.
(scm_i_dbl2num, scm_i_fraction2double, scm_i_fraction_equalp,
scm_i_print_fraction): New prototypes.
* goops.c (create_standard_classes): Create "<fraction>" class.
* gc-mark.c (scm_gc_mark_dependencies): Handle fractions.
* gc-card.c (scm_i_sweep_card): Include scm_tc16_fraction as a
case in the switch, but do nothing for now.
* eval.c (SCM_CEVAL, SCM_APPLY, call_dsubr_1): Convert fractions
to doubles when calling 'dsubr' functions.
* eq.c (scm_eqv_p, scm_equal_p): Handle fractions.
2003-11-18 19:59:53 +00:00
|
|
|
|
{
|
2004-07-23 15:43:02 +00:00
|
|
|
|
if (SCM_I_INUMP (denominator))
|
2003-11-19 05:12:08 +00:00
|
|
|
|
{
|
2004-07-23 15:43:02 +00:00
|
|
|
|
long yy = SCM_I_INUM (denominator);
|
2003-11-19 05:12:08 +00:00
|
|
|
|
if (mpz_divisible_ui_p (SCM_I_BIG_MPZ (numerator), yy))
|
|
|
|
|
|
return scm_divide (numerator, denominator);
|
|
|
|
|
|
}
|
|
|
|
|
|
else
|
* print.c (scm_iprin1): Handle fractions.
* objects.h (scm_class_fraction): New.
* objects.c (scm_class_fraction): New.
(scm_class_of): Handle fractions.
* hash.c (scm_hasher): Handle fractions.
* numbers.c: New code for handling fraction all over the place.
(scm_odd_p, scm_even_p): Handle inexact integers.
(scm_rational_p): New function, same as scm_real_p.
(scm_round_number, scm_truncate_number, scm_ceiling, scm_floor):
New exact functions that replace the inexact 'dsubr'
implementations.
(scm_numerator, scm_denominator): New.
* numbers.h (SCM_NUMP): Recognize fractions.
(SCM_FRACTIONP, SCM_SLOPPY_FRACTIONP, SCM_FRACTION_NUMERATOR,
SCM_FRACTION_DENOMINATOR, SCM_FRACTION_SET_NUMERATOR,
SCM_FRACTION_SET_DENOMINATOR, SCM_FRACTION_REDUCED_BIT,
SCM_FRACTION_REDUCED_SET, SCM_FRACTION_REDUCED_CLEAR,
SCM_FRACTION_REDUCED): New.
(scm_floor, scm_ceiling, scm_truncate_number, scm_round_number):
New prototypes.
(scm_make_ratio, scm_rationalize, scm_numerator, scm_denominator,
scm_rational_p): New prototypes.
(scm_i_dbl2num, scm_i_fraction2double, scm_i_fraction_equalp,
scm_i_print_fraction): New prototypes.
* goops.c (create_standard_classes): Create "<fraction>" class.
* gc-mark.c (scm_gc_mark_dependencies): Handle fractions.
* gc-card.c (scm_i_sweep_card): Include scm_tc16_fraction as a
case in the switch, but do nothing for now.
* eval.c (SCM_CEVAL, SCM_APPLY, call_dsubr_1): Convert fractions
to doubles when calling 'dsubr' functions.
* eq.c (scm_eqv_p, scm_equal_p): Handle fractions.
2003-11-18 19:59:53 +00:00
|
|
|
|
{
|
2004-07-27 15:41:49 +00:00
|
|
|
|
if (scm_is_eq (numerator, denominator))
|
2004-07-08 15:54:05 +00:00
|
|
|
|
return SCM_I_MAKINUM(1);
|
2003-11-19 05:12:08 +00:00
|
|
|
|
if (mpz_divisible_p (SCM_I_BIG_MPZ (numerator),
|
|
|
|
|
|
SCM_I_BIG_MPZ (denominator)))
|
|
|
|
|
|
return scm_divide(numerator, denominator);
|
* print.c (scm_iprin1): Handle fractions.
* objects.h (scm_class_fraction): New.
* objects.c (scm_class_fraction): New.
(scm_class_of): Handle fractions.
* hash.c (scm_hasher): Handle fractions.
* numbers.c: New code for handling fraction all over the place.
(scm_odd_p, scm_even_p): Handle inexact integers.
(scm_rational_p): New function, same as scm_real_p.
(scm_round_number, scm_truncate_number, scm_ceiling, scm_floor):
New exact functions that replace the inexact 'dsubr'
implementations.
(scm_numerator, scm_denominator): New.
* numbers.h (SCM_NUMP): Recognize fractions.
(SCM_FRACTIONP, SCM_SLOPPY_FRACTIONP, SCM_FRACTION_NUMERATOR,
SCM_FRACTION_DENOMINATOR, SCM_FRACTION_SET_NUMERATOR,
SCM_FRACTION_SET_DENOMINATOR, SCM_FRACTION_REDUCED_BIT,
SCM_FRACTION_REDUCED_SET, SCM_FRACTION_REDUCED_CLEAR,
SCM_FRACTION_REDUCED): New.
(scm_floor, scm_ceiling, scm_truncate_number, scm_round_number):
New prototypes.
(scm_make_ratio, scm_rationalize, scm_numerator, scm_denominator,
scm_rational_p): New prototypes.
(scm_i_dbl2num, scm_i_fraction2double, scm_i_fraction_equalp,
scm_i_print_fraction): New prototypes.
* goops.c (create_standard_classes): Create "<fraction>" class.
* gc-mark.c (scm_gc_mark_dependencies): Handle fractions.
* gc-card.c (scm_i_sweep_card): Include scm_tc16_fraction as a
case in the switch, but do nothing for now.
* eval.c (SCM_CEVAL, SCM_APPLY, call_dsubr_1): Convert fractions
to doubles when calling 'dsubr' functions.
* eq.c (scm_eqv_p, scm_equal_p): Handle fractions.
2003-11-18 19:59:53 +00:00
|
|
|
|
}
|
|
|
|
|
|
}
|
2003-11-19 05:12:08 +00:00
|
|
|
|
|
|
|
|
|
|
/* No, it's a proper fraction.
|
|
|
|
|
|
*/
|
2006-12-23 20:35:32 +00:00
|
|
|
|
{
|
|
|
|
|
|
SCM divisor = scm_gcd (numerator, denominator);
|
|
|
|
|
|
if (!(scm_is_eq (divisor, SCM_I_MAKINUM(1))))
|
|
|
|
|
|
{
|
|
|
|
|
|
numerator = scm_divide (numerator, divisor);
|
|
|
|
|
|
denominator = scm_divide (denominator, divisor);
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
return scm_double_cell (scm_tc16_fraction,
|
|
|
|
|
|
SCM_UNPACK (numerator),
|
|
|
|
|
|
SCM_UNPACK (denominator), 0);
|
|
|
|
|
|
}
|
* print.c (scm_iprin1): Handle fractions.
* objects.h (scm_class_fraction): New.
* objects.c (scm_class_fraction): New.
(scm_class_of): Handle fractions.
* hash.c (scm_hasher): Handle fractions.
* numbers.c: New code for handling fraction all over the place.
(scm_odd_p, scm_even_p): Handle inexact integers.
(scm_rational_p): New function, same as scm_real_p.
(scm_round_number, scm_truncate_number, scm_ceiling, scm_floor):
New exact functions that replace the inexact 'dsubr'
implementations.
(scm_numerator, scm_denominator): New.
* numbers.h (SCM_NUMP): Recognize fractions.
(SCM_FRACTIONP, SCM_SLOPPY_FRACTIONP, SCM_FRACTION_NUMERATOR,
SCM_FRACTION_DENOMINATOR, SCM_FRACTION_SET_NUMERATOR,
SCM_FRACTION_SET_DENOMINATOR, SCM_FRACTION_REDUCED_BIT,
SCM_FRACTION_REDUCED_SET, SCM_FRACTION_REDUCED_CLEAR,
SCM_FRACTION_REDUCED): New.
(scm_floor, scm_ceiling, scm_truncate_number, scm_round_number):
New prototypes.
(scm_make_ratio, scm_rationalize, scm_numerator, scm_denominator,
scm_rational_p): New prototypes.
(scm_i_dbl2num, scm_i_fraction2double, scm_i_fraction_equalp,
scm_i_print_fraction): New prototypes.
* goops.c (create_standard_classes): Create "<fraction>" class.
* gc-mark.c (scm_gc_mark_dependencies): Handle fractions.
* gc-card.c (scm_i_sweep_card): Include scm_tc16_fraction as a
case in the switch, but do nothing for now.
* eval.c (SCM_CEVAL, SCM_APPLY, call_dsubr_1): Convert fractions
to doubles when calling 'dsubr' functions.
* eq.c (scm_eqv_p, scm_equal_p): Handle fractions.
2003-11-18 19:59:53 +00:00
|
|
|
|
}
|
2003-11-19 05:12:08 +00:00
|
|
|
|
#undef FUNC_NAME
|
* print.c (scm_iprin1): Handle fractions.
* objects.h (scm_class_fraction): New.
* objects.c (scm_class_fraction): New.
(scm_class_of): Handle fractions.
* hash.c (scm_hasher): Handle fractions.
* numbers.c: New code for handling fraction all over the place.
(scm_odd_p, scm_even_p): Handle inexact integers.
(scm_rational_p): New function, same as scm_real_p.
(scm_round_number, scm_truncate_number, scm_ceiling, scm_floor):
New exact functions that replace the inexact 'dsubr'
implementations.
(scm_numerator, scm_denominator): New.
* numbers.h (SCM_NUMP): Recognize fractions.
(SCM_FRACTIONP, SCM_SLOPPY_FRACTIONP, SCM_FRACTION_NUMERATOR,
SCM_FRACTION_DENOMINATOR, SCM_FRACTION_SET_NUMERATOR,
SCM_FRACTION_SET_DENOMINATOR, SCM_FRACTION_REDUCED_BIT,
SCM_FRACTION_REDUCED_SET, SCM_FRACTION_REDUCED_CLEAR,
SCM_FRACTION_REDUCED): New.
(scm_floor, scm_ceiling, scm_truncate_number, scm_round_number):
New prototypes.
(scm_make_ratio, scm_rationalize, scm_numerator, scm_denominator,
scm_rational_p): New prototypes.
(scm_i_dbl2num, scm_i_fraction2double, scm_i_fraction_equalp,
scm_i_print_fraction): New prototypes.
* goops.c (create_standard_classes): Create "<fraction>" class.
* gc-mark.c (scm_gc_mark_dependencies): Handle fractions.
* gc-card.c (scm_i_sweep_card): Include scm_tc16_fraction as a
case in the switch, but do nothing for now.
* eval.c (SCM_CEVAL, SCM_APPLY, call_dsubr_1): Convert fractions
to doubles when calling 'dsubr' functions.
* eq.c (scm_eqv_p, scm_equal_p): Handle fractions.
2003-11-18 19:59:53 +00:00
|
|
|
|
|
|
|
|
|
|
double
|
|
|
|
|
|
scm_i_fraction2double (SCM z)
|
|
|
|
|
|
{
|
(scm_is_rational): New.
(scm_i_short2big, scm_i_int2big, scm_i_uint2big, scm_i_size2big,
scm_i_ptrdiff2big, scm_i_long_long2big, scm_i_ulong_long2big):
Removed prototypes.
(scm_make_real, scm_num2dbl, scm_float2num, scm_double2num):
Discouraged by moving to discouraged.h and discouraged.c.
Replaced all uses with scm_from_double.
(scm_num2float, scm_num2double): Discouraged by moving prototype
to discouraged.h and rewriting in terms of scm_to_double.
Replaced all uses with scm_to_double.
(scm_to_double): Do not implement in terms of scm_num2dbl, use
explicit code.
(scm_from_double): Do not implement in terms of scm_make_real, use
explicit code.
2004-08-03 15:03:35 +00:00
|
|
|
|
return scm_to_double (scm_divide2real (SCM_FRACTION_NUMERATOR (z),
|
|
|
|
|
|
SCM_FRACTION_DENOMINATOR (z)));
|
* print.c (scm_iprin1): Handle fractions.
* objects.h (scm_class_fraction): New.
* objects.c (scm_class_fraction): New.
(scm_class_of): Handle fractions.
* hash.c (scm_hasher): Handle fractions.
* numbers.c: New code for handling fraction all over the place.
(scm_odd_p, scm_even_p): Handle inexact integers.
(scm_rational_p): New function, same as scm_real_p.
(scm_round_number, scm_truncate_number, scm_ceiling, scm_floor):
New exact functions that replace the inexact 'dsubr'
implementations.
(scm_numerator, scm_denominator): New.
* numbers.h (SCM_NUMP): Recognize fractions.
(SCM_FRACTIONP, SCM_SLOPPY_FRACTIONP, SCM_FRACTION_NUMERATOR,
SCM_FRACTION_DENOMINATOR, SCM_FRACTION_SET_NUMERATOR,
SCM_FRACTION_SET_DENOMINATOR, SCM_FRACTION_REDUCED_BIT,
SCM_FRACTION_REDUCED_SET, SCM_FRACTION_REDUCED_CLEAR,
SCM_FRACTION_REDUCED): New.
(scm_floor, scm_ceiling, scm_truncate_number, scm_round_number):
New prototypes.
(scm_make_ratio, scm_rationalize, scm_numerator, scm_denominator,
scm_rational_p): New prototypes.
(scm_i_dbl2num, scm_i_fraction2double, scm_i_fraction_equalp,
scm_i_print_fraction): New prototypes.
* goops.c (create_standard_classes): Create "<fraction>" class.
* gc-mark.c (scm_gc_mark_dependencies): Handle fractions.
* gc-card.c (scm_i_sweep_card): Include scm_tc16_fraction as a
case in the switch, but do nothing for now.
* eval.c (SCM_CEVAL, SCM_APPLY, call_dsubr_1): Convert fractions
to doubles when calling 'dsubr' functions.
* eq.c (scm_eqv_p, scm_equal_p): Handle fractions.
2003-11-18 19:59:53 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
2000-01-05 19:05:23 +00:00
|
|
|
|
SCM_DEFINE (scm_exact_p, "exact?", 1, 0, 0,
|
1999-12-12 02:36:16 +00:00
|
|
|
|
(SCM x),
|
* vectors.c (s_scm_vector_p, list->vector, scm_vector)
(scm_vector_ref, scm_vector_set_x, scm_vector_to_list)
(scm_vector_fill_x), strorder.c (scm_string_equal_p)
(scm_string_ci_equal_p, scm_string_less_p, scm_string_leq_p)
(scm_string_gr_p, scm_string_geq_p, scm_string_ci_less_p)
(scm_string_ci_geq_p), symbols.c (scm_symbol_p)
(scm_symbol_to_string, scm_string_to_symbol): Changed use of @t{}
to @code{} as the texinfo manual recommends, converted the
examples to use a @lisp{}-environment.
* strports.c (scm_eval_string): Cleaned up the docstring.
* struct.c (scm_struct_p, scm_struct_vtable_p): Added texinfo
markup.
* numbers.c (scm_exact_p, scm_odd_p, scm_even_p)
(scm_number_to_string, scm_string_to_number, scm_number_p)
(scm_real_p, scm_integer_p, scm_inexact_p, scm_make_rectangular)
(scm_make_polar, scm_inexact_to_exact): Added texinfo markup.
(scm_ash): Added texinfo markup and removed obsolete @refill.
(scm_gr_p): Corrected comment.
(scm_gr_p, scm_leq_p, scm_geq_p): Added texinfo markup to (future
docstring) comments.
(scm_positive_p, scm_less_p, scm_num_eq_p, scm_real_p)
(scm_number_p, scm_negative_p, scm_max, scm_min, scm_sum)
(scm_difference, scm_product, scm_divide, scm_asinh, scm_acosh)
(scm_atanh, scm_truncate, scm_round, scm_exact_to_inexact)
(floor, ceiling, $sqrt, $abs, $exp, $log, $sin, $cos, $tan, $asin)
($acos, $atan, $sinh, $cosh, $tanh, scm_real_part, scm_imag_part)
(scm_magnitude, scm_angle, scm_abs, scm_quotient, scm_remainder)
(scm_modulo, scm_gcd, scm_lcm): Added (future docstring) comments.
2001-03-02 09:07:22 +00:00
|
|
|
|
"Return @code{#t} if @var{x} is an exact number, @code{#f}\n"
|
|
|
|
|
|
"otherwise.")
|
1999-12-12 02:36:16 +00:00
|
|
|
|
#define FUNC_NAME s_scm_exact_p
|
1996-07-25 22:56:11 +00:00
|
|
|
|
{
|
2004-07-23 15:43:02 +00:00
|
|
|
|
if (SCM_I_INUMP (x))
|
2003-07-13 16:13:57 +00:00
|
|
|
|
return SCM_BOOL_T;
|
|
|
|
|
|
if (SCM_BIGP (x))
|
|
|
|
|
|
return SCM_BOOL_T;
|
* print.c (scm_iprin1): Handle fractions.
* objects.h (scm_class_fraction): New.
* objects.c (scm_class_fraction): New.
(scm_class_of): Handle fractions.
* hash.c (scm_hasher): Handle fractions.
* numbers.c: New code for handling fraction all over the place.
(scm_odd_p, scm_even_p): Handle inexact integers.
(scm_rational_p): New function, same as scm_real_p.
(scm_round_number, scm_truncate_number, scm_ceiling, scm_floor):
New exact functions that replace the inexact 'dsubr'
implementations.
(scm_numerator, scm_denominator): New.
* numbers.h (SCM_NUMP): Recognize fractions.
(SCM_FRACTIONP, SCM_SLOPPY_FRACTIONP, SCM_FRACTION_NUMERATOR,
SCM_FRACTION_DENOMINATOR, SCM_FRACTION_SET_NUMERATOR,
SCM_FRACTION_SET_DENOMINATOR, SCM_FRACTION_REDUCED_BIT,
SCM_FRACTION_REDUCED_SET, SCM_FRACTION_REDUCED_CLEAR,
SCM_FRACTION_REDUCED): New.
(scm_floor, scm_ceiling, scm_truncate_number, scm_round_number):
New prototypes.
(scm_make_ratio, scm_rationalize, scm_numerator, scm_denominator,
scm_rational_p): New prototypes.
(scm_i_dbl2num, scm_i_fraction2double, scm_i_fraction_equalp,
scm_i_print_fraction): New prototypes.
* goops.c (create_standard_classes): Create "<fraction>" class.
* gc-mark.c (scm_gc_mark_dependencies): Handle fractions.
* gc-card.c (scm_i_sweep_card): Include scm_tc16_fraction as a
case in the switch, but do nothing for now.
* eval.c (SCM_CEVAL, SCM_APPLY, call_dsubr_1): Convert fractions
to doubles when calling 'dsubr' functions.
* eq.c (scm_eqv_p, scm_equal_p): Handle fractions.
2003-11-18 19:59:53 +00:00
|
|
|
|
if (SCM_FRACTIONP (x))
|
|
|
|
|
|
return SCM_BOOL_T;
|
2003-11-19 02:38:37 +00:00
|
|
|
|
if (SCM_NUMBERP (x))
|
|
|
|
|
|
return SCM_BOOL_F;
|
|
|
|
|
|
SCM_WRONG_TYPE_ARG (1, x);
|
1996-07-25 22:56:11 +00:00
|
|
|
|
}
|
1999-12-12 02:36:16 +00:00
|
|
|
|
#undef FUNC_NAME
|
1996-07-25 22:56:11 +00:00
|
|
|
|
|
2000-04-20 15:51:09 +00:00
|
|
|
|
|
2000-01-05 19:05:23 +00:00
|
|
|
|
SCM_DEFINE (scm_odd_p, "odd?", 1, 0, 0,
|
1999-12-12 02:36:16 +00:00
|
|
|
|
(SCM n),
|
* vectors.c (s_scm_vector_p, list->vector, scm_vector)
(scm_vector_ref, scm_vector_set_x, scm_vector_to_list)
(scm_vector_fill_x), strorder.c (scm_string_equal_p)
(scm_string_ci_equal_p, scm_string_less_p, scm_string_leq_p)
(scm_string_gr_p, scm_string_geq_p, scm_string_ci_less_p)
(scm_string_ci_geq_p), symbols.c (scm_symbol_p)
(scm_symbol_to_string, scm_string_to_symbol): Changed use of @t{}
to @code{} as the texinfo manual recommends, converted the
examples to use a @lisp{}-environment.
* strports.c (scm_eval_string): Cleaned up the docstring.
* struct.c (scm_struct_p, scm_struct_vtable_p): Added texinfo
markup.
* numbers.c (scm_exact_p, scm_odd_p, scm_even_p)
(scm_number_to_string, scm_string_to_number, scm_number_p)
(scm_real_p, scm_integer_p, scm_inexact_p, scm_make_rectangular)
(scm_make_polar, scm_inexact_to_exact): Added texinfo markup.
(scm_ash): Added texinfo markup and removed obsolete @refill.
(scm_gr_p): Corrected comment.
(scm_gr_p, scm_leq_p, scm_geq_p): Added texinfo markup to (future
docstring) comments.
(scm_positive_p, scm_less_p, scm_num_eq_p, scm_real_p)
(scm_number_p, scm_negative_p, scm_max, scm_min, scm_sum)
(scm_difference, scm_product, scm_divide, scm_asinh, scm_acosh)
(scm_atanh, scm_truncate, scm_round, scm_exact_to_inexact)
(floor, ceiling, $sqrt, $abs, $exp, $log, $sin, $cos, $tan, $asin)
($acos, $atan, $sinh, $cosh, $tanh, scm_real_part, scm_imag_part)
(scm_magnitude, scm_angle, scm_abs, scm_quotient, scm_remainder)
(scm_modulo, scm_gcd, scm_lcm): Added (future docstring) comments.
2001-03-02 09:07:22 +00:00
|
|
|
|
"Return @code{#t} if @var{n} is an odd number, @code{#f}\n"
|
|
|
|
|
|
"otherwise.")
|
1999-12-12 02:36:16 +00:00
|
|
|
|
#define FUNC_NAME s_scm_odd_p
|
1996-07-25 22:56:11 +00:00
|
|
|
|
{
|
2004-07-23 15:43:02 +00:00
|
|
|
|
if (SCM_I_INUMP (n))
|
2003-07-13 16:13:57 +00:00
|
|
|
|
{
|
2004-07-23 15:43:02 +00:00
|
|
|
|
long val = SCM_I_INUM (n);
|
(scm_is_integer, scm_is_signed_integer, scm_is_unsigned_integer,
scm_to_signed_integer, scm_to_unsigned_integer, scm_to_schar,
scm_to_uchar, scm_to_char, scm_to_short, scm_to_ushort, scm_to_long,
scm_to_ulong, scm_to_size_t, scm_to_ssize_t, scm_from_schar,
scm_from_uchar, scm_from_char, scm_from_short, scm_from_ushort,
scm_from_int, scm_from_uint, scm_from_long, scm_from_ulong,
scm_from_size_t, scm_from_ssize_t, scm_is_real, scm_to_double,
scm_from_double): New.
* deprecated.h, boolean.h (SCM_FALSEP, SCM_NFALSEP, SCM_BOOL,
SCM_NEGATE_BOOL, SCM_BOOLP): Deprecated by moving into "deprecated.h".
Replaced all uses with scm_is_false, scm_is_true, scm_from_bool, and
scm_is_bool, respectively.
2004-07-06 10:23:30 +00:00
|
|
|
|
return scm_from_bool ((val & 1L) != 0);
|
2003-07-13 16:13:57 +00:00
|
|
|
|
}
|
|
|
|
|
|
else if (SCM_BIGP (n))
|
|
|
|
|
|
{
|
|
|
|
|
|
int odd_p = mpz_odd_p (SCM_I_BIG_MPZ (n));
|
|
|
|
|
|
scm_remember_upto_here_1 (n);
|
(scm_is_integer, scm_is_signed_integer, scm_is_unsigned_integer,
scm_to_signed_integer, scm_to_unsigned_integer, scm_to_schar,
scm_to_uchar, scm_to_char, scm_to_short, scm_to_ushort, scm_to_long,
scm_to_ulong, scm_to_size_t, scm_to_ssize_t, scm_from_schar,
scm_from_uchar, scm_from_char, scm_from_short, scm_from_ushort,
scm_from_int, scm_from_uint, scm_from_long, scm_from_ulong,
scm_from_size_t, scm_from_ssize_t, scm_is_real, scm_to_double,
scm_from_double): New.
* deprecated.h, boolean.h (SCM_FALSEP, SCM_NFALSEP, SCM_BOOL,
SCM_NEGATE_BOOL, SCM_BOOLP): Deprecated by moving into "deprecated.h".
Replaced all uses with scm_is_false, scm_is_true, scm_from_bool, and
scm_is_bool, respectively.
2004-07-06 10:23:30 +00:00
|
|
|
|
return scm_from_bool (odd_p);
|
2003-07-13 16:13:57 +00:00
|
|
|
|
}
|
(scm_is_integer, scm_is_signed_integer, scm_is_unsigned_integer,
scm_to_signed_integer, scm_to_unsigned_integer, scm_to_schar,
scm_to_uchar, scm_to_char, scm_to_short, scm_to_ushort, scm_to_long,
scm_to_ulong, scm_to_size_t, scm_to_ssize_t, scm_from_schar,
scm_from_uchar, scm_from_char, scm_from_short, scm_from_ushort,
scm_from_int, scm_from_uint, scm_from_long, scm_from_ulong,
scm_from_size_t, scm_from_ssize_t, scm_is_real, scm_to_double,
scm_from_double): New.
* deprecated.h, boolean.h (SCM_FALSEP, SCM_NFALSEP, SCM_BOOL,
SCM_NEGATE_BOOL, SCM_BOOLP): Deprecated by moving into "deprecated.h".
Replaced all uses with scm_is_false, scm_is_true, scm_from_bool, and
scm_is_bool, respectively.
2004-07-06 10:23:30 +00:00
|
|
|
|
else if (scm_is_true (scm_inf_p (n)))
|
From John W. Eaton.
* numbers.h: Conditionally include floatingpoint.h, ieeefp.h, and
nan.h. Provide declarations for scm_inf_p, scm_nan_p, scn_inf,
and scm_nan.
* numbers.c: [SCO && ! HAVE_ISNAN] (isnan): New function.
[SCO && ! HAVE_ISINF] (isinf): New function.
(xisinf, xisnan): New functions.
(IS_INF): Delete.
(isfinite): Define in terms of xisinf.
(scm_inf_p, scm_nan_p): New functions.
(guile_Inf, guile_NaN): New file-scope vars.
(guile_ieee_init): New function.
(scm_inf, scm_nan): New functions.
(idbl2str): Handle Inf and NaN. Remove funny label and
corresponding gotos.
(ALLOW_DIVIDE_BY_ZERO): New macro.
(scm_divide): Allow division by zero to occur if
ALLOW_DIVIDE_BY_ZERO is defined.
Handle bignums and ints as special cases.
Additional stuff by me:
numbers.c (mem2ureal): Recognize "inf.0" and "nan.xxx".
(scm_even_p, scm_odd_p): Treat infinity as even and odd.
(iflo2str): Don't output a '+' for negative numbers or for Inf and
NaN. They will provide their own sign.
(scm_divide): Only allow divides by inexact zeros. Dividing by
exact zeros still signals an errors.
2002-05-06 22:33:10 +00:00
|
|
|
|
return SCM_BOOL_T;
|
* print.c (scm_iprin1): Handle fractions.
* objects.h (scm_class_fraction): New.
* objects.c (scm_class_fraction): New.
(scm_class_of): Handle fractions.
* hash.c (scm_hasher): Handle fractions.
* numbers.c: New code for handling fraction all over the place.
(scm_odd_p, scm_even_p): Handle inexact integers.
(scm_rational_p): New function, same as scm_real_p.
(scm_round_number, scm_truncate_number, scm_ceiling, scm_floor):
New exact functions that replace the inexact 'dsubr'
implementations.
(scm_numerator, scm_denominator): New.
* numbers.h (SCM_NUMP): Recognize fractions.
(SCM_FRACTIONP, SCM_SLOPPY_FRACTIONP, SCM_FRACTION_NUMERATOR,
SCM_FRACTION_DENOMINATOR, SCM_FRACTION_SET_NUMERATOR,
SCM_FRACTION_SET_DENOMINATOR, SCM_FRACTION_REDUCED_BIT,
SCM_FRACTION_REDUCED_SET, SCM_FRACTION_REDUCED_CLEAR,
SCM_FRACTION_REDUCED): New.
(scm_floor, scm_ceiling, scm_truncate_number, scm_round_number):
New prototypes.
(scm_make_ratio, scm_rationalize, scm_numerator, scm_denominator,
scm_rational_p): New prototypes.
(scm_i_dbl2num, scm_i_fraction2double, scm_i_fraction_equalp,
scm_i_print_fraction): New prototypes.
* goops.c (create_standard_classes): Create "<fraction>" class.
* gc-mark.c (scm_gc_mark_dependencies): Handle fractions.
* gc-card.c (scm_i_sweep_card): Include scm_tc16_fraction as a
case in the switch, but do nothing for now.
* eval.c (SCM_CEVAL, SCM_APPLY, call_dsubr_1): Convert fractions
to doubles when calling 'dsubr' functions.
* eq.c (scm_eqv_p, scm_equal_p): Handle fractions.
2003-11-18 19:59:53 +00:00
|
|
|
|
else if (SCM_REALP (n))
|
|
|
|
|
|
{
|
|
|
|
|
|
double rem = fabs (fmod (SCM_REAL_VALUE(n), 2.0));
|
|
|
|
|
|
if (rem == 1.0)
|
|
|
|
|
|
return SCM_BOOL_T;
|
|
|
|
|
|
else if (rem == 0.0)
|
|
|
|
|
|
return SCM_BOOL_F;
|
|
|
|
|
|
else
|
|
|
|
|
|
SCM_WRONG_TYPE_ARG (1, n);
|
|
|
|
|
|
}
|
2003-07-13 16:13:57 +00:00
|
|
|
|
else
|
2000-04-21 11:35:39 +00:00
|
|
|
|
SCM_WRONG_TYPE_ARG (1, n);
|
1996-07-25 22:56:11 +00:00
|
|
|
|
}
|
1999-12-12 02:36:16 +00:00
|
|
|
|
#undef FUNC_NAME
|
1996-07-25 22:56:11 +00:00
|
|
|
|
|
2000-04-20 15:51:09 +00:00
|
|
|
|
|
2000-01-05 19:05:23 +00:00
|
|
|
|
SCM_DEFINE (scm_even_p, "even?", 1, 0, 0,
|
1999-12-12 02:36:16 +00:00
|
|
|
|
(SCM n),
|
* vectors.c (s_scm_vector_p, list->vector, scm_vector)
(scm_vector_ref, scm_vector_set_x, scm_vector_to_list)
(scm_vector_fill_x), strorder.c (scm_string_equal_p)
(scm_string_ci_equal_p, scm_string_less_p, scm_string_leq_p)
(scm_string_gr_p, scm_string_geq_p, scm_string_ci_less_p)
(scm_string_ci_geq_p), symbols.c (scm_symbol_p)
(scm_symbol_to_string, scm_string_to_symbol): Changed use of @t{}
to @code{} as the texinfo manual recommends, converted the
examples to use a @lisp{}-environment.
* strports.c (scm_eval_string): Cleaned up the docstring.
* struct.c (scm_struct_p, scm_struct_vtable_p): Added texinfo
markup.
* numbers.c (scm_exact_p, scm_odd_p, scm_even_p)
(scm_number_to_string, scm_string_to_number, scm_number_p)
(scm_real_p, scm_integer_p, scm_inexact_p, scm_make_rectangular)
(scm_make_polar, scm_inexact_to_exact): Added texinfo markup.
(scm_ash): Added texinfo markup and removed obsolete @refill.
(scm_gr_p): Corrected comment.
(scm_gr_p, scm_leq_p, scm_geq_p): Added texinfo markup to (future
docstring) comments.
(scm_positive_p, scm_less_p, scm_num_eq_p, scm_real_p)
(scm_number_p, scm_negative_p, scm_max, scm_min, scm_sum)
(scm_difference, scm_product, scm_divide, scm_asinh, scm_acosh)
(scm_atanh, scm_truncate, scm_round, scm_exact_to_inexact)
(floor, ceiling, $sqrt, $abs, $exp, $log, $sin, $cos, $tan, $asin)
($acos, $atan, $sinh, $cosh, $tanh, scm_real_part, scm_imag_part)
(scm_magnitude, scm_angle, scm_abs, scm_quotient, scm_remainder)
(scm_modulo, scm_gcd, scm_lcm): Added (future docstring) comments.
2001-03-02 09:07:22 +00:00
|
|
|
|
"Return @code{#t} if @var{n} is an even number, @code{#f}\n"
|
|
|
|
|
|
"otherwise.")
|
1999-12-12 02:36:16 +00:00
|
|
|
|
#define FUNC_NAME s_scm_even_p
|
1996-07-25 22:56:11 +00:00
|
|
|
|
{
|
2004-07-23 15:43:02 +00:00
|
|
|
|
if (SCM_I_INUMP (n))
|
2003-07-13 16:13:57 +00:00
|
|
|
|
{
|
2004-07-23 15:43:02 +00:00
|
|
|
|
long val = SCM_I_INUM (n);
|
(scm_is_integer, scm_is_signed_integer, scm_is_unsigned_integer,
scm_to_signed_integer, scm_to_unsigned_integer, scm_to_schar,
scm_to_uchar, scm_to_char, scm_to_short, scm_to_ushort, scm_to_long,
scm_to_ulong, scm_to_size_t, scm_to_ssize_t, scm_from_schar,
scm_from_uchar, scm_from_char, scm_from_short, scm_from_ushort,
scm_from_int, scm_from_uint, scm_from_long, scm_from_ulong,
scm_from_size_t, scm_from_ssize_t, scm_is_real, scm_to_double,
scm_from_double): New.
* deprecated.h, boolean.h (SCM_FALSEP, SCM_NFALSEP, SCM_BOOL,
SCM_NEGATE_BOOL, SCM_BOOLP): Deprecated by moving into "deprecated.h".
Replaced all uses with scm_is_false, scm_is_true, scm_from_bool, and
scm_is_bool, respectively.
2004-07-06 10:23:30 +00:00
|
|
|
|
return scm_from_bool ((val & 1L) == 0);
|
2003-07-13 16:13:57 +00:00
|
|
|
|
}
|
|
|
|
|
|
else if (SCM_BIGP (n))
|
|
|
|
|
|
{
|
|
|
|
|
|
int even_p = mpz_even_p (SCM_I_BIG_MPZ (n));
|
|
|
|
|
|
scm_remember_upto_here_1 (n);
|
(scm_is_integer, scm_is_signed_integer, scm_is_unsigned_integer,
scm_to_signed_integer, scm_to_unsigned_integer, scm_to_schar,
scm_to_uchar, scm_to_char, scm_to_short, scm_to_ushort, scm_to_long,
scm_to_ulong, scm_to_size_t, scm_to_ssize_t, scm_from_schar,
scm_from_uchar, scm_from_char, scm_from_short, scm_from_ushort,
scm_from_int, scm_from_uint, scm_from_long, scm_from_ulong,
scm_from_size_t, scm_from_ssize_t, scm_is_real, scm_to_double,
scm_from_double): New.
* deprecated.h, boolean.h (SCM_FALSEP, SCM_NFALSEP, SCM_BOOL,
SCM_NEGATE_BOOL, SCM_BOOLP): Deprecated by moving into "deprecated.h".
Replaced all uses with scm_is_false, scm_is_true, scm_from_bool, and
scm_is_bool, respectively.
2004-07-06 10:23:30 +00:00
|
|
|
|
return scm_from_bool (even_p);
|
2003-07-13 16:13:57 +00:00
|
|
|
|
}
|
(scm_is_integer, scm_is_signed_integer, scm_is_unsigned_integer,
scm_to_signed_integer, scm_to_unsigned_integer, scm_to_schar,
scm_to_uchar, scm_to_char, scm_to_short, scm_to_ushort, scm_to_long,
scm_to_ulong, scm_to_size_t, scm_to_ssize_t, scm_from_schar,
scm_from_uchar, scm_from_char, scm_from_short, scm_from_ushort,
scm_from_int, scm_from_uint, scm_from_long, scm_from_ulong,
scm_from_size_t, scm_from_ssize_t, scm_is_real, scm_to_double,
scm_from_double): New.
* deprecated.h, boolean.h (SCM_FALSEP, SCM_NFALSEP, SCM_BOOL,
SCM_NEGATE_BOOL, SCM_BOOLP): Deprecated by moving into "deprecated.h".
Replaced all uses with scm_is_false, scm_is_true, scm_from_bool, and
scm_is_bool, respectively.
2004-07-06 10:23:30 +00:00
|
|
|
|
else if (scm_is_true (scm_inf_p (n)))
|
From John W. Eaton.
* numbers.h: Conditionally include floatingpoint.h, ieeefp.h, and
nan.h. Provide declarations for scm_inf_p, scm_nan_p, scn_inf,
and scm_nan.
* numbers.c: [SCO && ! HAVE_ISNAN] (isnan): New function.
[SCO && ! HAVE_ISINF] (isinf): New function.
(xisinf, xisnan): New functions.
(IS_INF): Delete.
(isfinite): Define in terms of xisinf.
(scm_inf_p, scm_nan_p): New functions.
(guile_Inf, guile_NaN): New file-scope vars.
(guile_ieee_init): New function.
(scm_inf, scm_nan): New functions.
(idbl2str): Handle Inf and NaN. Remove funny label and
corresponding gotos.
(ALLOW_DIVIDE_BY_ZERO): New macro.
(scm_divide): Allow division by zero to occur if
ALLOW_DIVIDE_BY_ZERO is defined.
Handle bignums and ints as special cases.
Additional stuff by me:
numbers.c (mem2ureal): Recognize "inf.0" and "nan.xxx".
(scm_even_p, scm_odd_p): Treat infinity as even and odd.
(iflo2str): Don't output a '+' for negative numbers or for Inf and
NaN. They will provide their own sign.
(scm_divide): Only allow divides by inexact zeros. Dividing by
exact zeros still signals an errors.
2002-05-06 22:33:10 +00:00
|
|
|
|
return SCM_BOOL_T;
|
* print.c (scm_iprin1): Handle fractions.
* objects.h (scm_class_fraction): New.
* objects.c (scm_class_fraction): New.
(scm_class_of): Handle fractions.
* hash.c (scm_hasher): Handle fractions.
* numbers.c: New code for handling fraction all over the place.
(scm_odd_p, scm_even_p): Handle inexact integers.
(scm_rational_p): New function, same as scm_real_p.
(scm_round_number, scm_truncate_number, scm_ceiling, scm_floor):
New exact functions that replace the inexact 'dsubr'
implementations.
(scm_numerator, scm_denominator): New.
* numbers.h (SCM_NUMP): Recognize fractions.
(SCM_FRACTIONP, SCM_SLOPPY_FRACTIONP, SCM_FRACTION_NUMERATOR,
SCM_FRACTION_DENOMINATOR, SCM_FRACTION_SET_NUMERATOR,
SCM_FRACTION_SET_DENOMINATOR, SCM_FRACTION_REDUCED_BIT,
SCM_FRACTION_REDUCED_SET, SCM_FRACTION_REDUCED_CLEAR,
SCM_FRACTION_REDUCED): New.
(scm_floor, scm_ceiling, scm_truncate_number, scm_round_number):
New prototypes.
(scm_make_ratio, scm_rationalize, scm_numerator, scm_denominator,
scm_rational_p): New prototypes.
(scm_i_dbl2num, scm_i_fraction2double, scm_i_fraction_equalp,
scm_i_print_fraction): New prototypes.
* goops.c (create_standard_classes): Create "<fraction>" class.
* gc-mark.c (scm_gc_mark_dependencies): Handle fractions.
* gc-card.c (scm_i_sweep_card): Include scm_tc16_fraction as a
case in the switch, but do nothing for now.
* eval.c (SCM_CEVAL, SCM_APPLY, call_dsubr_1): Convert fractions
to doubles when calling 'dsubr' functions.
* eq.c (scm_eqv_p, scm_equal_p): Handle fractions.
2003-11-18 19:59:53 +00:00
|
|
|
|
else if (SCM_REALP (n))
|
|
|
|
|
|
{
|
|
|
|
|
|
double rem = fabs (fmod (SCM_REAL_VALUE(n), 2.0));
|
|
|
|
|
|
if (rem == 1.0)
|
|
|
|
|
|
return SCM_BOOL_F;
|
|
|
|
|
|
else if (rem == 0.0)
|
|
|
|
|
|
return SCM_BOOL_T;
|
|
|
|
|
|
else
|
|
|
|
|
|
SCM_WRONG_TYPE_ARG (1, n);
|
|
|
|
|
|
}
|
2003-07-13 16:13:57 +00:00
|
|
|
|
else
|
2000-04-21 11:35:39 +00:00
|
|
|
|
SCM_WRONG_TYPE_ARG (1, n);
|
1996-07-25 22:56:11 +00:00
|
|
|
|
}
|
1999-12-12 02:36:16 +00:00
|
|
|
|
#undef FUNC_NAME
|
1996-07-25 22:56:11 +00:00
|
|
|
|
|
From John W. Eaton.
* numbers.h: Conditionally include floatingpoint.h, ieeefp.h, and
nan.h. Provide declarations for scm_inf_p, scm_nan_p, scn_inf,
and scm_nan.
* numbers.c: [SCO && ! HAVE_ISNAN] (isnan): New function.
[SCO && ! HAVE_ISINF] (isinf): New function.
(xisinf, xisnan): New functions.
(IS_INF): Delete.
(isfinite): Define in terms of xisinf.
(scm_inf_p, scm_nan_p): New functions.
(guile_Inf, guile_NaN): New file-scope vars.
(guile_ieee_init): New function.
(scm_inf, scm_nan): New functions.
(idbl2str): Handle Inf and NaN. Remove funny label and
corresponding gotos.
(ALLOW_DIVIDE_BY_ZERO): New macro.
(scm_divide): Allow division by zero to occur if
ALLOW_DIVIDE_BY_ZERO is defined.
Handle bignums and ints as special cases.
Additional stuff by me:
numbers.c (mem2ureal): Recognize "inf.0" and "nan.xxx".
(scm_even_p, scm_odd_p): Treat infinity as even and odd.
(iflo2str): Don't output a '+' for negative numbers or for Inf and
NaN. They will provide their own sign.
(scm_divide): Only allow divides by inexact zeros. Dividing by
exact zeros still signals an errors.
2002-05-06 22:33:10 +00:00
|
|
|
|
SCM_DEFINE (scm_inf_p, "inf?", 1, 0, 0,
|
2004-08-24 16:43:50 +00:00
|
|
|
|
(SCM x),
|
|
|
|
|
|
"Return @code{#t} if @var{x} is either @samp{+inf.0}\n"
|
|
|
|
|
|
"or @samp{-inf.0}, @code{#f} otherwise.")
|
From John W. Eaton.
* numbers.h: Conditionally include floatingpoint.h, ieeefp.h, and
nan.h. Provide declarations for scm_inf_p, scm_nan_p, scn_inf,
and scm_nan.
* numbers.c: [SCO && ! HAVE_ISNAN] (isnan): New function.
[SCO && ! HAVE_ISINF] (isinf): New function.
(xisinf, xisnan): New functions.
(IS_INF): Delete.
(isfinite): Define in terms of xisinf.
(scm_inf_p, scm_nan_p): New functions.
(guile_Inf, guile_NaN): New file-scope vars.
(guile_ieee_init): New function.
(scm_inf, scm_nan): New functions.
(idbl2str): Handle Inf and NaN. Remove funny label and
corresponding gotos.
(ALLOW_DIVIDE_BY_ZERO): New macro.
(scm_divide): Allow division by zero to occur if
ALLOW_DIVIDE_BY_ZERO is defined.
Handle bignums and ints as special cases.
Additional stuff by me:
numbers.c (mem2ureal): Recognize "inf.0" and "nan.xxx".
(scm_even_p, scm_odd_p): Treat infinity as even and odd.
(iflo2str): Don't output a '+' for negative numbers or for Inf and
NaN. They will provide their own sign.
(scm_divide): Only allow divides by inexact zeros. Dividing by
exact zeros still signals an errors.
2002-05-06 22:33:10 +00:00
|
|
|
|
#define FUNC_NAME s_scm_inf_p
|
|
|
|
|
|
{
|
2004-08-24 16:43:50 +00:00
|
|
|
|
if (SCM_REALP (x))
|
|
|
|
|
|
return scm_from_bool (xisinf (SCM_REAL_VALUE (x)));
|
|
|
|
|
|
else if (SCM_COMPLEXP (x))
|
|
|
|
|
|
return scm_from_bool (xisinf (SCM_COMPLEX_REAL (x))
|
|
|
|
|
|
|| xisinf (SCM_COMPLEX_IMAG (x)));
|
2003-07-13 16:13:57 +00:00
|
|
|
|
else
|
From John W. Eaton.
* numbers.h: Conditionally include floatingpoint.h, ieeefp.h, and
nan.h. Provide declarations for scm_inf_p, scm_nan_p, scn_inf,
and scm_nan.
* numbers.c: [SCO && ! HAVE_ISNAN] (isnan): New function.
[SCO && ! HAVE_ISINF] (isinf): New function.
(xisinf, xisnan): New functions.
(IS_INF): Delete.
(isfinite): Define in terms of xisinf.
(scm_inf_p, scm_nan_p): New functions.
(guile_Inf, guile_NaN): New file-scope vars.
(guile_ieee_init): New function.
(scm_inf, scm_nan): New functions.
(idbl2str): Handle Inf and NaN. Remove funny label and
corresponding gotos.
(ALLOW_DIVIDE_BY_ZERO): New macro.
(scm_divide): Allow division by zero to occur if
ALLOW_DIVIDE_BY_ZERO is defined.
Handle bignums and ints as special cases.
Additional stuff by me:
numbers.c (mem2ureal): Recognize "inf.0" and "nan.xxx".
(scm_even_p, scm_odd_p): Treat infinity as even and odd.
(iflo2str): Don't output a '+' for negative numbers or for Inf and
NaN. They will provide their own sign.
(scm_divide): Only allow divides by inexact zeros. Dividing by
exact zeros still signals an errors.
2002-05-06 22:33:10 +00:00
|
|
|
|
return SCM_BOOL_F;
|
|
|
|
|
|
}
|
|
|
|
|
|
#undef FUNC_NAME
|
|
|
|
|
|
|
|
|
|
|
|
SCM_DEFINE (scm_nan_p, "nan?", 1, 0, 0,
|
|
|
|
|
|
(SCM n),
|
|
|
|
|
|
"Return @code{#t} if @var{n} is a NaN, @code{#f}\n"
|
|
|
|
|
|
"otherwise.")
|
|
|
|
|
|
#define FUNC_NAME s_scm_nan_p
|
|
|
|
|
|
{
|
2003-07-13 16:13:57 +00:00
|
|
|
|
if (SCM_REALP (n))
|
(scm_is_integer, scm_is_signed_integer, scm_is_unsigned_integer,
scm_to_signed_integer, scm_to_unsigned_integer, scm_to_schar,
scm_to_uchar, scm_to_char, scm_to_short, scm_to_ushort, scm_to_long,
scm_to_ulong, scm_to_size_t, scm_to_ssize_t, scm_from_schar,
scm_from_uchar, scm_from_char, scm_from_short, scm_from_ushort,
scm_from_int, scm_from_uint, scm_from_long, scm_from_ulong,
scm_from_size_t, scm_from_ssize_t, scm_is_real, scm_to_double,
scm_from_double): New.
* deprecated.h, boolean.h (SCM_FALSEP, SCM_NFALSEP, SCM_BOOL,
SCM_NEGATE_BOOL, SCM_BOOLP): Deprecated by moving into "deprecated.h".
Replaced all uses with scm_is_false, scm_is_true, scm_from_bool, and
scm_is_bool, respectively.
2004-07-06 10:23:30 +00:00
|
|
|
|
return scm_from_bool (xisnan (SCM_REAL_VALUE (n)));
|
2003-07-13 16:13:57 +00:00
|
|
|
|
else if (SCM_COMPLEXP (n))
|
(scm_is_integer, scm_is_signed_integer, scm_is_unsigned_integer,
scm_to_signed_integer, scm_to_unsigned_integer, scm_to_schar,
scm_to_uchar, scm_to_char, scm_to_short, scm_to_ushort, scm_to_long,
scm_to_ulong, scm_to_size_t, scm_to_ssize_t, scm_from_schar,
scm_from_uchar, scm_from_char, scm_from_short, scm_from_ushort,
scm_from_int, scm_from_uint, scm_from_long, scm_from_ulong,
scm_from_size_t, scm_from_ssize_t, scm_is_real, scm_to_double,
scm_from_double): New.
* deprecated.h, boolean.h (SCM_FALSEP, SCM_NFALSEP, SCM_BOOL,
SCM_NEGATE_BOOL, SCM_BOOLP): Deprecated by moving into "deprecated.h".
Replaced all uses with scm_is_false, scm_is_true, scm_from_bool, and
scm_is_bool, respectively.
2004-07-06 10:23:30 +00:00
|
|
|
|
return scm_from_bool (xisnan (SCM_COMPLEX_REAL (n))
|
From John W. Eaton.
* numbers.h: Conditionally include floatingpoint.h, ieeefp.h, and
nan.h. Provide declarations for scm_inf_p, scm_nan_p, scn_inf,
and scm_nan.
* numbers.c: [SCO && ! HAVE_ISNAN] (isnan): New function.
[SCO && ! HAVE_ISINF] (isinf): New function.
(xisinf, xisnan): New functions.
(IS_INF): Delete.
(isfinite): Define in terms of xisinf.
(scm_inf_p, scm_nan_p): New functions.
(guile_Inf, guile_NaN): New file-scope vars.
(guile_ieee_init): New function.
(scm_inf, scm_nan): New functions.
(idbl2str): Handle Inf and NaN. Remove funny label and
corresponding gotos.
(ALLOW_DIVIDE_BY_ZERO): New macro.
(scm_divide): Allow division by zero to occur if
ALLOW_DIVIDE_BY_ZERO is defined.
Handle bignums and ints as special cases.
Additional stuff by me:
numbers.c (mem2ureal): Recognize "inf.0" and "nan.xxx".
(scm_even_p, scm_odd_p): Treat infinity as even and odd.
(iflo2str): Don't output a '+' for negative numbers or for Inf and
NaN. They will provide their own sign.
(scm_divide): Only allow divides by inexact zeros. Dividing by
exact zeros still signals an errors.
2002-05-06 22:33:10 +00:00
|
|
|
|
|| xisnan (SCM_COMPLEX_IMAG (n)));
|
2003-07-13 16:13:57 +00:00
|
|
|
|
else
|
From John W. Eaton.
* numbers.h: Conditionally include floatingpoint.h, ieeefp.h, and
nan.h. Provide declarations for scm_inf_p, scm_nan_p, scn_inf,
and scm_nan.
* numbers.c: [SCO && ! HAVE_ISNAN] (isnan): New function.
[SCO && ! HAVE_ISINF] (isinf): New function.
(xisinf, xisnan): New functions.
(IS_INF): Delete.
(isfinite): Define in terms of xisinf.
(scm_inf_p, scm_nan_p): New functions.
(guile_Inf, guile_NaN): New file-scope vars.
(guile_ieee_init): New function.
(scm_inf, scm_nan): New functions.
(idbl2str): Handle Inf and NaN. Remove funny label and
corresponding gotos.
(ALLOW_DIVIDE_BY_ZERO): New macro.
(scm_divide): Allow division by zero to occur if
ALLOW_DIVIDE_BY_ZERO is defined.
Handle bignums and ints as special cases.
Additional stuff by me:
numbers.c (mem2ureal): Recognize "inf.0" and "nan.xxx".
(scm_even_p, scm_odd_p): Treat infinity as even and odd.
(iflo2str): Don't output a '+' for negative numbers or for Inf and
NaN. They will provide their own sign.
(scm_divide): Only allow divides by inexact zeros. Dividing by
exact zeros still signals an errors.
2002-05-06 22:33:10 +00:00
|
|
|
|
return SCM_BOOL_F;
|
|
|
|
|
|
}
|
|
|
|
|
|
#undef FUNC_NAME
|
|
|
|
|
|
|
|
|
|
|
|
/* Guile's idea of infinity. */
|
|
|
|
|
|
static double guile_Inf;
|
|
|
|
|
|
|
|
|
|
|
|
/* Guile's idea of not a number. */
|
|
|
|
|
|
static double guile_NaN;
|
|
|
|
|
|
|
|
|
|
|
|
static void
|
|
|
|
|
|
guile_ieee_init (void)
|
|
|
|
|
|
{
|
|
|
|
|
|
#if defined (HAVE_ISINF) || defined (HAVE_FINITE)
|
|
|
|
|
|
|
|
|
|
|
|
/* Some version of gcc on some old version of Linux used to crash when
|
|
|
|
|
|
trying to make Inf and NaN. */
|
|
|
|
|
|
|
2004-02-28 20:01:13 +00:00
|
|
|
|
#ifdef INFINITY
|
|
|
|
|
|
/* C99 INFINITY, when available.
|
|
|
|
|
|
FIXME: The standard allows for INFINITY to be something that overflows
|
|
|
|
|
|
at compile time. We ought to have a configure test to check for that
|
|
|
|
|
|
before trying to use it. (But in practice we believe this is not a
|
|
|
|
|
|
problem on any system guile is likely to target.) */
|
|
|
|
|
|
guile_Inf = INFINITY;
|
2009-11-17 23:40:51 +01:00
|
|
|
|
#elif defined HAVE_DINFINITY
|
2004-02-28 20:01:13 +00:00
|
|
|
|
/* OSF */
|
From John W. Eaton.
* numbers.h: Conditionally include floatingpoint.h, ieeefp.h, and
nan.h. Provide declarations for scm_inf_p, scm_nan_p, scn_inf,
and scm_nan.
* numbers.c: [SCO && ! HAVE_ISNAN] (isnan): New function.
[SCO && ! HAVE_ISINF] (isinf): New function.
(xisinf, xisnan): New functions.
(IS_INF): Delete.
(isfinite): Define in terms of xisinf.
(scm_inf_p, scm_nan_p): New functions.
(guile_Inf, guile_NaN): New file-scope vars.
(guile_ieee_init): New function.
(scm_inf, scm_nan): New functions.
(idbl2str): Handle Inf and NaN. Remove funny label and
corresponding gotos.
(ALLOW_DIVIDE_BY_ZERO): New macro.
(scm_divide): Allow division by zero to occur if
ALLOW_DIVIDE_BY_ZERO is defined.
Handle bignums and ints as special cases.
Additional stuff by me:
numbers.c (mem2ureal): Recognize "inf.0" and "nan.xxx".
(scm_even_p, scm_odd_p): Treat infinity as even and odd.
(iflo2str): Don't output a '+' for negative numbers or for Inf and
NaN. They will provide their own sign.
(scm_divide): Only allow divides by inexact zeros. Dividing by
exact zeros still signals an errors.
2002-05-06 22:33:10 +00:00
|
|
|
|
extern unsigned int DINFINITY[2];
|
2006-07-12 08:07:27 +00:00
|
|
|
|
guile_Inf = (*((double *) (DINFINITY)));
|
From John W. Eaton.
* numbers.h: Conditionally include floatingpoint.h, ieeefp.h, and
nan.h. Provide declarations for scm_inf_p, scm_nan_p, scn_inf,
and scm_nan.
* numbers.c: [SCO && ! HAVE_ISNAN] (isnan): New function.
[SCO && ! HAVE_ISINF] (isinf): New function.
(xisinf, xisnan): New functions.
(IS_INF): Delete.
(isfinite): Define in terms of xisinf.
(scm_inf_p, scm_nan_p): New functions.
(guile_Inf, guile_NaN): New file-scope vars.
(guile_ieee_init): New function.
(scm_inf, scm_nan): New functions.
(idbl2str): Handle Inf and NaN. Remove funny label and
corresponding gotos.
(ALLOW_DIVIDE_BY_ZERO): New macro.
(scm_divide): Allow division by zero to occur if
ALLOW_DIVIDE_BY_ZERO is defined.
Handle bignums and ints as special cases.
Additional stuff by me:
numbers.c (mem2ureal): Recognize "inf.0" and "nan.xxx".
(scm_even_p, scm_odd_p): Treat infinity as even and odd.
(iflo2str): Don't output a '+' for negative numbers or for Inf and
NaN. They will provide their own sign.
(scm_divide): Only allow divides by inexact zeros. Dividing by
exact zeros still signals an errors.
2002-05-06 22:33:10 +00:00
|
|
|
|
#else
|
|
|
|
|
|
double tmp = 1e+10;
|
|
|
|
|
|
guile_Inf = tmp;
|
|
|
|
|
|
for (;;)
|
|
|
|
|
|
{
|
|
|
|
|
|
guile_Inf *= 1e+10;
|
|
|
|
|
|
if (guile_Inf == tmp)
|
|
|
|
|
|
break;
|
|
|
|
|
|
tmp = guile_Inf;
|
|
|
|
|
|
}
|
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
|
|
#if defined (HAVE_ISNAN)
|
|
|
|
|
|
|
2004-02-28 20:01:13 +00:00
|
|
|
|
#ifdef NAN
|
|
|
|
|
|
/* C99 NAN, when available */
|
|
|
|
|
|
guile_NaN = NAN;
|
2009-11-17 23:40:51 +01:00
|
|
|
|
#elif defined HAVE_DQNAN
|
2006-07-12 08:07:27 +00:00
|
|
|
|
{
|
|
|
|
|
|
/* OSF */
|
|
|
|
|
|
extern unsigned int DQNAN[2];
|
|
|
|
|
|
guile_NaN = (*((double *)(DQNAN)));
|
|
|
|
|
|
}
|
From John W. Eaton.
* numbers.h: Conditionally include floatingpoint.h, ieeefp.h, and
nan.h. Provide declarations for scm_inf_p, scm_nan_p, scn_inf,
and scm_nan.
* numbers.c: [SCO && ! HAVE_ISNAN] (isnan): New function.
[SCO && ! HAVE_ISINF] (isinf): New function.
(xisinf, xisnan): New functions.
(IS_INF): Delete.
(isfinite): Define in terms of xisinf.
(scm_inf_p, scm_nan_p): New functions.
(guile_Inf, guile_NaN): New file-scope vars.
(guile_ieee_init): New function.
(scm_inf, scm_nan): New functions.
(idbl2str): Handle Inf and NaN. Remove funny label and
corresponding gotos.
(ALLOW_DIVIDE_BY_ZERO): New macro.
(scm_divide): Allow division by zero to occur if
ALLOW_DIVIDE_BY_ZERO is defined.
Handle bignums and ints as special cases.
Additional stuff by me:
numbers.c (mem2ureal): Recognize "inf.0" and "nan.xxx".
(scm_even_p, scm_odd_p): Treat infinity as even and odd.
(iflo2str): Don't output a '+' for negative numbers or for Inf and
NaN. They will provide their own sign.
(scm_divide): Only allow divides by inexact zeros. Dividing by
exact zeros still signals an errors.
2002-05-06 22:33:10 +00:00
|
|
|
|
#else
|
|
|
|
|
|
guile_NaN = guile_Inf / guile_Inf;
|
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
|
|
#endif
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
SCM_DEFINE (scm_inf, "inf", 0, 0, 0,
|
|
|
|
|
|
(void),
|
|
|
|
|
|
"Return Inf.")
|
|
|
|
|
|
#define FUNC_NAME s_scm_inf
|
|
|
|
|
|
{
|
|
|
|
|
|
static int initialized = 0;
|
|
|
|
|
|
if (! initialized)
|
|
|
|
|
|
{
|
|
|
|
|
|
guile_ieee_init ();
|
|
|
|
|
|
initialized = 1;
|
|
|
|
|
|
}
|
(scm_is_rational): New.
(scm_i_short2big, scm_i_int2big, scm_i_uint2big, scm_i_size2big,
scm_i_ptrdiff2big, scm_i_long_long2big, scm_i_ulong_long2big):
Removed prototypes.
(scm_make_real, scm_num2dbl, scm_float2num, scm_double2num):
Discouraged by moving to discouraged.h and discouraged.c.
Replaced all uses with scm_from_double.
(scm_num2float, scm_num2double): Discouraged by moving prototype
to discouraged.h and rewriting in terms of scm_to_double.
Replaced all uses with scm_to_double.
(scm_to_double): Do not implement in terms of scm_num2dbl, use
explicit code.
(scm_from_double): Do not implement in terms of scm_make_real, use
explicit code.
2004-08-03 15:03:35 +00:00
|
|
|
|
return scm_from_double (guile_Inf);
|
From John W. Eaton.
* numbers.h: Conditionally include floatingpoint.h, ieeefp.h, and
nan.h. Provide declarations for scm_inf_p, scm_nan_p, scn_inf,
and scm_nan.
* numbers.c: [SCO && ! HAVE_ISNAN] (isnan): New function.
[SCO && ! HAVE_ISINF] (isinf): New function.
(xisinf, xisnan): New functions.
(IS_INF): Delete.
(isfinite): Define in terms of xisinf.
(scm_inf_p, scm_nan_p): New functions.
(guile_Inf, guile_NaN): New file-scope vars.
(guile_ieee_init): New function.
(scm_inf, scm_nan): New functions.
(idbl2str): Handle Inf and NaN. Remove funny label and
corresponding gotos.
(ALLOW_DIVIDE_BY_ZERO): New macro.
(scm_divide): Allow division by zero to occur if
ALLOW_DIVIDE_BY_ZERO is defined.
Handle bignums and ints as special cases.
Additional stuff by me:
numbers.c (mem2ureal): Recognize "inf.0" and "nan.xxx".
(scm_even_p, scm_odd_p): Treat infinity as even and odd.
(iflo2str): Don't output a '+' for negative numbers or for Inf and
NaN. They will provide their own sign.
(scm_divide): Only allow divides by inexact zeros. Dividing by
exact zeros still signals an errors.
2002-05-06 22:33:10 +00:00
|
|
|
|
}
|
|
|
|
|
|
#undef FUNC_NAME
|
|
|
|
|
|
|
|
|
|
|
|
SCM_DEFINE (scm_nan, "nan", 0, 0, 0,
|
|
|
|
|
|
(void),
|
|
|
|
|
|
"Return NaN.")
|
|
|
|
|
|
#define FUNC_NAME s_scm_nan
|
|
|
|
|
|
{
|
|
|
|
|
|
static int initialized = 0;
|
2003-07-13 16:13:57 +00:00
|
|
|
|
if (!initialized)
|
From John W. Eaton.
* numbers.h: Conditionally include floatingpoint.h, ieeefp.h, and
nan.h. Provide declarations for scm_inf_p, scm_nan_p, scn_inf,
and scm_nan.
* numbers.c: [SCO && ! HAVE_ISNAN] (isnan): New function.
[SCO && ! HAVE_ISINF] (isinf): New function.
(xisinf, xisnan): New functions.
(IS_INF): Delete.
(isfinite): Define in terms of xisinf.
(scm_inf_p, scm_nan_p): New functions.
(guile_Inf, guile_NaN): New file-scope vars.
(guile_ieee_init): New function.
(scm_inf, scm_nan): New functions.
(idbl2str): Handle Inf and NaN. Remove funny label and
corresponding gotos.
(ALLOW_DIVIDE_BY_ZERO): New macro.
(scm_divide): Allow division by zero to occur if
ALLOW_DIVIDE_BY_ZERO is defined.
Handle bignums and ints as special cases.
Additional stuff by me:
numbers.c (mem2ureal): Recognize "inf.0" and "nan.xxx".
(scm_even_p, scm_odd_p): Treat infinity as even and odd.
(iflo2str): Don't output a '+' for negative numbers or for Inf and
NaN. They will provide their own sign.
(scm_divide): Only allow divides by inexact zeros. Dividing by
exact zeros still signals an errors.
2002-05-06 22:33:10 +00:00
|
|
|
|
{
|
|
|
|
|
|
guile_ieee_init ();
|
|
|
|
|
|
initialized = 1;
|
|
|
|
|
|
}
|
(scm_is_rational): New.
(scm_i_short2big, scm_i_int2big, scm_i_uint2big, scm_i_size2big,
scm_i_ptrdiff2big, scm_i_long_long2big, scm_i_ulong_long2big):
Removed prototypes.
(scm_make_real, scm_num2dbl, scm_float2num, scm_double2num):
Discouraged by moving to discouraged.h and discouraged.c.
Replaced all uses with scm_from_double.
(scm_num2float, scm_num2double): Discouraged by moving prototype
to discouraged.h and rewriting in terms of scm_to_double.
Replaced all uses with scm_to_double.
(scm_to_double): Do not implement in terms of scm_num2dbl, use
explicit code.
(scm_from_double): Do not implement in terms of scm_make_real, use
explicit code.
2004-08-03 15:03:35 +00:00
|
|
|
|
return scm_from_double (guile_NaN);
|
From John W. Eaton.
* numbers.h: Conditionally include floatingpoint.h, ieeefp.h, and
nan.h. Provide declarations for scm_inf_p, scm_nan_p, scn_inf,
and scm_nan.
* numbers.c: [SCO && ! HAVE_ISNAN] (isnan): New function.
[SCO && ! HAVE_ISINF] (isinf): New function.
(xisinf, xisnan): New functions.
(IS_INF): Delete.
(isfinite): Define in terms of xisinf.
(scm_inf_p, scm_nan_p): New functions.
(guile_Inf, guile_NaN): New file-scope vars.
(guile_ieee_init): New function.
(scm_inf, scm_nan): New functions.
(idbl2str): Handle Inf and NaN. Remove funny label and
corresponding gotos.
(ALLOW_DIVIDE_BY_ZERO): New macro.
(scm_divide): Allow division by zero to occur if
ALLOW_DIVIDE_BY_ZERO is defined.
Handle bignums and ints as special cases.
Additional stuff by me:
numbers.c (mem2ureal): Recognize "inf.0" and "nan.xxx".
(scm_even_p, scm_odd_p): Treat infinity as even and odd.
(iflo2str): Don't output a '+' for negative numbers or for Inf and
NaN. They will provide their own sign.
(scm_divide): Only allow divides by inexact zeros. Dividing by
exact zeros still signals an errors.
2002-05-06 22:33:10 +00:00
|
|
|
|
}
|
|
|
|
|
|
#undef FUNC_NAME
|
|
|
|
|
|
|
2000-04-20 15:51:09 +00:00
|
|
|
|
|
2003-03-06 12:51:57 +00:00
|
|
|
|
SCM_PRIMITIVE_GENERIC (scm_abs, "abs", 1, 0, 0,
|
|
|
|
|
|
(SCM x),
|
|
|
|
|
|
"Return the absolute value of @var{x}.")
|
|
|
|
|
|
#define FUNC_NAME
|
1996-07-25 22:56:11 +00:00
|
|
|
|
{
|
2004-07-23 15:43:02 +00:00
|
|
|
|
if (SCM_I_INUMP (x))
|
2003-07-13 16:13:57 +00:00
|
|
|
|
{
|
2004-07-23 15:43:02 +00:00
|
|
|
|
long int xx = SCM_I_INUM (x);
|
2003-07-13 16:13:57 +00:00
|
|
|
|
if (xx >= 0)
|
|
|
|
|
|
return x;
|
|
|
|
|
|
else if (SCM_POSFIXABLE (-xx))
|
2004-07-08 15:54:05 +00:00
|
|
|
|
return SCM_I_MAKINUM (-xx);
|
2003-07-13 16:13:57 +00:00
|
|
|
|
else
|
|
|
|
|
|
return scm_i_long2big (-xx);
|
2000-04-20 15:51:09 +00:00
|
|
|
|
}
|
2003-07-13 16:13:57 +00:00
|
|
|
|
else if (SCM_BIGP (x))
|
|
|
|
|
|
{
|
|
|
|
|
|
const int sgn = mpz_sgn (SCM_I_BIG_MPZ (x));
|
|
|
|
|
|
if (sgn < 0)
|
|
|
|
|
|
return scm_i_clonebig (x, 0);
|
|
|
|
|
|
else
|
|
|
|
|
|
return x;
|
2000-04-20 15:51:09 +00:00
|
|
|
|
}
|
2003-07-13 16:13:57 +00:00
|
|
|
|
else if (SCM_REALP (x))
|
2003-11-21 00:07:13 +00:00
|
|
|
|
{
|
|
|
|
|
|
/* note that if x is a NaN then xx<0 is false so we return x unchanged */
|
|
|
|
|
|
double xx = SCM_REAL_VALUE (x);
|
|
|
|
|
|
if (xx < 0.0)
|
(scm_is_rational): New.
(scm_i_short2big, scm_i_int2big, scm_i_uint2big, scm_i_size2big,
scm_i_ptrdiff2big, scm_i_long_long2big, scm_i_ulong_long2big):
Removed prototypes.
(scm_make_real, scm_num2dbl, scm_float2num, scm_double2num):
Discouraged by moving to discouraged.h and discouraged.c.
Replaced all uses with scm_from_double.
(scm_num2float, scm_num2double): Discouraged by moving prototype
to discouraged.h and rewriting in terms of scm_to_double.
Replaced all uses with scm_to_double.
(scm_to_double): Do not implement in terms of scm_num2dbl, use
explicit code.
(scm_from_double): Do not implement in terms of scm_make_real, use
explicit code.
2004-08-03 15:03:35 +00:00
|
|
|
|
return scm_from_double (-xx);
|
2003-11-21 00:07:13 +00:00
|
|
|
|
else
|
|
|
|
|
|
return x;
|
|
|
|
|
|
}
|
* print.c (scm_iprin1): Handle fractions.
* objects.h (scm_class_fraction): New.
* objects.c (scm_class_fraction): New.
(scm_class_of): Handle fractions.
* hash.c (scm_hasher): Handle fractions.
* numbers.c: New code for handling fraction all over the place.
(scm_odd_p, scm_even_p): Handle inexact integers.
(scm_rational_p): New function, same as scm_real_p.
(scm_round_number, scm_truncate_number, scm_ceiling, scm_floor):
New exact functions that replace the inexact 'dsubr'
implementations.
(scm_numerator, scm_denominator): New.
* numbers.h (SCM_NUMP): Recognize fractions.
(SCM_FRACTIONP, SCM_SLOPPY_FRACTIONP, SCM_FRACTION_NUMERATOR,
SCM_FRACTION_DENOMINATOR, SCM_FRACTION_SET_NUMERATOR,
SCM_FRACTION_SET_DENOMINATOR, SCM_FRACTION_REDUCED_BIT,
SCM_FRACTION_REDUCED_SET, SCM_FRACTION_REDUCED_CLEAR,
SCM_FRACTION_REDUCED): New.
(scm_floor, scm_ceiling, scm_truncate_number, scm_round_number):
New prototypes.
(scm_make_ratio, scm_rationalize, scm_numerator, scm_denominator,
scm_rational_p): New prototypes.
(scm_i_dbl2num, scm_i_fraction2double, scm_i_fraction_equalp,
scm_i_print_fraction): New prototypes.
* goops.c (create_standard_classes): Create "<fraction>" class.
* gc-mark.c (scm_gc_mark_dependencies): Handle fractions.
* gc-card.c (scm_i_sweep_card): Include scm_tc16_fraction as a
case in the switch, but do nothing for now.
* eval.c (SCM_CEVAL, SCM_APPLY, call_dsubr_1): Convert fractions
to doubles when calling 'dsubr' functions.
* eq.c (scm_eqv_p, scm_equal_p): Handle fractions.
2003-11-18 19:59:53 +00:00
|
|
|
|
else if (SCM_FRACTIONP (x))
|
|
|
|
|
|
{
|
(scm_is_integer, scm_is_signed_integer, scm_is_unsigned_integer,
scm_to_signed_integer, scm_to_unsigned_integer, scm_to_schar,
scm_to_uchar, scm_to_char, scm_to_short, scm_to_ushort, scm_to_long,
scm_to_ulong, scm_to_size_t, scm_to_ssize_t, scm_from_schar,
scm_from_uchar, scm_from_char, scm_from_short, scm_from_ushort,
scm_from_int, scm_from_uint, scm_from_long, scm_from_ulong,
scm_from_size_t, scm_from_ssize_t, scm_is_real, scm_to_double,
scm_from_double): New.
* deprecated.h, boolean.h (SCM_FALSEP, SCM_NFALSEP, SCM_BOOL,
SCM_NEGATE_BOOL, SCM_BOOLP): Deprecated by moving into "deprecated.h".
Replaced all uses with scm_is_false, scm_is_true, scm_from_bool, and
scm_is_bool, respectively.
2004-07-06 10:23:30 +00:00
|
|
|
|
if (scm_is_false (scm_negative_p (SCM_FRACTION_NUMERATOR (x))))
|
* print.c (scm_iprin1): Handle fractions.
* objects.h (scm_class_fraction): New.
* objects.c (scm_class_fraction): New.
(scm_class_of): Handle fractions.
* hash.c (scm_hasher): Handle fractions.
* numbers.c: New code for handling fraction all over the place.
(scm_odd_p, scm_even_p): Handle inexact integers.
(scm_rational_p): New function, same as scm_real_p.
(scm_round_number, scm_truncate_number, scm_ceiling, scm_floor):
New exact functions that replace the inexact 'dsubr'
implementations.
(scm_numerator, scm_denominator): New.
* numbers.h (SCM_NUMP): Recognize fractions.
(SCM_FRACTIONP, SCM_SLOPPY_FRACTIONP, SCM_FRACTION_NUMERATOR,
SCM_FRACTION_DENOMINATOR, SCM_FRACTION_SET_NUMERATOR,
SCM_FRACTION_SET_DENOMINATOR, SCM_FRACTION_REDUCED_BIT,
SCM_FRACTION_REDUCED_SET, SCM_FRACTION_REDUCED_CLEAR,
SCM_FRACTION_REDUCED): New.
(scm_floor, scm_ceiling, scm_truncate_number, scm_round_number):
New prototypes.
(scm_make_ratio, scm_rationalize, scm_numerator, scm_denominator,
scm_rational_p): New prototypes.
(scm_i_dbl2num, scm_i_fraction2double, scm_i_fraction_equalp,
scm_i_print_fraction): New prototypes.
* goops.c (create_standard_classes): Create "<fraction>" class.
* gc-mark.c (scm_gc_mark_dependencies): Handle fractions.
* gc-card.c (scm_i_sweep_card): Include scm_tc16_fraction as a
case in the switch, but do nothing for now.
* eval.c (SCM_CEVAL, SCM_APPLY, call_dsubr_1): Convert fractions
to doubles when calling 'dsubr' functions.
* eq.c (scm_eqv_p, scm_equal_p): Handle fractions.
2003-11-18 19:59:53 +00:00
|
|
|
|
return x;
|
2004-08-03 15:55:42 +00:00
|
|
|
|
return scm_i_make_ratio (scm_difference (SCM_FRACTION_NUMERATOR (x), SCM_UNDEFINED),
|
* print.c (scm_iprin1): Handle fractions.
* objects.h (scm_class_fraction): New.
* objects.c (scm_class_fraction): New.
(scm_class_of): Handle fractions.
* hash.c (scm_hasher): Handle fractions.
* numbers.c: New code for handling fraction all over the place.
(scm_odd_p, scm_even_p): Handle inexact integers.
(scm_rational_p): New function, same as scm_real_p.
(scm_round_number, scm_truncate_number, scm_ceiling, scm_floor):
New exact functions that replace the inexact 'dsubr'
implementations.
(scm_numerator, scm_denominator): New.
* numbers.h (SCM_NUMP): Recognize fractions.
(SCM_FRACTIONP, SCM_SLOPPY_FRACTIONP, SCM_FRACTION_NUMERATOR,
SCM_FRACTION_DENOMINATOR, SCM_FRACTION_SET_NUMERATOR,
SCM_FRACTION_SET_DENOMINATOR, SCM_FRACTION_REDUCED_BIT,
SCM_FRACTION_REDUCED_SET, SCM_FRACTION_REDUCED_CLEAR,
SCM_FRACTION_REDUCED): New.
(scm_floor, scm_ceiling, scm_truncate_number, scm_round_number):
New prototypes.
(scm_make_ratio, scm_rationalize, scm_numerator, scm_denominator,
scm_rational_p): New prototypes.
(scm_i_dbl2num, scm_i_fraction2double, scm_i_fraction_equalp,
scm_i_print_fraction): New prototypes.
* goops.c (create_standard_classes): Create "<fraction>" class.
* gc-mark.c (scm_gc_mark_dependencies): Handle fractions.
* gc-card.c (scm_i_sweep_card): Include scm_tc16_fraction as a
case in the switch, but do nothing for now.
* eval.c (SCM_CEVAL, SCM_APPLY, call_dsubr_1): Convert fractions
to doubles when calling 'dsubr' functions.
* eq.c (scm_eqv_p, scm_equal_p): Handle fractions.
2003-11-18 19:59:53 +00:00
|
|
|
|
SCM_FRACTION_DENOMINATOR (x));
|
|
|
|
|
|
}
|
2003-07-13 16:13:57 +00:00
|
|
|
|
else
|
2003-03-06 12:51:57 +00:00
|
|
|
|
SCM_WTA_DISPATCH_1 (g_scm_abs, x, 1, s_scm_abs);
|
1996-07-25 22:56:11 +00:00
|
|
|
|
}
|
2003-03-06 12:51:57 +00:00
|
|
|
|
#undef FUNC_NAME
|
1996-07-25 22:56:11 +00:00
|
|
|
|
|
2000-04-20 15:51:09 +00:00
|
|
|
|
|
* procs.c, procs.h (scm_subr_entry): New type: Stores data
associated with subrs.
(SCM_SUBRNUM, SCM_SUBR_ENTRY, SCM_SUBR_GENERIC, SCM_SUBR_PROPS,
SCM_SUBR_DOC): New macros.
(scm_subr_table): New variable.
(scm_mark_subr_table): New function.
* init.c (scm_boot_guile_1): Call scm_init_subr_table.
* gc.c (scm_gc_mark): Don't mark subr names here.
(scm_igc): Call scm_mark_subr_table.
* snarf.h (SCM_GPROC, SCM_GPROC1): New macros.
* procs.c, procs.h (scm_subr_p): New function (used internally).
* gsubr.c, gsubr.h (scm_make_gsubr_with_generic): New function.
* objects.c, objects.h (scm_primitive_generic): New class.
* objects.h (SCM_CMETHOD_CODE, SCM_CMETHOD_ENV): New macros.
* print.c (scm_iprin1): Print primitive-generics.
* __scm.h (SCM_WTA_DISPATCH_1, SCM_GASSERT1,
SCM_WTA_DISPATCH_2, SCM_GASSERT2): New macros.
* eval.c (SCM_CEVAL, SCM_APPLY): Replace scm_wta -->
SCM_WTA_DISPATCH_1 for scm_cxr's (unary floating point
primitives). NOTE: This means that it is now *required* to use
SCM_GPROC1 when creating float scm_cxr's (float scm_cxr's is an
obscured representation that will be removed in the future anyway,
so backward compatibility is no problem here).
* numbers.c: Converted most numeric primitives (all but bit
comparison operations and bit operations) to dispatch on generic
if args don't match.
* eval.c, eval.h (scm_eval_body): New function.
* objects.c (scm_call_generic_0, scm_call_generic_1,
scm_call_generic_2, scm_call_generic_3, scm_apply_generic): New
functions.
* eval.c (SCM_CEVAL): Apply the cmethod directly after having
called scm_memoize_method instead of doing a second lookup.
* objects.h (scm_memoize_method): Now returns the memoized cmethod.
* procs.c (scm_make_subr_opt): Use scm_sysintern0 instead of
scm_sysintern so that the binding connected with the subr name
isn't cleared when we give set = 0.
1999-08-26 04:24:42 +00:00
|
|
|
|
SCM_GPROC (s_quotient, "quotient", 2, 0, 0, scm_quotient, g_quotient);
|
* vectors.c (s_scm_vector_p, list->vector, scm_vector)
(scm_vector_ref, scm_vector_set_x, scm_vector_to_list)
(scm_vector_fill_x), strorder.c (scm_string_equal_p)
(scm_string_ci_equal_p, scm_string_less_p, scm_string_leq_p)
(scm_string_gr_p, scm_string_geq_p, scm_string_ci_less_p)
(scm_string_ci_geq_p), symbols.c (scm_symbol_p)
(scm_symbol_to_string, scm_string_to_symbol): Changed use of @t{}
to @code{} as the texinfo manual recommends, converted the
examples to use a @lisp{}-environment.
* strports.c (scm_eval_string): Cleaned up the docstring.
* struct.c (scm_struct_p, scm_struct_vtable_p): Added texinfo
markup.
* numbers.c (scm_exact_p, scm_odd_p, scm_even_p)
(scm_number_to_string, scm_string_to_number, scm_number_p)
(scm_real_p, scm_integer_p, scm_inexact_p, scm_make_rectangular)
(scm_make_polar, scm_inexact_to_exact): Added texinfo markup.
(scm_ash): Added texinfo markup and removed obsolete @refill.
(scm_gr_p): Corrected comment.
(scm_gr_p, scm_leq_p, scm_geq_p): Added texinfo markup to (future
docstring) comments.
(scm_positive_p, scm_less_p, scm_num_eq_p, scm_real_p)
(scm_number_p, scm_negative_p, scm_max, scm_min, scm_sum)
(scm_difference, scm_product, scm_divide, scm_asinh, scm_acosh)
(scm_atanh, scm_truncate, scm_round, scm_exact_to_inexact)
(floor, ceiling, $sqrt, $abs, $exp, $log, $sin, $cos, $tan, $asin)
($acos, $atan, $sinh, $cosh, $tanh, scm_real_part, scm_imag_part)
(scm_magnitude, scm_angle, scm_abs, scm_quotient, scm_remainder)
(scm_modulo, scm_gcd, scm_lcm): Added (future docstring) comments.
2001-03-02 09:07:22 +00:00
|
|
|
|
/* "Return the quotient of the numbers @var{x} and @var{y}."
|
|
|
|
|
|
*/
|
1996-07-25 22:56:11 +00:00
|
|
|
|
SCM
|
1999-12-12 20:35:02 +00:00
|
|
|
|
scm_quotient (SCM x, SCM y)
|
1996-07-25 22:56:11 +00:00
|
|
|
|
{
|
2004-07-23 15:43:02 +00:00
|
|
|
|
if (SCM_I_INUMP (x))
|
2003-07-13 16:13:57 +00:00
|
|
|
|
{
|
2004-07-23 15:43:02 +00:00
|
|
|
|
long xx = SCM_I_INUM (x);
|
|
|
|
|
|
if (SCM_I_INUMP (y))
|
2003-07-13 16:13:57 +00:00
|
|
|
|
{
|
2004-07-23 15:43:02 +00:00
|
|
|
|
long yy = SCM_I_INUM (y);
|
2003-07-13 16:13:57 +00:00
|
|
|
|
if (yy == 0)
|
|
|
|
|
|
scm_num_overflow (s_quotient);
|
|
|
|
|
|
else
|
|
|
|
|
|
{
|
|
|
|
|
|
long z = xx / yy;
|
|
|
|
|
|
if (SCM_FIXABLE (z))
|
2004-07-08 15:54:05 +00:00
|
|
|
|
return SCM_I_MAKINUM (z);
|
2003-07-13 16:13:57 +00:00
|
|
|
|
else
|
|
|
|
|
|
return scm_i_long2big (z);
|
|
|
|
|
|
}
|
2000-04-11 13:00:15 +00:00
|
|
|
|
}
|
2003-07-13 16:13:57 +00:00
|
|
|
|
else if (SCM_BIGP (y))
|
2001-01-17 18:15:30 +00:00
|
|
|
|
{
|
2004-07-23 15:43:02 +00:00
|
|
|
|
if ((SCM_I_INUM (x) == SCM_MOST_NEGATIVE_FIXNUM)
|
2004-04-05 22:48:05 +00:00
|
|
|
|
&& (mpz_cmp_ui (SCM_I_BIG_MPZ (y),
|
|
|
|
|
|
- SCM_MOST_NEGATIVE_FIXNUM) == 0))
|
|
|
|
|
|
{
|
|
|
|
|
|
/* Special case: x == fixnum-min && y == abs (fixnum-min) */
|
|
|
|
|
|
scm_remember_upto_here_1 (y);
|
2004-07-08 15:54:05 +00:00
|
|
|
|
return SCM_I_MAKINUM (-1);
|
2004-04-05 22:48:05 +00:00
|
|
|
|
}
|
2003-07-13 16:13:57 +00:00
|
|
|
|
else
|
2004-07-08 15:54:05 +00:00
|
|
|
|
return SCM_I_MAKINUM (0);
|
2001-01-17 18:15:30 +00:00
|
|
|
|
}
|
|
|
|
|
|
else
|
2003-07-13 16:13:57 +00:00
|
|
|
|
SCM_WTA_DISPATCH_2 (g_quotient, x, y, SCM_ARG2, s_quotient);
|
2000-04-11 13:00:15 +00:00
|
|
|
|
}
|
2003-07-13 16:13:57 +00:00
|
|
|
|
else if (SCM_BIGP (x))
|
|
|
|
|
|
{
|
2004-07-23 15:43:02 +00:00
|
|
|
|
if (SCM_I_INUMP (y))
|
2003-07-13 16:13:57 +00:00
|
|
|
|
{
|
2004-07-23 15:43:02 +00:00
|
|
|
|
long yy = SCM_I_INUM (y);
|
2003-07-13 16:13:57 +00:00
|
|
|
|
if (yy == 0)
|
|
|
|
|
|
scm_num_overflow (s_quotient);
|
|
|
|
|
|
else if (yy == 1)
|
|
|
|
|
|
return x;
|
|
|
|
|
|
else
|
|
|
|
|
|
{
|
|
|
|
|
|
SCM result = scm_i_mkbig ();
|
|
|
|
|
|
if (yy < 0)
|
|
|
|
|
|
{
|
|
|
|
|
|
mpz_tdiv_q_ui (SCM_I_BIG_MPZ (result),
|
|
|
|
|
|
SCM_I_BIG_MPZ (x),
|
|
|
|
|
|
- yy);
|
|
|
|
|
|
mpz_neg (SCM_I_BIG_MPZ (result), SCM_I_BIG_MPZ (result));
|
|
|
|
|
|
}
|
|
|
|
|
|
else
|
|
|
|
|
|
mpz_tdiv_q_ui (SCM_I_BIG_MPZ (result), SCM_I_BIG_MPZ (x), yy);
|
|
|
|
|
|
scm_remember_upto_here_1 (x);
|
|
|
|
|
|
return scm_i_normbig (result);
|
|
|
|
|
|
}
|
|
|
|
|
|
}
|
|
|
|
|
|
else if (SCM_BIGP (y))
|
|
|
|
|
|
{
|
|
|
|
|
|
SCM result = scm_i_mkbig ();
|
|
|
|
|
|
mpz_tdiv_q (SCM_I_BIG_MPZ (result),
|
|
|
|
|
|
SCM_I_BIG_MPZ (x),
|
|
|
|
|
|
SCM_I_BIG_MPZ (y));
|
|
|
|
|
|
scm_remember_upto_here_2 (x, y);
|
|
|
|
|
|
return scm_i_normbig (result);
|
|
|
|
|
|
}
|
|
|
|
|
|
else
|
|
|
|
|
|
SCM_WTA_DISPATCH_2 (g_quotient, x, y, SCM_ARG2, s_quotient);
|
1999-01-10 07:38:39 +00:00
|
|
|
|
}
|
2003-07-13 16:13:57 +00:00
|
|
|
|
else
|
2000-04-28 08:35:28 +00:00
|
|
|
|
SCM_WTA_DISPATCH_2 (g_quotient, x, y, SCM_ARG1, s_quotient);
|
1996-07-25 22:56:11 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
* procs.c, procs.h (scm_subr_entry): New type: Stores data
associated with subrs.
(SCM_SUBRNUM, SCM_SUBR_ENTRY, SCM_SUBR_GENERIC, SCM_SUBR_PROPS,
SCM_SUBR_DOC): New macros.
(scm_subr_table): New variable.
(scm_mark_subr_table): New function.
* init.c (scm_boot_guile_1): Call scm_init_subr_table.
* gc.c (scm_gc_mark): Don't mark subr names here.
(scm_igc): Call scm_mark_subr_table.
* snarf.h (SCM_GPROC, SCM_GPROC1): New macros.
* procs.c, procs.h (scm_subr_p): New function (used internally).
* gsubr.c, gsubr.h (scm_make_gsubr_with_generic): New function.
* objects.c, objects.h (scm_primitive_generic): New class.
* objects.h (SCM_CMETHOD_CODE, SCM_CMETHOD_ENV): New macros.
* print.c (scm_iprin1): Print primitive-generics.
* __scm.h (SCM_WTA_DISPATCH_1, SCM_GASSERT1,
SCM_WTA_DISPATCH_2, SCM_GASSERT2): New macros.
* eval.c (SCM_CEVAL, SCM_APPLY): Replace scm_wta -->
SCM_WTA_DISPATCH_1 for scm_cxr's (unary floating point
primitives). NOTE: This means that it is now *required* to use
SCM_GPROC1 when creating float scm_cxr's (float scm_cxr's is an
obscured representation that will be removed in the future anyway,
so backward compatibility is no problem here).
* numbers.c: Converted most numeric primitives (all but bit
comparison operations and bit operations) to dispatch on generic
if args don't match.
* eval.c, eval.h (scm_eval_body): New function.
* objects.c (scm_call_generic_0, scm_call_generic_1,
scm_call_generic_2, scm_call_generic_3, scm_apply_generic): New
functions.
* eval.c (SCM_CEVAL): Apply the cmethod directly after having
called scm_memoize_method instead of doing a second lookup.
* objects.h (scm_memoize_method): Now returns the memoized cmethod.
* procs.c (scm_make_subr_opt): Use scm_sysintern0 instead of
scm_sysintern so that the binding connected with the subr name
isn't cleared when we give set = 0.
1999-08-26 04:24:42 +00:00
|
|
|
|
SCM_GPROC (s_remainder, "remainder", 2, 0, 0, scm_remainder, g_remainder);
|
* vectors.c (s_scm_vector_p, list->vector, scm_vector)
(scm_vector_ref, scm_vector_set_x, scm_vector_to_list)
(scm_vector_fill_x), strorder.c (scm_string_equal_p)
(scm_string_ci_equal_p, scm_string_less_p, scm_string_leq_p)
(scm_string_gr_p, scm_string_geq_p, scm_string_ci_less_p)
(scm_string_ci_geq_p), symbols.c (scm_symbol_p)
(scm_symbol_to_string, scm_string_to_symbol): Changed use of @t{}
to @code{} as the texinfo manual recommends, converted the
examples to use a @lisp{}-environment.
* strports.c (scm_eval_string): Cleaned up the docstring.
* struct.c (scm_struct_p, scm_struct_vtable_p): Added texinfo
markup.
* numbers.c (scm_exact_p, scm_odd_p, scm_even_p)
(scm_number_to_string, scm_string_to_number, scm_number_p)
(scm_real_p, scm_integer_p, scm_inexact_p, scm_make_rectangular)
(scm_make_polar, scm_inexact_to_exact): Added texinfo markup.
(scm_ash): Added texinfo markup and removed obsolete @refill.
(scm_gr_p): Corrected comment.
(scm_gr_p, scm_leq_p, scm_geq_p): Added texinfo markup to (future
docstring) comments.
(scm_positive_p, scm_less_p, scm_num_eq_p, scm_real_p)
(scm_number_p, scm_negative_p, scm_max, scm_min, scm_sum)
(scm_difference, scm_product, scm_divide, scm_asinh, scm_acosh)
(scm_atanh, scm_truncate, scm_round, scm_exact_to_inexact)
(floor, ceiling, $sqrt, $abs, $exp, $log, $sin, $cos, $tan, $asin)
($acos, $atan, $sinh, $cosh, $tanh, scm_real_part, scm_imag_part)
(scm_magnitude, scm_angle, scm_abs, scm_quotient, scm_remainder)
(scm_modulo, scm_gcd, scm_lcm): Added (future docstring) comments.
2001-03-02 09:07:22 +00:00
|
|
|
|
/* "Return the remainder of the numbers @var{x} and @var{y}.\n"
|
|
|
|
|
|
* "@lisp\n"
|
|
|
|
|
|
* "(remainder 13 4) @result{} 1\n"
|
|
|
|
|
|
* "(remainder -13 4) @result{} -1\n"
|
|
|
|
|
|
* "@end lisp"
|
|
|
|
|
|
*/
|
1996-07-25 22:56:11 +00:00
|
|
|
|
SCM
|
1999-12-12 20:35:02 +00:00
|
|
|
|
scm_remainder (SCM x, SCM y)
|
1996-07-25 22:56:11 +00:00
|
|
|
|
{
|
2004-07-23 15:43:02 +00:00
|
|
|
|
if (SCM_I_INUMP (x))
|
2003-07-13 16:13:57 +00:00
|
|
|
|
{
|
2004-07-23 15:43:02 +00:00
|
|
|
|
if (SCM_I_INUMP (y))
|
2003-07-13 16:13:57 +00:00
|
|
|
|
{
|
2004-07-23 15:43:02 +00:00
|
|
|
|
long yy = SCM_I_INUM (y);
|
2003-07-13 16:13:57 +00:00
|
|
|
|
if (yy == 0)
|
|
|
|
|
|
scm_num_overflow (s_remainder);
|
|
|
|
|
|
else
|
|
|
|
|
|
{
|
2004-07-23 15:43:02 +00:00
|
|
|
|
long z = SCM_I_INUM (x) % yy;
|
2004-07-08 15:54:05 +00:00
|
|
|
|
return SCM_I_MAKINUM (z);
|
2003-07-13 16:13:57 +00:00
|
|
|
|
}
|
|
|
|
|
|
}
|
|
|
|
|
|
else if (SCM_BIGP (y))
|
2001-01-17 18:15:30 +00:00
|
|
|
|
{
|
2004-07-23 15:43:02 +00:00
|
|
|
|
if ((SCM_I_INUM (x) == SCM_MOST_NEGATIVE_FIXNUM)
|
2004-04-05 22:48:05 +00:00
|
|
|
|
&& (mpz_cmp_ui (SCM_I_BIG_MPZ (y),
|
|
|
|
|
|
- SCM_MOST_NEGATIVE_FIXNUM) == 0))
|
|
|
|
|
|
{
|
|
|
|
|
|
/* Special case: x == fixnum-min && y == abs (fixnum-min) */
|
|
|
|
|
|
scm_remember_upto_here_1 (y);
|
2004-07-08 15:54:05 +00:00
|
|
|
|
return SCM_I_MAKINUM (0);
|
2004-04-05 22:48:05 +00:00
|
|
|
|
}
|
2003-07-13 16:13:57 +00:00
|
|
|
|
else
|
|
|
|
|
|
return x;
|
2001-01-17 18:15:30 +00:00
|
|
|
|
}
|
|
|
|
|
|
else
|
2003-07-13 16:13:57 +00:00
|
|
|
|
SCM_WTA_DISPATCH_2 (g_remainder, x, y, SCM_ARG2, s_remainder);
|
2000-04-28 08:35:28 +00:00
|
|
|
|
}
|
2003-07-13 16:13:57 +00:00
|
|
|
|
else if (SCM_BIGP (x))
|
|
|
|
|
|
{
|
2004-07-23 15:43:02 +00:00
|
|
|
|
if (SCM_I_INUMP (y))
|
2003-07-13 16:13:57 +00:00
|
|
|
|
{
|
2004-07-23 15:43:02 +00:00
|
|
|
|
long yy = SCM_I_INUM (y);
|
2003-07-13 16:13:57 +00:00
|
|
|
|
if (yy == 0)
|
|
|
|
|
|
scm_num_overflow (s_remainder);
|
|
|
|
|
|
else
|
|
|
|
|
|
{
|
|
|
|
|
|
SCM result = scm_i_mkbig ();
|
|
|
|
|
|
if (yy < 0)
|
|
|
|
|
|
yy = - yy;
|
|
|
|
|
|
mpz_tdiv_r_ui (SCM_I_BIG_MPZ (result), SCM_I_BIG_MPZ(x), yy);
|
|
|
|
|
|
scm_remember_upto_here_1 (x);
|
|
|
|
|
|
return scm_i_normbig (result);
|
|
|
|
|
|
}
|
|
|
|
|
|
}
|
|
|
|
|
|
else if (SCM_BIGP (y))
|
|
|
|
|
|
{
|
|
|
|
|
|
SCM result = scm_i_mkbig ();
|
|
|
|
|
|
mpz_tdiv_r (SCM_I_BIG_MPZ (result),
|
|
|
|
|
|
SCM_I_BIG_MPZ (x),
|
|
|
|
|
|
SCM_I_BIG_MPZ (y));
|
|
|
|
|
|
scm_remember_upto_here_2 (x, y);
|
|
|
|
|
|
return scm_i_normbig (result);
|
|
|
|
|
|
}
|
|
|
|
|
|
else
|
|
|
|
|
|
SCM_WTA_DISPATCH_2 (g_remainder, x, y, SCM_ARG2, s_remainder);
|
1999-01-10 07:38:39 +00:00
|
|
|
|
}
|
2003-07-13 16:13:57 +00:00
|
|
|
|
else
|
2000-04-28 08:35:28 +00:00
|
|
|
|
SCM_WTA_DISPATCH_2 (g_remainder, x, y, SCM_ARG1, s_remainder);
|
1996-07-25 22:56:11 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
2000-04-28 08:35:28 +00:00
|
|
|
|
|
* procs.c, procs.h (scm_subr_entry): New type: Stores data
associated with subrs.
(SCM_SUBRNUM, SCM_SUBR_ENTRY, SCM_SUBR_GENERIC, SCM_SUBR_PROPS,
SCM_SUBR_DOC): New macros.
(scm_subr_table): New variable.
(scm_mark_subr_table): New function.
* init.c (scm_boot_guile_1): Call scm_init_subr_table.
* gc.c (scm_gc_mark): Don't mark subr names here.
(scm_igc): Call scm_mark_subr_table.
* snarf.h (SCM_GPROC, SCM_GPROC1): New macros.
* procs.c, procs.h (scm_subr_p): New function (used internally).
* gsubr.c, gsubr.h (scm_make_gsubr_with_generic): New function.
* objects.c, objects.h (scm_primitive_generic): New class.
* objects.h (SCM_CMETHOD_CODE, SCM_CMETHOD_ENV): New macros.
* print.c (scm_iprin1): Print primitive-generics.
* __scm.h (SCM_WTA_DISPATCH_1, SCM_GASSERT1,
SCM_WTA_DISPATCH_2, SCM_GASSERT2): New macros.
* eval.c (SCM_CEVAL, SCM_APPLY): Replace scm_wta -->
SCM_WTA_DISPATCH_1 for scm_cxr's (unary floating point
primitives). NOTE: This means that it is now *required* to use
SCM_GPROC1 when creating float scm_cxr's (float scm_cxr's is an
obscured representation that will be removed in the future anyway,
so backward compatibility is no problem here).
* numbers.c: Converted most numeric primitives (all but bit
comparison operations and bit operations) to dispatch on generic
if args don't match.
* eval.c, eval.h (scm_eval_body): New function.
* objects.c (scm_call_generic_0, scm_call_generic_1,
scm_call_generic_2, scm_call_generic_3, scm_apply_generic): New
functions.
* eval.c (SCM_CEVAL): Apply the cmethod directly after having
called scm_memoize_method instead of doing a second lookup.
* objects.h (scm_memoize_method): Now returns the memoized cmethod.
* procs.c (scm_make_subr_opt): Use scm_sysintern0 instead of
scm_sysintern so that the binding connected with the subr name
isn't cleared when we give set = 0.
1999-08-26 04:24:42 +00:00
|
|
|
|
SCM_GPROC (s_modulo, "modulo", 2, 0, 0, scm_modulo, g_modulo);
|
* vectors.c (s_scm_vector_p, list->vector, scm_vector)
(scm_vector_ref, scm_vector_set_x, scm_vector_to_list)
(scm_vector_fill_x), strorder.c (scm_string_equal_p)
(scm_string_ci_equal_p, scm_string_less_p, scm_string_leq_p)
(scm_string_gr_p, scm_string_geq_p, scm_string_ci_less_p)
(scm_string_ci_geq_p), symbols.c (scm_symbol_p)
(scm_symbol_to_string, scm_string_to_symbol): Changed use of @t{}
to @code{} as the texinfo manual recommends, converted the
examples to use a @lisp{}-environment.
* strports.c (scm_eval_string): Cleaned up the docstring.
* struct.c (scm_struct_p, scm_struct_vtable_p): Added texinfo
markup.
* numbers.c (scm_exact_p, scm_odd_p, scm_even_p)
(scm_number_to_string, scm_string_to_number, scm_number_p)
(scm_real_p, scm_integer_p, scm_inexact_p, scm_make_rectangular)
(scm_make_polar, scm_inexact_to_exact): Added texinfo markup.
(scm_ash): Added texinfo markup and removed obsolete @refill.
(scm_gr_p): Corrected comment.
(scm_gr_p, scm_leq_p, scm_geq_p): Added texinfo markup to (future
docstring) comments.
(scm_positive_p, scm_less_p, scm_num_eq_p, scm_real_p)
(scm_number_p, scm_negative_p, scm_max, scm_min, scm_sum)
(scm_difference, scm_product, scm_divide, scm_asinh, scm_acosh)
(scm_atanh, scm_truncate, scm_round, scm_exact_to_inexact)
(floor, ceiling, $sqrt, $abs, $exp, $log, $sin, $cos, $tan, $asin)
($acos, $atan, $sinh, $cosh, $tanh, scm_real_part, scm_imag_part)
(scm_magnitude, scm_angle, scm_abs, scm_quotient, scm_remainder)
(scm_modulo, scm_gcd, scm_lcm): Added (future docstring) comments.
2001-03-02 09:07:22 +00:00
|
|
|
|
/* "Return the modulo of the numbers @var{x} and @var{y}.\n"
|
|
|
|
|
|
* "@lisp\n"
|
|
|
|
|
|
* "(modulo 13 4) @result{} 1\n"
|
|
|
|
|
|
* "(modulo -13 4) @result{} 3\n"
|
|
|
|
|
|
* "@end lisp"
|
|
|
|
|
|
*/
|
1996-07-25 22:56:11 +00:00
|
|
|
|
SCM
|
1999-12-12 20:35:02 +00:00
|
|
|
|
scm_modulo (SCM x, SCM y)
|
1996-07-25 22:56:11 +00:00
|
|
|
|
{
|
2004-07-23 15:43:02 +00:00
|
|
|
|
if (SCM_I_INUMP (x))
|
2003-07-13 16:13:57 +00:00
|
|
|
|
{
|
2004-07-23 15:43:02 +00:00
|
|
|
|
long xx = SCM_I_INUM (x);
|
|
|
|
|
|
if (SCM_I_INUMP (y))
|
2003-07-13 16:13:57 +00:00
|
|
|
|
{
|
2004-07-23 15:43:02 +00:00
|
|
|
|
long yy = SCM_I_INUM (y);
|
2003-07-13 16:13:57 +00:00
|
|
|
|
if (yy == 0)
|
|
|
|
|
|
scm_num_overflow (s_modulo);
|
|
|
|
|
|
else
|
|
|
|
|
|
{
|
2004-12-10 00:00:27 +00:00
|
|
|
|
/* C99 specifies that "%" is the remainder corresponding to a
|
|
|
|
|
|
quotient rounded towards zero, and that's also traditional
|
|
|
|
|
|
for machine division, so z here should be well defined. */
|
2003-07-13 16:13:57 +00:00
|
|
|
|
long z = xx % yy;
|
|
|
|
|
|
long result;
|
|
|
|
|
|
|
|
|
|
|
|
if (yy < 0)
|
|
|
|
|
|
{
|
|
|
|
|
|
if (z > 0)
|
|
|
|
|
|
result = z + yy;
|
|
|
|
|
|
else
|
|
|
|
|
|
result = z;
|
|
|
|
|
|
}
|
|
|
|
|
|
else
|
|
|
|
|
|
{
|
|
|
|
|
|
if (z < 0)
|
|
|
|
|
|
result = z + yy;
|
|
|
|
|
|
else
|
|
|
|
|
|
result = z;
|
|
|
|
|
|
}
|
2004-07-08 15:54:05 +00:00
|
|
|
|
return SCM_I_MAKINUM (result);
|
2003-07-13 16:13:57 +00:00
|
|
|
|
}
|
|
|
|
|
|
}
|
|
|
|
|
|
else if (SCM_BIGP (y))
|
|
|
|
|
|
{
|
|
|
|
|
|
int sgn_y = mpz_sgn (SCM_I_BIG_MPZ (y));
|
|
|
|
|
|
{
|
|
|
|
|
|
mpz_t z_x;
|
|
|
|
|
|
SCM result;
|
|
|
|
|
|
|
|
|
|
|
|
if (sgn_y < 0)
|
|
|
|
|
|
{
|
|
|
|
|
|
SCM pos_y = scm_i_clonebig (y, 0);
|
|
|
|
|
|
/* do this after the last scm_op */
|
|
|
|
|
|
mpz_init_set_si (z_x, xx);
|
|
|
|
|
|
result = pos_y; /* re-use this bignum */
|
|
|
|
|
|
mpz_mod (SCM_I_BIG_MPZ (result),
|
|
|
|
|
|
z_x,
|
|
|
|
|
|
SCM_I_BIG_MPZ (pos_y));
|
|
|
|
|
|
scm_remember_upto_here_1 (pos_y);
|
|
|
|
|
|
}
|
|
|
|
|
|
else
|
|
|
|
|
|
{
|
|
|
|
|
|
result = scm_i_mkbig ();
|
|
|
|
|
|
/* do this after the last scm_op */
|
|
|
|
|
|
mpz_init_set_si (z_x, xx);
|
|
|
|
|
|
mpz_mod (SCM_I_BIG_MPZ (result),
|
|
|
|
|
|
z_x,
|
|
|
|
|
|
SCM_I_BIG_MPZ (y));
|
|
|
|
|
|
scm_remember_upto_here_1 (y);
|
|
|
|
|
|
}
|
2003-04-04 21:49:44 +00:00
|
|
|
|
|
2003-07-13 16:13:57 +00:00
|
|
|
|
if ((sgn_y < 0) && mpz_sgn (SCM_I_BIG_MPZ (result)) != 0)
|
|
|
|
|
|
mpz_add (SCM_I_BIG_MPZ (result),
|
|
|
|
|
|
SCM_I_BIG_MPZ (y),
|
|
|
|
|
|
SCM_I_BIG_MPZ (result));
|
|
|
|
|
|
scm_remember_upto_here_1 (y);
|
|
|
|
|
|
/* and do this before the next one */
|
|
|
|
|
|
mpz_clear (z_x);
|
|
|
|
|
|
return scm_i_normbig (result);
|
|
|
|
|
|
}
|
|
|
|
|
|
}
|
|
|
|
|
|
else
|
|
|
|
|
|
SCM_WTA_DISPATCH_2 (g_modulo, x, y, SCM_ARG2, s_modulo);
|
1999-01-10 07:38:39 +00:00
|
|
|
|
}
|
2003-07-13 16:13:57 +00:00
|
|
|
|
else if (SCM_BIGP (x))
|
|
|
|
|
|
{
|
2004-07-23 15:43:02 +00:00
|
|
|
|
if (SCM_I_INUMP (y))
|
2003-07-13 16:13:57 +00:00
|
|
|
|
{
|
2004-07-23 15:43:02 +00:00
|
|
|
|
long yy = SCM_I_INUM (y);
|
2003-07-13 16:13:57 +00:00
|
|
|
|
if (yy == 0)
|
|
|
|
|
|
scm_num_overflow (s_modulo);
|
|
|
|
|
|
else
|
|
|
|
|
|
{
|
|
|
|
|
|
SCM result = scm_i_mkbig ();
|
|
|
|
|
|
mpz_mod_ui (SCM_I_BIG_MPZ (result),
|
|
|
|
|
|
SCM_I_BIG_MPZ (x),
|
|
|
|
|
|
(yy < 0) ? - yy : yy);
|
|
|
|
|
|
scm_remember_upto_here_1 (x);
|
|
|
|
|
|
if ((yy < 0) && (mpz_sgn (SCM_I_BIG_MPZ (result)) != 0))
|
|
|
|
|
|
mpz_sub_ui (SCM_I_BIG_MPZ (result),
|
|
|
|
|
|
SCM_I_BIG_MPZ (result),
|
|
|
|
|
|
- yy);
|
|
|
|
|
|
return scm_i_normbig (result);
|
|
|
|
|
|
}
|
|
|
|
|
|
}
|
|
|
|
|
|
else if (SCM_BIGP (y))
|
|
|
|
|
|
{
|
|
|
|
|
|
{
|
|
|
|
|
|
SCM result = scm_i_mkbig ();
|
|
|
|
|
|
int y_sgn = mpz_sgn (SCM_I_BIG_MPZ (y));
|
|
|
|
|
|
SCM pos_y = scm_i_clonebig (y, y_sgn >= 0);
|
|
|
|
|
|
mpz_mod (SCM_I_BIG_MPZ (result),
|
|
|
|
|
|
SCM_I_BIG_MPZ (x),
|
|
|
|
|
|
SCM_I_BIG_MPZ (pos_y));
|
2003-04-04 21:49:44 +00:00
|
|
|
|
|
2003-07-13 16:13:57 +00:00
|
|
|
|
scm_remember_upto_here_1 (x);
|
|
|
|
|
|
if ((y_sgn < 0) && (mpz_sgn (SCM_I_BIG_MPZ (result)) != 0))
|
|
|
|
|
|
mpz_add (SCM_I_BIG_MPZ (result),
|
|
|
|
|
|
SCM_I_BIG_MPZ (y),
|
|
|
|
|
|
SCM_I_BIG_MPZ (result));
|
|
|
|
|
|
scm_remember_upto_here_2 (y, pos_y);
|
|
|
|
|
|
return scm_i_normbig (result);
|
|
|
|
|
|
}
|
|
|
|
|
|
}
|
|
|
|
|
|
else
|
|
|
|
|
|
SCM_WTA_DISPATCH_2 (g_modulo, x, y, SCM_ARG2, s_modulo);
|
2000-04-11 13:00:15 +00:00
|
|
|
|
}
|
2003-07-13 16:13:57 +00:00
|
|
|
|
else
|
2000-04-28 17:14:49 +00:00
|
|
|
|
SCM_WTA_DISPATCH_2 (g_modulo, x, y, SCM_ARG1, s_modulo);
|
1996-07-25 22:56:11 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
2009-09-06 16:47:19 +02:00
|
|
|
|
SCM_PRIMITIVE_GENERIC (scm_i_gcd, "gcd", 0, 2, 1,
|
|
|
|
|
|
(SCM x, SCM y, SCM rest),
|
|
|
|
|
|
"Return the greatest common divisor of all parameter values.\n"
|
|
|
|
|
|
"If called without arguments, 0 is returned.")
|
|
|
|
|
|
#define FUNC_NAME s_scm_i_gcd
|
|
|
|
|
|
{
|
|
|
|
|
|
while (!scm_is_null (rest))
|
|
|
|
|
|
{ x = scm_gcd (x, y);
|
|
|
|
|
|
y = scm_car (rest);
|
|
|
|
|
|
rest = scm_cdr (rest);
|
|
|
|
|
|
}
|
|
|
|
|
|
return scm_gcd (x, y);
|
|
|
|
|
|
}
|
|
|
|
|
|
#undef FUNC_NAME
|
|
|
|
|
|
|
|
|
|
|
|
#define s_gcd s_scm_i_gcd
|
|
|
|
|
|
#define g_gcd g_scm_i_gcd
|
|
|
|
|
|
|
1996-07-25 22:56:11 +00:00
|
|
|
|
SCM
|
1999-12-12 20:35:02 +00:00
|
|
|
|
scm_gcd (SCM x, SCM y)
|
1996-07-25 22:56:11 +00:00
|
|
|
|
{
|
2003-04-04 21:49:44 +00:00
|
|
|
|
if (SCM_UNBNDP (y))
|
2008-09-17 21:46:40 +01:00
|
|
|
|
return SCM_UNBNDP (x) ? SCM_INUM0 : scm_abs (x);
|
2003-04-04 21:49:44 +00:00
|
|
|
|
|
2004-07-23 15:43:02 +00:00
|
|
|
|
if (SCM_I_INUMP (x))
|
2003-04-04 21:49:44 +00:00
|
|
|
|
{
|
2004-07-23 15:43:02 +00:00
|
|
|
|
if (SCM_I_INUMP (y))
|
2003-04-04 21:49:44 +00:00
|
|
|
|
{
|
2004-07-23 15:43:02 +00:00
|
|
|
|
long xx = SCM_I_INUM (x);
|
|
|
|
|
|
long yy = SCM_I_INUM (y);
|
2003-04-04 21:49:44 +00:00
|
|
|
|
long u = xx < 0 ? -xx : xx;
|
|
|
|
|
|
long v = yy < 0 ? -yy : yy;
|
|
|
|
|
|
long result;
|
2003-07-13 16:13:57 +00:00
|
|
|
|
if (xx == 0)
|
|
|
|
|
|
result = v;
|
|
|
|
|
|
else if (yy == 0)
|
|
|
|
|
|
result = u;
|
|
|
|
|
|
else
|
|
|
|
|
|
{
|
|
|
|
|
|
long k = 1;
|
|
|
|
|
|
long t;
|
|
|
|
|
|
/* Determine a common factor 2^k */
|
|
|
|
|
|
while (!(1 & (u | v)))
|
|
|
|
|
|
{
|
|
|
|
|
|
k <<= 1;
|
|
|
|
|
|
u >>= 1;
|
|
|
|
|
|
v >>= 1;
|
|
|
|
|
|
}
|
|
|
|
|
|
/* Now, any factor 2^n can be eliminated */
|
|
|
|
|
|
if (u & 1)
|
|
|
|
|
|
t = -v;
|
|
|
|
|
|
else
|
|
|
|
|
|
{
|
|
|
|
|
|
t = u;
|
|
|
|
|
|
b3:
|
|
|
|
|
|
t = SCM_SRS (t, 1);
|
|
|
|
|
|
}
|
|
|
|
|
|
if (!(1 & t))
|
|
|
|
|
|
goto b3;
|
|
|
|
|
|
if (t > 0)
|
|
|
|
|
|
u = t;
|
|
|
|
|
|
else
|
|
|
|
|
|
v = -t;
|
|
|
|
|
|
t = u - v;
|
|
|
|
|
|
if (t != 0)
|
|
|
|
|
|
goto b3;
|
|
|
|
|
|
result = u * k;
|
|
|
|
|
|
}
|
|
|
|
|
|
return (SCM_POSFIXABLE (result)
|
2004-07-08 15:54:05 +00:00
|
|
|
|
? SCM_I_MAKINUM (result)
|
2003-07-13 16:13:57 +00:00
|
|
|
|
: scm_i_long2big (result));
|
2003-04-04 21:49:44 +00:00
|
|
|
|
}
|
|
|
|
|
|
else if (SCM_BIGP (y))
|
|
|
|
|
|
{
|
2004-04-15 01:45:12 +00:00
|
|
|
|
SCM_SWAP (x, y);
|
|
|
|
|
|
goto big_inum;
|
2003-04-04 21:49:44 +00:00
|
|
|
|
}
|
|
|
|
|
|
else
|
|
|
|
|
|
SCM_WTA_DISPATCH_2 (g_gcd, x, y, SCM_ARG2, s_gcd);
|
1999-01-10 07:38:39 +00:00
|
|
|
|
}
|
2003-04-04 21:49:44 +00:00
|
|
|
|
else if (SCM_BIGP (x))
|
|
|
|
|
|
{
|
2004-07-23 15:43:02 +00:00
|
|
|
|
if (SCM_I_INUMP (y))
|
2003-04-04 21:49:44 +00:00
|
|
|
|
{
|
|
|
|
|
|
unsigned long result;
|
2004-04-15 01:45:12 +00:00
|
|
|
|
long yy;
|
|
|
|
|
|
big_inum:
|
2004-07-23 15:43:02 +00:00
|
|
|
|
yy = SCM_I_INUM (y);
|
2003-05-10 00:20:05 +00:00
|
|
|
|
if (yy == 0)
|
|
|
|
|
|
return scm_abs (x);
|
2003-07-13 16:13:57 +00:00
|
|
|
|
if (yy < 0)
|
|
|
|
|
|
yy = -yy;
|
2003-04-04 21:49:44 +00:00
|
|
|
|
result = mpz_gcd_ui (NULL, SCM_I_BIG_MPZ (x), yy);
|
|
|
|
|
|
scm_remember_upto_here_1 (x);
|
2003-07-13 16:13:57 +00:00
|
|
|
|
return (SCM_POSFIXABLE (result)
|
2004-07-08 15:54:05 +00:00
|
|
|
|
? SCM_I_MAKINUM (result)
|
* discouraged.h, discouraged.c: New files.
* deprecated.h (SCM_FALSEP, SCM_NFALSEP, SCM_BOOLP, SCM_EQ_P,
SCM_NEGATE_BOOL, SCM_BOOL, SCM_BOOT_NOT): Promoted from being
deprecated to being discouraged by moving to discouraged.h.
* numbers.h, numbers.c, discouraged.h, discouraged.c
(scm_short2num, scm_ushort2num, scm_int2num, scm_uint2num,
scm_long2num, scm_ulong2num, scm_size2num, scm_ptrdiff2num,
scm_num2short, scm_num2ushort, scm_num2int, scm_num2uint,
scm_num2long, scm_num2ulong, scm_num2size, scm_num2ptrdiff,
scm_long_long2num, scm_ulong_long2num, scm_num2long_long,
scm_num2ulong_long): Discouraged by moving to discouraged.h and
discouraged.c and reimplementing in terms of scm_from_* and
scm_to_*.
* numbers.h, numbers.c: Removed GUILE_DEBUG code.
(scm_i_short2big, scm_i_ushort2big, scm_i_int2big, scm_i_uint2big,
scm_i_size2big, scm_i_ptrdiff2big): Removed.
(scm_i_long2big, scm_i_ulong2big): New, explicit definitions.
* conv-integer.i.c, conv-uinteger.i.c: Use them instead of
explicit code.
2004-08-02 15:57:04 +00:00
|
|
|
|
: scm_from_ulong (result));
|
2003-04-04 21:49:44 +00:00
|
|
|
|
}
|
|
|
|
|
|
else if (SCM_BIGP (y))
|
|
|
|
|
|
{
|
|
|
|
|
|
SCM result = scm_i_mkbig ();
|
2003-07-13 16:13:57 +00:00
|
|
|
|
mpz_gcd (SCM_I_BIG_MPZ (result),
|
|
|
|
|
|
SCM_I_BIG_MPZ (x),
|
|
|
|
|
|
SCM_I_BIG_MPZ (y));
|
|
|
|
|
|
scm_remember_upto_here_2 (x, y);
|
2003-04-04 21:49:44 +00:00
|
|
|
|
return scm_i_normbig (result);
|
|
|
|
|
|
}
|
|
|
|
|
|
else
|
|
|
|
|
|
SCM_WTA_DISPATCH_2 (g_gcd, x, y, SCM_ARG2, s_gcd);
|
2000-04-28 17:14:49 +00:00
|
|
|
|
}
|
2003-04-04 21:49:44 +00:00
|
|
|
|
else
|
2000-04-28 17:14:49 +00:00
|
|
|
|
SCM_WTA_DISPATCH_2 (g_gcd, x, y, SCM_ARG1, s_gcd);
|
1996-07-25 22:56:11 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
2009-09-06 16:47:19 +02:00
|
|
|
|
SCM_PRIMITIVE_GENERIC (scm_i_lcm, "lcm", 0, 2, 1,
|
|
|
|
|
|
(SCM x, SCM y, SCM rest),
|
|
|
|
|
|
"Return the least common multiple of the arguments.\n"
|
|
|
|
|
|
"If called without arguments, 1 is returned.")
|
|
|
|
|
|
#define FUNC_NAME s_scm_i_lcm
|
|
|
|
|
|
{
|
|
|
|
|
|
while (!scm_is_null (rest))
|
|
|
|
|
|
{ x = scm_lcm (x, y);
|
|
|
|
|
|
y = scm_car (rest);
|
|
|
|
|
|
rest = scm_cdr (rest);
|
|
|
|
|
|
}
|
|
|
|
|
|
return scm_lcm (x, y);
|
|
|
|
|
|
}
|
|
|
|
|
|
#undef FUNC_NAME
|
|
|
|
|
|
|
|
|
|
|
|
#define s_lcm s_scm_i_lcm
|
|
|
|
|
|
#define g_lcm g_scm_i_lcm
|
|
|
|
|
|
|
1996-07-25 22:56:11 +00:00
|
|
|
|
SCM
|
1999-12-12 20:35:02 +00:00
|
|
|
|
scm_lcm (SCM n1, SCM n2)
|
1996-07-25 22:56:11 +00:00
|
|
|
|
{
|
2003-04-04 21:49:44 +00:00
|
|
|
|
if (SCM_UNBNDP (n2))
|
|
|
|
|
|
{
|
|
|
|
|
|
if (SCM_UNBNDP (n1))
|
2004-07-08 15:54:05 +00:00
|
|
|
|
return SCM_I_MAKINUM (1L);
|
|
|
|
|
|
n2 = SCM_I_MAKINUM (1L);
|
2000-04-28 17:14:49 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
2004-07-23 15:43:02 +00:00
|
|
|
|
SCM_GASSERT2 (SCM_I_INUMP (n1) || SCM_BIGP (n1),
|
2003-04-04 21:49:44 +00:00
|
|
|
|
g_lcm, n1, n2, SCM_ARG1, s_lcm);
|
2004-07-23 15:43:02 +00:00
|
|
|
|
SCM_GASSERT2 (SCM_I_INUMP (n2) || SCM_BIGP (n2),
|
2003-04-04 21:49:44 +00:00
|
|
|
|
g_lcm, n1, n2, SCM_ARGn, s_lcm);
|
2000-04-28 17:14:49 +00:00
|
|
|
|
|
2004-07-23 15:43:02 +00:00
|
|
|
|
if (SCM_I_INUMP (n1))
|
2003-04-04 21:49:44 +00:00
|
|
|
|
{
|
2004-07-23 15:43:02 +00:00
|
|
|
|
if (SCM_I_INUMP (n2))
|
2003-04-04 21:49:44 +00:00
|
|
|
|
{
|
|
|
|
|
|
SCM d = scm_gcd (n1, n2);
|
2004-07-27 15:41:49 +00:00
|
|
|
|
if (scm_is_eq (d, SCM_INUM0))
|
2003-04-04 21:49:44 +00:00
|
|
|
|
return d;
|
|
|
|
|
|
else
|
|
|
|
|
|
return scm_abs (scm_product (n1, scm_quotient (n2, d)));
|
|
|
|
|
|
}
|
|
|
|
|
|
else
|
|
|
|
|
|
{
|
|
|
|
|
|
/* inum n1, big n2 */
|
|
|
|
|
|
inumbig:
|
|
|
|
|
|
{
|
|
|
|
|
|
SCM result = scm_i_mkbig ();
|
2004-07-23 15:43:02 +00:00
|
|
|
|
long nn1 = SCM_I_INUM (n1);
|
2003-04-04 21:49:44 +00:00
|
|
|
|
if (nn1 == 0) return SCM_INUM0;
|
|
|
|
|
|
if (nn1 < 0) nn1 = - nn1;
|
|
|
|
|
|
mpz_lcm_ui (SCM_I_BIG_MPZ (result), SCM_I_BIG_MPZ (n2), nn1);
|
|
|
|
|
|
scm_remember_upto_here_1 (n2);
|
|
|
|
|
|
return result;
|
|
|
|
|
|
}
|
|
|
|
|
|
}
|
|
|
|
|
|
}
|
|
|
|
|
|
else
|
|
|
|
|
|
{
|
|
|
|
|
|
/* big n1 */
|
2004-07-23 15:43:02 +00:00
|
|
|
|
if (SCM_I_INUMP (n2))
|
2003-04-04 21:49:44 +00:00
|
|
|
|
{
|
|
|
|
|
|
SCM_SWAP (n1, n2);
|
|
|
|
|
|
goto inumbig;
|
|
|
|
|
|
}
|
|
|
|
|
|
else
|
|
|
|
|
|
{
|
|
|
|
|
|
SCM result = scm_i_mkbig ();
|
|
|
|
|
|
mpz_lcm(SCM_I_BIG_MPZ (result),
|
|
|
|
|
|
SCM_I_BIG_MPZ (n1),
|
|
|
|
|
|
SCM_I_BIG_MPZ (n2));
|
|
|
|
|
|
scm_remember_upto_here_2(n1, n2);
|
|
|
|
|
|
/* shouldn't need to normalize b/c lcm of 2 bigs should be big */
|
|
|
|
|
|
return result;
|
|
|
|
|
|
}
|
1999-01-10 07:38:39 +00:00
|
|
|
|
}
|
1996-07-25 22:56:11 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
2000-03-09 22:58:32 +00:00
|
|
|
|
/* Emulating 2's complement bignums with sign magnitude arithmetic:
|
|
|
|
|
|
|
|
|
|
|
|
Logand:
|
|
|
|
|
|
X Y Result Method:
|
|
|
|
|
|
(len)
|
|
|
|
|
|
+ + + x (map digit:logand X Y)
|
|
|
|
|
|
+ - + x (map digit:logand X (lognot (+ -1 Y)))
|
|
|
|
|
|
- + + y (map digit:logand (lognot (+ -1 X)) Y)
|
|
|
|
|
|
- - - (+ 1 (map digit:logior (+ -1 X) (+ -1 Y)))
|
|
|
|
|
|
|
|
|
|
|
|
Logior:
|
|
|
|
|
|
X Y Result Method:
|
|
|
|
|
|
|
|
|
|
|
|
+ + + (map digit:logior X Y)
|
|
|
|
|
|
+ - - y (+ 1 (map digit:logand (lognot X) (+ -1 Y)))
|
|
|
|
|
|
- + - x (+ 1 (map digit:logand (+ -1 X) (lognot Y)))
|
|
|
|
|
|
- - - x (+ 1 (map digit:logand (+ -1 X) (+ -1 Y)))
|
|
|
|
|
|
|
|
|
|
|
|
Logxor:
|
|
|
|
|
|
X Y Result Method:
|
|
|
|
|
|
|
|
|
|
|
|
+ + + (map digit:logxor X Y)
|
|
|
|
|
|
+ - - (+ 1 (map digit:logxor X (+ -1 Y)))
|
|
|
|
|
|
- + - (+ 1 (map digit:logxor (+ -1 X) Y))
|
|
|
|
|
|
- - + (map digit:logxor (+ -1 X) (+ -1 Y))
|
|
|
|
|
|
|
|
|
|
|
|
Logtest:
|
|
|
|
|
|
X Y Result
|
|
|
|
|
|
|
|
|
|
|
|
+ + (any digit:logand X Y)
|
|
|
|
|
|
+ - (any digit:logand X (lognot (+ -1 Y)))
|
|
|
|
|
|
- + (any digit:logand (lognot (+ -1 X)) Y)
|
|
|
|
|
|
- - #t
|
|
|
|
|
|
|
|
|
|
|
|
*/
|
|
|
|
|
|
|
2009-09-06 16:47:19 +02:00
|
|
|
|
SCM_DEFINE (scm_i_logand, "logand", 0, 2, 1,
|
|
|
|
|
|
(SCM x, SCM y, SCM rest),
|
|
|
|
|
|
"Return the bitwise AND of the integer arguments.\n\n"
|
|
|
|
|
|
"@lisp\n"
|
|
|
|
|
|
"(logand) @result{} -1\n"
|
|
|
|
|
|
"(logand 7) @result{} 7\n"
|
|
|
|
|
|
"(logand #b111 #b011 #b001) @result{} 1\n"
|
|
|
|
|
|
"@end lisp")
|
|
|
|
|
|
#define FUNC_NAME s_scm_i_logand
|
|
|
|
|
|
{
|
|
|
|
|
|
while (!scm_is_null (rest))
|
|
|
|
|
|
{ x = scm_logand (x, y);
|
|
|
|
|
|
y = scm_car (rest);
|
|
|
|
|
|
rest = scm_cdr (rest);
|
|
|
|
|
|
}
|
|
|
|
|
|
return scm_logand (x, y);
|
|
|
|
|
|
}
|
|
|
|
|
|
#undef FUNC_NAME
|
|
|
|
|
|
|
|
|
|
|
|
#define s_scm_logand s_scm_i_logand
|
|
|
|
|
|
|
|
|
|
|
|
SCM scm_logand (SCM n1, SCM n2)
|
1999-12-12 02:36:16 +00:00
|
|
|
|
#define FUNC_NAME s_scm_logand
|
1996-07-25 22:56:11 +00:00
|
|
|
|
{
|
2000-05-05 01:30:31 +00:00
|
|
|
|
long int nn1;
|
|
|
|
|
|
|
2003-07-13 16:13:57 +00:00
|
|
|
|
if (SCM_UNBNDP (n2))
|
|
|
|
|
|
{
|
|
|
|
|
|
if (SCM_UNBNDP (n1))
|
2004-07-08 15:54:05 +00:00
|
|
|
|
return SCM_I_MAKINUM (-1);
|
2003-07-13 16:13:57 +00:00
|
|
|
|
else if (!SCM_NUMBERP (n1))
|
|
|
|
|
|
SCM_WRONG_TYPE_ARG (SCM_ARG1, n1);
|
|
|
|
|
|
else if (SCM_NUMBERP (n1))
|
|
|
|
|
|
return n1;
|
|
|
|
|
|
else
|
|
|
|
|
|
SCM_WRONG_TYPE_ARG (SCM_ARG1, n1);
|
1997-09-01 20:41:31 +00:00
|
|
|
|
}
|
2000-04-28 17:14:49 +00:00
|
|
|
|
|
2004-07-23 15:43:02 +00:00
|
|
|
|
if (SCM_I_INUMP (n1))
|
2003-07-13 16:13:57 +00:00
|
|
|
|
{
|
2004-07-23 15:43:02 +00:00
|
|
|
|
nn1 = SCM_I_INUM (n1);
|
|
|
|
|
|
if (SCM_I_INUMP (n2))
|
2003-07-13 16:13:57 +00:00
|
|
|
|
{
|
2004-07-23 15:43:02 +00:00
|
|
|
|
long nn2 = SCM_I_INUM (n2);
|
2004-07-08 15:54:05 +00:00
|
|
|
|
return SCM_I_MAKINUM (nn1 & nn2);
|
2003-07-13 16:13:57 +00:00
|
|
|
|
}
|
|
|
|
|
|
else if SCM_BIGP (n2)
|
|
|
|
|
|
{
|
|
|
|
|
|
intbig:
|
|
|
|
|
|
if (n1 == 0)
|
|
|
|
|
|
return SCM_INUM0;
|
|
|
|
|
|
{
|
|
|
|
|
|
SCM result_z = scm_i_mkbig ();
|
|
|
|
|
|
mpz_t nn1_z;
|
|
|
|
|
|
mpz_init_set_si (nn1_z, nn1);
|
|
|
|
|
|
mpz_and (SCM_I_BIG_MPZ (result_z), nn1_z, SCM_I_BIG_MPZ (n2));
|
|
|
|
|
|
scm_remember_upto_here_1 (n2);
|
|
|
|
|
|
mpz_clear (nn1_z);
|
|
|
|
|
|
return scm_i_normbig (result_z);
|
|
|
|
|
|
}
|
|
|
|
|
|
}
|
|
|
|
|
|
else
|
|
|
|
|
|
SCM_WRONG_TYPE_ARG (SCM_ARG2, n2);
|
|
|
|
|
|
}
|
|
|
|
|
|
else if (SCM_BIGP (n1))
|
|
|
|
|
|
{
|
2004-07-23 15:43:02 +00:00
|
|
|
|
if (SCM_I_INUMP (n2))
|
2003-07-13 16:13:57 +00:00
|
|
|
|
{
|
|
|
|
|
|
SCM_SWAP (n1, n2);
|
2004-07-23 15:43:02 +00:00
|
|
|
|
nn1 = SCM_I_INUM (n1);
|
2003-07-13 16:13:57 +00:00
|
|
|
|
goto intbig;
|
|
|
|
|
|
}
|
|
|
|
|
|
else if (SCM_BIGP (n2))
|
|
|
|
|
|
{
|
|
|
|
|
|
SCM result_z = scm_i_mkbig ();
|
|
|
|
|
|
mpz_and (SCM_I_BIG_MPZ (result_z),
|
|
|
|
|
|
SCM_I_BIG_MPZ (n1),
|
|
|
|
|
|
SCM_I_BIG_MPZ (n2));
|
|
|
|
|
|
scm_remember_upto_here_2 (n1, n2);
|
|
|
|
|
|
return scm_i_normbig (result_z);
|
|
|
|
|
|
}
|
|
|
|
|
|
else
|
|
|
|
|
|
SCM_WRONG_TYPE_ARG (SCM_ARG2, n2);
|
2000-04-28 17:14:49 +00:00
|
|
|
|
}
|
2003-07-13 16:13:57 +00:00
|
|
|
|
else
|
2000-04-28 17:14:49 +00:00
|
|
|
|
SCM_WRONG_TYPE_ARG (SCM_ARG1, n1);
|
1996-07-25 22:56:11 +00:00
|
|
|
|
}
|
1999-12-12 02:36:16 +00:00
|
|
|
|
#undef FUNC_NAME
|
1996-07-25 22:56:11 +00:00
|
|
|
|
|
2000-04-28 17:14:49 +00:00
|
|
|
|
|
2009-09-06 16:47:19 +02:00
|
|
|
|
SCM_DEFINE (scm_i_logior, "logior", 0, 2, 1,
|
|
|
|
|
|
(SCM x, SCM y, SCM rest),
|
|
|
|
|
|
"Return the bitwise OR of the integer arguments.\n\n"
|
|
|
|
|
|
"@lisp\n"
|
|
|
|
|
|
"(logior) @result{} 0\n"
|
|
|
|
|
|
"(logior 7) @result{} 7\n"
|
|
|
|
|
|
"(logior #b000 #b001 #b011) @result{} 3\n"
|
|
|
|
|
|
"@end lisp")
|
|
|
|
|
|
#define FUNC_NAME s_scm_i_logior
|
|
|
|
|
|
{
|
|
|
|
|
|
while (!scm_is_null (rest))
|
|
|
|
|
|
{ x = scm_logior (x, y);
|
|
|
|
|
|
y = scm_car (rest);
|
|
|
|
|
|
rest = scm_cdr (rest);
|
|
|
|
|
|
}
|
|
|
|
|
|
return scm_logior (x, y);
|
|
|
|
|
|
}
|
|
|
|
|
|
#undef FUNC_NAME
|
|
|
|
|
|
|
|
|
|
|
|
#define s_scm_logior s_scm_i_logior
|
|
|
|
|
|
|
|
|
|
|
|
SCM scm_logior (SCM n1, SCM n2)
|
1999-12-12 02:36:16 +00:00
|
|
|
|
#define FUNC_NAME s_scm_logior
|
1996-07-25 22:56:11 +00:00
|
|
|
|
{
|
2000-05-05 01:30:31 +00:00
|
|
|
|
long int nn1;
|
|
|
|
|
|
|
2003-07-13 16:13:57 +00:00
|
|
|
|
if (SCM_UNBNDP (n2))
|
|
|
|
|
|
{
|
|
|
|
|
|
if (SCM_UNBNDP (n1))
|
|
|
|
|
|
return SCM_INUM0;
|
|
|
|
|
|
else if (SCM_NUMBERP (n1))
|
|
|
|
|
|
return n1;
|
|
|
|
|
|
else
|
|
|
|
|
|
SCM_WRONG_TYPE_ARG (SCM_ARG1, n1);
|
1997-09-01 20:41:31 +00:00
|
|
|
|
}
|
2000-04-28 17:14:49 +00:00
|
|
|
|
|
2004-07-23 15:43:02 +00:00
|
|
|
|
if (SCM_I_INUMP (n1))
|
2003-07-13 16:13:57 +00:00
|
|
|
|
{
|
2004-07-23 15:43:02 +00:00
|
|
|
|
nn1 = SCM_I_INUM (n1);
|
|
|
|
|
|
if (SCM_I_INUMP (n2))
|
2003-07-13 16:13:57 +00:00
|
|
|
|
{
|
2004-07-23 15:43:02 +00:00
|
|
|
|
long nn2 = SCM_I_INUM (n2);
|
2004-07-08 15:54:05 +00:00
|
|
|
|
return SCM_I_MAKINUM (nn1 | nn2);
|
2003-07-13 16:13:57 +00:00
|
|
|
|
}
|
|
|
|
|
|
else if (SCM_BIGP (n2))
|
|
|
|
|
|
{
|
|
|
|
|
|
intbig:
|
|
|
|
|
|
if (nn1 == 0)
|
|
|
|
|
|
return n2;
|
|
|
|
|
|
{
|
|
|
|
|
|
SCM result_z = scm_i_mkbig ();
|
|
|
|
|
|
mpz_t nn1_z;
|
|
|
|
|
|
mpz_init_set_si (nn1_z, nn1);
|
|
|
|
|
|
mpz_ior (SCM_I_BIG_MPZ (result_z), nn1_z, SCM_I_BIG_MPZ (n2));
|
|
|
|
|
|
scm_remember_upto_here_1 (n2);
|
|
|
|
|
|
mpz_clear (nn1_z);
|
2005-03-13 00:16:22 +00:00
|
|
|
|
return scm_i_normbig (result_z);
|
2003-07-13 16:13:57 +00:00
|
|
|
|
}
|
|
|
|
|
|
}
|
|
|
|
|
|
else
|
|
|
|
|
|
SCM_WRONG_TYPE_ARG (SCM_ARG2, n2);
|
|
|
|
|
|
}
|
|
|
|
|
|
else if (SCM_BIGP (n1))
|
|
|
|
|
|
{
|
2004-07-23 15:43:02 +00:00
|
|
|
|
if (SCM_I_INUMP (n2))
|
2003-07-13 16:13:57 +00:00
|
|
|
|
{
|
|
|
|
|
|
SCM_SWAP (n1, n2);
|
2004-07-23 15:43:02 +00:00
|
|
|
|
nn1 = SCM_I_INUM (n1);
|
2003-07-13 16:13:57 +00:00
|
|
|
|
goto intbig;
|
|
|
|
|
|
}
|
|
|
|
|
|
else if (SCM_BIGP (n2))
|
|
|
|
|
|
{
|
|
|
|
|
|
SCM result_z = scm_i_mkbig ();
|
|
|
|
|
|
mpz_ior (SCM_I_BIG_MPZ (result_z),
|
|
|
|
|
|
SCM_I_BIG_MPZ (n1),
|
|
|
|
|
|
SCM_I_BIG_MPZ (n2));
|
|
|
|
|
|
scm_remember_upto_here_2 (n1, n2);
|
2005-03-13 00:16:22 +00:00
|
|
|
|
return scm_i_normbig (result_z);
|
2003-07-13 16:13:57 +00:00
|
|
|
|
}
|
|
|
|
|
|
else
|
|
|
|
|
|
SCM_WRONG_TYPE_ARG (SCM_ARG2, n2);
|
2000-04-28 17:14:49 +00:00
|
|
|
|
}
|
2003-07-13 16:13:57 +00:00
|
|
|
|
else
|
2000-04-28 17:14:49 +00:00
|
|
|
|
SCM_WRONG_TYPE_ARG (SCM_ARG1, n1);
|
1996-07-25 22:56:11 +00:00
|
|
|
|
}
|
1999-12-12 02:36:16 +00:00
|
|
|
|
#undef FUNC_NAME
|
1996-07-25 22:56:11 +00:00
|
|
|
|
|
2000-04-28 17:14:49 +00:00
|
|
|
|
|
2009-09-06 16:47:19 +02:00
|
|
|
|
SCM_DEFINE (scm_i_logxor, "logxor", 0, 2, 1,
|
|
|
|
|
|
(SCM x, SCM y, SCM rest),
|
2001-07-25 22:37:05 +00:00
|
|
|
|
"Return the bitwise XOR of the integer arguments. A bit is\n"
|
|
|
|
|
|
"set in the result if it is set in an odd number of arguments.\n"
|
|
|
|
|
|
"@lisp\n"
|
|
|
|
|
|
"(logxor) @result{} 0\n"
|
|
|
|
|
|
"(logxor 7) @result{} 7\n"
|
|
|
|
|
|
"(logxor #b000 #b001 #b011) @result{} 2\n"
|
|
|
|
|
|
"(logxor #b000 #b001 #b011 #b011) @result{} 1\n"
|
2001-04-03 13:19:05 +00:00
|
|
|
|
"@end lisp")
|
2009-09-06 16:47:19 +02:00
|
|
|
|
#define FUNC_NAME s_scm_i_logxor
|
|
|
|
|
|
{
|
|
|
|
|
|
while (!scm_is_null (rest))
|
|
|
|
|
|
{ x = scm_logxor (x, y);
|
|
|
|
|
|
y = scm_car (rest);
|
|
|
|
|
|
rest = scm_cdr (rest);
|
|
|
|
|
|
}
|
|
|
|
|
|
return scm_logxor (x, y);
|
|
|
|
|
|
}
|
|
|
|
|
|
#undef FUNC_NAME
|
|
|
|
|
|
|
|
|
|
|
|
#define s_scm_logxor s_scm_i_logxor
|
|
|
|
|
|
|
|
|
|
|
|
SCM scm_logxor (SCM n1, SCM n2)
|
1999-12-12 02:36:16 +00:00
|
|
|
|
#define FUNC_NAME s_scm_logxor
|
1996-07-25 22:56:11 +00:00
|
|
|
|
{
|
2000-05-05 01:30:31 +00:00
|
|
|
|
long int nn1;
|
|
|
|
|
|
|
2003-07-13 16:13:57 +00:00
|
|
|
|
if (SCM_UNBNDP (n2))
|
|
|
|
|
|
{
|
|
|
|
|
|
if (SCM_UNBNDP (n1))
|
|
|
|
|
|
return SCM_INUM0;
|
|
|
|
|
|
else if (SCM_NUMBERP (n1))
|
|
|
|
|
|
return n1;
|
|
|
|
|
|
else
|
|
|
|
|
|
SCM_WRONG_TYPE_ARG (SCM_ARG1, n1);
|
1997-09-01 20:41:31 +00:00
|
|
|
|
}
|
2000-04-28 17:14:49 +00:00
|
|
|
|
|
2004-07-23 15:43:02 +00:00
|
|
|
|
if (SCM_I_INUMP (n1))
|
2003-07-13 16:13:57 +00:00
|
|
|
|
{
|
2004-07-23 15:43:02 +00:00
|
|
|
|
nn1 = SCM_I_INUM (n1);
|
|
|
|
|
|
if (SCM_I_INUMP (n2))
|
2003-07-13 16:13:57 +00:00
|
|
|
|
{
|
2004-07-23 15:43:02 +00:00
|
|
|
|
long nn2 = SCM_I_INUM (n2);
|
2004-07-08 15:54:05 +00:00
|
|
|
|
return SCM_I_MAKINUM (nn1 ^ nn2);
|
2003-07-13 16:13:57 +00:00
|
|
|
|
}
|
|
|
|
|
|
else if (SCM_BIGP (n2))
|
|
|
|
|
|
{
|
|
|
|
|
|
intbig:
|
|
|
|
|
|
{
|
|
|
|
|
|
SCM result_z = scm_i_mkbig ();
|
|
|
|
|
|
mpz_t nn1_z;
|
|
|
|
|
|
mpz_init_set_si (nn1_z, nn1);
|
|
|
|
|
|
mpz_xor (SCM_I_BIG_MPZ (result_z), nn1_z, SCM_I_BIG_MPZ (n2));
|
|
|
|
|
|
scm_remember_upto_here_1 (n2);
|
|
|
|
|
|
mpz_clear (nn1_z);
|
|
|
|
|
|
return scm_i_normbig (result_z);
|
|
|
|
|
|
}
|
|
|
|
|
|
}
|
|
|
|
|
|
else
|
|
|
|
|
|
SCM_WRONG_TYPE_ARG (SCM_ARG2, n2);
|
|
|
|
|
|
}
|
|
|
|
|
|
else if (SCM_BIGP (n1))
|
|
|
|
|
|
{
|
2004-07-23 15:43:02 +00:00
|
|
|
|
if (SCM_I_INUMP (n2))
|
2003-07-13 16:13:57 +00:00
|
|
|
|
{
|
|
|
|
|
|
SCM_SWAP (n1, n2);
|
2004-07-23 15:43:02 +00:00
|
|
|
|
nn1 = SCM_I_INUM (n1);
|
2003-07-13 16:13:57 +00:00
|
|
|
|
goto intbig;
|
|
|
|
|
|
}
|
|
|
|
|
|
else if (SCM_BIGP (n2))
|
|
|
|
|
|
{
|
|
|
|
|
|
SCM result_z = scm_i_mkbig ();
|
|
|
|
|
|
mpz_xor (SCM_I_BIG_MPZ (result_z),
|
|
|
|
|
|
SCM_I_BIG_MPZ (n1),
|
|
|
|
|
|
SCM_I_BIG_MPZ (n2));
|
|
|
|
|
|
scm_remember_upto_here_2 (n1, n2);
|
|
|
|
|
|
return scm_i_normbig (result_z);
|
|
|
|
|
|
}
|
|
|
|
|
|
else
|
|
|
|
|
|
SCM_WRONG_TYPE_ARG (SCM_ARG2, n2);
|
2000-04-28 17:14:49 +00:00
|
|
|
|
}
|
2003-07-13 16:13:57 +00:00
|
|
|
|
else
|
2000-04-28 17:14:49 +00:00
|
|
|
|
SCM_WRONG_TYPE_ARG (SCM_ARG1, n1);
|
1996-07-25 22:56:11 +00:00
|
|
|
|
}
|
1999-12-12 02:36:16 +00:00
|
|
|
|
#undef FUNC_NAME
|
1996-07-25 22:56:11 +00:00
|
|
|
|
|
2000-04-28 17:14:49 +00:00
|
|
|
|
|
2000-01-05 19:05:23 +00:00
|
|
|
|
SCM_DEFINE (scm_logtest, "logtest", 2, 0, 0,
|
2001-04-03 13:19:05 +00:00
|
|
|
|
(SCM j, SCM k),
|
2005-01-15 00:01:40 +00:00
|
|
|
|
"Test whether @var{j} and @var{k} have any 1 bits in common.\n"
|
|
|
|
|
|
"This is equivalent to @code{(not (zero? (logand j k)))}, but\n"
|
|
|
|
|
|
"without actually calculating the @code{logand}, just testing\n"
|
|
|
|
|
|
"for non-zero.\n"
|
|
|
|
|
|
"\n"
|
2001-04-03 13:19:05 +00:00
|
|
|
|
"@lisp\n"
|
* alist.c, chars.c, debug.c, dynl.c, dynwind.c, error.c, eval.c,
evalext.c, filesys.c, gc.c, hash.c, hashtab.c, ioext.c,
keywords.c, list.c, load.c, macros.c, net_db.c, numbers.c,
objprop.c, ports.c, posix.c, print.c, procprop.c, procs.c,
ramap.c, regex-posix.c, root.c, scmsigs.c, simpos.c, socket.c,
stacks.c, stime.c, strings.c, strop.c, strports.c, struct.c,
symbols.c, throw.c, unif.c, vectors.c, version.c, vports.c,
weaks.c: Converted docstrings to ANSI C format.
2000-01-18 11:24:03 +00:00
|
|
|
|
"(logtest #b0100 #b1011) @result{} #f\n"
|
|
|
|
|
|
"(logtest #b0100 #b0111) @result{} #t\n"
|
2001-04-03 13:19:05 +00:00
|
|
|
|
"@end lisp")
|
1999-12-12 02:36:16 +00:00
|
|
|
|
#define FUNC_NAME s_scm_logtest
|
1996-07-25 22:56:11 +00:00
|
|
|
|
{
|
2001-04-03 13:19:05 +00:00
|
|
|
|
long int nj;
|
2000-05-05 01:30:31 +00:00
|
|
|
|
|
2004-07-23 15:43:02 +00:00
|
|
|
|
if (SCM_I_INUMP (j))
|
2003-07-13 16:13:57 +00:00
|
|
|
|
{
|
2004-07-23 15:43:02 +00:00
|
|
|
|
nj = SCM_I_INUM (j);
|
|
|
|
|
|
if (SCM_I_INUMP (k))
|
2003-07-13 16:13:57 +00:00
|
|
|
|
{
|
2004-07-23 15:43:02 +00:00
|
|
|
|
long nk = SCM_I_INUM (k);
|
(scm_is_integer, scm_is_signed_integer, scm_is_unsigned_integer,
scm_to_signed_integer, scm_to_unsigned_integer, scm_to_schar,
scm_to_uchar, scm_to_char, scm_to_short, scm_to_ushort, scm_to_long,
scm_to_ulong, scm_to_size_t, scm_to_ssize_t, scm_from_schar,
scm_from_uchar, scm_from_char, scm_from_short, scm_from_ushort,
scm_from_int, scm_from_uint, scm_from_long, scm_from_ulong,
scm_from_size_t, scm_from_ssize_t, scm_is_real, scm_to_double,
scm_from_double): New.
* deprecated.h, boolean.h (SCM_FALSEP, SCM_NFALSEP, SCM_BOOL,
SCM_NEGATE_BOOL, SCM_BOOLP): Deprecated by moving into "deprecated.h".
Replaced all uses with scm_is_false, scm_is_true, scm_from_bool, and
scm_is_bool, respectively.
2004-07-06 10:23:30 +00:00
|
|
|
|
return scm_from_bool (nj & nk);
|
2003-07-13 16:13:57 +00:00
|
|
|
|
}
|
|
|
|
|
|
else if (SCM_BIGP (k))
|
|
|
|
|
|
{
|
|
|
|
|
|
intbig:
|
|
|
|
|
|
if (nj == 0)
|
|
|
|
|
|
return SCM_BOOL_F;
|
|
|
|
|
|
{
|
|
|
|
|
|
SCM result;
|
|
|
|
|
|
mpz_t nj_z;
|
|
|
|
|
|
mpz_init_set_si (nj_z, nj);
|
|
|
|
|
|
mpz_and (nj_z, nj_z, SCM_I_BIG_MPZ (k));
|
|
|
|
|
|
scm_remember_upto_here_1 (k);
|
(scm_is_integer, scm_is_signed_integer, scm_is_unsigned_integer,
scm_to_signed_integer, scm_to_unsigned_integer, scm_to_schar,
scm_to_uchar, scm_to_char, scm_to_short, scm_to_ushort, scm_to_long,
scm_to_ulong, scm_to_size_t, scm_to_ssize_t, scm_from_schar,
scm_from_uchar, scm_from_char, scm_from_short, scm_from_ushort,
scm_from_int, scm_from_uint, scm_from_long, scm_from_ulong,
scm_from_size_t, scm_from_ssize_t, scm_is_real, scm_to_double,
scm_from_double): New.
* deprecated.h, boolean.h (SCM_FALSEP, SCM_NFALSEP, SCM_BOOL,
SCM_NEGATE_BOOL, SCM_BOOLP): Deprecated by moving into "deprecated.h".
Replaced all uses with scm_is_false, scm_is_true, scm_from_bool, and
scm_is_bool, respectively.
2004-07-06 10:23:30 +00:00
|
|
|
|
result = scm_from_bool (mpz_sgn (nj_z) != 0);
|
2003-07-13 16:13:57 +00:00
|
|
|
|
mpz_clear (nj_z);
|
|
|
|
|
|
return result;
|
|
|
|
|
|
}
|
|
|
|
|
|
}
|
|
|
|
|
|
else
|
|
|
|
|
|
SCM_WRONG_TYPE_ARG (SCM_ARG2, k);
|
|
|
|
|
|
}
|
|
|
|
|
|
else if (SCM_BIGP (j))
|
|
|
|
|
|
{
|
2004-07-23 15:43:02 +00:00
|
|
|
|
if (SCM_I_INUMP (k))
|
2003-07-13 16:13:57 +00:00
|
|
|
|
{
|
|
|
|
|
|
SCM_SWAP (j, k);
|
2004-07-23 15:43:02 +00:00
|
|
|
|
nj = SCM_I_INUM (j);
|
2003-07-13 16:13:57 +00:00
|
|
|
|
goto intbig;
|
|
|
|
|
|
}
|
|
|
|
|
|
else if (SCM_BIGP (k))
|
|
|
|
|
|
{
|
|
|
|
|
|
SCM result;
|
|
|
|
|
|
mpz_t result_z;
|
|
|
|
|
|
mpz_init (result_z);
|
|
|
|
|
|
mpz_and (result_z,
|
|
|
|
|
|
SCM_I_BIG_MPZ (j),
|
|
|
|
|
|
SCM_I_BIG_MPZ (k));
|
|
|
|
|
|
scm_remember_upto_here_2 (j, k);
|
(scm_is_integer, scm_is_signed_integer, scm_is_unsigned_integer,
scm_to_signed_integer, scm_to_unsigned_integer, scm_to_schar,
scm_to_uchar, scm_to_char, scm_to_short, scm_to_ushort, scm_to_long,
scm_to_ulong, scm_to_size_t, scm_to_ssize_t, scm_from_schar,
scm_from_uchar, scm_from_char, scm_from_short, scm_from_ushort,
scm_from_int, scm_from_uint, scm_from_long, scm_from_ulong,
scm_from_size_t, scm_from_ssize_t, scm_is_real, scm_to_double,
scm_from_double): New.
* deprecated.h, boolean.h (SCM_FALSEP, SCM_NFALSEP, SCM_BOOL,
SCM_NEGATE_BOOL, SCM_BOOLP): Deprecated by moving into "deprecated.h".
Replaced all uses with scm_is_false, scm_is_true, scm_from_bool, and
scm_is_bool, respectively.
2004-07-06 10:23:30 +00:00
|
|
|
|
result = scm_from_bool (mpz_sgn (result_z) != 0);
|
2003-07-13 16:13:57 +00:00
|
|
|
|
mpz_clear (result_z);
|
|
|
|
|
|
return result;
|
|
|
|
|
|
}
|
|
|
|
|
|
else
|
|
|
|
|
|
SCM_WRONG_TYPE_ARG (SCM_ARG2, k);
|
|
|
|
|
|
}
|
|
|
|
|
|
else
|
|
|
|
|
|
SCM_WRONG_TYPE_ARG (SCM_ARG1, j);
|
1996-07-25 22:56:11 +00:00
|
|
|
|
}
|
1999-12-12 02:36:16 +00:00
|
|
|
|
#undef FUNC_NAME
|
1996-07-25 22:56:11 +00:00
|
|
|
|
|
2000-01-12 01:51:18 +00:00
|
|
|
|
|
2000-01-05 19:05:23 +00:00
|
|
|
|
SCM_DEFINE (scm_logbit_p, "logbit?", 2, 0, 0,
|
2000-01-17 19:44:01 +00:00
|
|
|
|
(SCM index, SCM j),
|
2005-01-15 00:01:40 +00:00
|
|
|
|
"Test whether bit number @var{index} in @var{j} is set.\n"
|
|
|
|
|
|
"@var{index} starts from 0 for the least significant bit.\n"
|
|
|
|
|
|
"\n"
|
2001-04-03 13:19:05 +00:00
|
|
|
|
"@lisp\n"
|
* alist.c, chars.c, debug.c, dynl.c, dynwind.c, error.c, eval.c,
evalext.c, filesys.c, gc.c, hash.c, hashtab.c, ioext.c,
keywords.c, list.c, load.c, macros.c, net_db.c, numbers.c,
objprop.c, ports.c, posix.c, print.c, procprop.c, procs.c,
ramap.c, regex-posix.c, root.c, scmsigs.c, simpos.c, socket.c,
stacks.c, stime.c, strings.c, strop.c, strports.c, struct.c,
symbols.c, throw.c, unif.c, vectors.c, version.c, vports.c,
weaks.c: Converted docstrings to ANSI C format.
2000-01-18 11:24:03 +00:00
|
|
|
|
"(logbit? 0 #b1101) @result{} #t\n"
|
|
|
|
|
|
"(logbit? 1 #b1101) @result{} #f\n"
|
|
|
|
|
|
"(logbit? 2 #b1101) @result{} #t\n"
|
|
|
|
|
|
"(logbit? 3 #b1101) @result{} #t\n"
|
|
|
|
|
|
"(logbit? 4 #b1101) @result{} #f\n"
|
2001-04-03 13:19:05 +00:00
|
|
|
|
"@end lisp")
|
1999-12-12 02:36:16 +00:00
|
|
|
|
#define FUNC_NAME s_scm_logbit_p
|
1996-07-25 22:56:11 +00:00
|
|
|
|
{
|
2000-05-15 17:03:59 +00:00
|
|
|
|
unsigned long int iindex;
|
(scm_to_signed_integer, scm_to_unsigned_integer): dot
not accept inexact integers.
* validate.h, deprecated.h (SCM_VALIDATE_INUM, SCM_VALIDATE_INUM_COPY,
SCM_VALIDATE_BIGINT, SCM_VALIDATE_INUM_MIN,
SCM_VALIDATE_INUM_MIN_COPY,
SCM_VALIDATE_INUM_MIN_DEF_COPY,SCM_VALIDATE_INUM_DEF,
SCM_VALIDATE_INUM_DEF_COPY, SCM_VALIDATE_INUM_RANGE,
SCM_VALIDATE_INUM_RANGE_COPY): Deprecated because they make the
fixnum/bignum distinction visible. Changed all uses to scm_to_size_t
or similar.
2004-07-10 13:55:04 +00:00
|
|
|
|
iindex = scm_to_ulong (index);
|
2000-05-15 17:03:59 +00:00
|
|
|
|
|
2004-07-23 15:43:02 +00:00
|
|
|
|
if (SCM_I_INUMP (j))
|
2004-05-09 22:33:29 +00:00
|
|
|
|
{
|
|
|
|
|
|
/* bits above what's in an inum follow the sign bit */
|
2004-05-09 22:46:17 +00:00
|
|
|
|
iindex = min (iindex, SCM_LONG_BIT - 1);
|
2004-07-23 15:43:02 +00:00
|
|
|
|
return scm_from_bool ((1L << iindex) & SCM_I_INUM (j));
|
2004-05-09 22:33:29 +00:00
|
|
|
|
}
|
2003-07-13 16:13:57 +00:00
|
|
|
|
else if (SCM_BIGP (j))
|
|
|
|
|
|
{
|
|
|
|
|
|
int val = mpz_tstbit (SCM_I_BIG_MPZ (j), iindex);
|
|
|
|
|
|
scm_remember_upto_here_1 (j);
|
(scm_is_integer, scm_is_signed_integer, scm_is_unsigned_integer,
scm_to_signed_integer, scm_to_unsigned_integer, scm_to_schar,
scm_to_uchar, scm_to_char, scm_to_short, scm_to_ushort, scm_to_long,
scm_to_ulong, scm_to_size_t, scm_to_ssize_t, scm_from_schar,
scm_from_uchar, scm_from_char, scm_from_short, scm_from_ushort,
scm_from_int, scm_from_uint, scm_from_long, scm_from_ulong,
scm_from_size_t, scm_from_ssize_t, scm_is_real, scm_to_double,
scm_from_double): New.
* deprecated.h, boolean.h (SCM_FALSEP, SCM_NFALSEP, SCM_BOOL,
SCM_NEGATE_BOOL, SCM_BOOLP): Deprecated by moving into "deprecated.h".
Replaced all uses with scm_is_false, scm_is_true, scm_from_bool, and
scm_is_bool, respectively.
2004-07-06 10:23:30 +00:00
|
|
|
|
return scm_from_bool (val);
|
2003-07-13 16:13:57 +00:00
|
|
|
|
}
|
|
|
|
|
|
else
|
2000-05-15 17:03:59 +00:00
|
|
|
|
SCM_WRONG_TYPE_ARG (SCM_ARG2, j);
|
1996-07-25 22:56:11 +00:00
|
|
|
|
}
|
1999-12-12 02:36:16 +00:00
|
|
|
|
#undef FUNC_NAME
|
1996-07-25 22:56:11 +00:00
|
|
|
|
|
2000-05-15 17:03:59 +00:00
|
|
|
|
|
2000-01-05 19:05:23 +00:00
|
|
|
|
SCM_DEFINE (scm_lognot, "lognot", 1, 0, 0,
|
1999-12-12 02:36:16 +00:00
|
|
|
|
(SCM n),
|
2003-09-02 23:00:28 +00:00
|
|
|
|
"Return the integer which is the ones-complement of the integer\n"
|
2001-04-03 13:19:05 +00:00
|
|
|
|
"argument.\n"
|
|
|
|
|
|
"\n"
|
* alist.c, chars.c, debug.c, dynl.c, dynwind.c, error.c, eval.c,
evalext.c, filesys.c, gc.c, hash.c, hashtab.c, ioext.c,
keywords.c, list.c, load.c, macros.c, net_db.c, numbers.c,
objprop.c, ports.c, posix.c, print.c, procprop.c, procs.c,
ramap.c, regex-posix.c, root.c, scmsigs.c, simpos.c, socket.c,
stacks.c, stime.c, strings.c, strop.c, strports.c, struct.c,
symbols.c, throw.c, unif.c, vectors.c, version.c, vports.c,
weaks.c: Converted docstrings to ANSI C format.
2000-01-18 11:24:03 +00:00
|
|
|
|
"@lisp\n"
|
|
|
|
|
|
"(number->string (lognot #b10000000) 2)\n"
|
|
|
|
|
|
" @result{} \"-10000001\"\n"
|
|
|
|
|
|
"(number->string (lognot #b0) 2)\n"
|
|
|
|
|
|
" @result{} \"-1\"\n"
|
2001-04-03 13:19:05 +00:00
|
|
|
|
"@end lisp")
|
1999-12-12 02:36:16 +00:00
|
|
|
|
#define FUNC_NAME s_scm_lognot
|
1996-07-25 22:56:11 +00:00
|
|
|
|
{
|
2004-07-23 15:43:02 +00:00
|
|
|
|
if (SCM_I_INUMP (n)) {
|
2003-08-30 00:04:42 +00:00
|
|
|
|
/* No overflow here, just need to toggle all the bits making up the inum.
|
|
|
|
|
|
Enhancement: No need to strip the tag and add it back, could just xor
|
|
|
|
|
|
a block of 1 bits, if that worked with the various debug versions of
|
|
|
|
|
|
the SCM typedef. */
|
2004-07-23 15:43:02 +00:00
|
|
|
|
return SCM_I_MAKINUM (~ SCM_I_INUM (n));
|
2003-08-30 00:04:42 +00:00
|
|
|
|
|
|
|
|
|
|
} else if (SCM_BIGP (n)) {
|
|
|
|
|
|
SCM result = scm_i_mkbig ();
|
|
|
|
|
|
mpz_com (SCM_I_BIG_MPZ (result), SCM_I_BIG_MPZ (n));
|
|
|
|
|
|
scm_remember_upto_here_1 (n);
|
|
|
|
|
|
return result;
|
|
|
|
|
|
|
|
|
|
|
|
} else {
|
|
|
|
|
|
SCM_WRONG_TYPE_ARG (SCM_ARG1, n);
|
|
|
|
|
|
}
|
1996-07-25 22:56:11 +00:00
|
|
|
|
}
|
1999-12-12 02:36:16 +00:00
|
|
|
|
#undef FUNC_NAME
|
1996-07-25 22:56:11 +00:00
|
|
|
|
|
2004-03-25 21:35:53 +00:00
|
|
|
|
/* returns 0 if IN is not an integer. OUT must already be
|
|
|
|
|
|
initialized. */
|
|
|
|
|
|
static int
|
|
|
|
|
|
coerce_to_big (SCM in, mpz_t out)
|
|
|
|
|
|
{
|
|
|
|
|
|
if (SCM_BIGP (in))
|
|
|
|
|
|
mpz_set (out, SCM_I_BIG_MPZ (in));
|
2004-07-23 15:43:02 +00:00
|
|
|
|
else if (SCM_I_INUMP (in))
|
|
|
|
|
|
mpz_set_si (out, SCM_I_INUM (in));
|
2004-03-25 21:35:53 +00:00
|
|
|
|
else
|
|
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
|
|
|
|
return 1;
|
|
|
|
|
|
}
|
|
|
|
|
|
|
2004-03-25 21:55:20 +00:00
|
|
|
|
SCM_DEFINE (scm_modulo_expt, "modulo-expt", 3, 0, 0,
|
2004-03-25 21:35:53 +00:00
|
|
|
|
(SCM n, SCM k, SCM m),
|
|
|
|
|
|
"Return @var{n} raised to the integer exponent\n"
|
|
|
|
|
|
"@var{k}, modulo @var{m}.\n"
|
|
|
|
|
|
"\n"
|
|
|
|
|
|
"@lisp\n"
|
|
|
|
|
|
"(modulo-expt 2 3 5)\n"
|
|
|
|
|
|
" @result{} 3\n"
|
|
|
|
|
|
"@end lisp")
|
2004-03-25 21:55:20 +00:00
|
|
|
|
#define FUNC_NAME s_scm_modulo_expt
|
2004-03-25 21:35:53 +00:00
|
|
|
|
{
|
|
|
|
|
|
mpz_t n_tmp;
|
|
|
|
|
|
mpz_t k_tmp;
|
|
|
|
|
|
mpz_t m_tmp;
|
|
|
|
|
|
|
|
|
|
|
|
/* There are two classes of error we might encounter --
|
|
|
|
|
|
1) Math errors, which we'll report by calling scm_num_overflow,
|
|
|
|
|
|
and
|
|
|
|
|
|
2) wrong-type errors, which of course we'll report by calling
|
|
|
|
|
|
SCM_WRONG_TYPE_ARG.
|
|
|
|
|
|
We don't report those errors immediately, however; instead we do
|
|
|
|
|
|
some cleanup first. These variables tell us which error (if
|
|
|
|
|
|
any) we should report after cleaning up.
|
|
|
|
|
|
*/
|
|
|
|
|
|
int report_overflow = 0;
|
|
|
|
|
|
|
|
|
|
|
|
int position_of_wrong_type = 0;
|
|
|
|
|
|
SCM value_of_wrong_type = SCM_INUM0;
|
|
|
|
|
|
|
|
|
|
|
|
SCM result = SCM_UNDEFINED;
|
|
|
|
|
|
|
|
|
|
|
|
mpz_init (n_tmp);
|
|
|
|
|
|
mpz_init (k_tmp);
|
|
|
|
|
|
mpz_init (m_tmp);
|
|
|
|
|
|
|
2004-07-27 15:41:49 +00:00
|
|
|
|
if (scm_is_eq (m, SCM_INUM0))
|
2004-03-25 21:35:53 +00:00
|
|
|
|
{
|
|
|
|
|
|
report_overflow = 1;
|
|
|
|
|
|
goto cleanup;
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
if (!coerce_to_big (n, n_tmp))
|
|
|
|
|
|
{
|
|
|
|
|
|
value_of_wrong_type = n;
|
|
|
|
|
|
position_of_wrong_type = 1;
|
|
|
|
|
|
goto cleanup;
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
if (!coerce_to_big (k, k_tmp))
|
|
|
|
|
|
{
|
|
|
|
|
|
value_of_wrong_type = k;
|
|
|
|
|
|
position_of_wrong_type = 2;
|
|
|
|
|
|
goto cleanup;
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
if (!coerce_to_big (m, m_tmp))
|
|
|
|
|
|
{
|
|
|
|
|
|
value_of_wrong_type = m;
|
|
|
|
|
|
position_of_wrong_type = 3;
|
|
|
|
|
|
goto cleanup;
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/* if the exponent K is negative, and we simply call mpz_powm, we
|
|
|
|
|
|
will get a divide-by-zero exception when an inverse 1/n mod m
|
|
|
|
|
|
doesn't exist (or is not unique). Since exceptions are hard to
|
|
|
|
|
|
handle, we'll attempt the inversion "by hand" -- that way, we get
|
|
|
|
|
|
a simple failure code, which is easy to handle. */
|
|
|
|
|
|
|
|
|
|
|
|
if (-1 == mpz_sgn (k_tmp))
|
|
|
|
|
|
{
|
|
|
|
|
|
if (!mpz_invert (n_tmp, n_tmp, m_tmp))
|
|
|
|
|
|
{
|
|
|
|
|
|
report_overflow = 1;
|
|
|
|
|
|
goto cleanup;
|
|
|
|
|
|
}
|
|
|
|
|
|
mpz_neg (k_tmp, k_tmp);
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
result = scm_i_mkbig ();
|
|
|
|
|
|
mpz_powm (SCM_I_BIG_MPZ (result),
|
|
|
|
|
|
n_tmp,
|
|
|
|
|
|
k_tmp,
|
|
|
|
|
|
m_tmp);
|
2004-03-25 21:51:39 +00:00
|
|
|
|
|
|
|
|
|
|
if (mpz_sgn (m_tmp) < 0 && mpz_sgn (SCM_I_BIG_MPZ (result)) != 0)
|
|
|
|
|
|
mpz_add (SCM_I_BIG_MPZ (result), SCM_I_BIG_MPZ (result), m_tmp);
|
|
|
|
|
|
|
2004-03-25 21:35:53 +00:00
|
|
|
|
cleanup:
|
|
|
|
|
|
mpz_clear (m_tmp);
|
|
|
|
|
|
mpz_clear (k_tmp);
|
|
|
|
|
|
mpz_clear (n_tmp);
|
|
|
|
|
|
|
|
|
|
|
|
if (report_overflow)
|
|
|
|
|
|
scm_num_overflow (FUNC_NAME);
|
|
|
|
|
|
|
|
|
|
|
|
if (position_of_wrong_type)
|
|
|
|
|
|
SCM_WRONG_TYPE_ARG (position_of_wrong_type,
|
|
|
|
|
|
value_of_wrong_type);
|
|
|
|
|
|
|
|
|
|
|
|
return scm_i_normbig (result);
|
|
|
|
|
|
}
|
|
|
|
|
|
#undef FUNC_NAME
|
|
|
|
|
|
|
2000-01-05 19:05:23 +00:00
|
|
|
|
SCM_DEFINE (scm_integer_expt, "integer-expt", 2, 0, 0,
|
2000-01-17 19:44:01 +00:00
|
|
|
|
(SCM n, SCM k),
|
2005-01-15 00:01:40 +00:00
|
|
|
|
"Return @var{n} raised to the power @var{k}. @var{k} must be an\n"
|
|
|
|
|
|
"exact integer, @var{n} can be any number.\n"
|
|
|
|
|
|
"\n"
|
|
|
|
|
|
"Negative @var{k} is supported, and results in @math{1/n^abs(k)}\n"
|
|
|
|
|
|
"in the usual way. @math{@var{n}^0} is 1, as usual, and that\n"
|
|
|
|
|
|
"includes @math{0^0} is 1.\n"
|
2001-04-03 13:19:05 +00:00
|
|
|
|
"\n"
|
* alist.c, chars.c, debug.c, dynl.c, dynwind.c, error.c, eval.c,
evalext.c, filesys.c, gc.c, hash.c, hashtab.c, ioext.c,
keywords.c, list.c, load.c, macros.c, net_db.c, numbers.c,
objprop.c, ports.c, posix.c, print.c, procprop.c, procs.c,
ramap.c, regex-posix.c, root.c, scmsigs.c, simpos.c, socket.c,
stacks.c, stime.c, strings.c, strop.c, strports.c, struct.c,
symbols.c, throw.c, unif.c, vectors.c, version.c, vports.c,
weaks.c: Converted docstrings to ANSI C format.
2000-01-18 11:24:03 +00:00
|
|
|
|
"@lisp\n"
|
2005-01-15 00:01:40 +00:00
|
|
|
|
"(integer-expt 2 5) @result{} 32\n"
|
|
|
|
|
|
"(integer-expt -3 3) @result{} -27\n"
|
|
|
|
|
|
"(integer-expt 5 -3) @result{} 1/125\n"
|
|
|
|
|
|
"(integer-expt 0 0) @result{} 1\n"
|
* alist.c, chars.c, debug.c, dynl.c, dynwind.c, error.c, eval.c,
evalext.c, filesys.c, gc.c, hash.c, hashtab.c, ioext.c,
keywords.c, list.c, load.c, macros.c, net_db.c, numbers.c,
objprop.c, ports.c, posix.c, print.c, procprop.c, procs.c,
ramap.c, regex-posix.c, root.c, scmsigs.c, simpos.c, socket.c,
stacks.c, stime.c, strings.c, strop.c, strports.c, struct.c,
symbols.c, throw.c, unif.c, vectors.c, version.c, vports.c,
weaks.c: Converted docstrings to ANSI C format.
2000-01-18 11:24:03 +00:00
|
|
|
|
"@end lisp")
|
1999-12-12 02:36:16 +00:00
|
|
|
|
#define FUNC_NAME s_scm_integer_expt
|
1996-07-25 22:56:11 +00:00
|
|
|
|
{
|
2003-04-17 22:15:37 +00:00
|
|
|
|
long i2 = 0;
|
|
|
|
|
|
SCM z_i2 = SCM_BOOL_F;
|
|
|
|
|
|
int i2_is_big = 0;
|
2004-07-08 15:54:05 +00:00
|
|
|
|
SCM acc = SCM_I_MAKINUM (1L);
|
2003-04-04 21:49:44 +00:00
|
|
|
|
|
2010-06-10 18:14:02 +02:00
|
|
|
|
SCM_VALIDATE_NUMBER (SCM_ARG1, n);
|
|
|
|
|
|
|
2002-11-03 17:13:50 +00:00
|
|
|
|
/* 0^0 == 1 according to R5RS */
|
2004-07-27 15:41:49 +00:00
|
|
|
|
if (scm_is_eq (n, SCM_INUM0) || scm_is_eq (n, acc))
|
(scm_is_integer, scm_is_signed_integer, scm_is_unsigned_integer,
scm_to_signed_integer, scm_to_unsigned_integer, scm_to_schar,
scm_to_uchar, scm_to_char, scm_to_short, scm_to_ushort, scm_to_long,
scm_to_ulong, scm_to_size_t, scm_to_ssize_t, scm_from_schar,
scm_from_uchar, scm_from_char, scm_from_short, scm_from_ushort,
scm_from_int, scm_from_uint, scm_from_long, scm_from_ulong,
scm_from_size_t, scm_from_ssize_t, scm_is_real, scm_to_double,
scm_from_double): New.
* deprecated.h, boolean.h (SCM_FALSEP, SCM_NFALSEP, SCM_BOOL,
SCM_NEGATE_BOOL, SCM_BOOLP): Deprecated by moving into "deprecated.h".
Replaced all uses with scm_is_false, scm_is_true, scm_from_bool, and
scm_is_bool, respectively.
2004-07-06 10:23:30 +00:00
|
|
|
|
return scm_is_false (scm_zero_p(k)) ? n : acc;
|
2004-07-27 15:41:49 +00:00
|
|
|
|
else if (scm_is_eq (n, SCM_I_MAKINUM (-1L)))
|
(scm_is_integer, scm_is_signed_integer, scm_is_unsigned_integer,
scm_to_signed_integer, scm_to_unsigned_integer, scm_to_schar,
scm_to_uchar, scm_to_char, scm_to_short, scm_to_ushort, scm_to_long,
scm_to_ulong, scm_to_size_t, scm_to_ssize_t, scm_from_schar,
scm_from_uchar, scm_from_char, scm_from_short, scm_from_ushort,
scm_from_int, scm_from_uint, scm_from_long, scm_from_ulong,
scm_from_size_t, scm_from_ssize_t, scm_is_real, scm_to_double,
scm_from_double): New.
* deprecated.h, boolean.h (SCM_FALSEP, SCM_NFALSEP, SCM_BOOL,
SCM_NEGATE_BOOL, SCM_BOOLP): Deprecated by moving into "deprecated.h".
Replaced all uses with scm_is_false, scm_is_true, scm_from_bool, and
scm_is_bool, respectively.
2004-07-06 10:23:30 +00:00
|
|
|
|
return scm_is_false (scm_even_p (k)) ? n : acc;
|
2003-04-04 21:49:44 +00:00
|
|
|
|
|
2004-07-23 15:43:02 +00:00
|
|
|
|
if (SCM_I_INUMP (k))
|
|
|
|
|
|
i2 = SCM_I_INUM (k);
|
2003-04-04 21:49:44 +00:00
|
|
|
|
else if (SCM_BIGP (k))
|
|
|
|
|
|
{
|
|
|
|
|
|
z_i2 = scm_i_clonebig (k, 1);
|
|
|
|
|
|
scm_remember_upto_here_1 (k);
|
|
|
|
|
|
i2_is_big = 1;
|
|
|
|
|
|
}
|
2001-09-20 18:53:32 +00:00
|
|
|
|
else
|
2003-04-04 21:49:44 +00:00
|
|
|
|
SCM_WRONG_TYPE_ARG (2, k);
|
|
|
|
|
|
|
|
|
|
|
|
if (i2_is_big)
|
1999-01-10 07:38:39 +00:00
|
|
|
|
{
|
2003-04-04 21:49:44 +00:00
|
|
|
|
if (mpz_sgn(SCM_I_BIG_MPZ (z_i2)) == -1)
|
|
|
|
|
|
{
|
|
|
|
|
|
mpz_neg (SCM_I_BIG_MPZ (z_i2), SCM_I_BIG_MPZ (z_i2));
|
|
|
|
|
|
n = scm_divide (n, SCM_UNDEFINED);
|
|
|
|
|
|
}
|
|
|
|
|
|
while (1)
|
|
|
|
|
|
{
|
|
|
|
|
|
if (mpz_sgn(SCM_I_BIG_MPZ (z_i2)) == 0)
|
|
|
|
|
|
{
|
|
|
|
|
|
return acc;
|
|
|
|
|
|
}
|
|
|
|
|
|
if (mpz_cmp_ui(SCM_I_BIG_MPZ (z_i2), 1) == 0)
|
|
|
|
|
|
{
|
|
|
|
|
|
return scm_product (acc, n);
|
|
|
|
|
|
}
|
|
|
|
|
|
if (mpz_tstbit(SCM_I_BIG_MPZ (z_i2), 0))
|
|
|
|
|
|
acc = scm_product (acc, n);
|
|
|
|
|
|
n = scm_product (n, n);
|
|
|
|
|
|
mpz_fdiv_q_2exp (SCM_I_BIG_MPZ (z_i2), SCM_I_BIG_MPZ (z_i2), 1);
|
|
|
|
|
|
}
|
1999-01-10 07:38:39 +00:00
|
|
|
|
}
|
2003-04-04 21:49:44 +00:00
|
|
|
|
else
|
1999-01-10 07:38:39 +00:00
|
|
|
|
{
|
2003-04-04 21:49:44 +00:00
|
|
|
|
if (i2 < 0)
|
|
|
|
|
|
{
|
|
|
|
|
|
i2 = -i2;
|
|
|
|
|
|
n = scm_divide (n, SCM_UNDEFINED);
|
|
|
|
|
|
}
|
|
|
|
|
|
while (1)
|
|
|
|
|
|
{
|
|
|
|
|
|
if (0 == i2)
|
|
|
|
|
|
return acc;
|
|
|
|
|
|
if (1 == i2)
|
|
|
|
|
|
return scm_product (acc, n);
|
|
|
|
|
|
if (i2 & 1)
|
|
|
|
|
|
acc = scm_product (acc, n);
|
|
|
|
|
|
n = scm_product (n, n);
|
|
|
|
|
|
i2 >>= 1;
|
|
|
|
|
|
}
|
1999-01-10 07:38:39 +00:00
|
|
|
|
}
|
1996-07-25 22:56:11 +00:00
|
|
|
|
}
|
1999-12-12 02:36:16 +00:00
|
|
|
|
#undef FUNC_NAME
|
1996-07-25 22:56:11 +00:00
|
|
|
|
|
2000-01-05 19:05:23 +00:00
|
|
|
|
SCM_DEFINE (scm_ash, "ash", 2, 0, 0,
|
1999-12-12 02:36:16 +00:00
|
|
|
|
(SCM n, SCM cnt),
|
2003-10-19 00:27:00 +00:00
|
|
|
|
"Return @var{n} shifted left by @var{cnt} bits, or shifted right\n"
|
|
|
|
|
|
"if @var{cnt} is negative. This is an ``arithmetic'' shift.\n"
|
2001-04-03 13:19:05 +00:00
|
|
|
|
"\n"
|
2004-04-06 00:17:41 +00:00
|
|
|
|
"This is effectively a multiplication by 2^@var{cnt}, and when\n"
|
2003-10-19 00:27:00 +00:00
|
|
|
|
"@var{cnt} is negative it's a division, rounded towards negative\n"
|
|
|
|
|
|
"infinity. (Note that this is not the same rounding as\n"
|
|
|
|
|
|
"@code{quotient} does.)\n"
|
|
|
|
|
|
"\n"
|
|
|
|
|
|
"With @var{n} viewed as an infinite precision twos complement,\n"
|
|
|
|
|
|
"@code{ash} means a left shift introducing zero bits, or a right\n"
|
|
|
|
|
|
"shift dropping bits.\n"
|
2001-04-03 13:19:05 +00:00
|
|
|
|
"\n"
|
* alist.c, chars.c, debug.c, dynl.c, dynwind.c, error.c, eval.c,
evalext.c, filesys.c, gc.c, hash.c, hashtab.c, ioext.c,
keywords.c, list.c, load.c, macros.c, net_db.c, numbers.c,
objprop.c, ports.c, posix.c, print.c, procprop.c, procs.c,
ramap.c, regex-posix.c, root.c, scmsigs.c, simpos.c, socket.c,
stacks.c, stime.c, strings.c, strop.c, strports.c, struct.c,
symbols.c, throw.c, unif.c, vectors.c, version.c, vports.c,
weaks.c: Converted docstrings to ANSI C format.
2000-01-18 11:24:03 +00:00
|
|
|
|
"@lisp\n"
|
2001-04-03 13:19:05 +00:00
|
|
|
|
"(number->string (ash #b1 3) 2) @result{} \"1000\"\n"
|
|
|
|
|
|
"(number->string (ash #b1010 -1) 2) @result{} \"101\"\n"
|
2003-10-19 00:27:00 +00:00
|
|
|
|
"\n"
|
|
|
|
|
|
";; -23 is bits ...11101001, -6 is bits ...111010\n"
|
|
|
|
|
|
"(ash -23 -2) @result{} -6\n"
|
2000-01-18 14:13:31 +00:00
|
|
|
|
"@end lisp")
|
1999-12-12 02:36:16 +00:00
|
|
|
|
#define FUNC_NAME s_scm_ash
|
1996-07-25 22:56:11 +00:00
|
|
|
|
{
|
2000-03-20 04:02:56 +00:00
|
|
|
|
long bits_to_shift;
|
(scm_to_signed_integer, scm_to_unsigned_integer): dot
not accept inexact integers.
* validate.h, deprecated.h (SCM_VALIDATE_INUM, SCM_VALIDATE_INUM_COPY,
SCM_VALIDATE_BIGINT, SCM_VALIDATE_INUM_MIN,
SCM_VALIDATE_INUM_MIN_COPY,
SCM_VALIDATE_INUM_MIN_DEF_COPY,SCM_VALIDATE_INUM_DEF,
SCM_VALIDATE_INUM_DEF_COPY, SCM_VALIDATE_INUM_RANGE,
SCM_VALIDATE_INUM_RANGE_COPY): Deprecated because they make the
fixnum/bignum distinction visible. Changed all uses to scm_to_size_t
or similar.
2004-07-10 13:55:04 +00:00
|
|
|
|
bits_to_shift = scm_to_long (cnt);
|
2003-04-04 21:49:44 +00:00
|
|
|
|
|
2005-01-27 22:51:22 +00:00
|
|
|
|
if (SCM_I_INUMP (n))
|
|
|
|
|
|
{
|
|
|
|
|
|
long nn = SCM_I_INUM (n);
|
|
|
|
|
|
|
|
|
|
|
|
if (bits_to_shift > 0)
|
|
|
|
|
|
{
|
|
|
|
|
|
/* Left shift of bits_to_shift >= SCM_I_FIXNUM_BIT-1 will always
|
|
|
|
|
|
overflow a non-zero fixnum. For smaller shifts we check the
|
|
|
|
|
|
bits going into positions above SCM_I_FIXNUM_BIT-1. If they're
|
|
|
|
|
|
all 0s for nn>=0, or all 1s for nn<0 then there's no overflow.
|
|
|
|
|
|
Those bits are "nn >> (SCM_I_FIXNUM_BIT-1 -
|
|
|
|
|
|
bits_to_shift)". */
|
|
|
|
|
|
|
|
|
|
|
|
if (nn == 0)
|
|
|
|
|
|
return n;
|
|
|
|
|
|
|
|
|
|
|
|
if (bits_to_shift < SCM_I_FIXNUM_BIT-1
|
|
|
|
|
|
&& ((unsigned long)
|
|
|
|
|
|
(SCM_SRS (nn, (SCM_I_FIXNUM_BIT-1 - bits_to_shift)) + 1)
|
|
|
|
|
|
<= 1))
|
|
|
|
|
|
{
|
|
|
|
|
|
return SCM_I_MAKINUM (nn << bits_to_shift);
|
|
|
|
|
|
}
|
|
|
|
|
|
else
|
|
|
|
|
|
{
|
|
|
|
|
|
SCM result = scm_i_long2big (nn);
|
|
|
|
|
|
mpz_mul_2exp (SCM_I_BIG_MPZ (result), SCM_I_BIG_MPZ (result),
|
|
|
|
|
|
bits_to_shift);
|
|
|
|
|
|
return result;
|
|
|
|
|
|
}
|
|
|
|
|
|
}
|
|
|
|
|
|
else
|
|
|
|
|
|
{
|
|
|
|
|
|
bits_to_shift = -bits_to_shift;
|
|
|
|
|
|
if (bits_to_shift >= SCM_LONG_BIT)
|
|
|
|
|
|
return (nn >= 0 ? SCM_I_MAKINUM (0) : SCM_I_MAKINUM(-1));
|
|
|
|
|
|
else
|
|
|
|
|
|
return SCM_I_MAKINUM (SCM_SRS (nn, bits_to_shift));
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
else if (SCM_BIGP (n))
|
2003-04-04 21:49:44 +00:00
|
|
|
|
{
|
2005-01-27 22:51:22 +00:00
|
|
|
|
SCM result;
|
|
|
|
|
|
|
|
|
|
|
|
if (bits_to_shift == 0)
|
|
|
|
|
|
return n;
|
|
|
|
|
|
|
|
|
|
|
|
result = scm_i_mkbig ();
|
|
|
|
|
|
if (bits_to_shift >= 0)
|
|
|
|
|
|
{
|
|
|
|
|
|
mpz_mul_2exp (SCM_I_BIG_MPZ (result), SCM_I_BIG_MPZ (n),
|
|
|
|
|
|
bits_to_shift);
|
|
|
|
|
|
return result;
|
|
|
|
|
|
}
|
2003-04-04 21:49:44 +00:00
|
|
|
|
else
|
2005-01-27 22:51:22 +00:00
|
|
|
|
{
|
|
|
|
|
|
/* GMP doesn't have an fdiv_q_2exp variant returning just a long, so
|
|
|
|
|
|
we have to allocate a bignum even if the result is going to be a
|
|
|
|
|
|
fixnum. */
|
|
|
|
|
|
mpz_fdiv_q_2exp (SCM_I_BIG_MPZ (result), SCM_I_BIG_MPZ (n),
|
|
|
|
|
|
-bits_to_shift);
|
|
|
|
|
|
return scm_i_normbig (result);
|
|
|
|
|
|
}
|
|
|
|
|
|
|
2003-04-04 21:49:44 +00:00
|
|
|
|
}
|
|
|
|
|
|
else
|
2005-01-27 22:51:22 +00:00
|
|
|
|
{
|
|
|
|
|
|
SCM_WRONG_TYPE_ARG (SCM_ARG1, n);
|
|
|
|
|
|
}
|
1996-07-25 22:56:11 +00:00
|
|
|
|
}
|
1999-12-12 02:36:16 +00:00
|
|
|
|
#undef FUNC_NAME
|
1996-07-25 22:56:11 +00:00
|
|
|
|
|
2000-05-16 09:06:23 +00:00
|
|
|
|
|
2000-01-05 19:05:23 +00:00
|
|
|
|
SCM_DEFINE (scm_bit_extract, "bit-extract", 3, 0, 0,
|
1999-12-12 02:36:16 +00:00
|
|
|
|
(SCM n, SCM start, SCM end),
|
2001-04-03 13:19:05 +00:00
|
|
|
|
"Return the integer composed of the @var{start} (inclusive)\n"
|
|
|
|
|
|
"through @var{end} (exclusive) bits of @var{n}. The\n"
|
|
|
|
|
|
"@var{start}th bit becomes the 0-th bit in the result.\n"
|
|
|
|
|
|
"\n"
|
* alist.c, chars.c, debug.c, dynl.c, dynwind.c, error.c, eval.c,
evalext.c, filesys.c, gc.c, hash.c, hashtab.c, ioext.c,
keywords.c, list.c, load.c, macros.c, net_db.c, numbers.c,
objprop.c, ports.c, posix.c, print.c, procprop.c, procs.c,
ramap.c, regex-posix.c, root.c, scmsigs.c, simpos.c, socket.c,
stacks.c, stime.c, strings.c, strop.c, strports.c, struct.c,
symbols.c, throw.c, unif.c, vectors.c, version.c, vports.c,
weaks.c: Converted docstrings to ANSI C format.
2000-01-18 11:24:03 +00:00
|
|
|
|
"@lisp\n"
|
|
|
|
|
|
"(number->string (bit-extract #b1101101010 0 4) 2)\n"
|
|
|
|
|
|
" @result{} \"1010\"\n"
|
|
|
|
|
|
"(number->string (bit-extract #b1101101010 4 9) 2)\n"
|
|
|
|
|
|
" @result{} \"10110\"\n"
|
|
|
|
|
|
"@end lisp")
|
1999-12-12 02:36:16 +00:00
|
|
|
|
#define FUNC_NAME s_scm_bit_extract
|
1996-07-25 22:56:11 +00:00
|
|
|
|
{
|
2003-11-21 00:33:44 +00:00
|
|
|
|
unsigned long int istart, iend, bits;
|
(scm_to_signed_integer, scm_to_unsigned_integer): dot
not accept inexact integers.
* validate.h, deprecated.h (SCM_VALIDATE_INUM, SCM_VALIDATE_INUM_COPY,
SCM_VALIDATE_BIGINT, SCM_VALIDATE_INUM_MIN,
SCM_VALIDATE_INUM_MIN_COPY,
SCM_VALIDATE_INUM_MIN_DEF_COPY,SCM_VALIDATE_INUM_DEF,
SCM_VALIDATE_INUM_DEF_COPY, SCM_VALIDATE_INUM_RANGE,
SCM_VALIDATE_INUM_RANGE_COPY): Deprecated because they make the
fixnum/bignum distinction visible. Changed all uses to scm_to_size_t
or similar.
2004-07-10 13:55:04 +00:00
|
|
|
|
istart = scm_to_ulong (start);
|
|
|
|
|
|
iend = scm_to_ulong (end);
|
2000-01-12 01:51:18 +00:00
|
|
|
|
SCM_ASSERT_RANGE (3, end, (iend >= istart));
|
2000-05-15 17:03:59 +00:00
|
|
|
|
|
2003-11-21 00:33:44 +00:00
|
|
|
|
/* how many bits to keep */
|
|
|
|
|
|
bits = iend - istart;
|
|
|
|
|
|
|
2004-07-23 15:43:02 +00:00
|
|
|
|
if (SCM_I_INUMP (n))
|
2003-07-13 16:13:57 +00:00
|
|
|
|
{
|
2004-07-23 15:43:02 +00:00
|
|
|
|
long int in = SCM_I_INUM (n);
|
2003-11-21 00:33:44 +00:00
|
|
|
|
|
|
|
|
|
|
/* When istart>=SCM_I_FIXNUM_BIT we can just limit the shift to
|
2004-04-22 01:21:39 +00:00
|
|
|
|
SCM_I_FIXNUM_BIT-1 to get either 0 or -1 per the sign of "in". */
|
2004-04-27 22:19:41 +00:00
|
|
|
|
in = SCM_SRS (in, min (istart, SCM_I_FIXNUM_BIT-1));
|
2001-01-17 18:15:30 +00:00
|
|
|
|
|
2003-07-13 16:13:57 +00:00
|
|
|
|
if (in < 0 && bits >= SCM_I_FIXNUM_BIT)
|
|
|
|
|
|
{
|
|
|
|
|
|
/* Since we emulate two's complement encoded numbers, this
|
|
|
|
|
|
* special case requires us to produce a result that has
|
2003-11-21 00:33:44 +00:00
|
|
|
|
* more bits than can be stored in a fixnum.
|
2003-07-13 16:13:57 +00:00
|
|
|
|
*/
|
2003-11-21 00:33:44 +00:00
|
|
|
|
SCM result = scm_i_long2big (in);
|
|
|
|
|
|
mpz_fdiv_r_2exp (SCM_I_BIG_MPZ (result), SCM_I_BIG_MPZ (result),
|
|
|
|
|
|
bits);
|
|
|
|
|
|
return result;
|
2003-07-13 16:13:57 +00:00
|
|
|
|
}
|
2001-01-17 18:15:30 +00:00
|
|
|
|
|
2003-11-21 00:33:44 +00:00
|
|
|
|
/* mask down to requisite bits */
|
2004-04-27 22:19:41 +00:00
|
|
|
|
bits = min (bits, SCM_I_FIXNUM_BIT);
|
2004-07-08 15:54:05 +00:00
|
|
|
|
return SCM_I_MAKINUM (in & ((1L << bits) - 1));
|
2003-07-13 16:13:57 +00:00
|
|
|
|
}
|
|
|
|
|
|
else if (SCM_BIGP (n))
|
2001-01-17 18:15:30 +00:00
|
|
|
|
{
|
2003-11-21 00:33:44 +00:00
|
|
|
|
SCM result;
|
|
|
|
|
|
if (bits == 1)
|
|
|
|
|
|
{
|
2004-07-08 15:54:05 +00:00
|
|
|
|
result = SCM_I_MAKINUM (mpz_tstbit (SCM_I_BIG_MPZ (n), istart));
|
2003-11-21 00:33:44 +00:00
|
|
|
|
}
|
|
|
|
|
|
else
|
|
|
|
|
|
{
|
|
|
|
|
|
/* ENHANCE-ME: It'd be nice not to allocate a new bignum when
|
|
|
|
|
|
bits<SCM_I_FIXNUM_BIT. Would want some help from GMP to get
|
|
|
|
|
|
such bits into a ulong. */
|
|
|
|
|
|
result = scm_i_mkbig ();
|
|
|
|
|
|
mpz_fdiv_q_2exp (SCM_I_BIG_MPZ(result), SCM_I_BIG_MPZ(n), istart);
|
|
|
|
|
|
mpz_fdiv_r_2exp (SCM_I_BIG_MPZ(result), SCM_I_BIG_MPZ(result), bits);
|
|
|
|
|
|
result = scm_i_normbig (result);
|
|
|
|
|
|
}
|
|
|
|
|
|
scm_remember_upto_here_1 (n);
|
|
|
|
|
|
return result;
|
2001-01-17 18:15:30 +00:00
|
|
|
|
}
|
2003-07-13 16:13:57 +00:00
|
|
|
|
else
|
2000-05-15 17:03:59 +00:00
|
|
|
|
SCM_WRONG_TYPE_ARG (SCM_ARG1, n);
|
1996-07-25 22:56:11 +00:00
|
|
|
|
}
|
1999-12-12 02:36:16 +00:00
|
|
|
|
#undef FUNC_NAME
|
1996-07-25 22:56:11 +00:00
|
|
|
|
|
2003-11-21 00:33:44 +00:00
|
|
|
|
|
1999-04-17 16:03:32 +00:00
|
|
|
|
static const char scm_logtab[] = {
|
|
|
|
|
|
0, 1, 1, 2, 1, 2, 2, 3, 1, 2, 2, 3, 2, 3, 3, 4
|
|
|
|
|
|
};
|
* __scm.h, alist.c, alist.h, append.c, append.h, appinit.c,
arbiters.c, arbiters.h, async.c, async.h, boolean.c, boolean.h,
chars.c, chars.h, continuations.c, continuations.h, debug.c,
debug.h, dynwind.c, dynwind.h, eq.c, eq.h, error.c, eval.c,
eval.h, extchrs.c, extchrs.h, fdsocket.c, fdsocket.h, filesys.c,
filesys.h, fports.c, fports.h, gc.c, gdb_interface.h, gdbint.c,
gdbint.h, genio.c, genio.h, gscm.c, gscm.h, gsubr.c, gsubr.h,
hash.c, hash.h, hashtab.c, hashtab.h, init.c, ioext.c, ioext.h,
kw.c, kw.h, libguile.h, mallocs.c, mallocs.h, markers.c,
markers.h, mbstrings.c, mbstrings.h, numbers.c, numbers.h,
objprop.c, objprop.h, options.c, options.h, pairs.c, pairs.h,
ports.c, ports.h, posix.c, posix.h, print.c, print.h, procprop.c,
procprop.h, procs.c, procs.h, ramap.c, ramap.h, read.c, read.h,
root.c, scmsigs.c, scmsigs.h, sequences.c, sequences.h, simpos.c,
simpos.h, smob.c, socket.c, socket.h, srcprop.c, srcprop.h,
stackchk.c, stackchk.h, stime.c, stime.h, strings.c, strings.h,
strop.c, strop.h, strorder.c, strorder.h, strports.c, strports.h,
struct.c, struct.h, symbols.c, symbols.h, tag.c, tag.h, unif.c,
unif.h, variable.c, variable.h, vectors.c, vectors.h, version.c,
version.h, vports.c, vports.h, weaks.c, weaks.h: Use SCM_P to
declare functions with prototypes. (Patch thanks to Marius
Vollmer.)
1996-10-14 01:33:50 +00:00
|
|
|
|
|
2000-01-05 19:05:23 +00:00
|
|
|
|
SCM_DEFINE (scm_logcount, "logcount", 1, 0, 0,
|
1999-12-12 02:36:16 +00:00
|
|
|
|
(SCM n),
|
2001-04-03 13:19:05 +00:00
|
|
|
|
"Return the number of bits in integer @var{n}. If integer is\n"
|
|
|
|
|
|
"positive, the 1-bits in its binary representation are counted.\n"
|
|
|
|
|
|
"If negative, the 0-bits in its two's-complement binary\n"
|
|
|
|
|
|
"representation are counted. If 0, 0 is returned.\n"
|
|
|
|
|
|
"\n"
|
* alist.c, chars.c, debug.c, dynl.c, dynwind.c, error.c, eval.c,
evalext.c, filesys.c, gc.c, hash.c, hashtab.c, ioext.c,
keywords.c, list.c, load.c, macros.c, net_db.c, numbers.c,
objprop.c, ports.c, posix.c, print.c, procprop.c, procs.c,
ramap.c, regex-posix.c, root.c, scmsigs.c, simpos.c, socket.c,
stacks.c, stime.c, strings.c, strop.c, strports.c, struct.c,
symbols.c, throw.c, unif.c, vectors.c, version.c, vports.c,
weaks.c: Converted docstrings to ANSI C format.
2000-01-18 11:24:03 +00:00
|
|
|
|
"@lisp\n"
|
|
|
|
|
|
"(logcount #b10101010)\n"
|
2003-04-04 21:49:44 +00:00
|
|
|
|
" @result{} 4\n"
|
|
|
|
|
|
"(logcount 0)\n"
|
|
|
|
|
|
" @result{} 0\n"
|
|
|
|
|
|
"(logcount -2)\n"
|
|
|
|
|
|
" @result{} 1\n"
|
|
|
|
|
|
"@end lisp")
|
|
|
|
|
|
#define FUNC_NAME s_scm_logcount
|
|
|
|
|
|
{
|
2004-07-23 15:43:02 +00:00
|
|
|
|
if (SCM_I_INUMP (n))
|
1999-01-10 07:38:39 +00:00
|
|
|
|
{
|
2003-04-04 21:49:44 +00:00
|
|
|
|
unsigned long int c = 0;
|
2004-07-23 15:43:02 +00:00
|
|
|
|
long int nn = SCM_I_INUM (n);
|
2003-04-04 21:49:44 +00:00
|
|
|
|
if (nn < 0)
|
|
|
|
|
|
nn = -1 - nn;
|
|
|
|
|
|
while (nn)
|
|
|
|
|
|
{
|
|
|
|
|
|
c += scm_logtab[15 & nn];
|
|
|
|
|
|
nn >>= 4;
|
|
|
|
|
|
}
|
2004-07-08 15:54:05 +00:00
|
|
|
|
return SCM_I_MAKINUM (c);
|
1999-01-10 07:38:39 +00:00
|
|
|
|
}
|
2003-04-04 21:49:44 +00:00
|
|
|
|
else if (SCM_BIGP (n))
|
1999-01-10 07:38:39 +00:00
|
|
|
|
{
|
2003-04-04 21:49:44 +00:00
|
|
|
|
unsigned long count;
|
2003-05-30 00:23:11 +00:00
|
|
|
|
if (mpz_sgn (SCM_I_BIG_MPZ (n)) >= 0)
|
|
|
|
|
|
count = mpz_popcount (SCM_I_BIG_MPZ (n));
|
2003-04-04 21:49:44 +00:00
|
|
|
|
else
|
2003-05-30 00:23:11 +00:00
|
|
|
|
count = mpz_hamdist (SCM_I_BIG_MPZ (n), z_negative_one);
|
|
|
|
|
|
scm_remember_upto_here_1 (n);
|
2004-07-08 15:54:05 +00:00
|
|
|
|
return SCM_I_MAKINUM (count);
|
1999-01-10 07:38:39 +00:00
|
|
|
|
}
|
2003-04-04 21:49:44 +00:00
|
|
|
|
else
|
|
|
|
|
|
SCM_WRONG_TYPE_ARG (SCM_ARG1, n);
|
1996-07-25 22:56:11 +00:00
|
|
|
|
}
|
2003-04-04 21:49:44 +00:00
|
|
|
|
#undef FUNC_NAME
|
1996-07-25 22:56:11 +00:00
|
|
|
|
|
|
|
|
|
|
|
2003-04-04 21:49:44 +00:00
|
|
|
|
static const char scm_ilentab[] = {
|
|
|
|
|
|
0, 1, 2, 2, 3, 3, 3, 3, 4, 4, 4, 4, 4, 4, 4, 4
|
|
|
|
|
|
};
|
|
|
|
|
|
|
1996-07-25 22:56:11 +00:00
|
|
|
|
|
2003-04-04 21:49:44 +00:00
|
|
|
|
SCM_DEFINE (scm_integer_length, "integer-length", 1, 0, 0,
|
|
|
|
|
|
(SCM n),
|
|
|
|
|
|
"Return the number of bits necessary to represent @var{n}.\n"
|
|
|
|
|
|
"\n"
|
|
|
|
|
|
"@lisp\n"
|
|
|
|
|
|
"(integer-length #b10101010)\n"
|
|
|
|
|
|
" @result{} 8\n"
|
|
|
|
|
|
"(integer-length 0)\n"
|
|
|
|
|
|
" @result{} 0\n"
|
|
|
|
|
|
"(integer-length #b1111)\n"
|
|
|
|
|
|
" @result{} 4\n"
|
|
|
|
|
|
"@end lisp")
|
|
|
|
|
|
#define FUNC_NAME s_scm_integer_length
|
|
|
|
|
|
{
|
2004-07-23 15:43:02 +00:00
|
|
|
|
if (SCM_I_INUMP (n))
|
2003-07-13 16:13:57 +00:00
|
|
|
|
{
|
|
|
|
|
|
unsigned long int c = 0;
|
|
|
|
|
|
unsigned int l = 4;
|
2004-07-23 15:43:02 +00:00
|
|
|
|
long int nn = SCM_I_INUM (n);
|
2003-07-13 16:13:57 +00:00
|
|
|
|
if (nn < 0)
|
|
|
|
|
|
nn = -1 - nn;
|
|
|
|
|
|
while (nn)
|
|
|
|
|
|
{
|
|
|
|
|
|
c += 4;
|
|
|
|
|
|
l = scm_ilentab [15 & nn];
|
|
|
|
|
|
nn >>= 4;
|
|
|
|
|
|
}
|
2004-07-08 15:54:05 +00:00
|
|
|
|
return SCM_I_MAKINUM (c - 4 + l);
|
2003-07-13 16:13:57 +00:00
|
|
|
|
}
|
|
|
|
|
|
else if (SCM_BIGP (n))
|
|
|
|
|
|
{
|
|
|
|
|
|
/* mpz_sizeinbase looks at the absolute value of negatives, whereas we
|
|
|
|
|
|
want a ones-complement. If n is ...111100..00 then mpz_sizeinbase is
|
|
|
|
|
|
1 too big, so check for that and adjust. */
|
|
|
|
|
|
size_t size = mpz_sizeinbase (SCM_I_BIG_MPZ (n), 2);
|
|
|
|
|
|
if (mpz_sgn (SCM_I_BIG_MPZ (n)) < 0
|
|
|
|
|
|
&& mpz_scan0 (SCM_I_BIG_MPZ (n), /* no 0 bits above the lowest 1 */
|
|
|
|
|
|
mpz_scan1 (SCM_I_BIG_MPZ (n), 0)) == ULONG_MAX)
|
|
|
|
|
|
size--;
|
|
|
|
|
|
scm_remember_upto_here_1 (n);
|
2004-07-08 15:54:05 +00:00
|
|
|
|
return SCM_I_MAKINUM (size);
|
2003-07-13 16:13:57 +00:00
|
|
|
|
}
|
|
|
|
|
|
else
|
2003-04-04 21:49:44 +00:00
|
|
|
|
SCM_WRONG_TYPE_ARG (SCM_ARG1, n);
|
|
|
|
|
|
}
|
|
|
|
|
|
#undef FUNC_NAME
|
1996-07-25 22:56:11 +00:00
|
|
|
|
|
|
|
|
|
|
/*** NUMBERS -> STRINGS ***/
|
2004-05-10 20:35:39 +00:00
|
|
|
|
#define SCM_MAX_DBL_PREC 60
|
|
|
|
|
|
#define SCM_MAX_DBL_RADIX 36
|
|
|
|
|
|
|
|
|
|
|
|
/* this is an array starting with radix 2, and ending with radix SCM_MAX_DBL_RADIX */
|
|
|
|
|
|
static int scm_dblprec[SCM_MAX_DBL_RADIX - 1];
|
|
|
|
|
|
static double fx_per_radix[SCM_MAX_DBL_RADIX - 1][SCM_MAX_DBL_PREC];
|
|
|
|
|
|
|
|
|
|
|
|
static
|
|
|
|
|
|
void init_dblprec(int *prec, int radix) {
|
|
|
|
|
|
/* determine floating point precision by adding successively
|
|
|
|
|
|
smaller increments to 1.0 until it is considered == 1.0 */
|
|
|
|
|
|
double f = ((double)1.0)/radix;
|
|
|
|
|
|
double fsum = 1.0 + f;
|
|
|
|
|
|
|
|
|
|
|
|
*prec = 0;
|
|
|
|
|
|
while (fsum != 1.0)
|
|
|
|
|
|
{
|
|
|
|
|
|
if (++(*prec) > SCM_MAX_DBL_PREC)
|
|
|
|
|
|
fsum = 1.0;
|
|
|
|
|
|
else
|
|
|
|
|
|
{
|
|
|
|
|
|
f /= radix;
|
|
|
|
|
|
fsum = f + 1.0;
|
|
|
|
|
|
}
|
|
|
|
|
|
}
|
|
|
|
|
|
(*prec) -= 1;
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
static
|
|
|
|
|
|
void init_fx_radix(double *fx_list, int radix)
|
|
|
|
|
|
{
|
|
|
|
|
|
/* initialize a per-radix list of tolerances. When added
|
|
|
|
|
|
to a number < 1.0, we can determine if we should raund
|
|
|
|
|
|
up and quit converting a number to a string. */
|
|
|
|
|
|
int i;
|
|
|
|
|
|
fx_list[0] = 0.0;
|
|
|
|
|
|
fx_list[1] = 0.5;
|
|
|
|
|
|
for( i = 2 ; i < SCM_MAX_DBL_PREC; ++i )
|
|
|
|
|
|
fx_list[i] = (fx_list[i-1] / radix);
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/* use this array as a way to generate a single digit */
|
|
|
|
|
|
static const char*number_chars="0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ";
|
1996-07-25 22:56:11 +00:00
|
|
|
|
|
* validate.h
(SCM_NUM2{SIZE,PTRDIFF,SHORT,USHORT,BITS,UBITS,INT,UINT}[_DEF]):
new macros.
* unif.h: type renaming:
scm_array -> scm_array_t
scm_array_dim -> scm_array_dim_t
the old names are deprecated, all in-Guile uses changed.
* tags.h (scm_ubits_t): new typedef, representing unsigned
scm_bits_t.
* stacks.h: type renaming:
scm_info_frame -> scm_info_frame_t
scm_stack -> scm_stack_t
the old names are deprecated, all in-Guile uses changed.
* srcprop.h: type renaming:
scm_srcprops -> scm_srcprops_t
scm_srcprops_chunk -> scm_srcprops_chunk_t
the old names are deprecated, all in-Guile uses changed.
* gsubr.c, procs.c, print.c, ports.c, read.c, rdelim.c, ramap.c,
rw.c, smob.c, sort.c, srcprop.c, stacks.c, strings.c, strop.c,
strorder.c, strports.c, struct.c, symbols.c, unif.c, values.c,
vectors.c, vports.c, weaks.c:
various int/size_t -> size_t/scm_bits_t changes.
* random.h: type renaming:
scm_rstate -> scm_rstate_t
scm_rng -> scm_rng_t
scm_i_rstate -> scm_i_rstate_t
the old names are deprecated, all in-Guile uses changed.
* procs.h: type renaming:
scm_subr_entry -> scm_subr_entry_t
the old name is deprecated, all in-Guile uses changed.
* options.h (scm_option_t.val): unsigned long -> scm_bits_t.
type renaming:
scm_option -> scm_option_t
the old name is deprecated, all in-Guile uses changed.
* objects.c: various long -> scm_bits_t changes.
(scm_i_make_class_object): flags: unsigned long -> scm_ubits_t
* numbers.h (SCM_FIXNUM_BIT): deprecated, renamed to
SCM_I_FIXNUM_BIT.
* num2integral.i.c: new file, multiply included by numbers.c, used
to "templatize" the various integral <-> num conversion routines.
* numbers.c (scm_mkbig, scm_big2num, scm_adjbig, scm_normbig,
scm_copybig, scm_2ulong2big, scm_dbl2big, scm_big2dbl):
deprecated.
(scm_i_mkbig, scm_i_big2inum, scm_i_adjbig, scm_i_normbig,
scm_i_copybig, scm_i_short2big, scm_i_ushort2big, scm_i_int2big,
scm_i_uint2big, scm_i_long2big, scm_i_ulong2big, scm_i_bits2big,
scm_i_ubits2big, scm_i_size2big, scm_i_ptrdiff2big,
scm_i_long_long2big, scm_i_ulong_long2big, scm_i_dbl2big,
scm_i_big2dbl, scm_short2num, scm_ushort2num, scm_int2num,
scm_uint2num, scm_bits2num, scm_ubits2num, scm_size2num,
scm_ptrdiff2num, scm_num2short, scm_num2ushort, scm_num2int,
scm_num2uint, scm_num2bits, scm_num2ubits, scm_num2ptrdiff,
scm_num2size): new functions.
* modules.c (scm_module_reverse_lookup): i, n: int -> scm_bits_t.x
* load.c: change int -> size_t in various places (where the
variable is used to store a string length).
(search-path): call scm_done_free, not scm_done_malloc.
* list.c (scm_ilength): return a scm_bits_t, not long.
some other {int,long} -> scm_bits_t changes.
* hashtab.c: various [u]int -> scm_bits_t changes.
scm_ihashx_closure -> scm_ihashx_closure_t (and made a typedef).
(scm_ihashx): n: uint -> scm_bits_t
use scm_bits2num instead of scm_ulong2num.
* gsubr.c: various int -> scm_bits_t changes.
* gh_data.c (gh_scm2double): no loss of precision any more.
* gh.h (gh_str2scm): len: int -> size_t
(gh_{get,set}_substr): start: int -> scm_bits_t,
len: int -> size_t
(gh_<num>2scm): n: int -> scm_bits_t
(gh_*vector_length): return scm_[u]size_t, not unsigned long.
(gh_length): return scm_bits_t, not unsigned long.
* fports.h: type renaming:
scm_fport -> scm_fport_t
the old name is deprecated, all in-Guile uses changed.
* fports.c (fport_fill_input): count: int -> scm_bits_t
(fport_flush): init_size, remaining, count: int -> scm_bits_t
* debug.h (scm_lookup_cstr, scm_lookup_soft, scm_evstr): removed
those prototypes, as the functions they prototype don't exist.
* fports.c (default_buffer_size): int -> size_t
(scm_fport_buffer_add): read_size, write_size: int -> scm_bits_t
default_size: int -> size_t
(scm_setvbuf): csize: int -> scm_bits_t
* fluids.c (n_fluids): int -> scm_bits_t
(grow_fluids): old_length, i: int -> scm_bits_t
(next_fluid_num, scm_fluid_ref, scm_fluid_set_x): n: int ->
scm_bits_t
(scm_c_with_fluids): flen, vlen: int -> scm_bits_t
* filesys.c (s_scm_open_fdes): changed calls to SCM_NUM2LONG to
the new and shiny SCM_NUM2INT.
* extensions.c: extension -> extension_t (and made a typedef).
* eval.h (SCM_IFRAME): cast to scm_bits_t, not int. just so
there are no nasty surprises if/when the various deeply magic tag
bits move somewhere else.
* eval.c: changed the locals used to store results of SCM_IFRAME,
scm_ilength and such to be of type scm_bits_t (and not int/long).
(iqq): depth, edepth: int -> scm_bits_t
(scm_eval_stack): int -> scm_bits_t
(SCM_CEVAL): various vars are not scm_bits_t instead of int.
(check_map_args, scm_map, scm_for_each): len: long -> scm_bits_t
i: int -> scm_bits_t
* environments.c: changed the many calls to scm_ulong2num to
scm_ubits2num.
(import_environment_fold): proc_as_ul: ulong -> scm_ubits_t
* dynwind.c (scm_dowinds): delta: long -> scm_bits_t
* debug.h: type renaming:
scm_debug_info -> scm_debug_info_t
scm_debug_frame -> scm_debug_frame_t
the old names are deprecated, all in-Guile uses changed.
(scm_debug_eframe_size): int -> scm_bits_t
* debug.c (scm_init_debug): use scm_c_define instead of the
deprecated scm_define.
* continuations.h: type renaming:
scm_contregs -> scm_contregs_t
the old name is deprecated, all in-Guile uses changed.
(scm_contregs_t.num_stack_items): size_t -> scm_bits_t
(scm_contregs_t.num_stack_items): ulong -> scm_ubits_t
* continuations.c (scm_make_continuation): change the type of
stack_size form long to scm_bits_t.
* ports.h: type renaming:
scm_port_rw_active -> scm_port_rw_active_t (and made a typedef)
scm_port -> scm_port_t
scm_ptob_descriptor -> scm_ptob_descriptor_t
the old names are deprecated, all in-Guile uses changed.
(scm_port_t.entry): int -> scm_bits_t.
(scm_port_t.line_number): int -> long.
(scm_port_t.putback_buf_size): int -> size_t.
* __scm.h (long_long, ulong_long): deprecated (they pollute the
global namespace and have little value besides that).
(SCM_BITS_LENGTH): new, is the bit size of scm_bits_t (i.e. of an
SCM handle).
(ifdef spaghetti): include sys/types.h and sys/stdtypes.h, if they
exist (for size_t & ptrdiff_t)
(scm_sizet): deprecated.
* Makefile.am (noinst_HEADERS): add num2integral.i.c
2001-05-24 00:50:51 +00:00
|
|
|
|
static size_t
|
2004-05-10 20:35:39 +00:00
|
|
|
|
idbl2str (double f, char *a, int radix)
|
1996-07-25 22:56:11 +00:00
|
|
|
|
{
|
2004-05-10 20:35:39 +00:00
|
|
|
|
int efmt, dpt, d, i, wp;
|
|
|
|
|
|
double *fx;
|
|
|
|
|
|
#ifdef DBL_MIN_10_EXP
|
|
|
|
|
|
double f_cpy;
|
|
|
|
|
|
int exp_cpy;
|
|
|
|
|
|
#endif /* DBL_MIN_10_EXP */
|
|
|
|
|
|
size_t ch = 0;
|
|
|
|
|
|
int exp = 0;
|
|
|
|
|
|
|
|
|
|
|
|
if(radix < 2 ||
|
|
|
|
|
|
radix > SCM_MAX_DBL_RADIX)
|
|
|
|
|
|
{
|
|
|
|
|
|
/* revert to existing behavior */
|
|
|
|
|
|
radix = 10;
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
wp = scm_dblprec[radix-2];
|
|
|
|
|
|
fx = fx_per_radix[radix-2];
|
1996-07-25 22:56:11 +00:00
|
|
|
|
|
1999-01-10 07:38:39 +00:00
|
|
|
|
if (f == 0.0)
|
2002-05-22 13:50:20 +00:00
|
|
|
|
{
|
|
|
|
|
|
#ifdef HAVE_COPYSIGN
|
|
|
|
|
|
double sgn = copysign (1.0, f);
|
|
|
|
|
|
|
|
|
|
|
|
if (sgn < 0.0)
|
|
|
|
|
|
a[ch++] = '-';
|
|
|
|
|
|
#endif
|
|
|
|
|
|
goto zero; /*{a[0]='0'; a[1]='.'; a[2]='0'; return 3;} */
|
|
|
|
|
|
}
|
From John W. Eaton.
* numbers.h: Conditionally include floatingpoint.h, ieeefp.h, and
nan.h. Provide declarations for scm_inf_p, scm_nan_p, scn_inf,
and scm_nan.
* numbers.c: [SCO && ! HAVE_ISNAN] (isnan): New function.
[SCO && ! HAVE_ISINF] (isinf): New function.
(xisinf, xisnan): New functions.
(IS_INF): Delete.
(isfinite): Define in terms of xisinf.
(scm_inf_p, scm_nan_p): New functions.
(guile_Inf, guile_NaN): New file-scope vars.
(guile_ieee_init): New function.
(scm_inf, scm_nan): New functions.
(idbl2str): Handle Inf and NaN. Remove funny label and
corresponding gotos.
(ALLOW_DIVIDE_BY_ZERO): New macro.
(scm_divide): Allow division by zero to occur if
ALLOW_DIVIDE_BY_ZERO is defined.
Handle bignums and ints as special cases.
Additional stuff by me:
numbers.c (mem2ureal): Recognize "inf.0" and "nan.xxx".
(scm_even_p, scm_odd_p): Treat infinity as even and odd.
(iflo2str): Don't output a '+' for negative numbers or for Inf and
NaN. They will provide their own sign.
(scm_divide): Only allow divides by inexact zeros. Dividing by
exact zeros still signals an errors.
2002-05-06 22:33:10 +00:00
|
|
|
|
|
|
|
|
|
|
if (xisinf (f))
|
|
|
|
|
|
{
|
|
|
|
|
|
if (f < 0)
|
|
|
|
|
|
strcpy (a, "-inf.0");
|
|
|
|
|
|
else
|
|
|
|
|
|
strcpy (a, "+inf.0");
|
|
|
|
|
|
return ch+6;
|
|
|
|
|
|
}
|
|
|
|
|
|
else if (xisnan (f))
|
|
|
|
|
|
{
|
|
|
|
|
|
strcpy (a, "+nan.0");
|
|
|
|
|
|
return ch+6;
|
|
|
|
|
|
}
|
|
|
|
|
|
|
1999-01-10 07:38:39 +00:00
|
|
|
|
if (f < 0.0)
|
|
|
|
|
|
{
|
|
|
|
|
|
f = -f;
|
|
|
|
|
|
a[ch++] = '-';
|
|
|
|
|
|
}
|
From John W. Eaton.
* numbers.h: Conditionally include floatingpoint.h, ieeefp.h, and
nan.h. Provide declarations for scm_inf_p, scm_nan_p, scn_inf,
and scm_nan.
* numbers.c: [SCO && ! HAVE_ISNAN] (isnan): New function.
[SCO && ! HAVE_ISINF] (isinf): New function.
(xisinf, xisnan): New functions.
(IS_INF): Delete.
(isfinite): Define in terms of xisinf.
(scm_inf_p, scm_nan_p): New functions.
(guile_Inf, guile_NaN): New file-scope vars.
(guile_ieee_init): New function.
(scm_inf, scm_nan): New functions.
(idbl2str): Handle Inf and NaN. Remove funny label and
corresponding gotos.
(ALLOW_DIVIDE_BY_ZERO): New macro.
(scm_divide): Allow division by zero to occur if
ALLOW_DIVIDE_BY_ZERO is defined.
Handle bignums and ints as special cases.
Additional stuff by me:
numbers.c (mem2ureal): Recognize "inf.0" and "nan.xxx".
(scm_even_p, scm_odd_p): Treat infinity as even and odd.
(iflo2str): Don't output a '+' for negative numbers or for Inf and
NaN. They will provide their own sign.
(scm_divide): Only allow divides by inexact zeros. Dividing by
exact zeros still signals an errors.
2002-05-06 22:33:10 +00:00
|
|
|
|
|
1999-01-10 07:38:39 +00:00
|
|
|
|
#ifdef DBL_MIN_10_EXP /* Prevent unnormalized values, as from
|
|
|
|
|
|
make-uniform-vector, from causing infinite loops. */
|
2004-05-10 20:35:39 +00:00
|
|
|
|
/* just do the checking...if it passes, we do the conversion for our
|
|
|
|
|
|
radix again below */
|
|
|
|
|
|
f_cpy = f;
|
|
|
|
|
|
exp_cpy = exp;
|
|
|
|
|
|
|
|
|
|
|
|
while (f_cpy < 1.0)
|
1999-01-10 07:38:39 +00:00
|
|
|
|
{
|
2004-05-10 20:35:39 +00:00
|
|
|
|
f_cpy *= 10.0;
|
|
|
|
|
|
if (exp_cpy-- < DBL_MIN_10_EXP)
|
From John W. Eaton.
* numbers.h: Conditionally include floatingpoint.h, ieeefp.h, and
nan.h. Provide declarations for scm_inf_p, scm_nan_p, scn_inf,
and scm_nan.
* numbers.c: [SCO && ! HAVE_ISNAN] (isnan): New function.
[SCO && ! HAVE_ISINF] (isinf): New function.
(xisinf, xisnan): New functions.
(IS_INF): Delete.
(isfinite): Define in terms of xisinf.
(scm_inf_p, scm_nan_p): New functions.
(guile_Inf, guile_NaN): New file-scope vars.
(guile_ieee_init): New function.
(scm_inf, scm_nan): New functions.
(idbl2str): Handle Inf and NaN. Remove funny label and
corresponding gotos.
(ALLOW_DIVIDE_BY_ZERO): New macro.
(scm_divide): Allow division by zero to occur if
ALLOW_DIVIDE_BY_ZERO is defined.
Handle bignums and ints as special cases.
Additional stuff by me:
numbers.c (mem2ureal): Recognize "inf.0" and "nan.xxx".
(scm_even_p, scm_odd_p): Treat infinity as even and odd.
(iflo2str): Don't output a '+' for negative numbers or for Inf and
NaN. They will provide their own sign.
(scm_divide): Only allow divides by inexact zeros. Dividing by
exact zeros still signals an errors.
2002-05-06 22:33:10 +00:00
|
|
|
|
{
|
|
|
|
|
|
a[ch++] = '#';
|
|
|
|
|
|
a[ch++] = '.';
|
|
|
|
|
|
a[ch++] = '#';
|
|
|
|
|
|
return ch;
|
|
|
|
|
|
}
|
1999-01-10 07:38:39 +00:00
|
|
|
|
}
|
2004-05-10 20:35:39 +00:00
|
|
|
|
while (f_cpy > 10.0)
|
1999-01-10 07:38:39 +00:00
|
|
|
|
{
|
2004-05-10 20:35:39 +00:00
|
|
|
|
f_cpy *= 0.10;
|
|
|
|
|
|
if (exp_cpy++ > DBL_MAX_10_EXP)
|
From John W. Eaton.
* numbers.h: Conditionally include floatingpoint.h, ieeefp.h, and
nan.h. Provide declarations for scm_inf_p, scm_nan_p, scn_inf,
and scm_nan.
* numbers.c: [SCO && ! HAVE_ISNAN] (isnan): New function.
[SCO && ! HAVE_ISINF] (isinf): New function.
(xisinf, xisnan): New functions.
(IS_INF): Delete.
(isfinite): Define in terms of xisinf.
(scm_inf_p, scm_nan_p): New functions.
(guile_Inf, guile_NaN): New file-scope vars.
(guile_ieee_init): New function.
(scm_inf, scm_nan): New functions.
(idbl2str): Handle Inf and NaN. Remove funny label and
corresponding gotos.
(ALLOW_DIVIDE_BY_ZERO): New macro.
(scm_divide): Allow division by zero to occur if
ALLOW_DIVIDE_BY_ZERO is defined.
Handle bignums and ints as special cases.
Additional stuff by me:
numbers.c (mem2ureal): Recognize "inf.0" and "nan.xxx".
(scm_even_p, scm_odd_p): Treat infinity as even and odd.
(iflo2str): Don't output a '+' for negative numbers or for Inf and
NaN. They will provide their own sign.
(scm_divide): Only allow divides by inexact zeros. Dividing by
exact zeros still signals an errors.
2002-05-06 22:33:10 +00:00
|
|
|
|
{
|
|
|
|
|
|
a[ch++] = '#';
|
|
|
|
|
|
a[ch++] = '.';
|
|
|
|
|
|
a[ch++] = '#';
|
|
|
|
|
|
return ch;
|
|
|
|
|
|
}
|
1999-01-10 07:38:39 +00:00
|
|
|
|
}
|
2004-05-10 20:35:39 +00:00
|
|
|
|
#endif
|
|
|
|
|
|
|
1999-01-10 07:38:39 +00:00
|
|
|
|
while (f < 1.0)
|
|
|
|
|
|
{
|
2004-05-10 20:35:39 +00:00
|
|
|
|
f *= radix;
|
1999-01-10 07:38:39 +00:00
|
|
|
|
exp--;
|
|
|
|
|
|
}
|
2004-05-10 20:35:39 +00:00
|
|
|
|
while (f > radix)
|
1999-01-10 07:38:39 +00:00
|
|
|
|
{
|
2004-05-10 20:35:39 +00:00
|
|
|
|
f /= radix;
|
1999-01-10 07:38:39 +00:00
|
|
|
|
exp++;
|
|
|
|
|
|
}
|
2004-05-10 20:35:39 +00:00
|
|
|
|
|
|
|
|
|
|
if (f + fx[wp] >= radix)
|
1999-01-10 07:38:39 +00:00
|
|
|
|
{
|
|
|
|
|
|
f = 1.0;
|
|
|
|
|
|
exp++;
|
|
|
|
|
|
}
|
1996-07-25 22:56:11 +00:00
|
|
|
|
zero:
|
2004-05-10 20:35:39 +00:00
|
|
|
|
#ifdef ENGNOT
|
|
|
|
|
|
/* adding 9999 makes this equivalent to abs(x) % 3 */
|
1999-01-10 07:38:39 +00:00
|
|
|
|
dpt = (exp + 9999) % 3;
|
1996-07-25 22:56:11 +00:00
|
|
|
|
exp -= dpt++;
|
|
|
|
|
|
efmt = 1;
|
1999-01-10 07:38:39 +00:00
|
|
|
|
#else
|
|
|
|
|
|
efmt = (exp < -3) || (exp > wp + 2);
|
1996-07-25 22:56:11 +00:00
|
|
|
|
if (!efmt)
|
1998-03-30 21:03:35 +00:00
|
|
|
|
{
|
|
|
|
|
|
if (exp < 0)
|
|
|
|
|
|
{
|
|
|
|
|
|
a[ch++] = '0';
|
|
|
|
|
|
a[ch++] = '.';
|
|
|
|
|
|
dpt = exp;
|
1999-01-10 07:38:39 +00:00
|
|
|
|
while (++dpt)
|
|
|
|
|
|
a[ch++] = '0';
|
1998-03-30 21:03:35 +00:00
|
|
|
|
}
|
|
|
|
|
|
else
|
1999-01-10 07:38:39 +00:00
|
|
|
|
dpt = exp + 1;
|
1998-03-30 21:03:35 +00:00
|
|
|
|
}
|
1996-07-25 22:56:11 +00:00
|
|
|
|
else
|
|
|
|
|
|
dpt = 1;
|
1999-01-10 07:38:39 +00:00
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
|
|
do
|
|
|
|
|
|
{
|
|
|
|
|
|
d = f;
|
|
|
|
|
|
f -= d;
|
2004-05-10 20:35:39 +00:00
|
|
|
|
a[ch++] = number_chars[d];
|
1999-01-10 07:38:39 +00:00
|
|
|
|
if (f < fx[wp])
|
|
|
|
|
|
break;
|
|
|
|
|
|
if (f + fx[wp] >= 1.0)
|
|
|
|
|
|
{
|
2004-05-10 20:35:39 +00:00
|
|
|
|
a[ch - 1] = number_chars[d+1];
|
1999-01-10 07:38:39 +00:00
|
|
|
|
break;
|
|
|
|
|
|
}
|
2004-05-10 20:35:39 +00:00
|
|
|
|
f *= radix;
|
1999-01-10 07:38:39 +00:00
|
|
|
|
if (!(--dpt))
|
|
|
|
|
|
a[ch++] = '.';
|
1996-07-25 22:56:11 +00:00
|
|
|
|
}
|
1999-01-10 07:38:39 +00:00
|
|
|
|
while (wp--);
|
1996-07-25 22:56:11 +00:00
|
|
|
|
|
|
|
|
|
|
if (dpt > 0)
|
1998-03-30 21:03:35 +00:00
|
|
|
|
{
|
1999-01-10 07:38:39 +00:00
|
|
|
|
#ifndef ENGNOT
|
1998-03-30 21:03:35 +00:00
|
|
|
|
if ((dpt > 4) && (exp > 6))
|
|
|
|
|
|
{
|
1999-01-10 07:38:39 +00:00
|
|
|
|
d = (a[0] == '-' ? 2 : 1);
|
1998-03-30 21:03:35 +00:00
|
|
|
|
for (i = ch++; i > d; i--)
|
1999-01-10 07:38:39 +00:00
|
|
|
|
a[i] = a[i - 1];
|
1998-03-30 21:03:35 +00:00
|
|
|
|
a[d] = '.';
|
|
|
|
|
|
efmt = 1;
|
|
|
|
|
|
}
|
|
|
|
|
|
else
|
1999-01-10 07:38:39 +00:00
|
|
|
|
#endif
|
1998-03-30 21:03:35 +00:00
|
|
|
|
{
|
1999-01-10 07:38:39 +00:00
|
|
|
|
while (--dpt)
|
|
|
|
|
|
a[ch++] = '0';
|
1998-03-30 21:03:35 +00:00
|
|
|
|
a[ch++] = '.';
|
|
|
|
|
|
}
|
|
|
|
|
|
}
|
1999-01-10 07:38:39 +00:00
|
|
|
|
if (a[ch - 1] == '.')
|
|
|
|
|
|
a[ch++] = '0'; /* trailing zero */
|
|
|
|
|
|
if (efmt && exp)
|
|
|
|
|
|
{
|
|
|
|
|
|
a[ch++] = 'e';
|
|
|
|
|
|
if (exp < 0)
|
|
|
|
|
|
{
|
|
|
|
|
|
exp = -exp;
|
|
|
|
|
|
a[ch++] = '-';
|
|
|
|
|
|
}
|
2004-05-10 20:35:39 +00:00
|
|
|
|
for (i = radix; i <= exp; i *= radix);
|
|
|
|
|
|
for (i /= radix; i; i /= radix)
|
1999-01-10 07:38:39 +00:00
|
|
|
|
{
|
2004-05-10 20:35:39 +00:00
|
|
|
|
a[ch++] = number_chars[exp / i];
|
1999-01-10 07:38:39 +00:00
|
|
|
|
exp %= i;
|
|
|
|
|
|
}
|
1996-07-25 22:56:11 +00:00
|
|
|
|
}
|
|
|
|
|
|
return ch;
|
|
|
|
|
|
}
|
|
|
|
|
|
|
2004-10-29 14:17:20 +00:00
|
|
|
|
|
|
|
|
|
|
static size_t
|
|
|
|
|
|
icmplx2str (double real, double imag, char *str, int radix)
|
|
|
|
|
|
{
|
|
|
|
|
|
size_t i;
|
|
|
|
|
|
|
|
|
|
|
|
i = idbl2str (real, str, radix);
|
|
|
|
|
|
if (imag != 0.0)
|
|
|
|
|
|
{
|
|
|
|
|
|
/* Don't output a '+' for negative numbers or for Inf and
|
|
|
|
|
|
NaN. They will provide their own sign. */
|
|
|
|
|
|
if (0 <= imag && !xisinf (imag) && !xisnan (imag))
|
|
|
|
|
|
str[i++] = '+';
|
|
|
|
|
|
i += idbl2str (imag, &str[i], radix);
|
|
|
|
|
|
str[i++] = 'i';
|
|
|
|
|
|
}
|
|
|
|
|
|
return i;
|
|
|
|
|
|
}
|
|
|
|
|
|
|
* validate.h
(SCM_NUM2{SIZE,PTRDIFF,SHORT,USHORT,BITS,UBITS,INT,UINT}[_DEF]):
new macros.
* unif.h: type renaming:
scm_array -> scm_array_t
scm_array_dim -> scm_array_dim_t
the old names are deprecated, all in-Guile uses changed.
* tags.h (scm_ubits_t): new typedef, representing unsigned
scm_bits_t.
* stacks.h: type renaming:
scm_info_frame -> scm_info_frame_t
scm_stack -> scm_stack_t
the old names are deprecated, all in-Guile uses changed.
* srcprop.h: type renaming:
scm_srcprops -> scm_srcprops_t
scm_srcprops_chunk -> scm_srcprops_chunk_t
the old names are deprecated, all in-Guile uses changed.
* gsubr.c, procs.c, print.c, ports.c, read.c, rdelim.c, ramap.c,
rw.c, smob.c, sort.c, srcprop.c, stacks.c, strings.c, strop.c,
strorder.c, strports.c, struct.c, symbols.c, unif.c, values.c,
vectors.c, vports.c, weaks.c:
various int/size_t -> size_t/scm_bits_t changes.
* random.h: type renaming:
scm_rstate -> scm_rstate_t
scm_rng -> scm_rng_t
scm_i_rstate -> scm_i_rstate_t
the old names are deprecated, all in-Guile uses changed.
* procs.h: type renaming:
scm_subr_entry -> scm_subr_entry_t
the old name is deprecated, all in-Guile uses changed.
* options.h (scm_option_t.val): unsigned long -> scm_bits_t.
type renaming:
scm_option -> scm_option_t
the old name is deprecated, all in-Guile uses changed.
* objects.c: various long -> scm_bits_t changes.
(scm_i_make_class_object): flags: unsigned long -> scm_ubits_t
* numbers.h (SCM_FIXNUM_BIT): deprecated, renamed to
SCM_I_FIXNUM_BIT.
* num2integral.i.c: new file, multiply included by numbers.c, used
to "templatize" the various integral <-> num conversion routines.
* numbers.c (scm_mkbig, scm_big2num, scm_adjbig, scm_normbig,
scm_copybig, scm_2ulong2big, scm_dbl2big, scm_big2dbl):
deprecated.
(scm_i_mkbig, scm_i_big2inum, scm_i_adjbig, scm_i_normbig,
scm_i_copybig, scm_i_short2big, scm_i_ushort2big, scm_i_int2big,
scm_i_uint2big, scm_i_long2big, scm_i_ulong2big, scm_i_bits2big,
scm_i_ubits2big, scm_i_size2big, scm_i_ptrdiff2big,
scm_i_long_long2big, scm_i_ulong_long2big, scm_i_dbl2big,
scm_i_big2dbl, scm_short2num, scm_ushort2num, scm_int2num,
scm_uint2num, scm_bits2num, scm_ubits2num, scm_size2num,
scm_ptrdiff2num, scm_num2short, scm_num2ushort, scm_num2int,
scm_num2uint, scm_num2bits, scm_num2ubits, scm_num2ptrdiff,
scm_num2size): new functions.
* modules.c (scm_module_reverse_lookup): i, n: int -> scm_bits_t.x
* load.c: change int -> size_t in various places (where the
variable is used to store a string length).
(search-path): call scm_done_free, not scm_done_malloc.
* list.c (scm_ilength): return a scm_bits_t, not long.
some other {int,long} -> scm_bits_t changes.
* hashtab.c: various [u]int -> scm_bits_t changes.
scm_ihashx_closure -> scm_ihashx_closure_t (and made a typedef).
(scm_ihashx): n: uint -> scm_bits_t
use scm_bits2num instead of scm_ulong2num.
* gsubr.c: various int -> scm_bits_t changes.
* gh_data.c (gh_scm2double): no loss of precision any more.
* gh.h (gh_str2scm): len: int -> size_t
(gh_{get,set}_substr): start: int -> scm_bits_t,
len: int -> size_t
(gh_<num>2scm): n: int -> scm_bits_t
(gh_*vector_length): return scm_[u]size_t, not unsigned long.
(gh_length): return scm_bits_t, not unsigned long.
* fports.h: type renaming:
scm_fport -> scm_fport_t
the old name is deprecated, all in-Guile uses changed.
* fports.c (fport_fill_input): count: int -> scm_bits_t
(fport_flush): init_size, remaining, count: int -> scm_bits_t
* debug.h (scm_lookup_cstr, scm_lookup_soft, scm_evstr): removed
those prototypes, as the functions they prototype don't exist.
* fports.c (default_buffer_size): int -> size_t
(scm_fport_buffer_add): read_size, write_size: int -> scm_bits_t
default_size: int -> size_t
(scm_setvbuf): csize: int -> scm_bits_t
* fluids.c (n_fluids): int -> scm_bits_t
(grow_fluids): old_length, i: int -> scm_bits_t
(next_fluid_num, scm_fluid_ref, scm_fluid_set_x): n: int ->
scm_bits_t
(scm_c_with_fluids): flen, vlen: int -> scm_bits_t
* filesys.c (s_scm_open_fdes): changed calls to SCM_NUM2LONG to
the new and shiny SCM_NUM2INT.
* extensions.c: extension -> extension_t (and made a typedef).
* eval.h (SCM_IFRAME): cast to scm_bits_t, not int. just so
there are no nasty surprises if/when the various deeply magic tag
bits move somewhere else.
* eval.c: changed the locals used to store results of SCM_IFRAME,
scm_ilength and such to be of type scm_bits_t (and not int/long).
(iqq): depth, edepth: int -> scm_bits_t
(scm_eval_stack): int -> scm_bits_t
(SCM_CEVAL): various vars are not scm_bits_t instead of int.
(check_map_args, scm_map, scm_for_each): len: long -> scm_bits_t
i: int -> scm_bits_t
* environments.c: changed the many calls to scm_ulong2num to
scm_ubits2num.
(import_environment_fold): proc_as_ul: ulong -> scm_ubits_t
* dynwind.c (scm_dowinds): delta: long -> scm_bits_t
* debug.h: type renaming:
scm_debug_info -> scm_debug_info_t
scm_debug_frame -> scm_debug_frame_t
the old names are deprecated, all in-Guile uses changed.
(scm_debug_eframe_size): int -> scm_bits_t
* debug.c (scm_init_debug): use scm_c_define instead of the
deprecated scm_define.
* continuations.h: type renaming:
scm_contregs -> scm_contregs_t
the old name is deprecated, all in-Guile uses changed.
(scm_contregs_t.num_stack_items): size_t -> scm_bits_t
(scm_contregs_t.num_stack_items): ulong -> scm_ubits_t
* continuations.c (scm_make_continuation): change the type of
stack_size form long to scm_bits_t.
* ports.h: type renaming:
scm_port_rw_active -> scm_port_rw_active_t (and made a typedef)
scm_port -> scm_port_t
scm_ptob_descriptor -> scm_ptob_descriptor_t
the old names are deprecated, all in-Guile uses changed.
(scm_port_t.entry): int -> scm_bits_t.
(scm_port_t.line_number): int -> long.
(scm_port_t.putback_buf_size): int -> size_t.
* __scm.h (long_long, ulong_long): deprecated (they pollute the
global namespace and have little value besides that).
(SCM_BITS_LENGTH): new, is the bit size of scm_bits_t (i.e. of an
SCM handle).
(ifdef spaghetti): include sys/types.h and sys/stdtypes.h, if they
exist (for size_t & ptrdiff_t)
(scm_sizet): deprecated.
* Makefile.am (noinst_HEADERS): add num2integral.i.c
2001-05-24 00:50:51 +00:00
|
|
|
|
static size_t
|
2004-05-10 20:35:39 +00:00
|
|
|
|
iflo2str (SCM flt, char *str, int radix)
|
1996-07-25 22:56:11 +00:00
|
|
|
|
{
|
* validate.h
(SCM_NUM2{SIZE,PTRDIFF,SHORT,USHORT,BITS,UBITS,INT,UINT}[_DEF]):
new macros.
* unif.h: type renaming:
scm_array -> scm_array_t
scm_array_dim -> scm_array_dim_t
the old names are deprecated, all in-Guile uses changed.
* tags.h (scm_ubits_t): new typedef, representing unsigned
scm_bits_t.
* stacks.h: type renaming:
scm_info_frame -> scm_info_frame_t
scm_stack -> scm_stack_t
the old names are deprecated, all in-Guile uses changed.
* srcprop.h: type renaming:
scm_srcprops -> scm_srcprops_t
scm_srcprops_chunk -> scm_srcprops_chunk_t
the old names are deprecated, all in-Guile uses changed.
* gsubr.c, procs.c, print.c, ports.c, read.c, rdelim.c, ramap.c,
rw.c, smob.c, sort.c, srcprop.c, stacks.c, strings.c, strop.c,
strorder.c, strports.c, struct.c, symbols.c, unif.c, values.c,
vectors.c, vports.c, weaks.c:
various int/size_t -> size_t/scm_bits_t changes.
* random.h: type renaming:
scm_rstate -> scm_rstate_t
scm_rng -> scm_rng_t
scm_i_rstate -> scm_i_rstate_t
the old names are deprecated, all in-Guile uses changed.
* procs.h: type renaming:
scm_subr_entry -> scm_subr_entry_t
the old name is deprecated, all in-Guile uses changed.
* options.h (scm_option_t.val): unsigned long -> scm_bits_t.
type renaming:
scm_option -> scm_option_t
the old name is deprecated, all in-Guile uses changed.
* objects.c: various long -> scm_bits_t changes.
(scm_i_make_class_object): flags: unsigned long -> scm_ubits_t
* numbers.h (SCM_FIXNUM_BIT): deprecated, renamed to
SCM_I_FIXNUM_BIT.
* num2integral.i.c: new file, multiply included by numbers.c, used
to "templatize" the various integral <-> num conversion routines.
* numbers.c (scm_mkbig, scm_big2num, scm_adjbig, scm_normbig,
scm_copybig, scm_2ulong2big, scm_dbl2big, scm_big2dbl):
deprecated.
(scm_i_mkbig, scm_i_big2inum, scm_i_adjbig, scm_i_normbig,
scm_i_copybig, scm_i_short2big, scm_i_ushort2big, scm_i_int2big,
scm_i_uint2big, scm_i_long2big, scm_i_ulong2big, scm_i_bits2big,
scm_i_ubits2big, scm_i_size2big, scm_i_ptrdiff2big,
scm_i_long_long2big, scm_i_ulong_long2big, scm_i_dbl2big,
scm_i_big2dbl, scm_short2num, scm_ushort2num, scm_int2num,
scm_uint2num, scm_bits2num, scm_ubits2num, scm_size2num,
scm_ptrdiff2num, scm_num2short, scm_num2ushort, scm_num2int,
scm_num2uint, scm_num2bits, scm_num2ubits, scm_num2ptrdiff,
scm_num2size): new functions.
* modules.c (scm_module_reverse_lookup): i, n: int -> scm_bits_t.x
* load.c: change int -> size_t in various places (where the
variable is used to store a string length).
(search-path): call scm_done_free, not scm_done_malloc.
* list.c (scm_ilength): return a scm_bits_t, not long.
some other {int,long} -> scm_bits_t changes.
* hashtab.c: various [u]int -> scm_bits_t changes.
scm_ihashx_closure -> scm_ihashx_closure_t (and made a typedef).
(scm_ihashx): n: uint -> scm_bits_t
use scm_bits2num instead of scm_ulong2num.
* gsubr.c: various int -> scm_bits_t changes.
* gh_data.c (gh_scm2double): no loss of precision any more.
* gh.h (gh_str2scm): len: int -> size_t
(gh_{get,set}_substr): start: int -> scm_bits_t,
len: int -> size_t
(gh_<num>2scm): n: int -> scm_bits_t
(gh_*vector_length): return scm_[u]size_t, not unsigned long.
(gh_length): return scm_bits_t, not unsigned long.
* fports.h: type renaming:
scm_fport -> scm_fport_t
the old name is deprecated, all in-Guile uses changed.
* fports.c (fport_fill_input): count: int -> scm_bits_t
(fport_flush): init_size, remaining, count: int -> scm_bits_t
* debug.h (scm_lookup_cstr, scm_lookup_soft, scm_evstr): removed
those prototypes, as the functions they prototype don't exist.
* fports.c (default_buffer_size): int -> size_t
(scm_fport_buffer_add): read_size, write_size: int -> scm_bits_t
default_size: int -> size_t
(scm_setvbuf): csize: int -> scm_bits_t
* fluids.c (n_fluids): int -> scm_bits_t
(grow_fluids): old_length, i: int -> scm_bits_t
(next_fluid_num, scm_fluid_ref, scm_fluid_set_x): n: int ->
scm_bits_t
(scm_c_with_fluids): flen, vlen: int -> scm_bits_t
* filesys.c (s_scm_open_fdes): changed calls to SCM_NUM2LONG to
the new and shiny SCM_NUM2INT.
* extensions.c: extension -> extension_t (and made a typedef).
* eval.h (SCM_IFRAME): cast to scm_bits_t, not int. just so
there are no nasty surprises if/when the various deeply magic tag
bits move somewhere else.
* eval.c: changed the locals used to store results of SCM_IFRAME,
scm_ilength and such to be of type scm_bits_t (and not int/long).
(iqq): depth, edepth: int -> scm_bits_t
(scm_eval_stack): int -> scm_bits_t
(SCM_CEVAL): various vars are not scm_bits_t instead of int.
(check_map_args, scm_map, scm_for_each): len: long -> scm_bits_t
i: int -> scm_bits_t
* environments.c: changed the many calls to scm_ulong2num to
scm_ubits2num.
(import_environment_fold): proc_as_ul: ulong -> scm_ubits_t
* dynwind.c (scm_dowinds): delta: long -> scm_bits_t
* debug.h: type renaming:
scm_debug_info -> scm_debug_info_t
scm_debug_frame -> scm_debug_frame_t
the old names are deprecated, all in-Guile uses changed.
(scm_debug_eframe_size): int -> scm_bits_t
* debug.c (scm_init_debug): use scm_c_define instead of the
deprecated scm_define.
* continuations.h: type renaming:
scm_contregs -> scm_contregs_t
the old name is deprecated, all in-Guile uses changed.
(scm_contregs_t.num_stack_items): size_t -> scm_bits_t
(scm_contregs_t.num_stack_items): ulong -> scm_ubits_t
* continuations.c (scm_make_continuation): change the type of
stack_size form long to scm_bits_t.
* ports.h: type renaming:
scm_port_rw_active -> scm_port_rw_active_t (and made a typedef)
scm_port -> scm_port_t
scm_ptob_descriptor -> scm_ptob_descriptor_t
the old names are deprecated, all in-Guile uses changed.
(scm_port_t.entry): int -> scm_bits_t.
(scm_port_t.line_number): int -> long.
(scm_port_t.putback_buf_size): int -> size_t.
* __scm.h (long_long, ulong_long): deprecated (they pollute the
global namespace and have little value besides that).
(SCM_BITS_LENGTH): new, is the bit size of scm_bits_t (i.e. of an
SCM handle).
(ifdef spaghetti): include sys/types.h and sys/stdtypes.h, if they
exist (for size_t & ptrdiff_t)
(scm_sizet): deprecated.
* Makefile.am (noinst_HEADERS): add num2integral.i.c
2001-05-24 00:50:51 +00:00
|
|
|
|
size_t i;
|
2001-07-30 19:35:15 +00:00
|
|
|
|
if (SCM_REALP (flt))
|
2004-05-10 20:35:39 +00:00
|
|
|
|
i = idbl2str (SCM_REAL_VALUE (flt), str, radix);
|
1996-07-25 22:56:11 +00:00
|
|
|
|
else
|
2004-10-29 14:17:20 +00:00
|
|
|
|
i = icmplx2str (SCM_COMPLEX_REAL (flt), SCM_COMPLEX_IMAG (flt),
|
|
|
|
|
|
str, radix);
|
1996-07-25 22:56:11 +00:00
|
|
|
|
return i;
|
|
|
|
|
|
}
|
|
|
|
|
|
|
2004-10-22 13:50:39 +00:00
|
|
|
|
/* convert a scm_t_intmax to a string (unterminated). returns the number of
|
1999-12-12 02:36:16 +00:00
|
|
|
|
characters in the result.
|
|
|
|
|
|
rad is output base
|
|
|
|
|
|
p is destination: worst case (base 2) is SCM_INTBUFLEN */
|
* validate.h
(SCM_NUM2{SIZE,PTRDIFF,SHORT,USHORT,BITS,UBITS,INT,UINT}[_DEF]):
new macros.
* unif.h: type renaming:
scm_array -> scm_array_t
scm_array_dim -> scm_array_dim_t
the old names are deprecated, all in-Guile uses changed.
* tags.h (scm_ubits_t): new typedef, representing unsigned
scm_bits_t.
* stacks.h: type renaming:
scm_info_frame -> scm_info_frame_t
scm_stack -> scm_stack_t
the old names are deprecated, all in-Guile uses changed.
* srcprop.h: type renaming:
scm_srcprops -> scm_srcprops_t
scm_srcprops_chunk -> scm_srcprops_chunk_t
the old names are deprecated, all in-Guile uses changed.
* gsubr.c, procs.c, print.c, ports.c, read.c, rdelim.c, ramap.c,
rw.c, smob.c, sort.c, srcprop.c, stacks.c, strings.c, strop.c,
strorder.c, strports.c, struct.c, symbols.c, unif.c, values.c,
vectors.c, vports.c, weaks.c:
various int/size_t -> size_t/scm_bits_t changes.
* random.h: type renaming:
scm_rstate -> scm_rstate_t
scm_rng -> scm_rng_t
scm_i_rstate -> scm_i_rstate_t
the old names are deprecated, all in-Guile uses changed.
* procs.h: type renaming:
scm_subr_entry -> scm_subr_entry_t
the old name is deprecated, all in-Guile uses changed.
* options.h (scm_option_t.val): unsigned long -> scm_bits_t.
type renaming:
scm_option -> scm_option_t
the old name is deprecated, all in-Guile uses changed.
* objects.c: various long -> scm_bits_t changes.
(scm_i_make_class_object): flags: unsigned long -> scm_ubits_t
* numbers.h (SCM_FIXNUM_BIT): deprecated, renamed to
SCM_I_FIXNUM_BIT.
* num2integral.i.c: new file, multiply included by numbers.c, used
to "templatize" the various integral <-> num conversion routines.
* numbers.c (scm_mkbig, scm_big2num, scm_adjbig, scm_normbig,
scm_copybig, scm_2ulong2big, scm_dbl2big, scm_big2dbl):
deprecated.
(scm_i_mkbig, scm_i_big2inum, scm_i_adjbig, scm_i_normbig,
scm_i_copybig, scm_i_short2big, scm_i_ushort2big, scm_i_int2big,
scm_i_uint2big, scm_i_long2big, scm_i_ulong2big, scm_i_bits2big,
scm_i_ubits2big, scm_i_size2big, scm_i_ptrdiff2big,
scm_i_long_long2big, scm_i_ulong_long2big, scm_i_dbl2big,
scm_i_big2dbl, scm_short2num, scm_ushort2num, scm_int2num,
scm_uint2num, scm_bits2num, scm_ubits2num, scm_size2num,
scm_ptrdiff2num, scm_num2short, scm_num2ushort, scm_num2int,
scm_num2uint, scm_num2bits, scm_num2ubits, scm_num2ptrdiff,
scm_num2size): new functions.
* modules.c (scm_module_reverse_lookup): i, n: int -> scm_bits_t.x
* load.c: change int -> size_t in various places (where the
variable is used to store a string length).
(search-path): call scm_done_free, not scm_done_malloc.
* list.c (scm_ilength): return a scm_bits_t, not long.
some other {int,long} -> scm_bits_t changes.
* hashtab.c: various [u]int -> scm_bits_t changes.
scm_ihashx_closure -> scm_ihashx_closure_t (and made a typedef).
(scm_ihashx): n: uint -> scm_bits_t
use scm_bits2num instead of scm_ulong2num.
* gsubr.c: various int -> scm_bits_t changes.
* gh_data.c (gh_scm2double): no loss of precision any more.
* gh.h (gh_str2scm): len: int -> size_t
(gh_{get,set}_substr): start: int -> scm_bits_t,
len: int -> size_t
(gh_<num>2scm): n: int -> scm_bits_t
(gh_*vector_length): return scm_[u]size_t, not unsigned long.
(gh_length): return scm_bits_t, not unsigned long.
* fports.h: type renaming:
scm_fport -> scm_fport_t
the old name is deprecated, all in-Guile uses changed.
* fports.c (fport_fill_input): count: int -> scm_bits_t
(fport_flush): init_size, remaining, count: int -> scm_bits_t
* debug.h (scm_lookup_cstr, scm_lookup_soft, scm_evstr): removed
those prototypes, as the functions they prototype don't exist.
* fports.c (default_buffer_size): int -> size_t
(scm_fport_buffer_add): read_size, write_size: int -> scm_bits_t
default_size: int -> size_t
(scm_setvbuf): csize: int -> scm_bits_t
* fluids.c (n_fluids): int -> scm_bits_t
(grow_fluids): old_length, i: int -> scm_bits_t
(next_fluid_num, scm_fluid_ref, scm_fluid_set_x): n: int ->
scm_bits_t
(scm_c_with_fluids): flen, vlen: int -> scm_bits_t
* filesys.c (s_scm_open_fdes): changed calls to SCM_NUM2LONG to
the new and shiny SCM_NUM2INT.
* extensions.c: extension -> extension_t (and made a typedef).
* eval.h (SCM_IFRAME): cast to scm_bits_t, not int. just so
there are no nasty surprises if/when the various deeply magic tag
bits move somewhere else.
* eval.c: changed the locals used to store results of SCM_IFRAME,
scm_ilength and such to be of type scm_bits_t (and not int/long).
(iqq): depth, edepth: int -> scm_bits_t
(scm_eval_stack): int -> scm_bits_t
(SCM_CEVAL): various vars are not scm_bits_t instead of int.
(check_map_args, scm_map, scm_for_each): len: long -> scm_bits_t
i: int -> scm_bits_t
* environments.c: changed the many calls to scm_ulong2num to
scm_ubits2num.
(import_environment_fold): proc_as_ul: ulong -> scm_ubits_t
* dynwind.c (scm_dowinds): delta: long -> scm_bits_t
* debug.h: type renaming:
scm_debug_info -> scm_debug_info_t
scm_debug_frame -> scm_debug_frame_t
the old names are deprecated, all in-Guile uses changed.
(scm_debug_eframe_size): int -> scm_bits_t
* debug.c (scm_init_debug): use scm_c_define instead of the
deprecated scm_define.
* continuations.h: type renaming:
scm_contregs -> scm_contregs_t
the old name is deprecated, all in-Guile uses changed.
(scm_contregs_t.num_stack_items): size_t -> scm_bits_t
(scm_contregs_t.num_stack_items): ulong -> scm_ubits_t
* continuations.c (scm_make_continuation): change the type of
stack_size form long to scm_bits_t.
* ports.h: type renaming:
scm_port_rw_active -> scm_port_rw_active_t (and made a typedef)
scm_port -> scm_port_t
scm_ptob_descriptor -> scm_ptob_descriptor_t
the old names are deprecated, all in-Guile uses changed.
(scm_port_t.entry): int -> scm_bits_t.
(scm_port_t.line_number): int -> long.
(scm_port_t.putback_buf_size): int -> size_t.
* __scm.h (long_long, ulong_long): deprecated (they pollute the
global namespace and have little value besides that).
(SCM_BITS_LENGTH): new, is the bit size of scm_bits_t (i.e. of an
SCM handle).
(ifdef spaghetti): include sys/types.h and sys/stdtypes.h, if they
exist (for size_t & ptrdiff_t)
(scm_sizet): deprecated.
* Makefile.am (noinst_HEADERS): add num2integral.i.c
2001-05-24 00:50:51 +00:00
|
|
|
|
size_t
|
2004-10-22 13:50:39 +00:00
|
|
|
|
scm_iint2str (scm_t_intmax num, int rad, char *p)
|
|
|
|
|
|
{
|
|
|
|
|
|
if (num < 0)
|
|
|
|
|
|
{
|
|
|
|
|
|
*p++ = '-';
|
|
|
|
|
|
return scm_iuint2str (-num, rad, p) + 1;
|
|
|
|
|
|
}
|
|
|
|
|
|
else
|
|
|
|
|
|
return scm_iuint2str (num, rad, p);
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/* convert a scm_t_intmax to a string (unterminated). returns the number of
|
|
|
|
|
|
characters in the result.
|
|
|
|
|
|
rad is output base
|
|
|
|
|
|
p is destination: worst case (base 2) is SCM_INTBUFLEN */
|
|
|
|
|
|
size_t
|
|
|
|
|
|
scm_iuint2str (scm_t_uintmax num, int rad, char *p)
|
1996-07-25 22:56:11 +00:00
|
|
|
|
{
|
* validate.h
(SCM_NUM2{SIZE,PTRDIFF,SHORT,USHORT,BITS,UBITS,INT,UINT}[_DEF]):
new macros.
* unif.h: type renaming:
scm_array -> scm_array_t
scm_array_dim -> scm_array_dim_t
the old names are deprecated, all in-Guile uses changed.
* tags.h (scm_ubits_t): new typedef, representing unsigned
scm_bits_t.
* stacks.h: type renaming:
scm_info_frame -> scm_info_frame_t
scm_stack -> scm_stack_t
the old names are deprecated, all in-Guile uses changed.
* srcprop.h: type renaming:
scm_srcprops -> scm_srcprops_t
scm_srcprops_chunk -> scm_srcprops_chunk_t
the old names are deprecated, all in-Guile uses changed.
* gsubr.c, procs.c, print.c, ports.c, read.c, rdelim.c, ramap.c,
rw.c, smob.c, sort.c, srcprop.c, stacks.c, strings.c, strop.c,
strorder.c, strports.c, struct.c, symbols.c, unif.c, values.c,
vectors.c, vports.c, weaks.c:
various int/size_t -> size_t/scm_bits_t changes.
* random.h: type renaming:
scm_rstate -> scm_rstate_t
scm_rng -> scm_rng_t
scm_i_rstate -> scm_i_rstate_t
the old names are deprecated, all in-Guile uses changed.
* procs.h: type renaming:
scm_subr_entry -> scm_subr_entry_t
the old name is deprecated, all in-Guile uses changed.
* options.h (scm_option_t.val): unsigned long -> scm_bits_t.
type renaming:
scm_option -> scm_option_t
the old name is deprecated, all in-Guile uses changed.
* objects.c: various long -> scm_bits_t changes.
(scm_i_make_class_object): flags: unsigned long -> scm_ubits_t
* numbers.h (SCM_FIXNUM_BIT): deprecated, renamed to
SCM_I_FIXNUM_BIT.
* num2integral.i.c: new file, multiply included by numbers.c, used
to "templatize" the various integral <-> num conversion routines.
* numbers.c (scm_mkbig, scm_big2num, scm_adjbig, scm_normbig,
scm_copybig, scm_2ulong2big, scm_dbl2big, scm_big2dbl):
deprecated.
(scm_i_mkbig, scm_i_big2inum, scm_i_adjbig, scm_i_normbig,
scm_i_copybig, scm_i_short2big, scm_i_ushort2big, scm_i_int2big,
scm_i_uint2big, scm_i_long2big, scm_i_ulong2big, scm_i_bits2big,
scm_i_ubits2big, scm_i_size2big, scm_i_ptrdiff2big,
scm_i_long_long2big, scm_i_ulong_long2big, scm_i_dbl2big,
scm_i_big2dbl, scm_short2num, scm_ushort2num, scm_int2num,
scm_uint2num, scm_bits2num, scm_ubits2num, scm_size2num,
scm_ptrdiff2num, scm_num2short, scm_num2ushort, scm_num2int,
scm_num2uint, scm_num2bits, scm_num2ubits, scm_num2ptrdiff,
scm_num2size): new functions.
* modules.c (scm_module_reverse_lookup): i, n: int -> scm_bits_t.x
* load.c: change int -> size_t in various places (where the
variable is used to store a string length).
(search-path): call scm_done_free, not scm_done_malloc.
* list.c (scm_ilength): return a scm_bits_t, not long.
some other {int,long} -> scm_bits_t changes.
* hashtab.c: various [u]int -> scm_bits_t changes.
scm_ihashx_closure -> scm_ihashx_closure_t (and made a typedef).
(scm_ihashx): n: uint -> scm_bits_t
use scm_bits2num instead of scm_ulong2num.
* gsubr.c: various int -> scm_bits_t changes.
* gh_data.c (gh_scm2double): no loss of precision any more.
* gh.h (gh_str2scm): len: int -> size_t
(gh_{get,set}_substr): start: int -> scm_bits_t,
len: int -> size_t
(gh_<num>2scm): n: int -> scm_bits_t
(gh_*vector_length): return scm_[u]size_t, not unsigned long.
(gh_length): return scm_bits_t, not unsigned long.
* fports.h: type renaming:
scm_fport -> scm_fport_t
the old name is deprecated, all in-Guile uses changed.
* fports.c (fport_fill_input): count: int -> scm_bits_t
(fport_flush): init_size, remaining, count: int -> scm_bits_t
* debug.h (scm_lookup_cstr, scm_lookup_soft, scm_evstr): removed
those prototypes, as the functions they prototype don't exist.
* fports.c (default_buffer_size): int -> size_t
(scm_fport_buffer_add): read_size, write_size: int -> scm_bits_t
default_size: int -> size_t
(scm_setvbuf): csize: int -> scm_bits_t
* fluids.c (n_fluids): int -> scm_bits_t
(grow_fluids): old_length, i: int -> scm_bits_t
(next_fluid_num, scm_fluid_ref, scm_fluid_set_x): n: int ->
scm_bits_t
(scm_c_with_fluids): flen, vlen: int -> scm_bits_t
* filesys.c (s_scm_open_fdes): changed calls to SCM_NUM2LONG to
the new and shiny SCM_NUM2INT.
* extensions.c: extension -> extension_t (and made a typedef).
* eval.h (SCM_IFRAME): cast to scm_bits_t, not int. just so
there are no nasty surprises if/when the various deeply magic tag
bits move somewhere else.
* eval.c: changed the locals used to store results of SCM_IFRAME,
scm_ilength and such to be of type scm_bits_t (and not int/long).
(iqq): depth, edepth: int -> scm_bits_t
(scm_eval_stack): int -> scm_bits_t
(SCM_CEVAL): various vars are not scm_bits_t instead of int.
(check_map_args, scm_map, scm_for_each): len: long -> scm_bits_t
i: int -> scm_bits_t
* environments.c: changed the many calls to scm_ulong2num to
scm_ubits2num.
(import_environment_fold): proc_as_ul: ulong -> scm_ubits_t
* dynwind.c (scm_dowinds): delta: long -> scm_bits_t
* debug.h: type renaming:
scm_debug_info -> scm_debug_info_t
scm_debug_frame -> scm_debug_frame_t
the old names are deprecated, all in-Guile uses changed.
(scm_debug_eframe_size): int -> scm_bits_t
* debug.c (scm_init_debug): use scm_c_define instead of the
deprecated scm_define.
* continuations.h: type renaming:
scm_contregs -> scm_contregs_t
the old name is deprecated, all in-Guile uses changed.
(scm_contregs_t.num_stack_items): size_t -> scm_bits_t
(scm_contregs_t.num_stack_items): ulong -> scm_ubits_t
* continuations.c (scm_make_continuation): change the type of
stack_size form long to scm_bits_t.
* ports.h: type renaming:
scm_port_rw_active -> scm_port_rw_active_t (and made a typedef)
scm_port -> scm_port_t
scm_ptob_descriptor -> scm_ptob_descriptor_t
the old names are deprecated, all in-Guile uses changed.
(scm_port_t.entry): int -> scm_bits_t.
(scm_port_t.line_number): int -> long.
(scm_port_t.putback_buf_size): int -> size_t.
* __scm.h (long_long, ulong_long): deprecated (they pollute the
global namespace and have little value besides that).
(SCM_BITS_LENGTH): new, is the bit size of scm_bits_t (i.e. of an
SCM handle).
(ifdef spaghetti): include sys/types.h and sys/stdtypes.h, if they
exist (for size_t & ptrdiff_t)
(scm_sizet): deprecated.
* Makefile.am (noinst_HEADERS): add num2integral.i.c
2001-05-24 00:50:51 +00:00
|
|
|
|
size_t j = 1;
|
|
|
|
|
|
size_t i;
|
2004-10-22 13:50:39 +00:00
|
|
|
|
scm_t_uintmax n = num;
|
* configure.in: check for hstrerror.
* socket.c (scm_htons, scm_ntohs, scm_htonl, scm_ntohl): new
functions for network data conversion.
* numbers.c (scm_num2long, scm_num2longlong):
throw out-of-range instead of wrong-type-arg if appropriate.
(scm_iint2str): handle -2^31 correctly.
(scm_num2long): handle -2^31 bignum correctly.
(scm_num2long_long): rewrite the bigdig case: basically copied
from scm_num2long.
numbers.h: (SCM_BITSPERLONGLONG): deleted.
* unif.c (rapr1): use sprintf instead of intprint for unsigned
longs: intprint can't cope with large values.
* numbers.c (scm_num2ulong): check more consistently that the
input is not negative. if it is, throw out-of-range instead of
wrong-type-arg.
* ramap.c (scm_array_fill_int): don't limit fill to INUM for
uvect, ivect or llvect.
Check that fill doesn't overflow short uniform array.
* __scm.h: add another long to the definition of long_long and
ulong_long.
* unif.c (scm_raprin1): use 'l' instead of "long_long" in the
print representation of llvect. read can't handle more than
one character.
(scm_dimensions_to_uniform_array): make "fill" an optional argument
instead of a rest argument.
* tags.h (scm_tc7_llvect): wasn't defined anywhere, so use the free
tag 29 for now.
* __scm.h: don't mention LONGLONGS.
* unif.c, numbers.c, eq.c, gc.c, print.c, eval.c, ramap.c:
replace LONGLONGS with HAVE_LONG_LONGS as set by configure.
* net_db.c (scm_inet_aton): throw errors using the misc-error key
instead of system-error. inet_aton doesn't set errno.
system-error isn't right in gethost either, since it's throwing
the value of h_errno instead of errno. so:
(scm_host_not_found_key, scm_try_again_key,
scm_no_recovery_key, scm_no_data_key): new error keys.
(scm_resolv_error): new procedure, use the new keys.
(scm_gethost): call scm_resolv_error not scm_syserror_msg.
* error.c: (various): use scm_cons instead of scm_listify
to build short lists.
* boot-9.scm (read-hash-extend to set up arrays): add 'l' for
long_long uniform vectors.
* networking.scm (sethostent, setnetent, setprotoent, setservent):
take an optional argument STAYOPEN. default is #f.
* readline.c (scm_init_readline): set rl_readline_name to Guile,
to allow conditionals in .inputrc.
1999-11-18 22:36:28 +00:00
|
|
|
|
|
1999-01-10 07:38:39 +00:00
|
|
|
|
for (n /= rad; n > 0; n /= rad)
|
* configure.in: check for hstrerror.
* socket.c (scm_htons, scm_ntohs, scm_htonl, scm_ntohl): new
functions for network data conversion.
* numbers.c (scm_num2long, scm_num2longlong):
throw out-of-range instead of wrong-type-arg if appropriate.
(scm_iint2str): handle -2^31 correctly.
(scm_num2long): handle -2^31 bignum correctly.
(scm_num2long_long): rewrite the bigdig case: basically copied
from scm_num2long.
numbers.h: (SCM_BITSPERLONGLONG): deleted.
* unif.c (rapr1): use sprintf instead of intprint for unsigned
longs: intprint can't cope with large values.
* numbers.c (scm_num2ulong): check more consistently that the
input is not negative. if it is, throw out-of-range instead of
wrong-type-arg.
* ramap.c (scm_array_fill_int): don't limit fill to INUM for
uvect, ivect or llvect.
Check that fill doesn't overflow short uniform array.
* __scm.h: add another long to the definition of long_long and
ulong_long.
* unif.c (scm_raprin1): use 'l' instead of "long_long" in the
print representation of llvect. read can't handle more than
one character.
(scm_dimensions_to_uniform_array): make "fill" an optional argument
instead of a rest argument.
* tags.h (scm_tc7_llvect): wasn't defined anywhere, so use the free
tag 29 for now.
* __scm.h: don't mention LONGLONGS.
* unif.c, numbers.c, eq.c, gc.c, print.c, eval.c, ramap.c:
replace LONGLONGS with HAVE_LONG_LONGS as set by configure.
* net_db.c (scm_inet_aton): throw errors using the misc-error key
instead of system-error. inet_aton doesn't set errno.
system-error isn't right in gethost either, since it's throwing
the value of h_errno instead of errno. so:
(scm_host_not_found_key, scm_try_again_key,
scm_no_recovery_key, scm_no_data_key): new error keys.
(scm_resolv_error): new procedure, use the new keys.
(scm_gethost): call scm_resolv_error not scm_syserror_msg.
* error.c: (various): use scm_cons instead of scm_listify
to build short lists.
* boot-9.scm (read-hash-extend to set up arrays): add 'l' for
long_long uniform vectors.
* networking.scm (sethostent, setnetent, setprotoent, setservent):
take an optional argument STAYOPEN. default is #f.
* readline.c (scm_init_readline): set rl_readline_name to Guile,
to allow conditionals in .inputrc.
1999-11-18 22:36:28 +00:00
|
|
|
|
j++;
|
|
|
|
|
|
|
|
|
|
|
|
i = j;
|
2004-10-22 13:50:39 +00:00
|
|
|
|
n = num;
|
1999-01-10 07:38:39 +00:00
|
|
|
|
while (i--)
|
|
|
|
|
|
{
|
* configure.in: check for hstrerror.
* socket.c (scm_htons, scm_ntohs, scm_htonl, scm_ntohl): new
functions for network data conversion.
* numbers.c (scm_num2long, scm_num2longlong):
throw out-of-range instead of wrong-type-arg if appropriate.
(scm_iint2str): handle -2^31 correctly.
(scm_num2long): handle -2^31 bignum correctly.
(scm_num2long_long): rewrite the bigdig case: basically copied
from scm_num2long.
numbers.h: (SCM_BITSPERLONGLONG): deleted.
* unif.c (rapr1): use sprintf instead of intprint for unsigned
longs: intprint can't cope with large values.
* numbers.c (scm_num2ulong): check more consistently that the
input is not negative. if it is, throw out-of-range instead of
wrong-type-arg.
* ramap.c (scm_array_fill_int): don't limit fill to INUM for
uvect, ivect or llvect.
Check that fill doesn't overflow short uniform array.
* __scm.h: add another long to the definition of long_long and
ulong_long.
* unif.c (scm_raprin1): use 'l' instead of "long_long" in the
print representation of llvect. read can't handle more than
one character.
(scm_dimensions_to_uniform_array): make "fill" an optional argument
instead of a rest argument.
* tags.h (scm_tc7_llvect): wasn't defined anywhere, so use the free
tag 29 for now.
* __scm.h: don't mention LONGLONGS.
* unif.c, numbers.c, eq.c, gc.c, print.c, eval.c, ramap.c:
replace LONGLONGS with HAVE_LONG_LONGS as set by configure.
* net_db.c (scm_inet_aton): throw errors using the misc-error key
instead of system-error. inet_aton doesn't set errno.
system-error isn't right in gethost either, since it's throwing
the value of h_errno instead of errno. so:
(scm_host_not_found_key, scm_try_again_key,
scm_no_recovery_key, scm_no_data_key): new error keys.
(scm_resolv_error): new procedure, use the new keys.
(scm_gethost): call scm_resolv_error not scm_syserror_msg.
* error.c: (various): use scm_cons instead of scm_listify
to build short lists.
* boot-9.scm (read-hash-extend to set up arrays): add 'l' for
long_long uniform vectors.
* networking.scm (sethostent, setnetent, setprotoent, setservent):
take an optional argument STAYOPEN. default is #f.
* readline.c (scm_init_readline): set rl_readline_name to Guile,
to allow conditionals in .inputrc.
1999-11-18 22:36:28 +00:00
|
|
|
|
int d = n % rad;
|
|
|
|
|
|
|
1999-01-10 07:38:39 +00:00
|
|
|
|
n /= rad;
|
|
|
|
|
|
p[i] = d + ((d < 10) ? '0' : 'a' - 10);
|
|
|
|
|
|
}
|
1996-07-25 22:56:11 +00:00
|
|
|
|
return j;
|
|
|
|
|
|
}
|
|
|
|
|
|
|
2000-01-05 19:05:23 +00:00
|
|
|
|
SCM_DEFINE (scm_number_to_string, "number->string", 1, 1, 0,
|
2000-05-09 16:55:54 +00:00
|
|
|
|
(SCM n, SCM radix),
|
|
|
|
|
|
"Return a string holding the external representation of the\n"
|
* vectors.c (s_scm_vector_p, list->vector, scm_vector)
(scm_vector_ref, scm_vector_set_x, scm_vector_to_list)
(scm_vector_fill_x), strorder.c (scm_string_equal_p)
(scm_string_ci_equal_p, scm_string_less_p, scm_string_leq_p)
(scm_string_gr_p, scm_string_geq_p, scm_string_ci_less_p)
(scm_string_ci_geq_p), symbols.c (scm_symbol_p)
(scm_symbol_to_string, scm_string_to_symbol): Changed use of @t{}
to @code{} as the texinfo manual recommends, converted the
examples to use a @lisp{}-environment.
* strports.c (scm_eval_string): Cleaned up the docstring.
* struct.c (scm_struct_p, scm_struct_vtable_p): Added texinfo
markup.
* numbers.c (scm_exact_p, scm_odd_p, scm_even_p)
(scm_number_to_string, scm_string_to_number, scm_number_p)
(scm_real_p, scm_integer_p, scm_inexact_p, scm_make_rectangular)
(scm_make_polar, scm_inexact_to_exact): Added texinfo markup.
(scm_ash): Added texinfo markup and removed obsolete @refill.
(scm_gr_p): Corrected comment.
(scm_gr_p, scm_leq_p, scm_geq_p): Added texinfo markup to (future
docstring) comments.
(scm_positive_p, scm_less_p, scm_num_eq_p, scm_real_p)
(scm_number_p, scm_negative_p, scm_max, scm_min, scm_sum)
(scm_difference, scm_product, scm_divide, scm_asinh, scm_acosh)
(scm_atanh, scm_truncate, scm_round, scm_exact_to_inexact)
(floor, ceiling, $sqrt, $abs, $exp, $log, $sin, $cos, $tan, $asin)
($acos, $atan, $sinh, $cosh, $tanh, scm_real_part, scm_imag_part)
(scm_magnitude, scm_angle, scm_abs, scm_quotient, scm_remainder)
(scm_modulo, scm_gcd, scm_lcm): Added (future docstring) comments.
2001-03-02 09:07:22 +00:00
|
|
|
|
"number @var{n} in the given @var{radix}. If @var{n} is\n"
|
|
|
|
|
|
"inexact, a radix of 10 will be used.")
|
1999-12-12 02:36:16 +00:00
|
|
|
|
#define FUNC_NAME s_scm_number_to_string
|
1996-07-25 22:56:11 +00:00
|
|
|
|
{
|
1999-12-12 02:36:16 +00:00
|
|
|
|
int base;
|
2000-05-09 12:58:53 +00:00
|
|
|
|
|
2003-07-13 16:13:57 +00:00
|
|
|
|
if (SCM_UNBNDP (radix))
|
2000-05-09 12:58:53 +00:00
|
|
|
|
base = 10;
|
2003-07-13 16:13:57 +00:00
|
|
|
|
else
|
(scm_to_signed_integer, scm_to_unsigned_integer): dot
not accept inexact integers.
* validate.h, deprecated.h (SCM_VALIDATE_INUM, SCM_VALIDATE_INUM_COPY,
SCM_VALIDATE_BIGINT, SCM_VALIDATE_INUM_MIN,
SCM_VALIDATE_INUM_MIN_COPY,
SCM_VALIDATE_INUM_MIN_DEF_COPY,SCM_VALIDATE_INUM_DEF,
SCM_VALIDATE_INUM_DEF_COPY, SCM_VALIDATE_INUM_RANGE,
SCM_VALIDATE_INUM_RANGE_COPY): Deprecated because they make the
fixnum/bignum distinction visible. Changed all uses to scm_to_size_t
or similar.
2004-07-10 13:55:04 +00:00
|
|
|
|
base = scm_to_signed_integer (radix, 2, 36);
|
2000-05-09 12:58:53 +00:00
|
|
|
|
|
2004-07-23 15:43:02 +00:00
|
|
|
|
if (SCM_I_INUMP (n))
|
2003-07-13 16:13:57 +00:00
|
|
|
|
{
|
|
|
|
|
|
char num_buf [SCM_INTBUFLEN];
|
2004-07-23 15:43:02 +00:00
|
|
|
|
size_t length = scm_iint2str (SCM_I_INUM (n), base, num_buf);
|
* strings.h, strings.c: (scm_i_string_chars, scm_i_string_length,
scm_i_string_writable_chars, scm_i_string_stop_writing): New, to
replace SCM_I_STRING_CHARS and SCM_I_STRING_LENGTH. Updated all
uses.
(scm_i_make_string, scm_c_make_string): New, to replace
scm_allocate_string. Updated all uses.
(SCM_STRINGP, SCM_STRING_CHARS, SCM_STRING_UCHARS,
SCM_STRING_LENGTH): Deprecated.
(scm_allocate_string, scm_take_str, scm_take0str, scm_mem2string,
scm_str2string, scm_makfrom0str, scm_makfrom0str_opt):
Discouraged. Replaced all uses with scm_from_locale_string or
similar, as appropriate.
(scm_c_string_length, scm_c_string_ref, scm_c_string_set_x,
scm_c_substring, scm_c_substring_shared, scm_c_substring_copy,
scm_substring_shared, scm_substring_copy): New.
* symbols.c, symbols.h (SCM_SYMBOLP, SCM_SYMBOL_FUNC,
SCM_SET_SYMBOL_FUNC, SCM_SYMBOL_PROPS, SCM_SET_SYMBOL_PROPS,
SCM_SYMBOL_HASH, SCM_SYMBOL_INTERNED_P, scm_mem2symbol,
scm_str2symbol, scm_mem2uninterned_symbol): Discouraged.
(SCM_SYMBOL_LENGTH, SCM_SYMBOL_CHARS, scm_c_symbol2str):
Deprecated.
(SCM_MAKE_SYMBOL_TAG, SCM_SET_SYMBOL_LENGTH, SCM_SET_SYMBOL_CHARS,
SCM_PROP_SLOTS, SCM_SET_PROP_SLOTS): Removed.
(scm_is_symbol, scm_from_locale_symbol, scm_from_locale_symboln):
New, to replace scm_str2symbol and scm_mem2symbol, respectively.
Updated all uses.
(scm_gensym): Generate only the number suffix in the buffer, just
string-append the prefix.
2004-08-19 17:19:44 +00:00
|
|
|
|
return scm_from_locale_stringn (num_buf, length);
|
2003-07-13 16:13:57 +00:00
|
|
|
|
}
|
|
|
|
|
|
else if (SCM_BIGP (n))
|
|
|
|
|
|
{
|
|
|
|
|
|
char *str = mpz_get_str (NULL, base, SCM_I_BIG_MPZ (n));
|
|
|
|
|
|
scm_remember_upto_here_1 (n);
|
* strings.h, strings.c: (scm_i_string_chars, scm_i_string_length,
scm_i_string_writable_chars, scm_i_string_stop_writing): New, to
replace SCM_I_STRING_CHARS and SCM_I_STRING_LENGTH. Updated all
uses.
(scm_i_make_string, scm_c_make_string): New, to replace
scm_allocate_string. Updated all uses.
(SCM_STRINGP, SCM_STRING_CHARS, SCM_STRING_UCHARS,
SCM_STRING_LENGTH): Deprecated.
(scm_allocate_string, scm_take_str, scm_take0str, scm_mem2string,
scm_str2string, scm_makfrom0str, scm_makfrom0str_opt):
Discouraged. Replaced all uses with scm_from_locale_string or
similar, as appropriate.
(scm_c_string_length, scm_c_string_ref, scm_c_string_set_x,
scm_c_substring, scm_c_substring_shared, scm_c_substring_copy,
scm_substring_shared, scm_substring_copy): New.
* symbols.c, symbols.h (SCM_SYMBOLP, SCM_SYMBOL_FUNC,
SCM_SET_SYMBOL_FUNC, SCM_SYMBOL_PROPS, SCM_SET_SYMBOL_PROPS,
SCM_SYMBOL_HASH, SCM_SYMBOL_INTERNED_P, scm_mem2symbol,
scm_str2symbol, scm_mem2uninterned_symbol): Discouraged.
(SCM_SYMBOL_LENGTH, SCM_SYMBOL_CHARS, scm_c_symbol2str):
Deprecated.
(SCM_MAKE_SYMBOL_TAG, SCM_SET_SYMBOL_LENGTH, SCM_SET_SYMBOL_CHARS,
SCM_PROP_SLOTS, SCM_SET_PROP_SLOTS): Removed.
(scm_is_symbol, scm_from_locale_symbol, scm_from_locale_symboln):
New, to replace scm_str2symbol and scm_mem2symbol, respectively.
Updated all uses.
(scm_gensym): Generate only the number suffix in the buffer, just
string-append the prefix.
2004-08-19 17:19:44 +00:00
|
|
|
|
return scm_take_locale_string (str);
|
2003-07-13 16:13:57 +00:00
|
|
|
|
}
|
* print.c (scm_iprin1): Handle fractions.
* objects.h (scm_class_fraction): New.
* objects.c (scm_class_fraction): New.
(scm_class_of): Handle fractions.
* hash.c (scm_hasher): Handle fractions.
* numbers.c: New code for handling fraction all over the place.
(scm_odd_p, scm_even_p): Handle inexact integers.
(scm_rational_p): New function, same as scm_real_p.
(scm_round_number, scm_truncate_number, scm_ceiling, scm_floor):
New exact functions that replace the inexact 'dsubr'
implementations.
(scm_numerator, scm_denominator): New.
* numbers.h (SCM_NUMP): Recognize fractions.
(SCM_FRACTIONP, SCM_SLOPPY_FRACTIONP, SCM_FRACTION_NUMERATOR,
SCM_FRACTION_DENOMINATOR, SCM_FRACTION_SET_NUMERATOR,
SCM_FRACTION_SET_DENOMINATOR, SCM_FRACTION_REDUCED_BIT,
SCM_FRACTION_REDUCED_SET, SCM_FRACTION_REDUCED_CLEAR,
SCM_FRACTION_REDUCED): New.
(scm_floor, scm_ceiling, scm_truncate_number, scm_round_number):
New prototypes.
(scm_make_ratio, scm_rationalize, scm_numerator, scm_denominator,
scm_rational_p): New prototypes.
(scm_i_dbl2num, scm_i_fraction2double, scm_i_fraction_equalp,
scm_i_print_fraction): New prototypes.
* goops.c (create_standard_classes): Create "<fraction>" class.
* gc-mark.c (scm_gc_mark_dependencies): Handle fractions.
* gc-card.c (scm_i_sweep_card): Include scm_tc16_fraction as a
case in the switch, but do nothing for now.
* eval.c (SCM_CEVAL, SCM_APPLY, call_dsubr_1): Convert fractions
to doubles when calling 'dsubr' functions.
* eq.c (scm_eqv_p, scm_equal_p): Handle fractions.
2003-11-18 19:59:53 +00:00
|
|
|
|
else if (SCM_FRACTIONP (n))
|
|
|
|
|
|
{
|
|
|
|
|
|
return scm_string_append (scm_list_3 (scm_number_to_string (SCM_FRACTION_NUMERATOR (n), radix),
|
* strings.h, strings.c: (scm_i_string_chars, scm_i_string_length,
scm_i_string_writable_chars, scm_i_string_stop_writing): New, to
replace SCM_I_STRING_CHARS and SCM_I_STRING_LENGTH. Updated all
uses.
(scm_i_make_string, scm_c_make_string): New, to replace
scm_allocate_string. Updated all uses.
(SCM_STRINGP, SCM_STRING_CHARS, SCM_STRING_UCHARS,
SCM_STRING_LENGTH): Deprecated.
(scm_allocate_string, scm_take_str, scm_take0str, scm_mem2string,
scm_str2string, scm_makfrom0str, scm_makfrom0str_opt):
Discouraged. Replaced all uses with scm_from_locale_string or
similar, as appropriate.
(scm_c_string_length, scm_c_string_ref, scm_c_string_set_x,
scm_c_substring, scm_c_substring_shared, scm_c_substring_copy,
scm_substring_shared, scm_substring_copy): New.
* symbols.c, symbols.h (SCM_SYMBOLP, SCM_SYMBOL_FUNC,
SCM_SET_SYMBOL_FUNC, SCM_SYMBOL_PROPS, SCM_SET_SYMBOL_PROPS,
SCM_SYMBOL_HASH, SCM_SYMBOL_INTERNED_P, scm_mem2symbol,
scm_str2symbol, scm_mem2uninterned_symbol): Discouraged.
(SCM_SYMBOL_LENGTH, SCM_SYMBOL_CHARS, scm_c_symbol2str):
Deprecated.
(SCM_MAKE_SYMBOL_TAG, SCM_SET_SYMBOL_LENGTH, SCM_SET_SYMBOL_CHARS,
SCM_PROP_SLOTS, SCM_SET_PROP_SLOTS): Removed.
(scm_is_symbol, scm_from_locale_symbol, scm_from_locale_symboln):
New, to replace scm_str2symbol and scm_mem2symbol, respectively.
Updated all uses.
(scm_gensym): Generate only the number suffix in the buffer, just
string-append the prefix.
2004-08-19 17:19:44 +00:00
|
|
|
|
scm_from_locale_string ("/"),
|
* print.c (scm_iprin1): Handle fractions.
* objects.h (scm_class_fraction): New.
* objects.c (scm_class_fraction): New.
(scm_class_of): Handle fractions.
* hash.c (scm_hasher): Handle fractions.
* numbers.c: New code for handling fraction all over the place.
(scm_odd_p, scm_even_p): Handle inexact integers.
(scm_rational_p): New function, same as scm_real_p.
(scm_round_number, scm_truncate_number, scm_ceiling, scm_floor):
New exact functions that replace the inexact 'dsubr'
implementations.
(scm_numerator, scm_denominator): New.
* numbers.h (SCM_NUMP): Recognize fractions.
(SCM_FRACTIONP, SCM_SLOPPY_FRACTIONP, SCM_FRACTION_NUMERATOR,
SCM_FRACTION_DENOMINATOR, SCM_FRACTION_SET_NUMERATOR,
SCM_FRACTION_SET_DENOMINATOR, SCM_FRACTION_REDUCED_BIT,
SCM_FRACTION_REDUCED_SET, SCM_FRACTION_REDUCED_CLEAR,
SCM_FRACTION_REDUCED): New.
(scm_floor, scm_ceiling, scm_truncate_number, scm_round_number):
New prototypes.
(scm_make_ratio, scm_rationalize, scm_numerator, scm_denominator,
scm_rational_p): New prototypes.
(scm_i_dbl2num, scm_i_fraction2double, scm_i_fraction_equalp,
scm_i_print_fraction): New prototypes.
* goops.c (create_standard_classes): Create "<fraction>" class.
* gc-mark.c (scm_gc_mark_dependencies): Handle fractions.
* gc-card.c (scm_i_sweep_card): Include scm_tc16_fraction as a
case in the switch, but do nothing for now.
* eval.c (SCM_CEVAL, SCM_APPLY, call_dsubr_1): Convert fractions
to doubles when calling 'dsubr' functions.
* eq.c (scm_eqv_p, scm_equal_p): Handle fractions.
2003-11-18 19:59:53 +00:00
|
|
|
|
scm_number_to_string (SCM_FRACTION_DENOMINATOR (n), radix)));
|
|
|
|
|
|
}
|
2003-07-13 16:13:57 +00:00
|
|
|
|
else if (SCM_INEXACTP (n))
|
|
|
|
|
|
{
|
|
|
|
|
|
char num_buf [FLOBUFLEN];
|
* strings.h, strings.c: (scm_i_string_chars, scm_i_string_length,
scm_i_string_writable_chars, scm_i_string_stop_writing): New, to
replace SCM_I_STRING_CHARS and SCM_I_STRING_LENGTH. Updated all
uses.
(scm_i_make_string, scm_c_make_string): New, to replace
scm_allocate_string. Updated all uses.
(SCM_STRINGP, SCM_STRING_CHARS, SCM_STRING_UCHARS,
SCM_STRING_LENGTH): Deprecated.
(scm_allocate_string, scm_take_str, scm_take0str, scm_mem2string,
scm_str2string, scm_makfrom0str, scm_makfrom0str_opt):
Discouraged. Replaced all uses with scm_from_locale_string or
similar, as appropriate.
(scm_c_string_length, scm_c_string_ref, scm_c_string_set_x,
scm_c_substring, scm_c_substring_shared, scm_c_substring_copy,
scm_substring_shared, scm_substring_copy): New.
* symbols.c, symbols.h (SCM_SYMBOLP, SCM_SYMBOL_FUNC,
SCM_SET_SYMBOL_FUNC, SCM_SYMBOL_PROPS, SCM_SET_SYMBOL_PROPS,
SCM_SYMBOL_HASH, SCM_SYMBOL_INTERNED_P, scm_mem2symbol,
scm_str2symbol, scm_mem2uninterned_symbol): Discouraged.
(SCM_SYMBOL_LENGTH, SCM_SYMBOL_CHARS, scm_c_symbol2str):
Deprecated.
(SCM_MAKE_SYMBOL_TAG, SCM_SET_SYMBOL_LENGTH, SCM_SET_SYMBOL_CHARS,
SCM_PROP_SLOTS, SCM_SET_PROP_SLOTS): Removed.
(scm_is_symbol, scm_from_locale_symbol, scm_from_locale_symboln):
New, to replace scm_str2symbol and scm_mem2symbol, respectively.
Updated all uses.
(scm_gensym): Generate only the number suffix in the buffer, just
string-append the prefix.
2004-08-19 17:19:44 +00:00
|
|
|
|
return scm_from_locale_stringn (num_buf, iflo2str (n, num_buf, base));
|
2003-07-13 16:13:57 +00:00
|
|
|
|
}
|
|
|
|
|
|
else
|
2000-05-09 16:55:54 +00:00
|
|
|
|
SCM_WRONG_TYPE_ARG (1, n);
|
1996-07-25 22:56:11 +00:00
|
|
|
|
}
|
1999-12-12 02:36:16 +00:00
|
|
|
|
#undef FUNC_NAME
|
1996-07-25 22:56:11 +00:00
|
|
|
|
|
|
|
|
|
|
|
2003-04-04 21:49:44 +00:00
|
|
|
|
/* These print routines used to be stubbed here so that scm_repl.c
|
|
|
|
|
|
wouldn't need SCM_BIGDIG conditionals (pre GMP) */
|
* __scm.h, alist.c, alist.h, append.c, append.h, appinit.c,
arbiters.c, arbiters.h, async.c, async.h, boolean.c, boolean.h,
chars.c, chars.h, continuations.c, continuations.h, debug.c,
debug.h, dynwind.c, dynwind.h, eq.c, eq.h, error.c, eval.c,
eval.h, extchrs.c, extchrs.h, fdsocket.c, fdsocket.h, filesys.c,
filesys.h, fports.c, fports.h, gc.c, gdb_interface.h, gdbint.c,
gdbint.h, genio.c, genio.h, gscm.c, gscm.h, gsubr.c, gsubr.h,
hash.c, hash.h, hashtab.c, hashtab.h, init.c, ioext.c, ioext.h,
kw.c, kw.h, libguile.h, mallocs.c, mallocs.h, markers.c,
markers.h, mbstrings.c, mbstrings.h, numbers.c, numbers.h,
objprop.c, objprop.h, options.c, options.h, pairs.c, pairs.h,
ports.c, ports.h, posix.c, posix.h, print.c, print.h, procprop.c,
procprop.h, procs.c, procs.h, ramap.c, ramap.h, read.c, read.h,
root.c, scmsigs.c, scmsigs.h, sequences.c, sequences.h, simpos.c,
simpos.h, smob.c, socket.c, socket.h, srcprop.c, srcprop.h,
stackchk.c, stackchk.h, stime.c, stime.h, strings.c, strings.h,
strop.c, strop.h, strorder.c, strorder.h, strports.c, strports.h,
struct.c, struct.h, symbols.c, symbols.h, tag.c, tag.h, unif.c,
unif.h, variable.c, variable.h, vectors.c, vectors.h, version.c,
version.h, vports.c, vports.h, weaks.c, weaks.h: Use SCM_P to
declare functions with prototypes. (Patch thanks to Marius
Vollmer.)
1996-10-14 01:33:50 +00:00
|
|
|
|
|
1996-07-25 22:56:11 +00:00
|
|
|
|
int
|
2001-06-07 21:12:19 +00:00
|
|
|
|
scm_print_real (SCM sexp, SCM port, scm_print_state *pstate SCM_UNUSED)
|
1996-07-25 22:56:11 +00:00
|
|
|
|
{
|
2001-05-08 10:23:17 +00:00
|
|
|
|
char num_buf[FLOBUFLEN];
|
2004-05-10 20:35:39 +00:00
|
|
|
|
scm_lfwrite (num_buf, iflo2str (sexp, num_buf, 10), port);
|
1996-07-25 22:56:11 +00:00
|
|
|
|
return !0;
|
|
|
|
|
|
}
|
|
|
|
|
|
|
2004-10-26 16:53:23 +00:00
|
|
|
|
void
|
|
|
|
|
|
scm_i_print_double (double val, SCM port)
|
|
|
|
|
|
{
|
|
|
|
|
|
char num_buf[FLOBUFLEN];
|
|
|
|
|
|
scm_lfwrite (num_buf, idbl2str (val, num_buf, 10), port);
|
|
|
|
|
|
}
|
|
|
|
|
|
|
* __scm.h eq.c, eval.c, gc.c, hc.h, gh_data, hash.c, numbers.c,
numbers.h, objects.c, ramap.c, random.c, unif.c, unif.h: Extensive
rewrite of handling of real and complex numbers.
(SCM_FLOATS, SCM_SINGLES): These #ifdef conditionals have been
removed along with the support for floats. (Float vectors are
still supported.)
* numbers.c (scm_floprint, scm_floequal): Removed.
(scm_print_real, scm_print_complex, scm_real_equalp,
scm_complex_equalp): New functions.
* numbers.c (scm_makdbl): no malloc'ing needed, so the
{DEFER,ALLOW}_INTS thing removed.
2000-03-14 06:41:12 +00:00
|
|
|
|
int
|
2001-06-07 21:12:19 +00:00
|
|
|
|
scm_print_complex (SCM sexp, SCM port, scm_print_state *pstate SCM_UNUSED)
|
* print.c (scm_iprin1): Handle fractions.
* objects.h (scm_class_fraction): New.
* objects.c (scm_class_fraction): New.
(scm_class_of): Handle fractions.
* hash.c (scm_hasher): Handle fractions.
* numbers.c: New code for handling fraction all over the place.
(scm_odd_p, scm_even_p): Handle inexact integers.
(scm_rational_p): New function, same as scm_real_p.
(scm_round_number, scm_truncate_number, scm_ceiling, scm_floor):
New exact functions that replace the inexact 'dsubr'
implementations.
(scm_numerator, scm_denominator): New.
* numbers.h (SCM_NUMP): Recognize fractions.
(SCM_FRACTIONP, SCM_SLOPPY_FRACTIONP, SCM_FRACTION_NUMERATOR,
SCM_FRACTION_DENOMINATOR, SCM_FRACTION_SET_NUMERATOR,
SCM_FRACTION_SET_DENOMINATOR, SCM_FRACTION_REDUCED_BIT,
SCM_FRACTION_REDUCED_SET, SCM_FRACTION_REDUCED_CLEAR,
SCM_FRACTION_REDUCED): New.
(scm_floor, scm_ceiling, scm_truncate_number, scm_round_number):
New prototypes.
(scm_make_ratio, scm_rationalize, scm_numerator, scm_denominator,
scm_rational_p): New prototypes.
(scm_i_dbl2num, scm_i_fraction2double, scm_i_fraction_equalp,
scm_i_print_fraction): New prototypes.
* goops.c (create_standard_classes): Create "<fraction>" class.
* gc-mark.c (scm_gc_mark_dependencies): Handle fractions.
* gc-card.c (scm_i_sweep_card): Include scm_tc16_fraction as a
case in the switch, but do nothing for now.
* eval.c (SCM_CEVAL, SCM_APPLY, call_dsubr_1): Convert fractions
to doubles when calling 'dsubr' functions.
* eq.c (scm_eqv_p, scm_equal_p): Handle fractions.
2003-11-18 19:59:53 +00:00
|
|
|
|
|
* __scm.h eq.c, eval.c, gc.c, hc.h, gh_data, hash.c, numbers.c,
numbers.h, objects.c, ramap.c, random.c, unif.c, unif.h: Extensive
rewrite of handling of real and complex numbers.
(SCM_FLOATS, SCM_SINGLES): These #ifdef conditionals have been
removed along with the support for floats. (Float vectors are
still supported.)
* numbers.c (scm_floprint, scm_floequal): Removed.
(scm_print_real, scm_print_complex, scm_real_equalp,
scm_complex_equalp): New functions.
* numbers.c (scm_makdbl): no malloc'ing needed, so the
{DEFER,ALLOW}_INTS thing removed.
2000-03-14 06:41:12 +00:00
|
|
|
|
{
|
2001-05-08 10:23:17 +00:00
|
|
|
|
char num_buf[FLOBUFLEN];
|
2004-05-10 20:35:39 +00:00
|
|
|
|
scm_lfwrite (num_buf, iflo2str (sexp, num_buf, 10), port);
|
* __scm.h eq.c, eval.c, gc.c, hc.h, gh_data, hash.c, numbers.c,
numbers.h, objects.c, ramap.c, random.c, unif.c, unif.h: Extensive
rewrite of handling of real and complex numbers.
(SCM_FLOATS, SCM_SINGLES): These #ifdef conditionals have been
removed along with the support for floats. (Float vectors are
still supported.)
* numbers.c (scm_floprint, scm_floequal): Removed.
(scm_print_real, scm_print_complex, scm_real_equalp,
scm_complex_equalp): New functions.
* numbers.c (scm_makdbl): no malloc'ing needed, so the
{DEFER,ALLOW}_INTS thing removed.
2000-03-14 06:41:12 +00:00
|
|
|
|
return !0;
|
|
|
|
|
|
}
|
* __scm.h, alist.c, alist.h, append.c, append.h, appinit.c,
arbiters.c, arbiters.h, async.c, async.h, boolean.c, boolean.h,
chars.c, chars.h, continuations.c, continuations.h, debug.c,
debug.h, dynwind.c, dynwind.h, eq.c, eq.h, error.c, eval.c,
eval.h, extchrs.c, extchrs.h, fdsocket.c, fdsocket.h, filesys.c,
filesys.h, fports.c, fports.h, gc.c, gdb_interface.h, gdbint.c,
gdbint.h, genio.c, genio.h, gscm.c, gscm.h, gsubr.c, gsubr.h,
hash.c, hash.h, hashtab.c, hashtab.h, init.c, ioext.c, ioext.h,
kw.c, kw.h, libguile.h, mallocs.c, mallocs.h, markers.c,
markers.h, mbstrings.c, mbstrings.h, numbers.c, numbers.h,
objprop.c, objprop.h, options.c, options.h, pairs.c, pairs.h,
ports.c, ports.h, posix.c, posix.h, print.c, print.h, procprop.c,
procprop.h, procs.c, procs.h, ramap.c, ramap.h, read.c, read.h,
root.c, scmsigs.c, scmsigs.h, sequences.c, sequences.h, simpos.c,
simpos.h, smob.c, socket.c, socket.h, srcprop.c, srcprop.h,
stackchk.c, stackchk.h, stime.c, stime.h, strings.c, strings.h,
strop.c, strop.h, strorder.c, strorder.h, strports.c, strports.h,
struct.c, struct.h, symbols.c, symbols.h, tag.c, tag.h, unif.c,
unif.h, variable.c, variable.h, vectors.c, vectors.h, version.c,
version.h, vports.c, vports.h, weaks.c, weaks.h: Use SCM_P to
declare functions with prototypes. (Patch thanks to Marius
Vollmer.)
1996-10-14 01:33:50 +00:00
|
|
|
|
|
2004-10-29 14:17:20 +00:00
|
|
|
|
void
|
|
|
|
|
|
scm_i_print_complex (double real, double imag, SCM port)
|
|
|
|
|
|
{
|
|
|
|
|
|
char num_buf[FLOBUFLEN];
|
|
|
|
|
|
scm_lfwrite (num_buf, icmplx2str (real, imag, num_buf, 10), port);
|
|
|
|
|
|
}
|
|
|
|
|
|
|
* print.c (scm_iprin1): Handle fractions.
* objects.h (scm_class_fraction): New.
* objects.c (scm_class_fraction): New.
(scm_class_of): Handle fractions.
* hash.c (scm_hasher): Handle fractions.
* numbers.c: New code for handling fraction all over the place.
(scm_odd_p, scm_even_p): Handle inexact integers.
(scm_rational_p): New function, same as scm_real_p.
(scm_round_number, scm_truncate_number, scm_ceiling, scm_floor):
New exact functions that replace the inexact 'dsubr'
implementations.
(scm_numerator, scm_denominator): New.
* numbers.h (SCM_NUMP): Recognize fractions.
(SCM_FRACTIONP, SCM_SLOPPY_FRACTIONP, SCM_FRACTION_NUMERATOR,
SCM_FRACTION_DENOMINATOR, SCM_FRACTION_SET_NUMERATOR,
SCM_FRACTION_SET_DENOMINATOR, SCM_FRACTION_REDUCED_BIT,
SCM_FRACTION_REDUCED_SET, SCM_FRACTION_REDUCED_CLEAR,
SCM_FRACTION_REDUCED): New.
(scm_floor, scm_ceiling, scm_truncate_number, scm_round_number):
New prototypes.
(scm_make_ratio, scm_rationalize, scm_numerator, scm_denominator,
scm_rational_p): New prototypes.
(scm_i_dbl2num, scm_i_fraction2double, scm_i_fraction_equalp,
scm_i_print_fraction): New prototypes.
* goops.c (create_standard_classes): Create "<fraction>" class.
* gc-mark.c (scm_gc_mark_dependencies): Handle fractions.
* gc-card.c (scm_i_sweep_card): Include scm_tc16_fraction as a
case in the switch, but do nothing for now.
* eval.c (SCM_CEVAL, SCM_APPLY, call_dsubr_1): Convert fractions
to doubles when calling 'dsubr' functions.
* eq.c (scm_eqv_p, scm_equal_p): Handle fractions.
2003-11-18 19:59:53 +00:00
|
|
|
|
int
|
|
|
|
|
|
scm_i_print_fraction (SCM sexp, SCM port, scm_print_state *pstate SCM_UNUSED)
|
|
|
|
|
|
{
|
|
|
|
|
|
SCM str;
|
|
|
|
|
|
str = scm_number_to_string (sexp, SCM_UNDEFINED);
|
2009-08-21 09:18:30 -07:00
|
|
|
|
scm_lfwrite_str (str, port);
|
* print.c (scm_iprin1): Handle fractions.
* objects.h (scm_class_fraction): New.
* objects.c (scm_class_fraction): New.
(scm_class_of): Handle fractions.
* hash.c (scm_hasher): Handle fractions.
* numbers.c: New code for handling fraction all over the place.
(scm_odd_p, scm_even_p): Handle inexact integers.
(scm_rational_p): New function, same as scm_real_p.
(scm_round_number, scm_truncate_number, scm_ceiling, scm_floor):
New exact functions that replace the inexact 'dsubr'
implementations.
(scm_numerator, scm_denominator): New.
* numbers.h (SCM_NUMP): Recognize fractions.
(SCM_FRACTIONP, SCM_SLOPPY_FRACTIONP, SCM_FRACTION_NUMERATOR,
SCM_FRACTION_DENOMINATOR, SCM_FRACTION_SET_NUMERATOR,
SCM_FRACTION_SET_DENOMINATOR, SCM_FRACTION_REDUCED_BIT,
SCM_FRACTION_REDUCED_SET, SCM_FRACTION_REDUCED_CLEAR,
SCM_FRACTION_REDUCED): New.
(scm_floor, scm_ceiling, scm_truncate_number, scm_round_number):
New prototypes.
(scm_make_ratio, scm_rationalize, scm_numerator, scm_denominator,
scm_rational_p): New prototypes.
(scm_i_dbl2num, scm_i_fraction2double, scm_i_fraction_equalp,
scm_i_print_fraction): New prototypes.
* goops.c (create_standard_classes): Create "<fraction>" class.
* gc-mark.c (scm_gc_mark_dependencies): Handle fractions.
* gc-card.c (scm_i_sweep_card): Include scm_tc16_fraction as a
case in the switch, but do nothing for now.
* eval.c (SCM_CEVAL, SCM_APPLY, call_dsubr_1): Convert fractions
to doubles when calling 'dsubr' functions.
* eq.c (scm_eqv_p, scm_equal_p): Handle fractions.
2003-11-18 19:59:53 +00:00
|
|
|
|
scm_remember_upto_here_1 (str);
|
|
|
|
|
|
return !0;
|
|
|
|
|
|
}
|
|
|
|
|
|
|
1996-07-25 22:56:11 +00:00
|
|
|
|
int
|
2001-06-07 21:12:19 +00:00
|
|
|
|
scm_bigprint (SCM exp, SCM port, scm_print_state *pstate SCM_UNUSED)
|
1996-07-25 22:56:11 +00:00
|
|
|
|
{
|
2003-04-04 21:49:44 +00:00
|
|
|
|
char *str = mpz_get_str (NULL, 10, SCM_I_BIG_MPZ (exp));
|
|
|
|
|
|
scm_remember_upto_here_1 (exp);
|
|
|
|
|
|
scm_lfwrite (str, (size_t) strlen (str), port);
|
|
|
|
|
|
free (str);
|
1996-07-25 22:56:11 +00:00
|
|
|
|
return !0;
|
|
|
|
|
|
}
|
|
|
|
|
|
/*** END nums->strs ***/
|
|
|
|
|
|
|
2001-07-30 19:35:15 +00:00
|
|
|
|
|
1996-07-25 22:56:11 +00:00
|
|
|
|
/*** STRINGS -> NUMBERS ***/
|
1996-10-03 05:18:47 +00:00
|
|
|
|
|
2001-07-30 19:35:15 +00:00
|
|
|
|
/* The following functions implement the conversion from strings to numbers.
|
|
|
|
|
|
* The implementation somehow follows the grammar for numbers as it is given
|
|
|
|
|
|
* in R5RS. Thus, the functions resemble syntactic units (<ureal R>,
|
|
|
|
|
|
* <uinteger R>, ...) that are used to build up numbers in the grammar. Some
|
|
|
|
|
|
* points should be noted about the implementation:
|
|
|
|
|
|
* * Each function keeps a local index variable 'idx' that points at the
|
|
|
|
|
|
* current position within the parsed string. The global index is only
|
|
|
|
|
|
* updated if the function could parse the corresponding syntactic unit
|
|
|
|
|
|
* successfully.
|
|
|
|
|
|
* * Similarly, the functions keep track of indicators of inexactness ('#',
|
|
|
|
|
|
* '.' or exponents) using local variables ('hash_seen', 'x'). Again, the
|
|
|
|
|
|
* global exactness information is only updated after each part has been
|
|
|
|
|
|
* successfully parsed.
|
|
|
|
|
|
* * Sequences of digits are parsed into temporary variables holding fixnums.
|
|
|
|
|
|
* Only if these fixnums would overflow, the result variables are updated
|
|
|
|
|
|
* using the standard functions scm_add, scm_product, scm_divide etc. Then,
|
|
|
|
|
|
* the temporary variables holding the fixnums are cleared, and the process
|
|
|
|
|
|
* starts over again. If for example fixnums were able to store five decimal
|
|
|
|
|
|
* digits, a number 1234567890 would be parsed in two parts 12345 and 67890,
|
|
|
|
|
|
* and the result was computed as 12345 * 100000 + 67890. In other words,
|
|
|
|
|
|
* only every five digits two bignum operations were performed.
|
|
|
|
|
|
*/
|
|
|
|
|
|
|
|
|
|
|
|
enum t_exactness {NO_EXACTNESS, INEXACT, EXACT};
|
|
|
|
|
|
|
|
|
|
|
|
/* R5RS, section 7.1.1, lexical structure of numbers: <uinteger R>. */
|
|
|
|
|
|
|
|
|
|
|
|
/* In non ASCII-style encodings the following macro might not work. */
|
2009-08-21 09:18:30 -07:00
|
|
|
|
#define XDIGIT2UINT(d) \
|
|
|
|
|
|
(uc_is_property_decimal_digit ((int) (unsigned char) d) \
|
|
|
|
|
|
? (d) - '0' \
|
2009-08-21 09:30:53 -07:00
|
|
|
|
: uc_tolower ((int) (unsigned char) d) - 'a' + 10)
|
2001-07-30 19:35:15 +00:00
|
|
|
|
|
1996-10-03 05:18:47 +00:00
|
|
|
|
static SCM
|
2009-08-21 09:18:30 -07:00
|
|
|
|
mem2uinteger (SCM mem, unsigned int *p_idx,
|
2001-07-30 19:35:15 +00:00
|
|
|
|
unsigned int radix, enum t_exactness *p_exactness)
|
1996-10-03 05:18:47 +00:00
|
|
|
|
{
|
2001-07-30 19:35:15 +00:00
|
|
|
|
unsigned int idx = *p_idx;
|
|
|
|
|
|
unsigned int hash_seen = 0;
|
|
|
|
|
|
scm_t_bits shift = 1;
|
|
|
|
|
|
scm_t_bits add = 0;
|
|
|
|
|
|
unsigned int digit_value;
|
|
|
|
|
|
SCM result;
|
|
|
|
|
|
char c;
|
2009-08-21 09:18:30 -07:00
|
|
|
|
size_t len = scm_i_string_length (mem);
|
2001-07-30 19:35:15 +00:00
|
|
|
|
|
|
|
|
|
|
if (idx == len)
|
|
|
|
|
|
return SCM_BOOL_F;
|
1996-10-03 05:18:47 +00:00
|
|
|
|
|
2009-08-21 09:18:30 -07:00
|
|
|
|
c = scm_i_string_ref (mem, idx);
|
|
|
|
|
|
if (!uc_is_property_ascii_hex_digit ((scm_t_uint32) c))
|
2001-07-30 19:35:15 +00:00
|
|
|
|
return SCM_BOOL_F;
|
|
|
|
|
|
digit_value = XDIGIT2UINT (c);
|
|
|
|
|
|
if (digit_value >= radix)
|
|
|
|
|
|
return SCM_BOOL_F;
|
|
|
|
|
|
|
|
|
|
|
|
idx++;
|
2004-07-08 15:54:05 +00:00
|
|
|
|
result = SCM_I_MAKINUM (digit_value);
|
2001-07-30 19:35:15 +00:00
|
|
|
|
while (idx != len)
|
1999-01-10 07:38:39 +00:00
|
|
|
|
{
|
2009-08-21 09:18:30 -07:00
|
|
|
|
scm_t_wchar c = scm_i_string_ref (mem, idx);
|
|
|
|
|
|
if (uc_is_property_ascii_hex_digit ((scm_t_uint32) c))
|
1999-01-10 07:38:39 +00:00
|
|
|
|
{
|
2001-07-30 19:35:15 +00:00
|
|
|
|
if (hash_seen)
|
2001-10-13 12:39:26 +00:00
|
|
|
|
break;
|
2001-07-30 19:35:15 +00:00
|
|
|
|
digit_value = XDIGIT2UINT (c);
|
|
|
|
|
|
if (digit_value >= radix)
|
2001-10-13 12:39:26 +00:00
|
|
|
|
break;
|
1999-01-10 07:38:39 +00:00
|
|
|
|
}
|
2001-07-30 19:35:15 +00:00
|
|
|
|
else if (c == '#')
|
|
|
|
|
|
{
|
|
|
|
|
|
hash_seen = 1;
|
|
|
|
|
|
digit_value = 0;
|
|
|
|
|
|
}
|
|
|
|
|
|
else
|
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
|
|
idx++;
|
|
|
|
|
|
if (SCM_MOST_POSITIVE_FIXNUM / radix < shift)
|
|
|
|
|
|
{
|
2004-07-08 15:54:05 +00:00
|
|
|
|
result = scm_product (result, SCM_I_MAKINUM (shift));
|
2001-07-30 19:35:15 +00:00
|
|
|
|
if (add > 0)
|
2004-07-08 15:54:05 +00:00
|
|
|
|
result = scm_sum (result, SCM_I_MAKINUM (add));
|
2001-07-30 19:35:15 +00:00
|
|
|
|
|
|
|
|
|
|
shift = radix;
|
|
|
|
|
|
add = digit_value;
|
|
|
|
|
|
}
|
|
|
|
|
|
else
|
|
|
|
|
|
{
|
|
|
|
|
|
shift = shift * radix;
|
|
|
|
|
|
add = add * radix + digit_value;
|
|
|
|
|
|
}
|
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
|
|
if (shift > 1)
|
2004-07-08 15:54:05 +00:00
|
|
|
|
result = scm_product (result, SCM_I_MAKINUM (shift));
|
2001-07-30 19:35:15 +00:00
|
|
|
|
if (add > 0)
|
2004-07-08 15:54:05 +00:00
|
|
|
|
result = scm_sum (result, SCM_I_MAKINUM (add));
|
2001-07-30 19:35:15 +00:00
|
|
|
|
|
|
|
|
|
|
*p_idx = idx;
|
|
|
|
|
|
if (hash_seen)
|
|
|
|
|
|
*p_exactness = INEXACT;
|
|
|
|
|
|
|
|
|
|
|
|
return result;
|
1996-10-03 05:18:47 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
2001-07-30 19:35:15 +00:00
|
|
|
|
/* R5RS, section 7.1.1, lexical structure of numbers: <decimal 10>. Only
|
|
|
|
|
|
* covers the parts of the rules that start at a potential point. The value
|
|
|
|
|
|
* of the digits up to the point have been parsed by the caller and are given
|
2001-10-09 20:56:36 +00:00
|
|
|
|
* in variable result. The content of *p_exactness indicates, whether a hash
|
|
|
|
|
|
* has already been seen in the digits before the point.
|
2001-07-30 19:35:15 +00:00
|
|
|
|
*/
|
* __scm.h, alist.c, alist.h, append.c, append.h, appinit.c,
arbiters.c, arbiters.h, async.c, async.h, boolean.c, boolean.h,
chars.c, chars.h, continuations.c, continuations.h, debug.c,
debug.h, dynwind.c, dynwind.h, eq.c, eq.h, error.c, eval.c,
eval.h, extchrs.c, extchrs.h, fdsocket.c, fdsocket.h, filesys.c,
filesys.h, fports.c, fports.h, gc.c, gdb_interface.h, gdbint.c,
gdbint.h, genio.c, genio.h, gscm.c, gscm.h, gsubr.c, gsubr.h,
hash.c, hash.h, hashtab.c, hashtab.h, init.c, ioext.c, ioext.h,
kw.c, kw.h, libguile.h, mallocs.c, mallocs.h, markers.c,
markers.h, mbstrings.c, mbstrings.h, numbers.c, numbers.h,
objprop.c, objprop.h, options.c, options.h, pairs.c, pairs.h,
ports.c, ports.h, posix.c, posix.h, print.c, print.h, procprop.c,
procprop.h, procs.c, procs.h, ramap.c, ramap.h, read.c, read.h,
root.c, scmsigs.c, scmsigs.h, sequences.c, sequences.h, simpos.c,
simpos.h, smob.c, socket.c, socket.h, srcprop.c, srcprop.h,
stackchk.c, stackchk.h, stime.c, stime.h, strings.c, strings.h,
strop.c, strop.h, strorder.c, strorder.h, strports.c, strports.h,
struct.c, struct.h, symbols.c, symbols.h, tag.c, tag.h, unif.c,
unif.h, variable.c, variable.h, vectors.c, vectors.h, version.c,
version.h, vports.c, vports.h, weaks.c, weaks.h: Use SCM_P to
declare functions with prototypes. (Patch thanks to Marius
Vollmer.)
1996-10-14 01:33:50 +00:00
|
|
|
|
|
2009-08-21 09:18:30 -07:00
|
|
|
|
#define DIGIT2UINT(d) (uc_numeric_value(d).numerator)
|
2001-07-30 19:35:15 +00:00
|
|
|
|
|
|
|
|
|
|
static SCM
|
2009-08-21 09:18:30 -07:00
|
|
|
|
mem2decimal_from_point (SCM result, SCM mem,
|
2001-07-30 19:35:15 +00:00
|
|
|
|
unsigned int *p_idx, enum t_exactness *p_exactness)
|
1996-07-25 22:56:11 +00:00
|
|
|
|
{
|
2001-07-30 19:35:15 +00:00
|
|
|
|
unsigned int idx = *p_idx;
|
|
|
|
|
|
enum t_exactness x = *p_exactness;
|
2009-08-21 09:18:30 -07:00
|
|
|
|
size_t len = scm_i_string_length (mem);
|
2001-07-30 19:35:15 +00:00
|
|
|
|
|
|
|
|
|
|
if (idx == len)
|
2001-10-09 20:56:36 +00:00
|
|
|
|
return result;
|
2001-07-30 19:35:15 +00:00
|
|
|
|
|
2009-08-21 09:18:30 -07:00
|
|
|
|
if (scm_i_string_ref (mem, idx) == '.')
|
2001-07-30 19:35:15 +00:00
|
|
|
|
{
|
|
|
|
|
|
scm_t_bits shift = 1;
|
|
|
|
|
|
scm_t_bits add = 0;
|
|
|
|
|
|
unsigned int digit_value;
|
2004-07-08 15:54:05 +00:00
|
|
|
|
SCM big_shift = SCM_I_MAKINUM (1);
|
2001-07-30 19:35:15 +00:00
|
|
|
|
|
|
|
|
|
|
idx++;
|
|
|
|
|
|
while (idx != len)
|
|
|
|
|
|
{
|
2009-08-21 09:18:30 -07:00
|
|
|
|
scm_t_wchar c = scm_i_string_ref (mem, idx);
|
|
|
|
|
|
if (uc_is_property_decimal_digit ((scm_t_uint32) c))
|
2001-07-30 19:35:15 +00:00
|
|
|
|
{
|
|
|
|
|
|
if (x == INEXACT)
|
|
|
|
|
|
return SCM_BOOL_F;
|
|
|
|
|
|
else
|
|
|
|
|
|
digit_value = DIGIT2UINT (c);
|
|
|
|
|
|
}
|
|
|
|
|
|
else if (c == '#')
|
|
|
|
|
|
{
|
|
|
|
|
|
x = INEXACT;
|
|
|
|
|
|
digit_value = 0;
|
|
|
|
|
|
}
|
|
|
|
|
|
else
|
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
|
|
idx++;
|
|
|
|
|
|
if (SCM_MOST_POSITIVE_FIXNUM / 10 < shift)
|
|
|
|
|
|
{
|
2004-07-08 15:54:05 +00:00
|
|
|
|
big_shift = scm_product (big_shift, SCM_I_MAKINUM (shift));
|
|
|
|
|
|
result = scm_product (result, SCM_I_MAKINUM (shift));
|
2001-07-30 19:35:15 +00:00
|
|
|
|
if (add > 0)
|
2004-07-08 15:54:05 +00:00
|
|
|
|
result = scm_sum (result, SCM_I_MAKINUM (add));
|
2001-07-30 19:35:15 +00:00
|
|
|
|
|
|
|
|
|
|
shift = 10;
|
|
|
|
|
|
add = digit_value;
|
|
|
|
|
|
}
|
|
|
|
|
|
else
|
|
|
|
|
|
{
|
|
|
|
|
|
shift = shift * 10;
|
|
|
|
|
|
add = add * 10 + digit_value;
|
|
|
|
|
|
}
|
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
|
|
if (add > 0)
|
|
|
|
|
|
{
|
2004-07-08 15:54:05 +00:00
|
|
|
|
big_shift = scm_product (big_shift, SCM_I_MAKINUM (shift));
|
|
|
|
|
|
result = scm_product (result, SCM_I_MAKINUM (shift));
|
|
|
|
|
|
result = scm_sum (result, SCM_I_MAKINUM (add));
|
2001-07-30 19:35:15 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
2003-11-19 02:19:03 +00:00
|
|
|
|
result = scm_divide (result, big_shift);
|
2001-10-09 20:56:36 +00:00
|
|
|
|
|
2001-07-30 19:35:15 +00:00
|
|
|
|
/* We've seen a decimal point, thus the value is implicitly inexact. */
|
|
|
|
|
|
x = INEXACT;
|
1999-01-10 07:38:39 +00:00
|
|
|
|
}
|
2001-07-30 19:35:15 +00:00
|
|
|
|
|
|
|
|
|
|
if (idx != len)
|
1999-01-10 07:38:39 +00:00
|
|
|
|
{
|
2001-07-30 19:35:15 +00:00
|
|
|
|
int sign = 1;
|
|
|
|
|
|
unsigned int start;
|
2009-08-21 09:18:30 -07:00
|
|
|
|
scm_t_wchar c;
|
2001-07-30 19:35:15 +00:00
|
|
|
|
int exponent;
|
|
|
|
|
|
SCM e;
|
|
|
|
|
|
|
|
|
|
|
|
/* R5RS, section 7.1.1, lexical structure of numbers: <suffix> */
|
|
|
|
|
|
|
2009-08-21 09:18:30 -07:00
|
|
|
|
switch (scm_i_string_ref (mem, idx))
|
1999-01-10 07:38:39 +00:00
|
|
|
|
{
|
2001-07-30 19:35:15 +00:00
|
|
|
|
case 'd': case 'D':
|
|
|
|
|
|
case 'e': case 'E':
|
|
|
|
|
|
case 'f': case 'F':
|
|
|
|
|
|
case 'l': case 'L':
|
|
|
|
|
|
case 's': case 'S':
|
|
|
|
|
|
idx++;
|
2009-08-04 20:29:09 +02:00
|
|
|
|
if (idx == len)
|
|
|
|
|
|
return SCM_BOOL_F;
|
|
|
|
|
|
|
2001-07-30 19:35:15 +00:00
|
|
|
|
start = idx;
|
2009-08-21 09:18:30 -07:00
|
|
|
|
c = scm_i_string_ref (mem, idx);
|
2001-07-30 19:35:15 +00:00
|
|
|
|
if (c == '-')
|
|
|
|
|
|
{
|
|
|
|
|
|
idx++;
|
2009-08-04 20:29:09 +02:00
|
|
|
|
if (idx == len)
|
|
|
|
|
|
return SCM_BOOL_F;
|
|
|
|
|
|
|
2001-07-30 19:35:15 +00:00
|
|
|
|
sign = -1;
|
2009-08-21 09:18:30 -07:00
|
|
|
|
c = scm_i_string_ref (mem, idx);
|
2001-07-30 19:35:15 +00:00
|
|
|
|
}
|
|
|
|
|
|
else if (c == '+')
|
|
|
|
|
|
{
|
|
|
|
|
|
idx++;
|
2009-08-04 20:29:09 +02:00
|
|
|
|
if (idx == len)
|
|
|
|
|
|
return SCM_BOOL_F;
|
|
|
|
|
|
|
2001-07-30 19:35:15 +00:00
|
|
|
|
sign = 1;
|
2009-08-21 09:18:30 -07:00
|
|
|
|
c = scm_i_string_ref (mem, idx);
|
2001-07-30 19:35:15 +00:00
|
|
|
|
}
|
|
|
|
|
|
else
|
|
|
|
|
|
sign = 1;
|
|
|
|
|
|
|
2009-08-21 09:18:30 -07:00
|
|
|
|
if (!uc_is_property_decimal_digit ((scm_t_uint32) c))
|
2001-07-30 19:35:15 +00:00
|
|
|
|
return SCM_BOOL_F;
|
|
|
|
|
|
|
|
|
|
|
|
idx++;
|
|
|
|
|
|
exponent = DIGIT2UINT (c);
|
|
|
|
|
|
while (idx != len)
|
1999-01-10 07:38:39 +00:00
|
|
|
|
{
|
2009-08-21 09:18:30 -07:00
|
|
|
|
scm_t_wchar c = scm_i_string_ref (mem, idx);
|
|
|
|
|
|
if (uc_is_property_decimal_digit ((scm_t_uint32) c))
|
2001-07-30 19:35:15 +00:00
|
|
|
|
{
|
|
|
|
|
|
idx++;
|
|
|
|
|
|
if (exponent <= SCM_MAXEXP)
|
|
|
|
|
|
exponent = exponent * 10 + DIGIT2UINT (c);
|
|
|
|
|
|
}
|
|
|
|
|
|
else
|
|
|
|
|
|
break;
|
1999-01-10 07:38:39 +00:00
|
|
|
|
}
|
2001-07-30 19:35:15 +00:00
|
|
|
|
|
|
|
|
|
|
if (exponent > SCM_MAXEXP)
|
1999-01-10 07:38:39 +00:00
|
|
|
|
{
|
2001-07-30 19:35:15 +00:00
|
|
|
|
size_t exp_len = idx - start;
|
2009-08-21 09:18:30 -07:00
|
|
|
|
SCM exp_string = scm_i_substring_copy (mem, start, start + exp_len);
|
2001-07-30 19:35:15 +00:00
|
|
|
|
SCM exp_num = scm_string_to_number (exp_string, SCM_UNDEFINED);
|
|
|
|
|
|
scm_out_of_range ("string->number", exp_num);
|
1999-01-10 07:38:39 +00:00
|
|
|
|
}
|
2001-07-30 19:35:15 +00:00
|
|
|
|
|
2004-07-08 15:54:05 +00:00
|
|
|
|
e = scm_integer_expt (SCM_I_MAKINUM (10), SCM_I_MAKINUM (exponent));
|
2001-07-30 19:35:15 +00:00
|
|
|
|
if (sign == 1)
|
|
|
|
|
|
result = scm_product (result, e);
|
|
|
|
|
|
else
|
* print.c (scm_iprin1): Handle fractions.
* objects.h (scm_class_fraction): New.
* objects.c (scm_class_fraction): New.
(scm_class_of): Handle fractions.
* hash.c (scm_hasher): Handle fractions.
* numbers.c: New code for handling fraction all over the place.
(scm_odd_p, scm_even_p): Handle inexact integers.
(scm_rational_p): New function, same as scm_real_p.
(scm_round_number, scm_truncate_number, scm_ceiling, scm_floor):
New exact functions that replace the inexact 'dsubr'
implementations.
(scm_numerator, scm_denominator): New.
* numbers.h (SCM_NUMP): Recognize fractions.
(SCM_FRACTIONP, SCM_SLOPPY_FRACTIONP, SCM_FRACTION_NUMERATOR,
SCM_FRACTION_DENOMINATOR, SCM_FRACTION_SET_NUMERATOR,
SCM_FRACTION_SET_DENOMINATOR, SCM_FRACTION_REDUCED_BIT,
SCM_FRACTION_REDUCED_SET, SCM_FRACTION_REDUCED_CLEAR,
SCM_FRACTION_REDUCED): New.
(scm_floor, scm_ceiling, scm_truncate_number, scm_round_number):
New prototypes.
(scm_make_ratio, scm_rationalize, scm_numerator, scm_denominator,
scm_rational_p): New prototypes.
(scm_i_dbl2num, scm_i_fraction2double, scm_i_fraction_equalp,
scm_i_print_fraction): New prototypes.
* goops.c (create_standard_classes): Create "<fraction>" class.
* gc-mark.c (scm_gc_mark_dependencies): Handle fractions.
* gc-card.c (scm_i_sweep_card): Include scm_tc16_fraction as a
case in the switch, but do nothing for now.
* eval.c (SCM_CEVAL, SCM_APPLY, call_dsubr_1): Convert fractions
to doubles when calling 'dsubr' functions.
* eq.c (scm_eqv_p, scm_equal_p): Handle fractions.
2003-11-18 19:59:53 +00:00
|
|
|
|
result = scm_divide2real (result, e);
|
2001-07-30 19:35:15 +00:00
|
|
|
|
|
|
|
|
|
|
/* We've seen an exponent, thus the value is implicitly inexact. */
|
|
|
|
|
|
x = INEXACT;
|
|
|
|
|
|
|
1999-01-10 07:38:39 +00:00
|
|
|
|
break;
|
2001-07-30 19:35:15 +00:00
|
|
|
|
|
1999-01-10 07:38:39 +00:00
|
|
|
|
default:
|
2001-07-30 19:35:15 +00:00
|
|
|
|
break;
|
1999-01-10 07:38:39 +00:00
|
|
|
|
}
|
1996-07-25 22:56:11 +00:00
|
|
|
|
}
|
2001-07-30 19:35:15 +00:00
|
|
|
|
|
|
|
|
|
|
*p_idx = idx;
|
|
|
|
|
|
if (x == INEXACT)
|
|
|
|
|
|
*p_exactness = x;
|
|
|
|
|
|
|
|
|
|
|
|
return result;
|
1996-07-25 22:56:11 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
2001-07-30 19:35:15 +00:00
|
|
|
|
|
|
|
|
|
|
/* R5RS, section 7.1.1, lexical structure of numbers: <ureal R> */
|
|
|
|
|
|
|
|
|
|
|
|
static SCM
|
2009-08-21 09:18:30 -07:00
|
|
|
|
mem2ureal (SCM mem, unsigned int *p_idx,
|
2001-07-30 19:35:15 +00:00
|
|
|
|
unsigned int radix, enum t_exactness *p_exactness)
|
1996-07-25 22:56:11 +00:00
|
|
|
|
{
|
2001-07-30 19:35:15 +00:00
|
|
|
|
unsigned int idx = *p_idx;
|
2002-05-22 19:55:40 +00:00
|
|
|
|
SCM result;
|
2009-08-21 09:18:30 -07:00
|
|
|
|
size_t len = scm_i_string_length (mem);
|
2001-07-30 19:35:15 +00:00
|
|
|
|
|
2009-07-01 01:39:24 +01:00
|
|
|
|
/* Start off believing that the number will be exact. This changes
|
|
|
|
|
|
to INEXACT if we see a decimal point or a hash. */
|
|
|
|
|
|
enum t_exactness x = EXACT;
|
|
|
|
|
|
|
2001-07-30 19:35:15 +00:00
|
|
|
|
if (idx == len)
|
|
|
|
|
|
return SCM_BOOL_F;
|
|
|
|
|
|
|
2009-08-21 09:18:30 -07:00
|
|
|
|
if (idx+5 <= len && !scm_i_string_strcmp (mem, idx, "inf.0"))
|
From John W. Eaton.
* numbers.h: Conditionally include floatingpoint.h, ieeefp.h, and
nan.h. Provide declarations for scm_inf_p, scm_nan_p, scn_inf,
and scm_nan.
* numbers.c: [SCO && ! HAVE_ISNAN] (isnan): New function.
[SCO && ! HAVE_ISINF] (isinf): New function.
(xisinf, xisnan): New functions.
(IS_INF): Delete.
(isfinite): Define in terms of xisinf.
(scm_inf_p, scm_nan_p): New functions.
(guile_Inf, guile_NaN): New file-scope vars.
(guile_ieee_init): New function.
(scm_inf, scm_nan): New functions.
(idbl2str): Handle Inf and NaN. Remove funny label and
corresponding gotos.
(ALLOW_DIVIDE_BY_ZERO): New macro.
(scm_divide): Allow division by zero to occur if
ALLOW_DIVIDE_BY_ZERO is defined.
Handle bignums and ints as special cases.
Additional stuff by me:
numbers.c (mem2ureal): Recognize "inf.0" and "nan.xxx".
(scm_even_p, scm_odd_p): Treat infinity as even and odd.
(iflo2str): Don't output a '+' for negative numbers or for Inf and
NaN. They will provide their own sign.
(scm_divide): Only allow divides by inexact zeros. Dividing by
exact zeros still signals an errors.
2002-05-06 22:33:10 +00:00
|
|
|
|
{
|
|
|
|
|
|
*p_idx = idx+5;
|
|
|
|
|
|
return scm_inf ();
|
|
|
|
|
|
}
|
|
|
|
|
|
|
2009-08-21 09:18:30 -07:00
|
|
|
|
if (idx+4 < len && !scm_i_string_strcmp (mem, idx, "nan."))
|
From John W. Eaton.
* numbers.h: Conditionally include floatingpoint.h, ieeefp.h, and
nan.h. Provide declarations for scm_inf_p, scm_nan_p, scn_inf,
and scm_nan.
* numbers.c: [SCO && ! HAVE_ISNAN] (isnan): New function.
[SCO && ! HAVE_ISINF] (isinf): New function.
(xisinf, xisnan): New functions.
(IS_INF): Delete.
(isfinite): Define in terms of xisinf.
(scm_inf_p, scm_nan_p): New functions.
(guile_Inf, guile_NaN): New file-scope vars.
(guile_ieee_init): New function.
(scm_inf, scm_nan): New functions.
(idbl2str): Handle Inf and NaN. Remove funny label and
corresponding gotos.
(ALLOW_DIVIDE_BY_ZERO): New macro.
(scm_divide): Allow division by zero to occur if
ALLOW_DIVIDE_BY_ZERO is defined.
Handle bignums and ints as special cases.
Additional stuff by me:
numbers.c (mem2ureal): Recognize "inf.0" and "nan.xxx".
(scm_even_p, scm_odd_p): Treat infinity as even and odd.
(iflo2str): Don't output a '+' for negative numbers or for Inf and
NaN. They will provide their own sign.
(scm_divide): Only allow divides by inexact zeros. Dividing by
exact zeros still signals an errors.
2002-05-06 22:33:10 +00:00
|
|
|
|
{
|
2003-11-19 02:19:03 +00:00
|
|
|
|
/* Cobble up the fractional part. We might want to set the
|
|
|
|
|
|
NaN's mantissa from it. */
|
From John W. Eaton.
* numbers.h: Conditionally include floatingpoint.h, ieeefp.h, and
nan.h. Provide declarations for scm_inf_p, scm_nan_p, scn_inf,
and scm_nan.
* numbers.c: [SCO && ! HAVE_ISNAN] (isnan): New function.
[SCO && ! HAVE_ISINF] (isinf): New function.
(xisinf, xisnan): New functions.
(IS_INF): Delete.
(isfinite): Define in terms of xisinf.
(scm_inf_p, scm_nan_p): New functions.
(guile_Inf, guile_NaN): New file-scope vars.
(guile_ieee_init): New function.
(scm_inf, scm_nan): New functions.
(idbl2str): Handle Inf and NaN. Remove funny label and
corresponding gotos.
(ALLOW_DIVIDE_BY_ZERO): New macro.
(scm_divide): Allow division by zero to occur if
ALLOW_DIVIDE_BY_ZERO is defined.
Handle bignums and ints as special cases.
Additional stuff by me:
numbers.c (mem2ureal): Recognize "inf.0" and "nan.xxx".
(scm_even_p, scm_odd_p): Treat infinity as even and odd.
(iflo2str): Don't output a '+' for negative numbers or for Inf and
NaN. They will provide their own sign.
(scm_divide): Only allow divides by inexact zeros. Dividing by
exact zeros still signals an errors.
2002-05-06 22:33:10 +00:00
|
|
|
|
idx += 4;
|
2009-08-21 09:18:30 -07:00
|
|
|
|
mem2uinteger (mem, &idx, 10, &x);
|
From John W. Eaton.
* numbers.h: Conditionally include floatingpoint.h, ieeefp.h, and
nan.h. Provide declarations for scm_inf_p, scm_nan_p, scn_inf,
and scm_nan.
* numbers.c: [SCO && ! HAVE_ISNAN] (isnan): New function.
[SCO && ! HAVE_ISINF] (isinf): New function.
(xisinf, xisnan): New functions.
(IS_INF): Delete.
(isfinite): Define in terms of xisinf.
(scm_inf_p, scm_nan_p): New functions.
(guile_Inf, guile_NaN): New file-scope vars.
(guile_ieee_init): New function.
(scm_inf, scm_nan): New functions.
(idbl2str): Handle Inf and NaN. Remove funny label and
corresponding gotos.
(ALLOW_DIVIDE_BY_ZERO): New macro.
(scm_divide): Allow division by zero to occur if
ALLOW_DIVIDE_BY_ZERO is defined.
Handle bignums and ints as special cases.
Additional stuff by me:
numbers.c (mem2ureal): Recognize "inf.0" and "nan.xxx".
(scm_even_p, scm_odd_p): Treat infinity as even and odd.
(iflo2str): Don't output a '+' for negative numbers or for Inf and
NaN. They will provide their own sign.
(scm_divide): Only allow divides by inexact zeros. Dividing by
exact zeros still signals an errors.
2002-05-06 22:33:10 +00:00
|
|
|
|
*p_idx = idx;
|
|
|
|
|
|
return scm_nan ();
|
|
|
|
|
|
}
|
|
|
|
|
|
|
2009-08-21 09:18:30 -07:00
|
|
|
|
if (scm_i_string_ref (mem, idx) == '.')
|
2001-07-30 19:35:15 +00:00
|
|
|
|
{
|
|
|
|
|
|
if (radix != 10)
|
|
|
|
|
|
return SCM_BOOL_F;
|
|
|
|
|
|
else if (idx + 1 == len)
|
|
|
|
|
|
return SCM_BOOL_F;
|
2009-08-21 09:18:30 -07:00
|
|
|
|
else if (!uc_is_property_decimal_digit ((scm_t_uint32) scm_i_string_ref (mem, idx+1)))
|
2001-07-30 19:35:15 +00:00
|
|
|
|
return SCM_BOOL_F;
|
|
|
|
|
|
else
|
2009-08-21 09:18:30 -07:00
|
|
|
|
result = mem2decimal_from_point (SCM_I_MAKINUM (0), mem,
|
2009-07-01 01:39:24 +01:00
|
|
|
|
p_idx, &x);
|
1999-01-10 07:38:39 +00:00
|
|
|
|
}
|
2001-07-30 19:35:15 +00:00
|
|
|
|
else
|
|
|
|
|
|
{
|
|
|
|
|
|
SCM uinteger;
|
|
|
|
|
|
|
2009-08-21 09:18:30 -07:00
|
|
|
|
uinteger = mem2uinteger (mem, &idx, radix, &x);
|
(scm_is_integer, scm_is_signed_integer, scm_is_unsigned_integer,
scm_to_signed_integer, scm_to_unsigned_integer, scm_to_schar,
scm_to_uchar, scm_to_char, scm_to_short, scm_to_ushort, scm_to_long,
scm_to_ulong, scm_to_size_t, scm_to_ssize_t, scm_from_schar,
scm_from_uchar, scm_from_char, scm_from_short, scm_from_ushort,
scm_from_int, scm_from_uint, scm_from_long, scm_from_ulong,
scm_from_size_t, scm_from_ssize_t, scm_is_real, scm_to_double,
scm_from_double): New.
* deprecated.h, boolean.h (SCM_FALSEP, SCM_NFALSEP, SCM_BOOL,
SCM_NEGATE_BOOL, SCM_BOOLP): Deprecated by moving into "deprecated.h".
Replaced all uses with scm_is_false, scm_is_true, scm_from_bool, and
scm_is_bool, respectively.
2004-07-06 10:23:30 +00:00
|
|
|
|
if (scm_is_false (uinteger))
|
2001-07-30 19:35:15 +00:00
|
|
|
|
return SCM_BOOL_F;
|
|
|
|
|
|
|
|
|
|
|
|
if (idx == len)
|
|
|
|
|
|
result = uinteger;
|
2009-08-21 09:18:30 -07:00
|
|
|
|
else if (scm_i_string_ref (mem, idx) == '/')
|
1999-01-10 07:38:39 +00:00
|
|
|
|
{
|
2001-07-30 19:35:15 +00:00
|
|
|
|
SCM divisor;
|
|
|
|
|
|
|
|
|
|
|
|
idx++;
|
2009-08-04 20:29:09 +02:00
|
|
|
|
if (idx == len)
|
|
|
|
|
|
return SCM_BOOL_F;
|
2001-07-30 19:35:15 +00:00
|
|
|
|
|
2009-08-21 09:18:30 -07:00
|
|
|
|
divisor = mem2uinteger (mem, &idx, radix, &x);
|
(scm_is_integer, scm_is_signed_integer, scm_is_unsigned_integer,
scm_to_signed_integer, scm_to_unsigned_integer, scm_to_schar,
scm_to_uchar, scm_to_char, scm_to_short, scm_to_ushort, scm_to_long,
scm_to_ulong, scm_to_size_t, scm_to_ssize_t, scm_from_schar,
scm_from_uchar, scm_from_char, scm_from_short, scm_from_ushort,
scm_from_int, scm_from_uint, scm_from_long, scm_from_ulong,
scm_from_size_t, scm_from_ssize_t, scm_is_real, scm_to_double,
scm_from_double): New.
* deprecated.h, boolean.h (SCM_FALSEP, SCM_NFALSEP, SCM_BOOL,
SCM_NEGATE_BOOL, SCM_BOOLP): Deprecated by moving into "deprecated.h".
Replaced all uses with scm_is_false, scm_is_true, scm_from_bool, and
scm_is_bool, respectively.
2004-07-06 10:23:30 +00:00
|
|
|
|
if (scm_is_false (divisor))
|
2001-07-30 19:35:15 +00:00
|
|
|
|
return SCM_BOOL_F;
|
|
|
|
|
|
|
* print.c (scm_iprin1): Handle fractions.
* objects.h (scm_class_fraction): New.
* objects.c (scm_class_fraction): New.
(scm_class_of): Handle fractions.
* hash.c (scm_hasher): Handle fractions.
* numbers.c: New code for handling fraction all over the place.
(scm_odd_p, scm_even_p): Handle inexact integers.
(scm_rational_p): New function, same as scm_real_p.
(scm_round_number, scm_truncate_number, scm_ceiling, scm_floor):
New exact functions that replace the inexact 'dsubr'
implementations.
(scm_numerator, scm_denominator): New.
* numbers.h (SCM_NUMP): Recognize fractions.
(SCM_FRACTIONP, SCM_SLOPPY_FRACTIONP, SCM_FRACTION_NUMERATOR,
SCM_FRACTION_DENOMINATOR, SCM_FRACTION_SET_NUMERATOR,
SCM_FRACTION_SET_DENOMINATOR, SCM_FRACTION_REDUCED_BIT,
SCM_FRACTION_REDUCED_SET, SCM_FRACTION_REDUCED_CLEAR,
SCM_FRACTION_REDUCED): New.
(scm_floor, scm_ceiling, scm_truncate_number, scm_round_number):
New prototypes.
(scm_make_ratio, scm_rationalize, scm_numerator, scm_denominator,
scm_rational_p): New prototypes.
(scm_i_dbl2num, scm_i_fraction2double, scm_i_fraction_equalp,
scm_i_print_fraction): New prototypes.
* goops.c (create_standard_classes): Create "<fraction>" class.
* gc-mark.c (scm_gc_mark_dependencies): Handle fractions.
* gc-card.c (scm_i_sweep_card): Include scm_tc16_fraction as a
case in the switch, but do nothing for now.
* eval.c (SCM_CEVAL, SCM_APPLY, call_dsubr_1): Convert fractions
to doubles when calling 'dsubr' functions.
* eq.c (scm_eqv_p, scm_equal_p): Handle fractions.
2003-11-18 19:59:53 +00:00
|
|
|
|
/* both are int/big here, I assume */
|
2004-08-03 15:55:42 +00:00
|
|
|
|
result = scm_i_make_ratio (uinteger, divisor);
|
1999-01-10 07:38:39 +00:00
|
|
|
|
}
|
2001-07-30 19:35:15 +00:00
|
|
|
|
else if (radix == 10)
|
|
|
|
|
|
{
|
2009-08-21 09:18:30 -07:00
|
|
|
|
result = mem2decimal_from_point (uinteger, mem, &idx, &x);
|
(scm_is_integer, scm_is_signed_integer, scm_is_unsigned_integer,
scm_to_signed_integer, scm_to_unsigned_integer, scm_to_schar,
scm_to_uchar, scm_to_char, scm_to_short, scm_to_ushort, scm_to_long,
scm_to_ulong, scm_to_size_t, scm_to_ssize_t, scm_from_schar,
scm_from_uchar, scm_from_char, scm_from_short, scm_from_ushort,
scm_from_int, scm_from_uint, scm_from_long, scm_from_ulong,
scm_from_size_t, scm_from_ssize_t, scm_is_real, scm_to_double,
scm_from_double): New.
* deprecated.h, boolean.h (SCM_FALSEP, SCM_NFALSEP, SCM_BOOL,
SCM_NEGATE_BOOL, SCM_BOOLP): Deprecated by moving into "deprecated.h".
Replaced all uses with scm_is_false, scm_is_true, scm_from_bool, and
scm_is_bool, respectively.
2004-07-06 10:23:30 +00:00
|
|
|
|
if (scm_is_false (result))
|
2001-07-30 19:35:15 +00:00
|
|
|
|
return SCM_BOOL_F;
|
|
|
|
|
|
}
|
|
|
|
|
|
else
|
|
|
|
|
|
result = uinteger;
|
|
|
|
|
|
|
|
|
|
|
|
*p_idx = idx;
|
1999-01-10 07:38:39 +00:00
|
|
|
|
}
|
2002-05-22 19:55:40 +00:00
|
|
|
|
|
2009-07-01 01:39:24 +01:00
|
|
|
|
/* Update *p_exactness if the number just read was inexact. This is
|
|
|
|
|
|
important for complex numbers, so that a complex number is
|
|
|
|
|
|
treated as inexact overall if either its real or imaginary part
|
|
|
|
|
|
is inexact.
|
|
|
|
|
|
*/
|
|
|
|
|
|
if (x == INEXACT)
|
|
|
|
|
|
*p_exactness = x;
|
|
|
|
|
|
|
2002-05-22 19:55:40 +00:00
|
|
|
|
/* When returning an inexact zero, make sure it is represented as a
|
|
|
|
|
|
floating point value so that we can change its sign.
|
|
|
|
|
|
*/
|
2004-07-27 15:41:49 +00:00
|
|
|
|
if (scm_is_eq (result, SCM_I_MAKINUM(0)) && *p_exactness == INEXACT)
|
(scm_is_rational): New.
(scm_i_short2big, scm_i_int2big, scm_i_uint2big, scm_i_size2big,
scm_i_ptrdiff2big, scm_i_long_long2big, scm_i_ulong_long2big):
Removed prototypes.
(scm_make_real, scm_num2dbl, scm_float2num, scm_double2num):
Discouraged by moving to discouraged.h and discouraged.c.
Replaced all uses with scm_from_double.
(scm_num2float, scm_num2double): Discouraged by moving prototype
to discouraged.h and rewriting in terms of scm_to_double.
Replaced all uses with scm_to_double.
(scm_to_double): Do not implement in terms of scm_num2dbl, use
explicit code.
(scm_from_double): Do not implement in terms of scm_make_real, use
explicit code.
2004-08-03 15:03:35 +00:00
|
|
|
|
result = scm_from_double (0.0);
|
2002-05-22 19:55:40 +00:00
|
|
|
|
|
|
|
|
|
|
return result;
|
2001-07-30 19:35:15 +00:00
|
|
|
|
}
|
1996-07-25 22:56:11 +00:00
|
|
|
|
|
|
|
|
|
|
|
2001-07-30 19:35:15 +00:00
|
|
|
|
/* R5RS, section 7.1.1, lexical structure of numbers: <complex R> */
|
1996-07-25 22:56:11 +00:00
|
|
|
|
|
2001-07-30 19:35:15 +00:00
|
|
|
|
static SCM
|
2009-08-21 09:18:30 -07:00
|
|
|
|
mem2complex (SCM mem, unsigned int idx,
|
2001-07-30 19:35:15 +00:00
|
|
|
|
unsigned int radix, enum t_exactness *p_exactness)
|
|
|
|
|
|
{
|
2009-08-21 09:18:30 -07:00
|
|
|
|
scm_t_wchar c;
|
2001-07-30 19:35:15 +00:00
|
|
|
|
int sign = 0;
|
|
|
|
|
|
SCM ureal;
|
2009-08-21 09:18:30 -07:00
|
|
|
|
size_t len = scm_i_string_length (mem);
|
2001-07-30 19:35:15 +00:00
|
|
|
|
|
|
|
|
|
|
if (idx == len)
|
|
|
|
|
|
return SCM_BOOL_F;
|
|
|
|
|
|
|
2009-08-21 09:18:30 -07:00
|
|
|
|
c = scm_i_string_ref (mem, idx);
|
2001-07-30 19:35:15 +00:00
|
|
|
|
if (c == '+')
|
|
|
|
|
|
{
|
|
|
|
|
|
idx++;
|
|
|
|
|
|
sign = 1;
|
|
|
|
|
|
}
|
|
|
|
|
|
else if (c == '-')
|
|
|
|
|
|
{
|
|
|
|
|
|
idx++;
|
|
|
|
|
|
sign = -1;
|
1996-07-25 22:56:11 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
2001-07-30 19:35:15 +00:00
|
|
|
|
if (idx == len)
|
|
|
|
|
|
return SCM_BOOL_F;
|
|
|
|
|
|
|
2009-08-21 09:18:30 -07:00
|
|
|
|
ureal = mem2ureal (mem, &idx, radix, p_exactness);
|
(scm_is_integer, scm_is_signed_integer, scm_is_unsigned_integer,
scm_to_signed_integer, scm_to_unsigned_integer, scm_to_schar,
scm_to_uchar, scm_to_char, scm_to_short, scm_to_ushort, scm_to_long,
scm_to_ulong, scm_to_size_t, scm_to_ssize_t, scm_from_schar,
scm_from_uchar, scm_from_char, scm_from_short, scm_from_ushort,
scm_from_int, scm_from_uint, scm_from_long, scm_from_ulong,
scm_from_size_t, scm_from_ssize_t, scm_is_real, scm_to_double,
scm_from_double): New.
* deprecated.h, boolean.h (SCM_FALSEP, SCM_NFALSEP, SCM_BOOL,
SCM_NEGATE_BOOL, SCM_BOOLP): Deprecated by moving into "deprecated.h".
Replaced all uses with scm_is_false, scm_is_true, scm_from_bool, and
scm_is_bool, respectively.
2004-07-06 10:23:30 +00:00
|
|
|
|
if (scm_is_false (ureal))
|
1999-01-10 07:38:39 +00:00
|
|
|
|
{
|
2001-07-30 19:35:15 +00:00
|
|
|
|
/* input must be either +i or -i */
|
|
|
|
|
|
|
|
|
|
|
|
if (sign == 0)
|
|
|
|
|
|
return SCM_BOOL_F;
|
|
|
|
|
|
|
2009-08-21 09:18:30 -07:00
|
|
|
|
if (scm_i_string_ref (mem, idx) == 'i'
|
|
|
|
|
|
|| scm_i_string_ref (mem, idx) == 'I')
|
1999-01-10 07:38:39 +00:00
|
|
|
|
{
|
2001-07-30 19:35:15 +00:00
|
|
|
|
idx++;
|
|
|
|
|
|
if (idx != len)
|
|
|
|
|
|
return SCM_BOOL_F;
|
|
|
|
|
|
|
2004-07-08 15:54:05 +00:00
|
|
|
|
return scm_make_rectangular (SCM_I_MAKINUM (0), SCM_I_MAKINUM (sign));
|
1999-01-10 07:38:39 +00:00
|
|
|
|
}
|
2001-07-30 19:35:15 +00:00
|
|
|
|
else
|
|
|
|
|
|
return SCM_BOOL_F;
|
1996-07-25 22:56:11 +00:00
|
|
|
|
}
|
2001-07-30 19:35:15 +00:00
|
|
|
|
else
|
|
|
|
|
|
{
|
(scm_is_integer, scm_is_signed_integer, scm_is_unsigned_integer,
scm_to_signed_integer, scm_to_unsigned_integer, scm_to_schar,
scm_to_uchar, scm_to_char, scm_to_short, scm_to_ushort, scm_to_long,
scm_to_ulong, scm_to_size_t, scm_to_ssize_t, scm_from_schar,
scm_from_uchar, scm_from_char, scm_from_short, scm_from_ushort,
scm_from_int, scm_from_uint, scm_from_long, scm_from_ulong,
scm_from_size_t, scm_from_ssize_t, scm_is_real, scm_to_double,
scm_from_double): New.
* deprecated.h, boolean.h (SCM_FALSEP, SCM_NFALSEP, SCM_BOOL,
SCM_NEGATE_BOOL, SCM_BOOLP): Deprecated by moving into "deprecated.h".
Replaced all uses with scm_is_false, scm_is_true, scm_from_bool, and
scm_is_bool, respectively.
2004-07-06 10:23:30 +00:00
|
|
|
|
if (sign == -1 && scm_is_false (scm_nan_p (ureal)))
|
2001-07-30 19:35:15 +00:00
|
|
|
|
ureal = scm_difference (ureal, SCM_UNDEFINED);
|
1999-01-10 07:38:39 +00:00
|
|
|
|
|
2001-07-30 19:35:15 +00:00
|
|
|
|
if (idx == len)
|
|
|
|
|
|
return ureal;
|
|
|
|
|
|
|
2009-08-21 09:18:30 -07:00
|
|
|
|
c = scm_i_string_ref (mem, idx);
|
2001-07-30 19:35:15 +00:00
|
|
|
|
switch (c)
|
1999-01-10 07:38:39 +00:00
|
|
|
|
{
|
2001-07-30 19:35:15 +00:00
|
|
|
|
case 'i': case 'I':
|
|
|
|
|
|
/* either +<ureal>i or -<ureal>i */
|
|
|
|
|
|
|
|
|
|
|
|
idx++;
|
|
|
|
|
|
if (sign == 0)
|
|
|
|
|
|
return SCM_BOOL_F;
|
|
|
|
|
|
if (idx != len)
|
|
|
|
|
|
return SCM_BOOL_F;
|
2004-07-08 15:54:05 +00:00
|
|
|
|
return scm_make_rectangular (SCM_I_MAKINUM (0), ureal);
|
2001-07-30 19:35:15 +00:00
|
|
|
|
|
|
|
|
|
|
case '@':
|
|
|
|
|
|
/* polar input: <real>@<real>. */
|
|
|
|
|
|
|
|
|
|
|
|
idx++;
|
|
|
|
|
|
if (idx == len)
|
|
|
|
|
|
return SCM_BOOL_F;
|
|
|
|
|
|
else
|
1999-01-10 07:38:39 +00:00
|
|
|
|
{
|
2001-07-30 19:35:15 +00:00
|
|
|
|
int sign;
|
|
|
|
|
|
SCM angle;
|
|
|
|
|
|
SCM result;
|
|
|
|
|
|
|
2009-08-21 09:18:30 -07:00
|
|
|
|
c = scm_i_string_ref (mem, idx);
|
2001-07-30 19:35:15 +00:00
|
|
|
|
if (c == '+')
|
|
|
|
|
|
{
|
|
|
|
|
|
idx++;
|
2009-08-04 20:29:09 +02:00
|
|
|
|
if (idx == len)
|
|
|
|
|
|
return SCM_BOOL_F;
|
2001-07-30 19:35:15 +00:00
|
|
|
|
sign = 1;
|
|
|
|
|
|
}
|
|
|
|
|
|
else if (c == '-')
|
|
|
|
|
|
{
|
|
|
|
|
|
idx++;
|
2009-08-04 20:29:09 +02:00
|
|
|
|
if (idx == len)
|
|
|
|
|
|
return SCM_BOOL_F;
|
2001-07-30 19:35:15 +00:00
|
|
|
|
sign = -1;
|
|
|
|
|
|
}
|
|
|
|
|
|
else
|
|
|
|
|
|
sign = 1;
|
|
|
|
|
|
|
2009-08-21 09:18:30 -07:00
|
|
|
|
angle = mem2ureal (mem, &idx, radix, p_exactness);
|
(scm_is_integer, scm_is_signed_integer, scm_is_unsigned_integer,
scm_to_signed_integer, scm_to_unsigned_integer, scm_to_schar,
scm_to_uchar, scm_to_char, scm_to_short, scm_to_ushort, scm_to_long,
scm_to_ulong, scm_to_size_t, scm_to_ssize_t, scm_from_schar,
scm_from_uchar, scm_from_char, scm_from_short, scm_from_ushort,
scm_from_int, scm_from_uint, scm_from_long, scm_from_ulong,
scm_from_size_t, scm_from_ssize_t, scm_is_real, scm_to_double,
scm_from_double): New.
* deprecated.h, boolean.h (SCM_FALSEP, SCM_NFALSEP, SCM_BOOL,
SCM_NEGATE_BOOL, SCM_BOOLP): Deprecated by moving into "deprecated.h".
Replaced all uses with scm_is_false, scm_is_true, scm_from_bool, and
scm_is_bool, respectively.
2004-07-06 10:23:30 +00:00
|
|
|
|
if (scm_is_false (angle))
|
2001-07-30 19:35:15 +00:00
|
|
|
|
return SCM_BOOL_F;
|
|
|
|
|
|
if (idx != len)
|
|
|
|
|
|
return SCM_BOOL_F;
|
|
|
|
|
|
|
(scm_is_integer, scm_is_signed_integer, scm_is_unsigned_integer,
scm_to_signed_integer, scm_to_unsigned_integer, scm_to_schar,
scm_to_uchar, scm_to_char, scm_to_short, scm_to_ushort, scm_to_long,
scm_to_ulong, scm_to_size_t, scm_to_ssize_t, scm_from_schar,
scm_from_uchar, scm_from_char, scm_from_short, scm_from_ushort,
scm_from_int, scm_from_uint, scm_from_long, scm_from_ulong,
scm_from_size_t, scm_from_ssize_t, scm_is_real, scm_to_double,
scm_from_double): New.
* deprecated.h, boolean.h (SCM_FALSEP, SCM_NFALSEP, SCM_BOOL,
SCM_NEGATE_BOOL, SCM_BOOLP): Deprecated by moving into "deprecated.h".
Replaced all uses with scm_is_false, scm_is_true, scm_from_bool, and
scm_is_bool, respectively.
2004-07-06 10:23:30 +00:00
|
|
|
|
if (sign == -1 && scm_is_false (scm_nan_p (ureal)))
|
2001-07-30 19:35:15 +00:00
|
|
|
|
angle = scm_difference (angle, SCM_UNDEFINED);
|
|
|
|
|
|
|
|
|
|
|
|
result = scm_make_polar (ureal, angle);
|
|
|
|
|
|
return result;
|
1999-01-10 07:38:39 +00:00
|
|
|
|
}
|
2001-07-30 19:35:15 +00:00
|
|
|
|
case '+':
|
|
|
|
|
|
case '-':
|
|
|
|
|
|
/* expecting input matching <real>[+-]<ureal>?i */
|
1996-07-25 22:56:11 +00:00
|
|
|
|
|
2001-07-30 19:35:15 +00:00
|
|
|
|
idx++;
|
|
|
|
|
|
if (idx == len)
|
|
|
|
|
|
return SCM_BOOL_F;
|
|
|
|
|
|
else
|
|
|
|
|
|
{
|
|
|
|
|
|
int sign = (c == '+') ? 1 : -1;
|
2009-08-21 09:18:30 -07:00
|
|
|
|
SCM imag = mem2ureal (mem, &idx, radix, p_exactness);
|
1996-07-25 22:56:11 +00:00
|
|
|
|
|
(scm_is_integer, scm_is_signed_integer, scm_is_unsigned_integer,
scm_to_signed_integer, scm_to_unsigned_integer, scm_to_schar,
scm_to_uchar, scm_to_char, scm_to_short, scm_to_ushort, scm_to_long,
scm_to_ulong, scm_to_size_t, scm_to_ssize_t, scm_from_schar,
scm_from_uchar, scm_from_char, scm_from_short, scm_from_ushort,
scm_from_int, scm_from_uint, scm_from_long, scm_from_ulong,
scm_from_size_t, scm_from_ssize_t, scm_is_real, scm_to_double,
scm_from_double): New.
* deprecated.h, boolean.h (SCM_FALSEP, SCM_NFALSEP, SCM_BOOL,
SCM_NEGATE_BOOL, SCM_BOOLP): Deprecated by moving into "deprecated.h".
Replaced all uses with scm_is_false, scm_is_true, scm_from_bool, and
scm_is_bool, respectively.
2004-07-06 10:23:30 +00:00
|
|
|
|
if (scm_is_false (imag))
|
2004-07-08 15:54:05 +00:00
|
|
|
|
imag = SCM_I_MAKINUM (sign);
|
(scm_is_integer, scm_is_signed_integer, scm_is_unsigned_integer,
scm_to_signed_integer, scm_to_unsigned_integer, scm_to_schar,
scm_to_uchar, scm_to_char, scm_to_short, scm_to_ushort, scm_to_long,
scm_to_ulong, scm_to_size_t, scm_to_ssize_t, scm_from_schar,
scm_from_uchar, scm_from_char, scm_from_short, scm_from_ushort,
scm_from_int, scm_from_uint, scm_from_long, scm_from_ulong,
scm_from_size_t, scm_from_ssize_t, scm_is_real, scm_to_double,
scm_from_double): New.
* deprecated.h, boolean.h (SCM_FALSEP, SCM_NFALSEP, SCM_BOOL,
SCM_NEGATE_BOOL, SCM_BOOLP): Deprecated by moving into "deprecated.h".
Replaced all uses with scm_is_false, scm_is_true, scm_from_bool, and
scm_is_bool, respectively.
2004-07-06 10:23:30 +00:00
|
|
|
|
else if (sign == -1 && scm_is_false (scm_nan_p (ureal)))
|
2001-10-13 12:39:26 +00:00
|
|
|
|
imag = scm_difference (imag, SCM_UNDEFINED);
|
1996-07-25 22:56:11 +00:00
|
|
|
|
|
2001-07-30 19:35:15 +00:00
|
|
|
|
if (idx == len)
|
|
|
|
|
|
return SCM_BOOL_F;
|
2009-08-21 09:18:30 -07:00
|
|
|
|
if (scm_i_string_ref (mem, idx) != 'i'
|
|
|
|
|
|
&& scm_i_string_ref (mem, idx) != 'I')
|
2001-07-30 19:35:15 +00:00
|
|
|
|
return SCM_BOOL_F;
|
1996-07-25 22:56:11 +00:00
|
|
|
|
|
2001-07-30 19:35:15 +00:00
|
|
|
|
idx++;
|
|
|
|
|
|
if (idx != len)
|
|
|
|
|
|
return SCM_BOOL_F;
|
1996-07-25 22:56:11 +00:00
|
|
|
|
|
2001-10-13 12:39:26 +00:00
|
|
|
|
return scm_make_rectangular (ureal, imag);
|
2001-07-30 19:35:15 +00:00
|
|
|
|
}
|
|
|
|
|
|
default:
|
|
|
|
|
|
return SCM_BOOL_F;
|
|
|
|
|
|
}
|
|
|
|
|
|
}
|
1996-07-25 22:56:11 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
2001-07-30 19:35:15 +00:00
|
|
|
|
/* R5RS, section 7.1.1, lexical structure of numbers: <number> */
|
|
|
|
|
|
|
|
|
|
|
|
enum t_radix {NO_RADIX=0, DUAL=2, OCT=8, DEC=10, HEX=16};
|
* __scm.h, alist.c, alist.h, append.c, append.h, appinit.c,
arbiters.c, arbiters.h, async.c, async.h, boolean.c, boolean.h,
chars.c, chars.h, continuations.c, continuations.h, debug.c,
debug.h, dynwind.c, dynwind.h, eq.c, eq.h, error.c, eval.c,
eval.h, extchrs.c, extchrs.h, fdsocket.c, fdsocket.h, filesys.c,
filesys.h, fports.c, fports.h, gc.c, gdb_interface.h, gdbint.c,
gdbint.h, genio.c, genio.h, gscm.c, gscm.h, gsubr.c, gsubr.h,
hash.c, hash.h, hashtab.c, hashtab.h, init.c, ioext.c, ioext.h,
kw.c, kw.h, libguile.h, mallocs.c, mallocs.h, markers.c,
markers.h, mbstrings.c, mbstrings.h, numbers.c, numbers.h,
objprop.c, objprop.h, options.c, options.h, pairs.c, pairs.h,
ports.c, ports.h, posix.c, posix.h, print.c, print.h, procprop.c,
procprop.h, procs.c, procs.h, ramap.c, ramap.h, read.c, read.h,
root.c, scmsigs.c, scmsigs.h, sequences.c, sequences.h, simpos.c,
simpos.h, smob.c, socket.c, socket.h, srcprop.c, srcprop.h,
stackchk.c, stackchk.h, stime.c, stime.h, strings.c, strings.h,
strop.c, strop.h, strorder.c, strorder.h, strports.c, strports.h,
struct.c, struct.h, symbols.c, symbols.h, tag.c, tag.h, unif.c,
unif.h, variable.c, variable.h, vectors.c, vectors.h, version.c,
version.h, vports.c, vports.h, weaks.c, weaks.h: Use SCM_P to
declare functions with prototypes. (Patch thanks to Marius
Vollmer.)
1996-10-14 01:33:50 +00:00
|
|
|
|
|
1996-07-25 22:56:11 +00:00
|
|
|
|
SCM
|
2009-08-21 09:18:30 -07:00
|
|
|
|
scm_i_string_to_number (SCM mem, unsigned int default_radix)
|
1996-07-25 22:56:11 +00:00
|
|
|
|
{
|
2001-07-30 19:35:15 +00:00
|
|
|
|
unsigned int idx = 0;
|
|
|
|
|
|
unsigned int radix = NO_RADIX;
|
|
|
|
|
|
enum t_exactness forced_x = NO_EXACTNESS;
|
|
|
|
|
|
enum t_exactness implicit_x = EXACT;
|
|
|
|
|
|
SCM result;
|
2009-08-21 09:18:30 -07:00
|
|
|
|
size_t len = scm_i_string_length (mem);
|
2001-07-30 19:35:15 +00:00
|
|
|
|
|
|
|
|
|
|
/* R5RS, section 7.1.1, lexical structure of numbers: <prefix R> */
|
2009-08-21 09:18:30 -07:00
|
|
|
|
while (idx + 2 < len && scm_i_string_ref (mem, idx) == '#')
|
2001-07-30 19:35:15 +00:00
|
|
|
|
{
|
2009-08-21 09:18:30 -07:00
|
|
|
|
switch (scm_i_string_ref (mem, idx + 1))
|
2001-07-30 19:35:15 +00:00
|
|
|
|
{
|
|
|
|
|
|
case 'b': case 'B':
|
|
|
|
|
|
if (radix != NO_RADIX)
|
|
|
|
|
|
return SCM_BOOL_F;
|
|
|
|
|
|
radix = DUAL;
|
|
|
|
|
|
break;
|
|
|
|
|
|
case 'd': case 'D':
|
|
|
|
|
|
if (radix != NO_RADIX)
|
|
|
|
|
|
return SCM_BOOL_F;
|
|
|
|
|
|
radix = DEC;
|
|
|
|
|
|
break;
|
|
|
|
|
|
case 'i': case 'I':
|
|
|
|
|
|
if (forced_x != NO_EXACTNESS)
|
|
|
|
|
|
return SCM_BOOL_F;
|
|
|
|
|
|
forced_x = INEXACT;
|
|
|
|
|
|
break;
|
|
|
|
|
|
case 'e': case 'E':
|
|
|
|
|
|
if (forced_x != NO_EXACTNESS)
|
|
|
|
|
|
return SCM_BOOL_F;
|
|
|
|
|
|
forced_x = EXACT;
|
|
|
|
|
|
break;
|
|
|
|
|
|
case 'o': case 'O':
|
|
|
|
|
|
if (radix != NO_RADIX)
|
|
|
|
|
|
return SCM_BOOL_F;
|
|
|
|
|
|
radix = OCT;
|
|
|
|
|
|
break;
|
|
|
|
|
|
case 'x': case 'X':
|
|
|
|
|
|
if (radix != NO_RADIX)
|
|
|
|
|
|
return SCM_BOOL_F;
|
|
|
|
|
|
radix = HEX;
|
|
|
|
|
|
break;
|
|
|
|
|
|
default:
|
1999-01-10 07:38:39 +00:00
|
|
|
|
return SCM_BOOL_F;
|
2001-07-30 19:35:15 +00:00
|
|
|
|
}
|
|
|
|
|
|
idx += 2;
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/* R5RS, section 7.1.1, lexical structure of numbers: <complex R> */
|
|
|
|
|
|
if (radix == NO_RADIX)
|
2009-08-21 09:18:30 -07:00
|
|
|
|
result = mem2complex (mem, idx, default_radix, &implicit_x);
|
2001-07-30 19:35:15 +00:00
|
|
|
|
else
|
2009-08-21 09:18:30 -07:00
|
|
|
|
result = mem2complex (mem, idx, (unsigned int) radix, &implicit_x);
|
2001-07-30 19:35:15 +00:00
|
|
|
|
|
(scm_is_integer, scm_is_signed_integer, scm_is_unsigned_integer,
scm_to_signed_integer, scm_to_unsigned_integer, scm_to_schar,
scm_to_uchar, scm_to_char, scm_to_short, scm_to_ushort, scm_to_long,
scm_to_ulong, scm_to_size_t, scm_to_ssize_t, scm_from_schar,
scm_from_uchar, scm_from_char, scm_from_short, scm_from_ushort,
scm_from_int, scm_from_uint, scm_from_long, scm_from_ulong,
scm_from_size_t, scm_from_ssize_t, scm_is_real, scm_to_double,
scm_from_double): New.
* deprecated.h, boolean.h (SCM_FALSEP, SCM_NFALSEP, SCM_BOOL,
SCM_NEGATE_BOOL, SCM_BOOLP): Deprecated by moving into "deprecated.h".
Replaced all uses with scm_is_false, scm_is_true, scm_from_bool, and
scm_is_bool, respectively.
2004-07-06 10:23:30 +00:00
|
|
|
|
if (scm_is_false (result))
|
2001-07-30 19:35:15 +00:00
|
|
|
|
return SCM_BOOL_F;
|
1999-01-10 07:38:39 +00:00
|
|
|
|
|
2001-07-30 19:35:15 +00:00
|
|
|
|
switch (forced_x)
|
1999-01-10 07:38:39 +00:00
|
|
|
|
{
|
2001-07-30 19:35:15 +00:00
|
|
|
|
case EXACT:
|
|
|
|
|
|
if (SCM_INEXACTP (result))
|
|
|
|
|
|
return scm_inexact_to_exact (result);
|
|
|
|
|
|
else
|
|
|
|
|
|
return result;
|
|
|
|
|
|
case INEXACT:
|
|
|
|
|
|
if (SCM_INEXACTP (result))
|
|
|
|
|
|
return result;
|
|
|
|
|
|
else
|
|
|
|
|
|
return scm_exact_to_inexact (result);
|
|
|
|
|
|
case NO_EXACTNESS:
|
|
|
|
|
|
default:
|
|
|
|
|
|
if (implicit_x == INEXACT)
|
|
|
|
|
|
{
|
|
|
|
|
|
if (SCM_INEXACTP (result))
|
|
|
|
|
|
return result;
|
|
|
|
|
|
else
|
|
|
|
|
|
return scm_exact_to_inexact (result);
|
|
|
|
|
|
}
|
|
|
|
|
|
else
|
|
|
|
|
|
return result;
|
1999-01-10 07:38:39 +00:00
|
|
|
|
}
|
1996-07-25 22:56:11 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
2009-08-21 09:18:30 -07:00
|
|
|
|
SCM
|
|
|
|
|
|
scm_c_locale_stringn_to_number (const char* mem, size_t len,
|
|
|
|
|
|
unsigned int default_radix)
|
|
|
|
|
|
{
|
|
|
|
|
|
SCM str = scm_from_locale_stringn (mem, len);
|
|
|
|
|
|
|
|
|
|
|
|
return scm_i_string_to_number (str, default_radix);
|
|
|
|
|
|
}
|
|
|
|
|
|
|
1996-07-25 22:56:11 +00:00
|
|
|
|
|
2000-01-05 19:05:23 +00:00
|
|
|
|
SCM_DEFINE (scm_string_to_number, "string->number", 1, 1, 0,
|
2000-05-09 16:55:54 +00:00
|
|
|
|
(SCM string, SCM radix),
|
2001-04-03 13:19:05 +00:00
|
|
|
|
"Return a number of the maximally precise representation\n"
|
* vectors.c (s_scm_vector_p, list->vector, scm_vector)
(scm_vector_ref, scm_vector_set_x, scm_vector_to_list)
(scm_vector_fill_x), strorder.c (scm_string_equal_p)
(scm_string_ci_equal_p, scm_string_less_p, scm_string_leq_p)
(scm_string_gr_p, scm_string_geq_p, scm_string_ci_less_p)
(scm_string_ci_geq_p), symbols.c (scm_symbol_p)
(scm_symbol_to_string, scm_string_to_symbol): Changed use of @t{}
to @code{} as the texinfo manual recommends, converted the
examples to use a @lisp{}-environment.
* strports.c (scm_eval_string): Cleaned up the docstring.
* struct.c (scm_struct_p, scm_struct_vtable_p): Added texinfo
markup.
* numbers.c (scm_exact_p, scm_odd_p, scm_even_p)
(scm_number_to_string, scm_string_to_number, scm_number_p)
(scm_real_p, scm_integer_p, scm_inexact_p, scm_make_rectangular)
(scm_make_polar, scm_inexact_to_exact): Added texinfo markup.
(scm_ash): Added texinfo markup and removed obsolete @refill.
(scm_gr_p): Corrected comment.
(scm_gr_p, scm_leq_p, scm_geq_p): Added texinfo markup to (future
docstring) comments.
(scm_positive_p, scm_less_p, scm_num_eq_p, scm_real_p)
(scm_number_p, scm_negative_p, scm_max, scm_min, scm_sum)
(scm_difference, scm_product, scm_divide, scm_asinh, scm_acosh)
(scm_atanh, scm_truncate, scm_round, scm_exact_to_inexact)
(floor, ceiling, $sqrt, $abs, $exp, $log, $sin, $cos, $tan, $asin)
($acos, $atan, $sinh, $cosh, $tanh, scm_real_part, scm_imag_part)
(scm_magnitude, scm_angle, scm_abs, scm_quotient, scm_remainder)
(scm_modulo, scm_gcd, scm_lcm): Added (future docstring) comments.
2001-03-02 09:07:22 +00:00
|
|
|
|
"expressed by the given @var{string}. @var{radix} must be an\n"
|
* list.c (scm_list, scm_cons_star, scm_null_p, scm_list_p),
(scm_length, scm_append, scm_reverse, scm_list_ref),
(scm_memq, scm_memv, scm_member, scm_delv_x, scm_delete_x),
(scm_delq, scm_delv, scm_delete, scm_delq1_x, scm_delv1_x),
(scm_delete1_x), gc.c (scm_map_free_list),
(scm_free_list_length), hash.c (scm_hashq, scm_hashv),
(scm_hash), hashtab.c (scm_hashq_ref, scm_hashq_set_x),
(scm_hashq_remove_x, scm_hashv_ref, scm_hashv_set_x),
(scm_hashv_remove_x, scm_hash_ref, scm_hash_set_x),
(scm_hash_remove_x), ports.c (scm_pt_size, scm_pt_member), print.c
(scm_current_pstate), scmsigs.c (scm_usleep), goops.c
(scm_get_keyword, scm_sys_compute_slots): Added texinfo markup.
* weaks.c (scm_weak_vector_p, scm_weak_key_hash_table_p),
(scm_weak_value_hash_table_p, scm_doubly_weak_hash_table_p),
rdelim.c (scm_read_delimited_x), strop.c (scm_string_index),
symbols.c (scm_symbol_interned_p), numbers.c
(scm_string_to_number), ports.c (scm_port_p): Corrected texinfo
markup.
2001-03-16 10:00:17 +00:00
|
|
|
|
"exact integer, either 2, 8, 10, or 16. If supplied, @var{radix}\n"
|
|
|
|
|
|
"is a default radix that may be overridden by an explicit radix\n"
|
|
|
|
|
|
"prefix in @var{string} (e.g. \"#o177\"). If @var{radix} is not\n"
|
|
|
|
|
|
"supplied, then the default radix is 10. If string is not a\n"
|
|
|
|
|
|
"syntactically valid notation for a number, then\n"
|
|
|
|
|
|
"@code{string->number} returns @code{#f}.")
|
1999-12-12 02:36:16 +00:00
|
|
|
|
#define FUNC_NAME s_scm_string_to_number
|
1996-07-25 22:56:11 +00:00
|
|
|
|
{
|
|
|
|
|
|
SCM answer;
|
(scm_to_signed_integer, scm_to_unsigned_integer): dot
not accept inexact integers.
* validate.h, deprecated.h (SCM_VALIDATE_INUM, SCM_VALIDATE_INUM_COPY,
SCM_VALIDATE_BIGINT, SCM_VALIDATE_INUM_MIN,
SCM_VALIDATE_INUM_MIN_COPY,
SCM_VALIDATE_INUM_MIN_DEF_COPY,SCM_VALIDATE_INUM_DEF,
SCM_VALIDATE_INUM_DEF_COPY, SCM_VALIDATE_INUM_RANGE,
SCM_VALIDATE_INUM_RANGE_COPY): Deprecated because they make the
fixnum/bignum distinction visible. Changed all uses to scm_to_size_t
or similar.
2004-07-10 13:55:04 +00:00
|
|
|
|
unsigned int base;
|
2000-10-30 11:42:26 +00:00
|
|
|
|
SCM_VALIDATE_STRING (1, string);
|
(scm_to_signed_integer, scm_to_unsigned_integer): dot
not accept inexact integers.
* validate.h, deprecated.h (SCM_VALIDATE_INUM, SCM_VALIDATE_INUM_COPY,
SCM_VALIDATE_BIGINT, SCM_VALIDATE_INUM_MIN,
SCM_VALIDATE_INUM_MIN_COPY,
SCM_VALIDATE_INUM_MIN_DEF_COPY,SCM_VALIDATE_INUM_DEF,
SCM_VALIDATE_INUM_DEF_COPY, SCM_VALIDATE_INUM_RANGE,
SCM_VALIDATE_INUM_RANGE_COPY): Deprecated because they make the
fixnum/bignum distinction visible. Changed all uses to scm_to_size_t
or similar.
2004-07-10 13:55:04 +00:00
|
|
|
|
|
|
|
|
|
|
if (SCM_UNBNDP (radix))
|
|
|
|
|
|
base = 10;
|
|
|
|
|
|
else
|
|
|
|
|
|
base = scm_to_unsigned_integer (radix, 2, INT_MAX);
|
|
|
|
|
|
|
2009-08-21 09:18:30 -07:00
|
|
|
|
answer = scm_i_string_to_number (string, base);
|
* socket.c, rw.c, deprecated.h, validate.h
(SCM_VALIDATE_STRING_COPY): Deprecated. Replaced all uses with
SCM_VALIDATE_STRING plus SCM_I_STRING_CHARS or
scm_to_locale_string, etc.
(SCM_VALIDATE_SUBSTRING_SPEC_COPY): Deprecated. Replaced as
above, plus scm_i_get_substring_spec.
* regex-posix.c, read.c, random.c, ramap.c, print.c, numbers.c,
hash.c, gc.c, gc-card.c, convert.i.c, backtrace.c, strop.c,
strorder.c, strports.c, struct.c, symbols.c, unif.c, ports.c: Use
SCM_I_STRING_CHARS, SCM_I_STRING_UCHARS, and SCM_I_STRING_LENGTH
instead of SCM_STRING_CHARS, SCM_STRING_UCHARS, and
SCM_STRING_LENGTH, respectively. Also, replaced scm_return_first
with more explicit scm_remember_upto_here_1, etc, or introduced
them in the first place.
2004-08-12 17:45:03 +00:00
|
|
|
|
scm_remember_upto_here_1 (string);
|
|
|
|
|
|
return answer;
|
1996-07-25 22:56:11 +00:00
|
|
|
|
}
|
1999-12-12 02:36:16 +00:00
|
|
|
|
#undef FUNC_NAME
|
2001-07-30 19:35:15 +00:00
|
|
|
|
|
|
|
|
|
|
|
1996-07-25 22:56:11 +00:00
|
|
|
|
/*** END strs->nums ***/
|
|
|
|
|
|
|
2000-05-10 13:42:23 +00:00
|
|
|
|
|
1996-07-25 22:56:11 +00:00
|
|
|
|
SCM
|
1999-12-12 02:36:16 +00:00
|
|
|
|
scm_bigequal (SCM x, SCM y)
|
1996-07-25 22:56:11 +00:00
|
|
|
|
{
|
2003-09-17 21:03:26 +00:00
|
|
|
|
int result = mpz_cmp (SCM_I_BIG_MPZ (x), SCM_I_BIG_MPZ (y));
|
2003-04-04 21:49:44 +00:00
|
|
|
|
scm_remember_upto_here_2 (x, y);
|
(scm_is_integer, scm_is_signed_integer, scm_is_unsigned_integer,
scm_to_signed_integer, scm_to_unsigned_integer, scm_to_schar,
scm_to_uchar, scm_to_char, scm_to_short, scm_to_ushort, scm_to_long,
scm_to_ulong, scm_to_size_t, scm_to_ssize_t, scm_from_schar,
scm_from_uchar, scm_from_char, scm_from_short, scm_from_ushort,
scm_from_int, scm_from_uint, scm_from_long, scm_from_ulong,
scm_from_size_t, scm_from_ssize_t, scm_is_real, scm_to_double,
scm_from_double): New.
* deprecated.h, boolean.h (SCM_FALSEP, SCM_NFALSEP, SCM_BOOL,
SCM_NEGATE_BOOL, SCM_BOOLP): Deprecated by moving into "deprecated.h".
Replaced all uses with scm_is_false, scm_is_true, scm_from_bool, and
scm_is_bool, respectively.
2004-07-06 10:23:30 +00:00
|
|
|
|
return scm_from_bool (0 == result);
|
1996-07-25 22:56:11 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
SCM
|
* __scm.h eq.c, eval.c, gc.c, hc.h, gh_data, hash.c, numbers.c,
numbers.h, objects.c, ramap.c, random.c, unif.c, unif.h: Extensive
rewrite of handling of real and complex numbers.
(SCM_FLOATS, SCM_SINGLES): These #ifdef conditionals have been
removed along with the support for floats. (Float vectors are
still supported.)
* numbers.c (scm_floprint, scm_floequal): Removed.
(scm_print_real, scm_print_complex, scm_real_equalp,
scm_complex_equalp): New functions.
* numbers.c (scm_makdbl): no malloc'ing needed, so the
{DEFER,ALLOW}_INTS thing removed.
2000-03-14 06:41:12 +00:00
|
|
|
|
scm_real_equalp (SCM x, SCM y)
|
1996-07-25 22:56:11 +00:00
|
|
|
|
{
|
(scm_is_integer, scm_is_signed_integer, scm_is_unsigned_integer,
scm_to_signed_integer, scm_to_unsigned_integer, scm_to_schar,
scm_to_uchar, scm_to_char, scm_to_short, scm_to_ushort, scm_to_long,
scm_to_ulong, scm_to_size_t, scm_to_ssize_t, scm_from_schar,
scm_from_uchar, scm_from_char, scm_from_short, scm_from_ushort,
scm_from_int, scm_from_uint, scm_from_long, scm_from_ulong,
scm_from_size_t, scm_from_ssize_t, scm_is_real, scm_to_double,
scm_from_double): New.
* deprecated.h, boolean.h (SCM_FALSEP, SCM_NFALSEP, SCM_BOOL,
SCM_NEGATE_BOOL, SCM_BOOLP): Deprecated by moving into "deprecated.h".
Replaced all uses with scm_is_false, scm_is_true, scm_from_bool, and
scm_is_bool, respectively.
2004-07-06 10:23:30 +00:00
|
|
|
|
return scm_from_bool (SCM_REAL_VALUE (x) == SCM_REAL_VALUE (y));
|
1996-07-25 22:56:11 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
* __scm.h eq.c, eval.c, gc.c, hc.h, gh_data, hash.c, numbers.c,
numbers.h, objects.c, ramap.c, random.c, unif.c, unif.h: Extensive
rewrite of handling of real and complex numbers.
(SCM_FLOATS, SCM_SINGLES): These #ifdef conditionals have been
removed along with the support for floats. (Float vectors are
still supported.)
* numbers.c (scm_floprint, scm_floequal): Removed.
(scm_print_real, scm_print_complex, scm_real_equalp,
scm_complex_equalp): New functions.
* numbers.c (scm_makdbl): no malloc'ing needed, so the
{DEFER,ALLOW}_INTS thing removed.
2000-03-14 06:41:12 +00:00
|
|
|
|
SCM
|
|
|
|
|
|
scm_complex_equalp (SCM x, SCM y)
|
|
|
|
|
|
{
|
(scm_is_integer, scm_is_signed_integer, scm_is_unsigned_integer,
scm_to_signed_integer, scm_to_unsigned_integer, scm_to_schar,
scm_to_uchar, scm_to_char, scm_to_short, scm_to_ushort, scm_to_long,
scm_to_ulong, scm_to_size_t, scm_to_ssize_t, scm_from_schar,
scm_from_uchar, scm_from_char, scm_from_short, scm_from_ushort,
scm_from_int, scm_from_uint, scm_from_long, scm_from_ulong,
scm_from_size_t, scm_from_ssize_t, scm_is_real, scm_to_double,
scm_from_double): New.
* deprecated.h, boolean.h (SCM_FALSEP, SCM_NFALSEP, SCM_BOOL,
SCM_NEGATE_BOOL, SCM_BOOLP): Deprecated by moving into "deprecated.h".
Replaced all uses with scm_is_false, scm_is_true, scm_from_bool, and
scm_is_bool, respectively.
2004-07-06 10:23:30 +00:00
|
|
|
|
return scm_from_bool (SCM_COMPLEX_REAL (x) == SCM_COMPLEX_REAL (y)
|
* __scm.h eq.c, eval.c, gc.c, hc.h, gh_data, hash.c, numbers.c,
numbers.h, objects.c, ramap.c, random.c, unif.c, unif.h: Extensive
rewrite of handling of real and complex numbers.
(SCM_FLOATS, SCM_SINGLES): These #ifdef conditionals have been
removed along with the support for floats. (Float vectors are
still supported.)
* numbers.c (scm_floprint, scm_floequal): Removed.
(scm_print_real, scm_print_complex, scm_real_equalp,
scm_complex_equalp): New functions.
* numbers.c (scm_makdbl): no malloc'ing needed, so the
{DEFER,ALLOW}_INTS thing removed.
2000-03-14 06:41:12 +00:00
|
|
|
|
&& SCM_COMPLEX_IMAG (x) == SCM_COMPLEX_IMAG (y));
|
|
|
|
|
|
}
|
1996-07-25 22:56:11 +00:00
|
|
|
|
|
* print.c (scm_iprin1): Handle fractions.
* objects.h (scm_class_fraction): New.
* objects.c (scm_class_fraction): New.
(scm_class_of): Handle fractions.
* hash.c (scm_hasher): Handle fractions.
* numbers.c: New code for handling fraction all over the place.
(scm_odd_p, scm_even_p): Handle inexact integers.
(scm_rational_p): New function, same as scm_real_p.
(scm_round_number, scm_truncate_number, scm_ceiling, scm_floor):
New exact functions that replace the inexact 'dsubr'
implementations.
(scm_numerator, scm_denominator): New.
* numbers.h (SCM_NUMP): Recognize fractions.
(SCM_FRACTIONP, SCM_SLOPPY_FRACTIONP, SCM_FRACTION_NUMERATOR,
SCM_FRACTION_DENOMINATOR, SCM_FRACTION_SET_NUMERATOR,
SCM_FRACTION_SET_DENOMINATOR, SCM_FRACTION_REDUCED_BIT,
SCM_FRACTION_REDUCED_SET, SCM_FRACTION_REDUCED_CLEAR,
SCM_FRACTION_REDUCED): New.
(scm_floor, scm_ceiling, scm_truncate_number, scm_round_number):
New prototypes.
(scm_make_ratio, scm_rationalize, scm_numerator, scm_denominator,
scm_rational_p): New prototypes.
(scm_i_dbl2num, scm_i_fraction2double, scm_i_fraction_equalp,
scm_i_print_fraction): New prototypes.
* goops.c (create_standard_classes): Create "<fraction>" class.
* gc-mark.c (scm_gc_mark_dependencies): Handle fractions.
* gc-card.c (scm_i_sweep_card): Include scm_tc16_fraction as a
case in the switch, but do nothing for now.
* eval.c (SCM_CEVAL, SCM_APPLY, call_dsubr_1): Convert fractions
to doubles when calling 'dsubr' functions.
* eq.c (scm_eqv_p, scm_equal_p): Handle fractions.
2003-11-18 19:59:53 +00:00
|
|
|
|
SCM
|
|
|
|
|
|
scm_i_fraction_equalp (SCM x, SCM y)
|
|
|
|
|
|
{
|
(scm_is_integer, scm_is_signed_integer, scm_is_unsigned_integer,
scm_to_signed_integer, scm_to_unsigned_integer, scm_to_schar,
scm_to_uchar, scm_to_char, scm_to_short, scm_to_ushort, scm_to_long,
scm_to_ulong, scm_to_size_t, scm_to_ssize_t, scm_from_schar,
scm_from_uchar, scm_from_char, scm_from_short, scm_from_ushort,
scm_from_int, scm_from_uint, scm_from_long, scm_from_ulong,
scm_from_size_t, scm_from_ssize_t, scm_is_real, scm_to_double,
scm_from_double): New.
* deprecated.h, boolean.h (SCM_FALSEP, SCM_NFALSEP, SCM_BOOL,
SCM_NEGATE_BOOL, SCM_BOOLP): Deprecated by moving into "deprecated.h".
Replaced all uses with scm_is_false, scm_is_true, scm_from_bool, and
scm_is_bool, respectively.
2004-07-06 10:23:30 +00:00
|
|
|
|
if (scm_is_false (scm_equal_p (SCM_FRACTION_NUMERATOR (x),
|
2003-11-19 03:50:26 +00:00
|
|
|
|
SCM_FRACTION_NUMERATOR (y)))
|
(scm_is_integer, scm_is_signed_integer, scm_is_unsigned_integer,
scm_to_signed_integer, scm_to_unsigned_integer, scm_to_schar,
scm_to_uchar, scm_to_char, scm_to_short, scm_to_ushort, scm_to_long,
scm_to_ulong, scm_to_size_t, scm_to_ssize_t, scm_from_schar,
scm_from_uchar, scm_from_char, scm_from_short, scm_from_ushort,
scm_from_int, scm_from_uint, scm_from_long, scm_from_ulong,
scm_from_size_t, scm_from_ssize_t, scm_is_real, scm_to_double,
scm_from_double): New.
* deprecated.h, boolean.h (SCM_FALSEP, SCM_NFALSEP, SCM_BOOL,
SCM_NEGATE_BOOL, SCM_BOOLP): Deprecated by moving into "deprecated.h".
Replaced all uses with scm_is_false, scm_is_true, scm_from_bool, and
scm_is_bool, respectively.
2004-07-06 10:23:30 +00:00
|
|
|
|
|| scm_is_false (scm_equal_p (SCM_FRACTION_DENOMINATOR (x),
|
2003-11-19 03:50:26 +00:00
|
|
|
|
SCM_FRACTION_DENOMINATOR (y))))
|
|
|
|
|
|
return SCM_BOOL_F;
|
|
|
|
|
|
else
|
|
|
|
|
|
return SCM_BOOL_T;
|
* print.c (scm_iprin1): Handle fractions.
* objects.h (scm_class_fraction): New.
* objects.c (scm_class_fraction): New.
(scm_class_of): Handle fractions.
* hash.c (scm_hasher): Handle fractions.
* numbers.c: New code for handling fraction all over the place.
(scm_odd_p, scm_even_p): Handle inexact integers.
(scm_rational_p): New function, same as scm_real_p.
(scm_round_number, scm_truncate_number, scm_ceiling, scm_floor):
New exact functions that replace the inexact 'dsubr'
implementations.
(scm_numerator, scm_denominator): New.
* numbers.h (SCM_NUMP): Recognize fractions.
(SCM_FRACTIONP, SCM_SLOPPY_FRACTIONP, SCM_FRACTION_NUMERATOR,
SCM_FRACTION_DENOMINATOR, SCM_FRACTION_SET_NUMERATOR,
SCM_FRACTION_SET_DENOMINATOR, SCM_FRACTION_REDUCED_BIT,
SCM_FRACTION_REDUCED_SET, SCM_FRACTION_REDUCED_CLEAR,
SCM_FRACTION_REDUCED): New.
(scm_floor, scm_ceiling, scm_truncate_number, scm_round_number):
New prototypes.
(scm_make_ratio, scm_rationalize, scm_numerator, scm_denominator,
scm_rational_p): New prototypes.
(scm_i_dbl2num, scm_i_fraction2double, scm_i_fraction_equalp,
scm_i_print_fraction): New prototypes.
* goops.c (create_standard_classes): Create "<fraction>" class.
* gc-mark.c (scm_gc_mark_dependencies): Handle fractions.
* gc-card.c (scm_i_sweep_card): Include scm_tc16_fraction as a
case in the switch, but do nothing for now.
* eval.c (SCM_CEVAL, SCM_APPLY, call_dsubr_1): Convert fractions
to doubles when calling 'dsubr' functions.
* eq.c (scm_eqv_p, scm_equal_p): Handle fractions.
2003-11-18 19:59:53 +00:00
|
|
|
|
}
|
1996-07-25 22:56:11 +00:00
|
|
|
|
|
|
|
|
|
|
|
2004-08-03 17:12:14 +00:00
|
|
|
|
SCM_DEFINE (scm_number_p, "number?", 1, 0, 0,
|
|
|
|
|
|
(SCM x),
|
|
|
|
|
|
"Return @code{#t} if @var{x} is a number, @code{#f}\n"
|
|
|
|
|
|
"otherwise.")
|
|
|
|
|
|
#define FUNC_NAME s_scm_number_p
|
|
|
|
|
|
{
|
|
|
|
|
|
return scm_from_bool (SCM_NUMBERP (x));
|
|
|
|
|
|
}
|
|
|
|
|
|
#undef FUNC_NAME
|
|
|
|
|
|
|
|
|
|
|
|
SCM_DEFINE (scm_complex_p, "complex?", 1, 0, 0,
|
1999-12-12 02:36:16 +00:00
|
|
|
|
(SCM x),
|
* vectors.c (s_scm_vector_p, list->vector, scm_vector)
(scm_vector_ref, scm_vector_set_x, scm_vector_to_list)
(scm_vector_fill_x), strorder.c (scm_string_equal_p)
(scm_string_ci_equal_p, scm_string_less_p, scm_string_leq_p)
(scm_string_gr_p, scm_string_geq_p, scm_string_ci_less_p)
(scm_string_ci_geq_p), symbols.c (scm_symbol_p)
(scm_symbol_to_string, scm_string_to_symbol): Changed use of @t{}
to @code{} as the texinfo manual recommends, converted the
examples to use a @lisp{}-environment.
* strports.c (scm_eval_string): Cleaned up the docstring.
* struct.c (scm_struct_p, scm_struct_vtable_p): Added texinfo
markup.
* numbers.c (scm_exact_p, scm_odd_p, scm_even_p)
(scm_number_to_string, scm_string_to_number, scm_number_p)
(scm_real_p, scm_integer_p, scm_inexact_p, scm_make_rectangular)
(scm_make_polar, scm_inexact_to_exact): Added texinfo markup.
(scm_ash): Added texinfo markup and removed obsolete @refill.
(scm_gr_p): Corrected comment.
(scm_gr_p, scm_leq_p, scm_geq_p): Added texinfo markup to (future
docstring) comments.
(scm_positive_p, scm_less_p, scm_num_eq_p, scm_real_p)
(scm_number_p, scm_negative_p, scm_max, scm_min, scm_sum)
(scm_difference, scm_product, scm_divide, scm_asinh, scm_acosh)
(scm_atanh, scm_truncate, scm_round, scm_exact_to_inexact)
(floor, ceiling, $sqrt, $abs, $exp, $log, $sin, $cos, $tan, $asin)
($acos, $atan, $sinh, $cosh, $tanh, scm_real_part, scm_imag_part)
(scm_magnitude, scm_angle, scm_abs, scm_quotient, scm_remainder)
(scm_modulo, scm_gcd, scm_lcm): Added (future docstring) comments.
2001-03-02 09:07:22 +00:00
|
|
|
|
"Return @code{#t} if @var{x} is a complex number, @code{#f}\n"
|
2002-03-15 10:37:40 +00:00
|
|
|
|
"otherwise. Note that the sets of real, rational and integer\n"
|
* vectors.c (s_scm_vector_p, list->vector, scm_vector)
(scm_vector_ref, scm_vector_set_x, scm_vector_to_list)
(scm_vector_fill_x), strorder.c (scm_string_equal_p)
(scm_string_ci_equal_p, scm_string_less_p, scm_string_leq_p)
(scm_string_gr_p, scm_string_geq_p, scm_string_ci_less_p)
(scm_string_ci_geq_p), symbols.c (scm_symbol_p)
(scm_symbol_to_string, scm_string_to_symbol): Changed use of @t{}
to @code{} as the texinfo manual recommends, converted the
examples to use a @lisp{}-environment.
* strports.c (scm_eval_string): Cleaned up the docstring.
* struct.c (scm_struct_p, scm_struct_vtable_p): Added texinfo
markup.
* numbers.c (scm_exact_p, scm_odd_p, scm_even_p)
(scm_number_to_string, scm_string_to_number, scm_number_p)
(scm_real_p, scm_integer_p, scm_inexact_p, scm_make_rectangular)
(scm_make_polar, scm_inexact_to_exact): Added texinfo markup.
(scm_ash): Added texinfo markup and removed obsolete @refill.
(scm_gr_p): Corrected comment.
(scm_gr_p, scm_leq_p, scm_geq_p): Added texinfo markup to (future
docstring) comments.
(scm_positive_p, scm_less_p, scm_num_eq_p, scm_real_p)
(scm_number_p, scm_negative_p, scm_max, scm_min, scm_sum)
(scm_difference, scm_product, scm_divide, scm_asinh, scm_acosh)
(scm_atanh, scm_truncate, scm_round, scm_exact_to_inexact)
(floor, ceiling, $sqrt, $abs, $exp, $log, $sin, $cos, $tan, $asin)
($acos, $atan, $sinh, $cosh, $tanh, scm_real_part, scm_imag_part)
(scm_magnitude, scm_angle, scm_abs, scm_quotient, scm_remainder)
(scm_modulo, scm_gcd, scm_lcm): Added (future docstring) comments.
2001-03-02 09:07:22 +00:00
|
|
|
|
"values form subsets of the set of complex numbers, i. e. the\n"
|
|
|
|
|
|
"predicate will also be fulfilled if @var{x} is a real,\n"
|
|
|
|
|
|
"rational or integer number.")
|
2004-08-03 17:12:14 +00:00
|
|
|
|
#define FUNC_NAME s_scm_complex_p
|
1996-07-25 22:56:11 +00:00
|
|
|
|
{
|
2004-08-03 17:12:14 +00:00
|
|
|
|
/* all numbers are complex. */
|
|
|
|
|
|
return scm_number_p (x);
|
1996-07-25 22:56:11 +00:00
|
|
|
|
}
|
1999-12-12 02:36:16 +00:00
|
|
|
|
#undef FUNC_NAME
|
1996-07-25 22:56:11 +00:00
|
|
|
|
|
* print.c (scm_iprin1): Handle fractions.
* objects.h (scm_class_fraction): New.
* objects.c (scm_class_fraction): New.
(scm_class_of): Handle fractions.
* hash.c (scm_hasher): Handle fractions.
* numbers.c: New code for handling fraction all over the place.
(scm_odd_p, scm_even_p): Handle inexact integers.
(scm_rational_p): New function, same as scm_real_p.
(scm_round_number, scm_truncate_number, scm_ceiling, scm_floor):
New exact functions that replace the inexact 'dsubr'
implementations.
(scm_numerator, scm_denominator): New.
* numbers.h (SCM_NUMP): Recognize fractions.
(SCM_FRACTIONP, SCM_SLOPPY_FRACTIONP, SCM_FRACTION_NUMERATOR,
SCM_FRACTION_DENOMINATOR, SCM_FRACTION_SET_NUMERATOR,
SCM_FRACTION_SET_DENOMINATOR, SCM_FRACTION_REDUCED_BIT,
SCM_FRACTION_REDUCED_SET, SCM_FRACTION_REDUCED_CLEAR,
SCM_FRACTION_REDUCED): New.
(scm_floor, scm_ceiling, scm_truncate_number, scm_round_number):
New prototypes.
(scm_make_ratio, scm_rationalize, scm_numerator, scm_denominator,
scm_rational_p): New prototypes.
(scm_i_dbl2num, scm_i_fraction2double, scm_i_fraction_equalp,
scm_i_print_fraction): New prototypes.
* goops.c (create_standard_classes): Create "<fraction>" class.
* gc-mark.c (scm_gc_mark_dependencies): Handle fractions.
* gc-card.c (scm_i_sweep_card): Include scm_tc16_fraction as a
case in the switch, but do nothing for now.
* eval.c (SCM_CEVAL, SCM_APPLY, call_dsubr_1): Convert fractions
to doubles when calling 'dsubr' functions.
* eq.c (scm_eqv_p, scm_equal_p): Handle fractions.
2003-11-18 19:59:53 +00:00
|
|
|
|
SCM_DEFINE (scm_real_p, "real?", 1, 0, 0,
|
|
|
|
|
|
(SCM x),
|
|
|
|
|
|
"Return @code{#t} if @var{x} is a real number, @code{#f}\n"
|
|
|
|
|
|
"otherwise. Note that the set of integer values forms a subset of\n"
|
|
|
|
|
|
"the set of real numbers, i. e. the predicate will also be\n"
|
|
|
|
|
|
"fulfilled if @var{x} is an integer number.")
|
|
|
|
|
|
#define FUNC_NAME s_scm_real_p
|
|
|
|
|
|
{
|
|
|
|
|
|
/* we can't represent irrational numbers. */
|
|
|
|
|
|
return scm_rational_p (x);
|
|
|
|
|
|
}
|
|
|
|
|
|
#undef FUNC_NAME
|
|
|
|
|
|
|
|
|
|
|
|
SCM_DEFINE (scm_rational_p, "rational?", 1, 0, 0,
|
1999-12-12 02:36:16 +00:00
|
|
|
|
(SCM x),
|
* vectors.c (s_scm_vector_p, list->vector, scm_vector)
(scm_vector_ref, scm_vector_set_x, scm_vector_to_list)
(scm_vector_fill_x), strorder.c (scm_string_equal_p)
(scm_string_ci_equal_p, scm_string_less_p, scm_string_leq_p)
(scm_string_gr_p, scm_string_geq_p, scm_string_ci_less_p)
(scm_string_ci_geq_p), symbols.c (scm_symbol_p)
(scm_symbol_to_string, scm_string_to_symbol): Changed use of @t{}
to @code{} as the texinfo manual recommends, converted the
examples to use a @lisp{}-environment.
* strports.c (scm_eval_string): Cleaned up the docstring.
* struct.c (scm_struct_p, scm_struct_vtable_p): Added texinfo
markup.
* numbers.c (scm_exact_p, scm_odd_p, scm_even_p)
(scm_number_to_string, scm_string_to_number, scm_number_p)
(scm_real_p, scm_integer_p, scm_inexact_p, scm_make_rectangular)
(scm_make_polar, scm_inexact_to_exact): Added texinfo markup.
(scm_ash): Added texinfo markup and removed obsolete @refill.
(scm_gr_p): Corrected comment.
(scm_gr_p, scm_leq_p, scm_geq_p): Added texinfo markup to (future
docstring) comments.
(scm_positive_p, scm_less_p, scm_num_eq_p, scm_real_p)
(scm_number_p, scm_negative_p, scm_max, scm_min, scm_sum)
(scm_difference, scm_product, scm_divide, scm_asinh, scm_acosh)
(scm_atanh, scm_truncate, scm_round, scm_exact_to_inexact)
(floor, ceiling, $sqrt, $abs, $exp, $log, $sin, $cos, $tan, $asin)
($acos, $atan, $sinh, $cosh, $tanh, scm_real_part, scm_imag_part)
(scm_magnitude, scm_angle, scm_abs, scm_quotient, scm_remainder)
(scm_modulo, scm_gcd, scm_lcm): Added (future docstring) comments.
2001-03-02 09:07:22 +00:00
|
|
|
|
"Return @code{#t} if @var{x} is a rational number, @code{#f}\n"
|
2002-03-15 10:37:40 +00:00
|
|
|
|
"otherwise. Note that the set of integer values forms a subset of\n"
|
* vectors.c (s_scm_vector_p, list->vector, scm_vector)
(scm_vector_ref, scm_vector_set_x, scm_vector_to_list)
(scm_vector_fill_x), strorder.c (scm_string_equal_p)
(scm_string_ci_equal_p, scm_string_less_p, scm_string_leq_p)
(scm_string_gr_p, scm_string_geq_p, scm_string_ci_less_p)
(scm_string_ci_geq_p), symbols.c (scm_symbol_p)
(scm_symbol_to_string, scm_string_to_symbol): Changed use of @t{}
to @code{} as the texinfo manual recommends, converted the
examples to use a @lisp{}-environment.
* strports.c (scm_eval_string): Cleaned up the docstring.
* struct.c (scm_struct_p, scm_struct_vtable_p): Added texinfo
markup.
* numbers.c (scm_exact_p, scm_odd_p, scm_even_p)
(scm_number_to_string, scm_string_to_number, scm_number_p)
(scm_real_p, scm_integer_p, scm_inexact_p, scm_make_rectangular)
(scm_make_polar, scm_inexact_to_exact): Added texinfo markup.
(scm_ash): Added texinfo markup and removed obsolete @refill.
(scm_gr_p): Corrected comment.
(scm_gr_p, scm_leq_p, scm_geq_p): Added texinfo markup to (future
docstring) comments.
(scm_positive_p, scm_less_p, scm_num_eq_p, scm_real_p)
(scm_number_p, scm_negative_p, scm_max, scm_min, scm_sum)
(scm_difference, scm_product, scm_divide, scm_asinh, scm_acosh)
(scm_atanh, scm_truncate, scm_round, scm_exact_to_inexact)
(floor, ceiling, $sqrt, $abs, $exp, $log, $sin, $cos, $tan, $asin)
($acos, $atan, $sinh, $cosh, $tanh, scm_real_part, scm_imag_part)
(scm_magnitude, scm_angle, scm_abs, scm_quotient, scm_remainder)
(scm_modulo, scm_gcd, scm_lcm): Added (future docstring) comments.
2001-03-02 09:07:22 +00:00
|
|
|
|
"the set of rational numbers, i. e. the predicate will also be\n"
|
* print.c (scm_iprin1): Handle fractions.
* objects.h (scm_class_fraction): New.
* objects.c (scm_class_fraction): New.
(scm_class_of): Handle fractions.
* hash.c (scm_hasher): Handle fractions.
* numbers.c: New code for handling fraction all over the place.
(scm_odd_p, scm_even_p): Handle inexact integers.
(scm_rational_p): New function, same as scm_real_p.
(scm_round_number, scm_truncate_number, scm_ceiling, scm_floor):
New exact functions that replace the inexact 'dsubr'
implementations.
(scm_numerator, scm_denominator): New.
* numbers.h (SCM_NUMP): Recognize fractions.
(SCM_FRACTIONP, SCM_SLOPPY_FRACTIONP, SCM_FRACTION_NUMERATOR,
SCM_FRACTION_DENOMINATOR, SCM_FRACTION_SET_NUMERATOR,
SCM_FRACTION_SET_DENOMINATOR, SCM_FRACTION_REDUCED_BIT,
SCM_FRACTION_REDUCED_SET, SCM_FRACTION_REDUCED_CLEAR,
SCM_FRACTION_REDUCED): New.
(scm_floor, scm_ceiling, scm_truncate_number, scm_round_number):
New prototypes.
(scm_make_ratio, scm_rationalize, scm_numerator, scm_denominator,
scm_rational_p): New prototypes.
(scm_i_dbl2num, scm_i_fraction2double, scm_i_fraction_equalp,
scm_i_print_fraction): New prototypes.
* goops.c (create_standard_classes): Create "<fraction>" class.
* gc-mark.c (scm_gc_mark_dependencies): Handle fractions.
* gc-card.c (scm_i_sweep_card): Include scm_tc16_fraction as a
case in the switch, but do nothing for now.
* eval.c (SCM_CEVAL, SCM_APPLY, call_dsubr_1): Convert fractions
to doubles when calling 'dsubr' functions.
* eq.c (scm_eqv_p, scm_equal_p): Handle fractions.
2003-11-18 19:59:53 +00:00
|
|
|
|
"fulfilled if @var{x} is an integer number.")
|
|
|
|
|
|
#define FUNC_NAME s_scm_rational_p
|
1996-07-25 22:56:11 +00:00
|
|
|
|
{
|
2004-07-23 15:43:02 +00:00
|
|
|
|
if (SCM_I_INUMP (x))
|
1996-07-25 22:56:11 +00:00
|
|
|
|
return SCM_BOOL_T;
|
2003-07-13 16:13:57 +00:00
|
|
|
|
else if (SCM_IMP (x))
|
1996-07-25 22:56:11 +00:00
|
|
|
|
return SCM_BOOL_F;
|
2003-07-13 16:13:57 +00:00
|
|
|
|
else if (SCM_BIGP (x))
|
1996-07-25 22:56:11 +00:00
|
|
|
|
return SCM_BOOL_T;
|
* print.c (scm_iprin1): Handle fractions.
* objects.h (scm_class_fraction): New.
* objects.c (scm_class_fraction): New.
(scm_class_of): Handle fractions.
* hash.c (scm_hasher): Handle fractions.
* numbers.c: New code for handling fraction all over the place.
(scm_odd_p, scm_even_p): Handle inexact integers.
(scm_rational_p): New function, same as scm_real_p.
(scm_round_number, scm_truncate_number, scm_ceiling, scm_floor):
New exact functions that replace the inexact 'dsubr'
implementations.
(scm_numerator, scm_denominator): New.
* numbers.h (SCM_NUMP): Recognize fractions.
(SCM_FRACTIONP, SCM_SLOPPY_FRACTIONP, SCM_FRACTION_NUMERATOR,
SCM_FRACTION_DENOMINATOR, SCM_FRACTION_SET_NUMERATOR,
SCM_FRACTION_SET_DENOMINATOR, SCM_FRACTION_REDUCED_BIT,
SCM_FRACTION_REDUCED_SET, SCM_FRACTION_REDUCED_CLEAR,
SCM_FRACTION_REDUCED): New.
(scm_floor, scm_ceiling, scm_truncate_number, scm_round_number):
New prototypes.
(scm_make_ratio, scm_rationalize, scm_numerator, scm_denominator,
scm_rational_p): New prototypes.
(scm_i_dbl2num, scm_i_fraction2double, scm_i_fraction_equalp,
scm_i_print_fraction): New prototypes.
* goops.c (create_standard_classes): Create "<fraction>" class.
* gc-mark.c (scm_gc_mark_dependencies): Handle fractions.
* gc-card.c (scm_i_sweep_card): Include scm_tc16_fraction as a
case in the switch, but do nothing for now.
* eval.c (SCM_CEVAL, SCM_APPLY, call_dsubr_1): Convert fractions
to doubles when calling 'dsubr' functions.
* eq.c (scm_eqv_p, scm_equal_p): Handle fractions.
2003-11-18 19:59:53 +00:00
|
|
|
|
else if (SCM_FRACTIONP (x))
|
|
|
|
|
|
return SCM_BOOL_T;
|
|
|
|
|
|
else if (SCM_REALP (x))
|
|
|
|
|
|
/* due to their limited precision, all floating point numbers are
|
|
|
|
|
|
rational as well. */
|
|
|
|
|
|
return SCM_BOOL_T;
|
2003-07-13 16:13:57 +00:00
|
|
|
|
else
|
2000-05-09 16:55:54 +00:00
|
|
|
|
return SCM_BOOL_F;
|
1996-07-25 22:56:11 +00:00
|
|
|
|
}
|
1999-12-12 02:36:16 +00:00
|
|
|
|
#undef FUNC_NAME
|
1996-07-25 22:56:11 +00:00
|
|
|
|
|
2000-01-05 19:05:23 +00:00
|
|
|
|
SCM_DEFINE (scm_integer_p, "integer?", 1, 0, 0,
|
1999-12-12 02:36:16 +00:00
|
|
|
|
(SCM x),
|
* vectors.c (s_scm_vector_p, list->vector, scm_vector)
(scm_vector_ref, scm_vector_set_x, scm_vector_to_list)
(scm_vector_fill_x), strorder.c (scm_string_equal_p)
(scm_string_ci_equal_p, scm_string_less_p, scm_string_leq_p)
(scm_string_gr_p, scm_string_geq_p, scm_string_ci_less_p)
(scm_string_ci_geq_p), symbols.c (scm_symbol_p)
(scm_symbol_to_string, scm_string_to_symbol): Changed use of @t{}
to @code{} as the texinfo manual recommends, converted the
examples to use a @lisp{}-environment.
* strports.c (scm_eval_string): Cleaned up the docstring.
* struct.c (scm_struct_p, scm_struct_vtable_p): Added texinfo
markup.
* numbers.c (scm_exact_p, scm_odd_p, scm_even_p)
(scm_number_to_string, scm_string_to_number, scm_number_p)
(scm_real_p, scm_integer_p, scm_inexact_p, scm_make_rectangular)
(scm_make_polar, scm_inexact_to_exact): Added texinfo markup.
(scm_ash): Added texinfo markup and removed obsolete @refill.
(scm_gr_p): Corrected comment.
(scm_gr_p, scm_leq_p, scm_geq_p): Added texinfo markup to (future
docstring) comments.
(scm_positive_p, scm_less_p, scm_num_eq_p, scm_real_p)
(scm_number_p, scm_negative_p, scm_max, scm_min, scm_sum)
(scm_difference, scm_product, scm_divide, scm_asinh, scm_acosh)
(scm_atanh, scm_truncate, scm_round, scm_exact_to_inexact)
(floor, ceiling, $sqrt, $abs, $exp, $log, $sin, $cos, $tan, $asin)
($acos, $atan, $sinh, $cosh, $tanh, scm_real_part, scm_imag_part)
(scm_magnitude, scm_angle, scm_abs, scm_quotient, scm_remainder)
(scm_modulo, scm_gcd, scm_lcm): Added (future docstring) comments.
2001-03-02 09:07:22 +00:00
|
|
|
|
"Return @code{#t} if @var{x} is an integer number, @code{#f}\n"
|
|
|
|
|
|
"else.")
|
1999-12-12 02:36:16 +00:00
|
|
|
|
#define FUNC_NAME s_scm_integer_p
|
1996-07-25 22:56:11 +00:00
|
|
|
|
{
|
|
|
|
|
|
double r;
|
2004-07-23 15:43:02 +00:00
|
|
|
|
if (SCM_I_INUMP (x))
|
1999-01-10 07:38:39 +00:00
|
|
|
|
return SCM_BOOL_T;
|
|
|
|
|
|
if (SCM_IMP (x))
|
|
|
|
|
|
return SCM_BOOL_F;
|
|
|
|
|
|
if (SCM_BIGP (x))
|
|
|
|
|
|
return SCM_BOOL_T;
|
2001-07-30 19:35:15 +00:00
|
|
|
|
if (!SCM_INEXACTP (x))
|
1999-01-10 07:38:39 +00:00
|
|
|
|
return SCM_BOOL_F;
|
2001-07-30 19:35:15 +00:00
|
|
|
|
if (SCM_COMPLEXP (x))
|
1999-01-10 07:38:39 +00:00
|
|
|
|
return SCM_BOOL_F;
|
2000-05-10 13:42:23 +00:00
|
|
|
|
r = SCM_REAL_VALUE (x);
|
2004-09-08 01:03:06 +00:00
|
|
|
|
/* +/-inf passes r==floor(r), making those #t */
|
1999-01-10 07:38:39 +00:00
|
|
|
|
if (r == floor (r))
|
|
|
|
|
|
return SCM_BOOL_T;
|
1996-07-25 22:56:11 +00:00
|
|
|
|
return SCM_BOOL_F;
|
|
|
|
|
|
}
|
1999-12-12 02:36:16 +00:00
|
|
|
|
#undef FUNC_NAME
|
1996-07-25 22:56:11 +00:00
|
|
|
|
|
|
|
|
|
|
|
2000-01-05 19:05:23 +00:00
|
|
|
|
SCM_DEFINE (scm_inexact_p, "inexact?", 1, 0, 0,
|
1999-12-12 02:36:16 +00:00
|
|
|
|
(SCM x),
|
* vectors.c (s_scm_vector_p, list->vector, scm_vector)
(scm_vector_ref, scm_vector_set_x, scm_vector_to_list)
(scm_vector_fill_x), strorder.c (scm_string_equal_p)
(scm_string_ci_equal_p, scm_string_less_p, scm_string_leq_p)
(scm_string_gr_p, scm_string_geq_p, scm_string_ci_less_p)
(scm_string_ci_geq_p), symbols.c (scm_symbol_p)
(scm_symbol_to_string, scm_string_to_symbol): Changed use of @t{}
to @code{} as the texinfo manual recommends, converted the
examples to use a @lisp{}-environment.
* strports.c (scm_eval_string): Cleaned up the docstring.
* struct.c (scm_struct_p, scm_struct_vtable_p): Added texinfo
markup.
* numbers.c (scm_exact_p, scm_odd_p, scm_even_p)
(scm_number_to_string, scm_string_to_number, scm_number_p)
(scm_real_p, scm_integer_p, scm_inexact_p, scm_make_rectangular)
(scm_make_polar, scm_inexact_to_exact): Added texinfo markup.
(scm_ash): Added texinfo markup and removed obsolete @refill.
(scm_gr_p): Corrected comment.
(scm_gr_p, scm_leq_p, scm_geq_p): Added texinfo markup to (future
docstring) comments.
(scm_positive_p, scm_less_p, scm_num_eq_p, scm_real_p)
(scm_number_p, scm_negative_p, scm_max, scm_min, scm_sum)
(scm_difference, scm_product, scm_divide, scm_asinh, scm_acosh)
(scm_atanh, scm_truncate, scm_round, scm_exact_to_inexact)
(floor, ceiling, $sqrt, $abs, $exp, $log, $sin, $cos, $tan, $asin)
($acos, $atan, $sinh, $cosh, $tanh, scm_real_part, scm_imag_part)
(scm_magnitude, scm_angle, scm_abs, scm_quotient, scm_remainder)
(scm_modulo, scm_gcd, scm_lcm): Added (future docstring) comments.
2001-03-02 09:07:22 +00:00
|
|
|
|
"Return @code{#t} if @var{x} is an inexact number, @code{#f}\n"
|
|
|
|
|
|
"else.")
|
1999-12-12 02:36:16 +00:00
|
|
|
|
#define FUNC_NAME s_scm_inexact_p
|
1996-07-25 22:56:11 +00:00
|
|
|
|
{
|
2003-11-19 02:38:37 +00:00
|
|
|
|
if (SCM_INEXACTP (x))
|
|
|
|
|
|
return SCM_BOOL_T;
|
|
|
|
|
|
if (SCM_NUMBERP (x))
|
|
|
|
|
|
return SCM_BOOL_F;
|
|
|
|
|
|
SCM_WRONG_TYPE_ARG (1, x);
|
1996-07-25 22:56:11 +00:00
|
|
|
|
}
|
1999-12-12 02:36:16 +00:00
|
|
|
|
#undef FUNC_NAME
|
1996-07-25 22:56:11 +00:00
|
|
|
|
|
|
|
|
|
|
|
2009-12-04 13:05:00 +01:00
|
|
|
|
SCM scm_i_num_eq_p (SCM, SCM, SCM);
|
|
|
|
|
|
SCM_PRIMITIVE_GENERIC (scm_i_num_eq_p, "=", 0, 2, 1,
|
|
|
|
|
|
(SCM x, SCM y, SCM rest),
|
|
|
|
|
|
"Return @code{#t} if all parameters are numerically equal.")
|
|
|
|
|
|
#define FUNC_NAME s_scm_i_num_eq_p
|
|
|
|
|
|
{
|
|
|
|
|
|
if (SCM_UNBNDP (x) || SCM_UNBNDP (y))
|
|
|
|
|
|
return SCM_BOOL_T;
|
|
|
|
|
|
while (!scm_is_null (rest))
|
|
|
|
|
|
{
|
|
|
|
|
|
if (scm_is_false (scm_num_eq_p (x, y)))
|
|
|
|
|
|
return SCM_BOOL_F;
|
|
|
|
|
|
x = y;
|
|
|
|
|
|
y = scm_car (rest);
|
|
|
|
|
|
rest = scm_cdr (rest);
|
|
|
|
|
|
}
|
|
|
|
|
|
return scm_num_eq_p (x, y);
|
|
|
|
|
|
}
|
|
|
|
|
|
#undef FUNC_NAME
|
1996-07-25 22:56:11 +00:00
|
|
|
|
SCM
|
1999-12-12 20:35:02 +00:00
|
|
|
|
scm_num_eq_p (SCM x, SCM y)
|
1996-07-25 22:56:11 +00:00
|
|
|
|
{
|
2004-02-18 00:21:11 +00:00
|
|
|
|
again:
|
2004-07-23 15:43:02 +00:00
|
|
|
|
if (SCM_I_INUMP (x))
|
2003-07-13 16:13:57 +00:00
|
|
|
|
{
|
2004-07-23 15:43:02 +00:00
|
|
|
|
long xx = SCM_I_INUM (x);
|
|
|
|
|
|
if (SCM_I_INUMP (y))
|
2003-07-13 16:13:57 +00:00
|
|
|
|
{
|
2004-07-23 15:43:02 +00:00
|
|
|
|
long yy = SCM_I_INUM (y);
|
(scm_is_integer, scm_is_signed_integer, scm_is_unsigned_integer,
scm_to_signed_integer, scm_to_unsigned_integer, scm_to_schar,
scm_to_uchar, scm_to_char, scm_to_short, scm_to_ushort, scm_to_long,
scm_to_ulong, scm_to_size_t, scm_to_ssize_t, scm_from_schar,
scm_from_uchar, scm_from_char, scm_from_short, scm_from_ushort,
scm_from_int, scm_from_uint, scm_from_long, scm_from_ulong,
scm_from_size_t, scm_from_ssize_t, scm_is_real, scm_to_double,
scm_from_double): New.
* deprecated.h, boolean.h (SCM_FALSEP, SCM_NFALSEP, SCM_BOOL,
SCM_NEGATE_BOOL, SCM_BOOLP): Deprecated by moving into "deprecated.h".
Replaced all uses with scm_is_false, scm_is_true, scm_from_bool, and
scm_is_bool, respectively.
2004-07-06 10:23:30 +00:00
|
|
|
|
return scm_from_bool (xx == yy);
|
2003-07-13 16:13:57 +00:00
|
|
|
|
}
|
|
|
|
|
|
else if (SCM_BIGP (y))
|
|
|
|
|
|
return SCM_BOOL_F;
|
|
|
|
|
|
else if (SCM_REALP (y))
|
2005-03-13 00:13:10 +00:00
|
|
|
|
{
|
|
|
|
|
|
/* On a 32-bit system an inum fits a double, we can cast the inum
|
|
|
|
|
|
to a double and compare.
|
|
|
|
|
|
|
|
|
|
|
|
But on a 64-bit system an inum is bigger than a double and
|
|
|
|
|
|
casting it to a double (call that dxx) will round. dxx is at
|
|
|
|
|
|
worst 1 bigger or smaller than xx, so if dxx==yy we know yy is
|
|
|
|
|
|
an integer and fits a long. So we cast yy to a long and
|
|
|
|
|
|
compare with plain xx.
|
|
|
|
|
|
|
|
|
|
|
|
An alternative (for any size system actually) would be to check
|
|
|
|
|
|
yy is an integer (with floor) and is in range of an inum
|
|
|
|
|
|
(compare against appropriate powers of 2) then test
|
|
|
|
|
|
xx==(long)yy. It's just a matter of which casts/comparisons
|
|
|
|
|
|
might be fastest or easiest for the cpu. */
|
|
|
|
|
|
|
|
|
|
|
|
double yy = SCM_REAL_VALUE (y);
|
2005-08-11 21:03:58 +00:00
|
|
|
|
return scm_from_bool ((double) xx == yy
|
|
|
|
|
|
&& (DBL_MANT_DIG >= SCM_I_FIXNUM_BIT-1
|
|
|
|
|
|
|| xx == (long) yy));
|
2005-03-13 00:13:10 +00:00
|
|
|
|
}
|
2003-07-13 16:13:57 +00:00
|
|
|
|
else if (SCM_COMPLEXP (y))
|
(scm_is_integer, scm_is_signed_integer, scm_is_unsigned_integer,
scm_to_signed_integer, scm_to_unsigned_integer, scm_to_schar,
scm_to_uchar, scm_to_char, scm_to_short, scm_to_ushort, scm_to_long,
scm_to_ulong, scm_to_size_t, scm_to_ssize_t, scm_from_schar,
scm_from_uchar, scm_from_char, scm_from_short, scm_from_ushort,
scm_from_int, scm_from_uint, scm_from_long, scm_from_ulong,
scm_from_size_t, scm_from_ssize_t, scm_is_real, scm_to_double,
scm_from_double): New.
* deprecated.h, boolean.h (SCM_FALSEP, SCM_NFALSEP, SCM_BOOL,
SCM_NEGATE_BOOL, SCM_BOOLP): Deprecated by moving into "deprecated.h".
Replaced all uses with scm_is_false, scm_is_true, scm_from_bool, and
scm_is_bool, respectively.
2004-07-06 10:23:30 +00:00
|
|
|
|
return scm_from_bool (((double) xx == SCM_COMPLEX_REAL (y))
|
2003-07-13 16:13:57 +00:00
|
|
|
|
&& (0.0 == SCM_COMPLEX_IMAG (y)));
|
* print.c (scm_iprin1): Handle fractions.
* objects.h (scm_class_fraction): New.
* objects.c (scm_class_fraction): New.
(scm_class_of): Handle fractions.
* hash.c (scm_hasher): Handle fractions.
* numbers.c: New code for handling fraction all over the place.
(scm_odd_p, scm_even_p): Handle inexact integers.
(scm_rational_p): New function, same as scm_real_p.
(scm_round_number, scm_truncate_number, scm_ceiling, scm_floor):
New exact functions that replace the inexact 'dsubr'
implementations.
(scm_numerator, scm_denominator): New.
* numbers.h (SCM_NUMP): Recognize fractions.
(SCM_FRACTIONP, SCM_SLOPPY_FRACTIONP, SCM_FRACTION_NUMERATOR,
SCM_FRACTION_DENOMINATOR, SCM_FRACTION_SET_NUMERATOR,
SCM_FRACTION_SET_DENOMINATOR, SCM_FRACTION_REDUCED_BIT,
SCM_FRACTION_REDUCED_SET, SCM_FRACTION_REDUCED_CLEAR,
SCM_FRACTION_REDUCED): New.
(scm_floor, scm_ceiling, scm_truncate_number, scm_round_number):
New prototypes.
(scm_make_ratio, scm_rationalize, scm_numerator, scm_denominator,
scm_rational_p): New prototypes.
(scm_i_dbl2num, scm_i_fraction2double, scm_i_fraction_equalp,
scm_i_print_fraction): New prototypes.
* goops.c (create_standard_classes): Create "<fraction>" class.
* gc-mark.c (scm_gc_mark_dependencies): Handle fractions.
* gc-card.c (scm_i_sweep_card): Include scm_tc16_fraction as a
case in the switch, but do nothing for now.
* eval.c (SCM_CEVAL, SCM_APPLY, call_dsubr_1): Convert fractions
to doubles when calling 'dsubr' functions.
* eq.c (scm_eqv_p, scm_equal_p): Handle fractions.
2003-11-18 19:59:53 +00:00
|
|
|
|
else if (SCM_FRACTIONP (y))
|
|
|
|
|
|
return SCM_BOOL_F;
|
2003-07-13 16:13:57 +00:00
|
|
|
|
else
|
2009-12-04 13:05:00 +01:00
|
|
|
|
SCM_WTA_DISPATCH_2 (g_scm_i_num_eq_p, x, y, SCM_ARGn, s_scm_i_num_eq_p);
|
1999-01-10 07:38:39 +00:00
|
|
|
|
}
|
2003-07-13 16:13:57 +00:00
|
|
|
|
else if (SCM_BIGP (x))
|
|
|
|
|
|
{
|
2004-07-23 15:43:02 +00:00
|
|
|
|
if (SCM_I_INUMP (y))
|
2003-07-13 16:13:57 +00:00
|
|
|
|
return SCM_BOOL_F;
|
|
|
|
|
|
else if (SCM_BIGP (y))
|
|
|
|
|
|
{
|
|
|
|
|
|
int cmp = mpz_cmp (SCM_I_BIG_MPZ (x), SCM_I_BIG_MPZ (y));
|
|
|
|
|
|
scm_remember_upto_here_2 (x, y);
|
(scm_is_integer, scm_is_signed_integer, scm_is_unsigned_integer,
scm_to_signed_integer, scm_to_unsigned_integer, scm_to_schar,
scm_to_uchar, scm_to_char, scm_to_short, scm_to_ushort, scm_to_long,
scm_to_ulong, scm_to_size_t, scm_to_ssize_t, scm_from_schar,
scm_from_uchar, scm_from_char, scm_from_short, scm_from_ushort,
scm_from_int, scm_from_uint, scm_from_long, scm_from_ulong,
scm_from_size_t, scm_from_ssize_t, scm_is_real, scm_to_double,
scm_from_double): New.
* deprecated.h, boolean.h (SCM_FALSEP, SCM_NFALSEP, SCM_BOOL,
SCM_NEGATE_BOOL, SCM_BOOLP): Deprecated by moving into "deprecated.h".
Replaced all uses with scm_is_false, scm_is_true, scm_from_bool, and
scm_is_bool, respectively.
2004-07-06 10:23:30 +00:00
|
|
|
|
return scm_from_bool (0 == cmp);
|
2003-07-13 16:13:57 +00:00
|
|
|
|
}
|
|
|
|
|
|
else if (SCM_REALP (y))
|
|
|
|
|
|
{
|
|
|
|
|
|
int cmp;
|
|
|
|
|
|
if (xisnan (SCM_REAL_VALUE (y)))
|
|
|
|
|
|
return SCM_BOOL_F;
|
|
|
|
|
|
cmp = xmpz_cmp_d (SCM_I_BIG_MPZ (x), SCM_REAL_VALUE (y));
|
|
|
|
|
|
scm_remember_upto_here_1 (x);
|
(scm_is_integer, scm_is_signed_integer, scm_is_unsigned_integer,
scm_to_signed_integer, scm_to_unsigned_integer, scm_to_schar,
scm_to_uchar, scm_to_char, scm_to_short, scm_to_ushort, scm_to_long,
scm_to_ulong, scm_to_size_t, scm_to_ssize_t, scm_from_schar,
scm_from_uchar, scm_from_char, scm_from_short, scm_from_ushort,
scm_from_int, scm_from_uint, scm_from_long, scm_from_ulong,
scm_from_size_t, scm_from_ssize_t, scm_is_real, scm_to_double,
scm_from_double): New.
* deprecated.h, boolean.h (SCM_FALSEP, SCM_NFALSEP, SCM_BOOL,
SCM_NEGATE_BOOL, SCM_BOOLP): Deprecated by moving into "deprecated.h".
Replaced all uses with scm_is_false, scm_is_true, scm_from_bool, and
scm_is_bool, respectively.
2004-07-06 10:23:30 +00:00
|
|
|
|
return scm_from_bool (0 == cmp);
|
2003-07-13 16:13:57 +00:00
|
|
|
|
}
|
|
|
|
|
|
else if (SCM_COMPLEXP (y))
|
|
|
|
|
|
{
|
|
|
|
|
|
int cmp;
|
|
|
|
|
|
if (0.0 != SCM_COMPLEX_IMAG (y))
|
|
|
|
|
|
return SCM_BOOL_F;
|
|
|
|
|
|
if (xisnan (SCM_COMPLEX_REAL (y)))
|
|
|
|
|
|
return SCM_BOOL_F;
|
|
|
|
|
|
cmp = xmpz_cmp_d (SCM_I_BIG_MPZ (x), SCM_COMPLEX_REAL (y));
|
|
|
|
|
|
scm_remember_upto_here_1 (x);
|
(scm_is_integer, scm_is_signed_integer, scm_is_unsigned_integer,
scm_to_signed_integer, scm_to_unsigned_integer, scm_to_schar,
scm_to_uchar, scm_to_char, scm_to_short, scm_to_ushort, scm_to_long,
scm_to_ulong, scm_to_size_t, scm_to_ssize_t, scm_from_schar,
scm_from_uchar, scm_from_char, scm_from_short, scm_from_ushort,
scm_from_int, scm_from_uint, scm_from_long, scm_from_ulong,
scm_from_size_t, scm_from_ssize_t, scm_is_real, scm_to_double,
scm_from_double): New.
* deprecated.h, boolean.h (SCM_FALSEP, SCM_NFALSEP, SCM_BOOL,
SCM_NEGATE_BOOL, SCM_BOOLP): Deprecated by moving into "deprecated.h".
Replaced all uses with scm_is_false, scm_is_true, scm_from_bool, and
scm_is_bool, respectively.
2004-07-06 10:23:30 +00:00
|
|
|
|
return scm_from_bool (0 == cmp);
|
2003-07-13 16:13:57 +00:00
|
|
|
|
}
|
* print.c (scm_iprin1): Handle fractions.
* objects.h (scm_class_fraction): New.
* objects.c (scm_class_fraction): New.
(scm_class_of): Handle fractions.
* hash.c (scm_hasher): Handle fractions.
* numbers.c: New code for handling fraction all over the place.
(scm_odd_p, scm_even_p): Handle inexact integers.
(scm_rational_p): New function, same as scm_real_p.
(scm_round_number, scm_truncate_number, scm_ceiling, scm_floor):
New exact functions that replace the inexact 'dsubr'
implementations.
(scm_numerator, scm_denominator): New.
* numbers.h (SCM_NUMP): Recognize fractions.
(SCM_FRACTIONP, SCM_SLOPPY_FRACTIONP, SCM_FRACTION_NUMERATOR,
SCM_FRACTION_DENOMINATOR, SCM_FRACTION_SET_NUMERATOR,
SCM_FRACTION_SET_DENOMINATOR, SCM_FRACTION_REDUCED_BIT,
SCM_FRACTION_REDUCED_SET, SCM_FRACTION_REDUCED_CLEAR,
SCM_FRACTION_REDUCED): New.
(scm_floor, scm_ceiling, scm_truncate_number, scm_round_number):
New prototypes.
(scm_make_ratio, scm_rationalize, scm_numerator, scm_denominator,
scm_rational_p): New prototypes.
(scm_i_dbl2num, scm_i_fraction2double, scm_i_fraction_equalp,
scm_i_print_fraction): New prototypes.
* goops.c (create_standard_classes): Create "<fraction>" class.
* gc-mark.c (scm_gc_mark_dependencies): Handle fractions.
* gc-card.c (scm_i_sweep_card): Include scm_tc16_fraction as a
case in the switch, but do nothing for now.
* eval.c (SCM_CEVAL, SCM_APPLY, call_dsubr_1): Convert fractions
to doubles when calling 'dsubr' functions.
* eq.c (scm_eqv_p, scm_equal_p): Handle fractions.
2003-11-18 19:59:53 +00:00
|
|
|
|
else if (SCM_FRACTIONP (y))
|
|
|
|
|
|
return SCM_BOOL_F;
|
2003-07-13 16:13:57 +00:00
|
|
|
|
else
|
2009-12-04 13:05:00 +01:00
|
|
|
|
SCM_WTA_DISPATCH_2 (g_scm_i_num_eq_p, x, y, SCM_ARGn, s_scm_i_num_eq_p);
|
2000-05-03 12:35:56 +00:00
|
|
|
|
}
|
2003-07-13 16:13:57 +00:00
|
|
|
|
else if (SCM_REALP (x))
|
|
|
|
|
|
{
|
2005-03-13 00:13:10 +00:00
|
|
|
|
double xx = SCM_REAL_VALUE (x);
|
2004-07-23 15:43:02 +00:00
|
|
|
|
if (SCM_I_INUMP (y))
|
2005-03-13 00:13:10 +00:00
|
|
|
|
{
|
|
|
|
|
|
/* see comments with inum/real above */
|
|
|
|
|
|
long yy = SCM_I_INUM (y);
|
2005-08-11 21:03:58 +00:00
|
|
|
|
return scm_from_bool (xx == (double) yy
|
|
|
|
|
|
&& (DBL_MANT_DIG >= SCM_I_FIXNUM_BIT-1
|
|
|
|
|
|
|| (long) xx == yy));
|
2005-03-13 00:13:10 +00:00
|
|
|
|
}
|
2003-07-13 16:13:57 +00:00
|
|
|
|
else if (SCM_BIGP (y))
|
|
|
|
|
|
{
|
|
|
|
|
|
int cmp;
|
|
|
|
|
|
if (xisnan (SCM_REAL_VALUE (x)))
|
|
|
|
|
|
return SCM_BOOL_F;
|
|
|
|
|
|
cmp = xmpz_cmp_d (SCM_I_BIG_MPZ (y), SCM_REAL_VALUE (x));
|
|
|
|
|
|
scm_remember_upto_here_1 (y);
|
(scm_is_integer, scm_is_signed_integer, scm_is_unsigned_integer,
scm_to_signed_integer, scm_to_unsigned_integer, scm_to_schar,
scm_to_uchar, scm_to_char, scm_to_short, scm_to_ushort, scm_to_long,
scm_to_ulong, scm_to_size_t, scm_to_ssize_t, scm_from_schar,
scm_from_uchar, scm_from_char, scm_from_short, scm_from_ushort,
scm_from_int, scm_from_uint, scm_from_long, scm_from_ulong,
scm_from_size_t, scm_from_ssize_t, scm_is_real, scm_to_double,
scm_from_double): New.
* deprecated.h, boolean.h (SCM_FALSEP, SCM_NFALSEP, SCM_BOOL,
SCM_NEGATE_BOOL, SCM_BOOLP): Deprecated by moving into "deprecated.h".
Replaced all uses with scm_is_false, scm_is_true, scm_from_bool, and
scm_is_bool, respectively.
2004-07-06 10:23:30 +00:00
|
|
|
|
return scm_from_bool (0 == cmp);
|
2003-07-13 16:13:57 +00:00
|
|
|
|
}
|
|
|
|
|
|
else if (SCM_REALP (y))
|
(scm_is_integer, scm_is_signed_integer, scm_is_unsigned_integer,
scm_to_signed_integer, scm_to_unsigned_integer, scm_to_schar,
scm_to_uchar, scm_to_char, scm_to_short, scm_to_ushort, scm_to_long,
scm_to_ulong, scm_to_size_t, scm_to_ssize_t, scm_from_schar,
scm_from_uchar, scm_from_char, scm_from_short, scm_from_ushort,
scm_from_int, scm_from_uint, scm_from_long, scm_from_ulong,
scm_from_size_t, scm_from_ssize_t, scm_is_real, scm_to_double,
scm_from_double): New.
* deprecated.h, boolean.h (SCM_FALSEP, SCM_NFALSEP, SCM_BOOL,
SCM_NEGATE_BOOL, SCM_BOOLP): Deprecated by moving into "deprecated.h".
Replaced all uses with scm_is_false, scm_is_true, scm_from_bool, and
scm_is_bool, respectively.
2004-07-06 10:23:30 +00:00
|
|
|
|
return scm_from_bool (SCM_REAL_VALUE (x) == SCM_REAL_VALUE (y));
|
2003-07-13 16:13:57 +00:00
|
|
|
|
else if (SCM_COMPLEXP (y))
|
(scm_is_integer, scm_is_signed_integer, scm_is_unsigned_integer,
scm_to_signed_integer, scm_to_unsigned_integer, scm_to_schar,
scm_to_uchar, scm_to_char, scm_to_short, scm_to_ushort, scm_to_long,
scm_to_ulong, scm_to_size_t, scm_to_ssize_t, scm_from_schar,
scm_from_uchar, scm_from_char, scm_from_short, scm_from_ushort,
scm_from_int, scm_from_uint, scm_from_long, scm_from_ulong,
scm_from_size_t, scm_from_ssize_t, scm_is_real, scm_to_double,
scm_from_double): New.
* deprecated.h, boolean.h (SCM_FALSEP, SCM_NFALSEP, SCM_BOOL,
SCM_NEGATE_BOOL, SCM_BOOLP): Deprecated by moving into "deprecated.h".
Replaced all uses with scm_is_false, scm_is_true, scm_from_bool, and
scm_is_bool, respectively.
2004-07-06 10:23:30 +00:00
|
|
|
|
return scm_from_bool ((SCM_REAL_VALUE (x) == SCM_COMPLEX_REAL (y))
|
2003-07-13 16:13:57 +00:00
|
|
|
|
&& (0.0 == SCM_COMPLEX_IMAG (y)));
|
* print.c (scm_iprin1): Handle fractions.
* objects.h (scm_class_fraction): New.
* objects.c (scm_class_fraction): New.
(scm_class_of): Handle fractions.
* hash.c (scm_hasher): Handle fractions.
* numbers.c: New code for handling fraction all over the place.
(scm_odd_p, scm_even_p): Handle inexact integers.
(scm_rational_p): New function, same as scm_real_p.
(scm_round_number, scm_truncate_number, scm_ceiling, scm_floor):
New exact functions that replace the inexact 'dsubr'
implementations.
(scm_numerator, scm_denominator): New.
* numbers.h (SCM_NUMP): Recognize fractions.
(SCM_FRACTIONP, SCM_SLOPPY_FRACTIONP, SCM_FRACTION_NUMERATOR,
SCM_FRACTION_DENOMINATOR, SCM_FRACTION_SET_NUMERATOR,
SCM_FRACTION_SET_DENOMINATOR, SCM_FRACTION_REDUCED_BIT,
SCM_FRACTION_REDUCED_SET, SCM_FRACTION_REDUCED_CLEAR,
SCM_FRACTION_REDUCED): New.
(scm_floor, scm_ceiling, scm_truncate_number, scm_round_number):
New prototypes.
(scm_make_ratio, scm_rationalize, scm_numerator, scm_denominator,
scm_rational_p): New prototypes.
(scm_i_dbl2num, scm_i_fraction2double, scm_i_fraction_equalp,
scm_i_print_fraction): New prototypes.
* goops.c (create_standard_classes): Create "<fraction>" class.
* gc-mark.c (scm_gc_mark_dependencies): Handle fractions.
* gc-card.c (scm_i_sweep_card): Include scm_tc16_fraction as a
case in the switch, but do nothing for now.
* eval.c (SCM_CEVAL, SCM_APPLY, call_dsubr_1): Convert fractions
to doubles when calling 'dsubr' functions.
* eq.c (scm_eqv_p, scm_equal_p): Handle fractions.
2003-11-18 19:59:53 +00:00
|
|
|
|
else if (SCM_FRACTIONP (y))
|
2004-02-18 00:21:11 +00:00
|
|
|
|
{
|
|
|
|
|
|
double xx = SCM_REAL_VALUE (x);
|
|
|
|
|
|
if (xisnan (xx))
|
|
|
|
|
|
return SCM_BOOL_F;
|
|
|
|
|
|
if (xisinf (xx))
|
(scm_is_integer, scm_is_signed_integer, scm_is_unsigned_integer,
scm_to_signed_integer, scm_to_unsigned_integer, scm_to_schar,
scm_to_uchar, scm_to_char, scm_to_short, scm_to_ushort, scm_to_long,
scm_to_ulong, scm_to_size_t, scm_to_ssize_t, scm_from_schar,
scm_from_uchar, scm_from_char, scm_from_short, scm_from_ushort,
scm_from_int, scm_from_uint, scm_from_long, scm_from_ulong,
scm_from_size_t, scm_from_ssize_t, scm_is_real, scm_to_double,
scm_from_double): New.
* deprecated.h, boolean.h (SCM_FALSEP, SCM_NFALSEP, SCM_BOOL,
SCM_NEGATE_BOOL, SCM_BOOLP): Deprecated by moving into "deprecated.h".
Replaced all uses with scm_is_false, scm_is_true, scm_from_bool, and
scm_is_bool, respectively.
2004-07-06 10:23:30 +00:00
|
|
|
|
return scm_from_bool (xx < 0.0);
|
2004-02-18 00:21:11 +00:00
|
|
|
|
x = scm_inexact_to_exact (x); /* with x as frac or int */
|
|
|
|
|
|
goto again;
|
|
|
|
|
|
}
|
2003-07-13 16:13:57 +00:00
|
|
|
|
else
|
2009-12-04 13:05:00 +01:00
|
|
|
|
SCM_WTA_DISPATCH_2 (g_scm_i_num_eq_p, x, y, SCM_ARGn, s_scm_i_num_eq_p);
|
1999-01-10 07:38:39 +00:00
|
|
|
|
}
|
2003-07-13 16:13:57 +00:00
|
|
|
|
else if (SCM_COMPLEXP (x))
|
|
|
|
|
|
{
|
2004-07-23 15:43:02 +00:00
|
|
|
|
if (SCM_I_INUMP (y))
|
|
|
|
|
|
return scm_from_bool ((SCM_COMPLEX_REAL (x) == (double) SCM_I_INUM (y))
|
2003-07-13 16:13:57 +00:00
|
|
|
|
&& (SCM_COMPLEX_IMAG (x) == 0.0));
|
|
|
|
|
|
else if (SCM_BIGP (y))
|
|
|
|
|
|
{
|
|
|
|
|
|
int cmp;
|
|
|
|
|
|
if (0.0 != SCM_COMPLEX_IMAG (x))
|
|
|
|
|
|
return SCM_BOOL_F;
|
|
|
|
|
|
if (xisnan (SCM_COMPLEX_REAL (x)))
|
|
|
|
|
|
return SCM_BOOL_F;
|
|
|
|
|
|
cmp = xmpz_cmp_d (SCM_I_BIG_MPZ (y), SCM_COMPLEX_REAL (x));
|
|
|
|
|
|
scm_remember_upto_here_1 (y);
|
(scm_is_integer, scm_is_signed_integer, scm_is_unsigned_integer,
scm_to_signed_integer, scm_to_unsigned_integer, scm_to_schar,
scm_to_uchar, scm_to_char, scm_to_short, scm_to_ushort, scm_to_long,
scm_to_ulong, scm_to_size_t, scm_to_ssize_t, scm_from_schar,
scm_from_uchar, scm_from_char, scm_from_short, scm_from_ushort,
scm_from_int, scm_from_uint, scm_from_long, scm_from_ulong,
scm_from_size_t, scm_from_ssize_t, scm_is_real, scm_to_double,
scm_from_double): New.
* deprecated.h, boolean.h (SCM_FALSEP, SCM_NFALSEP, SCM_BOOL,
SCM_NEGATE_BOOL, SCM_BOOLP): Deprecated by moving into "deprecated.h".
Replaced all uses with scm_is_false, scm_is_true, scm_from_bool, and
scm_is_bool, respectively.
2004-07-06 10:23:30 +00:00
|
|
|
|
return scm_from_bool (0 == cmp);
|
2003-07-13 16:13:57 +00:00
|
|
|
|
}
|
|
|
|
|
|
else if (SCM_REALP (y))
|
(scm_is_integer, scm_is_signed_integer, scm_is_unsigned_integer,
scm_to_signed_integer, scm_to_unsigned_integer, scm_to_schar,
scm_to_uchar, scm_to_char, scm_to_short, scm_to_ushort, scm_to_long,
scm_to_ulong, scm_to_size_t, scm_to_ssize_t, scm_from_schar,
scm_from_uchar, scm_from_char, scm_from_short, scm_from_ushort,
scm_from_int, scm_from_uint, scm_from_long, scm_from_ulong,
scm_from_size_t, scm_from_ssize_t, scm_is_real, scm_to_double,
scm_from_double): New.
* deprecated.h, boolean.h (SCM_FALSEP, SCM_NFALSEP, SCM_BOOL,
SCM_NEGATE_BOOL, SCM_BOOLP): Deprecated by moving into "deprecated.h".
Replaced all uses with scm_is_false, scm_is_true, scm_from_bool, and
scm_is_bool, respectively.
2004-07-06 10:23:30 +00:00
|
|
|
|
return scm_from_bool ((SCM_COMPLEX_REAL (x) == SCM_REAL_VALUE (y))
|
2003-07-13 16:13:57 +00:00
|
|
|
|
&& (SCM_COMPLEX_IMAG (x) == 0.0));
|
|
|
|
|
|
else if (SCM_COMPLEXP (y))
|
(scm_is_integer, scm_is_signed_integer, scm_is_unsigned_integer,
scm_to_signed_integer, scm_to_unsigned_integer, scm_to_schar,
scm_to_uchar, scm_to_char, scm_to_short, scm_to_ushort, scm_to_long,
scm_to_ulong, scm_to_size_t, scm_to_ssize_t, scm_from_schar,
scm_from_uchar, scm_from_char, scm_from_short, scm_from_ushort,
scm_from_int, scm_from_uint, scm_from_long, scm_from_ulong,
scm_from_size_t, scm_from_ssize_t, scm_is_real, scm_to_double,
scm_from_double): New.
* deprecated.h, boolean.h (SCM_FALSEP, SCM_NFALSEP, SCM_BOOL,
SCM_NEGATE_BOOL, SCM_BOOLP): Deprecated by moving into "deprecated.h".
Replaced all uses with scm_is_false, scm_is_true, scm_from_bool, and
scm_is_bool, respectively.
2004-07-06 10:23:30 +00:00
|
|
|
|
return scm_from_bool ((SCM_COMPLEX_REAL (x) == SCM_COMPLEX_REAL (y))
|
2003-07-13 16:13:57 +00:00
|
|
|
|
&& (SCM_COMPLEX_IMAG (x) == SCM_COMPLEX_IMAG (y)));
|
* print.c (scm_iprin1): Handle fractions.
* objects.h (scm_class_fraction): New.
* objects.c (scm_class_fraction): New.
(scm_class_of): Handle fractions.
* hash.c (scm_hasher): Handle fractions.
* numbers.c: New code for handling fraction all over the place.
(scm_odd_p, scm_even_p): Handle inexact integers.
(scm_rational_p): New function, same as scm_real_p.
(scm_round_number, scm_truncate_number, scm_ceiling, scm_floor):
New exact functions that replace the inexact 'dsubr'
implementations.
(scm_numerator, scm_denominator): New.
* numbers.h (SCM_NUMP): Recognize fractions.
(SCM_FRACTIONP, SCM_SLOPPY_FRACTIONP, SCM_FRACTION_NUMERATOR,
SCM_FRACTION_DENOMINATOR, SCM_FRACTION_SET_NUMERATOR,
SCM_FRACTION_SET_DENOMINATOR, SCM_FRACTION_REDUCED_BIT,
SCM_FRACTION_REDUCED_SET, SCM_FRACTION_REDUCED_CLEAR,
SCM_FRACTION_REDUCED): New.
(scm_floor, scm_ceiling, scm_truncate_number, scm_round_number):
New prototypes.
(scm_make_ratio, scm_rationalize, scm_numerator, scm_denominator,
scm_rational_p): New prototypes.
(scm_i_dbl2num, scm_i_fraction2double, scm_i_fraction_equalp,
scm_i_print_fraction): New prototypes.
* goops.c (create_standard_classes): Create "<fraction>" class.
* gc-mark.c (scm_gc_mark_dependencies): Handle fractions.
* gc-card.c (scm_i_sweep_card): Include scm_tc16_fraction as a
case in the switch, but do nothing for now.
* eval.c (SCM_CEVAL, SCM_APPLY, call_dsubr_1): Convert fractions
to doubles when calling 'dsubr' functions.
* eq.c (scm_eqv_p, scm_equal_p): Handle fractions.
2003-11-18 19:59:53 +00:00
|
|
|
|
else if (SCM_FRACTIONP (y))
|
2004-02-18 00:21:11 +00:00
|
|
|
|
{
|
|
|
|
|
|
double xx;
|
|
|
|
|
|
if (SCM_COMPLEX_IMAG (x) != 0.0)
|
|
|
|
|
|
return SCM_BOOL_F;
|
|
|
|
|
|
xx = SCM_COMPLEX_REAL (x);
|
|
|
|
|
|
if (xisnan (xx))
|
|
|
|
|
|
return SCM_BOOL_F;
|
|
|
|
|
|
if (xisinf (xx))
|
(scm_is_integer, scm_is_signed_integer, scm_is_unsigned_integer,
scm_to_signed_integer, scm_to_unsigned_integer, scm_to_schar,
scm_to_uchar, scm_to_char, scm_to_short, scm_to_ushort, scm_to_long,
scm_to_ulong, scm_to_size_t, scm_to_ssize_t, scm_from_schar,
scm_from_uchar, scm_from_char, scm_from_short, scm_from_ushort,
scm_from_int, scm_from_uint, scm_from_long, scm_from_ulong,
scm_from_size_t, scm_from_ssize_t, scm_is_real, scm_to_double,
scm_from_double): New.
* deprecated.h, boolean.h (SCM_FALSEP, SCM_NFALSEP, SCM_BOOL,
SCM_NEGATE_BOOL, SCM_BOOLP): Deprecated by moving into "deprecated.h".
Replaced all uses with scm_is_false, scm_is_true, scm_from_bool, and
scm_is_bool, respectively.
2004-07-06 10:23:30 +00:00
|
|
|
|
return scm_from_bool (xx < 0.0);
|
2004-02-18 00:21:11 +00:00
|
|
|
|
x = scm_inexact_to_exact (x); /* with x as frac or int */
|
|
|
|
|
|
goto again;
|
|
|
|
|
|
}
|
* print.c (scm_iprin1): Handle fractions.
* objects.h (scm_class_fraction): New.
* objects.c (scm_class_fraction): New.
(scm_class_of): Handle fractions.
* hash.c (scm_hasher): Handle fractions.
* numbers.c: New code for handling fraction all over the place.
(scm_odd_p, scm_even_p): Handle inexact integers.
(scm_rational_p): New function, same as scm_real_p.
(scm_round_number, scm_truncate_number, scm_ceiling, scm_floor):
New exact functions that replace the inexact 'dsubr'
implementations.
(scm_numerator, scm_denominator): New.
* numbers.h (SCM_NUMP): Recognize fractions.
(SCM_FRACTIONP, SCM_SLOPPY_FRACTIONP, SCM_FRACTION_NUMERATOR,
SCM_FRACTION_DENOMINATOR, SCM_FRACTION_SET_NUMERATOR,
SCM_FRACTION_SET_DENOMINATOR, SCM_FRACTION_REDUCED_BIT,
SCM_FRACTION_REDUCED_SET, SCM_FRACTION_REDUCED_CLEAR,
SCM_FRACTION_REDUCED): New.
(scm_floor, scm_ceiling, scm_truncate_number, scm_round_number):
New prototypes.
(scm_make_ratio, scm_rationalize, scm_numerator, scm_denominator,
scm_rational_p): New prototypes.
(scm_i_dbl2num, scm_i_fraction2double, scm_i_fraction_equalp,
scm_i_print_fraction): New prototypes.
* goops.c (create_standard_classes): Create "<fraction>" class.
* gc-mark.c (scm_gc_mark_dependencies): Handle fractions.
* gc-card.c (scm_i_sweep_card): Include scm_tc16_fraction as a
case in the switch, but do nothing for now.
* eval.c (SCM_CEVAL, SCM_APPLY, call_dsubr_1): Convert fractions
to doubles when calling 'dsubr' functions.
* eq.c (scm_eqv_p, scm_equal_p): Handle fractions.
2003-11-18 19:59:53 +00:00
|
|
|
|
else
|
2009-12-04 13:05:00 +01:00
|
|
|
|
SCM_WTA_DISPATCH_2 (g_scm_i_num_eq_p, x, y, SCM_ARGn, s_scm_i_num_eq_p);
|
* print.c (scm_iprin1): Handle fractions.
* objects.h (scm_class_fraction): New.
* objects.c (scm_class_fraction): New.
(scm_class_of): Handle fractions.
* hash.c (scm_hasher): Handle fractions.
* numbers.c: New code for handling fraction all over the place.
(scm_odd_p, scm_even_p): Handle inexact integers.
(scm_rational_p): New function, same as scm_real_p.
(scm_round_number, scm_truncate_number, scm_ceiling, scm_floor):
New exact functions that replace the inexact 'dsubr'
implementations.
(scm_numerator, scm_denominator): New.
* numbers.h (SCM_NUMP): Recognize fractions.
(SCM_FRACTIONP, SCM_SLOPPY_FRACTIONP, SCM_FRACTION_NUMERATOR,
SCM_FRACTION_DENOMINATOR, SCM_FRACTION_SET_NUMERATOR,
SCM_FRACTION_SET_DENOMINATOR, SCM_FRACTION_REDUCED_BIT,
SCM_FRACTION_REDUCED_SET, SCM_FRACTION_REDUCED_CLEAR,
SCM_FRACTION_REDUCED): New.
(scm_floor, scm_ceiling, scm_truncate_number, scm_round_number):
New prototypes.
(scm_make_ratio, scm_rationalize, scm_numerator, scm_denominator,
scm_rational_p): New prototypes.
(scm_i_dbl2num, scm_i_fraction2double, scm_i_fraction_equalp,
scm_i_print_fraction): New prototypes.
* goops.c (create_standard_classes): Create "<fraction>" class.
* gc-mark.c (scm_gc_mark_dependencies): Handle fractions.
* gc-card.c (scm_i_sweep_card): Include scm_tc16_fraction as a
case in the switch, but do nothing for now.
* eval.c (SCM_CEVAL, SCM_APPLY, call_dsubr_1): Convert fractions
to doubles when calling 'dsubr' functions.
* eq.c (scm_eqv_p, scm_equal_p): Handle fractions.
2003-11-18 19:59:53 +00:00
|
|
|
|
}
|
|
|
|
|
|
else if (SCM_FRACTIONP (x))
|
|
|
|
|
|
{
|
2004-07-23 15:43:02 +00:00
|
|
|
|
if (SCM_I_INUMP (y))
|
* print.c (scm_iprin1): Handle fractions.
* objects.h (scm_class_fraction): New.
* objects.c (scm_class_fraction): New.
(scm_class_of): Handle fractions.
* hash.c (scm_hasher): Handle fractions.
* numbers.c: New code for handling fraction all over the place.
(scm_odd_p, scm_even_p): Handle inexact integers.
(scm_rational_p): New function, same as scm_real_p.
(scm_round_number, scm_truncate_number, scm_ceiling, scm_floor):
New exact functions that replace the inexact 'dsubr'
implementations.
(scm_numerator, scm_denominator): New.
* numbers.h (SCM_NUMP): Recognize fractions.
(SCM_FRACTIONP, SCM_SLOPPY_FRACTIONP, SCM_FRACTION_NUMERATOR,
SCM_FRACTION_DENOMINATOR, SCM_FRACTION_SET_NUMERATOR,
SCM_FRACTION_SET_DENOMINATOR, SCM_FRACTION_REDUCED_BIT,
SCM_FRACTION_REDUCED_SET, SCM_FRACTION_REDUCED_CLEAR,
SCM_FRACTION_REDUCED): New.
(scm_floor, scm_ceiling, scm_truncate_number, scm_round_number):
New prototypes.
(scm_make_ratio, scm_rationalize, scm_numerator, scm_denominator,
scm_rational_p): New prototypes.
(scm_i_dbl2num, scm_i_fraction2double, scm_i_fraction_equalp,
scm_i_print_fraction): New prototypes.
* goops.c (create_standard_classes): Create "<fraction>" class.
* gc-mark.c (scm_gc_mark_dependencies): Handle fractions.
* gc-card.c (scm_i_sweep_card): Include scm_tc16_fraction as a
case in the switch, but do nothing for now.
* eval.c (SCM_CEVAL, SCM_APPLY, call_dsubr_1): Convert fractions
to doubles when calling 'dsubr' functions.
* eq.c (scm_eqv_p, scm_equal_p): Handle fractions.
2003-11-18 19:59:53 +00:00
|
|
|
|
return SCM_BOOL_F;
|
|
|
|
|
|
else if (SCM_BIGP (y))
|
|
|
|
|
|
return SCM_BOOL_F;
|
|
|
|
|
|
else if (SCM_REALP (y))
|
2004-02-18 00:21:11 +00:00
|
|
|
|
{
|
|
|
|
|
|
double yy = SCM_REAL_VALUE (y);
|
|
|
|
|
|
if (xisnan (yy))
|
|
|
|
|
|
return SCM_BOOL_F;
|
|
|
|
|
|
if (xisinf (yy))
|
(scm_is_integer, scm_is_signed_integer, scm_is_unsigned_integer,
scm_to_signed_integer, scm_to_unsigned_integer, scm_to_schar,
scm_to_uchar, scm_to_char, scm_to_short, scm_to_ushort, scm_to_long,
scm_to_ulong, scm_to_size_t, scm_to_ssize_t, scm_from_schar,
scm_from_uchar, scm_from_char, scm_from_short, scm_from_ushort,
scm_from_int, scm_from_uint, scm_from_long, scm_from_ulong,
scm_from_size_t, scm_from_ssize_t, scm_is_real, scm_to_double,
scm_from_double): New.
* deprecated.h, boolean.h (SCM_FALSEP, SCM_NFALSEP, SCM_BOOL,
SCM_NEGATE_BOOL, SCM_BOOLP): Deprecated by moving into "deprecated.h".
Replaced all uses with scm_is_false, scm_is_true, scm_from_bool, and
scm_is_bool, respectively.
2004-07-06 10:23:30 +00:00
|
|
|
|
return scm_from_bool (0.0 < yy);
|
2004-02-18 00:21:11 +00:00
|
|
|
|
y = scm_inexact_to_exact (y); /* with y as frac or int */
|
|
|
|
|
|
goto again;
|
|
|
|
|
|
}
|
* print.c (scm_iprin1): Handle fractions.
* objects.h (scm_class_fraction): New.
* objects.c (scm_class_fraction): New.
(scm_class_of): Handle fractions.
* hash.c (scm_hasher): Handle fractions.
* numbers.c: New code for handling fraction all over the place.
(scm_odd_p, scm_even_p): Handle inexact integers.
(scm_rational_p): New function, same as scm_real_p.
(scm_round_number, scm_truncate_number, scm_ceiling, scm_floor):
New exact functions that replace the inexact 'dsubr'
implementations.
(scm_numerator, scm_denominator): New.
* numbers.h (SCM_NUMP): Recognize fractions.
(SCM_FRACTIONP, SCM_SLOPPY_FRACTIONP, SCM_FRACTION_NUMERATOR,
SCM_FRACTION_DENOMINATOR, SCM_FRACTION_SET_NUMERATOR,
SCM_FRACTION_SET_DENOMINATOR, SCM_FRACTION_REDUCED_BIT,
SCM_FRACTION_REDUCED_SET, SCM_FRACTION_REDUCED_CLEAR,
SCM_FRACTION_REDUCED): New.
(scm_floor, scm_ceiling, scm_truncate_number, scm_round_number):
New prototypes.
(scm_make_ratio, scm_rationalize, scm_numerator, scm_denominator,
scm_rational_p): New prototypes.
(scm_i_dbl2num, scm_i_fraction2double, scm_i_fraction_equalp,
scm_i_print_fraction): New prototypes.
* goops.c (create_standard_classes): Create "<fraction>" class.
* gc-mark.c (scm_gc_mark_dependencies): Handle fractions.
* gc-card.c (scm_i_sweep_card): Include scm_tc16_fraction as a
case in the switch, but do nothing for now.
* eval.c (SCM_CEVAL, SCM_APPLY, call_dsubr_1): Convert fractions
to doubles when calling 'dsubr' functions.
* eq.c (scm_eqv_p, scm_equal_p): Handle fractions.
2003-11-18 19:59:53 +00:00
|
|
|
|
else if (SCM_COMPLEXP (y))
|
2004-02-18 00:21:11 +00:00
|
|
|
|
{
|
|
|
|
|
|
double yy;
|
|
|
|
|
|
if (SCM_COMPLEX_IMAG (y) != 0.0)
|
|
|
|
|
|
return SCM_BOOL_F;
|
|
|
|
|
|
yy = SCM_COMPLEX_REAL (y);
|
|
|
|
|
|
if (xisnan (yy))
|
|
|
|
|
|
return SCM_BOOL_F;
|
|
|
|
|
|
if (xisinf (yy))
|
(scm_is_integer, scm_is_signed_integer, scm_is_unsigned_integer,
scm_to_signed_integer, scm_to_unsigned_integer, scm_to_schar,
scm_to_uchar, scm_to_char, scm_to_short, scm_to_ushort, scm_to_long,
scm_to_ulong, scm_to_size_t, scm_to_ssize_t, scm_from_schar,
scm_from_uchar, scm_from_char, scm_from_short, scm_from_ushort,
scm_from_int, scm_from_uint, scm_from_long, scm_from_ulong,
scm_from_size_t, scm_from_ssize_t, scm_is_real, scm_to_double,
scm_from_double): New.
* deprecated.h, boolean.h (SCM_FALSEP, SCM_NFALSEP, SCM_BOOL,
SCM_NEGATE_BOOL, SCM_BOOLP): Deprecated by moving into "deprecated.h".
Replaced all uses with scm_is_false, scm_is_true, scm_from_bool, and
scm_is_bool, respectively.
2004-07-06 10:23:30 +00:00
|
|
|
|
return scm_from_bool (0.0 < yy);
|
2004-02-18 00:21:11 +00:00
|
|
|
|
y = scm_inexact_to_exact (y); /* with y as frac or int */
|
|
|
|
|
|
goto again;
|
|
|
|
|
|
}
|
* print.c (scm_iprin1): Handle fractions.
* objects.h (scm_class_fraction): New.
* objects.c (scm_class_fraction): New.
(scm_class_of): Handle fractions.
* hash.c (scm_hasher): Handle fractions.
* numbers.c: New code for handling fraction all over the place.
(scm_odd_p, scm_even_p): Handle inexact integers.
(scm_rational_p): New function, same as scm_real_p.
(scm_round_number, scm_truncate_number, scm_ceiling, scm_floor):
New exact functions that replace the inexact 'dsubr'
implementations.
(scm_numerator, scm_denominator): New.
* numbers.h (SCM_NUMP): Recognize fractions.
(SCM_FRACTIONP, SCM_SLOPPY_FRACTIONP, SCM_FRACTION_NUMERATOR,
SCM_FRACTION_DENOMINATOR, SCM_FRACTION_SET_NUMERATOR,
SCM_FRACTION_SET_DENOMINATOR, SCM_FRACTION_REDUCED_BIT,
SCM_FRACTION_REDUCED_SET, SCM_FRACTION_REDUCED_CLEAR,
SCM_FRACTION_REDUCED): New.
(scm_floor, scm_ceiling, scm_truncate_number, scm_round_number):
New prototypes.
(scm_make_ratio, scm_rationalize, scm_numerator, scm_denominator,
scm_rational_p): New prototypes.
(scm_i_dbl2num, scm_i_fraction2double, scm_i_fraction_equalp,
scm_i_print_fraction): New prototypes.
* goops.c (create_standard_classes): Create "<fraction>" class.
* gc-mark.c (scm_gc_mark_dependencies): Handle fractions.
* gc-card.c (scm_i_sweep_card): Include scm_tc16_fraction as a
case in the switch, but do nothing for now.
* eval.c (SCM_CEVAL, SCM_APPLY, call_dsubr_1): Convert fractions
to doubles when calling 'dsubr' functions.
* eq.c (scm_eqv_p, scm_equal_p): Handle fractions.
2003-11-18 19:59:53 +00:00
|
|
|
|
else if (SCM_FRACTIONP (y))
|
|
|
|
|
|
return scm_i_fraction_equalp (x, y);
|
2003-07-13 16:13:57 +00:00
|
|
|
|
else
|
2009-12-04 13:05:00 +01:00
|
|
|
|
SCM_WTA_DISPATCH_2 (g_scm_i_num_eq_p, x, y, SCM_ARGn, s_scm_i_num_eq_p);
|
2000-05-03 12:35:56 +00:00
|
|
|
|
}
|
2003-07-13 16:13:57 +00:00
|
|
|
|
else
|
2009-12-04 13:05:00 +01:00
|
|
|
|
SCM_WTA_DISPATCH_2 (g_scm_i_num_eq_p, x, y, SCM_ARG1, s_scm_i_num_eq_p);
|
1996-07-25 22:56:11 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
2004-01-03 21:38:38 +00:00
|
|
|
|
/* OPTIMIZE-ME: For int/frac and frac/frac compares, the multiplications
|
|
|
|
|
|
done are good for inums, but for bignums an answer can almost always be
|
|
|
|
|
|
had by just examining a few high bits of the operands, as done by GMP in
|
|
|
|
|
|
mpq_cmp. flonum/frac compares likewise, but with the slight complication
|
|
|
|
|
|
of the float exponent to take into account. */
|
|
|
|
|
|
|
2010-05-28 16:51:57 +02:00
|
|
|
|
SCM_INTERNAL SCM scm_i_num_less_p (SCM, SCM, SCM);
|
2009-12-04 13:05:00 +01:00
|
|
|
|
SCM_PRIMITIVE_GENERIC (scm_i_num_less_p, "<", 0, 2, 1,
|
|
|
|
|
|
(SCM x, SCM y, SCM rest),
|
|
|
|
|
|
"Return @code{#t} if the list of parameters is monotonically\n"
|
|
|
|
|
|
"increasing.")
|
|
|
|
|
|
#define FUNC_NAME s_scm_i_num_less_p
|
|
|
|
|
|
{
|
|
|
|
|
|
if (SCM_UNBNDP (x) || SCM_UNBNDP (y))
|
|
|
|
|
|
return SCM_BOOL_T;
|
|
|
|
|
|
while (!scm_is_null (rest))
|
|
|
|
|
|
{
|
|
|
|
|
|
if (scm_is_false (scm_less_p (x, y)))
|
|
|
|
|
|
return SCM_BOOL_F;
|
|
|
|
|
|
x = y;
|
|
|
|
|
|
y = scm_car (rest);
|
|
|
|
|
|
rest = scm_cdr (rest);
|
|
|
|
|
|
}
|
|
|
|
|
|
return scm_less_p (x, y);
|
|
|
|
|
|
}
|
|
|
|
|
|
#undef FUNC_NAME
|
1996-07-25 22:56:11 +00:00
|
|
|
|
SCM
|
1999-12-12 20:35:02 +00:00
|
|
|
|
scm_less_p (SCM x, SCM y)
|
1996-07-25 22:56:11 +00:00
|
|
|
|
{
|
2004-01-03 21:38:38 +00:00
|
|
|
|
again:
|
2004-07-23 15:43:02 +00:00
|
|
|
|
if (SCM_I_INUMP (x))
|
2003-07-13 16:13:57 +00:00
|
|
|
|
{
|
2004-07-23 15:43:02 +00:00
|
|
|
|
long xx = SCM_I_INUM (x);
|
|
|
|
|
|
if (SCM_I_INUMP (y))
|
2003-07-13 16:13:57 +00:00
|
|
|
|
{
|
2004-07-23 15:43:02 +00:00
|
|
|
|
long yy = SCM_I_INUM (y);
|
(scm_is_integer, scm_is_signed_integer, scm_is_unsigned_integer,
scm_to_signed_integer, scm_to_unsigned_integer, scm_to_schar,
scm_to_uchar, scm_to_char, scm_to_short, scm_to_ushort, scm_to_long,
scm_to_ulong, scm_to_size_t, scm_to_ssize_t, scm_from_schar,
scm_from_uchar, scm_from_char, scm_from_short, scm_from_ushort,
scm_from_int, scm_from_uint, scm_from_long, scm_from_ulong,
scm_from_size_t, scm_from_ssize_t, scm_is_real, scm_to_double,
scm_from_double): New.
* deprecated.h, boolean.h (SCM_FALSEP, SCM_NFALSEP, SCM_BOOL,
SCM_NEGATE_BOOL, SCM_BOOLP): Deprecated by moving into "deprecated.h".
Replaced all uses with scm_is_false, scm_is_true, scm_from_bool, and
scm_is_bool, respectively.
2004-07-06 10:23:30 +00:00
|
|
|
|
return scm_from_bool (xx < yy);
|
2003-07-13 16:13:57 +00:00
|
|
|
|
}
|
|
|
|
|
|
else if (SCM_BIGP (y))
|
|
|
|
|
|
{
|
|
|
|
|
|
int sgn = mpz_sgn (SCM_I_BIG_MPZ (y));
|
|
|
|
|
|
scm_remember_upto_here_1 (y);
|
(scm_is_integer, scm_is_signed_integer, scm_is_unsigned_integer,
scm_to_signed_integer, scm_to_unsigned_integer, scm_to_schar,
scm_to_uchar, scm_to_char, scm_to_short, scm_to_ushort, scm_to_long,
scm_to_ulong, scm_to_size_t, scm_to_ssize_t, scm_from_schar,
scm_from_uchar, scm_from_char, scm_from_short, scm_from_ushort,
scm_from_int, scm_from_uint, scm_from_long, scm_from_ulong,
scm_from_size_t, scm_from_ssize_t, scm_is_real, scm_to_double,
scm_from_double): New.
* deprecated.h, boolean.h (SCM_FALSEP, SCM_NFALSEP, SCM_BOOL,
SCM_NEGATE_BOOL, SCM_BOOLP): Deprecated by moving into "deprecated.h".
Replaced all uses with scm_is_false, scm_is_true, scm_from_bool, and
scm_is_bool, respectively.
2004-07-06 10:23:30 +00:00
|
|
|
|
return scm_from_bool (sgn > 0);
|
2003-07-13 16:13:57 +00:00
|
|
|
|
}
|
|
|
|
|
|
else if (SCM_REALP (y))
|
(scm_is_integer, scm_is_signed_integer, scm_is_unsigned_integer,
scm_to_signed_integer, scm_to_unsigned_integer, scm_to_schar,
scm_to_uchar, scm_to_char, scm_to_short, scm_to_ushort, scm_to_long,
scm_to_ulong, scm_to_size_t, scm_to_ssize_t, scm_from_schar,
scm_from_uchar, scm_from_char, scm_from_short, scm_from_ushort,
scm_from_int, scm_from_uint, scm_from_long, scm_from_ulong,
scm_from_size_t, scm_from_ssize_t, scm_is_real, scm_to_double,
scm_from_double): New.
* deprecated.h, boolean.h (SCM_FALSEP, SCM_NFALSEP, SCM_BOOL,
SCM_NEGATE_BOOL, SCM_BOOLP): Deprecated by moving into "deprecated.h".
Replaced all uses with scm_is_false, scm_is_true, scm_from_bool, and
scm_is_bool, respectively.
2004-07-06 10:23:30 +00:00
|
|
|
|
return scm_from_bool ((double) xx < SCM_REAL_VALUE (y));
|
* print.c (scm_iprin1): Handle fractions.
* objects.h (scm_class_fraction): New.
* objects.c (scm_class_fraction): New.
(scm_class_of): Handle fractions.
* hash.c (scm_hasher): Handle fractions.
* numbers.c: New code for handling fraction all over the place.
(scm_odd_p, scm_even_p): Handle inexact integers.
(scm_rational_p): New function, same as scm_real_p.
(scm_round_number, scm_truncate_number, scm_ceiling, scm_floor):
New exact functions that replace the inexact 'dsubr'
implementations.
(scm_numerator, scm_denominator): New.
* numbers.h (SCM_NUMP): Recognize fractions.
(SCM_FRACTIONP, SCM_SLOPPY_FRACTIONP, SCM_FRACTION_NUMERATOR,
SCM_FRACTION_DENOMINATOR, SCM_FRACTION_SET_NUMERATOR,
SCM_FRACTION_SET_DENOMINATOR, SCM_FRACTION_REDUCED_BIT,
SCM_FRACTION_REDUCED_SET, SCM_FRACTION_REDUCED_CLEAR,
SCM_FRACTION_REDUCED): New.
(scm_floor, scm_ceiling, scm_truncate_number, scm_round_number):
New prototypes.
(scm_make_ratio, scm_rationalize, scm_numerator, scm_denominator,
scm_rational_p): New prototypes.
(scm_i_dbl2num, scm_i_fraction2double, scm_i_fraction_equalp,
scm_i_print_fraction): New prototypes.
* goops.c (create_standard_classes): Create "<fraction>" class.
* gc-mark.c (scm_gc_mark_dependencies): Handle fractions.
* gc-card.c (scm_i_sweep_card): Include scm_tc16_fraction as a
case in the switch, but do nothing for now.
* eval.c (SCM_CEVAL, SCM_APPLY, call_dsubr_1): Convert fractions
to doubles when calling 'dsubr' functions.
* eq.c (scm_eqv_p, scm_equal_p): Handle fractions.
2003-11-18 19:59:53 +00:00
|
|
|
|
else if (SCM_FRACTIONP (y))
|
2004-01-03 21:38:38 +00:00
|
|
|
|
{
|
|
|
|
|
|
/* "x < a/b" becomes "x*b < a" */
|
|
|
|
|
|
int_frac:
|
|
|
|
|
|
x = scm_product (x, SCM_FRACTION_DENOMINATOR (y));
|
|
|
|
|
|
y = SCM_FRACTION_NUMERATOR (y);
|
|
|
|
|
|
goto again;
|
|
|
|
|
|
}
|
2003-07-13 16:13:57 +00:00
|
|
|
|
else
|
2009-12-04 13:05:00 +01:00
|
|
|
|
SCM_WTA_DISPATCH_2 (g_scm_i_num_less_p, x, y, SCM_ARGn, s_scm_i_num_less_p);
|
1999-01-10 07:38:39 +00:00
|
|
|
|
}
|
2003-07-13 16:13:57 +00:00
|
|
|
|
else if (SCM_BIGP (x))
|
|
|
|
|
|
{
|
2004-07-23 15:43:02 +00:00
|
|
|
|
if (SCM_I_INUMP (y))
|
2003-07-13 16:13:57 +00:00
|
|
|
|
{
|
|
|
|
|
|
int sgn = mpz_sgn (SCM_I_BIG_MPZ (x));
|
|
|
|
|
|
scm_remember_upto_here_1 (x);
|
(scm_is_integer, scm_is_signed_integer, scm_is_unsigned_integer,
scm_to_signed_integer, scm_to_unsigned_integer, scm_to_schar,
scm_to_uchar, scm_to_char, scm_to_short, scm_to_ushort, scm_to_long,
scm_to_ulong, scm_to_size_t, scm_to_ssize_t, scm_from_schar,
scm_from_uchar, scm_from_char, scm_from_short, scm_from_ushort,
scm_from_int, scm_from_uint, scm_from_long, scm_from_ulong,
scm_from_size_t, scm_from_ssize_t, scm_is_real, scm_to_double,
scm_from_double): New.
* deprecated.h, boolean.h (SCM_FALSEP, SCM_NFALSEP, SCM_BOOL,
SCM_NEGATE_BOOL, SCM_BOOLP): Deprecated by moving into "deprecated.h".
Replaced all uses with scm_is_false, scm_is_true, scm_from_bool, and
scm_is_bool, respectively.
2004-07-06 10:23:30 +00:00
|
|
|
|
return scm_from_bool (sgn < 0);
|
2003-07-13 16:13:57 +00:00
|
|
|
|
}
|
|
|
|
|
|
else if (SCM_BIGP (y))
|
|
|
|
|
|
{
|
|
|
|
|
|
int cmp = mpz_cmp (SCM_I_BIG_MPZ (x), SCM_I_BIG_MPZ (y));
|
|
|
|
|
|
scm_remember_upto_here_2 (x, y);
|
(scm_is_integer, scm_is_signed_integer, scm_is_unsigned_integer,
scm_to_signed_integer, scm_to_unsigned_integer, scm_to_schar,
scm_to_uchar, scm_to_char, scm_to_short, scm_to_ushort, scm_to_long,
scm_to_ulong, scm_to_size_t, scm_to_ssize_t, scm_from_schar,
scm_from_uchar, scm_from_char, scm_from_short, scm_from_ushort,
scm_from_int, scm_from_uint, scm_from_long, scm_from_ulong,
scm_from_size_t, scm_from_ssize_t, scm_is_real, scm_to_double,
scm_from_double): New.
* deprecated.h, boolean.h (SCM_FALSEP, SCM_NFALSEP, SCM_BOOL,
SCM_NEGATE_BOOL, SCM_BOOLP): Deprecated by moving into "deprecated.h".
Replaced all uses with scm_is_false, scm_is_true, scm_from_bool, and
scm_is_bool, respectively.
2004-07-06 10:23:30 +00:00
|
|
|
|
return scm_from_bool (cmp < 0);
|
2003-07-13 16:13:57 +00:00
|
|
|
|
}
|
|
|
|
|
|
else if (SCM_REALP (y))
|
|
|
|
|
|
{
|
|
|
|
|
|
int cmp;
|
|
|
|
|
|
if (xisnan (SCM_REAL_VALUE (y)))
|
|
|
|
|
|
return SCM_BOOL_F;
|
|
|
|
|
|
cmp = xmpz_cmp_d (SCM_I_BIG_MPZ (x), SCM_REAL_VALUE (y));
|
|
|
|
|
|
scm_remember_upto_here_1 (x);
|
(scm_is_integer, scm_is_signed_integer, scm_is_unsigned_integer,
scm_to_signed_integer, scm_to_unsigned_integer, scm_to_schar,
scm_to_uchar, scm_to_char, scm_to_short, scm_to_ushort, scm_to_long,
scm_to_ulong, scm_to_size_t, scm_to_ssize_t, scm_from_schar,
scm_from_uchar, scm_from_char, scm_from_short, scm_from_ushort,
scm_from_int, scm_from_uint, scm_from_long, scm_from_ulong,
scm_from_size_t, scm_from_ssize_t, scm_is_real, scm_to_double,
scm_from_double): New.
* deprecated.h, boolean.h (SCM_FALSEP, SCM_NFALSEP, SCM_BOOL,
SCM_NEGATE_BOOL, SCM_BOOLP): Deprecated by moving into "deprecated.h".
Replaced all uses with scm_is_false, scm_is_true, scm_from_bool, and
scm_is_bool, respectively.
2004-07-06 10:23:30 +00:00
|
|
|
|
return scm_from_bool (cmp < 0);
|
2003-07-13 16:13:57 +00:00
|
|
|
|
}
|
* print.c (scm_iprin1): Handle fractions.
* objects.h (scm_class_fraction): New.
* objects.c (scm_class_fraction): New.
(scm_class_of): Handle fractions.
* hash.c (scm_hasher): Handle fractions.
* numbers.c: New code for handling fraction all over the place.
(scm_odd_p, scm_even_p): Handle inexact integers.
(scm_rational_p): New function, same as scm_real_p.
(scm_round_number, scm_truncate_number, scm_ceiling, scm_floor):
New exact functions that replace the inexact 'dsubr'
implementations.
(scm_numerator, scm_denominator): New.
* numbers.h (SCM_NUMP): Recognize fractions.
(SCM_FRACTIONP, SCM_SLOPPY_FRACTIONP, SCM_FRACTION_NUMERATOR,
SCM_FRACTION_DENOMINATOR, SCM_FRACTION_SET_NUMERATOR,
SCM_FRACTION_SET_DENOMINATOR, SCM_FRACTION_REDUCED_BIT,
SCM_FRACTION_REDUCED_SET, SCM_FRACTION_REDUCED_CLEAR,
SCM_FRACTION_REDUCED): New.
(scm_floor, scm_ceiling, scm_truncate_number, scm_round_number):
New prototypes.
(scm_make_ratio, scm_rationalize, scm_numerator, scm_denominator,
scm_rational_p): New prototypes.
(scm_i_dbl2num, scm_i_fraction2double, scm_i_fraction_equalp,
scm_i_print_fraction): New prototypes.
* goops.c (create_standard_classes): Create "<fraction>" class.
* gc-mark.c (scm_gc_mark_dependencies): Handle fractions.
* gc-card.c (scm_i_sweep_card): Include scm_tc16_fraction as a
case in the switch, but do nothing for now.
* eval.c (SCM_CEVAL, SCM_APPLY, call_dsubr_1): Convert fractions
to doubles when calling 'dsubr' functions.
* eq.c (scm_eqv_p, scm_equal_p): Handle fractions.
2003-11-18 19:59:53 +00:00
|
|
|
|
else if (SCM_FRACTIONP (y))
|
2004-01-03 21:38:38 +00:00
|
|
|
|
goto int_frac;
|
2003-07-13 16:13:57 +00:00
|
|
|
|
else
|
2009-12-04 13:05:00 +01:00
|
|
|
|
SCM_WTA_DISPATCH_2 (g_scm_i_num_less_p, x, y, SCM_ARGn, s_scm_i_num_less_p);
|
2000-05-03 12:35:56 +00:00
|
|
|
|
}
|
2003-07-13 16:13:57 +00:00
|
|
|
|
else if (SCM_REALP (x))
|
|
|
|
|
|
{
|
2004-07-23 15:43:02 +00:00
|
|
|
|
if (SCM_I_INUMP (y))
|
|
|
|
|
|
return scm_from_bool (SCM_REAL_VALUE (x) < (double) SCM_I_INUM (y));
|
2003-07-13 16:13:57 +00:00
|
|
|
|
else if (SCM_BIGP (y))
|
|
|
|
|
|
{
|
|
|
|
|
|
int cmp;
|
|
|
|
|
|
if (xisnan (SCM_REAL_VALUE (x)))
|
|
|
|
|
|
return SCM_BOOL_F;
|
|
|
|
|
|
cmp = xmpz_cmp_d (SCM_I_BIG_MPZ (y), SCM_REAL_VALUE (x));
|
|
|
|
|
|
scm_remember_upto_here_1 (y);
|
(scm_is_integer, scm_is_signed_integer, scm_is_unsigned_integer,
scm_to_signed_integer, scm_to_unsigned_integer, scm_to_schar,
scm_to_uchar, scm_to_char, scm_to_short, scm_to_ushort, scm_to_long,
scm_to_ulong, scm_to_size_t, scm_to_ssize_t, scm_from_schar,
scm_from_uchar, scm_from_char, scm_from_short, scm_from_ushort,
scm_from_int, scm_from_uint, scm_from_long, scm_from_ulong,
scm_from_size_t, scm_from_ssize_t, scm_is_real, scm_to_double,
scm_from_double): New.
* deprecated.h, boolean.h (SCM_FALSEP, SCM_NFALSEP, SCM_BOOL,
SCM_NEGATE_BOOL, SCM_BOOLP): Deprecated by moving into "deprecated.h".
Replaced all uses with scm_is_false, scm_is_true, scm_from_bool, and
scm_is_bool, respectively.
2004-07-06 10:23:30 +00:00
|
|
|
|
return scm_from_bool (cmp > 0);
|
2003-07-13 16:13:57 +00:00
|
|
|
|
}
|
|
|
|
|
|
else if (SCM_REALP (y))
|
(scm_is_integer, scm_is_signed_integer, scm_is_unsigned_integer,
scm_to_signed_integer, scm_to_unsigned_integer, scm_to_schar,
scm_to_uchar, scm_to_char, scm_to_short, scm_to_ushort, scm_to_long,
scm_to_ulong, scm_to_size_t, scm_to_ssize_t, scm_from_schar,
scm_from_uchar, scm_from_char, scm_from_short, scm_from_ushort,
scm_from_int, scm_from_uint, scm_from_long, scm_from_ulong,
scm_from_size_t, scm_from_ssize_t, scm_is_real, scm_to_double,
scm_from_double): New.
* deprecated.h, boolean.h (SCM_FALSEP, SCM_NFALSEP, SCM_BOOL,
SCM_NEGATE_BOOL, SCM_BOOLP): Deprecated by moving into "deprecated.h".
Replaced all uses with scm_is_false, scm_is_true, scm_from_bool, and
scm_is_bool, respectively.
2004-07-06 10:23:30 +00:00
|
|
|
|
return scm_from_bool (SCM_REAL_VALUE (x) < SCM_REAL_VALUE (y));
|
* print.c (scm_iprin1): Handle fractions.
* objects.h (scm_class_fraction): New.
* objects.c (scm_class_fraction): New.
(scm_class_of): Handle fractions.
* hash.c (scm_hasher): Handle fractions.
* numbers.c: New code for handling fraction all over the place.
(scm_odd_p, scm_even_p): Handle inexact integers.
(scm_rational_p): New function, same as scm_real_p.
(scm_round_number, scm_truncate_number, scm_ceiling, scm_floor):
New exact functions that replace the inexact 'dsubr'
implementations.
(scm_numerator, scm_denominator): New.
* numbers.h (SCM_NUMP): Recognize fractions.
(SCM_FRACTIONP, SCM_SLOPPY_FRACTIONP, SCM_FRACTION_NUMERATOR,
SCM_FRACTION_DENOMINATOR, SCM_FRACTION_SET_NUMERATOR,
SCM_FRACTION_SET_DENOMINATOR, SCM_FRACTION_REDUCED_BIT,
SCM_FRACTION_REDUCED_SET, SCM_FRACTION_REDUCED_CLEAR,
SCM_FRACTION_REDUCED): New.
(scm_floor, scm_ceiling, scm_truncate_number, scm_round_number):
New prototypes.
(scm_make_ratio, scm_rationalize, scm_numerator, scm_denominator,
scm_rational_p): New prototypes.
(scm_i_dbl2num, scm_i_fraction2double, scm_i_fraction_equalp,
scm_i_print_fraction): New prototypes.
* goops.c (create_standard_classes): Create "<fraction>" class.
* gc-mark.c (scm_gc_mark_dependencies): Handle fractions.
* gc-card.c (scm_i_sweep_card): Include scm_tc16_fraction as a
case in the switch, but do nothing for now.
* eval.c (SCM_CEVAL, SCM_APPLY, call_dsubr_1): Convert fractions
to doubles when calling 'dsubr' functions.
* eq.c (scm_eqv_p, scm_equal_p): Handle fractions.
2003-11-18 19:59:53 +00:00
|
|
|
|
else if (SCM_FRACTIONP (y))
|
2004-01-03 21:38:38 +00:00
|
|
|
|
{
|
|
|
|
|
|
double xx = SCM_REAL_VALUE (x);
|
|
|
|
|
|
if (xisnan (xx))
|
|
|
|
|
|
return SCM_BOOL_F;
|
|
|
|
|
|
if (xisinf (xx))
|
(scm_is_integer, scm_is_signed_integer, scm_is_unsigned_integer,
scm_to_signed_integer, scm_to_unsigned_integer, scm_to_schar,
scm_to_uchar, scm_to_char, scm_to_short, scm_to_ushort, scm_to_long,
scm_to_ulong, scm_to_size_t, scm_to_ssize_t, scm_from_schar,
scm_from_uchar, scm_from_char, scm_from_short, scm_from_ushort,
scm_from_int, scm_from_uint, scm_from_long, scm_from_ulong,
scm_from_size_t, scm_from_ssize_t, scm_is_real, scm_to_double,
scm_from_double): New.
* deprecated.h, boolean.h (SCM_FALSEP, SCM_NFALSEP, SCM_BOOL,
SCM_NEGATE_BOOL, SCM_BOOLP): Deprecated by moving into "deprecated.h".
Replaced all uses with scm_is_false, scm_is_true, scm_from_bool, and
scm_is_bool, respectively.
2004-07-06 10:23:30 +00:00
|
|
|
|
return scm_from_bool (xx < 0.0);
|
2004-01-03 21:38:38 +00:00
|
|
|
|
x = scm_inexact_to_exact (x); /* with x as frac or int */
|
|
|
|
|
|
goto again;
|
|
|
|
|
|
}
|
* print.c (scm_iprin1): Handle fractions.
* objects.h (scm_class_fraction): New.
* objects.c (scm_class_fraction): New.
(scm_class_of): Handle fractions.
* hash.c (scm_hasher): Handle fractions.
* numbers.c: New code for handling fraction all over the place.
(scm_odd_p, scm_even_p): Handle inexact integers.
(scm_rational_p): New function, same as scm_real_p.
(scm_round_number, scm_truncate_number, scm_ceiling, scm_floor):
New exact functions that replace the inexact 'dsubr'
implementations.
(scm_numerator, scm_denominator): New.
* numbers.h (SCM_NUMP): Recognize fractions.
(SCM_FRACTIONP, SCM_SLOPPY_FRACTIONP, SCM_FRACTION_NUMERATOR,
SCM_FRACTION_DENOMINATOR, SCM_FRACTION_SET_NUMERATOR,
SCM_FRACTION_SET_DENOMINATOR, SCM_FRACTION_REDUCED_BIT,
SCM_FRACTION_REDUCED_SET, SCM_FRACTION_REDUCED_CLEAR,
SCM_FRACTION_REDUCED): New.
(scm_floor, scm_ceiling, scm_truncate_number, scm_round_number):
New prototypes.
(scm_make_ratio, scm_rationalize, scm_numerator, scm_denominator,
scm_rational_p): New prototypes.
(scm_i_dbl2num, scm_i_fraction2double, scm_i_fraction_equalp,
scm_i_print_fraction): New prototypes.
* goops.c (create_standard_classes): Create "<fraction>" class.
* gc-mark.c (scm_gc_mark_dependencies): Handle fractions.
* gc-card.c (scm_i_sweep_card): Include scm_tc16_fraction as a
case in the switch, but do nothing for now.
* eval.c (SCM_CEVAL, SCM_APPLY, call_dsubr_1): Convert fractions
to doubles when calling 'dsubr' functions.
* eq.c (scm_eqv_p, scm_equal_p): Handle fractions.
2003-11-18 19:59:53 +00:00
|
|
|
|
else
|
2009-12-04 13:05:00 +01:00
|
|
|
|
SCM_WTA_DISPATCH_2 (g_scm_i_num_less_p, x, y, SCM_ARGn, s_scm_i_num_less_p);
|
* print.c (scm_iprin1): Handle fractions.
* objects.h (scm_class_fraction): New.
* objects.c (scm_class_fraction): New.
(scm_class_of): Handle fractions.
* hash.c (scm_hasher): Handle fractions.
* numbers.c: New code for handling fraction all over the place.
(scm_odd_p, scm_even_p): Handle inexact integers.
(scm_rational_p): New function, same as scm_real_p.
(scm_round_number, scm_truncate_number, scm_ceiling, scm_floor):
New exact functions that replace the inexact 'dsubr'
implementations.
(scm_numerator, scm_denominator): New.
* numbers.h (SCM_NUMP): Recognize fractions.
(SCM_FRACTIONP, SCM_SLOPPY_FRACTIONP, SCM_FRACTION_NUMERATOR,
SCM_FRACTION_DENOMINATOR, SCM_FRACTION_SET_NUMERATOR,
SCM_FRACTION_SET_DENOMINATOR, SCM_FRACTION_REDUCED_BIT,
SCM_FRACTION_REDUCED_SET, SCM_FRACTION_REDUCED_CLEAR,
SCM_FRACTION_REDUCED): New.
(scm_floor, scm_ceiling, scm_truncate_number, scm_round_number):
New prototypes.
(scm_make_ratio, scm_rationalize, scm_numerator, scm_denominator,
scm_rational_p): New prototypes.
(scm_i_dbl2num, scm_i_fraction2double, scm_i_fraction_equalp,
scm_i_print_fraction): New prototypes.
* goops.c (create_standard_classes): Create "<fraction>" class.
* gc-mark.c (scm_gc_mark_dependencies): Handle fractions.
* gc-card.c (scm_i_sweep_card): Include scm_tc16_fraction as a
case in the switch, but do nothing for now.
* eval.c (SCM_CEVAL, SCM_APPLY, call_dsubr_1): Convert fractions
to doubles when calling 'dsubr' functions.
* eq.c (scm_eqv_p, scm_equal_p): Handle fractions.
2003-11-18 19:59:53 +00:00
|
|
|
|
}
|
|
|
|
|
|
else if (SCM_FRACTIONP (x))
|
|
|
|
|
|
{
|
2004-07-23 15:43:02 +00:00
|
|
|
|
if (SCM_I_INUMP (y) || SCM_BIGP (y))
|
2004-01-03 21:38:38 +00:00
|
|
|
|
{
|
|
|
|
|
|
/* "a/b < y" becomes "a < y*b" */
|
|
|
|
|
|
y = scm_product (y, SCM_FRACTION_DENOMINATOR (x));
|
|
|
|
|
|
x = SCM_FRACTION_NUMERATOR (x);
|
|
|
|
|
|
goto again;
|
|
|
|
|
|
}
|
* print.c (scm_iprin1): Handle fractions.
* objects.h (scm_class_fraction): New.
* objects.c (scm_class_fraction): New.
(scm_class_of): Handle fractions.
* hash.c (scm_hasher): Handle fractions.
* numbers.c: New code for handling fraction all over the place.
(scm_odd_p, scm_even_p): Handle inexact integers.
(scm_rational_p): New function, same as scm_real_p.
(scm_round_number, scm_truncate_number, scm_ceiling, scm_floor):
New exact functions that replace the inexact 'dsubr'
implementations.
(scm_numerator, scm_denominator): New.
* numbers.h (SCM_NUMP): Recognize fractions.
(SCM_FRACTIONP, SCM_SLOPPY_FRACTIONP, SCM_FRACTION_NUMERATOR,
SCM_FRACTION_DENOMINATOR, SCM_FRACTION_SET_NUMERATOR,
SCM_FRACTION_SET_DENOMINATOR, SCM_FRACTION_REDUCED_BIT,
SCM_FRACTION_REDUCED_SET, SCM_FRACTION_REDUCED_CLEAR,
SCM_FRACTION_REDUCED): New.
(scm_floor, scm_ceiling, scm_truncate_number, scm_round_number):
New prototypes.
(scm_make_ratio, scm_rationalize, scm_numerator, scm_denominator,
scm_rational_p): New prototypes.
(scm_i_dbl2num, scm_i_fraction2double, scm_i_fraction_equalp,
scm_i_print_fraction): New prototypes.
* goops.c (create_standard_classes): Create "<fraction>" class.
* gc-mark.c (scm_gc_mark_dependencies): Handle fractions.
* gc-card.c (scm_i_sweep_card): Include scm_tc16_fraction as a
case in the switch, but do nothing for now.
* eval.c (SCM_CEVAL, SCM_APPLY, call_dsubr_1): Convert fractions
to doubles when calling 'dsubr' functions.
* eq.c (scm_eqv_p, scm_equal_p): Handle fractions.
2003-11-18 19:59:53 +00:00
|
|
|
|
else if (SCM_REALP (y))
|
2004-01-03 21:38:38 +00:00
|
|
|
|
{
|
|
|
|
|
|
double yy = SCM_REAL_VALUE (y);
|
|
|
|
|
|
if (xisnan (yy))
|
|
|
|
|
|
return SCM_BOOL_F;
|
|
|
|
|
|
if (xisinf (yy))
|
(scm_is_integer, scm_is_signed_integer, scm_is_unsigned_integer,
scm_to_signed_integer, scm_to_unsigned_integer, scm_to_schar,
scm_to_uchar, scm_to_char, scm_to_short, scm_to_ushort, scm_to_long,
scm_to_ulong, scm_to_size_t, scm_to_ssize_t, scm_from_schar,
scm_from_uchar, scm_from_char, scm_from_short, scm_from_ushort,
scm_from_int, scm_from_uint, scm_from_long, scm_from_ulong,
scm_from_size_t, scm_from_ssize_t, scm_is_real, scm_to_double,
scm_from_double): New.
* deprecated.h, boolean.h (SCM_FALSEP, SCM_NFALSEP, SCM_BOOL,
SCM_NEGATE_BOOL, SCM_BOOLP): Deprecated by moving into "deprecated.h".
Replaced all uses with scm_is_false, scm_is_true, scm_from_bool, and
scm_is_bool, respectively.
2004-07-06 10:23:30 +00:00
|
|
|
|
return scm_from_bool (0.0 < yy);
|
2004-01-03 21:38:38 +00:00
|
|
|
|
y = scm_inexact_to_exact (y); /* with y as frac or int */
|
|
|
|
|
|
goto again;
|
|
|
|
|
|
}
|
* print.c (scm_iprin1): Handle fractions.
* objects.h (scm_class_fraction): New.
* objects.c (scm_class_fraction): New.
(scm_class_of): Handle fractions.
* hash.c (scm_hasher): Handle fractions.
* numbers.c: New code for handling fraction all over the place.
(scm_odd_p, scm_even_p): Handle inexact integers.
(scm_rational_p): New function, same as scm_real_p.
(scm_round_number, scm_truncate_number, scm_ceiling, scm_floor):
New exact functions that replace the inexact 'dsubr'
implementations.
(scm_numerator, scm_denominator): New.
* numbers.h (SCM_NUMP): Recognize fractions.
(SCM_FRACTIONP, SCM_SLOPPY_FRACTIONP, SCM_FRACTION_NUMERATOR,
SCM_FRACTION_DENOMINATOR, SCM_FRACTION_SET_NUMERATOR,
SCM_FRACTION_SET_DENOMINATOR, SCM_FRACTION_REDUCED_BIT,
SCM_FRACTION_REDUCED_SET, SCM_FRACTION_REDUCED_CLEAR,
SCM_FRACTION_REDUCED): New.
(scm_floor, scm_ceiling, scm_truncate_number, scm_round_number):
New prototypes.
(scm_make_ratio, scm_rationalize, scm_numerator, scm_denominator,
scm_rational_p): New prototypes.
(scm_i_dbl2num, scm_i_fraction2double, scm_i_fraction_equalp,
scm_i_print_fraction): New prototypes.
* goops.c (create_standard_classes): Create "<fraction>" class.
* gc-mark.c (scm_gc_mark_dependencies): Handle fractions.
* gc-card.c (scm_i_sweep_card): Include scm_tc16_fraction as a
case in the switch, but do nothing for now.
* eval.c (SCM_CEVAL, SCM_APPLY, call_dsubr_1): Convert fractions
to doubles when calling 'dsubr' functions.
* eq.c (scm_eqv_p, scm_equal_p): Handle fractions.
2003-11-18 19:59:53 +00:00
|
|
|
|
else if (SCM_FRACTIONP (y))
|
2004-01-03 21:38:38 +00:00
|
|
|
|
{
|
|
|
|
|
|
/* "a/b < c/d" becomes "a*d < c*b" */
|
|
|
|
|
|
SCM new_x = scm_product (SCM_FRACTION_NUMERATOR (x),
|
|
|
|
|
|
SCM_FRACTION_DENOMINATOR (y));
|
|
|
|
|
|
SCM new_y = scm_product (SCM_FRACTION_NUMERATOR (y),
|
|
|
|
|
|
SCM_FRACTION_DENOMINATOR (x));
|
|
|
|
|
|
x = new_x;
|
|
|
|
|
|
y = new_y;
|
|
|
|
|
|
goto again;
|
|
|
|
|
|
}
|
2003-07-13 16:13:57 +00:00
|
|
|
|
else
|
2009-12-04 13:05:00 +01:00
|
|
|
|
SCM_WTA_DISPATCH_2 (g_scm_i_num_less_p, x, y, SCM_ARGn, s_scm_i_num_less_p);
|
1999-01-10 07:38:39 +00:00
|
|
|
|
}
|
2003-07-13 16:13:57 +00:00
|
|
|
|
else
|
2009-12-04 13:05:00 +01:00
|
|
|
|
SCM_WTA_DISPATCH_2 (g_scm_i_num_less_p, x, y, SCM_ARG1, s_scm_i_num_less_p);
|
1996-07-25 22:56:11 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
2009-12-04 13:05:00 +01:00
|
|
|
|
SCM scm_i_num_gr_p (SCM, SCM, SCM);
|
|
|
|
|
|
SCM_PRIMITIVE_GENERIC (scm_i_num_gr_p, ">", 0, 2, 1,
|
|
|
|
|
|
(SCM x, SCM y, SCM rest),
|
|
|
|
|
|
"Return @code{#t} if the list of parameters is monotonically\n"
|
|
|
|
|
|
"decreasing.")
|
|
|
|
|
|
#define FUNC_NAME s_scm_i_num_gr_p
|
|
|
|
|
|
{
|
|
|
|
|
|
if (SCM_UNBNDP (x) || SCM_UNBNDP (y))
|
|
|
|
|
|
return SCM_BOOL_T;
|
|
|
|
|
|
while (!scm_is_null (rest))
|
|
|
|
|
|
{
|
|
|
|
|
|
if (scm_is_false (scm_gr_p (x, y)))
|
|
|
|
|
|
return SCM_BOOL_F;
|
|
|
|
|
|
x = y;
|
|
|
|
|
|
y = scm_car (rest);
|
|
|
|
|
|
rest = scm_cdr (rest);
|
|
|
|
|
|
}
|
|
|
|
|
|
return scm_gr_p (x, y);
|
|
|
|
|
|
}
|
|
|
|
|
|
#undef FUNC_NAME
|
|
|
|
|
|
#define FUNC_NAME s_scm_i_num_gr_p
|
2000-06-30 16:08:48 +00:00
|
|
|
|
SCM
|
|
|
|
|
|
scm_gr_p (SCM x, SCM y)
|
1996-07-25 22:56:11 +00:00
|
|
|
|
{
|
2000-06-30 16:08:48 +00:00
|
|
|
|
if (!SCM_NUMBERP (x))
|
2009-12-04 13:05:00 +01:00
|
|
|
|
SCM_WTA_DISPATCH_2 (g_scm_i_num_gr_p, x, y, SCM_ARG1, FUNC_NAME);
|
2000-06-30 16:08:48 +00:00
|
|
|
|
else if (!SCM_NUMBERP (y))
|
2009-12-04 13:05:00 +01:00
|
|
|
|
SCM_WTA_DISPATCH_2 (g_scm_i_num_gr_p, x, y, SCM_ARG2, FUNC_NAME);
|
2000-06-30 16:08:48 +00:00
|
|
|
|
else
|
|
|
|
|
|
return scm_less_p (y, x);
|
1996-07-25 22:56:11 +00:00
|
|
|
|
}
|
1999-12-12 02:36:16 +00:00
|
|
|
|
#undef FUNC_NAME
|
1996-07-25 22:56:11 +00:00
|
|
|
|
|
|
|
|
|
|
|
2009-12-04 13:05:00 +01:00
|
|
|
|
SCM scm_i_num_leq_p (SCM, SCM, SCM);
|
|
|
|
|
|
SCM_PRIMITIVE_GENERIC (scm_i_num_leq_p, "<=", 0, 2, 1,
|
|
|
|
|
|
(SCM x, SCM y, SCM rest),
|
|
|
|
|
|
"Return @code{#t} if the list of parameters is monotonically\n"
|
|
|
|
|
|
"non-decreasing.")
|
|
|
|
|
|
#define FUNC_NAME s_scm_i_num_leq_p
|
|
|
|
|
|
{
|
|
|
|
|
|
if (SCM_UNBNDP (x) || SCM_UNBNDP (y))
|
|
|
|
|
|
return SCM_BOOL_T;
|
|
|
|
|
|
while (!scm_is_null (rest))
|
|
|
|
|
|
{
|
|
|
|
|
|
if (scm_is_false (scm_leq_p (x, y)))
|
|
|
|
|
|
return SCM_BOOL_F;
|
|
|
|
|
|
x = y;
|
|
|
|
|
|
y = scm_car (rest);
|
|
|
|
|
|
rest = scm_cdr (rest);
|
|
|
|
|
|
}
|
|
|
|
|
|
return scm_leq_p (x, y);
|
|
|
|
|
|
}
|
|
|
|
|
|
#undef FUNC_NAME
|
|
|
|
|
|
#define FUNC_NAME s_scm_i_num_leq_p
|
2000-06-30 16:08:48 +00:00
|
|
|
|
SCM
|
|
|
|
|
|
scm_leq_p (SCM x, SCM y)
|
1996-07-25 22:56:11 +00:00
|
|
|
|
{
|
2000-06-30 16:08:48 +00:00
|
|
|
|
if (!SCM_NUMBERP (x))
|
2009-12-04 13:05:00 +01:00
|
|
|
|
SCM_WTA_DISPATCH_2 (g_scm_i_num_leq_p, x, y, SCM_ARG1, FUNC_NAME);
|
2000-06-30 16:08:48 +00:00
|
|
|
|
else if (!SCM_NUMBERP (y))
|
2009-12-04 13:05:00 +01:00
|
|
|
|
SCM_WTA_DISPATCH_2 (g_scm_i_num_leq_p, x, y, SCM_ARG2, FUNC_NAME);
|
(scm_is_integer, scm_is_signed_integer, scm_is_unsigned_integer,
scm_to_signed_integer, scm_to_unsigned_integer, scm_to_schar,
scm_to_uchar, scm_to_char, scm_to_short, scm_to_ushort, scm_to_long,
scm_to_ulong, scm_to_size_t, scm_to_ssize_t, scm_from_schar,
scm_from_uchar, scm_from_char, scm_from_short, scm_from_ushort,
scm_from_int, scm_from_uint, scm_from_long, scm_from_ulong,
scm_from_size_t, scm_from_ssize_t, scm_is_real, scm_to_double,
scm_from_double): New.
* deprecated.h, boolean.h (SCM_FALSEP, SCM_NFALSEP, SCM_BOOL,
SCM_NEGATE_BOOL, SCM_BOOLP): Deprecated by moving into "deprecated.h".
Replaced all uses with scm_is_false, scm_is_true, scm_from_bool, and
scm_is_bool, respectively.
2004-07-06 10:23:30 +00:00
|
|
|
|
else if (scm_is_true (scm_nan_p (x)) || scm_is_true (scm_nan_p (y)))
|
2002-05-08 20:08:16 +00:00
|
|
|
|
return SCM_BOOL_F;
|
2000-06-30 16:08:48 +00:00
|
|
|
|
else
|
(scm_is_integer, scm_is_signed_integer, scm_is_unsigned_integer,
scm_to_signed_integer, scm_to_unsigned_integer, scm_to_schar,
scm_to_uchar, scm_to_char, scm_to_short, scm_to_ushort, scm_to_long,
scm_to_ulong, scm_to_size_t, scm_to_ssize_t, scm_from_schar,
scm_from_uchar, scm_from_char, scm_from_short, scm_from_ushort,
scm_from_int, scm_from_uint, scm_from_long, scm_from_ulong,
scm_from_size_t, scm_from_ssize_t, scm_is_real, scm_to_double,
scm_from_double): New.
* deprecated.h, boolean.h (SCM_FALSEP, SCM_NFALSEP, SCM_BOOL,
SCM_NEGATE_BOOL, SCM_BOOLP): Deprecated by moving into "deprecated.h".
Replaced all uses with scm_is_false, scm_is_true, scm_from_bool, and
scm_is_bool, respectively.
2004-07-06 10:23:30 +00:00
|
|
|
|
return scm_not (scm_less_p (y, x));
|
1996-07-25 22:56:11 +00:00
|
|
|
|
}
|
1999-12-12 02:36:16 +00:00
|
|
|
|
#undef FUNC_NAME
|
1996-07-25 22:56:11 +00:00
|
|
|
|
|
|
|
|
|
|
|
2009-12-04 13:05:00 +01:00
|
|
|
|
SCM scm_i_num_geq_p (SCM, SCM, SCM);
|
|
|
|
|
|
SCM_PRIMITIVE_GENERIC (scm_i_num_geq_p, ">=", 0, 2, 1,
|
|
|
|
|
|
(SCM x, SCM y, SCM rest),
|
|
|
|
|
|
"Return @code{#t} if the list of parameters is monotonically\n"
|
|
|
|
|
|
"non-increasing.")
|
|
|
|
|
|
#define FUNC_NAME s_scm_i_num_geq_p
|
|
|
|
|
|
{
|
|
|
|
|
|
if (SCM_UNBNDP (x) || SCM_UNBNDP (y))
|
|
|
|
|
|
return SCM_BOOL_T;
|
|
|
|
|
|
while (!scm_is_null (rest))
|
|
|
|
|
|
{
|
|
|
|
|
|
if (scm_is_false (scm_geq_p (x, y)))
|
|
|
|
|
|
return SCM_BOOL_F;
|
|
|
|
|
|
x = y;
|
|
|
|
|
|
y = scm_car (rest);
|
|
|
|
|
|
rest = scm_cdr (rest);
|
|
|
|
|
|
}
|
|
|
|
|
|
return scm_geq_p (x, y);
|
|
|
|
|
|
}
|
|
|
|
|
|
#undef FUNC_NAME
|
|
|
|
|
|
#define FUNC_NAME s_scm_i_num_geq_p
|
2000-06-30 16:08:48 +00:00
|
|
|
|
SCM
|
|
|
|
|
|
scm_geq_p (SCM x, SCM y)
|
1996-07-25 22:56:11 +00:00
|
|
|
|
{
|
2000-06-30 16:08:48 +00:00
|
|
|
|
if (!SCM_NUMBERP (x))
|
2009-12-04 13:05:00 +01:00
|
|
|
|
SCM_WTA_DISPATCH_2 (g_scm_i_num_geq_p, x, y, SCM_ARG1, FUNC_NAME);
|
2000-06-30 16:08:48 +00:00
|
|
|
|
else if (!SCM_NUMBERP (y))
|
2009-12-04 13:05:00 +01:00
|
|
|
|
SCM_WTA_DISPATCH_2 (g_scm_i_num_geq_p, x, y, SCM_ARG2, FUNC_NAME);
|
(scm_is_integer, scm_is_signed_integer, scm_is_unsigned_integer,
scm_to_signed_integer, scm_to_unsigned_integer, scm_to_schar,
scm_to_uchar, scm_to_char, scm_to_short, scm_to_ushort, scm_to_long,
scm_to_ulong, scm_to_size_t, scm_to_ssize_t, scm_from_schar,
scm_from_uchar, scm_from_char, scm_from_short, scm_from_ushort,
scm_from_int, scm_from_uint, scm_from_long, scm_from_ulong,
scm_from_size_t, scm_from_ssize_t, scm_is_real, scm_to_double,
scm_from_double): New.
* deprecated.h, boolean.h (SCM_FALSEP, SCM_NFALSEP, SCM_BOOL,
SCM_NEGATE_BOOL, SCM_BOOLP): Deprecated by moving into "deprecated.h".
Replaced all uses with scm_is_false, scm_is_true, scm_from_bool, and
scm_is_bool, respectively.
2004-07-06 10:23:30 +00:00
|
|
|
|
else if (scm_is_true (scm_nan_p (x)) || scm_is_true (scm_nan_p (y)))
|
2002-05-08 20:08:16 +00:00
|
|
|
|
return SCM_BOOL_F;
|
2000-06-30 16:08:48 +00:00
|
|
|
|
else
|
(scm_is_integer, scm_is_signed_integer, scm_is_unsigned_integer,
scm_to_signed_integer, scm_to_unsigned_integer, scm_to_schar,
scm_to_uchar, scm_to_char, scm_to_short, scm_to_ushort, scm_to_long,
scm_to_ulong, scm_to_size_t, scm_to_ssize_t, scm_from_schar,
scm_from_uchar, scm_from_char, scm_from_short, scm_from_ushort,
scm_from_int, scm_from_uint, scm_from_long, scm_from_ulong,
scm_from_size_t, scm_from_ssize_t, scm_is_real, scm_to_double,
scm_from_double): New.
* deprecated.h, boolean.h (SCM_FALSEP, SCM_NFALSEP, SCM_BOOL,
SCM_NEGATE_BOOL, SCM_BOOLP): Deprecated by moving into "deprecated.h".
Replaced all uses with scm_is_false, scm_is_true, scm_from_bool, and
scm_is_bool, respectively.
2004-07-06 10:23:30 +00:00
|
|
|
|
return scm_not (scm_less_p (x, y));
|
1996-07-25 22:56:11 +00:00
|
|
|
|
}
|
1999-12-12 02:36:16 +00:00
|
|
|
|
#undef FUNC_NAME
|
1996-07-25 22:56:11 +00:00
|
|
|
|
|
|
|
|
|
|
|
1999-09-06 21:12:15 +00:00
|
|
|
|
SCM_GPROC (s_zero_p, "zero?", 1, 0, 0, scm_zero_p, g_zero_p);
|
* vectors.c (s_scm_vector_p, list->vector, scm_vector)
(scm_vector_ref, scm_vector_set_x, scm_vector_to_list)
(scm_vector_fill_x), strorder.c (scm_string_equal_p)
(scm_string_ci_equal_p, scm_string_less_p, scm_string_leq_p)
(scm_string_gr_p, scm_string_geq_p, scm_string_ci_less_p)
(scm_string_ci_geq_p), symbols.c (scm_symbol_p)
(scm_symbol_to_string, scm_string_to_symbol): Changed use of @t{}
to @code{} as the texinfo manual recommends, converted the
examples to use a @lisp{}-environment.
* strports.c (scm_eval_string): Cleaned up the docstring.
* struct.c (scm_struct_p, scm_struct_vtable_p): Added texinfo
markup.
* numbers.c (scm_exact_p, scm_odd_p, scm_even_p)
(scm_number_to_string, scm_string_to_number, scm_number_p)
(scm_real_p, scm_integer_p, scm_inexact_p, scm_make_rectangular)
(scm_make_polar, scm_inexact_to_exact): Added texinfo markup.
(scm_ash): Added texinfo markup and removed obsolete @refill.
(scm_gr_p): Corrected comment.
(scm_gr_p, scm_leq_p, scm_geq_p): Added texinfo markup to (future
docstring) comments.
(scm_positive_p, scm_less_p, scm_num_eq_p, scm_real_p)
(scm_number_p, scm_negative_p, scm_max, scm_min, scm_sum)
(scm_difference, scm_product, scm_divide, scm_asinh, scm_acosh)
(scm_atanh, scm_truncate, scm_round, scm_exact_to_inexact)
(floor, ceiling, $sqrt, $abs, $exp, $log, $sin, $cos, $tan, $asin)
($acos, $atan, $sinh, $cosh, $tanh, scm_real_part, scm_imag_part)
(scm_magnitude, scm_angle, scm_abs, scm_quotient, scm_remainder)
(scm_modulo, scm_gcd, scm_lcm): Added (future docstring) comments.
2001-03-02 09:07:22 +00:00
|
|
|
|
/* "Return @code{#t} if @var{z} is an exact or inexact number equal to\n"
|
|
|
|
|
|
* "zero."
|
|
|
|
|
|
*/
|
1996-07-25 22:56:11 +00:00
|
|
|
|
SCM
|
1999-12-12 20:35:02 +00:00
|
|
|
|
scm_zero_p (SCM z)
|
1996-07-25 22:56:11 +00:00
|
|
|
|
{
|
2004-07-23 15:43:02 +00:00
|
|
|
|
if (SCM_I_INUMP (z))
|
2004-07-27 15:41:49 +00:00
|
|
|
|
return scm_from_bool (scm_is_eq (z, SCM_INUM0));
|
2003-07-13 16:13:57 +00:00
|
|
|
|
else if (SCM_BIGP (z))
|
2000-05-08 19:34:20 +00:00
|
|
|
|
return SCM_BOOL_F;
|
2003-07-13 16:13:57 +00:00
|
|
|
|
else if (SCM_REALP (z))
|
(scm_is_integer, scm_is_signed_integer, scm_is_unsigned_integer,
scm_to_signed_integer, scm_to_unsigned_integer, scm_to_schar,
scm_to_uchar, scm_to_char, scm_to_short, scm_to_ushort, scm_to_long,
scm_to_ulong, scm_to_size_t, scm_to_ssize_t, scm_from_schar,
scm_from_uchar, scm_from_char, scm_from_short, scm_from_ushort,
scm_from_int, scm_from_uint, scm_from_long, scm_from_ulong,
scm_from_size_t, scm_from_ssize_t, scm_is_real, scm_to_double,
scm_from_double): New.
* deprecated.h, boolean.h (SCM_FALSEP, SCM_NFALSEP, SCM_BOOL,
SCM_NEGATE_BOOL, SCM_BOOLP): Deprecated by moving into "deprecated.h".
Replaced all uses with scm_is_false, scm_is_true, scm_from_bool, and
scm_is_bool, respectively.
2004-07-06 10:23:30 +00:00
|
|
|
|
return scm_from_bool (SCM_REAL_VALUE (z) == 0.0);
|
2003-07-13 16:13:57 +00:00
|
|
|
|
else if (SCM_COMPLEXP (z))
|
(scm_is_integer, scm_is_signed_integer, scm_is_unsigned_integer,
scm_to_signed_integer, scm_to_unsigned_integer, scm_to_schar,
scm_to_uchar, scm_to_char, scm_to_short, scm_to_ushort, scm_to_long,
scm_to_ulong, scm_to_size_t, scm_to_ssize_t, scm_from_schar,
scm_from_uchar, scm_from_char, scm_from_short, scm_from_ushort,
scm_from_int, scm_from_uint, scm_from_long, scm_from_ulong,
scm_from_size_t, scm_from_ssize_t, scm_is_real, scm_to_double,
scm_from_double): New.
* deprecated.h, boolean.h (SCM_FALSEP, SCM_NFALSEP, SCM_BOOL,
SCM_NEGATE_BOOL, SCM_BOOLP): Deprecated by moving into "deprecated.h".
Replaced all uses with scm_is_false, scm_is_true, scm_from_bool, and
scm_is_bool, respectively.
2004-07-06 10:23:30 +00:00
|
|
|
|
return scm_from_bool (SCM_COMPLEX_REAL (z) == 0.0
|
2000-05-08 19:34:20 +00:00
|
|
|
|
&& SCM_COMPLEX_IMAG (z) == 0.0);
|
* print.c (scm_iprin1): Handle fractions.
* objects.h (scm_class_fraction): New.
* objects.c (scm_class_fraction): New.
(scm_class_of): Handle fractions.
* hash.c (scm_hasher): Handle fractions.
* numbers.c: New code for handling fraction all over the place.
(scm_odd_p, scm_even_p): Handle inexact integers.
(scm_rational_p): New function, same as scm_real_p.
(scm_round_number, scm_truncate_number, scm_ceiling, scm_floor):
New exact functions that replace the inexact 'dsubr'
implementations.
(scm_numerator, scm_denominator): New.
* numbers.h (SCM_NUMP): Recognize fractions.
(SCM_FRACTIONP, SCM_SLOPPY_FRACTIONP, SCM_FRACTION_NUMERATOR,
SCM_FRACTION_DENOMINATOR, SCM_FRACTION_SET_NUMERATOR,
SCM_FRACTION_SET_DENOMINATOR, SCM_FRACTION_REDUCED_BIT,
SCM_FRACTION_REDUCED_SET, SCM_FRACTION_REDUCED_CLEAR,
SCM_FRACTION_REDUCED): New.
(scm_floor, scm_ceiling, scm_truncate_number, scm_round_number):
New prototypes.
(scm_make_ratio, scm_rationalize, scm_numerator, scm_denominator,
scm_rational_p): New prototypes.
(scm_i_dbl2num, scm_i_fraction2double, scm_i_fraction_equalp,
scm_i_print_fraction): New prototypes.
* goops.c (create_standard_classes): Create "<fraction>" class.
* gc-mark.c (scm_gc_mark_dependencies): Handle fractions.
* gc-card.c (scm_i_sweep_card): Include scm_tc16_fraction as a
case in the switch, but do nothing for now.
* eval.c (SCM_CEVAL, SCM_APPLY, call_dsubr_1): Convert fractions
to doubles when calling 'dsubr' functions.
* eq.c (scm_eqv_p, scm_equal_p): Handle fractions.
2003-11-18 19:59:53 +00:00
|
|
|
|
else if (SCM_FRACTIONP (z))
|
|
|
|
|
|
return SCM_BOOL_F;
|
2003-07-13 16:13:57 +00:00
|
|
|
|
else
|
2000-05-08 19:34:20 +00:00
|
|
|
|
SCM_WTA_DISPATCH_1 (g_zero_p, z, SCM_ARG1, s_zero_p);
|
1996-07-25 22:56:11 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
1999-09-06 21:12:15 +00:00
|
|
|
|
SCM_GPROC (s_positive_p, "positive?", 1, 0, 0, scm_positive_p, g_positive_p);
|
* vectors.c (s_scm_vector_p, list->vector, scm_vector)
(scm_vector_ref, scm_vector_set_x, scm_vector_to_list)
(scm_vector_fill_x), strorder.c (scm_string_equal_p)
(scm_string_ci_equal_p, scm_string_less_p, scm_string_leq_p)
(scm_string_gr_p, scm_string_geq_p, scm_string_ci_less_p)
(scm_string_ci_geq_p), symbols.c (scm_symbol_p)
(scm_symbol_to_string, scm_string_to_symbol): Changed use of @t{}
to @code{} as the texinfo manual recommends, converted the
examples to use a @lisp{}-environment.
* strports.c (scm_eval_string): Cleaned up the docstring.
* struct.c (scm_struct_p, scm_struct_vtable_p): Added texinfo
markup.
* numbers.c (scm_exact_p, scm_odd_p, scm_even_p)
(scm_number_to_string, scm_string_to_number, scm_number_p)
(scm_real_p, scm_integer_p, scm_inexact_p, scm_make_rectangular)
(scm_make_polar, scm_inexact_to_exact): Added texinfo markup.
(scm_ash): Added texinfo markup and removed obsolete @refill.
(scm_gr_p): Corrected comment.
(scm_gr_p, scm_leq_p, scm_geq_p): Added texinfo markup to (future
docstring) comments.
(scm_positive_p, scm_less_p, scm_num_eq_p, scm_real_p)
(scm_number_p, scm_negative_p, scm_max, scm_min, scm_sum)
(scm_difference, scm_product, scm_divide, scm_asinh, scm_acosh)
(scm_atanh, scm_truncate, scm_round, scm_exact_to_inexact)
(floor, ceiling, $sqrt, $abs, $exp, $log, $sin, $cos, $tan, $asin)
($acos, $atan, $sinh, $cosh, $tanh, scm_real_part, scm_imag_part)
(scm_magnitude, scm_angle, scm_abs, scm_quotient, scm_remainder)
(scm_modulo, scm_gcd, scm_lcm): Added (future docstring) comments.
2001-03-02 09:07:22 +00:00
|
|
|
|
/* "Return @code{#t} if @var{x} is an exact or inexact number greater than\n"
|
|
|
|
|
|
* "zero."
|
|
|
|
|
|
*/
|
1996-07-25 22:56:11 +00:00
|
|
|
|
SCM
|
1999-12-12 20:35:02 +00:00
|
|
|
|
scm_positive_p (SCM x)
|
1996-07-25 22:56:11 +00:00
|
|
|
|
{
|
2004-07-23 15:43:02 +00:00
|
|
|
|
if (SCM_I_INUMP (x))
|
|
|
|
|
|
return scm_from_bool (SCM_I_INUM (x) > 0);
|
2003-07-13 16:13:57 +00:00
|
|
|
|
else if (SCM_BIGP (x))
|
|
|
|
|
|
{
|
|
|
|
|
|
int sgn = mpz_sgn (SCM_I_BIG_MPZ (x));
|
|
|
|
|
|
scm_remember_upto_here_1 (x);
|
(scm_is_integer, scm_is_signed_integer, scm_is_unsigned_integer,
scm_to_signed_integer, scm_to_unsigned_integer, scm_to_schar,
scm_to_uchar, scm_to_char, scm_to_short, scm_to_ushort, scm_to_long,
scm_to_ulong, scm_to_size_t, scm_to_ssize_t, scm_from_schar,
scm_from_uchar, scm_from_char, scm_from_short, scm_from_ushort,
scm_from_int, scm_from_uint, scm_from_long, scm_from_ulong,
scm_from_size_t, scm_from_ssize_t, scm_is_real, scm_to_double,
scm_from_double): New.
* deprecated.h, boolean.h (SCM_FALSEP, SCM_NFALSEP, SCM_BOOL,
SCM_NEGATE_BOOL, SCM_BOOLP): Deprecated by moving into "deprecated.h".
Replaced all uses with scm_is_false, scm_is_true, scm_from_bool, and
scm_is_bool, respectively.
2004-07-06 10:23:30 +00:00
|
|
|
|
return scm_from_bool (sgn > 0);
|
2003-07-13 16:13:57 +00:00
|
|
|
|
}
|
|
|
|
|
|
else if (SCM_REALP (x))
|
(scm_is_integer, scm_is_signed_integer, scm_is_unsigned_integer,
scm_to_signed_integer, scm_to_unsigned_integer, scm_to_schar,
scm_to_uchar, scm_to_char, scm_to_short, scm_to_ushort, scm_to_long,
scm_to_ulong, scm_to_size_t, scm_to_ssize_t, scm_from_schar,
scm_from_uchar, scm_from_char, scm_from_short, scm_from_ushort,
scm_from_int, scm_from_uint, scm_from_long, scm_from_ulong,
scm_from_size_t, scm_from_ssize_t, scm_is_real, scm_to_double,
scm_from_double): New.
* deprecated.h, boolean.h (SCM_FALSEP, SCM_NFALSEP, SCM_BOOL,
SCM_NEGATE_BOOL, SCM_BOOLP): Deprecated by moving into "deprecated.h".
Replaced all uses with scm_is_false, scm_is_true, scm_from_bool, and
scm_is_bool, respectively.
2004-07-06 10:23:30 +00:00
|
|
|
|
return scm_from_bool(SCM_REAL_VALUE (x) > 0.0);
|
* print.c (scm_iprin1): Handle fractions.
* objects.h (scm_class_fraction): New.
* objects.c (scm_class_fraction): New.
(scm_class_of): Handle fractions.
* hash.c (scm_hasher): Handle fractions.
* numbers.c: New code for handling fraction all over the place.
(scm_odd_p, scm_even_p): Handle inexact integers.
(scm_rational_p): New function, same as scm_real_p.
(scm_round_number, scm_truncate_number, scm_ceiling, scm_floor):
New exact functions that replace the inexact 'dsubr'
implementations.
(scm_numerator, scm_denominator): New.
* numbers.h (SCM_NUMP): Recognize fractions.
(SCM_FRACTIONP, SCM_SLOPPY_FRACTIONP, SCM_FRACTION_NUMERATOR,
SCM_FRACTION_DENOMINATOR, SCM_FRACTION_SET_NUMERATOR,
SCM_FRACTION_SET_DENOMINATOR, SCM_FRACTION_REDUCED_BIT,
SCM_FRACTION_REDUCED_SET, SCM_FRACTION_REDUCED_CLEAR,
SCM_FRACTION_REDUCED): New.
(scm_floor, scm_ceiling, scm_truncate_number, scm_round_number):
New prototypes.
(scm_make_ratio, scm_rationalize, scm_numerator, scm_denominator,
scm_rational_p): New prototypes.
(scm_i_dbl2num, scm_i_fraction2double, scm_i_fraction_equalp,
scm_i_print_fraction): New prototypes.
* goops.c (create_standard_classes): Create "<fraction>" class.
* gc-mark.c (scm_gc_mark_dependencies): Handle fractions.
* gc-card.c (scm_i_sweep_card): Include scm_tc16_fraction as a
case in the switch, but do nothing for now.
* eval.c (SCM_CEVAL, SCM_APPLY, call_dsubr_1): Convert fractions
to doubles when calling 'dsubr' functions.
* eq.c (scm_eqv_p, scm_equal_p): Handle fractions.
2003-11-18 19:59:53 +00:00
|
|
|
|
else if (SCM_FRACTIONP (x))
|
|
|
|
|
|
return scm_positive_p (SCM_FRACTION_NUMERATOR (x));
|
2003-07-13 16:13:57 +00:00
|
|
|
|
else
|
2000-05-08 19:34:20 +00:00
|
|
|
|
SCM_WTA_DISPATCH_1 (g_positive_p, x, SCM_ARG1, s_positive_p);
|
1996-07-25 22:56:11 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
1999-09-06 21:12:15 +00:00
|
|
|
|
SCM_GPROC (s_negative_p, "negative?", 1, 0, 0, scm_negative_p, g_negative_p);
|
* vectors.c (s_scm_vector_p, list->vector, scm_vector)
(scm_vector_ref, scm_vector_set_x, scm_vector_to_list)
(scm_vector_fill_x), strorder.c (scm_string_equal_p)
(scm_string_ci_equal_p, scm_string_less_p, scm_string_leq_p)
(scm_string_gr_p, scm_string_geq_p, scm_string_ci_less_p)
(scm_string_ci_geq_p), symbols.c (scm_symbol_p)
(scm_symbol_to_string, scm_string_to_symbol): Changed use of @t{}
to @code{} as the texinfo manual recommends, converted the
examples to use a @lisp{}-environment.
* strports.c (scm_eval_string): Cleaned up the docstring.
* struct.c (scm_struct_p, scm_struct_vtable_p): Added texinfo
markup.
* numbers.c (scm_exact_p, scm_odd_p, scm_even_p)
(scm_number_to_string, scm_string_to_number, scm_number_p)
(scm_real_p, scm_integer_p, scm_inexact_p, scm_make_rectangular)
(scm_make_polar, scm_inexact_to_exact): Added texinfo markup.
(scm_ash): Added texinfo markup and removed obsolete @refill.
(scm_gr_p): Corrected comment.
(scm_gr_p, scm_leq_p, scm_geq_p): Added texinfo markup to (future
docstring) comments.
(scm_positive_p, scm_less_p, scm_num_eq_p, scm_real_p)
(scm_number_p, scm_negative_p, scm_max, scm_min, scm_sum)
(scm_difference, scm_product, scm_divide, scm_asinh, scm_acosh)
(scm_atanh, scm_truncate, scm_round, scm_exact_to_inexact)
(floor, ceiling, $sqrt, $abs, $exp, $log, $sin, $cos, $tan, $asin)
($acos, $atan, $sinh, $cosh, $tanh, scm_real_part, scm_imag_part)
(scm_magnitude, scm_angle, scm_abs, scm_quotient, scm_remainder)
(scm_modulo, scm_gcd, scm_lcm): Added (future docstring) comments.
2001-03-02 09:07:22 +00:00
|
|
|
|
/* "Return @code{#t} if @var{x} is an exact or inexact number less than\n"
|
|
|
|
|
|
* "zero."
|
|
|
|
|
|
*/
|
1996-07-25 22:56:11 +00:00
|
|
|
|
SCM
|
1999-12-12 20:35:02 +00:00
|
|
|
|
scm_negative_p (SCM x)
|
1996-07-25 22:56:11 +00:00
|
|
|
|
{
|
2004-07-23 15:43:02 +00:00
|
|
|
|
if (SCM_I_INUMP (x))
|
|
|
|
|
|
return scm_from_bool (SCM_I_INUM (x) < 0);
|
2003-07-13 16:13:57 +00:00
|
|
|
|
else if (SCM_BIGP (x))
|
|
|
|
|
|
{
|
|
|
|
|
|
int sgn = mpz_sgn (SCM_I_BIG_MPZ (x));
|
|
|
|
|
|
scm_remember_upto_here_1 (x);
|
(scm_is_integer, scm_is_signed_integer, scm_is_unsigned_integer,
scm_to_signed_integer, scm_to_unsigned_integer, scm_to_schar,
scm_to_uchar, scm_to_char, scm_to_short, scm_to_ushort, scm_to_long,
scm_to_ulong, scm_to_size_t, scm_to_ssize_t, scm_from_schar,
scm_from_uchar, scm_from_char, scm_from_short, scm_from_ushort,
scm_from_int, scm_from_uint, scm_from_long, scm_from_ulong,
scm_from_size_t, scm_from_ssize_t, scm_is_real, scm_to_double,
scm_from_double): New.
* deprecated.h, boolean.h (SCM_FALSEP, SCM_NFALSEP, SCM_BOOL,
SCM_NEGATE_BOOL, SCM_BOOLP): Deprecated by moving into "deprecated.h".
Replaced all uses with scm_is_false, scm_is_true, scm_from_bool, and
scm_is_bool, respectively.
2004-07-06 10:23:30 +00:00
|
|
|
|
return scm_from_bool (sgn < 0);
|
2003-07-13 16:13:57 +00:00
|
|
|
|
}
|
|
|
|
|
|
else if (SCM_REALP (x))
|
(scm_is_integer, scm_is_signed_integer, scm_is_unsigned_integer,
scm_to_signed_integer, scm_to_unsigned_integer, scm_to_schar,
scm_to_uchar, scm_to_char, scm_to_short, scm_to_ushort, scm_to_long,
scm_to_ulong, scm_to_size_t, scm_to_ssize_t, scm_from_schar,
scm_from_uchar, scm_from_char, scm_from_short, scm_from_ushort,
scm_from_int, scm_from_uint, scm_from_long, scm_from_ulong,
scm_from_size_t, scm_from_ssize_t, scm_is_real, scm_to_double,
scm_from_double): New.
* deprecated.h, boolean.h (SCM_FALSEP, SCM_NFALSEP, SCM_BOOL,
SCM_NEGATE_BOOL, SCM_BOOLP): Deprecated by moving into "deprecated.h".
Replaced all uses with scm_is_false, scm_is_true, scm_from_bool, and
scm_is_bool, respectively.
2004-07-06 10:23:30 +00:00
|
|
|
|
return scm_from_bool(SCM_REAL_VALUE (x) < 0.0);
|
* print.c (scm_iprin1): Handle fractions.
* objects.h (scm_class_fraction): New.
* objects.c (scm_class_fraction): New.
(scm_class_of): Handle fractions.
* hash.c (scm_hasher): Handle fractions.
* numbers.c: New code for handling fraction all over the place.
(scm_odd_p, scm_even_p): Handle inexact integers.
(scm_rational_p): New function, same as scm_real_p.
(scm_round_number, scm_truncate_number, scm_ceiling, scm_floor):
New exact functions that replace the inexact 'dsubr'
implementations.
(scm_numerator, scm_denominator): New.
* numbers.h (SCM_NUMP): Recognize fractions.
(SCM_FRACTIONP, SCM_SLOPPY_FRACTIONP, SCM_FRACTION_NUMERATOR,
SCM_FRACTION_DENOMINATOR, SCM_FRACTION_SET_NUMERATOR,
SCM_FRACTION_SET_DENOMINATOR, SCM_FRACTION_REDUCED_BIT,
SCM_FRACTION_REDUCED_SET, SCM_FRACTION_REDUCED_CLEAR,
SCM_FRACTION_REDUCED): New.
(scm_floor, scm_ceiling, scm_truncate_number, scm_round_number):
New prototypes.
(scm_make_ratio, scm_rationalize, scm_numerator, scm_denominator,
scm_rational_p): New prototypes.
(scm_i_dbl2num, scm_i_fraction2double, scm_i_fraction_equalp,
scm_i_print_fraction): New prototypes.
* goops.c (create_standard_classes): Create "<fraction>" class.
* gc-mark.c (scm_gc_mark_dependencies): Handle fractions.
* gc-card.c (scm_i_sweep_card): Include scm_tc16_fraction as a
case in the switch, but do nothing for now.
* eval.c (SCM_CEVAL, SCM_APPLY, call_dsubr_1): Convert fractions
to doubles when calling 'dsubr' functions.
* eq.c (scm_eqv_p, scm_equal_p): Handle fractions.
2003-11-18 19:59:53 +00:00
|
|
|
|
else if (SCM_FRACTIONP (x))
|
|
|
|
|
|
return scm_negative_p (SCM_FRACTION_NUMERATOR (x));
|
2003-07-13 16:13:57 +00:00
|
|
|
|
else
|
2000-05-08 19:34:20 +00:00
|
|
|
|
SCM_WTA_DISPATCH_1 (g_negative_p, x, SCM_ARG1, s_negative_p);
|
1996-07-25 22:56:11 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
2004-03-24 21:53:31 +00:00
|
|
|
|
/* scm_min and scm_max return an inexact when either argument is inexact, as
|
|
|
|
|
|
required by r5rs. On that basis, for exact/inexact combinations the
|
|
|
|
|
|
exact is converted to inexact to compare and possibly return. This is
|
|
|
|
|
|
unlike scm_less_p above which takes some trouble to preserve all bits in
|
|
|
|
|
|
its test, such trouble is not required for min and max. */
|
|
|
|
|
|
|
2009-09-06 16:47:19 +02:00
|
|
|
|
SCM_PRIMITIVE_GENERIC (scm_i_max, "max", 0, 2, 1,
|
|
|
|
|
|
(SCM x, SCM y, SCM rest),
|
|
|
|
|
|
"Return the maximum of all parameter values.")
|
|
|
|
|
|
#define FUNC_NAME s_scm_i_max
|
|
|
|
|
|
{
|
|
|
|
|
|
while (!scm_is_null (rest))
|
|
|
|
|
|
{ x = scm_max (x, y);
|
|
|
|
|
|
y = scm_car (rest);
|
|
|
|
|
|
rest = scm_cdr (rest);
|
|
|
|
|
|
}
|
|
|
|
|
|
return scm_max (x, y);
|
|
|
|
|
|
}
|
|
|
|
|
|
#undef FUNC_NAME
|
|
|
|
|
|
|
|
|
|
|
|
#define s_max s_scm_i_max
|
|
|
|
|
|
#define g_max g_scm_i_max
|
|
|
|
|
|
|
1996-07-25 22:56:11 +00:00
|
|
|
|
SCM
|
1999-12-12 20:35:02 +00:00
|
|
|
|
scm_max (SCM x, SCM y)
|
1996-07-25 22:56:11 +00:00
|
|
|
|
{
|
2003-07-13 16:13:57 +00:00
|
|
|
|
if (SCM_UNBNDP (y))
|
|
|
|
|
|
{
|
|
|
|
|
|
if (SCM_UNBNDP (x))
|
|
|
|
|
|
SCM_WTA_DISPATCH_0 (g_max, s_max);
|
2004-07-23 15:43:02 +00:00
|
|
|
|
else if (SCM_I_INUMP(x) || SCM_BIGP(x) || SCM_REALP(x) || SCM_FRACTIONP(x))
|
2003-07-13 16:13:57 +00:00
|
|
|
|
return x;
|
|
|
|
|
|
else
|
|
|
|
|
|
SCM_WTA_DISPATCH_1 (g_max, x, SCM_ARG1, s_max);
|
1999-01-10 07:38:39 +00:00
|
|
|
|
}
|
2000-05-03 12:35:56 +00:00
|
|
|
|
|
2004-07-23 15:43:02 +00:00
|
|
|
|
if (SCM_I_INUMP (x))
|
2003-07-13 16:13:57 +00:00
|
|
|
|
{
|
2004-07-23 15:43:02 +00:00
|
|
|
|
long xx = SCM_I_INUM (x);
|
|
|
|
|
|
if (SCM_I_INUMP (y))
|
2003-07-13 16:13:57 +00:00
|
|
|
|
{
|
2004-07-23 15:43:02 +00:00
|
|
|
|
long yy = SCM_I_INUM (y);
|
2003-07-13 16:13:57 +00:00
|
|
|
|
return (xx < yy) ? y : x;
|
|
|
|
|
|
}
|
|
|
|
|
|
else if (SCM_BIGP (y))
|
|
|
|
|
|
{
|
|
|
|
|
|
int sgn = mpz_sgn (SCM_I_BIG_MPZ (y));
|
|
|
|
|
|
scm_remember_upto_here_1 (y);
|
|
|
|
|
|
return (sgn < 0) ? x : y;
|
|
|
|
|
|
}
|
|
|
|
|
|
else if (SCM_REALP (y))
|
|
|
|
|
|
{
|
|
|
|
|
|
double z = xx;
|
|
|
|
|
|
/* if y==NaN then ">" is false and we return NaN */
|
(scm_is_rational): New.
(scm_i_short2big, scm_i_int2big, scm_i_uint2big, scm_i_size2big,
scm_i_ptrdiff2big, scm_i_long_long2big, scm_i_ulong_long2big):
Removed prototypes.
(scm_make_real, scm_num2dbl, scm_float2num, scm_double2num):
Discouraged by moving to discouraged.h and discouraged.c.
Replaced all uses with scm_from_double.
(scm_num2float, scm_num2double): Discouraged by moving prototype
to discouraged.h and rewriting in terms of scm_to_double.
Replaced all uses with scm_to_double.
(scm_to_double): Do not implement in terms of scm_num2dbl, use
explicit code.
(scm_from_double): Do not implement in terms of scm_make_real, use
explicit code.
2004-08-03 15:03:35 +00:00
|
|
|
|
return (z > SCM_REAL_VALUE (y)) ? scm_from_double (z) : y;
|
2003-07-13 16:13:57 +00:00
|
|
|
|
}
|
* print.c (scm_iprin1): Handle fractions.
* objects.h (scm_class_fraction): New.
* objects.c (scm_class_fraction): New.
(scm_class_of): Handle fractions.
* hash.c (scm_hasher): Handle fractions.
* numbers.c: New code for handling fraction all over the place.
(scm_odd_p, scm_even_p): Handle inexact integers.
(scm_rational_p): New function, same as scm_real_p.
(scm_round_number, scm_truncate_number, scm_ceiling, scm_floor):
New exact functions that replace the inexact 'dsubr'
implementations.
(scm_numerator, scm_denominator): New.
* numbers.h (SCM_NUMP): Recognize fractions.
(SCM_FRACTIONP, SCM_SLOPPY_FRACTIONP, SCM_FRACTION_NUMERATOR,
SCM_FRACTION_DENOMINATOR, SCM_FRACTION_SET_NUMERATOR,
SCM_FRACTION_SET_DENOMINATOR, SCM_FRACTION_REDUCED_BIT,
SCM_FRACTION_REDUCED_SET, SCM_FRACTION_REDUCED_CLEAR,
SCM_FRACTION_REDUCED): New.
(scm_floor, scm_ceiling, scm_truncate_number, scm_round_number):
New prototypes.
(scm_make_ratio, scm_rationalize, scm_numerator, scm_denominator,
scm_rational_p): New prototypes.
(scm_i_dbl2num, scm_i_fraction2double, scm_i_fraction_equalp,
scm_i_print_fraction): New prototypes.
* goops.c (create_standard_classes): Create "<fraction>" class.
* gc-mark.c (scm_gc_mark_dependencies): Handle fractions.
* gc-card.c (scm_i_sweep_card): Include scm_tc16_fraction as a
case in the switch, but do nothing for now.
* eval.c (SCM_CEVAL, SCM_APPLY, call_dsubr_1): Convert fractions
to doubles when calling 'dsubr' functions.
* eq.c (scm_eqv_p, scm_equal_p): Handle fractions.
2003-11-18 19:59:53 +00:00
|
|
|
|
else if (SCM_FRACTIONP (y))
|
|
|
|
|
|
{
|
2004-04-15 00:44:19 +00:00
|
|
|
|
use_less:
|
(scm_is_integer, scm_is_signed_integer, scm_is_unsigned_integer,
scm_to_signed_integer, scm_to_unsigned_integer, scm_to_schar,
scm_to_uchar, scm_to_char, scm_to_short, scm_to_ushort, scm_to_long,
scm_to_ulong, scm_to_size_t, scm_to_ssize_t, scm_from_schar,
scm_from_uchar, scm_from_char, scm_from_short, scm_from_ushort,
scm_from_int, scm_from_uint, scm_from_long, scm_from_ulong,
scm_from_size_t, scm_from_ssize_t, scm_is_real, scm_to_double,
scm_from_double): New.
* deprecated.h, boolean.h (SCM_FALSEP, SCM_NFALSEP, SCM_BOOL,
SCM_NEGATE_BOOL, SCM_BOOLP): Deprecated by moving into "deprecated.h".
Replaced all uses with scm_is_false, scm_is_true, scm_from_bool, and
scm_is_bool, respectively.
2004-07-06 10:23:30 +00:00
|
|
|
|
return (scm_is_false (scm_less_p (x, y)) ? x : y);
|
* print.c (scm_iprin1): Handle fractions.
* objects.h (scm_class_fraction): New.
* objects.c (scm_class_fraction): New.
(scm_class_of): Handle fractions.
* hash.c (scm_hasher): Handle fractions.
* numbers.c: New code for handling fraction all over the place.
(scm_odd_p, scm_even_p): Handle inexact integers.
(scm_rational_p): New function, same as scm_real_p.
(scm_round_number, scm_truncate_number, scm_ceiling, scm_floor):
New exact functions that replace the inexact 'dsubr'
implementations.
(scm_numerator, scm_denominator): New.
* numbers.h (SCM_NUMP): Recognize fractions.
(SCM_FRACTIONP, SCM_SLOPPY_FRACTIONP, SCM_FRACTION_NUMERATOR,
SCM_FRACTION_DENOMINATOR, SCM_FRACTION_SET_NUMERATOR,
SCM_FRACTION_SET_DENOMINATOR, SCM_FRACTION_REDUCED_BIT,
SCM_FRACTION_REDUCED_SET, SCM_FRACTION_REDUCED_CLEAR,
SCM_FRACTION_REDUCED): New.
(scm_floor, scm_ceiling, scm_truncate_number, scm_round_number):
New prototypes.
(scm_make_ratio, scm_rationalize, scm_numerator, scm_denominator,
scm_rational_p): New prototypes.
(scm_i_dbl2num, scm_i_fraction2double, scm_i_fraction_equalp,
scm_i_print_fraction): New prototypes.
* goops.c (create_standard_classes): Create "<fraction>" class.
* gc-mark.c (scm_gc_mark_dependencies): Handle fractions.
* gc-card.c (scm_i_sweep_card): Include scm_tc16_fraction as a
case in the switch, but do nothing for now.
* eval.c (SCM_CEVAL, SCM_APPLY, call_dsubr_1): Convert fractions
to doubles when calling 'dsubr' functions.
* eq.c (scm_eqv_p, scm_equal_p): Handle fractions.
2003-11-18 19:59:53 +00:00
|
|
|
|
}
|
2003-07-13 16:13:57 +00:00
|
|
|
|
else
|
|
|
|
|
|
SCM_WTA_DISPATCH_2 (g_max, x, y, SCM_ARGn, s_max);
|
1999-01-10 07:38:39 +00:00
|
|
|
|
}
|
2003-07-13 16:13:57 +00:00
|
|
|
|
else if (SCM_BIGP (x))
|
|
|
|
|
|
{
|
2004-07-23 15:43:02 +00:00
|
|
|
|
if (SCM_I_INUMP (y))
|
2003-07-13 16:13:57 +00:00
|
|
|
|
{
|
|
|
|
|
|
int sgn = mpz_sgn (SCM_I_BIG_MPZ (x));
|
|
|
|
|
|
scm_remember_upto_here_1 (x);
|
|
|
|
|
|
return (sgn < 0) ? y : x;
|
|
|
|
|
|
}
|
|
|
|
|
|
else if (SCM_BIGP (y))
|
|
|
|
|
|
{
|
|
|
|
|
|
int cmp = mpz_cmp (SCM_I_BIG_MPZ (x), SCM_I_BIG_MPZ (y));
|
|
|
|
|
|
scm_remember_upto_here_2 (x, y);
|
|
|
|
|
|
return (cmp > 0) ? x : y;
|
|
|
|
|
|
}
|
|
|
|
|
|
else if (SCM_REALP (y))
|
|
|
|
|
|
{
|
2004-03-24 21:53:31 +00:00
|
|
|
|
/* if y==NaN then xx>yy is false, so we return the NaN y */
|
|
|
|
|
|
double xx, yy;
|
|
|
|
|
|
big_real:
|
|
|
|
|
|
xx = scm_i_big2dbl (x);
|
|
|
|
|
|
yy = SCM_REAL_VALUE (y);
|
(scm_is_rational): New.
(scm_i_short2big, scm_i_int2big, scm_i_uint2big, scm_i_size2big,
scm_i_ptrdiff2big, scm_i_long_long2big, scm_i_ulong_long2big):
Removed prototypes.
(scm_make_real, scm_num2dbl, scm_float2num, scm_double2num):
Discouraged by moving to discouraged.h and discouraged.c.
Replaced all uses with scm_from_double.
(scm_num2float, scm_num2double): Discouraged by moving prototype
to discouraged.h and rewriting in terms of scm_to_double.
Replaced all uses with scm_to_double.
(scm_to_double): Do not implement in terms of scm_num2dbl, use
explicit code.
(scm_from_double): Do not implement in terms of scm_make_real, use
explicit code.
2004-08-03 15:03:35 +00:00
|
|
|
|
return (xx > yy ? scm_from_double (xx) : y);
|
2003-07-13 16:13:57 +00:00
|
|
|
|
}
|
* print.c (scm_iprin1): Handle fractions.
* objects.h (scm_class_fraction): New.
* objects.c (scm_class_fraction): New.
(scm_class_of): Handle fractions.
* hash.c (scm_hasher): Handle fractions.
* numbers.c: New code for handling fraction all over the place.
(scm_odd_p, scm_even_p): Handle inexact integers.
(scm_rational_p): New function, same as scm_real_p.
(scm_round_number, scm_truncate_number, scm_ceiling, scm_floor):
New exact functions that replace the inexact 'dsubr'
implementations.
(scm_numerator, scm_denominator): New.
* numbers.h (SCM_NUMP): Recognize fractions.
(SCM_FRACTIONP, SCM_SLOPPY_FRACTIONP, SCM_FRACTION_NUMERATOR,
SCM_FRACTION_DENOMINATOR, SCM_FRACTION_SET_NUMERATOR,
SCM_FRACTION_SET_DENOMINATOR, SCM_FRACTION_REDUCED_BIT,
SCM_FRACTION_REDUCED_SET, SCM_FRACTION_REDUCED_CLEAR,
SCM_FRACTION_REDUCED): New.
(scm_floor, scm_ceiling, scm_truncate_number, scm_round_number):
New prototypes.
(scm_make_ratio, scm_rationalize, scm_numerator, scm_denominator,
scm_rational_p): New prototypes.
(scm_i_dbl2num, scm_i_fraction2double, scm_i_fraction_equalp,
scm_i_print_fraction): New prototypes.
* goops.c (create_standard_classes): Create "<fraction>" class.
* gc-mark.c (scm_gc_mark_dependencies): Handle fractions.
* gc-card.c (scm_i_sweep_card): Include scm_tc16_fraction as a
case in the switch, but do nothing for now.
* eval.c (SCM_CEVAL, SCM_APPLY, call_dsubr_1): Convert fractions
to doubles when calling 'dsubr' functions.
* eq.c (scm_eqv_p, scm_equal_p): Handle fractions.
2003-11-18 19:59:53 +00:00
|
|
|
|
else if (SCM_FRACTIONP (y))
|
|
|
|
|
|
{
|
2004-04-15 00:44:19 +00:00
|
|
|
|
goto use_less;
|
* print.c (scm_iprin1): Handle fractions.
* objects.h (scm_class_fraction): New.
* objects.c (scm_class_fraction): New.
(scm_class_of): Handle fractions.
* hash.c (scm_hasher): Handle fractions.
* numbers.c: New code for handling fraction all over the place.
(scm_odd_p, scm_even_p): Handle inexact integers.
(scm_rational_p): New function, same as scm_real_p.
(scm_round_number, scm_truncate_number, scm_ceiling, scm_floor):
New exact functions that replace the inexact 'dsubr'
implementations.
(scm_numerator, scm_denominator): New.
* numbers.h (SCM_NUMP): Recognize fractions.
(SCM_FRACTIONP, SCM_SLOPPY_FRACTIONP, SCM_FRACTION_NUMERATOR,
SCM_FRACTION_DENOMINATOR, SCM_FRACTION_SET_NUMERATOR,
SCM_FRACTION_SET_DENOMINATOR, SCM_FRACTION_REDUCED_BIT,
SCM_FRACTION_REDUCED_SET, SCM_FRACTION_REDUCED_CLEAR,
SCM_FRACTION_REDUCED): New.
(scm_floor, scm_ceiling, scm_truncate_number, scm_round_number):
New prototypes.
(scm_make_ratio, scm_rationalize, scm_numerator, scm_denominator,
scm_rational_p): New prototypes.
(scm_i_dbl2num, scm_i_fraction2double, scm_i_fraction_equalp,
scm_i_print_fraction): New prototypes.
* goops.c (create_standard_classes): Create "<fraction>" class.
* gc-mark.c (scm_gc_mark_dependencies): Handle fractions.
* gc-card.c (scm_i_sweep_card): Include scm_tc16_fraction as a
case in the switch, but do nothing for now.
* eval.c (SCM_CEVAL, SCM_APPLY, call_dsubr_1): Convert fractions
to doubles when calling 'dsubr' functions.
* eq.c (scm_eqv_p, scm_equal_p): Handle fractions.
2003-11-18 19:59:53 +00:00
|
|
|
|
}
|
2003-07-13 16:13:57 +00:00
|
|
|
|
else
|
|
|
|
|
|
SCM_WTA_DISPATCH_2 (g_max, x, y, SCM_ARGn, s_max);
|
2000-05-03 12:35:56 +00:00
|
|
|
|
}
|
2003-07-13 16:13:57 +00:00
|
|
|
|
else if (SCM_REALP (x))
|
|
|
|
|
|
{
|
2004-07-23 15:43:02 +00:00
|
|
|
|
if (SCM_I_INUMP (y))
|
2003-07-13 16:13:57 +00:00
|
|
|
|
{
|
2004-07-23 15:43:02 +00:00
|
|
|
|
double z = SCM_I_INUM (y);
|
2003-07-13 16:13:57 +00:00
|
|
|
|
/* if x==NaN then "<" is false and we return NaN */
|
(scm_is_rational): New.
(scm_i_short2big, scm_i_int2big, scm_i_uint2big, scm_i_size2big,
scm_i_ptrdiff2big, scm_i_long_long2big, scm_i_ulong_long2big):
Removed prototypes.
(scm_make_real, scm_num2dbl, scm_float2num, scm_double2num):
Discouraged by moving to discouraged.h and discouraged.c.
Replaced all uses with scm_from_double.
(scm_num2float, scm_num2double): Discouraged by moving prototype
to discouraged.h and rewriting in terms of scm_to_double.
Replaced all uses with scm_to_double.
(scm_to_double): Do not implement in terms of scm_num2dbl, use
explicit code.
(scm_from_double): Do not implement in terms of scm_make_real, use
explicit code.
2004-08-03 15:03:35 +00:00
|
|
|
|
return (SCM_REAL_VALUE (x) < z) ? scm_from_double (z) : x;
|
2003-07-13 16:13:57 +00:00
|
|
|
|
}
|
|
|
|
|
|
else if (SCM_BIGP (y))
|
|
|
|
|
|
{
|
2004-04-17 21:58:23 +00:00
|
|
|
|
SCM_SWAP (x, y);
|
2004-03-24 21:53:31 +00:00
|
|
|
|
goto big_real;
|
2003-07-13 16:13:57 +00:00
|
|
|
|
}
|
|
|
|
|
|
else if (SCM_REALP (y))
|
|
|
|
|
|
{
|
|
|
|
|
|
/* if x==NaN then our explicit check means we return NaN
|
|
|
|
|
|
if y==NaN then ">" is false and we return NaN
|
|
|
|
|
|
calling isnan is unavoidable, since it's the only way to know
|
|
|
|
|
|
which of x or y causes any compares to be false */
|
|
|
|
|
|
double xx = SCM_REAL_VALUE (x);
|
|
|
|
|
|
return (xisnan (xx) || xx > SCM_REAL_VALUE (y)) ? x : y;
|
|
|
|
|
|
}
|
* print.c (scm_iprin1): Handle fractions.
* objects.h (scm_class_fraction): New.
* objects.c (scm_class_fraction): New.
(scm_class_of): Handle fractions.
* hash.c (scm_hasher): Handle fractions.
* numbers.c: New code for handling fraction all over the place.
(scm_odd_p, scm_even_p): Handle inexact integers.
(scm_rational_p): New function, same as scm_real_p.
(scm_round_number, scm_truncate_number, scm_ceiling, scm_floor):
New exact functions that replace the inexact 'dsubr'
implementations.
(scm_numerator, scm_denominator): New.
* numbers.h (SCM_NUMP): Recognize fractions.
(SCM_FRACTIONP, SCM_SLOPPY_FRACTIONP, SCM_FRACTION_NUMERATOR,
SCM_FRACTION_DENOMINATOR, SCM_FRACTION_SET_NUMERATOR,
SCM_FRACTION_SET_DENOMINATOR, SCM_FRACTION_REDUCED_BIT,
SCM_FRACTION_REDUCED_SET, SCM_FRACTION_REDUCED_CLEAR,
SCM_FRACTION_REDUCED): New.
(scm_floor, scm_ceiling, scm_truncate_number, scm_round_number):
New prototypes.
(scm_make_ratio, scm_rationalize, scm_numerator, scm_denominator,
scm_rational_p): New prototypes.
(scm_i_dbl2num, scm_i_fraction2double, scm_i_fraction_equalp,
scm_i_print_fraction): New prototypes.
* goops.c (create_standard_classes): Create "<fraction>" class.
* gc-mark.c (scm_gc_mark_dependencies): Handle fractions.
* gc-card.c (scm_i_sweep_card): Include scm_tc16_fraction as a
case in the switch, but do nothing for now.
* eval.c (SCM_CEVAL, SCM_APPLY, call_dsubr_1): Convert fractions
to doubles when calling 'dsubr' functions.
* eq.c (scm_eqv_p, scm_equal_p): Handle fractions.
2003-11-18 19:59:53 +00:00
|
|
|
|
else if (SCM_FRACTIONP (y))
|
|
|
|
|
|
{
|
|
|
|
|
|
double yy = scm_i_fraction2double (y);
|
|
|
|
|
|
double xx = SCM_REAL_VALUE (x);
|
(scm_is_rational): New.
(scm_i_short2big, scm_i_int2big, scm_i_uint2big, scm_i_size2big,
scm_i_ptrdiff2big, scm_i_long_long2big, scm_i_ulong_long2big):
Removed prototypes.
(scm_make_real, scm_num2dbl, scm_float2num, scm_double2num):
Discouraged by moving to discouraged.h and discouraged.c.
Replaced all uses with scm_from_double.
(scm_num2float, scm_num2double): Discouraged by moving prototype
to discouraged.h and rewriting in terms of scm_to_double.
Replaced all uses with scm_to_double.
(scm_to_double): Do not implement in terms of scm_num2dbl, use
explicit code.
(scm_from_double): Do not implement in terms of scm_make_real, use
explicit code.
2004-08-03 15:03:35 +00:00
|
|
|
|
return (xx < yy) ? scm_from_double (yy) : x;
|
* print.c (scm_iprin1): Handle fractions.
* objects.h (scm_class_fraction): New.
* objects.c (scm_class_fraction): New.
(scm_class_of): Handle fractions.
* hash.c (scm_hasher): Handle fractions.
* numbers.c: New code for handling fraction all over the place.
(scm_odd_p, scm_even_p): Handle inexact integers.
(scm_rational_p): New function, same as scm_real_p.
(scm_round_number, scm_truncate_number, scm_ceiling, scm_floor):
New exact functions that replace the inexact 'dsubr'
implementations.
(scm_numerator, scm_denominator): New.
* numbers.h (SCM_NUMP): Recognize fractions.
(SCM_FRACTIONP, SCM_SLOPPY_FRACTIONP, SCM_FRACTION_NUMERATOR,
SCM_FRACTION_DENOMINATOR, SCM_FRACTION_SET_NUMERATOR,
SCM_FRACTION_SET_DENOMINATOR, SCM_FRACTION_REDUCED_BIT,
SCM_FRACTION_REDUCED_SET, SCM_FRACTION_REDUCED_CLEAR,
SCM_FRACTION_REDUCED): New.
(scm_floor, scm_ceiling, scm_truncate_number, scm_round_number):
New prototypes.
(scm_make_ratio, scm_rationalize, scm_numerator, scm_denominator,
scm_rational_p): New prototypes.
(scm_i_dbl2num, scm_i_fraction2double, scm_i_fraction_equalp,
scm_i_print_fraction): New prototypes.
* goops.c (create_standard_classes): Create "<fraction>" class.
* gc-mark.c (scm_gc_mark_dependencies): Handle fractions.
* gc-card.c (scm_i_sweep_card): Include scm_tc16_fraction as a
case in the switch, but do nothing for now.
* eval.c (SCM_CEVAL, SCM_APPLY, call_dsubr_1): Convert fractions
to doubles when calling 'dsubr' functions.
* eq.c (scm_eqv_p, scm_equal_p): Handle fractions.
2003-11-18 19:59:53 +00:00
|
|
|
|
}
|
|
|
|
|
|
else
|
|
|
|
|
|
SCM_WTA_DISPATCH_2 (g_max, x, y, SCM_ARGn, s_max);
|
|
|
|
|
|
}
|
|
|
|
|
|
else if (SCM_FRACTIONP (x))
|
|
|
|
|
|
{
|
2004-07-23 15:43:02 +00:00
|
|
|
|
if (SCM_I_INUMP (y))
|
* print.c (scm_iprin1): Handle fractions.
* objects.h (scm_class_fraction): New.
* objects.c (scm_class_fraction): New.
(scm_class_of): Handle fractions.
* hash.c (scm_hasher): Handle fractions.
* numbers.c: New code for handling fraction all over the place.
(scm_odd_p, scm_even_p): Handle inexact integers.
(scm_rational_p): New function, same as scm_real_p.
(scm_round_number, scm_truncate_number, scm_ceiling, scm_floor):
New exact functions that replace the inexact 'dsubr'
implementations.
(scm_numerator, scm_denominator): New.
* numbers.h (SCM_NUMP): Recognize fractions.
(SCM_FRACTIONP, SCM_SLOPPY_FRACTIONP, SCM_FRACTION_NUMERATOR,
SCM_FRACTION_DENOMINATOR, SCM_FRACTION_SET_NUMERATOR,
SCM_FRACTION_SET_DENOMINATOR, SCM_FRACTION_REDUCED_BIT,
SCM_FRACTION_REDUCED_SET, SCM_FRACTION_REDUCED_CLEAR,
SCM_FRACTION_REDUCED): New.
(scm_floor, scm_ceiling, scm_truncate_number, scm_round_number):
New prototypes.
(scm_make_ratio, scm_rationalize, scm_numerator, scm_denominator,
scm_rational_p): New prototypes.
(scm_i_dbl2num, scm_i_fraction2double, scm_i_fraction_equalp,
scm_i_print_fraction): New prototypes.
* goops.c (create_standard_classes): Create "<fraction>" class.
* gc-mark.c (scm_gc_mark_dependencies): Handle fractions.
* gc-card.c (scm_i_sweep_card): Include scm_tc16_fraction as a
case in the switch, but do nothing for now.
* eval.c (SCM_CEVAL, SCM_APPLY, call_dsubr_1): Convert fractions
to doubles when calling 'dsubr' functions.
* eq.c (scm_eqv_p, scm_equal_p): Handle fractions.
2003-11-18 19:59:53 +00:00
|
|
|
|
{
|
2004-04-15 00:44:19 +00:00
|
|
|
|
goto use_less;
|
* print.c (scm_iprin1): Handle fractions.
* objects.h (scm_class_fraction): New.
* objects.c (scm_class_fraction): New.
(scm_class_of): Handle fractions.
* hash.c (scm_hasher): Handle fractions.
* numbers.c: New code for handling fraction all over the place.
(scm_odd_p, scm_even_p): Handle inexact integers.
(scm_rational_p): New function, same as scm_real_p.
(scm_round_number, scm_truncate_number, scm_ceiling, scm_floor):
New exact functions that replace the inexact 'dsubr'
implementations.
(scm_numerator, scm_denominator): New.
* numbers.h (SCM_NUMP): Recognize fractions.
(SCM_FRACTIONP, SCM_SLOPPY_FRACTIONP, SCM_FRACTION_NUMERATOR,
SCM_FRACTION_DENOMINATOR, SCM_FRACTION_SET_NUMERATOR,
SCM_FRACTION_SET_DENOMINATOR, SCM_FRACTION_REDUCED_BIT,
SCM_FRACTION_REDUCED_SET, SCM_FRACTION_REDUCED_CLEAR,
SCM_FRACTION_REDUCED): New.
(scm_floor, scm_ceiling, scm_truncate_number, scm_round_number):
New prototypes.
(scm_make_ratio, scm_rationalize, scm_numerator, scm_denominator,
scm_rational_p): New prototypes.
(scm_i_dbl2num, scm_i_fraction2double, scm_i_fraction_equalp,
scm_i_print_fraction): New prototypes.
* goops.c (create_standard_classes): Create "<fraction>" class.
* gc-mark.c (scm_gc_mark_dependencies): Handle fractions.
* gc-card.c (scm_i_sweep_card): Include scm_tc16_fraction as a
case in the switch, but do nothing for now.
* eval.c (SCM_CEVAL, SCM_APPLY, call_dsubr_1): Convert fractions
to doubles when calling 'dsubr' functions.
* eq.c (scm_eqv_p, scm_equal_p): Handle fractions.
2003-11-18 19:59:53 +00:00
|
|
|
|
}
|
|
|
|
|
|
else if (SCM_BIGP (y))
|
|
|
|
|
|
{
|
2004-04-15 00:44:19 +00:00
|
|
|
|
goto use_less;
|
* print.c (scm_iprin1): Handle fractions.
* objects.h (scm_class_fraction): New.
* objects.c (scm_class_fraction): New.
(scm_class_of): Handle fractions.
* hash.c (scm_hasher): Handle fractions.
* numbers.c: New code for handling fraction all over the place.
(scm_odd_p, scm_even_p): Handle inexact integers.
(scm_rational_p): New function, same as scm_real_p.
(scm_round_number, scm_truncate_number, scm_ceiling, scm_floor):
New exact functions that replace the inexact 'dsubr'
implementations.
(scm_numerator, scm_denominator): New.
* numbers.h (SCM_NUMP): Recognize fractions.
(SCM_FRACTIONP, SCM_SLOPPY_FRACTIONP, SCM_FRACTION_NUMERATOR,
SCM_FRACTION_DENOMINATOR, SCM_FRACTION_SET_NUMERATOR,
SCM_FRACTION_SET_DENOMINATOR, SCM_FRACTION_REDUCED_BIT,
SCM_FRACTION_REDUCED_SET, SCM_FRACTION_REDUCED_CLEAR,
SCM_FRACTION_REDUCED): New.
(scm_floor, scm_ceiling, scm_truncate_number, scm_round_number):
New prototypes.
(scm_make_ratio, scm_rationalize, scm_numerator, scm_denominator,
scm_rational_p): New prototypes.
(scm_i_dbl2num, scm_i_fraction2double, scm_i_fraction_equalp,
scm_i_print_fraction): New prototypes.
* goops.c (create_standard_classes): Create "<fraction>" class.
* gc-mark.c (scm_gc_mark_dependencies): Handle fractions.
* gc-card.c (scm_i_sweep_card): Include scm_tc16_fraction as a
case in the switch, but do nothing for now.
* eval.c (SCM_CEVAL, SCM_APPLY, call_dsubr_1): Convert fractions
to doubles when calling 'dsubr' functions.
* eq.c (scm_eqv_p, scm_equal_p): Handle fractions.
2003-11-18 19:59:53 +00:00
|
|
|
|
}
|
|
|
|
|
|
else if (SCM_REALP (y))
|
|
|
|
|
|
{
|
|
|
|
|
|
double xx = scm_i_fraction2double (x);
|
(scm_is_rational): New.
(scm_i_short2big, scm_i_int2big, scm_i_uint2big, scm_i_size2big,
scm_i_ptrdiff2big, scm_i_long_long2big, scm_i_ulong_long2big):
Removed prototypes.
(scm_make_real, scm_num2dbl, scm_float2num, scm_double2num):
Discouraged by moving to discouraged.h and discouraged.c.
Replaced all uses with scm_from_double.
(scm_num2float, scm_num2double): Discouraged by moving prototype
to discouraged.h and rewriting in terms of scm_to_double.
Replaced all uses with scm_to_double.
(scm_to_double): Do not implement in terms of scm_num2dbl, use
explicit code.
(scm_from_double): Do not implement in terms of scm_make_real, use
explicit code.
2004-08-03 15:03:35 +00:00
|
|
|
|
return (xx < SCM_REAL_VALUE (y)) ? y : scm_from_double (xx);
|
* print.c (scm_iprin1): Handle fractions.
* objects.h (scm_class_fraction): New.
* objects.c (scm_class_fraction): New.
(scm_class_of): Handle fractions.
* hash.c (scm_hasher): Handle fractions.
* numbers.c: New code for handling fraction all over the place.
(scm_odd_p, scm_even_p): Handle inexact integers.
(scm_rational_p): New function, same as scm_real_p.
(scm_round_number, scm_truncate_number, scm_ceiling, scm_floor):
New exact functions that replace the inexact 'dsubr'
implementations.
(scm_numerator, scm_denominator): New.
* numbers.h (SCM_NUMP): Recognize fractions.
(SCM_FRACTIONP, SCM_SLOPPY_FRACTIONP, SCM_FRACTION_NUMERATOR,
SCM_FRACTION_DENOMINATOR, SCM_FRACTION_SET_NUMERATOR,
SCM_FRACTION_SET_DENOMINATOR, SCM_FRACTION_REDUCED_BIT,
SCM_FRACTION_REDUCED_SET, SCM_FRACTION_REDUCED_CLEAR,
SCM_FRACTION_REDUCED): New.
(scm_floor, scm_ceiling, scm_truncate_number, scm_round_number):
New prototypes.
(scm_make_ratio, scm_rationalize, scm_numerator, scm_denominator,
scm_rational_p): New prototypes.
(scm_i_dbl2num, scm_i_fraction2double, scm_i_fraction_equalp,
scm_i_print_fraction): New prototypes.
* goops.c (create_standard_classes): Create "<fraction>" class.
* gc-mark.c (scm_gc_mark_dependencies): Handle fractions.
* gc-card.c (scm_i_sweep_card): Include scm_tc16_fraction as a
case in the switch, but do nothing for now.
* eval.c (SCM_CEVAL, SCM_APPLY, call_dsubr_1): Convert fractions
to doubles when calling 'dsubr' functions.
* eq.c (scm_eqv_p, scm_equal_p): Handle fractions.
2003-11-18 19:59:53 +00:00
|
|
|
|
}
|
|
|
|
|
|
else if (SCM_FRACTIONP (y))
|
|
|
|
|
|
{
|
2004-04-15 00:44:19 +00:00
|
|
|
|
goto use_less;
|
* print.c (scm_iprin1): Handle fractions.
* objects.h (scm_class_fraction): New.
* objects.c (scm_class_fraction): New.
(scm_class_of): Handle fractions.
* hash.c (scm_hasher): Handle fractions.
* numbers.c: New code for handling fraction all over the place.
(scm_odd_p, scm_even_p): Handle inexact integers.
(scm_rational_p): New function, same as scm_real_p.
(scm_round_number, scm_truncate_number, scm_ceiling, scm_floor):
New exact functions that replace the inexact 'dsubr'
implementations.
(scm_numerator, scm_denominator): New.
* numbers.h (SCM_NUMP): Recognize fractions.
(SCM_FRACTIONP, SCM_SLOPPY_FRACTIONP, SCM_FRACTION_NUMERATOR,
SCM_FRACTION_DENOMINATOR, SCM_FRACTION_SET_NUMERATOR,
SCM_FRACTION_SET_DENOMINATOR, SCM_FRACTION_REDUCED_BIT,
SCM_FRACTION_REDUCED_SET, SCM_FRACTION_REDUCED_CLEAR,
SCM_FRACTION_REDUCED): New.
(scm_floor, scm_ceiling, scm_truncate_number, scm_round_number):
New prototypes.
(scm_make_ratio, scm_rationalize, scm_numerator, scm_denominator,
scm_rational_p): New prototypes.
(scm_i_dbl2num, scm_i_fraction2double, scm_i_fraction_equalp,
scm_i_print_fraction): New prototypes.
* goops.c (create_standard_classes): Create "<fraction>" class.
* gc-mark.c (scm_gc_mark_dependencies): Handle fractions.
* gc-card.c (scm_i_sweep_card): Include scm_tc16_fraction as a
case in the switch, but do nothing for now.
* eval.c (SCM_CEVAL, SCM_APPLY, call_dsubr_1): Convert fractions
to doubles when calling 'dsubr' functions.
* eq.c (scm_eqv_p, scm_equal_p): Handle fractions.
2003-11-18 19:59:53 +00:00
|
|
|
|
}
|
2003-07-13 16:13:57 +00:00
|
|
|
|
else
|
|
|
|
|
|
SCM_WTA_DISPATCH_2 (g_max, x, y, SCM_ARGn, s_max);
|
1999-01-10 07:38:39 +00:00
|
|
|
|
}
|
2003-07-13 16:13:57 +00:00
|
|
|
|
else
|
2000-05-03 12:35:56 +00:00
|
|
|
|
SCM_WTA_DISPATCH_2 (g_max, x, y, SCM_ARG1, s_max);
|
1996-07-25 22:56:11 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
2009-09-06 16:47:19 +02:00
|
|
|
|
SCM_PRIMITIVE_GENERIC (scm_i_min, "min", 0, 2, 1,
|
|
|
|
|
|
(SCM x, SCM y, SCM rest),
|
|
|
|
|
|
"Return the minimum of all parameter values.")
|
|
|
|
|
|
#define FUNC_NAME s_scm_i_min
|
|
|
|
|
|
{
|
|
|
|
|
|
while (!scm_is_null (rest))
|
|
|
|
|
|
{ x = scm_min (x, y);
|
|
|
|
|
|
y = scm_car (rest);
|
|
|
|
|
|
rest = scm_cdr (rest);
|
|
|
|
|
|
}
|
|
|
|
|
|
return scm_min (x, y);
|
|
|
|
|
|
}
|
|
|
|
|
|
#undef FUNC_NAME
|
|
|
|
|
|
|
|
|
|
|
|
#define s_min s_scm_i_min
|
|
|
|
|
|
#define g_min g_scm_i_min
|
|
|
|
|
|
|
1996-07-25 22:56:11 +00:00
|
|
|
|
SCM
|
1999-12-12 20:35:02 +00:00
|
|
|
|
scm_min (SCM x, SCM y)
|
1996-07-25 22:56:11 +00:00
|
|
|
|
{
|
2003-07-13 16:13:57 +00:00
|
|
|
|
if (SCM_UNBNDP (y))
|
|
|
|
|
|
{
|
|
|
|
|
|
if (SCM_UNBNDP (x))
|
|
|
|
|
|
SCM_WTA_DISPATCH_0 (g_min, s_min);
|
2004-07-23 15:43:02 +00:00
|
|
|
|
else if (SCM_I_INUMP(x) || SCM_BIGP(x) || SCM_REALP(x) || SCM_FRACTIONP(x))
|
2003-07-13 16:13:57 +00:00
|
|
|
|
return x;
|
|
|
|
|
|
else
|
|
|
|
|
|
SCM_WTA_DISPATCH_1 (g_min, x, SCM_ARG1, s_min);
|
1999-01-10 07:38:39 +00:00
|
|
|
|
}
|
2000-05-03 12:35:56 +00:00
|
|
|
|
|
2004-07-23 15:43:02 +00:00
|
|
|
|
if (SCM_I_INUMP (x))
|
2003-07-13 16:13:57 +00:00
|
|
|
|
{
|
2004-07-23 15:43:02 +00:00
|
|
|
|
long xx = SCM_I_INUM (x);
|
|
|
|
|
|
if (SCM_I_INUMP (y))
|
2003-07-13 16:13:57 +00:00
|
|
|
|
{
|
2004-07-23 15:43:02 +00:00
|
|
|
|
long yy = SCM_I_INUM (y);
|
2003-07-13 16:13:57 +00:00
|
|
|
|
return (xx < yy) ? x : y;
|
|
|
|
|
|
}
|
|
|
|
|
|
else if (SCM_BIGP (y))
|
|
|
|
|
|
{
|
|
|
|
|
|
int sgn = mpz_sgn (SCM_I_BIG_MPZ (y));
|
|
|
|
|
|
scm_remember_upto_here_1 (y);
|
|
|
|
|
|
return (sgn < 0) ? y : x;
|
|
|
|
|
|
}
|
|
|
|
|
|
else if (SCM_REALP (y))
|
|
|
|
|
|
{
|
|
|
|
|
|
double z = xx;
|
|
|
|
|
|
/* if y==NaN then "<" is false and we return NaN */
|
(scm_is_rational): New.
(scm_i_short2big, scm_i_int2big, scm_i_uint2big, scm_i_size2big,
scm_i_ptrdiff2big, scm_i_long_long2big, scm_i_ulong_long2big):
Removed prototypes.
(scm_make_real, scm_num2dbl, scm_float2num, scm_double2num):
Discouraged by moving to discouraged.h and discouraged.c.
Replaced all uses with scm_from_double.
(scm_num2float, scm_num2double): Discouraged by moving prototype
to discouraged.h and rewriting in terms of scm_to_double.
Replaced all uses with scm_to_double.
(scm_to_double): Do not implement in terms of scm_num2dbl, use
explicit code.
(scm_from_double): Do not implement in terms of scm_make_real, use
explicit code.
2004-08-03 15:03:35 +00:00
|
|
|
|
return (z < SCM_REAL_VALUE (y)) ? scm_from_double (z) : y;
|
2003-07-13 16:13:57 +00:00
|
|
|
|
}
|
* print.c (scm_iprin1): Handle fractions.
* objects.h (scm_class_fraction): New.
* objects.c (scm_class_fraction): New.
(scm_class_of): Handle fractions.
* hash.c (scm_hasher): Handle fractions.
* numbers.c: New code for handling fraction all over the place.
(scm_odd_p, scm_even_p): Handle inexact integers.
(scm_rational_p): New function, same as scm_real_p.
(scm_round_number, scm_truncate_number, scm_ceiling, scm_floor):
New exact functions that replace the inexact 'dsubr'
implementations.
(scm_numerator, scm_denominator): New.
* numbers.h (SCM_NUMP): Recognize fractions.
(SCM_FRACTIONP, SCM_SLOPPY_FRACTIONP, SCM_FRACTION_NUMERATOR,
SCM_FRACTION_DENOMINATOR, SCM_FRACTION_SET_NUMERATOR,
SCM_FRACTION_SET_DENOMINATOR, SCM_FRACTION_REDUCED_BIT,
SCM_FRACTION_REDUCED_SET, SCM_FRACTION_REDUCED_CLEAR,
SCM_FRACTION_REDUCED): New.
(scm_floor, scm_ceiling, scm_truncate_number, scm_round_number):
New prototypes.
(scm_make_ratio, scm_rationalize, scm_numerator, scm_denominator,
scm_rational_p): New prototypes.
(scm_i_dbl2num, scm_i_fraction2double, scm_i_fraction_equalp,
scm_i_print_fraction): New prototypes.
* goops.c (create_standard_classes): Create "<fraction>" class.
* gc-mark.c (scm_gc_mark_dependencies): Handle fractions.
* gc-card.c (scm_i_sweep_card): Include scm_tc16_fraction as a
case in the switch, but do nothing for now.
* eval.c (SCM_CEVAL, SCM_APPLY, call_dsubr_1): Convert fractions
to doubles when calling 'dsubr' functions.
* eq.c (scm_eqv_p, scm_equal_p): Handle fractions.
2003-11-18 19:59:53 +00:00
|
|
|
|
else if (SCM_FRACTIONP (y))
|
|
|
|
|
|
{
|
2004-04-15 00:44:19 +00:00
|
|
|
|
use_less:
|
(scm_is_integer, scm_is_signed_integer, scm_is_unsigned_integer,
scm_to_signed_integer, scm_to_unsigned_integer, scm_to_schar,
scm_to_uchar, scm_to_char, scm_to_short, scm_to_ushort, scm_to_long,
scm_to_ulong, scm_to_size_t, scm_to_ssize_t, scm_from_schar,
scm_from_uchar, scm_from_char, scm_from_short, scm_from_ushort,
scm_from_int, scm_from_uint, scm_from_long, scm_from_ulong,
scm_from_size_t, scm_from_ssize_t, scm_is_real, scm_to_double,
scm_from_double): New.
* deprecated.h, boolean.h (SCM_FALSEP, SCM_NFALSEP, SCM_BOOL,
SCM_NEGATE_BOOL, SCM_BOOLP): Deprecated by moving into "deprecated.h".
Replaced all uses with scm_is_false, scm_is_true, scm_from_bool, and
scm_is_bool, respectively.
2004-07-06 10:23:30 +00:00
|
|
|
|
return (scm_is_false (scm_less_p (x, y)) ? y : x);
|
* print.c (scm_iprin1): Handle fractions.
* objects.h (scm_class_fraction): New.
* objects.c (scm_class_fraction): New.
(scm_class_of): Handle fractions.
* hash.c (scm_hasher): Handle fractions.
* numbers.c: New code for handling fraction all over the place.
(scm_odd_p, scm_even_p): Handle inexact integers.
(scm_rational_p): New function, same as scm_real_p.
(scm_round_number, scm_truncate_number, scm_ceiling, scm_floor):
New exact functions that replace the inexact 'dsubr'
implementations.
(scm_numerator, scm_denominator): New.
* numbers.h (SCM_NUMP): Recognize fractions.
(SCM_FRACTIONP, SCM_SLOPPY_FRACTIONP, SCM_FRACTION_NUMERATOR,
SCM_FRACTION_DENOMINATOR, SCM_FRACTION_SET_NUMERATOR,
SCM_FRACTION_SET_DENOMINATOR, SCM_FRACTION_REDUCED_BIT,
SCM_FRACTION_REDUCED_SET, SCM_FRACTION_REDUCED_CLEAR,
SCM_FRACTION_REDUCED): New.
(scm_floor, scm_ceiling, scm_truncate_number, scm_round_number):
New prototypes.
(scm_make_ratio, scm_rationalize, scm_numerator, scm_denominator,
scm_rational_p): New prototypes.
(scm_i_dbl2num, scm_i_fraction2double, scm_i_fraction_equalp,
scm_i_print_fraction): New prototypes.
* goops.c (create_standard_classes): Create "<fraction>" class.
* gc-mark.c (scm_gc_mark_dependencies): Handle fractions.
* gc-card.c (scm_i_sweep_card): Include scm_tc16_fraction as a
case in the switch, but do nothing for now.
* eval.c (SCM_CEVAL, SCM_APPLY, call_dsubr_1): Convert fractions
to doubles when calling 'dsubr' functions.
* eq.c (scm_eqv_p, scm_equal_p): Handle fractions.
2003-11-18 19:59:53 +00:00
|
|
|
|
}
|
2003-07-13 16:13:57 +00:00
|
|
|
|
else
|
|
|
|
|
|
SCM_WTA_DISPATCH_2 (g_min, x, y, SCM_ARGn, s_min);
|
1999-01-10 07:38:39 +00:00
|
|
|
|
}
|
2003-07-13 16:13:57 +00:00
|
|
|
|
else if (SCM_BIGP (x))
|
|
|
|
|
|
{
|
2004-07-23 15:43:02 +00:00
|
|
|
|
if (SCM_I_INUMP (y))
|
2003-07-13 16:13:57 +00:00
|
|
|
|
{
|
|
|
|
|
|
int sgn = mpz_sgn (SCM_I_BIG_MPZ (x));
|
|
|
|
|
|
scm_remember_upto_here_1 (x);
|
|
|
|
|
|
return (sgn < 0) ? x : y;
|
|
|
|
|
|
}
|
|
|
|
|
|
else if (SCM_BIGP (y))
|
|
|
|
|
|
{
|
|
|
|
|
|
int cmp = mpz_cmp (SCM_I_BIG_MPZ (x), SCM_I_BIG_MPZ (y));
|
|
|
|
|
|
scm_remember_upto_here_2 (x, y);
|
|
|
|
|
|
return (cmp > 0) ? y : x;
|
|
|
|
|
|
}
|
|
|
|
|
|
else if (SCM_REALP (y))
|
|
|
|
|
|
{
|
2004-03-24 21:53:31 +00:00
|
|
|
|
/* if y==NaN then xx<yy is false, so we return the NaN y */
|
|
|
|
|
|
double xx, yy;
|
|
|
|
|
|
big_real:
|
|
|
|
|
|
xx = scm_i_big2dbl (x);
|
|
|
|
|
|
yy = SCM_REAL_VALUE (y);
|
(scm_is_rational): New.
(scm_i_short2big, scm_i_int2big, scm_i_uint2big, scm_i_size2big,
scm_i_ptrdiff2big, scm_i_long_long2big, scm_i_ulong_long2big):
Removed prototypes.
(scm_make_real, scm_num2dbl, scm_float2num, scm_double2num):
Discouraged by moving to discouraged.h and discouraged.c.
Replaced all uses with scm_from_double.
(scm_num2float, scm_num2double): Discouraged by moving prototype
to discouraged.h and rewriting in terms of scm_to_double.
Replaced all uses with scm_to_double.
(scm_to_double): Do not implement in terms of scm_num2dbl, use
explicit code.
(scm_from_double): Do not implement in terms of scm_make_real, use
explicit code.
2004-08-03 15:03:35 +00:00
|
|
|
|
return (xx < yy ? scm_from_double (xx) : y);
|
2003-07-13 16:13:57 +00:00
|
|
|
|
}
|
* print.c (scm_iprin1): Handle fractions.
* objects.h (scm_class_fraction): New.
* objects.c (scm_class_fraction): New.
(scm_class_of): Handle fractions.
* hash.c (scm_hasher): Handle fractions.
* numbers.c: New code for handling fraction all over the place.
(scm_odd_p, scm_even_p): Handle inexact integers.
(scm_rational_p): New function, same as scm_real_p.
(scm_round_number, scm_truncate_number, scm_ceiling, scm_floor):
New exact functions that replace the inexact 'dsubr'
implementations.
(scm_numerator, scm_denominator): New.
* numbers.h (SCM_NUMP): Recognize fractions.
(SCM_FRACTIONP, SCM_SLOPPY_FRACTIONP, SCM_FRACTION_NUMERATOR,
SCM_FRACTION_DENOMINATOR, SCM_FRACTION_SET_NUMERATOR,
SCM_FRACTION_SET_DENOMINATOR, SCM_FRACTION_REDUCED_BIT,
SCM_FRACTION_REDUCED_SET, SCM_FRACTION_REDUCED_CLEAR,
SCM_FRACTION_REDUCED): New.
(scm_floor, scm_ceiling, scm_truncate_number, scm_round_number):
New prototypes.
(scm_make_ratio, scm_rationalize, scm_numerator, scm_denominator,
scm_rational_p): New prototypes.
(scm_i_dbl2num, scm_i_fraction2double, scm_i_fraction_equalp,
scm_i_print_fraction): New prototypes.
* goops.c (create_standard_classes): Create "<fraction>" class.
* gc-mark.c (scm_gc_mark_dependencies): Handle fractions.
* gc-card.c (scm_i_sweep_card): Include scm_tc16_fraction as a
case in the switch, but do nothing for now.
* eval.c (SCM_CEVAL, SCM_APPLY, call_dsubr_1): Convert fractions
to doubles when calling 'dsubr' functions.
* eq.c (scm_eqv_p, scm_equal_p): Handle fractions.
2003-11-18 19:59:53 +00:00
|
|
|
|
else if (SCM_FRACTIONP (y))
|
|
|
|
|
|
{
|
2004-04-15 00:44:19 +00:00
|
|
|
|
goto use_less;
|
* print.c (scm_iprin1): Handle fractions.
* objects.h (scm_class_fraction): New.
* objects.c (scm_class_fraction): New.
(scm_class_of): Handle fractions.
* hash.c (scm_hasher): Handle fractions.
* numbers.c: New code for handling fraction all over the place.
(scm_odd_p, scm_even_p): Handle inexact integers.
(scm_rational_p): New function, same as scm_real_p.
(scm_round_number, scm_truncate_number, scm_ceiling, scm_floor):
New exact functions that replace the inexact 'dsubr'
implementations.
(scm_numerator, scm_denominator): New.
* numbers.h (SCM_NUMP): Recognize fractions.
(SCM_FRACTIONP, SCM_SLOPPY_FRACTIONP, SCM_FRACTION_NUMERATOR,
SCM_FRACTION_DENOMINATOR, SCM_FRACTION_SET_NUMERATOR,
SCM_FRACTION_SET_DENOMINATOR, SCM_FRACTION_REDUCED_BIT,
SCM_FRACTION_REDUCED_SET, SCM_FRACTION_REDUCED_CLEAR,
SCM_FRACTION_REDUCED): New.
(scm_floor, scm_ceiling, scm_truncate_number, scm_round_number):
New prototypes.
(scm_make_ratio, scm_rationalize, scm_numerator, scm_denominator,
scm_rational_p): New prototypes.
(scm_i_dbl2num, scm_i_fraction2double, scm_i_fraction_equalp,
scm_i_print_fraction): New prototypes.
* goops.c (create_standard_classes): Create "<fraction>" class.
* gc-mark.c (scm_gc_mark_dependencies): Handle fractions.
* gc-card.c (scm_i_sweep_card): Include scm_tc16_fraction as a
case in the switch, but do nothing for now.
* eval.c (SCM_CEVAL, SCM_APPLY, call_dsubr_1): Convert fractions
to doubles when calling 'dsubr' functions.
* eq.c (scm_eqv_p, scm_equal_p): Handle fractions.
2003-11-18 19:59:53 +00:00
|
|
|
|
}
|
2003-07-13 16:13:57 +00:00
|
|
|
|
else
|
|
|
|
|
|
SCM_WTA_DISPATCH_2 (g_min, x, y, SCM_ARGn, s_min);
|
2000-05-03 12:35:56 +00:00
|
|
|
|
}
|
2003-07-13 16:13:57 +00:00
|
|
|
|
else if (SCM_REALP (x))
|
|
|
|
|
|
{
|
2004-07-23 15:43:02 +00:00
|
|
|
|
if (SCM_I_INUMP (y))
|
2003-07-13 16:13:57 +00:00
|
|
|
|
{
|
2004-07-23 15:43:02 +00:00
|
|
|
|
double z = SCM_I_INUM (y);
|
2003-07-13 16:13:57 +00:00
|
|
|
|
/* if x==NaN then "<" is false and we return NaN */
|
(scm_is_rational): New.
(scm_i_short2big, scm_i_int2big, scm_i_uint2big, scm_i_size2big,
scm_i_ptrdiff2big, scm_i_long_long2big, scm_i_ulong_long2big):
Removed prototypes.
(scm_make_real, scm_num2dbl, scm_float2num, scm_double2num):
Discouraged by moving to discouraged.h and discouraged.c.
Replaced all uses with scm_from_double.
(scm_num2float, scm_num2double): Discouraged by moving prototype
to discouraged.h and rewriting in terms of scm_to_double.
Replaced all uses with scm_to_double.
(scm_to_double): Do not implement in terms of scm_num2dbl, use
explicit code.
(scm_from_double): Do not implement in terms of scm_make_real, use
explicit code.
2004-08-03 15:03:35 +00:00
|
|
|
|
return (z < SCM_REAL_VALUE (x)) ? scm_from_double (z) : x;
|
2003-07-13 16:13:57 +00:00
|
|
|
|
}
|
|
|
|
|
|
else if (SCM_BIGP (y))
|
|
|
|
|
|
{
|
2004-04-17 21:58:23 +00:00
|
|
|
|
SCM_SWAP (x, y);
|
2004-03-24 21:53:31 +00:00
|
|
|
|
goto big_real;
|
2003-07-13 16:13:57 +00:00
|
|
|
|
}
|
|
|
|
|
|
else if (SCM_REALP (y))
|
|
|
|
|
|
{
|
|
|
|
|
|
/* if x==NaN then our explicit check means we return NaN
|
|
|
|
|
|
if y==NaN then "<" is false and we return NaN
|
|
|
|
|
|
calling isnan is unavoidable, since it's the only way to know
|
|
|
|
|
|
which of x or y causes any compares to be false */
|
|
|
|
|
|
double xx = SCM_REAL_VALUE (x);
|
|
|
|
|
|
return (xisnan (xx) || xx < SCM_REAL_VALUE (y)) ? x : y;
|
|
|
|
|
|
}
|
* print.c (scm_iprin1): Handle fractions.
* objects.h (scm_class_fraction): New.
* objects.c (scm_class_fraction): New.
(scm_class_of): Handle fractions.
* hash.c (scm_hasher): Handle fractions.
* numbers.c: New code for handling fraction all over the place.
(scm_odd_p, scm_even_p): Handle inexact integers.
(scm_rational_p): New function, same as scm_real_p.
(scm_round_number, scm_truncate_number, scm_ceiling, scm_floor):
New exact functions that replace the inexact 'dsubr'
implementations.
(scm_numerator, scm_denominator): New.
* numbers.h (SCM_NUMP): Recognize fractions.
(SCM_FRACTIONP, SCM_SLOPPY_FRACTIONP, SCM_FRACTION_NUMERATOR,
SCM_FRACTION_DENOMINATOR, SCM_FRACTION_SET_NUMERATOR,
SCM_FRACTION_SET_DENOMINATOR, SCM_FRACTION_REDUCED_BIT,
SCM_FRACTION_REDUCED_SET, SCM_FRACTION_REDUCED_CLEAR,
SCM_FRACTION_REDUCED): New.
(scm_floor, scm_ceiling, scm_truncate_number, scm_round_number):
New prototypes.
(scm_make_ratio, scm_rationalize, scm_numerator, scm_denominator,
scm_rational_p): New prototypes.
(scm_i_dbl2num, scm_i_fraction2double, scm_i_fraction_equalp,
scm_i_print_fraction): New prototypes.
* goops.c (create_standard_classes): Create "<fraction>" class.
* gc-mark.c (scm_gc_mark_dependencies): Handle fractions.
* gc-card.c (scm_i_sweep_card): Include scm_tc16_fraction as a
case in the switch, but do nothing for now.
* eval.c (SCM_CEVAL, SCM_APPLY, call_dsubr_1): Convert fractions
to doubles when calling 'dsubr' functions.
* eq.c (scm_eqv_p, scm_equal_p): Handle fractions.
2003-11-18 19:59:53 +00:00
|
|
|
|
else if (SCM_FRACTIONP (y))
|
|
|
|
|
|
{
|
|
|
|
|
|
double yy = scm_i_fraction2double (y);
|
|
|
|
|
|
double xx = SCM_REAL_VALUE (x);
|
(scm_is_rational): New.
(scm_i_short2big, scm_i_int2big, scm_i_uint2big, scm_i_size2big,
scm_i_ptrdiff2big, scm_i_long_long2big, scm_i_ulong_long2big):
Removed prototypes.
(scm_make_real, scm_num2dbl, scm_float2num, scm_double2num):
Discouraged by moving to discouraged.h and discouraged.c.
Replaced all uses with scm_from_double.
(scm_num2float, scm_num2double): Discouraged by moving prototype
to discouraged.h and rewriting in terms of scm_to_double.
Replaced all uses with scm_to_double.
(scm_to_double): Do not implement in terms of scm_num2dbl, use
explicit code.
(scm_from_double): Do not implement in terms of scm_make_real, use
explicit code.
2004-08-03 15:03:35 +00:00
|
|
|
|
return (yy < xx) ? scm_from_double (yy) : x;
|
* print.c (scm_iprin1): Handle fractions.
* objects.h (scm_class_fraction): New.
* objects.c (scm_class_fraction): New.
(scm_class_of): Handle fractions.
* hash.c (scm_hasher): Handle fractions.
* numbers.c: New code for handling fraction all over the place.
(scm_odd_p, scm_even_p): Handle inexact integers.
(scm_rational_p): New function, same as scm_real_p.
(scm_round_number, scm_truncate_number, scm_ceiling, scm_floor):
New exact functions that replace the inexact 'dsubr'
implementations.
(scm_numerator, scm_denominator): New.
* numbers.h (SCM_NUMP): Recognize fractions.
(SCM_FRACTIONP, SCM_SLOPPY_FRACTIONP, SCM_FRACTION_NUMERATOR,
SCM_FRACTION_DENOMINATOR, SCM_FRACTION_SET_NUMERATOR,
SCM_FRACTION_SET_DENOMINATOR, SCM_FRACTION_REDUCED_BIT,
SCM_FRACTION_REDUCED_SET, SCM_FRACTION_REDUCED_CLEAR,
SCM_FRACTION_REDUCED): New.
(scm_floor, scm_ceiling, scm_truncate_number, scm_round_number):
New prototypes.
(scm_make_ratio, scm_rationalize, scm_numerator, scm_denominator,
scm_rational_p): New prototypes.
(scm_i_dbl2num, scm_i_fraction2double, scm_i_fraction_equalp,
scm_i_print_fraction): New prototypes.
* goops.c (create_standard_classes): Create "<fraction>" class.
* gc-mark.c (scm_gc_mark_dependencies): Handle fractions.
* gc-card.c (scm_i_sweep_card): Include scm_tc16_fraction as a
case in the switch, but do nothing for now.
* eval.c (SCM_CEVAL, SCM_APPLY, call_dsubr_1): Convert fractions
to doubles when calling 'dsubr' functions.
* eq.c (scm_eqv_p, scm_equal_p): Handle fractions.
2003-11-18 19:59:53 +00:00
|
|
|
|
}
|
2003-07-13 16:13:57 +00:00
|
|
|
|
else
|
|
|
|
|
|
SCM_WTA_DISPATCH_2 (g_min, x, y, SCM_ARGn, s_min);
|
1999-01-10 07:38:39 +00:00
|
|
|
|
}
|
* print.c (scm_iprin1): Handle fractions.
* objects.h (scm_class_fraction): New.
* objects.c (scm_class_fraction): New.
(scm_class_of): Handle fractions.
* hash.c (scm_hasher): Handle fractions.
* numbers.c: New code for handling fraction all over the place.
(scm_odd_p, scm_even_p): Handle inexact integers.
(scm_rational_p): New function, same as scm_real_p.
(scm_round_number, scm_truncate_number, scm_ceiling, scm_floor):
New exact functions that replace the inexact 'dsubr'
implementations.
(scm_numerator, scm_denominator): New.
* numbers.h (SCM_NUMP): Recognize fractions.
(SCM_FRACTIONP, SCM_SLOPPY_FRACTIONP, SCM_FRACTION_NUMERATOR,
SCM_FRACTION_DENOMINATOR, SCM_FRACTION_SET_NUMERATOR,
SCM_FRACTION_SET_DENOMINATOR, SCM_FRACTION_REDUCED_BIT,
SCM_FRACTION_REDUCED_SET, SCM_FRACTION_REDUCED_CLEAR,
SCM_FRACTION_REDUCED): New.
(scm_floor, scm_ceiling, scm_truncate_number, scm_round_number):
New prototypes.
(scm_make_ratio, scm_rationalize, scm_numerator, scm_denominator,
scm_rational_p): New prototypes.
(scm_i_dbl2num, scm_i_fraction2double, scm_i_fraction_equalp,
scm_i_print_fraction): New prototypes.
* goops.c (create_standard_classes): Create "<fraction>" class.
* gc-mark.c (scm_gc_mark_dependencies): Handle fractions.
* gc-card.c (scm_i_sweep_card): Include scm_tc16_fraction as a
case in the switch, but do nothing for now.
* eval.c (SCM_CEVAL, SCM_APPLY, call_dsubr_1): Convert fractions
to doubles when calling 'dsubr' functions.
* eq.c (scm_eqv_p, scm_equal_p): Handle fractions.
2003-11-18 19:59:53 +00:00
|
|
|
|
else if (SCM_FRACTIONP (x))
|
|
|
|
|
|
{
|
2004-07-23 15:43:02 +00:00
|
|
|
|
if (SCM_I_INUMP (y))
|
* print.c (scm_iprin1): Handle fractions.
* objects.h (scm_class_fraction): New.
* objects.c (scm_class_fraction): New.
(scm_class_of): Handle fractions.
* hash.c (scm_hasher): Handle fractions.
* numbers.c: New code for handling fraction all over the place.
(scm_odd_p, scm_even_p): Handle inexact integers.
(scm_rational_p): New function, same as scm_real_p.
(scm_round_number, scm_truncate_number, scm_ceiling, scm_floor):
New exact functions that replace the inexact 'dsubr'
implementations.
(scm_numerator, scm_denominator): New.
* numbers.h (SCM_NUMP): Recognize fractions.
(SCM_FRACTIONP, SCM_SLOPPY_FRACTIONP, SCM_FRACTION_NUMERATOR,
SCM_FRACTION_DENOMINATOR, SCM_FRACTION_SET_NUMERATOR,
SCM_FRACTION_SET_DENOMINATOR, SCM_FRACTION_REDUCED_BIT,
SCM_FRACTION_REDUCED_SET, SCM_FRACTION_REDUCED_CLEAR,
SCM_FRACTION_REDUCED): New.
(scm_floor, scm_ceiling, scm_truncate_number, scm_round_number):
New prototypes.
(scm_make_ratio, scm_rationalize, scm_numerator, scm_denominator,
scm_rational_p): New prototypes.
(scm_i_dbl2num, scm_i_fraction2double, scm_i_fraction_equalp,
scm_i_print_fraction): New prototypes.
* goops.c (create_standard_classes): Create "<fraction>" class.
* gc-mark.c (scm_gc_mark_dependencies): Handle fractions.
* gc-card.c (scm_i_sweep_card): Include scm_tc16_fraction as a
case in the switch, but do nothing for now.
* eval.c (SCM_CEVAL, SCM_APPLY, call_dsubr_1): Convert fractions
to doubles when calling 'dsubr' functions.
* eq.c (scm_eqv_p, scm_equal_p): Handle fractions.
2003-11-18 19:59:53 +00:00
|
|
|
|
{
|
2004-04-15 00:44:19 +00:00
|
|
|
|
goto use_less;
|
* print.c (scm_iprin1): Handle fractions.
* objects.h (scm_class_fraction): New.
* objects.c (scm_class_fraction): New.
(scm_class_of): Handle fractions.
* hash.c (scm_hasher): Handle fractions.
* numbers.c: New code for handling fraction all over the place.
(scm_odd_p, scm_even_p): Handle inexact integers.
(scm_rational_p): New function, same as scm_real_p.
(scm_round_number, scm_truncate_number, scm_ceiling, scm_floor):
New exact functions that replace the inexact 'dsubr'
implementations.
(scm_numerator, scm_denominator): New.
* numbers.h (SCM_NUMP): Recognize fractions.
(SCM_FRACTIONP, SCM_SLOPPY_FRACTIONP, SCM_FRACTION_NUMERATOR,
SCM_FRACTION_DENOMINATOR, SCM_FRACTION_SET_NUMERATOR,
SCM_FRACTION_SET_DENOMINATOR, SCM_FRACTION_REDUCED_BIT,
SCM_FRACTION_REDUCED_SET, SCM_FRACTION_REDUCED_CLEAR,
SCM_FRACTION_REDUCED): New.
(scm_floor, scm_ceiling, scm_truncate_number, scm_round_number):
New prototypes.
(scm_make_ratio, scm_rationalize, scm_numerator, scm_denominator,
scm_rational_p): New prototypes.
(scm_i_dbl2num, scm_i_fraction2double, scm_i_fraction_equalp,
scm_i_print_fraction): New prototypes.
* goops.c (create_standard_classes): Create "<fraction>" class.
* gc-mark.c (scm_gc_mark_dependencies): Handle fractions.
* gc-card.c (scm_i_sweep_card): Include scm_tc16_fraction as a
case in the switch, but do nothing for now.
* eval.c (SCM_CEVAL, SCM_APPLY, call_dsubr_1): Convert fractions
to doubles when calling 'dsubr' functions.
* eq.c (scm_eqv_p, scm_equal_p): Handle fractions.
2003-11-18 19:59:53 +00:00
|
|
|
|
}
|
|
|
|
|
|
else if (SCM_BIGP (y))
|
|
|
|
|
|
{
|
2004-04-15 00:44:19 +00:00
|
|
|
|
goto use_less;
|
* print.c (scm_iprin1): Handle fractions.
* objects.h (scm_class_fraction): New.
* objects.c (scm_class_fraction): New.
(scm_class_of): Handle fractions.
* hash.c (scm_hasher): Handle fractions.
* numbers.c: New code for handling fraction all over the place.
(scm_odd_p, scm_even_p): Handle inexact integers.
(scm_rational_p): New function, same as scm_real_p.
(scm_round_number, scm_truncate_number, scm_ceiling, scm_floor):
New exact functions that replace the inexact 'dsubr'
implementations.
(scm_numerator, scm_denominator): New.
* numbers.h (SCM_NUMP): Recognize fractions.
(SCM_FRACTIONP, SCM_SLOPPY_FRACTIONP, SCM_FRACTION_NUMERATOR,
SCM_FRACTION_DENOMINATOR, SCM_FRACTION_SET_NUMERATOR,
SCM_FRACTION_SET_DENOMINATOR, SCM_FRACTION_REDUCED_BIT,
SCM_FRACTION_REDUCED_SET, SCM_FRACTION_REDUCED_CLEAR,
SCM_FRACTION_REDUCED): New.
(scm_floor, scm_ceiling, scm_truncate_number, scm_round_number):
New prototypes.
(scm_make_ratio, scm_rationalize, scm_numerator, scm_denominator,
scm_rational_p): New prototypes.
(scm_i_dbl2num, scm_i_fraction2double, scm_i_fraction_equalp,
scm_i_print_fraction): New prototypes.
* goops.c (create_standard_classes): Create "<fraction>" class.
* gc-mark.c (scm_gc_mark_dependencies): Handle fractions.
* gc-card.c (scm_i_sweep_card): Include scm_tc16_fraction as a
case in the switch, but do nothing for now.
* eval.c (SCM_CEVAL, SCM_APPLY, call_dsubr_1): Convert fractions
to doubles when calling 'dsubr' functions.
* eq.c (scm_eqv_p, scm_equal_p): Handle fractions.
2003-11-18 19:59:53 +00:00
|
|
|
|
}
|
|
|
|
|
|
else if (SCM_REALP (y))
|
|
|
|
|
|
{
|
|
|
|
|
|
double xx = scm_i_fraction2double (x);
|
(scm_is_rational): New.
(scm_i_short2big, scm_i_int2big, scm_i_uint2big, scm_i_size2big,
scm_i_ptrdiff2big, scm_i_long_long2big, scm_i_ulong_long2big):
Removed prototypes.
(scm_make_real, scm_num2dbl, scm_float2num, scm_double2num):
Discouraged by moving to discouraged.h and discouraged.c.
Replaced all uses with scm_from_double.
(scm_num2float, scm_num2double): Discouraged by moving prototype
to discouraged.h and rewriting in terms of scm_to_double.
Replaced all uses with scm_to_double.
(scm_to_double): Do not implement in terms of scm_num2dbl, use
explicit code.
(scm_from_double): Do not implement in terms of scm_make_real, use
explicit code.
2004-08-03 15:03:35 +00:00
|
|
|
|
return (SCM_REAL_VALUE (y) < xx) ? y : scm_from_double (xx);
|
* print.c (scm_iprin1): Handle fractions.
* objects.h (scm_class_fraction): New.
* objects.c (scm_class_fraction): New.
(scm_class_of): Handle fractions.
* hash.c (scm_hasher): Handle fractions.
* numbers.c: New code for handling fraction all over the place.
(scm_odd_p, scm_even_p): Handle inexact integers.
(scm_rational_p): New function, same as scm_real_p.
(scm_round_number, scm_truncate_number, scm_ceiling, scm_floor):
New exact functions that replace the inexact 'dsubr'
implementations.
(scm_numerator, scm_denominator): New.
* numbers.h (SCM_NUMP): Recognize fractions.
(SCM_FRACTIONP, SCM_SLOPPY_FRACTIONP, SCM_FRACTION_NUMERATOR,
SCM_FRACTION_DENOMINATOR, SCM_FRACTION_SET_NUMERATOR,
SCM_FRACTION_SET_DENOMINATOR, SCM_FRACTION_REDUCED_BIT,
SCM_FRACTION_REDUCED_SET, SCM_FRACTION_REDUCED_CLEAR,
SCM_FRACTION_REDUCED): New.
(scm_floor, scm_ceiling, scm_truncate_number, scm_round_number):
New prototypes.
(scm_make_ratio, scm_rationalize, scm_numerator, scm_denominator,
scm_rational_p): New prototypes.
(scm_i_dbl2num, scm_i_fraction2double, scm_i_fraction_equalp,
scm_i_print_fraction): New prototypes.
* goops.c (create_standard_classes): Create "<fraction>" class.
* gc-mark.c (scm_gc_mark_dependencies): Handle fractions.
* gc-card.c (scm_i_sweep_card): Include scm_tc16_fraction as a
case in the switch, but do nothing for now.
* eval.c (SCM_CEVAL, SCM_APPLY, call_dsubr_1): Convert fractions
to doubles when calling 'dsubr' functions.
* eq.c (scm_eqv_p, scm_equal_p): Handle fractions.
2003-11-18 19:59:53 +00:00
|
|
|
|
}
|
|
|
|
|
|
else if (SCM_FRACTIONP (y))
|
|
|
|
|
|
{
|
2004-04-15 00:44:19 +00:00
|
|
|
|
goto use_less;
|
* print.c (scm_iprin1): Handle fractions.
* objects.h (scm_class_fraction): New.
* objects.c (scm_class_fraction): New.
(scm_class_of): Handle fractions.
* hash.c (scm_hasher): Handle fractions.
* numbers.c: New code for handling fraction all over the place.
(scm_odd_p, scm_even_p): Handle inexact integers.
(scm_rational_p): New function, same as scm_real_p.
(scm_round_number, scm_truncate_number, scm_ceiling, scm_floor):
New exact functions that replace the inexact 'dsubr'
implementations.
(scm_numerator, scm_denominator): New.
* numbers.h (SCM_NUMP): Recognize fractions.
(SCM_FRACTIONP, SCM_SLOPPY_FRACTIONP, SCM_FRACTION_NUMERATOR,
SCM_FRACTION_DENOMINATOR, SCM_FRACTION_SET_NUMERATOR,
SCM_FRACTION_SET_DENOMINATOR, SCM_FRACTION_REDUCED_BIT,
SCM_FRACTION_REDUCED_SET, SCM_FRACTION_REDUCED_CLEAR,
SCM_FRACTION_REDUCED): New.
(scm_floor, scm_ceiling, scm_truncate_number, scm_round_number):
New prototypes.
(scm_make_ratio, scm_rationalize, scm_numerator, scm_denominator,
scm_rational_p): New prototypes.
(scm_i_dbl2num, scm_i_fraction2double, scm_i_fraction_equalp,
scm_i_print_fraction): New prototypes.
* goops.c (create_standard_classes): Create "<fraction>" class.
* gc-mark.c (scm_gc_mark_dependencies): Handle fractions.
* gc-card.c (scm_i_sweep_card): Include scm_tc16_fraction as a
case in the switch, but do nothing for now.
* eval.c (SCM_CEVAL, SCM_APPLY, call_dsubr_1): Convert fractions
to doubles when calling 'dsubr' functions.
* eq.c (scm_eqv_p, scm_equal_p): Handle fractions.
2003-11-18 19:59:53 +00:00
|
|
|
|
}
|
|
|
|
|
|
else
|
2009-09-06 16:47:19 +02:00
|
|
|
|
SCM_WTA_DISPATCH_2 (g_min, x, y, SCM_ARGn, s_min);
|
* print.c (scm_iprin1): Handle fractions.
* objects.h (scm_class_fraction): New.
* objects.c (scm_class_fraction): New.
(scm_class_of): Handle fractions.
* hash.c (scm_hasher): Handle fractions.
* numbers.c: New code for handling fraction all over the place.
(scm_odd_p, scm_even_p): Handle inexact integers.
(scm_rational_p): New function, same as scm_real_p.
(scm_round_number, scm_truncate_number, scm_ceiling, scm_floor):
New exact functions that replace the inexact 'dsubr'
implementations.
(scm_numerator, scm_denominator): New.
* numbers.h (SCM_NUMP): Recognize fractions.
(SCM_FRACTIONP, SCM_SLOPPY_FRACTIONP, SCM_FRACTION_NUMERATOR,
SCM_FRACTION_DENOMINATOR, SCM_FRACTION_SET_NUMERATOR,
SCM_FRACTION_SET_DENOMINATOR, SCM_FRACTION_REDUCED_BIT,
SCM_FRACTION_REDUCED_SET, SCM_FRACTION_REDUCED_CLEAR,
SCM_FRACTION_REDUCED): New.
(scm_floor, scm_ceiling, scm_truncate_number, scm_round_number):
New prototypes.
(scm_make_ratio, scm_rationalize, scm_numerator, scm_denominator,
scm_rational_p): New prototypes.
(scm_i_dbl2num, scm_i_fraction2double, scm_i_fraction_equalp,
scm_i_print_fraction): New prototypes.
* goops.c (create_standard_classes): Create "<fraction>" class.
* gc-mark.c (scm_gc_mark_dependencies): Handle fractions.
* gc-card.c (scm_i_sweep_card): Include scm_tc16_fraction as a
case in the switch, but do nothing for now.
* eval.c (SCM_CEVAL, SCM_APPLY, call_dsubr_1): Convert fractions
to doubles when calling 'dsubr' functions.
* eq.c (scm_eqv_p, scm_equal_p): Handle fractions.
2003-11-18 19:59:53 +00:00
|
|
|
|
}
|
2003-07-13 16:13:57 +00:00
|
|
|
|
else
|
2000-05-03 12:35:56 +00:00
|
|
|
|
SCM_WTA_DISPATCH_2 (g_min, x, y, SCM_ARG1, s_min);
|
1996-07-25 22:56:11 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
2009-09-06 14:15:28 +02:00
|
|
|
|
SCM_PRIMITIVE_GENERIC (scm_i_sum, "+", 0, 2, 1,
|
|
|
|
|
|
(SCM x, SCM y, SCM rest),
|
|
|
|
|
|
"Return the sum of all parameter values. Return 0 if called without\n"
|
|
|
|
|
|
"any parameters." )
|
|
|
|
|
|
#define FUNC_NAME s_scm_i_sum
|
|
|
|
|
|
{
|
|
|
|
|
|
while (!scm_is_null (rest))
|
|
|
|
|
|
{ x = scm_sum (x, y);
|
|
|
|
|
|
y = scm_car (rest);
|
|
|
|
|
|
rest = scm_cdr (rest);
|
|
|
|
|
|
}
|
|
|
|
|
|
return scm_sum (x, y);
|
|
|
|
|
|
}
|
|
|
|
|
|
#undef FUNC_NAME
|
|
|
|
|
|
|
|
|
|
|
|
#define s_sum s_scm_i_sum
|
|
|
|
|
|
#define g_sum g_scm_i_sum
|
|
|
|
|
|
|
1996-07-25 22:56:11 +00:00
|
|
|
|
SCM
|
1999-12-12 20:35:02 +00:00
|
|
|
|
scm_sum (SCM x, SCM y)
|
1996-07-25 22:56:11 +00:00
|
|
|
|
{
|
2007-12-08 16:00:56 +00:00
|
|
|
|
if (SCM_UNLIKELY (SCM_UNBNDP (y)))
|
2003-04-04 21:49:44 +00:00
|
|
|
|
{
|
|
|
|
|
|
if (SCM_NUMBERP (x)) return x;
|
|
|
|
|
|
if (SCM_UNBNDP (x)) return SCM_INUM0;
|
2000-05-09 12:58:53 +00:00
|
|
|
|
SCM_WTA_DISPATCH_1 (g_sum, x, SCM_ARG1, s_sum);
|
1999-01-10 07:38:39 +00:00
|
|
|
|
}
|
2000-03-09 18:58:58 +00:00
|
|
|
|
|
2007-12-08 16:00:56 +00:00
|
|
|
|
if (SCM_LIKELY (SCM_I_INUMP (x)))
|
2003-04-04 21:49:44 +00:00
|
|
|
|
{
|
2007-12-08 16:00:56 +00:00
|
|
|
|
if (SCM_LIKELY (SCM_I_INUMP (y)))
|
2003-04-04 21:49:44 +00:00
|
|
|
|
{
|
2004-07-23 15:43:02 +00:00
|
|
|
|
long xx = SCM_I_INUM (x);
|
|
|
|
|
|
long yy = SCM_I_INUM (y);
|
2003-04-04 21:49:44 +00:00
|
|
|
|
long int z = xx + yy;
|
2004-07-08 15:54:05 +00:00
|
|
|
|
return SCM_FIXABLE (z) ? SCM_I_MAKINUM (z) : scm_i_long2big (z);
|
2003-04-04 21:49:44 +00:00
|
|
|
|
}
|
|
|
|
|
|
else if (SCM_BIGP (y))
|
|
|
|
|
|
{
|
|
|
|
|
|
SCM_SWAP (x, y);
|
|
|
|
|
|
goto add_big_inum;
|
|
|
|
|
|
}
|
|
|
|
|
|
else if (SCM_REALP (y))
|
|
|
|
|
|
{
|
2004-07-23 15:43:02 +00:00
|
|
|
|
long int xx = SCM_I_INUM (x);
|
(scm_is_rational): New.
(scm_i_short2big, scm_i_int2big, scm_i_uint2big, scm_i_size2big,
scm_i_ptrdiff2big, scm_i_long_long2big, scm_i_ulong_long2big):
Removed prototypes.
(scm_make_real, scm_num2dbl, scm_float2num, scm_double2num):
Discouraged by moving to discouraged.h and discouraged.c.
Replaced all uses with scm_from_double.
(scm_num2float, scm_num2double): Discouraged by moving prototype
to discouraged.h and rewriting in terms of scm_to_double.
Replaced all uses with scm_to_double.
(scm_to_double): Do not implement in terms of scm_num2dbl, use
explicit code.
(scm_from_double): Do not implement in terms of scm_make_real, use
explicit code.
2004-08-03 15:03:35 +00:00
|
|
|
|
return scm_from_double (xx + SCM_REAL_VALUE (y));
|
2003-04-04 21:49:44 +00:00
|
|
|
|
}
|
|
|
|
|
|
else if (SCM_COMPLEXP (y))
|
|
|
|
|
|
{
|
2004-07-23 15:43:02 +00:00
|
|
|
|
long int xx = SCM_I_INUM (x);
|
2004-08-03 17:12:14 +00:00
|
|
|
|
return scm_c_make_rectangular (xx + SCM_COMPLEX_REAL (y),
|
2003-04-04 21:49:44 +00:00
|
|
|
|
SCM_COMPLEX_IMAG (y));
|
|
|
|
|
|
}
|
* print.c (scm_iprin1): Handle fractions.
* objects.h (scm_class_fraction): New.
* objects.c (scm_class_fraction): New.
(scm_class_of): Handle fractions.
* hash.c (scm_hasher): Handle fractions.
* numbers.c: New code for handling fraction all over the place.
(scm_odd_p, scm_even_p): Handle inexact integers.
(scm_rational_p): New function, same as scm_real_p.
(scm_round_number, scm_truncate_number, scm_ceiling, scm_floor):
New exact functions that replace the inexact 'dsubr'
implementations.
(scm_numerator, scm_denominator): New.
* numbers.h (SCM_NUMP): Recognize fractions.
(SCM_FRACTIONP, SCM_SLOPPY_FRACTIONP, SCM_FRACTION_NUMERATOR,
SCM_FRACTION_DENOMINATOR, SCM_FRACTION_SET_NUMERATOR,
SCM_FRACTION_SET_DENOMINATOR, SCM_FRACTION_REDUCED_BIT,
SCM_FRACTION_REDUCED_SET, SCM_FRACTION_REDUCED_CLEAR,
SCM_FRACTION_REDUCED): New.
(scm_floor, scm_ceiling, scm_truncate_number, scm_round_number):
New prototypes.
(scm_make_ratio, scm_rationalize, scm_numerator, scm_denominator,
scm_rational_p): New prototypes.
(scm_i_dbl2num, scm_i_fraction2double, scm_i_fraction_equalp,
scm_i_print_fraction): New prototypes.
* goops.c (create_standard_classes): Create "<fraction>" class.
* gc-mark.c (scm_gc_mark_dependencies): Handle fractions.
* gc-card.c (scm_i_sweep_card): Include scm_tc16_fraction as a
case in the switch, but do nothing for now.
* eval.c (SCM_CEVAL, SCM_APPLY, call_dsubr_1): Convert fractions
to doubles when calling 'dsubr' functions.
* eq.c (scm_eqv_p, scm_equal_p): Handle fractions.
2003-11-18 19:59:53 +00:00
|
|
|
|
else if (SCM_FRACTIONP (y))
|
2004-08-03 15:55:42 +00:00
|
|
|
|
return scm_i_make_ratio (scm_sum (SCM_FRACTION_NUMERATOR (y),
|
* print.c (scm_iprin1): Handle fractions.
* objects.h (scm_class_fraction): New.
* objects.c (scm_class_fraction): New.
(scm_class_of): Handle fractions.
* hash.c (scm_hasher): Handle fractions.
* numbers.c: New code for handling fraction all over the place.
(scm_odd_p, scm_even_p): Handle inexact integers.
(scm_rational_p): New function, same as scm_real_p.
(scm_round_number, scm_truncate_number, scm_ceiling, scm_floor):
New exact functions that replace the inexact 'dsubr'
implementations.
(scm_numerator, scm_denominator): New.
* numbers.h (SCM_NUMP): Recognize fractions.
(SCM_FRACTIONP, SCM_SLOPPY_FRACTIONP, SCM_FRACTION_NUMERATOR,
SCM_FRACTION_DENOMINATOR, SCM_FRACTION_SET_NUMERATOR,
SCM_FRACTION_SET_DENOMINATOR, SCM_FRACTION_REDUCED_BIT,
SCM_FRACTION_REDUCED_SET, SCM_FRACTION_REDUCED_CLEAR,
SCM_FRACTION_REDUCED): New.
(scm_floor, scm_ceiling, scm_truncate_number, scm_round_number):
New prototypes.
(scm_make_ratio, scm_rationalize, scm_numerator, scm_denominator,
scm_rational_p): New prototypes.
(scm_i_dbl2num, scm_i_fraction2double, scm_i_fraction_equalp,
scm_i_print_fraction): New prototypes.
* goops.c (create_standard_classes): Create "<fraction>" class.
* gc-mark.c (scm_gc_mark_dependencies): Handle fractions.
* gc-card.c (scm_i_sweep_card): Include scm_tc16_fraction as a
case in the switch, but do nothing for now.
* eval.c (SCM_CEVAL, SCM_APPLY, call_dsubr_1): Convert fractions
to doubles when calling 'dsubr' functions.
* eq.c (scm_eqv_p, scm_equal_p): Handle fractions.
2003-11-18 19:59:53 +00:00
|
|
|
|
scm_product (x, SCM_FRACTION_DENOMINATOR (y))),
|
|
|
|
|
|
SCM_FRACTION_DENOMINATOR (y));
|
2003-04-04 21:49:44 +00:00
|
|
|
|
else
|
|
|
|
|
|
SCM_WTA_DISPATCH_2 (g_sum, x, y, SCM_ARGn, s_sum);
|
2003-07-13 16:13:57 +00:00
|
|
|
|
} else if (SCM_BIGP (x))
|
|
|
|
|
|
{
|
2004-07-23 15:43:02 +00:00
|
|
|
|
if (SCM_I_INUMP (y))
|
2003-07-13 16:13:57 +00:00
|
|
|
|
{
|
|
|
|
|
|
long int inum;
|
|
|
|
|
|
int bigsgn;
|
|
|
|
|
|
add_big_inum:
|
2004-07-23 15:43:02 +00:00
|
|
|
|
inum = SCM_I_INUM (y);
|
2003-07-13 16:13:57 +00:00
|
|
|
|
if (inum == 0)
|
|
|
|
|
|
return x;
|
|
|
|
|
|
bigsgn = mpz_sgn (SCM_I_BIG_MPZ (x));
|
|
|
|
|
|
if (inum < 0)
|
|
|
|
|
|
{
|
|
|
|
|
|
SCM result = scm_i_mkbig ();
|
|
|
|
|
|
mpz_sub_ui (SCM_I_BIG_MPZ (result), SCM_I_BIG_MPZ (x), - inum);
|
|
|
|
|
|
scm_remember_upto_here_1 (x);
|
|
|
|
|
|
/* we know the result will have to be a bignum */
|
|
|
|
|
|
if (bigsgn == -1)
|
|
|
|
|
|
return result;
|
|
|
|
|
|
return scm_i_normbig (result);
|
|
|
|
|
|
}
|
|
|
|
|
|
else
|
|
|
|
|
|
{
|
|
|
|
|
|
SCM result = scm_i_mkbig ();
|
|
|
|
|
|
mpz_add_ui (SCM_I_BIG_MPZ (result), SCM_I_BIG_MPZ (x), inum);
|
|
|
|
|
|
scm_remember_upto_here_1 (x);
|
|
|
|
|
|
/* we know the result will have to be a bignum */
|
|
|
|
|
|
if (bigsgn == 1)
|
|
|
|
|
|
return result;
|
|
|
|
|
|
return scm_i_normbig (result);
|
|
|
|
|
|
}
|
|
|
|
|
|
}
|
|
|
|
|
|
else if (SCM_BIGP (y))
|
|
|
|
|
|
{
|
|
|
|
|
|
SCM result = scm_i_mkbig ();
|
|
|
|
|
|
int sgn_x = mpz_sgn (SCM_I_BIG_MPZ (x));
|
|
|
|
|
|
int sgn_y = mpz_sgn (SCM_I_BIG_MPZ (y));
|
|
|
|
|
|
mpz_add (SCM_I_BIG_MPZ (result),
|
|
|
|
|
|
SCM_I_BIG_MPZ (x),
|
|
|
|
|
|
SCM_I_BIG_MPZ (y));
|
|
|
|
|
|
scm_remember_upto_here_2 (x, y);
|
|
|
|
|
|
/* we know the result will have to be a bignum */
|
|
|
|
|
|
if (sgn_x == sgn_y)
|
|
|
|
|
|
return result;
|
|
|
|
|
|
return scm_i_normbig (result);
|
|
|
|
|
|
}
|
|
|
|
|
|
else if (SCM_REALP (y))
|
|
|
|
|
|
{
|
|
|
|
|
|
double result = mpz_get_d (SCM_I_BIG_MPZ (x)) + SCM_REAL_VALUE (y);
|
|
|
|
|
|
scm_remember_upto_here_1 (x);
|
(scm_is_rational): New.
(scm_i_short2big, scm_i_int2big, scm_i_uint2big, scm_i_size2big,
scm_i_ptrdiff2big, scm_i_long_long2big, scm_i_ulong_long2big):
Removed prototypes.
(scm_make_real, scm_num2dbl, scm_float2num, scm_double2num):
Discouraged by moving to discouraged.h and discouraged.c.
Replaced all uses with scm_from_double.
(scm_num2float, scm_num2double): Discouraged by moving prototype
to discouraged.h and rewriting in terms of scm_to_double.
Replaced all uses with scm_to_double.
(scm_to_double): Do not implement in terms of scm_num2dbl, use
explicit code.
(scm_from_double): Do not implement in terms of scm_make_real, use
explicit code.
2004-08-03 15:03:35 +00:00
|
|
|
|
return scm_from_double (result);
|
2003-07-13 16:13:57 +00:00
|
|
|
|
}
|
|
|
|
|
|
else if (SCM_COMPLEXP (y))
|
|
|
|
|
|
{
|
|
|
|
|
|
double real_part = (mpz_get_d (SCM_I_BIG_MPZ (x))
|
|
|
|
|
|
+ SCM_COMPLEX_REAL (y));
|
|
|
|
|
|
scm_remember_upto_here_1 (x);
|
2004-08-03 17:12:14 +00:00
|
|
|
|
return scm_c_make_rectangular (real_part, SCM_COMPLEX_IMAG (y));
|
2003-07-13 16:13:57 +00:00
|
|
|
|
}
|
* print.c (scm_iprin1): Handle fractions.
* objects.h (scm_class_fraction): New.
* objects.c (scm_class_fraction): New.
(scm_class_of): Handle fractions.
* hash.c (scm_hasher): Handle fractions.
* numbers.c: New code for handling fraction all over the place.
(scm_odd_p, scm_even_p): Handle inexact integers.
(scm_rational_p): New function, same as scm_real_p.
(scm_round_number, scm_truncate_number, scm_ceiling, scm_floor):
New exact functions that replace the inexact 'dsubr'
implementations.
(scm_numerator, scm_denominator): New.
* numbers.h (SCM_NUMP): Recognize fractions.
(SCM_FRACTIONP, SCM_SLOPPY_FRACTIONP, SCM_FRACTION_NUMERATOR,
SCM_FRACTION_DENOMINATOR, SCM_FRACTION_SET_NUMERATOR,
SCM_FRACTION_SET_DENOMINATOR, SCM_FRACTION_REDUCED_BIT,
SCM_FRACTION_REDUCED_SET, SCM_FRACTION_REDUCED_CLEAR,
SCM_FRACTION_REDUCED): New.
(scm_floor, scm_ceiling, scm_truncate_number, scm_round_number):
New prototypes.
(scm_make_ratio, scm_rationalize, scm_numerator, scm_denominator,
scm_rational_p): New prototypes.
(scm_i_dbl2num, scm_i_fraction2double, scm_i_fraction_equalp,
scm_i_print_fraction): New prototypes.
* goops.c (create_standard_classes): Create "<fraction>" class.
* gc-mark.c (scm_gc_mark_dependencies): Handle fractions.
* gc-card.c (scm_i_sweep_card): Include scm_tc16_fraction as a
case in the switch, but do nothing for now.
* eval.c (SCM_CEVAL, SCM_APPLY, call_dsubr_1): Convert fractions
to doubles when calling 'dsubr' functions.
* eq.c (scm_eqv_p, scm_equal_p): Handle fractions.
2003-11-18 19:59:53 +00:00
|
|
|
|
else if (SCM_FRACTIONP (y))
|
2004-08-03 15:55:42 +00:00
|
|
|
|
return scm_i_make_ratio (scm_sum (SCM_FRACTION_NUMERATOR (y),
|
* print.c (scm_iprin1): Handle fractions.
* objects.h (scm_class_fraction): New.
* objects.c (scm_class_fraction): New.
(scm_class_of): Handle fractions.
* hash.c (scm_hasher): Handle fractions.
* numbers.c: New code for handling fraction all over the place.
(scm_odd_p, scm_even_p): Handle inexact integers.
(scm_rational_p): New function, same as scm_real_p.
(scm_round_number, scm_truncate_number, scm_ceiling, scm_floor):
New exact functions that replace the inexact 'dsubr'
implementations.
(scm_numerator, scm_denominator): New.
* numbers.h (SCM_NUMP): Recognize fractions.
(SCM_FRACTIONP, SCM_SLOPPY_FRACTIONP, SCM_FRACTION_NUMERATOR,
SCM_FRACTION_DENOMINATOR, SCM_FRACTION_SET_NUMERATOR,
SCM_FRACTION_SET_DENOMINATOR, SCM_FRACTION_REDUCED_BIT,
SCM_FRACTION_REDUCED_SET, SCM_FRACTION_REDUCED_CLEAR,
SCM_FRACTION_REDUCED): New.
(scm_floor, scm_ceiling, scm_truncate_number, scm_round_number):
New prototypes.
(scm_make_ratio, scm_rationalize, scm_numerator, scm_denominator,
scm_rational_p): New prototypes.
(scm_i_dbl2num, scm_i_fraction2double, scm_i_fraction_equalp,
scm_i_print_fraction): New prototypes.
* goops.c (create_standard_classes): Create "<fraction>" class.
* gc-mark.c (scm_gc_mark_dependencies): Handle fractions.
* gc-card.c (scm_i_sweep_card): Include scm_tc16_fraction as a
case in the switch, but do nothing for now.
* eval.c (SCM_CEVAL, SCM_APPLY, call_dsubr_1): Convert fractions
to doubles when calling 'dsubr' functions.
* eq.c (scm_eqv_p, scm_equal_p): Handle fractions.
2003-11-18 19:59:53 +00:00
|
|
|
|
scm_product (x, SCM_FRACTION_DENOMINATOR (y))),
|
|
|
|
|
|
SCM_FRACTION_DENOMINATOR (y));
|
2003-07-13 16:13:57 +00:00
|
|
|
|
else
|
|
|
|
|
|
SCM_WTA_DISPATCH_2 (g_sum, x, y, SCM_ARGn, s_sum);
|
1996-07-25 22:56:11 +00:00
|
|
|
|
}
|
2003-07-13 16:13:57 +00:00
|
|
|
|
else if (SCM_REALP (x))
|
|
|
|
|
|
{
|
2004-07-23 15:43:02 +00:00
|
|
|
|
if (SCM_I_INUMP (y))
|
(scm_is_rational): New.
(scm_i_short2big, scm_i_int2big, scm_i_uint2big, scm_i_size2big,
scm_i_ptrdiff2big, scm_i_long_long2big, scm_i_ulong_long2big):
Removed prototypes.
(scm_make_real, scm_num2dbl, scm_float2num, scm_double2num):
Discouraged by moving to discouraged.h and discouraged.c.
Replaced all uses with scm_from_double.
(scm_num2float, scm_num2double): Discouraged by moving prototype
to discouraged.h and rewriting in terms of scm_to_double.
Replaced all uses with scm_to_double.
(scm_to_double): Do not implement in terms of scm_num2dbl, use
explicit code.
(scm_from_double): Do not implement in terms of scm_make_real, use
explicit code.
2004-08-03 15:03:35 +00:00
|
|
|
|
return scm_from_double (SCM_REAL_VALUE (x) + SCM_I_INUM (y));
|
2003-07-13 16:13:57 +00:00
|
|
|
|
else if (SCM_BIGP (y))
|
|
|
|
|
|
{
|
|
|
|
|
|
double result = mpz_get_d (SCM_I_BIG_MPZ (y)) + SCM_REAL_VALUE (x);
|
|
|
|
|
|
scm_remember_upto_here_1 (y);
|
(scm_is_rational): New.
(scm_i_short2big, scm_i_int2big, scm_i_uint2big, scm_i_size2big,
scm_i_ptrdiff2big, scm_i_long_long2big, scm_i_ulong_long2big):
Removed prototypes.
(scm_make_real, scm_num2dbl, scm_float2num, scm_double2num):
Discouraged by moving to discouraged.h and discouraged.c.
Replaced all uses with scm_from_double.
(scm_num2float, scm_num2double): Discouraged by moving prototype
to discouraged.h and rewriting in terms of scm_to_double.
Replaced all uses with scm_to_double.
(scm_to_double): Do not implement in terms of scm_num2dbl, use
explicit code.
(scm_from_double): Do not implement in terms of scm_make_real, use
explicit code.
2004-08-03 15:03:35 +00:00
|
|
|
|
return scm_from_double (result);
|
2003-07-13 16:13:57 +00:00
|
|
|
|
}
|
|
|
|
|
|
else if (SCM_REALP (y))
|
(scm_is_rational): New.
(scm_i_short2big, scm_i_int2big, scm_i_uint2big, scm_i_size2big,
scm_i_ptrdiff2big, scm_i_long_long2big, scm_i_ulong_long2big):
Removed prototypes.
(scm_make_real, scm_num2dbl, scm_float2num, scm_double2num):
Discouraged by moving to discouraged.h and discouraged.c.
Replaced all uses with scm_from_double.
(scm_num2float, scm_num2double): Discouraged by moving prototype
to discouraged.h and rewriting in terms of scm_to_double.
Replaced all uses with scm_to_double.
(scm_to_double): Do not implement in terms of scm_num2dbl, use
explicit code.
(scm_from_double): Do not implement in terms of scm_make_real, use
explicit code.
2004-08-03 15:03:35 +00:00
|
|
|
|
return scm_from_double (SCM_REAL_VALUE (x) + SCM_REAL_VALUE (y));
|
2003-07-13 16:13:57 +00:00
|
|
|
|
else if (SCM_COMPLEXP (y))
|
2004-08-03 17:12:14 +00:00
|
|
|
|
return scm_c_make_rectangular (SCM_REAL_VALUE (x) + SCM_COMPLEX_REAL (y),
|
2003-07-13 16:13:57 +00:00
|
|
|
|
SCM_COMPLEX_IMAG (y));
|
* print.c (scm_iprin1): Handle fractions.
* objects.h (scm_class_fraction): New.
* objects.c (scm_class_fraction): New.
(scm_class_of): Handle fractions.
* hash.c (scm_hasher): Handle fractions.
* numbers.c: New code for handling fraction all over the place.
(scm_odd_p, scm_even_p): Handle inexact integers.
(scm_rational_p): New function, same as scm_real_p.
(scm_round_number, scm_truncate_number, scm_ceiling, scm_floor):
New exact functions that replace the inexact 'dsubr'
implementations.
(scm_numerator, scm_denominator): New.
* numbers.h (SCM_NUMP): Recognize fractions.
(SCM_FRACTIONP, SCM_SLOPPY_FRACTIONP, SCM_FRACTION_NUMERATOR,
SCM_FRACTION_DENOMINATOR, SCM_FRACTION_SET_NUMERATOR,
SCM_FRACTION_SET_DENOMINATOR, SCM_FRACTION_REDUCED_BIT,
SCM_FRACTION_REDUCED_SET, SCM_FRACTION_REDUCED_CLEAR,
SCM_FRACTION_REDUCED): New.
(scm_floor, scm_ceiling, scm_truncate_number, scm_round_number):
New prototypes.
(scm_make_ratio, scm_rationalize, scm_numerator, scm_denominator,
scm_rational_p): New prototypes.
(scm_i_dbl2num, scm_i_fraction2double, scm_i_fraction_equalp,
scm_i_print_fraction): New prototypes.
* goops.c (create_standard_classes): Create "<fraction>" class.
* gc-mark.c (scm_gc_mark_dependencies): Handle fractions.
* gc-card.c (scm_i_sweep_card): Include scm_tc16_fraction as a
case in the switch, but do nothing for now.
* eval.c (SCM_CEVAL, SCM_APPLY, call_dsubr_1): Convert fractions
to doubles when calling 'dsubr' functions.
* eq.c (scm_eqv_p, scm_equal_p): Handle fractions.
2003-11-18 19:59:53 +00:00
|
|
|
|
else if (SCM_FRACTIONP (y))
|
(scm_is_rational): New.
(scm_i_short2big, scm_i_int2big, scm_i_uint2big, scm_i_size2big,
scm_i_ptrdiff2big, scm_i_long_long2big, scm_i_ulong_long2big):
Removed prototypes.
(scm_make_real, scm_num2dbl, scm_float2num, scm_double2num):
Discouraged by moving to discouraged.h and discouraged.c.
Replaced all uses with scm_from_double.
(scm_num2float, scm_num2double): Discouraged by moving prototype
to discouraged.h and rewriting in terms of scm_to_double.
Replaced all uses with scm_to_double.
(scm_to_double): Do not implement in terms of scm_num2dbl, use
explicit code.
(scm_from_double): Do not implement in terms of scm_make_real, use
explicit code.
2004-08-03 15:03:35 +00:00
|
|
|
|
return scm_from_double (SCM_REAL_VALUE (x) + scm_i_fraction2double (y));
|
2003-07-13 16:13:57 +00:00
|
|
|
|
else
|
|
|
|
|
|
SCM_WTA_DISPATCH_2 (g_sum, x, y, SCM_ARGn, s_sum);
|
1999-01-10 07:38:39 +00:00
|
|
|
|
}
|
2003-07-13 16:13:57 +00:00
|
|
|
|
else if (SCM_COMPLEXP (x))
|
|
|
|
|
|
{
|
2004-07-23 15:43:02 +00:00
|
|
|
|
if (SCM_I_INUMP (y))
|
2004-08-03 17:12:14 +00:00
|
|
|
|
return scm_c_make_rectangular (SCM_COMPLEX_REAL (x) + SCM_I_INUM (y),
|
2003-07-13 16:13:57 +00:00
|
|
|
|
SCM_COMPLEX_IMAG (x));
|
|
|
|
|
|
else if (SCM_BIGP (y))
|
|
|
|
|
|
{
|
|
|
|
|
|
double real_part = (mpz_get_d (SCM_I_BIG_MPZ (y))
|
|
|
|
|
|
+ SCM_COMPLEX_REAL (x));
|
|
|
|
|
|
scm_remember_upto_here_1 (y);
|
2004-08-03 17:12:14 +00:00
|
|
|
|
return scm_c_make_rectangular (real_part, SCM_COMPLEX_IMAG (x));
|
2003-07-13 16:13:57 +00:00
|
|
|
|
}
|
|
|
|
|
|
else if (SCM_REALP (y))
|
2004-08-03 17:12:14 +00:00
|
|
|
|
return scm_c_make_rectangular (SCM_COMPLEX_REAL (x) + SCM_REAL_VALUE (y),
|
2003-07-13 16:13:57 +00:00
|
|
|
|
SCM_COMPLEX_IMAG (x));
|
|
|
|
|
|
else if (SCM_COMPLEXP (y))
|
2004-08-03 17:12:14 +00:00
|
|
|
|
return scm_c_make_rectangular (SCM_COMPLEX_REAL (x) + SCM_COMPLEX_REAL (y),
|
2003-07-13 16:13:57 +00:00
|
|
|
|
SCM_COMPLEX_IMAG (x) + SCM_COMPLEX_IMAG (y));
|
* print.c (scm_iprin1): Handle fractions.
* objects.h (scm_class_fraction): New.
* objects.c (scm_class_fraction): New.
(scm_class_of): Handle fractions.
* hash.c (scm_hasher): Handle fractions.
* numbers.c: New code for handling fraction all over the place.
(scm_odd_p, scm_even_p): Handle inexact integers.
(scm_rational_p): New function, same as scm_real_p.
(scm_round_number, scm_truncate_number, scm_ceiling, scm_floor):
New exact functions that replace the inexact 'dsubr'
implementations.
(scm_numerator, scm_denominator): New.
* numbers.h (SCM_NUMP): Recognize fractions.
(SCM_FRACTIONP, SCM_SLOPPY_FRACTIONP, SCM_FRACTION_NUMERATOR,
SCM_FRACTION_DENOMINATOR, SCM_FRACTION_SET_NUMERATOR,
SCM_FRACTION_SET_DENOMINATOR, SCM_FRACTION_REDUCED_BIT,
SCM_FRACTION_REDUCED_SET, SCM_FRACTION_REDUCED_CLEAR,
SCM_FRACTION_REDUCED): New.
(scm_floor, scm_ceiling, scm_truncate_number, scm_round_number):
New prototypes.
(scm_make_ratio, scm_rationalize, scm_numerator, scm_denominator,
scm_rational_p): New prototypes.
(scm_i_dbl2num, scm_i_fraction2double, scm_i_fraction_equalp,
scm_i_print_fraction): New prototypes.
* goops.c (create_standard_classes): Create "<fraction>" class.
* gc-mark.c (scm_gc_mark_dependencies): Handle fractions.
* gc-card.c (scm_i_sweep_card): Include scm_tc16_fraction as a
case in the switch, but do nothing for now.
* eval.c (SCM_CEVAL, SCM_APPLY, call_dsubr_1): Convert fractions
to doubles when calling 'dsubr' functions.
* eq.c (scm_eqv_p, scm_equal_p): Handle fractions.
2003-11-18 19:59:53 +00:00
|
|
|
|
else if (SCM_FRACTIONP (y))
|
2004-08-03 17:12:14 +00:00
|
|
|
|
return scm_c_make_rectangular (SCM_COMPLEX_REAL (x) + scm_i_fraction2double (y),
|
* print.c (scm_iprin1): Handle fractions.
* objects.h (scm_class_fraction): New.
* objects.c (scm_class_fraction): New.
(scm_class_of): Handle fractions.
* hash.c (scm_hasher): Handle fractions.
* numbers.c: New code for handling fraction all over the place.
(scm_odd_p, scm_even_p): Handle inexact integers.
(scm_rational_p): New function, same as scm_real_p.
(scm_round_number, scm_truncate_number, scm_ceiling, scm_floor):
New exact functions that replace the inexact 'dsubr'
implementations.
(scm_numerator, scm_denominator): New.
* numbers.h (SCM_NUMP): Recognize fractions.
(SCM_FRACTIONP, SCM_SLOPPY_FRACTIONP, SCM_FRACTION_NUMERATOR,
SCM_FRACTION_DENOMINATOR, SCM_FRACTION_SET_NUMERATOR,
SCM_FRACTION_SET_DENOMINATOR, SCM_FRACTION_REDUCED_BIT,
SCM_FRACTION_REDUCED_SET, SCM_FRACTION_REDUCED_CLEAR,
SCM_FRACTION_REDUCED): New.
(scm_floor, scm_ceiling, scm_truncate_number, scm_round_number):
New prototypes.
(scm_make_ratio, scm_rationalize, scm_numerator, scm_denominator,
scm_rational_p): New prototypes.
(scm_i_dbl2num, scm_i_fraction2double, scm_i_fraction_equalp,
scm_i_print_fraction): New prototypes.
* goops.c (create_standard_classes): Create "<fraction>" class.
* gc-mark.c (scm_gc_mark_dependencies): Handle fractions.
* gc-card.c (scm_i_sweep_card): Include scm_tc16_fraction as a
case in the switch, but do nothing for now.
* eval.c (SCM_CEVAL, SCM_APPLY, call_dsubr_1): Convert fractions
to doubles when calling 'dsubr' functions.
* eq.c (scm_eqv_p, scm_equal_p): Handle fractions.
2003-11-18 19:59:53 +00:00
|
|
|
|
SCM_COMPLEX_IMAG (x));
|
|
|
|
|
|
else
|
|
|
|
|
|
SCM_WTA_DISPATCH_2 (g_sum, x, y, SCM_ARGn, s_sum);
|
|
|
|
|
|
}
|
|
|
|
|
|
else if (SCM_FRACTIONP (x))
|
|
|
|
|
|
{
|
2004-07-23 15:43:02 +00:00
|
|
|
|
if (SCM_I_INUMP (y))
|
2004-08-03 15:55:42 +00:00
|
|
|
|
return scm_i_make_ratio (scm_sum (SCM_FRACTION_NUMERATOR (x),
|
* print.c (scm_iprin1): Handle fractions.
* objects.h (scm_class_fraction): New.
* objects.c (scm_class_fraction): New.
(scm_class_of): Handle fractions.
* hash.c (scm_hasher): Handle fractions.
* numbers.c: New code for handling fraction all over the place.
(scm_odd_p, scm_even_p): Handle inexact integers.
(scm_rational_p): New function, same as scm_real_p.
(scm_round_number, scm_truncate_number, scm_ceiling, scm_floor):
New exact functions that replace the inexact 'dsubr'
implementations.
(scm_numerator, scm_denominator): New.
* numbers.h (SCM_NUMP): Recognize fractions.
(SCM_FRACTIONP, SCM_SLOPPY_FRACTIONP, SCM_FRACTION_NUMERATOR,
SCM_FRACTION_DENOMINATOR, SCM_FRACTION_SET_NUMERATOR,
SCM_FRACTION_SET_DENOMINATOR, SCM_FRACTION_REDUCED_BIT,
SCM_FRACTION_REDUCED_SET, SCM_FRACTION_REDUCED_CLEAR,
SCM_FRACTION_REDUCED): New.
(scm_floor, scm_ceiling, scm_truncate_number, scm_round_number):
New prototypes.
(scm_make_ratio, scm_rationalize, scm_numerator, scm_denominator,
scm_rational_p): New prototypes.
(scm_i_dbl2num, scm_i_fraction2double, scm_i_fraction_equalp,
scm_i_print_fraction): New prototypes.
* goops.c (create_standard_classes): Create "<fraction>" class.
* gc-mark.c (scm_gc_mark_dependencies): Handle fractions.
* gc-card.c (scm_i_sweep_card): Include scm_tc16_fraction as a
case in the switch, but do nothing for now.
* eval.c (SCM_CEVAL, SCM_APPLY, call_dsubr_1): Convert fractions
to doubles when calling 'dsubr' functions.
* eq.c (scm_eqv_p, scm_equal_p): Handle fractions.
2003-11-18 19:59:53 +00:00
|
|
|
|
scm_product (y, SCM_FRACTION_DENOMINATOR (x))),
|
|
|
|
|
|
SCM_FRACTION_DENOMINATOR (x));
|
|
|
|
|
|
else if (SCM_BIGP (y))
|
2004-08-03 15:55:42 +00:00
|
|
|
|
return scm_i_make_ratio (scm_sum (SCM_FRACTION_NUMERATOR (x),
|
* print.c (scm_iprin1): Handle fractions.
* objects.h (scm_class_fraction): New.
* objects.c (scm_class_fraction): New.
(scm_class_of): Handle fractions.
* hash.c (scm_hasher): Handle fractions.
* numbers.c: New code for handling fraction all over the place.
(scm_odd_p, scm_even_p): Handle inexact integers.
(scm_rational_p): New function, same as scm_real_p.
(scm_round_number, scm_truncate_number, scm_ceiling, scm_floor):
New exact functions that replace the inexact 'dsubr'
implementations.
(scm_numerator, scm_denominator): New.
* numbers.h (SCM_NUMP): Recognize fractions.
(SCM_FRACTIONP, SCM_SLOPPY_FRACTIONP, SCM_FRACTION_NUMERATOR,
SCM_FRACTION_DENOMINATOR, SCM_FRACTION_SET_NUMERATOR,
SCM_FRACTION_SET_DENOMINATOR, SCM_FRACTION_REDUCED_BIT,
SCM_FRACTION_REDUCED_SET, SCM_FRACTION_REDUCED_CLEAR,
SCM_FRACTION_REDUCED): New.
(scm_floor, scm_ceiling, scm_truncate_number, scm_round_number):
New prototypes.
(scm_make_ratio, scm_rationalize, scm_numerator, scm_denominator,
scm_rational_p): New prototypes.
(scm_i_dbl2num, scm_i_fraction2double, scm_i_fraction_equalp,
scm_i_print_fraction): New prototypes.
* goops.c (create_standard_classes): Create "<fraction>" class.
* gc-mark.c (scm_gc_mark_dependencies): Handle fractions.
* gc-card.c (scm_i_sweep_card): Include scm_tc16_fraction as a
case in the switch, but do nothing for now.
* eval.c (SCM_CEVAL, SCM_APPLY, call_dsubr_1): Convert fractions
to doubles when calling 'dsubr' functions.
* eq.c (scm_eqv_p, scm_equal_p): Handle fractions.
2003-11-18 19:59:53 +00:00
|
|
|
|
scm_product (y, SCM_FRACTION_DENOMINATOR (x))),
|
|
|
|
|
|
SCM_FRACTION_DENOMINATOR (x));
|
|
|
|
|
|
else if (SCM_REALP (y))
|
(scm_is_rational): New.
(scm_i_short2big, scm_i_int2big, scm_i_uint2big, scm_i_size2big,
scm_i_ptrdiff2big, scm_i_long_long2big, scm_i_ulong_long2big):
Removed prototypes.
(scm_make_real, scm_num2dbl, scm_float2num, scm_double2num):
Discouraged by moving to discouraged.h and discouraged.c.
Replaced all uses with scm_from_double.
(scm_num2float, scm_num2double): Discouraged by moving prototype
to discouraged.h and rewriting in terms of scm_to_double.
Replaced all uses with scm_to_double.
(scm_to_double): Do not implement in terms of scm_num2dbl, use
explicit code.
(scm_from_double): Do not implement in terms of scm_make_real, use
explicit code.
2004-08-03 15:03:35 +00:00
|
|
|
|
return scm_from_double (SCM_REAL_VALUE (y) + scm_i_fraction2double (x));
|
* print.c (scm_iprin1): Handle fractions.
* objects.h (scm_class_fraction): New.
* objects.c (scm_class_fraction): New.
(scm_class_of): Handle fractions.
* hash.c (scm_hasher): Handle fractions.
* numbers.c: New code for handling fraction all over the place.
(scm_odd_p, scm_even_p): Handle inexact integers.
(scm_rational_p): New function, same as scm_real_p.
(scm_round_number, scm_truncate_number, scm_ceiling, scm_floor):
New exact functions that replace the inexact 'dsubr'
implementations.
(scm_numerator, scm_denominator): New.
* numbers.h (SCM_NUMP): Recognize fractions.
(SCM_FRACTIONP, SCM_SLOPPY_FRACTIONP, SCM_FRACTION_NUMERATOR,
SCM_FRACTION_DENOMINATOR, SCM_FRACTION_SET_NUMERATOR,
SCM_FRACTION_SET_DENOMINATOR, SCM_FRACTION_REDUCED_BIT,
SCM_FRACTION_REDUCED_SET, SCM_FRACTION_REDUCED_CLEAR,
SCM_FRACTION_REDUCED): New.
(scm_floor, scm_ceiling, scm_truncate_number, scm_round_number):
New prototypes.
(scm_make_ratio, scm_rationalize, scm_numerator, scm_denominator,
scm_rational_p): New prototypes.
(scm_i_dbl2num, scm_i_fraction2double, scm_i_fraction_equalp,
scm_i_print_fraction): New prototypes.
* goops.c (create_standard_classes): Create "<fraction>" class.
* gc-mark.c (scm_gc_mark_dependencies): Handle fractions.
* gc-card.c (scm_i_sweep_card): Include scm_tc16_fraction as a
case in the switch, but do nothing for now.
* eval.c (SCM_CEVAL, SCM_APPLY, call_dsubr_1): Convert fractions
to doubles when calling 'dsubr' functions.
* eq.c (scm_eqv_p, scm_equal_p): Handle fractions.
2003-11-18 19:59:53 +00:00
|
|
|
|
else if (SCM_COMPLEXP (y))
|
2004-08-03 17:12:14 +00:00
|
|
|
|
return scm_c_make_rectangular (SCM_COMPLEX_REAL (y) + scm_i_fraction2double (x),
|
* print.c (scm_iprin1): Handle fractions.
* objects.h (scm_class_fraction): New.
* objects.c (scm_class_fraction): New.
(scm_class_of): Handle fractions.
* hash.c (scm_hasher): Handle fractions.
* numbers.c: New code for handling fraction all over the place.
(scm_odd_p, scm_even_p): Handle inexact integers.
(scm_rational_p): New function, same as scm_real_p.
(scm_round_number, scm_truncate_number, scm_ceiling, scm_floor):
New exact functions that replace the inexact 'dsubr'
implementations.
(scm_numerator, scm_denominator): New.
* numbers.h (SCM_NUMP): Recognize fractions.
(SCM_FRACTIONP, SCM_SLOPPY_FRACTIONP, SCM_FRACTION_NUMERATOR,
SCM_FRACTION_DENOMINATOR, SCM_FRACTION_SET_NUMERATOR,
SCM_FRACTION_SET_DENOMINATOR, SCM_FRACTION_REDUCED_BIT,
SCM_FRACTION_REDUCED_SET, SCM_FRACTION_REDUCED_CLEAR,
SCM_FRACTION_REDUCED): New.
(scm_floor, scm_ceiling, scm_truncate_number, scm_round_number):
New prototypes.
(scm_make_ratio, scm_rationalize, scm_numerator, scm_denominator,
scm_rational_p): New prototypes.
(scm_i_dbl2num, scm_i_fraction2double, scm_i_fraction_equalp,
scm_i_print_fraction): New prototypes.
* goops.c (create_standard_classes): Create "<fraction>" class.
* gc-mark.c (scm_gc_mark_dependencies): Handle fractions.
* gc-card.c (scm_i_sweep_card): Include scm_tc16_fraction as a
case in the switch, but do nothing for now.
* eval.c (SCM_CEVAL, SCM_APPLY, call_dsubr_1): Convert fractions
to doubles when calling 'dsubr' functions.
* eq.c (scm_eqv_p, scm_equal_p): Handle fractions.
2003-11-18 19:59:53 +00:00
|
|
|
|
SCM_COMPLEX_IMAG (y));
|
|
|
|
|
|
else if (SCM_FRACTIONP (y))
|
|
|
|
|
|
/* a/b + c/d = (ad + bc) / bd */
|
2004-08-03 15:55:42 +00:00
|
|
|
|
return scm_i_make_ratio (scm_sum (scm_product (SCM_FRACTION_NUMERATOR (x), SCM_FRACTION_DENOMINATOR (y)),
|
* print.c (scm_iprin1): Handle fractions.
* objects.h (scm_class_fraction): New.
* objects.c (scm_class_fraction): New.
(scm_class_of): Handle fractions.
* hash.c (scm_hasher): Handle fractions.
* numbers.c: New code for handling fraction all over the place.
(scm_odd_p, scm_even_p): Handle inexact integers.
(scm_rational_p): New function, same as scm_real_p.
(scm_round_number, scm_truncate_number, scm_ceiling, scm_floor):
New exact functions that replace the inexact 'dsubr'
implementations.
(scm_numerator, scm_denominator): New.
* numbers.h (SCM_NUMP): Recognize fractions.
(SCM_FRACTIONP, SCM_SLOPPY_FRACTIONP, SCM_FRACTION_NUMERATOR,
SCM_FRACTION_DENOMINATOR, SCM_FRACTION_SET_NUMERATOR,
SCM_FRACTION_SET_DENOMINATOR, SCM_FRACTION_REDUCED_BIT,
SCM_FRACTION_REDUCED_SET, SCM_FRACTION_REDUCED_CLEAR,
SCM_FRACTION_REDUCED): New.
(scm_floor, scm_ceiling, scm_truncate_number, scm_round_number):
New prototypes.
(scm_make_ratio, scm_rationalize, scm_numerator, scm_denominator,
scm_rational_p): New prototypes.
(scm_i_dbl2num, scm_i_fraction2double, scm_i_fraction_equalp,
scm_i_print_fraction): New prototypes.
* goops.c (create_standard_classes): Create "<fraction>" class.
* gc-mark.c (scm_gc_mark_dependencies): Handle fractions.
* gc-card.c (scm_i_sweep_card): Include scm_tc16_fraction as a
case in the switch, but do nothing for now.
* eval.c (SCM_CEVAL, SCM_APPLY, call_dsubr_1): Convert fractions
to doubles when calling 'dsubr' functions.
* eq.c (scm_eqv_p, scm_equal_p): Handle fractions.
2003-11-18 19:59:53 +00:00
|
|
|
|
scm_product (SCM_FRACTION_NUMERATOR (y), SCM_FRACTION_DENOMINATOR (x))),
|
|
|
|
|
|
scm_product (SCM_FRACTION_DENOMINATOR (x), SCM_FRACTION_DENOMINATOR (y)));
|
2003-07-13 16:13:57 +00:00
|
|
|
|
else
|
|
|
|
|
|
SCM_WTA_DISPATCH_2 (g_sum, x, y, SCM_ARGn, s_sum);
|
2000-05-09 12:58:53 +00:00
|
|
|
|
}
|
2003-07-13 16:13:57 +00:00
|
|
|
|
else
|
2000-05-09 12:58:53 +00:00
|
|
|
|
SCM_WTA_DISPATCH_2 (g_sum, x, y, SCM_ARG1, s_sum);
|
1996-07-25 22:56:11 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
2005-04-14 00:35:50 +00:00
|
|
|
|
SCM_DEFINE (scm_oneplus, "1+", 1, 0, 0,
|
|
|
|
|
|
(SCM x),
|
|
|
|
|
|
"Return @math{@var{x}+1}.")
|
|
|
|
|
|
#define FUNC_NAME s_scm_oneplus
|
|
|
|
|
|
{
|
|
|
|
|
|
return scm_sum (x, SCM_I_MAKINUM (1));
|
|
|
|
|
|
}
|
|
|
|
|
|
#undef FUNC_NAME
|
|
|
|
|
|
|
|
|
|
|
|
|
2009-09-06 16:47:19 +02:00
|
|
|
|
SCM_PRIMITIVE_GENERIC (scm_i_difference, "-", 0, 2, 1,
|
|
|
|
|
|
(SCM x, SCM y, SCM rest),
|
|
|
|
|
|
"If called with one argument @var{z1}, -@var{z1} returned. Otherwise\n"
|
|
|
|
|
|
"the sum of all but the first argument are subtracted from the first\n"
|
|
|
|
|
|
"argument.")
|
|
|
|
|
|
#define FUNC_NAME s_scm_i_difference
|
|
|
|
|
|
{
|
|
|
|
|
|
while (!scm_is_null (rest))
|
|
|
|
|
|
{ x = scm_difference (x, y);
|
|
|
|
|
|
y = scm_car (rest);
|
|
|
|
|
|
rest = scm_cdr (rest);
|
|
|
|
|
|
}
|
|
|
|
|
|
return scm_difference (x, y);
|
|
|
|
|
|
}
|
|
|
|
|
|
#undef FUNC_NAME
|
|
|
|
|
|
|
|
|
|
|
|
#define s_difference s_scm_i_difference
|
|
|
|
|
|
#define g_difference g_scm_i_difference
|
|
|
|
|
|
|
1996-07-25 22:56:11 +00:00
|
|
|
|
SCM
|
1999-12-12 20:35:02 +00:00
|
|
|
|
scm_difference (SCM x, SCM y)
|
2009-09-06 16:47:19 +02:00
|
|
|
|
#define FUNC_NAME s_difference
|
1996-07-25 22:56:11 +00:00
|
|
|
|
{
|
2007-12-08 16:00:56 +00:00
|
|
|
|
if (SCM_UNLIKELY (SCM_UNBNDP (y)))
|
2003-04-04 21:49:44 +00:00
|
|
|
|
{
|
|
|
|
|
|
if (SCM_UNBNDP (x))
|
|
|
|
|
|
SCM_WTA_DISPATCH_0 (g_difference, s_difference);
|
|
|
|
|
|
else
|
2004-07-23 15:43:02 +00:00
|
|
|
|
if (SCM_I_INUMP (x))
|
2003-04-04 21:49:44 +00:00
|
|
|
|
{
|
2004-07-23 15:43:02 +00:00
|
|
|
|
long xx = -SCM_I_INUM (x);
|
2003-04-04 21:49:44 +00:00
|
|
|
|
if (SCM_FIXABLE (xx))
|
2004-07-08 15:54:05 +00:00
|
|
|
|
return SCM_I_MAKINUM (xx);
|
2003-04-04 21:49:44 +00:00
|
|
|
|
else
|
|
|
|
|
|
return scm_i_long2big (xx);
|
|
|
|
|
|
}
|
|
|
|
|
|
else if (SCM_BIGP (x))
|
2005-02-14 23:14:35 +00:00
|
|
|
|
/* Must scm_i_normbig here because -SCM_MOST_NEGATIVE_FIXNUM is a
|
|
|
|
|
|
bignum, but negating that gives a fixnum. */
|
2003-04-04 21:49:44 +00:00
|
|
|
|
return scm_i_normbig (scm_i_clonebig (x, 0));
|
|
|
|
|
|
else if (SCM_REALP (x))
|
(scm_is_rational): New.
(scm_i_short2big, scm_i_int2big, scm_i_uint2big, scm_i_size2big,
scm_i_ptrdiff2big, scm_i_long_long2big, scm_i_ulong_long2big):
Removed prototypes.
(scm_make_real, scm_num2dbl, scm_float2num, scm_double2num):
Discouraged by moving to discouraged.h and discouraged.c.
Replaced all uses with scm_from_double.
(scm_num2float, scm_num2double): Discouraged by moving prototype
to discouraged.h and rewriting in terms of scm_to_double.
Replaced all uses with scm_to_double.
(scm_to_double): Do not implement in terms of scm_num2dbl, use
explicit code.
(scm_from_double): Do not implement in terms of scm_make_real, use
explicit code.
2004-08-03 15:03:35 +00:00
|
|
|
|
return scm_from_double (-SCM_REAL_VALUE (x));
|
2003-04-04 21:49:44 +00:00
|
|
|
|
else if (SCM_COMPLEXP (x))
|
2004-08-03 17:12:14 +00:00
|
|
|
|
return scm_c_make_rectangular (-SCM_COMPLEX_REAL (x),
|
2003-04-04 21:49:44 +00:00
|
|
|
|
-SCM_COMPLEX_IMAG (x));
|
* print.c (scm_iprin1): Handle fractions.
* objects.h (scm_class_fraction): New.
* objects.c (scm_class_fraction): New.
(scm_class_of): Handle fractions.
* hash.c (scm_hasher): Handle fractions.
* numbers.c: New code for handling fraction all over the place.
(scm_odd_p, scm_even_p): Handle inexact integers.
(scm_rational_p): New function, same as scm_real_p.
(scm_round_number, scm_truncate_number, scm_ceiling, scm_floor):
New exact functions that replace the inexact 'dsubr'
implementations.
(scm_numerator, scm_denominator): New.
* numbers.h (SCM_NUMP): Recognize fractions.
(SCM_FRACTIONP, SCM_SLOPPY_FRACTIONP, SCM_FRACTION_NUMERATOR,
SCM_FRACTION_DENOMINATOR, SCM_FRACTION_SET_NUMERATOR,
SCM_FRACTION_SET_DENOMINATOR, SCM_FRACTION_REDUCED_BIT,
SCM_FRACTION_REDUCED_SET, SCM_FRACTION_REDUCED_CLEAR,
SCM_FRACTION_REDUCED): New.
(scm_floor, scm_ceiling, scm_truncate_number, scm_round_number):
New prototypes.
(scm_make_ratio, scm_rationalize, scm_numerator, scm_denominator,
scm_rational_p): New prototypes.
(scm_i_dbl2num, scm_i_fraction2double, scm_i_fraction_equalp,
scm_i_print_fraction): New prototypes.
* goops.c (create_standard_classes): Create "<fraction>" class.
* gc-mark.c (scm_gc_mark_dependencies): Handle fractions.
* gc-card.c (scm_i_sweep_card): Include scm_tc16_fraction as a
case in the switch, but do nothing for now.
* eval.c (SCM_CEVAL, SCM_APPLY, call_dsubr_1): Convert fractions
to doubles when calling 'dsubr' functions.
* eq.c (scm_eqv_p, scm_equal_p): Handle fractions.
2003-11-18 19:59:53 +00:00
|
|
|
|
else if (SCM_FRACTIONP (x))
|
2004-08-03 15:55:42 +00:00
|
|
|
|
return scm_i_make_ratio (scm_difference (SCM_FRACTION_NUMERATOR (x), SCM_UNDEFINED),
|
* print.c (scm_iprin1): Handle fractions.
* objects.h (scm_class_fraction): New.
* objects.c (scm_class_fraction): New.
(scm_class_of): Handle fractions.
* hash.c (scm_hasher): Handle fractions.
* numbers.c: New code for handling fraction all over the place.
(scm_odd_p, scm_even_p): Handle inexact integers.
(scm_rational_p): New function, same as scm_real_p.
(scm_round_number, scm_truncate_number, scm_ceiling, scm_floor):
New exact functions that replace the inexact 'dsubr'
implementations.
(scm_numerator, scm_denominator): New.
* numbers.h (SCM_NUMP): Recognize fractions.
(SCM_FRACTIONP, SCM_SLOPPY_FRACTIONP, SCM_FRACTION_NUMERATOR,
SCM_FRACTION_DENOMINATOR, SCM_FRACTION_SET_NUMERATOR,
SCM_FRACTION_SET_DENOMINATOR, SCM_FRACTION_REDUCED_BIT,
SCM_FRACTION_REDUCED_SET, SCM_FRACTION_REDUCED_CLEAR,
SCM_FRACTION_REDUCED): New.
(scm_floor, scm_ceiling, scm_truncate_number, scm_round_number):
New prototypes.
(scm_make_ratio, scm_rationalize, scm_numerator, scm_denominator,
scm_rational_p): New prototypes.
(scm_i_dbl2num, scm_i_fraction2double, scm_i_fraction_equalp,
scm_i_print_fraction): New prototypes.
* goops.c (create_standard_classes): Create "<fraction>" class.
* gc-mark.c (scm_gc_mark_dependencies): Handle fractions.
* gc-card.c (scm_i_sweep_card): Include scm_tc16_fraction as a
case in the switch, but do nothing for now.
* eval.c (SCM_CEVAL, SCM_APPLY, call_dsubr_1): Convert fractions
to doubles when calling 'dsubr' functions.
* eq.c (scm_eqv_p, scm_equal_p): Handle fractions.
2003-11-18 19:59:53 +00:00
|
|
|
|
SCM_FRACTION_DENOMINATOR (x));
|
2003-04-04 21:49:44 +00:00
|
|
|
|
else
|
|
|
|
|
|
SCM_WTA_DISPATCH_1 (g_difference, x, SCM_ARG1, s_difference);
|
1999-01-10 07:38:39 +00:00
|
|
|
|
}
|
2003-04-04 21:49:44 +00:00
|
|
|
|
|
2007-12-08 16:00:56 +00:00
|
|
|
|
if (SCM_LIKELY (SCM_I_INUMP (x)))
|
2003-07-13 16:13:57 +00:00
|
|
|
|
{
|
2007-12-08 16:00:56 +00:00
|
|
|
|
if (SCM_LIKELY (SCM_I_INUMP (y)))
|
2003-07-13 16:13:57 +00:00
|
|
|
|
{
|
2004-07-23 15:43:02 +00:00
|
|
|
|
long int xx = SCM_I_INUM (x);
|
|
|
|
|
|
long int yy = SCM_I_INUM (y);
|
2003-07-13 16:13:57 +00:00
|
|
|
|
long int z = xx - yy;
|
|
|
|
|
|
if (SCM_FIXABLE (z))
|
2004-07-08 15:54:05 +00:00
|
|
|
|
return SCM_I_MAKINUM (z);
|
2003-07-13 16:13:57 +00:00
|
|
|
|
else
|
|
|
|
|
|
return scm_i_long2big (z);
|
|
|
|
|
|
}
|
|
|
|
|
|
else if (SCM_BIGP (y))
|
|
|
|
|
|
{
|
|
|
|
|
|
/* inum-x - big-y */
|
2004-07-23 15:43:02 +00:00
|
|
|
|
long xx = SCM_I_INUM (x);
|
2003-04-04 21:49:44 +00:00
|
|
|
|
|
2003-07-13 16:13:57 +00:00
|
|
|
|
if (xx == 0)
|
|
|
|
|
|
return scm_i_clonebig (y, 0);
|
|
|
|
|
|
else
|
|
|
|
|
|
{
|
|
|
|
|
|
int sgn_y = mpz_sgn (SCM_I_BIG_MPZ (y));
|
|
|
|
|
|
SCM result = scm_i_mkbig ();
|
2003-04-04 21:49:44 +00:00
|
|
|
|
|
2003-07-13 16:13:57 +00:00
|
|
|
|
if (xx >= 0)
|
|
|
|
|
|
mpz_ui_sub (SCM_I_BIG_MPZ (result), xx, SCM_I_BIG_MPZ (y));
|
|
|
|
|
|
else
|
|
|
|
|
|
{
|
|
|
|
|
|
/* x - y == -(y + -x) */
|
|
|
|
|
|
mpz_add_ui (SCM_I_BIG_MPZ (result), SCM_I_BIG_MPZ (y), -xx);
|
|
|
|
|
|
mpz_neg (SCM_I_BIG_MPZ (result), SCM_I_BIG_MPZ (result));
|
|
|
|
|
|
}
|
|
|
|
|
|
scm_remember_upto_here_1 (y);
|
2003-04-04 21:49:44 +00:00
|
|
|
|
|
2003-07-13 16:13:57 +00:00
|
|
|
|
if ((xx < 0 && (sgn_y > 0)) || ((xx > 0) && sgn_y < 0))
|
|
|
|
|
|
/* we know the result will have to be a bignum */
|
|
|
|
|
|
return result;
|
|
|
|
|
|
else
|
|
|
|
|
|
return scm_i_normbig (result);
|
|
|
|
|
|
}
|
|
|
|
|
|
}
|
|
|
|
|
|
else if (SCM_REALP (y))
|
|
|
|
|
|
{
|
2004-07-23 15:43:02 +00:00
|
|
|
|
long int xx = SCM_I_INUM (x);
|
(scm_is_rational): New.
(scm_i_short2big, scm_i_int2big, scm_i_uint2big, scm_i_size2big,
scm_i_ptrdiff2big, scm_i_long_long2big, scm_i_ulong_long2big):
Removed prototypes.
(scm_make_real, scm_num2dbl, scm_float2num, scm_double2num):
Discouraged by moving to discouraged.h and discouraged.c.
Replaced all uses with scm_from_double.
(scm_num2float, scm_num2double): Discouraged by moving prototype
to discouraged.h and rewriting in terms of scm_to_double.
Replaced all uses with scm_to_double.
(scm_to_double): Do not implement in terms of scm_num2dbl, use
explicit code.
(scm_from_double): Do not implement in terms of scm_make_real, use
explicit code.
2004-08-03 15:03:35 +00:00
|
|
|
|
return scm_from_double (xx - SCM_REAL_VALUE (y));
|
2003-07-13 16:13:57 +00:00
|
|
|
|
}
|
|
|
|
|
|
else if (SCM_COMPLEXP (y))
|
|
|
|
|
|
{
|
2004-07-23 15:43:02 +00:00
|
|
|
|
long int xx = SCM_I_INUM (x);
|
2004-08-03 17:12:14 +00:00
|
|
|
|
return scm_c_make_rectangular (xx - SCM_COMPLEX_REAL (y),
|
2003-07-13 16:13:57 +00:00
|
|
|
|
- SCM_COMPLEX_IMAG (y));
|
|
|
|
|
|
}
|
* print.c (scm_iprin1): Handle fractions.
* objects.h (scm_class_fraction): New.
* objects.c (scm_class_fraction): New.
(scm_class_of): Handle fractions.
* hash.c (scm_hasher): Handle fractions.
* numbers.c: New code for handling fraction all over the place.
(scm_odd_p, scm_even_p): Handle inexact integers.
(scm_rational_p): New function, same as scm_real_p.
(scm_round_number, scm_truncate_number, scm_ceiling, scm_floor):
New exact functions that replace the inexact 'dsubr'
implementations.
(scm_numerator, scm_denominator): New.
* numbers.h (SCM_NUMP): Recognize fractions.
(SCM_FRACTIONP, SCM_SLOPPY_FRACTIONP, SCM_FRACTION_NUMERATOR,
SCM_FRACTION_DENOMINATOR, SCM_FRACTION_SET_NUMERATOR,
SCM_FRACTION_SET_DENOMINATOR, SCM_FRACTION_REDUCED_BIT,
SCM_FRACTION_REDUCED_SET, SCM_FRACTION_REDUCED_CLEAR,
SCM_FRACTION_REDUCED): New.
(scm_floor, scm_ceiling, scm_truncate_number, scm_round_number):
New prototypes.
(scm_make_ratio, scm_rationalize, scm_numerator, scm_denominator,
scm_rational_p): New prototypes.
(scm_i_dbl2num, scm_i_fraction2double, scm_i_fraction_equalp,
scm_i_print_fraction): New prototypes.
* goops.c (create_standard_classes): Create "<fraction>" class.
* gc-mark.c (scm_gc_mark_dependencies): Handle fractions.
* gc-card.c (scm_i_sweep_card): Include scm_tc16_fraction as a
case in the switch, but do nothing for now.
* eval.c (SCM_CEVAL, SCM_APPLY, call_dsubr_1): Convert fractions
to doubles when calling 'dsubr' functions.
* eq.c (scm_eqv_p, scm_equal_p): Handle fractions.
2003-11-18 19:59:53 +00:00
|
|
|
|
else if (SCM_FRACTIONP (y))
|
|
|
|
|
|
/* a - b/c = (ac - b) / c */
|
2004-08-03 15:55:42 +00:00
|
|
|
|
return scm_i_make_ratio (scm_difference (scm_product (x, SCM_FRACTION_DENOMINATOR (y)),
|
* print.c (scm_iprin1): Handle fractions.
* objects.h (scm_class_fraction): New.
* objects.c (scm_class_fraction): New.
(scm_class_of): Handle fractions.
* hash.c (scm_hasher): Handle fractions.
* numbers.c: New code for handling fraction all over the place.
(scm_odd_p, scm_even_p): Handle inexact integers.
(scm_rational_p): New function, same as scm_real_p.
(scm_round_number, scm_truncate_number, scm_ceiling, scm_floor):
New exact functions that replace the inexact 'dsubr'
implementations.
(scm_numerator, scm_denominator): New.
* numbers.h (SCM_NUMP): Recognize fractions.
(SCM_FRACTIONP, SCM_SLOPPY_FRACTIONP, SCM_FRACTION_NUMERATOR,
SCM_FRACTION_DENOMINATOR, SCM_FRACTION_SET_NUMERATOR,
SCM_FRACTION_SET_DENOMINATOR, SCM_FRACTION_REDUCED_BIT,
SCM_FRACTION_REDUCED_SET, SCM_FRACTION_REDUCED_CLEAR,
SCM_FRACTION_REDUCED): New.
(scm_floor, scm_ceiling, scm_truncate_number, scm_round_number):
New prototypes.
(scm_make_ratio, scm_rationalize, scm_numerator, scm_denominator,
scm_rational_p): New prototypes.
(scm_i_dbl2num, scm_i_fraction2double, scm_i_fraction_equalp,
scm_i_print_fraction): New prototypes.
* goops.c (create_standard_classes): Create "<fraction>" class.
* gc-mark.c (scm_gc_mark_dependencies): Handle fractions.
* gc-card.c (scm_i_sweep_card): Include scm_tc16_fraction as a
case in the switch, but do nothing for now.
* eval.c (SCM_CEVAL, SCM_APPLY, call_dsubr_1): Convert fractions
to doubles when calling 'dsubr' functions.
* eq.c (scm_eqv_p, scm_equal_p): Handle fractions.
2003-11-18 19:59:53 +00:00
|
|
|
|
SCM_FRACTION_NUMERATOR (y)),
|
|
|
|
|
|
SCM_FRACTION_DENOMINATOR (y));
|
2003-07-13 16:13:57 +00:00
|
|
|
|
else
|
|
|
|
|
|
SCM_WTA_DISPATCH_2 (g_difference, x, y, SCM_ARGn, s_difference);
|
1999-01-10 07:38:39 +00:00
|
|
|
|
}
|
2003-07-13 16:13:57 +00:00
|
|
|
|
else if (SCM_BIGP (x))
|
|
|
|
|
|
{
|
2004-07-23 15:43:02 +00:00
|
|
|
|
if (SCM_I_INUMP (y))
|
2003-07-13 16:13:57 +00:00
|
|
|
|
{
|
|
|
|
|
|
/* big-x - inum-y */
|
2004-07-23 15:43:02 +00:00
|
|
|
|
long yy = SCM_I_INUM (y);
|
2003-07-13 16:13:57 +00:00
|
|
|
|
int sgn_x = mpz_sgn (SCM_I_BIG_MPZ (x));
|
2003-04-04 21:49:44 +00:00
|
|
|
|
|
2003-07-13 16:13:57 +00:00
|
|
|
|
scm_remember_upto_here_1 (x);
|
|
|
|
|
|
if (sgn_x == 0)
|
* discouraged.h, discouraged.c: New files.
* deprecated.h (SCM_FALSEP, SCM_NFALSEP, SCM_BOOLP, SCM_EQ_P,
SCM_NEGATE_BOOL, SCM_BOOL, SCM_BOOT_NOT): Promoted from being
deprecated to being discouraged by moving to discouraged.h.
* numbers.h, numbers.c, discouraged.h, discouraged.c
(scm_short2num, scm_ushort2num, scm_int2num, scm_uint2num,
scm_long2num, scm_ulong2num, scm_size2num, scm_ptrdiff2num,
scm_num2short, scm_num2ushort, scm_num2int, scm_num2uint,
scm_num2long, scm_num2ulong, scm_num2size, scm_num2ptrdiff,
scm_long_long2num, scm_ulong_long2num, scm_num2long_long,
scm_num2ulong_long): Discouraged by moving to discouraged.h and
discouraged.c and reimplementing in terms of scm_from_* and
scm_to_*.
* numbers.h, numbers.c: Removed GUILE_DEBUG code.
(scm_i_short2big, scm_i_ushort2big, scm_i_int2big, scm_i_uint2big,
scm_i_size2big, scm_i_ptrdiff2big): Removed.
(scm_i_long2big, scm_i_ulong2big): New, explicit definitions.
* conv-integer.i.c, conv-uinteger.i.c: Use them instead of
explicit code.
2004-08-02 15:57:04 +00:00
|
|
|
|
return (SCM_FIXABLE (-yy) ?
|
|
|
|
|
|
SCM_I_MAKINUM (-yy) : scm_from_long (-yy));
|
2003-07-13 16:13:57 +00:00
|
|
|
|
else
|
|
|
|
|
|
{
|
|
|
|
|
|
SCM result = scm_i_mkbig ();
|
2003-04-04 21:49:44 +00:00
|
|
|
|
|
2003-08-22 01:17:48 +00:00
|
|
|
|
if (yy >= 0)
|
|
|
|
|
|
mpz_sub_ui (SCM_I_BIG_MPZ (result), SCM_I_BIG_MPZ (x), yy);
|
|
|
|
|
|
else
|
|
|
|
|
|
mpz_add_ui (SCM_I_BIG_MPZ (result), SCM_I_BIG_MPZ (x), -yy);
|
2003-07-13 16:13:57 +00:00
|
|
|
|
scm_remember_upto_here_1 (x);
|
2003-04-04 21:49:44 +00:00
|
|
|
|
|
2003-07-13 16:13:57 +00:00
|
|
|
|
if ((sgn_x < 0 && (yy > 0)) || ((sgn_x > 0) && yy < 0))
|
|
|
|
|
|
/* we know the result will have to be a bignum */
|
|
|
|
|
|
return result;
|
|
|
|
|
|
else
|
|
|
|
|
|
return scm_i_normbig (result);
|
|
|
|
|
|
}
|
|
|
|
|
|
}
|
|
|
|
|
|
else if (SCM_BIGP (y))
|
|
|
|
|
|
{
|
|
|
|
|
|
int sgn_x = mpz_sgn (SCM_I_BIG_MPZ (x));
|
|
|
|
|
|
int sgn_y = mpz_sgn (SCM_I_BIG_MPZ (y));
|
|
|
|
|
|
SCM result = scm_i_mkbig ();
|
|
|
|
|
|
mpz_sub (SCM_I_BIG_MPZ (result),
|
|
|
|
|
|
SCM_I_BIG_MPZ (x),
|
|
|
|
|
|
SCM_I_BIG_MPZ (y));
|
|
|
|
|
|
scm_remember_upto_here_2 (x, y);
|
|
|
|
|
|
/* we know the result will have to be a bignum */
|
|
|
|
|
|
if ((sgn_x == 1) && (sgn_y == -1))
|
|
|
|
|
|
return result;
|
|
|
|
|
|
if ((sgn_x == -1) && (sgn_y == 1))
|
|
|
|
|
|
return result;
|
|
|
|
|
|
return scm_i_normbig (result);
|
|
|
|
|
|
}
|
|
|
|
|
|
else if (SCM_REALP (y))
|
|
|
|
|
|
{
|
|
|
|
|
|
double result = mpz_get_d (SCM_I_BIG_MPZ (x)) - SCM_REAL_VALUE (y);
|
|
|
|
|
|
scm_remember_upto_here_1 (x);
|
(scm_is_rational): New.
(scm_i_short2big, scm_i_int2big, scm_i_uint2big, scm_i_size2big,
scm_i_ptrdiff2big, scm_i_long_long2big, scm_i_ulong_long2big):
Removed prototypes.
(scm_make_real, scm_num2dbl, scm_float2num, scm_double2num):
Discouraged by moving to discouraged.h and discouraged.c.
Replaced all uses with scm_from_double.
(scm_num2float, scm_num2double): Discouraged by moving prototype
to discouraged.h and rewriting in terms of scm_to_double.
Replaced all uses with scm_to_double.
(scm_to_double): Do not implement in terms of scm_num2dbl, use
explicit code.
(scm_from_double): Do not implement in terms of scm_make_real, use
explicit code.
2004-08-03 15:03:35 +00:00
|
|
|
|
return scm_from_double (result);
|
2003-07-13 16:13:57 +00:00
|
|
|
|
}
|
|
|
|
|
|
else if (SCM_COMPLEXP (y))
|
|
|
|
|
|
{
|
|
|
|
|
|
double real_part = (mpz_get_d (SCM_I_BIG_MPZ (x))
|
|
|
|
|
|
- SCM_COMPLEX_REAL (y));
|
|
|
|
|
|
scm_remember_upto_here_1 (x);
|
2004-08-03 17:12:14 +00:00
|
|
|
|
return scm_c_make_rectangular (real_part, - SCM_COMPLEX_IMAG (y));
|
2003-07-13 16:13:57 +00:00
|
|
|
|
}
|
* print.c (scm_iprin1): Handle fractions.
* objects.h (scm_class_fraction): New.
* objects.c (scm_class_fraction): New.
(scm_class_of): Handle fractions.
* hash.c (scm_hasher): Handle fractions.
* numbers.c: New code for handling fraction all over the place.
(scm_odd_p, scm_even_p): Handle inexact integers.
(scm_rational_p): New function, same as scm_real_p.
(scm_round_number, scm_truncate_number, scm_ceiling, scm_floor):
New exact functions that replace the inexact 'dsubr'
implementations.
(scm_numerator, scm_denominator): New.
* numbers.h (SCM_NUMP): Recognize fractions.
(SCM_FRACTIONP, SCM_SLOPPY_FRACTIONP, SCM_FRACTION_NUMERATOR,
SCM_FRACTION_DENOMINATOR, SCM_FRACTION_SET_NUMERATOR,
SCM_FRACTION_SET_DENOMINATOR, SCM_FRACTION_REDUCED_BIT,
SCM_FRACTION_REDUCED_SET, SCM_FRACTION_REDUCED_CLEAR,
SCM_FRACTION_REDUCED): New.
(scm_floor, scm_ceiling, scm_truncate_number, scm_round_number):
New prototypes.
(scm_make_ratio, scm_rationalize, scm_numerator, scm_denominator,
scm_rational_p): New prototypes.
(scm_i_dbl2num, scm_i_fraction2double, scm_i_fraction_equalp,
scm_i_print_fraction): New prototypes.
* goops.c (create_standard_classes): Create "<fraction>" class.
* gc-mark.c (scm_gc_mark_dependencies): Handle fractions.
* gc-card.c (scm_i_sweep_card): Include scm_tc16_fraction as a
case in the switch, but do nothing for now.
* eval.c (SCM_CEVAL, SCM_APPLY, call_dsubr_1): Convert fractions
to doubles when calling 'dsubr' functions.
* eq.c (scm_eqv_p, scm_equal_p): Handle fractions.
2003-11-18 19:59:53 +00:00
|
|
|
|
else if (SCM_FRACTIONP (y))
|
2004-08-03 15:55:42 +00:00
|
|
|
|
return scm_i_make_ratio (scm_difference (scm_product (x, SCM_FRACTION_DENOMINATOR (y)),
|
* print.c (scm_iprin1): Handle fractions.
* objects.h (scm_class_fraction): New.
* objects.c (scm_class_fraction): New.
(scm_class_of): Handle fractions.
* hash.c (scm_hasher): Handle fractions.
* numbers.c: New code for handling fraction all over the place.
(scm_odd_p, scm_even_p): Handle inexact integers.
(scm_rational_p): New function, same as scm_real_p.
(scm_round_number, scm_truncate_number, scm_ceiling, scm_floor):
New exact functions that replace the inexact 'dsubr'
implementations.
(scm_numerator, scm_denominator): New.
* numbers.h (SCM_NUMP): Recognize fractions.
(SCM_FRACTIONP, SCM_SLOPPY_FRACTIONP, SCM_FRACTION_NUMERATOR,
SCM_FRACTION_DENOMINATOR, SCM_FRACTION_SET_NUMERATOR,
SCM_FRACTION_SET_DENOMINATOR, SCM_FRACTION_REDUCED_BIT,
SCM_FRACTION_REDUCED_SET, SCM_FRACTION_REDUCED_CLEAR,
SCM_FRACTION_REDUCED): New.
(scm_floor, scm_ceiling, scm_truncate_number, scm_round_number):
New prototypes.
(scm_make_ratio, scm_rationalize, scm_numerator, scm_denominator,
scm_rational_p): New prototypes.
(scm_i_dbl2num, scm_i_fraction2double, scm_i_fraction_equalp,
scm_i_print_fraction): New prototypes.
* goops.c (create_standard_classes): Create "<fraction>" class.
* gc-mark.c (scm_gc_mark_dependencies): Handle fractions.
* gc-card.c (scm_i_sweep_card): Include scm_tc16_fraction as a
case in the switch, but do nothing for now.
* eval.c (SCM_CEVAL, SCM_APPLY, call_dsubr_1): Convert fractions
to doubles when calling 'dsubr' functions.
* eq.c (scm_eqv_p, scm_equal_p): Handle fractions.
2003-11-18 19:59:53 +00:00
|
|
|
|
SCM_FRACTION_NUMERATOR (y)),
|
|
|
|
|
|
SCM_FRACTION_DENOMINATOR (y));
|
2003-07-13 16:13:57 +00:00
|
|
|
|
else SCM_WTA_DISPATCH_2 (g_difference, x, y, SCM_ARGn, s_difference);
|
2003-04-04 21:49:44 +00:00
|
|
|
|
}
|
2003-07-13 16:13:57 +00:00
|
|
|
|
else if (SCM_REALP (x))
|
|
|
|
|
|
{
|
2004-07-23 15:43:02 +00:00
|
|
|
|
if (SCM_I_INUMP (y))
|
(scm_is_rational): New.
(scm_i_short2big, scm_i_int2big, scm_i_uint2big, scm_i_size2big,
scm_i_ptrdiff2big, scm_i_long_long2big, scm_i_ulong_long2big):
Removed prototypes.
(scm_make_real, scm_num2dbl, scm_float2num, scm_double2num):
Discouraged by moving to discouraged.h and discouraged.c.
Replaced all uses with scm_from_double.
(scm_num2float, scm_num2double): Discouraged by moving prototype
to discouraged.h and rewriting in terms of scm_to_double.
Replaced all uses with scm_to_double.
(scm_to_double): Do not implement in terms of scm_num2dbl, use
explicit code.
(scm_from_double): Do not implement in terms of scm_make_real, use
explicit code.
2004-08-03 15:03:35 +00:00
|
|
|
|
return scm_from_double (SCM_REAL_VALUE (x) - SCM_I_INUM (y));
|
2003-07-13 16:13:57 +00:00
|
|
|
|
else if (SCM_BIGP (y))
|
|
|
|
|
|
{
|
|
|
|
|
|
double result = SCM_REAL_VALUE (x) - mpz_get_d (SCM_I_BIG_MPZ (y));
|
|
|
|
|
|
scm_remember_upto_here_1 (x);
|
(scm_is_rational): New.
(scm_i_short2big, scm_i_int2big, scm_i_uint2big, scm_i_size2big,
scm_i_ptrdiff2big, scm_i_long_long2big, scm_i_ulong_long2big):
Removed prototypes.
(scm_make_real, scm_num2dbl, scm_float2num, scm_double2num):
Discouraged by moving to discouraged.h and discouraged.c.
Replaced all uses with scm_from_double.
(scm_num2float, scm_num2double): Discouraged by moving prototype
to discouraged.h and rewriting in terms of scm_to_double.
Replaced all uses with scm_to_double.
(scm_to_double): Do not implement in terms of scm_num2dbl, use
explicit code.
(scm_from_double): Do not implement in terms of scm_make_real, use
explicit code.
2004-08-03 15:03:35 +00:00
|
|
|
|
return scm_from_double (result);
|
2003-07-13 16:13:57 +00:00
|
|
|
|
}
|
|
|
|
|
|
else if (SCM_REALP (y))
|
(scm_is_rational): New.
(scm_i_short2big, scm_i_int2big, scm_i_uint2big, scm_i_size2big,
scm_i_ptrdiff2big, scm_i_long_long2big, scm_i_ulong_long2big):
Removed prototypes.
(scm_make_real, scm_num2dbl, scm_float2num, scm_double2num):
Discouraged by moving to discouraged.h and discouraged.c.
Replaced all uses with scm_from_double.
(scm_num2float, scm_num2double): Discouraged by moving prototype
to discouraged.h and rewriting in terms of scm_to_double.
Replaced all uses with scm_to_double.
(scm_to_double): Do not implement in terms of scm_num2dbl, use
explicit code.
(scm_from_double): Do not implement in terms of scm_make_real, use
explicit code.
2004-08-03 15:03:35 +00:00
|
|
|
|
return scm_from_double (SCM_REAL_VALUE (x) - SCM_REAL_VALUE (y));
|
2003-07-13 16:13:57 +00:00
|
|
|
|
else if (SCM_COMPLEXP (y))
|
2004-08-03 17:12:14 +00:00
|
|
|
|
return scm_c_make_rectangular (SCM_REAL_VALUE (x) - SCM_COMPLEX_REAL (y),
|
2003-07-13 16:13:57 +00:00
|
|
|
|
-SCM_COMPLEX_IMAG (y));
|
* print.c (scm_iprin1): Handle fractions.
* objects.h (scm_class_fraction): New.
* objects.c (scm_class_fraction): New.
(scm_class_of): Handle fractions.
* hash.c (scm_hasher): Handle fractions.
* numbers.c: New code for handling fraction all over the place.
(scm_odd_p, scm_even_p): Handle inexact integers.
(scm_rational_p): New function, same as scm_real_p.
(scm_round_number, scm_truncate_number, scm_ceiling, scm_floor):
New exact functions that replace the inexact 'dsubr'
implementations.
(scm_numerator, scm_denominator): New.
* numbers.h (SCM_NUMP): Recognize fractions.
(SCM_FRACTIONP, SCM_SLOPPY_FRACTIONP, SCM_FRACTION_NUMERATOR,
SCM_FRACTION_DENOMINATOR, SCM_FRACTION_SET_NUMERATOR,
SCM_FRACTION_SET_DENOMINATOR, SCM_FRACTION_REDUCED_BIT,
SCM_FRACTION_REDUCED_SET, SCM_FRACTION_REDUCED_CLEAR,
SCM_FRACTION_REDUCED): New.
(scm_floor, scm_ceiling, scm_truncate_number, scm_round_number):
New prototypes.
(scm_make_ratio, scm_rationalize, scm_numerator, scm_denominator,
scm_rational_p): New prototypes.
(scm_i_dbl2num, scm_i_fraction2double, scm_i_fraction_equalp,
scm_i_print_fraction): New prototypes.
* goops.c (create_standard_classes): Create "<fraction>" class.
* gc-mark.c (scm_gc_mark_dependencies): Handle fractions.
* gc-card.c (scm_i_sweep_card): Include scm_tc16_fraction as a
case in the switch, but do nothing for now.
* eval.c (SCM_CEVAL, SCM_APPLY, call_dsubr_1): Convert fractions
to doubles when calling 'dsubr' functions.
* eq.c (scm_eqv_p, scm_equal_p): Handle fractions.
2003-11-18 19:59:53 +00:00
|
|
|
|
else if (SCM_FRACTIONP (y))
|
(scm_is_rational): New.
(scm_i_short2big, scm_i_int2big, scm_i_uint2big, scm_i_size2big,
scm_i_ptrdiff2big, scm_i_long_long2big, scm_i_ulong_long2big):
Removed prototypes.
(scm_make_real, scm_num2dbl, scm_float2num, scm_double2num):
Discouraged by moving to discouraged.h and discouraged.c.
Replaced all uses with scm_from_double.
(scm_num2float, scm_num2double): Discouraged by moving prototype
to discouraged.h and rewriting in terms of scm_to_double.
Replaced all uses with scm_to_double.
(scm_to_double): Do not implement in terms of scm_num2dbl, use
explicit code.
(scm_from_double): Do not implement in terms of scm_make_real, use
explicit code.
2004-08-03 15:03:35 +00:00
|
|
|
|
return scm_from_double (SCM_REAL_VALUE (x) - scm_i_fraction2double (y));
|
2003-07-13 16:13:57 +00:00
|
|
|
|
else
|
|
|
|
|
|
SCM_WTA_DISPATCH_2 (g_difference, x, y, SCM_ARGn, s_difference);
|
2000-05-09 12:58:53 +00:00
|
|
|
|
}
|
2003-07-13 16:13:57 +00:00
|
|
|
|
else if (SCM_COMPLEXP (x))
|
|
|
|
|
|
{
|
2004-07-23 15:43:02 +00:00
|
|
|
|
if (SCM_I_INUMP (y))
|
2004-08-03 17:12:14 +00:00
|
|
|
|
return scm_c_make_rectangular (SCM_COMPLEX_REAL (x) - SCM_I_INUM (y),
|
2003-07-13 16:13:57 +00:00
|
|
|
|
SCM_COMPLEX_IMAG (x));
|
|
|
|
|
|
else if (SCM_BIGP (y))
|
|
|
|
|
|
{
|
|
|
|
|
|
double real_part = (SCM_COMPLEX_REAL (x)
|
|
|
|
|
|
- mpz_get_d (SCM_I_BIG_MPZ (y)));
|
|
|
|
|
|
scm_remember_upto_here_1 (x);
|
2004-08-03 17:12:14 +00:00
|
|
|
|
return scm_c_make_rectangular (real_part, SCM_COMPLEX_IMAG (y));
|
2003-07-13 16:13:57 +00:00
|
|
|
|
}
|
|
|
|
|
|
else if (SCM_REALP (y))
|
2004-08-03 17:12:14 +00:00
|
|
|
|
return scm_c_make_rectangular (SCM_COMPLEX_REAL (x) - SCM_REAL_VALUE (y),
|
2003-07-13 16:13:57 +00:00
|
|
|
|
SCM_COMPLEX_IMAG (x));
|
|
|
|
|
|
else if (SCM_COMPLEXP (y))
|
2004-08-03 17:12:14 +00:00
|
|
|
|
return scm_c_make_rectangular (SCM_COMPLEX_REAL (x) - SCM_COMPLEX_REAL (y),
|
2003-07-13 16:13:57 +00:00
|
|
|
|
SCM_COMPLEX_IMAG (x) - SCM_COMPLEX_IMAG (y));
|
* print.c (scm_iprin1): Handle fractions.
* objects.h (scm_class_fraction): New.
* objects.c (scm_class_fraction): New.
(scm_class_of): Handle fractions.
* hash.c (scm_hasher): Handle fractions.
* numbers.c: New code for handling fraction all over the place.
(scm_odd_p, scm_even_p): Handle inexact integers.
(scm_rational_p): New function, same as scm_real_p.
(scm_round_number, scm_truncate_number, scm_ceiling, scm_floor):
New exact functions that replace the inexact 'dsubr'
implementations.
(scm_numerator, scm_denominator): New.
* numbers.h (SCM_NUMP): Recognize fractions.
(SCM_FRACTIONP, SCM_SLOPPY_FRACTIONP, SCM_FRACTION_NUMERATOR,
SCM_FRACTION_DENOMINATOR, SCM_FRACTION_SET_NUMERATOR,
SCM_FRACTION_SET_DENOMINATOR, SCM_FRACTION_REDUCED_BIT,
SCM_FRACTION_REDUCED_SET, SCM_FRACTION_REDUCED_CLEAR,
SCM_FRACTION_REDUCED): New.
(scm_floor, scm_ceiling, scm_truncate_number, scm_round_number):
New prototypes.
(scm_make_ratio, scm_rationalize, scm_numerator, scm_denominator,
scm_rational_p): New prototypes.
(scm_i_dbl2num, scm_i_fraction2double, scm_i_fraction_equalp,
scm_i_print_fraction): New prototypes.
* goops.c (create_standard_classes): Create "<fraction>" class.
* gc-mark.c (scm_gc_mark_dependencies): Handle fractions.
* gc-card.c (scm_i_sweep_card): Include scm_tc16_fraction as a
case in the switch, but do nothing for now.
* eval.c (SCM_CEVAL, SCM_APPLY, call_dsubr_1): Convert fractions
to doubles when calling 'dsubr' functions.
* eq.c (scm_eqv_p, scm_equal_p): Handle fractions.
2003-11-18 19:59:53 +00:00
|
|
|
|
else if (SCM_FRACTIONP (y))
|
2004-08-03 17:12:14 +00:00
|
|
|
|
return scm_c_make_rectangular (SCM_COMPLEX_REAL (x) - scm_i_fraction2double (y),
|
* print.c (scm_iprin1): Handle fractions.
* objects.h (scm_class_fraction): New.
* objects.c (scm_class_fraction): New.
(scm_class_of): Handle fractions.
* hash.c (scm_hasher): Handle fractions.
* numbers.c: New code for handling fraction all over the place.
(scm_odd_p, scm_even_p): Handle inexact integers.
(scm_rational_p): New function, same as scm_real_p.
(scm_round_number, scm_truncate_number, scm_ceiling, scm_floor):
New exact functions that replace the inexact 'dsubr'
implementations.
(scm_numerator, scm_denominator): New.
* numbers.h (SCM_NUMP): Recognize fractions.
(SCM_FRACTIONP, SCM_SLOPPY_FRACTIONP, SCM_FRACTION_NUMERATOR,
SCM_FRACTION_DENOMINATOR, SCM_FRACTION_SET_NUMERATOR,
SCM_FRACTION_SET_DENOMINATOR, SCM_FRACTION_REDUCED_BIT,
SCM_FRACTION_REDUCED_SET, SCM_FRACTION_REDUCED_CLEAR,
SCM_FRACTION_REDUCED): New.
(scm_floor, scm_ceiling, scm_truncate_number, scm_round_number):
New prototypes.
(scm_make_ratio, scm_rationalize, scm_numerator, scm_denominator,
scm_rational_p): New prototypes.
(scm_i_dbl2num, scm_i_fraction2double, scm_i_fraction_equalp,
scm_i_print_fraction): New prototypes.
* goops.c (create_standard_classes): Create "<fraction>" class.
* gc-mark.c (scm_gc_mark_dependencies): Handle fractions.
* gc-card.c (scm_i_sweep_card): Include scm_tc16_fraction as a
case in the switch, but do nothing for now.
* eval.c (SCM_CEVAL, SCM_APPLY, call_dsubr_1): Convert fractions
to doubles when calling 'dsubr' functions.
* eq.c (scm_eqv_p, scm_equal_p): Handle fractions.
2003-11-18 19:59:53 +00:00
|
|
|
|
SCM_COMPLEX_IMAG (x));
|
|
|
|
|
|
else
|
|
|
|
|
|
SCM_WTA_DISPATCH_2 (g_difference, x, y, SCM_ARGn, s_difference);
|
|
|
|
|
|
}
|
|
|
|
|
|
else if (SCM_FRACTIONP (x))
|
|
|
|
|
|
{
|
2004-07-23 15:43:02 +00:00
|
|
|
|
if (SCM_I_INUMP (y))
|
* print.c (scm_iprin1): Handle fractions.
* objects.h (scm_class_fraction): New.
* objects.c (scm_class_fraction): New.
(scm_class_of): Handle fractions.
* hash.c (scm_hasher): Handle fractions.
* numbers.c: New code for handling fraction all over the place.
(scm_odd_p, scm_even_p): Handle inexact integers.
(scm_rational_p): New function, same as scm_real_p.
(scm_round_number, scm_truncate_number, scm_ceiling, scm_floor):
New exact functions that replace the inexact 'dsubr'
implementations.
(scm_numerator, scm_denominator): New.
* numbers.h (SCM_NUMP): Recognize fractions.
(SCM_FRACTIONP, SCM_SLOPPY_FRACTIONP, SCM_FRACTION_NUMERATOR,
SCM_FRACTION_DENOMINATOR, SCM_FRACTION_SET_NUMERATOR,
SCM_FRACTION_SET_DENOMINATOR, SCM_FRACTION_REDUCED_BIT,
SCM_FRACTION_REDUCED_SET, SCM_FRACTION_REDUCED_CLEAR,
SCM_FRACTION_REDUCED): New.
(scm_floor, scm_ceiling, scm_truncate_number, scm_round_number):
New prototypes.
(scm_make_ratio, scm_rationalize, scm_numerator, scm_denominator,
scm_rational_p): New prototypes.
(scm_i_dbl2num, scm_i_fraction2double, scm_i_fraction_equalp,
scm_i_print_fraction): New prototypes.
* goops.c (create_standard_classes): Create "<fraction>" class.
* gc-mark.c (scm_gc_mark_dependencies): Handle fractions.
* gc-card.c (scm_i_sweep_card): Include scm_tc16_fraction as a
case in the switch, but do nothing for now.
* eval.c (SCM_CEVAL, SCM_APPLY, call_dsubr_1): Convert fractions
to doubles when calling 'dsubr' functions.
* eq.c (scm_eqv_p, scm_equal_p): Handle fractions.
2003-11-18 19:59:53 +00:00
|
|
|
|
/* a/b - c = (a - cb) / b */
|
2004-08-03 15:55:42 +00:00
|
|
|
|
return scm_i_make_ratio (scm_difference (SCM_FRACTION_NUMERATOR (x),
|
* print.c (scm_iprin1): Handle fractions.
* objects.h (scm_class_fraction): New.
* objects.c (scm_class_fraction): New.
(scm_class_of): Handle fractions.
* hash.c (scm_hasher): Handle fractions.
* numbers.c: New code for handling fraction all over the place.
(scm_odd_p, scm_even_p): Handle inexact integers.
(scm_rational_p): New function, same as scm_real_p.
(scm_round_number, scm_truncate_number, scm_ceiling, scm_floor):
New exact functions that replace the inexact 'dsubr'
implementations.
(scm_numerator, scm_denominator): New.
* numbers.h (SCM_NUMP): Recognize fractions.
(SCM_FRACTIONP, SCM_SLOPPY_FRACTIONP, SCM_FRACTION_NUMERATOR,
SCM_FRACTION_DENOMINATOR, SCM_FRACTION_SET_NUMERATOR,
SCM_FRACTION_SET_DENOMINATOR, SCM_FRACTION_REDUCED_BIT,
SCM_FRACTION_REDUCED_SET, SCM_FRACTION_REDUCED_CLEAR,
SCM_FRACTION_REDUCED): New.
(scm_floor, scm_ceiling, scm_truncate_number, scm_round_number):
New prototypes.
(scm_make_ratio, scm_rationalize, scm_numerator, scm_denominator,
scm_rational_p): New prototypes.
(scm_i_dbl2num, scm_i_fraction2double, scm_i_fraction_equalp,
scm_i_print_fraction): New prototypes.
* goops.c (create_standard_classes): Create "<fraction>" class.
* gc-mark.c (scm_gc_mark_dependencies): Handle fractions.
* gc-card.c (scm_i_sweep_card): Include scm_tc16_fraction as a
case in the switch, but do nothing for now.
* eval.c (SCM_CEVAL, SCM_APPLY, call_dsubr_1): Convert fractions
to doubles when calling 'dsubr' functions.
* eq.c (scm_eqv_p, scm_equal_p): Handle fractions.
2003-11-18 19:59:53 +00:00
|
|
|
|
scm_product(y, SCM_FRACTION_DENOMINATOR (x))),
|
|
|
|
|
|
SCM_FRACTION_DENOMINATOR (x));
|
|
|
|
|
|
else if (SCM_BIGP (y))
|
2004-08-03 15:55:42 +00:00
|
|
|
|
return scm_i_make_ratio (scm_difference (SCM_FRACTION_NUMERATOR (x),
|
* print.c (scm_iprin1): Handle fractions.
* objects.h (scm_class_fraction): New.
* objects.c (scm_class_fraction): New.
(scm_class_of): Handle fractions.
* hash.c (scm_hasher): Handle fractions.
* numbers.c: New code for handling fraction all over the place.
(scm_odd_p, scm_even_p): Handle inexact integers.
(scm_rational_p): New function, same as scm_real_p.
(scm_round_number, scm_truncate_number, scm_ceiling, scm_floor):
New exact functions that replace the inexact 'dsubr'
implementations.
(scm_numerator, scm_denominator): New.
* numbers.h (SCM_NUMP): Recognize fractions.
(SCM_FRACTIONP, SCM_SLOPPY_FRACTIONP, SCM_FRACTION_NUMERATOR,
SCM_FRACTION_DENOMINATOR, SCM_FRACTION_SET_NUMERATOR,
SCM_FRACTION_SET_DENOMINATOR, SCM_FRACTION_REDUCED_BIT,
SCM_FRACTION_REDUCED_SET, SCM_FRACTION_REDUCED_CLEAR,
SCM_FRACTION_REDUCED): New.
(scm_floor, scm_ceiling, scm_truncate_number, scm_round_number):
New prototypes.
(scm_make_ratio, scm_rationalize, scm_numerator, scm_denominator,
scm_rational_p): New prototypes.
(scm_i_dbl2num, scm_i_fraction2double, scm_i_fraction_equalp,
scm_i_print_fraction): New prototypes.
* goops.c (create_standard_classes): Create "<fraction>" class.
* gc-mark.c (scm_gc_mark_dependencies): Handle fractions.
* gc-card.c (scm_i_sweep_card): Include scm_tc16_fraction as a
case in the switch, but do nothing for now.
* eval.c (SCM_CEVAL, SCM_APPLY, call_dsubr_1): Convert fractions
to doubles when calling 'dsubr' functions.
* eq.c (scm_eqv_p, scm_equal_p): Handle fractions.
2003-11-18 19:59:53 +00:00
|
|
|
|
scm_product(y, SCM_FRACTION_DENOMINATOR (x))),
|
|
|
|
|
|
SCM_FRACTION_DENOMINATOR (x));
|
|
|
|
|
|
else if (SCM_REALP (y))
|
(scm_is_rational): New.
(scm_i_short2big, scm_i_int2big, scm_i_uint2big, scm_i_size2big,
scm_i_ptrdiff2big, scm_i_long_long2big, scm_i_ulong_long2big):
Removed prototypes.
(scm_make_real, scm_num2dbl, scm_float2num, scm_double2num):
Discouraged by moving to discouraged.h and discouraged.c.
Replaced all uses with scm_from_double.
(scm_num2float, scm_num2double): Discouraged by moving prototype
to discouraged.h and rewriting in terms of scm_to_double.
Replaced all uses with scm_to_double.
(scm_to_double): Do not implement in terms of scm_num2dbl, use
explicit code.
(scm_from_double): Do not implement in terms of scm_make_real, use
explicit code.
2004-08-03 15:03:35 +00:00
|
|
|
|
return scm_from_double (scm_i_fraction2double (x) - SCM_REAL_VALUE (y));
|
* print.c (scm_iprin1): Handle fractions.
* objects.h (scm_class_fraction): New.
* objects.c (scm_class_fraction): New.
(scm_class_of): Handle fractions.
* hash.c (scm_hasher): Handle fractions.
* numbers.c: New code for handling fraction all over the place.
(scm_odd_p, scm_even_p): Handle inexact integers.
(scm_rational_p): New function, same as scm_real_p.
(scm_round_number, scm_truncate_number, scm_ceiling, scm_floor):
New exact functions that replace the inexact 'dsubr'
implementations.
(scm_numerator, scm_denominator): New.
* numbers.h (SCM_NUMP): Recognize fractions.
(SCM_FRACTIONP, SCM_SLOPPY_FRACTIONP, SCM_FRACTION_NUMERATOR,
SCM_FRACTION_DENOMINATOR, SCM_FRACTION_SET_NUMERATOR,
SCM_FRACTION_SET_DENOMINATOR, SCM_FRACTION_REDUCED_BIT,
SCM_FRACTION_REDUCED_SET, SCM_FRACTION_REDUCED_CLEAR,
SCM_FRACTION_REDUCED): New.
(scm_floor, scm_ceiling, scm_truncate_number, scm_round_number):
New prototypes.
(scm_make_ratio, scm_rationalize, scm_numerator, scm_denominator,
scm_rational_p): New prototypes.
(scm_i_dbl2num, scm_i_fraction2double, scm_i_fraction_equalp,
scm_i_print_fraction): New prototypes.
* goops.c (create_standard_classes): Create "<fraction>" class.
* gc-mark.c (scm_gc_mark_dependencies): Handle fractions.
* gc-card.c (scm_i_sweep_card): Include scm_tc16_fraction as a
case in the switch, but do nothing for now.
* eval.c (SCM_CEVAL, SCM_APPLY, call_dsubr_1): Convert fractions
to doubles when calling 'dsubr' functions.
* eq.c (scm_eqv_p, scm_equal_p): Handle fractions.
2003-11-18 19:59:53 +00:00
|
|
|
|
else if (SCM_COMPLEXP (y))
|
2004-08-03 17:12:14 +00:00
|
|
|
|
return scm_c_make_rectangular (scm_i_fraction2double (x) - SCM_COMPLEX_REAL (y),
|
* print.c (scm_iprin1): Handle fractions.
* objects.h (scm_class_fraction): New.
* objects.c (scm_class_fraction): New.
(scm_class_of): Handle fractions.
* hash.c (scm_hasher): Handle fractions.
* numbers.c: New code for handling fraction all over the place.
(scm_odd_p, scm_even_p): Handle inexact integers.
(scm_rational_p): New function, same as scm_real_p.
(scm_round_number, scm_truncate_number, scm_ceiling, scm_floor):
New exact functions that replace the inexact 'dsubr'
implementations.
(scm_numerator, scm_denominator): New.
* numbers.h (SCM_NUMP): Recognize fractions.
(SCM_FRACTIONP, SCM_SLOPPY_FRACTIONP, SCM_FRACTION_NUMERATOR,
SCM_FRACTION_DENOMINATOR, SCM_FRACTION_SET_NUMERATOR,
SCM_FRACTION_SET_DENOMINATOR, SCM_FRACTION_REDUCED_BIT,
SCM_FRACTION_REDUCED_SET, SCM_FRACTION_REDUCED_CLEAR,
SCM_FRACTION_REDUCED): New.
(scm_floor, scm_ceiling, scm_truncate_number, scm_round_number):
New prototypes.
(scm_make_ratio, scm_rationalize, scm_numerator, scm_denominator,
scm_rational_p): New prototypes.
(scm_i_dbl2num, scm_i_fraction2double, scm_i_fraction_equalp,
scm_i_print_fraction): New prototypes.
* goops.c (create_standard_classes): Create "<fraction>" class.
* gc-mark.c (scm_gc_mark_dependencies): Handle fractions.
* gc-card.c (scm_i_sweep_card): Include scm_tc16_fraction as a
case in the switch, but do nothing for now.
* eval.c (SCM_CEVAL, SCM_APPLY, call_dsubr_1): Convert fractions
to doubles when calling 'dsubr' functions.
* eq.c (scm_eqv_p, scm_equal_p): Handle fractions.
2003-11-18 19:59:53 +00:00
|
|
|
|
-SCM_COMPLEX_IMAG (y));
|
|
|
|
|
|
else if (SCM_FRACTIONP (y))
|
|
|
|
|
|
/* a/b - c/d = (ad - bc) / bd */
|
2004-08-03 15:55:42 +00:00
|
|
|
|
return scm_i_make_ratio (scm_difference (scm_product (SCM_FRACTION_NUMERATOR (x), SCM_FRACTION_DENOMINATOR (y)),
|
* print.c (scm_iprin1): Handle fractions.
* objects.h (scm_class_fraction): New.
* objects.c (scm_class_fraction): New.
(scm_class_of): Handle fractions.
* hash.c (scm_hasher): Handle fractions.
* numbers.c: New code for handling fraction all over the place.
(scm_odd_p, scm_even_p): Handle inexact integers.
(scm_rational_p): New function, same as scm_real_p.
(scm_round_number, scm_truncate_number, scm_ceiling, scm_floor):
New exact functions that replace the inexact 'dsubr'
implementations.
(scm_numerator, scm_denominator): New.
* numbers.h (SCM_NUMP): Recognize fractions.
(SCM_FRACTIONP, SCM_SLOPPY_FRACTIONP, SCM_FRACTION_NUMERATOR,
SCM_FRACTION_DENOMINATOR, SCM_FRACTION_SET_NUMERATOR,
SCM_FRACTION_SET_DENOMINATOR, SCM_FRACTION_REDUCED_BIT,
SCM_FRACTION_REDUCED_SET, SCM_FRACTION_REDUCED_CLEAR,
SCM_FRACTION_REDUCED): New.
(scm_floor, scm_ceiling, scm_truncate_number, scm_round_number):
New prototypes.
(scm_make_ratio, scm_rationalize, scm_numerator, scm_denominator,
scm_rational_p): New prototypes.
(scm_i_dbl2num, scm_i_fraction2double, scm_i_fraction_equalp,
scm_i_print_fraction): New prototypes.
* goops.c (create_standard_classes): Create "<fraction>" class.
* gc-mark.c (scm_gc_mark_dependencies): Handle fractions.
* gc-card.c (scm_i_sweep_card): Include scm_tc16_fraction as a
case in the switch, but do nothing for now.
* eval.c (SCM_CEVAL, SCM_APPLY, call_dsubr_1): Convert fractions
to doubles when calling 'dsubr' functions.
* eq.c (scm_eqv_p, scm_equal_p): Handle fractions.
2003-11-18 19:59:53 +00:00
|
|
|
|
scm_product (SCM_FRACTION_NUMERATOR (y), SCM_FRACTION_DENOMINATOR (x))),
|
|
|
|
|
|
scm_product (SCM_FRACTION_DENOMINATOR (x), SCM_FRACTION_DENOMINATOR (y)));
|
2003-07-13 16:13:57 +00:00
|
|
|
|
else
|
|
|
|
|
|
SCM_WTA_DISPATCH_2 (g_difference, x, y, SCM_ARGn, s_difference);
|
2000-05-09 12:58:53 +00:00
|
|
|
|
}
|
2003-07-13 16:13:57 +00:00
|
|
|
|
else
|
2000-05-09 12:58:53 +00:00
|
|
|
|
SCM_WTA_DISPATCH_2 (g_difference, x, y, SCM_ARG1, s_difference);
|
1996-07-25 22:56:11 +00:00
|
|
|
|
}
|
2001-05-06 01:26:23 +00:00
|
|
|
|
#undef FUNC_NAME
|
1996-07-25 22:56:11 +00:00
|
|
|
|
|
2003-04-04 21:49:44 +00:00
|
|
|
|
|
2005-04-14 00:35:50 +00:00
|
|
|
|
SCM_DEFINE (scm_oneminus, "1-", 1, 0, 0,
|
|
|
|
|
|
(SCM x),
|
|
|
|
|
|
"Return @math{@var{x}-1}.")
|
|
|
|
|
|
#define FUNC_NAME s_scm_oneminus
|
|
|
|
|
|
{
|
|
|
|
|
|
return scm_difference (x, SCM_I_MAKINUM (1));
|
|
|
|
|
|
}
|
|
|
|
|
|
#undef FUNC_NAME
|
|
|
|
|
|
|
|
|
|
|
|
|
2009-09-06 16:47:19 +02:00
|
|
|
|
SCM_PRIMITIVE_GENERIC (scm_i_product, "*", 0, 2, 1,
|
|
|
|
|
|
(SCM x, SCM y, SCM rest),
|
|
|
|
|
|
"Return the product of all arguments. If called without arguments,\n"
|
|
|
|
|
|
"1 is returned.")
|
|
|
|
|
|
#define FUNC_NAME s_scm_i_product
|
|
|
|
|
|
{
|
|
|
|
|
|
while (!scm_is_null (rest))
|
|
|
|
|
|
{ x = scm_product (x, y);
|
|
|
|
|
|
y = scm_car (rest);
|
|
|
|
|
|
rest = scm_cdr (rest);
|
|
|
|
|
|
}
|
|
|
|
|
|
return scm_product (x, y);
|
|
|
|
|
|
}
|
|
|
|
|
|
#undef FUNC_NAME
|
|
|
|
|
|
|
|
|
|
|
|
#define s_product s_scm_i_product
|
|
|
|
|
|
#define g_product g_scm_i_product
|
|
|
|
|
|
|
1996-07-25 22:56:11 +00:00
|
|
|
|
SCM
|
1999-12-12 20:35:02 +00:00
|
|
|
|
scm_product (SCM x, SCM y)
|
1996-07-25 22:56:11 +00:00
|
|
|
|
{
|
2007-12-08 16:00:56 +00:00
|
|
|
|
if (SCM_UNLIKELY (SCM_UNBNDP (y)))
|
2003-07-13 16:13:57 +00:00
|
|
|
|
{
|
|
|
|
|
|
if (SCM_UNBNDP (x))
|
2004-07-08 15:54:05 +00:00
|
|
|
|
return SCM_I_MAKINUM (1L);
|
2003-07-13 16:13:57 +00:00
|
|
|
|
else if (SCM_NUMBERP (x))
|
|
|
|
|
|
return x;
|
|
|
|
|
|
else
|
|
|
|
|
|
SCM_WTA_DISPATCH_1 (g_product, x, SCM_ARG1, s_product);
|
1999-01-10 07:38:39 +00:00
|
|
|
|
}
|
2003-04-04 21:49:44 +00:00
|
|
|
|
|
2007-12-08 16:00:56 +00:00
|
|
|
|
if (SCM_LIKELY (SCM_I_INUMP (x)))
|
2003-07-13 16:13:57 +00:00
|
|
|
|
{
|
|
|
|
|
|
long xx;
|
2000-05-03 12:35:56 +00:00
|
|
|
|
|
2003-07-13 16:13:57 +00:00
|
|
|
|
intbig:
|
2004-07-23 15:43:02 +00:00
|
|
|
|
xx = SCM_I_INUM (x);
|
2000-05-03 12:35:56 +00:00
|
|
|
|
|
2003-07-13 16:13:57 +00:00
|
|
|
|
switch (xx)
|
|
|
|
|
|
{
|
2003-04-04 21:49:44 +00:00
|
|
|
|
case 0: return x; break;
|
|
|
|
|
|
case 1: return y; break;
|
2003-07-13 16:13:57 +00:00
|
|
|
|
}
|
2000-05-03 12:35:56 +00:00
|
|
|
|
|
2007-12-08 16:00:56 +00:00
|
|
|
|
if (SCM_LIKELY (SCM_I_INUMP (y)))
|
2003-07-13 16:13:57 +00:00
|
|
|
|
{
|
2004-07-23 15:43:02 +00:00
|
|
|
|
long yy = SCM_I_INUM (y);
|
2003-07-13 16:13:57 +00:00
|
|
|
|
long kk = xx * yy;
|
2004-07-08 15:54:05 +00:00
|
|
|
|
SCM k = SCM_I_MAKINUM (kk);
|
2004-07-23 15:43:02 +00:00
|
|
|
|
if ((kk == SCM_I_INUM (k)) && (kk / xx == yy))
|
2003-07-13 16:13:57 +00:00
|
|
|
|
return k;
|
|
|
|
|
|
else
|
|
|
|
|
|
{
|
|
|
|
|
|
SCM result = scm_i_long2big (xx);
|
|
|
|
|
|
mpz_mul_si (SCM_I_BIG_MPZ (result), SCM_I_BIG_MPZ (result), yy);
|
|
|
|
|
|
return scm_i_normbig (result);
|
|
|
|
|
|
}
|
|
|
|
|
|
}
|
|
|
|
|
|
else if (SCM_BIGP (y))
|
|
|
|
|
|
{
|
|
|
|
|
|
SCM result = scm_i_mkbig ();
|
|
|
|
|
|
mpz_mul_si (SCM_I_BIG_MPZ (result), SCM_I_BIG_MPZ (y), xx);
|
|
|
|
|
|
scm_remember_upto_here_1 (y);
|
|
|
|
|
|
return result;
|
|
|
|
|
|
}
|
|
|
|
|
|
else if (SCM_REALP (y))
|
(scm_is_rational): New.
(scm_i_short2big, scm_i_int2big, scm_i_uint2big, scm_i_size2big,
scm_i_ptrdiff2big, scm_i_long_long2big, scm_i_ulong_long2big):
Removed prototypes.
(scm_make_real, scm_num2dbl, scm_float2num, scm_double2num):
Discouraged by moving to discouraged.h and discouraged.c.
Replaced all uses with scm_from_double.
(scm_num2float, scm_num2double): Discouraged by moving prototype
to discouraged.h and rewriting in terms of scm_to_double.
Replaced all uses with scm_to_double.
(scm_to_double): Do not implement in terms of scm_num2dbl, use
explicit code.
(scm_from_double): Do not implement in terms of scm_make_real, use
explicit code.
2004-08-03 15:03:35 +00:00
|
|
|
|
return scm_from_double (xx * SCM_REAL_VALUE (y));
|
2003-07-13 16:13:57 +00:00
|
|
|
|
else if (SCM_COMPLEXP (y))
|
2004-08-03 17:12:14 +00:00
|
|
|
|
return scm_c_make_rectangular (xx * SCM_COMPLEX_REAL (y),
|
2003-07-13 16:13:57 +00:00
|
|
|
|
xx * SCM_COMPLEX_IMAG (y));
|
* print.c (scm_iprin1): Handle fractions.
* objects.h (scm_class_fraction): New.
* objects.c (scm_class_fraction): New.
(scm_class_of): Handle fractions.
* hash.c (scm_hasher): Handle fractions.
* numbers.c: New code for handling fraction all over the place.
(scm_odd_p, scm_even_p): Handle inexact integers.
(scm_rational_p): New function, same as scm_real_p.
(scm_round_number, scm_truncate_number, scm_ceiling, scm_floor):
New exact functions that replace the inexact 'dsubr'
implementations.
(scm_numerator, scm_denominator): New.
* numbers.h (SCM_NUMP): Recognize fractions.
(SCM_FRACTIONP, SCM_SLOPPY_FRACTIONP, SCM_FRACTION_NUMERATOR,
SCM_FRACTION_DENOMINATOR, SCM_FRACTION_SET_NUMERATOR,
SCM_FRACTION_SET_DENOMINATOR, SCM_FRACTION_REDUCED_BIT,
SCM_FRACTION_REDUCED_SET, SCM_FRACTION_REDUCED_CLEAR,
SCM_FRACTION_REDUCED): New.
(scm_floor, scm_ceiling, scm_truncate_number, scm_round_number):
New prototypes.
(scm_make_ratio, scm_rationalize, scm_numerator, scm_denominator,
scm_rational_p): New prototypes.
(scm_i_dbl2num, scm_i_fraction2double, scm_i_fraction_equalp,
scm_i_print_fraction): New prototypes.
* goops.c (create_standard_classes): Create "<fraction>" class.
* gc-mark.c (scm_gc_mark_dependencies): Handle fractions.
* gc-card.c (scm_i_sweep_card): Include scm_tc16_fraction as a
case in the switch, but do nothing for now.
* eval.c (SCM_CEVAL, SCM_APPLY, call_dsubr_1): Convert fractions
to doubles when calling 'dsubr' functions.
* eq.c (scm_eqv_p, scm_equal_p): Handle fractions.
2003-11-18 19:59:53 +00:00
|
|
|
|
else if (SCM_FRACTIONP (y))
|
2004-08-03 15:55:42 +00:00
|
|
|
|
return scm_i_make_ratio (scm_product (x, SCM_FRACTION_NUMERATOR (y)),
|
* print.c (scm_iprin1): Handle fractions.
* objects.h (scm_class_fraction): New.
* objects.c (scm_class_fraction): New.
(scm_class_of): Handle fractions.
* hash.c (scm_hasher): Handle fractions.
* numbers.c: New code for handling fraction all over the place.
(scm_odd_p, scm_even_p): Handle inexact integers.
(scm_rational_p): New function, same as scm_real_p.
(scm_round_number, scm_truncate_number, scm_ceiling, scm_floor):
New exact functions that replace the inexact 'dsubr'
implementations.
(scm_numerator, scm_denominator): New.
* numbers.h (SCM_NUMP): Recognize fractions.
(SCM_FRACTIONP, SCM_SLOPPY_FRACTIONP, SCM_FRACTION_NUMERATOR,
SCM_FRACTION_DENOMINATOR, SCM_FRACTION_SET_NUMERATOR,
SCM_FRACTION_SET_DENOMINATOR, SCM_FRACTION_REDUCED_BIT,
SCM_FRACTION_REDUCED_SET, SCM_FRACTION_REDUCED_CLEAR,
SCM_FRACTION_REDUCED): New.
(scm_floor, scm_ceiling, scm_truncate_number, scm_round_number):
New prototypes.
(scm_make_ratio, scm_rationalize, scm_numerator, scm_denominator,
scm_rational_p): New prototypes.
(scm_i_dbl2num, scm_i_fraction2double, scm_i_fraction_equalp,
scm_i_print_fraction): New prototypes.
* goops.c (create_standard_classes): Create "<fraction>" class.
* gc-mark.c (scm_gc_mark_dependencies): Handle fractions.
* gc-card.c (scm_i_sweep_card): Include scm_tc16_fraction as a
case in the switch, but do nothing for now.
* eval.c (SCM_CEVAL, SCM_APPLY, call_dsubr_1): Convert fractions
to doubles when calling 'dsubr' functions.
* eq.c (scm_eqv_p, scm_equal_p): Handle fractions.
2003-11-18 19:59:53 +00:00
|
|
|
|
SCM_FRACTION_DENOMINATOR (y));
|
2003-07-13 16:13:57 +00:00
|
|
|
|
else
|
|
|
|
|
|
SCM_WTA_DISPATCH_2 (g_product, x, y, SCM_ARGn, s_product);
|
2000-05-03 12:35:56 +00:00
|
|
|
|
}
|
2003-07-13 16:13:57 +00:00
|
|
|
|
else if (SCM_BIGP (x))
|
|
|
|
|
|
{
|
2004-07-23 15:43:02 +00:00
|
|
|
|
if (SCM_I_INUMP (y))
|
2003-07-13 16:13:57 +00:00
|
|
|
|
{
|
|
|
|
|
|
SCM_SWAP (x, y);
|
|
|
|
|
|
goto intbig;
|
|
|
|
|
|
}
|
|
|
|
|
|
else if (SCM_BIGP (y))
|
|
|
|
|
|
{
|
|
|
|
|
|
SCM result = scm_i_mkbig ();
|
|
|
|
|
|
mpz_mul (SCM_I_BIG_MPZ (result),
|
|
|
|
|
|
SCM_I_BIG_MPZ (x),
|
|
|
|
|
|
SCM_I_BIG_MPZ (y));
|
|
|
|
|
|
scm_remember_upto_here_2 (x, y);
|
|
|
|
|
|
return result;
|
|
|
|
|
|
}
|
|
|
|
|
|
else if (SCM_REALP (y))
|
|
|
|
|
|
{
|
|
|
|
|
|
double result = mpz_get_d (SCM_I_BIG_MPZ (x)) * SCM_REAL_VALUE (y);
|
|
|
|
|
|
scm_remember_upto_here_1 (x);
|
(scm_is_rational): New.
(scm_i_short2big, scm_i_int2big, scm_i_uint2big, scm_i_size2big,
scm_i_ptrdiff2big, scm_i_long_long2big, scm_i_ulong_long2big):
Removed prototypes.
(scm_make_real, scm_num2dbl, scm_float2num, scm_double2num):
Discouraged by moving to discouraged.h and discouraged.c.
Replaced all uses with scm_from_double.
(scm_num2float, scm_num2double): Discouraged by moving prototype
to discouraged.h and rewriting in terms of scm_to_double.
Replaced all uses with scm_to_double.
(scm_to_double): Do not implement in terms of scm_num2dbl, use
explicit code.
(scm_from_double): Do not implement in terms of scm_make_real, use
explicit code.
2004-08-03 15:03:35 +00:00
|
|
|
|
return scm_from_double (result);
|
2003-07-13 16:13:57 +00:00
|
|
|
|
}
|
|
|
|
|
|
else if (SCM_COMPLEXP (y))
|
|
|
|
|
|
{
|
|
|
|
|
|
double z = mpz_get_d (SCM_I_BIG_MPZ (x));
|
|
|
|
|
|
scm_remember_upto_here_1 (x);
|
2004-08-03 17:12:14 +00:00
|
|
|
|
return scm_c_make_rectangular (z * SCM_COMPLEX_REAL (y),
|
2003-07-13 16:13:57 +00:00
|
|
|
|
z * SCM_COMPLEX_IMAG (y));
|
|
|
|
|
|
}
|
* print.c (scm_iprin1): Handle fractions.
* objects.h (scm_class_fraction): New.
* objects.c (scm_class_fraction): New.
(scm_class_of): Handle fractions.
* hash.c (scm_hasher): Handle fractions.
* numbers.c: New code for handling fraction all over the place.
(scm_odd_p, scm_even_p): Handle inexact integers.
(scm_rational_p): New function, same as scm_real_p.
(scm_round_number, scm_truncate_number, scm_ceiling, scm_floor):
New exact functions that replace the inexact 'dsubr'
implementations.
(scm_numerator, scm_denominator): New.
* numbers.h (SCM_NUMP): Recognize fractions.
(SCM_FRACTIONP, SCM_SLOPPY_FRACTIONP, SCM_FRACTION_NUMERATOR,
SCM_FRACTION_DENOMINATOR, SCM_FRACTION_SET_NUMERATOR,
SCM_FRACTION_SET_DENOMINATOR, SCM_FRACTION_REDUCED_BIT,
SCM_FRACTION_REDUCED_SET, SCM_FRACTION_REDUCED_CLEAR,
SCM_FRACTION_REDUCED): New.
(scm_floor, scm_ceiling, scm_truncate_number, scm_round_number):
New prototypes.
(scm_make_ratio, scm_rationalize, scm_numerator, scm_denominator,
scm_rational_p): New prototypes.
(scm_i_dbl2num, scm_i_fraction2double, scm_i_fraction_equalp,
scm_i_print_fraction): New prototypes.
* goops.c (create_standard_classes): Create "<fraction>" class.
* gc-mark.c (scm_gc_mark_dependencies): Handle fractions.
* gc-card.c (scm_i_sweep_card): Include scm_tc16_fraction as a
case in the switch, but do nothing for now.
* eval.c (SCM_CEVAL, SCM_APPLY, call_dsubr_1): Convert fractions
to doubles when calling 'dsubr' functions.
* eq.c (scm_eqv_p, scm_equal_p): Handle fractions.
2003-11-18 19:59:53 +00:00
|
|
|
|
else if (SCM_FRACTIONP (y))
|
2004-08-03 15:55:42 +00:00
|
|
|
|
return scm_i_make_ratio (scm_product (x, SCM_FRACTION_NUMERATOR (y)),
|
* print.c (scm_iprin1): Handle fractions.
* objects.h (scm_class_fraction): New.
* objects.c (scm_class_fraction): New.
(scm_class_of): Handle fractions.
* hash.c (scm_hasher): Handle fractions.
* numbers.c: New code for handling fraction all over the place.
(scm_odd_p, scm_even_p): Handle inexact integers.
(scm_rational_p): New function, same as scm_real_p.
(scm_round_number, scm_truncate_number, scm_ceiling, scm_floor):
New exact functions that replace the inexact 'dsubr'
implementations.
(scm_numerator, scm_denominator): New.
* numbers.h (SCM_NUMP): Recognize fractions.
(SCM_FRACTIONP, SCM_SLOPPY_FRACTIONP, SCM_FRACTION_NUMERATOR,
SCM_FRACTION_DENOMINATOR, SCM_FRACTION_SET_NUMERATOR,
SCM_FRACTION_SET_DENOMINATOR, SCM_FRACTION_REDUCED_BIT,
SCM_FRACTION_REDUCED_SET, SCM_FRACTION_REDUCED_CLEAR,
SCM_FRACTION_REDUCED): New.
(scm_floor, scm_ceiling, scm_truncate_number, scm_round_number):
New prototypes.
(scm_make_ratio, scm_rationalize, scm_numerator, scm_denominator,
scm_rational_p): New prototypes.
(scm_i_dbl2num, scm_i_fraction2double, scm_i_fraction_equalp,
scm_i_print_fraction): New prototypes.
* goops.c (create_standard_classes): Create "<fraction>" class.
* gc-mark.c (scm_gc_mark_dependencies): Handle fractions.
* gc-card.c (scm_i_sweep_card): Include scm_tc16_fraction as a
case in the switch, but do nothing for now.
* eval.c (SCM_CEVAL, SCM_APPLY, call_dsubr_1): Convert fractions
to doubles when calling 'dsubr' functions.
* eq.c (scm_eqv_p, scm_equal_p): Handle fractions.
2003-11-18 19:59:53 +00:00
|
|
|
|
SCM_FRACTION_DENOMINATOR (y));
|
2003-07-13 16:13:57 +00:00
|
|
|
|
else
|
|
|
|
|
|
SCM_WTA_DISPATCH_2 (g_product, x, y, SCM_ARGn, s_product);
|
2000-05-03 12:35:56 +00:00
|
|
|
|
}
|
2003-07-13 16:13:57 +00:00
|
|
|
|
else if (SCM_REALP (x))
|
|
|
|
|
|
{
|
2004-07-23 15:43:02 +00:00
|
|
|
|
if (SCM_I_INUMP (y))
|
2007-01-15 23:42:45 +00:00
|
|
|
|
{
|
|
|
|
|
|
/* inexact*exact0 => exact 0, per R5RS "Exactness" section */
|
|
|
|
|
|
if (scm_is_eq (y, SCM_INUM0))
|
|
|
|
|
|
return y;
|
|
|
|
|
|
return scm_from_double (SCM_I_INUM (y) * SCM_REAL_VALUE (x));
|
|
|
|
|
|
}
|
2003-07-13 16:13:57 +00:00
|
|
|
|
else if (SCM_BIGP (y))
|
|
|
|
|
|
{
|
|
|
|
|
|
double result = mpz_get_d (SCM_I_BIG_MPZ (y)) * SCM_REAL_VALUE (x);
|
|
|
|
|
|
scm_remember_upto_here_1 (y);
|
(scm_is_rational): New.
(scm_i_short2big, scm_i_int2big, scm_i_uint2big, scm_i_size2big,
scm_i_ptrdiff2big, scm_i_long_long2big, scm_i_ulong_long2big):
Removed prototypes.
(scm_make_real, scm_num2dbl, scm_float2num, scm_double2num):
Discouraged by moving to discouraged.h and discouraged.c.
Replaced all uses with scm_from_double.
(scm_num2float, scm_num2double): Discouraged by moving prototype
to discouraged.h and rewriting in terms of scm_to_double.
Replaced all uses with scm_to_double.
(scm_to_double): Do not implement in terms of scm_num2dbl, use
explicit code.
(scm_from_double): Do not implement in terms of scm_make_real, use
explicit code.
2004-08-03 15:03:35 +00:00
|
|
|
|
return scm_from_double (result);
|
2003-07-13 16:13:57 +00:00
|
|
|
|
}
|
|
|
|
|
|
else if (SCM_REALP (y))
|
(scm_is_rational): New.
(scm_i_short2big, scm_i_int2big, scm_i_uint2big, scm_i_size2big,
scm_i_ptrdiff2big, scm_i_long_long2big, scm_i_ulong_long2big):
Removed prototypes.
(scm_make_real, scm_num2dbl, scm_float2num, scm_double2num):
Discouraged by moving to discouraged.h and discouraged.c.
Replaced all uses with scm_from_double.
(scm_num2float, scm_num2double): Discouraged by moving prototype
to discouraged.h and rewriting in terms of scm_to_double.
Replaced all uses with scm_to_double.
(scm_to_double): Do not implement in terms of scm_num2dbl, use
explicit code.
(scm_from_double): Do not implement in terms of scm_make_real, use
explicit code.
2004-08-03 15:03:35 +00:00
|
|
|
|
return scm_from_double (SCM_REAL_VALUE (x) * SCM_REAL_VALUE (y));
|
2003-07-13 16:13:57 +00:00
|
|
|
|
else if (SCM_COMPLEXP (y))
|
2004-08-03 17:12:14 +00:00
|
|
|
|
return scm_c_make_rectangular (SCM_REAL_VALUE (x) * SCM_COMPLEX_REAL (y),
|
2003-07-13 16:13:57 +00:00
|
|
|
|
SCM_REAL_VALUE (x) * SCM_COMPLEX_IMAG (y));
|
* print.c (scm_iprin1): Handle fractions.
* objects.h (scm_class_fraction): New.
* objects.c (scm_class_fraction): New.
(scm_class_of): Handle fractions.
* hash.c (scm_hasher): Handle fractions.
* numbers.c: New code for handling fraction all over the place.
(scm_odd_p, scm_even_p): Handle inexact integers.
(scm_rational_p): New function, same as scm_real_p.
(scm_round_number, scm_truncate_number, scm_ceiling, scm_floor):
New exact functions that replace the inexact 'dsubr'
implementations.
(scm_numerator, scm_denominator): New.
* numbers.h (SCM_NUMP): Recognize fractions.
(SCM_FRACTIONP, SCM_SLOPPY_FRACTIONP, SCM_FRACTION_NUMERATOR,
SCM_FRACTION_DENOMINATOR, SCM_FRACTION_SET_NUMERATOR,
SCM_FRACTION_SET_DENOMINATOR, SCM_FRACTION_REDUCED_BIT,
SCM_FRACTION_REDUCED_SET, SCM_FRACTION_REDUCED_CLEAR,
SCM_FRACTION_REDUCED): New.
(scm_floor, scm_ceiling, scm_truncate_number, scm_round_number):
New prototypes.
(scm_make_ratio, scm_rationalize, scm_numerator, scm_denominator,
scm_rational_p): New prototypes.
(scm_i_dbl2num, scm_i_fraction2double, scm_i_fraction_equalp,
scm_i_print_fraction): New prototypes.
* goops.c (create_standard_classes): Create "<fraction>" class.
* gc-mark.c (scm_gc_mark_dependencies): Handle fractions.
* gc-card.c (scm_i_sweep_card): Include scm_tc16_fraction as a
case in the switch, but do nothing for now.
* eval.c (SCM_CEVAL, SCM_APPLY, call_dsubr_1): Convert fractions
to doubles when calling 'dsubr' functions.
* eq.c (scm_eqv_p, scm_equal_p): Handle fractions.
2003-11-18 19:59:53 +00:00
|
|
|
|
else if (SCM_FRACTIONP (y))
|
(scm_is_rational): New.
(scm_i_short2big, scm_i_int2big, scm_i_uint2big, scm_i_size2big,
scm_i_ptrdiff2big, scm_i_long_long2big, scm_i_ulong_long2big):
Removed prototypes.
(scm_make_real, scm_num2dbl, scm_float2num, scm_double2num):
Discouraged by moving to discouraged.h and discouraged.c.
Replaced all uses with scm_from_double.
(scm_num2float, scm_num2double): Discouraged by moving prototype
to discouraged.h and rewriting in terms of scm_to_double.
Replaced all uses with scm_to_double.
(scm_to_double): Do not implement in terms of scm_num2dbl, use
explicit code.
(scm_from_double): Do not implement in terms of scm_make_real, use
explicit code.
2004-08-03 15:03:35 +00:00
|
|
|
|
return scm_from_double (SCM_REAL_VALUE (x) * scm_i_fraction2double (y));
|
2003-07-13 16:13:57 +00:00
|
|
|
|
else
|
|
|
|
|
|
SCM_WTA_DISPATCH_2 (g_product, x, y, SCM_ARGn, s_product);
|
2000-05-03 12:35:56 +00:00
|
|
|
|
}
|
2003-07-13 16:13:57 +00:00
|
|
|
|
else if (SCM_COMPLEXP (x))
|
|
|
|
|
|
{
|
2004-07-23 15:43:02 +00:00
|
|
|
|
if (SCM_I_INUMP (y))
|
2007-01-15 23:42:45 +00:00
|
|
|
|
{
|
|
|
|
|
|
/* inexact*exact0 => exact 0, per R5RS "Exactness" section */
|
|
|
|
|
|
if (scm_is_eq (y, SCM_INUM0))
|
|
|
|
|
|
return y;
|
|
|
|
|
|
return scm_c_make_rectangular (SCM_I_INUM (y) * SCM_COMPLEX_REAL (x),
|
|
|
|
|
|
SCM_I_INUM (y) * SCM_COMPLEX_IMAG (x));
|
|
|
|
|
|
}
|
2003-07-13 16:13:57 +00:00
|
|
|
|
else if (SCM_BIGP (y))
|
|
|
|
|
|
{
|
|
|
|
|
|
double z = mpz_get_d (SCM_I_BIG_MPZ (y));
|
|
|
|
|
|
scm_remember_upto_here_1 (y);
|
2004-08-03 17:12:14 +00:00
|
|
|
|
return scm_c_make_rectangular (z * SCM_COMPLEX_REAL (x),
|
2003-07-17 23:38:34 +00:00
|
|
|
|
z * SCM_COMPLEX_IMAG (x));
|
2003-07-13 16:13:57 +00:00
|
|
|
|
}
|
|
|
|
|
|
else if (SCM_REALP (y))
|
2004-08-03 17:12:14 +00:00
|
|
|
|
return scm_c_make_rectangular (SCM_REAL_VALUE (y) * SCM_COMPLEX_REAL (x),
|
2003-07-13 16:13:57 +00:00
|
|
|
|
SCM_REAL_VALUE (y) * SCM_COMPLEX_IMAG (x));
|
|
|
|
|
|
else if (SCM_COMPLEXP (y))
|
|
|
|
|
|
{
|
2004-08-03 17:12:14 +00:00
|
|
|
|
return scm_c_make_rectangular (SCM_COMPLEX_REAL (x) * SCM_COMPLEX_REAL (y)
|
2003-07-13 16:13:57 +00:00
|
|
|
|
- SCM_COMPLEX_IMAG (x) * SCM_COMPLEX_IMAG (y),
|
|
|
|
|
|
SCM_COMPLEX_REAL (x) * SCM_COMPLEX_IMAG (y)
|
|
|
|
|
|
+ SCM_COMPLEX_IMAG (x) * SCM_COMPLEX_REAL (y));
|
|
|
|
|
|
}
|
* print.c (scm_iprin1): Handle fractions.
* objects.h (scm_class_fraction): New.
* objects.c (scm_class_fraction): New.
(scm_class_of): Handle fractions.
* hash.c (scm_hasher): Handle fractions.
* numbers.c: New code for handling fraction all over the place.
(scm_odd_p, scm_even_p): Handle inexact integers.
(scm_rational_p): New function, same as scm_real_p.
(scm_round_number, scm_truncate_number, scm_ceiling, scm_floor):
New exact functions that replace the inexact 'dsubr'
implementations.
(scm_numerator, scm_denominator): New.
* numbers.h (SCM_NUMP): Recognize fractions.
(SCM_FRACTIONP, SCM_SLOPPY_FRACTIONP, SCM_FRACTION_NUMERATOR,
SCM_FRACTION_DENOMINATOR, SCM_FRACTION_SET_NUMERATOR,
SCM_FRACTION_SET_DENOMINATOR, SCM_FRACTION_REDUCED_BIT,
SCM_FRACTION_REDUCED_SET, SCM_FRACTION_REDUCED_CLEAR,
SCM_FRACTION_REDUCED): New.
(scm_floor, scm_ceiling, scm_truncate_number, scm_round_number):
New prototypes.
(scm_make_ratio, scm_rationalize, scm_numerator, scm_denominator,
scm_rational_p): New prototypes.
(scm_i_dbl2num, scm_i_fraction2double, scm_i_fraction_equalp,
scm_i_print_fraction): New prototypes.
* goops.c (create_standard_classes): Create "<fraction>" class.
* gc-mark.c (scm_gc_mark_dependencies): Handle fractions.
* gc-card.c (scm_i_sweep_card): Include scm_tc16_fraction as a
case in the switch, but do nothing for now.
* eval.c (SCM_CEVAL, SCM_APPLY, call_dsubr_1): Convert fractions
to doubles when calling 'dsubr' functions.
* eq.c (scm_eqv_p, scm_equal_p): Handle fractions.
2003-11-18 19:59:53 +00:00
|
|
|
|
else if (SCM_FRACTIONP (y))
|
|
|
|
|
|
{
|
|
|
|
|
|
double yy = scm_i_fraction2double (y);
|
2004-08-03 17:12:14 +00:00
|
|
|
|
return scm_c_make_rectangular (yy * SCM_COMPLEX_REAL (x),
|
* print.c (scm_iprin1): Handle fractions.
* objects.h (scm_class_fraction): New.
* objects.c (scm_class_fraction): New.
(scm_class_of): Handle fractions.
* hash.c (scm_hasher): Handle fractions.
* numbers.c: New code for handling fraction all over the place.
(scm_odd_p, scm_even_p): Handle inexact integers.
(scm_rational_p): New function, same as scm_real_p.
(scm_round_number, scm_truncate_number, scm_ceiling, scm_floor):
New exact functions that replace the inexact 'dsubr'
implementations.
(scm_numerator, scm_denominator): New.
* numbers.h (SCM_NUMP): Recognize fractions.
(SCM_FRACTIONP, SCM_SLOPPY_FRACTIONP, SCM_FRACTION_NUMERATOR,
SCM_FRACTION_DENOMINATOR, SCM_FRACTION_SET_NUMERATOR,
SCM_FRACTION_SET_DENOMINATOR, SCM_FRACTION_REDUCED_BIT,
SCM_FRACTION_REDUCED_SET, SCM_FRACTION_REDUCED_CLEAR,
SCM_FRACTION_REDUCED): New.
(scm_floor, scm_ceiling, scm_truncate_number, scm_round_number):
New prototypes.
(scm_make_ratio, scm_rationalize, scm_numerator, scm_denominator,
scm_rational_p): New prototypes.
(scm_i_dbl2num, scm_i_fraction2double, scm_i_fraction_equalp,
scm_i_print_fraction): New prototypes.
* goops.c (create_standard_classes): Create "<fraction>" class.
* gc-mark.c (scm_gc_mark_dependencies): Handle fractions.
* gc-card.c (scm_i_sweep_card): Include scm_tc16_fraction as a
case in the switch, but do nothing for now.
* eval.c (SCM_CEVAL, SCM_APPLY, call_dsubr_1): Convert fractions
to doubles when calling 'dsubr' functions.
* eq.c (scm_eqv_p, scm_equal_p): Handle fractions.
2003-11-18 19:59:53 +00:00
|
|
|
|
yy * SCM_COMPLEX_IMAG (x));
|
|
|
|
|
|
}
|
|
|
|
|
|
else
|
|
|
|
|
|
SCM_WTA_DISPATCH_2 (g_product, x, y, SCM_ARGn, s_product);
|
|
|
|
|
|
}
|
|
|
|
|
|
else if (SCM_FRACTIONP (x))
|
|
|
|
|
|
{
|
2004-07-23 15:43:02 +00:00
|
|
|
|
if (SCM_I_INUMP (y))
|
2004-08-03 15:55:42 +00:00
|
|
|
|
return scm_i_make_ratio (scm_product (y, SCM_FRACTION_NUMERATOR (x)),
|
* print.c (scm_iprin1): Handle fractions.
* objects.h (scm_class_fraction): New.
* objects.c (scm_class_fraction): New.
(scm_class_of): Handle fractions.
* hash.c (scm_hasher): Handle fractions.
* numbers.c: New code for handling fraction all over the place.
(scm_odd_p, scm_even_p): Handle inexact integers.
(scm_rational_p): New function, same as scm_real_p.
(scm_round_number, scm_truncate_number, scm_ceiling, scm_floor):
New exact functions that replace the inexact 'dsubr'
implementations.
(scm_numerator, scm_denominator): New.
* numbers.h (SCM_NUMP): Recognize fractions.
(SCM_FRACTIONP, SCM_SLOPPY_FRACTIONP, SCM_FRACTION_NUMERATOR,
SCM_FRACTION_DENOMINATOR, SCM_FRACTION_SET_NUMERATOR,
SCM_FRACTION_SET_DENOMINATOR, SCM_FRACTION_REDUCED_BIT,
SCM_FRACTION_REDUCED_SET, SCM_FRACTION_REDUCED_CLEAR,
SCM_FRACTION_REDUCED): New.
(scm_floor, scm_ceiling, scm_truncate_number, scm_round_number):
New prototypes.
(scm_make_ratio, scm_rationalize, scm_numerator, scm_denominator,
scm_rational_p): New prototypes.
(scm_i_dbl2num, scm_i_fraction2double, scm_i_fraction_equalp,
scm_i_print_fraction): New prototypes.
* goops.c (create_standard_classes): Create "<fraction>" class.
* gc-mark.c (scm_gc_mark_dependencies): Handle fractions.
* gc-card.c (scm_i_sweep_card): Include scm_tc16_fraction as a
case in the switch, but do nothing for now.
* eval.c (SCM_CEVAL, SCM_APPLY, call_dsubr_1): Convert fractions
to doubles when calling 'dsubr' functions.
* eq.c (scm_eqv_p, scm_equal_p): Handle fractions.
2003-11-18 19:59:53 +00:00
|
|
|
|
SCM_FRACTION_DENOMINATOR (x));
|
|
|
|
|
|
else if (SCM_BIGP (y))
|
2004-08-03 15:55:42 +00:00
|
|
|
|
return scm_i_make_ratio (scm_product (y, SCM_FRACTION_NUMERATOR (x)),
|
* print.c (scm_iprin1): Handle fractions.
* objects.h (scm_class_fraction): New.
* objects.c (scm_class_fraction): New.
(scm_class_of): Handle fractions.
* hash.c (scm_hasher): Handle fractions.
* numbers.c: New code for handling fraction all over the place.
(scm_odd_p, scm_even_p): Handle inexact integers.
(scm_rational_p): New function, same as scm_real_p.
(scm_round_number, scm_truncate_number, scm_ceiling, scm_floor):
New exact functions that replace the inexact 'dsubr'
implementations.
(scm_numerator, scm_denominator): New.
* numbers.h (SCM_NUMP): Recognize fractions.
(SCM_FRACTIONP, SCM_SLOPPY_FRACTIONP, SCM_FRACTION_NUMERATOR,
SCM_FRACTION_DENOMINATOR, SCM_FRACTION_SET_NUMERATOR,
SCM_FRACTION_SET_DENOMINATOR, SCM_FRACTION_REDUCED_BIT,
SCM_FRACTION_REDUCED_SET, SCM_FRACTION_REDUCED_CLEAR,
SCM_FRACTION_REDUCED): New.
(scm_floor, scm_ceiling, scm_truncate_number, scm_round_number):
New prototypes.
(scm_make_ratio, scm_rationalize, scm_numerator, scm_denominator,
scm_rational_p): New prototypes.
(scm_i_dbl2num, scm_i_fraction2double, scm_i_fraction_equalp,
scm_i_print_fraction): New prototypes.
* goops.c (create_standard_classes): Create "<fraction>" class.
* gc-mark.c (scm_gc_mark_dependencies): Handle fractions.
* gc-card.c (scm_i_sweep_card): Include scm_tc16_fraction as a
case in the switch, but do nothing for now.
* eval.c (SCM_CEVAL, SCM_APPLY, call_dsubr_1): Convert fractions
to doubles when calling 'dsubr' functions.
* eq.c (scm_eqv_p, scm_equal_p): Handle fractions.
2003-11-18 19:59:53 +00:00
|
|
|
|
SCM_FRACTION_DENOMINATOR (x));
|
|
|
|
|
|
else if (SCM_REALP (y))
|
(scm_is_rational): New.
(scm_i_short2big, scm_i_int2big, scm_i_uint2big, scm_i_size2big,
scm_i_ptrdiff2big, scm_i_long_long2big, scm_i_ulong_long2big):
Removed prototypes.
(scm_make_real, scm_num2dbl, scm_float2num, scm_double2num):
Discouraged by moving to discouraged.h and discouraged.c.
Replaced all uses with scm_from_double.
(scm_num2float, scm_num2double): Discouraged by moving prototype
to discouraged.h and rewriting in terms of scm_to_double.
Replaced all uses with scm_to_double.
(scm_to_double): Do not implement in terms of scm_num2dbl, use
explicit code.
(scm_from_double): Do not implement in terms of scm_make_real, use
explicit code.
2004-08-03 15:03:35 +00:00
|
|
|
|
return scm_from_double (scm_i_fraction2double (x) * SCM_REAL_VALUE (y));
|
* print.c (scm_iprin1): Handle fractions.
* objects.h (scm_class_fraction): New.
* objects.c (scm_class_fraction): New.
(scm_class_of): Handle fractions.
* hash.c (scm_hasher): Handle fractions.
* numbers.c: New code for handling fraction all over the place.
(scm_odd_p, scm_even_p): Handle inexact integers.
(scm_rational_p): New function, same as scm_real_p.
(scm_round_number, scm_truncate_number, scm_ceiling, scm_floor):
New exact functions that replace the inexact 'dsubr'
implementations.
(scm_numerator, scm_denominator): New.
* numbers.h (SCM_NUMP): Recognize fractions.
(SCM_FRACTIONP, SCM_SLOPPY_FRACTIONP, SCM_FRACTION_NUMERATOR,
SCM_FRACTION_DENOMINATOR, SCM_FRACTION_SET_NUMERATOR,
SCM_FRACTION_SET_DENOMINATOR, SCM_FRACTION_REDUCED_BIT,
SCM_FRACTION_REDUCED_SET, SCM_FRACTION_REDUCED_CLEAR,
SCM_FRACTION_REDUCED): New.
(scm_floor, scm_ceiling, scm_truncate_number, scm_round_number):
New prototypes.
(scm_make_ratio, scm_rationalize, scm_numerator, scm_denominator,
scm_rational_p): New prototypes.
(scm_i_dbl2num, scm_i_fraction2double, scm_i_fraction_equalp,
scm_i_print_fraction): New prototypes.
* goops.c (create_standard_classes): Create "<fraction>" class.
* gc-mark.c (scm_gc_mark_dependencies): Handle fractions.
* gc-card.c (scm_i_sweep_card): Include scm_tc16_fraction as a
case in the switch, but do nothing for now.
* eval.c (SCM_CEVAL, SCM_APPLY, call_dsubr_1): Convert fractions
to doubles when calling 'dsubr' functions.
* eq.c (scm_eqv_p, scm_equal_p): Handle fractions.
2003-11-18 19:59:53 +00:00
|
|
|
|
else if (SCM_COMPLEXP (y))
|
|
|
|
|
|
{
|
|
|
|
|
|
double xx = scm_i_fraction2double (x);
|
2004-08-03 17:12:14 +00:00
|
|
|
|
return scm_c_make_rectangular (xx * SCM_COMPLEX_REAL (y),
|
* print.c (scm_iprin1): Handle fractions.
* objects.h (scm_class_fraction): New.
* objects.c (scm_class_fraction): New.
(scm_class_of): Handle fractions.
* hash.c (scm_hasher): Handle fractions.
* numbers.c: New code for handling fraction all over the place.
(scm_odd_p, scm_even_p): Handle inexact integers.
(scm_rational_p): New function, same as scm_real_p.
(scm_round_number, scm_truncate_number, scm_ceiling, scm_floor):
New exact functions that replace the inexact 'dsubr'
implementations.
(scm_numerator, scm_denominator): New.
* numbers.h (SCM_NUMP): Recognize fractions.
(SCM_FRACTIONP, SCM_SLOPPY_FRACTIONP, SCM_FRACTION_NUMERATOR,
SCM_FRACTION_DENOMINATOR, SCM_FRACTION_SET_NUMERATOR,
SCM_FRACTION_SET_DENOMINATOR, SCM_FRACTION_REDUCED_BIT,
SCM_FRACTION_REDUCED_SET, SCM_FRACTION_REDUCED_CLEAR,
SCM_FRACTION_REDUCED): New.
(scm_floor, scm_ceiling, scm_truncate_number, scm_round_number):
New prototypes.
(scm_make_ratio, scm_rationalize, scm_numerator, scm_denominator,
scm_rational_p): New prototypes.
(scm_i_dbl2num, scm_i_fraction2double, scm_i_fraction_equalp,
scm_i_print_fraction): New prototypes.
* goops.c (create_standard_classes): Create "<fraction>" class.
* gc-mark.c (scm_gc_mark_dependencies): Handle fractions.
* gc-card.c (scm_i_sweep_card): Include scm_tc16_fraction as a
case in the switch, but do nothing for now.
* eval.c (SCM_CEVAL, SCM_APPLY, call_dsubr_1): Convert fractions
to doubles when calling 'dsubr' functions.
* eq.c (scm_eqv_p, scm_equal_p): Handle fractions.
2003-11-18 19:59:53 +00:00
|
|
|
|
xx * SCM_COMPLEX_IMAG (y));
|
|
|
|
|
|
}
|
|
|
|
|
|
else if (SCM_FRACTIONP (y))
|
|
|
|
|
|
/* a/b * c/d = ac / bd */
|
2004-08-03 15:55:42 +00:00
|
|
|
|
return scm_i_make_ratio (scm_product (SCM_FRACTION_NUMERATOR (x),
|
* print.c (scm_iprin1): Handle fractions.
* objects.h (scm_class_fraction): New.
* objects.c (scm_class_fraction): New.
(scm_class_of): Handle fractions.
* hash.c (scm_hasher): Handle fractions.
* numbers.c: New code for handling fraction all over the place.
(scm_odd_p, scm_even_p): Handle inexact integers.
(scm_rational_p): New function, same as scm_real_p.
(scm_round_number, scm_truncate_number, scm_ceiling, scm_floor):
New exact functions that replace the inexact 'dsubr'
implementations.
(scm_numerator, scm_denominator): New.
* numbers.h (SCM_NUMP): Recognize fractions.
(SCM_FRACTIONP, SCM_SLOPPY_FRACTIONP, SCM_FRACTION_NUMERATOR,
SCM_FRACTION_DENOMINATOR, SCM_FRACTION_SET_NUMERATOR,
SCM_FRACTION_SET_DENOMINATOR, SCM_FRACTION_REDUCED_BIT,
SCM_FRACTION_REDUCED_SET, SCM_FRACTION_REDUCED_CLEAR,
SCM_FRACTION_REDUCED): New.
(scm_floor, scm_ceiling, scm_truncate_number, scm_round_number):
New prototypes.
(scm_make_ratio, scm_rationalize, scm_numerator, scm_denominator,
scm_rational_p): New prototypes.
(scm_i_dbl2num, scm_i_fraction2double, scm_i_fraction_equalp,
scm_i_print_fraction): New prototypes.
* goops.c (create_standard_classes): Create "<fraction>" class.
* gc-mark.c (scm_gc_mark_dependencies): Handle fractions.
* gc-card.c (scm_i_sweep_card): Include scm_tc16_fraction as a
case in the switch, but do nothing for now.
* eval.c (SCM_CEVAL, SCM_APPLY, call_dsubr_1): Convert fractions
to doubles when calling 'dsubr' functions.
* eq.c (scm_eqv_p, scm_equal_p): Handle fractions.
2003-11-18 19:59:53 +00:00
|
|
|
|
SCM_FRACTION_NUMERATOR (y)),
|
|
|
|
|
|
scm_product (SCM_FRACTION_DENOMINATOR (x),
|
|
|
|
|
|
SCM_FRACTION_DENOMINATOR (y)));
|
2003-07-13 16:13:57 +00:00
|
|
|
|
else
|
|
|
|
|
|
SCM_WTA_DISPATCH_2 (g_product, x, y, SCM_ARGn, s_product);
|
2000-05-03 12:35:56 +00:00
|
|
|
|
}
|
2003-07-13 16:13:57 +00:00
|
|
|
|
else
|
2000-05-03 12:35:56 +00:00
|
|
|
|
SCM_WTA_DISPATCH_2 (g_product, x, y, SCM_ARG1, s_product);
|
1996-07-25 22:56:11 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
From John W. Eaton.
* numbers.h: Conditionally include floatingpoint.h, ieeefp.h, and
nan.h. Provide declarations for scm_inf_p, scm_nan_p, scn_inf,
and scm_nan.
* numbers.c: [SCO && ! HAVE_ISNAN] (isnan): New function.
[SCO && ! HAVE_ISINF] (isinf): New function.
(xisinf, xisnan): New functions.
(IS_INF): Delete.
(isfinite): Define in terms of xisinf.
(scm_inf_p, scm_nan_p): New functions.
(guile_Inf, guile_NaN): New file-scope vars.
(guile_ieee_init): New function.
(scm_inf, scm_nan): New functions.
(idbl2str): Handle Inf and NaN. Remove funny label and
corresponding gotos.
(ALLOW_DIVIDE_BY_ZERO): New macro.
(scm_divide): Allow division by zero to occur if
ALLOW_DIVIDE_BY_ZERO is defined.
Handle bignums and ints as special cases.
Additional stuff by me:
numbers.c (mem2ureal): Recognize "inf.0" and "nan.xxx".
(scm_even_p, scm_odd_p): Treat infinity as even and odd.
(iflo2str): Don't output a '+' for negative numbers or for Inf and
NaN. They will provide their own sign.
(scm_divide): Only allow divides by inexact zeros. Dividing by
exact zeros still signals an errors.
2002-05-06 22:33:10 +00:00
|
|
|
|
#if ((defined (HAVE_ISINF) && defined (HAVE_ISNAN)) \
|
|
|
|
|
|
|| (defined (HAVE_FINITE) && defined (HAVE_ISNAN)))
|
|
|
|
|
|
#define ALLOW_DIVIDE_BY_ZERO
|
|
|
|
|
|
/* #define ALLOW_DIVIDE_BY_EXACT_ZERO */
|
|
|
|
|
|
#endif
|
1996-07-25 22:56:11 +00:00
|
|
|
|
|
2002-03-11 19:10:01 +00:00
|
|
|
|
/* The code below for complex division is adapted from the GNU
|
|
|
|
|
|
libstdc++, which adapted it from f2c's libF77, and is subject to
|
|
|
|
|
|
this copyright: */
|
|
|
|
|
|
|
|
|
|
|
|
/****************************************************************
|
|
|
|
|
|
Copyright 1990, 1991, 1992, 1993 by AT&T Bell Laboratories and Bellcore.
|
|
|
|
|
|
|
|
|
|
|
|
Permission to use, copy, modify, and distribute this software
|
|
|
|
|
|
and its documentation for any purpose and without fee is hereby
|
|
|
|
|
|
granted, provided that the above copyright notice appear in all
|
|
|
|
|
|
copies and that both that the copyright notice and this
|
|
|
|
|
|
permission notice and warranty disclaimer appear in supporting
|
|
|
|
|
|
documentation, and that the names of AT&T Bell Laboratories or
|
|
|
|
|
|
Bellcore or any of their entities not be used in advertising or
|
|
|
|
|
|
publicity pertaining to distribution of the software without
|
|
|
|
|
|
specific, written prior permission.
|
|
|
|
|
|
|
|
|
|
|
|
AT&T and Bellcore disclaim all warranties with regard to this
|
|
|
|
|
|
software, including all implied warranties of merchantability
|
|
|
|
|
|
and fitness. In no event shall AT&T or Bellcore be liable for
|
|
|
|
|
|
any special, indirect or consequential damages or any damages
|
|
|
|
|
|
whatsoever resulting from loss of use, data or profits, whether
|
|
|
|
|
|
in an action of contract, negligence or other tortious action,
|
|
|
|
|
|
arising out of or in connection with the use or performance of
|
|
|
|
|
|
this software.
|
|
|
|
|
|
****************************************************************/
|
|
|
|
|
|
|
2009-09-06 16:47:19 +02:00
|
|
|
|
SCM_PRIMITIVE_GENERIC (scm_i_divide, "/", 0, 2, 1,
|
|
|
|
|
|
(SCM x, SCM y, SCM rest),
|
|
|
|
|
|
"Divide the first argument by the product of the remaining\n"
|
|
|
|
|
|
"arguments. If called with one argument @var{z1}, 1/@var{z1} is\n"
|
|
|
|
|
|
"returned.")
|
|
|
|
|
|
#define FUNC_NAME s_scm_i_divide
|
|
|
|
|
|
{
|
|
|
|
|
|
while (!scm_is_null (rest))
|
|
|
|
|
|
{ x = scm_divide (x, y);
|
|
|
|
|
|
y = scm_car (rest);
|
|
|
|
|
|
rest = scm_cdr (rest);
|
|
|
|
|
|
}
|
|
|
|
|
|
return scm_divide (x, y);
|
|
|
|
|
|
}
|
|
|
|
|
|
#undef FUNC_NAME
|
|
|
|
|
|
|
|
|
|
|
|
#define s_divide s_scm_i_divide
|
|
|
|
|
|
#define g_divide g_scm_i_divide
|
|
|
|
|
|
|
* print.c (scm_iprin1): Handle fractions.
* objects.h (scm_class_fraction): New.
* objects.c (scm_class_fraction): New.
(scm_class_of): Handle fractions.
* hash.c (scm_hasher): Handle fractions.
* numbers.c: New code for handling fraction all over the place.
(scm_odd_p, scm_even_p): Handle inexact integers.
(scm_rational_p): New function, same as scm_real_p.
(scm_round_number, scm_truncate_number, scm_ceiling, scm_floor):
New exact functions that replace the inexact 'dsubr'
implementations.
(scm_numerator, scm_denominator): New.
* numbers.h (SCM_NUMP): Recognize fractions.
(SCM_FRACTIONP, SCM_SLOPPY_FRACTIONP, SCM_FRACTION_NUMERATOR,
SCM_FRACTION_DENOMINATOR, SCM_FRACTION_SET_NUMERATOR,
SCM_FRACTION_SET_DENOMINATOR, SCM_FRACTION_REDUCED_BIT,
SCM_FRACTION_REDUCED_SET, SCM_FRACTION_REDUCED_CLEAR,
SCM_FRACTION_REDUCED): New.
(scm_floor, scm_ceiling, scm_truncate_number, scm_round_number):
New prototypes.
(scm_make_ratio, scm_rationalize, scm_numerator, scm_denominator,
scm_rational_p): New prototypes.
(scm_i_dbl2num, scm_i_fraction2double, scm_i_fraction_equalp,
scm_i_print_fraction): New prototypes.
* goops.c (create_standard_classes): Create "<fraction>" class.
* gc-mark.c (scm_gc_mark_dependencies): Handle fractions.
* gc-card.c (scm_i_sweep_card): Include scm_tc16_fraction as a
case in the switch, but do nothing for now.
* eval.c (SCM_CEVAL, SCM_APPLY, call_dsubr_1): Convert fractions
to doubles when calling 'dsubr' functions.
* eq.c (scm_eqv_p, scm_equal_p): Handle fractions.
2003-11-18 19:59:53 +00:00
|
|
|
|
static SCM
|
2009-09-06 16:47:19 +02:00
|
|
|
|
do_divide (SCM x, SCM y, int inexact)
|
|
|
|
|
|
#define FUNC_NAME s_divide
|
1996-07-25 22:56:11 +00:00
|
|
|
|
{
|
2000-05-02 16:41:20 +00:00
|
|
|
|
double a;
|
|
|
|
|
|
|
2007-12-08 16:00:56 +00:00
|
|
|
|
if (SCM_UNLIKELY (SCM_UNBNDP (y)))
|
2003-07-13 16:13:57 +00:00
|
|
|
|
{
|
|
|
|
|
|
if (SCM_UNBNDP (x))
|
|
|
|
|
|
SCM_WTA_DISPATCH_0 (g_divide, s_divide);
|
2004-07-23 15:43:02 +00:00
|
|
|
|
else if (SCM_I_INUMP (x))
|
2003-07-13 16:13:57 +00:00
|
|
|
|
{
|
2004-07-23 15:43:02 +00:00
|
|
|
|
long xx = SCM_I_INUM (x);
|
2003-07-13 16:13:57 +00:00
|
|
|
|
if (xx == 1 || xx == -1)
|
|
|
|
|
|
return x;
|
From John W. Eaton.
* numbers.h: Conditionally include floatingpoint.h, ieeefp.h, and
nan.h. Provide declarations for scm_inf_p, scm_nan_p, scn_inf,
and scm_nan.
* numbers.c: [SCO && ! HAVE_ISNAN] (isnan): New function.
[SCO && ! HAVE_ISINF] (isinf): New function.
(xisinf, xisnan): New functions.
(IS_INF): Delete.
(isfinite): Define in terms of xisinf.
(scm_inf_p, scm_nan_p): New functions.
(guile_Inf, guile_NaN): New file-scope vars.
(guile_ieee_init): New function.
(scm_inf, scm_nan): New functions.
(idbl2str): Handle Inf and NaN. Remove funny label and
corresponding gotos.
(ALLOW_DIVIDE_BY_ZERO): New macro.
(scm_divide): Allow division by zero to occur if
ALLOW_DIVIDE_BY_ZERO is defined.
Handle bignums and ints as special cases.
Additional stuff by me:
numbers.c (mem2ureal): Recognize "inf.0" and "nan.xxx".
(scm_even_p, scm_odd_p): Treat infinity as even and odd.
(iflo2str): Don't output a '+' for negative numbers or for Inf and
NaN. They will provide their own sign.
(scm_divide): Only allow divides by inexact zeros. Dividing by
exact zeros still signals an errors.
2002-05-06 22:33:10 +00:00
|
|
|
|
#ifndef ALLOW_DIVIDE_BY_EXACT_ZERO
|
2003-07-13 16:13:57 +00:00
|
|
|
|
else if (xx == 0)
|
|
|
|
|
|
scm_num_overflow (s_divide);
|
From John W. Eaton.
* numbers.h: Conditionally include floatingpoint.h, ieeefp.h, and
nan.h. Provide declarations for scm_inf_p, scm_nan_p, scn_inf,
and scm_nan.
* numbers.c: [SCO && ! HAVE_ISNAN] (isnan): New function.
[SCO && ! HAVE_ISINF] (isinf): New function.
(xisinf, xisnan): New functions.
(IS_INF): Delete.
(isfinite): Define in terms of xisinf.
(scm_inf_p, scm_nan_p): New functions.
(guile_Inf, guile_NaN): New file-scope vars.
(guile_ieee_init): New function.
(scm_inf, scm_nan): New functions.
(idbl2str): Handle Inf and NaN. Remove funny label and
corresponding gotos.
(ALLOW_DIVIDE_BY_ZERO): New macro.
(scm_divide): Allow division by zero to occur if
ALLOW_DIVIDE_BY_ZERO is defined.
Handle bignums and ints as special cases.
Additional stuff by me:
numbers.c (mem2ureal): Recognize "inf.0" and "nan.xxx".
(scm_even_p, scm_odd_p): Treat infinity as even and odd.
(iflo2str): Don't output a '+' for negative numbers or for Inf and
NaN. They will provide their own sign.
(scm_divide): Only allow divides by inexact zeros. Dividing by
exact zeros still signals an errors.
2002-05-06 22:33:10 +00:00
|
|
|
|
#endif
|
2003-07-13 16:13:57 +00:00
|
|
|
|
else
|
* print.c (scm_iprin1): Handle fractions.
* objects.h (scm_class_fraction): New.
* objects.c (scm_class_fraction): New.
(scm_class_of): Handle fractions.
* hash.c (scm_hasher): Handle fractions.
* numbers.c: New code for handling fraction all over the place.
(scm_odd_p, scm_even_p): Handle inexact integers.
(scm_rational_p): New function, same as scm_real_p.
(scm_round_number, scm_truncate_number, scm_ceiling, scm_floor):
New exact functions that replace the inexact 'dsubr'
implementations.
(scm_numerator, scm_denominator): New.
* numbers.h (SCM_NUMP): Recognize fractions.
(SCM_FRACTIONP, SCM_SLOPPY_FRACTIONP, SCM_FRACTION_NUMERATOR,
SCM_FRACTION_DENOMINATOR, SCM_FRACTION_SET_NUMERATOR,
SCM_FRACTION_SET_DENOMINATOR, SCM_FRACTION_REDUCED_BIT,
SCM_FRACTION_REDUCED_SET, SCM_FRACTION_REDUCED_CLEAR,
SCM_FRACTION_REDUCED): New.
(scm_floor, scm_ceiling, scm_truncate_number, scm_round_number):
New prototypes.
(scm_make_ratio, scm_rationalize, scm_numerator, scm_denominator,
scm_rational_p): New prototypes.
(scm_i_dbl2num, scm_i_fraction2double, scm_i_fraction_equalp,
scm_i_print_fraction): New prototypes.
* goops.c (create_standard_classes): Create "<fraction>" class.
* gc-mark.c (scm_gc_mark_dependencies): Handle fractions.
* gc-card.c (scm_i_sweep_card): Include scm_tc16_fraction as a
case in the switch, but do nothing for now.
* eval.c (SCM_CEVAL, SCM_APPLY, call_dsubr_1): Convert fractions
to doubles when calling 'dsubr' functions.
* eq.c (scm_eqv_p, scm_equal_p): Handle fractions.
2003-11-18 19:59:53 +00:00
|
|
|
|
{
|
|
|
|
|
|
if (inexact)
|
(scm_is_rational): New.
(scm_i_short2big, scm_i_int2big, scm_i_uint2big, scm_i_size2big,
scm_i_ptrdiff2big, scm_i_long_long2big, scm_i_ulong_long2big):
Removed prototypes.
(scm_make_real, scm_num2dbl, scm_float2num, scm_double2num):
Discouraged by moving to discouraged.h and discouraged.c.
Replaced all uses with scm_from_double.
(scm_num2float, scm_num2double): Discouraged by moving prototype
to discouraged.h and rewriting in terms of scm_to_double.
Replaced all uses with scm_to_double.
(scm_to_double): Do not implement in terms of scm_num2dbl, use
explicit code.
(scm_from_double): Do not implement in terms of scm_make_real, use
explicit code.
2004-08-03 15:03:35 +00:00
|
|
|
|
return scm_from_double (1.0 / (double) xx);
|
2004-08-03 15:55:42 +00:00
|
|
|
|
else return scm_i_make_ratio (SCM_I_MAKINUM(1), x);
|
* print.c (scm_iprin1): Handle fractions.
* objects.h (scm_class_fraction): New.
* objects.c (scm_class_fraction): New.
(scm_class_of): Handle fractions.
* hash.c (scm_hasher): Handle fractions.
* numbers.c: New code for handling fraction all over the place.
(scm_odd_p, scm_even_p): Handle inexact integers.
(scm_rational_p): New function, same as scm_real_p.
(scm_round_number, scm_truncate_number, scm_ceiling, scm_floor):
New exact functions that replace the inexact 'dsubr'
implementations.
(scm_numerator, scm_denominator): New.
* numbers.h (SCM_NUMP): Recognize fractions.
(SCM_FRACTIONP, SCM_SLOPPY_FRACTIONP, SCM_FRACTION_NUMERATOR,
SCM_FRACTION_DENOMINATOR, SCM_FRACTION_SET_NUMERATOR,
SCM_FRACTION_SET_DENOMINATOR, SCM_FRACTION_REDUCED_BIT,
SCM_FRACTION_REDUCED_SET, SCM_FRACTION_REDUCED_CLEAR,
SCM_FRACTION_REDUCED): New.
(scm_floor, scm_ceiling, scm_truncate_number, scm_round_number):
New prototypes.
(scm_make_ratio, scm_rationalize, scm_numerator, scm_denominator,
scm_rational_p): New prototypes.
(scm_i_dbl2num, scm_i_fraction2double, scm_i_fraction_equalp,
scm_i_print_fraction): New prototypes.
* goops.c (create_standard_classes): Create "<fraction>" class.
* gc-mark.c (scm_gc_mark_dependencies): Handle fractions.
* gc-card.c (scm_i_sweep_card): Include scm_tc16_fraction as a
case in the switch, but do nothing for now.
* eval.c (SCM_CEVAL, SCM_APPLY, call_dsubr_1): Convert fractions
to doubles when calling 'dsubr' functions.
* eq.c (scm_eqv_p, scm_equal_p): Handle fractions.
2003-11-18 19:59:53 +00:00
|
|
|
|
}
|
2003-07-13 16:13:57 +00:00
|
|
|
|
}
|
|
|
|
|
|
else if (SCM_BIGP (x))
|
* print.c (scm_iprin1): Handle fractions.
* objects.h (scm_class_fraction): New.
* objects.c (scm_class_fraction): New.
(scm_class_of): Handle fractions.
* hash.c (scm_hasher): Handle fractions.
* numbers.c: New code for handling fraction all over the place.
(scm_odd_p, scm_even_p): Handle inexact integers.
(scm_rational_p): New function, same as scm_real_p.
(scm_round_number, scm_truncate_number, scm_ceiling, scm_floor):
New exact functions that replace the inexact 'dsubr'
implementations.
(scm_numerator, scm_denominator): New.
* numbers.h (SCM_NUMP): Recognize fractions.
(SCM_FRACTIONP, SCM_SLOPPY_FRACTIONP, SCM_FRACTION_NUMERATOR,
SCM_FRACTION_DENOMINATOR, SCM_FRACTION_SET_NUMERATOR,
SCM_FRACTION_SET_DENOMINATOR, SCM_FRACTION_REDUCED_BIT,
SCM_FRACTION_REDUCED_SET, SCM_FRACTION_REDUCED_CLEAR,
SCM_FRACTION_REDUCED): New.
(scm_floor, scm_ceiling, scm_truncate_number, scm_round_number):
New prototypes.
(scm_make_ratio, scm_rationalize, scm_numerator, scm_denominator,
scm_rational_p): New prototypes.
(scm_i_dbl2num, scm_i_fraction2double, scm_i_fraction_equalp,
scm_i_print_fraction): New prototypes.
* goops.c (create_standard_classes): Create "<fraction>" class.
* gc-mark.c (scm_gc_mark_dependencies): Handle fractions.
* gc-card.c (scm_i_sweep_card): Include scm_tc16_fraction as a
case in the switch, but do nothing for now.
* eval.c (SCM_CEVAL, SCM_APPLY, call_dsubr_1): Convert fractions
to doubles when calling 'dsubr' functions.
* eq.c (scm_eqv_p, scm_equal_p): Handle fractions.
2003-11-18 19:59:53 +00:00
|
|
|
|
{
|
|
|
|
|
|
if (inexact)
|
(scm_is_rational): New.
(scm_i_short2big, scm_i_int2big, scm_i_uint2big, scm_i_size2big,
scm_i_ptrdiff2big, scm_i_long_long2big, scm_i_ulong_long2big):
Removed prototypes.
(scm_make_real, scm_num2dbl, scm_float2num, scm_double2num):
Discouraged by moving to discouraged.h and discouraged.c.
Replaced all uses with scm_from_double.
(scm_num2float, scm_num2double): Discouraged by moving prototype
to discouraged.h and rewriting in terms of scm_to_double.
Replaced all uses with scm_to_double.
(scm_to_double): Do not implement in terms of scm_num2dbl, use
explicit code.
(scm_from_double): Do not implement in terms of scm_make_real, use
explicit code.
2004-08-03 15:03:35 +00:00
|
|
|
|
return scm_from_double (1.0 / scm_i_big2dbl (x));
|
2004-08-03 15:55:42 +00:00
|
|
|
|
else return scm_i_make_ratio (SCM_I_MAKINUM(1), x);
|
* print.c (scm_iprin1): Handle fractions.
* objects.h (scm_class_fraction): New.
* objects.c (scm_class_fraction): New.
(scm_class_of): Handle fractions.
* hash.c (scm_hasher): Handle fractions.
* numbers.c: New code for handling fraction all over the place.
(scm_odd_p, scm_even_p): Handle inexact integers.
(scm_rational_p): New function, same as scm_real_p.
(scm_round_number, scm_truncate_number, scm_ceiling, scm_floor):
New exact functions that replace the inexact 'dsubr'
implementations.
(scm_numerator, scm_denominator): New.
* numbers.h (SCM_NUMP): Recognize fractions.
(SCM_FRACTIONP, SCM_SLOPPY_FRACTIONP, SCM_FRACTION_NUMERATOR,
SCM_FRACTION_DENOMINATOR, SCM_FRACTION_SET_NUMERATOR,
SCM_FRACTION_SET_DENOMINATOR, SCM_FRACTION_REDUCED_BIT,
SCM_FRACTION_REDUCED_SET, SCM_FRACTION_REDUCED_CLEAR,
SCM_FRACTION_REDUCED): New.
(scm_floor, scm_ceiling, scm_truncate_number, scm_round_number):
New prototypes.
(scm_make_ratio, scm_rationalize, scm_numerator, scm_denominator,
scm_rational_p): New prototypes.
(scm_i_dbl2num, scm_i_fraction2double, scm_i_fraction_equalp,
scm_i_print_fraction): New prototypes.
* goops.c (create_standard_classes): Create "<fraction>" class.
* gc-mark.c (scm_gc_mark_dependencies): Handle fractions.
* gc-card.c (scm_i_sweep_card): Include scm_tc16_fraction as a
case in the switch, but do nothing for now.
* eval.c (SCM_CEVAL, SCM_APPLY, call_dsubr_1): Convert fractions
to doubles when calling 'dsubr' functions.
* eq.c (scm_eqv_p, scm_equal_p): Handle fractions.
2003-11-18 19:59:53 +00:00
|
|
|
|
}
|
2003-07-13 16:13:57 +00:00
|
|
|
|
else if (SCM_REALP (x))
|
|
|
|
|
|
{
|
|
|
|
|
|
double xx = SCM_REAL_VALUE (x);
|
From John W. Eaton.
* numbers.h: Conditionally include floatingpoint.h, ieeefp.h, and
nan.h. Provide declarations for scm_inf_p, scm_nan_p, scn_inf,
and scm_nan.
* numbers.c: [SCO && ! HAVE_ISNAN] (isnan): New function.
[SCO && ! HAVE_ISINF] (isinf): New function.
(xisinf, xisnan): New functions.
(IS_INF): Delete.
(isfinite): Define in terms of xisinf.
(scm_inf_p, scm_nan_p): New functions.
(guile_Inf, guile_NaN): New file-scope vars.
(guile_ieee_init): New function.
(scm_inf, scm_nan): New functions.
(idbl2str): Handle Inf and NaN. Remove funny label and
corresponding gotos.
(ALLOW_DIVIDE_BY_ZERO): New macro.
(scm_divide): Allow division by zero to occur if
ALLOW_DIVIDE_BY_ZERO is defined.
Handle bignums and ints as special cases.
Additional stuff by me:
numbers.c (mem2ureal): Recognize "inf.0" and "nan.xxx".
(scm_even_p, scm_odd_p): Treat infinity as even and odd.
(iflo2str): Don't output a '+' for negative numbers or for Inf and
NaN. They will provide their own sign.
(scm_divide): Only allow divides by inexact zeros. Dividing by
exact zeros still signals an errors.
2002-05-06 22:33:10 +00:00
|
|
|
|
#ifndef ALLOW_DIVIDE_BY_ZERO
|
2003-07-13 16:13:57 +00:00
|
|
|
|
if (xx == 0.0)
|
|
|
|
|
|
scm_num_overflow (s_divide);
|
|
|
|
|
|
else
|
From John W. Eaton.
* numbers.h: Conditionally include floatingpoint.h, ieeefp.h, and
nan.h. Provide declarations for scm_inf_p, scm_nan_p, scn_inf,
and scm_nan.
* numbers.c: [SCO && ! HAVE_ISNAN] (isnan): New function.
[SCO && ! HAVE_ISINF] (isinf): New function.
(xisinf, xisnan): New functions.
(IS_INF): Delete.
(isfinite): Define in terms of xisinf.
(scm_inf_p, scm_nan_p): New functions.
(guile_Inf, guile_NaN): New file-scope vars.
(guile_ieee_init): New function.
(scm_inf, scm_nan): New functions.
(idbl2str): Handle Inf and NaN. Remove funny label and
corresponding gotos.
(ALLOW_DIVIDE_BY_ZERO): New macro.
(scm_divide): Allow division by zero to occur if
ALLOW_DIVIDE_BY_ZERO is defined.
Handle bignums and ints as special cases.
Additional stuff by me:
numbers.c (mem2ureal): Recognize "inf.0" and "nan.xxx".
(scm_even_p, scm_odd_p): Treat infinity as even and odd.
(iflo2str): Don't output a '+' for negative numbers or for Inf and
NaN. They will provide their own sign.
(scm_divide): Only allow divides by inexact zeros. Dividing by
exact zeros still signals an errors.
2002-05-06 22:33:10 +00:00
|
|
|
|
#endif
|
(scm_is_rational): New.
(scm_i_short2big, scm_i_int2big, scm_i_uint2big, scm_i_size2big,
scm_i_ptrdiff2big, scm_i_long_long2big, scm_i_ulong_long2big):
Removed prototypes.
(scm_make_real, scm_num2dbl, scm_float2num, scm_double2num):
Discouraged by moving to discouraged.h and discouraged.c.
Replaced all uses with scm_from_double.
(scm_num2float, scm_num2double): Discouraged by moving prototype
to discouraged.h and rewriting in terms of scm_to_double.
Replaced all uses with scm_to_double.
(scm_to_double): Do not implement in terms of scm_num2dbl, use
explicit code.
(scm_from_double): Do not implement in terms of scm_make_real, use
explicit code.
2004-08-03 15:03:35 +00:00
|
|
|
|
return scm_from_double (1.0 / xx);
|
2003-07-13 16:13:57 +00:00
|
|
|
|
}
|
|
|
|
|
|
else if (SCM_COMPLEXP (x))
|
|
|
|
|
|
{
|
|
|
|
|
|
double r = SCM_COMPLEX_REAL (x);
|
|
|
|
|
|
double i = SCM_COMPLEX_IMAG (x);
|
2005-04-29 22:59:22 +00:00
|
|
|
|
if (fabs(r) <= fabs(i))
|
2003-07-13 16:13:57 +00:00
|
|
|
|
{
|
|
|
|
|
|
double t = r / i;
|
|
|
|
|
|
double d = i * (1.0 + t * t);
|
2004-08-03 17:12:14 +00:00
|
|
|
|
return scm_c_make_rectangular (t / d, -1.0 / d);
|
2003-07-13 16:13:57 +00:00
|
|
|
|
}
|
|
|
|
|
|
else
|
|
|
|
|
|
{
|
|
|
|
|
|
double t = i / r;
|
|
|
|
|
|
double d = r * (1.0 + t * t);
|
2004-08-03 17:12:14 +00:00
|
|
|
|
return scm_c_make_rectangular (1.0 / d, -t / d);
|
2003-07-13 16:13:57 +00:00
|
|
|
|
}
|
|
|
|
|
|
}
|
* print.c (scm_iprin1): Handle fractions.
* objects.h (scm_class_fraction): New.
* objects.c (scm_class_fraction): New.
(scm_class_of): Handle fractions.
* hash.c (scm_hasher): Handle fractions.
* numbers.c: New code for handling fraction all over the place.
(scm_odd_p, scm_even_p): Handle inexact integers.
(scm_rational_p): New function, same as scm_real_p.
(scm_round_number, scm_truncate_number, scm_ceiling, scm_floor):
New exact functions that replace the inexact 'dsubr'
implementations.
(scm_numerator, scm_denominator): New.
* numbers.h (SCM_NUMP): Recognize fractions.
(SCM_FRACTIONP, SCM_SLOPPY_FRACTIONP, SCM_FRACTION_NUMERATOR,
SCM_FRACTION_DENOMINATOR, SCM_FRACTION_SET_NUMERATOR,
SCM_FRACTION_SET_DENOMINATOR, SCM_FRACTION_REDUCED_BIT,
SCM_FRACTION_REDUCED_SET, SCM_FRACTION_REDUCED_CLEAR,
SCM_FRACTION_REDUCED): New.
(scm_floor, scm_ceiling, scm_truncate_number, scm_round_number):
New prototypes.
(scm_make_ratio, scm_rationalize, scm_numerator, scm_denominator,
scm_rational_p): New prototypes.
(scm_i_dbl2num, scm_i_fraction2double, scm_i_fraction_equalp,
scm_i_print_fraction): New prototypes.
* goops.c (create_standard_classes): Create "<fraction>" class.
* gc-mark.c (scm_gc_mark_dependencies): Handle fractions.
* gc-card.c (scm_i_sweep_card): Include scm_tc16_fraction as a
case in the switch, but do nothing for now.
* eval.c (SCM_CEVAL, SCM_APPLY, call_dsubr_1): Convert fractions
to doubles when calling 'dsubr' functions.
* eq.c (scm_eqv_p, scm_equal_p): Handle fractions.
2003-11-18 19:59:53 +00:00
|
|
|
|
else if (SCM_FRACTIONP (x))
|
2004-08-03 15:55:42 +00:00
|
|
|
|
return scm_i_make_ratio (SCM_FRACTION_DENOMINATOR (x),
|
* print.c (scm_iprin1): Handle fractions.
* objects.h (scm_class_fraction): New.
* objects.c (scm_class_fraction): New.
(scm_class_of): Handle fractions.
* hash.c (scm_hasher): Handle fractions.
* numbers.c: New code for handling fraction all over the place.
(scm_odd_p, scm_even_p): Handle inexact integers.
(scm_rational_p): New function, same as scm_real_p.
(scm_round_number, scm_truncate_number, scm_ceiling, scm_floor):
New exact functions that replace the inexact 'dsubr'
implementations.
(scm_numerator, scm_denominator): New.
* numbers.h (SCM_NUMP): Recognize fractions.
(SCM_FRACTIONP, SCM_SLOPPY_FRACTIONP, SCM_FRACTION_NUMERATOR,
SCM_FRACTION_DENOMINATOR, SCM_FRACTION_SET_NUMERATOR,
SCM_FRACTION_SET_DENOMINATOR, SCM_FRACTION_REDUCED_BIT,
SCM_FRACTION_REDUCED_SET, SCM_FRACTION_REDUCED_CLEAR,
SCM_FRACTION_REDUCED): New.
(scm_floor, scm_ceiling, scm_truncate_number, scm_round_number):
New prototypes.
(scm_make_ratio, scm_rationalize, scm_numerator, scm_denominator,
scm_rational_p): New prototypes.
(scm_i_dbl2num, scm_i_fraction2double, scm_i_fraction_equalp,
scm_i_print_fraction): New prototypes.
* goops.c (create_standard_classes): Create "<fraction>" class.
* gc-mark.c (scm_gc_mark_dependencies): Handle fractions.
* gc-card.c (scm_i_sweep_card): Include scm_tc16_fraction as a
case in the switch, but do nothing for now.
* eval.c (SCM_CEVAL, SCM_APPLY, call_dsubr_1): Convert fractions
to doubles when calling 'dsubr' functions.
* eq.c (scm_eqv_p, scm_equal_p): Handle fractions.
2003-11-18 19:59:53 +00:00
|
|
|
|
SCM_FRACTION_NUMERATOR (x));
|
2003-07-13 16:13:57 +00:00
|
|
|
|
else
|
|
|
|
|
|
SCM_WTA_DISPATCH_1 (g_divide, x, SCM_ARG1, s_divide);
|
2000-05-02 16:41:20 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
2007-12-08 16:00:56 +00:00
|
|
|
|
if (SCM_LIKELY (SCM_I_INUMP (x)))
|
2003-07-13 16:13:57 +00:00
|
|
|
|
{
|
2004-07-23 15:43:02 +00:00
|
|
|
|
long xx = SCM_I_INUM (x);
|
2007-12-08 16:00:56 +00:00
|
|
|
|
if (SCM_LIKELY (SCM_I_INUMP (y)))
|
2003-07-13 16:13:57 +00:00
|
|
|
|
{
|
2004-07-23 15:43:02 +00:00
|
|
|
|
long yy = SCM_I_INUM (y);
|
2003-07-13 16:13:57 +00:00
|
|
|
|
if (yy == 0)
|
|
|
|
|
|
{
|
From John W. Eaton.
* numbers.h: Conditionally include floatingpoint.h, ieeefp.h, and
nan.h. Provide declarations for scm_inf_p, scm_nan_p, scn_inf,
and scm_nan.
* numbers.c: [SCO && ! HAVE_ISNAN] (isnan): New function.
[SCO && ! HAVE_ISINF] (isinf): New function.
(xisinf, xisnan): New functions.
(IS_INF): Delete.
(isfinite): Define in terms of xisinf.
(scm_inf_p, scm_nan_p): New functions.
(guile_Inf, guile_NaN): New file-scope vars.
(guile_ieee_init): New function.
(scm_inf, scm_nan): New functions.
(idbl2str): Handle Inf and NaN. Remove funny label and
corresponding gotos.
(ALLOW_DIVIDE_BY_ZERO): New macro.
(scm_divide): Allow division by zero to occur if
ALLOW_DIVIDE_BY_ZERO is defined.
Handle bignums and ints as special cases.
Additional stuff by me:
numbers.c (mem2ureal): Recognize "inf.0" and "nan.xxx".
(scm_even_p, scm_odd_p): Treat infinity as even and odd.
(iflo2str): Don't output a '+' for negative numbers or for Inf and
NaN. They will provide their own sign.
(scm_divide): Only allow divides by inexact zeros. Dividing by
exact zeros still signals an errors.
2002-05-06 22:33:10 +00:00
|
|
|
|
#ifndef ALLOW_DIVIDE_BY_EXACT_ZERO
|
2003-07-13 16:13:57 +00:00
|
|
|
|
scm_num_overflow (s_divide);
|
From John W. Eaton.
* numbers.h: Conditionally include floatingpoint.h, ieeefp.h, and
nan.h. Provide declarations for scm_inf_p, scm_nan_p, scn_inf,
and scm_nan.
* numbers.c: [SCO && ! HAVE_ISNAN] (isnan): New function.
[SCO && ! HAVE_ISINF] (isinf): New function.
(xisinf, xisnan): New functions.
(IS_INF): Delete.
(isfinite): Define in terms of xisinf.
(scm_inf_p, scm_nan_p): New functions.
(guile_Inf, guile_NaN): New file-scope vars.
(guile_ieee_init): New function.
(scm_inf, scm_nan): New functions.
(idbl2str): Handle Inf and NaN. Remove funny label and
corresponding gotos.
(ALLOW_DIVIDE_BY_ZERO): New macro.
(scm_divide): Allow division by zero to occur if
ALLOW_DIVIDE_BY_ZERO is defined.
Handle bignums and ints as special cases.
Additional stuff by me:
numbers.c (mem2ureal): Recognize "inf.0" and "nan.xxx".
(scm_even_p, scm_odd_p): Treat infinity as even and odd.
(iflo2str): Don't output a '+' for negative numbers or for Inf and
NaN. They will provide their own sign.
(scm_divide): Only allow divides by inexact zeros. Dividing by
exact zeros still signals an errors.
2002-05-06 22:33:10 +00:00
|
|
|
|
#else
|
(scm_is_rational): New.
(scm_i_short2big, scm_i_int2big, scm_i_uint2big, scm_i_size2big,
scm_i_ptrdiff2big, scm_i_long_long2big, scm_i_ulong_long2big):
Removed prototypes.
(scm_make_real, scm_num2dbl, scm_float2num, scm_double2num):
Discouraged by moving to discouraged.h and discouraged.c.
Replaced all uses with scm_from_double.
(scm_num2float, scm_num2double): Discouraged by moving prototype
to discouraged.h and rewriting in terms of scm_to_double.
Replaced all uses with scm_to_double.
(scm_to_double): Do not implement in terms of scm_num2dbl, use
explicit code.
(scm_from_double): Do not implement in terms of scm_make_real, use
explicit code.
2004-08-03 15:03:35 +00:00
|
|
|
|
return scm_from_double ((double) xx / (double) yy);
|
From John W. Eaton.
* numbers.h: Conditionally include floatingpoint.h, ieeefp.h, and
nan.h. Provide declarations for scm_inf_p, scm_nan_p, scn_inf,
and scm_nan.
* numbers.c: [SCO && ! HAVE_ISNAN] (isnan): New function.
[SCO && ! HAVE_ISINF] (isinf): New function.
(xisinf, xisnan): New functions.
(IS_INF): Delete.
(isfinite): Define in terms of xisinf.
(scm_inf_p, scm_nan_p): New functions.
(guile_Inf, guile_NaN): New file-scope vars.
(guile_ieee_init): New function.
(scm_inf, scm_nan): New functions.
(idbl2str): Handle Inf and NaN. Remove funny label and
corresponding gotos.
(ALLOW_DIVIDE_BY_ZERO): New macro.
(scm_divide): Allow division by zero to occur if
ALLOW_DIVIDE_BY_ZERO is defined.
Handle bignums and ints as special cases.
Additional stuff by me:
numbers.c (mem2ureal): Recognize "inf.0" and "nan.xxx".
(scm_even_p, scm_odd_p): Treat infinity as even and odd.
(iflo2str): Don't output a '+' for negative numbers or for Inf and
NaN. They will provide their own sign.
(scm_divide): Only allow divides by inexact zeros. Dividing by
exact zeros still signals an errors.
2002-05-06 22:33:10 +00:00
|
|
|
|
#endif
|
2003-07-13 16:13:57 +00:00
|
|
|
|
}
|
|
|
|
|
|
else if (xx % yy != 0)
|
* print.c (scm_iprin1): Handle fractions.
* objects.h (scm_class_fraction): New.
* objects.c (scm_class_fraction): New.
(scm_class_of): Handle fractions.
* hash.c (scm_hasher): Handle fractions.
* numbers.c: New code for handling fraction all over the place.
(scm_odd_p, scm_even_p): Handle inexact integers.
(scm_rational_p): New function, same as scm_real_p.
(scm_round_number, scm_truncate_number, scm_ceiling, scm_floor):
New exact functions that replace the inexact 'dsubr'
implementations.
(scm_numerator, scm_denominator): New.
* numbers.h (SCM_NUMP): Recognize fractions.
(SCM_FRACTIONP, SCM_SLOPPY_FRACTIONP, SCM_FRACTION_NUMERATOR,
SCM_FRACTION_DENOMINATOR, SCM_FRACTION_SET_NUMERATOR,
SCM_FRACTION_SET_DENOMINATOR, SCM_FRACTION_REDUCED_BIT,
SCM_FRACTION_REDUCED_SET, SCM_FRACTION_REDUCED_CLEAR,
SCM_FRACTION_REDUCED): New.
(scm_floor, scm_ceiling, scm_truncate_number, scm_round_number):
New prototypes.
(scm_make_ratio, scm_rationalize, scm_numerator, scm_denominator,
scm_rational_p): New prototypes.
(scm_i_dbl2num, scm_i_fraction2double, scm_i_fraction_equalp,
scm_i_print_fraction): New prototypes.
* goops.c (create_standard_classes): Create "<fraction>" class.
* gc-mark.c (scm_gc_mark_dependencies): Handle fractions.
* gc-card.c (scm_i_sweep_card): Include scm_tc16_fraction as a
case in the switch, but do nothing for now.
* eval.c (SCM_CEVAL, SCM_APPLY, call_dsubr_1): Convert fractions
to doubles when calling 'dsubr' functions.
* eq.c (scm_eqv_p, scm_equal_p): Handle fractions.
2003-11-18 19:59:53 +00:00
|
|
|
|
{
|
|
|
|
|
|
if (inexact)
|
(scm_is_rational): New.
(scm_i_short2big, scm_i_int2big, scm_i_uint2big, scm_i_size2big,
scm_i_ptrdiff2big, scm_i_long_long2big, scm_i_ulong_long2big):
Removed prototypes.
(scm_make_real, scm_num2dbl, scm_float2num, scm_double2num):
Discouraged by moving to discouraged.h and discouraged.c.
Replaced all uses with scm_from_double.
(scm_num2float, scm_num2double): Discouraged by moving prototype
to discouraged.h and rewriting in terms of scm_to_double.
Replaced all uses with scm_to_double.
(scm_to_double): Do not implement in terms of scm_num2dbl, use
explicit code.
(scm_from_double): Do not implement in terms of scm_make_real, use
explicit code.
2004-08-03 15:03:35 +00:00
|
|
|
|
return scm_from_double ((double) xx / (double) yy);
|
2004-08-03 15:55:42 +00:00
|
|
|
|
else return scm_i_make_ratio (x, y);
|
* print.c (scm_iprin1): Handle fractions.
* objects.h (scm_class_fraction): New.
* objects.c (scm_class_fraction): New.
(scm_class_of): Handle fractions.
* hash.c (scm_hasher): Handle fractions.
* numbers.c: New code for handling fraction all over the place.
(scm_odd_p, scm_even_p): Handle inexact integers.
(scm_rational_p): New function, same as scm_real_p.
(scm_round_number, scm_truncate_number, scm_ceiling, scm_floor):
New exact functions that replace the inexact 'dsubr'
implementations.
(scm_numerator, scm_denominator): New.
* numbers.h (SCM_NUMP): Recognize fractions.
(SCM_FRACTIONP, SCM_SLOPPY_FRACTIONP, SCM_FRACTION_NUMERATOR,
SCM_FRACTION_DENOMINATOR, SCM_FRACTION_SET_NUMERATOR,
SCM_FRACTION_SET_DENOMINATOR, SCM_FRACTION_REDUCED_BIT,
SCM_FRACTION_REDUCED_SET, SCM_FRACTION_REDUCED_CLEAR,
SCM_FRACTION_REDUCED): New.
(scm_floor, scm_ceiling, scm_truncate_number, scm_round_number):
New prototypes.
(scm_make_ratio, scm_rationalize, scm_numerator, scm_denominator,
scm_rational_p): New prototypes.
(scm_i_dbl2num, scm_i_fraction2double, scm_i_fraction_equalp,
scm_i_print_fraction): New prototypes.
* goops.c (create_standard_classes): Create "<fraction>" class.
* gc-mark.c (scm_gc_mark_dependencies): Handle fractions.
* gc-card.c (scm_i_sweep_card): Include scm_tc16_fraction as a
case in the switch, but do nothing for now.
* eval.c (SCM_CEVAL, SCM_APPLY, call_dsubr_1): Convert fractions
to doubles when calling 'dsubr' functions.
* eq.c (scm_eqv_p, scm_equal_p): Handle fractions.
2003-11-18 19:59:53 +00:00
|
|
|
|
}
|
2003-07-13 16:13:57 +00:00
|
|
|
|
else
|
|
|
|
|
|
{
|
|
|
|
|
|
long z = xx / yy;
|
|
|
|
|
|
if (SCM_FIXABLE (z))
|
2004-07-08 15:54:05 +00:00
|
|
|
|
return SCM_I_MAKINUM (z);
|
2003-07-13 16:13:57 +00:00
|
|
|
|
else
|
|
|
|
|
|
return scm_i_long2big (z);
|
|
|
|
|
|
}
|
1999-01-10 07:38:39 +00:00
|
|
|
|
}
|
2003-07-13 16:13:57 +00:00
|
|
|
|
else if (SCM_BIGP (y))
|
* print.c (scm_iprin1): Handle fractions.
* objects.h (scm_class_fraction): New.
* objects.c (scm_class_fraction): New.
(scm_class_of): Handle fractions.
* hash.c (scm_hasher): Handle fractions.
* numbers.c: New code for handling fraction all over the place.
(scm_odd_p, scm_even_p): Handle inexact integers.
(scm_rational_p): New function, same as scm_real_p.
(scm_round_number, scm_truncate_number, scm_ceiling, scm_floor):
New exact functions that replace the inexact 'dsubr'
implementations.
(scm_numerator, scm_denominator): New.
* numbers.h (SCM_NUMP): Recognize fractions.
(SCM_FRACTIONP, SCM_SLOPPY_FRACTIONP, SCM_FRACTION_NUMERATOR,
SCM_FRACTION_DENOMINATOR, SCM_FRACTION_SET_NUMERATOR,
SCM_FRACTION_SET_DENOMINATOR, SCM_FRACTION_REDUCED_BIT,
SCM_FRACTION_REDUCED_SET, SCM_FRACTION_REDUCED_CLEAR,
SCM_FRACTION_REDUCED): New.
(scm_floor, scm_ceiling, scm_truncate_number, scm_round_number):
New prototypes.
(scm_make_ratio, scm_rationalize, scm_numerator, scm_denominator,
scm_rational_p): New prototypes.
(scm_i_dbl2num, scm_i_fraction2double, scm_i_fraction_equalp,
scm_i_print_fraction): New prototypes.
* goops.c (create_standard_classes): Create "<fraction>" class.
* gc-mark.c (scm_gc_mark_dependencies): Handle fractions.
* gc-card.c (scm_i_sweep_card): Include scm_tc16_fraction as a
case in the switch, but do nothing for now.
* eval.c (SCM_CEVAL, SCM_APPLY, call_dsubr_1): Convert fractions
to doubles when calling 'dsubr' functions.
* eq.c (scm_eqv_p, scm_equal_p): Handle fractions.
2003-11-18 19:59:53 +00:00
|
|
|
|
{
|
|
|
|
|
|
if (inexact)
|
(scm_is_rational): New.
(scm_i_short2big, scm_i_int2big, scm_i_uint2big, scm_i_size2big,
scm_i_ptrdiff2big, scm_i_long_long2big, scm_i_ulong_long2big):
Removed prototypes.
(scm_make_real, scm_num2dbl, scm_float2num, scm_double2num):
Discouraged by moving to discouraged.h and discouraged.c.
Replaced all uses with scm_from_double.
(scm_num2float, scm_num2double): Discouraged by moving prototype
to discouraged.h and rewriting in terms of scm_to_double.
Replaced all uses with scm_to_double.
(scm_to_double): Do not implement in terms of scm_num2dbl, use
explicit code.
(scm_from_double): Do not implement in terms of scm_make_real, use
explicit code.
2004-08-03 15:03:35 +00:00
|
|
|
|
return scm_from_double ((double) xx / scm_i_big2dbl (y));
|
2004-08-03 15:55:42 +00:00
|
|
|
|
else return scm_i_make_ratio (x, y);
|
* print.c (scm_iprin1): Handle fractions.
* objects.h (scm_class_fraction): New.
* objects.c (scm_class_fraction): New.
(scm_class_of): Handle fractions.
* hash.c (scm_hasher): Handle fractions.
* numbers.c: New code for handling fraction all over the place.
(scm_odd_p, scm_even_p): Handle inexact integers.
(scm_rational_p): New function, same as scm_real_p.
(scm_round_number, scm_truncate_number, scm_ceiling, scm_floor):
New exact functions that replace the inexact 'dsubr'
implementations.
(scm_numerator, scm_denominator): New.
* numbers.h (SCM_NUMP): Recognize fractions.
(SCM_FRACTIONP, SCM_SLOPPY_FRACTIONP, SCM_FRACTION_NUMERATOR,
SCM_FRACTION_DENOMINATOR, SCM_FRACTION_SET_NUMERATOR,
SCM_FRACTION_SET_DENOMINATOR, SCM_FRACTION_REDUCED_BIT,
SCM_FRACTION_REDUCED_SET, SCM_FRACTION_REDUCED_CLEAR,
SCM_FRACTION_REDUCED): New.
(scm_floor, scm_ceiling, scm_truncate_number, scm_round_number):
New prototypes.
(scm_make_ratio, scm_rationalize, scm_numerator, scm_denominator,
scm_rational_p): New prototypes.
(scm_i_dbl2num, scm_i_fraction2double, scm_i_fraction_equalp,
scm_i_print_fraction): New prototypes.
* goops.c (create_standard_classes): Create "<fraction>" class.
* gc-mark.c (scm_gc_mark_dependencies): Handle fractions.
* gc-card.c (scm_i_sweep_card): Include scm_tc16_fraction as a
case in the switch, but do nothing for now.
* eval.c (SCM_CEVAL, SCM_APPLY, call_dsubr_1): Convert fractions
to doubles when calling 'dsubr' functions.
* eq.c (scm_eqv_p, scm_equal_p): Handle fractions.
2003-11-18 19:59:53 +00:00
|
|
|
|
}
|
2003-07-13 16:13:57 +00:00
|
|
|
|
else if (SCM_REALP (y))
|
|
|
|
|
|
{
|
|
|
|
|
|
double yy = SCM_REAL_VALUE (y);
|
From John W. Eaton.
* numbers.h: Conditionally include floatingpoint.h, ieeefp.h, and
nan.h. Provide declarations for scm_inf_p, scm_nan_p, scn_inf,
and scm_nan.
* numbers.c: [SCO && ! HAVE_ISNAN] (isnan): New function.
[SCO && ! HAVE_ISINF] (isinf): New function.
(xisinf, xisnan): New functions.
(IS_INF): Delete.
(isfinite): Define in terms of xisinf.
(scm_inf_p, scm_nan_p): New functions.
(guile_Inf, guile_NaN): New file-scope vars.
(guile_ieee_init): New function.
(scm_inf, scm_nan): New functions.
(idbl2str): Handle Inf and NaN. Remove funny label and
corresponding gotos.
(ALLOW_DIVIDE_BY_ZERO): New macro.
(scm_divide): Allow division by zero to occur if
ALLOW_DIVIDE_BY_ZERO is defined.
Handle bignums and ints as special cases.
Additional stuff by me:
numbers.c (mem2ureal): Recognize "inf.0" and "nan.xxx".
(scm_even_p, scm_odd_p): Treat infinity as even and odd.
(iflo2str): Don't output a '+' for negative numbers or for Inf and
NaN. They will provide their own sign.
(scm_divide): Only allow divides by inexact zeros. Dividing by
exact zeros still signals an errors.
2002-05-06 22:33:10 +00:00
|
|
|
|
#ifndef ALLOW_DIVIDE_BY_ZERO
|
2003-07-13 16:13:57 +00:00
|
|
|
|
if (yy == 0.0)
|
|
|
|
|
|
scm_num_overflow (s_divide);
|
|
|
|
|
|
else
|
From John W. Eaton.
* numbers.h: Conditionally include floatingpoint.h, ieeefp.h, and
nan.h. Provide declarations for scm_inf_p, scm_nan_p, scn_inf,
and scm_nan.
* numbers.c: [SCO && ! HAVE_ISNAN] (isnan): New function.
[SCO && ! HAVE_ISINF] (isinf): New function.
(xisinf, xisnan): New functions.
(IS_INF): Delete.
(isfinite): Define in terms of xisinf.
(scm_inf_p, scm_nan_p): New functions.
(guile_Inf, guile_NaN): New file-scope vars.
(guile_ieee_init): New function.
(scm_inf, scm_nan): New functions.
(idbl2str): Handle Inf and NaN. Remove funny label and
corresponding gotos.
(ALLOW_DIVIDE_BY_ZERO): New macro.
(scm_divide): Allow division by zero to occur if
ALLOW_DIVIDE_BY_ZERO is defined.
Handle bignums and ints as special cases.
Additional stuff by me:
numbers.c (mem2ureal): Recognize "inf.0" and "nan.xxx".
(scm_even_p, scm_odd_p): Treat infinity as even and odd.
(iflo2str): Don't output a '+' for negative numbers or for Inf and
NaN. They will provide their own sign.
(scm_divide): Only allow divides by inexact zeros. Dividing by
exact zeros still signals an errors.
2002-05-06 22:33:10 +00:00
|
|
|
|
#endif
|
(scm_is_rational): New.
(scm_i_short2big, scm_i_int2big, scm_i_uint2big, scm_i_size2big,
scm_i_ptrdiff2big, scm_i_long_long2big, scm_i_ulong_long2big):
Removed prototypes.
(scm_make_real, scm_num2dbl, scm_float2num, scm_double2num):
Discouraged by moving to discouraged.h and discouraged.c.
Replaced all uses with scm_from_double.
(scm_num2float, scm_num2double): Discouraged by moving prototype
to discouraged.h and rewriting in terms of scm_to_double.
Replaced all uses with scm_to_double.
(scm_to_double): Do not implement in terms of scm_num2dbl, use
explicit code.
(scm_from_double): Do not implement in terms of scm_make_real, use
explicit code.
2004-08-03 15:03:35 +00:00
|
|
|
|
return scm_from_double ((double) xx / yy);
|
2002-03-11 19:10:01 +00:00
|
|
|
|
}
|
2003-07-13 16:13:57 +00:00
|
|
|
|
else if (SCM_COMPLEXP (y))
|
|
|
|
|
|
{
|
|
|
|
|
|
a = xx;
|
|
|
|
|
|
complex_div: /* y _must_ be a complex number */
|
|
|
|
|
|
{
|
|
|
|
|
|
double r = SCM_COMPLEX_REAL (y);
|
|
|
|
|
|
double i = SCM_COMPLEX_IMAG (y);
|
2005-04-29 22:59:22 +00:00
|
|
|
|
if (fabs(r) <= fabs(i))
|
2003-07-13 16:13:57 +00:00
|
|
|
|
{
|
|
|
|
|
|
double t = r / i;
|
|
|
|
|
|
double d = i * (1.0 + t * t);
|
2004-08-03 17:12:14 +00:00
|
|
|
|
return scm_c_make_rectangular ((a * t) / d, -a / d);
|
2003-07-13 16:13:57 +00:00
|
|
|
|
}
|
|
|
|
|
|
else
|
|
|
|
|
|
{
|
|
|
|
|
|
double t = i / r;
|
|
|
|
|
|
double d = r * (1.0 + t * t);
|
2004-08-03 17:12:14 +00:00
|
|
|
|
return scm_c_make_rectangular (a / d, -(a * t) / d);
|
2003-07-13 16:13:57 +00:00
|
|
|
|
}
|
|
|
|
|
|
}
|
|
|
|
|
|
}
|
* print.c (scm_iprin1): Handle fractions.
* objects.h (scm_class_fraction): New.
* objects.c (scm_class_fraction): New.
(scm_class_of): Handle fractions.
* hash.c (scm_hasher): Handle fractions.
* numbers.c: New code for handling fraction all over the place.
(scm_odd_p, scm_even_p): Handle inexact integers.
(scm_rational_p): New function, same as scm_real_p.
(scm_round_number, scm_truncate_number, scm_ceiling, scm_floor):
New exact functions that replace the inexact 'dsubr'
implementations.
(scm_numerator, scm_denominator): New.
* numbers.h (SCM_NUMP): Recognize fractions.
(SCM_FRACTIONP, SCM_SLOPPY_FRACTIONP, SCM_FRACTION_NUMERATOR,
SCM_FRACTION_DENOMINATOR, SCM_FRACTION_SET_NUMERATOR,
SCM_FRACTION_SET_DENOMINATOR, SCM_FRACTION_REDUCED_BIT,
SCM_FRACTION_REDUCED_SET, SCM_FRACTION_REDUCED_CLEAR,
SCM_FRACTION_REDUCED): New.
(scm_floor, scm_ceiling, scm_truncate_number, scm_round_number):
New prototypes.
(scm_make_ratio, scm_rationalize, scm_numerator, scm_denominator,
scm_rational_p): New prototypes.
(scm_i_dbl2num, scm_i_fraction2double, scm_i_fraction_equalp,
scm_i_print_fraction): New prototypes.
* goops.c (create_standard_classes): Create "<fraction>" class.
* gc-mark.c (scm_gc_mark_dependencies): Handle fractions.
* gc-card.c (scm_i_sweep_card): Include scm_tc16_fraction as a
case in the switch, but do nothing for now.
* eval.c (SCM_CEVAL, SCM_APPLY, call_dsubr_1): Convert fractions
to doubles when calling 'dsubr' functions.
* eq.c (scm_eqv_p, scm_equal_p): Handle fractions.
2003-11-18 19:59:53 +00:00
|
|
|
|
else if (SCM_FRACTIONP (y))
|
|
|
|
|
|
/* a / b/c = ac / b */
|
2004-08-03 15:55:42 +00:00
|
|
|
|
return scm_i_make_ratio (scm_product (x, SCM_FRACTION_DENOMINATOR (y)),
|
* print.c (scm_iprin1): Handle fractions.
* objects.h (scm_class_fraction): New.
* objects.c (scm_class_fraction): New.
(scm_class_of): Handle fractions.
* hash.c (scm_hasher): Handle fractions.
* numbers.c: New code for handling fraction all over the place.
(scm_odd_p, scm_even_p): Handle inexact integers.
(scm_rational_p): New function, same as scm_real_p.
(scm_round_number, scm_truncate_number, scm_ceiling, scm_floor):
New exact functions that replace the inexact 'dsubr'
implementations.
(scm_numerator, scm_denominator): New.
* numbers.h (SCM_NUMP): Recognize fractions.
(SCM_FRACTIONP, SCM_SLOPPY_FRACTIONP, SCM_FRACTION_NUMERATOR,
SCM_FRACTION_DENOMINATOR, SCM_FRACTION_SET_NUMERATOR,
SCM_FRACTION_SET_DENOMINATOR, SCM_FRACTION_REDUCED_BIT,
SCM_FRACTION_REDUCED_SET, SCM_FRACTION_REDUCED_CLEAR,
SCM_FRACTION_REDUCED): New.
(scm_floor, scm_ceiling, scm_truncate_number, scm_round_number):
New prototypes.
(scm_make_ratio, scm_rationalize, scm_numerator, scm_denominator,
scm_rational_p): New prototypes.
(scm_i_dbl2num, scm_i_fraction2double, scm_i_fraction_equalp,
scm_i_print_fraction): New prototypes.
* goops.c (create_standard_classes): Create "<fraction>" class.
* gc-mark.c (scm_gc_mark_dependencies): Handle fractions.
* gc-card.c (scm_i_sweep_card): Include scm_tc16_fraction as a
case in the switch, but do nothing for now.
* eval.c (SCM_CEVAL, SCM_APPLY, call_dsubr_1): Convert fractions
to doubles when calling 'dsubr' functions.
* eq.c (scm_eqv_p, scm_equal_p): Handle fractions.
2003-11-18 19:59:53 +00:00
|
|
|
|
SCM_FRACTION_NUMERATOR (y));
|
2003-07-13 16:13:57 +00:00
|
|
|
|
else
|
|
|
|
|
|
SCM_WTA_DISPATCH_2 (g_divide, x, y, SCM_ARGn, s_divide);
|
2000-05-02 16:41:20 +00:00
|
|
|
|
}
|
2003-07-13 16:13:57 +00:00
|
|
|
|
else if (SCM_BIGP (x))
|
|
|
|
|
|
{
|
2004-07-23 15:43:02 +00:00
|
|
|
|
if (SCM_I_INUMP (y))
|
2003-07-13 16:13:57 +00:00
|
|
|
|
{
|
2004-07-23 15:43:02 +00:00
|
|
|
|
long int yy = SCM_I_INUM (y);
|
2003-07-13 16:13:57 +00:00
|
|
|
|
if (yy == 0)
|
|
|
|
|
|
{
|
From John W. Eaton.
* numbers.h: Conditionally include floatingpoint.h, ieeefp.h, and
nan.h. Provide declarations for scm_inf_p, scm_nan_p, scn_inf,
and scm_nan.
* numbers.c: [SCO && ! HAVE_ISNAN] (isnan): New function.
[SCO && ! HAVE_ISINF] (isinf): New function.
(xisinf, xisnan): New functions.
(IS_INF): Delete.
(isfinite): Define in terms of xisinf.
(scm_inf_p, scm_nan_p): New functions.
(guile_Inf, guile_NaN): New file-scope vars.
(guile_ieee_init): New function.
(scm_inf, scm_nan): New functions.
(idbl2str): Handle Inf and NaN. Remove funny label and
corresponding gotos.
(ALLOW_DIVIDE_BY_ZERO): New macro.
(scm_divide): Allow division by zero to occur if
ALLOW_DIVIDE_BY_ZERO is defined.
Handle bignums and ints as special cases.
Additional stuff by me:
numbers.c (mem2ureal): Recognize "inf.0" and "nan.xxx".
(scm_even_p, scm_odd_p): Treat infinity as even and odd.
(iflo2str): Don't output a '+' for negative numbers or for Inf and
NaN. They will provide their own sign.
(scm_divide): Only allow divides by inexact zeros. Dividing by
exact zeros still signals an errors.
2002-05-06 22:33:10 +00:00
|
|
|
|
#ifndef ALLOW_DIVIDE_BY_EXACT_ZERO
|
2003-07-13 16:13:57 +00:00
|
|
|
|
scm_num_overflow (s_divide);
|
From John W. Eaton.
* numbers.h: Conditionally include floatingpoint.h, ieeefp.h, and
nan.h. Provide declarations for scm_inf_p, scm_nan_p, scn_inf,
and scm_nan.
* numbers.c: [SCO && ! HAVE_ISNAN] (isnan): New function.
[SCO && ! HAVE_ISINF] (isinf): New function.
(xisinf, xisnan): New functions.
(IS_INF): Delete.
(isfinite): Define in terms of xisinf.
(scm_inf_p, scm_nan_p): New functions.
(guile_Inf, guile_NaN): New file-scope vars.
(guile_ieee_init): New function.
(scm_inf, scm_nan): New functions.
(idbl2str): Handle Inf and NaN. Remove funny label and
corresponding gotos.
(ALLOW_DIVIDE_BY_ZERO): New macro.
(scm_divide): Allow division by zero to occur if
ALLOW_DIVIDE_BY_ZERO is defined.
Handle bignums and ints as special cases.
Additional stuff by me:
numbers.c (mem2ureal): Recognize "inf.0" and "nan.xxx".
(scm_even_p, scm_odd_p): Treat infinity as even and odd.
(iflo2str): Don't output a '+' for negative numbers or for Inf and
NaN. They will provide their own sign.
(scm_divide): Only allow divides by inexact zeros. Dividing by
exact zeros still signals an errors.
2002-05-06 22:33:10 +00:00
|
|
|
|
#else
|
2003-07-13 16:13:57 +00:00
|
|
|
|
int sgn = mpz_sgn (SCM_I_BIG_MPZ (x));
|
|
|
|
|
|
scm_remember_upto_here_1 (x);
|
|
|
|
|
|
return (sgn == 0) ? scm_nan () : scm_inf ();
|
From John W. Eaton.
* numbers.h: Conditionally include floatingpoint.h, ieeefp.h, and
nan.h. Provide declarations for scm_inf_p, scm_nan_p, scn_inf,
and scm_nan.
* numbers.c: [SCO && ! HAVE_ISNAN] (isnan): New function.
[SCO && ! HAVE_ISINF] (isinf): New function.
(xisinf, xisnan): New functions.
(IS_INF): Delete.
(isfinite): Define in terms of xisinf.
(scm_inf_p, scm_nan_p): New functions.
(guile_Inf, guile_NaN): New file-scope vars.
(guile_ieee_init): New function.
(scm_inf, scm_nan): New functions.
(idbl2str): Handle Inf and NaN. Remove funny label and
corresponding gotos.
(ALLOW_DIVIDE_BY_ZERO): New macro.
(scm_divide): Allow division by zero to occur if
ALLOW_DIVIDE_BY_ZERO is defined.
Handle bignums and ints as special cases.
Additional stuff by me:
numbers.c (mem2ureal): Recognize "inf.0" and "nan.xxx".
(scm_even_p, scm_odd_p): Treat infinity as even and odd.
(iflo2str): Don't output a '+' for negative numbers or for Inf and
NaN. They will provide their own sign.
(scm_divide): Only allow divides by inexact zeros. Dividing by
exact zeros still signals an errors.
2002-05-06 22:33:10 +00:00
|
|
|
|
#endif
|
2003-07-13 16:13:57 +00:00
|
|
|
|
}
|
|
|
|
|
|
else if (yy == 1)
|
|
|
|
|
|
return x;
|
|
|
|
|
|
else
|
|
|
|
|
|
{
|
|
|
|
|
|
/* FIXME: HMM, what are the relative performance issues here?
|
|
|
|
|
|
We need to test. Is it faster on average to test
|
|
|
|
|
|
divisible_p, then perform whichever operation, or is it
|
|
|
|
|
|
faster to perform the integer div opportunistically and
|
|
|
|
|
|
switch to real if there's a remainder? For now we take the
|
|
|
|
|
|
middle ground: test, then if divisible, use the faster div
|
|
|
|
|
|
func. */
|
|
|
|
|
|
|
|
|
|
|
|
long abs_yy = yy < 0 ? -yy : yy;
|
|
|
|
|
|
int divisible_p = mpz_divisible_ui_p (SCM_I_BIG_MPZ (x), abs_yy);
|
|
|
|
|
|
|
|
|
|
|
|
if (divisible_p)
|
|
|
|
|
|
{
|
|
|
|
|
|
SCM result = scm_i_mkbig ();
|
|
|
|
|
|
mpz_divexact_ui (SCM_I_BIG_MPZ (result), SCM_I_BIG_MPZ (x), abs_yy);
|
|
|
|
|
|
scm_remember_upto_here_1 (x);
|
|
|
|
|
|
if (yy < 0)
|
|
|
|
|
|
mpz_neg (SCM_I_BIG_MPZ (result), SCM_I_BIG_MPZ (result));
|
|
|
|
|
|
return scm_i_normbig (result);
|
|
|
|
|
|
}
|
|
|
|
|
|
else
|
* print.c (scm_iprin1): Handle fractions.
* objects.h (scm_class_fraction): New.
* objects.c (scm_class_fraction): New.
(scm_class_of): Handle fractions.
* hash.c (scm_hasher): Handle fractions.
* numbers.c: New code for handling fraction all over the place.
(scm_odd_p, scm_even_p): Handle inexact integers.
(scm_rational_p): New function, same as scm_real_p.
(scm_round_number, scm_truncate_number, scm_ceiling, scm_floor):
New exact functions that replace the inexact 'dsubr'
implementations.
(scm_numerator, scm_denominator): New.
* numbers.h (SCM_NUMP): Recognize fractions.
(SCM_FRACTIONP, SCM_SLOPPY_FRACTIONP, SCM_FRACTION_NUMERATOR,
SCM_FRACTION_DENOMINATOR, SCM_FRACTION_SET_NUMERATOR,
SCM_FRACTION_SET_DENOMINATOR, SCM_FRACTION_REDUCED_BIT,
SCM_FRACTION_REDUCED_SET, SCM_FRACTION_REDUCED_CLEAR,
SCM_FRACTION_REDUCED): New.
(scm_floor, scm_ceiling, scm_truncate_number, scm_round_number):
New prototypes.
(scm_make_ratio, scm_rationalize, scm_numerator, scm_denominator,
scm_rational_p): New prototypes.
(scm_i_dbl2num, scm_i_fraction2double, scm_i_fraction_equalp,
scm_i_print_fraction): New prototypes.
* goops.c (create_standard_classes): Create "<fraction>" class.
* gc-mark.c (scm_gc_mark_dependencies): Handle fractions.
* gc-card.c (scm_i_sweep_card): Include scm_tc16_fraction as a
case in the switch, but do nothing for now.
* eval.c (SCM_CEVAL, SCM_APPLY, call_dsubr_1): Convert fractions
to doubles when calling 'dsubr' functions.
* eq.c (scm_eqv_p, scm_equal_p): Handle fractions.
2003-11-18 19:59:53 +00:00
|
|
|
|
{
|
|
|
|
|
|
if (inexact)
|
(scm_is_rational): New.
(scm_i_short2big, scm_i_int2big, scm_i_uint2big, scm_i_size2big,
scm_i_ptrdiff2big, scm_i_long_long2big, scm_i_ulong_long2big):
Removed prototypes.
(scm_make_real, scm_num2dbl, scm_float2num, scm_double2num):
Discouraged by moving to discouraged.h and discouraged.c.
Replaced all uses with scm_from_double.
(scm_num2float, scm_num2double): Discouraged by moving prototype
to discouraged.h and rewriting in terms of scm_to_double.
Replaced all uses with scm_to_double.
(scm_to_double): Do not implement in terms of scm_num2dbl, use
explicit code.
(scm_from_double): Do not implement in terms of scm_make_real, use
explicit code.
2004-08-03 15:03:35 +00:00
|
|
|
|
return scm_from_double (scm_i_big2dbl (x) / (double) yy);
|
2004-08-03 15:55:42 +00:00
|
|
|
|
else return scm_i_make_ratio (x, y);
|
* print.c (scm_iprin1): Handle fractions.
* objects.h (scm_class_fraction): New.
* objects.c (scm_class_fraction): New.
(scm_class_of): Handle fractions.
* hash.c (scm_hasher): Handle fractions.
* numbers.c: New code for handling fraction all over the place.
(scm_odd_p, scm_even_p): Handle inexact integers.
(scm_rational_p): New function, same as scm_real_p.
(scm_round_number, scm_truncate_number, scm_ceiling, scm_floor):
New exact functions that replace the inexact 'dsubr'
implementations.
(scm_numerator, scm_denominator): New.
* numbers.h (SCM_NUMP): Recognize fractions.
(SCM_FRACTIONP, SCM_SLOPPY_FRACTIONP, SCM_FRACTION_NUMERATOR,
SCM_FRACTION_DENOMINATOR, SCM_FRACTION_SET_NUMERATOR,
SCM_FRACTION_SET_DENOMINATOR, SCM_FRACTION_REDUCED_BIT,
SCM_FRACTION_REDUCED_SET, SCM_FRACTION_REDUCED_CLEAR,
SCM_FRACTION_REDUCED): New.
(scm_floor, scm_ceiling, scm_truncate_number, scm_round_number):
New prototypes.
(scm_make_ratio, scm_rationalize, scm_numerator, scm_denominator,
scm_rational_p): New prototypes.
(scm_i_dbl2num, scm_i_fraction2double, scm_i_fraction_equalp,
scm_i_print_fraction): New prototypes.
* goops.c (create_standard_classes): Create "<fraction>" class.
* gc-mark.c (scm_gc_mark_dependencies): Handle fractions.
* gc-card.c (scm_i_sweep_card): Include scm_tc16_fraction as a
case in the switch, but do nothing for now.
* eval.c (SCM_CEVAL, SCM_APPLY, call_dsubr_1): Convert fractions
to doubles when calling 'dsubr' functions.
* eq.c (scm_eqv_p, scm_equal_p): Handle fractions.
2003-11-18 19:59:53 +00:00
|
|
|
|
}
|
2003-07-13 16:13:57 +00:00
|
|
|
|
}
|
|
|
|
|
|
}
|
|
|
|
|
|
else if (SCM_BIGP (y))
|
|
|
|
|
|
{
|
|
|
|
|
|
int y_is_zero = (mpz_sgn (SCM_I_BIG_MPZ (y)) == 0);
|
|
|
|
|
|
if (y_is_zero)
|
|
|
|
|
|
{
|
2003-04-04 21:49:44 +00:00
|
|
|
|
#ifndef ALLOW_DIVIDE_BY_EXACT_ZERO
|
2003-07-13 16:13:57 +00:00
|
|
|
|
scm_num_overflow (s_divide);
|
1999-01-10 07:38:39 +00:00
|
|
|
|
#else
|
2003-07-13 16:13:57 +00:00
|
|
|
|
int sgn = mpz_sgn (SCM_I_BIG_MPZ (x));
|
|
|
|
|
|
scm_remember_upto_here_1 (x);
|
|
|
|
|
|
return (sgn == 0) ? scm_nan () : scm_inf ();
|
1999-01-10 07:38:39 +00:00
|
|
|
|
#endif
|
2003-07-13 16:13:57 +00:00
|
|
|
|
}
|
|
|
|
|
|
else
|
|
|
|
|
|
{
|
|
|
|
|
|
/* big_x / big_y */
|
2006-06-17 23:15:59 +00:00
|
|
|
|
if (inexact)
|
|
|
|
|
|
{
|
|
|
|
|
|
/* It's easily possible for the ratio x/y to fit a double
|
|
|
|
|
|
but one or both x and y be too big to fit a double,
|
|
|
|
|
|
hence the use of mpq_get_d rather than converting and
|
|
|
|
|
|
dividing. */
|
|
|
|
|
|
mpq_t q;
|
|
|
|
|
|
*mpq_numref(q) = *SCM_I_BIG_MPZ (x);
|
|
|
|
|
|
*mpq_denref(q) = *SCM_I_BIG_MPZ (y);
|
|
|
|
|
|
return scm_from_double (mpq_get_d (q));
|
|
|
|
|
|
}
|
|
|
|
|
|
else
|
|
|
|
|
|
{
|
|
|
|
|
|
int divisible_p = mpz_divisible_p (SCM_I_BIG_MPZ (x),
|
|
|
|
|
|
SCM_I_BIG_MPZ (y));
|
|
|
|
|
|
if (divisible_p)
|
|
|
|
|
|
{
|
|
|
|
|
|
SCM result = scm_i_mkbig ();
|
|
|
|
|
|
mpz_divexact (SCM_I_BIG_MPZ (result),
|
|
|
|
|
|
SCM_I_BIG_MPZ (x),
|
|
|
|
|
|
SCM_I_BIG_MPZ (y));
|
|
|
|
|
|
scm_remember_upto_here_2 (x, y);
|
|
|
|
|
|
return scm_i_normbig (result);
|
|
|
|
|
|
}
|
|
|
|
|
|
else
|
|
|
|
|
|
return scm_i_make_ratio (x, y);
|
|
|
|
|
|
}
|
2003-07-13 16:13:57 +00:00
|
|
|
|
}
|
|
|
|
|
|
}
|
|
|
|
|
|
else if (SCM_REALP (y))
|
|
|
|
|
|
{
|
|
|
|
|
|
double yy = SCM_REAL_VALUE (y);
|
From John W. Eaton.
* numbers.h: Conditionally include floatingpoint.h, ieeefp.h, and
nan.h. Provide declarations for scm_inf_p, scm_nan_p, scn_inf,
and scm_nan.
* numbers.c: [SCO && ! HAVE_ISNAN] (isnan): New function.
[SCO && ! HAVE_ISINF] (isinf): New function.
(xisinf, xisnan): New functions.
(IS_INF): Delete.
(isfinite): Define in terms of xisinf.
(scm_inf_p, scm_nan_p): New functions.
(guile_Inf, guile_NaN): New file-scope vars.
(guile_ieee_init): New function.
(scm_inf, scm_nan): New functions.
(idbl2str): Handle Inf and NaN. Remove funny label and
corresponding gotos.
(ALLOW_DIVIDE_BY_ZERO): New macro.
(scm_divide): Allow division by zero to occur if
ALLOW_DIVIDE_BY_ZERO is defined.
Handle bignums and ints as special cases.
Additional stuff by me:
numbers.c (mem2ureal): Recognize "inf.0" and "nan.xxx".
(scm_even_p, scm_odd_p): Treat infinity as even and odd.
(iflo2str): Don't output a '+' for negative numbers or for Inf and
NaN. They will provide their own sign.
(scm_divide): Only allow divides by inexact zeros. Dividing by
exact zeros still signals an errors.
2002-05-06 22:33:10 +00:00
|
|
|
|
#ifndef ALLOW_DIVIDE_BY_ZERO
|
2003-07-13 16:13:57 +00:00
|
|
|
|
if (yy == 0.0)
|
|
|
|
|
|
scm_num_overflow (s_divide);
|
|
|
|
|
|
else
|
From John W. Eaton.
* numbers.h: Conditionally include floatingpoint.h, ieeefp.h, and
nan.h. Provide declarations for scm_inf_p, scm_nan_p, scn_inf,
and scm_nan.
* numbers.c: [SCO && ! HAVE_ISNAN] (isnan): New function.
[SCO && ! HAVE_ISINF] (isinf): New function.
(xisinf, xisnan): New functions.
(IS_INF): Delete.
(isfinite): Define in terms of xisinf.
(scm_inf_p, scm_nan_p): New functions.
(guile_Inf, guile_NaN): New file-scope vars.
(guile_ieee_init): New function.
(scm_inf, scm_nan): New functions.
(idbl2str): Handle Inf and NaN. Remove funny label and
corresponding gotos.
(ALLOW_DIVIDE_BY_ZERO): New macro.
(scm_divide): Allow division by zero to occur if
ALLOW_DIVIDE_BY_ZERO is defined.
Handle bignums and ints as special cases.
Additional stuff by me:
numbers.c (mem2ureal): Recognize "inf.0" and "nan.xxx".
(scm_even_p, scm_odd_p): Treat infinity as even and odd.
(iflo2str): Don't output a '+' for negative numbers or for Inf and
NaN. They will provide their own sign.
(scm_divide): Only allow divides by inexact zeros. Dividing by
exact zeros still signals an errors.
2002-05-06 22:33:10 +00:00
|
|
|
|
#endif
|
(scm_is_rational): New.
(scm_i_short2big, scm_i_int2big, scm_i_uint2big, scm_i_size2big,
scm_i_ptrdiff2big, scm_i_long_long2big, scm_i_ulong_long2big):
Removed prototypes.
(scm_make_real, scm_num2dbl, scm_float2num, scm_double2num):
Discouraged by moving to discouraged.h and discouraged.c.
Replaced all uses with scm_from_double.
(scm_num2float, scm_num2double): Discouraged by moving prototype
to discouraged.h and rewriting in terms of scm_to_double.
Replaced all uses with scm_to_double.
(scm_to_double): Do not implement in terms of scm_num2dbl, use
explicit code.
(scm_from_double): Do not implement in terms of scm_make_real, use
explicit code.
2004-08-03 15:03:35 +00:00
|
|
|
|
return scm_from_double (scm_i_big2dbl (x) / yy);
|
2003-07-13 16:13:57 +00:00
|
|
|
|
}
|
|
|
|
|
|
else if (SCM_COMPLEXP (y))
|
|
|
|
|
|
{
|
|
|
|
|
|
a = scm_i_big2dbl (x);
|
|
|
|
|
|
goto complex_div;
|
|
|
|
|
|
}
|
* print.c (scm_iprin1): Handle fractions.
* objects.h (scm_class_fraction): New.
* objects.c (scm_class_fraction): New.
(scm_class_of): Handle fractions.
* hash.c (scm_hasher): Handle fractions.
* numbers.c: New code for handling fraction all over the place.
(scm_odd_p, scm_even_p): Handle inexact integers.
(scm_rational_p): New function, same as scm_real_p.
(scm_round_number, scm_truncate_number, scm_ceiling, scm_floor):
New exact functions that replace the inexact 'dsubr'
implementations.
(scm_numerator, scm_denominator): New.
* numbers.h (SCM_NUMP): Recognize fractions.
(SCM_FRACTIONP, SCM_SLOPPY_FRACTIONP, SCM_FRACTION_NUMERATOR,
SCM_FRACTION_DENOMINATOR, SCM_FRACTION_SET_NUMERATOR,
SCM_FRACTION_SET_DENOMINATOR, SCM_FRACTION_REDUCED_BIT,
SCM_FRACTION_REDUCED_SET, SCM_FRACTION_REDUCED_CLEAR,
SCM_FRACTION_REDUCED): New.
(scm_floor, scm_ceiling, scm_truncate_number, scm_round_number):
New prototypes.
(scm_make_ratio, scm_rationalize, scm_numerator, scm_denominator,
scm_rational_p): New prototypes.
(scm_i_dbl2num, scm_i_fraction2double, scm_i_fraction_equalp,
scm_i_print_fraction): New prototypes.
* goops.c (create_standard_classes): Create "<fraction>" class.
* gc-mark.c (scm_gc_mark_dependencies): Handle fractions.
* gc-card.c (scm_i_sweep_card): Include scm_tc16_fraction as a
case in the switch, but do nothing for now.
* eval.c (SCM_CEVAL, SCM_APPLY, call_dsubr_1): Convert fractions
to doubles when calling 'dsubr' functions.
* eq.c (scm_eqv_p, scm_equal_p): Handle fractions.
2003-11-18 19:59:53 +00:00
|
|
|
|
else if (SCM_FRACTIONP (y))
|
2004-08-03 15:55:42 +00:00
|
|
|
|
return scm_i_make_ratio (scm_product (x, SCM_FRACTION_DENOMINATOR (y)),
|
* print.c (scm_iprin1): Handle fractions.
* objects.h (scm_class_fraction): New.
* objects.c (scm_class_fraction): New.
(scm_class_of): Handle fractions.
* hash.c (scm_hasher): Handle fractions.
* numbers.c: New code for handling fraction all over the place.
(scm_odd_p, scm_even_p): Handle inexact integers.
(scm_rational_p): New function, same as scm_real_p.
(scm_round_number, scm_truncate_number, scm_ceiling, scm_floor):
New exact functions that replace the inexact 'dsubr'
implementations.
(scm_numerator, scm_denominator): New.
* numbers.h (SCM_NUMP): Recognize fractions.
(SCM_FRACTIONP, SCM_SLOPPY_FRACTIONP, SCM_FRACTION_NUMERATOR,
SCM_FRACTION_DENOMINATOR, SCM_FRACTION_SET_NUMERATOR,
SCM_FRACTION_SET_DENOMINATOR, SCM_FRACTION_REDUCED_BIT,
SCM_FRACTION_REDUCED_SET, SCM_FRACTION_REDUCED_CLEAR,
SCM_FRACTION_REDUCED): New.
(scm_floor, scm_ceiling, scm_truncate_number, scm_round_number):
New prototypes.
(scm_make_ratio, scm_rationalize, scm_numerator, scm_denominator,
scm_rational_p): New prototypes.
(scm_i_dbl2num, scm_i_fraction2double, scm_i_fraction_equalp,
scm_i_print_fraction): New prototypes.
* goops.c (create_standard_classes): Create "<fraction>" class.
* gc-mark.c (scm_gc_mark_dependencies): Handle fractions.
* gc-card.c (scm_i_sweep_card): Include scm_tc16_fraction as a
case in the switch, but do nothing for now.
* eval.c (SCM_CEVAL, SCM_APPLY, call_dsubr_1): Convert fractions
to doubles when calling 'dsubr' functions.
* eq.c (scm_eqv_p, scm_equal_p): Handle fractions.
2003-11-18 19:59:53 +00:00
|
|
|
|
SCM_FRACTION_NUMERATOR (y));
|
2003-07-13 16:13:57 +00:00
|
|
|
|
else
|
|
|
|
|
|
SCM_WTA_DISPATCH_2 (g_divide, x, y, SCM_ARGn, s_divide);
|
1999-01-10 07:38:39 +00:00
|
|
|
|
}
|
2003-07-13 16:13:57 +00:00
|
|
|
|
else if (SCM_REALP (x))
|
|
|
|
|
|
{
|
|
|
|
|
|
double rx = SCM_REAL_VALUE (x);
|
2004-07-23 15:43:02 +00:00
|
|
|
|
if (SCM_I_INUMP (y))
|
2003-07-13 16:13:57 +00:00
|
|
|
|
{
|
2004-07-23 15:43:02 +00:00
|
|
|
|
long int yy = SCM_I_INUM (y);
|
From John W. Eaton.
* numbers.h: Conditionally include floatingpoint.h, ieeefp.h, and
nan.h. Provide declarations for scm_inf_p, scm_nan_p, scn_inf,
and scm_nan.
* numbers.c: [SCO && ! HAVE_ISNAN] (isnan): New function.
[SCO && ! HAVE_ISINF] (isinf): New function.
(xisinf, xisnan): New functions.
(IS_INF): Delete.
(isfinite): Define in terms of xisinf.
(scm_inf_p, scm_nan_p): New functions.
(guile_Inf, guile_NaN): New file-scope vars.
(guile_ieee_init): New function.
(scm_inf, scm_nan): New functions.
(idbl2str): Handle Inf and NaN. Remove funny label and
corresponding gotos.
(ALLOW_DIVIDE_BY_ZERO): New macro.
(scm_divide): Allow division by zero to occur if
ALLOW_DIVIDE_BY_ZERO is defined.
Handle bignums and ints as special cases.
Additional stuff by me:
numbers.c (mem2ureal): Recognize "inf.0" and "nan.xxx".
(scm_even_p, scm_odd_p): Treat infinity as even and odd.
(iflo2str): Don't output a '+' for negative numbers or for Inf and
NaN. They will provide their own sign.
(scm_divide): Only allow divides by inexact zeros. Dividing by
exact zeros still signals an errors.
2002-05-06 22:33:10 +00:00
|
|
|
|
#ifndef ALLOW_DIVIDE_BY_EXACT_ZERO
|
2003-07-13 16:13:57 +00:00
|
|
|
|
if (yy == 0)
|
|
|
|
|
|
scm_num_overflow (s_divide);
|
|
|
|
|
|
else
|
From John W. Eaton.
* numbers.h: Conditionally include floatingpoint.h, ieeefp.h, and
nan.h. Provide declarations for scm_inf_p, scm_nan_p, scn_inf,
and scm_nan.
* numbers.c: [SCO && ! HAVE_ISNAN] (isnan): New function.
[SCO && ! HAVE_ISINF] (isinf): New function.
(xisinf, xisnan): New functions.
(IS_INF): Delete.
(isfinite): Define in terms of xisinf.
(scm_inf_p, scm_nan_p): New functions.
(guile_Inf, guile_NaN): New file-scope vars.
(guile_ieee_init): New function.
(scm_inf, scm_nan): New functions.
(idbl2str): Handle Inf and NaN. Remove funny label and
corresponding gotos.
(ALLOW_DIVIDE_BY_ZERO): New macro.
(scm_divide): Allow division by zero to occur if
ALLOW_DIVIDE_BY_ZERO is defined.
Handle bignums and ints as special cases.
Additional stuff by me:
numbers.c (mem2ureal): Recognize "inf.0" and "nan.xxx".
(scm_even_p, scm_odd_p): Treat infinity as even and odd.
(iflo2str): Don't output a '+' for negative numbers or for Inf and
NaN. They will provide their own sign.
(scm_divide): Only allow divides by inexact zeros. Dividing by
exact zeros still signals an errors.
2002-05-06 22:33:10 +00:00
|
|
|
|
#endif
|
(scm_is_rational): New.
(scm_i_short2big, scm_i_int2big, scm_i_uint2big, scm_i_size2big,
scm_i_ptrdiff2big, scm_i_long_long2big, scm_i_ulong_long2big):
Removed prototypes.
(scm_make_real, scm_num2dbl, scm_float2num, scm_double2num):
Discouraged by moving to discouraged.h and discouraged.c.
Replaced all uses with scm_from_double.
(scm_num2float, scm_num2double): Discouraged by moving prototype
to discouraged.h and rewriting in terms of scm_to_double.
Replaced all uses with scm_to_double.
(scm_to_double): Do not implement in terms of scm_num2dbl, use
explicit code.
(scm_from_double): Do not implement in terms of scm_make_real, use
explicit code.
2004-08-03 15:03:35 +00:00
|
|
|
|
return scm_from_double (rx / (double) yy);
|
2003-07-13 16:13:57 +00:00
|
|
|
|
}
|
|
|
|
|
|
else if (SCM_BIGP (y))
|
|
|
|
|
|
{
|
|
|
|
|
|
double dby = mpz_get_d (SCM_I_BIG_MPZ (y));
|
|
|
|
|
|
scm_remember_upto_here_1 (y);
|
(scm_is_rational): New.
(scm_i_short2big, scm_i_int2big, scm_i_uint2big, scm_i_size2big,
scm_i_ptrdiff2big, scm_i_long_long2big, scm_i_ulong_long2big):
Removed prototypes.
(scm_make_real, scm_num2dbl, scm_float2num, scm_double2num):
Discouraged by moving to discouraged.h and discouraged.c.
Replaced all uses with scm_from_double.
(scm_num2float, scm_num2double): Discouraged by moving prototype
to discouraged.h and rewriting in terms of scm_to_double.
Replaced all uses with scm_to_double.
(scm_to_double): Do not implement in terms of scm_num2dbl, use
explicit code.
(scm_from_double): Do not implement in terms of scm_make_real, use
explicit code.
2004-08-03 15:03:35 +00:00
|
|
|
|
return scm_from_double (rx / dby);
|
2003-07-13 16:13:57 +00:00
|
|
|
|
}
|
|
|
|
|
|
else if (SCM_REALP (y))
|
|
|
|
|
|
{
|
|
|
|
|
|
double yy = SCM_REAL_VALUE (y);
|
From John W. Eaton.
* numbers.h: Conditionally include floatingpoint.h, ieeefp.h, and
nan.h. Provide declarations for scm_inf_p, scm_nan_p, scn_inf,
and scm_nan.
* numbers.c: [SCO && ! HAVE_ISNAN] (isnan): New function.
[SCO && ! HAVE_ISINF] (isinf): New function.
(xisinf, xisnan): New functions.
(IS_INF): Delete.
(isfinite): Define in terms of xisinf.
(scm_inf_p, scm_nan_p): New functions.
(guile_Inf, guile_NaN): New file-scope vars.
(guile_ieee_init): New function.
(scm_inf, scm_nan): New functions.
(idbl2str): Handle Inf and NaN. Remove funny label and
corresponding gotos.
(ALLOW_DIVIDE_BY_ZERO): New macro.
(scm_divide): Allow division by zero to occur if
ALLOW_DIVIDE_BY_ZERO is defined.
Handle bignums and ints as special cases.
Additional stuff by me:
numbers.c (mem2ureal): Recognize "inf.0" and "nan.xxx".
(scm_even_p, scm_odd_p): Treat infinity as even and odd.
(iflo2str): Don't output a '+' for negative numbers or for Inf and
NaN. They will provide their own sign.
(scm_divide): Only allow divides by inexact zeros. Dividing by
exact zeros still signals an errors.
2002-05-06 22:33:10 +00:00
|
|
|
|
#ifndef ALLOW_DIVIDE_BY_ZERO
|
2003-07-13 16:13:57 +00:00
|
|
|
|
if (yy == 0.0)
|
|
|
|
|
|
scm_num_overflow (s_divide);
|
|
|
|
|
|
else
|
From John W. Eaton.
* numbers.h: Conditionally include floatingpoint.h, ieeefp.h, and
nan.h. Provide declarations for scm_inf_p, scm_nan_p, scn_inf,
and scm_nan.
* numbers.c: [SCO && ! HAVE_ISNAN] (isnan): New function.
[SCO && ! HAVE_ISINF] (isinf): New function.
(xisinf, xisnan): New functions.
(IS_INF): Delete.
(isfinite): Define in terms of xisinf.
(scm_inf_p, scm_nan_p): New functions.
(guile_Inf, guile_NaN): New file-scope vars.
(guile_ieee_init): New function.
(scm_inf, scm_nan): New functions.
(idbl2str): Handle Inf and NaN. Remove funny label and
corresponding gotos.
(ALLOW_DIVIDE_BY_ZERO): New macro.
(scm_divide): Allow division by zero to occur if
ALLOW_DIVIDE_BY_ZERO is defined.
Handle bignums and ints as special cases.
Additional stuff by me:
numbers.c (mem2ureal): Recognize "inf.0" and "nan.xxx".
(scm_even_p, scm_odd_p): Treat infinity as even and odd.
(iflo2str): Don't output a '+' for negative numbers or for Inf and
NaN. They will provide their own sign.
(scm_divide): Only allow divides by inexact zeros. Dividing by
exact zeros still signals an errors.
2002-05-06 22:33:10 +00:00
|
|
|
|
#endif
|
(scm_is_rational): New.
(scm_i_short2big, scm_i_int2big, scm_i_uint2big, scm_i_size2big,
scm_i_ptrdiff2big, scm_i_long_long2big, scm_i_ulong_long2big):
Removed prototypes.
(scm_make_real, scm_num2dbl, scm_float2num, scm_double2num):
Discouraged by moving to discouraged.h and discouraged.c.
Replaced all uses with scm_from_double.
(scm_num2float, scm_num2double): Discouraged by moving prototype
to discouraged.h and rewriting in terms of scm_to_double.
Replaced all uses with scm_to_double.
(scm_to_double): Do not implement in terms of scm_num2dbl, use
explicit code.
(scm_from_double): Do not implement in terms of scm_make_real, use
explicit code.
2004-08-03 15:03:35 +00:00
|
|
|
|
return scm_from_double (rx / yy);
|
2003-07-13 16:13:57 +00:00
|
|
|
|
}
|
|
|
|
|
|
else if (SCM_COMPLEXP (y))
|
|
|
|
|
|
{
|
|
|
|
|
|
a = rx;
|
|
|
|
|
|
goto complex_div;
|
|
|
|
|
|
}
|
* print.c (scm_iprin1): Handle fractions.
* objects.h (scm_class_fraction): New.
* objects.c (scm_class_fraction): New.
(scm_class_of): Handle fractions.
* hash.c (scm_hasher): Handle fractions.
* numbers.c: New code for handling fraction all over the place.
(scm_odd_p, scm_even_p): Handle inexact integers.
(scm_rational_p): New function, same as scm_real_p.
(scm_round_number, scm_truncate_number, scm_ceiling, scm_floor):
New exact functions that replace the inexact 'dsubr'
implementations.
(scm_numerator, scm_denominator): New.
* numbers.h (SCM_NUMP): Recognize fractions.
(SCM_FRACTIONP, SCM_SLOPPY_FRACTIONP, SCM_FRACTION_NUMERATOR,
SCM_FRACTION_DENOMINATOR, SCM_FRACTION_SET_NUMERATOR,
SCM_FRACTION_SET_DENOMINATOR, SCM_FRACTION_REDUCED_BIT,
SCM_FRACTION_REDUCED_SET, SCM_FRACTION_REDUCED_CLEAR,
SCM_FRACTION_REDUCED): New.
(scm_floor, scm_ceiling, scm_truncate_number, scm_round_number):
New prototypes.
(scm_make_ratio, scm_rationalize, scm_numerator, scm_denominator,
scm_rational_p): New prototypes.
(scm_i_dbl2num, scm_i_fraction2double, scm_i_fraction_equalp,
scm_i_print_fraction): New prototypes.
* goops.c (create_standard_classes): Create "<fraction>" class.
* gc-mark.c (scm_gc_mark_dependencies): Handle fractions.
* gc-card.c (scm_i_sweep_card): Include scm_tc16_fraction as a
case in the switch, but do nothing for now.
* eval.c (SCM_CEVAL, SCM_APPLY, call_dsubr_1): Convert fractions
to doubles when calling 'dsubr' functions.
* eq.c (scm_eqv_p, scm_equal_p): Handle fractions.
2003-11-18 19:59:53 +00:00
|
|
|
|
else if (SCM_FRACTIONP (y))
|
(scm_is_rational): New.
(scm_i_short2big, scm_i_int2big, scm_i_uint2big, scm_i_size2big,
scm_i_ptrdiff2big, scm_i_long_long2big, scm_i_ulong_long2big):
Removed prototypes.
(scm_make_real, scm_num2dbl, scm_float2num, scm_double2num):
Discouraged by moving to discouraged.h and discouraged.c.
Replaced all uses with scm_from_double.
(scm_num2float, scm_num2double): Discouraged by moving prototype
to discouraged.h and rewriting in terms of scm_to_double.
Replaced all uses with scm_to_double.
(scm_to_double): Do not implement in terms of scm_num2dbl, use
explicit code.
(scm_from_double): Do not implement in terms of scm_make_real, use
explicit code.
2004-08-03 15:03:35 +00:00
|
|
|
|
return scm_from_double (rx / scm_i_fraction2double (y));
|
2003-07-13 16:13:57 +00:00
|
|
|
|
else
|
|
|
|
|
|
SCM_WTA_DISPATCH_2 (g_divide, x, y, SCM_ARGn, s_divide);
|
1999-01-10 07:38:39 +00:00
|
|
|
|
}
|
2003-07-13 16:13:57 +00:00
|
|
|
|
else if (SCM_COMPLEXP (x))
|
|
|
|
|
|
{
|
|
|
|
|
|
double rx = SCM_COMPLEX_REAL (x);
|
|
|
|
|
|
double ix = SCM_COMPLEX_IMAG (x);
|
2004-07-23 15:43:02 +00:00
|
|
|
|
if (SCM_I_INUMP (y))
|
2003-07-13 16:13:57 +00:00
|
|
|
|
{
|
2004-07-23 15:43:02 +00:00
|
|
|
|
long int yy = SCM_I_INUM (y);
|
From John W. Eaton.
* numbers.h: Conditionally include floatingpoint.h, ieeefp.h, and
nan.h. Provide declarations for scm_inf_p, scm_nan_p, scn_inf,
and scm_nan.
* numbers.c: [SCO && ! HAVE_ISNAN] (isnan): New function.
[SCO && ! HAVE_ISINF] (isinf): New function.
(xisinf, xisnan): New functions.
(IS_INF): Delete.
(isfinite): Define in terms of xisinf.
(scm_inf_p, scm_nan_p): New functions.
(guile_Inf, guile_NaN): New file-scope vars.
(guile_ieee_init): New function.
(scm_inf, scm_nan): New functions.
(idbl2str): Handle Inf and NaN. Remove funny label and
corresponding gotos.
(ALLOW_DIVIDE_BY_ZERO): New macro.
(scm_divide): Allow division by zero to occur if
ALLOW_DIVIDE_BY_ZERO is defined.
Handle bignums and ints as special cases.
Additional stuff by me:
numbers.c (mem2ureal): Recognize "inf.0" and "nan.xxx".
(scm_even_p, scm_odd_p): Treat infinity as even and odd.
(iflo2str): Don't output a '+' for negative numbers or for Inf and
NaN. They will provide their own sign.
(scm_divide): Only allow divides by inexact zeros. Dividing by
exact zeros still signals an errors.
2002-05-06 22:33:10 +00:00
|
|
|
|
#ifndef ALLOW_DIVIDE_BY_EXACT_ZERO
|
2003-07-13 16:13:57 +00:00
|
|
|
|
if (yy == 0)
|
|
|
|
|
|
scm_num_overflow (s_divide);
|
|
|
|
|
|
else
|
From John W. Eaton.
* numbers.h: Conditionally include floatingpoint.h, ieeefp.h, and
nan.h. Provide declarations for scm_inf_p, scm_nan_p, scn_inf,
and scm_nan.
* numbers.c: [SCO && ! HAVE_ISNAN] (isnan): New function.
[SCO && ! HAVE_ISINF] (isinf): New function.
(xisinf, xisnan): New functions.
(IS_INF): Delete.
(isfinite): Define in terms of xisinf.
(scm_inf_p, scm_nan_p): New functions.
(guile_Inf, guile_NaN): New file-scope vars.
(guile_ieee_init): New function.
(scm_inf, scm_nan): New functions.
(idbl2str): Handle Inf and NaN. Remove funny label and
corresponding gotos.
(ALLOW_DIVIDE_BY_ZERO): New macro.
(scm_divide): Allow division by zero to occur if
ALLOW_DIVIDE_BY_ZERO is defined.
Handle bignums and ints as special cases.
Additional stuff by me:
numbers.c (mem2ureal): Recognize "inf.0" and "nan.xxx".
(scm_even_p, scm_odd_p): Treat infinity as even and odd.
(iflo2str): Don't output a '+' for negative numbers or for Inf and
NaN. They will provide their own sign.
(scm_divide): Only allow divides by inexact zeros. Dividing by
exact zeros still signals an errors.
2002-05-06 22:33:10 +00:00
|
|
|
|
#endif
|
2003-07-13 16:13:57 +00:00
|
|
|
|
{
|
|
|
|
|
|
double d = yy;
|
2004-08-03 17:12:14 +00:00
|
|
|
|
return scm_c_make_rectangular (rx / d, ix / d);
|
2003-07-13 16:13:57 +00:00
|
|
|
|
}
|
|
|
|
|
|
}
|
|
|
|
|
|
else if (SCM_BIGP (y))
|
|
|
|
|
|
{
|
|
|
|
|
|
double dby = mpz_get_d (SCM_I_BIG_MPZ (y));
|
|
|
|
|
|
scm_remember_upto_here_1 (y);
|
2004-08-03 17:12:14 +00:00
|
|
|
|
return scm_c_make_rectangular (rx / dby, ix / dby);
|
2003-07-13 16:13:57 +00:00
|
|
|
|
}
|
|
|
|
|
|
else if (SCM_REALP (y))
|
|
|
|
|
|
{
|
|
|
|
|
|
double yy = SCM_REAL_VALUE (y);
|
From John W. Eaton.
* numbers.h: Conditionally include floatingpoint.h, ieeefp.h, and
nan.h. Provide declarations for scm_inf_p, scm_nan_p, scn_inf,
and scm_nan.
* numbers.c: [SCO && ! HAVE_ISNAN] (isnan): New function.
[SCO && ! HAVE_ISINF] (isinf): New function.
(xisinf, xisnan): New functions.
(IS_INF): Delete.
(isfinite): Define in terms of xisinf.
(scm_inf_p, scm_nan_p): New functions.
(guile_Inf, guile_NaN): New file-scope vars.
(guile_ieee_init): New function.
(scm_inf, scm_nan): New functions.
(idbl2str): Handle Inf and NaN. Remove funny label and
corresponding gotos.
(ALLOW_DIVIDE_BY_ZERO): New macro.
(scm_divide): Allow division by zero to occur if
ALLOW_DIVIDE_BY_ZERO is defined.
Handle bignums and ints as special cases.
Additional stuff by me:
numbers.c (mem2ureal): Recognize "inf.0" and "nan.xxx".
(scm_even_p, scm_odd_p): Treat infinity as even and odd.
(iflo2str): Don't output a '+' for negative numbers or for Inf and
NaN. They will provide their own sign.
(scm_divide): Only allow divides by inexact zeros. Dividing by
exact zeros still signals an errors.
2002-05-06 22:33:10 +00:00
|
|
|
|
#ifndef ALLOW_DIVIDE_BY_ZERO
|
2003-07-13 16:13:57 +00:00
|
|
|
|
if (yy == 0.0)
|
|
|
|
|
|
scm_num_overflow (s_divide);
|
|
|
|
|
|
else
|
From John W. Eaton.
* numbers.h: Conditionally include floatingpoint.h, ieeefp.h, and
nan.h. Provide declarations for scm_inf_p, scm_nan_p, scn_inf,
and scm_nan.
* numbers.c: [SCO && ! HAVE_ISNAN] (isnan): New function.
[SCO && ! HAVE_ISINF] (isinf): New function.
(xisinf, xisnan): New functions.
(IS_INF): Delete.
(isfinite): Define in terms of xisinf.
(scm_inf_p, scm_nan_p): New functions.
(guile_Inf, guile_NaN): New file-scope vars.
(guile_ieee_init): New function.
(scm_inf, scm_nan): New functions.
(idbl2str): Handle Inf and NaN. Remove funny label and
corresponding gotos.
(ALLOW_DIVIDE_BY_ZERO): New macro.
(scm_divide): Allow division by zero to occur if
ALLOW_DIVIDE_BY_ZERO is defined.
Handle bignums and ints as special cases.
Additional stuff by me:
numbers.c (mem2ureal): Recognize "inf.0" and "nan.xxx".
(scm_even_p, scm_odd_p): Treat infinity as even and odd.
(iflo2str): Don't output a '+' for negative numbers or for Inf and
NaN. They will provide their own sign.
(scm_divide): Only allow divides by inexact zeros. Dividing by
exact zeros still signals an errors.
2002-05-06 22:33:10 +00:00
|
|
|
|
#endif
|
2004-08-03 17:12:14 +00:00
|
|
|
|
return scm_c_make_rectangular (rx / yy, ix / yy);
|
2003-07-13 16:13:57 +00:00
|
|
|
|
}
|
|
|
|
|
|
else if (SCM_COMPLEXP (y))
|
|
|
|
|
|
{
|
|
|
|
|
|
double ry = SCM_COMPLEX_REAL (y);
|
|
|
|
|
|
double iy = SCM_COMPLEX_IMAG (y);
|
2005-04-29 22:59:22 +00:00
|
|
|
|
if (fabs(ry) <= fabs(iy))
|
2003-07-13 16:13:57 +00:00
|
|
|
|
{
|
|
|
|
|
|
double t = ry / iy;
|
|
|
|
|
|
double d = iy * (1.0 + t * t);
|
2004-08-03 17:12:14 +00:00
|
|
|
|
return scm_c_make_rectangular ((rx * t + ix) / d, (ix * t - rx) / d);
|
2003-07-13 16:13:57 +00:00
|
|
|
|
}
|
|
|
|
|
|
else
|
|
|
|
|
|
{
|
|
|
|
|
|
double t = iy / ry;
|
|
|
|
|
|
double d = ry * (1.0 + t * t);
|
2004-08-03 17:12:14 +00:00
|
|
|
|
return scm_c_make_rectangular ((rx + ix * t) / d, (ix - rx * t) / d);
|
2003-07-13 16:13:57 +00:00
|
|
|
|
}
|
|
|
|
|
|
}
|
* print.c (scm_iprin1): Handle fractions.
* objects.h (scm_class_fraction): New.
* objects.c (scm_class_fraction): New.
(scm_class_of): Handle fractions.
* hash.c (scm_hasher): Handle fractions.
* numbers.c: New code for handling fraction all over the place.
(scm_odd_p, scm_even_p): Handle inexact integers.
(scm_rational_p): New function, same as scm_real_p.
(scm_round_number, scm_truncate_number, scm_ceiling, scm_floor):
New exact functions that replace the inexact 'dsubr'
implementations.
(scm_numerator, scm_denominator): New.
* numbers.h (SCM_NUMP): Recognize fractions.
(SCM_FRACTIONP, SCM_SLOPPY_FRACTIONP, SCM_FRACTION_NUMERATOR,
SCM_FRACTION_DENOMINATOR, SCM_FRACTION_SET_NUMERATOR,
SCM_FRACTION_SET_DENOMINATOR, SCM_FRACTION_REDUCED_BIT,
SCM_FRACTION_REDUCED_SET, SCM_FRACTION_REDUCED_CLEAR,
SCM_FRACTION_REDUCED): New.
(scm_floor, scm_ceiling, scm_truncate_number, scm_round_number):
New prototypes.
(scm_make_ratio, scm_rationalize, scm_numerator, scm_denominator,
scm_rational_p): New prototypes.
(scm_i_dbl2num, scm_i_fraction2double, scm_i_fraction_equalp,
scm_i_print_fraction): New prototypes.
* goops.c (create_standard_classes): Create "<fraction>" class.
* gc-mark.c (scm_gc_mark_dependencies): Handle fractions.
* gc-card.c (scm_i_sweep_card): Include scm_tc16_fraction as a
case in the switch, but do nothing for now.
* eval.c (SCM_CEVAL, SCM_APPLY, call_dsubr_1): Convert fractions
to doubles when calling 'dsubr' functions.
* eq.c (scm_eqv_p, scm_equal_p): Handle fractions.
2003-11-18 19:59:53 +00:00
|
|
|
|
else if (SCM_FRACTIONP (y))
|
|
|
|
|
|
{
|
|
|
|
|
|
double yy = scm_i_fraction2double (y);
|
2004-08-03 17:12:14 +00:00
|
|
|
|
return scm_c_make_rectangular (rx / yy, ix / yy);
|
* print.c (scm_iprin1): Handle fractions.
* objects.h (scm_class_fraction): New.
* objects.c (scm_class_fraction): New.
(scm_class_of): Handle fractions.
* hash.c (scm_hasher): Handle fractions.
* numbers.c: New code for handling fraction all over the place.
(scm_odd_p, scm_even_p): Handle inexact integers.
(scm_rational_p): New function, same as scm_real_p.
(scm_round_number, scm_truncate_number, scm_ceiling, scm_floor):
New exact functions that replace the inexact 'dsubr'
implementations.
(scm_numerator, scm_denominator): New.
* numbers.h (SCM_NUMP): Recognize fractions.
(SCM_FRACTIONP, SCM_SLOPPY_FRACTIONP, SCM_FRACTION_NUMERATOR,
SCM_FRACTION_DENOMINATOR, SCM_FRACTION_SET_NUMERATOR,
SCM_FRACTION_SET_DENOMINATOR, SCM_FRACTION_REDUCED_BIT,
SCM_FRACTION_REDUCED_SET, SCM_FRACTION_REDUCED_CLEAR,
SCM_FRACTION_REDUCED): New.
(scm_floor, scm_ceiling, scm_truncate_number, scm_round_number):
New prototypes.
(scm_make_ratio, scm_rationalize, scm_numerator, scm_denominator,
scm_rational_p): New prototypes.
(scm_i_dbl2num, scm_i_fraction2double, scm_i_fraction_equalp,
scm_i_print_fraction): New prototypes.
* goops.c (create_standard_classes): Create "<fraction>" class.
* gc-mark.c (scm_gc_mark_dependencies): Handle fractions.
* gc-card.c (scm_i_sweep_card): Include scm_tc16_fraction as a
case in the switch, but do nothing for now.
* eval.c (SCM_CEVAL, SCM_APPLY, call_dsubr_1): Convert fractions
to doubles when calling 'dsubr' functions.
* eq.c (scm_eqv_p, scm_equal_p): Handle fractions.
2003-11-18 19:59:53 +00:00
|
|
|
|
}
|
2003-07-13 16:13:57 +00:00
|
|
|
|
else
|
|
|
|
|
|
SCM_WTA_DISPATCH_2 (g_divide, x, y, SCM_ARGn, s_divide);
|
2000-05-02 16:41:20 +00:00
|
|
|
|
}
|
* print.c (scm_iprin1): Handle fractions.
* objects.h (scm_class_fraction): New.
* objects.c (scm_class_fraction): New.
(scm_class_of): Handle fractions.
* hash.c (scm_hasher): Handle fractions.
* numbers.c: New code for handling fraction all over the place.
(scm_odd_p, scm_even_p): Handle inexact integers.
(scm_rational_p): New function, same as scm_real_p.
(scm_round_number, scm_truncate_number, scm_ceiling, scm_floor):
New exact functions that replace the inexact 'dsubr'
implementations.
(scm_numerator, scm_denominator): New.
* numbers.h (SCM_NUMP): Recognize fractions.
(SCM_FRACTIONP, SCM_SLOPPY_FRACTIONP, SCM_FRACTION_NUMERATOR,
SCM_FRACTION_DENOMINATOR, SCM_FRACTION_SET_NUMERATOR,
SCM_FRACTION_SET_DENOMINATOR, SCM_FRACTION_REDUCED_BIT,
SCM_FRACTION_REDUCED_SET, SCM_FRACTION_REDUCED_CLEAR,
SCM_FRACTION_REDUCED): New.
(scm_floor, scm_ceiling, scm_truncate_number, scm_round_number):
New prototypes.
(scm_make_ratio, scm_rationalize, scm_numerator, scm_denominator,
scm_rational_p): New prototypes.
(scm_i_dbl2num, scm_i_fraction2double, scm_i_fraction_equalp,
scm_i_print_fraction): New prototypes.
* goops.c (create_standard_classes): Create "<fraction>" class.
* gc-mark.c (scm_gc_mark_dependencies): Handle fractions.
* gc-card.c (scm_i_sweep_card): Include scm_tc16_fraction as a
case in the switch, but do nothing for now.
* eval.c (SCM_CEVAL, SCM_APPLY, call_dsubr_1): Convert fractions
to doubles when calling 'dsubr' functions.
* eq.c (scm_eqv_p, scm_equal_p): Handle fractions.
2003-11-18 19:59:53 +00:00
|
|
|
|
else if (SCM_FRACTIONP (x))
|
|
|
|
|
|
{
|
2004-07-23 15:43:02 +00:00
|
|
|
|
if (SCM_I_INUMP (y))
|
* print.c (scm_iprin1): Handle fractions.
* objects.h (scm_class_fraction): New.
* objects.c (scm_class_fraction): New.
(scm_class_of): Handle fractions.
* hash.c (scm_hasher): Handle fractions.
* numbers.c: New code for handling fraction all over the place.
(scm_odd_p, scm_even_p): Handle inexact integers.
(scm_rational_p): New function, same as scm_real_p.
(scm_round_number, scm_truncate_number, scm_ceiling, scm_floor):
New exact functions that replace the inexact 'dsubr'
implementations.
(scm_numerator, scm_denominator): New.
* numbers.h (SCM_NUMP): Recognize fractions.
(SCM_FRACTIONP, SCM_SLOPPY_FRACTIONP, SCM_FRACTION_NUMERATOR,
SCM_FRACTION_DENOMINATOR, SCM_FRACTION_SET_NUMERATOR,
SCM_FRACTION_SET_DENOMINATOR, SCM_FRACTION_REDUCED_BIT,
SCM_FRACTION_REDUCED_SET, SCM_FRACTION_REDUCED_CLEAR,
SCM_FRACTION_REDUCED): New.
(scm_floor, scm_ceiling, scm_truncate_number, scm_round_number):
New prototypes.
(scm_make_ratio, scm_rationalize, scm_numerator, scm_denominator,
scm_rational_p): New prototypes.
(scm_i_dbl2num, scm_i_fraction2double, scm_i_fraction_equalp,
scm_i_print_fraction): New prototypes.
* goops.c (create_standard_classes): Create "<fraction>" class.
* gc-mark.c (scm_gc_mark_dependencies): Handle fractions.
* gc-card.c (scm_i_sweep_card): Include scm_tc16_fraction as a
case in the switch, but do nothing for now.
* eval.c (SCM_CEVAL, SCM_APPLY, call_dsubr_1): Convert fractions
to doubles when calling 'dsubr' functions.
* eq.c (scm_eqv_p, scm_equal_p): Handle fractions.
2003-11-18 19:59:53 +00:00
|
|
|
|
{
|
2004-07-23 15:43:02 +00:00
|
|
|
|
long int yy = SCM_I_INUM (y);
|
* print.c (scm_iprin1): Handle fractions.
* objects.h (scm_class_fraction): New.
* objects.c (scm_class_fraction): New.
(scm_class_of): Handle fractions.
* hash.c (scm_hasher): Handle fractions.
* numbers.c: New code for handling fraction all over the place.
(scm_odd_p, scm_even_p): Handle inexact integers.
(scm_rational_p): New function, same as scm_real_p.
(scm_round_number, scm_truncate_number, scm_ceiling, scm_floor):
New exact functions that replace the inexact 'dsubr'
implementations.
(scm_numerator, scm_denominator): New.
* numbers.h (SCM_NUMP): Recognize fractions.
(SCM_FRACTIONP, SCM_SLOPPY_FRACTIONP, SCM_FRACTION_NUMERATOR,
SCM_FRACTION_DENOMINATOR, SCM_FRACTION_SET_NUMERATOR,
SCM_FRACTION_SET_DENOMINATOR, SCM_FRACTION_REDUCED_BIT,
SCM_FRACTION_REDUCED_SET, SCM_FRACTION_REDUCED_CLEAR,
SCM_FRACTION_REDUCED): New.
(scm_floor, scm_ceiling, scm_truncate_number, scm_round_number):
New prototypes.
(scm_make_ratio, scm_rationalize, scm_numerator, scm_denominator,
scm_rational_p): New prototypes.
(scm_i_dbl2num, scm_i_fraction2double, scm_i_fraction_equalp,
scm_i_print_fraction): New prototypes.
* goops.c (create_standard_classes): Create "<fraction>" class.
* gc-mark.c (scm_gc_mark_dependencies): Handle fractions.
* gc-card.c (scm_i_sweep_card): Include scm_tc16_fraction as a
case in the switch, but do nothing for now.
* eval.c (SCM_CEVAL, SCM_APPLY, call_dsubr_1): Convert fractions
to doubles when calling 'dsubr' functions.
* eq.c (scm_eqv_p, scm_equal_p): Handle fractions.
2003-11-18 19:59:53 +00:00
|
|
|
|
#ifndef ALLOW_DIVIDE_BY_EXACT_ZERO
|
|
|
|
|
|
if (yy == 0)
|
|
|
|
|
|
scm_num_overflow (s_divide);
|
|
|
|
|
|
else
|
|
|
|
|
|
#endif
|
2004-08-03 15:55:42 +00:00
|
|
|
|
return scm_i_make_ratio (SCM_FRACTION_NUMERATOR (x),
|
* print.c (scm_iprin1): Handle fractions.
* objects.h (scm_class_fraction): New.
* objects.c (scm_class_fraction): New.
(scm_class_of): Handle fractions.
* hash.c (scm_hasher): Handle fractions.
* numbers.c: New code for handling fraction all over the place.
(scm_odd_p, scm_even_p): Handle inexact integers.
(scm_rational_p): New function, same as scm_real_p.
(scm_round_number, scm_truncate_number, scm_ceiling, scm_floor):
New exact functions that replace the inexact 'dsubr'
implementations.
(scm_numerator, scm_denominator): New.
* numbers.h (SCM_NUMP): Recognize fractions.
(SCM_FRACTIONP, SCM_SLOPPY_FRACTIONP, SCM_FRACTION_NUMERATOR,
SCM_FRACTION_DENOMINATOR, SCM_FRACTION_SET_NUMERATOR,
SCM_FRACTION_SET_DENOMINATOR, SCM_FRACTION_REDUCED_BIT,
SCM_FRACTION_REDUCED_SET, SCM_FRACTION_REDUCED_CLEAR,
SCM_FRACTION_REDUCED): New.
(scm_floor, scm_ceiling, scm_truncate_number, scm_round_number):
New prototypes.
(scm_make_ratio, scm_rationalize, scm_numerator, scm_denominator,
scm_rational_p): New prototypes.
(scm_i_dbl2num, scm_i_fraction2double, scm_i_fraction_equalp,
scm_i_print_fraction): New prototypes.
* goops.c (create_standard_classes): Create "<fraction>" class.
* gc-mark.c (scm_gc_mark_dependencies): Handle fractions.
* gc-card.c (scm_i_sweep_card): Include scm_tc16_fraction as a
case in the switch, but do nothing for now.
* eval.c (SCM_CEVAL, SCM_APPLY, call_dsubr_1): Convert fractions
to doubles when calling 'dsubr' functions.
* eq.c (scm_eqv_p, scm_equal_p): Handle fractions.
2003-11-18 19:59:53 +00:00
|
|
|
|
scm_product (SCM_FRACTION_DENOMINATOR (x), y));
|
|
|
|
|
|
}
|
|
|
|
|
|
else if (SCM_BIGP (y))
|
|
|
|
|
|
{
|
2004-08-03 15:55:42 +00:00
|
|
|
|
return scm_i_make_ratio (SCM_FRACTION_NUMERATOR (x),
|
* print.c (scm_iprin1): Handle fractions.
* objects.h (scm_class_fraction): New.
* objects.c (scm_class_fraction): New.
(scm_class_of): Handle fractions.
* hash.c (scm_hasher): Handle fractions.
* numbers.c: New code for handling fraction all over the place.
(scm_odd_p, scm_even_p): Handle inexact integers.
(scm_rational_p): New function, same as scm_real_p.
(scm_round_number, scm_truncate_number, scm_ceiling, scm_floor):
New exact functions that replace the inexact 'dsubr'
implementations.
(scm_numerator, scm_denominator): New.
* numbers.h (SCM_NUMP): Recognize fractions.
(SCM_FRACTIONP, SCM_SLOPPY_FRACTIONP, SCM_FRACTION_NUMERATOR,
SCM_FRACTION_DENOMINATOR, SCM_FRACTION_SET_NUMERATOR,
SCM_FRACTION_SET_DENOMINATOR, SCM_FRACTION_REDUCED_BIT,
SCM_FRACTION_REDUCED_SET, SCM_FRACTION_REDUCED_CLEAR,
SCM_FRACTION_REDUCED): New.
(scm_floor, scm_ceiling, scm_truncate_number, scm_round_number):
New prototypes.
(scm_make_ratio, scm_rationalize, scm_numerator, scm_denominator,
scm_rational_p): New prototypes.
(scm_i_dbl2num, scm_i_fraction2double, scm_i_fraction_equalp,
scm_i_print_fraction): New prototypes.
* goops.c (create_standard_classes): Create "<fraction>" class.
* gc-mark.c (scm_gc_mark_dependencies): Handle fractions.
* gc-card.c (scm_i_sweep_card): Include scm_tc16_fraction as a
case in the switch, but do nothing for now.
* eval.c (SCM_CEVAL, SCM_APPLY, call_dsubr_1): Convert fractions
to doubles when calling 'dsubr' functions.
* eq.c (scm_eqv_p, scm_equal_p): Handle fractions.
2003-11-18 19:59:53 +00:00
|
|
|
|
scm_product (SCM_FRACTION_DENOMINATOR (x), y));
|
|
|
|
|
|
}
|
|
|
|
|
|
else if (SCM_REALP (y))
|
|
|
|
|
|
{
|
|
|
|
|
|
double yy = SCM_REAL_VALUE (y);
|
|
|
|
|
|
#ifndef ALLOW_DIVIDE_BY_ZERO
|
|
|
|
|
|
if (yy == 0.0)
|
|
|
|
|
|
scm_num_overflow (s_divide);
|
|
|
|
|
|
else
|
|
|
|
|
|
#endif
|
(scm_is_rational): New.
(scm_i_short2big, scm_i_int2big, scm_i_uint2big, scm_i_size2big,
scm_i_ptrdiff2big, scm_i_long_long2big, scm_i_ulong_long2big):
Removed prototypes.
(scm_make_real, scm_num2dbl, scm_float2num, scm_double2num):
Discouraged by moving to discouraged.h and discouraged.c.
Replaced all uses with scm_from_double.
(scm_num2float, scm_num2double): Discouraged by moving prototype
to discouraged.h and rewriting in terms of scm_to_double.
Replaced all uses with scm_to_double.
(scm_to_double): Do not implement in terms of scm_num2dbl, use
explicit code.
(scm_from_double): Do not implement in terms of scm_make_real, use
explicit code.
2004-08-03 15:03:35 +00:00
|
|
|
|
return scm_from_double (scm_i_fraction2double (x) / yy);
|
* print.c (scm_iprin1): Handle fractions.
* objects.h (scm_class_fraction): New.
* objects.c (scm_class_fraction): New.
(scm_class_of): Handle fractions.
* hash.c (scm_hasher): Handle fractions.
* numbers.c: New code for handling fraction all over the place.
(scm_odd_p, scm_even_p): Handle inexact integers.
(scm_rational_p): New function, same as scm_real_p.
(scm_round_number, scm_truncate_number, scm_ceiling, scm_floor):
New exact functions that replace the inexact 'dsubr'
implementations.
(scm_numerator, scm_denominator): New.
* numbers.h (SCM_NUMP): Recognize fractions.
(SCM_FRACTIONP, SCM_SLOPPY_FRACTIONP, SCM_FRACTION_NUMERATOR,
SCM_FRACTION_DENOMINATOR, SCM_FRACTION_SET_NUMERATOR,
SCM_FRACTION_SET_DENOMINATOR, SCM_FRACTION_REDUCED_BIT,
SCM_FRACTION_REDUCED_SET, SCM_FRACTION_REDUCED_CLEAR,
SCM_FRACTION_REDUCED): New.
(scm_floor, scm_ceiling, scm_truncate_number, scm_round_number):
New prototypes.
(scm_make_ratio, scm_rationalize, scm_numerator, scm_denominator,
scm_rational_p): New prototypes.
(scm_i_dbl2num, scm_i_fraction2double, scm_i_fraction_equalp,
scm_i_print_fraction): New prototypes.
* goops.c (create_standard_classes): Create "<fraction>" class.
* gc-mark.c (scm_gc_mark_dependencies): Handle fractions.
* gc-card.c (scm_i_sweep_card): Include scm_tc16_fraction as a
case in the switch, but do nothing for now.
* eval.c (SCM_CEVAL, SCM_APPLY, call_dsubr_1): Convert fractions
to doubles when calling 'dsubr' functions.
* eq.c (scm_eqv_p, scm_equal_p): Handle fractions.
2003-11-18 19:59:53 +00:00
|
|
|
|
}
|
|
|
|
|
|
else if (SCM_COMPLEXP (y))
|
|
|
|
|
|
{
|
|
|
|
|
|
a = scm_i_fraction2double (x);
|
|
|
|
|
|
goto complex_div;
|
|
|
|
|
|
}
|
|
|
|
|
|
else if (SCM_FRACTIONP (y))
|
2004-08-03 15:55:42 +00:00
|
|
|
|
return scm_i_make_ratio (scm_product (SCM_FRACTION_NUMERATOR (x), SCM_FRACTION_DENOMINATOR (y)),
|
* print.c (scm_iprin1): Handle fractions.
* objects.h (scm_class_fraction): New.
* objects.c (scm_class_fraction): New.
(scm_class_of): Handle fractions.
* hash.c (scm_hasher): Handle fractions.
* numbers.c: New code for handling fraction all over the place.
(scm_odd_p, scm_even_p): Handle inexact integers.
(scm_rational_p): New function, same as scm_real_p.
(scm_round_number, scm_truncate_number, scm_ceiling, scm_floor):
New exact functions that replace the inexact 'dsubr'
implementations.
(scm_numerator, scm_denominator): New.
* numbers.h (SCM_NUMP): Recognize fractions.
(SCM_FRACTIONP, SCM_SLOPPY_FRACTIONP, SCM_FRACTION_NUMERATOR,
SCM_FRACTION_DENOMINATOR, SCM_FRACTION_SET_NUMERATOR,
SCM_FRACTION_SET_DENOMINATOR, SCM_FRACTION_REDUCED_BIT,
SCM_FRACTION_REDUCED_SET, SCM_FRACTION_REDUCED_CLEAR,
SCM_FRACTION_REDUCED): New.
(scm_floor, scm_ceiling, scm_truncate_number, scm_round_number):
New prototypes.
(scm_make_ratio, scm_rationalize, scm_numerator, scm_denominator,
scm_rational_p): New prototypes.
(scm_i_dbl2num, scm_i_fraction2double, scm_i_fraction_equalp,
scm_i_print_fraction): New prototypes.
* goops.c (create_standard_classes): Create "<fraction>" class.
* gc-mark.c (scm_gc_mark_dependencies): Handle fractions.
* gc-card.c (scm_i_sweep_card): Include scm_tc16_fraction as a
case in the switch, but do nothing for now.
* eval.c (SCM_CEVAL, SCM_APPLY, call_dsubr_1): Convert fractions
to doubles when calling 'dsubr' functions.
* eq.c (scm_eqv_p, scm_equal_p): Handle fractions.
2003-11-18 19:59:53 +00:00
|
|
|
|
scm_product (SCM_FRACTION_NUMERATOR (y), SCM_FRACTION_DENOMINATOR (x)));
|
|
|
|
|
|
else
|
|
|
|
|
|
SCM_WTA_DISPATCH_2 (g_divide, x, y, SCM_ARGn, s_divide);
|
|
|
|
|
|
}
|
2003-07-13 16:13:57 +00:00
|
|
|
|
else
|
2000-05-02 16:41:20 +00:00
|
|
|
|
SCM_WTA_DISPATCH_2 (g_divide, x, y, SCM_ARG1, s_divide);
|
1996-07-25 22:56:11 +00:00
|
|
|
|
}
|
* print.c (scm_iprin1): Handle fractions.
* objects.h (scm_class_fraction): New.
* objects.c (scm_class_fraction): New.
(scm_class_of): Handle fractions.
* hash.c (scm_hasher): Handle fractions.
* numbers.c: New code for handling fraction all over the place.
(scm_odd_p, scm_even_p): Handle inexact integers.
(scm_rational_p): New function, same as scm_real_p.
(scm_round_number, scm_truncate_number, scm_ceiling, scm_floor):
New exact functions that replace the inexact 'dsubr'
implementations.
(scm_numerator, scm_denominator): New.
* numbers.h (SCM_NUMP): Recognize fractions.
(SCM_FRACTIONP, SCM_SLOPPY_FRACTIONP, SCM_FRACTION_NUMERATOR,
SCM_FRACTION_DENOMINATOR, SCM_FRACTION_SET_NUMERATOR,
SCM_FRACTION_SET_DENOMINATOR, SCM_FRACTION_REDUCED_BIT,
SCM_FRACTION_REDUCED_SET, SCM_FRACTION_REDUCED_CLEAR,
SCM_FRACTION_REDUCED): New.
(scm_floor, scm_ceiling, scm_truncate_number, scm_round_number):
New prototypes.
(scm_make_ratio, scm_rationalize, scm_numerator, scm_denominator,
scm_rational_p): New prototypes.
(scm_i_dbl2num, scm_i_fraction2double, scm_i_fraction_equalp,
scm_i_print_fraction): New prototypes.
* goops.c (create_standard_classes): Create "<fraction>" class.
* gc-mark.c (scm_gc_mark_dependencies): Handle fractions.
* gc-card.c (scm_i_sweep_card): Include scm_tc16_fraction as a
case in the switch, but do nothing for now.
* eval.c (SCM_CEVAL, SCM_APPLY, call_dsubr_1): Convert fractions
to doubles when calling 'dsubr' functions.
* eq.c (scm_eqv_p, scm_equal_p): Handle fractions.
2003-11-18 19:59:53 +00:00
|
|
|
|
|
|
|
|
|
|
SCM
|
|
|
|
|
|
scm_divide (SCM x, SCM y)
|
|
|
|
|
|
{
|
2009-09-06 16:47:19 +02:00
|
|
|
|
return do_divide (x, y, 0);
|
* print.c (scm_iprin1): Handle fractions.
* objects.h (scm_class_fraction): New.
* objects.c (scm_class_fraction): New.
(scm_class_of): Handle fractions.
* hash.c (scm_hasher): Handle fractions.
* numbers.c: New code for handling fraction all over the place.
(scm_odd_p, scm_even_p): Handle inexact integers.
(scm_rational_p): New function, same as scm_real_p.
(scm_round_number, scm_truncate_number, scm_ceiling, scm_floor):
New exact functions that replace the inexact 'dsubr'
implementations.
(scm_numerator, scm_denominator): New.
* numbers.h (SCM_NUMP): Recognize fractions.
(SCM_FRACTIONP, SCM_SLOPPY_FRACTIONP, SCM_FRACTION_NUMERATOR,
SCM_FRACTION_DENOMINATOR, SCM_FRACTION_SET_NUMERATOR,
SCM_FRACTION_SET_DENOMINATOR, SCM_FRACTION_REDUCED_BIT,
SCM_FRACTION_REDUCED_SET, SCM_FRACTION_REDUCED_CLEAR,
SCM_FRACTION_REDUCED): New.
(scm_floor, scm_ceiling, scm_truncate_number, scm_round_number):
New prototypes.
(scm_make_ratio, scm_rationalize, scm_numerator, scm_denominator,
scm_rational_p): New prototypes.
(scm_i_dbl2num, scm_i_fraction2double, scm_i_fraction_equalp,
scm_i_print_fraction): New prototypes.
* goops.c (create_standard_classes): Create "<fraction>" class.
* gc-mark.c (scm_gc_mark_dependencies): Handle fractions.
* gc-card.c (scm_i_sweep_card): Include scm_tc16_fraction as a
case in the switch, but do nothing for now.
* eval.c (SCM_CEVAL, SCM_APPLY, call_dsubr_1): Convert fractions
to doubles when calling 'dsubr' functions.
* eq.c (scm_eqv_p, scm_equal_p): Handle fractions.
2003-11-18 19:59:53 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
static SCM scm_divide2real (SCM x, SCM y)
|
|
|
|
|
|
{
|
2009-09-06 16:47:19 +02:00
|
|
|
|
return do_divide (x, y, 1);
|
* print.c (scm_iprin1): Handle fractions.
* objects.h (scm_class_fraction): New.
* objects.c (scm_class_fraction): New.
(scm_class_of): Handle fractions.
* hash.c (scm_hasher): Handle fractions.
* numbers.c: New code for handling fraction all over the place.
(scm_odd_p, scm_even_p): Handle inexact integers.
(scm_rational_p): New function, same as scm_real_p.
(scm_round_number, scm_truncate_number, scm_ceiling, scm_floor):
New exact functions that replace the inexact 'dsubr'
implementations.
(scm_numerator, scm_denominator): New.
* numbers.h (SCM_NUMP): Recognize fractions.
(SCM_FRACTIONP, SCM_SLOPPY_FRACTIONP, SCM_FRACTION_NUMERATOR,
SCM_FRACTION_DENOMINATOR, SCM_FRACTION_SET_NUMERATOR,
SCM_FRACTION_SET_DENOMINATOR, SCM_FRACTION_REDUCED_BIT,
SCM_FRACTION_REDUCED_SET, SCM_FRACTION_REDUCED_CLEAR,
SCM_FRACTION_REDUCED): New.
(scm_floor, scm_ceiling, scm_truncate_number, scm_round_number):
New prototypes.
(scm_make_ratio, scm_rationalize, scm_numerator, scm_denominator,
scm_rational_p): New prototypes.
(scm_i_dbl2num, scm_i_fraction2double, scm_i_fraction_equalp,
scm_i_print_fraction): New prototypes.
* goops.c (create_standard_classes): Create "<fraction>" class.
* gc-mark.c (scm_gc_mark_dependencies): Handle fractions.
* gc-card.c (scm_i_sweep_card): Include scm_tc16_fraction as a
case in the switch, but do nothing for now.
* eval.c (SCM_CEVAL, SCM_APPLY, call_dsubr_1): Convert fractions
to doubles when calling 'dsubr' functions.
* eq.c (scm_eqv_p, scm_equal_p): Handle fractions.
2003-11-18 19:59:53 +00:00
|
|
|
|
}
|
2001-05-06 01:26:23 +00:00
|
|
|
|
#undef FUNC_NAME
|
1996-07-25 22:56:11 +00:00
|
|
|
|
|
(_GNU_SOURCE): #define, to get C99 things.
(scm_asinh, scm_acosh, scm_atanh, scm_truncate, $asinh, $acosh,
$atanh, truncate): Use C library asinh, acosh, atanh and trunc, when
available.
(scm_inexact_to_exact): Expand isfinite to its definition !isinf.
(isfinite): Remove, conflicts with C99 isfinite().
2003-06-21 00:12:51 +00:00
|
|
|
|
|
1996-07-25 22:56:11 +00:00
|
|
|
|
double
|
2004-08-09 23:32:14 +00:00
|
|
|
|
scm_c_truncate (double x)
|
1996-07-25 22:56:11 +00:00
|
|
|
|
{
|
(_GNU_SOURCE): #define, to get C99 things.
(scm_asinh, scm_acosh, scm_atanh, scm_truncate, $asinh, $acosh,
$atanh, truncate): Use C library asinh, acosh, atanh and trunc, when
available.
(scm_inexact_to_exact): Expand isfinite to its definition !isinf.
(isfinite): Remove, conflicts with C99 isfinite().
2003-06-21 00:12:51 +00:00
|
|
|
|
#if HAVE_TRUNC
|
|
|
|
|
|
return trunc (x);
|
|
|
|
|
|
#else
|
1999-01-10 07:38:39 +00:00
|
|
|
|
if (x < 0.0)
|
|
|
|
|
|
return -floor (-x);
|
|
|
|
|
|
return floor (x);
|
(_GNU_SOURCE): #define, to get C99 things.
(scm_asinh, scm_acosh, scm_atanh, scm_truncate, $asinh, $acosh,
$atanh, truncate): Use C library asinh, acosh, atanh and trunc, when
available.
(scm_inexact_to_exact): Expand isfinite to its definition !isinf.
(isfinite): Remove, conflicts with C99 isfinite().
2003-06-21 00:12:51 +00:00
|
|
|
|
#endif
|
1996-07-25 22:56:11 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
2004-08-09 23:32:14 +00:00
|
|
|
|
/* scm_c_round is done using floor(x+0.5) to round to nearest and with
|
|
|
|
|
|
half-way case (ie. when x is an integer plus 0.5) going upwards.
|
|
|
|
|
|
Then half-way cases are identified and adjusted down if the
|
|
|
|
|
|
round-upwards didn't give the desired even integer.
|
2004-04-21 23:15:55 +00:00
|
|
|
|
|
|
|
|
|
|
"plus_half == result" identifies a half-way case. If plus_half, which is
|
|
|
|
|
|
x + 0.5, is an integer then x must be an integer plus 0.5.
|
|
|
|
|
|
|
|
|
|
|
|
An odd "result" value is identified with result/2 != floor(result/2).
|
|
|
|
|
|
This is done with plus_half, since that value is ready for use sooner in
|
|
|
|
|
|
a pipelined cpu, and we're already requiring plus_half == result.
|
|
|
|
|
|
|
|
|
|
|
|
Note however that we need to be careful when x is big and already an
|
|
|
|
|
|
integer. In that case "x+0.5" may round to an adjacent integer, causing
|
|
|
|
|
|
us to return such a value, incorrectly. For instance if the hardware is
|
|
|
|
|
|
in the usual default nearest-even rounding, then for x = 0x1FFFFFFFFFFFFF
|
|
|
|
|
|
(ie. 53 one bits) we will have x+0.5 = 0x20000000000000 and that value
|
|
|
|
|
|
returned. Or if the hardware is in round-upwards mode, then other bigger
|
|
|
|
|
|
values like say x == 2^128 will see x+0.5 rounding up to the next higher
|
|
|
|
|
|
representable value, 2^128+2^76 (or whatever), again incorrect.
|
|
|
|
|
|
|
|
|
|
|
|
These bad roundings of x+0.5 are avoided by testing at the start whether
|
|
|
|
|
|
x is already an integer. If it is then clearly that's the desired result
|
|
|
|
|
|
already. And if it's not then the exponent must be small enough to allow
|
|
|
|
|
|
an 0.5 to be represented, and hence added without a bad rounding. */
|
|
|
|
|
|
|
1996-07-25 22:56:11 +00:00
|
|
|
|
double
|
2004-08-09 23:32:14 +00:00
|
|
|
|
scm_c_round (double x)
|
1996-07-25 22:56:11 +00:00
|
|
|
|
{
|
2004-04-21 23:15:55 +00:00
|
|
|
|
double plus_half, result;
|
|
|
|
|
|
|
|
|
|
|
|
if (x == floor (x))
|
|
|
|
|
|
return x;
|
|
|
|
|
|
|
|
|
|
|
|
plus_half = x + 0.5;
|
|
|
|
|
|
result = floor (plus_half);
|
2004-08-09 23:32:14 +00:00
|
|
|
|
/* Adjust so that the rounding is towards even. */
|
2003-07-13 16:13:57 +00:00
|
|
|
|
return ((plus_half == result && plus_half / 2 != floor (plus_half / 2))
|
|
|
|
|
|
? result - 1
|
|
|
|
|
|
: result);
|
1996-07-25 22:56:11 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
* print.c (scm_iprin1): Handle fractions.
* objects.h (scm_class_fraction): New.
* objects.c (scm_class_fraction): New.
(scm_class_of): Handle fractions.
* hash.c (scm_hasher): Handle fractions.
* numbers.c: New code for handling fraction all over the place.
(scm_odd_p, scm_even_p): Handle inexact integers.
(scm_rational_p): New function, same as scm_real_p.
(scm_round_number, scm_truncate_number, scm_ceiling, scm_floor):
New exact functions that replace the inexact 'dsubr'
implementations.
(scm_numerator, scm_denominator): New.
* numbers.h (SCM_NUMP): Recognize fractions.
(SCM_FRACTIONP, SCM_SLOPPY_FRACTIONP, SCM_FRACTION_NUMERATOR,
SCM_FRACTION_DENOMINATOR, SCM_FRACTION_SET_NUMERATOR,
SCM_FRACTION_SET_DENOMINATOR, SCM_FRACTION_REDUCED_BIT,
SCM_FRACTION_REDUCED_SET, SCM_FRACTION_REDUCED_CLEAR,
SCM_FRACTION_REDUCED): New.
(scm_floor, scm_ceiling, scm_truncate_number, scm_round_number):
New prototypes.
(scm_make_ratio, scm_rationalize, scm_numerator, scm_denominator,
scm_rational_p): New prototypes.
(scm_i_dbl2num, scm_i_fraction2double, scm_i_fraction_equalp,
scm_i_print_fraction): New prototypes.
* goops.c (create_standard_classes): Create "<fraction>" class.
* gc-mark.c (scm_gc_mark_dependencies): Handle fractions.
* gc-card.c (scm_i_sweep_card): Include scm_tc16_fraction as a
case in the switch, but do nothing for now.
* eval.c (SCM_CEVAL, SCM_APPLY, call_dsubr_1): Convert fractions
to doubles when calling 'dsubr' functions.
* eq.c (scm_eqv_p, scm_equal_p): Handle fractions.
2003-11-18 19:59:53 +00:00
|
|
|
|
SCM_DEFINE (scm_truncate_number, "truncate", 1, 0, 0,
|
|
|
|
|
|
(SCM x),
|
|
|
|
|
|
"Round the number @var{x} towards zero.")
|
|
|
|
|
|
#define FUNC_NAME s_scm_truncate_number
|
|
|
|
|
|
{
|
(scm_is_integer, scm_is_signed_integer, scm_is_unsigned_integer,
scm_to_signed_integer, scm_to_unsigned_integer, scm_to_schar,
scm_to_uchar, scm_to_char, scm_to_short, scm_to_ushort, scm_to_long,
scm_to_ulong, scm_to_size_t, scm_to_ssize_t, scm_from_schar,
scm_from_uchar, scm_from_char, scm_from_short, scm_from_ushort,
scm_from_int, scm_from_uint, scm_from_long, scm_from_ulong,
scm_from_size_t, scm_from_ssize_t, scm_is_real, scm_to_double,
scm_from_double): New.
* deprecated.h, boolean.h (SCM_FALSEP, SCM_NFALSEP, SCM_BOOL,
SCM_NEGATE_BOOL, SCM_BOOLP): Deprecated by moving into "deprecated.h".
Replaced all uses with scm_is_false, scm_is_true, scm_from_bool, and
scm_is_bool, respectively.
2004-07-06 10:23:30 +00:00
|
|
|
|
if (scm_is_false (scm_negative_p (x)))
|
* print.c (scm_iprin1): Handle fractions.
* objects.h (scm_class_fraction): New.
* objects.c (scm_class_fraction): New.
(scm_class_of): Handle fractions.
* hash.c (scm_hasher): Handle fractions.
* numbers.c: New code for handling fraction all over the place.
(scm_odd_p, scm_even_p): Handle inexact integers.
(scm_rational_p): New function, same as scm_real_p.
(scm_round_number, scm_truncate_number, scm_ceiling, scm_floor):
New exact functions that replace the inexact 'dsubr'
implementations.
(scm_numerator, scm_denominator): New.
* numbers.h (SCM_NUMP): Recognize fractions.
(SCM_FRACTIONP, SCM_SLOPPY_FRACTIONP, SCM_FRACTION_NUMERATOR,
SCM_FRACTION_DENOMINATOR, SCM_FRACTION_SET_NUMERATOR,
SCM_FRACTION_SET_DENOMINATOR, SCM_FRACTION_REDUCED_BIT,
SCM_FRACTION_REDUCED_SET, SCM_FRACTION_REDUCED_CLEAR,
SCM_FRACTION_REDUCED): New.
(scm_floor, scm_ceiling, scm_truncate_number, scm_round_number):
New prototypes.
(scm_make_ratio, scm_rationalize, scm_numerator, scm_denominator,
scm_rational_p): New prototypes.
(scm_i_dbl2num, scm_i_fraction2double, scm_i_fraction_equalp,
scm_i_print_fraction): New prototypes.
* goops.c (create_standard_classes): Create "<fraction>" class.
* gc-mark.c (scm_gc_mark_dependencies): Handle fractions.
* gc-card.c (scm_i_sweep_card): Include scm_tc16_fraction as a
case in the switch, but do nothing for now.
* eval.c (SCM_CEVAL, SCM_APPLY, call_dsubr_1): Convert fractions
to doubles when calling 'dsubr' functions.
* eq.c (scm_eqv_p, scm_equal_p): Handle fractions.
2003-11-18 19:59:53 +00:00
|
|
|
|
return scm_floor (x);
|
|
|
|
|
|
else
|
|
|
|
|
|
return scm_ceiling (x);
|
|
|
|
|
|
}
|
|
|
|
|
|
#undef FUNC_NAME
|
|
|
|
|
|
|
|
|
|
|
|
static SCM exactly_one_half;
|
|
|
|
|
|
|
|
|
|
|
|
SCM_DEFINE (scm_round_number, "round", 1, 0, 0,
|
|
|
|
|
|
(SCM x),
|
|
|
|
|
|
"Round the number @var{x} towards the nearest integer. "
|
|
|
|
|
|
"When it is exactly halfway between two integers, "
|
|
|
|
|
|
"round towards the even one.")
|
|
|
|
|
|
#define FUNC_NAME s_scm_round_number
|
|
|
|
|
|
{
|
2004-07-23 15:43:02 +00:00
|
|
|
|
if (SCM_I_INUMP (x) || SCM_BIGP (x))
|
2004-05-18 23:43:28 +00:00
|
|
|
|
return x;
|
|
|
|
|
|
else if (SCM_REALP (x))
|
2004-08-09 23:32:14 +00:00
|
|
|
|
return scm_from_double (scm_c_round (SCM_REAL_VALUE (x)));
|
* print.c (scm_iprin1): Handle fractions.
* objects.h (scm_class_fraction): New.
* objects.c (scm_class_fraction): New.
(scm_class_of): Handle fractions.
* hash.c (scm_hasher): Handle fractions.
* numbers.c: New code for handling fraction all over the place.
(scm_odd_p, scm_even_p): Handle inexact integers.
(scm_rational_p): New function, same as scm_real_p.
(scm_round_number, scm_truncate_number, scm_ceiling, scm_floor):
New exact functions that replace the inexact 'dsubr'
implementations.
(scm_numerator, scm_denominator): New.
* numbers.h (SCM_NUMP): Recognize fractions.
(SCM_FRACTIONP, SCM_SLOPPY_FRACTIONP, SCM_FRACTION_NUMERATOR,
SCM_FRACTION_DENOMINATOR, SCM_FRACTION_SET_NUMERATOR,
SCM_FRACTION_SET_DENOMINATOR, SCM_FRACTION_REDUCED_BIT,
SCM_FRACTION_REDUCED_SET, SCM_FRACTION_REDUCED_CLEAR,
SCM_FRACTION_REDUCED): New.
(scm_floor, scm_ceiling, scm_truncate_number, scm_round_number):
New prototypes.
(scm_make_ratio, scm_rationalize, scm_numerator, scm_denominator,
scm_rational_p): New prototypes.
(scm_i_dbl2num, scm_i_fraction2double, scm_i_fraction_equalp,
scm_i_print_fraction): New prototypes.
* goops.c (create_standard_classes): Create "<fraction>" class.
* gc-mark.c (scm_gc_mark_dependencies): Handle fractions.
* gc-card.c (scm_i_sweep_card): Include scm_tc16_fraction as a
case in the switch, but do nothing for now.
* eval.c (SCM_CEVAL, SCM_APPLY, call_dsubr_1): Convert fractions
to doubles when calling 'dsubr' functions.
* eq.c (scm_eqv_p, scm_equal_p): Handle fractions.
2003-11-18 19:59:53 +00:00
|
|
|
|
else
|
2004-05-18 23:43:28 +00:00
|
|
|
|
{
|
|
|
|
|
|
/* OPTIMIZE-ME: Fraction case could be done more efficiently by a
|
|
|
|
|
|
single quotient+remainder division then examining to see which way
|
|
|
|
|
|
the rounding should go. */
|
|
|
|
|
|
SCM plus_half = scm_sum (x, exactly_one_half);
|
|
|
|
|
|
SCM result = scm_floor (plus_half);
|
2004-08-09 23:32:14 +00:00
|
|
|
|
/* Adjust so that the rounding is towards even. */
|
(scm_is_integer, scm_is_signed_integer, scm_is_unsigned_integer,
scm_to_signed_integer, scm_to_unsigned_integer, scm_to_schar,
scm_to_uchar, scm_to_char, scm_to_short, scm_to_ushort, scm_to_long,
scm_to_ulong, scm_to_size_t, scm_to_ssize_t, scm_from_schar,
scm_from_uchar, scm_from_char, scm_from_short, scm_from_ushort,
scm_from_int, scm_from_uint, scm_from_long, scm_from_ulong,
scm_from_size_t, scm_from_ssize_t, scm_is_real, scm_to_double,
scm_from_double): New.
* deprecated.h, boolean.h (SCM_FALSEP, SCM_NFALSEP, SCM_BOOL,
SCM_NEGATE_BOOL, SCM_BOOLP): Deprecated by moving into "deprecated.h".
Replaced all uses with scm_is_false, scm_is_true, scm_from_bool, and
scm_is_bool, respectively.
2004-07-06 10:23:30 +00:00
|
|
|
|
if (scm_is_true (scm_num_eq_p (plus_half, result))
|
|
|
|
|
|
&& scm_is_true (scm_odd_p (result)))
|
2004-07-08 15:54:05 +00:00
|
|
|
|
return scm_difference (result, SCM_I_MAKINUM (1));
|
2004-05-18 23:43:28 +00:00
|
|
|
|
else
|
|
|
|
|
|
return result;
|
|
|
|
|
|
}
|
* print.c (scm_iprin1): Handle fractions.
* objects.h (scm_class_fraction): New.
* objects.c (scm_class_fraction): New.
(scm_class_of): Handle fractions.
* hash.c (scm_hasher): Handle fractions.
* numbers.c: New code for handling fraction all over the place.
(scm_odd_p, scm_even_p): Handle inexact integers.
(scm_rational_p): New function, same as scm_real_p.
(scm_round_number, scm_truncate_number, scm_ceiling, scm_floor):
New exact functions that replace the inexact 'dsubr'
implementations.
(scm_numerator, scm_denominator): New.
* numbers.h (SCM_NUMP): Recognize fractions.
(SCM_FRACTIONP, SCM_SLOPPY_FRACTIONP, SCM_FRACTION_NUMERATOR,
SCM_FRACTION_DENOMINATOR, SCM_FRACTION_SET_NUMERATOR,
SCM_FRACTION_SET_DENOMINATOR, SCM_FRACTION_REDUCED_BIT,
SCM_FRACTION_REDUCED_SET, SCM_FRACTION_REDUCED_CLEAR,
SCM_FRACTION_REDUCED): New.
(scm_floor, scm_ceiling, scm_truncate_number, scm_round_number):
New prototypes.
(scm_make_ratio, scm_rationalize, scm_numerator, scm_denominator,
scm_rational_p): New prototypes.
(scm_i_dbl2num, scm_i_fraction2double, scm_i_fraction_equalp,
scm_i_print_fraction): New prototypes.
* goops.c (create_standard_classes): Create "<fraction>" class.
* gc-mark.c (scm_gc_mark_dependencies): Handle fractions.
* gc-card.c (scm_i_sweep_card): Include scm_tc16_fraction as a
case in the switch, but do nothing for now.
* eval.c (SCM_CEVAL, SCM_APPLY, call_dsubr_1): Convert fractions
to doubles when calling 'dsubr' functions.
* eq.c (scm_eqv_p, scm_equal_p): Handle fractions.
2003-11-18 19:59:53 +00:00
|
|
|
|
}
|
|
|
|
|
|
#undef FUNC_NAME
|
|
|
|
|
|
|
|
|
|
|
|
SCM_PRIMITIVE_GENERIC (scm_floor, "floor", 1, 0, 0,
|
|
|
|
|
|
(SCM x),
|
|
|
|
|
|
"Round the number @var{x} towards minus infinity.")
|
|
|
|
|
|
#define FUNC_NAME s_scm_floor
|
|
|
|
|
|
{
|
2004-07-23 15:43:02 +00:00
|
|
|
|
if (SCM_I_INUMP (x) || SCM_BIGP (x))
|
* print.c (scm_iprin1): Handle fractions.
* objects.h (scm_class_fraction): New.
* objects.c (scm_class_fraction): New.
(scm_class_of): Handle fractions.
* hash.c (scm_hasher): Handle fractions.
* numbers.c: New code for handling fraction all over the place.
(scm_odd_p, scm_even_p): Handle inexact integers.
(scm_rational_p): New function, same as scm_real_p.
(scm_round_number, scm_truncate_number, scm_ceiling, scm_floor):
New exact functions that replace the inexact 'dsubr'
implementations.
(scm_numerator, scm_denominator): New.
* numbers.h (SCM_NUMP): Recognize fractions.
(SCM_FRACTIONP, SCM_SLOPPY_FRACTIONP, SCM_FRACTION_NUMERATOR,
SCM_FRACTION_DENOMINATOR, SCM_FRACTION_SET_NUMERATOR,
SCM_FRACTION_SET_DENOMINATOR, SCM_FRACTION_REDUCED_BIT,
SCM_FRACTION_REDUCED_SET, SCM_FRACTION_REDUCED_CLEAR,
SCM_FRACTION_REDUCED): New.
(scm_floor, scm_ceiling, scm_truncate_number, scm_round_number):
New prototypes.
(scm_make_ratio, scm_rationalize, scm_numerator, scm_denominator,
scm_rational_p): New prototypes.
(scm_i_dbl2num, scm_i_fraction2double, scm_i_fraction_equalp,
scm_i_print_fraction): New prototypes.
* goops.c (create_standard_classes): Create "<fraction>" class.
* gc-mark.c (scm_gc_mark_dependencies): Handle fractions.
* gc-card.c (scm_i_sweep_card): Include scm_tc16_fraction as a
case in the switch, but do nothing for now.
* eval.c (SCM_CEVAL, SCM_APPLY, call_dsubr_1): Convert fractions
to doubles when calling 'dsubr' functions.
* eq.c (scm_eqv_p, scm_equal_p): Handle fractions.
2003-11-18 19:59:53 +00:00
|
|
|
|
return x;
|
|
|
|
|
|
else if (SCM_REALP (x))
|
(scm_is_rational): New.
(scm_i_short2big, scm_i_int2big, scm_i_uint2big, scm_i_size2big,
scm_i_ptrdiff2big, scm_i_long_long2big, scm_i_ulong_long2big):
Removed prototypes.
(scm_make_real, scm_num2dbl, scm_float2num, scm_double2num):
Discouraged by moving to discouraged.h and discouraged.c.
Replaced all uses with scm_from_double.
(scm_num2float, scm_num2double): Discouraged by moving prototype
to discouraged.h and rewriting in terms of scm_to_double.
Replaced all uses with scm_to_double.
(scm_to_double): Do not implement in terms of scm_num2dbl, use
explicit code.
(scm_from_double): Do not implement in terms of scm_make_real, use
explicit code.
2004-08-03 15:03:35 +00:00
|
|
|
|
return scm_from_double (floor (SCM_REAL_VALUE (x)));
|
* print.c (scm_iprin1): Handle fractions.
* objects.h (scm_class_fraction): New.
* objects.c (scm_class_fraction): New.
(scm_class_of): Handle fractions.
* hash.c (scm_hasher): Handle fractions.
* numbers.c: New code for handling fraction all over the place.
(scm_odd_p, scm_even_p): Handle inexact integers.
(scm_rational_p): New function, same as scm_real_p.
(scm_round_number, scm_truncate_number, scm_ceiling, scm_floor):
New exact functions that replace the inexact 'dsubr'
implementations.
(scm_numerator, scm_denominator): New.
* numbers.h (SCM_NUMP): Recognize fractions.
(SCM_FRACTIONP, SCM_SLOPPY_FRACTIONP, SCM_FRACTION_NUMERATOR,
SCM_FRACTION_DENOMINATOR, SCM_FRACTION_SET_NUMERATOR,
SCM_FRACTION_SET_DENOMINATOR, SCM_FRACTION_REDUCED_BIT,
SCM_FRACTION_REDUCED_SET, SCM_FRACTION_REDUCED_CLEAR,
SCM_FRACTION_REDUCED): New.
(scm_floor, scm_ceiling, scm_truncate_number, scm_round_number):
New prototypes.
(scm_make_ratio, scm_rationalize, scm_numerator, scm_denominator,
scm_rational_p): New prototypes.
(scm_i_dbl2num, scm_i_fraction2double, scm_i_fraction_equalp,
scm_i_print_fraction): New prototypes.
* goops.c (create_standard_classes): Create "<fraction>" class.
* gc-mark.c (scm_gc_mark_dependencies): Handle fractions.
* gc-card.c (scm_i_sweep_card): Include scm_tc16_fraction as a
case in the switch, but do nothing for now.
* eval.c (SCM_CEVAL, SCM_APPLY, call_dsubr_1): Convert fractions
to doubles when calling 'dsubr' functions.
* eq.c (scm_eqv_p, scm_equal_p): Handle fractions.
2003-11-18 19:59:53 +00:00
|
|
|
|
else if (SCM_FRACTIONP (x))
|
|
|
|
|
|
{
|
|
|
|
|
|
SCM q = scm_quotient (SCM_FRACTION_NUMERATOR (x),
|
|
|
|
|
|
SCM_FRACTION_DENOMINATOR (x));
|
(scm_is_integer, scm_is_signed_integer, scm_is_unsigned_integer,
scm_to_signed_integer, scm_to_unsigned_integer, scm_to_schar,
scm_to_uchar, scm_to_char, scm_to_short, scm_to_ushort, scm_to_long,
scm_to_ulong, scm_to_size_t, scm_to_ssize_t, scm_from_schar,
scm_from_uchar, scm_from_char, scm_from_short, scm_from_ushort,
scm_from_int, scm_from_uint, scm_from_long, scm_from_ulong,
scm_from_size_t, scm_from_ssize_t, scm_is_real, scm_to_double,
scm_from_double): New.
* deprecated.h, boolean.h (SCM_FALSEP, SCM_NFALSEP, SCM_BOOL,
SCM_NEGATE_BOOL, SCM_BOOLP): Deprecated by moving into "deprecated.h".
Replaced all uses with scm_is_false, scm_is_true, scm_from_bool, and
scm_is_bool, respectively.
2004-07-06 10:23:30 +00:00
|
|
|
|
if (scm_is_false (scm_negative_p (x)))
|
* print.c (scm_iprin1): Handle fractions.
* objects.h (scm_class_fraction): New.
* objects.c (scm_class_fraction): New.
(scm_class_of): Handle fractions.
* hash.c (scm_hasher): Handle fractions.
* numbers.c: New code for handling fraction all over the place.
(scm_odd_p, scm_even_p): Handle inexact integers.
(scm_rational_p): New function, same as scm_real_p.
(scm_round_number, scm_truncate_number, scm_ceiling, scm_floor):
New exact functions that replace the inexact 'dsubr'
implementations.
(scm_numerator, scm_denominator): New.
* numbers.h (SCM_NUMP): Recognize fractions.
(SCM_FRACTIONP, SCM_SLOPPY_FRACTIONP, SCM_FRACTION_NUMERATOR,
SCM_FRACTION_DENOMINATOR, SCM_FRACTION_SET_NUMERATOR,
SCM_FRACTION_SET_DENOMINATOR, SCM_FRACTION_REDUCED_BIT,
SCM_FRACTION_REDUCED_SET, SCM_FRACTION_REDUCED_CLEAR,
SCM_FRACTION_REDUCED): New.
(scm_floor, scm_ceiling, scm_truncate_number, scm_round_number):
New prototypes.
(scm_make_ratio, scm_rationalize, scm_numerator, scm_denominator,
scm_rational_p): New prototypes.
(scm_i_dbl2num, scm_i_fraction2double, scm_i_fraction_equalp,
scm_i_print_fraction): New prototypes.
* goops.c (create_standard_classes): Create "<fraction>" class.
* gc-mark.c (scm_gc_mark_dependencies): Handle fractions.
* gc-card.c (scm_i_sweep_card): Include scm_tc16_fraction as a
case in the switch, but do nothing for now.
* eval.c (SCM_CEVAL, SCM_APPLY, call_dsubr_1): Convert fractions
to doubles when calling 'dsubr' functions.
* eq.c (scm_eqv_p, scm_equal_p): Handle fractions.
2003-11-18 19:59:53 +00:00
|
|
|
|
{
|
|
|
|
|
|
/* For positive x, rounding towards zero is correct. */
|
|
|
|
|
|
return q;
|
|
|
|
|
|
}
|
|
|
|
|
|
else
|
|
|
|
|
|
{
|
|
|
|
|
|
/* For negative x, we need to return q-1 unless x is an
|
|
|
|
|
|
integer. But fractions are never integer, per our
|
|
|
|
|
|
assumptions. */
|
2004-07-08 15:54:05 +00:00
|
|
|
|
return scm_difference (q, SCM_I_MAKINUM (1));
|
* print.c (scm_iprin1): Handle fractions.
* objects.h (scm_class_fraction): New.
* objects.c (scm_class_fraction): New.
(scm_class_of): Handle fractions.
* hash.c (scm_hasher): Handle fractions.
* numbers.c: New code for handling fraction all over the place.
(scm_odd_p, scm_even_p): Handle inexact integers.
(scm_rational_p): New function, same as scm_real_p.
(scm_round_number, scm_truncate_number, scm_ceiling, scm_floor):
New exact functions that replace the inexact 'dsubr'
implementations.
(scm_numerator, scm_denominator): New.
* numbers.h (SCM_NUMP): Recognize fractions.
(SCM_FRACTIONP, SCM_SLOPPY_FRACTIONP, SCM_FRACTION_NUMERATOR,
SCM_FRACTION_DENOMINATOR, SCM_FRACTION_SET_NUMERATOR,
SCM_FRACTION_SET_DENOMINATOR, SCM_FRACTION_REDUCED_BIT,
SCM_FRACTION_REDUCED_SET, SCM_FRACTION_REDUCED_CLEAR,
SCM_FRACTION_REDUCED): New.
(scm_floor, scm_ceiling, scm_truncate_number, scm_round_number):
New prototypes.
(scm_make_ratio, scm_rationalize, scm_numerator, scm_denominator,
scm_rational_p): New prototypes.
(scm_i_dbl2num, scm_i_fraction2double, scm_i_fraction_equalp,
scm_i_print_fraction): New prototypes.
* goops.c (create_standard_classes): Create "<fraction>" class.
* gc-mark.c (scm_gc_mark_dependencies): Handle fractions.
* gc-card.c (scm_i_sweep_card): Include scm_tc16_fraction as a
case in the switch, but do nothing for now.
* eval.c (SCM_CEVAL, SCM_APPLY, call_dsubr_1): Convert fractions
to doubles when calling 'dsubr' functions.
* eq.c (scm_eqv_p, scm_equal_p): Handle fractions.
2003-11-18 19:59:53 +00:00
|
|
|
|
}
|
|
|
|
|
|
}
|
|
|
|
|
|
else
|
|
|
|
|
|
SCM_WTA_DISPATCH_1 (g_scm_floor, x, 1, s_scm_floor);
|
|
|
|
|
|
}
|
|
|
|
|
|
#undef FUNC_NAME
|
|
|
|
|
|
|
|
|
|
|
|
SCM_PRIMITIVE_GENERIC (scm_ceiling, "ceiling", 1, 0, 0,
|
|
|
|
|
|
(SCM x),
|
|
|
|
|
|
"Round the number @var{x} towards infinity.")
|
|
|
|
|
|
#define FUNC_NAME s_scm_ceiling
|
|
|
|
|
|
{
|
2004-07-23 15:43:02 +00:00
|
|
|
|
if (SCM_I_INUMP (x) || SCM_BIGP (x))
|
* print.c (scm_iprin1): Handle fractions.
* objects.h (scm_class_fraction): New.
* objects.c (scm_class_fraction): New.
(scm_class_of): Handle fractions.
* hash.c (scm_hasher): Handle fractions.
* numbers.c: New code for handling fraction all over the place.
(scm_odd_p, scm_even_p): Handle inexact integers.
(scm_rational_p): New function, same as scm_real_p.
(scm_round_number, scm_truncate_number, scm_ceiling, scm_floor):
New exact functions that replace the inexact 'dsubr'
implementations.
(scm_numerator, scm_denominator): New.
* numbers.h (SCM_NUMP): Recognize fractions.
(SCM_FRACTIONP, SCM_SLOPPY_FRACTIONP, SCM_FRACTION_NUMERATOR,
SCM_FRACTION_DENOMINATOR, SCM_FRACTION_SET_NUMERATOR,
SCM_FRACTION_SET_DENOMINATOR, SCM_FRACTION_REDUCED_BIT,
SCM_FRACTION_REDUCED_SET, SCM_FRACTION_REDUCED_CLEAR,
SCM_FRACTION_REDUCED): New.
(scm_floor, scm_ceiling, scm_truncate_number, scm_round_number):
New prototypes.
(scm_make_ratio, scm_rationalize, scm_numerator, scm_denominator,
scm_rational_p): New prototypes.
(scm_i_dbl2num, scm_i_fraction2double, scm_i_fraction_equalp,
scm_i_print_fraction): New prototypes.
* goops.c (create_standard_classes): Create "<fraction>" class.
* gc-mark.c (scm_gc_mark_dependencies): Handle fractions.
* gc-card.c (scm_i_sweep_card): Include scm_tc16_fraction as a
case in the switch, but do nothing for now.
* eval.c (SCM_CEVAL, SCM_APPLY, call_dsubr_1): Convert fractions
to doubles when calling 'dsubr' functions.
* eq.c (scm_eqv_p, scm_equal_p): Handle fractions.
2003-11-18 19:59:53 +00:00
|
|
|
|
return x;
|
|
|
|
|
|
else if (SCM_REALP (x))
|
(scm_is_rational): New.
(scm_i_short2big, scm_i_int2big, scm_i_uint2big, scm_i_size2big,
scm_i_ptrdiff2big, scm_i_long_long2big, scm_i_ulong_long2big):
Removed prototypes.
(scm_make_real, scm_num2dbl, scm_float2num, scm_double2num):
Discouraged by moving to discouraged.h and discouraged.c.
Replaced all uses with scm_from_double.
(scm_num2float, scm_num2double): Discouraged by moving prototype
to discouraged.h and rewriting in terms of scm_to_double.
Replaced all uses with scm_to_double.
(scm_to_double): Do not implement in terms of scm_num2dbl, use
explicit code.
(scm_from_double): Do not implement in terms of scm_make_real, use
explicit code.
2004-08-03 15:03:35 +00:00
|
|
|
|
return scm_from_double (ceil (SCM_REAL_VALUE (x)));
|
* print.c (scm_iprin1): Handle fractions.
* objects.h (scm_class_fraction): New.
* objects.c (scm_class_fraction): New.
(scm_class_of): Handle fractions.
* hash.c (scm_hasher): Handle fractions.
* numbers.c: New code for handling fraction all over the place.
(scm_odd_p, scm_even_p): Handle inexact integers.
(scm_rational_p): New function, same as scm_real_p.
(scm_round_number, scm_truncate_number, scm_ceiling, scm_floor):
New exact functions that replace the inexact 'dsubr'
implementations.
(scm_numerator, scm_denominator): New.
* numbers.h (SCM_NUMP): Recognize fractions.
(SCM_FRACTIONP, SCM_SLOPPY_FRACTIONP, SCM_FRACTION_NUMERATOR,
SCM_FRACTION_DENOMINATOR, SCM_FRACTION_SET_NUMERATOR,
SCM_FRACTION_SET_DENOMINATOR, SCM_FRACTION_REDUCED_BIT,
SCM_FRACTION_REDUCED_SET, SCM_FRACTION_REDUCED_CLEAR,
SCM_FRACTION_REDUCED): New.
(scm_floor, scm_ceiling, scm_truncate_number, scm_round_number):
New prototypes.
(scm_make_ratio, scm_rationalize, scm_numerator, scm_denominator,
scm_rational_p): New prototypes.
(scm_i_dbl2num, scm_i_fraction2double, scm_i_fraction_equalp,
scm_i_print_fraction): New prototypes.
* goops.c (create_standard_classes): Create "<fraction>" class.
* gc-mark.c (scm_gc_mark_dependencies): Handle fractions.
* gc-card.c (scm_i_sweep_card): Include scm_tc16_fraction as a
case in the switch, but do nothing for now.
* eval.c (SCM_CEVAL, SCM_APPLY, call_dsubr_1): Convert fractions
to doubles when calling 'dsubr' functions.
* eq.c (scm_eqv_p, scm_equal_p): Handle fractions.
2003-11-18 19:59:53 +00:00
|
|
|
|
else if (SCM_FRACTIONP (x))
|
|
|
|
|
|
{
|
|
|
|
|
|
SCM q = scm_quotient (SCM_FRACTION_NUMERATOR (x),
|
|
|
|
|
|
SCM_FRACTION_DENOMINATOR (x));
|
(scm_is_integer, scm_is_signed_integer, scm_is_unsigned_integer,
scm_to_signed_integer, scm_to_unsigned_integer, scm_to_schar,
scm_to_uchar, scm_to_char, scm_to_short, scm_to_ushort, scm_to_long,
scm_to_ulong, scm_to_size_t, scm_to_ssize_t, scm_from_schar,
scm_from_uchar, scm_from_char, scm_from_short, scm_from_ushort,
scm_from_int, scm_from_uint, scm_from_long, scm_from_ulong,
scm_from_size_t, scm_from_ssize_t, scm_is_real, scm_to_double,
scm_from_double): New.
* deprecated.h, boolean.h (SCM_FALSEP, SCM_NFALSEP, SCM_BOOL,
SCM_NEGATE_BOOL, SCM_BOOLP): Deprecated by moving into "deprecated.h".
Replaced all uses with scm_is_false, scm_is_true, scm_from_bool, and
scm_is_bool, respectively.
2004-07-06 10:23:30 +00:00
|
|
|
|
if (scm_is_false (scm_positive_p (x)))
|
* print.c (scm_iprin1): Handle fractions.
* objects.h (scm_class_fraction): New.
* objects.c (scm_class_fraction): New.
(scm_class_of): Handle fractions.
* hash.c (scm_hasher): Handle fractions.
* numbers.c: New code for handling fraction all over the place.
(scm_odd_p, scm_even_p): Handle inexact integers.
(scm_rational_p): New function, same as scm_real_p.
(scm_round_number, scm_truncate_number, scm_ceiling, scm_floor):
New exact functions that replace the inexact 'dsubr'
implementations.
(scm_numerator, scm_denominator): New.
* numbers.h (SCM_NUMP): Recognize fractions.
(SCM_FRACTIONP, SCM_SLOPPY_FRACTIONP, SCM_FRACTION_NUMERATOR,
SCM_FRACTION_DENOMINATOR, SCM_FRACTION_SET_NUMERATOR,
SCM_FRACTION_SET_DENOMINATOR, SCM_FRACTION_REDUCED_BIT,
SCM_FRACTION_REDUCED_SET, SCM_FRACTION_REDUCED_CLEAR,
SCM_FRACTION_REDUCED): New.
(scm_floor, scm_ceiling, scm_truncate_number, scm_round_number):
New prototypes.
(scm_make_ratio, scm_rationalize, scm_numerator, scm_denominator,
scm_rational_p): New prototypes.
(scm_i_dbl2num, scm_i_fraction2double, scm_i_fraction_equalp,
scm_i_print_fraction): New prototypes.
* goops.c (create_standard_classes): Create "<fraction>" class.
* gc-mark.c (scm_gc_mark_dependencies): Handle fractions.
* gc-card.c (scm_i_sweep_card): Include scm_tc16_fraction as a
case in the switch, but do nothing for now.
* eval.c (SCM_CEVAL, SCM_APPLY, call_dsubr_1): Convert fractions
to doubles when calling 'dsubr' functions.
* eq.c (scm_eqv_p, scm_equal_p): Handle fractions.
2003-11-18 19:59:53 +00:00
|
|
|
|
{
|
|
|
|
|
|
/* For negative x, rounding towards zero is correct. */
|
|
|
|
|
|
return q;
|
|
|
|
|
|
}
|
|
|
|
|
|
else
|
|
|
|
|
|
{
|
|
|
|
|
|
/* For positive x, we need to return q+1 unless x is an
|
|
|
|
|
|
integer. But fractions are never integer, per our
|
|
|
|
|
|
assumptions. */
|
2004-07-08 15:54:05 +00:00
|
|
|
|
return scm_sum (q, SCM_I_MAKINUM (1));
|
* print.c (scm_iprin1): Handle fractions.
* objects.h (scm_class_fraction): New.
* objects.c (scm_class_fraction): New.
(scm_class_of): Handle fractions.
* hash.c (scm_hasher): Handle fractions.
* numbers.c: New code for handling fraction all over the place.
(scm_odd_p, scm_even_p): Handle inexact integers.
(scm_rational_p): New function, same as scm_real_p.
(scm_round_number, scm_truncate_number, scm_ceiling, scm_floor):
New exact functions that replace the inexact 'dsubr'
implementations.
(scm_numerator, scm_denominator): New.
* numbers.h (SCM_NUMP): Recognize fractions.
(SCM_FRACTIONP, SCM_SLOPPY_FRACTIONP, SCM_FRACTION_NUMERATOR,
SCM_FRACTION_DENOMINATOR, SCM_FRACTION_SET_NUMERATOR,
SCM_FRACTION_SET_DENOMINATOR, SCM_FRACTION_REDUCED_BIT,
SCM_FRACTION_REDUCED_SET, SCM_FRACTION_REDUCED_CLEAR,
SCM_FRACTION_REDUCED): New.
(scm_floor, scm_ceiling, scm_truncate_number, scm_round_number):
New prototypes.
(scm_make_ratio, scm_rationalize, scm_numerator, scm_denominator,
scm_rational_p): New prototypes.
(scm_i_dbl2num, scm_i_fraction2double, scm_i_fraction_equalp,
scm_i_print_fraction): New prototypes.
* goops.c (create_standard_classes): Create "<fraction>" class.
* gc-mark.c (scm_gc_mark_dependencies): Handle fractions.
* gc-card.c (scm_i_sweep_card): Include scm_tc16_fraction as a
case in the switch, but do nothing for now.
* eval.c (SCM_CEVAL, SCM_APPLY, call_dsubr_1): Convert fractions
to doubles when calling 'dsubr' functions.
* eq.c (scm_eqv_p, scm_equal_p): Handle fractions.
2003-11-18 19:59:53 +00:00
|
|
|
|
}
|
|
|
|
|
|
}
|
|
|
|
|
|
else
|
|
|
|
|
|
SCM_WTA_DISPATCH_1 (g_scm_ceiling, x, 1, s_scm_ceiling);
|
|
|
|
|
|
}
|
|
|
|
|
|
#undef FUNC_NAME
|
1996-07-25 22:56:11 +00:00
|
|
|
|
|
implement transcendental sin, cos etc in c; deprecate $sin, $cos, etc
* libguile/deprecated.h:
* libguile/deprecated.c (scm_asinh, scm_acosh, scm_atanh): Deprecate
these stand-ins for the C99 asinh, acosh, and atanh functions. Guile
is not gnulib.
(scm_sys_atan2): Deprecate as well, in favor of scm_atan.
* libguile/numbers.h:
* libguile/numbers.c (scm_sin, scm_cos, scm_tan)
(scm_sinh, scm_cosh, scm_tanh)
(scm_asin, scm_acos, scm_atan)
(scm_sys_asinh, scm_sys_acosh, scm_sys_atanh): New functions,
replacing the combination of dsubrs and boot-9 wrappers with C subrs
that handle complex values. The latter three have _sys_ in their names
due to the name conflict with the deprecated scm_asinh et al.
Remove the $abs, $sin etc "dsubrs".
* module/ice-9/boot-9.scm: Remove transcendental functions, as this all
happens in C now.
* module/ice-9/deprecated.scm: Add aliases for $sin et al.
* test-suite/tests/ramap.test ("array-map!"): Adjust "dsubr" tests to
use sqrt, not $sqrt. They don't actually test dsubrs now. In the
two-source test, I'm pretty sure the dsubr array-map! should have been
failing, as indeed it does now; I've changed the test case to expect
the failure. I'd still like to know why it was succeeding before.
2009-09-03 22:29:10 +02:00
|
|
|
|
/* sin/cos/tan/asin/acos/atan
|
|
|
|
|
|
sinh/cosh/tanh/asinh/acosh/atanh
|
|
|
|
|
|
Derived from "Transcen.scm", Complex trancendental functions for SCM.
|
|
|
|
|
|
Written by Jerry D. Hedden, (C) FSF.
|
|
|
|
|
|
See the file `COPYING' for terms applying to this program. */
|
1996-07-25 22:56:11 +00:00
|
|
|
|
|
2009-09-03 12:19:39 +02:00
|
|
|
|
SCM_DEFINE (scm_expt, "expt", 2, 0, 0,
|
2001-02-24 23:46:04 +00:00
|
|
|
|
(SCM x, SCM y),
|
2009-09-03 12:19:39 +02:00
|
|
|
|
"Return @var{x} raised to the power of @var{y}.")
|
|
|
|
|
|
#define FUNC_NAME s_scm_expt
|
1996-07-25 22:56:11 +00:00
|
|
|
|
{
|
2010-06-10 18:14:02 +02:00
|
|
|
|
if (scm_is_true (scm_exact_p (x)) && scm_is_integer (y))
|
2009-09-03 12:19:39 +02:00
|
|
|
|
return scm_integer_expt (x, y);
|
|
|
|
|
|
else if (scm_is_real (x) && scm_is_real (y) && scm_to_double (x) >= 0.0)
|
|
|
|
|
|
{
|
|
|
|
|
|
return scm_from_double (pow (scm_to_double (x), scm_to_double (y)));
|
|
|
|
|
|
}
|
|
|
|
|
|
else
|
|
|
|
|
|
return scm_exp (scm_product (scm_log (x), y));
|
1996-07-25 22:56:11 +00:00
|
|
|
|
}
|
1999-12-12 02:36:16 +00:00
|
|
|
|
#undef FUNC_NAME
|
1996-07-25 22:56:11 +00:00
|
|
|
|
|
implement transcendental sin, cos etc in c; deprecate $sin, $cos, etc
* libguile/deprecated.h:
* libguile/deprecated.c (scm_asinh, scm_acosh, scm_atanh): Deprecate
these stand-ins for the C99 asinh, acosh, and atanh functions. Guile
is not gnulib.
(scm_sys_atan2): Deprecate as well, in favor of scm_atan.
* libguile/numbers.h:
* libguile/numbers.c (scm_sin, scm_cos, scm_tan)
(scm_sinh, scm_cosh, scm_tanh)
(scm_asin, scm_acos, scm_atan)
(scm_sys_asinh, scm_sys_acosh, scm_sys_atanh): New functions,
replacing the combination of dsubrs and boot-9 wrappers with C subrs
that handle complex values. The latter three have _sys_ in their names
due to the name conflict with the deprecated scm_asinh et al.
Remove the $abs, $sin etc "dsubrs".
* module/ice-9/boot-9.scm: Remove transcendental functions, as this all
happens in C now.
* module/ice-9/deprecated.scm: Add aliases for $sin et al.
* test-suite/tests/ramap.test ("array-map!"): Adjust "dsubr" tests to
use sqrt, not $sqrt. They don't actually test dsubrs now. In the
two-source test, I'm pretty sure the dsubr array-map! should have been
failing, as indeed it does now; I've changed the test case to expect
the failure. I'd still like to know why it was succeeding before.
2009-09-03 22:29:10 +02:00
|
|
|
|
SCM_PRIMITIVE_GENERIC (scm_sin, "sin", 1, 0, 0,
|
|
|
|
|
|
(SCM z),
|
|
|
|
|
|
"Compute the sine of @var{z}.")
|
|
|
|
|
|
#define FUNC_NAME s_scm_sin
|
|
|
|
|
|
{
|
|
|
|
|
|
if (scm_is_real (z))
|
|
|
|
|
|
return scm_from_double (sin (scm_to_double (z)));
|
|
|
|
|
|
else if (SCM_COMPLEXP (z))
|
|
|
|
|
|
{ double x, y;
|
|
|
|
|
|
x = SCM_COMPLEX_REAL (z);
|
|
|
|
|
|
y = SCM_COMPLEX_IMAG (z);
|
|
|
|
|
|
return scm_c_make_rectangular (sin (x) * cosh (y),
|
|
|
|
|
|
cos (x) * sinh (y));
|
|
|
|
|
|
}
|
|
|
|
|
|
else
|
|
|
|
|
|
SCM_WTA_DISPATCH_1 (g_scm_sin, z, 1, s_scm_sin);
|
|
|
|
|
|
}
|
|
|
|
|
|
#undef FUNC_NAME
|
1996-07-25 22:56:11 +00:00
|
|
|
|
|
implement transcendental sin, cos etc in c; deprecate $sin, $cos, etc
* libguile/deprecated.h:
* libguile/deprecated.c (scm_asinh, scm_acosh, scm_atanh): Deprecate
these stand-ins for the C99 asinh, acosh, and atanh functions. Guile
is not gnulib.
(scm_sys_atan2): Deprecate as well, in favor of scm_atan.
* libguile/numbers.h:
* libguile/numbers.c (scm_sin, scm_cos, scm_tan)
(scm_sinh, scm_cosh, scm_tanh)
(scm_asin, scm_acos, scm_atan)
(scm_sys_asinh, scm_sys_acosh, scm_sys_atanh): New functions,
replacing the combination of dsubrs and boot-9 wrappers with C subrs
that handle complex values. The latter three have _sys_ in their names
due to the name conflict with the deprecated scm_asinh et al.
Remove the $abs, $sin etc "dsubrs".
* module/ice-9/boot-9.scm: Remove transcendental functions, as this all
happens in C now.
* module/ice-9/deprecated.scm: Add aliases for $sin et al.
* test-suite/tests/ramap.test ("array-map!"): Adjust "dsubr" tests to
use sqrt, not $sqrt. They don't actually test dsubrs now. In the
two-source test, I'm pretty sure the dsubr array-map! should have been
failing, as indeed it does now; I've changed the test case to expect
the failure. I'd still like to know why it was succeeding before.
2009-09-03 22:29:10 +02:00
|
|
|
|
SCM_PRIMITIVE_GENERIC (scm_cos, "cos", 1, 0, 0,
|
|
|
|
|
|
(SCM z),
|
|
|
|
|
|
"Compute the cosine of @var{z}.")
|
|
|
|
|
|
#define FUNC_NAME s_scm_cos
|
|
|
|
|
|
{
|
|
|
|
|
|
if (scm_is_real (z))
|
|
|
|
|
|
return scm_from_double (cos (scm_to_double (z)));
|
|
|
|
|
|
else if (SCM_COMPLEXP (z))
|
|
|
|
|
|
{ double x, y;
|
|
|
|
|
|
x = SCM_COMPLEX_REAL (z);
|
|
|
|
|
|
y = SCM_COMPLEX_IMAG (z);
|
|
|
|
|
|
return scm_c_make_rectangular (cos (x) * cosh (y),
|
|
|
|
|
|
-sin (x) * sinh (y));
|
|
|
|
|
|
}
|
|
|
|
|
|
else
|
|
|
|
|
|
SCM_WTA_DISPATCH_1 (g_scm_cos, z, 1, s_scm_cos);
|
|
|
|
|
|
}
|
|
|
|
|
|
#undef FUNC_NAME
|
|
|
|
|
|
|
|
|
|
|
|
SCM_PRIMITIVE_GENERIC (scm_tan, "tan", 1, 0, 0,
|
|
|
|
|
|
(SCM z),
|
|
|
|
|
|
"Compute the tangent of @var{z}.")
|
|
|
|
|
|
#define FUNC_NAME s_scm_tan
|
1996-07-25 22:56:11 +00:00
|
|
|
|
{
|
implement transcendental sin, cos etc in c; deprecate $sin, $cos, etc
* libguile/deprecated.h:
* libguile/deprecated.c (scm_asinh, scm_acosh, scm_atanh): Deprecate
these stand-ins for the C99 asinh, acosh, and atanh functions. Guile
is not gnulib.
(scm_sys_atan2): Deprecate as well, in favor of scm_atan.
* libguile/numbers.h:
* libguile/numbers.c (scm_sin, scm_cos, scm_tan)
(scm_sinh, scm_cosh, scm_tanh)
(scm_asin, scm_acos, scm_atan)
(scm_sys_asinh, scm_sys_acosh, scm_sys_atanh): New functions,
replacing the combination of dsubrs and boot-9 wrappers with C subrs
that handle complex values. The latter three have _sys_ in their names
due to the name conflict with the deprecated scm_asinh et al.
Remove the $abs, $sin etc "dsubrs".
* module/ice-9/boot-9.scm: Remove transcendental functions, as this all
happens in C now.
* module/ice-9/deprecated.scm: Add aliases for $sin et al.
* test-suite/tests/ramap.test ("array-map!"): Adjust "dsubr" tests to
use sqrt, not $sqrt. They don't actually test dsubrs now. In the
two-source test, I'm pretty sure the dsubr array-map! should have been
failing, as indeed it does now; I've changed the test case to expect
the failure. I'd still like to know why it was succeeding before.
2009-09-03 22:29:10 +02:00
|
|
|
|
if (scm_is_real (z))
|
|
|
|
|
|
return scm_from_double (tan (scm_to_double (z)));
|
|
|
|
|
|
else if (SCM_COMPLEXP (z))
|
|
|
|
|
|
{ double x, y, w;
|
|
|
|
|
|
x = 2.0 * SCM_COMPLEX_REAL (z);
|
|
|
|
|
|
y = 2.0 * SCM_COMPLEX_IMAG (z);
|
|
|
|
|
|
w = cos (x) + cosh (y);
|
|
|
|
|
|
#ifndef ALLOW_DIVIDE_BY_ZERO
|
|
|
|
|
|
if (w == 0.0)
|
|
|
|
|
|
scm_num_overflow (s_scm_tan);
|
|
|
|
|
|
#endif
|
|
|
|
|
|
return scm_c_make_rectangular (sin (x) / w, sinh (y) / w);
|
|
|
|
|
|
}
|
|
|
|
|
|
else
|
|
|
|
|
|
SCM_WTA_DISPATCH_1 (g_scm_tan, z, 1, s_scm_tan);
|
|
|
|
|
|
}
|
|
|
|
|
|
#undef FUNC_NAME
|
|
|
|
|
|
|
|
|
|
|
|
SCM_PRIMITIVE_GENERIC (scm_sinh, "sinh", 1, 0, 0,
|
|
|
|
|
|
(SCM z),
|
|
|
|
|
|
"Compute the hyperbolic sine of @var{z}.")
|
|
|
|
|
|
#define FUNC_NAME s_scm_sinh
|
|
|
|
|
|
{
|
|
|
|
|
|
if (scm_is_real (z))
|
|
|
|
|
|
return scm_from_double (sinh (scm_to_double (z)));
|
|
|
|
|
|
else if (SCM_COMPLEXP (z))
|
|
|
|
|
|
{ double x, y;
|
|
|
|
|
|
x = SCM_COMPLEX_REAL (z);
|
|
|
|
|
|
y = SCM_COMPLEX_IMAG (z);
|
|
|
|
|
|
return scm_c_make_rectangular (sinh (x) * cos (y),
|
|
|
|
|
|
cosh (x) * sin (y));
|
|
|
|
|
|
}
|
|
|
|
|
|
else
|
|
|
|
|
|
SCM_WTA_DISPATCH_1 (g_scm_sinh, z, 1, s_scm_sinh);
|
|
|
|
|
|
}
|
|
|
|
|
|
#undef FUNC_NAME
|
|
|
|
|
|
|
|
|
|
|
|
SCM_PRIMITIVE_GENERIC (scm_cosh, "cosh", 1, 0, 0,
|
|
|
|
|
|
(SCM z),
|
|
|
|
|
|
"Compute the hyperbolic cosine of @var{z}.")
|
|
|
|
|
|
#define FUNC_NAME s_scm_cosh
|
|
|
|
|
|
{
|
|
|
|
|
|
if (scm_is_real (z))
|
|
|
|
|
|
return scm_from_double (cosh (scm_to_double (z)));
|
|
|
|
|
|
else if (SCM_COMPLEXP (z))
|
|
|
|
|
|
{ double x, y;
|
|
|
|
|
|
x = SCM_COMPLEX_REAL (z);
|
|
|
|
|
|
y = SCM_COMPLEX_IMAG (z);
|
|
|
|
|
|
return scm_c_make_rectangular (cosh (x) * cos (y),
|
|
|
|
|
|
sinh (x) * sin (y));
|
|
|
|
|
|
}
|
|
|
|
|
|
else
|
|
|
|
|
|
SCM_WTA_DISPATCH_1 (g_scm_cosh, z, 1, s_scm_cosh);
|
|
|
|
|
|
}
|
|
|
|
|
|
#undef FUNC_NAME
|
|
|
|
|
|
|
|
|
|
|
|
SCM_PRIMITIVE_GENERIC (scm_tanh, "tanh", 1, 0, 0,
|
|
|
|
|
|
(SCM z),
|
|
|
|
|
|
"Compute the hyperbolic tangent of @var{z}.")
|
|
|
|
|
|
#define FUNC_NAME s_scm_tanh
|
|
|
|
|
|
{
|
|
|
|
|
|
if (scm_is_real (z))
|
|
|
|
|
|
return scm_from_double (tanh (scm_to_double (z)));
|
|
|
|
|
|
else if (SCM_COMPLEXP (z))
|
|
|
|
|
|
{ double x, y, w;
|
|
|
|
|
|
x = 2.0 * SCM_COMPLEX_REAL (z);
|
|
|
|
|
|
y = 2.0 * SCM_COMPLEX_IMAG (z);
|
|
|
|
|
|
w = cosh (x) + cos (y);
|
|
|
|
|
|
#ifndef ALLOW_DIVIDE_BY_ZERO
|
|
|
|
|
|
if (w == 0.0)
|
|
|
|
|
|
scm_num_overflow (s_scm_tanh);
|
|
|
|
|
|
#endif
|
|
|
|
|
|
return scm_c_make_rectangular (sinh (x) / w, sin (y) / w);
|
|
|
|
|
|
}
|
|
|
|
|
|
else
|
|
|
|
|
|
SCM_WTA_DISPATCH_1 (g_scm_tanh, z, 1, s_scm_tanh);
|
|
|
|
|
|
}
|
|
|
|
|
|
#undef FUNC_NAME
|
|
|
|
|
|
|
|
|
|
|
|
SCM_PRIMITIVE_GENERIC (scm_asin, "asin", 1, 0, 0,
|
|
|
|
|
|
(SCM z),
|
|
|
|
|
|
"Compute the arc sine of @var{z}.")
|
|
|
|
|
|
#define FUNC_NAME s_scm_asin
|
|
|
|
|
|
{
|
|
|
|
|
|
if (scm_is_real (z))
|
|
|
|
|
|
{
|
|
|
|
|
|
double w = scm_to_double (z);
|
|
|
|
|
|
if (w >= -1.0 && w <= 1.0)
|
|
|
|
|
|
return scm_from_double (asin (w));
|
|
|
|
|
|
else
|
|
|
|
|
|
return scm_product (scm_c_make_rectangular (0, -1),
|
|
|
|
|
|
scm_sys_asinh (scm_c_make_rectangular (0, w)));
|
|
|
|
|
|
}
|
|
|
|
|
|
else if (SCM_COMPLEXP (z))
|
|
|
|
|
|
{ double x, y;
|
|
|
|
|
|
x = SCM_COMPLEX_REAL (z);
|
|
|
|
|
|
y = SCM_COMPLEX_IMAG (z);
|
|
|
|
|
|
return scm_product (scm_c_make_rectangular (0, -1),
|
|
|
|
|
|
scm_sys_asinh (scm_c_make_rectangular (-y, x)));
|
|
|
|
|
|
}
|
|
|
|
|
|
else
|
|
|
|
|
|
SCM_WTA_DISPATCH_1 (g_scm_asin, z, 1, s_scm_asin);
|
|
|
|
|
|
}
|
|
|
|
|
|
#undef FUNC_NAME
|
|
|
|
|
|
|
|
|
|
|
|
SCM_PRIMITIVE_GENERIC (scm_acos, "acos", 1, 0, 0,
|
|
|
|
|
|
(SCM z),
|
|
|
|
|
|
"Compute the arc cosine of @var{z}.")
|
|
|
|
|
|
#define FUNC_NAME s_scm_acos
|
|
|
|
|
|
{
|
|
|
|
|
|
if (scm_is_real (z))
|
|
|
|
|
|
{
|
|
|
|
|
|
double w = scm_to_double (z);
|
|
|
|
|
|
if (w >= -1.0 && w <= 1.0)
|
|
|
|
|
|
return scm_from_double (acos (w));
|
|
|
|
|
|
else
|
|
|
|
|
|
return scm_sum (scm_from_double (acos (0.0)),
|
|
|
|
|
|
scm_product (scm_c_make_rectangular (0, 1),
|
|
|
|
|
|
scm_sys_asinh (scm_c_make_rectangular (0, w))));
|
|
|
|
|
|
}
|
|
|
|
|
|
else if (SCM_COMPLEXP (z))
|
|
|
|
|
|
{ double x, y;
|
|
|
|
|
|
x = SCM_COMPLEX_REAL (z);
|
|
|
|
|
|
y = SCM_COMPLEX_IMAG (z);
|
|
|
|
|
|
return scm_sum (scm_from_double (acos (0.0)),
|
|
|
|
|
|
scm_product (scm_c_make_rectangular (0, 1),
|
|
|
|
|
|
scm_sys_asinh (scm_c_make_rectangular (-y, x))));
|
|
|
|
|
|
}
|
|
|
|
|
|
else
|
|
|
|
|
|
SCM_WTA_DISPATCH_1 (g_scm_acos, z, 1, s_scm_acos);
|
|
|
|
|
|
}
|
|
|
|
|
|
#undef FUNC_NAME
|
|
|
|
|
|
|
|
|
|
|
|
SCM_PRIMITIVE_GENERIC (scm_atan, "atan", 1, 1, 0,
|
|
|
|
|
|
(SCM z, SCM y),
|
|
|
|
|
|
"With one argument, compute the arc tangent of @var{z}.\n"
|
|
|
|
|
|
"If @var{y} is present, compute the arc tangent of @var{z}/@var{y},\n"
|
|
|
|
|
|
"using the sign of @var{z} and @var{y} to determine the quadrant.")
|
|
|
|
|
|
#define FUNC_NAME s_scm_atan
|
|
|
|
|
|
{
|
|
|
|
|
|
if (SCM_UNBNDP (y))
|
|
|
|
|
|
{
|
|
|
|
|
|
if (scm_is_real (z))
|
|
|
|
|
|
return scm_from_double (atan (scm_to_double (z)));
|
|
|
|
|
|
else if (SCM_COMPLEXP (z))
|
|
|
|
|
|
{
|
|
|
|
|
|
double v, w;
|
|
|
|
|
|
v = SCM_COMPLEX_REAL (z);
|
|
|
|
|
|
w = SCM_COMPLEX_IMAG (z);
|
|
|
|
|
|
return scm_divide (scm_log (scm_divide (scm_c_make_rectangular (v, w - 1.0),
|
|
|
|
|
|
scm_c_make_rectangular (v, w + 1.0))),
|
|
|
|
|
|
scm_c_make_rectangular (0, 2));
|
|
|
|
|
|
}
|
|
|
|
|
|
else
|
|
|
|
|
|
SCM_WTA_DISPATCH_2 (g_scm_atan, z, y, SCM_ARG1, s_scm_atan);
|
|
|
|
|
|
}
|
|
|
|
|
|
else if (scm_is_real (z))
|
|
|
|
|
|
{
|
|
|
|
|
|
if (scm_is_real (y))
|
|
|
|
|
|
return scm_from_double (atan2 (scm_to_double (z), scm_to_double (y)));
|
|
|
|
|
|
else
|
|
|
|
|
|
SCM_WTA_DISPATCH_2 (g_scm_atan, z, y, SCM_ARG2, s_scm_atan);
|
|
|
|
|
|
}
|
|
|
|
|
|
else
|
|
|
|
|
|
SCM_WTA_DISPATCH_2 (g_scm_atan, z, y, SCM_ARG1, s_scm_atan);
|
|
|
|
|
|
}
|
|
|
|
|
|
#undef FUNC_NAME
|
|
|
|
|
|
|
|
|
|
|
|
SCM_PRIMITIVE_GENERIC (scm_sys_asinh, "asinh", 1, 0, 0,
|
|
|
|
|
|
(SCM z),
|
|
|
|
|
|
"Compute the inverse hyperbolic sine of @var{z}.")
|
|
|
|
|
|
#define FUNC_NAME s_scm_sys_asinh
|
|
|
|
|
|
{
|
|
|
|
|
|
if (scm_is_real (z))
|
|
|
|
|
|
return scm_from_double (asinh (scm_to_double (z)));
|
|
|
|
|
|
else if (scm_is_number (z))
|
|
|
|
|
|
return scm_log (scm_sum (z,
|
|
|
|
|
|
scm_sqrt (scm_sum (scm_product (z, z),
|
|
|
|
|
|
SCM_I_MAKINUM (1)))));
|
|
|
|
|
|
else
|
|
|
|
|
|
SCM_WTA_DISPATCH_1 (g_scm_sys_asinh, z, 1, s_scm_sys_asinh);
|
|
|
|
|
|
}
|
|
|
|
|
|
#undef FUNC_NAME
|
|
|
|
|
|
|
|
|
|
|
|
SCM_PRIMITIVE_GENERIC (scm_sys_acosh, "acosh", 1, 0, 0,
|
|
|
|
|
|
(SCM z),
|
|
|
|
|
|
"Compute the inverse hyperbolic cosine of @var{z}.")
|
|
|
|
|
|
#define FUNC_NAME s_scm_sys_acosh
|
|
|
|
|
|
{
|
|
|
|
|
|
if (scm_is_real (z) && scm_to_double (z) >= 1.0)
|
|
|
|
|
|
return scm_from_double (acosh (scm_to_double (z)));
|
|
|
|
|
|
else if (scm_is_number (z))
|
|
|
|
|
|
return scm_log (scm_sum (z,
|
|
|
|
|
|
scm_sqrt (scm_difference (scm_product (z, z),
|
|
|
|
|
|
SCM_I_MAKINUM (1)))));
|
|
|
|
|
|
else
|
|
|
|
|
|
SCM_WTA_DISPATCH_1 (g_scm_sys_acosh, z, 1, s_scm_sys_acosh);
|
|
|
|
|
|
}
|
|
|
|
|
|
#undef FUNC_NAME
|
|
|
|
|
|
|
|
|
|
|
|
SCM_PRIMITIVE_GENERIC (scm_sys_atanh, "atanh", 1, 0, 0,
|
|
|
|
|
|
(SCM z),
|
|
|
|
|
|
"Compute the inverse hyperbolic tangent of @var{z}.")
|
|
|
|
|
|
#define FUNC_NAME s_scm_sys_atanh
|
|
|
|
|
|
{
|
|
|
|
|
|
if (scm_is_real (z) && scm_to_double (z) >= -1.0 && scm_to_double (z) <= 1.0)
|
|
|
|
|
|
return scm_from_double (atanh (scm_to_double (z)));
|
|
|
|
|
|
else if (scm_is_number (z))
|
|
|
|
|
|
return scm_divide (scm_log (scm_divide (scm_sum (SCM_I_MAKINUM (1), z),
|
|
|
|
|
|
scm_difference (SCM_I_MAKINUM (1), z))),
|
|
|
|
|
|
SCM_I_MAKINUM (2));
|
|
|
|
|
|
else
|
|
|
|
|
|
SCM_WTA_DISPATCH_1 (g_scm_sys_atanh, z, 1, s_scm_sys_atanh);
|
1996-07-25 22:56:11 +00:00
|
|
|
|
}
|
1999-12-12 02:36:16 +00:00
|
|
|
|
#undef FUNC_NAME
|
1996-07-25 22:56:11 +00:00
|
|
|
|
|
2004-08-03 17:12:14 +00:00
|
|
|
|
SCM
|
|
|
|
|
|
scm_c_make_rectangular (double re, double im)
|
|
|
|
|
|
{
|
|
|
|
|
|
if (im == 0.0)
|
|
|
|
|
|
return scm_from_double (re);
|
|
|
|
|
|
else
|
|
|
|
|
|
{
|
|
|
|
|
|
SCM z;
|
2006-06-08 22:01:47 +00:00
|
|
|
|
SCM_NEWSMOB (z, scm_tc16_complex,
|
|
|
|
|
|
scm_gc_malloc_pointerless (sizeof (scm_t_complex),
|
|
|
|
|
|
"complex"));
|
2004-08-03 17:12:14 +00:00
|
|
|
|
SCM_COMPLEX_REAL (z) = re;
|
|
|
|
|
|
SCM_COMPLEX_IMAG (z) = im;
|
|
|
|
|
|
return z;
|
|
|
|
|
|
}
|
|
|
|
|
|
}
|
1996-07-25 22:56:11 +00:00
|
|
|
|
|
2000-01-05 19:05:23 +00:00
|
|
|
|
SCM_DEFINE (scm_make_rectangular, "make-rectangular", 2, 0, 0,
|
2008-02-23 11:28:11 +00:00
|
|
|
|
(SCM real_part, SCM imaginary_part),
|
|
|
|
|
|
"Return a complex number constructed of the given @var{real-part} "
|
|
|
|
|
|
"and @var{imaginary-part} parts.")
|
1999-12-12 02:36:16 +00:00
|
|
|
|
#define FUNC_NAME s_scm_make_rectangular
|
1996-07-25 22:56:11 +00:00
|
|
|
|
{
|
implement transcendental sin, cos etc in c; deprecate $sin, $cos, etc
* libguile/deprecated.h:
* libguile/deprecated.c (scm_asinh, scm_acosh, scm_atanh): Deprecate
these stand-ins for the C99 asinh, acosh, and atanh functions. Guile
is not gnulib.
(scm_sys_atan2): Deprecate as well, in favor of scm_atan.
* libguile/numbers.h:
* libguile/numbers.c (scm_sin, scm_cos, scm_tan)
(scm_sinh, scm_cosh, scm_tanh)
(scm_asin, scm_acos, scm_atan)
(scm_sys_asinh, scm_sys_acosh, scm_sys_atanh): New functions,
replacing the combination of dsubrs and boot-9 wrappers with C subrs
that handle complex values. The latter three have _sys_ in their names
due to the name conflict with the deprecated scm_asinh et al.
Remove the $abs, $sin etc "dsubrs".
* module/ice-9/boot-9.scm: Remove transcendental functions, as this all
happens in C now.
* module/ice-9/deprecated.scm: Add aliases for $sin et al.
* test-suite/tests/ramap.test ("array-map!"): Adjust "dsubr" tests to
use sqrt, not $sqrt. They don't actually test dsubrs now. In the
two-source test, I'm pretty sure the dsubr array-map! should have been
failing, as indeed it does now; I've changed the test case to expect
the failure. I'd still like to know why it was succeeding before.
2009-09-03 22:29:10 +02:00
|
|
|
|
SCM_ASSERT_TYPE (scm_is_real (real_part), real_part,
|
|
|
|
|
|
SCM_ARG1, FUNC_NAME, "real");
|
|
|
|
|
|
SCM_ASSERT_TYPE (scm_is_real (imaginary_part), imaginary_part,
|
|
|
|
|
|
SCM_ARG2, FUNC_NAME, "real");
|
|
|
|
|
|
return scm_c_make_rectangular (scm_to_double (real_part),
|
|
|
|
|
|
scm_to_double (imaginary_part));
|
1996-07-25 22:56:11 +00:00
|
|
|
|
}
|
1999-12-12 02:36:16 +00:00
|
|
|
|
#undef FUNC_NAME
|
1996-07-25 22:56:11 +00:00
|
|
|
|
|
2004-08-03 17:12:14 +00:00
|
|
|
|
SCM
|
|
|
|
|
|
scm_c_make_polar (double mag, double ang)
|
|
|
|
|
|
{
|
|
|
|
|
|
double s, c;
|
2009-04-21 22:37:45 +02:00
|
|
|
|
|
|
|
|
|
|
/* The sincos(3) function is undocumented an broken on Tru64. Thus we only
|
|
|
|
|
|
use it on Glibc-based systems that have it (it's a GNU extension). See
|
|
|
|
|
|
http://lists.gnu.org/archive/html/guile-user/2009-04/msg00033.html for
|
|
|
|
|
|
details. */
|
|
|
|
|
|
#if (defined HAVE_SINCOS) && (defined __GLIBC__) && (defined _GNU_SOURCE)
|
2004-08-03 17:12:14 +00:00
|
|
|
|
sincos (ang, &s, &c);
|
|
|
|
|
|
#else
|
|
|
|
|
|
s = sin (ang);
|
|
|
|
|
|
c = cos (ang);
|
|
|
|
|
|
#endif
|
|
|
|
|
|
return scm_c_make_rectangular (mag * c, mag * s);
|
|
|
|
|
|
}
|
1996-07-25 22:56:11 +00:00
|
|
|
|
|
2000-01-05 19:05:23 +00:00
|
|
|
|
SCM_DEFINE (scm_make_polar, "make-polar", 2, 0, 0,
|
2001-02-24 23:46:04 +00:00
|
|
|
|
(SCM x, SCM y),
|
* vectors.c (s_scm_vector_p, list->vector, scm_vector)
(scm_vector_ref, scm_vector_set_x, scm_vector_to_list)
(scm_vector_fill_x), strorder.c (scm_string_equal_p)
(scm_string_ci_equal_p, scm_string_less_p, scm_string_leq_p)
(scm_string_gr_p, scm_string_geq_p, scm_string_ci_less_p)
(scm_string_ci_geq_p), symbols.c (scm_symbol_p)
(scm_symbol_to_string, scm_string_to_symbol): Changed use of @t{}
to @code{} as the texinfo manual recommends, converted the
examples to use a @lisp{}-environment.
* strports.c (scm_eval_string): Cleaned up the docstring.
* struct.c (scm_struct_p, scm_struct_vtable_p): Added texinfo
markup.
* numbers.c (scm_exact_p, scm_odd_p, scm_even_p)
(scm_number_to_string, scm_string_to_number, scm_number_p)
(scm_real_p, scm_integer_p, scm_inexact_p, scm_make_rectangular)
(scm_make_polar, scm_inexact_to_exact): Added texinfo markup.
(scm_ash): Added texinfo markup and removed obsolete @refill.
(scm_gr_p): Corrected comment.
(scm_gr_p, scm_leq_p, scm_geq_p): Added texinfo markup to (future
docstring) comments.
(scm_positive_p, scm_less_p, scm_num_eq_p, scm_real_p)
(scm_number_p, scm_negative_p, scm_max, scm_min, scm_sum)
(scm_difference, scm_product, scm_divide, scm_asinh, scm_acosh)
(scm_atanh, scm_truncate, scm_round, scm_exact_to_inexact)
(floor, ceiling, $sqrt, $abs, $exp, $log, $sin, $cos, $tan, $asin)
($acos, $atan, $sinh, $cosh, $tanh, scm_real_part, scm_imag_part)
(scm_magnitude, scm_angle, scm_abs, scm_quotient, scm_remainder)
(scm_modulo, scm_gcd, scm_lcm): Added (future docstring) comments.
2001-03-02 09:07:22 +00:00
|
|
|
|
"Return the complex number @var{x} * e^(i * @var{y}).")
|
1999-12-12 02:36:16 +00:00
|
|
|
|
#define FUNC_NAME s_scm_make_polar
|
1996-07-25 22:56:11 +00:00
|
|
|
|
{
|
implement transcendental sin, cos etc in c; deprecate $sin, $cos, etc
* libguile/deprecated.h:
* libguile/deprecated.c (scm_asinh, scm_acosh, scm_atanh): Deprecate
these stand-ins for the C99 asinh, acosh, and atanh functions. Guile
is not gnulib.
(scm_sys_atan2): Deprecate as well, in favor of scm_atan.
* libguile/numbers.h:
* libguile/numbers.c (scm_sin, scm_cos, scm_tan)
(scm_sinh, scm_cosh, scm_tanh)
(scm_asin, scm_acos, scm_atan)
(scm_sys_asinh, scm_sys_acosh, scm_sys_atanh): New functions,
replacing the combination of dsubrs and boot-9 wrappers with C subrs
that handle complex values. The latter three have _sys_ in their names
due to the name conflict with the deprecated scm_asinh et al.
Remove the $abs, $sin etc "dsubrs".
* module/ice-9/boot-9.scm: Remove transcendental functions, as this all
happens in C now.
* module/ice-9/deprecated.scm: Add aliases for $sin et al.
* test-suite/tests/ramap.test ("array-map!"): Adjust "dsubr" tests to
use sqrt, not $sqrt. They don't actually test dsubrs now. In the
two-source test, I'm pretty sure the dsubr array-map! should have been
failing, as indeed it does now; I've changed the test case to expect
the failure. I'd still like to know why it was succeeding before.
2009-09-03 22:29:10 +02:00
|
|
|
|
SCM_ASSERT_TYPE (scm_is_real (x), x, SCM_ARG1, FUNC_NAME, "real");
|
|
|
|
|
|
SCM_ASSERT_TYPE (scm_is_real (y), y, SCM_ARG2, FUNC_NAME, "real");
|
|
|
|
|
|
return scm_c_make_polar (scm_to_double (x), scm_to_double (y));
|
1996-07-25 22:56:11 +00:00
|
|
|
|
}
|
1999-12-12 02:36:16 +00:00
|
|
|
|
#undef FUNC_NAME
|
1996-07-25 22:56:11 +00:00
|
|
|
|
|
|
|
|
|
|
|
1999-09-06 21:12:15 +00:00
|
|
|
|
SCM_GPROC (s_real_part, "real-part", 1, 0, 0, scm_real_part, g_real_part);
|
* vectors.c (s_scm_vector_p, list->vector, scm_vector)
(scm_vector_ref, scm_vector_set_x, scm_vector_to_list)
(scm_vector_fill_x), strorder.c (scm_string_equal_p)
(scm_string_ci_equal_p, scm_string_less_p, scm_string_leq_p)
(scm_string_gr_p, scm_string_geq_p, scm_string_ci_less_p)
(scm_string_ci_geq_p), symbols.c (scm_symbol_p)
(scm_symbol_to_string, scm_string_to_symbol): Changed use of @t{}
to @code{} as the texinfo manual recommends, converted the
examples to use a @lisp{}-environment.
* strports.c (scm_eval_string): Cleaned up the docstring.
* struct.c (scm_struct_p, scm_struct_vtable_p): Added texinfo
markup.
* numbers.c (scm_exact_p, scm_odd_p, scm_even_p)
(scm_number_to_string, scm_string_to_number, scm_number_p)
(scm_real_p, scm_integer_p, scm_inexact_p, scm_make_rectangular)
(scm_make_polar, scm_inexact_to_exact): Added texinfo markup.
(scm_ash): Added texinfo markup and removed obsolete @refill.
(scm_gr_p): Corrected comment.
(scm_gr_p, scm_leq_p, scm_geq_p): Added texinfo markup to (future
docstring) comments.
(scm_positive_p, scm_less_p, scm_num_eq_p, scm_real_p)
(scm_number_p, scm_negative_p, scm_max, scm_min, scm_sum)
(scm_difference, scm_product, scm_divide, scm_asinh, scm_acosh)
(scm_atanh, scm_truncate, scm_round, scm_exact_to_inexact)
(floor, ceiling, $sqrt, $abs, $exp, $log, $sin, $cos, $tan, $asin)
($acos, $atan, $sinh, $cosh, $tanh, scm_real_part, scm_imag_part)
(scm_magnitude, scm_angle, scm_abs, scm_quotient, scm_remainder)
(scm_modulo, scm_gcd, scm_lcm): Added (future docstring) comments.
2001-03-02 09:07:22 +00:00
|
|
|
|
/* "Return the real part of the number @var{z}."
|
|
|
|
|
|
*/
|
1996-07-25 22:56:11 +00:00
|
|
|
|
SCM
|
1999-12-12 20:35:02 +00:00
|
|
|
|
scm_real_part (SCM z)
|
1996-07-25 22:56:11 +00:00
|
|
|
|
{
|
2004-07-23 15:43:02 +00:00
|
|
|
|
if (SCM_I_INUMP (z))
|
2000-05-08 19:34:20 +00:00
|
|
|
|
return z;
|
2003-07-13 16:13:57 +00:00
|
|
|
|
else if (SCM_BIGP (z))
|
2000-05-08 19:34:20 +00:00
|
|
|
|
return z;
|
2003-07-13 16:13:57 +00:00
|
|
|
|
else if (SCM_REALP (z))
|
2000-05-08 19:34:20 +00:00
|
|
|
|
return z;
|
2003-07-13 16:13:57 +00:00
|
|
|
|
else if (SCM_COMPLEXP (z))
|
(scm_is_rational): New.
(scm_i_short2big, scm_i_int2big, scm_i_uint2big, scm_i_size2big,
scm_i_ptrdiff2big, scm_i_long_long2big, scm_i_ulong_long2big):
Removed prototypes.
(scm_make_real, scm_num2dbl, scm_float2num, scm_double2num):
Discouraged by moving to discouraged.h and discouraged.c.
Replaced all uses with scm_from_double.
(scm_num2float, scm_num2double): Discouraged by moving prototype
to discouraged.h and rewriting in terms of scm_to_double.
Replaced all uses with scm_to_double.
(scm_to_double): Do not implement in terms of scm_num2dbl, use
explicit code.
(scm_from_double): Do not implement in terms of scm_make_real, use
explicit code.
2004-08-03 15:03:35 +00:00
|
|
|
|
return scm_from_double (SCM_COMPLEX_REAL (z));
|
* print.c (scm_iprin1): Handle fractions.
* objects.h (scm_class_fraction): New.
* objects.c (scm_class_fraction): New.
(scm_class_of): Handle fractions.
* hash.c (scm_hasher): Handle fractions.
* numbers.c: New code for handling fraction all over the place.
(scm_odd_p, scm_even_p): Handle inexact integers.
(scm_rational_p): New function, same as scm_real_p.
(scm_round_number, scm_truncate_number, scm_ceiling, scm_floor):
New exact functions that replace the inexact 'dsubr'
implementations.
(scm_numerator, scm_denominator): New.
* numbers.h (SCM_NUMP): Recognize fractions.
(SCM_FRACTIONP, SCM_SLOPPY_FRACTIONP, SCM_FRACTION_NUMERATOR,
SCM_FRACTION_DENOMINATOR, SCM_FRACTION_SET_NUMERATOR,
SCM_FRACTION_SET_DENOMINATOR, SCM_FRACTION_REDUCED_BIT,
SCM_FRACTION_REDUCED_SET, SCM_FRACTION_REDUCED_CLEAR,
SCM_FRACTION_REDUCED): New.
(scm_floor, scm_ceiling, scm_truncate_number, scm_round_number):
New prototypes.
(scm_make_ratio, scm_rationalize, scm_numerator, scm_denominator,
scm_rational_p): New prototypes.
(scm_i_dbl2num, scm_i_fraction2double, scm_i_fraction_equalp,
scm_i_print_fraction): New prototypes.
* goops.c (create_standard_classes): Create "<fraction>" class.
* gc-mark.c (scm_gc_mark_dependencies): Handle fractions.
* gc-card.c (scm_i_sweep_card): Include scm_tc16_fraction as a
case in the switch, but do nothing for now.
* eval.c (SCM_CEVAL, SCM_APPLY, call_dsubr_1): Convert fractions
to doubles when calling 'dsubr' functions.
* eq.c (scm_eqv_p, scm_equal_p): Handle fractions.
2003-11-18 19:59:53 +00:00
|
|
|
|
else if (SCM_FRACTIONP (z))
|
2003-12-02 21:27:13 +00:00
|
|
|
|
return z;
|
2003-07-13 16:13:57 +00:00
|
|
|
|
else
|
2000-05-08 19:34:20 +00:00
|
|
|
|
SCM_WTA_DISPATCH_1 (g_real_part, z, SCM_ARG1, s_real_part);
|
1996-07-25 22:56:11 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
1999-09-06 21:12:15 +00:00
|
|
|
|
SCM_GPROC (s_imag_part, "imag-part", 1, 0, 0, scm_imag_part, g_imag_part);
|
* vectors.c (s_scm_vector_p, list->vector, scm_vector)
(scm_vector_ref, scm_vector_set_x, scm_vector_to_list)
(scm_vector_fill_x), strorder.c (scm_string_equal_p)
(scm_string_ci_equal_p, scm_string_less_p, scm_string_leq_p)
(scm_string_gr_p, scm_string_geq_p, scm_string_ci_less_p)
(scm_string_ci_geq_p), symbols.c (scm_symbol_p)
(scm_symbol_to_string, scm_string_to_symbol): Changed use of @t{}
to @code{} as the texinfo manual recommends, converted the
examples to use a @lisp{}-environment.
* strports.c (scm_eval_string): Cleaned up the docstring.
* struct.c (scm_struct_p, scm_struct_vtable_p): Added texinfo
markup.
* numbers.c (scm_exact_p, scm_odd_p, scm_even_p)
(scm_number_to_string, scm_string_to_number, scm_number_p)
(scm_real_p, scm_integer_p, scm_inexact_p, scm_make_rectangular)
(scm_make_polar, scm_inexact_to_exact): Added texinfo markup.
(scm_ash): Added texinfo markup and removed obsolete @refill.
(scm_gr_p): Corrected comment.
(scm_gr_p, scm_leq_p, scm_geq_p): Added texinfo markup to (future
docstring) comments.
(scm_positive_p, scm_less_p, scm_num_eq_p, scm_real_p)
(scm_number_p, scm_negative_p, scm_max, scm_min, scm_sum)
(scm_difference, scm_product, scm_divide, scm_asinh, scm_acosh)
(scm_atanh, scm_truncate, scm_round, scm_exact_to_inexact)
(floor, ceiling, $sqrt, $abs, $exp, $log, $sin, $cos, $tan, $asin)
($acos, $atan, $sinh, $cosh, $tanh, scm_real_part, scm_imag_part)
(scm_magnitude, scm_angle, scm_abs, scm_quotient, scm_remainder)
(scm_modulo, scm_gcd, scm_lcm): Added (future docstring) comments.
2001-03-02 09:07:22 +00:00
|
|
|
|
/* "Return the imaginary part of the number @var{z}."
|
|
|
|
|
|
*/
|
1996-07-25 22:56:11 +00:00
|
|
|
|
SCM
|
1999-12-12 20:35:02 +00:00
|
|
|
|
scm_imag_part (SCM z)
|
1996-07-25 22:56:11 +00:00
|
|
|
|
{
|
2004-07-23 15:43:02 +00:00
|
|
|
|
if (SCM_I_INUMP (z))
|
1999-01-10 07:38:39 +00:00
|
|
|
|
return SCM_INUM0;
|
2003-07-13 16:13:57 +00:00
|
|
|
|
else if (SCM_BIGP (z))
|
1999-01-10 07:38:39 +00:00
|
|
|
|
return SCM_INUM0;
|
2003-07-13 16:13:57 +00:00
|
|
|
|
else if (SCM_REALP (z))
|
decruftify scm_sys_protects
* libguile/root.h
* libguile/root.c (scm_sys_protects): It used to be that for some reason
we'd define a special array of "protected" values. This was a little
silly, always, but with the BDW GC it's completely unnecessary. Also
many of these variables were unused, and none of them were good API.
So remove this array, and either eliminate, make static, or make
internal the various values.
* libguile/snarf.h: No need to generate calls to scm_permanent_object.
* guile-readline/readline.c (scm_init_readline): No need to call
scm_permanent_object.
* libguile/array-map.c (ramap, rafe): Remove the dubious nullvect
optimizations.
* libguile/async.c (scm_init_async): No need to init scm_asyncs, it is
no more.
* libguile/eval.c (scm_init_eval): No need to init scm_listofnull, it is
no more.
* libguile/gc.c: Make scm_protects a static var.
(scm_storage_prehistory): Change the sanity check to use the address
of protects.
(scm_init_gc_protect_object): No need to clear the scm_sys_protects,
as it is no more.
* libguile/keywords.c: Make the keyword obarray a static var.
* libguile/numbers.c: Make flo0 a static var.
* libguile/objprop.c: Make object_whash a static var.
* libguile/properties.c: Make properties_whash a static var.
* libguile/srcprop.h:
* libguile/srcprop.c: Make scm_source_whash a global with internal
linkage.
* libguile/strings.h:
* libguile/strings.c: Make scm_nullstr a global with internal linkage.
* libguile/vectors.c (scm_init_vectors): No need to init scm_nullvect,
it's unused.
2009-12-05 12:38:32 +01:00
|
|
|
|
return flo0;
|
2003-07-13 16:13:57 +00:00
|
|
|
|
else if (SCM_COMPLEXP (z))
|
(scm_is_rational): New.
(scm_i_short2big, scm_i_int2big, scm_i_uint2big, scm_i_size2big,
scm_i_ptrdiff2big, scm_i_long_long2big, scm_i_ulong_long2big):
Removed prototypes.
(scm_make_real, scm_num2dbl, scm_float2num, scm_double2num):
Discouraged by moving to discouraged.h and discouraged.c.
Replaced all uses with scm_from_double.
(scm_num2float, scm_num2double): Discouraged by moving prototype
to discouraged.h and rewriting in terms of scm_to_double.
Replaced all uses with scm_to_double.
(scm_to_double): Do not implement in terms of scm_num2dbl, use
explicit code.
(scm_from_double): Do not implement in terms of scm_make_real, use
explicit code.
2004-08-03 15:03:35 +00:00
|
|
|
|
return scm_from_double (SCM_COMPLEX_IMAG (z));
|
* print.c (scm_iprin1): Handle fractions.
* objects.h (scm_class_fraction): New.
* objects.c (scm_class_fraction): New.
(scm_class_of): Handle fractions.
* hash.c (scm_hasher): Handle fractions.
* numbers.c: New code for handling fraction all over the place.
(scm_odd_p, scm_even_p): Handle inexact integers.
(scm_rational_p): New function, same as scm_real_p.
(scm_round_number, scm_truncate_number, scm_ceiling, scm_floor):
New exact functions that replace the inexact 'dsubr'
implementations.
(scm_numerator, scm_denominator): New.
* numbers.h (SCM_NUMP): Recognize fractions.
(SCM_FRACTIONP, SCM_SLOPPY_FRACTIONP, SCM_FRACTION_NUMERATOR,
SCM_FRACTION_DENOMINATOR, SCM_FRACTION_SET_NUMERATOR,
SCM_FRACTION_SET_DENOMINATOR, SCM_FRACTION_REDUCED_BIT,
SCM_FRACTION_REDUCED_SET, SCM_FRACTION_REDUCED_CLEAR,
SCM_FRACTION_REDUCED): New.
(scm_floor, scm_ceiling, scm_truncate_number, scm_round_number):
New prototypes.
(scm_make_ratio, scm_rationalize, scm_numerator, scm_denominator,
scm_rational_p): New prototypes.
(scm_i_dbl2num, scm_i_fraction2double, scm_i_fraction_equalp,
scm_i_print_fraction): New prototypes.
* goops.c (create_standard_classes): Create "<fraction>" class.
* gc-mark.c (scm_gc_mark_dependencies): Handle fractions.
* gc-card.c (scm_i_sweep_card): Include scm_tc16_fraction as a
case in the switch, but do nothing for now.
* eval.c (SCM_CEVAL, SCM_APPLY, call_dsubr_1): Convert fractions
to doubles when calling 'dsubr' functions.
* eq.c (scm_eqv_p, scm_equal_p): Handle fractions.
2003-11-18 19:59:53 +00:00
|
|
|
|
else if (SCM_FRACTIONP (z))
|
|
|
|
|
|
return SCM_INUM0;
|
2003-07-13 16:13:57 +00:00
|
|
|
|
else
|
2000-05-08 19:34:20 +00:00
|
|
|
|
SCM_WTA_DISPATCH_1 (g_imag_part, z, SCM_ARG1, s_imag_part);
|
1996-07-25 22:56:11 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
* print.c (scm_iprin1): Handle fractions.
* objects.h (scm_class_fraction): New.
* objects.c (scm_class_fraction): New.
(scm_class_of): Handle fractions.
* hash.c (scm_hasher): Handle fractions.
* numbers.c: New code for handling fraction all over the place.
(scm_odd_p, scm_even_p): Handle inexact integers.
(scm_rational_p): New function, same as scm_real_p.
(scm_round_number, scm_truncate_number, scm_ceiling, scm_floor):
New exact functions that replace the inexact 'dsubr'
implementations.
(scm_numerator, scm_denominator): New.
* numbers.h (SCM_NUMP): Recognize fractions.
(SCM_FRACTIONP, SCM_SLOPPY_FRACTIONP, SCM_FRACTION_NUMERATOR,
SCM_FRACTION_DENOMINATOR, SCM_FRACTION_SET_NUMERATOR,
SCM_FRACTION_SET_DENOMINATOR, SCM_FRACTION_REDUCED_BIT,
SCM_FRACTION_REDUCED_SET, SCM_FRACTION_REDUCED_CLEAR,
SCM_FRACTION_REDUCED): New.
(scm_floor, scm_ceiling, scm_truncate_number, scm_round_number):
New prototypes.
(scm_make_ratio, scm_rationalize, scm_numerator, scm_denominator,
scm_rational_p): New prototypes.
(scm_i_dbl2num, scm_i_fraction2double, scm_i_fraction_equalp,
scm_i_print_fraction): New prototypes.
* goops.c (create_standard_classes): Create "<fraction>" class.
* gc-mark.c (scm_gc_mark_dependencies): Handle fractions.
* gc-card.c (scm_i_sweep_card): Include scm_tc16_fraction as a
case in the switch, but do nothing for now.
* eval.c (SCM_CEVAL, SCM_APPLY, call_dsubr_1): Convert fractions
to doubles when calling 'dsubr' functions.
* eq.c (scm_eqv_p, scm_equal_p): Handle fractions.
2003-11-18 19:59:53 +00:00
|
|
|
|
SCM_GPROC (s_numerator, "numerator", 1, 0, 0, scm_numerator, g_numerator);
|
|
|
|
|
|
/* "Return the numerator of the number @var{z}."
|
|
|
|
|
|
*/
|
|
|
|
|
|
SCM
|
|
|
|
|
|
scm_numerator (SCM z)
|
|
|
|
|
|
{
|
2004-07-23 15:43:02 +00:00
|
|
|
|
if (SCM_I_INUMP (z))
|
* print.c (scm_iprin1): Handle fractions.
* objects.h (scm_class_fraction): New.
* objects.c (scm_class_fraction): New.
(scm_class_of): Handle fractions.
* hash.c (scm_hasher): Handle fractions.
* numbers.c: New code for handling fraction all over the place.
(scm_odd_p, scm_even_p): Handle inexact integers.
(scm_rational_p): New function, same as scm_real_p.
(scm_round_number, scm_truncate_number, scm_ceiling, scm_floor):
New exact functions that replace the inexact 'dsubr'
implementations.
(scm_numerator, scm_denominator): New.
* numbers.h (SCM_NUMP): Recognize fractions.
(SCM_FRACTIONP, SCM_SLOPPY_FRACTIONP, SCM_FRACTION_NUMERATOR,
SCM_FRACTION_DENOMINATOR, SCM_FRACTION_SET_NUMERATOR,
SCM_FRACTION_SET_DENOMINATOR, SCM_FRACTION_REDUCED_BIT,
SCM_FRACTION_REDUCED_SET, SCM_FRACTION_REDUCED_CLEAR,
SCM_FRACTION_REDUCED): New.
(scm_floor, scm_ceiling, scm_truncate_number, scm_round_number):
New prototypes.
(scm_make_ratio, scm_rationalize, scm_numerator, scm_denominator,
scm_rational_p): New prototypes.
(scm_i_dbl2num, scm_i_fraction2double, scm_i_fraction_equalp,
scm_i_print_fraction): New prototypes.
* goops.c (create_standard_classes): Create "<fraction>" class.
* gc-mark.c (scm_gc_mark_dependencies): Handle fractions.
* gc-card.c (scm_i_sweep_card): Include scm_tc16_fraction as a
case in the switch, but do nothing for now.
* eval.c (SCM_CEVAL, SCM_APPLY, call_dsubr_1): Convert fractions
to doubles when calling 'dsubr' functions.
* eq.c (scm_eqv_p, scm_equal_p): Handle fractions.
2003-11-18 19:59:53 +00:00
|
|
|
|
return z;
|
|
|
|
|
|
else if (SCM_BIGP (z))
|
|
|
|
|
|
return z;
|
|
|
|
|
|
else if (SCM_FRACTIONP (z))
|
2006-12-23 20:35:32 +00:00
|
|
|
|
return SCM_FRACTION_NUMERATOR (z);
|
* print.c (scm_iprin1): Handle fractions.
* objects.h (scm_class_fraction): New.
* objects.c (scm_class_fraction): New.
(scm_class_of): Handle fractions.
* hash.c (scm_hasher): Handle fractions.
* numbers.c: New code for handling fraction all over the place.
(scm_odd_p, scm_even_p): Handle inexact integers.
(scm_rational_p): New function, same as scm_real_p.
(scm_round_number, scm_truncate_number, scm_ceiling, scm_floor):
New exact functions that replace the inexact 'dsubr'
implementations.
(scm_numerator, scm_denominator): New.
* numbers.h (SCM_NUMP): Recognize fractions.
(SCM_FRACTIONP, SCM_SLOPPY_FRACTIONP, SCM_FRACTION_NUMERATOR,
SCM_FRACTION_DENOMINATOR, SCM_FRACTION_SET_NUMERATOR,
SCM_FRACTION_SET_DENOMINATOR, SCM_FRACTION_REDUCED_BIT,
SCM_FRACTION_REDUCED_SET, SCM_FRACTION_REDUCED_CLEAR,
SCM_FRACTION_REDUCED): New.
(scm_floor, scm_ceiling, scm_truncate_number, scm_round_number):
New prototypes.
(scm_make_ratio, scm_rationalize, scm_numerator, scm_denominator,
scm_rational_p): New prototypes.
(scm_i_dbl2num, scm_i_fraction2double, scm_i_fraction_equalp,
scm_i_print_fraction): New prototypes.
* goops.c (create_standard_classes): Create "<fraction>" class.
* gc-mark.c (scm_gc_mark_dependencies): Handle fractions.
* gc-card.c (scm_i_sweep_card): Include scm_tc16_fraction as a
case in the switch, but do nothing for now.
* eval.c (SCM_CEVAL, SCM_APPLY, call_dsubr_1): Convert fractions
to doubles when calling 'dsubr' functions.
* eq.c (scm_eqv_p, scm_equal_p): Handle fractions.
2003-11-18 19:59:53 +00:00
|
|
|
|
else if (SCM_REALP (z))
|
|
|
|
|
|
return scm_exact_to_inexact (scm_numerator (scm_inexact_to_exact (z)));
|
|
|
|
|
|
else
|
|
|
|
|
|
SCM_WTA_DISPATCH_1 (g_numerator, z, SCM_ARG1, s_numerator);
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
SCM_GPROC (s_denominator, "denominator", 1, 0, 0, scm_denominator, g_denominator);
|
|
|
|
|
|
/* "Return the denominator of the number @var{z}."
|
|
|
|
|
|
*/
|
|
|
|
|
|
SCM
|
|
|
|
|
|
scm_denominator (SCM z)
|
|
|
|
|
|
{
|
2004-07-23 15:43:02 +00:00
|
|
|
|
if (SCM_I_INUMP (z))
|
2004-07-08 15:54:05 +00:00
|
|
|
|
return SCM_I_MAKINUM (1);
|
* print.c (scm_iprin1): Handle fractions.
* objects.h (scm_class_fraction): New.
* objects.c (scm_class_fraction): New.
(scm_class_of): Handle fractions.
* hash.c (scm_hasher): Handle fractions.
* numbers.c: New code for handling fraction all over the place.
(scm_odd_p, scm_even_p): Handle inexact integers.
(scm_rational_p): New function, same as scm_real_p.
(scm_round_number, scm_truncate_number, scm_ceiling, scm_floor):
New exact functions that replace the inexact 'dsubr'
implementations.
(scm_numerator, scm_denominator): New.
* numbers.h (SCM_NUMP): Recognize fractions.
(SCM_FRACTIONP, SCM_SLOPPY_FRACTIONP, SCM_FRACTION_NUMERATOR,
SCM_FRACTION_DENOMINATOR, SCM_FRACTION_SET_NUMERATOR,
SCM_FRACTION_SET_DENOMINATOR, SCM_FRACTION_REDUCED_BIT,
SCM_FRACTION_REDUCED_SET, SCM_FRACTION_REDUCED_CLEAR,
SCM_FRACTION_REDUCED): New.
(scm_floor, scm_ceiling, scm_truncate_number, scm_round_number):
New prototypes.
(scm_make_ratio, scm_rationalize, scm_numerator, scm_denominator,
scm_rational_p): New prototypes.
(scm_i_dbl2num, scm_i_fraction2double, scm_i_fraction_equalp,
scm_i_print_fraction): New prototypes.
* goops.c (create_standard_classes): Create "<fraction>" class.
* gc-mark.c (scm_gc_mark_dependencies): Handle fractions.
* gc-card.c (scm_i_sweep_card): Include scm_tc16_fraction as a
case in the switch, but do nothing for now.
* eval.c (SCM_CEVAL, SCM_APPLY, call_dsubr_1): Convert fractions
to doubles when calling 'dsubr' functions.
* eq.c (scm_eqv_p, scm_equal_p): Handle fractions.
2003-11-18 19:59:53 +00:00
|
|
|
|
else if (SCM_BIGP (z))
|
2004-07-08 15:54:05 +00:00
|
|
|
|
return SCM_I_MAKINUM (1);
|
* print.c (scm_iprin1): Handle fractions.
* objects.h (scm_class_fraction): New.
* objects.c (scm_class_fraction): New.
(scm_class_of): Handle fractions.
* hash.c (scm_hasher): Handle fractions.
* numbers.c: New code for handling fraction all over the place.
(scm_odd_p, scm_even_p): Handle inexact integers.
(scm_rational_p): New function, same as scm_real_p.
(scm_round_number, scm_truncate_number, scm_ceiling, scm_floor):
New exact functions that replace the inexact 'dsubr'
implementations.
(scm_numerator, scm_denominator): New.
* numbers.h (SCM_NUMP): Recognize fractions.
(SCM_FRACTIONP, SCM_SLOPPY_FRACTIONP, SCM_FRACTION_NUMERATOR,
SCM_FRACTION_DENOMINATOR, SCM_FRACTION_SET_NUMERATOR,
SCM_FRACTION_SET_DENOMINATOR, SCM_FRACTION_REDUCED_BIT,
SCM_FRACTION_REDUCED_SET, SCM_FRACTION_REDUCED_CLEAR,
SCM_FRACTION_REDUCED): New.
(scm_floor, scm_ceiling, scm_truncate_number, scm_round_number):
New prototypes.
(scm_make_ratio, scm_rationalize, scm_numerator, scm_denominator,
scm_rational_p): New prototypes.
(scm_i_dbl2num, scm_i_fraction2double, scm_i_fraction_equalp,
scm_i_print_fraction): New prototypes.
* goops.c (create_standard_classes): Create "<fraction>" class.
* gc-mark.c (scm_gc_mark_dependencies): Handle fractions.
* gc-card.c (scm_i_sweep_card): Include scm_tc16_fraction as a
case in the switch, but do nothing for now.
* eval.c (SCM_CEVAL, SCM_APPLY, call_dsubr_1): Convert fractions
to doubles when calling 'dsubr' functions.
* eq.c (scm_eqv_p, scm_equal_p): Handle fractions.
2003-11-18 19:59:53 +00:00
|
|
|
|
else if (SCM_FRACTIONP (z))
|
2006-12-23 20:35:32 +00:00
|
|
|
|
return SCM_FRACTION_DENOMINATOR (z);
|
* print.c (scm_iprin1): Handle fractions.
* objects.h (scm_class_fraction): New.
* objects.c (scm_class_fraction): New.
(scm_class_of): Handle fractions.
* hash.c (scm_hasher): Handle fractions.
* numbers.c: New code for handling fraction all over the place.
(scm_odd_p, scm_even_p): Handle inexact integers.
(scm_rational_p): New function, same as scm_real_p.
(scm_round_number, scm_truncate_number, scm_ceiling, scm_floor):
New exact functions that replace the inexact 'dsubr'
implementations.
(scm_numerator, scm_denominator): New.
* numbers.h (SCM_NUMP): Recognize fractions.
(SCM_FRACTIONP, SCM_SLOPPY_FRACTIONP, SCM_FRACTION_NUMERATOR,
SCM_FRACTION_DENOMINATOR, SCM_FRACTION_SET_NUMERATOR,
SCM_FRACTION_SET_DENOMINATOR, SCM_FRACTION_REDUCED_BIT,
SCM_FRACTION_REDUCED_SET, SCM_FRACTION_REDUCED_CLEAR,
SCM_FRACTION_REDUCED): New.
(scm_floor, scm_ceiling, scm_truncate_number, scm_round_number):
New prototypes.
(scm_make_ratio, scm_rationalize, scm_numerator, scm_denominator,
scm_rational_p): New prototypes.
(scm_i_dbl2num, scm_i_fraction2double, scm_i_fraction_equalp,
scm_i_print_fraction): New prototypes.
* goops.c (create_standard_classes): Create "<fraction>" class.
* gc-mark.c (scm_gc_mark_dependencies): Handle fractions.
* gc-card.c (scm_i_sweep_card): Include scm_tc16_fraction as a
case in the switch, but do nothing for now.
* eval.c (SCM_CEVAL, SCM_APPLY, call_dsubr_1): Convert fractions
to doubles when calling 'dsubr' functions.
* eq.c (scm_eqv_p, scm_equal_p): Handle fractions.
2003-11-18 19:59:53 +00:00
|
|
|
|
else if (SCM_REALP (z))
|
|
|
|
|
|
return scm_exact_to_inexact (scm_denominator (scm_inexact_to_exact (z)));
|
|
|
|
|
|
else
|
|
|
|
|
|
SCM_WTA_DISPATCH_1 (g_denominator, z, SCM_ARG1, s_denominator);
|
|
|
|
|
|
}
|
1996-07-25 22:56:11 +00:00
|
|
|
|
|
* procs.c, procs.h (scm_subr_entry): New type: Stores data
associated with subrs.
(SCM_SUBRNUM, SCM_SUBR_ENTRY, SCM_SUBR_GENERIC, SCM_SUBR_PROPS,
SCM_SUBR_DOC): New macros.
(scm_subr_table): New variable.
(scm_mark_subr_table): New function.
* init.c (scm_boot_guile_1): Call scm_init_subr_table.
* gc.c (scm_gc_mark): Don't mark subr names here.
(scm_igc): Call scm_mark_subr_table.
* snarf.h (SCM_GPROC, SCM_GPROC1): New macros.
* procs.c, procs.h (scm_subr_p): New function (used internally).
* gsubr.c, gsubr.h (scm_make_gsubr_with_generic): New function.
* objects.c, objects.h (scm_primitive_generic): New class.
* objects.h (SCM_CMETHOD_CODE, SCM_CMETHOD_ENV): New macros.
* print.c (scm_iprin1): Print primitive-generics.
* __scm.h (SCM_WTA_DISPATCH_1, SCM_GASSERT1,
SCM_WTA_DISPATCH_2, SCM_GASSERT2): New macros.
* eval.c (SCM_CEVAL, SCM_APPLY): Replace scm_wta -->
SCM_WTA_DISPATCH_1 for scm_cxr's (unary floating point
primitives). NOTE: This means that it is now *required* to use
SCM_GPROC1 when creating float scm_cxr's (float scm_cxr's is an
obscured representation that will be removed in the future anyway,
so backward compatibility is no problem here).
* numbers.c: Converted most numeric primitives (all but bit
comparison operations and bit operations) to dispatch on generic
if args don't match.
* eval.c, eval.h (scm_eval_body): New function.
* objects.c (scm_call_generic_0, scm_call_generic_1,
scm_call_generic_2, scm_call_generic_3, scm_apply_generic): New
functions.
* eval.c (SCM_CEVAL): Apply the cmethod directly after having
called scm_memoize_method instead of doing a second lookup.
* objects.h (scm_memoize_method): Now returns the memoized cmethod.
* procs.c (scm_make_subr_opt): Use scm_sysintern0 instead of
scm_sysintern so that the binding connected with the subr name
isn't cleared when we give set = 0.
1999-08-26 04:24:42 +00:00
|
|
|
|
SCM_GPROC (s_magnitude, "magnitude", 1, 0, 0, scm_magnitude, g_magnitude);
|
* vectors.c (s_scm_vector_p, list->vector, scm_vector)
(scm_vector_ref, scm_vector_set_x, scm_vector_to_list)
(scm_vector_fill_x), strorder.c (scm_string_equal_p)
(scm_string_ci_equal_p, scm_string_less_p, scm_string_leq_p)
(scm_string_gr_p, scm_string_geq_p, scm_string_ci_less_p)
(scm_string_ci_geq_p), symbols.c (scm_symbol_p)
(scm_symbol_to_string, scm_string_to_symbol): Changed use of @t{}
to @code{} as the texinfo manual recommends, converted the
examples to use a @lisp{}-environment.
* strports.c (scm_eval_string): Cleaned up the docstring.
* struct.c (scm_struct_p, scm_struct_vtable_p): Added texinfo
markup.
* numbers.c (scm_exact_p, scm_odd_p, scm_even_p)
(scm_number_to_string, scm_string_to_number, scm_number_p)
(scm_real_p, scm_integer_p, scm_inexact_p, scm_make_rectangular)
(scm_make_polar, scm_inexact_to_exact): Added texinfo markup.
(scm_ash): Added texinfo markup and removed obsolete @refill.
(scm_gr_p): Corrected comment.
(scm_gr_p, scm_leq_p, scm_geq_p): Added texinfo markup to (future
docstring) comments.
(scm_positive_p, scm_less_p, scm_num_eq_p, scm_real_p)
(scm_number_p, scm_negative_p, scm_max, scm_min, scm_sum)
(scm_difference, scm_product, scm_divide, scm_asinh, scm_acosh)
(scm_atanh, scm_truncate, scm_round, scm_exact_to_inexact)
(floor, ceiling, $sqrt, $abs, $exp, $log, $sin, $cos, $tan, $asin)
($acos, $atan, $sinh, $cosh, $tanh, scm_real_part, scm_imag_part)
(scm_magnitude, scm_angle, scm_abs, scm_quotient, scm_remainder)
(scm_modulo, scm_gcd, scm_lcm): Added (future docstring) comments.
2001-03-02 09:07:22 +00:00
|
|
|
|
/* "Return the magnitude of the number @var{z}. This is the same as\n"
|
|
|
|
|
|
* "@code{abs} for real arguments, but also allows complex numbers."
|
|
|
|
|
|
*/
|
1996-07-25 22:56:11 +00:00
|
|
|
|
SCM
|
1999-12-12 20:35:02 +00:00
|
|
|
|
scm_magnitude (SCM z)
|
1996-07-25 22:56:11 +00:00
|
|
|
|
{
|
2004-07-23 15:43:02 +00:00
|
|
|
|
if (SCM_I_INUMP (z))
|
2003-07-13 16:13:57 +00:00
|
|
|
|
{
|
2004-07-23 15:43:02 +00:00
|
|
|
|
long int zz = SCM_I_INUM (z);
|
2003-07-13 16:13:57 +00:00
|
|
|
|
if (zz >= 0)
|
|
|
|
|
|
return z;
|
|
|
|
|
|
else if (SCM_POSFIXABLE (-zz))
|
2004-07-08 15:54:05 +00:00
|
|
|
|
return SCM_I_MAKINUM (-zz);
|
2003-07-13 16:13:57 +00:00
|
|
|
|
else
|
|
|
|
|
|
return scm_i_long2big (-zz);
|
2000-05-10 13:42:23 +00:00
|
|
|
|
}
|
2003-07-13 16:13:57 +00:00
|
|
|
|
else if (SCM_BIGP (z))
|
|
|
|
|
|
{
|
|
|
|
|
|
int sgn = mpz_sgn (SCM_I_BIG_MPZ (z));
|
|
|
|
|
|
scm_remember_upto_here_1 (z);
|
|
|
|
|
|
if (sgn < 0)
|
|
|
|
|
|
return scm_i_clonebig (z, 0);
|
|
|
|
|
|
else
|
|
|
|
|
|
return z;
|
2000-05-10 13:42:23 +00:00
|
|
|
|
}
|
2003-07-13 16:13:57 +00:00
|
|
|
|
else if (SCM_REALP (z))
|
(scm_is_rational): New.
(scm_i_short2big, scm_i_int2big, scm_i_uint2big, scm_i_size2big,
scm_i_ptrdiff2big, scm_i_long_long2big, scm_i_ulong_long2big):
Removed prototypes.
(scm_make_real, scm_num2dbl, scm_float2num, scm_double2num):
Discouraged by moving to discouraged.h and discouraged.c.
Replaced all uses with scm_from_double.
(scm_num2float, scm_num2double): Discouraged by moving prototype
to discouraged.h and rewriting in terms of scm_to_double.
Replaced all uses with scm_to_double.
(scm_to_double): Do not implement in terms of scm_num2dbl, use
explicit code.
(scm_from_double): Do not implement in terms of scm_make_real, use
explicit code.
2004-08-03 15:03:35 +00:00
|
|
|
|
return scm_from_double (fabs (SCM_REAL_VALUE (z)));
|
2003-07-13 16:13:57 +00:00
|
|
|
|
else if (SCM_COMPLEXP (z))
|
(scm_is_rational): New.
(scm_i_short2big, scm_i_int2big, scm_i_uint2big, scm_i_size2big,
scm_i_ptrdiff2big, scm_i_long_long2big, scm_i_ulong_long2big):
Removed prototypes.
(scm_make_real, scm_num2dbl, scm_float2num, scm_double2num):
Discouraged by moving to discouraged.h and discouraged.c.
Replaced all uses with scm_from_double.
(scm_num2float, scm_num2double): Discouraged by moving prototype
to discouraged.h and rewriting in terms of scm_to_double.
Replaced all uses with scm_to_double.
(scm_to_double): Do not implement in terms of scm_num2dbl, use
explicit code.
(scm_from_double): Do not implement in terms of scm_make_real, use
explicit code.
2004-08-03 15:03:35 +00:00
|
|
|
|
return scm_from_double (hypot (SCM_COMPLEX_REAL (z), SCM_COMPLEX_IMAG (z)));
|
* print.c (scm_iprin1): Handle fractions.
* objects.h (scm_class_fraction): New.
* objects.c (scm_class_fraction): New.
(scm_class_of): Handle fractions.
* hash.c (scm_hasher): Handle fractions.
* numbers.c: New code for handling fraction all over the place.
(scm_odd_p, scm_even_p): Handle inexact integers.
(scm_rational_p): New function, same as scm_real_p.
(scm_round_number, scm_truncate_number, scm_ceiling, scm_floor):
New exact functions that replace the inexact 'dsubr'
implementations.
(scm_numerator, scm_denominator): New.
* numbers.h (SCM_NUMP): Recognize fractions.
(SCM_FRACTIONP, SCM_SLOPPY_FRACTIONP, SCM_FRACTION_NUMERATOR,
SCM_FRACTION_DENOMINATOR, SCM_FRACTION_SET_NUMERATOR,
SCM_FRACTION_SET_DENOMINATOR, SCM_FRACTION_REDUCED_BIT,
SCM_FRACTION_REDUCED_SET, SCM_FRACTION_REDUCED_CLEAR,
SCM_FRACTION_REDUCED): New.
(scm_floor, scm_ceiling, scm_truncate_number, scm_round_number):
New prototypes.
(scm_make_ratio, scm_rationalize, scm_numerator, scm_denominator,
scm_rational_p): New prototypes.
(scm_i_dbl2num, scm_i_fraction2double, scm_i_fraction_equalp,
scm_i_print_fraction): New prototypes.
* goops.c (create_standard_classes): Create "<fraction>" class.
* gc-mark.c (scm_gc_mark_dependencies): Handle fractions.
* gc-card.c (scm_i_sweep_card): Include scm_tc16_fraction as a
case in the switch, but do nothing for now.
* eval.c (SCM_CEVAL, SCM_APPLY, call_dsubr_1): Convert fractions
to doubles when calling 'dsubr' functions.
* eq.c (scm_eqv_p, scm_equal_p): Handle fractions.
2003-11-18 19:59:53 +00:00
|
|
|
|
else if (SCM_FRACTIONP (z))
|
|
|
|
|
|
{
|
(scm_is_integer, scm_is_signed_integer, scm_is_unsigned_integer,
scm_to_signed_integer, scm_to_unsigned_integer, scm_to_schar,
scm_to_uchar, scm_to_char, scm_to_short, scm_to_ushort, scm_to_long,
scm_to_ulong, scm_to_size_t, scm_to_ssize_t, scm_from_schar,
scm_from_uchar, scm_from_char, scm_from_short, scm_from_ushort,
scm_from_int, scm_from_uint, scm_from_long, scm_from_ulong,
scm_from_size_t, scm_from_ssize_t, scm_is_real, scm_to_double,
scm_from_double): New.
* deprecated.h, boolean.h (SCM_FALSEP, SCM_NFALSEP, SCM_BOOL,
SCM_NEGATE_BOOL, SCM_BOOLP): Deprecated by moving into "deprecated.h".
Replaced all uses with scm_is_false, scm_is_true, scm_from_bool, and
scm_is_bool, respectively.
2004-07-06 10:23:30 +00:00
|
|
|
|
if (scm_is_false (scm_negative_p (SCM_FRACTION_NUMERATOR (z))))
|
* print.c (scm_iprin1): Handle fractions.
* objects.h (scm_class_fraction): New.
* objects.c (scm_class_fraction): New.
(scm_class_of): Handle fractions.
* hash.c (scm_hasher): Handle fractions.
* numbers.c: New code for handling fraction all over the place.
(scm_odd_p, scm_even_p): Handle inexact integers.
(scm_rational_p): New function, same as scm_real_p.
(scm_round_number, scm_truncate_number, scm_ceiling, scm_floor):
New exact functions that replace the inexact 'dsubr'
implementations.
(scm_numerator, scm_denominator): New.
* numbers.h (SCM_NUMP): Recognize fractions.
(SCM_FRACTIONP, SCM_SLOPPY_FRACTIONP, SCM_FRACTION_NUMERATOR,
SCM_FRACTION_DENOMINATOR, SCM_FRACTION_SET_NUMERATOR,
SCM_FRACTION_SET_DENOMINATOR, SCM_FRACTION_REDUCED_BIT,
SCM_FRACTION_REDUCED_SET, SCM_FRACTION_REDUCED_CLEAR,
SCM_FRACTION_REDUCED): New.
(scm_floor, scm_ceiling, scm_truncate_number, scm_round_number):
New prototypes.
(scm_make_ratio, scm_rationalize, scm_numerator, scm_denominator,
scm_rational_p): New prototypes.
(scm_i_dbl2num, scm_i_fraction2double, scm_i_fraction_equalp,
scm_i_print_fraction): New prototypes.
* goops.c (create_standard_classes): Create "<fraction>" class.
* gc-mark.c (scm_gc_mark_dependencies): Handle fractions.
* gc-card.c (scm_i_sweep_card): Include scm_tc16_fraction as a
case in the switch, but do nothing for now.
* eval.c (SCM_CEVAL, SCM_APPLY, call_dsubr_1): Convert fractions
to doubles when calling 'dsubr' functions.
* eq.c (scm_eqv_p, scm_equal_p): Handle fractions.
2003-11-18 19:59:53 +00:00
|
|
|
|
return z;
|
2004-08-03 15:55:42 +00:00
|
|
|
|
return scm_i_make_ratio (scm_difference (SCM_FRACTION_NUMERATOR (z), SCM_UNDEFINED),
|
* print.c (scm_iprin1): Handle fractions.
* objects.h (scm_class_fraction): New.
* objects.c (scm_class_fraction): New.
(scm_class_of): Handle fractions.
* hash.c (scm_hasher): Handle fractions.
* numbers.c: New code for handling fraction all over the place.
(scm_odd_p, scm_even_p): Handle inexact integers.
(scm_rational_p): New function, same as scm_real_p.
(scm_round_number, scm_truncate_number, scm_ceiling, scm_floor):
New exact functions that replace the inexact 'dsubr'
implementations.
(scm_numerator, scm_denominator): New.
* numbers.h (SCM_NUMP): Recognize fractions.
(SCM_FRACTIONP, SCM_SLOPPY_FRACTIONP, SCM_FRACTION_NUMERATOR,
SCM_FRACTION_DENOMINATOR, SCM_FRACTION_SET_NUMERATOR,
SCM_FRACTION_SET_DENOMINATOR, SCM_FRACTION_REDUCED_BIT,
SCM_FRACTION_REDUCED_SET, SCM_FRACTION_REDUCED_CLEAR,
SCM_FRACTION_REDUCED): New.
(scm_floor, scm_ceiling, scm_truncate_number, scm_round_number):
New prototypes.
(scm_make_ratio, scm_rationalize, scm_numerator, scm_denominator,
scm_rational_p): New prototypes.
(scm_i_dbl2num, scm_i_fraction2double, scm_i_fraction_equalp,
scm_i_print_fraction): New prototypes.
* goops.c (create_standard_classes): Create "<fraction>" class.
* gc-mark.c (scm_gc_mark_dependencies): Handle fractions.
* gc-card.c (scm_i_sweep_card): Include scm_tc16_fraction as a
case in the switch, but do nothing for now.
* eval.c (SCM_CEVAL, SCM_APPLY, call_dsubr_1): Convert fractions
to doubles when calling 'dsubr' functions.
* eq.c (scm_eqv_p, scm_equal_p): Handle fractions.
2003-11-18 19:59:53 +00:00
|
|
|
|
SCM_FRACTION_DENOMINATOR (z));
|
|
|
|
|
|
}
|
2003-07-13 16:13:57 +00:00
|
|
|
|
else
|
2000-05-08 19:34:20 +00:00
|
|
|
|
SCM_WTA_DISPATCH_1 (g_magnitude, z, SCM_ARG1, s_magnitude);
|
1996-07-25 22:56:11 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
* procs.c, procs.h (scm_subr_entry): New type: Stores data
associated with subrs.
(SCM_SUBRNUM, SCM_SUBR_ENTRY, SCM_SUBR_GENERIC, SCM_SUBR_PROPS,
SCM_SUBR_DOC): New macros.
(scm_subr_table): New variable.
(scm_mark_subr_table): New function.
* init.c (scm_boot_guile_1): Call scm_init_subr_table.
* gc.c (scm_gc_mark): Don't mark subr names here.
(scm_igc): Call scm_mark_subr_table.
* snarf.h (SCM_GPROC, SCM_GPROC1): New macros.
* procs.c, procs.h (scm_subr_p): New function (used internally).
* gsubr.c, gsubr.h (scm_make_gsubr_with_generic): New function.
* objects.c, objects.h (scm_primitive_generic): New class.
* objects.h (SCM_CMETHOD_CODE, SCM_CMETHOD_ENV): New macros.
* print.c (scm_iprin1): Print primitive-generics.
* __scm.h (SCM_WTA_DISPATCH_1, SCM_GASSERT1,
SCM_WTA_DISPATCH_2, SCM_GASSERT2): New macros.
* eval.c (SCM_CEVAL, SCM_APPLY): Replace scm_wta -->
SCM_WTA_DISPATCH_1 for scm_cxr's (unary floating point
primitives). NOTE: This means that it is now *required* to use
SCM_GPROC1 when creating float scm_cxr's (float scm_cxr's is an
obscured representation that will be removed in the future anyway,
so backward compatibility is no problem here).
* numbers.c: Converted most numeric primitives (all but bit
comparison operations and bit operations) to dispatch on generic
if args don't match.
* eval.c, eval.h (scm_eval_body): New function.
* objects.c (scm_call_generic_0, scm_call_generic_1,
scm_call_generic_2, scm_call_generic_3, scm_apply_generic): New
functions.
* eval.c (SCM_CEVAL): Apply the cmethod directly after having
called scm_memoize_method instead of doing a second lookup.
* objects.h (scm_memoize_method): Now returns the memoized cmethod.
* procs.c (scm_make_subr_opt): Use scm_sysintern0 instead of
scm_sysintern so that the binding connected with the subr name
isn't cleared when we give set = 0.
1999-08-26 04:24:42 +00:00
|
|
|
|
SCM_GPROC (s_angle, "angle", 1, 0, 0, scm_angle, g_angle);
|
* vectors.c (s_scm_vector_p, list->vector, scm_vector)
(scm_vector_ref, scm_vector_set_x, scm_vector_to_list)
(scm_vector_fill_x), strorder.c (scm_string_equal_p)
(scm_string_ci_equal_p, scm_string_less_p, scm_string_leq_p)
(scm_string_gr_p, scm_string_geq_p, scm_string_ci_less_p)
(scm_string_ci_geq_p), symbols.c (scm_symbol_p)
(scm_symbol_to_string, scm_string_to_symbol): Changed use of @t{}
to @code{} as the texinfo manual recommends, converted the
examples to use a @lisp{}-environment.
* strports.c (scm_eval_string): Cleaned up the docstring.
* struct.c (scm_struct_p, scm_struct_vtable_p): Added texinfo
markup.
* numbers.c (scm_exact_p, scm_odd_p, scm_even_p)
(scm_number_to_string, scm_string_to_number, scm_number_p)
(scm_real_p, scm_integer_p, scm_inexact_p, scm_make_rectangular)
(scm_make_polar, scm_inexact_to_exact): Added texinfo markup.
(scm_ash): Added texinfo markup and removed obsolete @refill.
(scm_gr_p): Corrected comment.
(scm_gr_p, scm_leq_p, scm_geq_p): Added texinfo markup to (future
docstring) comments.
(scm_positive_p, scm_less_p, scm_num_eq_p, scm_real_p)
(scm_number_p, scm_negative_p, scm_max, scm_min, scm_sum)
(scm_difference, scm_product, scm_divide, scm_asinh, scm_acosh)
(scm_atanh, scm_truncate, scm_round, scm_exact_to_inexact)
(floor, ceiling, $sqrt, $abs, $exp, $log, $sin, $cos, $tan, $asin)
($acos, $atan, $sinh, $cosh, $tanh, scm_real_part, scm_imag_part)
(scm_magnitude, scm_angle, scm_abs, scm_quotient, scm_remainder)
(scm_modulo, scm_gcd, scm_lcm): Added (future docstring) comments.
2001-03-02 09:07:22 +00:00
|
|
|
|
/* "Return the angle of the complex number @var{z}."
|
|
|
|
|
|
*/
|
1996-07-25 22:56:11 +00:00
|
|
|
|
SCM
|
1999-12-12 20:35:02 +00:00
|
|
|
|
scm_angle (SCM z)
|
1996-07-25 22:56:11 +00:00
|
|
|
|
{
|
2003-07-24 01:03:40 +00:00
|
|
|
|
/* atan(0,-1) is pi and it'd be possible to have that as a constant like
|
decruftify scm_sys_protects
* libguile/root.h
* libguile/root.c (scm_sys_protects): It used to be that for some reason
we'd define a special array of "protected" values. This was a little
silly, always, but with the BDW GC it's completely unnecessary. Also
many of these variables were unused, and none of them were good API.
So remove this array, and either eliminate, make static, or make
internal the various values.
* libguile/snarf.h: No need to generate calls to scm_permanent_object.
* guile-readline/readline.c (scm_init_readline): No need to call
scm_permanent_object.
* libguile/array-map.c (ramap, rafe): Remove the dubious nullvect
optimizations.
* libguile/async.c (scm_init_async): No need to init scm_asyncs, it is
no more.
* libguile/eval.c (scm_init_eval): No need to init scm_listofnull, it is
no more.
* libguile/gc.c: Make scm_protects a static var.
(scm_storage_prehistory): Change the sanity check to use the address
of protects.
(scm_init_gc_protect_object): No need to clear the scm_sys_protects,
as it is no more.
* libguile/keywords.c: Make the keyword obarray a static var.
* libguile/numbers.c: Make flo0 a static var.
* libguile/objprop.c: Make object_whash a static var.
* libguile/properties.c: Make properties_whash a static var.
* libguile/srcprop.h:
* libguile/srcprop.c: Make scm_source_whash a global with internal
linkage.
* libguile/strings.h:
* libguile/strings.c: Make scm_nullstr a global with internal linkage.
* libguile/vectors.c (scm_init_vectors): No need to init scm_nullvect,
it's unused.
2009-12-05 12:38:32 +01:00
|
|
|
|
flo0 to save allocating a new flonum with scm_from_double each time.
|
2003-07-24 01:03:40 +00:00
|
|
|
|
But if atan2 follows the floating point rounding mode, then the value
|
|
|
|
|
|
is not a constant. Maybe it'd be close enough though. */
|
2004-07-23 15:43:02 +00:00
|
|
|
|
if (SCM_I_INUMP (z))
|
2003-07-13 16:13:57 +00:00
|
|
|
|
{
|
2004-07-23 15:43:02 +00:00
|
|
|
|
if (SCM_I_INUM (z) >= 0)
|
decruftify scm_sys_protects
* libguile/root.h
* libguile/root.c (scm_sys_protects): It used to be that for some reason
we'd define a special array of "protected" values. This was a little
silly, always, but with the BDW GC it's completely unnecessary. Also
many of these variables were unused, and none of them were good API.
So remove this array, and either eliminate, make static, or make
internal the various values.
* libguile/snarf.h: No need to generate calls to scm_permanent_object.
* guile-readline/readline.c (scm_init_readline): No need to call
scm_permanent_object.
* libguile/array-map.c (ramap, rafe): Remove the dubious nullvect
optimizations.
* libguile/async.c (scm_init_async): No need to init scm_asyncs, it is
no more.
* libguile/eval.c (scm_init_eval): No need to init scm_listofnull, it is
no more.
* libguile/gc.c: Make scm_protects a static var.
(scm_storage_prehistory): Change the sanity check to use the address
of protects.
(scm_init_gc_protect_object): No need to clear the scm_sys_protects,
as it is no more.
* libguile/keywords.c: Make the keyword obarray a static var.
* libguile/numbers.c: Make flo0 a static var.
* libguile/objprop.c: Make object_whash a static var.
* libguile/properties.c: Make properties_whash a static var.
* libguile/srcprop.h:
* libguile/srcprop.c: Make scm_source_whash a global with internal
linkage.
* libguile/strings.h:
* libguile/strings.c: Make scm_nullstr a global with internal linkage.
* libguile/vectors.c (scm_init_vectors): No need to init scm_nullvect,
it's unused.
2009-12-05 12:38:32 +01:00
|
|
|
|
return flo0;
|
2003-07-13 16:13:57 +00:00
|
|
|
|
else
|
(scm_is_rational): New.
(scm_i_short2big, scm_i_int2big, scm_i_uint2big, scm_i_size2big,
scm_i_ptrdiff2big, scm_i_long_long2big, scm_i_ulong_long2big):
Removed prototypes.
(scm_make_real, scm_num2dbl, scm_float2num, scm_double2num):
Discouraged by moving to discouraged.h and discouraged.c.
Replaced all uses with scm_from_double.
(scm_num2float, scm_num2double): Discouraged by moving prototype
to discouraged.h and rewriting in terms of scm_to_double.
Replaced all uses with scm_to_double.
(scm_to_double): Do not implement in terms of scm_num2dbl, use
explicit code.
(scm_from_double): Do not implement in terms of scm_make_real, use
explicit code.
2004-08-03 15:03:35 +00:00
|
|
|
|
return scm_from_double (atan2 (0.0, -1.0));
|
1999-01-10 07:38:39 +00:00
|
|
|
|
}
|
2003-07-13 16:13:57 +00:00
|
|
|
|
else if (SCM_BIGP (z))
|
|
|
|
|
|
{
|
|
|
|
|
|
int sgn = mpz_sgn (SCM_I_BIG_MPZ (z));
|
|
|
|
|
|
scm_remember_upto_here_1 (z);
|
|
|
|
|
|
if (sgn < 0)
|
(scm_is_rational): New.
(scm_i_short2big, scm_i_int2big, scm_i_uint2big, scm_i_size2big,
scm_i_ptrdiff2big, scm_i_long_long2big, scm_i_ulong_long2big):
Removed prototypes.
(scm_make_real, scm_num2dbl, scm_float2num, scm_double2num):
Discouraged by moving to discouraged.h and discouraged.c.
Replaced all uses with scm_from_double.
(scm_num2float, scm_num2double): Discouraged by moving prototype
to discouraged.h and rewriting in terms of scm_to_double.
Replaced all uses with scm_to_double.
(scm_to_double): Do not implement in terms of scm_num2dbl, use
explicit code.
(scm_from_double): Do not implement in terms of scm_make_real, use
explicit code.
2004-08-03 15:03:35 +00:00
|
|
|
|
return scm_from_double (atan2 (0.0, -1.0));
|
2003-07-13 16:13:57 +00:00
|
|
|
|
else
|
decruftify scm_sys_protects
* libguile/root.h
* libguile/root.c (scm_sys_protects): It used to be that for some reason
we'd define a special array of "protected" values. This was a little
silly, always, but with the BDW GC it's completely unnecessary. Also
many of these variables were unused, and none of them were good API.
So remove this array, and either eliminate, make static, or make
internal the various values.
* libguile/snarf.h: No need to generate calls to scm_permanent_object.
* guile-readline/readline.c (scm_init_readline): No need to call
scm_permanent_object.
* libguile/array-map.c (ramap, rafe): Remove the dubious nullvect
optimizations.
* libguile/async.c (scm_init_async): No need to init scm_asyncs, it is
no more.
* libguile/eval.c (scm_init_eval): No need to init scm_listofnull, it is
no more.
* libguile/gc.c: Make scm_protects a static var.
(scm_storage_prehistory): Change the sanity check to use the address
of protects.
(scm_init_gc_protect_object): No need to clear the scm_sys_protects,
as it is no more.
* libguile/keywords.c: Make the keyword obarray a static var.
* libguile/numbers.c: Make flo0 a static var.
* libguile/objprop.c: Make object_whash a static var.
* libguile/properties.c: Make properties_whash a static var.
* libguile/srcprop.h:
* libguile/srcprop.c: Make scm_source_whash a global with internal
linkage.
* libguile/strings.h:
* libguile/strings.c: Make scm_nullstr a global with internal linkage.
* libguile/vectors.c (scm_init_vectors): No need to init scm_nullvect,
it's unused.
2009-12-05 12:38:32 +01:00
|
|
|
|
return flo0;
|
1996-07-25 22:56:11 +00:00
|
|
|
|
}
|
2003-07-13 16:13:57 +00:00
|
|
|
|
else if (SCM_REALP (z))
|
2003-07-24 01:03:40 +00:00
|
|
|
|
{
|
|
|
|
|
|
if (SCM_REAL_VALUE (z) >= 0)
|
decruftify scm_sys_protects
* libguile/root.h
* libguile/root.c (scm_sys_protects): It used to be that for some reason
we'd define a special array of "protected" values. This was a little
silly, always, but with the BDW GC it's completely unnecessary. Also
many of these variables were unused, and none of them were good API.
So remove this array, and either eliminate, make static, or make
internal the various values.
* libguile/snarf.h: No need to generate calls to scm_permanent_object.
* guile-readline/readline.c (scm_init_readline): No need to call
scm_permanent_object.
* libguile/array-map.c (ramap, rafe): Remove the dubious nullvect
optimizations.
* libguile/async.c (scm_init_async): No need to init scm_asyncs, it is
no more.
* libguile/eval.c (scm_init_eval): No need to init scm_listofnull, it is
no more.
* libguile/gc.c: Make scm_protects a static var.
(scm_storage_prehistory): Change the sanity check to use the address
of protects.
(scm_init_gc_protect_object): No need to clear the scm_sys_protects,
as it is no more.
* libguile/keywords.c: Make the keyword obarray a static var.
* libguile/numbers.c: Make flo0 a static var.
* libguile/objprop.c: Make object_whash a static var.
* libguile/properties.c: Make properties_whash a static var.
* libguile/srcprop.h:
* libguile/srcprop.c: Make scm_source_whash a global with internal
linkage.
* libguile/strings.h:
* libguile/strings.c: Make scm_nullstr a global with internal linkage.
* libguile/vectors.c (scm_init_vectors): No need to init scm_nullvect,
it's unused.
2009-12-05 12:38:32 +01:00
|
|
|
|
return flo0;
|
2003-07-24 01:03:40 +00:00
|
|
|
|
else
|
(scm_is_rational): New.
(scm_i_short2big, scm_i_int2big, scm_i_uint2big, scm_i_size2big,
scm_i_ptrdiff2big, scm_i_long_long2big, scm_i_ulong_long2big):
Removed prototypes.
(scm_make_real, scm_num2dbl, scm_float2num, scm_double2num):
Discouraged by moving to discouraged.h and discouraged.c.
Replaced all uses with scm_from_double.
(scm_num2float, scm_num2double): Discouraged by moving prototype
to discouraged.h and rewriting in terms of scm_to_double.
Replaced all uses with scm_to_double.
(scm_to_double): Do not implement in terms of scm_num2dbl, use
explicit code.
(scm_from_double): Do not implement in terms of scm_make_real, use
explicit code.
2004-08-03 15:03:35 +00:00
|
|
|
|
return scm_from_double (atan2 (0.0, -1.0));
|
2003-07-24 01:03:40 +00:00
|
|
|
|
}
|
2003-07-13 16:13:57 +00:00
|
|
|
|
else if (SCM_COMPLEXP (z))
|
(scm_is_rational): New.
(scm_i_short2big, scm_i_int2big, scm_i_uint2big, scm_i_size2big,
scm_i_ptrdiff2big, scm_i_long_long2big, scm_i_ulong_long2big):
Removed prototypes.
(scm_make_real, scm_num2dbl, scm_float2num, scm_double2num):
Discouraged by moving to discouraged.h and discouraged.c.
Replaced all uses with scm_from_double.
(scm_num2float, scm_num2double): Discouraged by moving prototype
to discouraged.h and rewriting in terms of scm_to_double.
Replaced all uses with scm_to_double.
(scm_to_double): Do not implement in terms of scm_num2dbl, use
explicit code.
(scm_from_double): Do not implement in terms of scm_make_real, use
explicit code.
2004-08-03 15:03:35 +00:00
|
|
|
|
return scm_from_double (atan2 (SCM_COMPLEX_IMAG (z), SCM_COMPLEX_REAL (z)));
|
* print.c (scm_iprin1): Handle fractions.
* objects.h (scm_class_fraction): New.
* objects.c (scm_class_fraction): New.
(scm_class_of): Handle fractions.
* hash.c (scm_hasher): Handle fractions.
* numbers.c: New code for handling fraction all over the place.
(scm_odd_p, scm_even_p): Handle inexact integers.
(scm_rational_p): New function, same as scm_real_p.
(scm_round_number, scm_truncate_number, scm_ceiling, scm_floor):
New exact functions that replace the inexact 'dsubr'
implementations.
(scm_numerator, scm_denominator): New.
* numbers.h (SCM_NUMP): Recognize fractions.
(SCM_FRACTIONP, SCM_SLOPPY_FRACTIONP, SCM_FRACTION_NUMERATOR,
SCM_FRACTION_DENOMINATOR, SCM_FRACTION_SET_NUMERATOR,
SCM_FRACTION_SET_DENOMINATOR, SCM_FRACTION_REDUCED_BIT,
SCM_FRACTION_REDUCED_SET, SCM_FRACTION_REDUCED_CLEAR,
SCM_FRACTION_REDUCED): New.
(scm_floor, scm_ceiling, scm_truncate_number, scm_round_number):
New prototypes.
(scm_make_ratio, scm_rationalize, scm_numerator, scm_denominator,
scm_rational_p): New prototypes.
(scm_i_dbl2num, scm_i_fraction2double, scm_i_fraction_equalp,
scm_i_print_fraction): New prototypes.
* goops.c (create_standard_classes): Create "<fraction>" class.
* gc-mark.c (scm_gc_mark_dependencies): Handle fractions.
* gc-card.c (scm_i_sweep_card): Include scm_tc16_fraction as a
case in the switch, but do nothing for now.
* eval.c (SCM_CEVAL, SCM_APPLY, call_dsubr_1): Convert fractions
to doubles when calling 'dsubr' functions.
* eq.c (scm_eqv_p, scm_equal_p): Handle fractions.
2003-11-18 19:59:53 +00:00
|
|
|
|
else if (SCM_FRACTIONP (z))
|
|
|
|
|
|
{
|
(scm_is_integer, scm_is_signed_integer, scm_is_unsigned_integer,
scm_to_signed_integer, scm_to_unsigned_integer, scm_to_schar,
scm_to_uchar, scm_to_char, scm_to_short, scm_to_ushort, scm_to_long,
scm_to_ulong, scm_to_size_t, scm_to_ssize_t, scm_from_schar,
scm_from_uchar, scm_from_char, scm_from_short, scm_from_ushort,
scm_from_int, scm_from_uint, scm_from_long, scm_from_ulong,
scm_from_size_t, scm_from_ssize_t, scm_is_real, scm_to_double,
scm_from_double): New.
* deprecated.h, boolean.h (SCM_FALSEP, SCM_NFALSEP, SCM_BOOL,
SCM_NEGATE_BOOL, SCM_BOOLP): Deprecated by moving into "deprecated.h".
Replaced all uses with scm_is_false, scm_is_true, scm_from_bool, and
scm_is_bool, respectively.
2004-07-06 10:23:30 +00:00
|
|
|
|
if (scm_is_false (scm_negative_p (SCM_FRACTION_NUMERATOR (z))))
|
decruftify scm_sys_protects
* libguile/root.h
* libguile/root.c (scm_sys_protects): It used to be that for some reason
we'd define a special array of "protected" values. This was a little
silly, always, but with the BDW GC it's completely unnecessary. Also
many of these variables were unused, and none of them were good API.
So remove this array, and either eliminate, make static, or make
internal the various values.
* libguile/snarf.h: No need to generate calls to scm_permanent_object.
* guile-readline/readline.c (scm_init_readline): No need to call
scm_permanent_object.
* libguile/array-map.c (ramap, rafe): Remove the dubious nullvect
optimizations.
* libguile/async.c (scm_init_async): No need to init scm_asyncs, it is
no more.
* libguile/eval.c (scm_init_eval): No need to init scm_listofnull, it is
no more.
* libguile/gc.c: Make scm_protects a static var.
(scm_storage_prehistory): Change the sanity check to use the address
of protects.
(scm_init_gc_protect_object): No need to clear the scm_sys_protects,
as it is no more.
* libguile/keywords.c: Make the keyword obarray a static var.
* libguile/numbers.c: Make flo0 a static var.
* libguile/objprop.c: Make object_whash a static var.
* libguile/properties.c: Make properties_whash a static var.
* libguile/srcprop.h:
* libguile/srcprop.c: Make scm_source_whash a global with internal
linkage.
* libguile/strings.h:
* libguile/strings.c: Make scm_nullstr a global with internal linkage.
* libguile/vectors.c (scm_init_vectors): No need to init scm_nullvect,
it's unused.
2009-12-05 12:38:32 +01:00
|
|
|
|
return flo0;
|
(scm_is_rational): New.
(scm_i_short2big, scm_i_int2big, scm_i_uint2big, scm_i_size2big,
scm_i_ptrdiff2big, scm_i_long_long2big, scm_i_ulong_long2big):
Removed prototypes.
(scm_make_real, scm_num2dbl, scm_float2num, scm_double2num):
Discouraged by moving to discouraged.h and discouraged.c.
Replaced all uses with scm_from_double.
(scm_num2float, scm_num2double): Discouraged by moving prototype
to discouraged.h and rewriting in terms of scm_to_double.
Replaced all uses with scm_to_double.
(scm_to_double): Do not implement in terms of scm_num2dbl, use
explicit code.
(scm_from_double): Do not implement in terms of scm_make_real, use
explicit code.
2004-08-03 15:03:35 +00:00
|
|
|
|
else return scm_from_double (atan2 (0.0, -1.0));
|
* print.c (scm_iprin1): Handle fractions.
* objects.h (scm_class_fraction): New.
* objects.c (scm_class_fraction): New.
(scm_class_of): Handle fractions.
* hash.c (scm_hasher): Handle fractions.
* numbers.c: New code for handling fraction all over the place.
(scm_odd_p, scm_even_p): Handle inexact integers.
(scm_rational_p): New function, same as scm_real_p.
(scm_round_number, scm_truncate_number, scm_ceiling, scm_floor):
New exact functions that replace the inexact 'dsubr'
implementations.
(scm_numerator, scm_denominator): New.
* numbers.h (SCM_NUMP): Recognize fractions.
(SCM_FRACTIONP, SCM_SLOPPY_FRACTIONP, SCM_FRACTION_NUMERATOR,
SCM_FRACTION_DENOMINATOR, SCM_FRACTION_SET_NUMERATOR,
SCM_FRACTION_SET_DENOMINATOR, SCM_FRACTION_REDUCED_BIT,
SCM_FRACTION_REDUCED_SET, SCM_FRACTION_REDUCED_CLEAR,
SCM_FRACTION_REDUCED): New.
(scm_floor, scm_ceiling, scm_truncate_number, scm_round_number):
New prototypes.
(scm_make_ratio, scm_rationalize, scm_numerator, scm_denominator,
scm_rational_p): New prototypes.
(scm_i_dbl2num, scm_i_fraction2double, scm_i_fraction_equalp,
scm_i_print_fraction): New prototypes.
* goops.c (create_standard_classes): Create "<fraction>" class.
* gc-mark.c (scm_gc_mark_dependencies): Handle fractions.
* gc-card.c (scm_i_sweep_card): Include scm_tc16_fraction as a
case in the switch, but do nothing for now.
* eval.c (SCM_CEVAL, SCM_APPLY, call_dsubr_1): Convert fractions
to doubles when calling 'dsubr' functions.
* eq.c (scm_eqv_p, scm_equal_p): Handle fractions.
2003-11-18 19:59:53 +00:00
|
|
|
|
}
|
2003-07-13 16:13:57 +00:00
|
|
|
|
else
|
2000-05-03 12:35:56 +00:00
|
|
|
|
SCM_WTA_DISPATCH_1 (g_angle, z, SCM_ARG1, s_angle);
|
1996-07-25 22:56:11 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
2001-07-30 19:35:15 +00:00
|
|
|
|
SCM_GPROC (s_exact_to_inexact, "exact->inexact", 1, 0, 0, scm_exact_to_inexact, g_exact_to_inexact);
|
|
|
|
|
|
/* Convert the number @var{x} to its inexact representation.\n"
|
|
|
|
|
|
*/
|
|
|
|
|
|
SCM
|
|
|
|
|
|
scm_exact_to_inexact (SCM z)
|
|
|
|
|
|
{
|
2004-07-23 15:43:02 +00:00
|
|
|
|
if (SCM_I_INUMP (z))
|
(scm_is_rational): New.
(scm_i_short2big, scm_i_int2big, scm_i_uint2big, scm_i_size2big,
scm_i_ptrdiff2big, scm_i_long_long2big, scm_i_ulong_long2big):
Removed prototypes.
(scm_make_real, scm_num2dbl, scm_float2num, scm_double2num):
Discouraged by moving to discouraged.h and discouraged.c.
Replaced all uses with scm_from_double.
(scm_num2float, scm_num2double): Discouraged by moving prototype
to discouraged.h and rewriting in terms of scm_to_double.
Replaced all uses with scm_to_double.
(scm_to_double): Do not implement in terms of scm_num2dbl, use
explicit code.
(scm_from_double): Do not implement in terms of scm_make_real, use
explicit code.
2004-08-03 15:03:35 +00:00
|
|
|
|
return scm_from_double ((double) SCM_I_INUM (z));
|
2001-07-30 19:35:15 +00:00
|
|
|
|
else if (SCM_BIGP (z))
|
(scm_is_rational): New.
(scm_i_short2big, scm_i_int2big, scm_i_uint2big, scm_i_size2big,
scm_i_ptrdiff2big, scm_i_long_long2big, scm_i_ulong_long2big):
Removed prototypes.
(scm_make_real, scm_num2dbl, scm_float2num, scm_double2num):
Discouraged by moving to discouraged.h and discouraged.c.
Replaced all uses with scm_from_double.
(scm_num2float, scm_num2double): Discouraged by moving prototype
to discouraged.h and rewriting in terms of scm_to_double.
Replaced all uses with scm_to_double.
(scm_to_double): Do not implement in terms of scm_num2dbl, use
explicit code.
(scm_from_double): Do not implement in terms of scm_make_real, use
explicit code.
2004-08-03 15:03:35 +00:00
|
|
|
|
return scm_from_double (scm_i_big2dbl (z));
|
* print.c (scm_iprin1): Handle fractions.
* objects.h (scm_class_fraction): New.
* objects.c (scm_class_fraction): New.
(scm_class_of): Handle fractions.
* hash.c (scm_hasher): Handle fractions.
* numbers.c: New code for handling fraction all over the place.
(scm_odd_p, scm_even_p): Handle inexact integers.
(scm_rational_p): New function, same as scm_real_p.
(scm_round_number, scm_truncate_number, scm_ceiling, scm_floor):
New exact functions that replace the inexact 'dsubr'
implementations.
(scm_numerator, scm_denominator): New.
* numbers.h (SCM_NUMP): Recognize fractions.
(SCM_FRACTIONP, SCM_SLOPPY_FRACTIONP, SCM_FRACTION_NUMERATOR,
SCM_FRACTION_DENOMINATOR, SCM_FRACTION_SET_NUMERATOR,
SCM_FRACTION_SET_DENOMINATOR, SCM_FRACTION_REDUCED_BIT,
SCM_FRACTION_REDUCED_SET, SCM_FRACTION_REDUCED_CLEAR,
SCM_FRACTION_REDUCED): New.
(scm_floor, scm_ceiling, scm_truncate_number, scm_round_number):
New prototypes.
(scm_make_ratio, scm_rationalize, scm_numerator, scm_denominator,
scm_rational_p): New prototypes.
(scm_i_dbl2num, scm_i_fraction2double, scm_i_fraction_equalp,
scm_i_print_fraction): New prototypes.
* goops.c (create_standard_classes): Create "<fraction>" class.
* gc-mark.c (scm_gc_mark_dependencies): Handle fractions.
* gc-card.c (scm_i_sweep_card): Include scm_tc16_fraction as a
case in the switch, but do nothing for now.
* eval.c (SCM_CEVAL, SCM_APPLY, call_dsubr_1): Convert fractions
to doubles when calling 'dsubr' functions.
* eq.c (scm_eqv_p, scm_equal_p): Handle fractions.
2003-11-18 19:59:53 +00:00
|
|
|
|
else if (SCM_FRACTIONP (z))
|
(scm_is_rational): New.
(scm_i_short2big, scm_i_int2big, scm_i_uint2big, scm_i_size2big,
scm_i_ptrdiff2big, scm_i_long_long2big, scm_i_ulong_long2big):
Removed prototypes.
(scm_make_real, scm_num2dbl, scm_float2num, scm_double2num):
Discouraged by moving to discouraged.h and discouraged.c.
Replaced all uses with scm_from_double.
(scm_num2float, scm_num2double): Discouraged by moving prototype
to discouraged.h and rewriting in terms of scm_to_double.
Replaced all uses with scm_to_double.
(scm_to_double): Do not implement in terms of scm_num2dbl, use
explicit code.
(scm_from_double): Do not implement in terms of scm_make_real, use
explicit code.
2004-08-03 15:03:35 +00:00
|
|
|
|
return scm_from_double (scm_i_fraction2double (z));
|
2001-07-30 19:35:15 +00:00
|
|
|
|
else if (SCM_INEXACTP (z))
|
|
|
|
|
|
return z;
|
|
|
|
|
|
else
|
|
|
|
|
|
SCM_WTA_DISPATCH_1 (g_exact_to_inexact, z, 1, s_exact_to_inexact);
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
2000-01-05 19:05:23 +00:00
|
|
|
|
SCM_DEFINE (scm_inexact_to_exact, "inexact->exact", 1, 0, 0,
|
1999-12-12 02:36:16 +00:00
|
|
|
|
(SCM z),
|
2001-04-03 13:19:05 +00:00
|
|
|
|
"Return an exact number that is numerically closest to @var{z}.")
|
1999-12-12 02:36:16 +00:00
|
|
|
|
#define FUNC_NAME s_scm_inexact_to_exact
|
1996-07-25 22:56:11 +00:00
|
|
|
|
{
|
2004-07-23 15:43:02 +00:00
|
|
|
|
if (SCM_I_INUMP (z))
|
1999-01-10 07:38:39 +00:00
|
|
|
|
return z;
|
2003-07-13 16:13:57 +00:00
|
|
|
|
else if (SCM_BIGP (z))
|
1999-01-10 07:38:39 +00:00
|
|
|
|
return z;
|
2003-07-13 16:13:57 +00:00
|
|
|
|
else if (SCM_REALP (z))
|
|
|
|
|
|
{
|
* print.c (scm_iprin1): Handle fractions.
* objects.h (scm_class_fraction): New.
* objects.c (scm_class_fraction): New.
(scm_class_of): Handle fractions.
* hash.c (scm_hasher): Handle fractions.
* numbers.c: New code for handling fraction all over the place.
(scm_odd_p, scm_even_p): Handle inexact integers.
(scm_rational_p): New function, same as scm_real_p.
(scm_round_number, scm_truncate_number, scm_ceiling, scm_floor):
New exact functions that replace the inexact 'dsubr'
implementations.
(scm_numerator, scm_denominator): New.
* numbers.h (SCM_NUMP): Recognize fractions.
(SCM_FRACTIONP, SCM_SLOPPY_FRACTIONP, SCM_FRACTION_NUMERATOR,
SCM_FRACTION_DENOMINATOR, SCM_FRACTION_SET_NUMERATOR,
SCM_FRACTION_SET_DENOMINATOR, SCM_FRACTION_REDUCED_BIT,
SCM_FRACTION_REDUCED_SET, SCM_FRACTION_REDUCED_CLEAR,
SCM_FRACTION_REDUCED): New.
(scm_floor, scm_ceiling, scm_truncate_number, scm_round_number):
New prototypes.
(scm_make_ratio, scm_rationalize, scm_numerator, scm_denominator,
scm_rational_p): New prototypes.
(scm_i_dbl2num, scm_i_fraction2double, scm_i_fraction_equalp,
scm_i_print_fraction): New prototypes.
* goops.c (create_standard_classes): Create "<fraction>" class.
* gc-mark.c (scm_gc_mark_dependencies): Handle fractions.
* gc-card.c (scm_i_sweep_card): Include scm_tc16_fraction as a
case in the switch, but do nothing for now.
* eval.c (SCM_CEVAL, SCM_APPLY, call_dsubr_1): Convert fractions
to doubles when calling 'dsubr' functions.
* eq.c (scm_eqv_p, scm_equal_p): Handle fractions.
2003-11-18 19:59:53 +00:00
|
|
|
|
if (xisinf (SCM_REAL_VALUE (z)) || xisnan (SCM_REAL_VALUE (z)))
|
|
|
|
|
|
SCM_OUT_OF_RANGE (1, z);
|
2003-10-09 00:38:51 +00:00
|
|
|
|
else
|
* print.c (scm_iprin1): Handle fractions.
* objects.h (scm_class_fraction): New.
* objects.c (scm_class_fraction): New.
(scm_class_of): Handle fractions.
* hash.c (scm_hasher): Handle fractions.
* numbers.c: New code for handling fraction all over the place.
(scm_odd_p, scm_even_p): Handle inexact integers.
(scm_rational_p): New function, same as scm_real_p.
(scm_round_number, scm_truncate_number, scm_ceiling, scm_floor):
New exact functions that replace the inexact 'dsubr'
implementations.
(scm_numerator, scm_denominator): New.
* numbers.h (SCM_NUMP): Recognize fractions.
(SCM_FRACTIONP, SCM_SLOPPY_FRACTIONP, SCM_FRACTION_NUMERATOR,
SCM_FRACTION_DENOMINATOR, SCM_FRACTION_SET_NUMERATOR,
SCM_FRACTION_SET_DENOMINATOR, SCM_FRACTION_REDUCED_BIT,
SCM_FRACTION_REDUCED_SET, SCM_FRACTION_REDUCED_CLEAR,
SCM_FRACTION_REDUCED): New.
(scm_floor, scm_ceiling, scm_truncate_number, scm_round_number):
New prototypes.
(scm_make_ratio, scm_rationalize, scm_numerator, scm_denominator,
scm_rational_p): New prototypes.
(scm_i_dbl2num, scm_i_fraction2double, scm_i_fraction_equalp,
scm_i_print_fraction): New prototypes.
* goops.c (create_standard_classes): Create "<fraction>" class.
* gc-mark.c (scm_gc_mark_dependencies): Handle fractions.
* gc-card.c (scm_i_sweep_card): Include scm_tc16_fraction as a
case in the switch, but do nothing for now.
* eval.c (SCM_CEVAL, SCM_APPLY, call_dsubr_1): Convert fractions
to doubles when calling 'dsubr' functions.
* eq.c (scm_eqv_p, scm_equal_p): Handle fractions.
2003-11-18 19:59:53 +00:00
|
|
|
|
{
|
|
|
|
|
|
mpq_t frac;
|
|
|
|
|
|
SCM q;
|
|
|
|
|
|
|
|
|
|
|
|
mpq_init (frac);
|
|
|
|
|
|
mpq_set_d (frac, SCM_REAL_VALUE (z));
|
2004-08-03 15:55:42 +00:00
|
|
|
|
q = scm_i_make_ratio (scm_i_mpz2num (mpq_numref (frac)),
|
* print.c (scm_iprin1): Handle fractions.
* objects.h (scm_class_fraction): New.
* objects.c (scm_class_fraction): New.
(scm_class_of): Handle fractions.
* hash.c (scm_hasher): Handle fractions.
* numbers.c: New code for handling fraction all over the place.
(scm_odd_p, scm_even_p): Handle inexact integers.
(scm_rational_p): New function, same as scm_real_p.
(scm_round_number, scm_truncate_number, scm_ceiling, scm_floor):
New exact functions that replace the inexact 'dsubr'
implementations.
(scm_numerator, scm_denominator): New.
* numbers.h (SCM_NUMP): Recognize fractions.
(SCM_FRACTIONP, SCM_SLOPPY_FRACTIONP, SCM_FRACTION_NUMERATOR,
SCM_FRACTION_DENOMINATOR, SCM_FRACTION_SET_NUMERATOR,
SCM_FRACTION_SET_DENOMINATOR, SCM_FRACTION_REDUCED_BIT,
SCM_FRACTION_REDUCED_SET, SCM_FRACTION_REDUCED_CLEAR,
SCM_FRACTION_REDUCED): New.
(scm_floor, scm_ceiling, scm_truncate_number, scm_round_number):
New prototypes.
(scm_make_ratio, scm_rationalize, scm_numerator, scm_denominator,
scm_rational_p): New prototypes.
(scm_i_dbl2num, scm_i_fraction2double, scm_i_fraction_equalp,
scm_i_print_fraction): New prototypes.
* goops.c (create_standard_classes): Create "<fraction>" class.
* gc-mark.c (scm_gc_mark_dependencies): Handle fractions.
* gc-card.c (scm_i_sweep_card): Include scm_tc16_fraction as a
case in the switch, but do nothing for now.
* eval.c (SCM_CEVAL, SCM_APPLY, call_dsubr_1): Convert fractions
to doubles when calling 'dsubr' functions.
* eq.c (scm_eqv_p, scm_equal_p): Handle fractions.
2003-11-18 19:59:53 +00:00
|
|
|
|
scm_i_mpz2num (mpq_denref (frac)));
|
|
|
|
|
|
|
2004-08-03 15:55:42 +00:00
|
|
|
|
/* When scm_i_make_ratio throws, we leak the memory allocated
|
* print.c (scm_iprin1): Handle fractions.
* objects.h (scm_class_fraction): New.
* objects.c (scm_class_fraction): New.
(scm_class_of): Handle fractions.
* hash.c (scm_hasher): Handle fractions.
* numbers.c: New code for handling fraction all over the place.
(scm_odd_p, scm_even_p): Handle inexact integers.
(scm_rational_p): New function, same as scm_real_p.
(scm_round_number, scm_truncate_number, scm_ceiling, scm_floor):
New exact functions that replace the inexact 'dsubr'
implementations.
(scm_numerator, scm_denominator): New.
* numbers.h (SCM_NUMP): Recognize fractions.
(SCM_FRACTIONP, SCM_SLOPPY_FRACTIONP, SCM_FRACTION_NUMERATOR,
SCM_FRACTION_DENOMINATOR, SCM_FRACTION_SET_NUMERATOR,
SCM_FRACTION_SET_DENOMINATOR, SCM_FRACTION_REDUCED_BIT,
SCM_FRACTION_REDUCED_SET, SCM_FRACTION_REDUCED_CLEAR,
SCM_FRACTION_REDUCED): New.
(scm_floor, scm_ceiling, scm_truncate_number, scm_round_number):
New prototypes.
(scm_make_ratio, scm_rationalize, scm_numerator, scm_denominator,
scm_rational_p): New prototypes.
(scm_i_dbl2num, scm_i_fraction2double, scm_i_fraction_equalp,
scm_i_print_fraction): New prototypes.
* goops.c (create_standard_classes): Create "<fraction>" class.
* gc-mark.c (scm_gc_mark_dependencies): Handle fractions.
* gc-card.c (scm_i_sweep_card): Include scm_tc16_fraction as a
case in the switch, but do nothing for now.
* eval.c (SCM_CEVAL, SCM_APPLY, call_dsubr_1): Convert fractions
to doubles when calling 'dsubr' functions.
* eq.c (scm_eqv_p, scm_equal_p): Handle fractions.
2003-11-18 19:59:53 +00:00
|
|
|
|
for frac...
|
|
|
|
|
|
*/
|
|
|
|
|
|
mpq_clear (frac);
|
|
|
|
|
|
return q;
|
|
|
|
|
|
}
|
2000-05-08 19:34:20 +00:00
|
|
|
|
}
|
* print.c (scm_iprin1): Handle fractions.
* objects.h (scm_class_fraction): New.
* objects.c (scm_class_fraction): New.
(scm_class_of): Handle fractions.
* hash.c (scm_hasher): Handle fractions.
* numbers.c: New code for handling fraction all over the place.
(scm_odd_p, scm_even_p): Handle inexact integers.
(scm_rational_p): New function, same as scm_real_p.
(scm_round_number, scm_truncate_number, scm_ceiling, scm_floor):
New exact functions that replace the inexact 'dsubr'
implementations.
(scm_numerator, scm_denominator): New.
* numbers.h (SCM_NUMP): Recognize fractions.
(SCM_FRACTIONP, SCM_SLOPPY_FRACTIONP, SCM_FRACTION_NUMERATOR,
SCM_FRACTION_DENOMINATOR, SCM_FRACTION_SET_NUMERATOR,
SCM_FRACTION_SET_DENOMINATOR, SCM_FRACTION_REDUCED_BIT,
SCM_FRACTION_REDUCED_SET, SCM_FRACTION_REDUCED_CLEAR,
SCM_FRACTION_REDUCED): New.
(scm_floor, scm_ceiling, scm_truncate_number, scm_round_number):
New prototypes.
(scm_make_ratio, scm_rationalize, scm_numerator, scm_denominator,
scm_rational_p): New prototypes.
(scm_i_dbl2num, scm_i_fraction2double, scm_i_fraction_equalp,
scm_i_print_fraction): New prototypes.
* goops.c (create_standard_classes): Create "<fraction>" class.
* gc-mark.c (scm_gc_mark_dependencies): Handle fractions.
* gc-card.c (scm_i_sweep_card): Include scm_tc16_fraction as a
case in the switch, but do nothing for now.
* eval.c (SCM_CEVAL, SCM_APPLY, call_dsubr_1): Convert fractions
to doubles when calling 'dsubr' functions.
* eq.c (scm_eqv_p, scm_equal_p): Handle fractions.
2003-11-18 19:59:53 +00:00
|
|
|
|
else if (SCM_FRACTIONP (z))
|
|
|
|
|
|
return z;
|
2003-07-13 16:13:57 +00:00
|
|
|
|
else
|
2000-05-08 19:34:20 +00:00
|
|
|
|
SCM_WRONG_TYPE_ARG (1, z);
|
1996-07-25 22:56:11 +00:00
|
|
|
|
}
|
1999-12-12 02:36:16 +00:00
|
|
|
|
#undef FUNC_NAME
|
1996-07-25 22:56:11 +00:00
|
|
|
|
|
* print.c (scm_iprin1): Handle fractions.
* objects.h (scm_class_fraction): New.
* objects.c (scm_class_fraction): New.
(scm_class_of): Handle fractions.
* hash.c (scm_hasher): Handle fractions.
* numbers.c: New code for handling fraction all over the place.
(scm_odd_p, scm_even_p): Handle inexact integers.
(scm_rational_p): New function, same as scm_real_p.
(scm_round_number, scm_truncate_number, scm_ceiling, scm_floor):
New exact functions that replace the inexact 'dsubr'
implementations.
(scm_numerator, scm_denominator): New.
* numbers.h (SCM_NUMP): Recognize fractions.
(SCM_FRACTIONP, SCM_SLOPPY_FRACTIONP, SCM_FRACTION_NUMERATOR,
SCM_FRACTION_DENOMINATOR, SCM_FRACTION_SET_NUMERATOR,
SCM_FRACTION_SET_DENOMINATOR, SCM_FRACTION_REDUCED_BIT,
SCM_FRACTION_REDUCED_SET, SCM_FRACTION_REDUCED_CLEAR,
SCM_FRACTION_REDUCED): New.
(scm_floor, scm_ceiling, scm_truncate_number, scm_round_number):
New prototypes.
(scm_make_ratio, scm_rationalize, scm_numerator, scm_denominator,
scm_rational_p): New prototypes.
(scm_i_dbl2num, scm_i_fraction2double, scm_i_fraction_equalp,
scm_i_print_fraction): New prototypes.
* goops.c (create_standard_classes): Create "<fraction>" class.
* gc-mark.c (scm_gc_mark_dependencies): Handle fractions.
* gc-card.c (scm_i_sweep_card): Include scm_tc16_fraction as a
case in the switch, but do nothing for now.
* eval.c (SCM_CEVAL, SCM_APPLY, call_dsubr_1): Convert fractions
to doubles when calling 'dsubr' functions.
* eq.c (scm_eqv_p, scm_equal_p): Handle fractions.
2003-11-18 19:59:53 +00:00
|
|
|
|
SCM_DEFINE (scm_rationalize, "rationalize", 2, 0, 0,
|
2008-08-03 00:18:33 +01:00
|
|
|
|
(SCM x, SCM eps),
|
|
|
|
|
|
"Returns the @emph{simplest} rational number differing\n"
|
|
|
|
|
|
"from @var{x} by no more than @var{eps}.\n"
|
|
|
|
|
|
"\n"
|
|
|
|
|
|
"As required by @acronym{R5RS}, @code{rationalize} only returns an\n"
|
|
|
|
|
|
"exact result when both its arguments are exact. Thus, you might need\n"
|
|
|
|
|
|
"to use @code{inexact->exact} on the arguments.\n"
|
|
|
|
|
|
"\n"
|
|
|
|
|
|
"@lisp\n"
|
|
|
|
|
|
"(rationalize (inexact->exact 1.2) 1/100)\n"
|
|
|
|
|
|
"@result{} 6/5\n"
|
|
|
|
|
|
"@end lisp")
|
* print.c (scm_iprin1): Handle fractions.
* objects.h (scm_class_fraction): New.
* objects.c (scm_class_fraction): New.
(scm_class_of): Handle fractions.
* hash.c (scm_hasher): Handle fractions.
* numbers.c: New code for handling fraction all over the place.
(scm_odd_p, scm_even_p): Handle inexact integers.
(scm_rational_p): New function, same as scm_real_p.
(scm_round_number, scm_truncate_number, scm_ceiling, scm_floor):
New exact functions that replace the inexact 'dsubr'
implementations.
(scm_numerator, scm_denominator): New.
* numbers.h (SCM_NUMP): Recognize fractions.
(SCM_FRACTIONP, SCM_SLOPPY_FRACTIONP, SCM_FRACTION_NUMERATOR,
SCM_FRACTION_DENOMINATOR, SCM_FRACTION_SET_NUMERATOR,
SCM_FRACTION_SET_DENOMINATOR, SCM_FRACTION_REDUCED_BIT,
SCM_FRACTION_REDUCED_SET, SCM_FRACTION_REDUCED_CLEAR,
SCM_FRACTION_REDUCED): New.
(scm_floor, scm_ceiling, scm_truncate_number, scm_round_number):
New prototypes.
(scm_make_ratio, scm_rationalize, scm_numerator, scm_denominator,
scm_rational_p): New prototypes.
(scm_i_dbl2num, scm_i_fraction2double, scm_i_fraction_equalp,
scm_i_print_fraction): New prototypes.
* goops.c (create_standard_classes): Create "<fraction>" class.
* gc-mark.c (scm_gc_mark_dependencies): Handle fractions.
* gc-card.c (scm_i_sweep_card): Include scm_tc16_fraction as a
case in the switch, but do nothing for now.
* eval.c (SCM_CEVAL, SCM_APPLY, call_dsubr_1): Convert fractions
to doubles when calling 'dsubr' functions.
* eq.c (scm_eqv_p, scm_equal_p): Handle fractions.
2003-11-18 19:59:53 +00:00
|
|
|
|
#define FUNC_NAME s_scm_rationalize
|
|
|
|
|
|
{
|
2004-07-23 15:43:02 +00:00
|
|
|
|
if (SCM_I_INUMP (x))
|
* print.c (scm_iprin1): Handle fractions.
* objects.h (scm_class_fraction): New.
* objects.c (scm_class_fraction): New.
(scm_class_of): Handle fractions.
* hash.c (scm_hasher): Handle fractions.
* numbers.c: New code for handling fraction all over the place.
(scm_odd_p, scm_even_p): Handle inexact integers.
(scm_rational_p): New function, same as scm_real_p.
(scm_round_number, scm_truncate_number, scm_ceiling, scm_floor):
New exact functions that replace the inexact 'dsubr'
implementations.
(scm_numerator, scm_denominator): New.
* numbers.h (SCM_NUMP): Recognize fractions.
(SCM_FRACTIONP, SCM_SLOPPY_FRACTIONP, SCM_FRACTION_NUMERATOR,
SCM_FRACTION_DENOMINATOR, SCM_FRACTION_SET_NUMERATOR,
SCM_FRACTION_SET_DENOMINATOR, SCM_FRACTION_REDUCED_BIT,
SCM_FRACTION_REDUCED_SET, SCM_FRACTION_REDUCED_CLEAR,
SCM_FRACTION_REDUCED): New.
(scm_floor, scm_ceiling, scm_truncate_number, scm_round_number):
New prototypes.
(scm_make_ratio, scm_rationalize, scm_numerator, scm_denominator,
scm_rational_p): New prototypes.
(scm_i_dbl2num, scm_i_fraction2double, scm_i_fraction_equalp,
scm_i_print_fraction): New prototypes.
* goops.c (create_standard_classes): Create "<fraction>" class.
* gc-mark.c (scm_gc_mark_dependencies): Handle fractions.
* gc-card.c (scm_i_sweep_card): Include scm_tc16_fraction as a
case in the switch, but do nothing for now.
* eval.c (SCM_CEVAL, SCM_APPLY, call_dsubr_1): Convert fractions
to doubles when calling 'dsubr' functions.
* eq.c (scm_eqv_p, scm_equal_p): Handle fractions.
2003-11-18 19:59:53 +00:00
|
|
|
|
return x;
|
|
|
|
|
|
else if (SCM_BIGP (x))
|
|
|
|
|
|
return x;
|
|
|
|
|
|
else if ((SCM_REALP (x)) || SCM_FRACTIONP (x))
|
|
|
|
|
|
{
|
|
|
|
|
|
/* Use continued fractions to find closest ratio. All
|
|
|
|
|
|
arithmetic is done with exact numbers.
|
|
|
|
|
|
*/
|
|
|
|
|
|
|
|
|
|
|
|
SCM ex = scm_inexact_to_exact (x);
|
|
|
|
|
|
SCM int_part = scm_floor (ex);
|
2004-07-08 15:54:05 +00:00
|
|
|
|
SCM tt = SCM_I_MAKINUM (1);
|
|
|
|
|
|
SCM a1 = SCM_I_MAKINUM (0), a2 = SCM_I_MAKINUM (1), a = SCM_I_MAKINUM (0);
|
|
|
|
|
|
SCM b1 = SCM_I_MAKINUM (1), b2 = SCM_I_MAKINUM (0), b = SCM_I_MAKINUM (0);
|
* print.c (scm_iprin1): Handle fractions.
* objects.h (scm_class_fraction): New.
* objects.c (scm_class_fraction): New.
(scm_class_of): Handle fractions.
* hash.c (scm_hasher): Handle fractions.
* numbers.c: New code for handling fraction all over the place.
(scm_odd_p, scm_even_p): Handle inexact integers.
(scm_rational_p): New function, same as scm_real_p.
(scm_round_number, scm_truncate_number, scm_ceiling, scm_floor):
New exact functions that replace the inexact 'dsubr'
implementations.
(scm_numerator, scm_denominator): New.
* numbers.h (SCM_NUMP): Recognize fractions.
(SCM_FRACTIONP, SCM_SLOPPY_FRACTIONP, SCM_FRACTION_NUMERATOR,
SCM_FRACTION_DENOMINATOR, SCM_FRACTION_SET_NUMERATOR,
SCM_FRACTION_SET_DENOMINATOR, SCM_FRACTION_REDUCED_BIT,
SCM_FRACTION_REDUCED_SET, SCM_FRACTION_REDUCED_CLEAR,
SCM_FRACTION_REDUCED): New.
(scm_floor, scm_ceiling, scm_truncate_number, scm_round_number):
New prototypes.
(scm_make_ratio, scm_rationalize, scm_numerator, scm_denominator,
scm_rational_p): New prototypes.
(scm_i_dbl2num, scm_i_fraction2double, scm_i_fraction_equalp,
scm_i_print_fraction): New prototypes.
* goops.c (create_standard_classes): Create "<fraction>" class.
* gc-mark.c (scm_gc_mark_dependencies): Handle fractions.
* gc-card.c (scm_i_sweep_card): Include scm_tc16_fraction as a
case in the switch, but do nothing for now.
* eval.c (SCM_CEVAL, SCM_APPLY, call_dsubr_1): Convert fractions
to doubles when calling 'dsubr' functions.
* eq.c (scm_eqv_p, scm_equal_p): Handle fractions.
2003-11-18 19:59:53 +00:00
|
|
|
|
SCM rx;
|
|
|
|
|
|
int i = 0;
|
|
|
|
|
|
|
(scm_is_integer, scm_is_signed_integer, scm_is_unsigned_integer,
scm_to_signed_integer, scm_to_unsigned_integer, scm_to_schar,
scm_to_uchar, scm_to_char, scm_to_short, scm_to_ushort, scm_to_long,
scm_to_ulong, scm_to_size_t, scm_to_ssize_t, scm_from_schar,
scm_from_uchar, scm_from_char, scm_from_short, scm_from_ushort,
scm_from_int, scm_from_uint, scm_from_long, scm_from_ulong,
scm_from_size_t, scm_from_ssize_t, scm_is_real, scm_to_double,
scm_from_double): New.
* deprecated.h, boolean.h (SCM_FALSEP, SCM_NFALSEP, SCM_BOOL,
SCM_NEGATE_BOOL, SCM_BOOLP): Deprecated by moving into "deprecated.h".
Replaced all uses with scm_is_false, scm_is_true, scm_from_bool, and
scm_is_bool, respectively.
2004-07-06 10:23:30 +00:00
|
|
|
|
if (scm_is_true (scm_num_eq_p (ex, int_part)))
|
* print.c (scm_iprin1): Handle fractions.
* objects.h (scm_class_fraction): New.
* objects.c (scm_class_fraction): New.
(scm_class_of): Handle fractions.
* hash.c (scm_hasher): Handle fractions.
* numbers.c: New code for handling fraction all over the place.
(scm_odd_p, scm_even_p): Handle inexact integers.
(scm_rational_p): New function, same as scm_real_p.
(scm_round_number, scm_truncate_number, scm_ceiling, scm_floor):
New exact functions that replace the inexact 'dsubr'
implementations.
(scm_numerator, scm_denominator): New.
* numbers.h (SCM_NUMP): Recognize fractions.
(SCM_FRACTIONP, SCM_SLOPPY_FRACTIONP, SCM_FRACTION_NUMERATOR,
SCM_FRACTION_DENOMINATOR, SCM_FRACTION_SET_NUMERATOR,
SCM_FRACTION_SET_DENOMINATOR, SCM_FRACTION_REDUCED_BIT,
SCM_FRACTION_REDUCED_SET, SCM_FRACTION_REDUCED_CLEAR,
SCM_FRACTION_REDUCED): New.
(scm_floor, scm_ceiling, scm_truncate_number, scm_round_number):
New prototypes.
(scm_make_ratio, scm_rationalize, scm_numerator, scm_denominator,
scm_rational_p): New prototypes.
(scm_i_dbl2num, scm_i_fraction2double, scm_i_fraction_equalp,
scm_i_print_fraction): New prototypes.
* goops.c (create_standard_classes): Create "<fraction>" class.
* gc-mark.c (scm_gc_mark_dependencies): Handle fractions.
* gc-card.c (scm_i_sweep_card): Include scm_tc16_fraction as a
case in the switch, but do nothing for now.
* eval.c (SCM_CEVAL, SCM_APPLY, call_dsubr_1): Convert fractions
to doubles when calling 'dsubr' functions.
* eq.c (scm_eqv_p, scm_equal_p): Handle fractions.
2003-11-18 19:59:53 +00:00
|
|
|
|
return ex;
|
|
|
|
|
|
|
|
|
|
|
|
ex = scm_difference (ex, int_part); /* x = x-int_part */
|
|
|
|
|
|
rx = scm_divide (ex, SCM_UNDEFINED); /* rx = 1/x */
|
|
|
|
|
|
|
|
|
|
|
|
/* We stop after a million iterations just to be absolutely sure
|
|
|
|
|
|
that we don't go into an infinite loop. The process normally
|
|
|
|
|
|
converges after less than a dozen iterations.
|
|
|
|
|
|
*/
|
|
|
|
|
|
|
2008-08-03 00:18:33 +01:00
|
|
|
|
eps = scm_abs (eps);
|
* print.c (scm_iprin1): Handle fractions.
* objects.h (scm_class_fraction): New.
* objects.c (scm_class_fraction): New.
(scm_class_of): Handle fractions.
* hash.c (scm_hasher): Handle fractions.
* numbers.c: New code for handling fraction all over the place.
(scm_odd_p, scm_even_p): Handle inexact integers.
(scm_rational_p): New function, same as scm_real_p.
(scm_round_number, scm_truncate_number, scm_ceiling, scm_floor):
New exact functions that replace the inexact 'dsubr'
implementations.
(scm_numerator, scm_denominator): New.
* numbers.h (SCM_NUMP): Recognize fractions.
(SCM_FRACTIONP, SCM_SLOPPY_FRACTIONP, SCM_FRACTION_NUMERATOR,
SCM_FRACTION_DENOMINATOR, SCM_FRACTION_SET_NUMERATOR,
SCM_FRACTION_SET_DENOMINATOR, SCM_FRACTION_REDUCED_BIT,
SCM_FRACTION_REDUCED_SET, SCM_FRACTION_REDUCED_CLEAR,
SCM_FRACTION_REDUCED): New.
(scm_floor, scm_ceiling, scm_truncate_number, scm_round_number):
New prototypes.
(scm_make_ratio, scm_rationalize, scm_numerator, scm_denominator,
scm_rational_p): New prototypes.
(scm_i_dbl2num, scm_i_fraction2double, scm_i_fraction_equalp,
scm_i_print_fraction): New prototypes.
* goops.c (create_standard_classes): Create "<fraction>" class.
* gc-mark.c (scm_gc_mark_dependencies): Handle fractions.
* gc-card.c (scm_i_sweep_card): Include scm_tc16_fraction as a
case in the switch, but do nothing for now.
* eval.c (SCM_CEVAL, SCM_APPLY, call_dsubr_1): Convert fractions
to doubles when calling 'dsubr' functions.
* eq.c (scm_eqv_p, scm_equal_p): Handle fractions.
2003-11-18 19:59:53 +00:00
|
|
|
|
while (++i < 1000000)
|
|
|
|
|
|
{
|
|
|
|
|
|
a = scm_sum (scm_product (a1, tt), a2); /* a = a1*tt + a2 */
|
|
|
|
|
|
b = scm_sum (scm_product (b1, tt), b2); /* b = b1*tt + b2 */
|
(scm_is_integer, scm_is_signed_integer, scm_is_unsigned_integer,
scm_to_signed_integer, scm_to_unsigned_integer, scm_to_schar,
scm_to_uchar, scm_to_char, scm_to_short, scm_to_ushort, scm_to_long,
scm_to_ulong, scm_to_size_t, scm_to_ssize_t, scm_from_schar,
scm_from_uchar, scm_from_char, scm_from_short, scm_from_ushort,
scm_from_int, scm_from_uint, scm_from_long, scm_from_ulong,
scm_from_size_t, scm_from_ssize_t, scm_is_real, scm_to_double,
scm_from_double): New.
* deprecated.h, boolean.h (SCM_FALSEP, SCM_NFALSEP, SCM_BOOL,
SCM_NEGATE_BOOL, SCM_BOOLP): Deprecated by moving into "deprecated.h".
Replaced all uses with scm_is_false, scm_is_true, scm_from_bool, and
scm_is_bool, respectively.
2004-07-06 10:23:30 +00:00
|
|
|
|
if (scm_is_false (scm_zero_p (b)) && /* b != 0 */
|
|
|
|
|
|
scm_is_false
|
* print.c (scm_iprin1): Handle fractions.
* objects.h (scm_class_fraction): New.
* objects.c (scm_class_fraction): New.
(scm_class_of): Handle fractions.
* hash.c (scm_hasher): Handle fractions.
* numbers.c: New code for handling fraction all over the place.
(scm_odd_p, scm_even_p): Handle inexact integers.
(scm_rational_p): New function, same as scm_real_p.
(scm_round_number, scm_truncate_number, scm_ceiling, scm_floor):
New exact functions that replace the inexact 'dsubr'
implementations.
(scm_numerator, scm_denominator): New.
* numbers.h (SCM_NUMP): Recognize fractions.
(SCM_FRACTIONP, SCM_SLOPPY_FRACTIONP, SCM_FRACTION_NUMERATOR,
SCM_FRACTION_DENOMINATOR, SCM_FRACTION_SET_NUMERATOR,
SCM_FRACTION_SET_DENOMINATOR, SCM_FRACTION_REDUCED_BIT,
SCM_FRACTION_REDUCED_SET, SCM_FRACTION_REDUCED_CLEAR,
SCM_FRACTION_REDUCED): New.
(scm_floor, scm_ceiling, scm_truncate_number, scm_round_number):
New prototypes.
(scm_make_ratio, scm_rationalize, scm_numerator, scm_denominator,
scm_rational_p): New prototypes.
(scm_i_dbl2num, scm_i_fraction2double, scm_i_fraction_equalp,
scm_i_print_fraction): New prototypes.
* goops.c (create_standard_classes): Create "<fraction>" class.
* gc-mark.c (scm_gc_mark_dependencies): Handle fractions.
* gc-card.c (scm_i_sweep_card): Include scm_tc16_fraction as a
case in the switch, but do nothing for now.
* eval.c (SCM_CEVAL, SCM_APPLY, call_dsubr_1): Convert fractions
to doubles when calling 'dsubr' functions.
* eq.c (scm_eqv_p, scm_equal_p): Handle fractions.
2003-11-18 19:59:53 +00:00
|
|
|
|
(scm_gr_p (scm_abs (scm_difference (ex, scm_divide (a, b))),
|
2008-08-03 00:18:33 +01:00
|
|
|
|
eps))) /* abs(x-a/b) <= eps */
|
2003-11-19 03:50:26 +00:00
|
|
|
|
{
|
|
|
|
|
|
SCM res = scm_sum (int_part, scm_divide (a, b));
|
(scm_is_integer, scm_is_signed_integer, scm_is_unsigned_integer,
scm_to_signed_integer, scm_to_unsigned_integer, scm_to_schar,
scm_to_uchar, scm_to_char, scm_to_short, scm_to_ushort, scm_to_long,
scm_to_ulong, scm_to_size_t, scm_to_ssize_t, scm_from_schar,
scm_from_uchar, scm_from_char, scm_from_short, scm_from_ushort,
scm_from_int, scm_from_uint, scm_from_long, scm_from_ulong,
scm_from_size_t, scm_from_ssize_t, scm_is_real, scm_to_double,
scm_from_double): New.
* deprecated.h, boolean.h (SCM_FALSEP, SCM_NFALSEP, SCM_BOOL,
SCM_NEGATE_BOOL, SCM_BOOLP): Deprecated by moving into "deprecated.h".
Replaced all uses with scm_is_false, scm_is_true, scm_from_bool, and
scm_is_bool, respectively.
2004-07-06 10:23:30 +00:00
|
|
|
|
if (scm_is_false (scm_exact_p (x))
|
2008-08-03 00:18:33 +01:00
|
|
|
|
|| scm_is_false (scm_exact_p (eps)))
|
2003-11-19 03:50:26 +00:00
|
|
|
|
return scm_exact_to_inexact (res);
|
|
|
|
|
|
else
|
|
|
|
|
|
return res;
|
|
|
|
|
|
}
|
* print.c (scm_iprin1): Handle fractions.
* objects.h (scm_class_fraction): New.
* objects.c (scm_class_fraction): New.
(scm_class_of): Handle fractions.
* hash.c (scm_hasher): Handle fractions.
* numbers.c: New code for handling fraction all over the place.
(scm_odd_p, scm_even_p): Handle inexact integers.
(scm_rational_p): New function, same as scm_real_p.
(scm_round_number, scm_truncate_number, scm_ceiling, scm_floor):
New exact functions that replace the inexact 'dsubr'
implementations.
(scm_numerator, scm_denominator): New.
* numbers.h (SCM_NUMP): Recognize fractions.
(SCM_FRACTIONP, SCM_SLOPPY_FRACTIONP, SCM_FRACTION_NUMERATOR,
SCM_FRACTION_DENOMINATOR, SCM_FRACTION_SET_NUMERATOR,
SCM_FRACTION_SET_DENOMINATOR, SCM_FRACTION_REDUCED_BIT,
SCM_FRACTION_REDUCED_SET, SCM_FRACTION_REDUCED_CLEAR,
SCM_FRACTION_REDUCED): New.
(scm_floor, scm_ceiling, scm_truncate_number, scm_round_number):
New prototypes.
(scm_make_ratio, scm_rationalize, scm_numerator, scm_denominator,
scm_rational_p): New prototypes.
(scm_i_dbl2num, scm_i_fraction2double, scm_i_fraction_equalp,
scm_i_print_fraction): New prototypes.
* goops.c (create_standard_classes): Create "<fraction>" class.
* gc-mark.c (scm_gc_mark_dependencies): Handle fractions.
* gc-card.c (scm_i_sweep_card): Include scm_tc16_fraction as a
case in the switch, but do nothing for now.
* eval.c (SCM_CEVAL, SCM_APPLY, call_dsubr_1): Convert fractions
to doubles when calling 'dsubr' functions.
* eq.c (scm_eqv_p, scm_equal_p): Handle fractions.
2003-11-18 19:59:53 +00:00
|
|
|
|
rx = scm_divide (scm_difference (rx, tt), /* rx = 1/(rx - tt) */
|
|
|
|
|
|
SCM_UNDEFINED);
|
|
|
|
|
|
tt = scm_floor (rx); /* tt = floor (rx) */
|
|
|
|
|
|
a2 = a1;
|
|
|
|
|
|
b2 = b1;
|
|
|
|
|
|
a1 = a;
|
|
|
|
|
|
b1 = b;
|
|
|
|
|
|
}
|
|
|
|
|
|
scm_num_overflow (s_scm_rationalize);
|
|
|
|
|
|
}
|
|
|
|
|
|
else
|
|
|
|
|
|
SCM_WRONG_TYPE_ARG (1, x);
|
|
|
|
|
|
}
|
|
|
|
|
|
#undef FUNC_NAME
|
|
|
|
|
|
|
(scm_is_integer, scm_is_signed_integer, scm_is_unsigned_integer,
scm_to_signed_integer, scm_to_unsigned_integer, scm_to_schar,
scm_to_uchar, scm_to_char, scm_to_short, scm_to_ushort, scm_to_long,
scm_to_ulong, scm_to_size_t, scm_to_ssize_t, scm_from_schar,
scm_from_uchar, scm_from_char, scm_from_short, scm_from_ushort,
scm_from_int, scm_from_uint, scm_from_long, scm_from_ulong,
scm_from_size_t, scm_from_ssize_t, scm_is_real, scm_to_double,
scm_from_double): New.
* deprecated.h, boolean.h (SCM_FALSEP, SCM_NFALSEP, SCM_BOOL,
SCM_NEGATE_BOOL, SCM_BOOLP): Deprecated by moving into "deprecated.h".
Replaced all uses with scm_is_false, scm_is_true, scm_from_bool, and
scm_is_bool, respectively.
2004-07-06 10:23:30 +00:00
|
|
|
|
/* conversion functions */
|
|
|
|
|
|
|
|
|
|
|
|
int
|
|
|
|
|
|
scm_is_integer (SCM val)
|
|
|
|
|
|
{
|
|
|
|
|
|
return scm_is_true (scm_integer_p (val));
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
int
|
|
|
|
|
|
scm_is_signed_integer (SCM val, scm_t_intmax min, scm_t_intmax max)
|
|
|
|
|
|
{
|
2004-07-23 15:43:02 +00:00
|
|
|
|
if (SCM_I_INUMP (val))
|
(scm_is_integer, scm_is_signed_integer, scm_is_unsigned_integer,
scm_to_signed_integer, scm_to_unsigned_integer, scm_to_schar,
scm_to_uchar, scm_to_char, scm_to_short, scm_to_ushort, scm_to_long,
scm_to_ulong, scm_to_size_t, scm_to_ssize_t, scm_from_schar,
scm_from_uchar, scm_from_char, scm_from_short, scm_from_ushort,
scm_from_int, scm_from_uint, scm_from_long, scm_from_ulong,
scm_from_size_t, scm_from_ssize_t, scm_is_real, scm_to_double,
scm_from_double): New.
* deprecated.h, boolean.h (SCM_FALSEP, SCM_NFALSEP, SCM_BOOL,
SCM_NEGATE_BOOL, SCM_BOOLP): Deprecated by moving into "deprecated.h".
Replaced all uses with scm_is_false, scm_is_true, scm_from_bool, and
scm_is_bool, respectively.
2004-07-06 10:23:30 +00:00
|
|
|
|
{
|
2004-07-23 15:43:02 +00:00
|
|
|
|
scm_t_signed_bits n = SCM_I_INUM (val);
|
(scm_is_integer, scm_is_signed_integer, scm_is_unsigned_integer,
scm_to_signed_integer, scm_to_unsigned_integer, scm_to_schar,
scm_to_uchar, scm_to_char, scm_to_short, scm_to_ushort, scm_to_long,
scm_to_ulong, scm_to_size_t, scm_to_ssize_t, scm_from_schar,
scm_from_uchar, scm_from_char, scm_from_short, scm_from_ushort,
scm_from_int, scm_from_uint, scm_from_long, scm_from_ulong,
scm_from_size_t, scm_from_ssize_t, scm_is_real, scm_to_double,
scm_from_double): New.
* deprecated.h, boolean.h (SCM_FALSEP, SCM_NFALSEP, SCM_BOOL,
SCM_NEGATE_BOOL, SCM_BOOLP): Deprecated by moving into "deprecated.h".
Replaced all uses with scm_is_false, scm_is_true, scm_from_bool, and
scm_is_bool, respectively.
2004-07-06 10:23:30 +00:00
|
|
|
|
return n >= min && n <= max;
|
|
|
|
|
|
}
|
|
|
|
|
|
else if (SCM_BIGP (val))
|
|
|
|
|
|
{
|
|
|
|
|
|
if (min >= SCM_MOST_NEGATIVE_FIXNUM && max <= SCM_MOST_POSITIVE_FIXNUM)
|
|
|
|
|
|
return 0;
|
|
|
|
|
|
else if (min >= LONG_MIN && max <= LONG_MAX)
|
2004-07-08 15:54:05 +00:00
|
|
|
|
{
|
|
|
|
|
|
if (mpz_fits_slong_p (SCM_I_BIG_MPZ (val)))
|
|
|
|
|
|
{
|
|
|
|
|
|
long n = mpz_get_si (SCM_I_BIG_MPZ (val));
|
|
|
|
|
|
return n >= min && n <= max;
|
|
|
|
|
|
}
|
|
|
|
|
|
else
|
|
|
|
|
|
return 0;
|
|
|
|
|
|
}
|
(scm_is_integer, scm_is_signed_integer, scm_is_unsigned_integer,
scm_to_signed_integer, scm_to_unsigned_integer, scm_to_schar,
scm_to_uchar, scm_to_char, scm_to_short, scm_to_ushort, scm_to_long,
scm_to_ulong, scm_to_size_t, scm_to_ssize_t, scm_from_schar,
scm_from_uchar, scm_from_char, scm_from_short, scm_from_ushort,
scm_from_int, scm_from_uint, scm_from_long, scm_from_ulong,
scm_from_size_t, scm_from_ssize_t, scm_is_real, scm_to_double,
scm_from_double): New.
* deprecated.h, boolean.h (SCM_FALSEP, SCM_NFALSEP, SCM_BOOL,
SCM_NEGATE_BOOL, SCM_BOOLP): Deprecated by moving into "deprecated.h".
Replaced all uses with scm_is_false, scm_is_true, scm_from_bool, and
scm_is_bool, respectively.
2004-07-06 10:23:30 +00:00
|
|
|
|
else
|
|
|
|
|
|
{
|
2004-07-08 15:54:05 +00:00
|
|
|
|
scm_t_intmax n;
|
|
|
|
|
|
size_t count;
|
(scm_is_integer, scm_is_signed_integer, scm_is_unsigned_integer,
scm_to_signed_integer, scm_to_unsigned_integer, scm_to_schar,
scm_to_uchar, scm_to_char, scm_to_short, scm_to_ushort, scm_to_long,
scm_to_ulong, scm_to_size_t, scm_to_ssize_t, scm_from_schar,
scm_from_uchar, scm_from_char, scm_from_short, scm_from_ushort,
scm_from_int, scm_from_uint, scm_from_long, scm_from_ulong,
scm_from_size_t, scm_from_ssize_t, scm_is_real, scm_to_double,
scm_from_double): New.
* deprecated.h, boolean.h (SCM_FALSEP, SCM_NFALSEP, SCM_BOOL,
SCM_NEGATE_BOOL, SCM_BOOLP): Deprecated by moving into "deprecated.h".
Replaced all uses with scm_is_false, scm_is_true, scm_from_bool, and
scm_is_bool, respectively.
2004-07-06 10:23:30 +00:00
|
|
|
|
|
2004-07-08 15:54:05 +00:00
|
|
|
|
if (mpz_sizeinbase (SCM_I_BIG_MPZ (val), 2)
|
|
|
|
|
|
> CHAR_BIT*sizeof (scm_t_uintmax))
|
|
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
|
|
|
|
mpz_export (&n, &count, 1, sizeof (scm_t_uintmax), 0, 0,
|
|
|
|
|
|
SCM_I_BIG_MPZ (val));
|
(scm_is_integer, scm_is_signed_integer, scm_is_unsigned_integer,
scm_to_signed_integer, scm_to_unsigned_integer, scm_to_schar,
scm_to_uchar, scm_to_char, scm_to_short, scm_to_ushort, scm_to_long,
scm_to_ulong, scm_to_size_t, scm_to_ssize_t, scm_from_schar,
scm_from_uchar, scm_from_char, scm_from_short, scm_from_ushort,
scm_from_int, scm_from_uint, scm_from_long, scm_from_ulong,
scm_from_size_t, scm_from_ssize_t, scm_is_real, scm_to_double,
scm_from_double): New.
* deprecated.h, boolean.h (SCM_FALSEP, SCM_NFALSEP, SCM_BOOL,
SCM_NEGATE_BOOL, SCM_BOOLP): Deprecated by moving into "deprecated.h".
Replaced all uses with scm_is_false, scm_is_true, scm_from_bool, and
scm_is_bool, respectively.
2004-07-06 10:23:30 +00:00
|
|
|
|
|
2004-07-08 15:54:05 +00:00
|
|
|
|
if (mpz_sgn (SCM_I_BIG_MPZ (val)) >= 0)
|
(scm_is_integer, scm_is_signed_integer, scm_is_unsigned_integer,
scm_to_signed_integer, scm_to_unsigned_integer, scm_to_schar,
scm_to_uchar, scm_to_char, scm_to_short, scm_to_ushort, scm_to_long,
scm_to_ulong, scm_to_size_t, scm_to_ssize_t, scm_from_schar,
scm_from_uchar, scm_from_char, scm_from_short, scm_from_ushort,
scm_from_int, scm_from_uint, scm_from_long, scm_from_ulong,
scm_from_size_t, scm_from_ssize_t, scm_is_real, scm_to_double,
scm_from_double): New.
* deprecated.h, boolean.h (SCM_FALSEP, SCM_NFALSEP, SCM_BOOL,
SCM_NEGATE_BOOL, SCM_BOOLP): Deprecated by moving into "deprecated.h".
Replaced all uses with scm_is_false, scm_is_true, scm_from_bool, and
scm_is_bool, respectively.
2004-07-06 10:23:30 +00:00
|
|
|
|
{
|
2004-07-08 15:54:05 +00:00
|
|
|
|
if (n < 0)
|
|
|
|
|
|
return 0;
|
(scm_is_integer, scm_is_signed_integer, scm_is_unsigned_integer,
scm_to_signed_integer, scm_to_unsigned_integer, scm_to_schar,
scm_to_uchar, scm_to_char, scm_to_short, scm_to_ushort, scm_to_long,
scm_to_ulong, scm_to_size_t, scm_to_ssize_t, scm_from_schar,
scm_from_uchar, scm_from_char, scm_from_short, scm_from_ushort,
scm_from_int, scm_from_uint, scm_from_long, scm_from_ulong,
scm_from_size_t, scm_from_ssize_t, scm_is_real, scm_to_double,
scm_from_double): New.
* deprecated.h, boolean.h (SCM_FALSEP, SCM_NFALSEP, SCM_BOOL,
SCM_NEGATE_BOOL, SCM_BOOLP): Deprecated by moving into "deprecated.h".
Replaced all uses with scm_is_false, scm_is_true, scm_from_bool, and
scm_is_bool, respectively.
2004-07-06 10:23:30 +00:00
|
|
|
|
}
|
|
|
|
|
|
else
|
|
|
|
|
|
{
|
2004-07-08 15:54:05 +00:00
|
|
|
|
n = -n;
|
|
|
|
|
|
if (n >= 0)
|
|
|
|
|
|
return 0;
|
(scm_is_integer, scm_is_signed_integer, scm_is_unsigned_integer,
scm_to_signed_integer, scm_to_unsigned_integer, scm_to_schar,
scm_to_uchar, scm_to_char, scm_to_short, scm_to_ushort, scm_to_long,
scm_to_ulong, scm_to_size_t, scm_to_ssize_t, scm_from_schar,
scm_from_uchar, scm_from_char, scm_from_short, scm_from_ushort,
scm_from_int, scm_from_uint, scm_from_long, scm_from_ulong,
scm_from_size_t, scm_from_ssize_t, scm_is_real, scm_to_double,
scm_from_double): New.
* deprecated.h, boolean.h (SCM_FALSEP, SCM_NFALSEP, SCM_BOOL,
SCM_NEGATE_BOOL, SCM_BOOLP): Deprecated by moving into "deprecated.h".
Replaced all uses with scm_is_false, scm_is_true, scm_from_bool, and
scm_is_bool, respectively.
2004-07-06 10:23:30 +00:00
|
|
|
|
}
|
2004-07-08 15:54:05 +00:00
|
|
|
|
|
|
|
|
|
|
return n >= min && n <= max;
|
(scm_is_integer, scm_is_signed_integer, scm_is_unsigned_integer,
scm_to_signed_integer, scm_to_unsigned_integer, scm_to_schar,
scm_to_uchar, scm_to_char, scm_to_short, scm_to_ushort, scm_to_long,
scm_to_ulong, scm_to_size_t, scm_to_ssize_t, scm_from_schar,
scm_from_uchar, scm_from_char, scm_from_short, scm_from_ushort,
scm_from_int, scm_from_uint, scm_from_long, scm_from_ulong,
scm_from_size_t, scm_from_ssize_t, scm_is_real, scm_to_double,
scm_from_double): New.
* deprecated.h, boolean.h (SCM_FALSEP, SCM_NFALSEP, SCM_BOOL,
SCM_NEGATE_BOOL, SCM_BOOLP): Deprecated by moving into "deprecated.h".
Replaced all uses with scm_is_false, scm_is_true, scm_from_bool, and
scm_is_bool, respectively.
2004-07-06 10:23:30 +00:00
|
|
|
|
}
|
|
|
|
|
|
}
|
|
|
|
|
|
else
|
|
|
|
|
|
return 0;
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
int
|
|
|
|
|
|
scm_is_unsigned_integer (SCM val, scm_t_uintmax min, scm_t_uintmax max)
|
|
|
|
|
|
{
|
2004-07-23 15:43:02 +00:00
|
|
|
|
if (SCM_I_INUMP (val))
|
(scm_is_integer, scm_is_signed_integer, scm_is_unsigned_integer,
scm_to_signed_integer, scm_to_unsigned_integer, scm_to_schar,
scm_to_uchar, scm_to_char, scm_to_short, scm_to_ushort, scm_to_long,
scm_to_ulong, scm_to_size_t, scm_to_ssize_t, scm_from_schar,
scm_from_uchar, scm_from_char, scm_from_short, scm_from_ushort,
scm_from_int, scm_from_uint, scm_from_long, scm_from_ulong,
scm_from_size_t, scm_from_ssize_t, scm_is_real, scm_to_double,
scm_from_double): New.
* deprecated.h, boolean.h (SCM_FALSEP, SCM_NFALSEP, SCM_BOOL,
SCM_NEGATE_BOOL, SCM_BOOLP): Deprecated by moving into "deprecated.h".
Replaced all uses with scm_is_false, scm_is_true, scm_from_bool, and
scm_is_bool, respectively.
2004-07-06 10:23:30 +00:00
|
|
|
|
{
|
2004-07-23 15:43:02 +00:00
|
|
|
|
scm_t_signed_bits n = SCM_I_INUM (val);
|
(scm_is_integer, scm_is_signed_integer, scm_is_unsigned_integer,
scm_to_signed_integer, scm_to_unsigned_integer, scm_to_schar,
scm_to_uchar, scm_to_char, scm_to_short, scm_to_ushort, scm_to_long,
scm_to_ulong, scm_to_size_t, scm_to_ssize_t, scm_from_schar,
scm_from_uchar, scm_from_char, scm_from_short, scm_from_ushort,
scm_from_int, scm_from_uint, scm_from_long, scm_from_ulong,
scm_from_size_t, scm_from_ssize_t, scm_is_real, scm_to_double,
scm_from_double): New.
* deprecated.h, boolean.h (SCM_FALSEP, SCM_NFALSEP, SCM_BOOL,
SCM_NEGATE_BOOL, SCM_BOOLP): Deprecated by moving into "deprecated.h".
Replaced all uses with scm_is_false, scm_is_true, scm_from_bool, and
scm_is_bool, respectively.
2004-07-06 10:23:30 +00:00
|
|
|
|
return n >= 0 && ((scm_t_uintmax)n) >= min && ((scm_t_uintmax)n) <= max;
|
|
|
|
|
|
}
|
|
|
|
|
|
else if (SCM_BIGP (val))
|
|
|
|
|
|
{
|
|
|
|
|
|
if (max <= SCM_MOST_POSITIVE_FIXNUM)
|
|
|
|
|
|
return 0;
|
|
|
|
|
|
else if (max <= ULONG_MAX)
|
2004-07-08 15:54:05 +00:00
|
|
|
|
{
|
|
|
|
|
|
if (mpz_fits_ulong_p (SCM_I_BIG_MPZ (val)))
|
|
|
|
|
|
{
|
|
|
|
|
|
unsigned long n = mpz_get_ui (SCM_I_BIG_MPZ (val));
|
|
|
|
|
|
return n >= min && n <= max;
|
|
|
|
|
|
}
|
|
|
|
|
|
else
|
|
|
|
|
|
return 0;
|
|
|
|
|
|
}
|
(scm_is_integer, scm_is_signed_integer, scm_is_unsigned_integer,
scm_to_signed_integer, scm_to_unsigned_integer, scm_to_schar,
scm_to_uchar, scm_to_char, scm_to_short, scm_to_ushort, scm_to_long,
scm_to_ulong, scm_to_size_t, scm_to_ssize_t, scm_from_schar,
scm_from_uchar, scm_from_char, scm_from_short, scm_from_ushort,
scm_from_int, scm_from_uint, scm_from_long, scm_from_ulong,
scm_from_size_t, scm_from_ssize_t, scm_is_real, scm_to_double,
scm_from_double): New.
* deprecated.h, boolean.h (SCM_FALSEP, SCM_NFALSEP, SCM_BOOL,
SCM_NEGATE_BOOL, SCM_BOOLP): Deprecated by moving into "deprecated.h".
Replaced all uses with scm_is_false, scm_is_true, scm_from_bool, and
scm_is_bool, respectively.
2004-07-06 10:23:30 +00:00
|
|
|
|
else
|
|
|
|
|
|
{
|
2004-07-08 15:54:05 +00:00
|
|
|
|
scm_t_uintmax n;
|
|
|
|
|
|
size_t count;
|
(scm_is_integer, scm_is_signed_integer, scm_is_unsigned_integer,
scm_to_signed_integer, scm_to_unsigned_integer, scm_to_schar,
scm_to_uchar, scm_to_char, scm_to_short, scm_to_ushort, scm_to_long,
scm_to_ulong, scm_to_size_t, scm_to_ssize_t, scm_from_schar,
scm_from_uchar, scm_from_char, scm_from_short, scm_from_ushort,
scm_from_int, scm_from_uint, scm_from_long, scm_from_ulong,
scm_from_size_t, scm_from_ssize_t, scm_is_real, scm_to_double,
scm_from_double): New.
* deprecated.h, boolean.h (SCM_FALSEP, SCM_NFALSEP, SCM_BOOL,
SCM_NEGATE_BOOL, SCM_BOOLP): Deprecated by moving into "deprecated.h".
Replaced all uses with scm_is_false, scm_is_true, scm_from_bool, and
scm_is_bool, respectively.
2004-07-06 10:23:30 +00:00
|
|
|
|
|
2004-07-08 15:54:05 +00:00
|
|
|
|
if (mpz_sgn (SCM_I_BIG_MPZ (val)) < 0)
|
|
|
|
|
|
return 0;
|
(scm_is_integer, scm_is_signed_integer, scm_is_unsigned_integer,
scm_to_signed_integer, scm_to_unsigned_integer, scm_to_schar,
scm_to_uchar, scm_to_char, scm_to_short, scm_to_ushort, scm_to_long,
scm_to_ulong, scm_to_size_t, scm_to_ssize_t, scm_from_schar,
scm_from_uchar, scm_from_char, scm_from_short, scm_from_ushort,
scm_from_int, scm_from_uint, scm_from_long, scm_from_ulong,
scm_from_size_t, scm_from_ssize_t, scm_is_real, scm_to_double,
scm_from_double): New.
* deprecated.h, boolean.h (SCM_FALSEP, SCM_NFALSEP, SCM_BOOL,
SCM_NEGATE_BOOL, SCM_BOOLP): Deprecated by moving into "deprecated.h".
Replaced all uses with scm_is_false, scm_is_true, scm_from_bool, and
scm_is_bool, respectively.
2004-07-06 10:23:30 +00:00
|
|
|
|
|
2004-07-08 15:54:05 +00:00
|
|
|
|
if (mpz_sizeinbase (SCM_I_BIG_MPZ (val), 2)
|
|
|
|
|
|
> CHAR_BIT*sizeof (scm_t_uintmax))
|
(scm_is_integer, scm_is_signed_integer, scm_is_unsigned_integer,
scm_to_signed_integer, scm_to_unsigned_integer, scm_to_schar,
scm_to_uchar, scm_to_char, scm_to_short, scm_to_ushort, scm_to_long,
scm_to_ulong, scm_to_size_t, scm_to_ssize_t, scm_from_schar,
scm_from_uchar, scm_from_char, scm_from_short, scm_from_ushort,
scm_from_int, scm_from_uint, scm_from_long, scm_from_ulong,
scm_from_size_t, scm_from_ssize_t, scm_is_real, scm_to_double,
scm_from_double): New.
* deprecated.h, boolean.h (SCM_FALSEP, SCM_NFALSEP, SCM_BOOL,
SCM_NEGATE_BOOL, SCM_BOOLP): Deprecated by moving into "deprecated.h".
Replaced all uses with scm_is_false, scm_is_true, scm_from_bool, and
scm_is_bool, respectively.
2004-07-06 10:23:30 +00:00
|
|
|
|
return 0;
|
2004-07-08 15:54:05 +00:00
|
|
|
|
|
|
|
|
|
|
mpz_export (&n, &count, 1, sizeof (scm_t_uintmax), 0, 0,
|
|
|
|
|
|
SCM_I_BIG_MPZ (val));
|
(scm_is_integer, scm_is_signed_integer, scm_is_unsigned_integer,
scm_to_signed_integer, scm_to_unsigned_integer, scm_to_schar,
scm_to_uchar, scm_to_char, scm_to_short, scm_to_ushort, scm_to_long,
scm_to_ulong, scm_to_size_t, scm_to_ssize_t, scm_from_schar,
scm_from_uchar, scm_from_char, scm_from_short, scm_from_ushort,
scm_from_int, scm_from_uint, scm_from_long, scm_from_ulong,
scm_from_size_t, scm_from_ssize_t, scm_is_real, scm_to_double,
scm_from_double): New.
* deprecated.h, boolean.h (SCM_FALSEP, SCM_NFALSEP, SCM_BOOL,
SCM_NEGATE_BOOL, SCM_BOOLP): Deprecated by moving into "deprecated.h".
Replaced all uses with scm_is_false, scm_is_true, scm_from_bool, and
scm_is_bool, respectively.
2004-07-06 10:23:30 +00:00
|
|
|
|
|
2004-07-08 15:54:05 +00:00
|
|
|
|
return n >= min && n <= max;
|
(scm_is_integer, scm_is_signed_integer, scm_is_unsigned_integer,
scm_to_signed_integer, scm_to_unsigned_integer, scm_to_schar,
scm_to_uchar, scm_to_char, scm_to_short, scm_to_ushort, scm_to_long,
scm_to_ulong, scm_to_size_t, scm_to_ssize_t, scm_from_schar,
scm_from_uchar, scm_from_char, scm_from_short, scm_from_ushort,
scm_from_int, scm_from_uint, scm_from_long, scm_from_ulong,
scm_from_size_t, scm_from_ssize_t, scm_is_real, scm_to_double,
scm_from_double): New.
* deprecated.h, boolean.h (SCM_FALSEP, SCM_NFALSEP, SCM_BOOL,
SCM_NEGATE_BOOL, SCM_BOOLP): Deprecated by moving into "deprecated.h".
Replaced all uses with scm_is_false, scm_is_true, scm_from_bool, and
scm_is_bool, respectively.
2004-07-06 10:23:30 +00:00
|
|
|
|
}
|
|
|
|
|
|
}
|
|
|
|
|
|
else
|
|
|
|
|
|
return 0;
|
|
|
|
|
|
}
|
|
|
|
|
|
|
2004-10-19 15:59:56 +00:00
|
|
|
|
static void
|
|
|
|
|
|
scm_i_range_error (SCM bad_val, SCM min, SCM max)
|
|
|
|
|
|
{
|
|
|
|
|
|
scm_error (scm_out_of_range_key,
|
|
|
|
|
|
NULL,
|
|
|
|
|
|
"Value out of range ~S to ~S: ~S",
|
|
|
|
|
|
scm_list_3 (min, max, bad_val),
|
|
|
|
|
|
scm_list_1 (bad_val));
|
|
|
|
|
|
}
|
|
|
|
|
|
|
* conv-integer.i.c, conv-uinteger.i.c: New files, used to generate
the functions below.
* numbers.c, numbers.h (scm_to_int8, scm_to_uint8, scm_to_int16,
scm_to_uint16, scm_to_int32, scm_to_uint32, scm_to_int64,
scm_to_uint64, scm_from_int8, scm_from_uint8, scm_from_int16,
scm_from_uint16, scm_from_int32, scm_from_uint32, scm_from_int64,
scm_from_uint64): Turned from macros into proper functions.
(scm_to_signed_integer, scm_to_unsigned_integer,
scm_from_signed_integer, scm_from_unsigned_integer): Generate via
conv-integer.i.c and conv-uinteger.i.c, as well.
2004-07-29 13:42:50 +00:00
|
|
|
|
#define TYPE scm_t_intmax
|
|
|
|
|
|
#define TYPE_MIN min
|
|
|
|
|
|
#define TYPE_MAX max
|
|
|
|
|
|
#define SIZEOF_TYPE 0
|
|
|
|
|
|
#define SCM_TO_TYPE_PROTO(arg) scm_to_signed_integer (arg, scm_t_intmax min, scm_t_intmax max)
|
|
|
|
|
|
#define SCM_FROM_TYPE_PROTO(arg) scm_from_signed_integer (arg)
|
|
|
|
|
|
#include "libguile/conv-integer.i.c"
|
|
|
|
|
|
|
|
|
|
|
|
#define TYPE scm_t_uintmax
|
|
|
|
|
|
#define TYPE_MIN min
|
|
|
|
|
|
#define TYPE_MAX max
|
|
|
|
|
|
#define SIZEOF_TYPE 0
|
|
|
|
|
|
#define SCM_TO_TYPE_PROTO(arg) scm_to_unsigned_integer (arg, scm_t_uintmax min, scm_t_uintmax max)
|
|
|
|
|
|
#define SCM_FROM_TYPE_PROTO(arg) scm_from_unsigned_integer (arg)
|
|
|
|
|
|
#include "libguile/conv-uinteger.i.c"
|
|
|
|
|
|
|
|
|
|
|
|
#define TYPE scm_t_int8
|
|
|
|
|
|
#define TYPE_MIN SCM_T_INT8_MIN
|
|
|
|
|
|
#define TYPE_MAX SCM_T_INT8_MAX
|
|
|
|
|
|
#define SIZEOF_TYPE 1
|
|
|
|
|
|
#define SCM_TO_TYPE_PROTO(arg) scm_to_int8 (arg)
|
|
|
|
|
|
#define SCM_FROM_TYPE_PROTO(arg) scm_from_int8 (arg)
|
|
|
|
|
|
#include "libguile/conv-integer.i.c"
|
|
|
|
|
|
|
|
|
|
|
|
#define TYPE scm_t_uint8
|
|
|
|
|
|
#define TYPE_MIN 0
|
|
|
|
|
|
#define TYPE_MAX SCM_T_UINT8_MAX
|
|
|
|
|
|
#define SIZEOF_TYPE 1
|
|
|
|
|
|
#define SCM_TO_TYPE_PROTO(arg) scm_to_uint8 (arg)
|
|
|
|
|
|
#define SCM_FROM_TYPE_PROTO(arg) scm_from_uint8 (arg)
|
|
|
|
|
|
#include "libguile/conv-uinteger.i.c"
|
|
|
|
|
|
|
|
|
|
|
|
#define TYPE scm_t_int16
|
|
|
|
|
|
#define TYPE_MIN SCM_T_INT16_MIN
|
|
|
|
|
|
#define TYPE_MAX SCM_T_INT16_MAX
|
|
|
|
|
|
#define SIZEOF_TYPE 2
|
|
|
|
|
|
#define SCM_TO_TYPE_PROTO(arg) scm_to_int16 (arg)
|
|
|
|
|
|
#define SCM_FROM_TYPE_PROTO(arg) scm_from_int16 (arg)
|
|
|
|
|
|
#include "libguile/conv-integer.i.c"
|
|
|
|
|
|
|
|
|
|
|
|
#define TYPE scm_t_uint16
|
|
|
|
|
|
#define TYPE_MIN 0
|
|
|
|
|
|
#define TYPE_MAX SCM_T_UINT16_MAX
|
|
|
|
|
|
#define SIZEOF_TYPE 2
|
|
|
|
|
|
#define SCM_TO_TYPE_PROTO(arg) scm_to_uint16 (arg)
|
|
|
|
|
|
#define SCM_FROM_TYPE_PROTO(arg) scm_from_uint16 (arg)
|
|
|
|
|
|
#include "libguile/conv-uinteger.i.c"
|
|
|
|
|
|
|
|
|
|
|
|
#define TYPE scm_t_int32
|
|
|
|
|
|
#define TYPE_MIN SCM_T_INT32_MIN
|
|
|
|
|
|
#define TYPE_MAX SCM_T_INT32_MAX
|
|
|
|
|
|
#define SIZEOF_TYPE 4
|
|
|
|
|
|
#define SCM_TO_TYPE_PROTO(arg) scm_to_int32 (arg)
|
|
|
|
|
|
#define SCM_FROM_TYPE_PROTO(arg) scm_from_int32 (arg)
|
|
|
|
|
|
#include "libguile/conv-integer.i.c"
|
|
|
|
|
|
|
|
|
|
|
|
#define TYPE scm_t_uint32
|
|
|
|
|
|
#define TYPE_MIN 0
|
|
|
|
|
|
#define TYPE_MAX SCM_T_UINT32_MAX
|
|
|
|
|
|
#define SIZEOF_TYPE 4
|
|
|
|
|
|
#define SCM_TO_TYPE_PROTO(arg) scm_to_uint32 (arg)
|
|
|
|
|
|
#define SCM_FROM_TYPE_PROTO(arg) scm_from_uint32 (arg)
|
|
|
|
|
|
#include "libguile/conv-uinteger.i.c"
|
|
|
|
|
|
|
2009-07-29 06:38:32 -07:00
|
|
|
|
#define TYPE scm_t_wchar
|
|
|
|
|
|
#define TYPE_MIN (scm_t_int32)-1
|
|
|
|
|
|
#define TYPE_MAX (scm_t_int32)0x10ffff
|
|
|
|
|
|
#define SIZEOF_TYPE 4
|
|
|
|
|
|
#define SCM_TO_TYPE_PROTO(arg) scm_to_wchar (arg)
|
|
|
|
|
|
#define SCM_FROM_TYPE_PROTO(arg) scm_from_wchar (arg)
|
|
|
|
|
|
#include "libguile/conv-integer.i.c"
|
|
|
|
|
|
|
* conv-integer.i.c, conv-uinteger.i.c: New files, used to generate
the functions below.
* numbers.c, numbers.h (scm_to_int8, scm_to_uint8, scm_to_int16,
scm_to_uint16, scm_to_int32, scm_to_uint32, scm_to_int64,
scm_to_uint64, scm_from_int8, scm_from_uint8, scm_from_int16,
scm_from_uint16, scm_from_int32, scm_from_uint32, scm_from_int64,
scm_from_uint64): Turned from macros into proper functions.
(scm_to_signed_integer, scm_to_unsigned_integer,
scm_from_signed_integer, scm_from_unsigned_integer): Generate via
conv-integer.i.c and conv-uinteger.i.c, as well.
2004-07-29 13:42:50 +00:00
|
|
|
|
#define TYPE scm_t_int64
|
|
|
|
|
|
#define TYPE_MIN SCM_T_INT64_MIN
|
|
|
|
|
|
#define TYPE_MAX SCM_T_INT64_MAX
|
|
|
|
|
|
#define SIZEOF_TYPE 8
|
|
|
|
|
|
#define SCM_TO_TYPE_PROTO(arg) scm_to_int64 (arg)
|
|
|
|
|
|
#define SCM_FROM_TYPE_PROTO(arg) scm_from_int64 (arg)
|
|
|
|
|
|
#include "libguile/conv-integer.i.c"
|
|
|
|
|
|
|
|
|
|
|
|
#define TYPE scm_t_uint64
|
|
|
|
|
|
#define TYPE_MIN 0
|
|
|
|
|
|
#define TYPE_MAX SCM_T_UINT64_MAX
|
|
|
|
|
|
#define SIZEOF_TYPE 8
|
|
|
|
|
|
#define SCM_TO_TYPE_PROTO(arg) scm_to_uint64 (arg)
|
|
|
|
|
|
#define SCM_FROM_TYPE_PROTO(arg) scm_from_uint64 (arg)
|
|
|
|
|
|
#include "libguile/conv-uinteger.i.c"
|
(scm_is_integer, scm_is_signed_integer, scm_is_unsigned_integer,
scm_to_signed_integer, scm_to_unsigned_integer, scm_to_schar,
scm_to_uchar, scm_to_char, scm_to_short, scm_to_ushort, scm_to_long,
scm_to_ulong, scm_to_size_t, scm_to_ssize_t, scm_from_schar,
scm_from_uchar, scm_from_char, scm_from_short, scm_from_ushort,
scm_from_int, scm_from_uint, scm_from_long, scm_from_ulong,
scm_from_size_t, scm_from_ssize_t, scm_is_real, scm_to_double,
scm_from_double): New.
* deprecated.h, boolean.h (SCM_FALSEP, SCM_NFALSEP, SCM_BOOL,
SCM_NEGATE_BOOL, SCM_BOOLP): Deprecated by moving into "deprecated.h".
Replaced all uses with scm_is_false, scm_is_true, scm_from_bool, and
scm_is_bool, respectively.
2004-07-06 10:23:30 +00:00
|
|
|
|
|
2004-09-21 00:42:30 +00:00
|
|
|
|
void
|
|
|
|
|
|
scm_to_mpz (SCM val, mpz_t rop)
|
|
|
|
|
|
{
|
|
|
|
|
|
if (SCM_I_INUMP (val))
|
|
|
|
|
|
mpz_set_si (rop, SCM_I_INUM (val));
|
|
|
|
|
|
else if (SCM_BIGP (val))
|
|
|
|
|
|
mpz_set (rop, SCM_I_BIG_MPZ (val));
|
|
|
|
|
|
else
|
|
|
|
|
|
scm_wrong_type_arg_msg (NULL, 0, val, "exact integer");
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
SCM
|
|
|
|
|
|
scm_from_mpz (mpz_t val)
|
|
|
|
|
|
{
|
|
|
|
|
|
return scm_i_mpz2num (val);
|
|
|
|
|
|
}
|
|
|
|
|
|
|
(scm_is_integer, scm_is_signed_integer, scm_is_unsigned_integer,
scm_to_signed_integer, scm_to_unsigned_integer, scm_to_schar,
scm_to_uchar, scm_to_char, scm_to_short, scm_to_ushort, scm_to_long,
scm_to_ulong, scm_to_size_t, scm_to_ssize_t, scm_from_schar,
scm_from_uchar, scm_from_char, scm_from_short, scm_from_ushort,
scm_from_int, scm_from_uint, scm_from_long, scm_from_ulong,
scm_from_size_t, scm_from_ssize_t, scm_is_real, scm_to_double,
scm_from_double): New.
* deprecated.h, boolean.h (SCM_FALSEP, SCM_NFALSEP, SCM_BOOL,
SCM_NEGATE_BOOL, SCM_BOOLP): Deprecated by moving into "deprecated.h".
Replaced all uses with scm_is_false, scm_is_true, scm_from_bool, and
scm_is_bool, respectively.
2004-07-06 10:23:30 +00:00
|
|
|
|
int
|
|
|
|
|
|
scm_is_real (SCM val)
|
|
|
|
|
|
{
|
|
|
|
|
|
return scm_is_true (scm_real_p (val));
|
|
|
|
|
|
}
|
|
|
|
|
|
|
(scm_is_rational): New.
(scm_i_short2big, scm_i_int2big, scm_i_uint2big, scm_i_size2big,
scm_i_ptrdiff2big, scm_i_long_long2big, scm_i_ulong_long2big):
Removed prototypes.
(scm_make_real, scm_num2dbl, scm_float2num, scm_double2num):
Discouraged by moving to discouraged.h and discouraged.c.
Replaced all uses with scm_from_double.
(scm_num2float, scm_num2double): Discouraged by moving prototype
to discouraged.h and rewriting in terms of scm_to_double.
Replaced all uses with scm_to_double.
(scm_to_double): Do not implement in terms of scm_num2dbl, use
explicit code.
(scm_from_double): Do not implement in terms of scm_make_real, use
explicit code.
2004-08-03 15:03:35 +00:00
|
|
|
|
int
|
|
|
|
|
|
scm_is_rational (SCM val)
|
|
|
|
|
|
{
|
|
|
|
|
|
return scm_is_true (scm_rational_p (val));
|
|
|
|
|
|
}
|
|
|
|
|
|
|
(scm_is_integer, scm_is_signed_integer, scm_is_unsigned_integer,
scm_to_signed_integer, scm_to_unsigned_integer, scm_to_schar,
scm_to_uchar, scm_to_char, scm_to_short, scm_to_ushort, scm_to_long,
scm_to_ulong, scm_to_size_t, scm_to_ssize_t, scm_from_schar,
scm_from_uchar, scm_from_char, scm_from_short, scm_from_ushort,
scm_from_int, scm_from_uint, scm_from_long, scm_from_ulong,
scm_from_size_t, scm_from_ssize_t, scm_is_real, scm_to_double,
scm_from_double): New.
* deprecated.h, boolean.h (SCM_FALSEP, SCM_NFALSEP, SCM_BOOL,
SCM_NEGATE_BOOL, SCM_BOOLP): Deprecated by moving into "deprecated.h".
Replaced all uses with scm_is_false, scm_is_true, scm_from_bool, and
scm_is_bool, respectively.
2004-07-06 10:23:30 +00:00
|
|
|
|
double
|
|
|
|
|
|
scm_to_double (SCM val)
|
|
|
|
|
|
{
|
(scm_is_rational): New.
(scm_i_short2big, scm_i_int2big, scm_i_uint2big, scm_i_size2big,
scm_i_ptrdiff2big, scm_i_long_long2big, scm_i_ulong_long2big):
Removed prototypes.
(scm_make_real, scm_num2dbl, scm_float2num, scm_double2num):
Discouraged by moving to discouraged.h and discouraged.c.
Replaced all uses with scm_from_double.
(scm_num2float, scm_num2double): Discouraged by moving prototype
to discouraged.h and rewriting in terms of scm_to_double.
Replaced all uses with scm_to_double.
(scm_to_double): Do not implement in terms of scm_num2dbl, use
explicit code.
(scm_from_double): Do not implement in terms of scm_make_real, use
explicit code.
2004-08-03 15:03:35 +00:00
|
|
|
|
if (SCM_I_INUMP (val))
|
|
|
|
|
|
return SCM_I_INUM (val);
|
|
|
|
|
|
else if (SCM_BIGP (val))
|
|
|
|
|
|
return scm_i_big2dbl (val);
|
|
|
|
|
|
else if (SCM_FRACTIONP (val))
|
|
|
|
|
|
return scm_i_fraction2double (val);
|
|
|
|
|
|
else if (SCM_REALP (val))
|
|
|
|
|
|
return SCM_REAL_VALUE (val);
|
|
|
|
|
|
else
|
2004-10-29 14:17:20 +00:00
|
|
|
|
scm_wrong_type_arg_msg (NULL, 0, val, "real number");
|
(scm_is_integer, scm_is_signed_integer, scm_is_unsigned_integer,
scm_to_signed_integer, scm_to_unsigned_integer, scm_to_schar,
scm_to_uchar, scm_to_char, scm_to_short, scm_to_ushort, scm_to_long,
scm_to_ulong, scm_to_size_t, scm_to_ssize_t, scm_from_schar,
scm_from_uchar, scm_from_char, scm_from_short, scm_from_ushort,
scm_from_int, scm_from_uint, scm_from_long, scm_from_ulong,
scm_from_size_t, scm_from_ssize_t, scm_is_real, scm_to_double,
scm_from_double): New.
* deprecated.h, boolean.h (SCM_FALSEP, SCM_NFALSEP, SCM_BOOL,
SCM_NEGATE_BOOL, SCM_BOOLP): Deprecated by moving into "deprecated.h".
Replaced all uses with scm_is_false, scm_is_true, scm_from_bool, and
scm_is_bool, respectively.
2004-07-06 10:23:30 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
SCM
|
|
|
|
|
|
scm_from_double (double val)
|
|
|
|
|
|
{
|
(scm_is_rational): New.
(scm_i_short2big, scm_i_int2big, scm_i_uint2big, scm_i_size2big,
scm_i_ptrdiff2big, scm_i_long_long2big, scm_i_ulong_long2big):
Removed prototypes.
(scm_make_real, scm_num2dbl, scm_float2num, scm_double2num):
Discouraged by moving to discouraged.h and discouraged.c.
Replaced all uses with scm_from_double.
(scm_num2float, scm_num2double): Discouraged by moving prototype
to discouraged.h and rewriting in terms of scm_to_double.
Replaced all uses with scm_to_double.
(scm_to_double): Do not implement in terms of scm_num2dbl, use
explicit code.
(scm_from_double): Do not implement in terms of scm_make_real, use
explicit code.
2004-08-03 15:03:35 +00:00
|
|
|
|
SCM z = scm_double_cell (scm_tc16_real, 0, 0, 0);
|
|
|
|
|
|
SCM_REAL_VALUE (z) = val;
|
|
|
|
|
|
return z;
|
(scm_is_integer, scm_is_signed_integer, scm_is_unsigned_integer,
scm_to_signed_integer, scm_to_unsigned_integer, scm_to_schar,
scm_to_uchar, scm_to_char, scm_to_short, scm_to_ushort, scm_to_long,
scm_to_ulong, scm_to_size_t, scm_to_ssize_t, scm_from_schar,
scm_from_uchar, scm_from_char, scm_from_short, scm_from_ushort,
scm_from_int, scm_from_uint, scm_from_long, scm_from_ulong,
scm_from_size_t, scm_from_ssize_t, scm_is_real, scm_to_double,
scm_from_double): New.
* deprecated.h, boolean.h (SCM_FALSEP, SCM_NFALSEP, SCM_BOOL,
SCM_NEGATE_BOOL, SCM_BOOLP): Deprecated by moving into "deprecated.h".
Replaced all uses with scm_is_false, scm_is_true, scm_from_bool, and
scm_is_bool, respectively.
2004-07-06 10:23:30 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
2010-08-08 13:43:40 +02:00
|
|
|
|
#if SCM_ENABLE_DEPRECATED == 1
|
(scm_is_rational): New.
(scm_i_short2big, scm_i_int2big, scm_i_uint2big, scm_i_size2big,
scm_i_ptrdiff2big, scm_i_long_long2big, scm_i_ulong_long2big):
Removed prototypes.
(scm_make_real, scm_num2dbl, scm_float2num, scm_double2num):
Discouraged by moving to discouraged.h and discouraged.c.
Replaced all uses with scm_from_double.
(scm_num2float, scm_num2double): Discouraged by moving prototype
to discouraged.h and rewriting in terms of scm_to_double.
Replaced all uses with scm_to_double.
(scm_to_double): Do not implement in terms of scm_num2dbl, use
explicit code.
(scm_from_double): Do not implement in terms of scm_make_real, use
explicit code.
2004-08-03 15:03:35 +00:00
|
|
|
|
|
|
|
|
|
|
float
|
|
|
|
|
|
scm_num2float (SCM num, unsigned long int pos, const char *s_caller)
|
|
|
|
|
|
{
|
2010-08-08 13:43:40 +02:00
|
|
|
|
scm_c_issue_deprecation_warning
|
|
|
|
|
|
("`scm_num2float' is deprecated. Use scm_to_double instead.");
|
|
|
|
|
|
|
(scm_is_rational): New.
(scm_i_short2big, scm_i_int2big, scm_i_uint2big, scm_i_size2big,
scm_i_ptrdiff2big, scm_i_long_long2big, scm_i_ulong_long2big):
Removed prototypes.
(scm_make_real, scm_num2dbl, scm_float2num, scm_double2num):
Discouraged by moving to discouraged.h and discouraged.c.
Replaced all uses with scm_from_double.
(scm_num2float, scm_num2double): Discouraged by moving prototype
to discouraged.h and rewriting in terms of scm_to_double.
Replaced all uses with scm_to_double.
(scm_to_double): Do not implement in terms of scm_num2dbl, use
explicit code.
(scm_from_double): Do not implement in terms of scm_make_real, use
explicit code.
2004-08-03 15:03:35 +00:00
|
|
|
|
if (SCM_BIGP (num))
|
|
|
|
|
|
{
|
|
|
|
|
|
float res = mpz_get_d (SCM_I_BIG_MPZ (num));
|
|
|
|
|
|
if (!xisinf (res))
|
|
|
|
|
|
return res;
|
|
|
|
|
|
else
|
|
|
|
|
|
scm_out_of_range (NULL, num);
|
|
|
|
|
|
}
|
|
|
|
|
|
else
|
|
|
|
|
|
return scm_to_double (num);
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
double
|
|
|
|
|
|
scm_num2double (SCM num, unsigned long int pos, const char *s_caller)
|
|
|
|
|
|
{
|
2010-08-08 13:43:40 +02:00
|
|
|
|
scm_c_issue_deprecation_warning
|
|
|
|
|
|
("`scm_num2double' is deprecated. Use scm_to_double instead.");
|
|
|
|
|
|
|
(scm_is_rational): New.
(scm_i_short2big, scm_i_int2big, scm_i_uint2big, scm_i_size2big,
scm_i_ptrdiff2big, scm_i_long_long2big, scm_i_ulong_long2big):
Removed prototypes.
(scm_make_real, scm_num2dbl, scm_float2num, scm_double2num):
Discouraged by moving to discouraged.h and discouraged.c.
Replaced all uses with scm_from_double.
(scm_num2float, scm_num2double): Discouraged by moving prototype
to discouraged.h and rewriting in terms of scm_to_double.
Replaced all uses with scm_to_double.
(scm_to_double): Do not implement in terms of scm_num2dbl, use
explicit code.
(scm_from_double): Do not implement in terms of scm_make_real, use
explicit code.
2004-08-03 15:03:35 +00:00
|
|
|
|
if (SCM_BIGP (num))
|
|
|
|
|
|
{
|
|
|
|
|
|
double res = mpz_get_d (SCM_I_BIG_MPZ (num));
|
|
|
|
|
|
if (!xisinf (res))
|
|
|
|
|
|
return res;
|
|
|
|
|
|
else
|
|
|
|
|
|
scm_out_of_range (NULL, num);
|
|
|
|
|
|
}
|
|
|
|
|
|
else
|
|
|
|
|
|
return scm_to_double (num);
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
#endif
|
|
|
|
|
|
|
2004-08-03 17:12:14 +00:00
|
|
|
|
int
|
|
|
|
|
|
scm_is_complex (SCM val)
|
|
|
|
|
|
{
|
|
|
|
|
|
return scm_is_true (scm_complex_p (val));
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
double
|
|
|
|
|
|
scm_c_real_part (SCM z)
|
|
|
|
|
|
{
|
|
|
|
|
|
if (SCM_COMPLEXP (z))
|
|
|
|
|
|
return SCM_COMPLEX_REAL (z);
|
|
|
|
|
|
else
|
|
|
|
|
|
{
|
|
|
|
|
|
/* Use the scm_real_part to get proper error checking and
|
|
|
|
|
|
dispatching.
|
|
|
|
|
|
*/
|
|
|
|
|
|
return scm_to_double (scm_real_part (z));
|
|
|
|
|
|
}
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
double
|
|
|
|
|
|
scm_c_imag_part (SCM z)
|
|
|
|
|
|
{
|
|
|
|
|
|
if (SCM_COMPLEXP (z))
|
|
|
|
|
|
return SCM_COMPLEX_IMAG (z);
|
|
|
|
|
|
else
|
|
|
|
|
|
{
|
|
|
|
|
|
/* Use the scm_imag_part to get proper error checking and
|
|
|
|
|
|
dispatching. The result will almost always be 0.0, but not
|
|
|
|
|
|
always.
|
|
|
|
|
|
*/
|
|
|
|
|
|
return scm_to_double (scm_imag_part (z));
|
|
|
|
|
|
}
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
double
|
|
|
|
|
|
scm_c_magnitude (SCM z)
|
|
|
|
|
|
{
|
|
|
|
|
|
return scm_to_double (scm_magnitude (z));
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
double
|
|
|
|
|
|
scm_c_angle (SCM z)
|
|
|
|
|
|
{
|
|
|
|
|
|
return scm_to_double (scm_angle (z));
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
int
|
|
|
|
|
|
scm_is_number (SCM z)
|
|
|
|
|
|
{
|
|
|
|
|
|
return scm_is_true (scm_number_p (z));
|
|
|
|
|
|
}
|
|
|
|
|
|
|
2006-10-09 23:40:48 +00:00
|
|
|
|
|
|
|
|
|
|
/* In the following functions we dispatch to the real-arg funcs like log()
|
|
|
|
|
|
when we know the arg is real, instead of just handing everything to
|
|
|
|
|
|
clog() for instance. This is in case clog() doesn't optimize for a
|
|
|
|
|
|
real-only case, and because we have to test SCM_COMPLEXP anyway so may as
|
|
|
|
|
|
well use it to go straight to the applicable C func. */
|
|
|
|
|
|
|
|
|
|
|
|
SCM_DEFINE (scm_log, "log", 1, 0, 0,
|
|
|
|
|
|
(SCM z),
|
|
|
|
|
|
"Return the natural logarithm of @var{z}.")
|
|
|
|
|
|
#define FUNC_NAME s_scm_log
|
|
|
|
|
|
{
|
|
|
|
|
|
if (SCM_COMPLEXP (z))
|
|
|
|
|
|
{
|
2008-02-11 21:20:14 +00:00
|
|
|
|
#if HAVE_COMPLEX_DOUBLE && HAVE_CLOG && defined (SCM_COMPLEX_VALUE)
|
2006-10-09 23:40:48 +00:00
|
|
|
|
return scm_from_complex_double (clog (SCM_COMPLEX_VALUE (z)));
|
|
|
|
|
|
#else
|
|
|
|
|
|
double re = SCM_COMPLEX_REAL (z);
|
|
|
|
|
|
double im = SCM_COMPLEX_IMAG (z);
|
|
|
|
|
|
return scm_c_make_rectangular (log (hypot (re, im)),
|
|
|
|
|
|
atan2 (im, re));
|
|
|
|
|
|
#endif
|
|
|
|
|
|
}
|
|
|
|
|
|
else
|
|
|
|
|
|
{
|
|
|
|
|
|
/* ENHANCE-ME: When z is a bignum the logarithm will fit a double
|
|
|
|
|
|
although the value itself overflows. */
|
|
|
|
|
|
double re = scm_to_double (z);
|
|
|
|
|
|
double l = log (fabs (re));
|
|
|
|
|
|
if (re >= 0.0)
|
|
|
|
|
|
return scm_from_double (l);
|
|
|
|
|
|
else
|
|
|
|
|
|
return scm_c_make_rectangular (l, M_PI);
|
|
|
|
|
|
}
|
|
|
|
|
|
}
|
|
|
|
|
|
#undef FUNC_NAME
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
SCM_DEFINE (scm_log10, "log10", 1, 0, 0,
|
|
|
|
|
|
(SCM z),
|
|
|
|
|
|
"Return the base 10 logarithm of @var{z}.")
|
|
|
|
|
|
#define FUNC_NAME s_scm_log10
|
|
|
|
|
|
{
|
|
|
|
|
|
if (SCM_COMPLEXP (z))
|
|
|
|
|
|
{
|
|
|
|
|
|
/* Mingw has clog() but not clog10(). (Maybe it'd be worth using
|
|
|
|
|
|
clog() and a multiply by M_LOG10E, rather than the fallback
|
|
|
|
|
|
log10+hypot+atan2.) */
|
2008-02-11 21:20:14 +00:00
|
|
|
|
#if HAVE_COMPLEX_DOUBLE && HAVE_CLOG10 && defined (SCM_COMPLEX_VALUE)
|
2006-10-09 23:40:48 +00:00
|
|
|
|
return scm_from_complex_double (clog10 (SCM_COMPLEX_VALUE (z)));
|
|
|
|
|
|
#else
|
|
|
|
|
|
double re = SCM_COMPLEX_REAL (z);
|
|
|
|
|
|
double im = SCM_COMPLEX_IMAG (z);
|
|
|
|
|
|
return scm_c_make_rectangular (log10 (hypot (re, im)),
|
|
|
|
|
|
M_LOG10E * atan2 (im, re));
|
|
|
|
|
|
#endif
|
|
|
|
|
|
}
|
|
|
|
|
|
else
|
|
|
|
|
|
{
|
|
|
|
|
|
/* ENHANCE-ME: When z is a bignum the logarithm will fit a double
|
|
|
|
|
|
although the value itself overflows. */
|
|
|
|
|
|
double re = scm_to_double (z);
|
|
|
|
|
|
double l = log10 (fabs (re));
|
|
|
|
|
|
if (re >= 0.0)
|
|
|
|
|
|
return scm_from_double (l);
|
|
|
|
|
|
else
|
|
|
|
|
|
return scm_c_make_rectangular (l, M_LOG10E * M_PI);
|
|
|
|
|
|
}
|
|
|
|
|
|
}
|
|
|
|
|
|
#undef FUNC_NAME
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
SCM_DEFINE (scm_exp, "exp", 1, 0, 0,
|
|
|
|
|
|
(SCM z),
|
|
|
|
|
|
"Return @math{e} to the power of @var{z}, where @math{e} is the\n"
|
|
|
|
|
|
"base of natural logarithms (2.71828@dots{}).")
|
|
|
|
|
|
#define FUNC_NAME s_scm_exp
|
|
|
|
|
|
{
|
|
|
|
|
|
if (SCM_COMPLEXP (z))
|
|
|
|
|
|
{
|
2008-02-11 21:20:14 +00:00
|
|
|
|
#if HAVE_COMPLEX_DOUBLE && HAVE_CEXP && defined (SCM_COMPLEX_VALUE)
|
2006-10-09 23:40:48 +00:00
|
|
|
|
return scm_from_complex_double (cexp (SCM_COMPLEX_VALUE (z)));
|
|
|
|
|
|
#else
|
|
|
|
|
|
return scm_c_make_polar (exp (SCM_COMPLEX_REAL (z)),
|
|
|
|
|
|
SCM_COMPLEX_IMAG (z));
|
|
|
|
|
|
#endif
|
|
|
|
|
|
}
|
|
|
|
|
|
else
|
|
|
|
|
|
{
|
|
|
|
|
|
/* When z is a negative bignum the conversion to double overflows,
|
|
|
|
|
|
giving -infinity, but that's ok, the exp is still 0.0. */
|
|
|
|
|
|
return scm_from_double (exp (scm_to_double (z)));
|
|
|
|
|
|
}
|
|
|
|
|
|
}
|
|
|
|
|
|
#undef FUNC_NAME
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
SCM_DEFINE (scm_sqrt, "sqrt", 1, 0, 0,
|
|
|
|
|
|
(SCM x),
|
|
|
|
|
|
"Return the square root of @var{z}. Of the two possible roots\n"
|
|
|
|
|
|
"(positive and negative), the one with the a positive real part\n"
|
|
|
|
|
|
"is returned, or if that's zero then a positive imaginary part.\n"
|
|
|
|
|
|
"Thus,\n"
|
|
|
|
|
|
"\n"
|
|
|
|
|
|
"@example\n"
|
|
|
|
|
|
"(sqrt 9.0) @result{} 3.0\n"
|
|
|
|
|
|
"(sqrt -9.0) @result{} 0.0+3.0i\n"
|
|
|
|
|
|
"(sqrt 1.0+1.0i) @result{} 1.09868411346781+0.455089860562227i\n"
|
|
|
|
|
|
"(sqrt -1.0-1.0i) @result{} 0.455089860562227-1.09868411346781i\n"
|
|
|
|
|
|
"@end example")
|
|
|
|
|
|
#define FUNC_NAME s_scm_sqrt
|
|
|
|
|
|
{
|
|
|
|
|
|
if (SCM_COMPLEXP (x))
|
|
|
|
|
|
{
|
2008-02-11 21:20:14 +00:00
|
|
|
|
#if HAVE_COMPLEX_DOUBLE && HAVE_USABLE_CSQRT && defined (SCM_COMPLEX_VALUE)
|
2006-10-09 23:40:48 +00:00
|
|
|
|
return scm_from_complex_double (csqrt (SCM_COMPLEX_VALUE (x)));
|
|
|
|
|
|
#else
|
|
|
|
|
|
double re = SCM_COMPLEX_REAL (x);
|
|
|
|
|
|
double im = SCM_COMPLEX_IMAG (x);
|
|
|
|
|
|
return scm_c_make_polar (sqrt (hypot (re, im)),
|
|
|
|
|
|
0.5 * atan2 (im, re));
|
|
|
|
|
|
#endif
|
|
|
|
|
|
}
|
|
|
|
|
|
else
|
|
|
|
|
|
{
|
|
|
|
|
|
double xx = scm_to_double (x);
|
|
|
|
|
|
if (xx < 0)
|
|
|
|
|
|
return scm_c_make_rectangular (0.0, sqrt (-xx));
|
|
|
|
|
|
else
|
|
|
|
|
|
return scm_from_double (sqrt (xx));
|
|
|
|
|
|
}
|
|
|
|
|
|
}
|
|
|
|
|
|
#undef FUNC_NAME
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1996-07-25 22:56:11 +00:00
|
|
|
|
void
|
|
|
|
|
|
scm_init_numbers ()
|
|
|
|
|
|
{
|
2004-05-10 20:35:39 +00:00
|
|
|
|
int i;
|
|
|
|
|
|
|
2003-05-30 00:23:11 +00:00
|
|
|
|
mpz_init_set_si (z_negative_one, -1);
|
|
|
|
|
|
|
2000-12-14 00:08:56 +00:00
|
|
|
|
/* It may be possible to tune the performance of some algorithms by using
|
|
|
|
|
|
* the following constants to avoid the creation of bignums. Please, before
|
|
|
|
|
|
* using these values, remember the two rules of program optimization:
|
|
|
|
|
|
* 1st Rule: Don't do it. 2nd Rule (experts only): Don't do it yet. */
|
2001-05-15 14:57:22 +00:00
|
|
|
|
scm_c_define ("most-positive-fixnum",
|
2004-07-08 15:54:05 +00:00
|
|
|
|
SCM_I_MAKINUM (SCM_MOST_POSITIVE_FIXNUM));
|
2001-05-15 14:57:22 +00:00
|
|
|
|
scm_c_define ("most-negative-fixnum",
|
2004-07-08 15:54:05 +00:00
|
|
|
|
SCM_I_MAKINUM (SCM_MOST_NEGATIVE_FIXNUM));
|
2000-12-14 00:08:56 +00:00
|
|
|
|
|
* __scm.h eq.c, eval.c, gc.c, hc.h, gh_data, hash.c, numbers.c,
numbers.h, objects.c, ramap.c, random.c, unif.c, unif.h: Extensive
rewrite of handling of real and complex numbers.
(SCM_FLOATS, SCM_SINGLES): These #ifdef conditionals have been
removed along with the support for floats. (Float vectors are
still supported.)
* numbers.c (scm_floprint, scm_floequal): Removed.
(scm_print_real, scm_print_complex, scm_real_equalp,
scm_complex_equalp): New functions.
* numbers.c (scm_makdbl): no malloc'ing needed, so the
{DEFER,ALLOW}_INTS thing removed.
2000-03-14 06:41:12 +00:00
|
|
|
|
scm_add_feature ("complex");
|
|
|
|
|
|
scm_add_feature ("inexact");
|
decruftify scm_sys_protects
* libguile/root.h
* libguile/root.c (scm_sys_protects): It used to be that for some reason
we'd define a special array of "protected" values. This was a little
silly, always, but with the BDW GC it's completely unnecessary. Also
many of these variables were unused, and none of them were good API.
So remove this array, and either eliminate, make static, or make
internal the various values.
* libguile/snarf.h: No need to generate calls to scm_permanent_object.
* guile-readline/readline.c (scm_init_readline): No need to call
scm_permanent_object.
* libguile/array-map.c (ramap, rafe): Remove the dubious nullvect
optimizations.
* libguile/async.c (scm_init_async): No need to init scm_asyncs, it is
no more.
* libguile/eval.c (scm_init_eval): No need to init scm_listofnull, it is
no more.
* libguile/gc.c: Make scm_protects a static var.
(scm_storage_prehistory): Change the sanity check to use the address
of protects.
(scm_init_gc_protect_object): No need to clear the scm_sys_protects,
as it is no more.
* libguile/keywords.c: Make the keyword obarray a static var.
* libguile/numbers.c: Make flo0 a static var.
* libguile/objprop.c: Make object_whash a static var.
* libguile/properties.c: Make properties_whash a static var.
* libguile/srcprop.h:
* libguile/srcprop.c: Make scm_source_whash a global with internal
linkage.
* libguile/strings.h:
* libguile/strings.c: Make scm_nullstr a global with internal linkage.
* libguile/vectors.c (scm_init_vectors): No need to init scm_nullvect,
it's unused.
2009-12-05 12:38:32 +01:00
|
|
|
|
flo0 = scm_from_double (0.0);
|
2004-05-10 20:35:39 +00:00
|
|
|
|
|
|
|
|
|
|
/* determine floating point precision */
|
(scm_is_rational): New.
(scm_i_short2big, scm_i_int2big, scm_i_uint2big, scm_i_size2big,
scm_i_ptrdiff2big, scm_i_long_long2big, scm_i_ulong_long2big):
Removed prototypes.
(scm_make_real, scm_num2dbl, scm_float2num, scm_double2num):
Discouraged by moving to discouraged.h and discouraged.c.
Replaced all uses with scm_from_double.
(scm_num2float, scm_num2double): Discouraged by moving prototype
to discouraged.h and rewriting in terms of scm_to_double.
Replaced all uses with scm_to_double.
(scm_to_double): Do not implement in terms of scm_num2dbl, use
explicit code.
(scm_from_double): Do not implement in terms of scm_make_real, use
explicit code.
2004-08-03 15:03:35 +00:00
|
|
|
|
for (i=2; i <= SCM_MAX_DBL_RADIX; ++i)
|
2004-05-10 20:35:39 +00:00
|
|
|
|
{
|
|
|
|
|
|
init_dblprec(&scm_dblprec[i-2],i);
|
|
|
|
|
|
init_fx_radix(fx_per_radix[i-2],i);
|
|
|
|
|
|
}
|
1999-01-10 07:38:39 +00:00
|
|
|
|
#ifdef DBL_DIG
|
2004-05-10 20:35:39 +00:00
|
|
|
|
/* hard code precision for base 10 if the preprocessor tells us to... */
|
2009-12-05 11:30:09 +01:00
|
|
|
|
scm_dblprec[10-2] = (DBL_DIG > 20) ? 20 : DBL_DIG;
|
2004-05-10 20:35:39 +00:00
|
|
|
|
#endif
|
* validate.h
(SCM_NUM2{SIZE,PTRDIFF,SHORT,USHORT,BITS,UBITS,INT,UINT}[_DEF]):
new macros.
* unif.h: type renaming:
scm_array -> scm_array_t
scm_array_dim -> scm_array_dim_t
the old names are deprecated, all in-Guile uses changed.
* tags.h (scm_ubits_t): new typedef, representing unsigned
scm_bits_t.
* stacks.h: type renaming:
scm_info_frame -> scm_info_frame_t
scm_stack -> scm_stack_t
the old names are deprecated, all in-Guile uses changed.
* srcprop.h: type renaming:
scm_srcprops -> scm_srcprops_t
scm_srcprops_chunk -> scm_srcprops_chunk_t
the old names are deprecated, all in-Guile uses changed.
* gsubr.c, procs.c, print.c, ports.c, read.c, rdelim.c, ramap.c,
rw.c, smob.c, sort.c, srcprop.c, stacks.c, strings.c, strop.c,
strorder.c, strports.c, struct.c, symbols.c, unif.c, values.c,
vectors.c, vports.c, weaks.c:
various int/size_t -> size_t/scm_bits_t changes.
* random.h: type renaming:
scm_rstate -> scm_rstate_t
scm_rng -> scm_rng_t
scm_i_rstate -> scm_i_rstate_t
the old names are deprecated, all in-Guile uses changed.
* procs.h: type renaming:
scm_subr_entry -> scm_subr_entry_t
the old name is deprecated, all in-Guile uses changed.
* options.h (scm_option_t.val): unsigned long -> scm_bits_t.
type renaming:
scm_option -> scm_option_t
the old name is deprecated, all in-Guile uses changed.
* objects.c: various long -> scm_bits_t changes.
(scm_i_make_class_object): flags: unsigned long -> scm_ubits_t
* numbers.h (SCM_FIXNUM_BIT): deprecated, renamed to
SCM_I_FIXNUM_BIT.
* num2integral.i.c: new file, multiply included by numbers.c, used
to "templatize" the various integral <-> num conversion routines.
* numbers.c (scm_mkbig, scm_big2num, scm_adjbig, scm_normbig,
scm_copybig, scm_2ulong2big, scm_dbl2big, scm_big2dbl):
deprecated.
(scm_i_mkbig, scm_i_big2inum, scm_i_adjbig, scm_i_normbig,
scm_i_copybig, scm_i_short2big, scm_i_ushort2big, scm_i_int2big,
scm_i_uint2big, scm_i_long2big, scm_i_ulong2big, scm_i_bits2big,
scm_i_ubits2big, scm_i_size2big, scm_i_ptrdiff2big,
scm_i_long_long2big, scm_i_ulong_long2big, scm_i_dbl2big,
scm_i_big2dbl, scm_short2num, scm_ushort2num, scm_int2num,
scm_uint2num, scm_bits2num, scm_ubits2num, scm_size2num,
scm_ptrdiff2num, scm_num2short, scm_num2ushort, scm_num2int,
scm_num2uint, scm_num2bits, scm_num2ubits, scm_num2ptrdiff,
scm_num2size): new functions.
* modules.c (scm_module_reverse_lookup): i, n: int -> scm_bits_t.x
* load.c: change int -> size_t in various places (where the
variable is used to store a string length).
(search-path): call scm_done_free, not scm_done_malloc.
* list.c (scm_ilength): return a scm_bits_t, not long.
some other {int,long} -> scm_bits_t changes.
* hashtab.c: various [u]int -> scm_bits_t changes.
scm_ihashx_closure -> scm_ihashx_closure_t (and made a typedef).
(scm_ihashx): n: uint -> scm_bits_t
use scm_bits2num instead of scm_ulong2num.
* gsubr.c: various int -> scm_bits_t changes.
* gh_data.c (gh_scm2double): no loss of precision any more.
* gh.h (gh_str2scm): len: int -> size_t
(gh_{get,set}_substr): start: int -> scm_bits_t,
len: int -> size_t
(gh_<num>2scm): n: int -> scm_bits_t
(gh_*vector_length): return scm_[u]size_t, not unsigned long.
(gh_length): return scm_bits_t, not unsigned long.
* fports.h: type renaming:
scm_fport -> scm_fport_t
the old name is deprecated, all in-Guile uses changed.
* fports.c (fport_fill_input): count: int -> scm_bits_t
(fport_flush): init_size, remaining, count: int -> scm_bits_t
* debug.h (scm_lookup_cstr, scm_lookup_soft, scm_evstr): removed
those prototypes, as the functions they prototype don't exist.
* fports.c (default_buffer_size): int -> size_t
(scm_fport_buffer_add): read_size, write_size: int -> scm_bits_t
default_size: int -> size_t
(scm_setvbuf): csize: int -> scm_bits_t
* fluids.c (n_fluids): int -> scm_bits_t
(grow_fluids): old_length, i: int -> scm_bits_t
(next_fluid_num, scm_fluid_ref, scm_fluid_set_x): n: int ->
scm_bits_t
(scm_c_with_fluids): flen, vlen: int -> scm_bits_t
* filesys.c (s_scm_open_fdes): changed calls to SCM_NUM2LONG to
the new and shiny SCM_NUM2INT.
* extensions.c: extension -> extension_t (and made a typedef).
* eval.h (SCM_IFRAME): cast to scm_bits_t, not int. just so
there are no nasty surprises if/when the various deeply magic tag
bits move somewhere else.
* eval.c: changed the locals used to store results of SCM_IFRAME,
scm_ilength and such to be of type scm_bits_t (and not int/long).
(iqq): depth, edepth: int -> scm_bits_t
(scm_eval_stack): int -> scm_bits_t
(SCM_CEVAL): various vars are not scm_bits_t instead of int.
(check_map_args, scm_map, scm_for_each): len: long -> scm_bits_t
i: int -> scm_bits_t
* environments.c: changed the many calls to scm_ulong2num to
scm_ubits2num.
(import_environment_fold): proc_as_ul: ulong -> scm_ubits_t
* dynwind.c (scm_dowinds): delta: long -> scm_bits_t
* debug.h: type renaming:
scm_debug_info -> scm_debug_info_t
scm_debug_frame -> scm_debug_frame_t
the old names are deprecated, all in-Guile uses changed.
(scm_debug_eframe_size): int -> scm_bits_t
* debug.c (scm_init_debug): use scm_c_define instead of the
deprecated scm_define.
* continuations.h: type renaming:
scm_contregs -> scm_contregs_t
the old name is deprecated, all in-Guile uses changed.
(scm_contregs_t.num_stack_items): size_t -> scm_bits_t
(scm_contregs_t.num_stack_items): ulong -> scm_ubits_t
* continuations.c (scm_make_continuation): change the type of
stack_size form long to scm_bits_t.
* ports.h: type renaming:
scm_port_rw_active -> scm_port_rw_active_t (and made a typedef)
scm_port -> scm_port_t
scm_ptob_descriptor -> scm_ptob_descriptor_t
the old names are deprecated, all in-Guile uses changed.
(scm_port_t.entry): int -> scm_bits_t.
(scm_port_t.line_number): int -> long.
(scm_port_t.putback_buf_size): int -> size_t.
* __scm.h (long_long, ulong_long): deprecated (they pollute the
global namespace and have little value besides that).
(SCM_BITS_LENGTH): new, is the bit size of scm_bits_t (i.e. of an
SCM handle).
(ifdef spaghetti): include sys/types.h and sys/stdtypes.h, if they
exist (for size_t & ptrdiff_t)
(scm_sizet): deprecated.
* Makefile.am (noinst_HEADERS): add num2integral.i.c
2001-05-24 00:50:51 +00:00
|
|
|
|
|
2009-12-05 11:30:09 +01:00
|
|
|
|
exactly_one_half = scm_divide (SCM_I_MAKINUM (1), SCM_I_MAKINUM (2));
|
2000-04-21 14:16:44 +00:00
|
|
|
|
#include "libguile/numbers.x"
|
1996-07-25 22:56:11 +00:00
|
|
|
|
}
|
2000-03-19 19:01:16 +00:00
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
|
|
Local Variables:
|
|
|
|
|
|
c-file-style: "gnu"
|
|
|
|
|
|
End:
|
|
|
|
|
|
*/
|