X-Git-Url: https://code.kerkeslager.com/?a=blobdiff_plain;f=generation.py;h=145132f5abb996b3b6ca1235e2e1c27282bfd365;hb=a7d494789ae5f65c635b4a31e0468b2c17acdd34;hp=99fd681f459c02687bcf873d8de0c9379da2e401;hpb=02d64def49065ad614fe0ee2a85060666552192e;p=fur

diff --git a/generation.py b/generation.py
index 99fd681..145132f 100644
--- a/generation.py
+++ b/generation.py
@@ -33,6 +33,20 @@ def generate_function_call_for_fur_infix_operator(expression):
         generate_expression(expression.right),
     )
 
+def generate_structure_literal_expression(expression):
+    return 'Structure_construct({}, {}, {})'.format(
+        expression.field_count,
+        expression.symbol_list_variable,
+        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_list_construct_expression(expression):
     return 'List_construct({})'.format(expression.allocate)
 
@@ -44,6 +58,7 @@ def generate_list_get_expression(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,
@@ -51,6 +66,7 @@ def generate_expression(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)
@@ -66,12 +82,10 @@ def generate_function_call(function_call):
 
     # 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, {}, {})'.format(
+    return '{}.instance.closure.call(environmentPool, {}.instance.closure.closed, {}, stack)'.format(
         function_expression,
         function_expression,
         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):
@@ -90,6 +104,15 @@ def generate_array_variable_initialization_statement(statement):
         ', '.join(generate_expression(i) for i in statement.items),
     )
 
+def generate_symbol_array_variable_initialization_statement(statement):
+    return 'const char* {}[] = {{ {} }};'.format(
+        statement.variable,
+        ', '.join('SYMBOL_LIST[{}] /* symbol: "{}" */'.format(
+            statement.symbol_list_indices[i],
+            statement.symbol_list[i],
+        ) for i in range(len(statement.symbol_list))),
+    )
+
 def generate_variable_initialization_statement(statement):
     return 'Object {} = {};'.format(
         statement.variable,
@@ -147,6 +170,9 @@ def generate_list_append_statement(statement):
         generate_expression(statement.item_expression),
     )
 
+def generate_push_statement(statement):
+    return 'Stack_push(stack, {});'.format(generate_expression(statement.expression))
+
 def generate_statement(statement):
     return {
         transformation.CArrayVariableInitializationStatement: generate_array_variable_initialization_statement,
@@ -154,7 +180,9 @@ def generate_statement(statement):
         transformation.CFunctionDeclaration: generate_function_declaration,
         transformation.CIfElseStatement: generate_if_else_statement,
         transformation.CListAppendStatement: generate_list_append_statement,
+        transformation.CPushStatement: generate_push_statement,
         transformation.CSymbolAssignmentStatement: generate_symbol_assignment_statement,
+        transformation.CSymbolArrayVariableInitializationStatement: generate_symbol_array_variable_initialization_statement,
         transformation.CVariableInitializationStatement: generate_variable_initialization_statement,
         transformation.CVariableReassignmentStatement: generate_variable_reassignment_statement,
     }[type(statement)](statement)