Commit 3c226c00 authored by Branislav Katreniak's avatar Branislav Katreniak

dynamic cleanup: wrap local variable in switch with {}

* improves code consistency
* allows to add new case at the end
parent 06e4991e
...@@ -563,7 +563,7 @@ void DynamicStruct::Builder::set(StructSchema::Field field, const DynamicValue:: ...@@ -563,7 +563,7 @@ void DynamicStruct::Builder::set(StructSchema::Field field, const DynamicValue::
.set(value.as<AnyPointer>()); .set(value.as<AnyPointer>());
return; return;
case schema::Type::INTERFACE: case schema::Type::INTERFACE: {
auto interfaceType = type.asInterface(); auto interfaceType = type.asInterface();
auto capability = value.as<DynamicCapability>(); auto capability = value.as<DynamicCapability>();
KJ_REQUIRE(capability.getSchema().extends(interfaceType), "Value type mismatch.") { KJ_REQUIRE(capability.getSchema().extends(interfaceType), "Value type mismatch.") {
...@@ -572,6 +572,7 @@ void DynamicStruct::Builder::set(StructSchema::Field field, const DynamicValue:: ...@@ -572,6 +572,7 @@ void DynamicStruct::Builder::set(StructSchema::Field field, const DynamicValue::
builder.getPointerField(slot.getOffset() * POINTERS).setCapability( builder.getPointerField(slot.getOffset() * POINTERS).setCapability(
kj::mv(capability.hook)); kj::mv(capability.hook));
return; return;
}
} }
KJ_UNREACHABLE; KJ_UNREACHABLE;
...@@ -742,7 +743,7 @@ void DynamicStruct::Builder::adopt(StructSchema::Field field, Orphan<DynamicValu ...@@ -742,7 +743,7 @@ void DynamicStruct::Builder::adopt(StructSchema::Field field, Orphan<DynamicValu
} }
break; break;
case schema::Type::INTERFACE: case schema::Type::INTERFACE: {
auto interfaceType = type.asInterface(); auto interfaceType = type.asInterface();
KJ_REQUIRE(orphan.getType() == DynamicValue::CAPABILITY && KJ_REQUIRE(orphan.getType() == DynamicValue::CAPABILITY &&
orphan.interfaceSchema.extends(interfaceType), orphan.interfaceSchema.extends(interfaceType),
...@@ -750,6 +751,7 @@ void DynamicStruct::Builder::adopt(StructSchema::Field field, Orphan<DynamicValu ...@@ -750,6 +751,7 @@ void DynamicStruct::Builder::adopt(StructSchema::Field field, Orphan<DynamicValu
return; return;
} }
break; break;
}
} }
builder.getPointerField(slot.getOffset() * POINTERS).adopt(kj::mv(orphan.builder)); builder.getPointerField(slot.getOffset() * POINTERS).adopt(kj::mv(orphan.builder));
......
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