Make it easier to run without memory leak tests

[fur] / normalization.py

diff --git a/normalization.py b/normalization.py
index 40e3afd..f6c4246 100644 (file)
--- a/normalization.py
+++ b/normalization.py
@@ -17,6 +17,15 @@ NormalIntegerLiteralExpression = collections.namedtuple(
     ],
 )
 
+NormalLambdaExpression = collections.namedtuple(
+    'NormalLambdaExpression',
+    (
+        'name',
+        'argument_name_list',
+        'statement_list',
+    ),
+)
+
 NormalStringLiteralExpression = collections.namedtuple(
     'NormalStringLiteralExpression',
     [
@@ -103,15 +112,6 @@ NormalIfElseStatement = collections.namedtuple(
     ],
 )
 
-NormalFunctionDefinitionStatement = collections.namedtuple(
-    'NormalFunctionDefinitionStatement',
-    [
-        'name',
-        'argument_name_list',
-        'statement_list',
-    ],
-)
-
 NormalProgram = collections.namedtuple(
     'NormalProgram',
     [
@@ -132,6 +132,30 @@ def normalize_integer_literal_expression(counter, expression):
         NormalVariableExpression(variable=variable),
     )
 
+def normalize_lambda_expression(counter, expression):
+    variable = '${}'.format(counter)
+
+    _, statement_list = normalize_statement_list(
+        0,
+        expression.statement_list,
+        assign_result_to='result',
+    )
+
+    return (
+        counter + 1,
+        (
+            NormalVariableInitializationStatement(
+                variable=variable,
+                expression=NormalLambdaExpression(
+                    name=expression.name,
+                    argument_name_list=expression.argument_name_list,
+                    statement_list=statement_list,
+                ),
+            ),
+        ),
+        NormalVariableExpression(variable=variable),
+    )
+
 NormalListConstructExpression = collections.namedtuple(
     'NormalListConstructExpression',
     [
@@ -147,14 +171,6 @@ NormalListAppendStatement = collections.namedtuple(
     ],
 )
 
-NormalListGetExpression = collections.namedtuple(
-    'NormalListGetExpression',
-    [
-        'list_expression',
-        'index_expression',
-    ],
-)
-
 def normalize_list_literal_expression(counter, expression):
     list_variable = '${}'.format(counter)
     counter += 1
@@ -190,25 +206,6 @@ def normalize_list_literal_expression(counter, expression):
         list_expression,
     )
 
-def normalize_list_item_expression(counter, expression):
-    counter, list_prestatements, list_expression = normalize_expression(counter, expression.list_expression)
-    counter, index_prestatements, index_expression = normalize_expression(counter, expression.index_expression)
-
-    result_variable = '${}'.format(counter)
-    result_prestatement = NormalVariableInitializationStatement(
-        variable=result_variable,
-        expression=NormalListGetExpression(
-            list_expression=list_expression,
-            index_expression=index_expression,
-        ),
-    )
-
-    return (
-        counter + 1,
-        list_prestatements + index_prestatements + (result_prestatement,),
-        NormalVariableExpression(variable=result_variable),
-    )
-
 def normalize_string_literal_expression(counter, expression):
     variable = '${}'.format(counter)
     return (
@@ -407,6 +404,7 @@ def normalize_expression(counter, expression):
         desugaring.DesugaredFunctionCallExpression: normalize_function_call_expression,
         desugaring.DesugaredIfExpression: normalize_if_expression,
         desugaring.DesugaredIntegerLiteralExpression: normalize_integer_literal_expression,
+        desugaring.DesugaredLambdaExpression: normalize_lambda_expression,
         desugaring.DesugaredListLiteralExpression: normalize_list_literal_expression,
         desugaring.DesugaredStringLiteralExpression: normalize_string_literal_expression,
         desugaring.DesugaredStructureLiteralExpression: normalize_structure_literal_expression,
@@ -426,22 +424,6 @@ def normalize_expression_statement(counter, statement):
         NormalExpressionStatement(expression=normalized),
     )
 
-def normalize_function_definition_statement(counter, statement):
-    _, statement_list = normalize_statement_list(
-        0,
-        statement.statement_list,
-        assign_result_to='result',
-    )
-    return (
-        counter,
-        (),
-        NormalFunctionDefinitionStatement(
-            name=statement.name,
-            argument_name_list=statement.argument_name_list,
-            statement_list=statement_list,
-        ),
-    )
-
 def normalize_assignment_statement(counter, statement):
     counter, prestatements, normalized_expression = normalize_expression(counter, statement.expression)
     return (
@@ -457,7 +439,6 @@ def normalize_statement(counter, statement):
     return {
         desugaring.DesugaredAssignmentStatement: normalize_assignment_statement,
         desugaring.DesugaredExpressionStatement: normalize_expression_statement,
-        desugaring.DesugaredFunctionDefinitionStatement: normalize_function_definition_statement,
     }[type(statement)](counter, statement)
 
 @util.force_generator(tuple)