fix JuliaLang#41330: backslash not escaping \r\n (JuliaLang#41333)

base/shell.jl

@@ -88,9 +88,12 @@ function shell_parse(str::AbstractString, interpolate::Bool=true;
                 in_double_quotes = !in_double_quotes
                 i = consume_upto!(arg, s, i, j)
             elseif !in_single_quotes && c == '\\'
-                if !isempty(st) && peek(st)[2] == '\n'
+                if !isempty(st) && peek(st)[2] in ('\n', '\r')
                     i = consume_upto!(arg, s, i, j) + 1
-                    _ = popfirst!(st)
+                    if popfirst!(st)[2] == '\r' && peek(st)[2] == '\n'
+                        i += 1
+                        popfirst!(st)
+                    end
                 elseif in_double_quotes
                     isempty(st) && error("unterminated double quote")
                     k, c′ = peek(st)

src/julia-parser.scm

@@ -2365,8 +2365,11 @@
                     (loop (read-char p) b e 0))))
            (let ((nxch (not-eof-for delim (read-char p))))
              (write-char #\\ b)
-             (write-char nxch b)
-             (loop (read-char p) b e 0))))
+             (if (eqv? nxch #\return)
+                 (loop nxch b e 0)
+                 (begin
+                   (write-char nxch b)
+                   (loop (read-char p) b e 0))))))
 
       ((and (eqv? c #\$) (not raw))
        (let* ((ex (parse-interpolate s))

test/syntax.jl

@@ -2930,3 +2930,10 @@ end
 
 # issue #41253
 @test (function (::Dict{}); end)(Dict()) === nothing
+
+@testset "issue #41330" begin
+    @test Meta.parse("\"a\\\r\nb\"") == "ab"
+    @test Meta.parse("\"a\\\rb\"") == "ab"
+    @test eval(Meta.parse("`a\\\r\nb`")) == `ab`
+    @test eval(Meta.parse("`a\\\rb`")) == `ab`
+end