Appease -Wall

[fur] / templates / program.c

diff --git a/templates/program.c b/templates/program.c
index 0cab0c8..e2e553b 100644 (file)
--- a/templates/program.c
+++ b/templates/program.c
@@ -55,12 +55,12 @@ struct Object
 
 const Object TRUE = {
   BOOLEAN,
-  true
+  { true }
 };
 
 const Object FALSE = {
   BOOLEAN,
-  false
+  { false }
 };
 
 struct EnvironmentNode
@@ -72,24 +72,34 @@ struct EnvironmentNode
 
 struct Environment
 {
+  size_t referenceCount;
   Environment* parent;
   EnvironmentNode* root;
 };
 
-void Environment_initialize(Environment* self, Environment* parent)
+Environment* Environment_construct(Environment* parent)
 {
-  self->parent = parent;
-  self->root = NULL;
+  Environment* result = malloc(sizeof(Environment));
+  result->referenceCount = 1;
+  result->parent = parent;
+  result->root = NULL;
+  return result;
 }
 
-void Environment_deinitialize(Environment* self)
+void Environment_destruct(Environment* self)
 {
-  EnvironmentNode* next;
-  for(EnvironmentNode* node = self->root; node != NULL; node = next)
+  self->referenceCount--;
+
+  if(self->referenceCount == 0)
   {
-    // No objects are allocated on the heap (yet!) so we don't need to free anything else
-    next = node->next;
-    free(node);
+    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);
+    }
+    free(self);
   }
 }
 
@@ -210,7 +220,7 @@ Object operator$equals(Object left, Object right)
   assert(left.type == INTEGER);
   assert(right.type == INTEGER);
 
-  Object result = { BOOLEAN, left.instance.integer == right.instance.integer };
+  Object result = { BOOLEAN, { left.instance.integer == right.instance.integer } };
   return result;
 }
 
@@ -219,7 +229,7 @@ Object operator$notEquals(Object left, Object right)
   assert(left.type == INTEGER);
   assert(right.type == INTEGER);
 
-  Object result = { BOOLEAN, left.instance.integer != right.instance.integer };
+  Object result = { BOOLEAN, { left.instance.integer != right.instance.integer } };
   return result;
 }
 
@@ -228,7 +238,7 @@ Object operator$greaterThan(Object left, Object right)
   assert(left.type == INTEGER);
   assert(right.type == INTEGER);
 
-  Object result = { BOOLEAN, left.instance.integer > right.instance.integer };
+  Object result = { BOOLEAN, { left.instance.integer > right.instance.integer } };
   return result;
 }
 
@@ -237,7 +247,7 @@ Object operator$lessThan(Object left, Object right)
   assert(left.type == INTEGER);
   assert(right.type == INTEGER);
 
-  Object result = { BOOLEAN, left.instance.integer < right.instance.integer };
+  Object result = { BOOLEAN, { left.instance.integer < right.instance.integer } };
   return result;
 }
 
@@ -246,7 +256,7 @@ Object operator$greaterThanOrEqual(Object left, Object right)
   assert(left.type == INTEGER);
   assert(right.type == INTEGER);
 
-  Object result = { BOOLEAN, left.instance.integer >= right.instance.integer };
+  Object result = { BOOLEAN, { left.instance.integer >= right.instance.integer } };
   return result;
 }
 
@@ -255,7 +265,7 @@ Object operator$lessThanOrEqual(Object left, Object right)
   assert(left.type == INTEGER);
   assert(right.type == INTEGER);
 
-  Object result = { BOOLEAN, left.instance.integer <= right.instance.integer };
+  Object result = { BOOLEAN, { left.instance.integer <= right.instance.integer } };
   return result;
 }
 
@@ -264,7 +274,7 @@ Object operator$and(Object left, Object right)
   assert(left.type == BOOLEAN);
   assert(right.type == BOOLEAN);
 
-  Object result = { BOOLEAN, left.instance.boolean && right.instance.boolean };
+  Object result = { BOOLEAN, { left.instance.boolean && right.instance.boolean } };
   return result;
 }
 
@@ -273,7 +283,7 @@ Object operator$or(Object left, Object right)
   assert(left.type == BOOLEAN);
   assert(right.type == BOOLEAN);
 
-  Object result = { BOOLEAN, left.instance.boolean || right.instance.boolean };
+  Object result = { BOOLEAN, { left.instance.boolean || right.instance.boolean } };
   return result;
 }
 
@@ -333,15 +343,14 @@ Object builtin$print = { CLOSURE, (Instance)builtin$print$implementation };
 {% for function_definition in function_definition_list %}
 Object user${{function_definition.name}}$implementation(Environment* parent, size_t argc, Object* args)
 {
-  Environment environment;
-  Environment_initialize(&environment, parent);
+  Environment* environment = Environment_construct(parent);
 
   {% 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_destruct(environment);
   return result;
 }
 
@@ -350,19 +359,18 @@ Object user${{function_definition.name}} = { CLOSURE, (Instance)user${{function_
 
 int main(int argc, char** argv)
 {
-  Environment environment;
-  Environment_initialize(&environment, NULL);
+  Environment* environment = Environment_construct(NULL);
 
   // TODO Use the symbol from SYMBOL_LIST
   {% for builtin in builtins %}
-  Environment_set(&environment, "{{ builtin }}", builtin${{ builtin }});
+  Environment_set(environment, "{{ builtin }}", builtin${{ builtin }});
   {% endfor %}
 
   {% for statement in statements %}
   {{ generate_statement(statement) }}
   {% endfor %}
 
-  Environment_deinitialize(&environment);
+  Environment_destruct(environment);
 
   return 0;
 }