Some minor refactoring and added a (currently trivial) normalization step

[fur] / generation.py

diff --git a/generation.py b/generation.py
index 28f08cd..816ebc9 100644 (file)
--- a/generation.py
+++ b/generation.py
@@ -12,17 +12,7 @@ def generate_integer_literal(c_integer_literal):
     return 'integerLiteral({})'.format(c_integer_literal.value)
 
 def generate_string_literal(c_string_literal):
-    def c_escape(ch):
-        return {
-            '\n': r'\n',
-            '"': r'\"',
-            '\\': r'\\',
-        }.get(ch, ch)
-
-    return 'stringLiteral(runtime, "{}")'.format(
-        ''.join(c_escape(ch for ch in c_string_literal.value)),
-    )
-
+    return 'stringLiteral(STRING_LITERAL_LIST[{}])'.format(c_string_literal.index)
 
 CONSTANT_EXPRESSION_MAPPING = {
     'true':     'TRUE',
@@ -38,12 +28,12 @@ def generate_symbol_expression(c_symbol_expression):
         c_symbol_expression.symbol,
     )
 
-def generate_expression(c_argument):
-    if isinstance(c_argument, transformation.CNegationExpression):
-        return generate_negation_expression(c_argument)
+def generate_expression(expression):
+    if isinstance(expression, transformation.CNegationExpression):
+        return generate_negation_expression(expression)
 
-    if isinstance(c_argument, transformation.CFunctionCallExpression):
-        return generate_function_call(c_argument)
+    if isinstance(expression, transformation.CFunctionCallExpression):
+        return generate_function_call(expression)
 
     LITERAL_TYPE_MAPPING = {
         transformation.CIntegerLiteral: generate_integer_literal,
@@ -52,22 +42,17 @@ def generate_expression(c_argument):
         transformation.CSymbolExpression: generate_symbol_expression,
     }
 
-    if type(c_argument) in LITERAL_TYPE_MAPPING:
-        return LITERAL_TYPE_MAPPING[type(c_argument)](c_argument)
+    if type(expression) in LITERAL_TYPE_MAPPING:
+        return LITERAL_TYPE_MAPPING[type(expression)](expression)
 
-    INFIX_TYPE_MAPPING = {
-        transformation.CAdditionExpression: 'add',
-        transformation.CSubtractionExpression: 'subtract',
-        transformation.CMultiplicationExpression: 'multiply',
-        transformation.CIntegerDivisionExpression: 'integerDivide',
-        transformation.CModularDivisionExpression: 'modularDivide',
-    }
+    if isinstance(expression, transformation.CFunctionCallForFurInfixOperator):
+        return 'builtin${}({}, {})'.format(
+            expression.name,
+            generate_expression(expression.left),
+            generate_expression(expression.right),
+        )
 
-    return 'builtin${}({}, {})'.format(
-        INFIX_TYPE_MAPPING[type(c_argument)],
-        generate_expression(c_argument.left),
-        generate_expression(c_argument.right),
-    )
+    raise Exception('Could not handle expresssion "{}"'.format(expression))
 
 def generate_negation_expression(c_negation_expression):
     return 'builtin$negate({})'.format(
@@ -97,13 +82,14 @@ def generate_statement(statement):
 
     return generate_expression_statement(statement)
 
-def generate(c_program):
+def generate(program):
     template = ENV.get_template('program.c')
     return template.render(
-        builtins=list(sorted(c_program.builtins)),
-        statements=[generate_statement(statement) for statement in c_program.statements],
-        standard_libraries=list(sorted(c_program.standard_libraries)),
-        symbol_list=c_program.symbol_list,
+        builtins=list(sorted(program.builtin_set)),
+        statements=[generate_statement(statement) for statement in program.statements],
+        standard_libraries=list(sorted(program.standard_libraries)),
+        string_literal_list=program.string_literal_list,
+        symbol_list=program.symbol_list,
     )
 
 if __name__ == '__main__':