Represent tokens as a compressed stream instead of an array.

vm/snapshot_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 "include/dart_debugger_api.h"
 #include "platform/assert.h"
 #include "vm/bigint_operations.h"
 #include "vm/class_finalizer.h"
 #include "vm/dart_api_impl.h"
 #include "vm/dart_api_message.h"
@@ skipping 727 matching lines @@
 
   // Create a snapshot object using the buffer.
   const Snapshot* snapshot = Snapshot::SetupFromBuffer(buffer);
 
   // Read object back from the snapshot.
   SnapshotReader reader(snapshot, Isolate::Current());
   Script& serialized_script = Script::Handle();
   serialized_script ^= reader.ReadObject();
 
   // Check if the serialized script object matches the original script.
+  String& expected_literal = String::Handle();
+  String& actual_literal = String::Handle();
   String& str = String::Handle();
   str ^= serialized_script.url();
   EXPECT(url.Equals(str));
+
   const TokenStream& expected_tokens = TokenStream::Handle(script.tokens());
   const TokenStream& serialized_tokens =
       TokenStream::Handle(serialized_script.tokens());
   EXPECT_EQ(expected_tokens.Length(), serialized_tokens.Length());
-  String& expected_literal = String::Handle();
-  String& actual_literal = String::Handle();
-  for (intptr_t i = 0; i < expected_tokens.Length(); i++) {
-    EXPECT_EQ(expected_tokens.KindAt(i), serialized_tokens.KindAt(i));
-    expected_literal ^= expected_tokens.LiteralAt(i);
-    actual_literal ^= serialized_tokens.LiteralAt(i);
+  TokenStreamIterator expected_iterator(expected_tokens, 0);

[Ivan Posva, 2012/07/02 22:56:05]

I am becoming more and more convinced that this should be TokenStream::Iterator.

[siva, 2012/07/04 01:43:02]

Done.

+  TokenStreamIterator serialized_iterator(serialized_tokens, 0);
+  Token::Kind expected_kind = expected_iterator.CurrentTokenKind();
+  Token::Kind serialized_kind = serialized_iterator.CurrentTokenKind();
+  while (expected_kind != Token::kEOS && serialized_kind != Token::kEOS) {
+    EXPECT_EQ(expected_kind, serialized_kind);
+    expected_literal ^= expected_iterator.CurrentLiteral();
+    actual_literal ^= serialized_iterator.CurrentLiteral();
     EXPECT(expected_literal.Equals(actual_literal));
+    expected_iterator.Advance();
+    serialized_iterator.Advance();
+    expected_kind = expected_iterator.CurrentTokenKind();
+    serialized_kind = serialized_iterator.CurrentTokenKind();
   }
+
   // Check if we are able to generate the source from the token stream.
   // Rescan this source and compare the token stream to see if they are
   // the same.
   str ^= serialized_tokens.GenerateSource();
   const String& dummy_key = String::Handle(String::New(""));
   Scanner scanner(str, dummy_key);
   const TokenStream& reconstructed_tokens =
       TokenStream::Handle(TokenStream::New(scanner.GetStream()));
-  for (intptr_t i = 0; i < expected_tokens.Length(); i++) {
-    EXPECT_EQ(expected_tokens.KindAt(i), serialized_tokens.KindAt(i));
-    expected_literal ^= expected_tokens.LiteralAt(i);
-    actual_literal ^= reconstructed_tokens.LiteralAt(i);
+  expected_iterator.SetCurrentPosition(0);
+  TokenStreamIterator reconstructed_iterator(reconstructed_tokens, 0);
+  expected_kind = expected_iterator.CurrentTokenKind();
+  Token::Kind reconstructed_kind = reconstructed_iterator.CurrentTokenKind();
+  while (expected_kind != Token::kEOS && reconstructed_kind != Token::kEOS) {
+    EXPECT_EQ(expected_kind, reconstructed_kind);
+    expected_literal ^= expected_iterator.CurrentLiteral();
+    actual_literal ^= reconstructed_iterator.CurrentLiteral();
     EXPECT(expected_literal.Equals(actual_literal));
+    expected_iterator.Advance();
+    reconstructed_iterator.Advance();
+    expected_kind = expected_iterator.CurrentTokenKind();
+    reconstructed_kind = reconstructed_iterator.CurrentTokenKind();
   }
 
   free(buffer);
 }
 
 
 // Only ia32 and x64 can run execution tests.
 #if defined(TARGET_ARCH_IA32) || defined(TARGET_ARCH_X64)
 UNIT_TEST_CASE(FullSnapshot) {
   const char* kScriptChars =
@@ skipping 752 matching lines @@
   EXPECT(Dart_ErrorHasException(result));
   EXPECT_SUBSTRING("Exception: nulltruefalse1234563.14[]100123456789\n",
                    Dart_GetError(result));
 
   Dart_ExitScope();
 }
 
 #endif  // defined(TARGET_ARCH_IA32) || defined(TARGET_ARCH_X64).
 
 }  // namespace dart