Normalize function expressions

[fur] / normalization.py

diff --git a/normalization.py b/normalization.py
index 51c1d7b..9d25ba2 100644 (file)
--- a/normalization.py
+++ b/normalization.py
@@ -51,7 +51,7 @@ NormalInfixExpression = collections.namedtuple(
 NormalFunctionCallExpression = collections.namedtuple(
     'NormalFunctionCallExpression',
     [
-        'function',
+        'function_expression',
         'argument_count',
         'argument_items',
     ],
@@ -126,15 +126,30 @@ def fake_normalization(counter, thing):
 
 def normalize_integer_literal_expression(counter, expression):
     # TODO Store this in a C variable
-    return (counter, (), NormalIntegerLiteralExpression(integer=expression.integer))
+    return (
+        counter,
+        (),
+        NormalIntegerLiteralExpression(integer=expression.integer),
+    )
 
 def normalize_string_literal_expression(counter, expression):
     # TODO Store this in a C variable
-    return (counter, (), NormalStringLiteralExpression(string=expression.string))
+    return (
+        counter,
+        (),
+        NormalStringLiteralExpression(string=expression.string),
+    )
 
 def normalize_symbol_expression(counter, expression):
-    # TODO Store this in a C variable
-    return (counter, (), NormalSymbolExpression(symbol=expression.symbol))
+    variable = '${}'.format(counter)
+    return (
+        counter + 1,
+        (NormalVariableInitializationStatement(
+            variable=variable,
+            expression=NormalSymbolExpression(symbol=expression.symbol),
+        ),),
+        NormalVariableExpression(variable=variable),
+    )
 
 def normalize_function_call_expression(counter, expression):
     assert isinstance(expression, parsing.FurFunctionCallExpression)
@@ -174,11 +189,22 @@ def normalize_function_call_expression(counter, expression):
     for ps in function_prestatements:
         prestatements.append(ps)
 
+    if not isinstance(function_expression, NormalVariableExpression):
+        function_variable = '${}'.format(counter)
+
+        prestatements.append(NormalVariableInitializationStatement(
+            variable=function_variable,
+            expression=function_expression,
+        ))
+
+        function_expression = NormalVariableExpression(variable=function_variable)
+        counter += 1
+
     return (
         counter,
         tuple(prestatements),
         NormalFunctionCallExpression(
-            function=function_expression,
+            function_expression=function_expression,
             argument_count=len(arguments),
             argument_items=NormalVariableExpression(variable=arguments_variable),
         ),
@@ -208,7 +234,7 @@ def normalize_basic_infix_operation(counter, expression):
         counter,
         left_prestatements + right_prestatements + root_prestatements,
         NormalInfixExpression(
-            order=expression.order, # TODO Do we need this?
+            order=expression.order,
             operator=expression.operator,
             left=NormalVariableExpression(variable=left_variable),
             right=NormalVariableExpression(variable=right_variable),
@@ -244,9 +270,8 @@ def normalize_comparison_expression(counter, expression):
     counter, result_prestatements, result_expression = (
         counter,
         left_prestatements + right_prestatements + root_prestatements,
-        # TODO Implement short-circuiting
         NormalInfixExpression(
-            order=expression.order, # TODO Do we need this?
+            order=expression.order,
             operator=expression.operator,
             left=NormalVariableExpression(variable=left_variable),
             right=NormalVariableExpression(variable=right_variable),
@@ -347,13 +372,11 @@ def normalize_expression(counter, expression):
     }[type(expression)](counter, expression)
 
 def normalize_expression_statement(counter, statement):
-    # TODO Verify all expression types are supported and just call normalize_expression
-    counter, prestatements, normalized = {
-        parsing.FurFunctionCallExpression: normalize_function_call_expression,
-        parsing.FurSymbolExpression: normalize_expression,
-        parsing.FurInfixExpression: normalize_expression,
-        parsing.FurIntegerLiteralExpression: normalize_expression,
-    }[type(statement.expression)](counter, statement.expression)
+    # TODO Normalized will be a NormalVariableExpression, which will go unused
+    # for expression statements in every case except when it's a return
+    # statement. This cases warnings on C compilation. We should only generate
+    # this variable when it will be used on return.
+    counter, prestatements, normalized = normalize_expression(counter, statement.expression)
 
     return (
         counter,
@@ -401,7 +424,6 @@ def normalize_statement_list(statement_list):
         yield normalized
 
 def normalize(program):
-
     return NormalProgram(
         statement_list=normalize_statement_list(program.statement_list),
     )