mirror of
https://git.savannah.gnu.org/git/guile.git
synced 2025-05-31 09:20:23 +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
289 lines
8.1 KiB
C
289 lines
8.1 KiB
C
/* Copyright (C) 1996,1997,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, the Free Software Foundation gives permission
|
|
* for additional uses of the text contained in its release of GUILE.
|
|
*
|
|
* The exception is that, if you link the GUILE 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 the GUILE 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 the
|
|
* Free Software Foundation under the name GUILE. If you copy
|
|
* code from other Free Software Foundation releases into a copy of
|
|
* GUILE, 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 them.
|
|
*
|
|
* If you write modifications of your own for GUILE, 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/print.h"
|
|
#include "libguile/smob.h"
|
|
#include "libguile/dynwind.h"
|
|
#include "libguile/fluids.h"
|
|
#include "libguile/alist.h"
|
|
#include "libguile/eval.h"
|
|
#include "libguile/ports.h"
|
|
#include "libguile/deprecation.h"
|
|
|
|
#define INITIAL_FLUIDS 10
|
|
#include "libguile/validate.h"
|
|
|
|
static volatile scm_bits_t n_fluids;
|
|
scm_bits_t scm_tc16_fluid;
|
|
|
|
SCM
|
|
scm_make_initial_fluids ()
|
|
{
|
|
return scm_c_make_vector (INITIAL_FLUIDS, SCM_BOOL_F);
|
|
}
|
|
|
|
static void
|
|
grow_fluids (scm_root_state *root_state, int new_length)
|
|
{
|
|
SCM old_fluids, new_fluids;
|
|
scm_bits_t old_length, i;
|
|
|
|
old_fluids = root_state->fluids;
|
|
old_length = SCM_VECTOR_LENGTH (old_fluids);
|
|
new_fluids = scm_c_make_vector (new_length, SCM_BOOL_F);
|
|
i = 0;
|
|
while (i < old_length)
|
|
{
|
|
SCM_VELTS(new_fluids)[i] = SCM_VELTS(old_fluids)[i];
|
|
i++;
|
|
}
|
|
while (i < new_length)
|
|
{
|
|
SCM_VELTS(new_fluids)[i] = SCM_BOOL_F;
|
|
i++;
|
|
}
|
|
|
|
root_state->fluids = new_fluids;
|
|
}
|
|
|
|
void
|
|
scm_copy_fluids (scm_root_state *root_state)
|
|
{
|
|
grow_fluids (root_state, SCM_VECTOR_LENGTH (root_state->fluids));
|
|
}
|
|
|
|
static int
|
|
fluid_print (SCM exp, SCM port, scm_print_state *pstate)
|
|
{
|
|
scm_puts ("#<fluid ", port);
|
|
scm_intprint ((int) SCM_FLUID_NUM (exp), 10, port);
|
|
scm_putc ('>', port);
|
|
return 1;
|
|
}
|
|
|
|
static scm_bits_t
|
|
next_fluid_num ()
|
|
{
|
|
scm_bits_t n;
|
|
SCM_CRITICAL_SECTION_START;
|
|
n = n_fluids++;
|
|
SCM_CRITICAL_SECTION_END;
|
|
return n;
|
|
}
|
|
|
|
SCM_DEFINE (scm_make_fluid, "make-fluid", 0, 0, 0,
|
|
(),
|
|
"Return a newly created fluid.\n"
|
|
"Fluids are objects of a certain type (a smob) that can hold one SCM\n"
|
|
"value per dynamic root. That is, modifications to this value are\n"
|
|
"only visible to code that executes within the same dynamic root as\n"
|
|
"the modifying code. When a new dynamic root is constructed, it\n"
|
|
"inherits the values from its parent. Because each thread executes\n"
|
|
"in its own dynamic root, you can use fluids for thread local storage.")
|
|
#define FUNC_NAME s_scm_make_fluid
|
|
{
|
|
scm_bits_t n;
|
|
|
|
n = next_fluid_num ();
|
|
SCM_RETURN_NEWSMOB (scm_tc16_fluid, n);
|
|
}
|
|
#undef FUNC_NAME
|
|
|
|
SCM_DEFINE (scm_fluid_p, "fluid?", 1, 0, 0,
|
|
(SCM obj),
|
|
"Return @code{#t} iff @var{obj} is a fluid; otherwise, return\n"
|
|
"@code{#f}.")
|
|
#define FUNC_NAME s_scm_fluid_p
|
|
{
|
|
return SCM_BOOL(SCM_FLUIDP (obj));
|
|
}
|
|
#undef FUNC_NAME
|
|
|
|
SCM_DEFINE (scm_fluid_ref, "fluid-ref", 1, 0, 0,
|
|
(SCM fluid),
|
|
"Return the value associated with @var{fluid} in the current\n"
|
|
"dynamic root. If @var{fluid} has not been set, then return\n"
|
|
"@code{#f}.")
|
|
#define FUNC_NAME s_scm_fluid_ref
|
|
{
|
|
scm_bits_t n;
|
|
|
|
SCM_VALIDATE_FLUID (1, fluid);
|
|
|
|
n = SCM_FLUID_NUM (fluid);
|
|
|
|
if (SCM_VECTOR_LENGTH (scm_root->fluids) <= n)
|
|
grow_fluids (scm_root, n+1);
|
|
return SCM_VELTS (scm_root->fluids)[n];
|
|
}
|
|
#undef FUNC_NAME
|
|
|
|
SCM_DEFINE (scm_fluid_set_x, "fluid-set!", 2, 0, 0,
|
|
(SCM fluid, SCM value),
|
|
"Set the value associated with @var{fluid} in the current dynamic root.")
|
|
#define FUNC_NAME s_scm_fluid_set_x
|
|
{
|
|
scm_bits_t n;
|
|
|
|
SCM_VALIDATE_FLUID (1, fluid);
|
|
n = SCM_FLUID_NUM (fluid);
|
|
|
|
if (SCM_VECTOR_LENGTH (scm_root->fluids) <= n)
|
|
grow_fluids (scm_root, n+1);
|
|
SCM_VELTS (scm_root->fluids)[n] = value;
|
|
return SCM_UNSPECIFIED;
|
|
}
|
|
#undef FUNC_NAME
|
|
|
|
void
|
|
scm_swap_fluids (SCM fluids, SCM vals)
|
|
{
|
|
while (!SCM_NULLP (fluids))
|
|
{
|
|
SCM fl = SCM_CAR (fluids);
|
|
SCM old_val = scm_fluid_ref (fl);
|
|
scm_fluid_set_x (fl, SCM_CAR (vals));
|
|
SCM_SETCAR (vals, old_val);
|
|
fluids = SCM_CDR (fluids);
|
|
vals = SCM_CDR (vals);
|
|
}
|
|
}
|
|
|
|
/* Swap the fluid values in reverse order. This is important when the
|
|
same fluid appears multiple times in the fluids list. */
|
|
|
|
void
|
|
scm_swap_fluids_reverse (SCM fluids, SCM vals)
|
|
{
|
|
if (!SCM_NULLP (fluids))
|
|
{
|
|
SCM fl, old_val;
|
|
|
|
scm_swap_fluids_reverse (SCM_CDR (fluids), SCM_CDR (vals));
|
|
fl = SCM_CAR (fluids);
|
|
old_val = scm_fluid_ref (fl);
|
|
scm_fluid_set_x (fl, SCM_CAR (vals));
|
|
SCM_SETCAR (vals, old_val);
|
|
}
|
|
}
|
|
|
|
|
|
static SCM
|
|
apply_thunk (void *thunk)
|
|
{
|
|
return scm_apply (SCM_PACK (thunk), SCM_EOL, SCM_EOL);
|
|
}
|
|
|
|
SCM_DEFINE (scm_with_fluids, "with-fluids*", 3, 0, 0,
|
|
(SCM fluids, SCM values, SCM thunk),
|
|
"Set @var{fluids} to @var{values} temporary, and call @var{thunk}.\n"
|
|
"@var{fluids} must be a list of fluids and @var{values} must be the same\n"
|
|
"number of their values to be applied. Each substitution is done\n"
|
|
"one after another. @var{thunk} must be a procedure with no argument.")
|
|
#define FUNC_NAME s_scm_with_fluids
|
|
{
|
|
return scm_c_with_fluids (fluids, values, apply_thunk, (void *) SCM_UNPACK (thunk));
|
|
}
|
|
#undef FUNC_NAME
|
|
|
|
SCM
|
|
scm_c_with_fluids (SCM fluids, SCM values, SCM (*cproc) (), void *cdata)
|
|
#define FUNC_NAME "scm_c_with_fluids"
|
|
{
|
|
SCM ans;
|
|
scm_bits_t flen, vlen;
|
|
|
|
SCM_VALIDATE_LIST_COPYLEN (1, fluids, flen);
|
|
SCM_VALIDATE_LIST_COPYLEN (2, values, vlen);
|
|
if (flen != vlen)
|
|
scm_out_of_range (s_scm_with_fluids, values);
|
|
|
|
scm_swap_fluids (fluids, values);
|
|
scm_dynwinds = scm_acons (fluids, values, scm_dynwinds);
|
|
ans = cproc (cdata);
|
|
scm_dynwinds = SCM_CDR (scm_dynwinds);
|
|
scm_swap_fluids_reverse (fluids, values);
|
|
return ans;
|
|
}
|
|
#undef FUNC_NAME
|
|
|
|
SCM
|
|
scm_c_with_fluid (SCM fluid, SCM value, SCM (*cproc) (), void *cdata)
|
|
#define FUNC_NAME "scm_c_with_fluid"
|
|
{
|
|
return scm_c_with_fluids (SCM_LIST1 (fluid), SCM_LIST1 (value),
|
|
cproc, cdata);
|
|
}
|
|
#undef FUNC_NAME
|
|
|
|
void
|
|
scm_init_fluids ()
|
|
{
|
|
scm_tc16_fluid = scm_make_smob_type ("fluid", 0);
|
|
scm_set_smob_print (scm_tc16_fluid, fluid_print);
|
|
#ifndef SCM_MAGIC_SNARFER
|
|
#include "libguile/fluids.x"
|
|
#endif
|
|
}
|
|
|
|
#if SCM_DEBUG_DEPRECATED == 0
|
|
|
|
SCM
|
|
scm_internal_with_fluids (SCM fluids, SCM values, SCM (*cproc) (), void *cdata)
|
|
{
|
|
scm_c_issue_deprecation_warning ("`scm_internal_with_fluids' is deprecated. "
|
|
"Use `scm_c_with_fluids' instead.");
|
|
|
|
return scm_c_with_fluids (fluids, values, cproc, cdata);
|
|
}
|
|
|
|
#endif
|
|
|
|
/*
|
|
Local Variables:
|
|
c-file-style: "gnu"
|
|
End:
|
|
*/
|