Clean up stacks in the case of an exception

[fur] / templates / program.c

diff --git a/templates/program.c b/templates/program.c
index 18d8616..7cfd1e3 100644 (file)
--- a/templates/program.c
+++ b/templates/program.c
@@ -163,6 +163,11 @@ void Stack_initialize(Stack* self)
   self->length = 0;
 }
 
+bool Stack_any(Stack* self)
+{
+  return self->length > 0;
+}
+
 void Stack_push(Stack* self, Object item)
 {
   assert(self->length < 256);
@@ -545,7 +550,7 @@ Object operator$negate(Object input)
 }
 
 // TODO Make this conditionally added
-Object operator$concatenate(Stack* stack, jmp_buf parent_jump)
+Object operator$concatenate(Stack* stack, jmp_buf parent_jump, size_t line)
 {
   Object right = Stack_pop(stack);
   Object left = Stack_pop(stack);
@@ -578,7 +583,7 @@ Object operator$concatenate(Stack* stack, jmp_buf parent_jump)
 }
 
 {% for id in infix_declarations %}
-Object operator${{ id.name }}(Stack* stack, jmp_buf parent_jump)
+Object operator${{ id.name }}(Stack* stack, jmp_buf parent_jump, size_t line)
 {
   Object right = Stack_pop(stack);
   Object left = Stack_pop(stack);
@@ -589,7 +594,7 @@ Object operator${{ id.name }}(Stack* stack, jmp_buf parent_jump)
   {% if id.name == 'integerDivide' or id.name == 'modularDivide' %}
   if(right.instance.integer == 0)
   {
-    fprintf(stderr, "DivisionByZeroError\n");
+    fprintf(stderr, "DivisionByZeroError on line %zu\n", line);
     longjmp(parent_jump, 1);
   }
   {% endif %}
@@ -695,6 +700,12 @@ int main(int argc, char** argv)
   if(setjmp(jump) != 0)
   {
     fprintf(stderr, "\tin __main__\n");
+
+    while(Stack_any(stack))
+    {
+      Object item = Stack_pop(stack);
+      Object_deinitialize(&item);
+    }
     Environment_setLive(environment, false);
     EnvironmentPool_destruct(environmentPool);