commit 3b320f8a60e4343bf06319bca3fc949c95eaf326
author Yifan Hong <elsk@google.com> Tue Nov 01 15:15:54 2016 -0700
committer Yifan Hong <elsk@google.com> Mon Nov 07 16:54:40 2016 -0800
tree a8c8543a453a23c0b33870bb8c3f96f4e09cb61c
parent f5cc83329a3913c5ee3cbbcc90cffd57e40e87dd

Remove extra from getCppType.

The argument is used for array type originally. We
now use hidl_array instead of T[], so there is no
need to use extra.

Renamed the convenience getCppType to getCppStackType
to avoid casting to (Type *) before using this
method (which makes it inconvenient)

Also fixes:
* RefType::getCppType ignores specifyNamespaces
* ConstantExpression.cpp emits a C-style cast instead
  of static_cast

Bug: 32559427

Test: mma passes
Test: hidl_test

Change-Id: I7e2e31c34c1ca1aa83c4a5a4dbdf7fd6b9aff30c

VectorType.cpp

diff --git a/VectorType.cpp b/VectorType.cpp
index 461a05b..99449ab 100644
--- a/VectorType.cpp
+++ b/VectorType.cpp
@@ -39,21 +39,13 @@
 }
 
 std::string VectorType::getCppType(StorageMode mode,
-                                   std::string *extra,
                                    bool specifyNamespaces) const {
-    std::string elementExtra;
-    const std::string elementBase =
-        mElementType->getCppType(&elementExtra, specifyNamespaces);
-
     const std::string base =
           std::string(specifyNamespaces ? "::android::hardware::" : "")
         + "hidl_vec<"
-        + mElementType->getCppType(extra, specifyNamespaces)
-        + (*extra)
+        + mElementType->getCppStackType( specifyNamespaces)
         + ">";
 
-    extra->clear();
-
     switch (mode) {
         case StorageMode_Stack:
             return base;
@@ -106,8 +98,7 @@
         return;
     }
 
-    std::string baseExtra;
-    std::string baseType = mElementType->getCppType(&baseExtra);
+    std::string baseType = mElementType->getCppStackType();
 
     const std::string parentName = "_hidl_" + name + "_parent";
 
@@ -120,7 +111,6 @@
         out << name
             << " = (const ::android::hardware::hidl_vec<"
             << baseType
-            << baseExtra
             << "> *)"
             << parcelObjDeref
             << "readBuffer(&"
@@ -202,8 +192,7 @@
 
         out.indent();
 
-        std::string extra;
-        out << mElementType->getCppType(&extra, true /* specifyNamespaces */)
+        out << mElementType->getCppStackType(true /* specifyNamespaces */)
             << " _hidl_binder;\n";
 
         mElementType->emitReaderWriter(
@@ -262,8 +251,7 @@
         ErrorMode mode,
         const std::string &parentName,
         const std::string &offsetText) const {
-    std::string baseExtra;
-    std::string baseType = Type::getCppType(&baseExtra);
+    std::string baseType = getCppStackType();
 
     const std::string childName = "_hidl_" + sanitizedName + "_child";
     out << "size_t " << childName << ";\n\n";
@@ -287,7 +275,7 @@
 
     const std::string nameDeref = name + (nameIsPointer ? "->" : ".");
 
-    baseType = mElementType->getCppType(&baseExtra);
+    baseType = mElementType->getCppStackType();
 
     std::string iteratorName = "_hidl_index_" + std::to_string(depth);
 
@@ -315,7 +303,7 @@
             isReader,
             mode,
             childName,
-            iteratorName + " * sizeof(" + baseType + baseExtra + ")");
+            iteratorName + " * sizeof(" + baseType + ")");
 
     out.unindent();
 
@@ -381,8 +369,7 @@
     CHECK(needsResolveReferences() && mElementType->needsResolveReferences());
 
     const std::string nameDeref = name + (nameIsPointer ? "->" : ".");
-    std::string elementExtra;
-    std::string elementType = mElementType->getCppType(&elementExtra);
+    std::string elementType = mElementType->getCppStackType();
 
     std::string myChildName = childName, myChildOffset = childOffsetText;
 
@@ -425,7 +412,7 @@
         mode,
         myChildName,
         myChildOffset + " + " +
-                iteratorName + " * sizeof(" + elementType + elementExtra + ")");
+                iteratorName + " * sizeof(" + elementType + ")");
 
     out.unindent();