Added support for comparison operators

[fur] / generation.py

diff --git a/generation.py b/generation.py
index 808b0d8..8e93e02 100644 (file)
--- a/generation.py
+++ b/generation.py
@@ -23,13 +23,33 @@ def generate_string_literal(c_string_literal):
         ''.join(c_escape(ch for ch in c_string_literal.value)),
     )
 
-def generate_argument(c_argument):
+
+CONSTANT_EXPRESSION_MAPPING = {
+    'true':     'TRUE',
+    'false':    'FALSE',
+}
+
+def generate_constant_expression(c_constant_expression):
+    return CONSTANT_EXPRESSION_MAPPING[c_constant_expression.value]
+
+def generate_symbol_expression(c_symbol_expression):
+    return 'Environment_get(environment, SYMBOL_LIST[{}] /* symbol: {} */)'.format(
+        c_symbol_expression.symbol_list_index,
+        c_symbol_expression.symbol,
+    )
+
+def generate_expression(c_argument):
+    if isinstance(c_argument, transformation.CNegationExpression):
+        return generate_negation_expression(c_argument)
+
     if isinstance(c_argument, transformation.CFunctionCallExpression):
         return generate_function_call(c_argument)
 
     LITERAL_TYPE_MAPPING = {
         transformation.CIntegerLiteral: generate_integer_literal,
         transformation.CStringLiteral: generate_string_literal,
+        transformation.CConstantExpression: generate_constant_expression,
+        transformation.CSymbolExpression: generate_symbol_expression,
     }
 
     if type(c_argument) in LITERAL_TYPE_MAPPING:
@@ -41,22 +61,48 @@ def generate_argument(c_argument):
         transformation.CMultiplicationExpression: 'multiply',
         transformation.CIntegerDivisionExpression: 'integerDivide',
         transformation.CModularDivisionExpression: 'modularDivide',
+        transformation.CEqualityExpression: 'equals',
+        transformation.CInequalityExpression: 'notEquals',
+        transformation.CGreaterThanExpression: 'greaterThan',
+        transformation.CLessThanExpression: 'lessThan',
+        transformation.CGreaterThanOrEqualExpression: 'greaterThanOrEqual',
+        transformation.CLessThanOrEqualExpression: 'lessThanOrEqual',
+        transformation.CAndExpression: 'and',
     }
 
     return 'builtin${}({}, {})'.format(
         INFIX_TYPE_MAPPING[type(c_argument)],
-        generate_argument(c_argument.left),
-        generate_argument(c_argument.right),
+        generate_expression(c_argument.left),
+        generate_expression(c_argument.right),
+    )
+
+def generate_negation_expression(c_negation_expression):
+    return 'builtin$negate({})'.format(
+        generate_expression(c_negation_expression.value)
     )
 
 def generate_function_call(c_function_call):
     return '{}({})'.format(
         c_function_call.name,
-        ', '.join(generate_argument(argument) for argument in c_function_call.arguments),
+        ', '.join(generate_expression(argument) for argument in c_function_call.arguments),
+    )
+
+def generate_expression_statement(c_function_call_statement):
+    # TODO Do we need to garbage collect the results of arbitrary statements?
+    return '{};'.format(generate_expression(c_function_call_statement))
+
+def generate_assignment_statement(c_assignment_statement):
+    return 'Environment_set(environment, SYMBOL_LIST[{}] /* symbol: {} */, {});'.format(
+        c_assignment_statement.target_symbol_list_index,
+        c_assignment_statement.target,
+        generate_expression(c_assignment_statement.expression),
     )
 
-def generate_statement(c_function_call_statement):
-    return '{};'.format(generate_function_call(c_function_call_statement))
+def generate_statement(statement):
+    if isinstance(statement, transformation.CAssignmentStatement):
+        return generate_assignment_statement(statement)
+
+    return generate_expression_statement(statement)
 
 def generate(c_program):
     template = ENV.get_template('program.c')
@@ -64,6 +110,7 @@ def generate(c_program):
         builtins=list(sorted(c_program.builtins)),
         statements=[generate_statement(statement) for statement in c_program.statements],
         standard_libraries=list(sorted(c_program.standard_libraries)),
+        symbol_list=c_program.symbol_list,
     )
 
 if __name__ == '__main__':