Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

PS-923 Add prefix to nested type #51

Merged
merged 1 commit into from
Apr 29, 2020
Merged

PS-923 Add prefix to nested type #51

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions protobuf/protoc-gen-cruxclient/api_generator.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -400,7 +400,7 @@ void APIGenerator::PrintDjinniYAML(
vars["dir"] = dir;
auto messages = GetMessagesFromFile(file);
for (const auto message : messages) {
vars["message_name"] = message->name();
vars["message_name"] = ClassName(message, false);
vars["cpp_type_name"] = DotsToColons(message->full_name());
vars["objc_header"] = DotsToSlashs(message->full_name());
vars["file_name"] = StripProto(file->name());
Expand Down Expand Up @@ -473,7 +473,7 @@ void APIGenerator::PrintDjinniObjcSupport(
vars["dir"] = dir;
auto messages = GetMessagesFromFile(file);
for (const auto message : messages) {
vars["message_name"] = message->name();
vars["message_name"] = ClassName(message, false);
vars["objc_file_name"] = ToCamelCase(tokenize(StripProto(file->name()), "/").back());
vars["cpp_type_name"] = DotsToColons(message->full_name());
vars["file_name"] = StripProto(file->name());
Expand Down Expand Up @@ -553,7 +553,7 @@ void APIGenerator::PrintDjinniJNISupport(
vars["dir"] = dir;
auto messages = GetMessagesFromFile(file);
for (const auto message : messages) {
vars["message_name"] = message->name();
vars["message_name"] = ClassName(message, false);
vars["cpp_type_name"] = DotsToColons(message->full_name());
vars["file_name"] = StripProto(file->name());
vars["cpp_header"] = DotsToSlashs(ToLower(message->full_name()));
Expand Down
8 changes: 4 additions & 4 deletions protobuf/protoc-gen-cruxclient/generated/routeguide/v1/message.djinni.jni.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -209,10 +209,10 @@ struct Translator {
#include "routeguide/v1/message.pb.h"
namespace djinni::routeguide::v1::RouteSummary::Details {
struct JNIInfo {
const GlobalRef<jclass> clazz { jniFindClass("io/grpc/examples/routeguide/Details") };
const GlobalRef<jclass> clazz { jniFindClass("io/grpc/examples/routeguide/RouteSummary_Details") };
const jmethodID method_toBytes { jniGetMethodID(clazz.get(), "toByteArray", "()[B") };
const jmethodID method_byteSize { jniGetMethodID(clazz.get(), "getSerializedSize", "()I") };
const jmethodID method_fromBytes { jniGetStaticMethodID(clazz.get(), "parseFrom", "([B)Lio/grpc/examples/routeguide/Details;") };
const jmethodID method_fromBytes { jniGetStaticMethodID(clazz.get(), "parseFrom", "([B)Lio/grpc/examples/routeguide/RouteSummary_Details;") };
};

struct Translator {
Expand Down Expand Up @@ -250,10 +250,10 @@ struct Translator {
#include "routeguide/v1/message.pb.h"
namespace djinni::routeguide::v1::RouteSummary::Details::MoreDetails {
struct JNIInfo {
const GlobalRef<jclass> clazz { jniFindClass("io/grpc/examples/routeguide/MoreDetails") };
const GlobalRef<jclass> clazz { jniFindClass("io/grpc/examples/routeguide/RouteSummary_Details_MoreDetails") };
const jmethodID method_toBytes { jniGetMethodID(clazz.get(), "toByteArray", "()[B") };
const jmethodID method_byteSize { jniGetMethodID(clazz.get(), "getSerializedSize", "()I") };
const jmethodID method_fromBytes { jniGetStaticMethodID(clazz.get(), "parseFrom", "([B)Lio/grpc/examples/routeguide/MoreDetails;") };
const jmethodID method_fromBytes { jniGetStaticMethodID(clazz.get(), "parseFrom", "([B)Lio/grpc/examples/routeguide/RouteSummary_Details_MoreDetails;") };
};

struct Translator {
Expand Down
8 changes: 4 additions & 4 deletions protobuf/protoc-gen-cruxclient/generated/routeguide/v1/message.djinni.objc.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,7 @@ struct Translator {
namespace djinni::routeguide::v1::RouteSummary::Details {
struct Translator {
using CppType = ::routeguide::v1::RouteSummary::Details;
using ObjcType = RTGDetails*;
using ObjcType = RTGRouteSummary_Details*;
using Boxed = Translator;

static CppType toCpp(ObjcType message) {
Expand All @@ -175,7 +175,7 @@ struct Translator {
message.SerializeToArray(bytes, static_cast<int>(byte_size));
NSData *data = [NSData dataWithBytes: bytes length: (int)byte_size];
NSError *error;
return [RTGDetails parseFromData:data error:&error];
return [RTGRouteSummary_Details parseFromData:data error:&error];
}
};
} //namespace djinni::routeguide::v1::RouteSummary::Details
Expand All @@ -186,7 +186,7 @@ struct Translator {
namespace djinni::routeguide::v1::RouteSummary::Details::MoreDetails {
struct Translator {
using CppType = ::routeguide::v1::RouteSummary::Details::MoreDetails;
using ObjcType = RTGMoreDetails*;
using ObjcType = RTGRouteSummary_Details_MoreDetails*;
using Boxed = Translator;

static CppType toCpp(ObjcType message) {
Expand All @@ -205,7 +205,7 @@ struct Translator {
message.SerializeToArray(bytes, static_cast<int>(byte_size));
NSData *data = [NSData dataWithBytes: bytes length: (int)byte_size];
NSError *error;
return [RTGMoreDetails parseFromData:data error:&error];
return [RTGRouteSummary_Details_MoreDetails parseFromData:data error:&error];
}
};
} //namespace djinni::routeguide::v1::RouteSummary::Details::MoreDetails
Expand Down
24 changes: 12 additions & 12 deletions protobuf/protoc-gen-cruxclient/generated/routeguide/v1/message.djinni.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,7 @@ jni:
typeSignature: 'Lio/grpc/examples/routeguide/RouteSummary;'

---
name: pb_Details
name: pb_RouteSummary_Details
typedef: 'record deriving(eq, ord, parcelable)'
params: []
prefix: 'pb'
Expand All @@ -159,28 +159,28 @@ cpp:
header: '"routeguide/v1/message.pb.h"'
byValue: false
objc:
typename: 'RTGDetails'
typename: 'RTGRouteSummary_Details'
header: '"routeguide_v1_Message.pbobjc.h"'
boxed: 'RTGDetails'
boxed: 'RTGRouteSummary_Details'
pointer: true
hash: '%s.hash()'
objcpp:
translator: 'djinni::routeguide::v1::RouteSummary::Details::Translator'
header: '"routeguide/v1/message.djinni.objc.h"'
java:
typename: 'io.grpc.examples.routeguide.Details'
boxed: 'io.grpc.examples.routeguide.Details'
typename: 'io.grpc.examples.routeguide.RouteSummary_Details'
boxed: 'io.grpc.examples.routeguide.RouteSummary_Details'
reference: true
generic: false
hash: '%s.hashCode()'
jni:
translator: 'djinni::routeguide::v1::RouteSummary::Details::Translator'
header: '"routeguide/v1/message.djinni.jni.h"'
typename: jobject
typeSignature: 'Lio/grpc/examples/routeguide/Details;'
typeSignature: 'Lio/grpc/examples/routeguide/RouteSummary_Details;'

---
name: pb_MoreDetails
name: pb_RouteSummary_Details_MoreDetails
typedef: 'record deriving(eq, ord, parcelable)'
params: []
prefix: 'pb'
Expand All @@ -189,23 +189,23 @@ cpp:
header: '"routeguide/v1/message.pb.h"'
byValue: false
objc:
typename: 'RTGMoreDetails'
typename: 'RTGRouteSummary_Details_MoreDetails'
header: '"routeguide_v1_Message.pbobjc.h"'
boxed: 'RTGMoreDetails'
boxed: 'RTGRouteSummary_Details_MoreDetails'
pointer: true
hash: '%s.hash()'
objcpp:
translator: 'djinni::routeguide::v1::RouteSummary::Details::MoreDetails::Translator'
header: '"routeguide/v1/message.djinni.objc.h"'
java:
typename: 'io.grpc.examples.routeguide.MoreDetails'
boxed: 'io.grpc.examples.routeguide.MoreDetails'
typename: 'io.grpc.examples.routeguide.RouteSummary_Details_MoreDetails'
boxed: 'io.grpc.examples.routeguide.RouteSummary_Details_MoreDetails'
reference: true
generic: false
hash: '%s.hashCode()'
jni:
translator: 'djinni::routeguide::v1::RouteSummary::Details::MoreDetails::Translator'
header: '"routeguide/v1/message.djinni.jni.h"'
typename: jobject
typeSignature: 'Lio/grpc/examples/routeguide/MoreDetails;'
typeSignature: 'Lio/grpc/examples/routeguide/RouteSummary_Details_MoreDetails;'