Revert of Separate Scope into DeclarationScope and Scope

src/parsing/preparser.cc

Index: src/parsing/preparser.cc
diff --git a/src/parsing/preparser.cc b/src/parsing/preparser.cc
index 0f65b3e26a58d89476b2eb1133a0992190cf4dbf..2106c32ff777b8fbc945ad6d737e9611a117bced 100644
--- a/src/parsing/preparser.cc
+++ b/src/parsing/preparser.cc
@@ -131,11 +131,11 @@
   use_counts_ = use_counts;
   // Lazy functions always have trivial outer scopes (no with/catch scopes).
   DCHECK_NULL(scope_state_);
-  DeclarationScope* top_scope = NewScriptScope();
+  Scope* top_scope = NewScriptScope();
   FunctionState top_state(&function_state_, &scope_state_, top_scope,
                           kNormalFunction);
   scope()->SetLanguageMode(language_mode);
-  DeclarationScope* function_scope = NewFunctionScope(kind);
+  Scope* function_scope = NewFunctionScope(kind);
   if (!has_simple_parameters) function_scope->SetHasNonSimpleParameters();
   FunctionState function_state(&function_state_, &scope_state_, function_scope,
                                kind);
@@ -1103,7 +1103,7 @@
 
   // Parse function body.
   bool outer_is_script_scope = scope()->is_script_scope();
-  DeclarationScope* function_scope = NewFunctionScope(kind);
+  Scope* function_scope = NewFunctionScope(kind);
   function_scope->SetLanguageMode(language_mode);
   FunctionState function_state(&function_state_, &scope_state_, function_scope,
                                kind);