---

WI-Lee · WI-Lee · commit 0df3ea9d7d86 · 2015-05-13T22:06:26.000+01:00
yaml --- r: 210845 b: refs/heads/try c: 4f82c31 h: refs/heads/master i: 210843: 256f19f v: v3
diff --git a/[refs] b/[refs]
@@ -2,7 +2,7 @@
 refs/heads/master: 3e561f05c00cd180ec02db4ccab2840a4aba93d2
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: ba0e1cd8147d452c356aacb29fb87568ca26f111
-refs/heads/try: aef0581513f3fd01068cb423d9c62cb48b3f077a
+refs/heads/try: 4f82c3151b063a4226f33df047d4e748ef5e3f13
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
diff --git a/branches/try/src/libsyntax/parse/lexer/mod.rs b/branches/try/src/libsyntax/parse/lexer/mod.rs
@@ -1565,4 +1565,13 @@ mod tests {
         assert_eq!(lexer.next_token().tok, token::Literal(token::Char(token::intern("a")), None));
     }
 
+    #[test] fn crlf_comments() {
+        let sh = mk_sh();
+        let mut lexer = setup(&sh, "// test\r\n/// test\r\n".to_string());
+        let comment = lexer.next_token();
+        assert_eq!(comment.tok, token::Comment);
+        assert_eq!(comment.sp, ::codemap::mk_sp(BytePos(0), BytePos(7)));
+        assert_eq!(lexer.next_token().tok, token::Whitespace);
+        assert_eq!(lexer.next_token().tok, token::DocComment(token::intern("/// test")));
+    }
 }

Original file line number	Diff line number	Diff line change
`@@ -1565,4 +1565,13 @@ mod tests {`
`1565`	`1565`	`assert_eq!(lexer.next_token().tok, token::Literal(token::Char(token::intern("a")), None));`
`1566`	`1566`	`}`
`1567`	`1567`
	`1568`	`+ #[test] fn crlf_comments() {`
	`1569`	`+ let sh = mk_sh();`
	`1570`	`+ let mut lexer = setup(&sh, "// test\r\n/// test\r\n".to_string());`
	`1571`	`+ let comment = lexer.next_token();`
	`1572`	`+ assert_eq!(comment.tok, token::Comment);`
	`1573`	`+ assert_eq!(comment.sp, ::codemap::mk_sp(BytePos(0), BytePos(7)));`
	`1574`	`+ assert_eq!(lexer.next_token().tok, token::Whitespace);`
	`1575`	`+ assert_eq!(lexer.next_token().tok, token::DocComment(token::intern("/// test")));`
	`1576`	`+ }`
`1568`	`1577`	`}`