Set the environment to the same variable name

[fur] / generation.py

diff --git a/generation.py b/generation.py
index 4fe8de4..64554d0 100644 (file)
--- a/generation.py
+++ b/generation.py
@@ -12,7 +12,10 @@ def generate_integer_literal(c_integer_literal):
     return 'integerLiteral({})'.format(c_integer_literal.value)
 
 def generate_string_literal(c_string_literal):
-    return 'stringLiteral(STRING_LITERAL_LIST[{}])'.format(c_string_literal.index)
+    return 'stringLiteral(STRING_LITERAL_LIST[{}] /* string: {} */)'.format(
+        c_string_literal.index,
+        repr(c_string_literal.value),
+    )
 
 def generate_symbol_expression(symbol_expression):
     return 'Environment_get(environment, SYMBOL_LIST[{}] /* symbol: {} */)'.format(
@@ -23,30 +26,47 @@ def generate_symbol_expression(symbol_expression):
 def generate_variable_expression(expression):
     return expression.variable
 
-def generate_expression(expression):
-    if isinstance(expression, transformation.CNegationExpression):
-        return generate_negation_expression(expression)
+def generate_function_call_for_fur_infix_operator(expression):
+    return 'operator${}(stack, jump, {})'.format(
+        expression.name,
+        expression.metadata.line,
+    )
 
-    if isinstance(expression, transformation.CFunctionCallExpression):
-        return generate_function_call(expression)
+def generate_structure_literal_expression(expression):
+    return 'Structure_construct({}, {}, {})'.format(
+        expression.field_count,
+        expression.symbol_list_variable,
+        expression.value_list_variable,
+    )
 
-    LITERAL_TYPE_MAPPING = {
-        transformation.CIntegerLiteral: generate_integer_literal,
-        transformation.CStringLiteral: generate_string_literal,
-        transformation.CSymbolExpression: generate_symbol_expression,
-    }
+def generate_dot_expression(expression):
+    return 'Structure_get(&{}, SYMBOL_LIST[{}] /* symbol: "{}" */)'.format(
+        generate_variable_expression(expression.instance),
+        expression.symbol_list_index,
+        expression.symbol,
+    )
 
-    if type(expression) in LITERAL_TYPE_MAPPING:
-        return LITERAL_TYPE_MAPPING[type(expression)](expression)
+def generate_list_construct_expression(expression):
+    return 'List_construct({})'.format(expression.allocate)
 
-    if isinstance(expression, transformation.CFunctionCallForFurInfixOperator):
-        return 'operator${}({}, {})'.format(
-            expression.name,
-            generate_expression(expression.left),
-            generate_expression(expression.right),
-        )
+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.CDotExpression: generate_dot_expression,
+        transformation.CFunctionCallExpression: generate_function_call,
+        transformation.CFunctionCallForFurInfixOperator: generate_function_call_for_fur_infix_operator,
+        transformation.CIntegerLiteral: generate_integer_literal,
+        transformation.CListConstructExpression: generate_list_construct_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)
 
@@ -61,17 +81,14 @@ 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, jump)'.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):
-    # TODO Do we need to garbage collect the results of arbitrary statements?
-    return '{};'.format(generate_expression(statement.expression))
+    return 'Object_deinitialize(&({}));'.format(generate_expression(statement.expression))
 
 def generate_symbol_assignment_statement(statement):
     return 'Environment_set(environment, SYMBOL_LIST[{}] /* symbol: {} */, {});'.format(
@@ -86,6 +103,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,
@@ -137,13 +163,25 @@ def generate_if_else_statement(statement):
 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),
+        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,
         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,
         transformation.CSymbolAssignmentStatement: generate_symbol_assignment_statement,
-        transformation.CArrayVariableInitializationStatement: generate_array_variable_initialization_statement,
+        transformation.CSymbolArrayVariableInitializationStatement: generate_symbol_array_variable_initialization_statement,
         transformation.CVariableInitializationStatement: generate_variable_initialization_statement,
         transformation.CVariableReassignmentStatement: generate_variable_reassignment_statement,
     }[type(statement)](statement)
@@ -157,6 +195,16 @@ def generate_function_definition(definition):
     )
     return definition
 
+C_ESCAPES = {
+    '"':    r'\"',
+}
+
+def escape_character(ch):
+    return C_ESCAPES.get(ch, ch)
+
+def escape_string_literal(string_literal):
+    return  ''.join(escape_character(ch) for ch in string_literal)
+
 def generate(program):
     template = ENV.get_template('program.c')
     return template.render(
@@ -165,7 +213,7 @@ def generate(program):
         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,
+        string_literal_list=list(escape_string_literal(s) for s in program.string_literal_list),
         symbol_list=program.symbol_list,
     )