Make AM registers into an array
This commit is contained in:
36
lib/eval.c
36
lib/eval.c
@@ -6,11 +6,11 @@
|
||||
|
||||
static void eval_atom(am_t *am)
|
||||
{
|
||||
switch (am->expr->atom.type) {
|
||||
switch (AM_EXPR(am)->atom.type) {
|
||||
case ATOM_TYPE_EMPTY_LIST:
|
||||
case ATOM_TYPE_INTEGER:
|
||||
case ATOM_TYPE_PRIM_PROC:
|
||||
am->val = am->expr;
|
||||
AM_VAL(am) = AM_EXPR(am);
|
||||
break;
|
||||
case ATOM_TYPE_SYMBOL:
|
||||
env_fetch(am);
|
||||
@@ -20,42 +20,42 @@ static void eval_atom(am_t *am)
|
||||
|
||||
static void eval_list(am_t *am)
|
||||
{
|
||||
am->argl = expr_empty_list(am);
|
||||
am->unev = am->expr->pair.cdr;
|
||||
am->expr = am->expr->pair.car;
|
||||
AM_ARGL(am) = expr_empty_list(am);
|
||||
AM_UNEV(am) = AM_EXPR(am)->pair.cdr;
|
||||
AM_EXPR(am) = AM_EXPR(am)->pair.car;
|
||||
|
||||
while (!am->unev->is_atom) {
|
||||
while (!AM_UNEV(am)->is_atom) {
|
||||
am_push(am);
|
||||
am->expr = am->unev->pair.cdr;
|
||||
AM_EXPR(am) = AM_UNEV(am)->pair.cdr;
|
||||
am_push(am);
|
||||
am->expr = am->argl;
|
||||
AM_EXPR(am) = AM_ARGL(am);
|
||||
am_push(am);
|
||||
|
||||
am->expr = am->unev->pair.car;
|
||||
AM_EXPR(am) = AM_UNEV(am)->pair.car;
|
||||
eval(am);
|
||||
|
||||
am_pop(am);
|
||||
am->argl = am->expr;
|
||||
AM_ARGL(am) = AM_EXPR(am);
|
||||
am_append_arg(am);
|
||||
|
||||
am_pop(am);
|
||||
am->unev = am->expr;
|
||||
AM_UNEV(am) = AM_EXPR(am);
|
||||
am_pop(am);
|
||||
}
|
||||
|
||||
assert(am->expr->is_atom);
|
||||
assert(am->expr->atom.type == ATOM_TYPE_SYMBOL);
|
||||
assert(AM_EXPR(am)->is_atom);
|
||||
assert(AM_EXPR(am)->atom.type == ATOM_TYPE_SYMBOL);
|
||||
env_fetch(am);
|
||||
|
||||
assert(am->val->is_atom);
|
||||
assert(am->val->atom.type == ATOM_TYPE_PRIM_PROC);
|
||||
assert(am->val->atom.prim_proc != NULL);
|
||||
am->val->atom.prim_proc(am);
|
||||
assert(AM_VAL(am)->is_atom);
|
||||
assert(AM_VAL(am)->atom.type == ATOM_TYPE_PRIM_PROC);
|
||||
assert(AM_VAL(am)->atom.prim_proc != NULL);
|
||||
AM_VAL(am)->atom.prim_proc(am);
|
||||
}
|
||||
|
||||
void eval(am_t *am)
|
||||
{
|
||||
if (am->expr->is_atom)
|
||||
if (AM_EXPR(am)->is_atom)
|
||||
eval_atom(am);
|
||||
else
|
||||
eval_list(am);
|
||||
|
||||
Reference in New Issue
Block a user