X-Git-Url: https://code.kerkeslager.com/?p=fur;a=blobdiff_plain;f=generation.py;h=d855d07b3a5c6f4d384f5d032e096a9608fae9cf;hp=b2e191e6f1c244368c67e4c1ccaf1f478915eeab;hb=1c6569d51fe16165b0114dfea143d8c6a971777c;hpb=3a076cfd2c46c9f3b51815facd613445722a340b

diff --git a/generation.py b/generation.py
index b2e191e..d855d07 100644
--- a/generation.py
+++ b/generation.py
@@ -33,21 +33,21 @@ def generate_structure_literal_expression(expression):
         expression.value_list_variable,
     )
 
+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.CFunctionCallExpression: generate_function_call,
         transformation.CIntegerLiteral: generate_integer_literal,
+        transformation.CLambdaExpression: generate_lambda_expression,
         transformation.CListConstructExpression: generate_list_construct_expression,
-        transformation.CListGetExpression: generate_list_get_expression,
         transformation.CStringLiteral: generate_string_literal,
         transformation.CStructureLiteralExpression: generate_structure_literal_expression,
         transformation.CSymbolExpression: generate_symbol_expression,
@@ -56,10 +56,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,
@@ -140,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),
@@ -156,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,
@@ -170,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),
     )