fix case where a string contains "\E"

JuliaLang · Apr 5, 2019 · dba1b10 · dba1b10
1 parent c6132b6
commit dba1b10
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/base/regex.jl b/base/regex.jl
@@ -571,7 +571,9 @@ end
 *(r::Regex) = r # avoids wrapping r in a useless subpattern
 
 wrap_string(r::Regex, unshared::UInt32) = string("(?", regex_opts_str(r.compile_options & unshared), ':', r.pattern, ')')
-wrap_string(s::Union{AbstractString,AbstractChar}, ::UInt32) = string("\\Q", s, "\\E")
+# if s contains raw"\E", split '\' and 'E' within two distinct \Q...\E groups:
+wrap_string(s::AbstractString, ::UInt32) =  string("\\Q", replace(s, raw"\E" => raw"\\E\QE"), "\\E")
+wrap_string(s::AbstractChar, ::UInt32) = string("\\Q", s, "\\E")
 
 regex_opts_str(opts) = (isassigned(_regex_opts_str) ? _regex_opts_str[] : init_regex())[opts]
 

diff --git a/test/regex.jl b/test/regex.jl
@@ -107,6 +107,10 @@
         @test r"a"im * r"b"im == r"(?:a)(?:b)"im
         @test r"a"im * r"b"i  == r"(?m:a)(?:b)"i
 
+        r = r"" * raw"a\Eb|c"
+        @test match(r, raw"a\Eb|c").match == raw"a\Eb|c"
+        @test match(r, raw"c") == nothing
+
         # error for really incompatible options
         @test_throws ArgumentError r"a" * Regex("b", Base.DEFAULT_COMPILER_OPTS & ~Base.PCRE.UCP, Base.DEFAULT_MATCH_OPTS)
         @test_throws ArgumentError r"a" * Regex("b", Base.DEFAULT_COMPILER_OPTS, Base.DEFAULT_MATCH_OPTS & ~Base.PCRE.NO_UTF_CHECK)