Added variable-length args to function calls

[fur] / transformation.py

diff --git a/transformation.py b/transformation.py
index efc7d99..ecfab9a 100644 (file)
--- a/transformation.py
+++ b/transformation.py
@@ -60,7 +60,8 @@ CFunctionCallExpression = collections.namedtuple(
     'CFunctionCallExpression',
     [
         'name',
-        'arguments',
+        'argument_count',
+        'argument_items',
     ],
 )
 
@@ -73,6 +74,14 @@ CSymbolAssignmentStatement = collections.namedtuple(
     ],
 )
 
+CArrayVariableInitializationStatement = collections.namedtuple(
+    'CArrayVariableInitializationStatement',
+    [
+        'variable',
+        'items',
+    ],
+)
+
 CVariableInitializationStatement = collections.namedtuple(
     'CVariableInitializationStatement',
     [
@@ -233,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)
 
@@ -250,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()
@@ -288,6 +295,12 @@ def transform_if_else_statement(accumulators, statement):
         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,
@@ -306,6 +319,7 @@ def transform_statement(accumulators, statement):
         parsing.FurExpressionStatement: transform_expression_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)