-/* Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
+/* Copyright (C) 1995,1996,1997,1998,1999,2000,2001, 2006 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 library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
*
- * 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.
+ * This library 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
+ * Lesser General Public License for more details.
*
- * 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.
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
- * This is the C part of the module for delimited I/O. It's
- * similar to (scsh rdelim) but somewhat incompatible. */
+#if HAVE_CONFIG_H
+# include <config.h>
+#endif
#include "libguile/_scm.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 @var{gobble}\n"
- "is true, discard the delimiter character; otherwise, leave it\n"
- "in the input stream for the next read.\n"
- "If @var{port} is not specified, use the value of\n"
- "@code{(current-input-port)}. If @var{start} or @var{end} are specified,\n"
- "store data only into the substring of @var{str} bounded by @var{start}\n"
- "and @var{end} (which default to the beginning and end of the string,\n"
- "respectively).\n\n"
- "Return a pair consisting of the delimiter that terminated the string and\n"
- "the number of characters read. If reading stopped at the end of file,\n"
- "the delimiter returned is the @var{eof-object}; if the string was filled\n"
- "without encountering a delimiter, this value is @var{#f}.")
+ "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
{
- long j;
- char *buf;
- long cstart;
- long cend;
+ size_t j;
+ size_t cstart;
+ size_t cend;
int c;
- char *cdelims;
- int num_delims;
+ const char *cdelims;
+ size_t num_delims;
+
+ SCM_VALIDATE_STRING (1, delims);
+ cdelims = scm_i_string_chars (delims);
+ num_delims = scm_i_string_length (delims);
+
+ SCM_VALIDATE_STRING (2, str);
+ scm_i_get_substring_spec (scm_i_string_length (str),
+ start, &cstart, end, &cend);
- 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;
+ port = scm_current_input_port ();
else
- SCM_VALIDATE_OPINPORT (4,port);
+ SCM_VALIDATE_OPINPORT (4, port);
for (j = cstart; j < cend; j++)
{
- int k;
+ size_t k;
c = scm_getc (port);
for (k = 0; k < num_delims; k++)
{
if (cdelims[k] == c)
{
- if (SCM_FALSEP (gobble))
+ if (scm_is_false (gobble))
scm_ungetc (c, port);
return scm_cons (SCM_MAKE_CHAR (c),
- scm_long2num (j - cstart));
+ scm_from_size_t (j - cstart));
}
}
if (c == EOF)
return scm_cons (SCM_EOF_VAL,
- scm_long2num (j - cstart));
+ scm_from_size_t (j - cstart));
- buf[j] = c;
+ scm_c_string_set_x (str, j, SCM_MAKE_CHAR (c));
}
- return scm_cons (SCM_BOOL_F, scm_long2num (j - cstart));
+ return scm_cons (SCM_BOOL_F, scm_from_size_t (j - cstart));
}
#undef FUNC_NAME
static unsigned char *
-scm_do_read_line (SCM port, int *len_p)
+scm_do_read_line (SCM port, size_t *len_p)
{
- scm_port *pt = SCM_PTAB_ENTRY (port);
+ scm_t_port *pt = SCM_PTAB_ENTRY (port);
unsigned char *end;
/* I thought reading lines was simple. Mercy me. */
if ((end = memchr (pt->read_pos, '\n', (pt->read_end - pt->read_pos)))
!= 0)
{
- int buf_len = (end + 1) - pt->read_pos;
+ 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");
+ unsigned char *buf = scm_malloc (buf_len + 1);
memcpy (buf, pt->read_pos, buf_len);
pt->read_pos += buf_len;
{
/* When live, len is always the number of characters in the
current buffer that are part of the current line. */
- int len = (pt->read_end - pt->read_pos);
- int buf_size = (len < 50) ? 60 : len * 2;
+ 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");
- int buf_len = 0;
+ unsigned char *buf = scm_malloc (buf_size + 1);
+ size_t buf_len = 0;
for (;;)
{
if (buf_len + len > buf_size)
{
- int new_size = (buf_len + len) * 2;
- buf = scm_must_realloc (buf, buf_size + 1, new_size + 1,
- "%read-line");
+ size_t new_size = (buf_len + len) * 2;
+ buf = scm_realloc (buf, new_size + 1);
buf_size = new_size;
}
}
/* I wonder how expensive this realloc is. */
- buf = scm_must_realloc (buf, buf_size + 1, buf_len + 1, "%read-line");
+ buf = scm_realloc (buf, buf_len + 1);
buf[buf_len] = '\0';
*len_p = buf_len;
return buf;
}
-}
+}
/*
"@code{(#<eof> . #<eof>)}.")
#define FUNC_NAME s_scm_read_line
{
- scm_port *pt;
+ scm_t_port *pt;
char *s;
- int slen;
+ size_t slen = 0;
SCM line, term;
if (SCM_UNBNDP (port))
- port = scm_cur_inp;
+ port = scm_current_input_port ();
SCM_VALIDATE_OPINPORT (1,port);
pt = SCM_PTAB_ENTRY (port);
{
term = SCM_MAKE_CHAR ('\n');
s[slen-1] = '\0';
- line = scm_take_str (s, slen-1);
- scm_done_malloc (-1);
+ line = scm_take_locale_stringn (s, slen-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);
+ line = scm_take_locale_stringn (s, slen);
SCM_COL (port) += slen;
- }
+ }
}
if (pt->rw_random)
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 @var{port}\n"
- "is not specified, @code{(current-output-port)} is used. This function\n"
- "is equivalent to:\n\n"
- "@smalllisp\n"
+ "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 smalllisp")
+ "@end lisp")
#define FUNC_NAME s_scm_write_line
{
scm_display (obj, port);
}
#undef FUNC_NAME
-void
-scm_init_rdelim (void)
+SCM
+scm_init_rdelim_builtins (void)
{
- SCM rdelim_module = scm_make_module (scm_read_0str ("(ice-9 rdelim)"));
- SCM old_module = scm_select_module (rdelim_module);
-
-#ifndef SCM_MAGIC_SNARFER
#include "libguile/rdelim.x"
-#endif
-
- scm_select_module (old_module);
-#if DEBUG_DEPRECATED == 0
- {
- const char expr[] = "\
-(define-module (guile) :use-module (ice-9 rdelim))\
-(define-module (guile-user) :use-module (ice-9 rdelim))";
+ return SCM_UNSPECIFIED;
+}
- scm_eval_string (scm_makfromstr (expr, (sizeof expr) - 1, 0));
- }
- scm_select_module (old_module);
-#endif
+void
+scm_init_rdelim (void)
+{
+ scm_c_define_gsubr ("%init-rdelim-builtins", 0, 0, 0,
+ scm_init_rdelim_builtins);
}
/*
HCoop / bpt / guile.git / blobdiff