X-Git-Url: https://code.kerkeslager.com/?p=fur;a=blobdiff_plain;f=transformation.py;h=7d47ed494100f2f8673f3b11e261b2418fd206ba;hp=82d4b3fad509d01a103c3a5794cc4b658d36a5a6;hb=b47a0017d1dbfda8e8bae7989fff9ccb31897a28;hpb=8d6f07b43d8b41473fb7d8779bbc7a5843adcd7b

diff --git a/transformation.py b/transformation.py
index 82d4b3f..7d47ed4 100644
--- a/transformation.py
+++ b/transformation.py
@@ -61,9 +61,8 @@ CNegationExpression = collections.namedtuple(
 CFunctionCallForFurInfixOperator = collections.namedtuple(
     'CFunctionCallForFurInfixOperator',
     [
+        'metadata',
         'name',
-        'left',
-        'right',
     ],
 )
 
@@ -240,59 +239,21 @@ FUR_INFIX_OPERATOR_TO_C_INFIX_OPERATOR = {
     '>':    CInfixDeclaration(name='greaterThan', in_type='integer', out_type='boolean', operator='>'),
 }
 
-def transform_comparison_level_expression(accumulators, expression):
-    accumulators.operator_set.add(FUR_INFIX_OPERATOR_TO_C_INFIX_OPERATOR[expression.operator])
-
-    # Transform expressions like 1 < 2 < 3 into expressions like 1 < 2 && 2 < 3
-    if isinstance(expression.left, parsing.FurInfixExpression) and expression.left.order == 'comparison_level':
-        left = transform_comparison_level_expression(
-            accumulators,
-            expression.left
-        )
-
-        middle = left.right
-
-        right = transform_expression(
-            accumulators,
-            expression.right,
-        )
-
-        # TODO Don't evaluate the middle expression twice
-        return CFunctionCallForFurInfixOperator(
-            name='and',
-            left=left,
-            right=CFunctionCallForFurInfixOperator(
-                name=FUR_INFIX_OPERATOR_TO_C_INFIX_OPERATOR[expression.operator].name,
-                left=middle,
-                right=right,
-            ),
-        )
-
-    return CFunctionCallForFurInfixOperator(
-        name=FUR_INFIX_OPERATOR_TO_C_INFIX_OPERATOR[expression.operator].name,
-        left=transform_expression(accumulators, expression.left),
-        right=transform_expression(accumulators, expression.right),
-    )
-
 def transform_infix_operator_without_c_equivalent(accumulators, expression):
     return CFunctionCallForFurInfixOperator(
+        metadata=expression.metadata,
         name='concatenate',
-        left=transform_expression(accumulators, expression.left),
-        right=transform_expression(accumulators, expression.right),
     )
+
 def transform_infix_expression(accumulators, expression):
     if expression.operator in FUR_INFIX_OPERATOR_TO_C_FUNCTION:
         return transform_infix_operator_without_c_equivalent(accumulators, expression)
 
-    if expression.order == 'comparison_level':
-        return transform_comparison_level_expression(accumulators, expression)
-
     accumulators.operator_set.add(FUR_INFIX_OPERATOR_TO_C_INFIX_OPERATOR[expression.operator])
 
     return CFunctionCallForFurInfixOperator(
+        metadata=expression.metadata,
         name=FUR_INFIX_OPERATOR_TO_C_INFIX_OPERATOR[expression.operator].name,
-        left=transform_expression(accumulators, expression.left),
-        right=transform_expression(accumulators, expression.right),
     )
 
 def transform_integer_literal_expression(accumulators, expression):