-/* Copyright (C) 1995,1996 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
*
* 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, 675 Mass Ave, Cambridge, MA 02139, USA.
+ * 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.
*
* 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.
- */
-\f
+ * If you do not wish that, delete this exception notice. */
-#include "extchrs.h"
-#include <stdio.h>
-#include "_scm.h"
-#include "chars.h"
-#include "genio.h"
-#include "eval.h"
-#include "unif.h"
-#include "mbstrings.h"
-#include "kw.h"
-#include "alist.h"
-#include "srcprop.h"
-#include "hashtab.h"
-#include "hash.h"
-
-#include "read.h"
+/* Software engineering face-lift by Greg J. Badros, 11-Dec-1999,
+ gjb@cs.washington.edu, http://www.cs.washington.edu/homes/gjb */
\f
-#define default_case_i 0
+#include <stdio.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
+SCM_SYMBOL (scm_keyword_prefix, "prefix");
+
scm_option scm_read_opts[] = {
{ SCM_OPTION_BOOLEAN, "copy", 0,
"Copy source code expressions." },
{ SCM_OPTION_BOOLEAN, "positions", 0,
- "Record positions of source code expressions." }
+ "Record positions of source code expressions." },
+ { SCM_OPTION_BOOLEAN, "case-insensitive", 0,
+ "Convert symbols to lower case."},
+ { SCM_OPTION_SCM, "keywords", SCM_UNPACK (SCM_BOOL_F),
+ "Style of keyword recognition: #f or 'prefix"}
};
-SCM_PROC (s_read_options, "read-options-interface", 0, 1, 0, scm_read_options);
-#ifdef __STDC__
-SCM
-scm_read_options (SCM setting)
-#else
-SCM
-scm_read_options (setting)
- SCM setting;
-#endif
+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_read_opts,
SCM_N_READ_OPTIONS,
- s_read_options);
+ FUNC_NAME);
if (SCM_COPY_SOURCE_P)
SCM_RECORD_POSITIONS_P = 1;
return ans;
}
+#undef FUNC_NAME
-SCM_PROC (s_read, "read", 0, 3, 0, scm_read);
-#ifdef __STDC__
-SCM
-scm_read (SCM port, SCM case_insensitive_p, SCM sharp)
-#else
-SCM
-scm_read (port, case_insensitive_p, sharp)
- SCM port;
- SCM case_insensitive_p;
- SCM sharp;
-#endif
+/* An association list mapping extra hash characters to procedures. */
+static SCM *scm_read_hash_procedures;
+
+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;
SCM tok_buf, copy;
- int case_i;
if (SCM_UNBNDP (port))
port = scm_cur_inp;
- else
- SCM_ASSERT (SCM_NIMP (port) && SCM_OPINPORTP (port),
- port,
- SCM_ARG1,
- s_read);
-
- case_i = (SCM_UNBNDP (case_insensitive_p)
- ? default_case_i
- : (case_insensitive_p == SCM_BOOL_F));
-
- if (SCM_UNBNDP (sharp))
- sharp = SCM_BOOL_F;
+ SCM_VALIDATE_OPINPORT (1,port);
c = scm_flush_ws (port, (char *) NULL);
if (EOF == c)
return SCM_EOF_VAL;
- scm_gen_ungetc (c, port);
+ scm_ungetc (c, port);
- tok_buf = scm_makstr (30L, 0);
- return scm_lreadr (&tok_buf, port, case_i, sharp, ©);
+ tok_buf = scm_allocate_string (30);
+ return scm_lreadr (&tok_buf, port, ©);
}
+#undef FUNC_NAME
+
-#ifdef __STDC__
-char *
-scm_grow_tok_buf (SCM * tok_buf)
-#else
char *
-scm_grow_tok_buf (tok_buf)
- SCM * tok_buf;
-#endif
+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);
}
-#ifdef __STDC__
-int
-scm_flush_ws (SCM port, char *eoferr)
-#else
+
int
-scm_flush_ws (port, eoferr)
- SCM port;
- char *eoferr;
-#endif
+scm_flush_ws (SCM port, const char *eoferr)
{
register int c;
while (1)
- switch (c = scm_gen_getc (port))
+ switch (c = scm_getc (port))
{
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:
- switch (c = scm_gen_getc (port))
+ switch (c = scm_getc (port))
{
case EOF:
goto goteof;
}
-#ifdef __STDC__
-int
-scm_casei_streq (char * s1, char * s2)
-#else
+
int
-scm_casei_streq (s1, s2)
- char * s1;
- char * s2;
-#endif
+scm_casei_streq (char *s1, char *s2)
{
while (*s1 && *s2)
if (scm_downcase((int)*s1) != scm_downcase((int)*s2))
/* recsexpr is used when recording expressions
* constructed by read:sharp.
*/
-#ifdef __STDC__
-static SCM
-recsexpr (SCM obj, int line, int column, SCM filename)
+#ifndef DEBUG_EXTENSIONS
+#define recsexpr(obj, line, column, filename) (obj)
#else
static SCM
-recsexpr (obj, line, column, filename)
- SCM obj;
- int line;
- int column;
- SCM filename;
-#endif
+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
{
copy = scm_cons (recsexpr (SCM_CAR (obj), line, column, filename),
SCM_UNDEFINED);
- while (SCM_NIMP (tmp = SCM_CDR (tmp)) && SCM_CONSP (tmp))
- copy = (SCM_CDR (copy) = scm_cons (recsexpr (SCM_CAR (tmp),
- line,
- column,
- filename),
- SCM_UNDEFINED));
- SCM_CDR (copy) = tmp;
+ while ((tmp = SCM_CDR (tmp)) && SCM_CONSP (tmp))
+ {
+ SCM_SETCDR (copy, scm_cons (recsexpr (SCM_CAR (tmp),
+ line,
+ column,
+ filename),
+ SCM_UNDEFINED));
+ copy = SCM_CDR (copy);
+ }
+ SCM_SETCDR (copy, tmp);
}
else
{
recsexpr (SCM_CAR (obj), line, column, filename);
- while (SCM_NIMP (tmp = SCM_CDR (tmp)) && SCM_CONSP (tmp))
+ while ((tmp = SCM_CDR (tmp)) && SCM_CONSP (tmp))
recsexpr (SCM_CAR (tmp), line, column, filename);
copy = SCM_UNDEFINED;
}
return obj;
}
}
+#endif
+
+/* Consume an SCSH-style block comment. Assume that we've already
+ read the initial `#!', and eat characters until we get a
+ newline/exclamation-point/sharp-sign/newline sequence. */
+
+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? */
+ long history = 0;
+
+ for (;;)
+ {
+ int c = scm_getc (port);
+
+ if (c == EOF)
+ SCM_MISC_ERROR ("unterminated `#! ... !#' comment", SCM_EOL);
+ history = ((history << 8) | (c & 0xff)) & 0xffffffff;
+
+ /* Were the last four characters read "\n!#\n"? */
+ if (history == (('\n' << 24) | ('!' << 16) | ('#' << 8) | '\n'))
+ return;
+ }
+}
+#undef FUNC_NAME
+
+
+static SCM scm_get_hash_procedure(int c);
static char s_list[]="list";
-#ifdef __STDC__
-SCM
-scm_lreadr (SCM *tok_buf, SCM port, int case_i, SCM sharp, SCM *copy)
-#else
+
SCM
-scm_lreadr (tok_buf, port, case_i, sharp, copy)
- SCM *tok_buf;
- SCM port;
- int case_i;
- SCM sharp;
- SCM *copy;
-#endif
+scm_lreadr (SCM *tok_buf,SCM port,SCM *copy)
+#define FUNC_NAME "scm_lreadr"
{
int c;
scm_sizet j;
SCM p;
-
+
tryagain:
- c = scm_flush_ws (port, s_read);
+ c = scm_flush_ws (port, s_scm_read);
+tryagain_no_flush_ws:
switch (c)
{
case EOF:
case '(':
return SCM_RECORD_POSITIONS_P
- ? scm_lreadrecparen (tok_buf, port, s_list, case_i, sharp, copy)
- : scm_lreadparen (tok_buf, port, s_list, case_i, sharp, copy);
+ ? 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 '\'':
- p = scm_i_quote;
+ p = scm_sym_quote;
goto recquote;
case '`':
- p = scm_i_quasiquote;
+ p = scm_sym_quasiquote;
goto recquote;
case ',':
- c = scm_gen_getc (port);
+ c = scm_getc (port);
if ('@' == c)
- p = scm_i_uq_splicing;
+ p = scm_sym_uq_splicing;
else
{
- scm_gen_ungetc (c, port);
- p = scm_i_unquote;
+ scm_ungetc (c, port);
+ p = scm_sym_unquote;
}
recquote:
p = scm_cons2 (p,
- scm_lreadr (tok_buf, port, case_i, sharp, copy),
+ scm_lreadr (tok_buf, port, copy),
SCM_EOL);
if (SCM_RECORD_POSITIONS_P)
scm_whash_insert (scm_source_whash,
SCM_EOL));
return p;
case '#':
- c = scm_gen_getc (port);
+ c = scm_getc (port);
switch (c)
{
case '(':
- p = scm_lreadparen (tok_buf, port, "vector", case_i, sharp, copy);
+ p = scm_lreadparen (tok_buf, port, "vector", copy);
return SCM_NULLP (p) ? scm_nullvect : scm_vector (p);
case 't':
case 'I':
case 'e':
case 'E':
- scm_gen_ungetc (c, port);
+ scm_ungetc (c, port);
c = '#';
goto num;
+ case '!':
+ /* start of a shell script. Parse as a block comment,
+ terminated by !#, just like SCSH. */
+ skip_scsh_block_comment (port);
+ /* EOF is not an error here */
+ c = scm_flush_ws (port, (char *)NULL);
+ goto tryagain_no_flush_ws;
+
+#ifdef HAVE_ARRAYS
case '*':
- j = scm_read_token (c, tok_buf, port, case_i, 0);
- p = scm_istr2bve (SCM_CHARS (*tok_buf) + 1, (long) (j - 1));
+ j = scm_read_token (c, tok_buf, port, 0);
+ p = scm_istr2bve (SCM_STRING_CHARS (*tok_buf) + 1, (long) (j - 1));
if (SCM_NFALSEP (p))
return p;
else
goto unkshrp;
+#endif
case '{':
- j = scm_read_token (c, tok_buf, port, case_i, 1);
- p = scm_intern (SCM_CHARS (*tok_buf), j);
- if (SCM_PORT_REPRESENTATION (port) != scm_regular_port)
- scm_set_symbol_multi_byte_x (SCM_CAR (p), SCM_BOOL_T);
- return SCM_CAR (p);
+ j = scm_read_token (c, tok_buf, port, 1);
+ return scm_mem2symbol (SCM_STRING_CHARS (*tok_buf), j);
case '\\':
- c = scm_gen_getc (port);
- j = scm_read_token (c, tok_buf, port, case_i, 0);
+ c = scm_getc (port);
+ j = scm_read_token (c, tok_buf, port, 0);
if (j == 1)
- return SCM_MAKICHR (c);
+ 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_MAKICHR (SCM_INUM (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))))
- return SCM_MAKICHR (scm_charnums[c]);
- scm_wta (SCM_UNDEFINED, "unknown # object: #\\", SCM_CHARS (*tok_buf));
+ && (scm_casei_streq (scm_charnames[c], SCM_STRING_CHARS (*tok_buf))))
+ return SCM_MAKE_CHAR (scm_charnums[c]);
+ 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_mem2symbol (SCM_STRING_CHARS (*tok_buf), j);
+ return scm_make_keyword_from_dash_symbol (p);
default:
callshrp:
- if (SCM_NIMP (sharp))
- {
- int line = SCM_LINUM (port);
- int column = SCM_COL (port) - 2;
- SCM got;
- got = scm_apply (sharp,
- SCM_MAKICHR (c),
- scm_acons (port, SCM_EOL, SCM_EOL));
- if (SCM_UNSPECIFIED == got)
- goto unkshrp;
- if (SCM_RECORD_POSITIONS_P)
- return *copy = recsexpr (got, line, column,
- SCM_FILENAME (port));
- else
- return got;
- }
- unkshrp:scm_wta ((SCM) SCM_MAKICHR (c), "unknown # object", "");
+ {
+ SCM sharp = scm_get_hash_procedure (c);
+
+ if (SCM_NIMP (sharp))
+ {
+ int line = SCM_LINUM (port);
+ int column = SCM_COL (port) - 2;
+ SCM got;
+
+ got = scm_apply (sharp,
+ SCM_MAKE_CHAR (c),
+ scm_acons (port, SCM_EOL, SCM_EOL));
+ if (SCM_EQ_P (got, SCM_UNSPECIFIED))
+ goto unkshrp;
+ if (SCM_RECORD_POSITIONS_P)
+ return *copy = recsexpr (got, line, column,
+ SCM_FILENAME (port));
+ else
+ return got;
+ }
+ }
+ unkshrp:
+ scm_misc_error (s_scm_read, "Unknown # object: ~S",
+ SCM_LIST1 (SCM_MAKE_CHAR (c)));
}
case '"':
j = 0;
- while ('"' != (c = scm_gen_getc (port)))
+ 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 + sizeof(xwchar_t) + XMB_CUR_MAX >= SCM_LENGTH (*tok_buf))
+ while (j + 2 >= SCM_STRING_LENGTH (*tok_buf))
scm_grow_tok_buf (tok_buf);
if (c == '\\')
- switch (c = scm_gen_getc (port))
+ switch (c = scm_getc (port))
{
case '\n':
continue;
c = '\v';
break;
}
- if (SCM_PORT_REPRESENTATION(port) == scm_regular_port)
- {
- SCM_CHARS (*tok_buf)[j] = c;
- ++j;
- }
- else
- {
- int len;
- len = xwctomb (SCM_CHARS (*tok_buf) + j, c);
- if (len == 0)
- len = 1;
- SCM_ASSERT (len > 0, SCM_MAKINUM (c), "bogus char", "read");
- j += len;
- }
+ 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);
- if (SCM_PORT_REPRESENTATION(port) != scm_regular_port)
- {
- SCM_SETLENGTH (str, SCM_LENGTH (str), scm_tc7_mb_string);
- }
+ str = scm_makfromstr (SCM_STRING_CHARS (*tok_buf), j, 0);
return str;
}
case '-':
case '+':
num:
- j = scm_read_token (c, tok_buf, port, case_i, 0);
- p = scm_istring2number (SCM_CHARS (*tok_buf), (long) j, 10L);
+ j = scm_read_token (c, tok_buf, port, 0);
+ p = scm_istring2number (SCM_STRING_CHARS (*tok_buf), (long) j, 10L);
if (SCM_NFALSEP (p))
return p;
if (c == '#')
{
- if ((j == 2) && (scm_gen_getc (port) == '('))
+ if ((j == 2) && (scm_getc (port) == '('))
{
- scm_gen_ungetc ('(', port);
- c = SCM_CHARS (*tok_buf)[1];
+ scm_ungetc ('(', port);
+ 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 ':':
- j = scm_read_token ('-', tok_buf, port, case_i, 0);
- p = scm_intern (SCM_CHARS (*tok_buf), j);
- if (SCM_PORT_REPRESENTATION (port) != scm_regular_port)
- scm_set_symbol_multi_byte_x (SCM_CAR (p), SCM_BOOL_T);
- return scm_make_keyword_from_dash_symbol (SCM_CAR (p));
-
+ if (SCM_EQ_P (SCM_PACK (SCM_KEYWORD_STYLE), scm_keyword_prefix))
+ {
+ j = scm_read_token ('-', tok_buf, port, 0);
+ p = scm_mem2symbol (SCM_STRING_CHARS (*tok_buf), j);
+ return scm_make_keyword_from_dash_symbol (p);
+ }
+ /* fallthrough */
default:
- j = scm_read_token (c, tok_buf, port, case_i, 0);
+ j = scm_read_token (c, tok_buf, port, 0);
/* fallthrough */
tok:
- p = scm_intern (SCM_CHARS (*tok_buf), j);
- if (SCM_PORT_REPRESENTATION (port) != scm_regular_port)
- scm_set_symbol_multi_byte_x (SCM_CAR (p), SCM_BOOL_T);
- return SCM_CAR (p);
+ return scm_mem2symbol (SCM_STRING_CHARS (*tok_buf), j);
}
}
+#undef FUNC_NAME
+
#ifdef _UNICOS
_Pragma ("noopt"); /* # pragma _CRI noopt */
#endif
-#ifdef __STDC__
-scm_sizet
-scm_read_token (int ic, SCM * tok_buf, SCM port, int case_i, int weird)
-#else
+
scm_sizet
-scm_read_token (ic, * tok_buf, port, case_i, weird)
- int ic;
- SCM *tok_buf;
- SCM port;
- int case_i;
- int weird;
-#endif
+scm_read_token (int ic, SCM *tok_buf, SCM port, int weird)
{
register scm_sizet j;
register int c;
register char *p;
- c = ic;
- p = SCM_CHARS (*tok_buf);
+ c = (SCM_CASE_INSENSITIVE_P ? scm_downcase(ic) : ic);
+ p = SCM_STRING_CHARS (*tok_buf);
if (weird)
j = 0;
else
{
j = 0;
- while (j + sizeof(xwchar_t) + XMB_CUR_MAX >= SCM_LENGTH (*tok_buf))
+ while (j + 2 >= SCM_STRING_LENGTH (*tok_buf))
p = scm_grow_tok_buf (tok_buf);
- if (SCM_PORT_REPRESENTATION(port) == scm_regular_port)
- {
- p[j] = c;
- ++j;
- }
- else
- {
- int len;
- len = xwctomb (p + j, c);
- if (len == 0)
- len = 1;
- SCM_ASSERT (len > 0, SCM_MAKINUM (c), "bogus char", "read");
- j += len;
- }
+ p[j] = c;
+ ++j;
}
while (1)
{
- while (j + sizeof(xwchar_t) + XMB_CUR_MAX >= SCM_LENGTH (*tok_buf))
+ while (j + 2 >= SCM_STRING_LENGTH (*tok_buf))
p = scm_grow_tok_buf (tok_buf);
- c = scm_gen_getc (port);
+ c = scm_getc (port);
switch (c)
{
case '(':
if (weird)
goto default_case;
- scm_gen_ungetc (c, port);
+ scm_ungetc (c, port);
case EOF:
eof_case:
p[j] = 0;
goto default_case;
else
{
- c = scm_gen_getc (port);
+ c = scm_getc (port);
if (c == EOF)
goto eof_case;
else
if (!weird)
goto default_case;
- c = scm_gen_getc (port);
+ c = scm_getc (port);
if (c == '#')
{
p[j] = 0;
}
else
{
- scm_gen_ungetc (c, port);
+ scm_ungetc (c, port);
c = '}';
goto default_case;
}
default:
default_case:
{
- c = (case_i ? scm_downcase(c) : c);
- if (SCM_PORT_REPRESENTATION(port) == scm_regular_port)
- {
- p[j] = c;
- ++j;
- }
- else
- {
- int len;
- len = xwctomb (p + j, c);
- if (len == 0)
- len = 1;
- SCM_ASSERT (len > 0, SCM_MAKINUM (c), "bogus char", "read");
- j += len;
- }
+ c = (SCM_CASE_INSENSITIVE_P ? scm_downcase(c) : c);
+ p[j] = c;
+ ++j;
}
}
}
}
+
#ifdef _UNICOS
_Pragma ("opt"); /* # pragma _CRI opt */
#endif
-#ifdef __STDC__
SCM
-scm_lreadparen (SCM * tok_buf, SCM port, char *name, int case_i, SCM sharp, SCM *copy)
-#else
-SCM
-scm_lreadparen (tok_buf, port, name, case_i, sharp, SCM *copy)
- SCM *tok_buf;
- SCM port;
- char *name;
- int case_i;
- SCM sharp;
-#endif
+scm_lreadparen (SCM *tok_buf, SCM port, char *name, SCM *copy)
+#define FUNC_NAME "scm_lreadparen"
{
SCM tmp;
SCM tl;
c = scm_flush_ws (port, name);
if (')' == c)
return SCM_EOL;
- scm_gen_ungetc (c, port);
- if (scm_i_dot == (tmp = scm_lreadr (tok_buf, port, case_i, sharp, copy)))
+ scm_ungetc (c, port);
+ if (SCM_EQ_P (scm_sym_dot, (tmp = scm_lreadr (tok_buf, port, copy))))
{
- ans = scm_lreadr (tok_buf, port, case_i, sharp, 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_gen_ungetc (c, port);
- if (scm_i_dot == (tmp = scm_lreadr (tok_buf, port, case_i, sharp, copy)))
+ scm_ungetc (c, port);
+ if (SCM_EQ_P (scm_sym_dot, (tmp = scm_lreadr (tok_buf, port, copy))))
{
- SCM_CDR (tl) = scm_lreadr (tok_buf, port, case_i, sharp, copy);
+ SCM_SETCDR (tl, scm_lreadr (tok_buf, port, copy));
goto closeit;
}
- tl = (SCM_CDR (tl) = scm_cons (tmp, SCM_EOL));
+ SCM_SETCDR (tl, scm_cons (tmp, SCM_EOL));
+ tl = SCM_CDR (tl);
}
return ans;
}
+#undef FUNC_NAME
+
-#ifdef __STDC__
-SCM
-scm_lreadrecparen (SCM * tok_buf, SCM port, char *name, int case_i, SCM sharp, SCM *copy)
-#else
SCM
-scm_lreadrecparen (tok_buf, port, name, case_i, sharp, copy)
- SCM *tok_buf;
- SCM port;
- char *name;
- int case_i;
- SCM sharp;
- SCM *copy;
-#endif
+scm_lreadrecparen (SCM *tok_buf, SCM port, char *name, SCM *copy)
+#define FUNC_NAME "scm_lreadrecparen"
{
register int c;
register SCM tmp;
- register SCM tl, tl2;
- SCM ans, ans2;
+ register SCM tl, tl2 = SCM_EOL;
+ SCM ans, ans2 = SCM_EOL;
/* Need to capture line and column numbers here. */
int line = SCM_LINUM (port);
int column = SCM_COL (port) - 1;
c = scm_flush_ws (port, name);
if (')' == c)
return SCM_EOL;
- scm_gen_ungetc (c, port);
- if (scm_i_dot == (tmp = scm_lreadr (tok_buf, port, case_i, sharp, copy)))
+ scm_ungetc (c, port);
+ if (SCM_EQ_P (scm_sym_dot, (tmp = scm_lreadr (tok_buf, port, copy))))
{
- ans = scm_lreadr (tok_buf, port, case_i, sharp, 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. */
ans = tl = scm_cons (tmp, SCM_EOL);
if (SCM_COPY_SOURCE_P)
- ans2 = tl2 = scm_cons (SCM_NIMP (tmp) && SCM_CONSP (tmp)
+ ans2 = tl2 = scm_cons (SCM_CONSP (tmp)
? *copy
: tmp,
SCM_EOL);
while (')' != (c = scm_flush_ws (port, name)))
{
- scm_gen_ungetc (c, port);
- if (scm_i_dot == (tmp = scm_lreadr (tok_buf, port, case_i, sharp, copy)))
+ SCM new_tail;
+
+ scm_ungetc (c, port);
+ if (SCM_EQ_P (scm_sym_dot, (tmp = scm_lreadr (tok_buf, port, copy))))
{
- SCM_SETCDR (tl, tmp = scm_lreadr (tok_buf, port, case_i, sharp, copy));
+ SCM_SETCDR (tl, tmp = scm_lreadr (tok_buf, port, copy));
if (SCM_COPY_SOURCE_P)
- SCM_SETCDR (tl2, scm_cons (SCM_NIMP (tmp) && SCM_CONSP (tmp)
+ SCM_SETCDR (tl2, scm_cons (SCM_CONSP (tmp)
? *copy
: 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_NIMP (tmp) && 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
+/* Manipulate the read-hash-procedures alist. This could be written in
+ 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;
+ SCM prev;
+
+ SCM_VALIDATE_CHAR (1,chr);
+ SCM_ASSERT (SCM_FALSEP (proc) || SCM_NIMP(proc), proc, SCM_ARG2,
+ FUNC_NAME);
+
+ /* Check if chr is already in the alist. */
+ this = *scm_read_hash_procedures;
+ prev = SCM_BOOL_F;
+ while (1)
+ {
+ if (SCM_NULLP (this))
+ {
+ /* not found, so add it to the beginning. */
+ if (SCM_NFALSEP (proc))
+ {
+ *scm_read_hash_procedures =
+ scm_cons (scm_cons (chr, proc), *scm_read_hash_procedures);
+ }
+ break;
+ }
+ if (SCM_EQ_P (chr, SCM_CAAR (this)))
+ {
+ /* already in the alist. */
+ if (SCM_FALSEP (proc))
+ {
+ /* remove it. */
+ if (SCM_FALSEP (prev))
+ {
+ *scm_read_hash_procedures =
+ SCM_CDR (*scm_read_hash_procedures);
+ }
+ else
+ scm_set_cdr_x (prev, SCM_CDR (this));
+ }
+ else
+ {
+ /* replace it. */
+ scm_set_cdr_x (SCM_CAR (this), proc);
+ }
+ break;
+ }
+ prev = this;
+ this = SCM_CDR (this);
+ }
+
+ return SCM_UNSPECIFIED;
+}
+#undef FUNC_NAME
+
+/* Recover the read-hash procedure corresponding to char c. */
+static SCM
+scm_get_hash_procedure (int c)
+{
+ SCM rest = *scm_read_hash_procedures;
+
+ while (1)
+ {
+ if (SCM_NULLP (rest))
+ return SCM_BOOL_F;
+
+ if (SCM_CHAR (SCM_CAAR (rest)) == c)
+ return SCM_CDAR (rest);
+
+ rest = SCM_CDR (rest);
+ }
+}
-#ifdef __STDC__
-void
-scm_init_read (void)
-#else
void
scm_init_read ()
-#endif
{
-#ifdef READER_EXTENSIONS
+ 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);
+#ifndef SCM_MAGIC_SNARFER
+#include "libguile/read.x"
#endif
-#include "read.x"
}
+
+/*
+ Local Variables:
+ c-file-style: "gnu"
+ End:
+*/
HCoop / bpt / guile.git / blobdiff