Added structs

[fur] / templates / program.c

diff --git a/templates/program.c b/templates/program.c
index 1766967..d6df732 100644 (file)
--- a/templates/program.c
+++ b/templates/program.c
@@ -53,7 +53,9 @@ enum Type
   CLOSURE,
   INTEGER,
   LIST,
-  STRING,
+  STRING_CONCATENATION,
+  STRING_LITERAL,
+  STRUCTURE,
   VOID
 };
 
@@ -74,13 +76,28 @@ struct List
   Object* items;
 };
 
+struct StringConcatenation;
+typedef struct StringConcatenation StringConcatenation;
+
+struct Structure;
+typedef struct Structure Structure;
+struct Structure
+{
+  size_t reference_count;
+  size_t length;
+  const char** symbol_list;
+  Object* value_list;
+};
+
 union Instance
 {
   bool boolean;
   Closure closure;
   int32_t integer;
   List list;
-  const char* string;
+  StringConcatenation* string_concatenation;
+  const char* string_literal;
+  Structure* structure;
 };
 
 struct Object
@@ -93,6 +110,13 @@ const Object builtin$true = { BOOLEAN, (Instance)(bool){ true } };
 const Object builtin$false = { BOOLEAN, (Instance)(bool){ false } };
 const Object builtin$nil = { VOID, { 0 } };
 
+struct StringConcatenation
+{
+  size_t referenceCount;
+  Object left;
+  Object right;
+};
+
 Object List_construct(size_t allocate)
 {
   Object* items = malloc(sizeof(Object) * allocate);
@@ -125,6 +149,65 @@ Object List_get(Object* list, Object index)
   return list->instance.list.items[index.instance.integer];
 }
 
+Object Object_rereference(Object self)
+{
+  switch(self.type)
+  {
+    case BOOLEAN:
+    case CLOSURE:
+    case INTEGER:
+    case STRING_LITERAL:
+    case VOID:
+      return self;
+
+    case STRING_CONCATENATION:
+      self.instance.string_concatenation->referenceCount++;
+      return self;
+
+    case STRUCTURE:
+      self.instance.structure->reference_count++;
+      return self;
+
+    default:
+      assert(false);
+  }
+}
+
+Object Structure_construct(size_t length, const char** symbol_list, Object* value_list)
+{
+  Structure* structure = malloc(sizeof(Structure));
+  structure->reference_count = 1;
+  structure->length = length;
+  structure->symbol_list = malloc(sizeof(const char*) * length);
+  structure->value_list = malloc(sizeof(Object) * length);
+
+  // TODO Don't allow assignment of mutable structures, as this screws up reference counting
+  for(size_t i = 0; i < length; i++)
+  {
+    structure->symbol_list[i] = symbol_list[i];
+    structure->value_list[i] = Object_rereference(value_list[i]);
+  }
+
+  Object result = { STRUCTURE, (Instance)structure };
+
+  return result;
+}
+
+Object Structure_get(Object* self, const char* symbol)
+{
+  assert(self->type == STRUCTURE);
+
+  for(size_t i = 0; i < self->instance.structure->length; i++)
+  {
+    if(self->instance.structure->symbol_list[i] == symbol)
+    {
+      return self->instance.structure->value_list[i];
+    }
+  }
+
+  assert(false);
+}
+
 struct EnvironmentNode
 {
   const char* key;
@@ -151,30 +234,67 @@ void Environment_initialize(Environment* self, Environment* parent)
   self->live = true;
 }
 
-void Environment_deinitialize(Environment* self)
+void Object_deinitialize(Object* self)
 {
-  EnvironmentNode* next;
-  for(EnvironmentNode* node = self->root; node != NULL; node = next)
+  switch(self->type)
   {
-    next = node->next;
+    case BOOLEAN:
+      break;
+    case CLOSURE:
+      break;
+    case INTEGER:
+      break;
+    case STRING_LITERAL:
+      break;
+    case VOID:
+      break;
+
+    case LIST:
+      for(size_t i = 0; i < self->instance.list.length; i++) {
+        Object_deinitialize(&(self->instance.list.items[i]));
+      }
 
-    switch(node->value.type)
-    {
-      case BOOLEAN:
-      case CLOSURE:
-      case INTEGER:
-      case STRING:
-      case VOID:
-        break;
+      free(self->instance.list.items);
+      break;
 
-      case LIST:
-        free(node->value.instance.list.items);
-        break;
+    case STRING_CONCATENATION:
+      self->instance.string_concatenation->referenceCount--;
 
-      default:
-        assert(false);
-    }
+      if(self->instance.string_concatenation->referenceCount == 0)
+      {
+        Object_deinitialize(&(self->instance.string_concatenation->left));
+        Object_deinitialize(&(self->instance.string_concatenation->right));
+        free(self->instance.string_concatenation);
+      }
+      break;
+
+    case STRUCTURE:
+      self->instance.structure->reference_count--;
+
+      if(self->instance.structure->reference_count == 0)
+      {
+        for(size_t i = 0; i < self->instance.structure->length; i++)
+        {
+          Object_deinitialize(&(self->instance.structure->value_list[i]));
+        }
+        free(self->instance.structure->symbol_list);
+        free(self->instance.structure->value_list);
+        free(self->instance.structure);
+      }
+      break;
 
+    default:
+      assert(false);
+  }
+}
+
+void Environment_deinitialize(Environment* self)
+{
+  EnvironmentNode* next;
+  for(EnvironmentNode* node = self->root; node != NULL; node = next)
+  {
+    next = node->next;
+    Object_deinitialize(&(node->value));
     free(node);
   }
 }
@@ -199,7 +319,7 @@ void Environment_mark(Environment* self)
     {
       case BOOLEAN:
       case INTEGER:
-      case STRING:
+      case STRING_LITERAL:
       case VOID:
         break;
 
@@ -380,8 +500,8 @@ Object integerLiteral(int32_t literal)
 Object stringLiteral(const char* literal)
 {
   Object result;
-  result.type = STRING;
-  result.instance.string = literal;
+  result.type = STRING_LITERAL;
+  result.instance.string_literal = literal;
   return result;
 }
 
@@ -396,6 +516,36 @@ Object operator$negate(Object input)
   return result;
 }
 
+// TODO Make this conditionally added
+Object operator$concatenate(Object left, Object right)
+{
+  switch(left.type) {
+    case STRING_CONCATENATION:
+    case STRING_LITERAL:
+      break;
+
+    default:
+      assert(false);
+  }
+
+  switch(right.type) {
+    case STRING_CONCATENATION:
+    case STRING_LITERAL:
+      break;
+
+    default:
+      assert(false);
+  }
+
+  StringConcatenation* concatenation = malloc(sizeof(StringConcatenation));
+  concatenation->referenceCount = 1;
+  concatenation->left = Object_rereference(left);
+  concatenation->right = Object_rereference(right);
+
+  Object result = { STRING_CONCATENATION, (Instance)concatenation };
+  return result;
+}
+
 {% for id in infix_declarations %}
 Object operator${{ id.name }}(Object left, Object right)
 {
@@ -450,9 +600,14 @@ Object builtin$print$implementation(EnvironmentPool* environmentPool, Environmen
         printf("%" PRId32, output.instance.integer);
         break;
 
-      case STRING:
+      case STRING_CONCATENATION:
+        builtin$print$implementation(NULL, NULL, 1, &(output.instance.string_concatenation->left));
+        builtin$print$implementation(NULL, NULL, 1, &(output.instance.string_concatenation->right));
+        break;
+
+      case STRING_LITERAL:
         // Using fwrite instead of printf to handle size_t length
-        printf("%s", output.instance.string);
+        printf("%s", output.instance.string_literal);
         break;
 
       case VOID:
@@ -462,6 +617,7 @@ Object builtin$print$implementation(EnvironmentPool* environmentPool, Environmen
       default:
         assert(false);
     }
+    Object_deinitialize(&output);
   }
 
   // TODO Return something better