Revert of Separate Scope into DeclarationScope and Scope

test/cctest/test-parsing.cc

 // Copyright 2012 the V8 project authors. All rights reserved.
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
 //
 //     * Redistributions of source code must retain the above copyright
 //       notice, this list of conditions and the following disclaimer.
 //     * Redistributions in binary form must reproduce the above
 //       copyright notice, this list of conditions and the following
 //       disclaimer in the documentation and/or other materials provided
@@ skipping 1102 matching lines @@
       i::Handle<i::Script> script = factory->NewScript(source);
       i::Zone zone(CcTest::i_isolate()->allocator());
       i::ParseInfo info(&zone, script);
       i::Parser parser(&info);
       info.set_global();
       CHECK(parser.Parse(&info));
       CHECK(i::Rewriter::Rewrite(&info));
       CHECK(i::Scope::Analyze(&info));
       CHECK(info.literal() != NULL);
 
-      i::DeclarationScope* script_scope = info.literal()->scope();
+      i::Scope* script_scope = info.literal()->scope();
       CHECK(script_scope->is_script_scope());
 
       i::Scope* scope = script_scope->inner_scope();
       DCHECK_NOT_NULL(scope);
       DCHECK_NULL(scope->sibling());
       // Adjust for constructor scope.
       if (j == 2) {
         scope = scope->inner_scope();
         DCHECK_NOT_NULL(scope);
         DCHECK_NULL(scope->sibling());
       }
       // Arrows themselves never get an arguments object.
       if ((source_data[i].expected & ARGUMENTS) != 0 &&
-          !scope->AsDeclarationScope()->is_arrow_scope()) {
-        CHECK_NOT_NULL(scope->AsDeclarationScope()->arguments());
+          !scope->is_arrow_scope()) {
+        CHECK_NOT_NULL(scope->arguments());
       }
       CHECK_EQ((source_data[i].expected & SUPER_PROPERTY) != 0,
                scope->uses_super_property());
       if ((source_data[i].expected & THIS) != 0) {
         // Currently the is_used() flag is conservative; all variables in a
         // script scope are marked as used.
         CHECK(
             scope->Lookup(info.ast_value_factory()->this_string())->is_used());
       }
       CHECK_EQ((source_data[i].expected & EVAL) != 0, scope->calls_eval());
@@ skipping 4786 matching lines @@
       "import 'q.js'";
   i::Handle<i::String> source = factory->NewStringFromAsciiChecked(kSource);
   i::Handle<i::Script> script = factory->NewScript(source);
   i::Zone zone(CcTest::i_isolate()->allocator());
   i::ParseInfo info(&zone, script);
   i::Parser parser(&info);
   info.set_module();
   CHECK(parser.Parse(&info));
   CHECK(i::Compiler::Analyze(&info));
   i::FunctionLiteral* func = info.literal();
-  i::DeclarationScope* module_scope = func->scope();
+  i::Scope* module_scope = func->scope();
   i::Scope* outer_scope = module_scope->outer_scope();
   CHECK(outer_scope->is_script_scope());
   CHECK_NULL(outer_scope->outer_scope());
   CHECK(module_scope->is_module_scope());
   i::ModuleDescriptor* descriptor = module_scope->module();
   CHECK_NOT_NULL(descriptor);
   i::ZoneList<i::Declaration*>* declarations = module_scope->declarations();
   CHECK_EQ(8, declarations->length());
   CHECK(declarations->at(0)->proxy()->raw_name()->IsOneByteEqualTo("x"));
   CHECK(declarations->at(1)->proxy()->raw_name()->IsOneByteEqualTo("z"));
@@ skipping 2028 matching lines @@
     "(a,);",
     "(a,b,c,);",
     NULL
   };
   // clang-format on
 
   static const ParserFlag always_flags[] = {kAllowHarmonyTrailingCommas};
   RunParserSyncTest(context_data, data, kError, NULL, 0, always_flags,
                     arraysize(always_flags));
 }