Add DeclStmt::hasSolitaryDecl() and DeclStmt::getSolitaryDecl()
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@57204 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/include/clang/AST/Stmt.h b/include/clang/AST/Stmt.h
index 20b01ce..210a142 100644
--- a/include/clang/AST/Stmt.h
+++ b/include/clang/AST/Stmt.h
@@ -140,6 +140,7 @@
/// the first statement can be an expression or a declaration.
///
class DeclStmt : public Stmt {
+protected:
ScopedDecl *TheDecl;
SourceLocation StartLoc, EndLoc;
public:
@@ -148,8 +149,24 @@
virtual void Destroy(ASTContext& Ctx);
+ // hasSolitaryDecl - This method returns true if this DeclStmt refers
+ // to a single Decl.
+ bool hasSolitaryDecl() const;
+
const ScopedDecl *getDecl() const { return TheDecl; }
ScopedDecl *getDecl() { return TheDecl; }
+
+ const ScopedDecl* getSolitaryDecl() const {
+ assert (hasSolitaryDecl() &&
+ "Caller assumes this DeclStmt points to one Decl*");
+ return TheDecl;
+ }
+
+ ScopedDecl* getSolitaryDecl() {
+ assert (hasSolitaryDecl() &&
+ "Caller assumes this DeclStmt points to one Decl*");
+ return TheDecl;
+ }
SourceLocation getStartLoc() const { return StartLoc; }
SourceLocation getEndLoc() const { return EndLoc; }
diff --git a/lib/AST/Stmt.cpp b/lib/AST/Stmt.cpp
index 689fe85..fbb369f 100644
--- a/lib/AST/Stmt.cpp
+++ b/lib/AST/Stmt.cpp
@@ -188,7 +188,7 @@
//===----------------------------------------------------------------------===//
// DeclStmt
-Stmt::child_iterator DeclStmt::child_begin() { return getDecl(); }
+Stmt::child_iterator DeclStmt::child_begin() { return TheDecl; }
Stmt::child_iterator DeclStmt::child_end() { return child_iterator(); }
DeclStmt::decl_iterator& DeclStmt::decl_iterator::operator++() {
@@ -196,6 +196,10 @@
return *this;
}
+bool DeclStmt::hasSolitaryDecl() const {
+ return TheDecl->getNextDeclarator() == 0;
+}
+
// NullStmt
Stmt::child_iterator NullStmt::child_begin() { return child_iterator(); }
Stmt::child_iterator NullStmt::child_end() { return child_iterator(); }