Skip to content

C
capnproto
Commit 41e87ab5 authored by joshuawarner32@gmail.com's avatar joshuawarner32@gmail.com
Browse files
Options

use switch/cases instead of if/else blocks

parent 24747af2
Hide whitespace changes
Inline Side-by-side
Showing with 11 additions and 22 deletions
c++/src/capnp/any.c++
View file @ 41e87ab5
...@@ -173,32 +173,21 @@ StructEqualityResult AnyList::Reader::equals(AnyList::Reader right) { ...@@ -173,32 +173,21 @@ StructEqualityResult AnyList::Reader::equals(AnyList::Reader right) {
} }
StructEqualityResult AnyPointer::Reader::equals(AnyPointer::Reader right) { StructEqualityResult AnyPointer::Reader::equals(AnyPointer::Reader right) {
if(right.isCapability()) { if(getPointerType() != right.getPointerType()) {
return StructEqualityResult::UNKNOWN_CONTAINS_CAPS; return StructEqualityResult::NOT_EQUAL;
} }
if(isNull()) { switch(getPointerType()) {
if(right.isNull()) { case PointerType::NULL_:
return StructEqualityResult::EQUAL; return StructEqualityResult::EQUAL;
} else { case PointerType::STRUCT:
return StructEqualityResult::NOT_EQUAL;
}
} else if(isStruct()) {
if(right.isStruct()) {
return getAs<AnyStruct>().equals(right.getAs<AnyStruct>()); return getAs<AnyStruct>().equals(right.getAs<AnyStruct>());
} else { case PointerType::LIST:
return StructEqualityResult::NOT_EQUAL;
}
} else if(isList()) {
if(right.isList()) {
return getAs<AnyList>().equals(right.getAs<AnyList>()); return getAs<AnyList>().equals(right.getAs<AnyList>());
} else { case PointerType::CAPABILITY:
return StructEqualityResult::NOT_EQUAL; return StructEqualityResult::UNKNOWN_CONTAINS_CAPS;
} default:
} else if(isCapability()) { // There aren't currently any other types of pointers
return StructEqualityResult::UNKNOWN_CONTAINS_CAPS; KJ_FAIL_REQUIRE();
} else {
// There aren't currently any other types of pointers
KJ_FAIL_REQUIRE();
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment