Fixing bugs: 1612, 1843, 1847

runtime/vm/scanner.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/scanner.h"
 
 #include "platform/assert.h"
 #include "vm/flags.h"
 #include "vm/object.h"
 #include "vm/thread.h"
 #include "vm/token.h"
 
 namespace dart {
 
 DEFINE_FLAG(bool, print_tokens, false, "Print scanned tokens.");
 
 void Scanner::InitKeywordTable() {
   for (int i = 0; i < Token::numKeywords; i++) {
     Token::Kind token = static_cast<Token::Kind>(Token::kFirstKeyword + i);
     keywords_[i].kind = token;
     keywords_[i].keyword_chars = Token::Str(token);
     keywords_[i].keyword_len = strlen(Token::Str(token));
     keywords_[i].keyword_symbol = NULL;
   }
 }
 
 
 void Scanner::Reset() {
-  lookahead_pos_ = 0;
+  lookahead_pos_ = -1;
   token_start_ = 0;
-  c0_ = source_length_ == 0 ? '\0' : source_.CharAt(0);
+  c0_ = '\0';
   newline_seen_ = false;
   while (saved_context_ != NULL) {
     ScanContext* ctx = saved_context_;
     saved_context_ = ctx->next;
     delete ctx;
   }
   string_delimiter_ = '\0';
   string_is_multiline_ = false;
   brace_level_ = 0;
   c0_pos_.line = 1;
-  c0_pos_.column = 1;
+  c0_pos_.column = 0;
+  ReadChar();
 }
 
 
 Scanner::Scanner(const String& src, const String& private_key)
     : source_(src),
       source_length_(src.Length()),
       saved_context_(NULL),
       private_key_(String::ZoneHandle(private_key.raw())) {
   Reset();
   InitKeywordTable();
@@ skipping 843 matching lines @@
               "%c%"PRIxPTR, kPrivateKeySeparator, key_value);
   const String& result = String::Handle(String::New(private_key));
   return result.raw();
 }
 
 
 void Scanner::InitOnce() {
 }
 
 }  // namespace dart