Fix for Issue 2367

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/object_store.h"
@@ skipping 155 matching lines @@
   return true;
 }
 
 
 void Scanner::ReadChar() {
   if (lookahead_pos_ < source_length_) {
     if (c0_ == '\n') {
       newline_seen_ = true;
       c0_pos_.line++;
       c0_pos_.column = 0;
+      if (source_.CharAt(lookahead_pos_) == '\r') {
+        if (LookaheadChar(1) == '\n') {
+          lookahead_pos_++;
+        }
+      }
     }
     lookahead_pos_++;
     c0_pos_.column++;
     c0_ = LookaheadChar(0);
     // Replace '\r' with '\n' and a sequence of

[hausner, 2012/04/11 21:43:58]

This comment should probably be slightly adjusted, since the \r\n sequence is
handled above now.

[siva, 2012/04/11 22:04:40]

Done.

     // '\r' '\n' with a single '\n'.
     if (c0_ == '\r') {
       c0_ = '\n';
-      if (LookaheadChar(1) == '\n') {
-        lookahead_pos_++;
-      }
     }
   }
 }
 
 
 // Look ahead 'how_many' characters. Returns the character, or '\0' if
 // the lookahead position is beyond the end of the string. Does not
 // normalize line end characters into '\n'.
 int32_t Scanner::LookaheadChar(int how_many) {
   ASSERT(how_many >= 0);
@@ skipping 715 matching lines @@
               "%c%"PRIxPTR, kPrivateKeySeparator, key_value);
   const String& result = String::Handle(String::New(private_key));
   return result.raw();
 }
 
 
 void Scanner::InitOnce() {
 }
 
 }  // namespace dart