X-Git-Url: https://code.kerkeslager.com/?p=fur;a=blobdiff_plain;f=generation.py;h=1694e1fee2839824cef3de2b627481ed6eae0ead;hp=b48342ad137feb7e545b062ad6a7cf7ce9a2d590;hb=3da330f045ed7fcb66ee9d9447de320680263699;hpb=d8fdecee02795cb0372627208c4f0a52ae7814f9

diff --git a/generation.py b/generation.py
index b48342a..1694e1f 100644
--- a/generation.py
+++ b/generation.py
@@ -14,18 +14,10 @@ def generate_integer_literal(c_integer_literal):
 def generate_string_literal(c_string_literal):
     return 'stringLiteral(STRING_LITERAL_LIST[{}])'.format(c_string_literal.index)
 
-CONSTANT_EXPRESSION_MAPPING = {
-    'true':     'TRUE',
-    'false':    'FALSE',
-}
-
-def generate_constant_expression(c_constant_expression):
-    return CONSTANT_EXPRESSION_MAPPING[c_constant_expression.value]
-
-def generate_symbol_expression(c_symbol_expression):
-    return 'Environment_get(&environment, SYMBOL_LIST[{}] /* symbol: {} */)'.format(
-        c_symbol_expression.symbol_list_index,
-        c_symbol_expression.symbol,
+def generate_symbol_expression(symbol_expression):
+    return 'Environment_get(environment, SYMBOL_LIST[{}] /* symbol: {} */)'.format(
+        symbol_expression.symbol_list_index,
+        symbol_expression.symbol,
     )
 
 def generate_variable_expression(expression):
@@ -41,7 +33,6 @@ def generate_expression(expression):
     LITERAL_TYPE_MAPPING = {
         transformation.CIntegerLiteral: generate_integer_literal,
         transformation.CStringLiteral: generate_string_literal,
-        transformation.CConstantExpression: generate_constant_expression,
         transformation.CSymbolExpression: generate_symbol_expression,
     }
 
@@ -65,26 +56,27 @@ 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),
     )
 
 def generate_expression_statement(statement):
-    # TODO Do this at an earlier pass
-    if isinstance(statement.expression, transformation.CVariableExpression):
-        return '';
-
     # 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):
-    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),
+def generate_symbol_assignment_statement(statement):
+    return 'Environment_set(environment, SYMBOL_LIST[{}] /* symbol: {} */, {});'.format(
+        statement.target_symbol_list_index,
+        statement.target,
+        generate_expression(statement.expression),
     )
 
 def generate_array_variable_initialization_statement(statement):
@@ -142,7 +134,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 {
@@ -155,13 +147,22 @@ def generate_statement(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,
+        argument_name_list=definition.argument_name_list,
+        statement_list=list(generate_statement(s) for s in definition.statement_list),
+    )
+    return definition
+
 def generate(program):
     template = ENV.get_template('program.c')
     return template.render(
         builtins=tuple(sorted(program.builtin_set)),
-        function_definition_list=program.function_definition_list,
-        generate_statement=generate_statement,
-        statements=program.statements,
+        function_definition_list=list(generate_function_definition(fd) for fd in program.function_definition_list),
+        infix_declarations=program.operator_declarations,
+        statements=list(generate_statement(s) for s in program.statements),
         standard_libraries=list(sorted(program.standard_libraries)),
         string_literal_list=program.string_literal_list,
         symbol_list=program.symbol_list,