Add symbol and structure support
[fur] / normalization.py
index e3760f6..8248169 100644 (file)
@@ -1,6 +1,14 @@
 import collections
 
-import parsing
+import desugaring
+import util
+
+NormalBuiltinExpression = collections.namedtuple(
+    'NormalBuiltinExpression',
+    (
+        'symbol',
+    ),
+)
 
 NormalVariableExpression = collections.namedtuple(
     'NormalVariableExpression',
@@ -9,26 +17,61 @@ NormalVariableExpression = collections.namedtuple(
     ],
 )
 
-NormalInfixExpression = collections.namedtuple(
-    'NormalInfixExpression',
+NormalIntegerLiteralExpression = collections.namedtuple(
+    'NormalIntegerLiteralExpression',
     [
-        'order',
-        'operator',
-        'left',
-        'right',
+        'integer',
     ],
 )
 
+NormalLambdaExpression = collections.namedtuple(
+    'NormalLambdaExpression',
+    (
+        'name',
+        'argument_name_list',
+        'statement_list',
+    ),
+)
+
+NormalStringLiteralExpression = collections.namedtuple(
+    'NormalStringLiteralExpression',
+    [
+        'string',
+    ],
+)
+
+NormalSymbolExpression = collections.namedtuple(
+    'NormalSymbolExpression',
+    (
+        'symbol',
+    ),
+)
+
+NormalSymbolLiteralExpression = collections.namedtuple(
+    'NormalSymbolLiteralExpression',
+    (
+        'symbol',
+    ),
+)
+
+NormalPushStatement = collections.namedtuple(
+    'NormalPushStatement',
+    (
+        'expression',
+    ),
+)
+
 NormalFunctionCallExpression = collections.namedtuple(
     'NormalFunctionCallExpression',
     [
-        'function',
-        'arguments',
+        'metadata',
+        'function_expression',
+        'argument_count',
     ],
 )
 
-NormalVariableAssignmentStatement = collections.namedtuple(
-    'NormalVariableAssignmentStatement',
+NormalVariableInitializationStatement = collections.namedtuple(
+    'NormalVariableInitializationStatement',
     [
         'variable',
         'expression',
@@ -42,6 +85,23 @@ NormalExpressionStatement = collections.namedtuple(
     ],
 )
 
+NormalAssignmentStatement = collections.namedtuple(
+    'NormalAssignmentStatement',
+    [
+        'target',
+        'expression',
+    ],
+)
+
+NormalIfElseExpression = collections.namedtuple(
+    'NormalIfElseExpression',
+    [
+        'condition_expression',
+        'if_statement_list',
+        'else_statement_list',
+    ],
+)
+
 NormalProgram = collections.namedtuple(
     'NormalProgram',
     [
@@ -49,96 +109,213 @@ NormalProgram = collections.namedtuple(
     ],
 )
 
-def fake_normalization(counter, thing):
-    return (counter, (), thing)
+def normalize_builtin_expression(counter, expression):
+    return (
+        counter,
+        (),
+        NormalBuiltinExpression(symbol=expression.symbol),
+    )
 
-def normalize_function_call_expression(counter, expression):
-    assert isinstance(expression, parsing.FurFunctionCallExpression)
+def normalize_integer_literal_expression(counter, expression):
+    return (
+        counter,
+        (),
+        NormalIntegerLiteralExpression(integer=expression.integer),
+    )
+
+def normalize_lambda_expression(counter, expression):
+    variable = '${}'.format(counter)
+
+    _, statement_list = normalize_statement_list(
+        0,
+        expression.statement_list,
+    )
+
+    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',
+    [
+        'allocate',
+    ],
+)
+
+def normalize_list_literal_expression(counter, expression):
+    list_variable = '${}'.format(counter)
+    counter += 1
 
     prestatements = []
-    arguments = []
 
-    for argument in expression.arguments:
-        counter, argument_prestatements, normalized_argument = normalize_expression(counter, argument)
+    for item_expression in expression.item_expression_list:
+        counter, item_expression_prestatements, normalized = normalize_expression(
+            counter,
+            item_expression,
+        )
 
-        for s in argument_prestatements:
-            prestatements.append(s)
+        for p in item_expression_prestatements:
+            prestatements.append(p)
+
+        prestatements.append(
+            NormalPushStatement(
+                expression=normalized,
+            )
+        )
+
+    return (
+        counter,
+        tuple(prestatements),
+        NormalListConstructExpression(allocate=len(expression.item_expression_list)),
+    )
+
+def normalize_string_literal_expression(counter, expression):
+    return (
+        counter,
+        (),
+        NormalStringLiteralExpression(string=expression.string),
+    )
 
-        variable = '${}'.format(counter)
-        prestatements.append(NormalVariableAssignmentStatement(
-            variable=variable,
-            expression=normalized_argument,
+NormalStructureLiteralExpression = collections.namedtuple(
+    'NormalStructureLiteralExpression',
+    (
+        'field_count',
+    ),
+)
+
+def normalize_structure_literal_expression(counter, expression):
+    prestatements = []
+
+    for field in expression.fields:
+        counter, field_expression_prestatements, field_expression = normalize_expression(
+            counter,
+            field.expression,
+        )
+
+        for p in field_expression_prestatements:
+            prestatements.append(p)
+
+        prestatements.append(NormalPushStatement(
+            expression=field_expression,
         ))
-        arguments.append(NormalVariableExpression(
-            variable=variable,
+
+        prestatements.append(NormalPushStatement(
+            expression=NormalSymbolLiteralExpression(
+                symbol=field.symbol,
+            ),
         ))
-        counter += 1
 
     return (
         counter,
         tuple(prestatements),
-        NormalFunctionCallExpression(
-            expression.function, # TODO Normalize the function
-            arguments=tuple(arguments),
+        NormalStructureLiteralExpression(
+            field_count=len(expression.fields),
         ),
     )
 
-def normalize_basic_infix_operation(counter, expression):
-    counter, left_prestatements, left_expression = normalize_expression(counter, expression.left)
-    counter, right_prestatements, right_expression = normalize_expression(counter, expression.right)
+def normalize_symbol_expression(counter, expression):
+    return (
+        counter,
+        (),
+        NormalSymbolExpression(symbol=expression.symbol),
+    )
 
-    left_variable = '${}'.format(counter)
-    counter += 1
-    right_variable = '${}'.format(counter)
-    counter += 1
+def normalize_symbol_literal_expression(counter, expression):
+    return (
+        counter,
+        (),
+        NormalSymbolLiteralExpression(symbol=expression.symbol),
+    )
 
-    root_prestatements = (
-        NormalVariableAssignmentStatement(
-            variable=left_variable,
-            expression=left_expression,
-        ),
-        NormalVariableAssignmentStatement(
-            variable=right_variable,
-            expression=right_expression,
-        ),
+def normalize_function_call_expression(counter, expression):
+    prestatements = []
+
+    for argument in expression.argument_list:
+        counter, argument_prestatements, normalized_argument = normalize_expression(counter, argument)
+
+        for s in argument_prestatements:
+            prestatements.append(s)
+
+        prestatements.append(
+            NormalPushStatement(
+                expression=normalized_argument,
+            ),
+        )
+
+    counter, function_prestatements, function_expression = normalize_expression(
+        counter,
+        expression.function,
     )
 
+    for ps in function_prestatements:
+        prestatements.append(ps)
+
     return (
         counter,
-        left_prestatements + right_prestatements + root_prestatements,
-        NormalInfixExpression(
-            order=expression.order, # TODO Do we need this?
-            operator=expression.operator,
-            left=NormalVariableExpression(variable=left_variable),
-            right=NormalVariableExpression(variable=right_variable),
+        tuple(prestatements),
+        NormalFunctionCallExpression(
+            metadata=expression.metadata,
+            function_expression=function_expression,
+            argument_count=len(expression.argument_list),
         ),
     )
 
-def normalize_infix_expression(counter, expression):
-    # TODO Unfake this normalization
-    return {
-        'multiplication_level': normalize_basic_infix_operation,
-        'addition_level': normalize_basic_infix_operation,
-        'comparison_level': fake_normalization,
-        'and_level': fake_normalization,
-        'or_level': fake_normalization,
-    }[expression.order](counter, expression)
+def normalize_if_expression(counter, expression):
+    counter, condition_prestatements, condition_expression = normalize_expression(
+        counter,
+        expression.condition_expression,
+    )
+
+    counter, if_statement_list = normalize_statement_list(
+        counter,
+        expression.if_statement_list,
+    )
+    counter, else_statement_list = normalize_statement_list(
+        counter,
+        expression.else_statement_list,
+    )
+
+    return (
+        counter,
+        condition_prestatements,
+        NormalIfElseExpression(
+            condition_expression=condition_expression,
+            if_statement_list=if_statement_list,
+            else_statement_list=else_statement_list,
+        ),
+    )
 
 def normalize_expression(counter, expression):
     return {
-        parsing.FurFunctionCallExpression: normalize_function_call_expression,
-        parsing.FurInfixExpression: normalize_infix_expression,
-        parsing.FurIntegerLiteralExpression: fake_normalization,
-        parsing.FurNegationExpression: fake_normalization, # TODO Don't fake this
-        parsing.FurParenthesizedExpression: fake_normalization, # TODO Don't fake this
-        parsing.FurStringLiteralExpression: fake_normalization,
-        parsing.FurSymbolExpression: fake_normalization,
+        desugaring.DesugaredBuiltinExpression: normalize_builtin_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,
+        desugaring.DesugaredSymbolExpression: normalize_symbol_expression,
+        desugaring.DesugaredSymbolLiteralExpression: normalize_symbol_literal_expression,
     }[type(expression)](counter, expression)
 
 def normalize_expression_statement(counter, statement):
-    counter, prestatements, normalized = {
-        parsing.FurFunctionCallExpression: normalize_function_call_expression,
-    }[type(statement.expression)](counter, statement.expression)
+    # TODO Normalized will be a NormalVariableExpression, which will go unused
+    # for expression statements in every case except when it's a return
+    # statement. This cases warnings on C compilation. We should only generate
+    # this variable when it will be used on return.
+    counter, prestatements, normalized = normalize_expression(counter, statement.expression)
 
     return (
         counter,
@@ -146,21 +323,40 @@ def normalize_expression_statement(counter, statement):
         NormalExpressionStatement(expression=normalized),
     )
 
+def normalize_assignment_statement(counter, statement):
+    counter, prestatements, normalized_expression = normalize_expression(counter, statement.expression)
+    return (
+        counter,
+        prestatements,
+        NormalAssignmentStatement(
+            target=statement.target,
+            expression=normalized_expression,
+        ),
+    )
+
 def normalize_statement(counter, statement):
     return {
-        parsing.FurExpressionStatement: normalize_expression_statement,
-        parsing.FurAssignmentStatement: fake_normalization,
+        desugaring.DesugaredAssignmentStatement: normalize_assignment_statement,
+        desugaring.DesugaredExpressionStatement: normalize_expression_statement,
     }[type(statement)](counter, statement)
 
-def normalize(program):
-    counter = 0
-    statement_list = []
+@util.force_generator(tuple)
+def normalize_statement_list(counter, statement_list):
+    result_statement_list = []
 
-    for statement in program.statement_list:
+    for statement in statement_list:
         counter, prestatements, normalized = normalize_statement(counter, statement)
         for s in prestatements:
-            statement_list.append(s)
-        statement_list.append(normalized)
+            result_statement_list.append(s)
+        result_statement_list.append(normalized)
+
+    return (
+        counter,
+        result_statement_list,
+    )
+
+def normalize(program):
+    _, statement_list = normalize_statement_list(0, program.statement_list)
 
     return NormalProgram(
         statement_list=statement_list,