serverscanning/capnproto-java-rpc
16
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

adjust where the dot gets put in

Browse source
This commit is contained in:
David Renshaw 2014-10-28 17:59:02 -04:00
parent 2557bd30c9
commit 3d8537521c
1 changed files with 31 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

61
compiler/src/main/cpp/capnpc-java.c++
View file

@ -298,8 +298,8 @@ private:
case schema::Type::FLOAT32: return kj::strTree("float"); case schema::Type::FLOAT32: return kj::strTree("float");
case schema::Type::FLOAT64: return kj::strTree("double"); case schema::Type::FLOAT64: return kj::strTree("double");
case schema::Type::TEXT: return kj::strTree(" org.capnproto.Text", suffix); case schema::Type::TEXT: return kj::strTree(" org.capnproto.Text.", suffix);
case schema::Type::DATA: return kj::strTree(" org.capnproto.Data", suffix); case schema::Type::DATA: return kj::strTree(" org.capnproto.Data.", suffix);
case schema::Type::ENUM: return javaFullName(type.asEnum()); case schema::Type::ENUM: return javaFullName(type.asEnum());
case schema::Type::STRUCT: { case schema::Type::STRUCT: {
@ -308,14 +308,14 @@ private:
KJ_LOG(ERROR, suffix); KJ_LOG(ERROR, suffix);
auto typeArgs = getTypeArguments(structSchema, structSchema, kj::str(suffix)); auto typeArgs = getTypeArguments(structSchema, structSchema, kj::str(suffix));
return kj::strTree( return kj::strTree(
javaFullName(structSchema), suffix, "<", javaFullName(structSchema), ".", suffix, "<",
kj::StringTree(KJ_MAP(arg, typeArgs){ kj::StringTree(KJ_MAP(arg, typeArgs){
return kj::strTree(arg); return kj::strTree(arg);
}, ", "), }, ", "),
">" ">"
); );
} else { } else {
return kj::strTree(javaFullName(type.asStruct()), suffix); return kj::strTree(javaFullName(type.asStruct()), ".", suffix);
} }
} }
case schema::Type::INTERFACE: case schema::Type::INTERFACE:
@ -326,43 +326,43 @@ private:
auto elementType = type.asList().getElementType(); auto elementType = type.asList().getElementType();
switch (elementType.which()) { switch (elementType.which()) {
case schema::Type::VOID: case schema::Type::VOID:
return kj::strTree("org.capnproto.PrimitiveList.Void", suffix); return kj::strTree("org.capnproto.PrimitiveList.Void.", suffix);
case schema::Type::BOOL: case schema::Type::BOOL:
return kj::strTree("org.capnproto.PrimitiveList.Boolean", suffix); return kj::strTree("org.capnproto.PrimitiveList.Boolean.", suffix);
case schema::Type::INT8: case schema::Type::INT8:
case schema::Type::UINT8: case schema::Type::UINT8:
return kj::strTree("org.capnproto.PrimitiveList.Byte", suffix); return kj::strTree("org.capnproto.PrimitiveList.Byte.", suffix);
case schema::Type::INT16: case schema::Type::INT16:
case schema::Type::UINT16: case schema::Type::UINT16:
return kj::strTree("org.capnproto.PrimitiveList.Short", suffix); return kj::strTree("org.capnproto.PrimitiveList.Short.", suffix);
case schema::Type::INT32: case schema::Type::INT32:
case schema::Type::UINT32: case schema::Type::UINT32:
return kj::strTree("org.capnproto.PrimitiveList.Int", suffix); return kj::strTree("org.capnproto.PrimitiveList.Int.", suffix);
case schema::Type::INT64: case schema::Type::INT64:
case schema::Type::UINT64: case schema::Type::UINT64:
return kj::strTree("org.capnproto.PrimitiveList.Long", suffix); return kj::strTree("org.capnproto.PrimitiveList.Long.", suffix);
case schema::Type::FLOAT32: case schema::Type::FLOAT32:
return kj::strTree("org.capnproto.PrimitiveList.Float", suffix); return kj::strTree("org.capnproto.PrimitiveList.Float.", suffix);
case schema::Type::FLOAT64: case schema::Type::FLOAT64:
return kj::strTree("org.capnproto.PrimitiveList.Double", suffix); return kj::strTree("org.capnproto.PrimitiveList.Double.", suffix);
case schema::Type::STRUCT: case schema::Type::STRUCT:
{ {
auto inner = typeName(elementType, kj::str(suffix)); auto inner = typeName(elementType, kj::str(suffix));
return kj::strTree("org.capnproto.StructList", suffix, "<", kj::mv(inner), ">"); return kj::strTree("org.capnproto.StructList.", suffix, "<", kj::mv(inner), ">");
} }
case schema::Type::TEXT: case schema::Type::TEXT:
return kj::strTree( "org.capnproto.TextList", suffix); return kj::strTree( "org.capnproto.TextList.", suffix);
case schema::Type::DATA: case schema::Type::DATA:
return kj::strTree( "org.capnproto.DataList", suffix); return kj::strTree( "org.capnproto.DataList.", suffix);
case schema::Type::ENUM: case schema::Type::ENUM:
{ {
auto inner = typeName(elementType, kj::str(suffix)); auto inner = typeName(elementType, kj::str(suffix));
return kj::strTree("org.capnproto.EnumList", suffix, "<", kj::mv(inner), ">"); return kj::strTree("org.capnproto.EnumList.", suffix, "<", kj::mv(inner), ">");
} }
case schema::Type::LIST: case schema::Type::LIST:
{ {
auto inner = typeName(elementType, kj::str(suffix)); auto inner = typeName(elementType, kj::str(suffix));
return kj::strTree("org.capnproto.ListList", suffix, "<", kj::mv(inner), ">"); return kj::strTree("org.capnproto.ListList.", suffix, "<", kj::mv(inner), ">");
} }
case schema::Type::INTERFACE: case schema::Type::INTERFACE:
case schema::Type::ANY_POINTER: case schema::Type::ANY_POINTER:
@ -735,18 +735,20 @@ private:
")" ")"
).flatten(); ).flatten();
} else { } else {
return kj::str(typeName(type, kj::str(".factory"))); return kj::str(typeName(type, kj::str("factory")));
} }
} }
case schema::Type::LIST: { case schema::Type::LIST: {
auto elementType = type.asList().getElementType(); auto elementType = type.asList().getElementType();
switch (elementType.which()) { switch (elementType.which()) {
case schema::Type::STRUCT: case schema::Type::STRUCT: {
return kj::str(typeName(elementType, kj::str(".listFactory"))); // XXX
return kj::str(typeName(elementType, kj::str("listFactory")));
}
case schema::Type::LIST: case schema::Type::LIST:
return kj::str("new org.capnproto.ListList.Factory<", return kj::str("new org.capnproto.ListList.Factory<",
typeName(elementType, kj::str(".Builder")),", ", typeName(elementType, kj::str("Builder")),", ",
typeName(elementType, kj::str(".Reader")), ">(", typeName(elementType, kj::str("Reader")), ">(",
makeFactoryArg(elementType), makeFactoryArg(elementType),
")"); ")");
case schema::Type::ENUM: case schema::Type::ENUM:
@ -755,7 +757,7 @@ private:
typeName(elementType, kj::str("")), typeName(elementType, kj::str("")),
".values())"); ".values())");
default: default:
return kj::str(typeName(type, kj::str(".factory"))); return kj::str(typeName(type, kj::str("factory")));
} }
} }
default: default:
@ -826,8 +828,8 @@ private:
FieldKind kind = FieldKind::PRIMITIVE; FieldKind kind = FieldKind::PRIMITIVE;
kj::String ownedType; kj::String ownedType;
kj::String builderType = typeName(field.getType(), kj::str(".Builder")).flatten(); kj::String builderType = typeName(field.getType(), kj::str("Builder")).flatten();
kj::String readerType = typeName(field.getType(), kj::str(".Reader")).flatten(); kj::String readerType = typeName(field.getType(), kj::str("Reader")).flatten();
kj::String defaultMask; // primitives only kj::String defaultMask; // primitives only
size_t defaultOffset = 0; // pointers only: offset of the default value within the schema. size_t defaultOffset = 0; // pointers only: offset of the default value within the schema.
size_t defaultSize = 0; // blobs only: byte size of the default value. size_t defaultSize = 0; // blobs only: byte size of the default value.
@ -1419,7 +1421,7 @@ private:
auto proto = schema.getProto(); auto proto = schema.getProto();
auto constProto = proto.getConst(); auto constProto = proto.getConst();
auto type = schema.getType(); auto type = schema.getType();
auto typeName_ = typeName(type).flatten(); auto typeName_ = typeName(type, kj::str("Reader")).flatten();
auto upperCase = toUpperCase(name); auto upperCase = toUpperCase(name);
switch (type.which()) { switch (type.which()) {
@ -1468,21 +1470,20 @@ private:
return ConstText { return ConstText {
true, true,
kj::strTree(spaces(indent), kj::strTree(spaces(indent),
"public static final ", typeName_, ".Reader ", upperCase, " =\n", "public static final ", typeName_, " ", upperCase, " =\n",
spaces(indent), " ", spaces(indent), " ",
"new org.capnproto.AnyPointer.Reader(Schemas.b_", "new org.capnproto.AnyPointer.Reader(Schemas.b_",
kj::hex(proto.getId()), ",", schema.getValueSchemaOffset(), ",0x7fffffff).getAs(", kj::hex(proto.getId()), ",", schema.getValueSchemaOffset(), ",0x7fffffff).getAs(",
typeName_, ".factory);\n") makeFactoryArg(type), ");\n")
}; };
} }
case schema::Value::LIST: { case schema::Value::LIST: {
kj::String constType = typeName(type, kj::str(".Reader")).flatten();;
return ConstText { return ConstText {
true, true,
kj::strTree( kj::strTree(
spaces(indent), spaces(indent),
"public static final ", constType, ' ', upperCase, " =\n", "public static final ", typeName_, ' ', upperCase, " =\n",
spaces(indent), " (", spaces(indent), " (",
"new org.capnproto.AnyPointer.Reader(Schemas.b_", "new org.capnproto.AnyPointer.Reader(Schemas.b_",
kj::hex(proto.getId()), ",", schema.getValueSchemaOffset(), ",0x7fffffff).getAs(", kj::hex(proto.getId()), ",", schema.getValueSchemaOffset(), ",0x7fffffff).getAs(",