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

diff --git a/generation.py b/generation.py
index 6c1cf0b..d855d07 100644
--- 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):
@@ -55,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,
@@ -139,12 +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),
@@ -158,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,
@@ -172,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),
     )