X-Git-Url: https://code.kerkeslager.com/?a=blobdiff_plain;f=generation.py;h=c47a39e334f0aa887128c5bd30c56898e0191da5;hb=80efbcfcd42da6061d0e31add5cc1e6fb17b2f93;hp=c058f917c56c56eba540eb341ed6ee9cf33c0367;hpb=6e7ba75736ca8b463a263e7d58aa8f6bff62faaf;p=fur

diff --git a/generation.py b/generation.py
index c058f91..c47a39e 100644
--- a/generation.py
+++ b/generation.py
@@ -65,7 +65,7 @@ def generate_negation_expression(c_negation_expression):
     )
 
 def generate_function_call(function_call):
-    return 'Environment_get(environment, "{}").instance.closure({}, {})'.format(
+    return 'Environment_get(environment, "{}").instance.closure(environment, {}, {})'.format(
         function_call.name,
         function_call.argument_count,
         # TODO This is just a single item containing a reference to the items list--make that clearer
@@ -73,6 +73,10 @@ def generate_function_call(function_call):
     )
 
 def generate_expression_statement(statement):
+    # TODO Do this at an earlier pass
+    if isinstance(statement.expression, transformation.CVariableExpression):
+        return '';
+
     # TODO Do we need to garbage collect the results of arbitrary statements?
     return '{};'.format(generate_expression(statement.expression))
 
@@ -107,12 +111,36 @@ def indent(s):
 
 def generate_if_else_statement(statement):
     # TODO Check that the argument is boolean
-    return 'if({}.instance.boolean)\n{{\n{}\n}}\nelse\n{{\n{}\n}}'.format(
+    condition_expression = '{}.instance.boolean'.format(
         generate_expression(statement.condition_expression),
-        indent('\n'.join(generate_statement(s) for s in statement.if_statements)),
-        indent('\n'.join(generate_statement(s) for s in statement.else_statements)),
     )
 
+    if len(statement.if_statements) == 0:
+        condition_expression = '!({})'.format(condition_expression)
+        if_statements = statement.else_statements
+        else_statements = ()
+    else:
+        if_statements = statement.if_statements
+        else_statements = statement.else_statements
+
+    generated_if_clause = 'if({})'.format(condition_expression)
+
+    if len(if_statements) == 0:
+        generated_if_statements = ';'
+    else:
+        generated_if_statements = indent('\n{{\n{}\n}}'.format(
+            indent('\n'.join(generate_statement(s) for s in if_statements)),
+        ))
+
+    if len(else_statements) == 0:
+        generated_else_statements = ''
+    else:
+        generated_else_statements = indent('\nelse\n{{\n{}\n}}'.format(
+            indent('\n'.join(generate_statement(s) for s in else_statements)),
+        ))
+
+    return generated_if_clause + generated_if_statements + generated_else_statements
+
 def generate_function_declaration(statement):
     return 'Environment_set(environment, "{}", user${});'.format(statement.name, statement.name)
 
@@ -133,6 +161,7 @@ def generate(program):
         builtins=tuple(sorted(program.builtin_set)),
         function_definition_list=program.function_definition_list,
         generate_statement=generate_statement,
+        operator_declarations=program.operator_declarations,
         statements=program.statements,
         standard_libraries=list(sorted(program.standard_libraries)),
         string_literal_list=program.string_literal_list,