X-Git-Url: https://code.kerkeslager.com/?p=fur;a=blobdiff_plain;f=normalization.py;h=5eef1db1532bc8256817ee8e6f76b53edc74619a;hp=f6c42460b045e60420a29ae1050b0ef8d80703f8;hb=1c6569d51fe16165b0114dfea143d8c6a971777c;hpb=4d6f362ca35cd00803b1a79e03985301bcfbeea8

diff --git a/normalization.py b/normalization.py
index f6c4246..5eef1db 100644
--- a/normalization.py
+++ b/normalization.py
@@ -207,16 +207,10 @@ def normalize_list_literal_expression(counter, expression):
     )
 
 def normalize_string_literal_expression(counter, expression):
-    variable = '${}'.format(counter)
     return (
-        counter + 1,
-        (
-            NormalVariableInitializationStatement(
-                variable=variable,
-                expression=NormalStringLiteralExpression(string=expression.string),
-            ),
-        ),
-        NormalVariableExpression(variable=variable),
+        counter,
+        (),
+        NormalStringLiteralExpression(string=expression.string),
     )
 
 NormalStructureLiteralExpression = collections.namedtuple(
@@ -286,16 +280,10 @@ def normalize_structure_literal_expression(counter, expression):
 
 
 def normalize_symbol_expression(counter, expression):
-    variable = '${}'.format(counter)
     return (
-        counter + 1,
-        (
-            NormalVariableInitializationStatement(
-                variable=variable,
-                expression=NormalSymbolExpression(symbol=expression.symbol),
-            ),
-        ),
-        NormalVariableExpression(variable=variable),
+        counter,
+        (),
+        NormalSymbolExpression(symbol=expression.symbol),
     )
 
 def normalize_function_call_expression(counter, expression):
@@ -307,21 +295,11 @@ def normalize_function_call_expression(counter, expression):
         for s in argument_prestatements:
             prestatements.append(s)
 
-        variable = '${}'.format(counter)
-        prestatements.append(
-            NormalVariableInitializationStatement(
-                variable=variable,
-                expression=normalized_argument,
-            )
-        )
         prestatements.append(
             NormalPushStatement(
-                expression=NormalVariableExpression(
-                    variable=variable,
-                ),
+                expression=normalized_argument,
             ),
         )
-        counter += 1
 
     counter, function_prestatements, function_expression = normalize_expression(
         counter,
@@ -331,19 +309,6 @@ 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
-
     result_variable = '${}'.format(counter)
 
     prestatements.append(