PRINTABLE|SPECIAL, /* ) */
PRINTABLE, /* * */
PRINTABLE|SIGN, /* + */
- PRINTABLE|SPECIAL, /* , */
+ PRINTABLE|SPECIAL_QUASI, /* , */
PRINTABLE|SIGN, /* - */
PRINTABLE|DOTC|FLOATC, /* . */
PRINTABLE, /* / */
PRINTABLE, /* ] */
PRINTABLE, /* ^ */
PRINTABLE, /* _ */
- PRINTABLE|SPECIAL, /* ` */
+ PRINTABLE|SPECIAL_QUASI, /* ` */
PRINTABLE, /* a */
PRINTABLE, /* b */
PRINTABLE, /* c */
static int lex_unget_c;
static inline int
-lex_get()
+lex_get(void)
{
int c;
if (lex_unget_c) {
}
}
-#define AO_SCHEME_TOKEN_MAX 32
+#ifndef AO_SCHEME_TOKEN_MAX
+#define AO_SCHEME_TOKEN_MAX 128
+#endif
static char token_string[AO_SCHEME_TOKEN_MAX];
static int32_t token_int;
static int token_len;
-static float token_float;
static inline void add_token(int c) {
if (c && token_len < AO_SCHEME_TOKEN_MAX - 1)
token_string[token_len] = '\0';
}
+#ifdef AO_SCHEME_FEATURE_FLOAT
+static float token_float;
+
struct namedfloat {
const char *name;
float value;
};
#define NUM_NAMED_FLOATS (sizeof namedfloats / sizeof namedfloats[0])
+#endif
static int
_lex(void)
return QUOTE;
case '.':
return DOT;
+#ifdef AO_SCHEME_FEATURE_QUASI
case '`':
return QUASIQUOTE;
case ',':
lex_unget(c);
return UNQUOTE;
}
+#endif
}
}
if (lex_class & POUND) {
add_token(c);
end_token();
return BOOL;
+#ifdef AO_SCHEME_FEATURE_VECTOR
+ case '(':
+ return OPEN_VECTOR;
+#endif
case '\\':
for (;;) {
int alphabetic;
}
}
if (lex_class & PRINTABLE) {
- int isfloat;
- int hasdigit;
- int isneg;
- int isint;
- int epos;
-
- isfloat = 1;
- isint = 1;
- hasdigit = 0;
+#ifdef AO_SCHEME_FEATURE_FLOAT
+ int isfloat = 1;
+ int epos = 0;
+#endif
+ int hasdigit = 0;
+ int isneg = 0;
+ int isint = 1;
+
token_int = 0;
- isneg = 0;
- epos = 0;
for (;;) {
if (!(lex_class & NUMBER)) {
isint = 0;
+#ifdef AO_SCHEME_FEATURE_FLOAT
isfloat = 0;
+#endif
} else {
+#ifdef AO_SCHEME_FEATURE_FLOAT
if (!(lex_class & INTEGER))
isint = 0;
if (token_len != epos &&
isint = 0;
isfloat = 0;
}
+#endif
if (c == '-')
isneg = 1;
+#ifdef AO_SCHEME_FEATURE_FLOAT
if (c == '.' && epos != 0)
isfloat = 0;
if (c == 'e' || c == 'E') {
else
epos = token_len + 1;
}
+#endif
if (lex_class & DIGIT) {
hasdigit = 1;
if (isint)
}
add_token (c);
c = lexc ();
- if ((lex_class & (NOTNAME)) && (c != '.' || !isfloat)) {
+ if ((lex_class & (NOTNAME))
+#ifdef AO_SCHEME_FEATURE_FLOAT
+ && (c != '.' || !isfloat)
+#endif
+ ) {
+#ifdef AO_SCHEME_FEATURE_FLOAT
unsigned int u;
+#endif
// if (lex_class & ENDOFFILE)
// clearerr (f);
lex_unget(c);
token_int = -token_int;
return NUM;
}
+#ifdef AO_SCHEME_FEATURE_FLOAT
if (isfloat && hasdigit) {
token_float = strtof(token_string, NULL);
return FLOAT;
token_float = namedfloats[u].value;
return FLOAT;
}
+#endif
return NAME;
}
}
static int parse_token;
+int ao_scheme_read_list;
struct ao_scheme_cons *ao_scheme_read_cons;
struct ao_scheme_cons *ao_scheme_read_cons_tail;
struct ao_scheme_cons *ao_scheme_read_stack;
+static int ao_scheme_read_state;
#define READ_IN_QUOTE 0x01
#define READ_SAW_DOT 0x02
#define READ_DONE_DOT 0x04
+#define READ_SAW_VECTOR 0x08
static int
-push_read_stack(int cons, int read_state)
+push_read_stack(int read_state)
{
RDBGI("push read stack %p 0x%x\n", ao_scheme_read_cons, read_state);
RDBG_IN();
- if (cons) {
+ if (ao_scheme_read_list) {
ao_scheme_read_stack = ao_scheme_cons_cons(ao_scheme_cons_poly(ao_scheme_read_cons),
- ao_scheme__cons(ao_scheme_int_poly(read_state),
+ ao_scheme_cons(ao_scheme_int_poly(read_state),
ao_scheme_cons_poly(ao_scheme_read_stack)));
if (!ao_scheme_read_stack)
return 0;
- }
+ } else
+ ao_scheme_read_state = read_state;
ao_scheme_read_cons = NULL;
ao_scheme_read_cons_tail = NULL;
return 1;
}
static int
-pop_read_stack(int cons)
+pop_read_stack(void)
{
int read_state = 0;
- if (cons) {
+ if (ao_scheme_read_list) {
ao_scheme_read_cons = ao_scheme_poly_cons(ao_scheme_read_stack->car);
ao_scheme_read_stack = ao_scheme_poly_cons(ao_scheme_read_stack->cdr);
read_state = ao_scheme_poly_int(ao_scheme_read_stack->car);
ao_scheme_read_cons = 0;
ao_scheme_read_cons_tail = 0;
ao_scheme_read_stack = 0;
+ read_state = ao_scheme_read_state;
}
RDBG_OUT();
RDBGI("pop read stack %p %d\n", ao_scheme_read_cons, read_state);
return read_state;
}
+#ifdef AO_SCHEME_FEATURE_VECTOR
+#define is_open(t) ((t) == OPEN || (t) == OPEN_VECTOR)
+#else
+#define is_open(t) ((t) == OPEN)
+#endif
+
ao_poly
ao_scheme_read(void)
{
struct ao_scheme_atom *atom;
- char *string;
- int cons;
+ struct ao_scheme_string *string;
int read_state;
ao_poly v = AO_SCHEME_NIL;
- cons = 0;
+ ao_scheme_read_list = 0;
read_state = 0;
ao_scheme_read_cons = ao_scheme_read_cons_tail = ao_scheme_read_stack = 0;
for (;;) {
parse_token = lex();
- while (parse_token == OPEN) {
- if (!push_read_stack(cons, read_state))
+ while (is_open(parse_token)) {
+#ifdef AO_SCHEME_FEATURE_VECTOR
+ if (parse_token == OPEN_VECTOR)
+ read_state |= READ_SAW_VECTOR;
+#endif
+ if (!push_read_stack(read_state))
return AO_SCHEME_NIL;
- cons++;
+ ao_scheme_read_list++;
read_state = 0;
parse_token = lex();
}
switch (parse_token) {
case END:
default:
- if (cons)
+ if (ao_scheme_read_list)
ao_scheme_error(AO_SCHEME_EOF, "unexpected end of file");
return _ao_scheme_atom_eof;
break;
case NUM:
v = ao_scheme_integer_poly(token_int);
break;
+#ifdef AO_SCHEME_FEATURE_FLOAT
case FLOAT:
v = ao_scheme_float_get(token_float);
break;
+#endif
case BOOL:
if (token_string[0] == 't')
v = _ao_scheme_bool_true;
v = _ao_scheme_bool_false;
break;
case STRING:
- string = ao_scheme_string_copy(token_string);
+ string = ao_scheme_string_make(token_string);
if (string)
v = ao_scheme_string_poly(string);
else
v = AO_SCHEME_NIL;
break;
case QUOTE:
+#ifdef AO_SCHEME_FEATURE_QUASI
case QUASIQUOTE:
case UNQUOTE:
case UNQUOTE_SPLICING:
- if (!push_read_stack(cons, read_state))
+#endif
+ if (!push_read_stack(read_state))
return AO_SCHEME_NIL;
- cons++;
+ ao_scheme_read_list++;
read_state = READ_IN_QUOTE;
switch (parse_token) {
case QUOTE:
v = _ao_scheme_atom_quote;
break;
+#ifdef AO_SCHEME_FEATURE_QUASI
case QUASIQUOTE:
v = _ao_scheme_atom_quasiquote;
break;
case UNQUOTE_SPLICING:
v = _ao_scheme_atom_unquote2dsplicing;
break;
+#endif
}
break;
case CLOSE:
- if (!cons) {
+ if (!ao_scheme_read_list) {
v = AO_SCHEME_NIL;
break;
}
v = ao_scheme_cons_poly(ao_scheme_read_cons);
- --cons;
- read_state = pop_read_stack(cons);
+ --ao_scheme_read_list;
+ read_state = pop_read_stack();
+#ifdef AO_SCHEME_FEATURE_VECTOR
+ if (read_state & READ_SAW_VECTOR)
+ v = ao_scheme_vector_poly(ao_scheme_list_to_vector(ao_scheme_poly_cons(v)));
+#endif
break;
case DOT:
- if (!cons) {
+ if (!ao_scheme_read_list) {
ao_scheme_error(AO_SCHEME_INVALID, ". outside of cons");
return AO_SCHEME_NIL;
}
/* loop over QUOTE ends */
for (;;) {
- if (!cons)
+ if (!ao_scheme_read_list)
return v;
if (read_state & READ_DONE_DOT) {
break;
v = ao_scheme_cons_poly(ao_scheme_read_cons);
- --cons;
- read_state = pop_read_stack(cons);
+ --ao_scheme_read_list;
+ read_state = pop_read_stack();
}
}
return v;
projects / fw / altos / blobdiff