Make "do" a keyword

[fur] / normalization.py

diff --git a/normalization.py b/normalization.py
index 4a16a3d..ff2e327 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',
     ],
@@ -125,7 +125,6 @@ def fake_normalization(counter, thing):
     return (counter, (), thing)
 
 def normalize_integer_literal_expression(counter, expression):
-    # TODO Store this in a C variable
     return (
         counter,
         (),
@@ -133,7 +132,6 @@ def normalize_integer_literal_expression(counter, expression):
     )
 
 def normalize_string_literal_expression(counter, expression):
-    # TODO Store this in a C variable
     return (
         counter,
         (),
@@ -189,11 +187,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),
         ),