Support captured variables in debugger

runtime/vm/parser.cc

 // Copyright (c) 2012, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 #include "vm/parser.h"
 
 #include "vm/bigint_operations.h"
 #include "vm/class_finalizer.h"
 #include "vm/compiler.h"
 #include "vm/compiler_stats.h"
@@ skipping 159 matching lines @@
       scope->AllocateVariables(first_parameter_index_,
                                parameter_count,
                                first_stack_local_index_,
                                scope,
                                &context_owner);
 
   // If this function is not a closure function and if it contains captured
   // variables, the context needs to be saved on entry and restored on exit.
   // Add and allocate a local variable to this purpose.
   if ((context_owner != NULL) && !function().IsClosureFunction()) {
-    const String& context_var_name =
-        String::ZoneHandle(String::NewSymbol(":saved_entry_context_var"));
+    const String& context_var_name = String::ZoneHandle(
+        String::NewSymbol(LocalVariable::kSavedContextVarName));
     LocalVariable* context_var =
         new LocalVariable(function().token_index(),
                           context_var_name,
                           Type::ZoneHandle(Type::DynamicType()));
     context_var->set_index(next_free_frame_index--);
     scope->AddVariable(context_var);
     set_saved_context_var(context_var);
   }
 
   // Frame indices are relative to the frame pointer and are decreasing.
@@ skipping 3685 matching lines @@
                                  current_block_->scope->function_level() + 1,
                                  0);
   }
   ChainNewBlock(outer_scope);
 }
 
 
 SequenceNode* Parser::CloseBlock() {
   SequenceNode* statements = current_block_->statements;
   if (current_block_->scope != NULL) {
-    // Record the end token index of the scope.
+    // Record the begin and end token index of the scope.
+    ASSERT(statements != NULL);
+    current_block_->scope->set_begin_token_index(statements->token_index());
     current_block_->scope->set_end_token_index(token_index_);
   }
   current_block_ = current_block_->parent;
   return statements;
 }
 
 
 // Set up default values for all optional parameters to the function.
 void Parser::SetupDefaultsForOptionalParams(const ParamList* params,
                                             Array& default_values) {
@@ skipping 4678 matching lines @@
 void Parser::SkipQualIdent() {
   ASSERT(IsIdentifier());
   ConsumeToken();
   if (CurrentToken() == Token::kPERIOD) {
     ConsumeToken();  // Consume the kPERIOD token.
     ExpectIdentifier("identifier expected after '.'");
   }
 }
 
 }  // namespace dart