Get called functions from the environment

[fur] / generation.py

diff --git a/generation.py b/generation.py
index 149a5e2..6bc2384 100644 (file)
--- a/generation.py
+++ b/generation.py
@@ -49,7 +49,7 @@ def generate_expression(expression):
         return LITERAL_TYPE_MAPPING[type(expression)](expression)
 
     if isinstance(expression, transformation.CFunctionCallForFurInfixOperator):
-        return 'builtin${}({}, {})'.format(
+        return 'operator${}({}, {})'.format(
             expression.name,
             generate_expression(expression.left),
             generate_expression(expression.right),
@@ -60,14 +60,16 @@ def generate_expression(expression):
     }[type(expression)](expression)
 
 def generate_negation_expression(c_negation_expression):
-    return 'builtin$negate({})'.format(
+    return 'operator$negate({})'.format(
         generate_expression(c_negation_expression.value)
     )
 
-def generate_function_call(c_function_call):
-    return '{}({})'.format(
-        c_function_call.name,
-        ', '.join(generate_expression(argument) for argument in c_function_call.arguments),
+def generate_function_call(function_call):
+    return 'Environment_get(environment, "{}").instance.closure({}, {})'.format(
+        function_call.name,
+        function_call.argument_count,
+        # TODO This is just a single item containing a reference to the items list--make that clearer
+        generate_expression(function_call.argument_items),
     )
 
 def generate_expression_statement(statement):
@@ -81,6 +83,12 @@ def generate_symbol_assignment_statement(c_assignment_statement):
         generate_expression(c_assignment_statement.expression),
     )
 
+def generate_array_variable_initialization_statement(statement):
+    return 'Object {}[] = {{ {} }};'.format(
+        statement.variable,
+        ', '.join(generate_expression(i) for i in statement.items),
+    )
+
 def generate_variable_initialization_statement(statement):
     return 'Object {} = {};'.format(
         statement.variable,
@@ -110,6 +118,7 @@ def generate_statement(statement):
         transformation.CExpressionStatement: generate_expression_statement,
         transformation.CIfElseStatement: generate_if_else_statement,
         transformation.CSymbolAssignmentStatement: generate_symbol_assignment_statement,
+        transformation.CArrayVariableInitializationStatement: generate_array_variable_initialization_statement,
         transformation.CVariableInitializationStatement: generate_variable_initialization_statement,
         transformation.CVariableReassignmentStatement: generate_variable_reassignment_statement,
     }[type(statement)](statement)