Changes to shrink the token stream representation from two words to one word.

vm/parser.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 "vm/parser.h"
 
 #include "vm/bigint_operations.h"
 #include "vm/class_finalizer.h"
 #include "vm/compiler.h"
 #include "vm/compiler_stats.h"
@@ skipping 247 matching lines @@
 }
 
 
 String* Parser::CurrentLiteral() const {
   String& result = String::ZoneHandle();
   result ^= tokens_.LiteralAt(token_index_);
   return &result;
 }
 
 
+RawDouble* Parser::CurrentDoubleLiteral() const {
+  LiteralToken& token = LiteralToken::Handle();
+  token ^= tokens_.TokenAt(token_index_);
+  ASSERT(token.kind() == Token::kDOUBLE);
+  return reinterpret_cast<RawDouble*>(token.value());
+}
+
+
+RawInteger* Parser::CurrentIntegerLiteral() const {
+  LiteralToken& token = LiteralToken::Handle();
+  token ^= tokens_.TokenAt(token_index_);
+  ASSERT(token.kind() == Token::kINTEGER);
+  return reinterpret_cast<RawInteger*>(token.value());
+}
+
+
 // A QualIdent is an optionally qualified identifier.
 struct QualIdent {
   QualIdent() {
     Clear();
   }
   void Clear() {
     lib_prefix = NULL;
     ident_pos = 0;
     ident = NULL;
   }
@@ skipping 7265 matching lines @@
     ASSERT(primary != NULL);
   } else if (CurrentToken() == Token::kTHIS) {
     const String& this_name = String::Handle(String::NewSymbol(kThisName));
     LocalVariable* local = LookupLocalScope(this_name);
     if (local == NULL) {
       ErrorMsg("unexpected use of 'this' in primary expression");
     }
     primary = new LoadLocalNode(token_index_, *local);
     ConsumeToken();
   } else if (CurrentToken() == Token::kINTEGER) {
-    String* int_literal = CurrentLiteral();
-    ASSERT(int_literal != NULL);
-    ASSERT(int_literal->Length() > 0);
-    const Integer& literal = Integer::ZoneHandle(Integer::New(*int_literal));
+    const Integer& literal = Integer::ZoneHandle(CurrentIntegerLiteral());
     primary = new LiteralNode(token_index_, literal);
     ConsumeToken();
   } else if (CurrentToken() == Token::kTRUE) {
     primary = new LiteralNode(token_index_, Bool::ZoneHandle(Bool::True()));
     ConsumeToken();
   } else if (CurrentToken() == Token::kFALSE) {
     primary = new LiteralNode(token_index_, Bool::ZoneHandle(Bool::False()));
     ConsumeToken();
   } else if (CurrentToken() == Token::kNULL) {
     primary = new LiteralNode(token_index_, Instance::ZoneHandle());
     ConsumeToken();
   } else if (CurrentToken() == Token::kLPAREN) {
     ConsumeToken();
     const bool saved_mode = SetAllowFunctionLiterals(true);
     primary = ParseExpr(kAllowConst);
     SetAllowFunctionLiterals(saved_mode);
     ExpectToken(Token::kRPAREN);
   } else if (CurrentToken() == Token::kDOUBLE) {
-    String* double_literal = CurrentLiteral();
-    ASSERT(double_literal != NULL);
-    ASSERT(double_literal->Length() > 0);
-    Double& double_value =
-        Double::ZoneHandle(Double::NewCanonical(*double_literal));
+    Double& double_value = Double::ZoneHandle(CurrentDoubleLiteral());
     if (double_value.IsNull()) {
       ErrorMsg("invalid double literal");
     }
     primary = new LiteralNode(token_index_, double_value);
     ConsumeToken();
   } else if (CurrentToken() == Token::kSTRING) {
     primary = ParseStringLiteral();
   } else if (CurrentToken() == Token::kNEW) {
     primary = ParseNewOperator();
   } else if (CurrentToken() == Token::kCONST) {
@@ skipping 319 matching lines @@
 void Parser::SkipQualIdent() {
   ASSERT(IsIdentifier());
   ConsumeToken();
   if (CurrentToken() == Token::kPERIOD) {
     ConsumeToken();  // Consume the kPERIOD token.
     ExpectIdentifier("identifier expected after '.'");
   }
 }
 
 }  // namespace dart