X-Git-Url: https://code.kerkeslager.com/?a=blobdiff_plain;f=templates%2Ffunction_definition.c;h=ccf3e7596923a252cb4142c2906b350b958781aa;hb=4f86ad3f093ca0c51e77a28b208e7751629d4948;hp=9af76327a69324a90de3aaeedc8fc4604e944fc5;hpb=76ffe5adf4f6497945684e700dec15c809897d77;p=fur diff --git a/templates/function_definition.c b/templates/function_definition.c index 9af7632..ccf3e75 100644 --- a/templates/function_definition.c +++ b/templates/function_definition.c @@ -1,28 +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); 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 %} @@ -31,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; }