Handle arguments to functions

[fur] / generation.py

diff --git a/generation.py b/generation.py
index 74a3fa5..645441f 100644 (file)
--- a/generation.py
+++ b/generation.py
@@ -34,8 +34,9 @@ def generate_structure_literal_expression(expression):
     )
 
 def generate_lambda_expression(expression):
-    return '(Object){{ CLOSURE, (Instance)(Closure){{ environment, user${}$implementation }} }}'.format(
+    return '(Object){{ CLOSURE, (Instance)(Closure){{ environment, user${}${}$implementation }} }}'.format(
         expression.name,
+        expression.index,
     )
 
 def generate_list_construct_expression(expression):
@@ -44,6 +45,7 @@ def generate_list_construct_expression(expression):
 def generate_expression(expression):
     return {
         transformation.CFunctionCallExpression: generate_function_call,
+        transformation.CIfElseExpression: generate_if_else_expression,
         transformation.CIntegerLiteral: generate_integer_literal,
         transformation.CLambdaExpression: generate_lambda_expression,
         transformation.CListConstructExpression: generate_list_construct_expression,
@@ -55,10 +57,10 @@ def generate_expression(expression):
 
 def generate_function_call(function_call):
     # This gets called twice, so we want to be sure it is efficient and without side effects
-    assert isinstance(function_call.function_expression, transformation.CVariableExpression)
+    assert isinstance(function_call.function_expression, transformation.CSymbolExpression)
 
     # TODO Check the type of the things being called
-    function_expression = generate_variable_expression(function_call.function_expression)
+    function_expression = generate_expression(function_call.function_expression)
     return '{}.instance.closure.call(environmentPool, {}.instance.closure.closed, {}, stack, {}, jump)'.format(
         function_expression,
         function_expression,
@@ -97,17 +99,10 @@ def generate_variable_initialization_statement(statement):
         generate_expression(statement.expression),
     )
 
-def generate_variable_reassignment_statement(statement):
-    return '{} = {};'.format(
-        statement.variable,
-        generate_expression(statement.expression),
-    )
-
-
 def indent(s):
     return '\n'.join(' ' * 2 + l for l in s.split('\n'))
 
-def generate_if_else_statement(statement):
+def generate_if_else_expression(statement):
     # TODO Check that the argument is boolean
     condition_expression = '{}.instance.boolean'.format(
         generate_expression(statement.condition_expression),
@@ -152,19 +147,18 @@ def generate_statement(statement):
     return {
         transformation.CArrayVariableInitializationStatement: generate_array_variable_initialization_statement,
         transformation.CExpressionStatement: generate_expression_statement,
-        transformation.CIfElseStatement: generate_if_else_statement,
         transformation.CListAppendStatement: generate_list_append_statement,
         transformation.CPushStatement: generate_push_statement,
         transformation.CSymbolAssignmentStatement: generate_symbol_assignment_statement,
         transformation.CSymbolArrayVariableInitializationStatement: generate_symbol_array_variable_initialization_statement,
         transformation.CVariableInitializationStatement: generate_variable_initialization_statement,
-        transformation.CVariableReassignmentStatement: generate_variable_reassignment_statement,
     }[type(statement)](statement)
 
 def generate_function_definition(definition):
     template = ENV.get_template('function_definition.c')
     return template.render(
         name=definition.name,
+        index=definition.index,
         argument_name_list=definition.argument_name_list,
         statement_list=list(generate_statement(s) for s in definition.statement_list),
     )