aboutsummaryrefslogtreecommitdiff
path: root/src/ir.cpp
diff options
context:
space:
mode:
authorBen Noordhuis <info@bnoordhuis.nl>2018-02-07 20:38:49 +0100
committerAndrew Kelley <superjoe30@gmail.com>2018-02-07 14:38:49 -0500
commit0090c2d70b89cc6b5ab02bdc02aa49c4caf71a5a (patch)
tree3ad1caa3ee17dc7ee71d19f343121f429b101f5d /src/ir.cpp
parent917e6fe3707a82f76c48e484735b86937831451f (diff)
downloadzig-0090c2d70b89cc6b5ab02bdc02aa49c4caf71a5a.tar.gz
zig-0090c2d70b89cc6b5ab02bdc02aa49c4caf71a5a.zip
DRY 'is slice?' conditionals in parser (#750)
Diffstat (limited to 'src/ir.cpp')
-rw-r--r--src/ir.cpp8
1 files changed, 2 insertions, 6 deletions
diff --git a/src/ir.cpp b/src/ir.cpp
index 1dc717286a..ae8ef00f2f 100644
--- a/src/ir.cpp
+++ b/src/ir.cpp
@@ -6369,10 +6369,7 @@ static ImplicitCastMatchResult ir_types_match_with_implicit_cast(IrAnalyze *ira,
}
// implicit [N]T to []const T
- if (expected_type->id == TypeTableEntryIdStruct &&
- expected_type->data.structure.is_slice &&
- actual_type->id == TypeTableEntryIdArray)
- {
+ if (is_slice(expected_type) && actual_type->id == TypeTableEntryIdArray) {
TypeTableEntry *ptr_type = expected_type->data.structure.fields[slice_ptr_index].type_entry;
assert(ptr_type->id == TypeTableEntryIdPointer);
@@ -6384,8 +6381,7 @@ static ImplicitCastMatchResult ir_types_match_with_implicit_cast(IrAnalyze *ira,
}
// implicit &const [N]T to []const T
- if (expected_type->id == TypeTableEntryIdStruct &&
- expected_type->data.structure.is_slice &&
+ if (is_slice(expected_type) &&
actual_type->id == TypeTableEntryIdPointer &&
actual_type->data.pointer.is_const &&
actual_type->data.pointer.child_type->id == TypeTableEntryIdArray)