X-Git-Url: https://code.kerkeslager.com/?a=blobdiff_plain;f=normalization.py;h=f2b7b138a6a8dbe9db3ce5cad5e8c5b280b454cb;hb=61733d6070859e6a639ae4b34faec9aacca52a29;hp=5b5bd94cf058b5de65633298143220f56b44334b;hpb=3769b766b898b95fd699e3cb6d005576a4c22086;p=fur

diff --git a/normalization.py b/normalization.py
index 5b5bd94..f2b7b13 100644
--- a/normalization.py
+++ b/normalization.py
@@ -49,10 +49,9 @@ NormalDotExpression = collections.namedtuple(
 NormalInfixExpression = collections.namedtuple(
     'NormalInfixExpression',
     [
+        'metadata',
         'order',
         'operator',
-        'left',
-        'right',
     ],
 )
 
@@ -398,29 +397,18 @@ def normalize_basic_infix_operation(counter, expression):
     counter, left_prestatements, left_expression = normalize_expression(counter, expression.left)
     counter, right_prestatements, right_expression = normalize_expression(counter, expression.right)
 
-    left_variable = '${}'.format(counter)
-    counter += 1
-    right_variable = '${}'.format(counter)
-    counter += 1
     center_variable = '${}'.format(counter)
     counter += 1
 
     root_prestatements = (
-        NormalVariableInitializationStatement(
-            variable=left_variable,
-            expression=left_expression,
-        ),
-        NormalVariableInitializationStatement(
-            variable=right_variable,
-            expression=right_expression,
-        ),
+        NormalPushStatement(expression=left_expression),
+        NormalPushStatement(expression=right_expression),
         NormalVariableInitializationStatement(
             variable=center_variable,
             expression=NormalInfixExpression(
+                metadata=expression.metadata,
                 order=expression.order,
                 operator=expression.operator,
-                left=NormalVariableExpression(variable=left_variable),
-                right=NormalVariableExpression(variable=right_variable),
             ),
         ),
     )
@@ -440,6 +428,7 @@ def desugar_ternary_comparison(counter, expression):
     middle_variable = '${}'.format(counter)
     counter += 1
 
+    # TODO Is there a memory leak if the middle expression throws an exception because the first expression result hasn't been added to the stack?
     juncture_prestatements = (
         NormalVariableInitializationStatement(
             variable=left_variable,
@@ -454,15 +443,18 @@ def desugar_ternary_comparison(counter, expression):
     counter, boolean_expression_prestatements, boolean_expression =  normalize_boolean_expression(
         counter,
         parsing.FurInfixExpression(
+            metadata=expression.left.metadata,
             order='and_level',
             operator='and',
             left=parsing.FurInfixExpression(
+                metadata=expression.left.metadata,
                 order='comparison_level',
                 operator=expression.left.operator,
                 left=NormalVariableExpression(variable=left_variable),
                 right=NormalVariableExpression(variable=middle_variable),
             ),
             right=parsing.FurInfixExpression(
+                metadata=expression.metadata,
                 order='comparison_level',
                 operator=expression.operator,
                 left=NormalVariableExpression(variable=middle_variable),
@@ -481,37 +473,7 @@ def normalize_comparison_expression(counter, expression):
     if isinstance(expression.left, parsing.FurInfixExpression) and expression.order == 'comparison_level':
         return desugar_ternary_comparison(counter, expression)
 
-    counter, left_prestatements, left_expression = normalize_expression(counter, expression.left)
-    counter, right_prestatements, right_expression = normalize_expression(counter, expression.right)
-
-    left_variable = '${}'.format(counter)
-    counter += 1
-    right_variable = '${}'.format(counter)
-    counter += 1
-
-    root_prestatements = (
-        NormalVariableInitializationStatement(
-            variable=left_variable,
-            expression=left_expression,
-        ),
-        NormalVariableInitializationStatement(
-            variable=right_variable,
-            expression=right_expression,
-        ),
-    )
-
-    counter, result_prestatements, result_expression = (
-        counter,
-        left_prestatements + right_prestatements + root_prestatements,
-        NormalInfixExpression(
-            order=expression.order,
-            operator=expression.operator,
-            left=NormalVariableExpression(variable=left_variable),
-            right=NormalVariableExpression(variable=right_variable),
-        ),
-    )
-
-    return (counter, result_prestatements, result_expression)
+    return normalize_basic_infix_operation(counter, expression)
 
 def normalize_boolean_expression(counter, expression):
     counter, left_prestatements, left_expression = normalize_expression(counter, expression.left)