Revert of Separate Scope into DeclarationScope and Scope

src/ast/modules.cc

 // 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.
 
 #include "src/ast/modules.h"
 #include "src/ast/ast-value-factory.h"
 #include "src/ast/scopes.h"
 
 namespace v8 {
 namespace internal {
@@ skipping 61 matching lines @@
 
 
 void ModuleDescriptor::AddStarExport(
     const AstRawString* module_request, Scanner::Location loc, Zone* zone) {
   DCHECK_NOT_NULL(module_request);
   ModuleEntry* entry = new (zone) ModuleEntry(loc);
   entry->module_request = module_request;
   exports_.Add(entry, zone);
 }
 
-bool ModuleDescriptor::Validate(DeclarationScope* module_scope,
-                                PendingCompilationErrorHandler* error_handler,
-                                Zone* zone) const {
+
+bool ModuleDescriptor::Validate(
+    Scope* module_scope, PendingCompilationErrorHandler* error_handler,
+    Zone* zone) const {
   DCHECK(module_scope->is_module_scope());
   DCHECK_EQ(this, module_scope->module());
   DCHECK_NOT_NULL(error_handler);
 
   // Report error iff there are duplicate exports.
   {
     ZoneAllocationPolicy allocator(zone);
     ZoneHashMap* export_names = new (zone->New(sizeof(ZoneHashMap)))
         ZoneHashMap(ZoneHashMap::PointersMatch,
                     ZoneHashMap::kDefaultHashMapCapacity, allocator);
@@ skipping 21 matching lines @@
           entry->location.beg_pos, entry->location.end_pos,
           MessageTemplate::kModuleExportUndefined, entry->local_name);
       return false;
     }
   }
 
   return true;
 }
 }  // namespace internal
 }  // namespace v8