Normalize symbol expressions

[fur] / normalization.py

diff --git a/normalization.py b/normalization.py
index 3fa52ac..51c1d7b 100644 (file)
--- a/normalization.py
+++ b/normalization.py
@@ -10,6 +10,27 @@ NormalVariableExpression = collections.namedtuple(
     ],
 )
 
+NormalIntegerLiteralExpression = collections.namedtuple(
+    'NormalIntegerLiteralExpression',
+    [
+        'integer',
+    ],
+)
+
+NormalStringLiteralExpression = collections.namedtuple(
+    'NormalStringLiteralExpression',
+    [
+        'string',
+    ],
+)
+
+NormalSymbolExpression = collections.namedtuple(
+    'NormalSymbolExpression',
+    [
+        'symbol',
+    ],
+)
+
 NormalNegationExpression = collections.namedtuple(
     'NormalNegationExpression',
     [
@@ -67,6 +88,14 @@ NormalExpressionStatement = collections.namedtuple(
     ],
 )
 
+NormalAssignmentStatement = collections.namedtuple(
+    'NormalAssignmentStatement',
+    [
+        'target',
+        'expression',
+    ],
+)
+
 NormalIfElseStatement = collections.namedtuple(
     'NormalIfElseStatement',
     [
@@ -80,6 +109,7 @@ NormalFunctionDefinitionStatement = collections.namedtuple(
     'NormalFunctionDefinitionStatement',
     [
         'name',
+        'argument_name_list',
         'statement_list',
     ],
 )
@@ -91,10 +121,21 @@ NormalProgram = collections.namedtuple(
     ],
 )
 
-# TODO Get rid of this
 def fake_normalization(counter, thing):
     return (counter, (), thing)
 
+def normalize_integer_literal_expression(counter, expression):
+    # TODO Store this in a C variable
+    return (counter, (), NormalIntegerLiteralExpression(integer=expression.integer))
+
+def normalize_string_literal_expression(counter, expression):
+    # TODO Store this in a C variable
+    return (counter, (), NormalStringLiteralExpression(string=expression.string))
+
+def normalize_symbol_expression(counter, expression):
+    # TODO Store this in a C variable
+    return (counter, (), NormalSymbolExpression(symbol=expression.symbol))
+
 def normalize_function_call_expression(counter, expression):
     assert isinstance(expression, parsing.FurFunctionCallExpression)
 
@@ -125,11 +166,19 @@ def normalize_function_call_expression(counter, expression):
         items=tuple(arguments),
     ))
 
+    counter, function_prestatements, function_expression = normalize_expression(
+        counter,
+        expression.function,
+    )
+
+    for ps in function_prestatements:
+        prestatements.append(ps)
+
     return (
         counter,
         tuple(prestatements),
         NormalFunctionCallExpression(
-            function=expression.function, # TODO Normalize the function
+            function=function_expression,
             argument_count=len(arguments),
             argument_items=NormalVariableExpression(variable=arguments_variable),
         ),
@@ -285,20 +334,16 @@ def normalize_negation_expression(counter, expression):
         NormalNegationExpression(internal_expression=NormalVariableExpression(variable=internal_variable)),
     )
 
-def normalize_parenthesized_expression(counter, expression):
-    return normalize_expression(counter, expression.internal)
-
 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,
+        parsing.FurIntegerLiteralExpression: normalize_integer_literal_expression,
         parsing.FurNegationExpression: normalize_negation_expression,
-        parsing.FurParenthesizedExpression: normalize_parenthesized_expression,
-        parsing.FurStringLiteralExpression: fake_normalization,
-        parsing.FurSymbolExpression: fake_normalization,
+        parsing.FurStringLiteralExpression: normalize_string_literal_expression,
+        parsing.FurSymbolExpression: normalize_symbol_expression,
     }[type(expression)](counter, expression)
 
 def normalize_expression_statement(counter, statement):
@@ -322,13 +367,25 @@ def normalize_function_definition_statement(counter, statement):
         (),
         NormalFunctionDefinitionStatement(
             name=statement.name,
+            argument_name_list=statement.argument_name_list,
             statement_list=normalize_statement_list(statement.statement_list),
         ),
     )
 
+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.FurAssignmentStatement: fake_normalization, # TODO unfake this
+        parsing.FurAssignmentStatement: normalize_assignment_statement,
         parsing.FurExpressionStatement: normalize_expression_statement,
         parsing.FurFunctionDefinitionStatement: normalize_function_definition_statement,
     }[type(statement)](counter, statement)