2016-11-21 08:36:32 +00:00
|
|
|
/* -*-comment-start: "//";comment-end:""-*-
|
2018-07-22 13:24:36 +01:00
|
|
|
* GNU Mes --- Maxwell Equations of Software
|
2017-11-21 18:22:26 +00:00
|
|
|
* Copyright © 2016,2017,2018 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
|
2018-08-12 13:53:06 +01:00
|
|
|
* Copyright © 2018 Jeremiah Orians <jeremiah@pdp10.guru>
|
2016-11-21 08:36:32 +00:00
|
|
|
*
|
2018-07-22 13:24:36 +01:00
|
|
|
* This file is part of GNU Mes.
|
2016-11-21 08:36:32 +00:00
|
|
|
*
|
2018-07-22 13:24:36 +01:00
|
|
|
* GNU Mes is free software; you can redistribute it and/or modify it
|
2016-11-21 08:36:32 +00:00
|
|
|
* under the terms of the GNU General Public License as published by
|
|
|
|
* the Free Software Foundation; either version 3 of the License, or (at
|
|
|
|
* your option) any later version.
|
|
|
|
*
|
2018-07-22 13:24:36 +01:00
|
|
|
* GNU Mes is distributed in the hope that it will be useful, but
|
2016-11-21 08:36:32 +00:00
|
|
|
* WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
|
|
* GNU General Public License for more details.
|
|
|
|
*
|
|
|
|
* You should have received a copy of the GNU General Public License
|
2018-07-22 13:24:36 +01:00
|
|
|
* along with GNU Mes. If not, see <http://www.gnu.org/licenses/>.
|
2016-11-21 08:36:32 +00:00
|
|
|
*/
|
|
|
|
|
2017-05-02 22:30:46 +01:00
|
|
|
#include <ctype.h>
|
mini-mes: Merge with mes.c: lib.c, math.c, posix.c.
* mes.c: Include math.c after posix.c.
(assert_defined, check_formals, check_apply, load_env,
bload_env): Move from lib.c
* scaffold/mini-mes.c: Include mini-lib.h, lib.c., mini-math.h,
math.c, mini-posix.h, posix.c.
(greater_p, less_p, is_p, minus, plus, divide, modulo, multiply,
logior, ash): Remove.
(ungetchar, peekchar, peek_byte, read_byte, write_byte,
string_to_cstring, getenv_, open_input_file, current_input_port,
set_current_input_port, force_output): Remove.
(mes_builtins): include mini-lib.i, mini-lib.environment.i.
mini-math.i, mini-math.environment.i mini-posix.i,
mini-posix.environment.i.
* GNUmakefile (guile-mini-mes): Add dependencies.
2017-04-08 14:01:24 +01:00
|
|
|
|
2018-08-12 13:53:06 +01:00
|
|
|
#define MAX_STRING 4096
|
|
|
|
|
core: Move reader and posix functions from mes.c
* mes.c (getchar, ungetchar, peekchar, peek_byte, read_byte,
unread_byte, write_byte, read_input_file_env_, read_input_file_env):
Remove.
* posix.c (getchar, ungetchar, peekchar, peek_byte, read_byte,
unread_byte, write_byte): Move from mes.c.
* reader (read_input_file_env_, read_input_file_env): Move from mes.c.
2016-12-24 10:28:25 +00:00
|
|
|
SCM
|
|
|
|
read_input_file_env_ (SCM e, SCM a)
|
|
|
|
{
|
2018-04-05 20:35:31 +01:00
|
|
|
if (e == cell_nil)
|
|
|
|
return e;
|
core: Move reader and posix functions from mes.c
* mes.c (getchar, ungetchar, peekchar, peek_byte, read_byte,
unread_byte, write_byte, read_input_file_env_, read_input_file_env):
Remove.
* posix.c (getchar, ungetchar, peekchar, peek_byte, read_byte,
unread_byte, write_byte): Move from mes.c.
* reader (read_input_file_env_, read_input_file_env): Move from mes.c.
2016-12-24 10:28:25 +00:00
|
|
|
return cons (e, read_input_file_env_ (read_env (a), a));
|
|
|
|
}
|
|
|
|
|
|
|
|
SCM
|
|
|
|
read_input_file_env (SCM a)
|
|
|
|
{
|
|
|
|
r0 = a;
|
|
|
|
return read_input_file_env_ (read_env (r0), r0);
|
|
|
|
}
|
|
|
|
|
2016-11-21 08:36:32 +00:00
|
|
|
int
|
2018-01-06 06:58:23 +00:00
|
|
|
reader_read_line_comment (int c)
|
2016-11-21 08:36:32 +00:00
|
|
|
{
|
2018-08-12 13:53:06 +01:00
|
|
|
while (c != EOF)
|
|
|
|
{
|
|
|
|
if (c == '\n')
|
|
|
|
return c;
|
|
|
|
c = readchar ();
|
|
|
|
}
|
|
|
|
error (cell_symbol_system_error,
|
|
|
|
MAKE_STRING (cstring_to_list ("reader_read_line_comment")));
|
2016-11-21 08:36:32 +00:00
|
|
|
}
|
|
|
|
|
2018-01-06 06:58:23 +00:00
|
|
|
SCM reader_read_block_comment (int s, int c);
|
2018-04-09 07:41:30 +01:00
|
|
|
SCM reader_read_hash (int c, SCM a);
|
2018-04-05 21:41:53 +01:00
|
|
|
SCM reader_read_list (int c, SCM a);
|
2017-12-11 03:52:00 +00:00
|
|
|
|
2018-04-09 07:41:30 +01:00
|
|
|
int
|
|
|
|
reader_identifier_p (int c)
|
|
|
|
{
|
|
|
|
return (c > ' ' && c <= '~' && c != '"' && c != ';' && c != '(' && c != ')' && c != EOF);
|
|
|
|
}
|
|
|
|
|
|
|
|
int
|
|
|
|
reader_end_of_word_p (int c)
|
|
|
|
{
|
|
|
|
return (c == '"' || c == ';' || c == '(' || c == ')' || isspace (c) || c == EOF);
|
|
|
|
}
|
|
|
|
|
|
|
|
SCM
|
|
|
|
reader_read_identifier_or_number (int c)
|
|
|
|
{
|
2018-08-12 13:53:06 +01:00
|
|
|
char buf[MAX_STRING];
|
2018-04-09 07:41:30 +01:00
|
|
|
int i = 0;
|
2018-10-06 23:58:31 +01:00
|
|
|
long n = 0;
|
2018-04-09 07:41:30 +01:00
|
|
|
int negative_p = 0;
|
|
|
|
if (c == '+' && isdigit (peekchar ()))
|
2018-04-29 16:48:38 +01:00
|
|
|
c = readchar ();
|
2018-04-09 07:41:30 +01:00
|
|
|
else if (c == '-' && isdigit (peekchar ()))
|
|
|
|
{
|
|
|
|
negative_p = 1;
|
2018-04-29 16:48:38 +01:00
|
|
|
c = readchar ();
|
2018-04-09 07:41:30 +01:00
|
|
|
}
|
|
|
|
while (isdigit (c))
|
|
|
|
{
|
|
|
|
buf[i++] = c;
|
|
|
|
n *= 10;
|
|
|
|
n += c - '0';
|
2018-04-29 16:48:38 +01:00
|
|
|
c = readchar ();
|
2018-04-09 07:41:30 +01:00
|
|
|
}
|
|
|
|
if (reader_end_of_word_p (c))
|
|
|
|
{
|
2018-04-29 16:48:38 +01:00
|
|
|
unreadchar (c);
|
2018-04-09 07:41:30 +01:00
|
|
|
if (negative_p)
|
|
|
|
n = 0 - n;
|
|
|
|
return MAKE_NUMBER (n);
|
|
|
|
}
|
2018-08-12 13:53:06 +01:00
|
|
|
/* Fallthrough: Note that `4a', `+1b' are identifiers */
|
2018-04-09 07:41:30 +01:00
|
|
|
while (!reader_end_of_word_p (c))
|
|
|
|
{
|
|
|
|
buf[i++] = c;
|
2018-04-29 16:48:38 +01:00
|
|
|
c = readchar ();
|
2018-04-09 07:41:30 +01:00
|
|
|
}
|
2018-04-29 16:48:38 +01:00
|
|
|
unreadchar (c);
|
2018-04-09 07:41:30 +01:00
|
|
|
buf[i] = 0;
|
|
|
|
return lookup_symbol_ (cstring_to_list (buf));
|
|
|
|
}
|
|
|
|
|
2016-11-21 08:36:32 +00:00
|
|
|
SCM
|
2018-04-09 07:41:30 +01:00
|
|
|
reader_read_sexp_ (int c, SCM a)
|
2016-11-21 08:36:32 +00:00
|
|
|
{
|
2018-08-12 13:53:06 +01:00
|
|
|
reset_reader:
|
|
|
|
if (c == EOF)
|
|
|
|
return cell_nil;
|
|
|
|
if (c == ';')
|
|
|
|
{
|
|
|
|
c = reader_read_line_comment (c);
|
|
|
|
goto reset_reader;
|
|
|
|
}
|
|
|
|
if ((c == ' ') || (c == '\t') || (c == '\n') || (c == '\f'))
|
|
|
|
{
|
|
|
|
c = readchar ();
|
|
|
|
goto reset_reader;
|
|
|
|
}
|
|
|
|
if (c == '(')
|
|
|
|
return reader_read_list (readchar (), a);
|
|
|
|
if (c == ')')
|
|
|
|
return cell_nil;
|
|
|
|
if (c == '#')
|
|
|
|
return reader_read_hash (readchar (), a);
|
|
|
|
if (c == '`')
|
|
|
|
return cons (cell_symbol_quasiquote,
|
|
|
|
cons (reader_read_sexp_ (readchar (), a), cell_nil));
|
|
|
|
if(c == ',')
|
2018-04-05 21:41:53 +01:00
|
|
|
{
|
|
|
|
if (peekchar () == '@')
|
|
|
|
{
|
2018-04-29 16:48:38 +01:00
|
|
|
readchar ();
|
2018-04-05 21:41:53 +01:00
|
|
|
return cons (cell_symbol_unquote_splicing,
|
2018-04-29 16:48:38 +01:00
|
|
|
cons (reader_read_sexp_ (readchar (), a), cell_nil));
|
2018-04-05 21:41:53 +01:00
|
|
|
}
|
|
|
|
return cons (cell_symbol_unquote,
|
2018-04-29 16:48:38 +01:00
|
|
|
cons (reader_read_sexp_ (readchar (), a), cell_nil));
|
2018-04-05 21:41:53 +01:00
|
|
|
}
|
2018-08-12 13:53:06 +01:00
|
|
|
if (c == '\'')
|
|
|
|
return cons (cell_symbol_quote,
|
|
|
|
cons (reader_read_sexp_ (readchar (), a), cell_nil));
|
|
|
|
if (c == '"')
|
|
|
|
return reader_read_string ();
|
|
|
|
if (c == '.' && (!reader_identifier_p (peekchar ())))
|
|
|
|
return cell_dot;
|
|
|
|
return reader_read_identifier_or_number (c);
|
2016-11-21 08:36:32 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
int
|
2018-04-09 07:41:30 +01:00
|
|
|
reader_eat_whitespace (int c)
|
2016-11-21 08:36:32 +00:00
|
|
|
{
|
2018-04-09 07:41:30 +01:00
|
|
|
while (isspace (c))
|
2018-04-29 16:48:38 +01:00
|
|
|
c = readchar ();
|
2018-04-09 07:41:30 +01:00
|
|
|
if (c == ';')
|
|
|
|
return reader_eat_whitespace (reader_read_line_comment (c));
|
|
|
|
if (c == '#' && (peekchar () == '!' || peekchar () == '|'))
|
|
|
|
{
|
2018-04-29 16:48:38 +01:00
|
|
|
c=readchar ();
|
|
|
|
reader_read_block_comment (c, readchar ());
|
|
|
|
return reader_eat_whitespace (readchar ());
|
2018-04-09 07:41:30 +01:00
|
|
|
}
|
2016-11-21 08:36:32 +00:00
|
|
|
return c;
|
|
|
|
}
|
|
|
|
|
|
|
|
SCM
|
2018-04-05 21:41:53 +01:00
|
|
|
reader_read_list (int c, SCM a)
|
2016-11-21 08:36:32 +00:00
|
|
|
{
|
2018-04-09 07:41:30 +01:00
|
|
|
c = reader_eat_whitespace (c);
|
|
|
|
if (c == ')')
|
|
|
|
return cell_nil;
|
|
|
|
if (c == EOF)
|
|
|
|
error (cell_symbol_not_a_pair, MAKE_STRING (cstring_to_list ("EOF in list")));
|
|
|
|
//return cell_nil;
|
|
|
|
SCM s = reader_read_sexp_ (c, a);
|
2018-04-05 21:41:53 +01:00
|
|
|
if (s == cell_dot)
|
2018-04-29 16:48:38 +01:00
|
|
|
return CAR (reader_read_list (readchar (), a));
|
|
|
|
return cons (s, reader_read_list (readchar (), a));
|
2016-11-21 08:36:32 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
SCM
|
|
|
|
read_env (SCM a)
|
|
|
|
{
|
2018-04-29 16:48:38 +01:00
|
|
|
return reader_read_sexp_ (readchar (), a);
|
2017-03-25 14:58:44 +00:00
|
|
|
}
|
mini-mes: Merge with mes.c: lib.c, math.c, posix.c.
* mes.c: Include math.c after posix.c.
(assert_defined, check_formals, check_apply, load_env,
bload_env): Move from lib.c
* scaffold/mini-mes.c: Include mini-lib.h, lib.c., mini-math.h,
math.c, mini-posix.h, posix.c.
(greater_p, less_p, is_p, minus, plus, divide, modulo, multiply,
logior, ash): Remove.
(ungetchar, peekchar, peek_byte, read_byte, write_byte,
string_to_cstring, getenv_, open_input_file, current_input_port,
set_current_input_port, force_output): Remove.
(mes_builtins): include mini-lib.i, mini-lib.environment.i.
mini-math.i, mini-math.environment.i mini-posix.i,
mini-posix.environment.i.
* GNUmakefile (guile-mini-mes): Add dependencies.
2017-04-08 14:01:24 +01:00
|
|
|
|
mes: resurrect full reader in C core.
* module/mes/read-0.mes (defined?): New function.
(eat-whitespace, read-env, read-word, read-block-comment,
read-line-comment, read-list, read-character, read-hex, read-octal,
reader:read-string, lookup, read-hash, read-word): Only define if
not %c-reader.
* module/mes/base-0.mes (defined?): Remove.
* src/mes.c[MES_C_READER]: Set ARENA_SIZE=10000000.
(scm_symbol_quasiquote scm_symbol_unquote,
scm_symbol_unquote_splicing, scm_symbol_syntax,
scm_symbol_quasisyntax, scm_symbol_unsyntax,
scm_symbol_unsyntax_splicing): New symbol.
(scm_symbol_c_reader): New symbol.
(MAKE_KEYWORD)[MES_C_READER]: New define.
(mes_symbols): Define %c_reader.
* src/reader.c (read_word_)[MES_C_READER]: Extend to full Scheme
reader.
(eat_whitespace)[MES_C_READER]: Likewise.
(read_block_comment, read_hash, read_word, read_character,
read_octal, read_hex, append_char, read_string)[MES_C_READER]:
Likewise.
* make.scm (bin.gcc,bin.mescc): Define MES_C_READER=1.
2017-11-29 20:42:50 +00:00
|
|
|
SCM
|
2018-01-06 06:58:23 +00:00
|
|
|
reader_read_block_comment (int s, int c)
|
mes: resurrect full reader in C core.
* module/mes/read-0.mes (defined?): New function.
(eat-whitespace, read-env, read-word, read-block-comment,
read-line-comment, read-list, read-character, read-hex, read-octal,
reader:read-string, lookup, read-hash, read-word): Only define if
not %c-reader.
* module/mes/base-0.mes (defined?): Remove.
* src/mes.c[MES_C_READER]: Set ARENA_SIZE=10000000.
(scm_symbol_quasiquote scm_symbol_unquote,
scm_symbol_unquote_splicing, scm_symbol_syntax,
scm_symbol_quasisyntax, scm_symbol_unsyntax,
scm_symbol_unsyntax_splicing): New symbol.
(scm_symbol_c_reader): New symbol.
(MAKE_KEYWORD)[MES_C_READER]: New define.
(mes_symbols): Define %c_reader.
* src/reader.c (read_word_)[MES_C_READER]: Extend to full Scheme
reader.
(eat_whitespace)[MES_C_READER]: Likewise.
(read_block_comment, read_hash, read_word, read_character,
read_octal, read_hex, append_char, read_string)[MES_C_READER]:
Likewise.
* make.scm (bin.gcc,bin.mescc): Define MES_C_READER=1.
2017-11-29 20:42:50 +00:00
|
|
|
{
|
2018-04-29 16:48:38 +01:00
|
|
|
if (c == s && peekchar () == '#') return readchar ();
|
|
|
|
return reader_read_block_comment (s, readchar ());
|
mes: resurrect full reader in C core.
* module/mes/read-0.mes (defined?): New function.
(eat-whitespace, read-env, read-word, read-block-comment,
read-line-comment, read-list, read-character, read-hex, read-octal,
reader:read-string, lookup, read-hash, read-word): Only define if
not %c-reader.
* module/mes/base-0.mes (defined?): Remove.
* src/mes.c[MES_C_READER]: Set ARENA_SIZE=10000000.
(scm_symbol_quasiquote scm_symbol_unquote,
scm_symbol_unquote_splicing, scm_symbol_syntax,
scm_symbol_quasisyntax, scm_symbol_unsyntax,
scm_symbol_unsyntax_splicing): New symbol.
(scm_symbol_c_reader): New symbol.
(MAKE_KEYWORD)[MES_C_READER]: New define.
(mes_symbols): Define %c_reader.
* src/reader.c (read_word_)[MES_C_READER]: Extend to full Scheme
reader.
(eat_whitespace)[MES_C_READER]: Likewise.
(read_block_comment, read_hash, read_word, read_character,
read_octal, read_hex, append_char, read_string)[MES_C_READER]:
Likewise.
* make.scm (bin.gcc,bin.mescc): Define MES_C_READER=1.
2017-11-29 20:42:50 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
SCM
|
2018-04-09 07:41:30 +01:00
|
|
|
reader_read_hash (int c, SCM a)
|
mes: resurrect full reader in C core.
* module/mes/read-0.mes (defined?): New function.
(eat-whitespace, read-env, read-word, read-block-comment,
read-line-comment, read-list, read-character, read-hex, read-octal,
reader:read-string, lookup, read-hash, read-word): Only define if
not %c-reader.
* module/mes/base-0.mes (defined?): Remove.
* src/mes.c[MES_C_READER]: Set ARENA_SIZE=10000000.
(scm_symbol_quasiquote scm_symbol_unquote,
scm_symbol_unquote_splicing, scm_symbol_syntax,
scm_symbol_quasisyntax, scm_symbol_unsyntax,
scm_symbol_unsyntax_splicing): New symbol.
(scm_symbol_c_reader): New symbol.
(MAKE_KEYWORD)[MES_C_READER]: New define.
(mes_symbols): Define %c_reader.
* src/reader.c (read_word_)[MES_C_READER]: Extend to full Scheme
reader.
(eat_whitespace)[MES_C_READER]: Likewise.
(read_block_comment, read_hash, read_word, read_character,
read_octal, read_hex, append_char, read_string)[MES_C_READER]:
Likewise.
* make.scm (bin.gcc,bin.mescc): Define MES_C_READER=1.
2017-11-29 20:42:50 +00:00
|
|
|
{
|
2018-08-12 13:53:06 +01:00
|
|
|
if (c == '!')
|
mes: resurrect full reader in C core.
* module/mes/read-0.mes (defined?): New function.
(eat-whitespace, read-env, read-word, read-block-comment,
read-line-comment, read-list, read-character, read-hex, read-octal,
reader:read-string, lookup, read-hash, read-word): Only define if
not %c-reader.
* module/mes/base-0.mes (defined?): Remove.
* src/mes.c[MES_C_READER]: Set ARENA_SIZE=10000000.
(scm_symbol_quasiquote scm_symbol_unquote,
scm_symbol_unquote_splicing, scm_symbol_syntax,
scm_symbol_quasisyntax, scm_symbol_unsyntax,
scm_symbol_unsyntax_splicing): New symbol.
(scm_symbol_c_reader): New symbol.
(MAKE_KEYWORD)[MES_C_READER]: New define.
(mes_symbols): Define %c_reader.
* src/reader.c (read_word_)[MES_C_READER]: Extend to full Scheme
reader.
(eat_whitespace)[MES_C_READER]: Likewise.
(read_block_comment, read_hash, read_word, read_character,
read_octal, read_hex, append_char, read_string)[MES_C_READER]:
Likewise.
* make.scm (bin.gcc,bin.mescc): Define MES_C_READER=1.
2017-11-29 20:42:50 +00:00
|
|
|
{
|
2018-04-29 16:48:38 +01:00
|
|
|
reader_read_block_comment (c, readchar ());
|
|
|
|
return reader_read_sexp_ (readchar (), a);
|
2018-08-12 13:53:06 +01:00
|
|
|
}
|
|
|
|
if (c == '|')
|
|
|
|
{
|
2018-04-29 16:48:38 +01:00
|
|
|
reader_read_block_comment (c, readchar ());
|
|
|
|
return reader_read_sexp_ (readchar (), a);
|
2018-08-12 13:53:06 +01:00
|
|
|
}
|
|
|
|
if(c == 'f')
|
|
|
|
return cell_f;
|
|
|
|
if(c == 't')
|
|
|
|
return cell_t;
|
|
|
|
if(c == ',')
|
|
|
|
{
|
mes: resurrect full reader in C core.
* module/mes/read-0.mes (defined?): New function.
(eat-whitespace, read-env, read-word, read-block-comment,
read-line-comment, read-list, read-character, read-hex, read-octal,
reader:read-string, lookup, read-hash, read-word): Only define if
not %c-reader.
* module/mes/base-0.mes (defined?): Remove.
* src/mes.c[MES_C_READER]: Set ARENA_SIZE=10000000.
(scm_symbol_quasiquote scm_symbol_unquote,
scm_symbol_unquote_splicing, scm_symbol_syntax,
scm_symbol_quasisyntax, scm_symbol_unsyntax,
scm_symbol_unsyntax_splicing): New symbol.
(scm_symbol_c_reader): New symbol.
(MAKE_KEYWORD)[MES_C_READER]: New define.
(mes_symbols): Define %c_reader.
* src/reader.c (read_word_)[MES_C_READER]: Extend to full Scheme
reader.
(eat_whitespace)[MES_C_READER]: Likewise.
(read_block_comment, read_hash, read_word, read_character,
read_octal, read_hex, append_char, read_string)[MES_C_READER]:
Likewise.
* make.scm (bin.gcc,bin.mescc): Define MES_C_READER=1.
2017-11-29 20:42:50 +00:00
|
|
|
if (peekchar () == '@')
|
|
|
|
{
|
2018-04-29 16:48:38 +01:00
|
|
|
readchar ();
|
2018-04-05 21:41:53 +01:00
|
|
|
return cons (cell_symbol_unsyntax_splicing,
|
2018-08-12 13:53:06 +01:00
|
|
|
cons (reader_read_sexp_ (readchar (), a), cell_nil));
|
mes: resurrect full reader in C core.
* module/mes/read-0.mes (defined?): New function.
(eat-whitespace, read-env, read-word, read-block-comment,
read-line-comment, read-list, read-character, read-hex, read-octal,
reader:read-string, lookup, read-hash, read-word): Only define if
not %c-reader.
* module/mes/base-0.mes (defined?): Remove.
* src/mes.c[MES_C_READER]: Set ARENA_SIZE=10000000.
(scm_symbol_quasiquote scm_symbol_unquote,
scm_symbol_unquote_splicing, scm_symbol_syntax,
scm_symbol_quasisyntax, scm_symbol_unsyntax,
scm_symbol_unsyntax_splicing): New symbol.
(scm_symbol_c_reader): New symbol.
(MAKE_KEYWORD)[MES_C_READER]: New define.
(mes_symbols): Define %c_reader.
* src/reader.c (read_word_)[MES_C_READER]: Extend to full Scheme
reader.
(eat_whitespace)[MES_C_READER]: Likewise.
(read_block_comment, read_hash, read_word, read_character,
read_octal, read_hex, append_char, read_string)[MES_C_READER]:
Likewise.
* make.scm (bin.gcc,bin.mescc): Define MES_C_READER=1.
2017-11-29 20:42:50 +00:00
|
|
|
}
|
2018-08-12 13:53:06 +01:00
|
|
|
|
2018-04-05 21:41:53 +01:00
|
|
|
return cons (cell_symbol_unsyntax,
|
2018-04-29 16:48:38 +01:00
|
|
|
cons (reader_read_sexp_ (readchar (), a), cell_nil));
|
2018-08-12 13:53:06 +01:00
|
|
|
}
|
|
|
|
if (c == '\'')
|
|
|
|
return cons (cell_symbol_syntax,
|
|
|
|
cons (reader_read_sexp_ (readchar (), a), cell_nil));
|
|
|
|
if (c == '`')
|
|
|
|
return cons (cell_symbol_quasisyntax,
|
|
|
|
cons (reader_read_sexp_ (readchar (), a), cell_nil));
|
|
|
|
if (c == ':')
|
2018-04-29 16:48:38 +01:00
|
|
|
return MAKE_KEYWORD (CAR (reader_read_sexp_ (readchar (), a)));
|
2018-08-12 13:53:06 +01:00
|
|
|
if (c == 'b')
|
|
|
|
return reader_read_binary ();
|
|
|
|
if (c == 'o')
|
|
|
|
return reader_read_octal ();
|
|
|
|
if (c == 'x')
|
|
|
|
return reader_read_hex ();
|
|
|
|
if (c == '\\')
|
|
|
|
return reader_read_character ();
|
|
|
|
if (c == '(')
|
|
|
|
return list_to_vector (reader_read_list (readchar (), a));
|
|
|
|
if (c == ';')
|
|
|
|
{
|
2018-04-29 16:48:38 +01:00
|
|
|
reader_read_sexp_ (readchar (), a);
|
|
|
|
return reader_read_sexp_ (readchar (), a);
|
mes: resurrect full reader in C core.
* module/mes/read-0.mes (defined?): New function.
(eat-whitespace, read-env, read-word, read-block-comment,
read-line-comment, read-list, read-character, read-hex, read-octal,
reader:read-string, lookup, read-hash, read-word): Only define if
not %c-reader.
* module/mes/base-0.mes (defined?): Remove.
* src/mes.c[MES_C_READER]: Set ARENA_SIZE=10000000.
(scm_symbol_quasiquote scm_symbol_unquote,
scm_symbol_unquote_splicing, scm_symbol_syntax,
scm_symbol_quasisyntax, scm_symbol_unsyntax,
scm_symbol_unsyntax_splicing): New symbol.
(scm_symbol_c_reader): New symbol.
(MAKE_KEYWORD)[MES_C_READER]: New define.
(mes_symbols): Define %c_reader.
* src/reader.c (read_word_)[MES_C_READER]: Extend to full Scheme
reader.
(eat_whitespace)[MES_C_READER]: Likewise.
(read_block_comment, read_hash, read_word, read_character,
read_octal, read_hex, append_char, read_string)[MES_C_READER]:
Likewise.
* make.scm (bin.gcc,bin.mescc): Define MES_C_READER=1.
2017-11-29 20:42:50 +00:00
|
|
|
}
|
2018-04-29 16:48:38 +01:00
|
|
|
return reader_read_sexp_ (readchar (), a);
|
mes: resurrect full reader in C core.
* module/mes/read-0.mes (defined?): New function.
(eat-whitespace, read-env, read-word, read-block-comment,
read-line-comment, read-list, read-character, read-hex, read-octal,
reader:read-string, lookup, read-hash, read-word): Only define if
not %c-reader.
* module/mes/base-0.mes (defined?): Remove.
* src/mes.c[MES_C_READER]: Set ARENA_SIZE=10000000.
(scm_symbol_quasiquote scm_symbol_unquote,
scm_symbol_unquote_splicing, scm_symbol_syntax,
scm_symbol_quasisyntax, scm_symbol_unsyntax,
scm_symbol_unsyntax_splicing): New symbol.
(scm_symbol_c_reader): New symbol.
(MAKE_KEYWORD)[MES_C_READER]: New define.
(mes_symbols): Define %c_reader.
* src/reader.c (read_word_)[MES_C_READER]: Extend to full Scheme
reader.
(eat_whitespace)[MES_C_READER]: Likewise.
(read_block_comment, read_hash, read_word, read_character,
read_octal, read_hex, append_char, read_string)[MES_C_READER]:
Likewise.
* make.scm (bin.gcc,bin.mescc): Define MES_C_READER=1.
2017-11-29 20:42:50 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
SCM
|
2018-04-05 21:41:53 +01:00
|
|
|
reader_read_sexp (SCM c, SCM s, SCM a)
|
mes: resurrect full reader in C core.
* module/mes/read-0.mes (defined?): New function.
(eat-whitespace, read-env, read-word, read-block-comment,
read-line-comment, read-list, read-character, read-hex, read-octal,
reader:read-string, lookup, read-hash, read-word): Only define if
not %c-reader.
* module/mes/base-0.mes (defined?): Remove.
* src/mes.c[MES_C_READER]: Set ARENA_SIZE=10000000.
(scm_symbol_quasiquote scm_symbol_unquote,
scm_symbol_unquote_splicing, scm_symbol_syntax,
scm_symbol_quasisyntax, scm_symbol_unsyntax,
scm_symbol_unsyntax_splicing): New symbol.
(scm_symbol_c_reader): New symbol.
(MAKE_KEYWORD)[MES_C_READER]: New define.
(mes_symbols): Define %c_reader.
* src/reader.c (read_word_)[MES_C_READER]: Extend to full Scheme
reader.
(eat_whitespace)[MES_C_READER]: Likewise.
(read_block_comment, read_hash, read_word, read_character,
read_octal, read_hex, append_char, read_string)[MES_C_READER]:
Likewise.
* make.scm (bin.gcc,bin.mescc): Define MES_C_READER=1.
2017-11-29 20:42:50 +00:00
|
|
|
{
|
2018-04-09 07:41:30 +01:00
|
|
|
return reader_read_sexp_ (VALUE (c), a);
|
mes: resurrect full reader in C core.
* module/mes/read-0.mes (defined?): New function.
(eat-whitespace, read-env, read-word, read-block-comment,
read-line-comment, read-list, read-character, read-hex, read-octal,
reader:read-string, lookup, read-hash, read-word): Only define if
not %c-reader.
* module/mes/base-0.mes (defined?): Remove.
* src/mes.c[MES_C_READER]: Set ARENA_SIZE=10000000.
(scm_symbol_quasiquote scm_symbol_unquote,
scm_symbol_unquote_splicing, scm_symbol_syntax,
scm_symbol_quasisyntax, scm_symbol_unsyntax,
scm_symbol_unsyntax_splicing): New symbol.
(scm_symbol_c_reader): New symbol.
(MAKE_KEYWORD)[MES_C_READER]: New define.
(mes_symbols): Define %c_reader.
* src/reader.c (read_word_)[MES_C_READER]: Extend to full Scheme
reader.
(eat_whitespace)[MES_C_READER]: Likewise.
(read_block_comment, read_hash, read_word, read_character,
read_octal, read_hex, append_char, read_string)[MES_C_READER]:
Likewise.
* make.scm (bin.gcc,bin.mescc): Define MES_C_READER=1.
2017-11-29 20:42:50 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
SCM
|
2018-01-06 06:58:23 +00:00
|
|
|
reader_read_character ()
|
mes: resurrect full reader in C core.
* module/mes/read-0.mes (defined?): New function.
(eat-whitespace, read-env, read-word, read-block-comment,
read-line-comment, read-list, read-character, read-hex, read-octal,
reader:read-string, lookup, read-hash, read-word): Only define if
not %c-reader.
* module/mes/base-0.mes (defined?): Remove.
* src/mes.c[MES_C_READER]: Set ARENA_SIZE=10000000.
(scm_symbol_quasiquote scm_symbol_unquote,
scm_symbol_unquote_splicing, scm_symbol_syntax,
scm_symbol_quasisyntax, scm_symbol_unsyntax,
scm_symbol_unsyntax_splicing): New symbol.
(scm_symbol_c_reader): New symbol.
(MAKE_KEYWORD)[MES_C_READER]: New define.
(mes_symbols): Define %c_reader.
* src/reader.c (read_word_)[MES_C_READER]: Extend to full Scheme
reader.
(eat_whitespace)[MES_C_READER]: Likewise.
(read_block_comment, read_hash, read_word, read_character,
read_octal, read_hex, append_char, read_string)[MES_C_READER]:
Likewise.
* make.scm (bin.gcc,bin.mescc): Define MES_C_READER=1.
2017-11-29 20:42:50 +00:00
|
|
|
{
|
2018-04-29 16:48:38 +01:00
|
|
|
int c = readchar ();
|
2018-08-12 13:53:06 +01:00
|
|
|
int p = peekchar ();
|
|
|
|
int i = 0;
|
mes: resurrect full reader in C core.
* module/mes/read-0.mes (defined?): New function.
(eat-whitespace, read-env, read-word, read-block-comment,
read-line-comment, read-list, read-character, read-hex, read-octal,
reader:read-string, lookup, read-hash, read-word): Only define if
not %c-reader.
* module/mes/base-0.mes (defined?): Remove.
* src/mes.c[MES_C_READER]: Set ARENA_SIZE=10000000.
(scm_symbol_quasiquote scm_symbol_unquote,
scm_symbol_unquote_splicing, scm_symbol_syntax,
scm_symbol_quasisyntax, scm_symbol_unsyntax,
scm_symbol_unsyntax_splicing): New symbol.
(scm_symbol_c_reader): New symbol.
(MAKE_KEYWORD)[MES_C_READER]: New define.
(mes_symbols): Define %c_reader.
* src/reader.c (read_word_)[MES_C_READER]: Extend to full Scheme
reader.
(eat_whitespace)[MES_C_READER]: Likewise.
(read_block_comment, read_hash, read_word, read_character,
read_octal, read_hex, append_char, read_string)[MES_C_READER]:
Likewise.
* make.scm (bin.gcc,bin.mescc): Define MES_C_READER=1.
2017-11-29 20:42:50 +00:00
|
|
|
if (c >= '0' && c <= '7'
|
2018-08-12 13:53:06 +01:00
|
|
|
&& p >= '0' && p <= '7')
|
mes: resurrect full reader in C core.
* module/mes/read-0.mes (defined?): New function.
(eat-whitespace, read-env, read-word, read-block-comment,
read-line-comment, read-list, read-character, read-hex, read-octal,
reader:read-string, lookup, read-hash, read-word): Only define if
not %c-reader.
* module/mes/base-0.mes (defined?): Remove.
* src/mes.c[MES_C_READER]: Set ARENA_SIZE=10000000.
(scm_symbol_quasiquote scm_symbol_unquote,
scm_symbol_unquote_splicing, scm_symbol_syntax,
scm_symbol_quasisyntax, scm_symbol_unsyntax,
scm_symbol_unsyntax_splicing): New symbol.
(scm_symbol_c_reader): New symbol.
(MAKE_KEYWORD)[MES_C_READER]: New define.
(mes_symbols): Define %c_reader.
* src/reader.c (read_word_)[MES_C_READER]: Extend to full Scheme
reader.
(eat_whitespace)[MES_C_READER]: Likewise.
(read_block_comment, read_hash, read_word, read_character,
read_octal, read_hex, append_char, read_string)[MES_C_READER]:
Likewise.
* make.scm (bin.gcc,bin.mescc): Define MES_C_READER=1.
2017-11-29 20:42:50 +00:00
|
|
|
{
|
|
|
|
c = c - '0';
|
2018-08-12 13:53:06 +01:00
|
|
|
while (p >= '0' && p <= '7')
|
mes: resurrect full reader in C core.
* module/mes/read-0.mes (defined?): New function.
(eat-whitespace, read-env, read-word, read-block-comment,
read-line-comment, read-list, read-character, read-hex, read-octal,
reader:read-string, lookup, read-hash, read-word): Only define if
not %c-reader.
* module/mes/base-0.mes (defined?): Remove.
* src/mes.c[MES_C_READER]: Set ARENA_SIZE=10000000.
(scm_symbol_quasiquote scm_symbol_unquote,
scm_symbol_unquote_splicing, scm_symbol_syntax,
scm_symbol_quasisyntax, scm_symbol_unsyntax,
scm_symbol_unsyntax_splicing): New symbol.
(scm_symbol_c_reader): New symbol.
(MAKE_KEYWORD)[MES_C_READER]: New define.
(mes_symbols): Define %c_reader.
* src/reader.c (read_word_)[MES_C_READER]: Extend to full Scheme
reader.
(eat_whitespace)[MES_C_READER]: Likewise.
(read_block_comment, read_hash, read_word, read_character,
read_octal, read_hex, append_char, read_string)[MES_C_READER]:
Likewise.
* make.scm (bin.gcc,bin.mescc): Define MES_C_READER=1.
2017-11-29 20:42:50 +00:00
|
|
|
{
|
|
|
|
c <<= 3;
|
2018-04-29 16:48:38 +01:00
|
|
|
c += readchar () - '0';
|
2018-08-12 13:53:06 +01:00
|
|
|
p = peekchar ();
|
mes: resurrect full reader in C core.
* module/mes/read-0.mes (defined?): New function.
(eat-whitespace, read-env, read-word, read-block-comment,
read-line-comment, read-list, read-character, read-hex, read-octal,
reader:read-string, lookup, read-hash, read-word): Only define if
not %c-reader.
* module/mes/base-0.mes (defined?): Remove.
* src/mes.c[MES_C_READER]: Set ARENA_SIZE=10000000.
(scm_symbol_quasiquote scm_symbol_unquote,
scm_symbol_unquote_splicing, scm_symbol_syntax,
scm_symbol_quasisyntax, scm_symbol_unsyntax,
scm_symbol_unsyntax_splicing): New symbol.
(scm_symbol_c_reader): New symbol.
(MAKE_KEYWORD)[MES_C_READER]: New define.
(mes_symbols): Define %c_reader.
* src/reader.c (read_word_)[MES_C_READER]: Extend to full Scheme
reader.
(eat_whitespace)[MES_C_READER]: Likewise.
(read_block_comment, read_hash, read_word, read_character,
read_octal, read_hex, append_char, read_string)[MES_C_READER]:
Likewise.
* make.scm (bin.gcc,bin.mescc): Define MES_C_READER=1.
2017-11-29 20:42:50 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
else if (((c >= 'a' && c <= 'z')
|
|
|
|
|| c == '*')
|
2018-08-12 13:53:06 +01:00
|
|
|
&& ((p >= 'a' && p <= 'z')
|
|
|
|
|| p == '*'))
|
mes: resurrect full reader in C core.
* module/mes/read-0.mes (defined?): New function.
(eat-whitespace, read-env, read-word, read-block-comment,
read-line-comment, read-list, read-character, read-hex, read-octal,
reader:read-string, lookup, read-hash, read-word): Only define if
not %c-reader.
* module/mes/base-0.mes (defined?): Remove.
* src/mes.c[MES_C_READER]: Set ARENA_SIZE=10000000.
(scm_symbol_quasiquote scm_symbol_unquote,
scm_symbol_unquote_splicing, scm_symbol_syntax,
scm_symbol_quasisyntax, scm_symbol_unsyntax,
scm_symbol_unsyntax_splicing): New symbol.
(scm_symbol_c_reader): New symbol.
(MAKE_KEYWORD)[MES_C_READER]: New define.
(mes_symbols): Define %c_reader.
* src/reader.c (read_word_)[MES_C_READER]: Extend to full Scheme
reader.
(eat_whitespace)[MES_C_READER]: Likewise.
(read_block_comment, read_hash, read_word, read_character,
read_octal, read_hex, append_char, read_string)[MES_C_READER]:
Likewise.
* make.scm (bin.gcc,bin.mescc): Define MES_C_READER=1.
2017-11-29 20:42:50 +00:00
|
|
|
{
|
|
|
|
char buf[10];
|
2018-08-12 13:53:06 +01:00
|
|
|
buf[i] = c;
|
|
|
|
i = i + 1;
|
|
|
|
while ((p >= 'a' && p <= 'z')
|
|
|
|
|| p == '*')
|
mes: resurrect full reader in C core.
* module/mes/read-0.mes (defined?): New function.
(eat-whitespace, read-env, read-word, read-block-comment,
read-line-comment, read-list, read-character, read-hex, read-octal,
reader:read-string, lookup, read-hash, read-word): Only define if
not %c-reader.
* module/mes/base-0.mes (defined?): Remove.
* src/mes.c[MES_C_READER]: Set ARENA_SIZE=10000000.
(scm_symbol_quasiquote scm_symbol_unquote,
scm_symbol_unquote_splicing, scm_symbol_syntax,
scm_symbol_quasisyntax, scm_symbol_unsyntax,
scm_symbol_unsyntax_splicing): New symbol.
(scm_symbol_c_reader): New symbol.
(MAKE_KEYWORD)[MES_C_READER]: New define.
(mes_symbols): Define %c_reader.
* src/reader.c (read_word_)[MES_C_READER]: Extend to full Scheme
reader.
(eat_whitespace)[MES_C_READER]: Likewise.
(read_block_comment, read_hash, read_word, read_character,
read_octal, read_hex, append_char, read_string)[MES_C_READER]:
Likewise.
* make.scm (bin.gcc,bin.mescc): Define MES_C_READER=1.
2017-11-29 20:42:50 +00:00
|
|
|
{
|
2018-08-12 13:53:06 +01:00
|
|
|
buf[i] = readchar ();
|
|
|
|
i = i + 1;
|
|
|
|
p = peekchar ();
|
mes: resurrect full reader in C core.
* module/mes/read-0.mes (defined?): New function.
(eat-whitespace, read-env, read-word, read-block-comment,
read-line-comment, read-list, read-character, read-hex, read-octal,
reader:read-string, lookup, read-hash, read-word): Only define if
not %c-reader.
* module/mes/base-0.mes (defined?): Remove.
* src/mes.c[MES_C_READER]: Set ARENA_SIZE=10000000.
(scm_symbol_quasiquote scm_symbol_unquote,
scm_symbol_unquote_splicing, scm_symbol_syntax,
scm_symbol_quasisyntax, scm_symbol_unsyntax,
scm_symbol_unsyntax_splicing): New symbol.
(scm_symbol_c_reader): New symbol.
(MAKE_KEYWORD)[MES_C_READER]: New define.
(mes_symbols): Define %c_reader.
* src/reader.c (read_word_)[MES_C_READER]: Extend to full Scheme
reader.
(eat_whitespace)[MES_C_READER]: Likewise.
(read_block_comment, read_hash, read_word, read_character,
read_octal, read_hex, append_char, read_string)[MES_C_READER]:
Likewise.
* make.scm (bin.gcc,bin.mescc): Define MES_C_READER=1.
2017-11-29 20:42:50 +00:00
|
|
|
}
|
2018-08-12 13:53:06 +01:00
|
|
|
buf[i] = 0;
|
mes: resurrect full reader in C core.
* module/mes/read-0.mes (defined?): New function.
(eat-whitespace, read-env, read-word, read-block-comment,
read-line-comment, read-list, read-character, read-hex, read-octal,
reader:read-string, lookup, read-hash, read-word): Only define if
not %c-reader.
* module/mes/base-0.mes (defined?): Remove.
* src/mes.c[MES_C_READER]: Set ARENA_SIZE=10000000.
(scm_symbol_quasiquote scm_symbol_unquote,
scm_symbol_unquote_splicing, scm_symbol_syntax,
scm_symbol_quasisyntax, scm_symbol_unsyntax,
scm_symbol_unsyntax_splicing): New symbol.
(scm_symbol_c_reader): New symbol.
(MAKE_KEYWORD)[MES_C_READER]: New define.
(mes_symbols): Define %c_reader.
* src/reader.c (read_word_)[MES_C_READER]: Extend to full Scheme
reader.
(eat_whitespace)[MES_C_READER]: Likewise.
(read_block_comment, read_hash, read_word, read_character,
read_octal, read_hex, append_char, read_string)[MES_C_READER]:
Likewise.
* make.scm (bin.gcc,bin.mescc): Define MES_C_READER=1.
2017-11-29 20:42:50 +00:00
|
|
|
if (!strcmp (buf, "*eof*")) c = EOF;
|
|
|
|
else if (!strcmp (buf, "nul")) c = '\0';
|
|
|
|
else if (!strcmp (buf, "alarm")) c = '\a';
|
|
|
|
else if (!strcmp (buf, "backspace")) c = '\b';
|
|
|
|
else if (!strcmp (buf, "tab")) c = '\t';
|
2017-12-09 21:36:53 +00:00
|
|
|
else if (!strcmp (buf, "linefeed")) c = '\n';
|
mes: resurrect full reader in C core.
* module/mes/read-0.mes (defined?): New function.
(eat-whitespace, read-env, read-word, read-block-comment,
read-line-comment, read-list, read-character, read-hex, read-octal,
reader:read-string, lookup, read-hash, read-word): Only define if
not %c-reader.
* module/mes/base-0.mes (defined?): Remove.
* src/mes.c[MES_C_READER]: Set ARENA_SIZE=10000000.
(scm_symbol_quasiquote scm_symbol_unquote,
scm_symbol_unquote_splicing, scm_symbol_syntax,
scm_symbol_quasisyntax, scm_symbol_unsyntax,
scm_symbol_unsyntax_splicing): New symbol.
(scm_symbol_c_reader): New symbol.
(MAKE_KEYWORD)[MES_C_READER]: New define.
(mes_symbols): Define %c_reader.
* src/reader.c (read_word_)[MES_C_READER]: Extend to full Scheme
reader.
(eat_whitespace)[MES_C_READER]: Likewise.
(read_block_comment, read_hash, read_word, read_character,
read_octal, read_hex, append_char, read_string)[MES_C_READER]:
Likewise.
* make.scm (bin.gcc,bin.mescc): Define MES_C_READER=1.
2017-11-29 20:42:50 +00:00
|
|
|
else if (!strcmp (buf, "newline")) c = '\n';
|
|
|
|
else if (!strcmp (buf, "vtab")) c = '\v';
|
|
|
|
else if (!strcmp (buf, "page")) c = '\f';
|
2018-04-13 07:18:19 +01:00
|
|
|
#if 1 //__MESC__
|
mes: resurrect full reader in C core.
* module/mes/read-0.mes (defined?): New function.
(eat-whitespace, read-env, read-word, read-block-comment,
read-line-comment, read-list, read-character, read-hex, read-octal,
reader:read-string, lookup, read-hash, read-word): Only define if
not %c-reader.
* module/mes/base-0.mes (defined?): Remove.
* src/mes.c[MES_C_READER]: Set ARENA_SIZE=10000000.
(scm_symbol_quasiquote scm_symbol_unquote,
scm_symbol_unquote_splicing, scm_symbol_syntax,
scm_symbol_quasisyntax, scm_symbol_unsyntax,
scm_symbol_unsyntax_splicing): New symbol.
(scm_symbol_c_reader): New symbol.
(MAKE_KEYWORD)[MES_C_READER]: New define.
(mes_symbols): Define %c_reader.
* src/reader.c (read_word_)[MES_C_READER]: Extend to full Scheme
reader.
(eat_whitespace)[MES_C_READER]: Likewise.
(read_block_comment, read_hash, read_word, read_character,
read_octal, read_hex, append_char, read_string)[MES_C_READER]:
Likewise.
* make.scm (bin.gcc,bin.mescc): Define MES_C_READER=1.
2017-11-29 20:42:50 +00:00
|
|
|
//Nyacc bug
|
|
|
|
else if (!strcmp (buf, "return")) c = 13;
|
2017-12-09 21:36:53 +00:00
|
|
|
else if (!strcmp (buf, "esc")) c = 27;
|
mes: resurrect full reader in C core.
* module/mes/read-0.mes (defined?): New function.
(eat-whitespace, read-env, read-word, read-block-comment,
read-line-comment, read-list, read-character, read-hex, read-octal,
reader:read-string, lookup, read-hash, read-word): Only define if
not %c-reader.
* module/mes/base-0.mes (defined?): Remove.
* src/mes.c[MES_C_READER]: Set ARENA_SIZE=10000000.
(scm_symbol_quasiquote scm_symbol_unquote,
scm_symbol_unquote_splicing, scm_symbol_syntax,
scm_symbol_quasisyntax, scm_symbol_unsyntax,
scm_symbol_unsyntax_splicing): New symbol.
(scm_symbol_c_reader): New symbol.
(MAKE_KEYWORD)[MES_C_READER]: New define.
(mes_symbols): Define %c_reader.
* src/reader.c (read_word_)[MES_C_READER]: Extend to full Scheme
reader.
(eat_whitespace)[MES_C_READER]: Likewise.
(read_block_comment, read_hash, read_word, read_character,
read_octal, read_hex, append_char, read_string)[MES_C_READER]:
Likewise.
* make.scm (bin.gcc,bin.mescc): Define MES_C_READER=1.
2017-11-29 20:42:50 +00:00
|
|
|
#else
|
|
|
|
else if (!strcmp (buf, "return")) c = '\r';
|
2017-12-09 21:36:53 +00:00
|
|
|
//Nyacc crash else if (!strcmp (buf, "esc")) c = '\e';
|
mes: resurrect full reader in C core.
* module/mes/read-0.mes (defined?): New function.
(eat-whitespace, read-env, read-word, read-block-comment,
read-line-comment, read-list, read-character, read-hex, read-octal,
reader:read-string, lookup, read-hash, read-word): Only define if
not %c-reader.
* module/mes/base-0.mes (defined?): Remove.
* src/mes.c[MES_C_READER]: Set ARENA_SIZE=10000000.
(scm_symbol_quasiquote scm_symbol_unquote,
scm_symbol_unquote_splicing, scm_symbol_syntax,
scm_symbol_quasisyntax, scm_symbol_unsyntax,
scm_symbol_unsyntax_splicing): New symbol.
(scm_symbol_c_reader): New symbol.
(MAKE_KEYWORD)[MES_C_READER]: New define.
(mes_symbols): Define %c_reader.
* src/reader.c (read_word_)[MES_C_READER]: Extend to full Scheme
reader.
(eat_whitespace)[MES_C_READER]: Likewise.
(read_block_comment, read_hash, read_word, read_character,
read_octal, read_hex, append_char, read_string)[MES_C_READER]:
Likewise.
* make.scm (bin.gcc,bin.mescc): Define MES_C_READER=1.
2017-11-29 20:42:50 +00:00
|
|
|
#endif
|
|
|
|
else if (!strcmp (buf, "space")) c = ' ';
|
2017-12-09 21:36:53 +00:00
|
|
|
|
|
|
|
#if 1 // Nyacc uses old abbrevs
|
|
|
|
else if (!strcmp (buf, "bel")) c = '\a';
|
|
|
|
else if (!strcmp (buf, "bs")) c = '\b';
|
|
|
|
else if (!strcmp (buf, "ht")) c = '\t';
|
|
|
|
else if (!strcmp (buf, "vt")) c = '\v';
|
|
|
|
|
2018-04-13 07:18:19 +01:00
|
|
|
#if 1 //__MESC__
|
2017-12-09 21:36:53 +00:00
|
|
|
//Nyacc bug
|
|
|
|
else if (!strcmp (buf, "cr")) c = 13;
|
|
|
|
#else
|
|
|
|
else if (!strcmp (buf, "cr")) c = '\r';
|
|
|
|
#endif
|
|
|
|
#endif // Nyacc uses old abbrevs
|
|
|
|
|
mes: resurrect full reader in C core.
* module/mes/read-0.mes (defined?): New function.
(eat-whitespace, read-env, read-word, read-block-comment,
read-line-comment, read-list, read-character, read-hex, read-octal,
reader:read-string, lookup, read-hash, read-word): Only define if
not %c-reader.
* module/mes/base-0.mes (defined?): Remove.
* src/mes.c[MES_C_READER]: Set ARENA_SIZE=10000000.
(scm_symbol_quasiquote scm_symbol_unquote,
scm_symbol_unquote_splicing, scm_symbol_syntax,
scm_symbol_quasisyntax, scm_symbol_unsyntax,
scm_symbol_unsyntax_splicing): New symbol.
(scm_symbol_c_reader): New symbol.
(MAKE_KEYWORD)[MES_C_READER]: New define.
(mes_symbols): Define %c_reader.
* src/reader.c (read_word_)[MES_C_READER]: Extend to full Scheme
reader.
(eat_whitespace)[MES_C_READER]: Likewise.
(read_block_comment, read_hash, read_word, read_character,
read_octal, read_hex, append_char, read_string)[MES_C_READER]:
Likewise.
* make.scm (bin.gcc,bin.mescc): Define MES_C_READER=1.
2017-11-29 20:42:50 +00:00
|
|
|
else
|
|
|
|
{
|
|
|
|
eputs ("char not supported: ");
|
|
|
|
eputs (buf);
|
|
|
|
eputs ("\n");
|
2018-08-12 13:53:06 +01:00
|
|
|
error (cell_symbol_system_error,
|
|
|
|
MAKE_STRING (cstring_to_list ("char not supported")));
|
mes: resurrect full reader in C core.
* module/mes/read-0.mes (defined?): New function.
(eat-whitespace, read-env, read-word, read-block-comment,
read-line-comment, read-list, read-character, read-hex, read-octal,
reader:read-string, lookup, read-hash, read-word): Only define if
not %c-reader.
* module/mes/base-0.mes (defined?): Remove.
* src/mes.c[MES_C_READER]: Set ARENA_SIZE=10000000.
(scm_symbol_quasiquote scm_symbol_unquote,
scm_symbol_unquote_splicing, scm_symbol_syntax,
scm_symbol_quasisyntax, scm_symbol_unsyntax,
scm_symbol_unsyntax_splicing): New symbol.
(scm_symbol_c_reader): New symbol.
(MAKE_KEYWORD)[MES_C_READER]: New define.
(mes_symbols): Define %c_reader.
* src/reader.c (read_word_)[MES_C_READER]: Extend to full Scheme
reader.
(eat_whitespace)[MES_C_READER]: Likewise.
(read_block_comment, read_hash, read_word, read_character,
read_octal, read_hex, append_char, read_string)[MES_C_READER]:
Likewise.
* make.scm (bin.gcc,bin.mescc): Define MES_C_READER=1.
2017-11-29 20:42:50 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
return MAKE_CHAR (c);
|
|
|
|
}
|
|
|
|
|
2018-05-16 21:32:59 +01:00
|
|
|
SCM
|
|
|
|
reader_read_binary ()
|
|
|
|
{
|
2018-10-06 23:58:31 +01:00
|
|
|
long n = 0;
|
2018-05-16 21:32:59 +01:00
|
|
|
int c = peekchar ();
|
2018-10-06 23:58:31 +01:00
|
|
|
int negative_p = 0;
|
2018-08-12 13:53:06 +01:00
|
|
|
if (c == '-')
|
|
|
|
{
|
2018-10-06 23:58:31 +01:00
|
|
|
negative_p = 1;
|
2018-08-12 13:53:06 +01:00
|
|
|
readchar ();
|
|
|
|
c = peekchar ();
|
|
|
|
}
|
2018-05-16 21:32:59 +01:00
|
|
|
while (c == '0' || c == '1')
|
|
|
|
{
|
2018-08-12 13:53:06 +01:00
|
|
|
n = n << 1;
|
|
|
|
n = n + c - '0';
|
2018-05-16 21:32:59 +01:00
|
|
|
readchar ();
|
|
|
|
c = peekchar ();
|
|
|
|
}
|
2018-10-06 23:58:31 +01:00
|
|
|
if (negative_p)
|
|
|
|
n = 0 - n;
|
|
|
|
return MAKE_NUMBER (n);
|
2018-05-16 21:32:59 +01:00
|
|
|
}
|
|
|
|
|
mes: resurrect full reader in C core.
* module/mes/read-0.mes (defined?): New function.
(eat-whitespace, read-env, read-word, read-block-comment,
read-line-comment, read-list, read-character, read-hex, read-octal,
reader:read-string, lookup, read-hash, read-word): Only define if
not %c-reader.
* module/mes/base-0.mes (defined?): Remove.
* src/mes.c[MES_C_READER]: Set ARENA_SIZE=10000000.
(scm_symbol_quasiquote scm_symbol_unquote,
scm_symbol_unquote_splicing, scm_symbol_syntax,
scm_symbol_quasisyntax, scm_symbol_unsyntax,
scm_symbol_unsyntax_splicing): New symbol.
(scm_symbol_c_reader): New symbol.
(MAKE_KEYWORD)[MES_C_READER]: New define.
(mes_symbols): Define %c_reader.
* src/reader.c (read_word_)[MES_C_READER]: Extend to full Scheme
reader.
(eat_whitespace)[MES_C_READER]: Likewise.
(read_block_comment, read_hash, read_word, read_character,
read_octal, read_hex, append_char, read_string)[MES_C_READER]:
Likewise.
* make.scm (bin.gcc,bin.mescc): Define MES_C_READER=1.
2017-11-29 20:42:50 +00:00
|
|
|
SCM
|
2018-01-06 06:58:23 +00:00
|
|
|
reader_read_octal ()
|
mes: resurrect full reader in C core.
* module/mes/read-0.mes (defined?): New function.
(eat-whitespace, read-env, read-word, read-block-comment,
read-line-comment, read-list, read-character, read-hex, read-octal,
reader:read-string, lookup, read-hash, read-word): Only define if
not %c-reader.
* module/mes/base-0.mes (defined?): Remove.
* src/mes.c[MES_C_READER]: Set ARENA_SIZE=10000000.
(scm_symbol_quasiquote scm_symbol_unquote,
scm_symbol_unquote_splicing, scm_symbol_syntax,
scm_symbol_quasisyntax, scm_symbol_unsyntax,
scm_symbol_unsyntax_splicing): New symbol.
(scm_symbol_c_reader): New symbol.
(MAKE_KEYWORD)[MES_C_READER]: New define.
(mes_symbols): Define %c_reader.
* src/reader.c (read_word_)[MES_C_READER]: Extend to full Scheme
reader.
(eat_whitespace)[MES_C_READER]: Likewise.
(read_block_comment, read_hash, read_word, read_character,
read_octal, read_hex, append_char, read_string)[MES_C_READER]:
Likewise.
* make.scm (bin.gcc,bin.mescc): Define MES_C_READER=1.
2017-11-29 20:42:50 +00:00
|
|
|
{
|
2018-10-06 23:58:31 +01:00
|
|
|
long n = 0;
|
mes: resurrect full reader in C core.
* module/mes/read-0.mes (defined?): New function.
(eat-whitespace, read-env, read-word, read-block-comment,
read-line-comment, read-list, read-character, read-hex, read-octal,
reader:read-string, lookup, read-hash, read-word): Only define if
not %c-reader.
* module/mes/base-0.mes (defined?): Remove.
* src/mes.c[MES_C_READER]: Set ARENA_SIZE=10000000.
(scm_symbol_quasiquote scm_symbol_unquote,
scm_symbol_unquote_splicing, scm_symbol_syntax,
scm_symbol_quasisyntax, scm_symbol_unsyntax,
scm_symbol_unsyntax_splicing): New symbol.
(scm_symbol_c_reader): New symbol.
(MAKE_KEYWORD)[MES_C_READER]: New define.
(mes_symbols): Define %c_reader.
* src/reader.c (read_word_)[MES_C_READER]: Extend to full Scheme
reader.
(eat_whitespace)[MES_C_READER]: Likewise.
(read_block_comment, read_hash, read_word, read_character,
read_octal, read_hex, append_char, read_string)[MES_C_READER]:
Likewise.
* make.scm (bin.gcc,bin.mescc): Define MES_C_READER=1.
2017-11-29 20:42:50 +00:00
|
|
|
int c = peekchar ();
|
2018-10-06 23:58:31 +01:00
|
|
|
int negative_p = 0;
|
2018-08-12 13:53:06 +01:00
|
|
|
if (c == '-')
|
|
|
|
{
|
2018-10-06 23:58:31 +01:00
|
|
|
negative_p = 1;
|
2018-08-12 13:53:06 +01:00
|
|
|
readchar ();
|
|
|
|
c = peekchar ();
|
|
|
|
}
|
mes: resurrect full reader in C core.
* module/mes/read-0.mes (defined?): New function.
(eat-whitespace, read-env, read-word, read-block-comment,
read-line-comment, read-list, read-character, read-hex, read-octal,
reader:read-string, lookup, read-hash, read-word): Only define if
not %c-reader.
* module/mes/base-0.mes (defined?): Remove.
* src/mes.c[MES_C_READER]: Set ARENA_SIZE=10000000.
(scm_symbol_quasiquote scm_symbol_unquote,
scm_symbol_unquote_splicing, scm_symbol_syntax,
scm_symbol_quasisyntax, scm_symbol_unsyntax,
scm_symbol_unsyntax_splicing): New symbol.
(scm_symbol_c_reader): New symbol.
(MAKE_KEYWORD)[MES_C_READER]: New define.
(mes_symbols): Define %c_reader.
* src/reader.c (read_word_)[MES_C_READER]: Extend to full Scheme
reader.
(eat_whitespace)[MES_C_READER]: Likewise.
(read_block_comment, read_hash, read_word, read_character,
read_octal, read_hex, append_char, read_string)[MES_C_READER]:
Likewise.
* make.scm (bin.gcc,bin.mescc): Define MES_C_READER=1.
2017-11-29 20:42:50 +00:00
|
|
|
while (c >= '0' && c <= '7')
|
|
|
|
{
|
2018-08-12 13:53:06 +01:00
|
|
|
n = n << 3;
|
|
|
|
n = n + c - '0';
|
2018-04-29 16:48:38 +01:00
|
|
|
readchar ();
|
mes: resurrect full reader in C core.
* module/mes/read-0.mes (defined?): New function.
(eat-whitespace, read-env, read-word, read-block-comment,
read-line-comment, read-list, read-character, read-hex, read-octal,
reader:read-string, lookup, read-hash, read-word): Only define if
not %c-reader.
* module/mes/base-0.mes (defined?): Remove.
* src/mes.c[MES_C_READER]: Set ARENA_SIZE=10000000.
(scm_symbol_quasiquote scm_symbol_unquote,
scm_symbol_unquote_splicing, scm_symbol_syntax,
scm_symbol_quasisyntax, scm_symbol_unsyntax,
scm_symbol_unsyntax_splicing): New symbol.
(scm_symbol_c_reader): New symbol.
(MAKE_KEYWORD)[MES_C_READER]: New define.
(mes_symbols): Define %c_reader.
* src/reader.c (read_word_)[MES_C_READER]: Extend to full Scheme
reader.
(eat_whitespace)[MES_C_READER]: Likewise.
(read_block_comment, read_hash, read_word, read_character,
read_octal, read_hex, append_char, read_string)[MES_C_READER]:
Likewise.
* make.scm (bin.gcc,bin.mescc): Define MES_C_READER=1.
2017-11-29 20:42:50 +00:00
|
|
|
c = peekchar ();
|
|
|
|
}
|
2018-10-06 23:58:31 +01:00
|
|
|
if (negative_p)
|
|
|
|
n = 0 - n;
|
|
|
|
return MAKE_NUMBER (n);
|
mes: resurrect full reader in C core.
* module/mes/read-0.mes (defined?): New function.
(eat-whitespace, read-env, read-word, read-block-comment,
read-line-comment, read-list, read-character, read-hex, read-octal,
reader:read-string, lookup, read-hash, read-word): Only define if
not %c-reader.
* module/mes/base-0.mes (defined?): Remove.
* src/mes.c[MES_C_READER]: Set ARENA_SIZE=10000000.
(scm_symbol_quasiquote scm_symbol_unquote,
scm_symbol_unquote_splicing, scm_symbol_syntax,
scm_symbol_quasisyntax, scm_symbol_unsyntax,
scm_symbol_unsyntax_splicing): New symbol.
(scm_symbol_c_reader): New symbol.
(MAKE_KEYWORD)[MES_C_READER]: New define.
(mes_symbols): Define %c_reader.
* src/reader.c (read_word_)[MES_C_READER]: Extend to full Scheme
reader.
(eat_whitespace)[MES_C_READER]: Likewise.
(read_block_comment, read_hash, read_word, read_character,
read_octal, read_hex, append_char, read_string)[MES_C_READER]:
Likewise.
* make.scm (bin.gcc,bin.mescc): Define MES_C_READER=1.
2017-11-29 20:42:50 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
SCM
|
2018-01-06 06:58:23 +00:00
|
|
|
reader_read_hex ()
|
mes: resurrect full reader in C core.
* module/mes/read-0.mes (defined?): New function.
(eat-whitespace, read-env, read-word, read-block-comment,
read-line-comment, read-list, read-character, read-hex, read-octal,
reader:read-string, lookup, read-hash, read-word): Only define if
not %c-reader.
* module/mes/base-0.mes (defined?): Remove.
* src/mes.c[MES_C_READER]: Set ARENA_SIZE=10000000.
(scm_symbol_quasiquote scm_symbol_unquote,
scm_symbol_unquote_splicing, scm_symbol_syntax,
scm_symbol_quasisyntax, scm_symbol_unsyntax,
scm_symbol_unsyntax_splicing): New symbol.
(scm_symbol_c_reader): New symbol.
(MAKE_KEYWORD)[MES_C_READER]: New define.
(mes_symbols): Define %c_reader.
* src/reader.c (read_word_)[MES_C_READER]: Extend to full Scheme
reader.
(eat_whitespace)[MES_C_READER]: Likewise.
(read_block_comment, read_hash, read_word, read_character,
read_octal, read_hex, append_char, read_string)[MES_C_READER]:
Likewise.
* make.scm (bin.gcc,bin.mescc): Define MES_C_READER=1.
2017-11-29 20:42:50 +00:00
|
|
|
{
|
2018-10-06 23:58:31 +01:00
|
|
|
long n = 0;
|
mes: resurrect full reader in C core.
* module/mes/read-0.mes (defined?): New function.
(eat-whitespace, read-env, read-word, read-block-comment,
read-line-comment, read-list, read-character, read-hex, read-octal,
reader:read-string, lookup, read-hash, read-word): Only define if
not %c-reader.
* module/mes/base-0.mes (defined?): Remove.
* src/mes.c[MES_C_READER]: Set ARENA_SIZE=10000000.
(scm_symbol_quasiquote scm_symbol_unquote,
scm_symbol_unquote_splicing, scm_symbol_syntax,
scm_symbol_quasisyntax, scm_symbol_unsyntax,
scm_symbol_unsyntax_splicing): New symbol.
(scm_symbol_c_reader): New symbol.
(MAKE_KEYWORD)[MES_C_READER]: New define.
(mes_symbols): Define %c_reader.
* src/reader.c (read_word_)[MES_C_READER]: Extend to full Scheme
reader.
(eat_whitespace)[MES_C_READER]: Likewise.
(read_block_comment, read_hash, read_word, read_character,
read_octal, read_hex, append_char, read_string)[MES_C_READER]:
Likewise.
* make.scm (bin.gcc,bin.mescc): Define MES_C_READER=1.
2017-11-29 20:42:50 +00:00
|
|
|
int c = peekchar ();
|
2018-10-06 23:58:31 +01:00
|
|
|
int negative_p = 0;
|
2018-08-12 13:53:06 +01:00
|
|
|
if (c == '-')
|
|
|
|
{
|
2018-10-06 23:58:31 +01:00
|
|
|
negative_p = 1;
|
2018-08-12 13:53:06 +01:00
|
|
|
readchar ();
|
|
|
|
c = peekchar ();
|
|
|
|
}
|
mes: resurrect full reader in C core.
* module/mes/read-0.mes (defined?): New function.
(eat-whitespace, read-env, read-word, read-block-comment,
read-line-comment, read-list, read-character, read-hex, read-octal,
reader:read-string, lookup, read-hash, read-word): Only define if
not %c-reader.
* module/mes/base-0.mes (defined?): Remove.
* src/mes.c[MES_C_READER]: Set ARENA_SIZE=10000000.
(scm_symbol_quasiquote scm_symbol_unquote,
scm_symbol_unquote_splicing, scm_symbol_syntax,
scm_symbol_quasisyntax, scm_symbol_unsyntax,
scm_symbol_unsyntax_splicing): New symbol.
(scm_symbol_c_reader): New symbol.
(MAKE_KEYWORD)[MES_C_READER]: New define.
(mes_symbols): Define %c_reader.
* src/reader.c (read_word_)[MES_C_READER]: Extend to full Scheme
reader.
(eat_whitespace)[MES_C_READER]: Likewise.
(read_block_comment, read_hash, read_word, read_character,
read_octal, read_hex, append_char, read_string)[MES_C_READER]:
Likewise.
* make.scm (bin.gcc,bin.mescc): Define MES_C_READER=1.
2017-11-29 20:42:50 +00:00
|
|
|
while ((c >= '0' && c <= '9')
|
|
|
|
|| (c >= 'A' && c <= 'F')
|
|
|
|
|| (c >= 'a' && c <= 'f'))
|
|
|
|
{
|
2018-08-12 13:53:06 +01:00
|
|
|
n = n << 4;
|
|
|
|
if (c >= 'a')
|
|
|
|
n = n + c - 'a' + 10;
|
|
|
|
else if (c >= 'A')
|
|
|
|
n = n + c - 'A' + 10;
|
|
|
|
else
|
|
|
|
n = n + c - '0';
|
2018-04-29 16:48:38 +01:00
|
|
|
readchar ();
|
mes: resurrect full reader in C core.
* module/mes/read-0.mes (defined?): New function.
(eat-whitespace, read-env, read-word, read-block-comment,
read-line-comment, read-list, read-character, read-hex, read-octal,
reader:read-string, lookup, read-hash, read-word): Only define if
not %c-reader.
* module/mes/base-0.mes (defined?): Remove.
* src/mes.c[MES_C_READER]: Set ARENA_SIZE=10000000.
(scm_symbol_quasiquote scm_symbol_unquote,
scm_symbol_unquote_splicing, scm_symbol_syntax,
scm_symbol_quasisyntax, scm_symbol_unsyntax,
scm_symbol_unsyntax_splicing): New symbol.
(scm_symbol_c_reader): New symbol.
(MAKE_KEYWORD)[MES_C_READER]: New define.
(mes_symbols): Define %c_reader.
* src/reader.c (read_word_)[MES_C_READER]: Extend to full Scheme
reader.
(eat_whitespace)[MES_C_READER]: Likewise.
(read_block_comment, read_hash, read_word, read_character,
read_octal, read_hex, append_char, read_string)[MES_C_READER]:
Likewise.
* make.scm (bin.gcc,bin.mescc): Define MES_C_READER=1.
2017-11-29 20:42:50 +00:00
|
|
|
c = peekchar ();
|
|
|
|
}
|
2018-10-06 23:58:31 +01:00
|
|
|
if (negative_p)
|
|
|
|
n = 0 - n;
|
|
|
|
return MAKE_NUMBER (n);
|
mes: resurrect full reader in C core.
* module/mes/read-0.mes (defined?): New function.
(eat-whitespace, read-env, read-word, read-block-comment,
read-line-comment, read-list, read-character, read-hex, read-octal,
reader:read-string, lookup, read-hash, read-word): Only define if
not %c-reader.
* module/mes/base-0.mes (defined?): Remove.
* src/mes.c[MES_C_READER]: Set ARENA_SIZE=10000000.
(scm_symbol_quasiquote scm_symbol_unquote,
scm_symbol_unquote_splicing, scm_symbol_syntax,
scm_symbol_quasisyntax, scm_symbol_unsyntax,
scm_symbol_unsyntax_splicing): New symbol.
(scm_symbol_c_reader): New symbol.
(MAKE_KEYWORD)[MES_C_READER]: New define.
(mes_symbols): Define %c_reader.
* src/reader.c (read_word_)[MES_C_READER]: Extend to full Scheme
reader.
(eat_whitespace)[MES_C_READER]: Likewise.
(read_block_comment, read_hash, read_word, read_character,
read_octal, read_hex, append_char, read_string)[MES_C_READER]:
Likewise.
* make.scm (bin.gcc,bin.mescc): Define MES_C_READER=1.
2017-11-29 20:42:50 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
SCM
|
2018-01-06 06:58:23 +00:00
|
|
|
reader_read_string ()
|
mes: resurrect full reader in C core.
* module/mes/read-0.mes (defined?): New function.
(eat-whitespace, read-env, read-word, read-block-comment,
read-line-comment, read-list, read-character, read-hex, read-octal,
reader:read-string, lookup, read-hash, read-word): Only define if
not %c-reader.
* module/mes/base-0.mes (defined?): Remove.
* src/mes.c[MES_C_READER]: Set ARENA_SIZE=10000000.
(scm_symbol_quasiquote scm_symbol_unquote,
scm_symbol_unquote_splicing, scm_symbol_syntax,
scm_symbol_quasisyntax, scm_symbol_unsyntax,
scm_symbol_unsyntax_splicing): New symbol.
(scm_symbol_c_reader): New symbol.
(MAKE_KEYWORD)[MES_C_READER]: New define.
(mes_symbols): Define %c_reader.
* src/reader.c (read_word_)[MES_C_READER]: Extend to full Scheme
reader.
(eat_whitespace)[MES_C_READER]: Likewise.
(read_block_comment, read_hash, read_word, read_character,
read_octal, read_hex, append_char, read_string)[MES_C_READER]:
Likewise.
* make.scm (bin.gcc,bin.mescc): Define MES_C_READER=1.
2017-11-29 20:42:50 +00:00
|
|
|
{
|
2018-04-08 22:14:45 +01:00
|
|
|
SCM lst = cell_nil;
|
2018-08-12 13:53:06 +01:00
|
|
|
int c;
|
|
|
|
do
|
2018-04-08 22:14:45 +01:00
|
|
|
{
|
2018-08-12 13:53:06 +01:00
|
|
|
c = readchar ();
|
|
|
|
if (c == '"')
|
|
|
|
break;
|
2018-04-08 22:14:45 +01:00
|
|
|
if (c == '\\')
|
|
|
|
{
|
2018-08-12 13:53:06 +01:00
|
|
|
c = readchar ();
|
|
|
|
if (c == '\\' || c == '"')
|
|
|
|
lst = cons (MAKE_CHAR (c), lst);
|
|
|
|
else if (c == '0')
|
|
|
|
lst = cons (MAKE_CHAR ('\0'), lst);
|
|
|
|
else if (c == 'a')
|
|
|
|
lst = cons (MAKE_CHAR ('\a'), lst);
|
|
|
|
else if (c == 'b')
|
|
|
|
lst = cons (MAKE_CHAR ('\b'), lst);
|
|
|
|
else if (c == 't')
|
|
|
|
lst = cons (MAKE_CHAR ('\t'), lst);
|
|
|
|
else if (c == 'n')
|
|
|
|
lst = cons (MAKE_CHAR ('\n'), lst);
|
|
|
|
else if (c == 'v')
|
|
|
|
lst = cons (MAKE_CHAR ('\v'), lst);
|
|
|
|
else if (c == 'f')
|
|
|
|
lst = cons (MAKE_CHAR ('\f'), lst);
|
|
|
|
else if (c == 'r')
|
|
|
|
// Nyacc bug
|
|
|
|
// lst = cons (MAKE_CHAR ('\r'), lst);
|
|
|
|
lst = cons (MAKE_CHAR (13), lst);
|
|
|
|
else if (c == 'e')
|
|
|
|
// Nyacc bug
|
|
|
|
// lst = cons (MAKE_CHAR ('\e'), lst);
|
|
|
|
lst = cons (MAKE_CHAR (27), lst);
|
2018-04-08 22:14:45 +01:00
|
|
|
}
|
|
|
|
else
|
2018-08-12 13:53:06 +01:00
|
|
|
lst = cons (MAKE_CHAR (c), lst);
|
|
|
|
}
|
|
|
|
while (1);
|
|
|
|
return MAKE_STRING (reverse_x_ (lst, cell_nil));
|
mes: resurrect full reader in C core.
* module/mes/read-0.mes (defined?): New function.
(eat-whitespace, read-env, read-word, read-block-comment,
read-line-comment, read-list, read-character, read-hex, read-octal,
reader:read-string, lookup, read-hash, read-word): Only define if
not %c-reader.
* module/mes/base-0.mes (defined?): Remove.
* src/mes.c[MES_C_READER]: Set ARENA_SIZE=10000000.
(scm_symbol_quasiquote scm_symbol_unquote,
scm_symbol_unquote_splicing, scm_symbol_syntax,
scm_symbol_quasisyntax, scm_symbol_unsyntax,
scm_symbol_unsyntax_splicing): New symbol.
(scm_symbol_c_reader): New symbol.
(MAKE_KEYWORD)[MES_C_READER]: New define.
(mes_symbols): Define %c_reader.
* src/reader.c (read_word_)[MES_C_READER]: Extend to full Scheme
reader.
(eat_whitespace)[MES_C_READER]: Likewise.
(read_block_comment, read_hash, read_word, read_character,
read_octal, read_hex, append_char, read_string)[MES_C_READER]:
Likewise.
* make.scm (bin.gcc,bin.mescc): Define MES_C_READER=1.
2017-11-29 20:42:50 +00:00
|
|
|
}
|
|
|
|
|
2018-06-18 21:55:23 +01:00
|
|
|
int g_tiny = 0;
|
|
|
|
|
mini-mes: Merge with mes.c: lib.c, math.c, posix.c.
* mes.c: Include math.c after posix.c.
(assert_defined, check_formals, check_apply, load_env,
bload_env): Move from lib.c
* scaffold/mini-mes.c: Include mini-lib.h, lib.c., mini-math.h,
math.c, mini-posix.h, posix.c.
(greater_p, less_p, is_p, minus, plus, divide, modulo, multiply,
logior, ash): Remove.
(ungetchar, peekchar, peek_byte, read_byte, write_byte,
string_to_cstring, getenv_, open_input_file, current_input_port,
set_current_input_port, force_output): Remove.
(mes_builtins): include mini-lib.i, mini-lib.environment.i.
mini-math.i, mini-math.environment.i mini-posix.i,
mini-posix.environment.i.
* GNUmakefile (guile-mini-mes): Add dependencies.
2017-04-08 14:01:24 +01:00
|
|
|
int
|
|
|
|
dump ()
|
|
|
|
{
|
|
|
|
r1 = g_symbols;
|
|
|
|
gc_push_frame ();
|
|
|
|
gc ();
|
|
|
|
gc_peek_frame ();
|
|
|
|
char *p = (char*)g_cells;
|
2017-04-12 20:27:59 +01:00
|
|
|
putchar ('M');
|
|
|
|
putchar ('E');
|
|
|
|
putchar ('S');
|
|
|
|
putchar (g_stack >> 8);
|
|
|
|
putchar (g_stack % 256);
|
core: Always include reader.c, drop binary read-0-32.mo dependency.
* module/language/c99/compiler.mes (c99-input->full-ast): Remove
obsolete __NYACC__ and MES_FULL defines.
* src/mes.c [!MES_FULL]: Include reader-mes.h.
(mes_builtins) [!MES_FULL]: Include reader.mes.i, reader.me.environment.i.
[!MES_FULL]: Include reader.c.
(main) [!MES_FULL]: By default call load_env, only call bload_env
when --load is supplied. WAS: Always bload read-0-32.mo.
* src/reader.c (__end_of__mes_): Remove.
(dump): Remove option of dumping tiny test program.
* make/mescc-mes.make ($(OUT)/$(TARGET), mescc.mes-ccompile,
mescc.mes.c-compile-E): Depend on $(OUT)/mes, scripts/mes.
* src/src.make (mes.guile): Remove module/mes/read-32-0 dependency.
Do not build $(OUT)/mes.mes.
* module/module.make (module/mes/read-0.mo, module/mes/read-0-32.mo,
module/mes/tiny-0-32.mo): Remove targets.
(CLEAN): Do not add them. Neither install $(OUT)/mes.mes.
* .gitignore: Remove exceptions for them.
* make/install.make (install): Do not install them.
* HACKING: Update info about creating module/mes/read-32-0.mo.
* scaffold/mini-mes.c: Remove.
* scaffold/tiny-mes.c: Remove.
* scaffold/cons-mes.c: Remove.
* scaffold/scaffold.make (tiny-mes.libc, tiny-mes.guile, tiny-mes.mes,
mini-mes.libc, mini-mes.guile, mini-mes.mes): Reemove targets.
2017-05-28 15:03:45 +01:00
|
|
|
eputs ("dumping\n");
|
2018-06-18 21:55:23 +01:00
|
|
|
// See HACKING, simple crafted dump for tiny-mes.c
|
|
|
|
if (g_tiny || getenv ("MES_TINY"))
|
|
|
|
{
|
|
|
|
eputs ("dumping TINY\n");
|
|
|
|
|
|
|
|
TYPE (9) = 0x2d2d2d2d;
|
|
|
|
CAR (9) = 0x2d2d2d2d;
|
|
|
|
CDR (9) = 0x3e3e3e3e;
|
|
|
|
|
|
|
|
TYPE (10) = TPAIR;
|
|
|
|
CAR (10) = 11;
|
|
|
|
CDR (10) = 12;
|
|
|
|
|
|
|
|
TYPE (11) = TCHAR;
|
|
|
|
CAR (11) = 0x58585858;
|
|
|
|
CDR (11) = 65;
|
|
|
|
|
|
|
|
TYPE (12) = TPAIR;
|
|
|
|
CAR (12) = 13;
|
|
|
|
CDR (12) = 1;
|
|
|
|
|
|
|
|
TYPE (13) = TCHAR;
|
|
|
|
CAR (11) = 0x58585858;
|
|
|
|
CDR (13) = 66;
|
|
|
|
|
|
|
|
TYPE (14) = 0x3c3c3c3c;
|
|
|
|
CAR (14) = 0x2d2d2d2d;
|
|
|
|
CDR (14) = 0x2d2d2d2d;
|
|
|
|
|
|
|
|
g_free = 15;
|
|
|
|
}
|
|
|
|
else if (g_debug > 1)
|
2017-04-17 22:32:02 +01:00
|
|
|
{
|
core: Always include reader.c, drop binary read-0-32.mo dependency.
* module/language/c99/compiler.mes (c99-input->full-ast): Remove
obsolete __NYACC__ and MES_FULL defines.
* src/mes.c [!MES_FULL]: Include reader-mes.h.
(mes_builtins) [!MES_FULL]: Include reader.mes.i, reader.me.environment.i.
[!MES_FULL]: Include reader.c.
(main) [!MES_FULL]: By default call load_env, only call bload_env
when --load is supplied. WAS: Always bload read-0-32.mo.
* src/reader.c (__end_of__mes_): Remove.
(dump): Remove option of dumping tiny test program.
* make/mescc-mes.make ($(OUT)/$(TARGET), mescc.mes-ccompile,
mescc.mes.c-compile-E): Depend on $(OUT)/mes, scripts/mes.
* src/src.make (mes.guile): Remove module/mes/read-32-0 dependency.
Do not build $(OUT)/mes.mes.
* module/module.make (module/mes/read-0.mo, module/mes/read-0-32.mo,
module/mes/tiny-0-32.mo): Remove targets.
(CLEAN): Do not add them. Neither install $(OUT)/mes.mes.
* .gitignore: Remove exceptions for them.
* make/install.make (install): Do not install them.
* HACKING: Update info about creating module/mes/read-32-0.mo.
* scaffold/mini-mes.c: Remove.
* scaffold/tiny-mes.c: Remove.
* scaffold/cons-mes.c: Remove.
* scaffold/scaffold.make (tiny-mes.libc, tiny-mes.guile, tiny-mes.mes,
mini-mes.libc, mini-mes.guile, mini-mes.mes): Reemove targets.
2017-05-28 15:03:45 +01:00
|
|
|
eputs ("program r2=");
|
|
|
|
display_error_ (r2);
|
|
|
|
eputs ("\n");
|
2017-04-17 22:32:02 +01:00
|
|
|
}
|
|
|
|
|
2018-10-04 20:43:45 +01:00
|
|
|
long i;
|
2018-08-12 13:53:06 +01:00
|
|
|
for (i=0; i<g_free * sizeof (struct scm); i = i + 1)
|
|
|
|
{
|
|
|
|
putchar (p[0]);
|
|
|
|
p = p + 1;
|
|
|
|
}
|
mini-mes: Merge with mes.c: lib.c, math.c, posix.c.
* mes.c: Include math.c after posix.c.
(assert_defined, check_formals, check_apply, load_env,
bload_env): Move from lib.c
* scaffold/mini-mes.c: Include mini-lib.h, lib.c., mini-math.h,
math.c, mini-posix.h, posix.c.
(greater_p, less_p, is_p, minus, plus, divide, modulo, multiply,
logior, ash): Remove.
(ungetchar, peekchar, peek_byte, read_byte, write_byte,
string_to_cstring, getenv_, open_input_file, current_input_port,
set_current_input_port, force_output): Remove.
(mes_builtins): include mini-lib.i, mini-lib.environment.i.
mini-math.i, mini-math.environment.i mini-posix.i,
mini-posix.environment.i.
* GNUmakefile (guile-mini-mes): Add dependencies.
2017-04-08 14:01:24 +01:00
|
|
|
return 0;
|
|
|
|
}
|