Remove unecessary pushing/popping for function calls

[fur] / generation.py

diff --git a/generation.py b/generation.py
index 44a8d16..d855d07 100644 (file)
--- a/generation.py
+++ b/generation.py
@@ -26,11 +26,6 @@ def generate_symbol_expression(symbol_expression):
 def generate_variable_expression(expression):
     return expression.variable
 
-def generate_function_call_for_fur_infix_operator(expression):
-    return 'operator${}(stack, jump)'.format(
-        expression.name,
-    )
-
 def generate_structure_literal_expression(expression):
     return 'Structure_construct({}, {}, {})'.format(
         expression.field_count,
@@ -38,52 +33,38 @@ def generate_structure_literal_expression(expression):
         expression.value_list_variable,
     )
 
-def generate_dot_expression(expression):
-    return 'Structure_get(&{}, SYMBOL_LIST[{}] /* symbol: "{}" */)'.format(
-        generate_variable_expression(expression.instance),
-        expression.symbol_list_index,
-        expression.symbol,
+def generate_lambda_expression(expression):
+    return '(Object){{ CLOSURE, (Instance)(Closure){{ environment, user${}${}$implementation }} }}'.format(
+        expression.name,
+        expression.index,
     )
 
 def generate_list_construct_expression(expression):
     return 'List_construct({})'.format(expression.allocate)
 
-def generate_list_get_expression(expression):
-    return 'List_get(&{}, {})'.format(
-        generate_expression(expression.list_expression),
-        generate_expression(expression.index_expression),
-    )
-
 def generate_expression(expression):
     return {
-        transformation.CDotExpression: generate_dot_expression,
         transformation.CFunctionCallExpression: generate_function_call,
-        transformation.CFunctionCallForFurInfixOperator: generate_function_call_for_fur_infix_operator,
         transformation.CIntegerLiteral: generate_integer_literal,
+        transformation.CLambdaExpression: generate_lambda_expression,
         transformation.CListConstructExpression: generate_list_construct_expression,
-        transformation.CListGetExpression: generate_list_get_expression,
-        transformation.CNegationExpression: generate_negation_expression,
         transformation.CStringLiteral: generate_string_literal,
         transformation.CStructureLiteralExpression: generate_structure_literal_expression,
         transformation.CSymbolExpression: generate_symbol_expression,
         transformation.CVariableExpression: generate_variable_expression,
     }[type(expression)](expression)
 
-def generate_negation_expression(c_negation_expression):
-    return 'operator$negate({})'.format(
-        generate_expression(c_negation_expression.value)
-    )
-
 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)
-    return '{}.instance.closure.call(environmentPool, {}.instance.closure.closed, {}, stack, jump)'.format(
+    function_expression = generate_expression(function_call.function_expression)
+    return '{}.instance.closure.call(environmentPool, {}.instance.closure.closed, {}, stack, {}, jump)'.format(
         function_expression,
         function_expression,
         function_call.argument_count,
+        function_call.metadata.line,
     )
 
 def generate_expression_statement(statement):
@@ -159,9 +140,6 @@ def generate_if_else_statement(statement):
 
     return generated_if_clause + generated_if_statement_list + generated_else_statement_list
 
-def generate_function_declaration(statement):
-    return 'Environment_set(environment, "{}", (Object){{ CLOSURE, (Instance)(Closure){{ environment, user${}$implementation }} }});'.format(statement.name, statement.name)
-
 def generate_list_append_statement(statement):
     return 'List_append(&{}, {});'.format(
         generate_expression(statement.list_expression),
@@ -175,7 +153,6 @@ def generate_statement(statement):
     return {
         transformation.CArrayVariableInitializationStatement: generate_array_variable_initialization_statement,
         transformation.CExpressionStatement: generate_expression_statement,
-        transformation.CFunctionDeclaration: generate_function_declaration,
         transformation.CIfElseStatement: generate_if_else_statement,
         transformation.CListAppendStatement: generate_list_append_statement,
         transformation.CPushStatement: generate_push_statement,
@@ -189,6 +166,7 @@ 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),
     )