From 223c7dfb1190b2d97a780b09a57ea5bfd99a4f10 Mon Sep 17 00:00:00 2001
From: Graydon Hoare <graydon@mozilla.com>
Date: Tue, 31 May 2011 15:31:50 -0700
Subject: [PATCH] Fix comment-scanning logic in lexer.

---
 src/comp/front/lexer.rs | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/comp/front/lexer.rs b/src/comp/front/lexer.rs
index d87df0874532..a54f08bbc326 100644
--- a/src/comp/front/lexer.rs
+++ b/src/comp/front/lexer.rs
@@ -778,7 +778,9 @@ fn read_line_comments(&reader rdr, bool code_to_the_left) -> cmnt {
     auto p = rdr.get_chpos();
     let vec[str] lines = [];
     while (rdr.curr() == '/' && rdr.next() == '/') {
-        lines += [read_one_line_comment(rdr)];
+        auto line =  read_one_line_comment(rdr);
+        log line;
+        lines += [line];
         consume_non_eol_whitespace(rdr);
     }
     log "<<< line comments";
@@ -895,7 +897,7 @@ fn gather_comments(session sess, str path) -> vec[cmnt] {
         while (true) {
             auto code_to_the_left = true;
             consume_non_eol_whitespace(rdr);
-            if (rdr.next() == '\n') {
+            if (rdr.curr() == '\n') {
                 code_to_the_left = false;
                 consume_whitespace(rdr);
             }