-/* Copyright (C) 1995,1996 Free Software Foundation, Inc.
+/* Copyright (C) 1995,1996,1997 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.
- */
+ * If you do not wish that, delete this exception notice. */
\f
-#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"
return ans;
}
-/* CDR contains an association list mapping extra hash characters to
- procedures. */
-static SCM scm_read_hash_procedures;
+/* An association list mapping extra hash characters to procedures. */
+static SCM *scm_read_hash_procedures;
SCM_PROC (s_read, "read", 0, 1, 0, scm_read);
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, ©);
{
register int c;
while (1)
- switch (c = scm_gen_getc (port))
+ switch (c = scm_getc (port))
{
case EOF:
goteof:
return c;
case ';':
lp:
- switch (c = scm_gen_getc (port))
+ switch (c = scm_getc (port))
{
case EOF:
goto goteof;
/* recsexpr is used when recording expressions
* constructed by read:sharp.
*/
-
+#ifndef DEBUG_EXTENSIONS
+#define recsexpr(obj, line, column, filename) (obj)
+#else
static SCM recsexpr SCM_P ((SCM obj, int line, int column, SCM filename));
static SCM
return obj;
}
}
-
+#endif
/* Consume an SCSH-style block comment. Assume that we've already
- read the initial `#!', and eat characters until the matching `!#'. */
+ read the initial `#!', and eat characters until we get a
+ newline/exclamation-point/sharp-sign/newline sequence. */
static void
skip_scsh_block_comment (port)
SCM port;
{
- char last_c = '\0';
+ /* Is this portable? Dear God, spare me from the non-eight-bit
+ characters. But is it tasteful? */
+ long history = 0;
for (;;)
{
- int c = scm_gen_getc (port);
+ int c = scm_getc (port);
if (c == EOF)
scm_wta (SCM_UNDEFINED,
"unterminated `#! ... !#' comment", "read");
- else if (c == '#' && last_c == '!')
- return;
+ history = ((history << 8) | (c & 0xff)) & 0xffffffff;
- last_c = c;
+ /* Were the last four characters read "\n!#\n"? */
+ if (history == (('\n' << 24) | ('!' << 16) | ('#' << 8) | '\n'))
+ return;
}
}
p = scm_i_quasiquote;
goto recquote;
case ',':
- c = scm_gen_getc (port);
+ c = scm_getc (port);
if ('@' == c)
p = scm_i_uq_splicing;
else
{
- scm_gen_ungetc (c, port);
+ scm_ungetc (c, port);
p = scm_i_unquote;
}
recquote:
SCM_EOL));
return p;
case '#':
- c = scm_gen_getc (port);
+ c = scm_getc (port);
switch (c)
{
case '(':
case 'I':
case 'e':
case 'E':
- scm_gen_ungetc (c, port);
+ scm_ungetc (c, port);
c = '#';
goto num;
case '{':
j = scm_read_token (c, tok_buf, port, 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);
case '\\':
- c = scm_gen_getc (port);
+ c = scm_getc (port);
j = scm_read_token (c, tok_buf, port, 0);
if (j == 1)
return SCM_MAKICHR (c);
return SCM_MAKICHR (scm_charnums[c]);
scm_wta (SCM_UNDEFINED, "unknown # object: #\\", SCM_CHARS (*tok_buf));
+ /* #: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));
default:
callshrp:
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");
- while (j + sizeof(xwchar_t) + XMB_CUR_MAX >= SCM_LENGTH (*tok_buf))
+ while (j + 2 >= SCM_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_CHARS (*tok_buf)[j] = c;
+ ++j;
}
if (j == 0)
return scm_nullstr;
{
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);
- }
return str;
}
return p;
if (c == '#')
{
- if ((j == 2) && (scm_gen_getc (port) == '('))
+ if ((j == 2) && (scm_getc (port) == '('))
{
- scm_gen_ungetc ('(', port);
+ scm_ungetc ('(', port);
c = SCM_CHARS (*tok_buf)[1];
goto callshrp;
}
{
j = scm_read_token ('-', tok_buf, port, 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));
}
/* 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);
}
}
else
{
j = 0;
- while (j + sizeof(xwchar_t) + XMB_CUR_MAX >= SCM_LENGTH (*tok_buf))
+ while (j + 2 >= SCM_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_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_case:
{
c = (SCM_CASE_INSENSITIVE_P ? 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;
- }
+ p[j] = c;
+ ++j;
}
}
c = scm_flush_ws (port, name);
if (')' == c)
return SCM_EOL;
- scm_gen_ungetc (c, port);
+ scm_ungetc (c, port);
if (scm_i_dot == (tmp = scm_lreadr (tok_buf, port, copy)))
{
ans = scm_lreadr (tok_buf, port, copy);
ans = tl = scm_cons (tmp, SCM_EOL);
while (')' != (c = scm_flush_ws (port, name)))
{
- scm_gen_ungetc (c, port);
+ scm_ungetc (c, port);
if (scm_i_dot == (tmp = scm_lreadr (tok_buf, port, copy)))
{
SCM_SETCDR (tl, scm_lreadr (tok_buf, port, copy));
c = scm_flush_ws (port, name);
if (')' == c)
return SCM_EOL;
- scm_gen_ungetc (c, port);
+ scm_ungetc (c, port);
if (scm_i_dot == (tmp = scm_lreadr (tok_buf, port, copy)))
{
ans = scm_lreadr (tok_buf, port, copy);
SCM_EOL);
while (')' != (c = scm_flush_ws (port, name)))
{
- scm_gen_ungetc (c, port);
+ scm_ungetc (c, port);
if (scm_i_dot == (tmp = scm_lreadr (tok_buf, port, copy)))
{
SCM_SETCDR (tl, tmp = scm_lreadr (tok_buf, port, copy));
\f
-/* Register a procedure for extended # object processing and the character
- that will trigger it. */
+/* 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_PROC (s_read_hash_extend, "read-hash-extend", 2, 0, 0, scm_read_hash_extend);
SCM
scm_read_hash_extend (chr, proc)
SCM_ASSERT (SCM_FALSEP (proc) || SCM_NIMP(proc), proc, SCM_ARG2,
s_read_hash_extend);
- /* See it this chr is already in the alist. */
- this = SCM_CDR (scm_read_hash_procedures);
- prev = scm_read_hash_procedures;
+ /* 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_set_cdr_x (scm_read_hash_procedures,
- scm_cons (scm_cons (chr, proc),
- SCM_CDR (scm_read_hash_procedures)));
+ *scm_read_hash_procedures =
+ scm_cons (scm_cons (chr, proc), *scm_read_hash_procedures);
}
break;
}
{
/* already in the alist. */
if (SCM_FALSEP (proc))
- scm_set_cdr_x (prev, SCM_CDR (this)); /* remove it. */
+ {
+ /* remove it. */
+ if (prev == SCM_BOOL_F)
+ {
+ *scm_read_hash_procedures =
+ SCM_CDR (*scm_read_hash_procedures);
+ }
+ else
+ scm_set_cdr_x (prev, SCM_CDR (this));
+ }
else
- scm_set_cdr_x (SCM_CAR (this), proc); /* replace it. */
+ {
+ /* replace it. */
+ scm_set_cdr_x (SCM_CAR (this), proc);
+ }
break;
}
prev = this;
scm_get_hash_procedure (c)
int c;
{
- SCM rest = SCM_CDR (scm_read_hash_procedures);
+ SCM rest = *scm_read_hash_procedures;
while (1)
{
void
scm_init_read ()
{
- scm_read_hash_procedures = scm_cons (SCM_BOOL_F, SCM_EOL);
- scm_permanent_object (scm_read_hash_procedures);
+ 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"
HCoop / bpt / guile.git / blobdiff