Allocate Fur stacks on the C heap

[fur] / templates / program.c

diff --git a/templates/program.c b/templates/program.c
index 18d8616..b25f7dc 100644 (file)
--- a/templates/program.c
+++ b/templates/program.c
@@ -163,6 +163,23 @@ void Stack_initialize(Stack* self)
   self->length = 0;
 }
 
+Stack* Stack_construct()
+{
+  Stack* result = malloc(sizeof(Stack));
+  Stack_initialize(result);
+  return result;
+}
+
+void Stack_destruct(Stack* self)
+{
+  free(self);
+}
+
+bool Stack_any(Stack* self)
+{
+  return self->length > 0;
+}
+
 void Stack_push(Stack* self, Object item)
 {
   assert(self->length < 256);
@@ -517,6 +534,13 @@ Environment* EnvironmentPool_allocate(EnvironmentPool* self)
   return EnvironmentPool_allocate(previous->overflow);
 }
 
+Environment* Environment_construct(EnvironmentPool* environmentPool, Environment* parent)
+{
+  Environment* environment = EnvironmentPool_allocate(environmentPool);
+  Environment_initialize(environment, parent);
+  return environment;
+}
+
 Object integerLiteral(int32_t literal)
 {
   Object result;
@@ -545,7 +569,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 parentJump, size_t line)
 {
   Object right = Stack_pop(stack);
   Object left = Stack_pop(stack);
@@ -578,7 +602,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 parentJump, size_t line)
 {
   Object right = Stack_pop(stack);
   Object left = Stack_pop(stack);
@@ -589,8 +613,8 @@ 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");
-    longjmp(parent_jump, 1);
+    fprintf(stderr, "DivisionByZeroError on line %zu\n", line);
+    longjmp(parentJump, 1);
   }
   {% endif %}
 
@@ -602,7 +626,7 @@ Object operator${{ id.name }}(Stack* stack, jmp_buf parent_jump)
 {% endfor %}
 
 {% if 'pow' in builtins %}
-Object builtin$pow$implementation(EnvironmentPool* environmentPool, Environment* parent, size_t argc, Stack* stack, jmp_buf parent_jump)
+Object builtin$pow$implementation(EnvironmentPool* environmentPool, Environment* parent, size_t argc, Stack* stack, jmp_buf parentJump)
 {
   // Must unload items in reverse order
   Object exponent = Stack_pop(stack);
@@ -621,7 +645,7 @@ Object builtin$pow = { CLOSURE, (Instance)(Closure){ NULL, builtin$pow$implement
 {% endif %}
 
 {% if 'print' in builtins %}
-Object builtin$print$implementation(EnvironmentPool* environmentPool, Environment* parent, size_t argc, Stack* stack, jmp_buf parent_jump)
+Object builtin$print$implementation(EnvironmentPool* environmentPool, Environment* parent, size_t argc, Stack* stack, jmp_buf parentJump)
 {
   Stack reverse_stack;
   Stack_initialize(&reverse_stack);
@@ -651,9 +675,9 @@ Object builtin$print$implementation(EnvironmentPool* environmentPool, Environmen
 
       case STRING_CONCATENATION:
         Stack_push(stack, output.instance.string_concatenation->left);
-        builtin$print$implementation(NULL, NULL, 1, stack, parent_jump);
+        builtin$print$implementation(NULL, NULL, 1, stack, parentJump);
         Stack_push(stack, output.instance.string_concatenation->right);
-        builtin$print$implementation(NULL, NULL, 1, stack, parent_jump);
+        builtin$print$implementation(NULL, NULL, 1, stack, parentJump);
         break;
 
       case STRING_LITERAL:
@@ -695,6 +719,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);