commit d59a10defc81d9507abcd4eb3bb96dcf9e03537e
author Jiyong Park <jiyong@google.com> Wed Jul 18 11:12:55 2018 +0900
committer Jiyong Park <jiyong@google.com> Thu Jul 19 10:01:30 2018 +0900
tree c6d6853201f75214ac8226ef749b9062e64f5104
parent ccf00f8d81664d5f233cc0d176db778d0a0ae8b8

Rename AidlType to AidlTypeSpecifier

Bug: 110967839
Test: m -j
Test: system/tools/aidl/runtests.sh
Change-Id: I880007cef0bcf37f1529305d65b482981ee7f759

aidl_language.cpp

diff --git a/aidl_language.cpp b/aidl_language.cpp
index 873b572..c58b5ea 100644
--- a/aidl_language.cpp
+++ b/aidl_language.cpp
@@ -39,15 +39,15 @@
     : text_(text),
       comments_(comments) {}
 
-AidlType::AidlType(const std::string& simple_name, unsigned line, const std::string& comments,
-                   bool is_array)
+AidlTypeSpecifier::AidlTypeSpecifier(const std::string& simple_name, unsigned line,
+                                     const std::string& comments, bool is_array)
     : simple_name_(simple_name),
       name_(simple_name),
       line_(line),
       is_array_(is_array),
       comments_(comments) {}
 
-static std::string PrintTypeArgs(vector<unique_ptr<AidlType>>* type_params) {
+static std::string PrintTypeArgs(vector<unique_ptr<AidlTypeSpecifier>>* type_params) {
   if (type_params != nullptr) {
     std::vector<std::string> arg_names;
     for (const auto& ta : *type_params) {
@@ -59,8 +59,9 @@
   }
 }
 
-AidlType::AidlType(const std::string& simple_name, unsigned line, const std::string& comments,
-                   bool is_array, std::vector<std::unique_ptr<AidlType>>* type_params)
+AidlTypeSpecifier::AidlTypeSpecifier(const std::string& simple_name, unsigned line,
+                                     const std::string& comments, bool is_array,
+                                     std::vector<std::unique_ptr<AidlTypeSpecifier>>* type_params)
     : simple_name_(simple_name),
       name_(simple_name + PrintTypeArgs(type_params)),
       line_(line),
@@ -68,7 +69,7 @@
       comments_(comments),
       type_params_(std::move(*type_params)) {}
 
-string AidlType::ToString() const {
+string AidlTypeSpecifier::ToString() const {
   if (is_array_) {
     return GetName() + "[]";
   } else {
@@ -76,20 +77,21 @@
   }
 }
 
-AidlVariableDeclaration::AidlVariableDeclaration(AidlType* type, std::string name, unsigned line)
+AidlVariableDeclaration::AidlVariableDeclaration(AidlTypeSpecifier* type, std::string name,
+                                                 unsigned line)
     : type_(type), name_(name), line_(line) {}
 
 string AidlVariableDeclaration::ToString() const {
   return type_->ToString() + " " + name_;
 }
 
-AidlArgument::AidlArgument(AidlArgument::Direction direction, AidlType* type, std::string name,
-                           unsigned line)
+AidlArgument::AidlArgument(AidlArgument::Direction direction, AidlTypeSpecifier* type,
+                           std::string name, unsigned line)
     : AidlVariableDeclaration(type, name, line),
       direction_(direction),
       direction_specified_(true) {}
 
-AidlArgument::AidlArgument(AidlType* type, std::string name, unsigned line)
+AidlArgument::AidlArgument(AidlTypeSpecifier* type, std::string name, unsigned line)
     : AidlVariableDeclaration(type, name, line),
       direction_(AidlArgument::IN_DIR),
       direction_specified_(false) {}
@@ -157,9 +159,9 @@
   }
 }
 
-AidlMethod::AidlMethod(bool oneway, AidlType* type, std::string name,
-                       std::vector<std::unique_ptr<AidlArgument>>* args,
-                       unsigned line, const std::string& comments, int id)
+AidlMethod::AidlMethod(bool oneway, AidlTypeSpecifier* type, std::string name,
+                       std::vector<std::unique_ptr<AidlArgument>>* args, unsigned line,
+                       const std::string& comments, int id)
     : oneway_(oneway),
       comments_(comments),
       type_(type),
@@ -175,9 +177,9 @@
   }
 }
 
-AidlMethod::AidlMethod(bool oneway, AidlType* type, std::string name,
-                       std::vector<std::unique_ptr<AidlArgument>>* args,
-                       unsigned line, const std::string& comments)
+AidlMethod::AidlMethod(bool oneway, AidlTypeSpecifier* type, std::string name,
+                       std::vector<std::unique_ptr<AidlArgument>>* args, unsigned line,
+                       const std::string& comments)
     : AidlMethod(oneway, type, name, args, line, comments, 0) {
   has_id_ = false;
 }
@@ -187,11 +189,9 @@
   yylex_init(&scanner_);
 }
 
-AidlDefinedType::AidlDefinedType(std::string name, unsigned line,
-                                 const std::string& comments,
+AidlDefinedType::AidlDefinedType(std::string name, unsigned line, const std::string& comments,
                                  const std::vector<std::string>& package)
-    : AidlType(name, line, comments, false /*is_array*/),
-      package_(package) {}
+    : AidlTypeSpecifier(name, line, comments, false /*is_array*/), package_(package) {}
 
 std::string AidlDefinedType::GetPackage() const {
   return Join(package_, '.');