projects
/
fur
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Use snapshots of the stack to restore stack to its previous state
[fur]
/
templates
/
function_definition.c
diff --git
a/templates/function_definition.c
b/templates/function_definition.c
index
72ce6f0
..
9af7632
100644
(file)
--- a/
templates/function_definition.c
+++ b/
templates/function_definition.c
@@
-1,27
+1,37
@@
-Object user${{name}}$implementation(EnvironmentPool* environmentPool, Environment*
parent, size_t argc, Stack* stack, jmp_buf parent_j
ump)
+Object user${{name}}$implementation(EnvironmentPool* environmentPool, Environment*
environment, size_t argc, Stack* parentStack, jmp_buf parentJ
ump)
{
{
- Environment* environment = EnvironmentPool_allocate(environmentPool);
- Environment_initialize(environment, parent);
+ environment = Environment_construct(environmentPool, environment);
+
+ Stack* stack = Stack_construct();
+ StackSnapshot stackSnapshot = Stack_takeSnapshot(stack);
jmp_buf jump;
if(setjmp(jump) != 0)
{
jmp_buf jump;
if(setjmp(jump) != 0)
{
- Environment_setLive(environment, false);
fprintf(stderr, "\tin {{name}}\n");
fprintf(stderr, "\tin {{name}}\n");
- longjmp(parent_jump, 1);
+
+ Stack_rewind(stack, stackSnapshot);
+ Environment_setLive(environment, false);
+
+ Stack_destruct(stack);
+
+ longjmp(parentJump, 1);
}
Object result = builtin$nil;
{% for argument_name in argument_name_list|reverse %}
}
Object result = builtin$nil;
{% for argument_name in argument_name_list|reverse %}
- Environment_set(environment, "{{ argument_name }}", Stack_pop(
s
tack));
+ Environment_set(environment, "{{ argument_name }}", Stack_pop(
parentS
tack));
{% endfor %}
{% for statement in statement_list %}
{{ statement }}
{% endfor %}
{% endfor %}
{% for statement in statement_list %}
{{ statement }}
{% endfor %}
+ // TODO Set the environment back to the parent environment
Environment_setLive(environment, false);
Environment_setLive(environment, false);
+
+ Stack_destruct(stack);
return result;
}
return result;
}