Make the parser agnostic to the TokenStream implementation. This is the first step towards compacti…

vm/ast.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.h"
 #include "vm/compiler.h"
 #include "vm/dart_entry.h"
 #include "vm/isolate.h"
 #include "vm/object_store.h"
 
@@ skipping 69 matching lines @@
 
 
 // TODO(srdjan): Add code for logical negation.
 AstNode* LiteralNode::ApplyUnaryOp(Token::Kind unary_op_kind) {
   if (unary_op_kind == Token::kSUB) {
     if (literal().IsSmi()) {
       Smi& smi = Smi::Handle();
       smi ^= literal().raw();
       const Instance& literal =
           Instance::ZoneHandle(Integer::New(-smi.Value()));
-      return new LiteralNode(this->token_index(), literal);
+      return new LiteralNode(this->token_pos(), literal);
     }
     if (literal().IsDouble()) {
       Double& dbl = Double::Handle();
       dbl ^= literal().raw();
       // Preserve negative zero.
       double new_value = (dbl.value() == 0.0) ? -0.0 : (0.0 - dbl.value());
       Double& double_instance =
           Double::ZoneHandle(Double::New(new_value, Heap::kOld));
       double_instance ^= double_instance.Canonicalize();
-      return new LiteralNode(this->token_index(), double_instance);
+      return new LiteralNode(this->token_pos(), double_instance);
     }
   }
   return NULL;
 }
 
 
 bool ComparisonNode::IsKindValid() const {
   return Token::IsRelationalOperator(kind_)
       || Token::IsEqualityOperator(kind_)
       || Token::IsInstanceofOperator(kind_);
@@ skipping 132 matching lines @@
       }
       return NULL;
     default:
       UNREACHABLE();
       return NULL;
   }
   return NULL;
 }
 
 
-AstNode* UnaryOpNode::UnaryOpOrLiteral(intptr_t token_index,
+AstNode* UnaryOpNode::UnaryOpOrLiteral(intptr_t token_pos,
                                        Token::Kind kind,
                                        AstNode* operand) {
   AstNode* new_operand = operand->ApplyUnaryOp(kind);
   if (new_operand != NULL) {
     return new_operand;
   }
-  return new UnaryOpNode(token_index, kind, operand);
+  return new UnaryOpNode(token_pos, kind, operand);
 }
 
 
 bool UnaryOpNode::IsKindValid() const {
   switch (kind_) {
     case Token::kADD:
     case Token::kSUB:
     case Token::kNOT:
     case Token::kBIT_NOT:
       return true;
@@ skipping 32 matching lines @@
 }
 
 
 AstNode* LoadLocalNode::MakeAssignmentNode(AstNode* rhs) {
   if (local().is_final()) {
     return NULL;
   }
   if (HasPseudo()) {
     return NULL;
   }
-  return new StoreLocalNode(token_index(), local(), rhs);
+  return new StoreLocalNode(token_pos(), local(), rhs);
 }
 
 
 AstNode* LoadStaticFieldNode::MakeAssignmentNode(AstNode* rhs) {
-  return new StoreStaticFieldNode(token_index(), field(), rhs);
+  return new StoreStaticFieldNode(token_pos(), field(), rhs);
 }
 
 
 AstNode* InstanceGetterNode::MakeAssignmentNode(AstNode* rhs) {
-  return new InstanceSetterNode(token_index(), receiver(), field_name(), rhs);
+  return new InstanceSetterNode(token_pos(), receiver(), field_name(), rhs);
 }
 
 
 AstNode* LoadIndexedNode::MakeAssignmentNode(AstNode* rhs) {
-  return new StoreIndexedNode(token_index(), array(), index_expr(), rhs);
+  return new StoreIndexedNode(token_pos(), array(), index_expr(), rhs);
 }
 
 
 AstNode* StaticGetterNode::MakeAssignmentNode(AstNode* rhs) {
   // If no setter exist, set the field directly.
   const String& setter_name = String::Handle(Field::SetterName(field_name()));
   const Function& setter =
       Function::ZoneHandle(cls().LookupStaticFunction(setter_name));
   if (setter.IsNull()) {
     // Access to a lazily initialized static field that has not yet been
     // initialized is compiled to a static implicit getter.
     // A setter may not exist for such a field.
 #if defined(DEBUG)
     const String& getter_name = String::Handle(Field::GetterName(field_name()));
     const Function& getter =
         Function::ZoneHandle(cls().LookupStaticFunction(getter_name));
     ASSERT(!getter.IsNull() &&
            (getter.kind() == RawFunction::kConstImplicitGetter));
 #endif
     const Field& field = Field::ZoneHandle(
         cls().LookupStaticField(field_name()));
     ASSERT(!field.IsNull());
-    return new StoreStaticFieldNode(token_index(), field, rhs);
+    return new StoreStaticFieldNode(token_pos(), field, rhs);
   } else {
-    return new StaticSetterNode(token_index(), cls(), field_name(), rhs);
+    return new StaticSetterNode(token_pos(), cls(), field_name(), rhs);
   }
 }
 
 
 const Instance* StaticGetterNode::EvalConstExpr() const {
   const String& getter_name =
       String::Handle(Field::GetterName(this->field_name()));
   const Function& getter_func =
       Function::Handle(this->cls().LookupStaticFunction(getter_name));
   if (getter_func.IsNull() || !getter_func.is_const()) {
@@ skipping 10 matching lines @@
     // the Error object directly to the parser.  This will involve
     // replumbing all of the EvalConstExpr methods.
     return NULL;
   }
   Instance& field_value = Instance::ZoneHandle();
   field_value ^= result.raw();
   return &field_value;
 }
 
 }  // namespace dart