X-Git-Url: https://code.kerkeslager.com/?p=fur;a=blobdiff_plain;f=normalization.py;h=8248169c9210e0a2d005bfafe5a6e6455c434877;hp=309e84c9c88a60b928e15075b2701c18d0841ac7;hb=c24be69b26aedc427c7831f150e86ca00182d8e0;hpb=a9ab9dd833ed081abbed647aa16eeaa2f61b85d7

diff --git a/normalization.py b/normalization.py
index 309e84c..8248169 100644
--- a/normalization.py
+++ b/normalization.py
@@ -3,6 +3,13 @@ import collections
 import desugaring
 import util
 
+NormalBuiltinExpression = collections.namedtuple(
+    'NormalBuiltinExpression',
+    (
+        'symbol',
+    ),
+)
+
 NormalVariableExpression = collections.namedtuple(
     'NormalVariableExpression',
     [
@@ -35,9 +42,16 @@ NormalStringLiteralExpression = collections.namedtuple(
 
 NormalSymbolExpression = collections.namedtuple(
     'NormalSymbolExpression',
-    [
+    (
         'symbol',
-    ],
+    ),
+)
+
+NormalSymbolLiteralExpression = collections.namedtuple(
+    'NormalSymbolLiteralExpression',
+    (
+        'symbol',
+    ),
 )
 
 NormalPushStatement = collections.namedtuple(
@@ -56,22 +70,6 @@ NormalFunctionCallExpression = collections.namedtuple(
     ],
 )
 
-NormalArrayVariableInitializationStatement = collections.namedtuple(
-    'NormalArrayVariableInitializationStatement',
-    [
-        'variable',
-        'items',
-    ],
-)
-
-NormalSymbolArrayVariableInitializationStatement = collections.namedtuple(
-    'NormalSymbolArrayVariableInitializationStatement',
-    [
-        'variable',
-        'symbol_list',
-    ],
-)
-
 NormalVariableInitializationStatement = collections.namedtuple(
     'NormalVariableInitializationStatement',
     [
@@ -111,6 +109,13 @@ NormalProgram = collections.namedtuple(
     ],
 )
 
+def normalize_builtin_expression(counter, expression):
+    return (
+        counter,
+        (),
+        NormalBuiltinExpression(symbol=expression.symbol),
+    )
+
 def normalize_integer_literal_expression(counter, expression):
     return (
         counter,
@@ -148,14 +153,6 @@ NormalListConstructExpression = collections.namedtuple(
     ],
 )
 
-NormalListAppendStatement = collections.namedtuple(
-    'NormalListAppendStatement',
-    [
-        'list_expression',
-        'item_expression',
-    ],
-)
-
 def normalize_list_literal_expression(counter, expression):
     list_variable = '${}'.format(counter)
     counter += 1
@@ -192,70 +189,41 @@ def normalize_string_literal_expression(counter, expression):
 
 NormalStructureLiteralExpression = collections.namedtuple(
     'NormalStructureLiteralExpression',
-    [
+    (
         'field_count',
-        'symbol_list_variable',
-        'value_list_variable',
-    ],
+    ),
 )
 
 def normalize_structure_literal_expression(counter, expression):
     prestatements = []
-    field_symbol_array = []
-    field_value_array = []
 
-    for symbol_expression_pair in expression.fields:
-        counter, field_prestatements, field_expression = normalize_expression(
+    for field in expression.fields:
+        counter, field_expression_prestatements, field_expression = normalize_expression(
             counter,
-            symbol_expression_pair.expression,
+            field.expression,
         )
 
-        for p in field_prestatements:
+        for p in field_expression_prestatements:
             prestatements.append(p)
 
-        field_symbol_array.append(symbol_expression_pair.symbol)
-        field_value_array.append(field_expression)
-
-    symbol_array_variable = '${}'.format(counter)
-    counter += 1
-
-    prestatements.append(
-        NormalSymbolArrayVariableInitializationStatement(
-            variable=symbol_array_variable,
-            symbol_list=tuple(field_symbol_array),
-        )
-    )
-
-    value_array_variable = '${}'.format(counter)
-    counter += 1
+        prestatements.append(NormalPushStatement(
+            expression=field_expression,
+        ))
 
-    prestatements.append(
-        NormalArrayVariableInitializationStatement(
-            variable=value_array_variable,
-            items=tuple(field_value_array),
-        )
-    )
-
-    variable = '${}'.format(counter)
-
-    prestatements.append(
-        NormalVariableInitializationStatement(
-            variable=variable,
-            expression=NormalStructureLiteralExpression(
-                field_count=len(expression.fields),
-                symbol_list_variable=symbol_array_variable,
-                value_list_variable=value_array_variable,
+        prestatements.append(NormalPushStatement(
+            expression=NormalSymbolLiteralExpression(
+                symbol=field.symbol,
             ),
-        )
-    )
+        ))
 
     return (
-        counter + 1,
+        counter,
         tuple(prestatements),
-        NormalVariableExpression(variable=variable),
+        NormalStructureLiteralExpression(
+            field_count=len(expression.fields),
+        ),
     )
 
-
 def normalize_symbol_expression(counter, expression):
     return (
         counter,
@@ -263,6 +231,13 @@ def normalize_symbol_expression(counter, expression):
         NormalSymbolExpression(symbol=expression.symbol),
     )
 
+def normalize_symbol_literal_expression(counter, expression):
+    return (
+        counter,
+        (),
+        NormalSymbolLiteralExpression(symbol=expression.symbol),
+    )
+
 def normalize_function_call_expression(counter, expression):
     prestatements = []
 
@@ -286,23 +261,14 @@ def normalize_function_call_expression(counter, expression):
     for ps in function_prestatements:
         prestatements.append(ps)
 
-    result_variable = '${}'.format(counter)
-
-    prestatements.append(
-        NormalVariableInitializationStatement(
-            variable=result_variable,
-            expression=NormalFunctionCallExpression(
-                metadata=expression.metadata,
-                function_expression=function_expression,
-                argument_count=len(expression.argument_list),
-            ),
-        )
-    )
-
     return (
-        counter + 1,
+        counter,
         tuple(prestatements),
-        NormalVariableExpression(variable=result_variable),
+        NormalFunctionCallExpression(
+            metadata=expression.metadata,
+            function_expression=function_expression,
+            argument_count=len(expression.argument_list),
+        ),
     )
 
 def normalize_if_expression(counter, expression):
@@ -332,6 +298,7 @@ def normalize_if_expression(counter, expression):
 
 def normalize_expression(counter, expression):
     return {
+        desugaring.DesugaredBuiltinExpression: normalize_builtin_expression,
         desugaring.DesugaredFunctionCallExpression: normalize_function_call_expression,
         desugaring.DesugaredIfExpression: normalize_if_expression,
         desugaring.DesugaredIntegerLiteralExpression: normalize_integer_literal_expression,
@@ -340,6 +307,7 @@ def normalize_expression(counter, expression):
         desugaring.DesugaredStringLiteralExpression: normalize_string_literal_expression,
         desugaring.DesugaredStructureLiteralExpression: normalize_structure_literal_expression,
         desugaring.DesugaredSymbolExpression: normalize_symbol_expression,
+        desugaring.DesugaredSymbolLiteralExpression: normalize_symbol_literal_expression,
     }[type(expression)](counter, expression)
 
 def normalize_expression_statement(counter, statement):