Replace intptr_t with TokenDescriptor

runtime/vm/json_stream.h

 // Copyright (c) 2013, 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_JSON_STREAM_H_
 #define VM_JSON_STREAM_H_
 
 #include "include/dart_api.h"  // for Dart_Port
 #include "platform/text_buffer.h"
 #include "vm/allocation.h"
 #include "vm/service.h"
+#include "vm/token_descriptor.h"
 
 
 namespace dart {
 
 class Array;
 class Breakpoint;
 class BreakpointLocation;
 class Field;
 class GrowableObjectArray;
 class Instance;
@@ skipping 210 matching lines @@
   ~JSONObject() {
     stream_->CloseObject();
   }
 
   void AddServiceId(const Object& o) const {
     stream_->PrintServiceId(o);
   }
 
   void AddFixedServiceId(const char* format, ...) const PRINTF_ATTRIBUTE(2, 3);
 
-  void AddLocation(const Script& script,
-                   intptr_t token_pos,
-                   intptr_t end_token_pos = -1) const;
+  void AddLocation(
+      const Script& script,
+      TokenDescriptor token_pos,
+      TokenDescriptor end_token_pos = TokenDescriptor::kNoSource) const;
 
   void AddLocation(const BreakpointLocation* bpt_loc) const;
 
   void AddUnresolvedLocation(const BreakpointLocation* bpt_loc) const;
 
   void AddProperty(const char* name, bool b) const {
     stream_->PrintPropertyBool(name, b);
   }
   void AddProperty(const char* name, intptr_t i) const {
     stream_->PrintProperty(name, i);
@@ skipping 121 matching lines @@
 
   friend class JSONObject;
 
   DISALLOW_ALLOCATION();
   DISALLOW_COPY_AND_ASSIGN(JSONArray);
 };
 
 }  // namespace dart
 
 #endif  // VM_JSON_STREAM_H_