Add constant symbol list, which solves all the symbol allocation problems

[fur] / transformation.py

diff --git a/transformation.py b/transformation.py
index 0260696..e3658bc 100644 (file)
--- a/transformation.py
+++ b/transformation.py
@@ -19,7 +19,8 @@ CStringLiteral = collections.namedtuple(
 CSymbolExpression = collections.namedtuple(
     'CSymbolExpression',
     [
-        'value',
+        'symbol',
+        'symbol_list_index',
     ],
 )
 
@@ -82,6 +83,7 @@ CAssignmentStatement = collections.namedtuple(
     'CAssignmentStatement',
     [
         'target',
+        'target_symbol_list_index',
         'expression',
     ],
 )
@@ -92,6 +94,7 @@ CProgram = collections.namedtuple(
         'builtins',
         'statements',
         'standard_libraries',
+        'symbol_list',
     ],
 )
 
@@ -100,17 +103,25 @@ BUILTINS = {
     'print':    ['stdio.h'],
 }
 
-def transform_expression(builtin_dependencies, expression):
+def transform_expression(builtin_dependencies, symbol_list, expression):
     if isinstance(expression, parsing.FurNegationExpression):
-        return transform_negation_expression(builtin_dependencies, expression)
+        return transform_negation_expression(builtin_dependencies, symbol_list, expression)
 
     if isinstance(expression, parsing.FurFunctionCallExpression):
-        return transform_function_call_expression(builtin_dependencies, expression)
+        return transform_function_call_expression(builtin_dependencies, symbol_list, expression)
+
+    if isinstance(expression, parsing.FurSymbolExpression):
+        if expression.value not in symbol_list:
+            symbol_list.append(expression.value)
+
+        return CSymbolExpression(
+            symbol=expression.value,
+            symbol_list_index=symbol_list.index(expression.value),
+        )
 
     LITERAL_TYPE_MAPPING = {
         parsing.FurIntegerLiteralExpression: CIntegerLiteral,
         parsing.FurStringLiteralExpression: CStringLiteral,
-        parsing.FurSymbolExpression: CSymbolExpression,
     }
 
     if type(expression) in LITERAL_TYPE_MAPPING:
@@ -125,42 +136,56 @@ def transform_expression(builtin_dependencies, expression):
     }
 
     return INFIX_TYPE_MAPPING[type(expression)](
-        left=transform_expression(builtin_dependencies, expression.left),
-        right=transform_expression(builtin_dependencies, expression.right),
+        left=transform_expression(builtin_dependencies, symbol_list, expression.left),
+        right=transform_expression(builtin_dependencies, symbol_list, expression.right),
     )
 
-def transform_assignment_statement(builtin_dependencies, assignment_statement):
+def transform_assignment_statement(builtin_dependencies, symbol_list, assignment_statement):
     # TODO Check that target is not a builtin
+    if assignment_statement.target not in symbol_list:
+        symbol_list.append(assignment_statement.target)
+
     return CAssignmentStatement(
         target=assignment_statement.target,
-        expression=transform_expression(builtin_dependencies, assignment_statement.expression),
+        target_symbol_list_index=symbol_list.index(assignment_statement.target),
+        expression=transform_expression(
+            builtin_dependencies,
+            symbol_list,
+            assignment_statement.expression,
+        ),
     )
 
-def transform_negation_expression(builtin_dependencies, negation_expression):
-    return CNegationExpression(value=transform_expression(builtin_dependencies, negation_expression.value))
+def transform_negation_expression(builtin_dependencies, symbol_list, negation_expression):
+    return CNegationExpression(
+        value=transform_expression(builtin_dependencies, symbol_list, negation_expression.value),
+    )
 
-def transform_function_call_expression(builtin_dependencies, function_call):
+def transform_function_call_expression(builtin_dependencies, symbol_list, function_call):
     if function_call.function.value in BUILTINS.keys():
         builtin_dependencies.add(function_call.function.value)
 
         return CFunctionCallExpression(
             name='builtin$' + function_call.function.value,
-            arguments=tuple(transform_expression(builtin_dependencies, arg) for arg in function_call.arguments),
+            arguments=tuple(
+                transform_expression(builtin_dependencies, symbol_list, arg)
+                for arg in function_call.arguments
+            ),
         )
 
     raise Exception()
 
-def transform_statement(builtin_dependencies, statement):
+def transform_statement(builtin_dependencies, symbol_list, statement):
     return {
         parsing.FurAssignmentStatement: transform_assignment_statement,
         parsing.FurFunctionCallExpression: transform_function_call_expression,
-    }[type(statement)](builtin_dependencies, statement)
+    }[type(statement)](builtin_dependencies, symbol_list, statement)
 
 def transform(program):
     builtins = set()
+    symbol_list = []
 
     c_statements = [
-        transform_statement(builtins, statement) for statement in program.statement_list
+        transform_statement(builtins, symbol_list, statement) for statement in program.statement_list
     ]
 
     standard_libraries = set()
@@ -172,6 +197,7 @@ def transform(program):
         builtins=builtins,
         statements=c_statements,
         standard_libraries=standard_libraries,
+        symbol_list=symbol_list,
     )