Replace intptr_t with TokenDescriptor

runtime/vm/code_descriptors_test.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 "platform/assert.h"
 #include "vm/globals.h"
 
 #include "vm/ast.h"
 #include "vm/assembler.h"
 #include "vm/code_descriptors.h"
 #include "vm/compiler.h"
 #include "vm/dart_entry.h"
 #include "vm/native_entry.h"
 #include "vm/parser.h"
 #include "vm/symbols.h"
 #include "vm/thread.h"
 #include "vm/unit_test.h"
 
 namespace dart {
 
-static const intptr_t kPos = Token::kNoSourcePos;
+static const TokenDescriptor kPos = TokenDescriptor::kNoSource;
 
 
 CODEGEN_TEST_GENERATE(StackmapCodegen, test) {
   ParsedFunction* parsed_function =
       new ParsedFunction(Thread::Current(), test->function());
   LiteralNode* l = new LiteralNode(kPos, Smi::ZoneHandle(Smi::New(1)));
   test->node_sequence()->Add(new ReturnNode(kPos, l));
   l = new LiteralNode(kPos, Smi::ZoneHandle(Smi::New(2)));
   test->node_sequence()->Add(new ReturnNode(kPos, l));
   l = new LiteralNode(kPos, Smi::ZoneHandle(Smi::New(3)));
@@ skipping 230 matching lines @@
 
   // Now invoke 'A.moo' and it will trigger a GC when the native function
   // is called, this should then cause the stack map of function 'A.foo'
   // to be traversed and the appropriate objects visited.
   const Object& result = Object::Handle(
       DartEntry::InvokeFunction(function_foo, Object::empty_array()));
   EXPECT(!result.IsError());
 }
 
 
-TEST_CASE(DescriptorList_TokenPositions) {
+TEST_CASE(DescriptorList_TokenDescriptors) {
   DescriptorList* descriptors = new DescriptorList(64);
   ASSERT(descriptors != NULL);
   const intptr_t token_positions[] = {
     kMinInt32,
     5,
     13,
     13,
     13,
     13,
     31,
     23,
     23,
     23,
     33,
     33,
     5,
     5,
-    Token::kMinSourcePos,
-    Token::kMaxSourcePos,
+    TokenDescriptor::kMinSourcePos,
+    TokenDescriptor::kMaxSourcePos,
   };
   const intptr_t num_token_positions =
       sizeof(token_positions) / sizeof(token_positions[0]);
 
   for (intptr_t i = 0; i < num_token_positions; i++) {
     descriptors->AddDescriptor(RawPcDescriptors::kRuntimeCall, 0, 0,
-                               token_positions[i], 0);
+                               TokenDescriptor(token_positions[i]), 0);
   }
 
   const PcDescriptors& finalized_descriptors =
       PcDescriptors::Handle(descriptors->FinalizePcDescriptors(0));
 
   ASSERT(!finalized_descriptors.IsNull());
   PcDescriptors::Iterator it(finalized_descriptors,
                              RawPcDescriptors::kRuntimeCall);
 
   intptr_t i = 0;
   while (it.MoveNext()) {
-    if (token_positions[i] != it.TokenPos()) {
+    if (token_positions[i] != it.TokenPos().value()) {
       OS::Print("[%" Pd "]: Expected: %" Pd " != %" Pd "\n",
-                i, token_positions[i], it.TokenPos());
+                i, token_positions[i], it.TokenPos().value());
     }
-    EXPECT(token_positions[i] == it.TokenPos());
+    EXPECT(token_positions[i] == it.TokenPos().value());
     i++;
   }
 }
 
 
-TEST_CASE(CodeSourceMap_TokenPositions) {
+TEST_CASE(CodeSourceMap_TokenDescriptors) {
   const intptr_t token_positions[] = {
     kMinInt32,
     5,
     13,
     13,
     13,
     13,
     31,
     23,
     23,
     23,
     33,
     33,
     5,
     5,
-    Token::kMinSourcePos,
-    Token::kMaxSourcePos,
+    TokenDescriptor::kMinSourcePos,
+    TokenDescriptor::kMaxSourcePos,
   };
   const intptr_t num_token_positions =
       sizeof(token_positions) / sizeof(token_positions[0]);
 
   CodeSourceMapBuilder* builder = new CodeSourceMapBuilder();
   ASSERT(builder != NULL);
 
   for (intptr_t i = 0; i < num_token_positions; i++) {
-    builder->AddEntry(i, token_positions[i]);
+    builder->AddEntry(i, TokenDescriptor(token_positions[i]));
   }
 
   const CodeSourceMap& code_Source_map =
       CodeSourceMap::Handle(builder->Finalize());
 
   ASSERT(!code_Source_map.IsNull());
   CodeSourceMap::Iterator it(code_Source_map);
 
   uintptr_t i = 0;
   while (it.MoveNext()) {
     EXPECT(it.PcOffset() == i);
-    if (token_positions[i] != it.TokenPos()) {
+    if (token_positions[i] != it.TokenPos().value()) {
       OS::Print("[%" Pd "]: Expected: %" Pd " != %" Pd "\n",
-                i, token_positions[i], it.TokenPos());
+                i, token_positions[i], it.TokenPos().value());
     }
-    EXPECT(token_positions[i] == it.TokenPos());
+    EXPECT(token_positions[i] == it.TokenPos().value());
     i++;
   }
 }
 
 }  // namespace dart