From bc533caae0350c1f13216be905090213ffe662c7 Mon Sep 17 00:00:00 2001 From: dsavvinov Date: Wed, 20 Jul 2016 18:17:50 +0300 Subject: [PATCH] Protobuf: refactored generateSerializers() method into generateWriteTo() --- .../google/protobuf/compiler/kotlin/protoc | Bin 105224 -> 101128 bytes .../kotlin/src/kotlin_class_generator.cc | 26 ++++++------------ .../kotlin/src/kotlin_class_generator.h | 2 +- 3 files changed, 10 insertions(+), 18 deletions(-) diff --git a/proto/compiler/google/src/google/protobuf/compiler/kotlin/protoc b/proto/compiler/google/src/google/protobuf/compiler/kotlin/protoc index 50d8df117435b3dba9f30606fbbd13f3030b3929..df7073bb962605d98c265cd3292c440a20eaab4e 100755 GIT binary patch delta 18531 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 a!_)3nJoUcE+4Uf`t*UQc3GxIcHvK=x)HT!q delta 21321 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"\n"); - generateSerializers(printer, /* isRead = */ isBuilder); + generateWriteToMethod(printer); // builder, mergeFrom and only for fair classes if (!isBuilder) { @@ -189,26 +189,17 @@ void ClassGenerator::generateMergeMethods(io::Printer *printer) const { } -void ClassGenerator::generateSerializers(io::Printer *printer, bool isRead) const { - map 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" : ""; - +void ClassGenerator::generateWriteToMethod(io::Printer *printer) const { // generate function header - printer->Print(vars, - "fun $funName$ ($arg$: $stream$): $returnType$ {" + printer->Print("fun writeTo (output: CodedOutputStream) {" "\n"); printer->Indent(); // generate code for serialization/deserialization of fields 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->Print("}\n"); } @@ -274,7 +265,7 @@ void ClassGenerator::generateInitSection(io::Printer * printer) const { } void ClassGenerator::generateParseMethods(io::Printer *printer) const { - // parseFieldFrom(input: CodedInputStream): Boolean + // ====== parseFieldFrom(input: CodedInputStream): Boolean ========= map vars; vars["builderName"] = getBuilderFullType(); @@ -324,7 +315,8 @@ void ClassGenerator::generateParseMethods(io::Printer *printer) const { printer->Outdent(); printer->Print("}\n"); // parseFieldFrom body - // parseFromWithSize(input: CodedInputStream, expectedSize: Int) + + // ====== parseFromWithSize(input: CodedInputStream, expectedSize: Int) ========= printer->Print(vars, "fun parseFromWithSize(input: CodedInputStream, expectedSize: Int): $builderName$ {\n"); printer->Indent(); @@ -338,7 +330,7 @@ void ClassGenerator::generateParseMethods(io::Printer *printer) const { printer->Outdent(); // while-loop; printer->Print("}\n"); - // check if we read more than expected + // check if we have read more than expected vars["dollar"] = "$"; printer->Print(vars, "if (getSize() > expectedSize) { " @@ -351,7 +343,7 @@ void ClassGenerator::generateParseMethods(io::Printer *printer) const { printer->Print("}\n"); - // parseFrom(input: CodedInputStream) + // ======== parseFrom(input: CodedInputStream) ========= printer->Print(vars, "fun parseFrom(input: CodedInputStream): $builderName$ {\n"); printer->Indent(); diff --git a/proto/compiler/google/src/google/protobuf/compiler/kotlin/src/kotlin_class_generator.h b/proto/compiler/google/src/google/protobuf/compiler/kotlin/src/kotlin_class_generator.h index b0d7f0dcc28..01774e7ef30 100644 --- a/proto/compiler/google/src/google/protobuf/compiler/kotlin/src/kotlin_class_generator.h +++ b/proto/compiler/google/src/google/protobuf/compiler/kotlin/src/kotlin_class_generator.h @@ -54,7 +54,7 @@ private: * both methods are structurally the same with some trivial substitutions * (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 generateParseMethods(io::Printer * printer) const; void generateGetSizeMethod(io::Printer * printer) const;