Commit 57688dea36e6d1f8d7bad255898d1e222b3a6fbc | zig

author	Andrew Kelley <andrew@ziglang.org> 2016-04-06 14:15:20-07:00
committer	Andrew Kelley <andrew@ziglang.org> 2016-04-06 14:15:20-07:00
log	57688dea36e6d1f8d7bad255898d1e222b3a6fbc
tree	6aa180ef0197b047899b1b823106dd4cf838e2d0
parent	7bb67b1fd0ca56a04778083f1a01583d839be9b1

add error for gt and lt comparison of invalid types

2 files changed, 18 insertions(+), 5 deletions(-)

src
- analyze.cpp
test
- run_tests.cpp

src/analyze.cpp+13-5

 @@ -2845,8 +2845,20 @@ static TypeTableEntry *analyze_bool_bin_op_expr(CodeGen *g, ImportTableEntry *im
     TypeTableEntry *resolved_type = resolve_peer_type_compatibility(g, import, context, node,
             op_nodes, op_types, 2);
+    bool type_can_gt_lt_cmp = (resolved_type->id == TypeTableEntryIdNumLitFloat ||
+            resolved_type->id == TypeTableEntryIdNumLitInt ||
+            resolved_type->id == TypeTableEntryIdFloat ||
+            resolved_type->id == TypeTableEntryIdInt);
     if (resolved_type->id == TypeTableEntryIdInvalid) {
         return g->builtin_types.entry_invalid;
+    } else if (bin_op_type != BinOpTypeCmpEq &&
+               bin_op_type != BinOpTypeCmpNotEq &&
+               !type_can_gt_lt_cmp)
+    {
+        add_node_error(g, node,
+            buf_sprintf("operator not allowed for type '%s'", buf_ptr(&resolved_type->name)));
+        return g->builtin_types.entry_invalid;
     }
     ConstExprValue *op1_val = &get_resolved_expr(op1)->const_val;
 @@ -2856,11 +2868,7 @@ static TypeTableEntry *analyze_bool_bin_op_expr(CodeGen *g, ImportTableEntry *im
     }
     bool answer;
-    if (resolved_type->id == TypeTableEntryIdNumLitFloat ||
+    if (type_can_gt_lt_cmp) {
-        resolved_type->id == TypeTableEntryIdNumLitInt ||
-        resolved_type->id == TypeTableEntryIdFloat ||
-        resolved_type->id == TypeTableEntryIdInt)
-    {
         bool (*bignum_cmp)(BigNum *, BigNum *);
         if (bin_op_type == BinOpTypeCmpEq) {
             bignum_cmp = bignum_cmp_eq;

test/run_tests.cpp+5

 @@ -1776,6 +1776,11 @@ fn f() {
 const foo = "a
 b";
     )SOURCE", 1, ".tmp_source.zig:2:13: error: use raw string for multiline string literal");
+    add_compile_fail_case("invalid comparison for function pointers", R"SOURCE(
+fn foo() {}
+const invalid = foo > foo;
+    )SOURCE", 1, ".tmp_source.zig:3:21: error: operator not allowed for type 'fn()'");
 }
 //////////////////////////////////////////////////////////////////////////////