Add local variable declaration token position to service protocol

runtime/vm/scopes.h

 // 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.
 
 #ifndef VM_SCOPES_H_
 #define VM_SCOPES_H_
 
 #include "platform/assert.h"
 #include "platform/globals.h"
 #include "vm/allocation.h"
 #include "vm/growable_array.h"
 #include "vm/object.h"
 #include "vm/raw_object.h"
 #include "vm/symbols.h"
 #include "vm/token.h"
 
 namespace dart {
 
 class LocalScope;
 
 
 class LocalVariable : public ZoneAllocated {
  public:
-  LocalVariable(TokenPosition token_pos,
+  LocalVariable(TokenPosition declaration_pos,
+                TokenPosition token_pos,
                 const String& name,
                 const AbstractType& type)
-    : token_pos_(token_pos),
+    : declaration_pos_(declaration_pos),
+      token_pos_(token_pos),
       name_(name),
       owner_(NULL),
       type_(type),
       const_value_(NULL),
       is_final_(false),
       is_captured_(false),
       is_invisible_(false),
       is_captured_parameter_(false),
       index_(LocalVariable::kUninitializedIndex) {
     ASSERT(type.IsZoneHandle() || type.IsReadOnlyHandle());
     ASSERT(type.IsFinalized());
     ASSERT(name.IsSymbol());
   }
 
   TokenPosition token_pos() const { return token_pos_; }
+  TokenPosition declaration_token_pos() const { return declaration_pos_; }
   const String& name() const { return name_; }
   LocalScope* owner() const { return owner_; }
   void set_owner(LocalScope* owner) {
     ASSERT(owner_ == NULL);
     owner_ = owner;
   }
 
   const AbstractType& type() const { return type_; }
 
   bool is_final() const { return is_final_; }
@@ skipping 49 matching lines @@
 
   // Map the frame index to a bit-vector index.  Assumes the variable is
   // allocated to the frame.
   // var_count is the total number of stack-allocated variables including
   // all parameters.
   int BitIndexIn(intptr_t var_count) const;
 
  private:
   static const int kUninitializedIndex = INT_MIN;
 
+  const TokenPosition declaration_pos_;
   const TokenPosition token_pos_;
   const String& name_;
   LocalScope* owner_;  // Local scope declaring this variable.
 
   const AbstractType& type_;  // Declaration type of local variable.
 
   const Instance* const_value_;   // NULL or compile-time const value.
 
   bool is_final_;  // If true, this variable is readonly.
   bool is_captured_;  // If true, this variable lives in the context, otherwise
@@ skipping 256 matching lines @@
   // List of names referenced in this scope and its children that
   // are not resolved to local variables.
   GrowableArray<NameReference*> referenced_;
 
   DISALLOW_COPY_AND_ASSIGN(LocalScope);
 };
 
 }  // namespace dart
 
 #endif  // VM_SCOPES_H_