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

Protobuf: changed all for-loops in generated code into while-loops

Browse Source
This commit is contained in:
dsavvinov
2016-08-08 18:13:09 +03:00
parent 8c96f21515
commit 4779d517d9
2 changed files with 10 additions and 5 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_field_generator.cc
+10 -5
View File
@@ -133,16 +133,18 @@ void FieldGenerator::generateSerializationForPacked(io::Printer *printer, bool i
printer->Print(vars, "output.writeInt32NoTag(arrayByteSize)\n"); printer->Print(vars, "output.writeInt32NoTag(arrayByteSize)\n");
// all elements // all elements
printer->Print(vars, "for (item in $fieldName$) {\n"); printer->Print("var i = 0\n");
printer->Print(vars, "while (i < $fieldName$.size) {\n");
printer->Indent(); printer->Indent();
// hack: see above // hack: similar to one above
FieldGenerator singleFieldGen = FieldGenerator(descriptor, enclosingClass, nameResolver); FieldGenerator singleFieldGen = FieldGenerator(descriptor, enclosingClass, nameResolver);
singleFieldGen.simpleName = "item"; singleFieldGen.simpleName = simpleName + "[i]";
singleFieldGen.protoLabel = FieldDescriptor::LABEL_OPTIONAL; singleFieldGen.protoLabel = FieldDescriptor::LABEL_OPTIONAL;
singleFieldGen.generateSerializationCode(printer, isRead, /* noTag = */ isPrimitive, /* isField = */ false); singleFieldGen.generateSerializationCode(printer, isRead, /* noTag = */ isPrimitive, /* isField = */ false);
printer->Print(vars, "i += 1\n");
printer->Outdent(); // for-loop printer->Outdent(); // for-loop
printer->Print("}\n"); printer->Print("}\n");
} }
@@ -363,15 +365,18 @@ void FieldGenerator::generateSizeEstimationCode(io::Printer *printer, string var
printer->Print("var arraySize = 0\n"); printer->Print("var arraySize = 0\n");
// iterate over all elements of array // iterate over all elements of array
printer->Print(vars, "for (item in $fieldName$) {\n"); printer->Print("var i = 0\n");
printer->Print(vars, "while (i < $fieldName$.size) {\n");
printer->Indent(); printer->Indent();
// hack: reuse generateSizeEstimationCode in the same manner as in generateSerializationCode // hack: reuse generateSizeEstimationCode in the same manner as in generateSerializationCode
FieldGenerator singleFieldGen = FieldGenerator(descriptor, enclosingClass, nameResolver); FieldGenerator singleFieldGen = FieldGenerator(descriptor, enclosingClass, nameResolver);
singleFieldGen.protoLabel = FieldDescriptor::LABEL_OPTIONAL; singleFieldGen.protoLabel = FieldDescriptor::LABEL_OPTIONAL;
singleFieldGen.simpleName = "item"; singleFieldGen.simpleName = simpleName + "[i]";
singleFieldGen.generateSizeEstimationCode(printer, "arraySize", noTag, /* isField = */ false); singleFieldGen.generateSizeEstimationCode(printer, "arraySize", noTag, /* isField = */ false);
printer->Print(vars, "i += 1\n");
printer->Outdent(); // for-loop printer->Outdent(); // for-loop
printer->Print("}\n"); printer->Print("}\n");