X-Git-Url: https://code.kerkeslager.com/?a=blobdiff_plain;f=generation.py;h=4bcf1380f899dfd0aaf8ed2b2412317079523774;hb=06df4340fb0920f2c9d1967300be517d88cf0ca1;hp=c47a39e334f0aa887128c5bd30c56898e0191da5;hpb=80efbcfcd42da6061d0e31add5cc1e6fb17b2f93;p=fur

diff --git a/generation.py b/generation.py
index c47a39e..4bcf138 100644
--- a/generation.py
+++ b/generation.py
@@ -22,10 +22,10 @@ CONSTANT_EXPRESSION_MAPPING = {
 def generate_constant_expression(c_constant_expression):
     return CONSTANT_EXPRESSION_MAPPING[c_constant_expression.value]
 
-def generate_symbol_expression(c_symbol_expression):
+def generate_symbol_expression(symbol_expression):
     return 'Environment_get(environment, SYMBOL_LIST[{}] /* symbol: {} */)'.format(
-        c_symbol_expression.symbol_list_index,
-        c_symbol_expression.symbol,
+        symbol_expression.symbol_list_index,
+        symbol_expression.symbol,
     )
 
 def generate_variable_expression(expression):
@@ -65,8 +65,13 @@ def generate_negation_expression(c_negation_expression):
     )
 
 def generate_function_call(function_call):
-    return 'Environment_get(environment, "{}").instance.closure(environment, {}, {})'.format(
-        function_call.name,
+    # TODO This gets called twice, which is really inefficient--normalization would also allow other clauses besides a variable reference
+    # TODO This should no longer be called "name", as it can be an expression of a few types
+    # TODO Check the type of the things being called
+    get_closure_clause = generate_expression(function_call.name)
+    return '{}.instance.closure.call(environmentPool, {}.instance.closure.closed, {}, {})'.format(
+        get_closure_clause,
+        get_closure_clause,
         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),
@@ -80,11 +85,11 @@ def generate_expression_statement(statement):
     # TODO Do we need to garbage collect the results of arbitrary statements?
     return '{};'.format(generate_expression(statement.expression))
 
-def generate_symbol_assignment_statement(c_assignment_statement):
+def generate_symbol_assignment_statement(statement):
     return 'Environment_set(environment, SYMBOL_LIST[{}] /* symbol: {} */, {});'.format(
-        c_assignment_statement.target_symbol_list_index,
-        c_assignment_statement.target,
-        generate_expression(c_assignment_statement.expression),
+        statement.target_symbol_list_index,
+        statement.target,
+        generate_expression(statement.expression),
     )
 
 def generate_array_variable_initialization_statement(statement):
@@ -142,7 +147,7 @@ def generate_if_else_statement(statement):
     return generated_if_clause + generated_if_statements + generated_else_statements
 
 def generate_function_declaration(statement):
-    return 'Environment_set(environment, "{}", user${});'.format(statement.name, statement.name)
+    return 'Environment_set(environment, "{}", (Object){{ CLOSURE, (Instance)(Closure){{ environment, user${}$implementation }} }});'.format(statement.name, statement.name)
 
 def generate_statement(statement):
     return {
@@ -161,7 +166,7 @@ def generate(program):
         builtins=tuple(sorted(program.builtin_set)),
         function_definition_list=program.function_definition_list,
         generate_statement=generate_statement,
-        operator_declarations=program.operator_declarations,
+        infix_declarations=program.operator_declarations,
         statements=program.statements,
         standard_libraries=list(sorted(program.standard_libraries)),
         string_literal_list=program.string_literal_list,