Add support for lists to IR, clean up

[fur] / normalization.py

diff --git a/normalization.py b/normalization.py
index 7ce7488..76c5395 100644 (file)
--- a/normalization.py
+++ b/normalization.py
@@ -160,12 +160,7 @@ def normalize_list_literal_expression(counter, expression):
     list_variable = '${}'.format(counter)
     counter += 1
 
-    prestatements = [
-        NormalVariableInitializationStatement(
-            variable=list_variable,
-            expression=NormalListConstructExpression(allocate=len(expression.item_expression_list)),
-        ),
-    ]
+    prestatements = []
 
     list_expression = NormalVariableExpression(variable=list_variable)
 
@@ -179,12 +174,16 @@ def normalize_list_literal_expression(counter, expression):
             prestatements.append(p)
 
         prestatements.append(
-            NormalListAppendStatement(
-                list_expression=list_expression,
-                item_expression=normalized,
+            NormalPushStatement(
+                expression=normalized,
             )
         )
 
+    prestatements.append(NormalVariableInitializationStatement(
+        variable=list_variable,
+        expression=NormalListConstructExpression(allocate=len(expression.item_expression_list)),
+    ))
+
     return (
         counter,
         tuple(prestatements),