Normalized all infix expression statements

[fur] / normalization.py

diff --git a/normalization.py b/normalization.py
index 0d967d7..1dbeddb 100644 (file)
--- a/normalization.py
+++ b/normalization.py
@@ -27,8 +27,16 @@ NormalFunctionCallExpression = collections.namedtuple(
     ],
 )
 
-NormalVariableAssignmentStatement = collections.namedtuple(
-    'NormalVariableAssignmentStatement',
+NormalVariableInitializationStatement = collections.namedtuple(
+    'NormalVariableInitializationStatement',
+    [
+        'variable',
+        'expression',
+    ],
+)
+
+NormalVariableReassignmentStatement = collections.namedtuple(
+    'NormalVariableReassignmentStatement',
     [
         'variable',
         'expression',
@@ -42,6 +50,15 @@ NormalExpressionStatement = collections.namedtuple(
     ],
 )
 
+NormalIfElseStatement = collections.namedtuple(
+    'NormalIfElseStatement',
+    [
+        'condition_expression',
+        'if_statements',
+        'else_statements',
+    ],
+)
+
 NormalProgram = collections.namedtuple(
     'NormalProgram',
     [
@@ -65,7 +82,7 @@ def normalize_function_call_expression(counter, expression):
             prestatements.append(s)
 
         variable = '${}'.format(counter)
-        prestatements.append(NormalVariableAssignmentStatement(
+        prestatements.append(NormalVariableInitializationStatement(
             variable=variable,
             expression=normalized_argument,
         ))
@@ -93,11 +110,11 @@ def normalize_basic_infix_operation(counter, expression):
     counter += 1
 
     root_prestatements = (
-        NormalVariableAssignmentStatement(
+        NormalVariableInitializationStatement(
             variable=left_variable,
             expression=left_expression,
         ),
-        NormalVariableAssignmentStatement(
+        NormalVariableInitializationStatement(
             variable=right_variable,
             expression=right_expression,
         ),
@@ -130,11 +147,11 @@ def normalize_comparison_expression(counter, expression):
     counter += 1
 
     root_prestatements = (
-        NormalVariableAssignmentStatement(
+        NormalVariableInitializationStatement(
             variable=left_variable,
             expression=left_expression,
         ),
-        NormalVariableAssignmentStatement(
+        NormalVariableInitializationStatement(
             variable=right_variable,
             expression=right_expression,
         ),
@@ -178,8 +195,39 @@ def normalize_comparison_expression(counter, expression):
     return (counter, result_prestatements, result_expression)
 
 def normalize_boolean_expression(counter, expression):
-    # TODO Unfake this
-    return fake_normalization(counter, expression)
+    counter, left_prestatements, left_expression = normalize_expression(counter, expression.left)
+    counter, right_prestatements, right_expression = normalize_expression(counter, expression.right)
+
+    result_variable = '${}'.format(counter)
+    if_else_prestatment = NormalVariableInitializationStatement(variable=result_variable, expression=left_expression)
+    counter += 1
+
+    condition_expression=NormalVariableExpression(variable=result_variable)
+    short_circuited_statements = right_prestatements + (NormalVariableReassignmentStatement(variable=result_variable, expression=right_expression),)
+
+    if expression.operator == 'and':
+        if_else_statement = NormalIfElseStatement(
+            condition_expression=condition_expression,
+            if_statements=short_circuited_statements,
+            else_statements=(),
+        )
+
+    elif expression.operator == 'or':
+        if_else_statement = NormalIfElseStatement(
+            condition_expression=condition_expression,
+            if_statements=(),
+            else_statements=short_circuited_statements,
+        )
+
+    else:
+        raise Exception('Unable to handle operator "{}"'.format(expression.operator))
+
+    return (
+        counter,
+        left_prestatements + (if_else_prestatment, if_else_statement),
+        NormalVariableExpression(variable=result_variable),
+    )
+
 
 def normalize_infix_expression(counter, expression):
     return {
@@ -192,6 +240,8 @@ def normalize_infix_expression(counter, expression):
 
 def normalize_expression(counter, expression):
     return {
+        NormalInfixExpression: fake_normalization,
+        NormalVariableExpression: fake_normalization,
         parsing.FurFunctionCallExpression: normalize_function_call_expression,
         parsing.FurInfixExpression: normalize_infix_expression,
         parsing.FurIntegerLiteralExpression: fake_normalization,