X-Git-Url: https://code.kerkeslager.com/?a=blobdiff_plain;f=templates%2Fprogram.c;h=2a08f397bbe4762480dd08a1941b051d6447265e;hb=d6af7d074bf65e782e42055623a197863b5f8000;hp=aba83820e5d0d0227d6c1d7cc6bf2c7e6aff6c52;hpb=e5e0dba41edce39475f839e29650007b37641be9;p=fur

diff --git a/templates/program.c b/templates/program.c
index aba8382..2a08f39 100644
--- a/templates/program.c
+++ b/templates/program.c
@@ -4,6 +4,20 @@
 #include <stdlib.h>
 #include <string.h>
 
+/* Some terminology used in function names:
+ * - initialize: These functions take a pointer and potentially some other arguments, and use those
+ *   to initialize the value pointed to by self. Initialize functions DO NOT allocate the function,
+ *   so they can be used to initialize stack-allocated variables.
+ * - construct: This allocates a value for a pointer, initializes it, and returns it. This is for
+ *   heap-allocated values. It may be as simple as allocating the memory, calling an initialize, and
+ *   returning it.
+ * - deinitialize: These functions dereference or free any objects pointed to by the self pointer's
+ *   value, but they don't actually free the self pointer. This is useful for stack-allocated objects
+ *   which point to heap-allocated objects.
+ * - destruct: This dereferences or frees memory pointed to by the self argument, and all the
+ *   pointers on the self argument.
+ */
+
 {% for standard_library in standard_libraries %}
 #include <{{standard_library}}>
 {% endfor %}
@@ -18,6 +32,8 @@ struct EnvironmentNode;
 typedef struct EnvironmentNode EnvironmentNode;
 struct Environment;
 typedef struct Environment Environment;
+struct EnvironmentPool;
+typedef struct EnvironmentPool EnvironmentPool;
 
 const char* const STRING_LITERAL_LIST[] = {
 {% for string_literal in string_literal_list %}
@@ -39,10 +55,18 @@ enum Type
   STRING
 };
 
+struct Closure;
+typedef struct Closure Closure;
+struct Closure
+{
+  Environment* closed;
+  Object (*call)(EnvironmentPool*, Environment*, size_t, Object*);
+};
+
 union Instance
 {
   bool boolean;
-  Object (*closure)(Environment*, size_t, Object*);
+  Closure closure;
   int32_t integer;
   const char* string;
 };
@@ -55,12 +79,12 @@ struct Object
 
 const Object TRUE = {
   BOOLEAN,
-  true
+  { true }
 };
 
 const Object FALSE = {
   BOOLEAN,
-  false
+  { false }
 };
 
 struct EnvironmentNode
@@ -72,6 +96,9 @@ struct EnvironmentNode
 
 struct Environment
 {
+  bool mark;
+  bool live;
+
   Environment* parent;
   EnvironmentNode* root;
 };
@@ -80,6 +107,10 @@ void Environment_initialize(Environment* self, Environment* parent)
 {
   self->parent = parent;
   self->root = NULL;
+
+  // We are currently only ever initializing environments at the beginning of running functions, so
+  // for now at least we can assume that we want it to be live immediately.
+  self->live = true;
 }
 
 void Environment_deinitialize(Environment* self)
@@ -87,12 +118,44 @@ void Environment_deinitialize(Environment* self)
   EnvironmentNode* next;
   for(EnvironmentNode* node = self->root; node != NULL; node = next)
   {
-    // No objects are allocated on the heap (yet!) so we don't need to free anything else
     next = node->next;
     free(node);
   }
 }
 
+void Environment_setLive(Environment* self, bool live)
+{
+  self->live = live;
+}
+
+void Environment_mark(Environment* self)
+{
+  if(self == NULL) return;
+  if(self->mark) return; // Prevents infinite recursion in the case of cycles
+
+  self->mark = true;
+
+  Environment_mark(self->parent);
+
+  for(EnvironmentNode* node = self->root; node != NULL; node = node->next)
+  {
+    switch(node->value.type)
+    {
+      case BOOLEAN:
+      case INTEGER:
+      case STRING:
+        break;
+
+      case CLOSURE:
+        Environment_mark(node->value.instance.closure.closed);
+        break;
+
+      default:
+        assert(false);
+    }
+  }
+}
+
 // This need not be thread safe because environments exist on one thread only
 void Environment_set(Environment* self, const char* const key, Object value)
 {
@@ -123,162 +186,174 @@ Object Environment_get(Environment* self, const char* const symbol)
   assert(false);
 }
 
-Object integerLiteral(int32_t literal)
+# define POOL_SIZE 64
+struct EnvironmentPool
 {
-  Object result;
-  result.type = INTEGER;
-  result.instance.integer = literal;
-  return result;
-}
-
-Object stringLiteral(const char* literal)
-{
-  Object result;
-  result.type = STRING;
-  result.instance.string = literal;
-  return result;
-}
-
-// TODO Make this conditionally added
-Object operator$negate(Object input)
-{
-  assert(input.type == INTEGER);
-
-  Object result;
-  result.type = INTEGER;
-  result.instance.integer = -input.instance.integer;
-  return result;
-}
-
-Object operator$add(Object left, Object right)
-{
-  assert(left.type == INTEGER);
-  assert(right.type == INTEGER);
+  int8_t freeIndex;
+  bool allocatedFlags[POOL_SIZE];
+  Environment environments[POOL_SIZE];
+  EnvironmentPool* overflow;
+};
 
-  Object result;
-  result.type = INTEGER;
-  result.instance.integer = left.instance.integer + right.instance.integer;
-  return result;
-}
+EnvironmentPool* EnvironmentPool_construct();
+void EnvironmentPool_initialize(EnvironmentPool*);
+void EnvironmentPool_deinitialize(EnvironmentPool*);
+void EnvironmentPool_destruct(EnvironmentPool*);
 
-Object operator$subtract(Object left, Object right)
+EnvironmentPool* EnvironmentPool_construct()
 {
-  assert(left.type == INTEGER);
-  assert(right.type == INTEGER);
-
-  Object result;
-  result.type = INTEGER;
-  result.instance.integer = left.instance.integer - right.instance.integer;
+  EnvironmentPool* result = malloc(sizeof(EnvironmentPool));
+  EnvironmentPool_initialize(result);
   return result;
 }
 
-Object operator$multiply(Object left, Object right)
+void EnvironmentPool_initialize(EnvironmentPool* self)
 {
-  assert(left.type == INTEGER);
-  assert(right.type == INTEGER);
+  self->overflow = NULL;
+  self->freeIndex = 0;
 
-  Object result;
-  result.type = INTEGER;
-  result.instance.integer = left.instance.integer * right.instance.integer;
-  return result;
+  for(size_t i = 0; i < POOL_SIZE; i++)
+  {
+    self->allocatedFlags[i] = false;
+    self->environments[i].live = false;
+  }
 }
 
-Object operator$integerDivide(Object left, Object right)
+void EnvironmentPool_deinitialize(EnvironmentPool* self)
 {
-  assert(left.type == INTEGER);
-  assert(right.type == INTEGER);
+  // We can assume if this is being called, none of the Environments are live
+  for(int8_t i = 0; i < POOL_SIZE; i++)
+  {
+    if(self->allocatedFlags[i]) Environment_deinitialize(&(self->environments[i]));
+  }
 
-  Object result;
-  result.type = INTEGER;
-  result.instance.integer = left.instance.integer / right.instance.integer;
-  return result;
+  EnvironmentPool_destruct(self->overflow);
 }
 
-Object operator$modularDivide(Object left, Object right)
+void EnvironmentPool_destruct(EnvironmentPool* self)
 {
-  assert(left.type == INTEGER);
-  assert(right.type == INTEGER);
-
-  Object result;
-  result.type = INTEGER;
-  result.instance.integer = left.instance.integer % right.instance.integer;
-  return result;
+  if(self == NULL) return;
+  EnvironmentPool_deinitialize(self);
+  free(self);
 }
 
-Object operator$equals(Object left, Object right)
+void EnvironmentPool_GC(EnvironmentPool* self)
 {
-  assert(left.type == INTEGER);
-  assert(right.type == INTEGER);
-
-  Object result = { BOOLEAN, left.instance.integer == right.instance.integer };
-  return result;
-}
+  // Unmark all the environments
+  for(EnvironmentPool* current = self; current != NULL; current = current->overflow)
+  {
+    for(int8_t i = 0; i < POOL_SIZE; i++)
+    {
+      current->environments[i].mark = false;
+    }
+  }
 
-Object operator$notEquals(Object left, Object right)
-{
-  assert(left.type == INTEGER);
-  assert(right.type == INTEGER);
+  // Mark live enviroments and environments referenced by live environments
+  for(EnvironmentPool* current = self; current != NULL; current = current->overflow)
+  {
+    for(int8_t i = 0; i < POOL_SIZE; i++)
+    {
+      if(current->environments[i].live)
+      {
+        Environment_mark(&(current->environments[i]));
+      }
+    }
+  }
 
-  Object result = { BOOLEAN, left.instance.integer != right.instance.integer };
-  return result;
+  // TODO We never free pools until the very end--we could free a pool if two pools are empty
+  for(EnvironmentPool* current = self; current != NULL; current = current->overflow)
+  {
+    for(int8_t i = POOL_SIZE - 1; i >= 0; i--)
+    {
+      if(!current->environments[i].mark && current->allocatedFlags[i])
+      {
+        Environment_deinitialize(&(current->environments[i]));
+        current->allocatedFlags[i] = false;
+        current->freeIndex = i;
+      }
+    }
+  }
 }
 
-Object operator$greaterThan(Object left, Object right)
+Environment* EnvironmentPool_allocate(EnvironmentPool* self)
 {
-  assert(left.type == INTEGER);
-  assert(right.type == INTEGER);
+  for(EnvironmentPool* current = self; current != NULL; current = current->overflow)
+  {
+    for(; current->freeIndex < POOL_SIZE; current->freeIndex++)
+    {
+      if(!current->allocatedFlags[current->freeIndex])
+      {
+        current->allocatedFlags[current->freeIndex] = true;
+        return &(current->environments[current->freeIndex]);
+      }
+    }
+  }
 
-  Object result = { BOOLEAN, left.instance.integer > right.instance.integer };
-  return result;
-}
+  EnvironmentPool_GC(self);
 
-Object operator$lessThan(Object left, Object right)
-{
-  assert(left.type == INTEGER);
-  assert(right.type == INTEGER);
+  EnvironmentPool* previous;
+  for(EnvironmentPool* current = self; current != NULL; current = current->overflow)
+  {
+    for(; current->freeIndex < POOL_SIZE; current->freeIndex++)
+    {
+      if(!current->allocatedFlags[current->freeIndex])
+      {
+        current->allocatedFlags[current->freeIndex] = true;
+        return &(current->environments[current->freeIndex]);
+      }
+      else
+      {
+        previous = current;
+      }
+    }
+  }
 
-  Object result = { BOOLEAN, left.instance.integer < right.instance.integer };
-  return result;
+  previous->overflow = EnvironmentPool_construct();
+  return EnvironmentPool_allocate(previous->overflow);
 }
 
-Object operator$greaterThanOrEqual(Object left, Object right)
+Object integerLiteral(int32_t literal)
 {
-  assert(left.type == INTEGER);
-  assert(right.type == INTEGER);
-
-  Object result = { BOOLEAN, left.instance.integer >= right.instance.integer };
+  Object result;
+  result.type = INTEGER;
+  result.instance.integer = literal;
   return result;
 }
 
-Object operator$lessThanOrEqual(Object left, Object right)
+Object stringLiteral(const char* literal)
 {
-  assert(left.type == INTEGER);
-  assert(right.type == INTEGER);
-
-  Object result = { BOOLEAN, left.instance.integer <= right.instance.integer };
+  Object result;
+  result.type = STRING;
+  result.instance.string = literal;
   return result;
 }
 
-Object operator$and(Object left, Object right)
+// TODO Make this conditionally added
+Object operator$negate(Object input)
 {
-  assert(left.type == BOOLEAN);
-  assert(right.type == BOOLEAN);
+  assert(input.type == INTEGER);
 
-  Object result = { BOOLEAN, left.instance.boolean && right.instance.boolean };
+  Object result;
+  result.type = INTEGER;
+  result.instance.integer = -input.instance.integer;
   return result;
 }
 
-Object operator$or(Object left, Object right)
+{% for id in infix_declarations %}
+Object operator${{ id.name }}(Object left, Object right)
 {
-  assert(left.type == BOOLEAN);
-  assert(right.type == BOOLEAN);
+  assert(left.type == {{ id.in_type.upper() }});
+  assert(right.type == {{ id.in_type.upper() }});
 
-  Object result = { BOOLEAN, left.instance.boolean || right.instance.boolean };
+  Object result;
+  result.type = {{ id.out_type.upper() }};
+  result.instance.{{ id.out_type.lower() }} = left.instance.{{ id.in_type.lower() }} {{ id.operator }} right.instance.{{ id.in_type.lower() }};
   return result;
 }
+{% endfor %}
 
 {% if 'pow' in builtins %}
-Object builtin$pow$implementation(Environment* parent, size_t argc, Object* args)
+Object builtin$pow$implementation(EnvironmentPool* environmentPool, Environment* parent, size_t argc, Object* args)
 {
   assert(argc == 2);
 
@@ -294,11 +369,11 @@ Object builtin$pow$implementation(Environment* parent, size_t argc, Object* args
   return result;
 }
 
-Object builtin$pow = { CLOSURE, (Instance)builtin$pow$implementation };
+Object builtin$pow = { CLOSURE, (Instance)(Closure){ NULL, builtin$pow$implementation } };
 {% endif %}
 
 {% if 'print' in builtins %}
-Object builtin$print$implementation(Environment* parent, size_t argc, Object* args)
+Object builtin$print$implementation(EnvironmentPool* environmentPool, Environment* parent, size_t argc, Object* args)
 {
   for(size_t i = 0; i < argc; i++)
   {
@@ -309,6 +384,11 @@ Object builtin$print$implementation(Environment* parent, size_t argc, Object* ar
         fputs(output.instance.boolean ? "true" : "false", stdout);
         break;
 
+      case CLOSURE:
+        // TODO Print something better
+        printf("<Closure>");
+        break;
+
       case INTEGER:
         printf("%" PRId32, output.instance.integer);
         break;
@@ -327,30 +407,36 @@ Object builtin$print$implementation(Environment* parent, size_t argc, Object* ar
   return FALSE;
 }
 
-Object builtin$print = { CLOSURE, (Instance)builtin$print$implementation };
+Object builtin$print = { CLOSURE, (Instance)(Closure){ NULL, builtin$print$implementation } };
 {% endif %}
 
 {% for function_definition in function_definition_list %}
-Object user${{function_definition.name}}$implementation(Environment* parent, size_t argc, Object* args)
+Object user${{function_definition.name}}$implementation(EnvironmentPool* environmentPool, Environment* parent, size_t argc, Object* args)
 {
-  Environment* environment = malloc(sizeof(Environment));;
+  assert(argc == {{ function_definition.argument_name_list|length }});
+
+  Environment* environment = EnvironmentPool_allocate(environmentPool);
   Environment_initialize(environment, parent);
 
+  {% for argument_name in function_definition.argument_name_list %}
+  Environment_set(environment, "{{ argument_name }}", args[{{ loop.index0 }}]);
+  {% endfor %}
+
   {% for statement in function_definition.statement_list[:-1] %}
   {{ generate_statement(statement) }}
   {% endfor %}
 
   Object result = {{ generate_statement(function_definition.statement_list[-1]) }}
-  Environment_deinitialize(environment);
+
+  Environment_setLive(environment, false);
   return result;
 }
 
-Object user${{function_definition.name}} = { CLOSURE, (Instance)user${{function_definition.name}}$implementation };
 {% endfor %}
-
 int main(int argc, char** argv)
 {
-  Environment* environment = malloc(sizeof(Environment));
+  EnvironmentPool* environmentPool = EnvironmentPool_construct();
+  Environment* environment = EnvironmentPool_allocate(environmentPool);
   Environment_initialize(environment, NULL);
 
   // TODO Use the symbol from SYMBOL_LIST
@@ -362,8 +448,7 @@ int main(int argc, char** argv)
   {{ generate_statement(statement) }}
   {% endfor %}
 
-  Environment_deinitialize(environment);
-  free(environment);
-
+  Environment_setLive(environment, false);
+  EnvironmentPool_destruct(environmentPool);
   return 0;
 }