projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
altos/lisp: Add scheme-style bools (#t and #f)
[fw/altos]
/
src
/
lisp
/
ao_lisp_read.c
diff --git
a/src/lisp/ao_lisp_read.c
b/src/lisp/ao_lisp_read.c
index 84ef2a616bb09fdbdb9cebba3d4a2e889c14762b..508d16b4d821f8247d8b0db9336d1be21a49458a 100644
(file)
--- a/
src/lisp/ao_lisp_read.c
+++ b/
src/lisp/ao_lisp_read.c
@@
-51,18
+51,18
@@
static const uint16_t lex_classes[128] = {
PRINTABLE|WHITE, /* */
PRINTABLE, /* ! */
PRINTABLE|STRINGC, /* " */
PRINTABLE|WHITE, /* */
PRINTABLE, /* ! */
PRINTABLE|STRINGC, /* " */
- PRINTABLE|
COMMENT,
/* # */
+ PRINTABLE|
POUND,
/* # */
PRINTABLE, /* $ */
PRINTABLE, /* % */
PRINTABLE, /* & */
PRINTABLE, /* $ */
PRINTABLE, /* % */
PRINTABLE, /* & */
- PRINTABLE|
QUOTEC,
/* ' */
- PRINTABLE|
BRA,
/* ( */
- PRINTABLE|
KET,
/* ) */
+ PRINTABLE|
SPECIAL,
/* ' */
+ PRINTABLE|
SPECIAL,
/* ( */
+ PRINTABLE|
SPECIAL,
/* ) */
PRINTABLE, /* * */
PRINTABLE|SIGN, /* + */
PRINTABLE, /* , */
PRINTABLE|SIGN, /* - */
PRINTABLE, /* * */
PRINTABLE|SIGN, /* + */
PRINTABLE, /* , */
PRINTABLE|SIGN, /* - */
- PRINTABLE
,
/* . */
+ PRINTABLE
|SPECIAL,
/* . */
PRINTABLE, /* / */
PRINTABLE|DIGIT, /* 0 */
PRINTABLE|DIGIT, /* 1 */
PRINTABLE, /* / */
PRINTABLE|DIGIT, /* 0 */
PRINTABLE|DIGIT, /* 1 */
@@
-262,7
+262,7
@@
static inline void end_token(void) {
}
static int
}
static int
-lex(void)
+
_
lex(void)
{
int c;
{
int c;
@@
-283,22
+283,38
@@
lex(void)
continue;
}
continue;
}
- if (lex_class &
(BRA|KET|QUOTEC)
) {
+ if (lex_class &
SPECIAL
) {
add_token(c);
end_token();
switch (c) {
case '(':
add_token(c);
end_token();
switch (c) {
case '(':
+ case '[':
return OPEN;
case ')':
return OPEN;
case ')':
+ case ']':
return CLOSE;
case '\'':
return QUOTE;
return CLOSE;
case '\'':
return QUOTE;
+ case '.':
+ return DOT;
}
}
if (lex_class & TWIDDLE) {
token_int = lexc();
return NUM;
}
}
}
if (lex_class & TWIDDLE) {
token_int = lexc();
return NUM;
}
+ if (lex_class & POUND) {
+ for (;;) {
+ c = lexc();
+ add_token(c);
+ switch (c) {
+ case 't':
+ return BOOL;
+ case 'f':
+ return BOOL;
+ }
+ }
+ }
if (lex_class & STRINGC) {
for (;;) {
c = lexc();
if (lex_class & STRINGC) {
for (;;) {
c = lexc();
@@
-355,21
+371,32
@@
lex(void)
}
}
}
}
+static inline int lex(void)
+{
+ int parse_token = _lex();
+ DBGI("token %d (%s)\n", parse_token, token_string);
+ return parse_token;
+}
+
static int parse_token;
struct ao_lisp_cons *ao_lisp_read_cons;
struct ao_lisp_cons *ao_lisp_read_cons_tail;
struct ao_lisp_cons *ao_lisp_read_stack;
static int parse_token;
struct ao_lisp_cons *ao_lisp_read_cons;
struct ao_lisp_cons *ao_lisp_read_cons_tail;
struct ao_lisp_cons *ao_lisp_read_stack;
+#define READ_IN_QUOTE 0x01
+#define READ_SAW_DOT 0x02
+#define READ_DONE_DOT 0x04
+
static int
static int
-push_read_stack(int cons, int
in_quo
te)
+push_read_stack(int cons, int
read_sta
te)
{
{
- DBGI("push read stack %p
%d\n", ao_lisp_read_cons, in_quo
te);
+ DBGI("push read stack %p
0x%x\n", ao_lisp_read_cons, read_sta
te);
DBG_IN();
if (cons) {
ao_lisp_read_stack = ao_lisp_cons_cons(ao_lisp_cons_poly(ao_lisp_read_cons),
DBG_IN();
if (cons) {
ao_lisp_read_stack = ao_lisp_cons_cons(ao_lisp_cons_poly(ao_lisp_read_cons),
-
ao_lisp_cons_cons(ao_lisp_int_poly(in_quo
te),
-
ao_lisp_read_stack
));
+
ao_lisp__cons(ao_lisp_int_poly(read_sta
te),
+
ao_lisp_cons_poly(ao_lisp_read_stack)
));
if (!ao_lisp_read_stack)
return 0;
}
if (!ao_lisp_read_stack)
return 0;
}
@@
-381,11
+408,11
@@
push_read_stack(int cons, int in_quote)
static int
pop_read_stack(int cons)
{
static int
pop_read_stack(int cons)
{
- int
in_quo
te = 0;
+ int
read_sta
te = 0;
if (cons) {
ao_lisp_read_cons = ao_lisp_poly_cons(ao_lisp_read_stack->car);
ao_lisp_read_stack = ao_lisp_poly_cons(ao_lisp_read_stack->cdr);
if (cons) {
ao_lisp_read_cons = ao_lisp_poly_cons(ao_lisp_read_stack->car);
ao_lisp_read_stack = ao_lisp_poly_cons(ao_lisp_read_stack->cdr);
-
in_quo
te = ao_lisp_poly_int(ao_lisp_read_stack->car);
+
read_sta
te = ao_lisp_poly_int(ao_lisp_read_stack->car);
ao_lisp_read_stack = ao_lisp_poly_cons(ao_lisp_read_stack->cdr);
for (ao_lisp_read_cons_tail = ao_lisp_read_cons;
ao_lisp_read_cons_tail && ao_lisp_read_cons_tail->cdr;
ao_lisp_read_stack = ao_lisp_poly_cons(ao_lisp_read_stack->cdr);
for (ao_lisp_read_cons_tail = ao_lisp_read_cons;
ao_lisp_read_cons_tail && ao_lisp_read_cons_tail->cdr;
@@
-397,8
+424,8
@@
pop_read_stack(int cons)
ao_lisp_read_stack = 0;
}
DBG_OUT();
ao_lisp_read_stack = 0;
}
DBG_OUT();
- DBGI("pop read stack %p %d\n", ao_lisp_read_cons,
in_quo
te);
- return
in_quo
te;
+ DBGI("pop read stack %p %d\n", ao_lisp_read_cons,
read_sta
te);
+ return
read_sta
te;
}
ao_poly
}
ao_poly
@@
-407,23
+434,21
@@
ao_lisp_read(void)
struct ao_lisp_atom *atom;
char *string;
int cons;
struct ao_lisp_atom *atom;
char *string;
int cons;
- int
in_quo
te;
+ int
read_sta
te;
ao_poly v;
ao_poly v;
- parse_token = lex();
- DBGI("token %d (%s)\n", parse_token, token_string);
cons = 0;
cons = 0;
-
in_quo
te = 0;
+
read_sta
te = 0;
ao_lisp_read_cons = ao_lisp_read_cons_tail = ao_lisp_read_stack = 0;
for (;;) {
ao_lisp_read_cons = ao_lisp_read_cons_tail = ao_lisp_read_stack = 0;
for (;;) {
+ parse_token = lex();
while (parse_token == OPEN) {
while (parse_token == OPEN) {
- if (!push_read_stack(cons,
in_quo
te))
+ if (!push_read_stack(cons,
read_sta
te))
return AO_LISP_NIL;
cons++;
return AO_LISP_NIL;
cons++;
-
in_quo
te = 0;
+
read_sta
te = 0;
parse_token = lex();
parse_token = lex();
- DBGI("token %d (%s)\n", parse_token, token_string);
}
switch (parse_token) {
}
switch (parse_token) {
@@
-443,6
+468,12
@@
ao_lisp_read(void)
case NUM:
v = ao_lisp_int_poly(token_int);
break;
case NUM:
v = ao_lisp_int_poly(token_int);
break;
+ case BOOL:
+ if (token_string[0] == 't')
+ v = _ao_lisp_bool_true;
+ else
+ v = _ao_lisp_bool_false;
+ break;
case STRING:
string = ao_lisp_string_copy(token_string);
if (string)
case STRING:
string = ao_lisp_string_copy(token_string);
if (string)
@@
-451,10
+482,10
@@
ao_lisp_read(void)
v = AO_LISP_NIL;
break;
case QUOTE:
v = AO_LISP_NIL;
break;
case QUOTE:
- if (!push_read_stack(cons,
in_quo
te))
+ if (!push_read_stack(cons,
read_sta
te))
return AO_LISP_NIL;
cons++;
return AO_LISP_NIL;
cons++;
-
in_quote = 1
;
+
read_state |= READ_IN_QUOTE
;
v = _ao_lisp_atom_quote;
break;
case CLOSE:
v = _ao_lisp_atom_quote;
break;
case CLOSE:
@@
-464,8
+495,19
@@
ao_lisp_read(void)
}
v = ao_lisp_cons_poly(ao_lisp_read_cons);
--cons;
}
v = ao_lisp_cons_poly(ao_lisp_read_cons);
--cons;
-
in_quo
te = pop_read_stack(cons);
+
read_sta
te = pop_read_stack(cons);
break;
break;
+ case DOT:
+ if (!cons) {
+ ao_lisp_error(AO_LISP_INVALID, ". outside of cons");
+ return AO_LISP_NIL;
+ }
+ if (!ao_lisp_read_cons) {
+ ao_lisp_error(AO_LISP_INVALID, ". first in cons");
+ return AO_LISP_NIL;
+ }
+ read_state |= READ_SAW_DOT;
+ continue;
}
/* loop over QUOTE ends */
}
/* loop over QUOTE ends */
@@
-473,26
+515,33
@@
ao_lisp_read(void)
if (!cons)
return v;
if (!cons)
return v;
- struct ao_lisp_cons *read = ao_lisp_cons_cons(v, NULL);
- if (!read)
+ if (read_state & READ_DONE_DOT) {
+ ao_lisp_error(AO_LISP_INVALID, ". not last in cons");
return AO_LISP_NIL;
return AO_LISP_NIL;
+ }
- if (ao_lisp_read_cons_tail)
- ao_lisp_read_cons_tail->cdr = ao_lisp_cons_poly(read);
- else
- ao_lisp_read_cons = read;
- ao_lisp_read_cons_tail = read;
+ if (read_state & READ_SAW_DOT) {
+ read_state |= READ_DONE_DOT;
+ ao_lisp_read_cons_tail->cdr = v;
+ } else {
+ struct ao_lisp_cons *read = ao_lisp_cons_cons(v, AO_LISP_NIL);
+ if (!read)
+ return AO_LISP_NIL;
- if (!in_quote || !ao_lisp_read_cons->cdr)
+ if (ao_lisp_read_cons_tail)
+ ao_lisp_read_cons_tail->cdr = ao_lisp_cons_poly(read);
+ else
+ ao_lisp_read_cons = read;
+ ao_lisp_read_cons_tail = read;
+ }
+
+ if (!(read_state & READ_IN_QUOTE) || !ao_lisp_read_cons->cdr)
break;
v = ao_lisp_cons_poly(ao_lisp_read_cons);
--cons;
break;
v = ao_lisp_cons_poly(ao_lisp_read_cons);
--cons;
-
in_quo
te = pop_read_stack(cons);
+
read_sta
te = pop_read_stack(cons);
}
}
-
- parse_token = lex();
- DBGI("token %d (%s)\n", parse_token, token_string);
}
return v;
}
}
return v;
}