Revert of Separate Scope into DeclarationScope and Scope

src/ast/modules.h

 // Copyright 2012 the V8 project authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef V8_AST_MODULES_H_
 #define V8_AST_MODULES_H_
 
 #include "src/parsing/scanner.h"  // Only for Scanner::Location.
 #include "src/pending-compilation-error-handler.h"
 #include "src/zone.h"
@@ skipping 45 matching lines @@
     const AstRawString* export_name, const AstRawString* import_name,
     const AstRawString* module_request, const Scanner::Location loc,
     Zone* zone);
 
   // export * from "foo.js";
   void AddStarExport(
     const AstRawString* module_request, const Scanner::Location loc,
     Zone* zone);
 
   // Check if module is well-formed and report error if not.
-  bool Validate(DeclarationScope* module_scope,
-                PendingCompilationErrorHandler* error_handler,
-                Zone* zone) const;
+  bool Validate(
+      Scope* module_scope, PendingCompilationErrorHandler* error_handler,
+      Zone* zone) const;
+
 
  private:
   struct ModuleEntry : public ZoneObject {
     const Scanner::Location location;
     const AstRawString* export_name;
     const AstRawString* local_name;
     const AstRawString* import_name;
     const AstRawString* module_request;
 
     explicit ModuleEntry(Scanner::Location loc)
         : location(loc),
           export_name(nullptr),
           local_name(nullptr),
           import_name(nullptr),
           module_request(nullptr) {}
   };
 
   ZoneList<const ModuleEntry*> exports_;
   ZoneList<const ModuleEntry*> imports_;
 };
 
 }  // namespace internal
 }  // namespace v8
 
 #endif  // V8_AST_MODULES_H_