projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
altos/scheme: Add ports. Split scheme code up.
[fw/altos]
/
src
/
scheme
/
ao_scheme_eval.c
diff --git
a/src/scheme/ao_scheme_eval.c
b/src/scheme/ao_scheme_eval.c
index 91f6a84f9104869597e20448c2bbe285fbce6e31..9536cb91f9ac05dbbe9e3b2a42365c3d010797de 100644
(file)
--- a/
src/scheme/ao_scheme_eval.c
+++ b/
src/scheme/ao_scheme_eval.c
@@
-271,8
+271,10
@@
ao_scheme_eval_exec(void)
}
ao_scheme_v = v;
}
ao_scheme_v = v;
- ao_scheme_stack->values = AO_SCHEME_NIL;
- ao_scheme_stack->values_tail = AO_SCHEME_NIL;
+ if (ao_scheme_stack->state != eval_exec) {
+ ao_scheme_stack->values = AO_SCHEME_NIL;
+ ao_scheme_stack->values_tail = AO_SCHEME_NIL;
+ }
DBGI(".. result "); DBG_POLY(ao_scheme_v); DBG ("\n");
DBGI(".. frame "); DBG_POLY(ao_scheme_frame_poly(ao_scheme_frame_current)); DBG("\n");
break;
DBGI(".. result "); DBG_POLY(ao_scheme_v); DBG ("\n");
DBGI(".. frame "); DBG_POLY(ao_scheme_frame_poly(ao_scheme_frame_current)); DBG("\n");
break;
@@
-530,6
+532,7
@@
const char * const ao_scheme_state_names[] = {
[eval_macro] = "macro",
};
[eval_macro] = "macro",
};
+#ifdef AO_SCHEME_FEATURE_SAVE
/*
* Called at restore time to reset all execution state
*/
/*
* Called at restore time to reset all execution state
*/
@@
-547,6
+550,7
@@
ao_scheme_eval_restart(void)
{
return ao_scheme_stack_push();
}
{
return ao_scheme_stack_push();
}
+#endif /* AO_SCHEME_FEATURE_SAVE */
ao_poly
ao_scheme_eval(ao_poly _v)
ao_poly
ao_scheme_eval(ao_poly _v)
@@
-559,12
+563,11
@@
ao_scheme_eval(ao_poly _v)
return AO_SCHEME_NIL;
while (ao_scheme_stack) {
return AO_SCHEME_NIL;
while (ao_scheme_stack) {
- if (!(*evals[ao_scheme_stack->state])() || ao_scheme_exception) {
- ao_scheme_stack_clear();
- return AO_SCHEME_NIL;
- }
+ if (!(*evals[ao_scheme_stack->state])() || ao_scheme_exception)
+ break;
}
DBG_DO(if (ao_scheme_frame_current) {DBGI("frame left as "); DBG_POLY(ao_scheme_frame_poly(ao_scheme_frame_current)); DBG("\n");});
}
DBG_DO(if (ao_scheme_frame_current) {DBGI("frame left as "); DBG_POLY(ao_scheme_frame_poly(ao_scheme_frame_current)); DBG("\n");});
+ ao_scheme_stack = NULL;
ao_scheme_frame_current = NULL;
return ao_scheme_v;
}
ao_scheme_frame_current = NULL;
return ao_scheme_v;
}