mirror of
https://git.savannah.gnu.org/git/guile.git
synced 2025-04-30 03:40:34 +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
318 lines
9.2 KiB
C
318 lines
9.2 KiB
C
/* Copyright (C) 1995, 1996, 1997, 1998, 1999, 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.
|
|
|
|
* This is the C part of the module for delimited I/O. It's
|
|
* similar to (scsh rdelim) but somewhat incompatible. */
|
|
|
|
#include "libguile/_scm.h"
|
|
|
|
#include <stdio.h>
|
|
|
|
#ifdef HAVE_STRING_H
|
|
#include <string.h>
|
|
#endif
|
|
|
|
#include "libguile/chars.h"
|
|
#include "libguile/modules.h"
|
|
#include "libguile/ports.h"
|
|
#include "libguile/rdelim.h"
|
|
#include "libguile/root.h"
|
|
#include "libguile/strings.h"
|
|
#include "libguile/strports.h"
|
|
#include "libguile/validate.h"
|
|
|
|
SCM_DEFINE (scm_read_delimited_x, "%read-delimited!", 3, 3, 0,
|
|
(SCM delims, SCM str, SCM gobble, SCM port, SCM start, SCM end),
|
|
"Read characters from @var{port} into @var{str} until one of the\n"
|
|
"characters in the @var{delims} string is encountered. If\n"
|
|
"@var{gobble} is true, discard the delimiter character;\n"
|
|
"otherwise, leave it in the input stream for the next read. If\n"
|
|
"@var{port} is not specified, use the value of\n"
|
|
"@code{(current-input-port)}. If @var{start} or @var{end} are\n"
|
|
"specified, store data only into the substring of @var{str}\n"
|
|
"bounded by @var{start} and @var{end} (which default to the\n"
|
|
"beginning and end of the string, respectively).\n"
|
|
"\n"
|
|
" Return a pair consisting of the delimiter that terminated the\n"
|
|
"string and the number of characters read. If reading stopped\n"
|
|
"at the end of file, the delimiter returned is the\n"
|
|
"@var{eof-object}; if the string was filled without encountering\n"
|
|
"a delimiter, this value is @code{#f}.")
|
|
#define FUNC_NAME s_scm_read_delimited_x
|
|
{
|
|
size_t j;
|
|
char *buf;
|
|
size_t cstart;
|
|
size_t cend;
|
|
int c;
|
|
char *cdelims;
|
|
size_t num_delims;
|
|
|
|
SCM_VALIDATE_STRING_COPY (1, delims, cdelims);
|
|
num_delims = SCM_STRING_LENGTH (delims);
|
|
SCM_VALIDATE_SUBSTRING_SPEC_COPY (2, str, buf, 5, start, cstart,
|
|
6, end, cend);
|
|
if (SCM_UNBNDP (port))
|
|
port = scm_cur_inp;
|
|
else
|
|
SCM_VALIDATE_OPINPORT (4,port);
|
|
|
|
for (j = cstart; j < cend; j++)
|
|
{
|
|
size_t k;
|
|
|
|
c = scm_getc (port);
|
|
for (k = 0; k < num_delims; k++)
|
|
{
|
|
if (cdelims[k] == c)
|
|
{
|
|
if (SCM_FALSEP (gobble))
|
|
scm_ungetc (c, port);
|
|
|
|
return scm_cons (SCM_MAKE_CHAR (c),
|
|
scm_long2num (j - cstart));
|
|
}
|
|
}
|
|
if (c == EOF)
|
|
return scm_cons (SCM_EOF_VAL,
|
|
scm_long2num (j - cstart));
|
|
|
|
buf[j] = c;
|
|
}
|
|
return scm_cons (SCM_BOOL_F, scm_long2num (j - cstart));
|
|
}
|
|
#undef FUNC_NAME
|
|
|
|
static unsigned char *
|
|
scm_do_read_line (SCM port, size_t *len_p)
|
|
{
|
|
scm_port_t *pt = SCM_PTAB_ENTRY (port);
|
|
unsigned char *end;
|
|
|
|
/* I thought reading lines was simple. Mercy me. */
|
|
|
|
/* The common case: the buffer contains a complete line.
|
|
This needs to be fast. */
|
|
if ((end = memchr (pt->read_pos, '\n', (pt->read_end - pt->read_pos)))
|
|
!= 0)
|
|
{
|
|
size_t buf_len = (end + 1) - pt->read_pos;
|
|
/* Allocate a buffer of the perfect size. */
|
|
unsigned char *buf = scm_must_malloc (buf_len + 1, "%read-line");
|
|
|
|
memcpy (buf, pt->read_pos, buf_len);
|
|
pt->read_pos += buf_len;
|
|
|
|
buf[buf_len] = '\0';
|
|
|
|
*len_p = buf_len;
|
|
return buf;
|
|
}
|
|
|
|
/* The buffer contains no newlines. */
|
|
{
|
|
/* When live, len is always the number of characters in the
|
|
current buffer that are part of the current line. */
|
|
size_t len = (pt->read_end - pt->read_pos);
|
|
size_t buf_size = (len < 50) ? 60 : len * 2;
|
|
/* Invariant: buf always has buf_size + 1 characters allocated;
|
|
the `+ 1' is for the final '\0'. */
|
|
unsigned char *buf = scm_must_malloc (buf_size + 1, "%read-line");
|
|
size_t buf_len = 0;
|
|
|
|
for (;;)
|
|
{
|
|
if (buf_len + len > buf_size)
|
|
{
|
|
size_t new_size = (buf_len + len) * 2;
|
|
buf = scm_must_realloc (buf, buf_size + 1, new_size + 1,
|
|
"%read-line");
|
|
buf_size = new_size;
|
|
}
|
|
|
|
/* Copy what we've got out of the port, into our buffer. */
|
|
memcpy (buf + buf_len, pt->read_pos, len);
|
|
buf_len += len;
|
|
pt->read_pos += len;
|
|
|
|
/* If we had seen a newline, we're done now. */
|
|
if (end)
|
|
break;
|
|
|
|
/* Get more characters. */
|
|
if (scm_fill_input (port) == EOF)
|
|
{
|
|
/* If we're missing a final newline in the file, return
|
|
what we did get, sans newline. */
|
|
if (buf_len > 0)
|
|
break;
|
|
|
|
free (buf);
|
|
return 0;
|
|
}
|
|
|
|
/* Search the buffer for newlines. */
|
|
if ((end = memchr (pt->read_pos, '\n',
|
|
(len = (pt->read_end - pt->read_pos))))
|
|
!= 0)
|
|
len = (end - pt->read_pos) + 1;
|
|
}
|
|
|
|
/* I wonder how expensive this realloc is. */
|
|
buf = scm_must_realloc (buf, buf_size + 1, buf_len + 1, "%read-line");
|
|
buf[buf_len] = '\0';
|
|
*len_p = buf_len;
|
|
return buf;
|
|
}
|
|
}
|
|
|
|
|
|
/*
|
|
* %read-line
|
|
* truncates any terminating newline from its input, and returns
|
|
* a cons of the string read and its terminating character. Doing
|
|
* so makes it easy to implement the hairy `read-line' options
|
|
* efficiently in Scheme.
|
|
*/
|
|
|
|
SCM_DEFINE (scm_read_line, "%read-line", 0, 1, 0,
|
|
(SCM port),
|
|
"Read a newline-terminated line from @var{port}, allocating storage as\n"
|
|
"necessary. The newline terminator (if any) is removed from the string,\n"
|
|
"and a pair consisting of the line and its delimiter is returned. The\n"
|
|
"delimiter may be either a newline or the @var{eof-object}; if\n"
|
|
"@code{%read-line} is called at the end of file, it returns the pair\n"
|
|
"@code{(#<eof> . #<eof>)}.")
|
|
#define FUNC_NAME s_scm_read_line
|
|
{
|
|
scm_port_t *pt;
|
|
char *s;
|
|
size_t slen;
|
|
SCM line, term;
|
|
|
|
if (SCM_UNBNDP (port))
|
|
port = scm_cur_inp;
|
|
SCM_VALIDATE_OPINPORT (1,port);
|
|
|
|
pt = SCM_PTAB_ENTRY (port);
|
|
if (pt->rw_active == SCM_PORT_WRITE)
|
|
scm_ptobs[SCM_PTOBNUM (port)].flush (port);
|
|
|
|
s = (char *) scm_do_read_line (port, &slen);
|
|
|
|
if (s == NULL)
|
|
term = line = SCM_EOF_VAL;
|
|
else
|
|
{
|
|
if (s[slen-1] == '\n')
|
|
{
|
|
term = SCM_MAKE_CHAR ('\n');
|
|
s[slen-1] = '\0';
|
|
line = scm_take_str (s, slen-1);
|
|
scm_done_free (1);
|
|
SCM_INCLINE (port);
|
|
}
|
|
else
|
|
{
|
|
/* Fix: we should check for eof on the port before assuming this. */
|
|
term = SCM_EOF_VAL;
|
|
line = scm_take_str (s, slen);
|
|
SCM_COL (port) += slen;
|
|
}
|
|
}
|
|
|
|
if (pt->rw_random)
|
|
pt->rw_active = SCM_PORT_READ;
|
|
|
|
return scm_cons (line, term);
|
|
}
|
|
#undef FUNC_NAME
|
|
|
|
SCM_DEFINE (scm_write_line, "write-line", 1, 1, 0,
|
|
(SCM obj, SCM port),
|
|
"Display @var{obj} and a newline character to @var{port}. If\n"
|
|
"@var{port} is not specified, @code{(current-output-port)} is\n"
|
|
"used. This function is equivalent to:\n"
|
|
"@lisp\n"
|
|
"(display obj [port])\n"
|
|
"(newline [port])\n"
|
|
"@end lisp")
|
|
#define FUNC_NAME s_scm_write_line
|
|
{
|
|
scm_display (obj, port);
|
|
return scm_newline (port);
|
|
}
|
|
#undef FUNC_NAME
|
|
|
|
SCM
|
|
scm_init_rdelim_builtins (void)
|
|
{
|
|
#ifndef SCM_MAGIC_SNARFER
|
|
#include "libguile/rdelim.x"
|
|
#endif
|
|
|
|
#if DEBUG_DEPRECATED == 0
|
|
{
|
|
SCM old_module = scm_current_module ();
|
|
const char expr[] = "\
|
|
(define-module (guile) :use-module (ice-9 rdelim))\
|
|
(define-module (guile-user) :use-module (ice-9 rdelim))";
|
|
|
|
scm_eval_string (scm_makfromstr (expr, (sizeof expr) - 1, 0));
|
|
scm_set_current_module (old_module);
|
|
}
|
|
#endif
|
|
|
|
return SCM_UNSPECIFIED;
|
|
}
|
|
|
|
void
|
|
scm_init_rdelim (void)
|
|
{
|
|
scm_c_define_gsubr ("%init-rdelim-builtins", 0, 0, 0,
|
|
scm_init_rdelim_builtins);
|
|
}
|
|
|
|
/*
|
|
Local Variables:
|
|
c-file-style: "gnu"
|
|
End:
|
|
*/
|