Fix comparison with integer literals

1 files changed, 8 insertions, 6 deletions

diff --git a/src/compile.c b/src/compile.c
index 05cc7bcd..21091489 100644
--- a/src/compile.c
+++ b/src/compile.c
@@ -2630,19 +2630,21 @@ CORD compile(env_t *env, ast_t *ast)
         type_t *lhs_t = get_type(env, cmp.lhs);
         type_t *rhs_t = get_type(env, cmp.rhs);
         type_t *operand_t;
-        CORD lhs, rhs;
-        if (can_compile_to_type(env, cmp.rhs, lhs_t)) {
-            lhs = compile(env, cmp.lhs);
-            rhs = compile_to_type(env, cmp.rhs, lhs_t);
+        if (cmp.lhs->tag == Int && is_numeric_type(rhs_t)) {
+            operand_t = rhs_t;
+        } else if (cmp.rhs->tag == Int && is_numeric_type(lhs_t)) {
+            operand_t = lhs_t;
+        } else if (can_compile_to_type(env, cmp.rhs, lhs_t)) {
             operand_t = lhs_t;
         } else if (can_compile_to_type(env, cmp.lhs, rhs_t)) {
-            rhs = compile(env, cmp.rhs);
-            lhs = compile_to_type(env, cmp.lhs, rhs_t);
             operand_t = rhs_t;
         } else {
             code_err(ast, "I can't do comparisons between ", type_to_str(lhs_t), " and ", type_to_str(rhs_t));
         }
 
+        CORD lhs = compile_to_type(env, cmp.lhs, operand_t);
+        CORD rhs = compile_to_type(env, cmp.rhs, operand_t);
+
         if (ast->tag == Compare)
             return CORD_all("generic_compare(stack(", lhs, "), stack(", rhs, "), ",
                             compile_type_info(operand_t), ")");