2008-02-07 09:54:47 +00:00
|
|
|
|
/* Copyright (C) 1995,1996,1997,1999,2000,2001,2003, 2004, 2006, 2007, 2008 Free Software
|
2003-06-04 16:36:03 +00:00
|
|
|
|
* Foundation, Inc.
|
1996-07-25 22:56:11 +00:00
|
|
|
|
*
|
2003-04-05 19:15:35 +00:00
|
|
|
|
* This library is free software; you can redistribute it and/or
|
2009-06-17 00:22:09 +01:00
|
|
|
|
* modify it under the terms of the GNU Lesser General Public License
|
|
|
|
|
|
* as published by the Free Software Foundation; either version 3 of
|
|
|
|
|
|
* the License, or (at your option) any later version.
|
1996-07-25 22:56:11 +00:00
|
|
|
|
*
|
2009-06-17 00:22:09 +01:00
|
|
|
|
* This library is distributed in the hope that it will be useful, but
|
|
|
|
|
|
* WITHOUT ANY WARRANTY; without even the implied warranty of
|
2003-04-05 19:15:35 +00:00
|
|
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
|
|
|
|
* Lesser General Public License for more details.
|
1996-07-25 22:56:11 +00:00
|
|
|
|
*
|
2003-04-05 19:15:35 +00:00
|
|
|
|
* You should have received a copy of the GNU Lesser General Public
|
|
|
|
|
|
* License along with this library; if not, write to the Free Software
|
2009-06-17 00:22:09 +01:00
|
|
|
|
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
|
|
|
|
|
|
* 02110-1301 USA
|
2003-04-05 19:15:35 +00:00
|
|
|
|
*/
|
1999-12-12 02:36:16 +00:00
|
|
|
|
|
|
|
|
|
|
|
1996-07-25 22:56:11 +00:00
|
|
|
|
|
|
|
|
|
|
|
2007-07-22 16:30:13 +00:00
|
|
|
|
#ifdef HAVE_CONFIG_H
|
|
|
|
|
|
# include <config.h>
|
|
|
|
|
|
#endif
|
|
|
|
|
|
|
1996-07-25 22:56:11 +00:00
|
|
|
|
#include <stdio.h>
|
2007-07-22 16:30:13 +00:00
|
|
|
|
#include <ctype.h>
|
|
|
|
|
|
#include <string.h>
|
|
|
|
|
|
|
2000-04-21 14:16:44 +00:00
|
|
|
|
#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"
|
2002-08-05 23:04:44 +00:00
|
|
|
|
#include "libguile/strports.h"
|
2000-04-21 14:16:44 +00:00
|
|
|
|
#include "libguile/vectors.h"
|
|
|
|
|
|
#include "libguile/validate.h"
|
2004-10-26 17:00:13 +00:00
|
|
|
|
#include "libguile/srfi-4.h"
|
2007-07-22 16:30:13 +00:00
|
|
|
|
#include "libguile/srfi-13.h"
|
2002-08-05 23:04:44 +00:00
|
|
|
|
|
2000-04-21 14:16:44 +00:00
|
|
|
|
#include "libguile/read.h"
|
* backtrace.c, debug.c, debug.h, deprecation.c, eq.c, eval.c
eval.h, gsubr.c, init.c, macros.c, print.c, print.h, read.c,
read.h, stacks.c, symbols.c, throw.c: use private-options.h
* private-options.h: new file: contain hardcoded option
definitions.
2007-01-22 15:14:40 +00:00
|
|
|
|
#include "libguile/private-options.h"
|
|
|
|
|
|
|
1996-07-25 22:56:11 +00:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
2003-05-06 20:17:26 +00:00
|
|
|
|
SCM_GLOBAL_SYMBOL (scm_sym_dot, ".");
|
1997-03-10 06:49:15 +00:00
|
|
|
|
SCM_SYMBOL (scm_keyword_prefix, "prefix");
|
2008-04-15 19:52:43 +02:00
|
|
|
|
SCM_SYMBOL (scm_keyword_postfix, "postfix");
|
1997-03-10 06:49:15 +00:00
|
|
|
|
|
2001-06-14 19:50:43 +00:00
|
|
|
|
scm_t_option scm_read_opts[] = {
|
1996-08-23 01:20:34 +00:00
|
|
|
|
{ SCM_OPTION_BOOLEAN, "copy", 0,
|
|
|
|
|
|
"Copy source code expressions." },
|
1996-11-02 20:54:03 +00:00
|
|
|
|
{ SCM_OPTION_BOOLEAN, "positions", 0,
|
* strports.c (scm_read_0str, scm_eval_0str): update scm_read usage.
* gdbint.c (gdb_read): update scm_lreadr usage.
* load.h: update prototypes.
* load.c (scm_primitive_load, scm_read_and_eval_x,
scm_primitive_load_path): remove case_insensitive_p, sharp arguments.
* read.h: add prototype for scm_read_hash_extend. Change args for
other prototypes.
* read.c (scm_read_hash_procedures): new variable.
(scm_read_hash_extend): new procedure.
(scm_get_hash_procedure): new procedure.
* (scm_lreadr): use scm_get_hash_procedure instead of an argument
for extended # processing.
(scm_read, scm_lreadr, scm_lreadrecparen, scm_lreadparen,
scm_read_token): remove case_i, sharp arguments. Change callers.
* read.h (SCM_N_READ_OPTIONS): increase to 3.
(SCM_CASE_INSENSITIVE_P): define.
* read.c: add case-insensitive option to scm_read_opts.
* (scm_read_token): use SCM_CASE_INSENSITIVE_P instead of an argument
to determine whether to convert symbol case.
(default_case_i): definition removed.
* read.c (scm_read_token): if case_i, downcase ic before doing
anything with it.
1997-03-08 18:58:24 +00:00
|
|
|
|
"Record positions of source code expressions." },
|
|
|
|
|
|
{ SCM_OPTION_BOOLEAN, "case-insensitive", 0,
|
1997-03-10 06:49:15 +00:00
|
|
|
|
"Convert symbols to lower case."},
|
2000-03-12 18:30:33 +00:00
|
|
|
|
{ SCM_OPTION_SCM, "keywords", SCM_UNPACK (SCM_BOOL_F),
|
2008-04-15 20:14:44 +02:00
|
|
|
|
"Style of keyword recognition: #f, 'prefix or 'postfix."},
|
2004-02-08 19:14:18 +00:00
|
|
|
|
#if SCM_ENABLE_ELISP
|
|
|
|
|
|
{ SCM_OPTION_BOOLEAN, "elisp-vectors", 0,
|
|
|
|
|
|
"Support Elisp vector syntax, namely `[...]'."},
|
2004-02-10 19:44:10 +00:00
|
|
|
|
{ SCM_OPTION_BOOLEAN, "elisp-strings", 0,
|
2007-01-19 19:26:36 +00:00
|
|
|
|
"Support `\\(' and `\\)' in strings."},
|
2004-02-08 19:14:18 +00:00
|
|
|
|
#endif
|
2007-01-19 19:26:36 +00:00
|
|
|
|
{ 0, },
|
1996-08-20 17:11:25 +00:00
|
|
|
|
};
|
|
|
|
|
|
|
2002-08-04 23:33:28 +00:00
|
|
|
|
/*
|
|
|
|
|
|
Give meaningful error messages for errors
|
|
|
|
|
|
|
|
|
|
|
|
We use the format
|
|
|
|
|
|
|
2002-08-05 23:04:44 +00:00
|
|
|
|
FILE:LINE:COL: MESSAGE
|
2002-08-04 23:33:28 +00:00
|
|
|
|
This happened in ....
|
|
|
|
|
|
|
|
|
|
|
|
This is not standard GNU format, but the test-suite likes the real
|
|
|
|
|
|
message to be in front.
|
|
|
|
|
|
|
|
|
|
|
|
*/
|
|
|
|
|
|
|
|
|
|
|
|
|
2004-10-26 17:00:13 +00:00
|
|
|
|
void
|
|
|
|
|
|
scm_i_input_error (char const *function,
|
|
|
|
|
|
SCM port, const char *message, SCM arg)
|
2002-08-05 23:04:44 +00:00
|
|
|
|
{
|
2004-08-10 13:54:01 +00:00
|
|
|
|
SCM fn = (scm_is_string (SCM_FILENAME(port))
|
|
|
|
|
|
? SCM_FILENAME(port)
|
|
|
|
|
|
: scm_from_locale_string ("#<unknown port>"));
|
2002-08-05 23:04:44 +00:00
|
|
|
|
|
2004-08-10 13:54:01 +00:00
|
|
|
|
SCM string_port = scm_open_output_string ();
|
2002-08-05 23:04:44 +00:00
|
|
|
|
SCM string = SCM_EOL;
|
|
|
|
|
|
scm_simple_format (string_port,
|
(scm_i_casei_streq): New, for counted strings.
* strings.h, strings.c: (scm_i_string_chars, scm_i_string_length,
scm_i_string_writable_chars, scm_i_string_stop_writing): New, to
replace SCM_I_STRING_CHARS and SCM_I_STRING_LENGTH. Updated all
uses.
(scm_i_make_string, scm_c_make_string): New, to replace
scm_allocate_string. Updated all uses.
(SCM_STRINGP, SCM_STRING_CHARS, SCM_STRING_UCHARS,
SCM_STRING_LENGTH): Deprecated.
(scm_allocate_string, scm_take_str, scm_take0str, scm_mem2string,
scm_str2string, scm_makfrom0str, scm_makfrom0str_opt):
Discouraged. Replaced all uses with scm_from_locale_string or
similar, as appropriate.
(scm_c_string_length, scm_c_string_ref, scm_c_string_set_x,
scm_c_substring, scm_c_substring_shared, scm_c_substring_copy,
scm_substring_shared, scm_substring_copy): New.
* symbols.c, symbols.h (SCM_SYMBOLP, SCM_SYMBOL_FUNC,
SCM_SET_SYMBOL_FUNC, SCM_SYMBOL_PROPS, SCM_SET_SYMBOL_PROPS,
SCM_SYMBOL_HASH, SCM_SYMBOL_INTERNED_P, scm_mem2symbol,
scm_str2symbol, scm_mem2uninterned_symbol): Discouraged.
(SCM_SYMBOL_LENGTH, SCM_SYMBOL_CHARS, scm_c_symbol2str):
Deprecated.
(SCM_MAKE_SYMBOL_TAG, SCM_SET_SYMBOL_LENGTH, SCM_SET_SYMBOL_CHARS,
SCM_PROP_SLOTS, SCM_SET_PROP_SLOTS): Removed.
(scm_is_symbol, scm_from_locale_symbol, scm_from_locale_symboln):
New, to replace scm_str2symbol and scm_mem2symbol, respectively.
Updated all uses.
(scm_gensym): Generate only the number suffix in the buffer, just
string-append the prefix.
2004-08-19 17:17:43 +00:00
|
|
|
|
scm_from_locale_string ("~A:~S:~S: ~A"),
|
2004-08-10 13:54:01 +00:00
|
|
|
|
scm_list_4 (fn,
|
2007-03-07 23:35:55 +00:00
|
|
|
|
scm_from_long (SCM_LINUM (port) + 1),
|
* numbers.h, numbers.c, discouraged.h, discouraged.c (scm_short2num,
scm_ushort2num, scm_int2num, scm_uint2num, scm_long2num,
scm_ulong2num, scm_size2num, scm_ptrdiff2num, scm_num2short,
scm_num2ushort, scm_num2int, scm_num2uint, scm_num2long,
scm_num2ulong, scm_num2size, scm_num2ptrdiff, scm_long_long2num,
scm_ulong_long2num, scm_num2long_long, scm_num2ulong_long):
Discouraged by moving to discouraged.h and discouraged.c and
reimplementing in terms of scm_from_* and scm_to_*. Changed all uses
to the new scm_from_* and scm_to_* functions.
2004-08-02 16:14:04 +00:00
|
|
|
|
scm_from_int (SCM_COL (port) + 1),
|
(scm_i_casei_streq): New, for counted strings.
* strings.h, strings.c: (scm_i_string_chars, scm_i_string_length,
scm_i_string_writable_chars, scm_i_string_stop_writing): New, to
replace SCM_I_STRING_CHARS and SCM_I_STRING_LENGTH. Updated all
uses.
(scm_i_make_string, scm_c_make_string): New, to replace
scm_allocate_string. Updated all uses.
(SCM_STRINGP, SCM_STRING_CHARS, SCM_STRING_UCHARS,
SCM_STRING_LENGTH): Deprecated.
(scm_allocate_string, scm_take_str, scm_take0str, scm_mem2string,
scm_str2string, scm_makfrom0str, scm_makfrom0str_opt):
Discouraged. Replaced all uses with scm_from_locale_string or
similar, as appropriate.
(scm_c_string_length, scm_c_string_ref, scm_c_string_set_x,
scm_c_substring, scm_c_substring_shared, scm_c_substring_copy,
scm_substring_shared, scm_substring_copy): New.
* symbols.c, symbols.h (SCM_SYMBOLP, SCM_SYMBOL_FUNC,
SCM_SET_SYMBOL_FUNC, SCM_SYMBOL_PROPS, SCM_SET_SYMBOL_PROPS,
SCM_SYMBOL_HASH, SCM_SYMBOL_INTERNED_P, scm_mem2symbol,
scm_str2symbol, scm_mem2uninterned_symbol): Discouraged.
(SCM_SYMBOL_LENGTH, SCM_SYMBOL_CHARS, scm_c_symbol2str):
Deprecated.
(SCM_MAKE_SYMBOL_TAG, SCM_SET_SYMBOL_LENGTH, SCM_SET_SYMBOL_CHARS,
SCM_PROP_SLOTS, SCM_SET_PROP_SLOTS): Removed.
(scm_is_symbol, scm_from_locale_symbol, scm_from_locale_symboln):
New, to replace scm_str2symbol and scm_mem2symbol, respectively.
Updated all uses.
(scm_gensym): Generate only the number suffix in the buffer, just
string-append the prefix.
2004-08-19 17:17:43 +00:00
|
|
|
|
scm_from_locale_string (message)));
|
2002-08-05 23:04:44 +00:00
|
|
|
|
|
|
|
|
|
|
string = scm_get_output_string (string_port);
|
|
|
|
|
|
scm_close_output_port (string_port);
|
(scm_i_casei_streq): New, for counted strings.
* strings.h, strings.c: (scm_i_string_chars, scm_i_string_length,
scm_i_string_writable_chars, scm_i_string_stop_writing): New, to
replace SCM_I_STRING_CHARS and SCM_I_STRING_LENGTH. Updated all
uses.
(scm_i_make_string, scm_c_make_string): New, to replace
scm_allocate_string. Updated all uses.
(SCM_STRINGP, SCM_STRING_CHARS, SCM_STRING_UCHARS,
SCM_STRING_LENGTH): Deprecated.
(scm_allocate_string, scm_take_str, scm_take0str, scm_mem2string,
scm_str2string, scm_makfrom0str, scm_makfrom0str_opt):
Discouraged. Replaced all uses with scm_from_locale_string or
similar, as appropriate.
(scm_c_string_length, scm_c_string_ref, scm_c_string_set_x,
scm_c_substring, scm_c_substring_shared, scm_c_substring_copy,
scm_substring_shared, scm_substring_copy): New.
* symbols.c, symbols.h (SCM_SYMBOLP, SCM_SYMBOL_FUNC,
SCM_SET_SYMBOL_FUNC, SCM_SYMBOL_PROPS, SCM_SET_SYMBOL_PROPS,
SCM_SYMBOL_HASH, SCM_SYMBOL_INTERNED_P, scm_mem2symbol,
scm_str2symbol, scm_mem2uninterned_symbol): Discouraged.
(SCM_SYMBOL_LENGTH, SCM_SYMBOL_CHARS, scm_c_symbol2str):
Deprecated.
(SCM_MAKE_SYMBOL_TAG, SCM_SET_SYMBOL_LENGTH, SCM_SET_SYMBOL_CHARS,
SCM_PROP_SLOTS, SCM_SET_PROP_SLOTS): Removed.
(scm_is_symbol, scm_from_locale_symbol, scm_from_locale_symboln):
New, to replace scm_str2symbol and scm_mem2symbol, respectively.
Updated all uses.
(scm_gensym): Generate only the number suffix in the buffer, just
string-append the prefix.
2004-08-19 17:17:43 +00:00
|
|
|
|
scm_error_scm (scm_from_locale_symbol ("read-error"),
|
2004-10-26 17:00:13 +00:00
|
|
|
|
function? scm_from_locale_string (function) : SCM_BOOL_F,
|
2002-08-05 23:04:44 +00:00
|
|
|
|
string,
|
2003-06-04 16:36:03 +00:00
|
|
|
|
arg,
|
2002-08-05 23:04:44 +00:00
|
|
|
|
SCM_BOOL_F);
|
|
|
|
|
|
}
|
2002-08-04 23:33:28 +00:00
|
|
|
|
|
|
|
|
|
|
|
2000-01-05 19:05:23 +00:00
|
|
|
|
SCM_DEFINE (scm_read_options, "read-options-interface", 0, 1, 0,
|
1999-12-12 02:36:16 +00:00
|
|
|
|
(SCM setting),
|
2001-02-16 15:17:20 +00:00
|
|
|
|
"Option interface for the read options. Instead of using\n"
|
|
|
|
|
|
"this procedure directly, use the procedures @code{read-enable},\n"
|
2002-03-15 09:40:57 +00:00
|
|
|
|
"@code{read-disable}, @code{read-set!} and @code{read-options}.")
|
1999-12-12 02:36:16 +00:00
|
|
|
|
#define FUNC_NAME s_scm_read_options
|
1996-08-20 17:11:25 +00:00
|
|
|
|
{
|
1996-08-23 01:20:34 +00:00
|
|
|
|
SCM ans = scm_options (setting,
|
|
|
|
|
|
scm_read_opts,
|
1999-12-12 02:36:16 +00:00
|
|
|
|
FUNC_NAME);
|
1996-08-23 01:20:34 +00:00
|
|
|
|
if (SCM_COPY_SOURCE_P)
|
|
|
|
|
|
SCM_RECORD_POSITIONS_P = 1;
|
1996-08-20 17:11:25 +00:00
|
|
|
|
return ans;
|
|
|
|
|
|
}
|
1999-12-12 02:36:16 +00:00
|
|
|
|
#undef FUNC_NAME
|
1996-08-20 17:11:25 +00:00
|
|
|
|
|
1997-03-11 03:57:04 +00:00
|
|
|
|
/* An association list mapping extra hash characters to procedures. */
|
|
|
|
|
|
static SCM *scm_read_hash_procedures;
|
* strports.c (scm_read_0str, scm_eval_0str): update scm_read usage.
* gdbint.c (gdb_read): update scm_lreadr usage.
* load.h: update prototypes.
* load.c (scm_primitive_load, scm_read_and_eval_x,
scm_primitive_load_path): remove case_insensitive_p, sharp arguments.
* read.h: add prototype for scm_read_hash_extend. Change args for
other prototypes.
* read.c (scm_read_hash_procedures): new variable.
(scm_read_hash_extend): new procedure.
(scm_get_hash_procedure): new procedure.
* (scm_lreadr): use scm_get_hash_procedure instead of an argument
for extended # processing.
(scm_read, scm_lreadr, scm_lreadrecparen, scm_lreadparen,
scm_read_token): remove case_i, sharp arguments. Change callers.
* read.h (SCM_N_READ_OPTIONS): increase to 3.
(SCM_CASE_INSENSITIVE_P): define.
* read.c: add case-insensitive option to scm_read_opts.
* (scm_read_token): use SCM_CASE_INSENSITIVE_P instead of an argument
to determine whether to convert symbol case.
(default_case_i): definition removed.
* read.c (scm_read_token): if case_i, downcase ic before doing
anything with it.
1997-03-08 18:58:24 +00:00
|
|
|
|
|
1996-07-25 22:56:11 +00:00
|
|
|
|
|
2007-07-22 16:30:13 +00:00
|
|
|
|
|
|
|
|
|
|
/* Token readers. */
|
1996-07-25 22:56:11 +00:00
|
|
|
|
|
|
|
|
|
|
|
2007-07-22 16:30:13 +00:00
|
|
|
|
/* Size of the C buffer used to read symbols and numbers. */
|
|
|
|
|
|
#define READER_BUFFER_SIZE 128
|
1996-07-25 22:56:11 +00:00
|
|
|
|
|
2007-07-22 16:30:13 +00:00
|
|
|
|
/* Size of the C buffer used to read strings. */
|
|
|
|
|
|
#define READER_STRING_BUFFER_SIZE 512
|
1996-07-25 22:56:11 +00:00
|
|
|
|
|
2007-07-22 16:30:13 +00:00
|
|
|
|
/* The maximum size of Scheme character names. */
|
|
|
|
|
|
#define READER_CHAR_NAME_MAX_SIZE 50
|
* __scm.h, alist.c, alist.h, append.c, append.h, appinit.c,
arbiters.c, arbiters.h, async.c, async.h, boolean.c, boolean.h,
chars.c, chars.h, continuations.c, continuations.h, debug.c,
debug.h, dynwind.c, dynwind.h, eq.c, eq.h, error.c, eval.c,
eval.h, extchrs.c, extchrs.h, fdsocket.c, fdsocket.h, filesys.c,
filesys.h, fports.c, fports.h, gc.c, gdb_interface.h, gdbint.c,
gdbint.h, genio.c, genio.h, gscm.c, gscm.h, gsubr.c, gsubr.h,
hash.c, hash.h, hashtab.c, hashtab.h, init.c, ioext.c, ioext.h,
kw.c, kw.h, libguile.h, mallocs.c, mallocs.h, markers.c,
markers.h, mbstrings.c, mbstrings.h, numbers.c, numbers.h,
objprop.c, objprop.h, options.c, options.h, pairs.c, pairs.h,
ports.c, ports.h, posix.c, posix.h, print.c, print.h, procprop.c,
procprop.h, procs.c, procs.h, ramap.c, ramap.h, read.c, read.h,
root.c, scmsigs.c, scmsigs.h, sequences.c, sequences.h, simpos.c,
simpos.h, smob.c, socket.c, socket.h, srcprop.c, srcprop.h,
stackchk.c, stackchk.h, stime.c, stime.h, strings.c, strings.h,
strop.c, strop.h, strorder.c, strorder.h, strports.c, strports.h,
struct.c, struct.h, symbols.c, symbols.h, tag.c, tag.h, unif.c,
unif.h, variable.c, variable.h, vectors.c, vectors.h, version.c,
version.h, vports.c, vports.h, weaks.c, weaks.h: Use SCM_P to
declare functions with prototypes. (Patch thanks to Marius
Vollmer.)
1996-10-14 01:33:50 +00:00
|
|
|
|
|
2000-10-06 16:51:08 +00:00
|
|
|
|
|
2007-07-22 16:30:13 +00:00
|
|
|
|
/* `isblank' is only in C99. */
|
|
|
|
|
|
#define CHAR_IS_BLANK_(_chr) \
|
|
|
|
|
|
(((_chr) == ' ') || ((_chr) == '\t') || ((_chr) == '\n') \
|
2007-10-17 21:56:10 +00:00
|
|
|
|
|| ((_chr) == '\f') || ((_chr) == '\r'))
|
2007-07-22 16:30:13 +00:00
|
|
|
|
|
|
|
|
|
|
#ifdef MSDOS
|
|
|
|
|
|
# define CHAR_IS_BLANK(_chr) \
|
|
|
|
|
|
((CHAR_IS_BLANK_ (chr)) || ((_chr) == 26))
|
|
|
|
|
|
#else
|
|
|
|
|
|
# define CHAR_IS_BLANK CHAR_IS_BLANK_
|
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/* R5RS one-character delimiters (see section 7.1.1, ``Lexical
|
|
|
|
|
|
structure''). */
|
|
|
|
|
|
#define CHAR_IS_R5RS_DELIMITER(c) \
|
|
|
|
|
|
(CHAR_IS_BLANK (c) \
|
|
|
|
|
|
|| (c == ')') || (c == '(') || (c == ';') || (c == '"'))
|
|
|
|
|
|
|
|
|
|
|
|
#define CHAR_IS_DELIMITER CHAR_IS_R5RS_DELIMITER
|
|
|
|
|
|
|
|
|
|
|
|
/* Exponent markers, as defined in section 7.1.1 of R5RS, ``Lexical
|
|
|
|
|
|
Structure''. */
|
|
|
|
|
|
#define CHAR_IS_EXPONENT_MARKER(_chr) \
|
|
|
|
|
|
(((_chr) == 'e') || ((_chr) == 's') || ((_chr) == 'f') \
|
|
|
|
|
|
|| ((_chr) == 'd') || ((_chr) == 'l'))
|
|
|
|
|
|
|
|
|
|
|
|
/* An inlinable version of `scm_c_downcase ()'. */
|
|
|
|
|
|
#define CHAR_DOWNCASE(_chr) \
|
|
|
|
|
|
(((_chr) <= UCHAR_MAX) ? tolower (_chr) : (_chr))
|
|
|
|
|
|
|
|
|
|
|
|
|
2007-09-03 16:58:20 +00:00
|
|
|
|
/* Read an SCSH block comment. */
|
|
|
|
|
|
static inline SCM scm_read_scsh_block_comment (int chr, SCM port);
|
add reader support for #; #` #' #, and #,@. fix bug in compile-and-load.
* libguile/read.c (flush_ws, scm_read_commented_expression)
(scm_read_sharp): Add support for commenting out expressions with #;.
(scm_read_syntax, scm_read_sharp): Add support for #', #`, #, and #,@.
* module/ice-9/boot-9.scm: Remove #' read-hash extension, which actually
didn't do anything at all. It's been there since 1997, but no Guile
code I've ever seen uses it, and it conflicts with #'x => (syntax x)
from modern Scheme.
* module/system/base/compile.scm (compile-and-load): Whoops, fix a number
of bugs here.
2009-05-28 14:49:33 +02:00
|
|
|
|
static SCM scm_read_commented_expression (int chr, SCM port);
|
2007-09-03 16:58:20 +00:00
|
|
|
|
|
2007-10-17 21:56:10 +00:00
|
|
|
|
/* Read from PORT until a delimiter (e.g., a whitespace) is read. Return
|
|
|
|
|
|
zero if the whole token fits in BUF, non-zero otherwise. */
|
2007-07-22 16:30:13 +00:00
|
|
|
|
static inline int
|
|
|
|
|
|
read_token (SCM port, char *buf, size_t buf_size, size_t *read)
|
2004-09-07 09:18:59 +00:00
|
|
|
|
{
|
2007-07-22 16:30:13 +00:00
|
|
|
|
*read = 0;
|
2004-09-07 09:18:59 +00:00
|
|
|
|
|
2007-07-22 16:30:13 +00:00
|
|
|
|
while (*read < buf_size)
|
2004-09-07 09:18:59 +00:00
|
|
|
|
{
|
2007-07-22 16:30:13 +00:00
|
|
|
|
int chr;
|
2004-09-07 09:18:59 +00:00
|
|
|
|
|
2007-07-22 16:30:13 +00:00
|
|
|
|
chr = scm_getc (port);
|
|
|
|
|
|
chr = (SCM_CASE_INSENSITIVE_P ? CHAR_DOWNCASE (chr) : chr);
|
|
|
|
|
|
|
|
|
|
|
|
if (chr == EOF)
|
|
|
|
|
|
return 0;
|
|
|
|
|
|
else if (CHAR_IS_DELIMITER (chr))
|
|
|
|
|
|
{
|
|
|
|
|
|
scm_ungetc (chr, port);
|
|
|
|
|
|
return 0;
|
|
|
|
|
|
}
|
2004-09-07 09:18:59 +00:00
|
|
|
|
else
|
2007-07-22 16:30:13 +00:00
|
|
|
|
{
|
|
|
|
|
|
*buf = (char) chr;
|
|
|
|
|
|
buf++, (*read)++;
|
|
|
|
|
|
}
|
2004-09-07 09:18:59 +00:00
|
|
|
|
}
|
2007-07-22 16:30:13 +00:00
|
|
|
|
|
|
|
|
|
|
return 1;
|
2004-09-07 09:18:59 +00:00
|
|
|
|
}
|
* __scm.h, alist.c, alist.h, append.c, append.h, appinit.c,
arbiters.c, arbiters.h, async.c, async.h, boolean.c, boolean.h,
chars.c, chars.h, continuations.c, continuations.h, debug.c,
debug.h, dynwind.c, dynwind.h, eq.c, eq.h, error.c, eval.c,
eval.h, extchrs.c, extchrs.h, fdsocket.c, fdsocket.h, filesys.c,
filesys.h, fports.c, fports.h, gc.c, gdb_interface.h, gdbint.c,
gdbint.h, genio.c, genio.h, gscm.c, gscm.h, gsubr.c, gsubr.h,
hash.c, hash.h, hashtab.c, hashtab.h, init.c, ioext.c, ioext.h,
kw.c, kw.h, libguile.h, mallocs.c, mallocs.h, markers.c,
markers.h, mbstrings.c, mbstrings.h, numbers.c, numbers.h,
objprop.c, objprop.h, options.c, options.h, pairs.c, pairs.h,
ports.c, ports.h, posix.c, posix.h, print.c, print.h, procprop.c,
procprop.h, procs.c, procs.h, ramap.c, ramap.h, read.c, read.h,
root.c, scmsigs.c, scmsigs.h, sequences.c, sequences.h, simpos.c,
simpos.h, smob.c, socket.c, socket.h, srcprop.c, srcprop.h,
stackchk.c, stackchk.h, stime.c, stime.h, strings.c, strings.h,
strop.c, strop.h, strorder.c, strorder.h, strports.c, strports.h,
struct.c, struct.h, symbols.c, symbols.h, tag.c, tag.h, unif.c,
unif.h, variable.c, variable.h, vectors.c, vectors.h, version.c,
version.h, vports.c, vports.h, weaks.c, weaks.h: Use SCM_P to
declare functions with prototypes. (Patch thanks to Marius
Vollmer.)
1996-10-14 01:33:50 +00:00
|
|
|
|
|
2007-07-22 16:30:13 +00:00
|
|
|
|
|
|
|
|
|
|
/* Skip whitespace from PORT and return the first non-whitespace character
|
|
|
|
|
|
read. Raise an error on end-of-file. */
|
|
|
|
|
|
static int
|
|
|
|
|
|
flush_ws (SCM port, const char *eoferr)
|
1996-07-25 22:56:11 +00:00
|
|
|
|
{
|
|
|
|
|
|
register int c;
|
|
|
|
|
|
while (1)
|
* Makefile.in: Rebuilt.
* Makefile.am (libguile_la_SOURCES): Removed extchrs.c,
mbstrings.c.
(modinclude_HEADERS): Removed extchrs.h, mbstrings.h.
* unif.c (scm_vector_set_length_x): Don't handle multibyte
strings.
* tag.c (scm_utag_mb_string, scm_utag_mb_substring): Removed.
(scm_tag): Don't handle multibyte strings.
* read.c: Don't include mbstrings.h.
(scm_lreadr): Don't handle multibyte ports.
* kw.c: Don't include mbstrings.h.
* init.c: Don't include mbstrings.h.
(scm_boot_guile_1): Don't init mbstrings module.
* hash.c (scm_hasher): Don't handle mbstrings.
* gscm.c (gscm_run_scm): Don't init mbstrings module.
* gc.c (scm_gc_mark): Don't handle mbstrings.
(scm_gc_sweep): Likewise.
* eval.c (SCM_CEVAL): Don't handle mbstrings.
* eq.c (scm_equal_p): Use SCM_TYP7S, not SCM_TYP7SD.
* tags.h (SCM_TYP7SD): Removed.
(SCM_TYP7D): Removed.
(scm_tc7_mb_string): Removed.
(scm_tc7_mb_substring): Removed.
* print.c (scm_iprin1): Handle char printing directly. Don't
handle mbstrings.
Don't include "mbstrings.h".
* symbols.c (scm_intern_obarray_soft, scm_string_to_symbol,
scm_string_to_obarray_symbol, msymbolize): Don't set symbol's
multi-byte flag.
Don't include "mbstrings.h".
* symbols.h (SCM_SYMBOL_MULTI_BYTE_STRINGP): Removed.
(SCM_SYMBOL_SLOTS): Define as 4.
(SCM_ROSTRINGP): Use SCM_TYP7S, not SCM_TYP7SD.
* arbiters.c, backtrace.c, debug.c, dynl.c, eval.c, fluids.c,
gc.c, gsubr.c, ioext.c, kw.c, mallocs.c, numbers.c, ports.c,
print.c, read.c, regex-posix.c, root.c, srcprop.c, stackchk.c,
struct.c, threads.c, throw.c, unif.c, variable.c: Use new
("gen"-less) I/O function names.
* ports.c (scm_add_to_port_table): Don't set port's
representation.
* ports.h (scm_port_representation_type): Removed.
(scm_string_representation_type): Removed.
(struct scm_port_table ): Removed representation field.
(SCM_PORT_REPRESENTATION): Removed.
(SCM_SET_PORT_REPRESENTATION): Removed.
* genio.h: Use new function names.
* genio.c: Don't include "extchrs.h".
(scm_gen_putc, scm_gen_puts, scm_gen_write, scm_get_getc):
Removed.
(scm_putc, scm_puts, scm_lfwrite): No longer static.
(scm_getc): No longer static; handle line and column changes.
(scm_ungetc): Renamed from scm_gen_ungetc.
(scm_do_read_line): Renamed from scm_gen_read_line.
* libguile.h: Don't include "extchrs.h" or "mbstrings.h"
* extchrs.h, extchrs.c, mbstrings.h, mbstrings.c: Removed.
1997-10-15 17:18:32 +00:00
|
|
|
|
switch (c = scm_getc (port))
|
1996-07-25 22:56:11 +00:00
|
|
|
|
{
|
|
|
|
|
|
case EOF:
|
|
|
|
|
|
goteof:
|
|
|
|
|
|
if (eoferr)
|
2000-08-06 22:04:11 +00:00
|
|
|
|
{
|
2004-10-26 17:00:13 +00:00
|
|
|
|
scm_i_input_error (eoferr,
|
|
|
|
|
|
port,
|
|
|
|
|
|
"end of file",
|
|
|
|
|
|
SCM_EOL);
|
2000-08-06 22:04:11 +00:00
|
|
|
|
}
|
1996-07-25 22:56:11 +00:00
|
|
|
|
return c;
|
2007-07-22 16:30:13 +00:00
|
|
|
|
|
1996-07-25 22:56:11 +00:00
|
|
|
|
case ';':
|
|
|
|
|
|
lp:
|
* Makefile.in: Rebuilt.
* Makefile.am (libguile_la_SOURCES): Removed extchrs.c,
mbstrings.c.
(modinclude_HEADERS): Removed extchrs.h, mbstrings.h.
* unif.c (scm_vector_set_length_x): Don't handle multibyte
strings.
* tag.c (scm_utag_mb_string, scm_utag_mb_substring): Removed.
(scm_tag): Don't handle multibyte strings.
* read.c: Don't include mbstrings.h.
(scm_lreadr): Don't handle multibyte ports.
* kw.c: Don't include mbstrings.h.
* init.c: Don't include mbstrings.h.
(scm_boot_guile_1): Don't init mbstrings module.
* hash.c (scm_hasher): Don't handle mbstrings.
* gscm.c (gscm_run_scm): Don't init mbstrings module.
* gc.c (scm_gc_mark): Don't handle mbstrings.
(scm_gc_sweep): Likewise.
* eval.c (SCM_CEVAL): Don't handle mbstrings.
* eq.c (scm_equal_p): Use SCM_TYP7S, not SCM_TYP7SD.
* tags.h (SCM_TYP7SD): Removed.
(SCM_TYP7D): Removed.
(scm_tc7_mb_string): Removed.
(scm_tc7_mb_substring): Removed.
* print.c (scm_iprin1): Handle char printing directly. Don't
handle mbstrings.
Don't include "mbstrings.h".
* symbols.c (scm_intern_obarray_soft, scm_string_to_symbol,
scm_string_to_obarray_symbol, msymbolize): Don't set symbol's
multi-byte flag.
Don't include "mbstrings.h".
* symbols.h (SCM_SYMBOL_MULTI_BYTE_STRINGP): Removed.
(SCM_SYMBOL_SLOTS): Define as 4.
(SCM_ROSTRINGP): Use SCM_TYP7S, not SCM_TYP7SD.
* arbiters.c, backtrace.c, debug.c, dynl.c, eval.c, fluids.c,
gc.c, gsubr.c, ioext.c, kw.c, mallocs.c, numbers.c, ports.c,
print.c, read.c, regex-posix.c, root.c, srcprop.c, stackchk.c,
struct.c, threads.c, throw.c, unif.c, variable.c: Use new
("gen"-less) I/O function names.
* ports.c (scm_add_to_port_table): Don't set port's
representation.
* ports.h (scm_port_representation_type): Removed.
(scm_string_representation_type): Removed.
(struct scm_port_table ): Removed representation field.
(SCM_PORT_REPRESENTATION): Removed.
(SCM_SET_PORT_REPRESENTATION): Removed.
* genio.h: Use new function names.
* genio.c: Don't include "extchrs.h".
(scm_gen_putc, scm_gen_puts, scm_gen_write, scm_get_getc):
Removed.
(scm_putc, scm_puts, scm_lfwrite): No longer static.
(scm_getc): No longer static; handle line and column changes.
(scm_ungetc): Renamed from scm_gen_ungetc.
(scm_do_read_line): Renamed from scm_gen_read_line.
* libguile.h: Don't include "extchrs.h" or "mbstrings.h"
* extchrs.h, extchrs.c, mbstrings.h, mbstrings.c: Removed.
1997-10-15 17:18:32 +00:00
|
|
|
|
switch (c = scm_getc (port))
|
1996-07-25 22:56:11 +00:00
|
|
|
|
{
|
|
|
|
|
|
case EOF:
|
|
|
|
|
|
goto goteof;
|
|
|
|
|
|
default:
|
|
|
|
|
|
goto lp;
|
|
|
|
|
|
case SCM_LINE_INCREMENTORS:
|
|
|
|
|
|
break;
|
|
|
|
|
|
}
|
|
|
|
|
|
break;
|
2007-07-22 16:30:13 +00:00
|
|
|
|
|
2007-09-03 16:58:20 +00:00
|
|
|
|
case '#':
|
|
|
|
|
|
switch (c = scm_getc (port))
|
|
|
|
|
|
{
|
|
|
|
|
|
case EOF:
|
|
|
|
|
|
eoferr = "read_sharp";
|
|
|
|
|
|
goto goteof;
|
|
|
|
|
|
case '!':
|
|
|
|
|
|
scm_read_scsh_block_comment (c, port);
|
|
|
|
|
|
break;
|
add reader support for #; #` #' #, and #,@. fix bug in compile-and-load.
* libguile/read.c (flush_ws, scm_read_commented_expression)
(scm_read_sharp): Add support for commenting out expressions with #;.
(scm_read_syntax, scm_read_sharp): Add support for #', #`, #, and #,@.
* module/ice-9/boot-9.scm: Remove #' read-hash extension, which actually
didn't do anything at all. It's been there since 1997, but no Guile
code I've ever seen uses it, and it conflicts with #'x => (syntax x)
from modern Scheme.
* module/system/base/compile.scm (compile-and-load): Whoops, fix a number
of bugs here.
2009-05-28 14:49:33 +02:00
|
|
|
|
case ';':
|
|
|
|
|
|
scm_read_commented_expression (c, port);
|
|
|
|
|
|
break;
|
2007-09-03 16:58:20 +00:00
|
|
|
|
default:
|
|
|
|
|
|
scm_ungetc (c, port);
|
|
|
|
|
|
return '#';
|
|
|
|
|
|
}
|
|
|
|
|
|
break;
|
|
|
|
|
|
|
1996-07-25 22:56:11 +00:00
|
|
|
|
case SCM_LINE_INCREMENTORS:
|
|
|
|
|
|
case SCM_SINGLE_SPACES:
|
|
|
|
|
|
case '\t':
|
|
|
|
|
|
break;
|
2007-07-22 16:30:13 +00:00
|
|
|
|
|
1996-07-25 22:56:11 +00:00
|
|
|
|
default:
|
|
|
|
|
|
return c;
|
|
|
|
|
|
}
|
2007-07-22 16:30:13 +00:00
|
|
|
|
|
|
|
|
|
|
return 0;
|
1996-07-25 22:56:11 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
2007-07-22 16:30:13 +00:00
|
|
|
|
|
|
|
|
|
|
/* Token readers. */
|
* __scm.h, alist.c, alist.h, append.c, append.h, appinit.c,
arbiters.c, arbiters.h, async.c, async.h, boolean.c, boolean.h,
chars.c, chars.h, continuations.c, continuations.h, debug.c,
debug.h, dynwind.c, dynwind.h, eq.c, eq.h, error.c, eval.c,
eval.h, extchrs.c, extchrs.h, fdsocket.c, fdsocket.h, filesys.c,
filesys.h, fports.c, fports.h, gc.c, gdb_interface.h, gdbint.c,
gdbint.h, genio.c, genio.h, gscm.c, gscm.h, gsubr.c, gsubr.h,
hash.c, hash.h, hashtab.c, hashtab.h, init.c, ioext.c, ioext.h,
kw.c, kw.h, libguile.h, mallocs.c, mallocs.h, markers.c,
markers.h, mbstrings.c, mbstrings.h, numbers.c, numbers.h,
objprop.c, objprop.h, options.c, options.h, pairs.c, pairs.h,
ports.c, ports.h, posix.c, posix.h, print.c, print.h, procprop.c,
procprop.h, procs.c, procs.h, ramap.c, ramap.h, read.c, read.h,
root.c, scmsigs.c, scmsigs.h, sequences.c, sequences.h, simpos.c,
simpos.h, smob.c, socket.c, socket.h, srcprop.c, srcprop.h,
stackchk.c, stackchk.h, stime.c, stime.h, strings.c, strings.h,
strop.c, strop.h, strorder.c, strorder.h, strports.c, strports.h,
struct.c, struct.h, symbols.c, symbols.h, tag.c, tag.h, unif.c,
unif.h, variable.c, variable.h, vectors.c, vectors.h, version.c,
version.h, vports.c, vports.h, weaks.c, weaks.h: Use SCM_P to
declare functions with prototypes. (Patch thanks to Marius
Vollmer.)
1996-10-14 01:33:50 +00:00
|
|
|
|
|
2007-07-22 16:30:13 +00:00
|
|
|
|
static SCM scm_read_expression (SCM port);
|
|
|
|
|
|
static SCM scm_read_sharp (int chr, SCM port);
|
|
|
|
|
|
static SCM scm_get_hash_procedure (int c);
|
|
|
|
|
|
static SCM recsexpr (SCM obj, long line, int column, SCM filename);
|
1996-07-25 22:56:11 +00:00
|
|
|
|
|
|
|
|
|
|
|
1996-09-18 19:35:48 +00:00
|
|
|
|
static SCM
|
2007-07-22 16:30:13 +00:00
|
|
|
|
scm_read_sexp (int chr, SCM port)
|
|
|
|
|
|
#define FUNC_NAME "scm_i_lreadparen"
|
1996-09-18 19:35:48 +00:00
|
|
|
|
{
|
2007-07-22 16:30:13 +00:00
|
|
|
|
register int c;
|
|
|
|
|
|
register SCM tmp;
|
|
|
|
|
|
register SCM tl, ans = SCM_EOL;
|
2008-04-26 21:39:27 +02:00
|
|
|
|
SCM tl2 = SCM_EOL, ans2 = SCM_EOL, copy = SCM_BOOL_F;
|
2007-07-22 16:30:13 +00:00
|
|
|
|
static const int terminating_char = ')';
|
|
|
|
|
|
|
|
|
|
|
|
/* Need to capture line and column numbers here. */
|
|
|
|
|
|
long line = SCM_LINUM (port);
|
|
|
|
|
|
int column = SCM_COL (port) - 1;
|
1996-10-25 08:30:26 +00:00
|
|
|
|
|
|
|
|
|
|
|
2007-07-22 16:30:13 +00:00
|
|
|
|
c = flush_ws (port, FUNC_NAME);
|
|
|
|
|
|
if (terminating_char == c)
|
|
|
|
|
|
return SCM_EOL;
|
1996-10-25 08:30:26 +00:00
|
|
|
|
|
2007-07-22 16:30:13 +00:00
|
|
|
|
scm_ungetc (c, port);
|
|
|
|
|
|
if (scm_is_eq (scm_sym_dot,
|
|
|
|
|
|
(tmp = scm_read_expression (port))))
|
|
|
|
|
|
{
|
|
|
|
|
|
ans = scm_read_expression (port);
|
|
|
|
|
|
if (terminating_char != (c = flush_ws (port, FUNC_NAME)))
|
|
|
|
|
|
scm_i_input_error (FUNC_NAME, port, "missing close paren",
|
|
|
|
|
|
SCM_EOL);
|
|
|
|
|
|
return ans;
|
|
|
|
|
|
}
|
* __scm.h, alist.c, alist.h, append.c, append.h, appinit.c,
arbiters.c, arbiters.h, async.c, async.h, boolean.c, boolean.h,
chars.c, chars.h, continuations.c, continuations.h, debug.c,
debug.h, dynwind.c, dynwind.h, eq.c, eq.h, error.c, eval.c,
eval.h, extchrs.c, extchrs.h, fdsocket.c, fdsocket.h, filesys.c,
filesys.h, fports.c, fports.h, gc.c, gdb_interface.h, gdbint.c,
gdbint.h, genio.c, genio.h, gscm.c, gscm.h, gsubr.c, gsubr.h,
hash.c, hash.h, hashtab.c, hashtab.h, init.c, ioext.c, ioext.h,
kw.c, kw.h, libguile.h, mallocs.c, mallocs.h, markers.c,
markers.h, mbstrings.c, mbstrings.h, numbers.c, numbers.h,
objprop.c, objprop.h, options.c, options.h, pairs.c, pairs.h,
ports.c, ports.h, posix.c, posix.h, print.c, print.h, procprop.c,
procprop.h, procs.c, procs.h, ramap.c, ramap.h, read.c, read.h,
root.c, scmsigs.c, scmsigs.h, sequences.c, sequences.h, simpos.c,
simpos.h, smob.c, socket.c, socket.h, srcprop.c, srcprop.h,
stackchk.c, stackchk.h, stime.c, stime.h, strings.c, strings.h,
strop.c, strop.h, strorder.c, strorder.h, strports.c, strports.h,
struct.c, struct.h, symbols.c, symbols.h, tag.c, tag.h, unif.c,
unif.h, variable.c, variable.h, vectors.c, vectors.h, version.c,
version.h, vports.c, vports.h, weaks.c, weaks.h: Use SCM_P to
declare functions with prototypes. (Patch thanks to Marius
Vollmer.)
1996-10-14 01:33:50 +00:00
|
|
|
|
|
2007-07-22 16:30:13 +00:00
|
|
|
|
/* Build the head of the list structure. */
|
|
|
|
|
|
ans = tl = scm_cons (tmp, SCM_EOL);
|
|
|
|
|
|
|
|
|
|
|
|
if (SCM_COPY_SOURCE_P)
|
|
|
|
|
|
ans2 = tl2 = scm_cons (scm_is_pair (tmp)
|
|
|
|
|
|
? copy
|
|
|
|
|
|
: tmp,
|
|
|
|
|
|
SCM_EOL);
|
|
|
|
|
|
|
|
|
|
|
|
while (terminating_char != (c = flush_ws (port, FUNC_NAME)))
|
1996-07-25 22:56:11 +00:00
|
|
|
|
{
|
2007-07-22 16:30:13 +00:00
|
|
|
|
SCM new_tail;
|
1996-07-25 22:56:11 +00:00
|
|
|
|
|
2007-07-22 16:30:13 +00:00
|
|
|
|
scm_ungetc (c, port);
|
|
|
|
|
|
if (scm_is_eq (scm_sym_dot,
|
|
|
|
|
|
(tmp = scm_read_expression (port))))
|
1996-07-25 22:56:11 +00:00
|
|
|
|
{
|
2007-07-22 16:30:13 +00:00
|
|
|
|
SCM_SETCDR (tl, tmp = scm_read_expression (port));
|
|
|
|
|
|
|
|
|
|
|
|
if (SCM_COPY_SOURCE_P)
|
|
|
|
|
|
SCM_SETCDR (tl2, scm_cons (scm_is_pair (tmp) ? copy : tmp,
|
|
|
|
|
|
SCM_EOL));
|
|
|
|
|
|
|
|
|
|
|
|
c = flush_ws (port, FUNC_NAME);
|
|
|
|
|
|
if (terminating_char != c)
|
|
|
|
|
|
scm_i_input_error (FUNC_NAME, port,
|
|
|
|
|
|
"in pair: missing close paren", SCM_EOL);
|
|
|
|
|
|
goto exit;
|
1996-07-25 22:56:11 +00:00
|
|
|
|
}
|
2001-06-27 13:15:20 +00:00
|
|
|
|
|
2007-07-22 16:30:13 +00:00
|
|
|
|
new_tail = scm_cons (tmp, SCM_EOL);
|
|
|
|
|
|
SCM_SETCDR (tl, new_tail);
|
|
|
|
|
|
tl = new_tail;
|
|
|
|
|
|
|
|
|
|
|
|
if (SCM_COPY_SOURCE_P)
|
1996-07-25 22:56:11 +00:00
|
|
|
|
{
|
2007-07-22 16:30:13 +00:00
|
|
|
|
SCM new_tail2 = scm_cons (scm_is_pair (tmp)
|
|
|
|
|
|
? copy
|
|
|
|
|
|
: tmp, SCM_EOL);
|
|
|
|
|
|
SCM_SETCDR (tl2, new_tail2);
|
|
|
|
|
|
tl2 = new_tail2;
|
|
|
|
|
|
}
|
|
|
|
|
|
}
|
1996-07-25 22:56:11 +00:00
|
|
|
|
|
2007-07-22 16:30:13 +00:00
|
|
|
|
exit:
|
|
|
|
|
|
if (SCM_RECORD_POSITIONS_P)
|
|
|
|
|
|
scm_whash_insert (scm_source_whash,
|
|
|
|
|
|
ans,
|
|
|
|
|
|
scm_make_srcprops (line, column,
|
|
|
|
|
|
SCM_FILENAME (port),
|
|
|
|
|
|
SCM_COPY_SOURCE_P
|
|
|
|
|
|
? ans2
|
|
|
|
|
|
: SCM_UNDEFINED,
|
|
|
|
|
|
SCM_EOL));
|
|
|
|
|
|
return ans;
|
|
|
|
|
|
}
|
|
|
|
|
|
#undef FUNC_NAME
|
2004-10-26 17:00:13 +00:00
|
|
|
|
|
2007-07-22 16:30:13 +00:00
|
|
|
|
static SCM
|
|
|
|
|
|
scm_read_string (int chr, SCM port)
|
|
|
|
|
|
#define FUNC_NAME "scm_lreadr"
|
|
|
|
|
|
{
|
|
|
|
|
|
/* For strings smaller than C_STR, this function creates only one Scheme
|
|
|
|
|
|
object (the string returned). */
|
1996-07-25 22:56:11 +00:00
|
|
|
|
|
2007-07-22 16:30:13 +00:00
|
|
|
|
SCM str = SCM_BOOL_F;
|
|
|
|
|
|
char c_str[READER_STRING_BUFFER_SIZE];
|
|
|
|
|
|
unsigned c_str_len = 0;
|
|
|
|
|
|
int c;
|
2004-10-29 14:45:19 +00:00
|
|
|
|
|
2007-07-22 16:30:13 +00:00
|
|
|
|
while ('"' != (c = scm_getc (port)))
|
|
|
|
|
|
{
|
|
|
|
|
|
if (c == EOF)
|
|
|
|
|
|
str_eof: scm_i_input_error (FUNC_NAME, port,
|
|
|
|
|
|
"end of file in string constant",
|
|
|
|
|
|
SCM_EOL);
|
1996-07-25 22:56:11 +00:00
|
|
|
|
|
2007-07-22 16:30:13 +00:00
|
|
|
|
if (c_str_len + 1 >= sizeof (c_str))
|
|
|
|
|
|
{
|
|
|
|
|
|
/* Flush the C buffer onto a Scheme string. */
|
|
|
|
|
|
SCM addy;
|
* strports.c (scm_read_0str, scm_eval_0str): update scm_read usage.
* gdbint.c (gdb_read): update scm_lreadr usage.
* load.h: update prototypes.
* load.c (scm_primitive_load, scm_read_and_eval_x,
scm_primitive_load_path): remove case_insensitive_p, sharp arguments.
* read.h: add prototype for scm_read_hash_extend. Change args for
other prototypes.
* read.c (scm_read_hash_procedures): new variable.
(scm_read_hash_extend): new procedure.
(scm_get_hash_procedure): new procedure.
* (scm_lreadr): use scm_get_hash_procedure instead of an argument
for extended # processing.
(scm_read, scm_lreadr, scm_lreadrecparen, scm_lreadparen,
scm_read_token): remove case_i, sharp arguments. Change callers.
* read.h (SCM_N_READ_OPTIONS): increase to 3.
(SCM_CASE_INSENSITIVE_P): define.
* read.c: add case-insensitive option to scm_read_opts.
* (scm_read_token): use SCM_CASE_INSENSITIVE_P instead of an argument
to determine whether to convert symbol case.
(default_case_i): definition removed.
* read.c (scm_read_token): if case_i, downcase ic before doing
anything with it.
1997-03-08 18:58:24 +00:00
|
|
|
|
|
2007-07-22 16:30:13 +00:00
|
|
|
|
if (str == SCM_BOOL_F)
|
|
|
|
|
|
str = scm_c_make_string (0, SCM_MAKE_CHAR ('X'));
|
1996-07-25 22:56:11 +00:00
|
|
|
|
|
2007-07-22 16:30:13 +00:00
|
|
|
|
addy = scm_from_locale_stringn (c_str, c_str_len);
|
|
|
|
|
|
str = scm_string_append_shared (scm_list_2 (str, addy));
|
1996-07-25 22:56:11 +00:00
|
|
|
|
|
2007-07-22 16:30:13 +00:00
|
|
|
|
c_str_len = 0;
|
|
|
|
|
|
}
|
1996-07-25 22:56:11 +00:00
|
|
|
|
|
2007-07-22 16:30:13 +00:00
|
|
|
|
if (c == '\\')
|
|
|
|
|
|
switch (c = scm_getc (port))
|
|
|
|
|
|
{
|
|
|
|
|
|
case EOF:
|
|
|
|
|
|
goto str_eof;
|
|
|
|
|
|
case '"':
|
|
|
|
|
|
case '\\':
|
|
|
|
|
|
break;
|
2004-02-08 19:14:18 +00:00
|
|
|
|
#if SCM_ENABLE_ELISP
|
2007-07-22 16:30:13 +00:00
|
|
|
|
case '(':
|
|
|
|
|
|
case ')':
|
|
|
|
|
|
if (SCM_ESCAPED_PARENS_P)
|
|
|
|
|
|
break;
|
|
|
|
|
|
goto bad_escaped;
|
2004-02-08 19:14:18 +00:00
|
|
|
|
#endif
|
2007-07-22 16:30:13 +00:00
|
|
|
|
case '\n':
|
|
|
|
|
|
continue;
|
|
|
|
|
|
case '0':
|
|
|
|
|
|
c = '\0';
|
|
|
|
|
|
break;
|
|
|
|
|
|
case 'f':
|
|
|
|
|
|
c = '\f';
|
|
|
|
|
|
break;
|
|
|
|
|
|
case 'n':
|
|
|
|
|
|
c = '\n';
|
|
|
|
|
|
break;
|
|
|
|
|
|
case 'r':
|
|
|
|
|
|
c = '\r';
|
|
|
|
|
|
break;
|
|
|
|
|
|
case 't':
|
|
|
|
|
|
c = '\t';
|
|
|
|
|
|
break;
|
|
|
|
|
|
case 'a':
|
|
|
|
|
|
c = '\007';
|
|
|
|
|
|
break;
|
|
|
|
|
|
case 'v':
|
|
|
|
|
|
c = '\v';
|
|
|
|
|
|
break;
|
|
|
|
|
|
case 'x':
|
2001-07-30 19:35:15 +00:00
|
|
|
|
{
|
2007-07-22 16:30:13 +00:00
|
|
|
|
int a, b;
|
|
|
|
|
|
a = scm_getc (port);
|
|
|
|
|
|
if (a == EOF) goto str_eof;
|
|
|
|
|
|
b = scm_getc (port);
|
|
|
|
|
|
if (b == EOF) goto str_eof;
|
|
|
|
|
|
if ('0' <= a && a <= '9') a -= '0';
|
|
|
|
|
|
else if ('A' <= a && a <= 'F') a = a - 'A' + 10;
|
|
|
|
|
|
else if ('a' <= a && a <= 'f') a = a - 'a' + 10;
|
|
|
|
|
|
else goto bad_escaped;
|
|
|
|
|
|
if ('0' <= b && b <= '9') b -= '0';
|
|
|
|
|
|
else if ('A' <= b && b <= 'F') b = b - 'A' + 10;
|
|
|
|
|
|
else if ('a' <= b && b <= 'f') b = b - 'a' + 10;
|
|
|
|
|
|
else goto bad_escaped;
|
|
|
|
|
|
c = a * 16 + b;
|
|
|
|
|
|
break;
|
2001-07-30 19:35:15 +00:00
|
|
|
|
}
|
2007-07-22 16:30:13 +00:00
|
|
|
|
default:
|
|
|
|
|
|
bad_escaped:
|
|
|
|
|
|
scm_i_input_error (FUNC_NAME, port,
|
|
|
|
|
|
"illegal character in escape sequence: ~S",
|
|
|
|
|
|
scm_list_1 (SCM_MAKE_CHAR (c)));
|
|
|
|
|
|
}
|
|
|
|
|
|
c_str[c_str_len++] = c;
|
|
|
|
|
|
}
|
2004-10-04 18:03:18 +00:00
|
|
|
|
|
2007-07-22 16:30:13 +00:00
|
|
|
|
if (c_str_len > 0)
|
|
|
|
|
|
{
|
|
|
|
|
|
SCM addy;
|
1996-07-25 22:56:11 +00:00
|
|
|
|
|
2007-07-22 16:30:13 +00:00
|
|
|
|
addy = scm_from_locale_stringn (c_str, c_str_len);
|
|
|
|
|
|
if (str == SCM_BOOL_F)
|
|
|
|
|
|
str = addy;
|
|
|
|
|
|
else
|
|
|
|
|
|
str = scm_string_append_shared (scm_list_2 (str, addy));
|
1996-07-25 22:56:11 +00:00
|
|
|
|
}
|
2007-07-22 16:30:13 +00:00
|
|
|
|
else
|
|
|
|
|
|
str = (str == SCM_BOOL_F) ? scm_nullstr : str;
|
|
|
|
|
|
|
2008-10-09 22:21:33 +02:00
|
|
|
|
return str;
|
1996-07-25 22:56:11 +00:00
|
|
|
|
}
|
2001-03-04 17:09:34 +00:00
|
|
|
|
#undef FUNC_NAME
|
|
|
|
|
|
|
1996-07-25 22:56:11 +00:00
|
|
|
|
|
2007-07-22 16:30:13 +00:00
|
|
|
|
static SCM
|
|
|
|
|
|
scm_read_number (int chr, SCM port)
|
1996-07-25 22:56:11 +00:00
|
|
|
|
{
|
2007-07-22 16:30:13 +00:00
|
|
|
|
SCM result, str = SCM_EOL;
|
|
|
|
|
|
char buffer[READER_BUFFER_SIZE];
|
|
|
|
|
|
size_t read;
|
|
|
|
|
|
int overflow = 0;
|
1996-07-25 22:56:11 +00:00
|
|
|
|
|
2007-07-22 16:30:13 +00:00
|
|
|
|
scm_ungetc (chr, port);
|
|
|
|
|
|
do
|
1996-07-25 22:56:11 +00:00
|
|
|
|
{
|
2007-07-22 16:30:13 +00:00
|
|
|
|
overflow = read_token (port, buffer, sizeof (buffer), &read);
|
|
|
|
|
|
|
|
|
|
|
|
if ((overflow) || (scm_is_pair (str)))
|
|
|
|
|
|
str = scm_cons (scm_from_locale_stringn (buffer, read), str);
|
1996-07-25 22:56:11 +00:00
|
|
|
|
}
|
2007-07-22 16:30:13 +00:00
|
|
|
|
while (overflow);
|
1996-07-25 22:56:11 +00:00
|
|
|
|
|
2007-07-22 16:30:13 +00:00
|
|
|
|
if (scm_is_pair (str))
|
1996-07-25 22:56:11 +00:00
|
|
|
|
{
|
2007-07-22 16:30:13 +00:00
|
|
|
|
/* The slow path. */
|
1996-07-25 22:56:11 +00:00
|
|
|
|
|
2007-07-22 16:30:13 +00:00
|
|
|
|
str = scm_string_concatenate (scm_reverse_x (str, SCM_EOL));
|
|
|
|
|
|
result = scm_string_to_number (str, SCM_UNDEFINED);
|
|
|
|
|
|
if (!scm_is_true (result))
|
|
|
|
|
|
/* Return a symbol instead of a number. */
|
|
|
|
|
|
result = scm_string_to_symbol (str);
|
|
|
|
|
|
}
|
|
|
|
|
|
else
|
|
|
|
|
|
{
|
|
|
|
|
|
result = scm_c_locale_stringn_to_number (buffer, read, 10);
|
|
|
|
|
|
if (!scm_is_true (result))
|
|
|
|
|
|
/* Return a symbol instead of a number. */
|
|
|
|
|
|
result = scm_from_locale_symboln (buffer, read);
|
|
|
|
|
|
}
|
1996-07-25 22:56:11 +00:00
|
|
|
|
|
2007-07-22 16:30:13 +00:00
|
|
|
|
return result;
|
|
|
|
|
|
}
|
1996-07-25 22:56:11 +00:00
|
|
|
|
|
2007-07-22 16:30:13 +00:00
|
|
|
|
static SCM
|
|
|
|
|
|
scm_read_mixed_case_symbol (int chr, SCM port)
|
|
|
|
|
|
{
|
|
|
|
|
|
SCM result, str = SCM_EOL;
|
2008-04-15 19:52:43 +02:00
|
|
|
|
int overflow = 0, ends_with_colon = 0;
|
2007-07-22 16:30:13 +00:00
|
|
|
|
char buffer[READER_BUFFER_SIZE];
|
|
|
|
|
|
size_t read = 0;
|
2008-04-15 19:52:43 +02:00
|
|
|
|
int postfix = scm_is_eq (SCM_PACK (SCM_KEYWORD_STYLE), scm_keyword_postfix);
|
2007-07-22 16:30:13 +00:00
|
|
|
|
|
|
|
|
|
|
scm_ungetc (chr, port);
|
|
|
|
|
|
do
|
|
|
|
|
|
{
|
|
|
|
|
|
overflow = read_token (port, buffer, sizeof (buffer), &read);
|
|
|
|
|
|
|
2008-04-15 19:52:43 +02:00
|
|
|
|
if (read > 0)
|
|
|
|
|
|
ends_with_colon = (buffer[read - 1] == ':');
|
|
|
|
|
|
|
2007-07-22 16:30:13 +00:00
|
|
|
|
if ((overflow) || (scm_is_pair (str)))
|
|
|
|
|
|
str = scm_cons (scm_from_locale_stringn (buffer, read), str);
|
|
|
|
|
|
}
|
|
|
|
|
|
while (overflow);
|
|
|
|
|
|
|
|
|
|
|
|
if (scm_is_pair (str))
|
|
|
|
|
|
{
|
2009-04-24 22:23:13 -07:00
|
|
|
|
size_t len;
|
|
|
|
|
|
|
2007-07-22 16:30:13 +00:00
|
|
|
|
str = scm_string_concatenate (scm_reverse_x (str, SCM_EOL));
|
2009-04-24 22:23:13 -07:00
|
|
|
|
len = scm_c_string_length (str);
|
2008-04-15 19:52:43 +02:00
|
|
|
|
|
|
|
|
|
|
/* Per SRFI-88, `:' alone is an identifier, not a keyword. */
|
2009-04-24 22:23:13 -07:00
|
|
|
|
if (postfix && ends_with_colon && (len > 1))
|
|
|
|
|
|
{
|
|
|
|
|
|
/* Strip off colon. */
|
|
|
|
|
|
str = scm_c_substring (str, 0, len-1);
|
|
|
|
|
|
result = scm_string_to_symbol (str);
|
|
|
|
|
|
result = scm_symbol_to_keyword (result);
|
|
|
|
|
|
}
|
|
|
|
|
|
else
|
|
|
|
|
|
result = scm_string_to_symbol (str);
|
2007-07-22 16:30:13 +00:00
|
|
|
|
}
|
|
|
|
|
|
else
|
2008-04-15 19:52:43 +02:00
|
|
|
|
{
|
|
|
|
|
|
/* For symbols smaller than `sizeof (buffer)', we don't need to recur
|
|
|
|
|
|
to Scheme strings. Therefore, we only create one Scheme object (a
|
|
|
|
|
|
symbol) per symbol read. */
|
|
|
|
|
|
if (postfix && ends_with_colon && (read > 1))
|
|
|
|
|
|
result = scm_from_locale_keywordn (buffer, read - 1);
|
|
|
|
|
|
else
|
|
|
|
|
|
result = scm_from_locale_symboln (buffer, read);
|
|
|
|
|
|
}
|
2007-07-22 16:30:13 +00:00
|
|
|
|
|
|
|
|
|
|
return result;
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
static SCM
|
|
|
|
|
|
scm_read_number_and_radix (int chr, SCM port)
|
|
|
|
|
|
#define FUNC_NAME "scm_lreadr"
|
|
|
|
|
|
{
|
|
|
|
|
|
SCM result, str = SCM_EOL;
|
|
|
|
|
|
size_t read;
|
|
|
|
|
|
char buffer[READER_BUFFER_SIZE];
|
|
|
|
|
|
unsigned int radix;
|
|
|
|
|
|
int overflow = 0;
|
|
|
|
|
|
|
|
|
|
|
|
switch (chr)
|
|
|
|
|
|
{
|
|
|
|
|
|
case 'B':
|
|
|
|
|
|
case 'b':
|
|
|
|
|
|
radix = 2;
|
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
|
|
case 'o':
|
|
|
|
|
|
case 'O':
|
|
|
|
|
|
radix = 8;
|
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
|
|
case 'd':
|
|
|
|
|
|
case 'D':
|
|
|
|
|
|
radix = 10;
|
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
|
|
case 'x':
|
|
|
|
|
|
case 'X':
|
|
|
|
|
|
radix = 16;
|
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
|
|
default:
|
|
|
|
|
|
scm_ungetc (chr, port);
|
|
|
|
|
|
scm_ungetc ('#', port);
|
|
|
|
|
|
radix = 10;
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
do
|
|
|
|
|
|
{
|
|
|
|
|
|
overflow = read_token (port, buffer, sizeof (buffer), &read);
|
|
|
|
|
|
|
|
|
|
|
|
if ((overflow) || (scm_is_pair (str)))
|
|
|
|
|
|
str = scm_cons (scm_from_locale_stringn (buffer, read), str);
|
|
|
|
|
|
}
|
|
|
|
|
|
while (overflow);
|
|
|
|
|
|
|
|
|
|
|
|
if (scm_is_pair (str))
|
|
|
|
|
|
{
|
|
|
|
|
|
str = scm_string_concatenate (scm_reverse_x (str, SCM_EOL));
|
|
|
|
|
|
result = scm_string_to_number (str, scm_from_uint (radix));
|
|
|
|
|
|
}
|
|
|
|
|
|
else
|
|
|
|
|
|
result = scm_c_locale_stringn_to_number (buffer, read, radix);
|
|
|
|
|
|
|
|
|
|
|
|
if (scm_is_true (result))
|
|
|
|
|
|
return result;
|
|
|
|
|
|
|
|
|
|
|
|
scm_i_input_error (FUNC_NAME, port, "unknown # object", SCM_EOL);
|
|
|
|
|
|
|
|
|
|
|
|
return SCM_BOOL_F;
|
|
|
|
|
|
}
|
|
|
|
|
|
#undef FUNC_NAME
|
|
|
|
|
|
|
|
|
|
|
|
static SCM
|
|
|
|
|
|
scm_read_quote (int chr, SCM port)
|
|
|
|
|
|
{
|
|
|
|
|
|
SCM p;
|
2007-08-23 21:17:24 +00:00
|
|
|
|
long line = SCM_LINUM (port);
|
|
|
|
|
|
int column = SCM_COL (port) - 1;
|
2007-07-22 16:30:13 +00:00
|
|
|
|
|
|
|
|
|
|
switch (chr)
|
|
|
|
|
|
{
|
|
|
|
|
|
case '`':
|
|
|
|
|
|
p = scm_sym_quasiquote;
|
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
|
|
case '\'':
|
|
|
|
|
|
p = scm_sym_quote;
|
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
|
|
case ',':
|
|
|
|
|
|
{
|
|
|
|
|
|
int c;
|
|
|
|
|
|
|
|
|
|
|
|
c = scm_getc (port);
|
|
|
|
|
|
if ('@' == c)
|
|
|
|
|
|
p = scm_sym_uq_splicing;
|
|
|
|
|
|
else
|
1996-07-25 22:56:11 +00:00
|
|
|
|
{
|
2007-07-22 16:30:13 +00:00
|
|
|
|
scm_ungetc (c, port);
|
|
|
|
|
|
p = scm_sym_unquote;
|
1996-07-25 22:56:11 +00:00
|
|
|
|
}
|
2007-07-22 16:30:13 +00:00
|
|
|
|
break;
|
|
|
|
|
|
}
|
1996-07-25 22:56:11 +00:00
|
|
|
|
|
2007-07-22 16:30:13 +00:00
|
|
|
|
default:
|
|
|
|
|
|
fprintf (stderr, "%s: unhandled quote character (%i)\n",
|
2008-02-07 09:54:47 +00:00
|
|
|
|
"scm_read_quote", chr);
|
2007-07-22 16:30:13 +00:00
|
|
|
|
abort ();
|
1996-07-25 22:56:11 +00:00
|
|
|
|
}
|
* __scm.h, alist.c, alist.h, append.c, append.h, appinit.c,
arbiters.c, arbiters.h, async.c, async.h, boolean.c, boolean.h,
chars.c, chars.h, continuations.c, continuations.h, debug.c,
debug.h, dynwind.c, dynwind.h, eq.c, eq.h, error.c, eval.c,
eval.h, extchrs.c, extchrs.h, fdsocket.c, fdsocket.h, filesys.c,
filesys.h, fports.c, fports.h, gc.c, gdb_interface.h, gdbint.c,
gdbint.h, genio.c, genio.h, gscm.c, gscm.h, gsubr.c, gsubr.h,
hash.c, hash.h, hashtab.c, hashtab.h, init.c, ioext.c, ioext.h,
kw.c, kw.h, libguile.h, mallocs.c, mallocs.h, markers.c,
markers.h, mbstrings.c, mbstrings.h, numbers.c, numbers.h,
objprop.c, objprop.h, options.c, options.h, pairs.c, pairs.h,
ports.c, ports.h, posix.c, posix.h, print.c, print.h, procprop.c,
procprop.h, procs.c, procs.h, ramap.c, ramap.h, read.c, read.h,
root.c, scmsigs.c, scmsigs.h, sequences.c, sequences.h, simpos.c,
simpos.h, smob.c, socket.c, socket.h, srcprop.c, srcprop.h,
stackchk.c, stackchk.h, stime.c, stime.h, strings.c, strings.h,
strop.c, strop.h, strorder.c, strorder.h, strports.c, strports.h,
struct.c, struct.h, symbols.c, symbols.h, tag.c, tag.h, unif.c,
unif.h, variable.c, variable.h, vectors.c, vectors.h, version.c,
version.h, vports.c, vports.h, weaks.c, weaks.h: Use SCM_P to
declare functions with prototypes. (Patch thanks to Marius
Vollmer.)
1996-10-14 01:33:50 +00:00
|
|
|
|
|
2007-07-22 16:30:13 +00:00
|
|
|
|
p = scm_cons2 (p, scm_read_expression (port), SCM_EOL);
|
2007-08-23 21:17:24 +00:00
|
|
|
|
if (SCM_RECORD_POSITIONS_P)
|
|
|
|
|
|
scm_whash_insert (scm_source_whash, p,
|
|
|
|
|
|
scm_make_srcprops (line, column,
|
|
|
|
|
|
SCM_FILENAME (port),
|
|
|
|
|
|
SCM_COPY_SOURCE_P
|
|
|
|
|
|
? (scm_cons2 (SCM_CAR (p),
|
|
|
|
|
|
SCM_CAR (SCM_CDR (p)),
|
|
|
|
|
|
SCM_EOL))
|
|
|
|
|
|
: SCM_UNDEFINED,
|
|
|
|
|
|
SCM_EOL));
|
|
|
|
|
|
|
1996-07-25 22:56:11 +00:00
|
|
|
|
|
2007-07-22 16:30:13 +00:00
|
|
|
|
return p;
|
|
|
|
|
|
}
|
|
|
|
|
|
|
add reader support for #; #` #' #, and #,@. fix bug in compile-and-load.
* libguile/read.c (flush_ws, scm_read_commented_expression)
(scm_read_sharp): Add support for commenting out expressions with #;.
(scm_read_syntax, scm_read_sharp): Add support for #', #`, #, and #,@.
* module/ice-9/boot-9.scm: Remove #' read-hash extension, which actually
didn't do anything at all. It's been there since 1997, but no Guile
code I've ever seen uses it, and it conflicts with #'x => (syntax x)
from modern Scheme.
* module/system/base/compile.scm (compile-and-load): Whoops, fix a number
of bugs here.
2009-05-28 14:49:33 +02:00
|
|
|
|
SCM_SYMBOL (sym_syntax, "syntax");
|
|
|
|
|
|
SCM_SYMBOL (sym_quasisyntax, "quasisyntax");
|
|
|
|
|
|
SCM_SYMBOL (sym_unsyntax, "unsyntax");
|
|
|
|
|
|
SCM_SYMBOL (sym_unsyntax_splicing, "unsyntax-splicing");
|
|
|
|
|
|
|
|
|
|
|
|
static SCM
|
|
|
|
|
|
scm_read_syntax (int chr, SCM port)
|
|
|
|
|
|
{
|
|
|
|
|
|
SCM p;
|
|
|
|
|
|
long line = SCM_LINUM (port);
|
|
|
|
|
|
int column = SCM_COL (port) - 1;
|
|
|
|
|
|
|
|
|
|
|
|
switch (chr)
|
|
|
|
|
|
{
|
|
|
|
|
|
case '`':
|
|
|
|
|
|
p = sym_quasisyntax;
|
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
|
|
case '\'':
|
|
|
|
|
|
p = sym_syntax;
|
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
|
|
case ',':
|
|
|
|
|
|
{
|
|
|
|
|
|
int c;
|
|
|
|
|
|
|
|
|
|
|
|
c = scm_getc (port);
|
|
|
|
|
|
if ('@' == c)
|
|
|
|
|
|
p = sym_unsyntax_splicing;
|
|
|
|
|
|
else
|
|
|
|
|
|
{
|
|
|
|
|
|
scm_ungetc (c, port);
|
|
|
|
|
|
p = sym_unsyntax;
|
|
|
|
|
|
}
|
|
|
|
|
|
break;
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
default:
|
|
|
|
|
|
fprintf (stderr, "%s: unhandled syntax character (%i)\n",
|
|
|
|
|
|
"scm_read_syntax", chr);
|
|
|
|
|
|
abort ();
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
p = scm_cons2 (p, scm_read_expression (port), SCM_EOL);
|
|
|
|
|
|
if (SCM_RECORD_POSITIONS_P)
|
|
|
|
|
|
scm_whash_insert (scm_source_whash, p,
|
|
|
|
|
|
scm_make_srcprops (line, column,
|
|
|
|
|
|
SCM_FILENAME (port),
|
|
|
|
|
|
SCM_COPY_SOURCE_P
|
|
|
|
|
|
? (scm_cons2 (SCM_CAR (p),
|
|
|
|
|
|
SCM_CAR (SCM_CDR (p)),
|
|
|
|
|
|
SCM_EOL))
|
|
|
|
|
|
: SCM_UNDEFINED,
|
|
|
|
|
|
SCM_EOL));
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
return p;
|
|
|
|
|
|
}
|
|
|
|
|
|
|
2007-07-22 16:30:13 +00:00
|
|
|
|
static inline SCM
|
|
|
|
|
|
scm_read_semicolon_comment (int chr, SCM port)
|
1996-07-25 22:56:11 +00:00
|
|
|
|
{
|
|
|
|
|
|
int c;
|
|
|
|
|
|
|
2007-07-22 16:30:13 +00:00
|
|
|
|
for (c = scm_getc (port);
|
|
|
|
|
|
(c != EOF) && (c != '\n');
|
|
|
|
|
|
c = scm_getc (port));
|
|
|
|
|
|
|
|
|
|
|
|
return SCM_UNSPECIFIED;
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/* Sharp readers, i.e. readers called after a `#' sign has been read. */
|
|
|
|
|
|
|
|
|
|
|
|
static SCM
|
|
|
|
|
|
scm_read_boolean (int chr, SCM port)
|
|
|
|
|
|
{
|
|
|
|
|
|
switch (chr)
|
1996-07-25 22:56:11 +00:00
|
|
|
|
{
|
2007-07-22 16:30:13 +00:00
|
|
|
|
case 't':
|
|
|
|
|
|
case 'T':
|
|
|
|
|
|
return SCM_BOOL_T;
|
|
|
|
|
|
|
|
|
|
|
|
case 'f':
|
|
|
|
|
|
case 'F':
|
|
|
|
|
|
return SCM_BOOL_F;
|
1996-07-25 22:56:11 +00:00
|
|
|
|
}
|
2007-07-22 16:30:13 +00:00
|
|
|
|
|
|
|
|
|
|
return SCM_UNSPECIFIED;
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
static SCM
|
|
|
|
|
|
scm_read_character (int chr, SCM port)
|
|
|
|
|
|
#define FUNC_NAME "scm_lreadr"
|
|
|
|
|
|
{
|
|
|
|
|
|
unsigned c;
|
|
|
|
|
|
char charname[READER_CHAR_NAME_MAX_SIZE];
|
|
|
|
|
|
size_t charname_len;
|
|
|
|
|
|
|
|
|
|
|
|
if (read_token (port, charname, sizeof (charname), &charname_len))
|
|
|
|
|
|
goto char_error;
|
|
|
|
|
|
|
|
|
|
|
|
if (charname_len == 0)
|
1996-07-25 22:56:11 +00:00
|
|
|
|
{
|
2007-07-22 16:30:13 +00:00
|
|
|
|
chr = scm_getc (port);
|
|
|
|
|
|
if (chr == EOF)
|
|
|
|
|
|
scm_i_input_error (FUNC_NAME, port, "unexpected end of file "
|
|
|
|
|
|
"while reading character", SCM_EOL);
|
|
|
|
|
|
|
|
|
|
|
|
/* CHR must be a token delimiter, like a whitespace. */
|
|
|
|
|
|
return (SCM_MAKE_CHAR (chr));
|
1996-07-25 22:56:11 +00:00
|
|
|
|
}
|
2007-07-22 16:30:13 +00:00
|
|
|
|
|
|
|
|
|
|
if (charname_len == 1)
|
|
|
|
|
|
return SCM_MAKE_CHAR (charname[0]);
|
|
|
|
|
|
|
|
|
|
|
|
if (*charname >= '0' && *charname < '8')
|
|
|
|
|
|
{
|
|
|
|
|
|
/* Dirk:FIXME:: This type of character syntax is not R5RS
|
|
|
|
|
|
* compliant. Further, it should be verified that the constant
|
|
|
|
|
|
* does only consist of octal digits. Finally, it should be
|
|
|
|
|
|
* checked whether the resulting fixnum is in the range of
|
|
|
|
|
|
* characters. */
|
|
|
|
|
|
SCM p = scm_c_locale_stringn_to_number (charname, charname_len, 8);
|
|
|
|
|
|
if (SCM_I_INUMP (p))
|
|
|
|
|
|
return SCM_MAKE_CHAR (SCM_I_INUM (p));
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
for (c = 0; c < scm_n_charnames; c++)
|
|
|
|
|
|
if (scm_charnames[c]
|
|
|
|
|
|
&& (!strncasecmp (scm_charnames[c], charname, charname_len)))
|
|
|
|
|
|
return SCM_MAKE_CHAR (scm_charnums[c]);
|
|
|
|
|
|
|
|
|
|
|
|
char_error:
|
|
|
|
|
|
scm_i_input_error (FUNC_NAME, port, "unknown character name ~a",
|
|
|
|
|
|
scm_list_1 (scm_from_locale_stringn (charname,
|
|
|
|
|
|
charname_len)));
|
|
|
|
|
|
|
|
|
|
|
|
return SCM_UNSPECIFIED;
|
1996-07-25 22:56:11 +00:00
|
|
|
|
}
|
2001-03-04 17:09:34 +00:00
|
|
|
|
#undef FUNC_NAME
|
1996-07-25 22:56:11 +00:00
|
|
|
|
|
2007-07-22 16:30:13 +00:00
|
|
|
|
static inline SCM
|
|
|
|
|
|
scm_read_keyword (int chr, SCM port)
|
|
|
|
|
|
{
|
|
|
|
|
|
SCM symbol;
|
|
|
|
|
|
|
|
|
|
|
|
/* Read the symbol that comprises the keyword. Doing this instead of
|
|
|
|
|
|
invoking a specific symbol reader function allows `scm_read_keyword ()'
|
|
|
|
|
|
to adapt to the delimiters currently valid of symbols.
|
* __scm.h, alist.c, alist.h, append.c, append.h, appinit.c,
arbiters.c, arbiters.h, async.c, async.h, boolean.c, boolean.h,
chars.c, chars.h, continuations.c, continuations.h, debug.c,
debug.h, dynwind.c, dynwind.h, eq.c, eq.h, error.c, eval.c,
eval.h, extchrs.c, extchrs.h, fdsocket.c, fdsocket.h, filesys.c,
filesys.h, fports.c, fports.h, gc.c, gdb_interface.h, gdbint.c,
gdbint.h, genio.c, genio.h, gscm.c, gscm.h, gsubr.c, gsubr.h,
hash.c, hash.h, hashtab.c, hashtab.h, init.c, ioext.c, ioext.h,
kw.c, kw.h, libguile.h, mallocs.c, mallocs.h, markers.c,
markers.h, mbstrings.c, mbstrings.h, numbers.c, numbers.h,
objprop.c, objprop.h, options.c, options.h, pairs.c, pairs.h,
ports.c, ports.h, posix.c, posix.h, print.c, print.h, procprop.c,
procprop.h, procs.c, procs.h, ramap.c, ramap.h, read.c, read.h,
root.c, scmsigs.c, scmsigs.h, sequences.c, sequences.h, simpos.c,
simpos.h, smob.c, socket.c, socket.h, srcprop.c, srcprop.h,
stackchk.c, stackchk.h, stime.c, stime.h, strings.c, strings.h,
strop.c, strop.h, strorder.c, strorder.h, strports.c, strports.h,
struct.c, struct.h, symbols.c, symbols.h, tag.c, tag.h, unif.c,
unif.h, variable.c, variable.h, vectors.c, vectors.h, version.c,
version.h, vports.c, vports.h, weaks.c, weaks.h: Use SCM_P to
declare functions with prototypes. (Patch thanks to Marius
Vollmer.)
1996-10-14 01:33:50 +00:00
|
|
|
|
|
2007-07-22 16:30:13 +00:00
|
|
|
|
XXX: This implementation allows sloppy syntaxes like `#: key'. */
|
|
|
|
|
|
symbol = scm_read_expression (port);
|
|
|
|
|
|
if (!scm_is_symbol (symbol))
|
2008-02-07 09:54:47 +00:00
|
|
|
|
scm_i_input_error ("scm_read_keyword", port,
|
2007-07-22 16:30:13 +00:00
|
|
|
|
"keyword prefix `~a' not followed by a symbol: ~s",
|
|
|
|
|
|
scm_list_2 (SCM_MAKE_CHAR (chr), symbol));
|
|
|
|
|
|
|
|
|
|
|
|
return (scm_symbol_to_keyword (symbol));
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
static inline SCM
|
|
|
|
|
|
scm_read_vector (int chr, SCM port)
|
1996-09-18 19:35:48 +00:00
|
|
|
|
{
|
2007-07-22 16:30:13 +00:00
|
|
|
|
/* Note: We call `scm_read_sexp ()' rather than READER here in order to
|
|
|
|
|
|
guarantee that it's going to do what we want. After all, this is an
|
|
|
|
|
|
implementation detail of `scm_read_vector ()', not a desirable
|
|
|
|
|
|
property. */
|
|
|
|
|
|
return (scm_vector (scm_read_sexp (chr, port)));
|
|
|
|
|
|
}
|
1996-09-18 19:35:48 +00:00
|
|
|
|
|
2007-07-22 16:30:13 +00:00
|
|
|
|
static inline SCM
|
|
|
|
|
|
scm_read_srfi4_vector (int chr, SCM port)
|
|
|
|
|
|
{
|
|
|
|
|
|
return scm_i_read_array (port, chr);
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
static SCM
|
|
|
|
|
|
scm_read_guile_bit_vector (int chr, SCM port)
|
|
|
|
|
|
{
|
|
|
|
|
|
/* Read the `#*10101'-style read syntax for bit vectors in Guile. This is
|
|
|
|
|
|
terribly inefficient but who cares? */
|
|
|
|
|
|
SCM s_bits = SCM_EOL;
|
|
|
|
|
|
|
|
|
|
|
|
for (chr = scm_getc (port);
|
|
|
|
|
|
(chr != EOF) && ((chr == '0') || (chr == '1'));
|
|
|
|
|
|
chr = scm_getc (port))
|
1996-09-18 19:35:48 +00:00
|
|
|
|
{
|
2007-07-22 16:30:13 +00:00
|
|
|
|
s_bits = scm_cons ((chr == '0') ? SCM_BOOL_F : SCM_BOOL_T, s_bits);
|
1996-09-18 19:35:48 +00:00
|
|
|
|
}
|
2007-07-22 16:30:13 +00:00
|
|
|
|
|
|
|
|
|
|
if (chr != EOF)
|
|
|
|
|
|
scm_ungetc (chr, port);
|
|
|
|
|
|
|
|
|
|
|
|
return scm_bitvector (scm_reverse_x (s_bits, SCM_EOL));
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
static inline SCM
|
|
|
|
|
|
scm_read_scsh_block_comment (int chr, SCM port)
|
|
|
|
|
|
{
|
|
|
|
|
|
int bang_seen = 0;
|
|
|
|
|
|
|
|
|
|
|
|
for (;;)
|
1996-09-18 19:35:48 +00:00
|
|
|
|
{
|
2007-07-22 16:30:13 +00:00
|
|
|
|
int c = scm_getc (port);
|
2000-07-18 16:09:09 +00:00
|
|
|
|
|
2007-07-22 16:30:13 +00:00
|
|
|
|
if (c == EOF)
|
|
|
|
|
|
scm_i_input_error ("skip_block_comment", port,
|
|
|
|
|
|
"unterminated `#! ... !#' comment", SCM_EOL);
|
|
|
|
|
|
|
|
|
|
|
|
if (c == '!')
|
|
|
|
|
|
bang_seen = 1;
|
|
|
|
|
|
else if (c == '#' && bang_seen)
|
|
|
|
|
|
break;
|
|
|
|
|
|
else
|
|
|
|
|
|
bang_seen = 0;
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
return SCM_UNSPECIFIED;
|
|
|
|
|
|
}
|
|
|
|
|
|
|
add reader support for #; #` #' #, and #,@. fix bug in compile-and-load.
* libguile/read.c (flush_ws, scm_read_commented_expression)
(scm_read_sharp): Add support for commenting out expressions with #;.
(scm_read_syntax, scm_read_sharp): Add support for #', #`, #, and #,@.
* module/ice-9/boot-9.scm: Remove #' read-hash extension, which actually
didn't do anything at all. It's been there since 1997, but no Guile
code I've ever seen uses it, and it conflicts with #'x => (syntax x)
from modern Scheme.
* module/system/base/compile.scm (compile-and-load): Whoops, fix a number
of bugs here.
2009-05-28 14:49:33 +02:00
|
|
|
|
static SCM
|
|
|
|
|
|
scm_read_commented_expression (int chr, SCM port)
|
|
|
|
|
|
{
|
|
|
|
|
|
int c;
|
|
|
|
|
|
|
|
|
|
|
|
c = flush_ws (port, (char *) NULL);
|
|
|
|
|
|
if (EOF == c)
|
|
|
|
|
|
scm_i_input_error ("read_commented_expression", port,
|
|
|
|
|
|
"no expression after #; comment", SCM_EOL);
|
|
|
|
|
|
scm_ungetc (c, port);
|
|
|
|
|
|
scm_read_expression (port);
|
|
|
|
|
|
return SCM_UNSPECIFIED;
|
|
|
|
|
|
}
|
|
|
|
|
|
|
2007-07-22 16:30:13 +00:00
|
|
|
|
static SCM
|
|
|
|
|
|
scm_read_extended_symbol (int chr, SCM port)
|
|
|
|
|
|
{
|
|
|
|
|
|
/* Guile's extended symbol read syntax looks like this:
|
|
|
|
|
|
|
|
|
|
|
|
#{This is all a symbol name}#
|
|
|
|
|
|
|
|
|
|
|
|
So here, CHR is expected to be `{'. */
|
|
|
|
|
|
SCM result;
|
|
|
|
|
|
int saw_brace = 0, finished = 0;
|
|
|
|
|
|
size_t len = 0;
|
|
|
|
|
|
char buf[1024];
|
|
|
|
|
|
|
|
|
|
|
|
result = scm_c_make_string (0, SCM_MAKE_CHAR ('X'));
|
|
|
|
|
|
|
|
|
|
|
|
while ((chr = scm_getc (port)) != EOF)
|
|
|
|
|
|
{
|
|
|
|
|
|
if (saw_brace)
|
1996-09-18 19:35:48 +00:00
|
|
|
|
{
|
2007-07-22 16:30:13 +00:00
|
|
|
|
if (chr == '#')
|
|
|
|
|
|
{
|
|
|
|
|
|
finished = 1;
|
|
|
|
|
|
break;
|
|
|
|
|
|
}
|
|
|
|
|
|
else
|
|
|
|
|
|
{
|
|
|
|
|
|
saw_brace = 0;
|
|
|
|
|
|
buf[len++] = '}';
|
|
|
|
|
|
buf[len++] = chr;
|
|
|
|
|
|
}
|
1996-09-18 19:35:48 +00:00
|
|
|
|
}
|
2007-07-22 16:30:13 +00:00
|
|
|
|
else if (chr == '}')
|
|
|
|
|
|
saw_brace = 1;
|
|
|
|
|
|
else
|
|
|
|
|
|
buf[len++] = chr;
|
2000-07-18 16:09:09 +00:00
|
|
|
|
|
2007-07-22 16:30:13 +00:00
|
|
|
|
if (len >= sizeof (buf) - 2)
|
|
|
|
|
|
{
|
|
|
|
|
|
scm_string_append (scm_list_2 (result,
|
|
|
|
|
|
scm_from_locale_stringn (buf, len)));
|
|
|
|
|
|
len = 0;
|
|
|
|
|
|
}
|
2000-07-18 16:09:09 +00:00
|
|
|
|
|
2007-07-22 16:30:13 +00:00
|
|
|
|
if (finished)
|
|
|
|
|
|
break;
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
if (len)
|
|
|
|
|
|
result = scm_string_append (scm_list_2
|
|
|
|
|
|
(result,
|
|
|
|
|
|
scm_from_locale_stringn (buf, len)));
|
|
|
|
|
|
|
|
|
|
|
|
return (scm_string_to_symbol (result));
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/* Top-level token readers, i.e., dispatchers. */
|
|
|
|
|
|
|
|
|
|
|
|
static SCM
|
|
|
|
|
|
scm_read_sharp_extension (int chr, SCM port)
|
|
|
|
|
|
{
|
|
|
|
|
|
SCM proc;
|
|
|
|
|
|
|
|
|
|
|
|
proc = scm_get_hash_procedure (chr);
|
|
|
|
|
|
if (scm_is_true (scm_procedure_p (proc)))
|
|
|
|
|
|
{
|
|
|
|
|
|
long line = SCM_LINUM (port);
|
|
|
|
|
|
int column = SCM_COL (port) - 2;
|
|
|
|
|
|
SCM got;
|
|
|
|
|
|
|
|
|
|
|
|
got = scm_call_2 (proc, SCM_MAKE_CHAR (chr), port);
|
|
|
|
|
|
if (!scm_is_eq (got, SCM_UNSPECIFIED))
|
2000-07-18 16:09:09 +00:00
|
|
|
|
{
|
2007-07-22 16:30:13 +00:00
|
|
|
|
if (SCM_RECORD_POSITIONS_P)
|
|
|
|
|
|
return (recsexpr (got, line, column,
|
|
|
|
|
|
SCM_FILENAME (port)));
|
|
|
|
|
|
else
|
|
|
|
|
|
return got;
|
2000-07-18 16:09:09 +00:00
|
|
|
|
}
|
1996-09-18 19:35:48 +00:00
|
|
|
|
}
|
2007-07-22 16:30:13 +00:00
|
|
|
|
|
|
|
|
|
|
return SCM_UNSPECIFIED;
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/* The reader for the sharp `#' character. It basically dispatches reads
|
|
|
|
|
|
among the above token readers. */
|
|
|
|
|
|
static SCM
|
|
|
|
|
|
scm_read_sharp (int chr, SCM port)
|
|
|
|
|
|
#define FUNC_NAME "scm_lreadr"
|
|
|
|
|
|
{
|
|
|
|
|
|
SCM result;
|
|
|
|
|
|
|
|
|
|
|
|
chr = scm_getc (port);
|
|
|
|
|
|
|
|
|
|
|
|
result = scm_read_sharp_extension (chr, port);
|
|
|
|
|
|
if (!scm_is_eq (result, SCM_UNSPECIFIED))
|
|
|
|
|
|
return result;
|
|
|
|
|
|
|
|
|
|
|
|
switch (chr)
|
|
|
|
|
|
{
|
|
|
|
|
|
case '\\':
|
|
|
|
|
|
return (scm_read_character (chr, port));
|
|
|
|
|
|
case '(':
|
|
|
|
|
|
return (scm_read_vector (chr, port));
|
|
|
|
|
|
case 's':
|
|
|
|
|
|
case 'u':
|
|
|
|
|
|
case 'f':
|
|
|
|
|
|
/* This one may return either a boolean or an SRFI-4 vector. */
|
|
|
|
|
|
return (scm_read_srfi4_vector (chr, port));
|
|
|
|
|
|
case '*':
|
|
|
|
|
|
return (scm_read_guile_bit_vector (chr, port));
|
|
|
|
|
|
case 't':
|
|
|
|
|
|
case 'T':
|
|
|
|
|
|
case 'F':
|
|
|
|
|
|
/* This one may return either a boolean or an SRFI-4 vector. */
|
|
|
|
|
|
return (scm_read_boolean (chr, port));
|
|
|
|
|
|
case ':':
|
|
|
|
|
|
return (scm_read_keyword (chr, port));
|
|
|
|
|
|
case '0': case '1': case '2': case '3': case '4':
|
|
|
|
|
|
case '5': case '6': case '7': case '8': case '9':
|
|
|
|
|
|
case '@':
|
|
|
|
|
|
#if SCM_ENABLE_DEPRECATED
|
|
|
|
|
|
/* See below for 'i' and 'e'. */
|
|
|
|
|
|
case 'a':
|
|
|
|
|
|
case 'c':
|
|
|
|
|
|
case 'y':
|
|
|
|
|
|
case 'h':
|
|
|
|
|
|
case 'l':
|
|
|
|
|
|
#endif
|
|
|
|
|
|
return (scm_i_read_array (port, chr));
|
|
|
|
|
|
|
|
|
|
|
|
case 'i':
|
|
|
|
|
|
case 'e':
|
|
|
|
|
|
#if SCM_ENABLE_DEPRECATED
|
|
|
|
|
|
{
|
|
|
|
|
|
/* When next char is '(', it really is an old-style
|
|
|
|
|
|
uniform array. */
|
|
|
|
|
|
int next_c = scm_getc (port);
|
|
|
|
|
|
if (next_c != EOF)
|
|
|
|
|
|
scm_ungetc (next_c, port);
|
|
|
|
|
|
if (next_c == '(')
|
|
|
|
|
|
return scm_i_read_array (port, chr);
|
|
|
|
|
|
/* Fall through. */
|
|
|
|
|
|
}
|
|
|
|
|
|
#endif
|
|
|
|
|
|
case 'b':
|
|
|
|
|
|
case 'B':
|
|
|
|
|
|
case 'o':
|
|
|
|
|
|
case 'O':
|
|
|
|
|
|
case 'd':
|
|
|
|
|
|
case 'D':
|
|
|
|
|
|
case 'x':
|
|
|
|
|
|
case 'X':
|
|
|
|
|
|
case 'I':
|
|
|
|
|
|
case 'E':
|
|
|
|
|
|
return (scm_read_number_and_radix (chr, port));
|
|
|
|
|
|
case '{':
|
|
|
|
|
|
return (scm_read_extended_symbol (chr, port));
|
|
|
|
|
|
case '!':
|
|
|
|
|
|
return (scm_read_scsh_block_comment (chr, port));
|
add reader support for #; #` #' #, and #,@. fix bug in compile-and-load.
* libguile/read.c (flush_ws, scm_read_commented_expression)
(scm_read_sharp): Add support for commenting out expressions with #;.
(scm_read_syntax, scm_read_sharp): Add support for #', #`, #, and #,@.
* module/ice-9/boot-9.scm: Remove #' read-hash extension, which actually
didn't do anything at all. It's been there since 1997, but no Guile
code I've ever seen uses it, and it conflicts with #'x => (syntax x)
from modern Scheme.
* module/system/base/compile.scm (compile-and-load): Whoops, fix a number
of bugs here.
2009-05-28 14:49:33 +02:00
|
|
|
|
case ';':
|
|
|
|
|
|
return (scm_read_commented_expression (chr, port));
|
|
|
|
|
|
case '`':
|
|
|
|
|
|
case '\'':
|
|
|
|
|
|
case ',':
|
|
|
|
|
|
return (scm_read_syntax (chr, port));
|
2007-07-22 16:30:13 +00:00
|
|
|
|
default:
|
|
|
|
|
|
result = scm_read_sharp_extension (chr, port);
|
|
|
|
|
|
if (scm_is_eq (result, SCM_UNSPECIFIED))
|
|
|
|
|
|
scm_i_input_error (FUNC_NAME, port, "Unknown # object: ~S",
|
|
|
|
|
|
scm_list_1 (SCM_MAKE_CHAR (chr)));
|
|
|
|
|
|
else
|
|
|
|
|
|
return result;
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
return SCM_UNSPECIFIED;
|
|
|
|
|
|
}
|
|
|
|
|
|
#undef FUNC_NAME
|
|
|
|
|
|
|
|
|
|
|
|
static SCM
|
|
|
|
|
|
scm_read_expression (SCM port)
|
|
|
|
|
|
#define FUNC_NAME "scm_read_expression"
|
|
|
|
|
|
{
|
|
|
|
|
|
while (1)
|
|
|
|
|
|
{
|
|
|
|
|
|
register int chr;
|
|
|
|
|
|
|
|
|
|
|
|
chr = scm_getc (port);
|
|
|
|
|
|
|
|
|
|
|
|
switch (chr)
|
|
|
|
|
|
{
|
|
|
|
|
|
case SCM_WHITE_SPACES:
|
|
|
|
|
|
case SCM_LINE_INCREMENTORS:
|
|
|
|
|
|
break;
|
|
|
|
|
|
case ';':
|
|
|
|
|
|
(void) scm_read_semicolon_comment (chr, port);
|
|
|
|
|
|
break;
|
|
|
|
|
|
case '(':
|
|
|
|
|
|
return (scm_read_sexp (chr, port));
|
|
|
|
|
|
case '"':
|
|
|
|
|
|
return (scm_read_string (chr, port));
|
|
|
|
|
|
case '\'':
|
|
|
|
|
|
case '`':
|
|
|
|
|
|
case ',':
|
|
|
|
|
|
return (scm_read_quote (chr, port));
|
|
|
|
|
|
case '#':
|
|
|
|
|
|
{
|
|
|
|
|
|
SCM result;
|
|
|
|
|
|
result = scm_read_sharp (chr, port);
|
|
|
|
|
|
if (scm_is_eq (result, SCM_UNSPECIFIED))
|
|
|
|
|
|
/* We read a comment or some such. */
|
|
|
|
|
|
break;
|
|
|
|
|
|
else
|
|
|
|
|
|
return result;
|
|
|
|
|
|
}
|
|
|
|
|
|
case ')':
|
|
|
|
|
|
scm_i_input_error (FUNC_NAME, port, "unexpected \")\"", SCM_EOL);
|
|
|
|
|
|
break;
|
|
|
|
|
|
case EOF:
|
|
|
|
|
|
return SCM_EOF_VAL;
|
|
|
|
|
|
case ':':
|
|
|
|
|
|
if (scm_is_eq (SCM_PACK (SCM_KEYWORD_STYLE), scm_keyword_prefix))
|
|
|
|
|
|
return scm_symbol_to_keyword (scm_read_expression (port));
|
|
|
|
|
|
/* Fall through. */
|
|
|
|
|
|
|
|
|
|
|
|
default:
|
|
|
|
|
|
{
|
|
|
|
|
|
if (((chr >= '0') && (chr <= '9'))
|
|
|
|
|
|
|| (strchr ("+-.", chr)))
|
|
|
|
|
|
return (scm_read_number (chr, port));
|
|
|
|
|
|
else
|
|
|
|
|
|
return (scm_read_mixed_case_symbol (chr, port));
|
|
|
|
|
|
}
|
|
|
|
|
|
}
|
|
|
|
|
|
}
|
|
|
|
|
|
}
|
|
|
|
|
|
#undef FUNC_NAME
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/* Actual reader. */
|
|
|
|
|
|
|
|
|
|
|
|
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;
|
|
|
|
|
|
|
|
|
|
|
|
if (SCM_UNBNDP (port))
|
|
|
|
|
|
port = scm_current_input_port ();
|
|
|
|
|
|
SCM_VALIDATE_OPINPORT (1, port);
|
|
|
|
|
|
|
|
|
|
|
|
c = flush_ws (port, (char *) NULL);
|
|
|
|
|
|
if (EOF == c)
|
|
|
|
|
|
return SCM_EOF_VAL;
|
|
|
|
|
|
scm_ungetc (c, port);
|
|
|
|
|
|
|
|
|
|
|
|
return (scm_read_expression (port));
|
1996-09-18 19:35:48 +00:00
|
|
|
|
}
|
2001-03-04 17:09:34 +00:00
|
|
|
|
#undef FUNC_NAME
|
1996-09-18 19:35:48 +00:00
|
|
|
|
|
1996-07-25 22:56:11 +00:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
2007-07-22 16:30:13 +00:00
|
|
|
|
/* Used when recording expressions constructed by `scm_read_sharp ()'. */
|
|
|
|
|
|
static SCM
|
|
|
|
|
|
recsexpr (SCM obj, long line, int column, SCM filename)
|
|
|
|
|
|
{
|
|
|
|
|
|
if (!scm_is_pair(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
|
|
|
|
|
|
which haven't previously been read by the reader. */
|
|
|
|
|
|
if (scm_is_false (scm_whash_lookup (scm_source_whash, obj)))
|
|
|
|
|
|
{
|
|
|
|
|
|
if (SCM_COPY_SOURCE_P)
|
|
|
|
|
|
{
|
|
|
|
|
|
copy = scm_cons (recsexpr (SCM_CAR (obj), line, column, filename),
|
|
|
|
|
|
SCM_UNDEFINED);
|
|
|
|
|
|
while ((tmp = SCM_CDR (tmp)) && scm_is_pair (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 ((tmp = SCM_CDR (tmp)) && scm_is_pair (tmp))
|
|
|
|
|
|
recsexpr (SCM_CAR (tmp), line, column, filename);
|
|
|
|
|
|
copy = SCM_UNDEFINED;
|
|
|
|
|
|
}
|
|
|
|
|
|
scm_whash_insert (scm_source_whash,
|
|
|
|
|
|
obj,
|
|
|
|
|
|
scm_make_srcprops (line,
|
|
|
|
|
|
column,
|
|
|
|
|
|
filename,
|
|
|
|
|
|
copy,
|
|
|
|
|
|
SCM_EOL));
|
|
|
|
|
|
}
|
|
|
|
|
|
return obj;
|
|
|
|
|
|
}
|
|
|
|
|
|
}
|
|
|
|
|
|
|
1997-03-11 03:57:04 +00:00
|
|
|
|
/* Manipulate the read-hash-procedures alist. This could be written in
|
|
|
|
|
|
Scheme, but maybe it will also be used by C code during initialisation. */
|
2000-01-05 19:05:23 +00:00
|
|
|
|
SCM_DEFINE (scm_read_hash_extend, "read-hash-extend", 2, 0, 0,
|
1999-12-12 02:36:16 +00:00
|
|
|
|
(SCM chr, SCM proc),
|
2001-02-16 15:17:20 +00:00
|
|
|
|
"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"
|
2007-01-06 18:20:35 +00:00
|
|
|
|
"returned will be the return value of @code{read}. \n"
|
|
|
|
|
|
"Passing @code{#f} for @var{proc} will remove a previous setting. \n"
|
|
|
|
|
|
)
|
1999-12-12 02:36:16 +00:00
|
|
|
|
#define FUNC_NAME s_scm_read_hash_extend
|
* strports.c (scm_read_0str, scm_eval_0str): update scm_read usage.
* gdbint.c (gdb_read): update scm_lreadr usage.
* load.h: update prototypes.
* load.c (scm_primitive_load, scm_read_and_eval_x,
scm_primitive_load_path): remove case_insensitive_p, sharp arguments.
* read.h: add prototype for scm_read_hash_extend. Change args for
other prototypes.
* read.c (scm_read_hash_procedures): new variable.
(scm_read_hash_extend): new procedure.
(scm_get_hash_procedure): new procedure.
* (scm_lreadr): use scm_get_hash_procedure instead of an argument
for extended # processing.
(scm_read, scm_lreadr, scm_lreadrecparen, scm_lreadparen,
scm_read_token): remove case_i, sharp arguments. Change callers.
* read.h (SCM_N_READ_OPTIONS): increase to 3.
(SCM_CASE_INSENSITIVE_P): define.
* read.c: add case-insensitive option to scm_read_opts.
* (scm_read_token): use SCM_CASE_INSENSITIVE_P instead of an argument
to determine whether to convert symbol case.
(default_case_i): definition removed.
* read.c (scm_read_token): if case_i, downcase ic before doing
anything with it.
1997-03-08 18:58:24 +00:00
|
|
|
|
{
|
1997-03-08 22:52:56 +00:00
|
|
|
|
SCM this;
|
|
|
|
|
|
SCM prev;
|
|
|
|
|
|
|
2001-06-26 10:59:34 +00:00
|
|
|
|
SCM_VALIDATE_CHAR (1, chr);
|
2004-07-06 10:59:25 +00:00
|
|
|
|
SCM_ASSERT (scm_is_false (proc)
|
2004-07-27 15:41:49 +00:00
|
|
|
|
|| scm_is_eq (scm_procedure_p (proc), SCM_BOOL_T),
|
2001-06-26 10:59:34 +00:00
|
|
|
|
proc, SCM_ARG2, FUNC_NAME);
|
1997-03-08 22:52:56 +00:00
|
|
|
|
|
1997-03-11 03:57:04 +00:00
|
|
|
|
/* Check if chr is already in the alist. */
|
|
|
|
|
|
this = *scm_read_hash_procedures;
|
|
|
|
|
|
prev = SCM_BOOL_F;
|
1997-03-08 22:52:56 +00:00
|
|
|
|
while (1)
|
|
|
|
|
|
{
|
2004-09-22 17:41:37 +00:00
|
|
|
|
if (scm_is_null (this))
|
1997-03-08 22:52:56 +00:00
|
|
|
|
{
|
|
|
|
|
|
/* not found, so add it to the beginning. */
|
2004-07-06 10:59:25 +00:00
|
|
|
|
if (scm_is_true (proc))
|
1997-03-08 22:52:56 +00:00
|
|
|
|
{
|
1997-03-11 03:57:04 +00:00
|
|
|
|
*scm_read_hash_procedures =
|
|
|
|
|
|
scm_cons (scm_cons (chr, proc), *scm_read_hash_procedures);
|
1997-03-08 22:52:56 +00:00
|
|
|
|
}
|
|
|
|
|
|
break;
|
|
|
|
|
|
}
|
2004-07-27 15:41:49 +00:00
|
|
|
|
if (scm_is_eq (chr, SCM_CAAR (this)))
|
1997-03-08 22:52:56 +00:00
|
|
|
|
{
|
|
|
|
|
|
/* already in the alist. */
|
2004-07-06 10:59:25 +00:00
|
|
|
|
if (scm_is_false (proc))
|
1997-03-11 03:57:04 +00:00
|
|
|
|
{
|
|
|
|
|
|
/* remove it. */
|
2004-07-06 10:59:25 +00:00
|
|
|
|
if (scm_is_false (prev))
|
1997-03-11 03:57:04 +00:00
|
|
|
|
{
|
|
|
|
|
|
*scm_read_hash_procedures =
|
|
|
|
|
|
SCM_CDR (*scm_read_hash_procedures);
|
|
|
|
|
|
}
|
|
|
|
|
|
else
|
|
|
|
|
|
scm_set_cdr_x (prev, SCM_CDR (this));
|
|
|
|
|
|
}
|
1997-03-08 22:52:56 +00:00
|
|
|
|
else
|
1997-03-11 03:57:04 +00:00
|
|
|
|
{
|
|
|
|
|
|
/* replace it. */
|
|
|
|
|
|
scm_set_cdr_x (SCM_CAR (this), proc);
|
|
|
|
|
|
}
|
1997-03-08 22:52:56 +00:00
|
|
|
|
break;
|
|
|
|
|
|
}
|
|
|
|
|
|
prev = this;
|
|
|
|
|
|
this = SCM_CDR (this);
|
|
|
|
|
|
}
|
* strports.c (scm_read_0str, scm_eval_0str): update scm_read usage.
* gdbint.c (gdb_read): update scm_lreadr usage.
* load.h: update prototypes.
* load.c (scm_primitive_load, scm_read_and_eval_x,
scm_primitive_load_path): remove case_insensitive_p, sharp arguments.
* read.h: add prototype for scm_read_hash_extend. Change args for
other prototypes.
* read.c (scm_read_hash_procedures): new variable.
(scm_read_hash_extend): new procedure.
(scm_get_hash_procedure): new procedure.
* (scm_lreadr): use scm_get_hash_procedure instead of an argument
for extended # processing.
(scm_read, scm_lreadr, scm_lreadrecparen, scm_lreadparen,
scm_read_token): remove case_i, sharp arguments. Change callers.
* read.h (SCM_N_READ_OPTIONS): increase to 3.
(SCM_CASE_INSENSITIVE_P): define.
* read.c: add case-insensitive option to scm_read_opts.
* (scm_read_token): use SCM_CASE_INSENSITIVE_P instead of an argument
to determine whether to convert symbol case.
(default_case_i): definition removed.
* read.c (scm_read_token): if case_i, downcase ic before doing
anything with it.
1997-03-08 18:58:24 +00:00
|
|
|
|
|
|
|
|
|
|
return SCM_UNSPECIFIED;
|
|
|
|
|
|
}
|
1999-12-12 02:36:16 +00:00
|
|
|
|
#undef FUNC_NAME
|
1996-07-25 22:56:11 +00:00
|
|
|
|
|
* strports.c (scm_read_0str, scm_eval_0str): update scm_read usage.
* gdbint.c (gdb_read): update scm_lreadr usage.
* load.h: update prototypes.
* load.c (scm_primitive_load, scm_read_and_eval_x,
scm_primitive_load_path): remove case_insensitive_p, sharp arguments.
* read.h: add prototype for scm_read_hash_extend. Change args for
other prototypes.
* read.c (scm_read_hash_procedures): new variable.
(scm_read_hash_extend): new procedure.
(scm_get_hash_procedure): new procedure.
* (scm_lreadr): use scm_get_hash_procedure instead of an argument
for extended # processing.
(scm_read, scm_lreadr, scm_lreadrecparen, scm_lreadparen,
scm_read_token): remove case_i, sharp arguments. Change callers.
* read.h (SCM_N_READ_OPTIONS): increase to 3.
(SCM_CASE_INSENSITIVE_P): define.
* read.c: add case-insensitive option to scm_read_opts.
* (scm_read_token): use SCM_CASE_INSENSITIVE_P instead of an argument
to determine whether to convert symbol case.
(default_case_i): definition removed.
* read.c (scm_read_token): if case_i, downcase ic before doing
anything with it.
1997-03-08 18:58:24 +00:00
|
|
|
|
/* Recover the read-hash procedure corresponding to char c. */
|
|
|
|
|
|
static SCM
|
1999-12-12 20:35:02 +00:00
|
|
|
|
scm_get_hash_procedure (int c)
|
* strports.c (scm_read_0str, scm_eval_0str): update scm_read usage.
* gdbint.c (gdb_read): update scm_lreadr usage.
* load.h: update prototypes.
* load.c (scm_primitive_load, scm_read_and_eval_x,
scm_primitive_load_path): remove case_insensitive_p, sharp arguments.
* read.h: add prototype for scm_read_hash_extend. Change args for
other prototypes.
* read.c (scm_read_hash_procedures): new variable.
(scm_read_hash_extend): new procedure.
(scm_get_hash_procedure): new procedure.
* (scm_lreadr): use scm_get_hash_procedure instead of an argument
for extended # processing.
(scm_read, scm_lreadr, scm_lreadrecparen, scm_lreadparen,
scm_read_token): remove case_i, sharp arguments. Change callers.
* read.h (SCM_N_READ_OPTIONS): increase to 3.
(SCM_CASE_INSENSITIVE_P): define.
* read.c: add case-insensitive option to scm_read_opts.
* (scm_read_token): use SCM_CASE_INSENSITIVE_P instead of an argument
to determine whether to convert symbol case.
(default_case_i): definition removed.
* read.c (scm_read_token): if case_i, downcase ic before doing
anything with it.
1997-03-08 18:58:24 +00:00
|
|
|
|
{
|
1997-03-11 03:57:04 +00:00
|
|
|
|
SCM rest = *scm_read_hash_procedures;
|
1997-03-08 22:52:56 +00:00
|
|
|
|
|
* strports.c (scm_read_0str, scm_eval_0str): update scm_read usage.
* gdbint.c (gdb_read): update scm_lreadr usage.
* load.h: update prototypes.
* load.c (scm_primitive_load, scm_read_and_eval_x,
scm_primitive_load_path): remove case_insensitive_p, sharp arguments.
* read.h: add prototype for scm_read_hash_extend. Change args for
other prototypes.
* read.c (scm_read_hash_procedures): new variable.
(scm_read_hash_extend): new procedure.
(scm_get_hash_procedure): new procedure.
* (scm_lreadr): use scm_get_hash_procedure instead of an argument
for extended # processing.
(scm_read, scm_lreadr, scm_lreadrecparen, scm_lreadparen,
scm_read_token): remove case_i, sharp arguments. Change callers.
* read.h (SCM_N_READ_OPTIONS): increase to 3.
(SCM_CASE_INSENSITIVE_P): define.
* read.c: add case-insensitive option to scm_read_opts.
* (scm_read_token): use SCM_CASE_INSENSITIVE_P instead of an argument
to determine whether to convert symbol case.
(default_case_i): definition removed.
* read.c (scm_read_token): if case_i, downcase ic before doing
anything with it.
1997-03-08 18:58:24 +00:00
|
|
|
|
while (1)
|
|
|
|
|
|
{
|
2004-09-22 17:41:37 +00:00
|
|
|
|
if (scm_is_null (rest))
|
* strports.c (scm_read_0str, scm_eval_0str): update scm_read usage.
* gdbint.c (gdb_read): update scm_lreadr usage.
* load.h: update prototypes.
* load.c (scm_primitive_load, scm_read_and_eval_x,
scm_primitive_load_path): remove case_insensitive_p, sharp arguments.
* read.h: add prototype for scm_read_hash_extend. Change args for
other prototypes.
* read.c (scm_read_hash_procedures): new variable.
(scm_read_hash_extend): new procedure.
(scm_get_hash_procedure): new procedure.
* (scm_lreadr): use scm_get_hash_procedure instead of an argument
for extended # processing.
(scm_read, scm_lreadr, scm_lreadrecparen, scm_lreadparen,
scm_read_token): remove case_i, sharp arguments. Change callers.
* read.h (SCM_N_READ_OPTIONS): increase to 3.
(SCM_CASE_INSENSITIVE_P): define.
* read.c: add case-insensitive option to scm_read_opts.
* (scm_read_token): use SCM_CASE_INSENSITIVE_P instead of an argument
to determine whether to convert symbol case.
(default_case_i): definition removed.
* read.c (scm_read_token): if case_i, downcase ic before doing
anything with it.
1997-03-08 18:58:24 +00:00
|
|
|
|
return SCM_BOOL_F;
|
|
|
|
|
|
|
2000-03-02 20:54:43 +00:00
|
|
|
|
if (SCM_CHAR (SCM_CAAR (rest)) == c)
|
* strports.c (scm_read_0str, scm_eval_0str): update scm_read usage.
* gdbint.c (gdb_read): update scm_lreadr usage.
* load.h: update prototypes.
* load.c (scm_primitive_load, scm_read_and_eval_x,
scm_primitive_load_path): remove case_insensitive_p, sharp arguments.
* read.h: add prototype for scm_read_hash_extend. Change args for
other prototypes.
* read.c (scm_read_hash_procedures): new variable.
(scm_read_hash_extend): new procedure.
(scm_get_hash_procedure): new procedure.
* (scm_lreadr): use scm_get_hash_procedure instead of an argument
for extended # processing.
(scm_read, scm_lreadr, scm_lreadrecparen, scm_lreadparen,
scm_read_token): remove case_i, sharp arguments. Change callers.
* read.h (SCM_N_READ_OPTIONS): increase to 3.
(SCM_CASE_INSENSITIVE_P): define.
* read.c: add case-insensitive option to scm_read_opts.
* (scm_read_token): use SCM_CASE_INSENSITIVE_P instead of an argument
to determine whether to convert symbol case.
(default_case_i): definition removed.
* read.c (scm_read_token): if case_i, downcase ic before doing
anything with it.
1997-03-08 18:58:24 +00:00
|
|
|
|
return SCM_CDAR (rest);
|
|
|
|
|
|
|
|
|
|
|
|
rest = SCM_CDR (rest);
|
|
|
|
|
|
}
|
|
|
|
|
|
}
|
* __scm.h, alist.c, alist.h, append.c, append.h, appinit.c,
arbiters.c, arbiters.h, async.c, async.h, boolean.c, boolean.h,
chars.c, chars.h, continuations.c, continuations.h, debug.c,
debug.h, dynwind.c, dynwind.h, eq.c, eq.h, error.c, eval.c,
eval.h, extchrs.c, extchrs.h, fdsocket.c, fdsocket.h, filesys.c,
filesys.h, fports.c, fports.h, gc.c, gdb_interface.h, gdbint.c,
gdbint.h, genio.c, genio.h, gscm.c, gscm.h, gsubr.c, gsubr.h,
hash.c, hash.h, hashtab.c, hashtab.h, init.c, ioext.c, ioext.h,
kw.c, kw.h, libguile.h, mallocs.c, mallocs.h, markers.c,
markers.h, mbstrings.c, mbstrings.h, numbers.c, numbers.h,
objprop.c, objprop.h, options.c, options.h, pairs.c, pairs.h,
ports.c, ports.h, posix.c, posix.h, print.c, print.h, procprop.c,
procprop.h, procs.c, procs.h, ramap.c, ramap.h, read.c, read.h,
root.c, scmsigs.c, scmsigs.h, sequences.c, sequences.h, simpos.c,
simpos.h, smob.c, socket.c, socket.h, srcprop.c, srcprop.h,
stackchk.c, stackchk.h, stime.c, stime.h, strings.c, strings.h,
strop.c, strop.h, strorder.c, strorder.h, strports.c, strports.h,
struct.c, struct.h, symbols.c, symbols.h, tag.c, tag.h, unif.c,
unif.h, variable.c, variable.h, vectors.c, vectors.h, version.c,
version.h, vports.c, vports.h, weaks.c, weaks.h: Use SCM_P to
declare functions with prototypes. (Patch thanks to Marius
Vollmer.)
1996-10-14 01:33:50 +00:00
|
|
|
|
|
1996-07-25 22:56:11 +00:00
|
|
|
|
void
|
|
|
|
|
|
scm_init_read ()
|
|
|
|
|
|
{
|
1997-03-11 03:57:04 +00:00
|
|
|
|
scm_read_hash_procedures =
|
2001-05-15 14:57:22 +00:00
|
|
|
|
SCM_VARIABLE_LOC (scm_c_define ("read-hash-procedures", SCM_EOL));
|
1997-03-08 22:52:56 +00:00
|
|
|
|
|
2007-01-19 19:26:36 +00:00
|
|
|
|
scm_init_opts (scm_read_options, scm_read_opts);
|
2000-04-21 14:16:44 +00:00
|
|
|
|
#include "libguile/read.x"
|
1996-07-25 22:56:11 +00:00
|
|
|
|
}
|
2000-03-19 19:01:16 +00:00
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
|
|
Local Variables:
|
|
|
|
|
|
c-file-style: "gnu"
|
|
|
|
|
|
End:
|
|
|
|
|
|
*/
|