Added variable-length args to function calls

[fur] / transformation.py

diff --git a/transformation.py b/transformation.py
index 5de9bbf..ecfab9a 100644 (file)
--- a/transformation.py
+++ b/transformation.py
@@ -60,7 +60,8 @@ CFunctionCallExpression = collections.namedtuple(
     'CFunctionCallExpression',
     [
         'name',
-        'arguments',
+        'argument_count',
+        'argument_items',
     ],
 )
 
@@ -73,8 +74,24 @@ CSymbolAssignmentStatement = collections.namedtuple(
     ],
 )
 
-CVariableAssignmentStatement = collections.namedtuple(
-    'CVariableAssignmentStatement',
+CArrayVariableInitializationStatement = collections.namedtuple(
+    'CArrayVariableInitializationStatement',
+    [
+        'variable',
+        'items',
+    ],
+)
+
+CVariableInitializationStatement = collections.namedtuple(
+    'CVariableInitializationStatement',
+    [
+        'variable',
+        'expression',
+    ],
+)
+
+CVariableReassignmentStatement = collections.namedtuple(
+    'CVariableReassignmentStatement',
     [
         'variable',
         'expression',
@@ -88,6 +105,15 @@ CExpressionStatement = collections.namedtuple(
     ],
 )
 
+CIfElseStatement = collections.namedtuple(
+    'CIfElseStatement',
+    [
+        'condition_expression',
+        'if_statements',
+        'else_statements',
+    ],
+)
+
 CProgram = collections.namedtuple(
     'CProgram',
     [
@@ -108,10 +134,10 @@ EQUALITY_LEVEL_OPERATOR_TO_FUNCTION_NAME_MAPPING = {
     '>':    'greaterThan',
 }
 
-def transform_equality_level_expression(accumulators, expression):
+def transform_comparison_level_expression(accumulators, expression):
     # Transform expressions like 1 < 2 < 3 into expressions like 1 < 2 && 2 < 3
-    if isinstance(expression.left, parsing.FurInfixExpression) and expression.left.order == 'equality_level':
-        left = transform_equality_level_expression(
+    if isinstance(expression.left, parsing.FurInfixExpression) and expression.left.order == 'comparison_level':
+        left = transform_comparison_level_expression(
             accumulators,
             expression.left
         )
@@ -151,8 +177,8 @@ def transform_variable_expression(accumulators, expression):
     return CVariableExpression(variable=expression.variable)
 
 def transform_infix_expression(accumulators, expression):
-    if expression.order == 'equality_level':
-        return transform_equality_level_expression(accumulators, expression)
+    if expression.order == 'comparison_level':
+        return transform_comparison_level_expression(accumulators, expression)
 
     INFIX_OPERATOR_TO_FUNCTION_NAME = {
         '+':    'add',
@@ -216,6 +242,7 @@ def transform_expression(accumulators, expression):
         parsing.FurInfixExpression: transform_infix_expression, # TODO Shouldn't need this
         normalization.NormalFunctionCallExpression: transform_function_call_expression,
         normalization.NormalInfixExpression: transform_infix_expression,
+        normalization.NormalNegationExpression: transform_negation_expression,
         normalization.NormalVariableExpression: transform_variable_expression,
     }[type(expression)](accumulators, expression)
 
@@ -233,23 +260,20 @@ def transform_symbol_assignment_statement(accumulators, assignment_statement):
         ),
     )
 
-def transform_negation_expression(accumulators, negation_expression):
+def transform_negation_expression(accumulators, expression):
     return CNegationExpression(
-        value=transform_expression(accumulators, negation_expression.value),
+        value=transform_expression(accumulators, expression.internal_expression),
     )
 
 def transform_function_call_expression(accumulators, function_call):
-    # TODO Function should be a full expression
     if function_call.function.value in BUILTINS.keys():
         # TODO Check that the builtin is actually callable
         accumulators.builtin_set.add(function_call.function.value)
 
         return CFunctionCallExpression(
             name='builtin$' + function_call.function.value,
-            arguments=tuple(
-                transform_expression(accumulators, arg)
-                for arg in function_call.arguments
-            ),
+            argument_count=function_call.argument_count,
+            argument_items=transform_expression(accumulators, function_call.argument_items),
         )
 
     raise Exception()
@@ -264,8 +288,27 @@ def transform_expression_statement(accumulators, statement):
         expression=expression,
     )
 
-def transform_variable_assignment_statement(accumulators, statement):
-    return CVariableAssignmentStatement(
+def transform_if_else_statement(accumulators, statement):
+    return CIfElseStatement(
+        condition_expression=transform_expression(accumulators, statement.condition_expression),
+        if_statements=tuple(transform_statement(accumulators, s) for s in statement.if_statements),
+        else_statements=tuple(transform_statement(accumulators, s) for s in statement.else_statements),
+    )
+
+def transform_array_variable_initialization_statement(accumulators, statement):
+    return CArrayVariableInitializationStatement(
+        variable=statement.variable,
+        items=tuple(transform_expression(accumulators, i) for i in statement.items),
+    )
+
+def transform_variable_initialization_statement(accumulators, statement):
+    return CVariableInitializationStatement(
+        variable=statement.variable,
+        expression=transform_expression(accumulators, statement.expression),
+    )
+
+def transform_variable_reassignment_statement(accumulators, statement):
+    return CVariableReassignmentStatement(
         variable=statement.variable,
         expression=transform_expression(accumulators, statement.expression),
     )
@@ -274,8 +317,11 @@ def transform_statement(accumulators, statement):
     return {
         parsing.FurAssignmentStatement: transform_symbol_assignment_statement,
         parsing.FurExpressionStatement: transform_expression_statement,
-        normalization.NormalVariableAssignmentStatement: transform_variable_assignment_statement,
         normalization.NormalExpressionStatement: transform_expression_statement,
+        normalization.NormalIfElseStatement: transform_if_else_statement,
+        normalization.NormalArrayVariableInitializationStatement: transform_array_variable_initialization_statement,
+        normalization.NormalVariableInitializationStatement: transform_variable_initialization_statement,
+        normalization.NormalVariableReassignmentStatement: transform_variable_reassignment_statement,
     }[type(statement)](accumulators, statement)