* 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
This commit is contained in:
Michael Livshin
parent
92905faf2c
commit
1be6b49ccb
112 changed files with 2577 additions and 1894 deletions
|
|
@ -62,8 +62,8 @@
|
|||
* SCM_INUMP (SCM_CAR (x)) can give wrong answers.
|
||||
*/
|
||||
|
||||
#define SCM_FIXNUM_BIT (SCM_LONG_BIT - 2)
|
||||
#define SCM_MOST_POSITIVE_FIXNUM ((1L << (SCM_FIXNUM_BIT - 1)) - 1)
|
||||
#define SCM_I_FIXNUM_BIT (SCM_BITS_LENGTH - 2)
|
||||
#define SCM_MOST_POSITIVE_FIXNUM ((1L << (SCM_I_FIXNUM_BIT - 1)) - 1)
|
||||
#define SCM_MOST_NEGATIVE_FIXNUM (-SCM_MOST_POSITIVE_FIXNUM - 1)
|
||||
|
||||
|
||||
|
|
@ -115,7 +115,7 @@
|
|||
/* SCM_INTBUFLEN is the maximum number of characters neccessary for the
|
||||
* printed or scm_string representation of an exact immediate.
|
||||
*/
|
||||
#define SCM_INTBUFLEN (5 + SCM_LONG_BIT)
|
||||
#define SCM_INTBUFLEN (5 + SCM_BITS_LENGTH)
|
||||
|
||||
|
||||
|
||||
|
|
@ -154,9 +154,10 @@
|
|||
# endif /* def _UNICOS */
|
||||
|
||||
# define SCM_BIGRAD (1L << SCM_BITSPERDIG)
|
||||
# define SCM_DIGSPERLONG ((scm_sizet)((sizeof(long)*SCM_CHAR_BIT+SCM_BITSPERDIG-1)/SCM_BITSPERDIG))
|
||||
# define SCM_BIGUP(x) ((unsigned long)(x) << SCM_BITSPERDIG)
|
||||
# define SCM_LONGLONGBIGUP(x) ((ulong_long)(x) << SCM_BITSPERDIG)
|
||||
# define SCM_DIGSPERLONG ((size_t)((sizeof(long)*SCM_CHAR_BIT+SCM_BITSPERDIG-1)/SCM_BITSPERDIG))
|
||||
# define SCM_I_BIGUP(type, x) ((type)(x) << SCM_BITSPERDIG)
|
||||
# define SCM_BIGUP(x) SCM_I_BIGUP (unsigned long, x)
|
||||
# define SCM_LONGLONGBIGUP(x) SCM_I_BIGUP (unsigned long long, x)
|
||||
# define SCM_BIGDN(x) ((x) >> SCM_BITSPERDIG)
|
||||
# define SCM_BIGLO(x) ((x) & (SCM_BIGRAD-1))
|
||||
#endif /* def BIGNUMS */
|
||||
|
|
@ -176,7 +177,7 @@
|
|||
#define SCM_BIGSIGN(x) (SCM_CELL_WORD_0 (x) & SCM_BIGSIGNFLAG)
|
||||
#define SCM_BDIGITS(x) ((SCM_BIGDIG *) (SCM_CELL_WORD_1 (x)))
|
||||
#define SCM_SET_BIGNUM_BASE(n, b) (SCM_SET_CELL_WORD_1 ((n), (b)))
|
||||
#define SCM_NUMDIGS(x) ((scm_sizet) (SCM_CELL_WORD_0 (x) >> SCM_BIGSIZEFIELD))
|
||||
#define SCM_NUMDIGS(x) ((size_t) ((scm_ubits_t) SCM_CELL_WORD_0 (x) >> SCM_BIGSIZEFIELD))
|
||||
#define SCM_SETNUMDIGS(x, v, sign) \
|
||||
SCM_SET_CELL_WORD_0 (x, \
|
||||
scm_tc16_big \
|
||||
|
|
@ -220,24 +221,49 @@ extern SCM scm_ash (SCM n, SCM cnt);
|
|||
extern SCM scm_bit_extract (SCM n, SCM start, SCM end);
|
||||
extern SCM scm_logcount (SCM n);
|
||||
extern SCM scm_integer_length (SCM n);
|
||||
extern SCM scm_mkbig (scm_sizet nlen, int sign);
|
||||
extern SCM scm_big2inum (SCM b, scm_sizet l);
|
||||
extern SCM scm_adjbig (SCM b, scm_sizet nlen);
|
||||
extern SCM scm_i_mkbig (size_t nlen, int sign);
|
||||
extern SCM scm_i_big2inum (SCM b, size_t l);
|
||||
extern SCM scm_i_adjbig (SCM b, size_t nlen);
|
||||
extern SCM scm_i_normbig (SCM b);
|
||||
extern SCM scm_i_copybig (SCM b, int sign);
|
||||
extern SCM scm_i_short2big (short n);
|
||||
extern SCM scm_i_ushort2big (unsigned short n);
|
||||
extern SCM scm_i_int2big (int n);
|
||||
extern SCM scm_i_uint2big (unsigned int n);
|
||||
extern SCM scm_i_long2big (long n);
|
||||
extern SCM scm_i_ulong2big (unsigned long n);
|
||||
extern SCM scm_i_bits2big (scm_bits_t n);
|
||||
extern SCM scm_i_ubits2big (scm_ubits_t n);
|
||||
extern SCM scm_i_size2big (size_t n);
|
||||
extern SCM scm_i_ptrdiff2big (ptrdiff_t n);
|
||||
|
||||
|
||||
#if (SCM_DEBUG_DEPRECATED == 0)
|
||||
extern SCM scm_big2inum (SCM b, size_t l);
|
||||
extern SCM scm_mkbig (size_t nlen, int sign);
|
||||
extern SCM scm_adjbig (SCM b, size_t len);
|
||||
extern SCM scm_normbig (SCM b);
|
||||
extern SCM scm_copybig (SCM b, int sign);
|
||||
extern SCM scm_long2big (long n);
|
||||
#ifdef HAVE_LONG_LONGS
|
||||
extern SCM scm_long_long2big (long_long n);
|
||||
|
||||
#define SCM_FIXNUM_BIT SCM_I_FIXNUM_BIT
|
||||
#endif
|
||||
|
||||
#ifdef HAVE_LONG_LONGS
|
||||
extern SCM scm_i_long_long2big (long long n);
|
||||
extern SCM scm_i_ulong_long2big (unsigned long long n);
|
||||
#endif
|
||||
|
||||
#if (SCM_DEBUG_DEPRECATED == 0)
|
||||
extern SCM scm_2ulong2big (unsigned long * np);
|
||||
extern SCM scm_ulong2big (unsigned long n);
|
||||
#endif
|
||||
|
||||
extern int scm_bigcomp (SCM x, SCM y);
|
||||
extern long scm_pseudolong (long x);
|
||||
extern void scm_longdigs (long x, SCM_BIGDIG digs[]);
|
||||
extern SCM scm_addbig (SCM_BIGDIG *x, scm_sizet nx, int xsgn, SCM bigy, int sgny);
|
||||
extern SCM scm_mulbig (SCM_BIGDIG *x, scm_sizet nx, SCM_BIGDIG *y, scm_sizet ny, int sgn);
|
||||
extern unsigned int scm_divbigdig (SCM_BIGDIG *ds, scm_sizet h, SCM_BIGDIG div);
|
||||
extern scm_sizet scm_iint2str (long num, int rad, char *p);
|
||||
extern SCM scm_addbig (SCM_BIGDIG *x, size_t nx, int xsgn, SCM bigy, int sgny);
|
||||
extern SCM scm_mulbig (SCM_BIGDIG *x, size_t nx, SCM_BIGDIG *y, size_t ny, int sgn);
|
||||
extern unsigned int scm_divbigdig (SCM_BIGDIG *ds, size_t h, SCM_BIGDIG div);
|
||||
extern size_t scm_iint2str (long num, int rad, char *p);
|
||||
extern SCM scm_number_to_string (SCM x, SCM radix);
|
||||
extern int scm_print_real (SCM sexp, SCM port, scm_print_state *pstate);
|
||||
extern int scm_print_complex (SCM sexp, SCM port, scm_print_state *pstate);
|
||||
|
|
@ -286,21 +312,57 @@ extern SCM scm_magnitude (SCM z);
|
|||
extern SCM scm_angle (SCM z);
|
||||
extern SCM scm_inexact_to_exact (SCM z);
|
||||
extern SCM scm_trunc (SCM x);
|
||||
extern SCM scm_i_dbl2big (double d);
|
||||
|
||||
#if (SCM_DEBUG_DEPRECATED == 0)
|
||||
extern SCM scm_dbl2big (double d);
|
||||
#endif
|
||||
|
||||
extern double scm_i_big2dbl (SCM b);
|
||||
|
||||
#if (SCM_DEBUG_DEPRECATED == 0)
|
||||
extern double scm_big2dbl (SCM b);
|
||||
extern SCM scm_long2num (long sl);
|
||||
extern SCM scm_ulong2num (unsigned long sl);
|
||||
#endif
|
||||
|
||||
extern SCM scm_short2num (short n);
|
||||
extern SCM scm_ushort2num (unsigned short n);
|
||||
extern SCM scm_int2num (int n);
|
||||
extern SCM scm_uint2num (unsigned int n);
|
||||
extern SCM scm_long2num (long n);
|
||||
extern SCM scm_ulong2num (unsigned long n);
|
||||
extern SCM scm_bits2num (scm_bits_t n);
|
||||
extern SCM scm_ubits2num (scm_ubits_t n);
|
||||
extern SCM scm_size2num (size_t n);
|
||||
extern SCM scm_ptrdiff2num (ptrdiff_t n);
|
||||
extern short scm_num2short (SCM num, unsigned long int pos,
|
||||
const char *s_caller);
|
||||
extern unsigned short scm_num2ushort (SCM num, unsigned long int pos,
|
||||
const char *s_caller);
|
||||
extern int scm_num2int (SCM num, unsigned long int pos,
|
||||
const char *s_caller);
|
||||
extern unsigned int scm_num2uint (SCM num, unsigned long int pos,
|
||||
const char *s_caller);
|
||||
extern long scm_num2long (SCM num, unsigned long int pos,
|
||||
const char *s_caller);
|
||||
#ifdef HAVE_LONG_LONGS
|
||||
extern SCM scm_long_long2num (long_long sl);
|
||||
extern long_long scm_num2long_long (SCM num, unsigned long int pos,
|
||||
const char *s_caller);
|
||||
extern ulong_long scm_num2ulong_long (SCM num, unsigned long int pos,
|
||||
const char *s_caller);
|
||||
#endif
|
||||
extern unsigned long scm_num2ulong (SCM num, unsigned long int pos,
|
||||
const char *s_caller);
|
||||
extern scm_bits_t scm_num2bits (SCM num, unsigned long int pos,
|
||||
const char *s_caller);
|
||||
extern scm_ubits_t scm_num2ubits (SCM num, unsigned long int pos,
|
||||
const char *s_caller);
|
||||
extern ptrdiff_t scm_num2ptrdiff (SCM num, unsigned long int pos,
|
||||
const char *s_caller);
|
||||
extern size_t scm_num2size (SCM num, unsigned long int pos,
|
||||
const char *s_caller);
|
||||
#ifdef HAVE_LONG_LONGS
|
||||
extern SCM scm_long_long2num (long long sl);
|
||||
extern SCM scm_ulong_long2num (unsigned long long sl);
|
||||
extern long long scm_num2long_long (SCM num, unsigned long int pos,
|
||||
const char *s_caller);
|
||||
extern unsigned long long scm_num2ulong_long (SCM num, unsigned long int pos,
|
||||
const char *s_caller);
|
||||
#endif
|
||||
|
||||
extern void scm_init_numbers (void);
|
||||
|
||||
#endif /* NUMBERSH */
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue