Replace intptr_t with TokenDescriptor

runtime/vm/ast_printer.cc

 // Copyright (c) 2011, 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/ast_printer.h"
 
 #include "vm/handles.h"
 #include "vm/log.h"
 #include "vm/object.h"
 #include "vm/os.h"
@@ skipping 13 matching lines @@
   THR_Print(")");
 }
 
 
 void AstPrinter::VisitSequenceNode(SequenceNode* node) {
   indent_++;
   LocalScope* scope = node->scope();
   THR_Print("(%s (scope \"%p\"", node->PrettyName(), scope);
   if (scope != NULL) {
     THR_Print(" (%" Pd "-%" Pd ") loop %d",
-              scope->begin_token_pos(),
-              scope->end_token_pos(),
+              scope->begin_token_pos().value(),

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

ditto.

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

Done.

+              scope->end_token_pos().value(),
               scope->loop_level());
     if (scope->HasContextLevel()) {
       THR_Print(" context %d captures %d",
                 scope->context_level(),
                 scope->num_context_variables());
     } else {
       ASSERT(scope->num_context_variables() == 0);
     }
   }
   THR_Print(")");
@@ skipping 426 matching lines @@
   }
   if (var->HasIndex()) {
     THR_Print(" @%d", var->index());
     if (var->is_captured()) {
       THR_Print(" ctx %d", var->owner()->context_level());
     }
   } else if (var->owner()->function_level() != 0) {
     THR_Print(" lev %d", var->owner()->function_level());
   }
   THR_Print(" valid %" Pd "-%" Pd ")\n",
-            var->token_pos(),
-            scope->end_token_pos());
+            var->token_pos().value(),
+            scope->end_token_pos().value());
 }
 
 
 void AstPrinter::PrintLocalScope(const LocalScope* scope,
                                  int start_index,
                                  int indent) {
   ASSERT(scope != NULL);
   for (int i = start_index; i < scope->num_variables(); i++) {
     LocalVariable* var = scope->VariableAt(i);
     PrintLocalScopeVariable(scope, var, indent);
@@ skipping 51 matching lines @@
           parsed_function.DefaultParameterValueAt(pos - num_fixed_params);
       THR_Print(" =%s", default_parameter_value.ToCString());
     }
     if (param->HasIndex()) {
       THR_Print(" @%d", param->index());
       if (param->is_captured()) {
         THR_Print(" ctx %d", param->owner()->context_level());
       }
     }
     THR_Print(" valid %" Pd "-%" Pd ")\n",
-              param->token_pos(),
-              scope->end_token_pos());
+              param->token_pos().value(),
+              scope->end_token_pos().value());
     pos++;
   }
   // Visit remaining non-parameter variables and children scopes.
   PrintLocalScope(scope, pos, indent);
   THR_Print("}\n");
 }
 
 
 void AstPrinter::PrintFunctionNodes(const ParsedFunction& parsed_function) {
   HANDLESCOPE(parsed_function.thread());
   SequenceNode* node_sequence = parsed_function.node_sequence();
   ASSERT(node_sequence != NULL);
   AstPrinter ast_printer;
   const char* function_name =
       parsed_function.function().ToFullyQualifiedCString();
   THR_Print("Ast for function '%s' {\n", function_name);
   node_sequence->Visit(&ast_printer);
   THR_Print("}\n");
 }
 
 }  // namespace dart