Replace intptr_t with TokenDescriptor

runtime/vm/class_finalizer.cc

Index: runtime/vm/class_finalizer.cc
diff --git a/runtime/vm/class_finalizer.cc b/runtime/vm/class_finalizer.cc
index f97d6dc1856d6ff2f14218787e0716f7c5ff8fb8..1c9d6de7a3d2514a5c0a92bcf8cd921ff03d1367 100644
--- a/runtime/vm/class_finalizer.cc
+++ b/runtime/vm/class_finalizer.cc
@@ -2075,7 +2075,7 @@ void ClassFinalizer::ApplyMixinType(const Class& mixin_app_class,
     THR_Print("Applying mixin type '%s' to %s at pos %" Pd "\n",
               String::Handle(mixin_type.Name()).ToCString(),
               mixin_app_class.ToCString(),
-              mixin_app_class.token_pos());
+              mixin_app_class.token_pos().value());

[Ivan Posva, 2016/02/01 17:16:52]

ditto.

Here and other places.

[Cutch, 2016/02/02 18:00:20]

Done.

[Cutch, 2016/02/02 18:00:20]

Done.

   }
 
   // Check for illegal self references.
@@ -2205,7 +2205,7 @@ void ClassFinalizer::ApplyMixinMembers(const Class& cls) {
     THR_Print("Applying mixin members of %s to %s at pos %" Pd "\n",
               mixin_cls.ToCString(),
               cls.ToCString(),
-              cls.token_pos());
+              cls.token_pos().value());
   }
 
   const GrowableObjectArray& cloned_funcs =
@@ -3131,7 +3131,7 @@ void ClassFinalizer::MarkTypeMalformed(const Error& prev_error,
 
 RawType* ClassFinalizer::NewFinalizedMalformedType(const Error& prev_error,
                                                    const Script& script,
-                                                   intptr_t type_pos,
+                                                   TokenDescriptor type_pos,
                                                    const char* format, ...) {
   va_list args;
   va_start(args, format);
@@ -3191,7 +3191,7 @@ void ClassFinalizer::ReportError(const Error& error) {
 
 void ClassFinalizer::ReportErrors(const Error& prev_error,
                                   const Class& cls,
-                                  intptr_t token_pos,
+                                  TokenDescriptor token_pos,
                                   const char* format, ...) {
   va_list args;
   va_start(args, format);
@@ -3203,7 +3203,7 @@ void ClassFinalizer::ReportErrors(const Error& prev_error,
 
 
 void ClassFinalizer::ReportError(const Class& cls,
-                                 intptr_t token_pos,
+                                 TokenDescriptor token_pos,
                                  const char* format, ...) {
   va_list args;
   va_start(args, format);