Merge pull request #330 from katreniak/bka-cleanups

Bka cleanups

c++/src/capnp/compat/json.c++

@@ -534,10 +534,10 @@ void decodeField(Type type, JsonValue::Reader value, SetFn setFn, DecodeArrayFn
       }
       break;
     case schema::Type::INTERFACE:
-      KJ_FAIL_REQUIRE("don't know how to JSON-encode capabilities; "
+      KJ_FAIL_REQUIRE("don't know how to JSON-decode capabilities; "
                       "JsonCodec::Handler not implemented yet :(");
     case schema::Type::ANY_POINTER:
-      KJ_FAIL_REQUIRE("don't know how to JSON-encode AnyPointer; "
+      KJ_FAIL_REQUIRE("don't know how to JSON-decode AnyPointer; "
                       "JsonCodec::Handler not implemented yet :(");
   }
 }

c++/src/capnp/dynamic.c++

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

doc/language.md

@@ -316,7 +316,7 @@ interface Node {
 }
 
 interface Directory extends(Node) {
-  list @0 () -> (list: List(Entry));
+  list @0 () -> (list :List(Entry));
   struct Entry {
     name @0 :Text;
     node @1 :Node;
@@ -330,9 +330,9 @@ interface Directory extends(Node) {
 }
 
 interface File extends(Node) {
-  size @0 () -> (size: UInt64);
+  size @0 () -> (size :UInt64);
   read @1 (startAt :UInt64 = 0, amount :UInt64 = 0xffffffffffffffff)
-       -> (data: Data);
+       -> (data :Data);
   # Default params = read entire file.
 
   write @2 (startAt :UInt64, data :Data);