commit f7a421c02d43c3289ca45f0d5ccdf8d27e605f5a
author Casey Dahlin <sadmac@google.com> Mon Oct 05 17:24:28 2015 -0700
committer Casey Dahlin <sadmac@google.com> Tue Oct 06 10:59:46 2015 -0700
tree 61b7e0ddfd85e0189fae29949085ba7e6b07591f
parent f4a9311fa018c78a7b30a73bd8ebbaa33c701ae4

Use parser to find array brackets

Change-Id: Ib93032113c92fe23e1a7e4ac9b990a065f2b5d19
Test: Unit tests, Full Android Rebuild
Bugs: 24680682
Signed-off-by: Casey Dahlin <sadmac@google.com>

aidl_language.cpp

diff --git a/aidl_language.cpp b/aidl_language.cpp
index 21a32ad..1a84b49 100644
--- a/aidl_language.cpp
+++ b/aidl_language.cpp
@@ -44,27 +44,14 @@
 }
 
 AidlType::AidlType(const std::string& name, unsigned line,
-                   const std::string& comments, unsigned dimension)
+                   const std::string& comments, bool is_array)
     : name_(name),
       line_(line),
-      dimension_(dimension),
+      is_array_(is_array),
       comments_(comments) {}
 
-AidlType::AidlType(const std::string& name, unsigned line,
-                   const std::string& comments)
-    : AidlType(name, line, comments, 0) {}
-
 string AidlType::ToString() const {
-  return name_ + Brackets();
-}
-
-std::string AidlType::Brackets() const {
-  std::string result;
-
-  for (unsigned i = 0; i < dimension_; i++)
-    result += "[]";
-
-  return result;
+  return name_ + (is_array_ ? "[]" : "");
 }
 
 AidlArgument::AidlArgument(AidlArgument::Direction direction, AidlType* type,