---

yaml
---
r: 214377
b: refs/heads/beta
c: 2dcc200
h: refs/heads/master
i:
  214375: 5e80a6f
v: v3

Author: WI-Lee

[refs]

@@ -23,7 +23,7 @@ refs/tags/0.9: 36870b185fc5f5486636d4515f0e22677493f225
 refs/tags/0.10: ac33f2b15782272ae348dbd7b14b8257b2148b5a
 refs/tags/0.11.0: e1247cb1d0d681be034adb4b558b5a0c0d5720f9
 refs/tags/0.12.0: f0c419429ef30723ceaf6b42f9b5a2aeb5d2e2d1
-refs/heads/beta: 93af5f9b446adfeb95abdd8df76cf961451f9d91
+refs/heads/beta: 2dcc200be0f17ec0cab568736d9d3ccbae453a65
 refs/tags/1.0.0-alpha: e42bd6d93a1d3433c486200587f8f9e12590a4d7
 refs/heads/tmp: 8c0aa6d64ebab528f7eb182812007155d6044972
 refs/tags/1.0.0-alpha.2: 4c705f6bc559886632d3871b04f58aab093bfa2f

branches/beta/src/libsyntax/parse/lexer/mod.rs

@@ -406,6 +406,11 @@ impl<'a> StringReader<'a> {
 
                     // line comments starting with "///" or "//!" are doc-comments
                     let doc_comment = self.curr_is('/') || self.curr_is('!');
+                    let start_bpos = if doc_comment {
+                        self.pos - BytePos(3)
+                    } else {
+                        self.last_pos - BytePos(2)
+                    };
 
                     while !self.is_eof() {
                         match self.curr.unwrap() {
@@ -425,7 +430,6 @@ impl<'a> StringReader<'a> {
                     }
 
                     return if doc_comment {
-                        let start_bpos = self.pos - BytePos(3);
                         self.with_str_from(start_bpos, |string| {
                             // comments with only more "/"s are not doc comments
                             let tok = if is_doc_comment(string) {
@@ -440,7 +444,6 @@ impl<'a> StringReader<'a> {
                             })
                         })
                     } else {
-                        let start_bpos = self.last_pos - BytePos(2);
                         Some(TokenAndSpan {
                             tok: token::Comment,
                             sp: codemap::mk_sp(start_bpos, self.last_pos)