Make AM registers into an array
This commit is contained in:
12
lib/parse.c
12
lib/parse.c
@@ -24,7 +24,7 @@ static parse_state_t pop_state(parse_ctx_t *ctx)
|
||||
|
||||
static void append(parse_ctx_t *ctx, expr_t *expr)
|
||||
{
|
||||
expr_t *list = ctx->am->expr;
|
||||
expr_t *list = AM_EXPR(ctx->am);
|
||||
while (!list->is_atom)
|
||||
list = list->pair.cdr;
|
||||
assert(list->atom.type == ATOM_TYPE_EMPTY_LIST);
|
||||
@@ -40,16 +40,16 @@ parse_state_t parse_proc(parse_ctx_t *ctx, const token_t *token)
|
||||
case PARSE_STATE_INIT:
|
||||
switch (token->type) {
|
||||
case TOKEN_TYPE_INTEGER:
|
||||
ctx->am->expr = expr_integer(ctx->am, token->integer);
|
||||
AM_EXPR(ctx->am) = expr_integer(ctx->am, token->integer);
|
||||
ctx->state = PARSE_STATE_DONE;
|
||||
break;
|
||||
case TOKEN_TYPE_SYMBOL:
|
||||
ctx->am->expr = expr_symbol(ctx->am, &token->symbol);
|
||||
AM_EXPR(ctx->am) = expr_symbol(ctx->am, &token->symbol);
|
||||
ctx->state = PARSE_STATE_DONE;
|
||||
break;
|
||||
case TOKEN_TYPE_OPEN_PAREN:
|
||||
push_state(ctx, PARSE_STATE_DONE);
|
||||
ctx->am->expr = expr_empty_list(ctx->am);
|
||||
AM_EXPR(ctx->am) = expr_empty_list(ctx->am);
|
||||
ctx->state = PARSE_STATE_LIST;
|
||||
break;
|
||||
case TOKEN_TYPE_CLOSE_PAREN:
|
||||
@@ -69,13 +69,13 @@ parse_state_t parse_proc(parse_ctx_t *ctx, const token_t *token)
|
||||
case TOKEN_TYPE_OPEN_PAREN:
|
||||
am_push(ctx->am);
|
||||
push_state(ctx, PARSE_STATE_LIST);
|
||||
ctx->am->expr = expr_empty_list(ctx->am);
|
||||
AM_EXPR(ctx->am) = expr_empty_list(ctx->am);
|
||||
ctx->state = PARSE_STATE_LIST;
|
||||
break;
|
||||
case TOKEN_TYPE_CLOSE_PAREN:
|
||||
ctx->state = pop_state(ctx);
|
||||
if (ctx->state == PARSE_STATE_LIST) {
|
||||
expr_t *expr = ctx->am->expr;
|
||||
expr_t *expr = AM_EXPR(ctx->am);
|
||||
am_pop(ctx->am);
|
||||
append(ctx, expr);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user