mirror of
https://git.savannah.gnu.org/git/guile.git
synced 2025-05-01 20:30:28 +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
362 lines
11 KiB
C
362 lines
11 KiB
C
/* Copyright (C) 1995,1996,1997,1998,1999,2000,2001 Free Software Foundation
|
||
*
|
||
* 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.
|
||
*
|
||
* The author can be reached at djurfeldt@nada.kth.se
|
||
* Mikael Djurfeldt, SANS/NADA KTH, 10044 STOCKHOLM, SWEDEN */
|
||
|
||
/* Software engineering face-lift by Greg J. Badros, 11-Dec-1999,
|
||
gjb@cs.washington.edu, http://www.cs.washington.edu/homes/gjb */
|
||
|
||
|
||
|
||
#include <errno.h>
|
||
|
||
#include "libguile/_scm.h"
|
||
#include "libguile/smob.h"
|
||
#include "libguile/alist.h"
|
||
#include "libguile/debug.h"
|
||
#include "libguile/hashtab.h"
|
||
#include "libguile/hash.h"
|
||
#include "libguile/ports.h"
|
||
#include "libguile/root.h"
|
||
#include "libguile/weaks.h"
|
||
|
||
#include "libguile/validate.h"
|
||
#include "libguile/srcprop.h"
|
||
|
||
/* {Source Properties}
|
||
*
|
||
* Properties of source list expressions.
|
||
* Five of these have special meaning and optimized storage:
|
||
*
|
||
* filename string The name of the source file.
|
||
* copy list A copy of the list expression.
|
||
* line integer The source code line number.
|
||
* column integer The source code column number.
|
||
* breakpoint boolean Sets a breakpoint on this form.
|
||
*
|
||
* Most properties above can be set by the reader.
|
||
*
|
||
*/
|
||
|
||
SCM_GLOBAL_SYMBOL (scm_sym_filename, "filename");
|
||
SCM_GLOBAL_SYMBOL (scm_sym_copy, "copy");
|
||
SCM_GLOBAL_SYMBOL (scm_sym_line, "line");
|
||
SCM_GLOBAL_SYMBOL (scm_sym_column, "column");
|
||
SCM_GLOBAL_SYMBOL (scm_sym_breakpoint, "breakpoint");
|
||
|
||
scm_bits_t scm_tc16_srcprops;
|
||
static scm_srcprops_chunk_t *srcprops_chunklist = 0;
|
||
static scm_srcprops_t *srcprops_freelist = 0;
|
||
|
||
|
||
static SCM
|
||
srcprops_mark (SCM obj)
|
||
{
|
||
scm_gc_mark (SRCPROPFNAME (obj));
|
||
scm_gc_mark (SRCPROPCOPY (obj));
|
||
return SRCPROPPLIST (obj);
|
||
}
|
||
|
||
|
||
static size_t
|
||
srcprops_free (SCM obj)
|
||
{
|
||
*((scm_srcprops_t **) SCM_CELL_WORD_1 (obj)) = srcprops_freelist;
|
||
srcprops_freelist = (scm_srcprops_t *) SCM_CELL_WORD_1 (obj);
|
||
return 0; /* srcprops_chunks are not freed until leaving guile */
|
||
}
|
||
|
||
|
||
static int
|
||
srcprops_print (SCM obj, SCM port, scm_print_state *pstate)
|
||
{
|
||
int writingp = SCM_WRITINGP (pstate);
|
||
scm_puts ("#<srcprops ", port);
|
||
SCM_SET_WRITINGP (pstate, 1);
|
||
scm_iprin1 (scm_srcprops_to_plist (obj), port, pstate);
|
||
SCM_SET_WRITINGP (pstate, writingp);
|
||
scm_putc ('>', port);
|
||
return 1;
|
||
}
|
||
|
||
|
||
SCM
|
||
scm_make_srcprops (long line, int col, SCM filename, SCM copy, SCM plist)
|
||
{
|
||
register scm_srcprops_t *ptr;
|
||
SCM_DEFER_INTS;
|
||
if ((ptr = srcprops_freelist) != NULL)
|
||
srcprops_freelist = *(scm_srcprops_t **)ptr;
|
||
else
|
||
{
|
||
size_t i;
|
||
scm_srcprops_chunk_t *mem;
|
||
size_t n = sizeof (scm_srcprops_chunk_t)
|
||
+ sizeof (scm_srcprops_t) * (SRCPROPS_CHUNKSIZE - 1);
|
||
SCM_SYSCALL (mem = (scm_srcprops_chunk_t *) malloc (n));
|
||
if (mem == NULL)
|
||
scm_memory_error ("srcprops");
|
||
scm_mallocated += n;
|
||
mem->next = srcprops_chunklist;
|
||
srcprops_chunklist = mem;
|
||
ptr = &mem->srcprops[0];
|
||
for (i = 1; i < SRCPROPS_CHUNKSIZE - 1; ++i)
|
||
*(scm_srcprops_t **)&ptr[i] = &ptr[i + 1];
|
||
*(scm_srcprops_t **)&ptr[SRCPROPS_CHUNKSIZE - 1] = 0;
|
||
srcprops_freelist = (scm_srcprops_t *) &ptr[1];
|
||
}
|
||
ptr->pos = SRCPROPMAKPOS (line, col);
|
||
ptr->fname = filename;
|
||
ptr->copy = copy;
|
||
ptr->plist = plist;
|
||
SCM_ALLOW_INTS;
|
||
SCM_RETURN_NEWSMOB (scm_tc16_srcprops, ptr);
|
||
}
|
||
|
||
|
||
SCM
|
||
scm_srcprops_to_plist (SCM obj)
|
||
{
|
||
SCM plist = SRCPROPPLIST (obj);
|
||
if (!SCM_UNBNDP (SRCPROPCOPY (obj)))
|
||
plist = scm_acons (scm_sym_copy, SRCPROPCOPY (obj), plist);
|
||
if (!SCM_UNBNDP (SRCPROPFNAME (obj)))
|
||
plist = scm_acons (scm_sym_filename, SRCPROPFNAME (obj), plist);
|
||
plist = scm_acons (scm_sym_column, SCM_MAKINUM (SRCPROPCOL (obj)), plist);
|
||
plist = scm_acons (scm_sym_line, SCM_MAKINUM (SRCPROPLINE (obj)), plist);
|
||
plist = scm_acons (scm_sym_breakpoint, SRCPROPBRK (obj), plist);
|
||
return plist;
|
||
}
|
||
|
||
SCM_DEFINE (scm_source_properties, "source-properties", 1, 0, 0,
|
||
(SCM obj),
|
||
"Return the source property association list of @var{obj}.")
|
||
#define FUNC_NAME s_scm_source_properties
|
||
{
|
||
SCM p;
|
||
SCM_VALIDATE_NIM (1,obj);
|
||
if (SCM_MEMOIZEDP (obj))
|
||
obj = SCM_MEMOIZED_EXP (obj);
|
||
#ifndef SCM_RECKLESS
|
||
else if (SCM_NCONSP (obj))
|
||
SCM_WRONG_TYPE_ARG (1, obj);
|
||
#endif
|
||
p = scm_hashq_ref (scm_source_whash, obj, SCM_BOOL_F);
|
||
if (SRCPROPSP (p))
|
||
return scm_srcprops_to_plist (p);
|
||
return SCM_EOL;
|
||
}
|
||
#undef FUNC_NAME
|
||
|
||
/* Perhaps this procedure should look through an alist
|
||
and try to make a srcprops-object...? */
|
||
SCM_DEFINE (scm_set_source_properties_x, "set-source-properties!", 2, 0, 0,
|
||
(SCM obj, SCM plist),
|
||
"Install the association list @var{plist} as the source property\n"
|
||
"list for @var{obj}.")
|
||
#define FUNC_NAME s_scm_set_source_properties_x
|
||
{
|
||
SCM handle;
|
||
SCM_VALIDATE_NIM (1,obj);
|
||
if (SCM_MEMOIZEDP (obj))
|
||
obj = SCM_MEMOIZED_EXP (obj);
|
||
#ifndef SCM_RECKLESS
|
||
else if (SCM_NCONSP (obj))
|
||
SCM_WRONG_TYPE_ARG(1, obj);
|
||
#endif
|
||
handle = scm_hashq_create_handle_x (scm_source_whash, obj, plist);
|
||
SCM_SETCDR (handle, plist);
|
||
return plist;
|
||
}
|
||
#undef FUNC_NAME
|
||
|
||
SCM_DEFINE (scm_source_property, "source-property", 2, 0, 0,
|
||
(SCM obj, SCM key),
|
||
"Return the source property specified by @var{key} from\n"
|
||
"@var{obj}'s source property list.")
|
||
#define FUNC_NAME s_scm_source_property
|
||
{
|
||
SCM p;
|
||
SCM_VALIDATE_NIM (1,obj);
|
||
if (SCM_MEMOIZEDP (obj))
|
||
obj = SCM_MEMOIZED_EXP (obj);
|
||
#ifndef SCM_RECKLESS
|
||
else if (SCM_NECONSP (obj))
|
||
SCM_WRONG_TYPE_ARG (1, obj);
|
||
#endif
|
||
p = scm_hashq_ref (scm_source_whash, obj, SCM_EOL);
|
||
if (SCM_IMP (p) || !SRCPROPSP (p))
|
||
goto plist;
|
||
if (SCM_EQ_P (scm_sym_breakpoint, key)) p = SRCPROPBRK (p);
|
||
else if (SCM_EQ_P (scm_sym_line, key)) p = SCM_MAKINUM (SRCPROPLINE (p));
|
||
else if (SCM_EQ_P (scm_sym_column, key)) p = SCM_MAKINUM (SRCPROPCOL (p));
|
||
else if (SCM_EQ_P (scm_sym_filename, key)) p = SRCPROPFNAME (p);
|
||
else if (SCM_EQ_P (scm_sym_copy, key)) p = SRCPROPCOPY (p);
|
||
else
|
||
{
|
||
p = SRCPROPPLIST (p);
|
||
plist:
|
||
p = scm_assoc (key, p);
|
||
return (SCM_NIMP (p) ? SCM_CDR (p) : SCM_BOOL_F);
|
||
}
|
||
return SCM_UNBNDP (p) ? SCM_BOOL_F : p;
|
||
}
|
||
#undef FUNC_NAME
|
||
|
||
SCM_DEFINE (scm_set_source_property_x, "set-source-property!", 3, 0, 0,
|
||
(SCM obj, SCM key, SCM datum),
|
||
"Set the source property of object @var{obj}, which is specified by\n"
|
||
"@var{key} to @var{datum}. Normally, the key will be a symbol.")
|
||
#define FUNC_NAME s_scm_set_source_property_x
|
||
{
|
||
scm_whash_handle h;
|
||
SCM p;
|
||
SCM_VALIDATE_NIM (1,obj);
|
||
if (SCM_MEMOIZEDP (obj))
|
||
obj = SCM_MEMOIZED_EXP (obj);
|
||
#ifndef SCM_RECKLESS
|
||
else if (SCM_NCONSP (obj))
|
||
SCM_WRONG_TYPE_ARG (1, obj);
|
||
#endif
|
||
h = scm_whash_get_handle (scm_source_whash, obj);
|
||
if (SCM_WHASHFOUNDP (h))
|
||
p = SCM_WHASHREF (scm_source_whash, h);
|
||
else
|
||
{
|
||
h = scm_whash_create_handle (scm_source_whash, obj);
|
||
p = SCM_EOL;
|
||
}
|
||
if (SCM_EQ_P (scm_sym_breakpoint, key))
|
||
{
|
||
if (SRCPROPSP (p))
|
||
{
|
||
if (SCM_FALSEP (datum))
|
||
CLEARSRCPROPBRK (p);
|
||
else
|
||
SETSRCPROPBRK (p);
|
||
}
|
||
else
|
||
{
|
||
SCM sp = scm_make_srcprops (0, 0, SCM_UNDEFINED, SCM_UNDEFINED, p);
|
||
SCM_WHASHSET (scm_source_whash, h, sp);
|
||
if (SCM_FALSEP (datum))
|
||
CLEARSRCPROPBRK (sp);
|
||
else
|
||
SETSRCPROPBRK (sp);
|
||
}
|
||
}
|
||
else if (SCM_EQ_P (scm_sym_line, key))
|
||
{
|
||
SCM_VALIDATE_INUM (3,datum);
|
||
if (SRCPROPSP (p))
|
||
SETSRCPROPLINE (p, SCM_INUM (datum));
|
||
else
|
||
SCM_WHASHSET (scm_source_whash, h,
|
||
scm_make_srcprops (SCM_INUM (datum), 0,
|
||
SCM_UNDEFINED, SCM_UNDEFINED, p));
|
||
}
|
||
else if (SCM_EQ_P (scm_sym_column, key))
|
||
{
|
||
SCM_VALIDATE_INUM (3,datum);
|
||
if (SRCPROPSP (p))
|
||
SETSRCPROPCOL (p, SCM_INUM (datum));
|
||
else
|
||
SCM_WHASHSET (scm_source_whash, h,
|
||
scm_make_srcprops (0, SCM_INUM (datum),
|
||
SCM_UNDEFINED, SCM_UNDEFINED, p));
|
||
}
|
||
else if (SCM_EQ_P (scm_sym_filename, key))
|
||
{
|
||
if (SRCPROPSP (p))
|
||
SRCPROPFNAME (p) = datum;
|
||
else
|
||
SCM_WHASHSET (scm_source_whash, h, scm_make_srcprops (0, 0, datum, SCM_UNDEFINED, p));
|
||
}
|
||
else if (SCM_EQ_P (scm_sym_copy, key))
|
||
{
|
||
if (SRCPROPSP (p))
|
||
SRCPROPCOPY (p) = datum;
|
||
else
|
||
SCM_WHASHSET (scm_source_whash, h, scm_make_srcprops (0, 0, SCM_UNDEFINED, datum, p));
|
||
}
|
||
else
|
||
SCM_WHASHSET (scm_source_whash, h, scm_acons (key, datum, p));
|
||
return SCM_UNSPECIFIED;
|
||
}
|
||
#undef FUNC_NAME
|
||
|
||
|
||
void
|
||
scm_init_srcprop ()
|
||
{
|
||
scm_tc16_srcprops = scm_make_smob_type ("srcprops", 0);
|
||
scm_set_smob_mark (scm_tc16_srcprops, srcprops_mark);
|
||
scm_set_smob_free (scm_tc16_srcprops, srcprops_free);
|
||
scm_set_smob_print (scm_tc16_srcprops, srcprops_print);
|
||
|
||
scm_source_whash = scm_make_weak_key_hash_table (SCM_MAKINUM (2047));
|
||
scm_c_define ("source-whash", scm_source_whash);
|
||
|
||
#ifndef SCM_MAGIC_SNARFER
|
||
#include "libguile/srcprop.x"
|
||
#endif
|
||
}
|
||
|
||
void
|
||
scm_finish_srcprop ()
|
||
{
|
||
register scm_srcprops_chunk_t *ptr = srcprops_chunklist, *next;
|
||
while (ptr)
|
||
{
|
||
next = ptr->next;
|
||
free ((char *) ptr);
|
||
scm_mallocated -= sizeof (scm_srcprops_chunk_t)
|
||
+ sizeof (scm_srcprops_t) * (SRCPROPS_CHUNKSIZE - 1);
|
||
ptr = next;
|
||
}
|
||
}
|
||
|
||
/*
|
||
Local Variables:
|
||
c-file-style: "gnu"
|
||
End:
|
||
*/
|