commit 19f11b53241877c442d31d9dc6b372e294a500d0
author Steven Moreland <smoreland@google.com> Fri May 12 18:22:21 2017 -0700
committer Steven Moreland <smoreland@google.com> Fri May 12 18:22:21 2017 -0700
tree 3be225fb959c7ac24ae6cb5cf62396fc1825a78d
parent 05951b3a51621d33ea0638680f0308a37bf5cdd8

Removed "bool AST::isInterface(std::string*)"

Test: links
Change-Id: I603831ed8aa8a8794a54d38ce0e1d0b6c68701cb

AST.cpp

diff --git a/AST.cpp b/AST.cpp
index 4b10fb0..cecdabd 100644
--- a/AST.cpp
+++ b/AST.cpp
@@ -86,8 +86,8 @@
     return mPackage;
 }
 
-bool AST::isInterface(std::string *ifaceName) const {
-    return mRootScope->containsSingleInterface(ifaceName);
+bool AST::isInterface() const {
+    return mRootScope->getInterface() != nullptr;
 }
 
 bool AST::containsInterfaces() const {
@@ -530,8 +530,7 @@
 }
 
 bool AST::isJavaCompatible() const {
-    std::string ifaceName;
-    if (!AST::isInterface(&ifaceName)) {
+    if (!AST::isInterface()) {
         for (const auto *type : mRootScope->getSubTypes()) {
             if (!type->isJavaCompatible()) {
                 return false;
@@ -559,4 +558,10 @@
     return mRootScope->getInterface();
 }
 
+std::string AST::getBaseName() const {
+    const Interface *iface = mRootScope->getInterface();
+
+    return iface ? iface->getBaseName() : "types";
+}
+
 }  // namespace android;