mirror of
https://git.savannah.gnu.org/git/guile.git
synced 2025-05-21 12:10:26 +02:00
(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
346 lines
9.4 KiB
C
346 lines
9.4 KiB
C
/* Copyright (C) 1995,1996,1998,2000,2001 Free Software Foundation, Inc.
|
||
*
|
||
* This program is free software; you can redistribute it and/or modify
|
||
* it under the terms of the GNU General Public License as published by
|
||
* the Free Software Foundation; either version 2, or (at your option)
|
||
* any later version.
|
||
*
|
||
* This program is distributed in the hope that it will be useful,
|
||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||
* GNU General Public License for more details.
|
||
*
|
||
* You should have received a copy of the GNU General Public License
|
||
* along with this software; see the file COPYING. If not, write to
|
||
* the Free Software Foundation, Inc., 59 Temple Place, Suite 330,
|
||
* Boston, MA 02111-1307 USA
|
||
*
|
||
* As a special exception, Free Software Foundation gives permission
|
||
* for additional uses of the text contained in its release of this library.
|
||
*
|
||
* The exception is that, if you link this library with other files
|
||
* to produce an executable, this does not by itself cause the
|
||
* resulting executable to be covered by the GNU General Public License.
|
||
* Your use of that executable is in no way restricted on account of
|
||
* linking this library code into it.
|
||
*
|
||
* This exception does not however invalidate any other reasons why
|
||
* the executable file might be covered by the GNU General Public License.
|
||
*
|
||
* This exception applies only to the code released by
|
||
* Free Software Foundation as part of this library. If you copy
|
||
* code from other releases distributed under the terms of the GPL into a copy of
|
||
* this library, as the General Public License permits, the exception does
|
||
* not apply to the code that you add in this way. To avoid misleading
|
||
* anyone as to the status of such modified files, you must delete
|
||
* this exception notice from such code.
|
||
*
|
||
* If you write modifications of your own for this library, it is your choice
|
||
* whether to permit this exception to apply to your modifications.
|
||
* If you do not wish that, delete this exception notice. */
|
||
|
||
/* Software engineering face-lift by Greg J. Badros, 11-Dec-1999,
|
||
gjb@cs.washington.edu, http://www.cs.washington.edu/homes/gjb */
|
||
|
||
|
||
#include "libguile/_scm.h"
|
||
#include "libguile/vectors.h"
|
||
|
||
#include "libguile/validate.h"
|
||
#include "libguile/weaks.h"
|
||
|
||
|
||
|
||
/* {Weak Vectors}
|
||
*/
|
||
|
||
|
||
SCM_DEFINE (scm_make_weak_vector, "make-weak-vector", 1, 1, 0,
|
||
(SCM size, SCM fill),
|
||
"Return a weak vector with @var{size} elements. If the optional\n"
|
||
"argument @var{fill} is given, all entries in the vector will be\n"
|
||
"set to @var{fill}. The default value for @var{fill} is the\n"
|
||
"empty list.")
|
||
#define FUNC_NAME s_scm_make_weak_vector
|
||
{
|
||
/* Dirk:FIXME:: We should probably rather use a double cell for weak vectors. */
|
||
SCM v;
|
||
v = scm_make_vector (scm_sum (size, SCM_MAKINUM (2)), fill);
|
||
SCM_DEFER_INTS;
|
||
SCM_SET_VECTOR_LENGTH (v, SCM_INUM (size), scm_tc7_wvect);
|
||
SCM_SETVELTS(v, SCM_VELTS(v) + 2);
|
||
SCM_VELTS(v)[-2] = SCM_EOL;
|
||
SCM_UNPACK (SCM_VELTS (v)[-1]) = 0;
|
||
SCM_ALLOW_INTS;
|
||
return v;
|
||
}
|
||
#undef FUNC_NAME
|
||
|
||
|
||
SCM_REGISTER_PROC(s_list_to_weak_vector, "list->weak-vector", 1, 0, 0, scm_weak_vector);
|
||
|
||
SCM_DEFINE (scm_weak_vector, "weak-vector", 0, 0, 1,
|
||
(SCM l),
|
||
"@deffnx primitive list->weak-vector l\n"
|
||
"Construct a weak vector from a list: @code{weak-vector} uses\n"
|
||
"the list of its arguments while @code{list->weak-vector} uses\n"
|
||
"its only argument @var{l} (a list) to construct a weak vector\n"
|
||
"the same way @code{list->vector} would.")
|
||
#define FUNC_NAME s_scm_weak_vector
|
||
{
|
||
SCM res;
|
||
SCM *data;
|
||
scm_bits_t i;
|
||
|
||
/* Dirk:FIXME:: In case of multiple threads, the list might get corrupted
|
||
while the vector is being created. */
|
||
i = scm_ilength (l);
|
||
SCM_ASSERT (i >= 0, l, SCM_ARG1, FUNC_NAME);
|
||
res = scm_make_weak_vector (SCM_MAKINUM (i), SCM_UNSPECIFIED);
|
||
data = SCM_VELTS (res);
|
||
|
||
while (!SCM_NULLP (l))
|
||
{
|
||
*data++ = SCM_CAR (l);
|
||
l = SCM_CDR (l);
|
||
}
|
||
|
||
return res;
|
||
}
|
||
#undef FUNC_NAME
|
||
|
||
|
||
SCM_DEFINE (scm_weak_vector_p, "weak-vector?", 1, 0, 0,
|
||
(SCM obj),
|
||
"Return @code{#t} if @var{obj} is a weak vector. Note that all\n"
|
||
"weak hashes are also weak vectors.")
|
||
#define FUNC_NAME s_scm_weak_vector_p
|
||
{
|
||
return SCM_BOOL(SCM_WVECTP (obj) && !SCM_IS_WHVEC (obj));
|
||
}
|
||
#undef FUNC_NAME
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
SCM_DEFINE (scm_make_weak_key_hash_table, "make-weak-key-hash-table", 1, 0, 0,
|
||
(SCM size),
|
||
"@deffnx primitive make-weak-value-hash-table size\n"
|
||
"@deffnx primitive make-doubly-weak-hash-table size\n"
|
||
"Return a weak hash table with @var{size} buckets. As with any\n"
|
||
"hash table, choosing a good size for the table requires some\n"
|
||
"caution.\n"
|
||
"\n"
|
||
"You can modify weak hash tables in exactly the same way you\n"
|
||
"would modify regular hash tables. (@pxref{Hash Tables})")
|
||
#define FUNC_NAME s_scm_make_weak_key_hash_table
|
||
{
|
||
SCM v;
|
||
SCM_VALIDATE_INUM (1, size);
|
||
v = scm_make_weak_vector (size, SCM_EOL);
|
||
SCM_DEFER_INTS;
|
||
SCM_UNPACK (SCM_VELTS (v)[-1]) = 1;
|
||
SCM_ALLOW_INTS;
|
||
return v;
|
||
}
|
||
#undef FUNC_NAME
|
||
|
||
|
||
SCM_DEFINE (scm_make_weak_value_hash_table, "make-weak-value-hash-table", 1, 0, 0,
|
||
(SCM size),
|
||
"Return a hash table with weak values with @var{size} buckets.\n"
|
||
"(@pxref{Hash Tables})")
|
||
#define FUNC_NAME s_scm_make_weak_value_hash_table
|
||
{
|
||
SCM v;
|
||
SCM_VALIDATE_INUM (1, size);
|
||
v = scm_make_weak_vector (size, SCM_EOL);
|
||
SCM_DEFER_INTS;
|
||
SCM_UNPACK (SCM_VELTS (v)[-1]) = 2;
|
||
SCM_ALLOW_INTS;
|
||
return v;
|
||
}
|
||
#undef FUNC_NAME
|
||
|
||
|
||
|
||
SCM_DEFINE (scm_make_doubly_weak_hash_table, "make-doubly-weak-hash-table", 1, 0, 0,
|
||
(SCM size),
|
||
"Return a hash table with weak keys and values with @var{size}\n"
|
||
"buckets. (@pxref{Hash Tables})")
|
||
#define FUNC_NAME s_scm_make_doubly_weak_hash_table
|
||
{
|
||
SCM v;
|
||
SCM_VALIDATE_INUM (1, size);
|
||
v = scm_make_weak_vector (size, SCM_EOL);
|
||
SCM_DEFER_INTS;
|
||
SCM_UNPACK (SCM_VELTS (v)[-1]) = 3;
|
||
SCM_ALLOW_INTS;
|
||
return v;
|
||
}
|
||
#undef FUNC_NAME
|
||
|
||
SCM_DEFINE (scm_weak_key_hash_table_p, "weak-key-hash-table?", 1, 0, 0,
|
||
(SCM obj),
|
||
"@deffnx primitive weak-value-hash-table? obj\n"
|
||
"@deffnx primitive doubly-weak-hash-table? obj\n"
|
||
"Return @code{#t} if @var{obj} is the specified weak hash\n"
|
||
"table. Note that a doubly weak hash table is neither a weak key\n"
|
||
"nor a weak value hash table.")
|
||
#define FUNC_NAME s_scm_weak_key_hash_table_p
|
||
{
|
||
return SCM_BOOL(SCM_WVECTP (obj) && SCM_IS_WHVEC(obj));
|
||
}
|
||
#undef FUNC_NAME
|
||
|
||
|
||
SCM_DEFINE (scm_weak_value_hash_table_p, "weak-value-hash-table?", 1, 0, 0,
|
||
(SCM obj),
|
||
"Return @code{#t} if @var{obj} is a weak value hash table.")
|
||
#define FUNC_NAME s_scm_weak_value_hash_table_p
|
||
{
|
||
return SCM_BOOL(SCM_WVECTP (obj) && SCM_IS_WHVEC_V(obj));
|
||
}
|
||
#undef FUNC_NAME
|
||
|
||
|
||
SCM_DEFINE (scm_doubly_weak_hash_table_p, "doubly-weak-hash-table?", 1, 0, 0,
|
||
(SCM obj),
|
||
"Return @code{#t} if @var{obj} is a doubly weak hash table.")
|
||
#define FUNC_NAME s_scm_doubly_weak_hash_table_p
|
||
{
|
||
return SCM_BOOL(SCM_WVECTP (obj) && SCM_IS_WHVEC_B (obj));
|
||
}
|
||
#undef FUNC_NAME
|
||
|
||
static void *
|
||
scm_weak_vector_gc_init (void *dummy1, void *dummy2, void *dummy3)
|
||
{
|
||
scm_weak_vectors = SCM_EOL;
|
||
|
||
return 0;
|
||
}
|
||
|
||
static void *
|
||
scm_mark_weak_vector_spines (void *dummy1, void *dummy2, void *dummy3)
|
||
{
|
||
SCM w;
|
||
|
||
for (w = scm_weak_vectors; !SCM_NULLP (w); w = SCM_WVECT_GC_CHAIN (w))
|
||
{
|
||
if (SCM_IS_WHVEC_ANY (w))
|
||
{
|
||
SCM *ptr;
|
||
SCM obj;
|
||
scm_bits_t j, n;
|
||
|
||
obj = w;
|
||
ptr = SCM_VELTS (w);
|
||
n = SCM_VECTOR_LENGTH (w);
|
||
for (j = 0; j < n; ++j)
|
||
{
|
||
SCM alist;
|
||
|
||
alist = ptr[j];
|
||
while ( SCM_CONSP (alist)
|
||
&& !SCM_GCMARKP (alist)
|
||
&& SCM_CONSP (SCM_CAR (alist)))
|
||
{
|
||
SCM_SETGCMARK (alist);
|
||
SCM_SETGCMARK (SCM_CAR (alist));
|
||
alist = SCM_CDR (alist);
|
||
}
|
||
}
|
||
}
|
||
}
|
||
|
||
return 0;
|
||
}
|
||
|
||
static void *
|
||
scm_scan_weak_vectors (void *dummy1, void *dummy2, void *dummy3)
|
||
{
|
||
SCM *ptr, w;
|
||
for (w = scm_weak_vectors; !SCM_NULLP (w); w = SCM_WVECT_GC_CHAIN (w))
|
||
{
|
||
if (!SCM_IS_WHVEC_ANY (w))
|
||
{
|
||
register long j, n;
|
||
|
||
ptr = SCM_VELTS (w);
|
||
n = SCM_VECTOR_LENGTH (w);
|
||
for (j = 0; j < n; ++j)
|
||
if (SCM_FREE_CELL_P (ptr[j]))
|
||
ptr[j] = SCM_BOOL_F;
|
||
}
|
||
else /* if (SCM_IS_WHVEC_ANY (scm_weak_vectors[i])) */
|
||
{
|
||
SCM obj = w;
|
||
register scm_bits_t n = SCM_VECTOR_LENGTH (w);
|
||
register scm_bits_t j;
|
||
int weak_keys = SCM_IS_WHVEC (obj) || SCM_IS_WHVEC_B (obj);
|
||
int weak_values = SCM_IS_WHVEC_V (obj) || SCM_IS_WHVEC_B (obj);
|
||
|
||
ptr = SCM_VELTS (w);
|
||
|
||
for (j = 0; j < n; ++j)
|
||
{
|
||
SCM * fixup;
|
||
SCM alist;
|
||
|
||
fixup = ptr + j;
|
||
alist = *fixup;
|
||
|
||
while ( SCM_CONSP (alist)
|
||
&& SCM_CONSP (SCM_CAR (alist)))
|
||
{
|
||
SCM key;
|
||
SCM value;
|
||
|
||
key = SCM_CAAR (alist);
|
||
value = SCM_CDAR (alist);
|
||
if ( (weak_keys && SCM_FREE_CELL_P (key))
|
||
|| (weak_values && SCM_FREE_CELL_P (value)))
|
||
{
|
||
*fixup = SCM_CDR (alist);
|
||
}
|
||
else
|
||
fixup = SCM_CDRLOC (alist);
|
||
alist = SCM_CDR (alist);
|
||
}
|
||
}
|
||
}
|
||
}
|
||
|
||
return 0;
|
||
}
|
||
|
||
|
||
|
||
|
||
|
||
void
|
||
scm_weaks_prehistory ()
|
||
{
|
||
scm_c_hook_add (&scm_before_mark_c_hook, scm_weak_vector_gc_init, 0, 0);
|
||
scm_c_hook_add (&scm_before_sweep_c_hook, scm_mark_weak_vector_spines, 0, 0);
|
||
scm_c_hook_add (&scm_after_sweep_c_hook, scm_scan_weak_vectors, 0, 0);
|
||
}
|
||
|
||
void
|
||
scm_init_weaks ()
|
||
{
|
||
#ifndef SCM_MAGIC_SNARFER
|
||
#include "libguile/weaks.x"
|
||
#endif
|
||
}
|
||
|
||
|
||
/*
|
||
Local Variables:
|
||
c-file-style: "gnu"
|
||
End:
|
||
*/
|