Fix emitting comments followed by \r\n

Before this patch the `\r` character would be part of the comment and
not the following NewlineWs (which would simply be a `\n`-style
NewlineWs instead of a `\r\n` as one would expect).

src/tokenize.jl

@@ -748,7 +748,7 @@ function lex_comment(l::Lexer)
         valid = true
         while true
             pc = peekchar(l)
-            if pc == '\n' || pc == EOF_CHAR
+            if pc == '\n' || pc == '\r' || pc == EOF_CHAR
                 return emit(l, valid ? K"Comment" : K"ErrorInvalidUTF8")
             end
             valid &= isvalid(pc)

test/tokenize.jl

@@ -1143,6 +1143,10 @@ end
     end
 end
 
+@testset "comment terminated by \\r\\n" begin
+    @test strtok("#\r\n") == ["#", "\r\n", ""]
+end
+
 @testset "dotop miscellanea" begin
     @test strtok("a .-> b")  ==  ["a", " ", ".-", ">", " ", "b", ""]
     @test strtok(".>: b")    ==  [".>:", " ", "b", ""]