commit 4c865b72b320a46f326a335cfd326b66b0e10f67
author Andreas Huber <andih@google.com> Wed Sep 14 15:26:27 2016 -0700
committer Andreas Huber <andih@google.com> Thu Sep 15 09:28:59 2016 -0700
tree 6707fb83825317c16e65c75b31c64f8189dadbc5
parent a3558b3b273695b31fbe1025339956966cde39c4

[Java hidl-gen] Fix multi-dimensional arrays (used within structures, not

as method arguments).

Bug: 31438033
Change-Id: I8e29ae8eca2a9ef8a320e37ca0bb79dcfa8a9b9a

VectorType.cpp

diff --git a/VectorType.cpp b/VectorType.cpp
index 555d28d..00e171c 100644
--- a/VectorType.cpp
+++ b/VectorType.cpp
@@ -53,8 +53,12 @@
     }
 }
 
-std::string VectorType::getJavaType() const {
-    return mElementType->getJavaType() + "[]";
+std::string VectorType::getJavaType(
+        std::string *extra, bool /* forInitializer */) const {
+    *extra = "[]";
+
+    std::string elementExtra;
+    return mElementType->getJavaType(&elementExtra) + elementExtra;
 }
 
 void VectorType::emitReaderWriter(
@@ -207,13 +211,15 @@
         const std::string &argName,
         bool isReader) const {
     if (mElementType->isCompoundType()) {
+        std::string extra;  // unused, because CompoundType leaves this empty.
+
         if (isReader) {
-            out << mElementType->getJavaType()
+            out << mElementType->getJavaType(&extra)
                 << ".readVectorFromParcel("
                 << parcelObj
                 << ");\n";
         } else {
-            out << mElementType->getJavaType()
+            out << mElementType->getJavaType(&extra)
                 << ".writeVectorToParcel("
                 << parcelObj
                 << ", "
@@ -248,17 +254,19 @@
 
 void VectorType::emitJavaFieldReaderWriter(
         Formatter &out,
+        size_t depth,
         const std::string &blobName,
         const std::string &fieldName,
         const std::string &offset,
         bool isReader) const {
     VectorType::EmitJavaFieldReaderWriterForElementType(
-            out, mElementType, blobName, fieldName, offset, isReader);
+            out, depth, mElementType, blobName, fieldName, offset, isReader);
 }
 
 // static
 void VectorType::EmitJavaFieldReaderWriterForElementType(
         Formatter &out,
+        size_t depth,
         const Type *elementType,
         const std::string &blobName,
         const std::string &fieldName,
@@ -287,8 +295,16 @@
             << offset
             << " + 8 /* offsetof(hidl_vec<T>, mSize) */);\n";
 
-        out << "for (int _hidl_index = 0; _hidl_index < _hidl_vec_size; "
-            << "++_hidl_index) {\n";
+        std::string iteratorName = "_hidl_index_" + std::to_string(depth);
+
+        out << "for (int "
+            << iteratorName
+            << " = 0; "
+            << iteratorName
+            << " < _hidl_vec_size; "
+            << "++"
+            << iteratorName
+            << ") {\n";
 
         out.indent();
 
@@ -299,9 +315,10 @@
 
         elementType->emitJavaFieldReaderWriter(
                 out,
+                depth + 1,
                 "childBlob",
                 "_hidl_vec_element",
-                "_hidl_index * " + std::to_string(elementSize),
+                iteratorName + " * " + std::to_string(elementSize),
                 true /* isReader */);
 
         out << fieldName
@@ -342,16 +359,25 @@
         << elementSize
         << "));\n";
 
-    out << "for (int _hidl_index = 0; _hidl_index < _hidl_vec_size; "
-        << "++_hidl_index) {\n";
+    std::string iteratorName = "_hidl_index_" + std::to_string(depth);
+
+    out << "for (int "
+        << iteratorName
+        << " = 0; "
+        << iteratorName
+        << " < _hidl_vec_size; "
+        << "++"
+        << iteratorName
+        << ") {\n";
 
     out.indent();
 
     elementType->emitJavaFieldReaderWriter(
             out,
+            depth + 1,
             "childBlob",
-            fieldName + ".elementAt(_hidl_index)",
-            "_hidl_index * " + std::to_string(elementSize),
+            fieldName + ".elementAt(" + iteratorName + ")",
+            iteratorName + " * " + std::to_string(elementSize),
             false /* isReader */);
 
     out.unindent();