Fix ternary operator bug

ncc/src/casts.rs

@@ -228,6 +228,16 @@ impl Expr
                 test_expr.as_mut().insert_casts()?;
                 then_expr.as_mut().insert_casts()?;
                 else_expr.as_mut().insert_casts()?;
+
+                let then_t = then_expr.eval_type()?;
+                let else_t = else_expr.eval_type()?;
+
+                if !then_t.eq(&else_t) {
+                    *else_expr = Box::new(Expr::Cast {
+                        new_type: then_t.clone(),
+                        child: else_expr.clone()
+                    });
+                }
             }
 
             Expr::Call { callee, args } => {

ncc/src/codegen.rs

@@ -103,7 +103,7 @@ impl Unit
         out.push_str("\n");
 
         out.push_str("# Reserve the first heap word so we can use address 0 as null\n");
-        out.push_str(".u64 0;\n");
+        out.push_str(".u64 0xBADADD5EFEFEFEFE;\n");
         out.push_str("\n");
 
         out.push_str("__EVENT_LOOP_ENABLED__:\n");

ncc/src/types.rs

@@ -410,8 +410,8 @@ impl Expr
                 let then_type = then_expr.eval_type()?;
                 let else_type = else_expr.eval_type()?;
 
-                if !then_type.eq(&else_type) {
-                    return ParseError::msg_only("mismatched types in ternary (?) expression")
+                if !assign_compat(&then_type, &else_type) {
+                    return ParseError::msg_only("incompatible types in ternary (?) expression")
                 }
 
                 Ok(then_type)

ncc/tests/floats.c

@@ -47,6 +47,9 @@ int main()
     assert(0.0f < 1.0f);
     assert(-1.0f < 0.0f);
 
+    // Ternary expression with mismatched types
+    assert((0? 1.5f:2) == 2.0f);
+
     // Arithmetic
     assert(1.0f + 2.0f == 3.0f);
     assert(2.0f * 3.0f == 6.0f);