Ekdohibs/zig
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

add compile error for invalid equality operator uses

Browse Source 
See #145
This commit is contained in:
Andrew Kelley 2016-04-24 12:09:51 -07:00
parent 46ab981787
commit 8ad75a9bf3
2 changed files with 60 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
src/analyze.cpp
View File

@ -3014,20 +3014,52 @@ static TypeTableEntry *analyze_bool_bin_op_expr(CodeGen *g, ImportTableEntry *im
TypeTableEntry *resolved_type = resolve_peer_type_compatibility(g, import, context, node, TypeTableEntry *resolved_type = resolve_peer_type_compatibility(g, import, context, node,
op_nodes, op_types, 2); op_nodes, op_types, 2);
bool type_can_gt_lt_cmp = (resolved_type->id == TypeTableEntryIdNumLitFloat || bool is_equality_cmp = (bin_op_type == BinOpTypeCmpEq || bin_op_type == BinOpTypeCmpNotEq);
resolved_type->id == TypeTableEntryIdNumLitInt ||
resolved_type->id == TypeTableEntryIdFloat ||
resolved_type->id == TypeTableEntryIdInt);
if (resolved_type->id == TypeTableEntryIdInvalid) { switch (resolved_type->id) {
return g->builtin_types.entry_invalid; case TypeTableEntryIdInvalid:
} else if (bin_op_type != BinOpTypeCmpEq && return g->builtin_types.entry_invalid;
bin_op_type != BinOpTypeCmpNotEq &&
!type_can_gt_lt_cmp) case TypeTableEntryIdNumLitFloat:
{ case TypeTableEntryIdNumLitInt:
add_node_error(g, node, case TypeTableEntryIdInt:
buf_sprintf("operator not allowed for type '%s'", buf_ptr(&resolved_type->name))); case TypeTableEntryIdFloat:
return g->builtin_types.entry_invalid; break;
case TypeTableEntryIdBool:
case TypeTableEntryIdMetaType:
case TypeTableEntryIdVoid:
case TypeTableEntryIdPointer:
case TypeTableEntryIdPureError:
case TypeTableEntryIdFn:
case TypeTableEntryIdTypeDecl:
case TypeTableEntryIdNamespace:
case TypeTableEntryIdGenericFn:
if (!is_equality_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;
}
break;
case TypeTableEntryIdEnum:
if (!is_equality_cmp || resolved_type->data.enumeration.gen_field_count != 0) {
add_node_error(g, node,
buf_sprintf("operator not allowed for type '%s'", buf_ptr(&resolved_type->name)));
return g->builtin_types.entry_invalid;
}
break;
case TypeTableEntryIdUnreachable:
case TypeTableEntryIdArray:
case TypeTableEntryIdStruct:
case TypeTableEntryIdUndefLit:
case TypeTableEntryIdMaybe:
case TypeTableEntryIdErrorUnion:
case TypeTableEntryIdUnion:
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; ConstExprValue *op1_val = &get_resolved_expr(*op1)->const_val;

15
test/run_tests.cpp
View File

@ -1218,6 +1218,21 @@ fn test_a_thing() {
bad_fn_call(); bad_fn_call();
} }
)SOURCE", 1, ".tmp_source.zig:6:5: error: use of undeclared identifier 'bad_fn_call'"); )SOURCE", 1, ".tmp_source.zig:6:5: error: use of undeclared identifier 'bad_fn_call'");
add_compile_fail_case("illegal comparison of types", R"SOURCE(
fn bad_eql_1(a: []u8, b: []u8) -> bool {
a == b
}
enum EnumWithData {
One,
Two: i32,
}
fn bad_eql_2(a: EnumWithData, b: EnumWithData) -> bool {
a == b
}
)SOURCE", 2,
".tmp_source.zig:3:7: error: operator not allowed for type '[]u8'",
".tmp_source.zig:10:7: error: operator not allowed for type 'EnumWithData'");
} }
////////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////////