azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Protobuf: refactored generateSerializers() method into generateWriteTo()

Browse Source
This commit is contained in:
dsavvinov
2016-07-20 18:17:50 +03:00
parent 622043e2a5
commit bc533caae0
3 changed files with 10 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
proto/compiler/google/src/google/protobuf/compiler/kotlin/protoc
BIN
View File
Binary file not shown.
proto/compiler/google/src/google/protobuf/compiler/kotlin/src/kotlin_class_generator.cc
+9 -17
View File
@@ -49,7 +49,7 @@ void ClassGenerator::generateCode(io::Printer *printer, bool isBuilder) const {
// write serialization methods only for fair classes, read methods only for Builders) // write serialization methods only for fair classes, read methods only for Builders)
printer->Print("\n"); printer->Print("\n");
generateSerializers(printer, /* isRead = */ isBuilder); generateWriteToMethod(printer);
// builder, mergeFrom and only for fair classes // builder, mergeFrom and only for fair classes
if (!isBuilder) { if (!isBuilder) {
@@ -189,26 +189,17 @@ void ClassGenerator::generateMergeMethods(io::Printer *printer) const {
} }
void ClassGenerator::generateSerializers(io::Printer *printer, bool isRead) const { void ClassGenerator::generateWriteToMethod(io::Printer *printer) const {
map <string, string> vars;
vars["funName"]= isRead ? "readFrom" : "writeTo";
vars["stream"] = isRead ? "CodedInputStream" : "CodedOutputStream";
vars["arg"] = isRead ? "input" : "output";
vars["returnType"] = isRead ? getBuilderFullType() : "Unit";
vars["maybeReturn"] = isRead ? "return this\n" : "";
// generate function header // generate function header
printer->Print(vars, printer->Print("fun writeTo (output: CodedOutputStream) {"
"fun $funName$ ($arg$: $stream$): $returnType$ {"
"\n"); "\n");
printer->Indent(); printer->Indent();
// generate code for serialization/deserialization of fields // generate code for serialization/deserialization of fields
for (int i = 0; i < properties.size(); ++i) { for (int i = 0; i < properties.size(); ++i) {
properties[i]->generateSerializationCode(printer, isRead); properties[i]->generateSerializationCode(printer, /* isRead = */ false, /* noTag = */ false);
} }
printer->Print(vars, "$maybeReturn$");
printer->Outdent(); printer->Outdent();
printer->Print("}\n"); printer->Print("}\n");
} }
@@ -274,7 +265,7 @@ void ClassGenerator::generateInitSection(io::Printer * printer) const {
} }
void ClassGenerator::generateParseMethods(io::Printer *printer) const { void ClassGenerator::generateParseMethods(io::Printer *printer) const {
// parseFieldFrom(input: CodedInputStream): Boolean // ====== parseFieldFrom(input: CodedInputStream): Boolean =========
map <string, string> vars; map <string, string> vars;
vars["builderName"] = getBuilderFullType(); vars["builderName"] = getBuilderFullType();
@@ -324,7 +315,8 @@ void ClassGenerator::generateParseMethods(io::Printer *printer) const {
printer->Outdent(); printer->Outdent();
printer->Print("}\n"); // parseFieldFrom body printer->Print("}\n"); // parseFieldFrom body
// parseFromWithSize(input: CodedInputStream, expectedSize: Int)
// ====== parseFromWithSize(input: CodedInputStream, expectedSize: Int) =========
printer->Print(vars, printer->Print(vars,
"fun parseFromWithSize(input: CodedInputStream, expectedSize: Int): $builderName$ {\n"); "fun parseFromWithSize(input: CodedInputStream, expectedSize: Int): $builderName$ {\n");
printer->Indent(); printer->Indent();
@@ -338,7 +330,7 @@ void ClassGenerator::generateParseMethods(io::Printer *printer) const {
printer->Outdent(); // while-loop; printer->Outdent(); // while-loop;
printer->Print("}\n"); printer->Print("}\n");
// check if we read more than expected // check if we have read more than expected
vars["dollar"] = "$"; vars["dollar"] = "$";
printer->Print(vars, printer->Print(vars,
"if (getSize() > expectedSize) { " "if (getSize() > expectedSize) { "
@@ -351,7 +343,7 @@ void ClassGenerator::generateParseMethods(io::Printer *printer) const {
printer->Print("}\n"); printer->Print("}\n");
// parseFrom(input: CodedInputStream) // ======== parseFrom(input: CodedInputStream) =========
printer->Print(vars, printer->Print(vars,
"fun parseFrom(input: CodedInputStream): $builderName$ {\n"); "fun parseFrom(input: CodedInputStream): $builderName$ {\n");
printer->Indent(); printer->Indent();
proto/compiler/google/src/google/protobuf/compiler/kotlin/src/kotlin_class_generator.h
+1 -1
View File
@@ -54,7 +54,7 @@ private:
* both methods are structurally the same with some trivial substitutions * both methods are structurally the same with some trivial substitutions
* (read -> write and etc.) * (read -> write and etc.)
*/ */
void generateSerializers(io::Printer * printer, bool isRead = false) const; void generateWriteToMethod(io::Printer *printer) const;
void generateMergeMethods(io::Printer *printer) const; void generateMergeMethods(io::Printer *printer) const;
void generateParseMethods(io::Printer * printer) const; void generateParseMethods(io::Printer * printer) const;
void generateGetSizeMethod(io::Printer * printer) const; void generateGetSizeMethod(io::Printer * printer) const;