X-Git-Url: https://code.kerkeslager.com/?a=blobdiff_plain;f=templates%2Ffunction_definition.c;h=ccf3e7596923a252cb4142c2906b350b958781aa;hb=c4de9dca8a54bb5eb611a87b4d9fe36b0fe9a0b1;hp=d20eba676f34f5a880b66ef3280b28477d2a39a3;hpb=b47a0017d1dbfda8e8bae7989fff9ccb31897a28;p=fur

diff --git a/templates/function_definition.c b/templates/function_definition.c
index d20eba6..ccf3e75 100644
--- a/templates/function_definition.c
+++ b/templates/function_definition.c
@@ -1,31 +1,31 @@
 
-Object user${{name}}$implementation(EnvironmentPool* environmentPool, Environment* environment, size_t argc, Stack* parentStack, jmp_buf parentJump)
+Object user${{name}}${{index}}$implementation(
+    EnvironmentPool* environmentPool,
+    Environment* environment,
+    size_t argc,
+    Stack* stack,
+    const unsigned long line,
+    jmp_buf parentJump)
 {
   environment = Environment_construct(environmentPool, environment);
 
-  Stack* stack = Stack_construct();
+  StackSnapshot stackSnapshot = Stack_takeSnapshot(stack);
 
   jmp_buf jump;
   if(setjmp(jump) != 0)
   {
-    fprintf(stderr, "\tin {{name}}\n");
+    fprintf(stderr, "\tin {{name}} on line %zu\n", line);
 
-    while(Stack_any(stack))
-    {
-      Object item = Stack_pop(stack);
-      Object_deinitialize(&item);
-    }
+    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 %}
-  Environment_set(environment, "{{ argument_name }}", Stack_pop(parentStack));
+  Environment_set(environment, "{{ argument_name }}", Stack_pop(stack));
   {% endfor %}
 
   {% for statement in statement_list %}
@@ -34,7 +34,5 @@ Object user${{name}}$implementation(EnvironmentPool* environmentPool, Environmen
 
   // TODO Set the environment back to the parent environment
   Environment_setLive(environment, false);
-
-  Stack_destruct(stack);
   return result;
 }