-/* Copyright (C) 1995,1996,1997, 1999 Free Software Foundation, Inc.
+/* Copyright (C) 1995,1996,1997,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
\f
#include <stdio.h>
-#include "_scm.h"
-#include "chars.h"
-#include "genio.h"
-#include "eval.h"
-#include "unif.h"
-#include "keywords.h"
-#include "alist.h"
-#include "srcprop.h"
-#include "hashtab.h"
-#include "hash.h"
-
-#include "validate.h"
-#include "read.h"
+#include "libguile/_scm.h"
+#include "libguile/chars.h"
+#include "libguile/eval.h"
+#include "libguile/unif.h"
+#include "libguile/keywords.h"
+#include "libguile/alist.h"
+#include "libguile/srcprop.h"
+#include "libguile/hashtab.h"
+#include "libguile/hash.h"
+#include "libguile/ports.h"
+#include "libguile/root.h"
+#include "libguile/strings.h"
+#include "libguile/vectors.h"
+
+#include "libguile/validate.h"
+#include "libguile/read.h"
\f
"Record positions of source code expressions." },
{ SCM_OPTION_BOOLEAN, "case-insensitive", 0,
"Convert symbols to lower case."},
- { SCM_OPTION_SCM, "keywords", SCM_BITS (SCM_BOOL_F),
+ { SCM_OPTION_SCM, "keywords", SCM_UNPACK (SCM_BOOL_F),
"Style of keyword recognition: #f or 'prefix"}
};
SCM_DEFINE (scm_read_options, "read-options-interface", 0, 1, 0,
(SCM setting),
-"")
+ "Option interface for the read options. Instead of using\n"
+ "this procedure directly, use the procedures @code{read-enable},\n"
+ "@code{read-disable}, @code{read-set!} and @var{read-options}.")
#define FUNC_NAME s_scm_read_options
{
SCM ans = scm_options (setting,
SCM_DEFINE (scm_read, "read", 0, 1, 0,
(SCM port),
-"")
+ "Read an s-expression from the input port @var{port}, or from\n"
+ "the current input port if @var{port} is not specified.\n"
+ "Any whitespace before the next token is discarded.")
#define FUNC_NAME s_scm_read
{
int c;
return SCM_EOF_VAL;
scm_ungetc (c, port);
- tok_buf = scm_makstr (30L, 0);
+ tok_buf = scm_allocate_string (30);
return scm_lreadr (&tok_buf, port, ©);
}
#undef FUNC_NAME
char *
scm_grow_tok_buf (SCM *tok_buf)
{
- scm_vector_set_length_x (*tok_buf, SCM_MAKINUM (2 * SCM_LENGTH (*tok_buf)));
- return SCM_CHARS (*tok_buf);
+ unsigned long int oldlen = SCM_STRING_LENGTH (*tok_buf);
+ SCM newstr = scm_allocate_string (2 * oldlen);
+ unsigned long int i;
+
+ for (i = 0; i != oldlen; ++i)
+ SCM_STRING_CHARS (newstr) [i] = SCM_STRING_CHARS (*tok_buf) [i];
+
+ *tok_buf = newstr;
+ return SCM_STRING_CHARS (newstr);
}
case EOF:
goteof:
if (eoferr)
- scm_wta (SCM_UNDEFINED, "end of file in ", eoferr);
+ {
+ if (!SCM_FALSEP (SCM_FILENAME (port)))
+ scm_misc_error (eoferr,
+ "end of file in ~A",
+ SCM_LIST1 (SCM_FILENAME (port)));
+ else
+ scm_misc_error (eoferr, "end of file", SCM_EOL);
+ }
return c;
case ';':
lp:
static SCM
recsexpr (SCM obj,int line,int column,SCM filename)
{
- if (SCM_IMP (obj) || SCM_NCONSP(obj))
+ if (!SCM_CONSP(obj)) {
return obj;
- {
+ } else {
SCM tmp = obj, copy;
/* If this sexpr is visible in the read:sharp source, we want to
keep that information, so only record non-constant cons cells
static void
skip_scsh_block_comment (SCM port)
+#define FUNC_NAME "skip_scsh_block_comment"
{
/* Is this portable? Dear God, spare me from the non-eight-bit
characters. But is it tasteful? */
int c = scm_getc (port);
if (c == EOF)
- scm_wta (SCM_UNDEFINED,
- "unterminated `#! ... !#' comment", "read");
+ SCM_MISC_ERROR ("unterminated `#! ... !#' comment", SCM_EOL);
history = ((history << 8) | (c & 0xff)) & 0xffffffff;
/* Were the last four characters read "\n!#\n"? */
return;
}
}
+#undef FUNC_NAME
+
static SCM scm_get_hash_procedure(int c);
SCM
scm_lreadr (SCM *tok_buf,SCM port,SCM *copy)
+#define FUNC_NAME "scm_lreadr"
{
int c;
scm_sizet j;
? scm_lreadrecparen (tok_buf, port, s_list, copy)
: scm_lreadparen (tok_buf, port, s_list, copy);
case ')':
- scm_wta (SCM_UNDEFINED, "unexpected \")\"", "read");
+ SCM_MISC_ERROR ("unexpected \")\"", SCM_EOL);
goto tryagain;
case '\'':
#ifdef HAVE_ARRAYS
case '*':
j = scm_read_token (c, tok_buf, port, 0);
- p = scm_istr2bve (SCM_CHARS (*tok_buf) + 1, (long) (j - 1));
+ p = scm_istr2bve (SCM_STRING_CHARS (*tok_buf) + 1, (long) (j - 1));
if (SCM_NFALSEP (p))
return p;
else
case '{':
j = scm_read_token (c, tok_buf, port, 1);
- p = scm_intern (SCM_CHARS (*tok_buf), j);
- return SCM_CAR (p);
+ return scm_mem2symbol (SCM_STRING_CHARS (*tok_buf), j);
case '\\':
c = scm_getc (port);
return SCM_MAKE_CHAR (c);
if (c >= '0' && c < '8')
{
- p = scm_istr2int (SCM_CHARS (*tok_buf), (long) j, 8);
+ p = scm_istr2int (SCM_STRING_CHARS (*tok_buf), (long) j, 8);
if (SCM_NFALSEP (p))
return SCM_MAKE_CHAR (SCM_INUM (p));
}
for (c = 0; c < scm_n_charnames; c++)
if (scm_charnames[c]
- && (scm_casei_streq (scm_charnames[c], SCM_CHARS (*tok_buf))))
+ && (scm_casei_streq (scm_charnames[c], SCM_STRING_CHARS (*tok_buf))))
return SCM_MAKE_CHAR (scm_charnums[c]);
- scm_wta (SCM_UNDEFINED, "unknown # object: #\\", SCM_CHARS (*tok_buf));
+ SCM_MISC_ERROR ("unknown # object", SCM_EOL);
/* #:SYMBOL is a syntax for keywords supported in all contexts. */
case ':':
j = scm_read_token ('-', tok_buf, port, 0);
- p = scm_intern (SCM_CHARS (*tok_buf), j);
- return scm_make_keyword_from_dash_symbol (SCM_CAR (p));
+ p = scm_mem2symbol (SCM_STRING_CHARS (*tok_buf), j);
+ return scm_make_keyword_from_dash_symbol (p);
default:
callshrp:
got = scm_apply (sharp,
SCM_MAKE_CHAR (c),
scm_acons (port, SCM_EOL, SCM_EOL));
- if (SCM_UNSPECIFIED == got)
+ if (SCM_EQ_P (got, SCM_UNSPECIFIED))
goto unkshrp;
if (SCM_RECORD_POSITIONS_P)
return *copy = recsexpr (got, line, column,
}
unkshrp:
scm_misc_error (s_scm_read, "Unknown # object: ~S",
- scm_listify (SCM_MAKE_CHAR (c), SCM_UNDEFINED));
+ SCM_LIST1 (SCM_MAKE_CHAR (c)));
}
case '"':
j = 0;
while ('"' != (c = scm_getc (port)))
{
- SCM_ASSERT (EOF != c, SCM_UNDEFINED, "end of file in ", "string");
+ if (c == EOF)
+ SCM_MISC_ERROR ("end of file in string constant", SCM_EOL);
- while (j + 2 >= SCM_LENGTH (*tok_buf))
+ while (j + 2 >= SCM_STRING_LENGTH (*tok_buf))
scm_grow_tok_buf (tok_buf);
if (c == '\\')
c = '\v';
break;
}
- SCM_CHARS (*tok_buf)[j] = c;
+ SCM_STRING_CHARS (*tok_buf)[j] = c;
++j;
}
if (j == 0)
return scm_nullstr;
- SCM_CHARS (*tok_buf)[j] = 0;
+ SCM_STRING_CHARS (*tok_buf)[j] = 0;
{
SCM str;
- str = scm_makfromstr (SCM_CHARS (*tok_buf), j, 0);
+ str = scm_makfromstr (SCM_STRING_CHARS (*tok_buf), j, 0);
return str;
}
case '+':
num:
j = scm_read_token (c, tok_buf, port, 0);
- p = scm_istring2number (SCM_CHARS (*tok_buf), (long) j, 10L);
+ p = scm_istring2number (SCM_STRING_CHARS (*tok_buf), (long) j, 10L);
if (SCM_NFALSEP (p))
return p;
if (c == '#')
if ((j == 2) && (scm_getc (port) == '('))
{
scm_ungetc ('(', port);
- c = SCM_CHARS (*tok_buf)[1];
+ c = SCM_STRING_CHARS (*tok_buf)[1];
goto callshrp;
}
- scm_wta (SCM_UNDEFINED, "unknown # object", SCM_CHARS (*tok_buf));
+ SCM_MISC_ERROR ("unknown # object", SCM_EOL);
}
goto tok;
case ':':
- if (SCM_SCM (SCM_KEYWORD_STYLE) == scm_keyword_prefix)
+ if (SCM_EQ_P (SCM_PACK (SCM_KEYWORD_STYLE), scm_keyword_prefix))
{
j = scm_read_token ('-', tok_buf, port, 0);
- p = scm_intern (SCM_CHARS (*tok_buf), j);
- return scm_make_keyword_from_dash_symbol (SCM_CAR (p));
+ p = scm_mem2symbol (SCM_STRING_CHARS (*tok_buf), j);
+ return scm_make_keyword_from_dash_symbol (p);
}
/* fallthrough */
default:
/* fallthrough */
tok:
- p = scm_intern (SCM_CHARS (*tok_buf), j);
- return SCM_CAR (p);
+ return scm_mem2symbol (SCM_STRING_CHARS (*tok_buf), j);
}
}
+#undef FUNC_NAME
+
#ifdef _UNICOS
_Pragma ("noopt"); /* # pragma _CRI noopt */
register char *p;
c = (SCM_CASE_INSENSITIVE_P ? scm_downcase(ic) : ic);
- p = SCM_CHARS (*tok_buf);
+ p = SCM_STRING_CHARS (*tok_buf);
if (weird)
j = 0;
else
{
j = 0;
- while (j + 2 >= SCM_LENGTH (*tok_buf))
+ while (j + 2 >= SCM_STRING_LENGTH (*tok_buf))
p = scm_grow_tok_buf (tok_buf);
p[j] = c;
++j;
while (1)
{
- while (j + 2 >= SCM_LENGTH (*tok_buf))
+ while (j + 2 >= SCM_STRING_LENGTH (*tok_buf))
p = scm_grow_tok_buf (tok_buf);
c = scm_getc (port);
switch (c)
SCM
scm_lreadparen (SCM *tok_buf, SCM port, char *name, SCM *copy)
+#define FUNC_NAME "scm_lreadparen"
{
SCM tmp;
SCM tl;
if (')' == c)
return SCM_EOL;
scm_ungetc (c, port);
- if (scm_sym_dot == (tmp = scm_lreadr (tok_buf, port, copy)))
+ if (SCM_EQ_P (scm_sym_dot, (tmp = scm_lreadr (tok_buf, port, copy))))
{
ans = scm_lreadr (tok_buf, port, copy);
closeit:
if (')' != (c = scm_flush_ws (port, name)))
- scm_wta (SCM_UNDEFINED, "missing close paren", "");
+ SCM_MISC_ERROR ("missing close paren", SCM_EOL);
return ans;
}
ans = tl = scm_cons (tmp, SCM_EOL);
while (')' != (c = scm_flush_ws (port, name)))
{
scm_ungetc (c, port);
- if (scm_sym_dot == (tmp = scm_lreadr (tok_buf, port, copy)))
+ if (SCM_EQ_P (scm_sym_dot, (tmp = scm_lreadr (tok_buf, port, copy))))
{
SCM_SETCDR (tl, scm_lreadr (tok_buf, port, copy));
goto closeit;
}
return ans;
}
+#undef FUNC_NAME
SCM
scm_lreadrecparen (SCM *tok_buf, SCM port, char *name, SCM *copy)
+#define FUNC_NAME "scm_lreadrecparen"
{
register int c;
register SCM tmp;
if (')' == c)
return SCM_EOL;
scm_ungetc (c, port);
- if (scm_sym_dot == (tmp = scm_lreadr (tok_buf, port, copy)))
+ if (SCM_EQ_P (scm_sym_dot, (tmp = scm_lreadr (tok_buf, port, copy))))
{
ans = scm_lreadr (tok_buf, port, copy);
if (')' != (c = scm_flush_ws (port, name)))
- scm_wta (SCM_UNDEFINED, "missing close paren", "");
+ SCM_MISC_ERROR ("missing close paren", SCM_EOL);
return ans;
}
/* Build the head of the list structure. */
SCM_EOL);
while (')' != (c = scm_flush_ws (port, name)))
{
+ SCM new_tail;
+
scm_ungetc (c, port);
- if (scm_sym_dot == (tmp = scm_lreadr (tok_buf, port, copy)))
+ if (SCM_EQ_P (scm_sym_dot, (tmp = scm_lreadr (tok_buf, port, copy))))
{
SCM_SETCDR (tl, tmp = scm_lreadr (tok_buf, port, copy));
if (SCM_COPY_SOURCE_P)
: tmp,
SCM_EOL));
if (')' != (c = scm_flush_ws (port, name)))
- scm_wta (SCM_UNDEFINED, "missing close paren", "");
+ SCM_MISC_ERROR ("missing close paren", SCM_EOL);
goto exit;
}
- tl = SCM_SETCDR (tl, scm_cons (tmp, SCM_EOL));
+
+ new_tail = scm_cons (tmp, SCM_EOL);
+ SCM_SETCDR (tl, new_tail);
+ tl = new_tail;
+
if (SCM_COPY_SOURCE_P)
- tl2 = SCM_SETCDR (tl2, scm_cons (SCM_CONSP (tmp)
- ? *copy
- : tmp,
- SCM_EOL));
+ {
+ SCM new_tail2 = scm_cons (SCM_CONSP (tmp) ? *copy : tmp, SCM_EOL);
+ SCM_SETCDR (tl2, new_tail2);
+ tl2 = new_tail2;
+ }
}
exit:
scm_whash_insert (scm_source_whash,
SCM_EOL));
return ans;
}
+#undef FUNC_NAME
\f
Scheme, but maybe it will also be used by C code during initialisation. */
SCM_DEFINE (scm_read_hash_extend, "read-hash-extend", 2, 0, 0,
(SCM chr, SCM proc),
-"")
+ "Install the procedure @var{proc} for reading expressions\n"
+ "starting with the character sequence @code{#} and @var{chr}.\n"
+ "@var{proc} will be called with two arguments: the character\n"
+ "@var{chr} and the port to read further data from. The object\n"
+ "returned will be the return value of @code{read}.")
#define FUNC_NAME s_scm_read_hash_extend
{
SCM this;
}
break;
}
- if (chr == SCM_CAAR (this))
+ if (SCM_EQ_P (chr, SCM_CAAR (this)))
{
/* already in the alist. */
if (SCM_FALSEP (proc))
{
/* remove it. */
- if (prev == SCM_BOOL_F)
+ if (SCM_FALSEP (prev))
{
*scm_read_hash_procedures =
SCM_CDR (*scm_read_hash_procedures);
SCM_CDRLOC (scm_sysintern ("read-hash-procedures", SCM_EOL));
scm_init_opts (scm_read_options, scm_read_opts, SCM_N_READ_OPTIONS);
-#include "read.x"
+#ifndef SCM_MAGIC_SNARFER
+#include "libguile/read.x"
+#endif
}
+
+/*
+ Local Variables:
+ c-file-style: "gnu"
+ End:
+*/
HCoop / bpt / guile.git / blobdiff