Change over the IMPORT statement to use the LIstStmt class.

isanbard · Nov 18, 2011 · f92ee4a · f92ee4a
1 parent 9a43914
commit f92ee4a
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 16 deletions.
diff --git a/include/flang/AST/Stmt.h b/include/flang/AST/Stmt.h
@@ -224,21 +224,14 @@ class UseStmt : public Stmt {
 /// ImportStmt - Specifies that the named entities from the host scoping unit
 /// are accessible in the interface body by host association.
 ///
-class ImportStmt : public Stmt {
-  unsigned NumNames;
-  const IdentifierInfo **Names;
-
+class ImportStmt : public ListStmt {
   ImportStmt(ASTContext &C, SMLoc Loc, ArrayRef<const IdentifierInfo*> names,
              ExprResult StmtLabel);
 public:
   static ImportStmt *Create(ASTContext &C, SMLoc Loc,
                             ArrayRef<const IdentifierInfo*> Names,
                             ExprResult StmtLabel);
 
-  ArrayRef<const IdentifierInfo *> getNameList() const {
-    return ArrayRef<const IdentifierInfo *>(Names, NumNames);
-  }
-
   static bool classof(const ImportStmt*) { return true; }
   static bool classof(const Stmt *S) {
     return S->getStatementID() == Import;

diff --git a/lib/AST/Stmt.cpp b/lib/AST/Stmt.cpp
@@ -101,14 +101,9 @@ llvm::StringRef UseStmt::getModuleName() const {
 //===----------------------------------------------------------------------===//
 
 ImportStmt::ImportStmt(ASTContext &C, SMLoc Loc,
-                       ArrayRef<const IdentifierInfo*> names,
+                       ArrayRef<const IdentifierInfo*> Names,
                        ExprResult StmtLabel)
-  : Stmt(Import, Loc, StmtLabel), NumNames(names.size()), Names(0) {
-  Names = new (C) const IdentifierInfo*[NumNames];
-
-  for (unsigned I = 0; I != NumNames; ++I)
-    Names[I] = names[I];
-}
+  : ListStmt(C, Import, Loc, Names, StmtLabel) {}
 
 ImportStmt *ImportStmt::Create(ASTContext &C, SMLoc Loc,
                                ArrayRef<const IdentifierInfo*> Names,

diff --git a/lib/AST/StmtDumper.cpp b/lib/AST/StmtDumper.cpp
@@ -75,7 +75,7 @@ void StmtVisitor::visit(const EndProgramStmt *S) {
 void StmtVisitor::visit(const UseStmt *S) {
 }
 void StmtVisitor::visit(const ImportStmt *S) {
-  ArrayRef<const IdentifierInfo *> NameList = S->getNameList();
+  ArrayRef<const IdentifierInfo *> NameList = S->getIDList();
   OS << "(import";
   if (NameList.size() != 0) {
     OS << ":";