Added if expression statements

[fur] / generation.py

diff --git a/generation.py b/generation.py
index 1694e1f..4fe8de4 100644 (file)
--- a/generation.py
+++ b/generation.py
@@ -56,13 +56,14 @@ def generate_negation_expression(c_negation_expression):
     )
 
 def generate_function_call(function_call):
-    # TODO This gets called twice, which is really inefficient--normalization would also allow other clauses besides a variable reference
-    # TODO This should no longer be called "name", as it can be an expression of a few types
+    # This gets called twice, so we want to be sure it is efficient and without side effects
+    assert isinstance(function_call.function_expression, transformation.CVariableExpression)
+
     # TODO Check the type of the things being called
-    get_closure_clause = generate_expression(function_call.name)
+    function_expression = generate_variable_expression(function_call.function_expression)
     return '{}.instance.closure.call(environmentPool, {}.instance.closure.closed, {}, {})'.format(
-        get_closure_clause,
-        get_closure_clause,
+        function_expression,
+        function_expression,
         function_call.argument_count,
         # TODO This is just a single item containing a reference to the items list--make that clearer
         generate_expression(function_call.argument_items),
@@ -107,31 +108,31 @@ def generate_if_else_statement(statement):
         generate_expression(statement.condition_expression),
     )
 
-    if len(statement.if_statements) == 0:
+    if len(statement.if_statement_list) == 0:
         condition_expression = '!({})'.format(condition_expression)
-        if_statements = statement.else_statements
-        else_statements = ()
+        if_statement_list = statement.else_statement_list
+        else_statement_list = ()
     else:
-        if_statements = statement.if_statements
-        else_statements = statement.else_statements
+        if_statement_list = statement.if_statement_list
+        else_statement_list = statement.else_statement_list
 
     generated_if_clause = 'if({})'.format(condition_expression)
 
-    if len(if_statements) == 0:
-        generated_if_statements = ';'
+    if len(if_statement_list) == 0:
+        generated_if_statement_list = ';'
     else:
-        generated_if_statements = indent('\n{{\n{}\n}}'.format(
-            indent('\n'.join(generate_statement(s) for s in if_statements)),
+        generated_if_statement_list = indent('\n{{\n{}\n}}'.format(
+            indent('\n'.join(generate_statement(s) for s in if_statement_list)),
         ))
 
-    if len(else_statements) == 0:
-        generated_else_statements = ''
+    if len(else_statement_list) == 0:
+        generated_else_statement_list = ''
     else:
-        generated_else_statements = indent('\nelse\n{{\n{}\n}}'.format(
-            indent('\n'.join(generate_statement(s) for s in else_statements)),
+        generated_else_statement_list = indent('\nelse\n{{\n{}\n}}'.format(
+            indent('\n'.join(generate_statement(s) for s in else_statement_list)),
         ))
 
-    return generated_if_clause + generated_if_statements + generated_else_statements
+    return generated_if_clause + generated_if_statement_list + generated_else_statement_list
 
 def generate_function_declaration(statement):
     return 'Environment_set(environment, "{}", (Object){{ CLOSURE, (Instance)(Closure){{ environment, user${}$implementation }} }});'.format(statement.name, statement.name)