Merge pull request JuliaLang#23584 from JuliaLang/jq/cartesian

Fix while loop variable issue in cartesian.jl
tpapp · Sep 5, 2017 · 2526b40 · 2526b40
2 parents 30530e0 + 4c0a3e6
commit 2526b40
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 0 deletions.
diff --git a/base/cartesian.jl b/base/cartesian.jl
@@ -302,6 +302,7 @@ function lreplace!(str::AbstractString, r::LReplace)
  pat = r.pat_str
  j = start(pat)
  matching = false
+ local istart::Int
  while !done(str, i)
  cstr, i = next(str, i)
  if !matching

diff --git a/test/cartesian.jl b/test/cartesian.jl
@@ -3,3 +3,5 @@
 @test Base.Cartesian.exprresolve(:(1 + 3)) == 4
 ex = Base.Cartesian.exprresolve(:(if 5 > 4; :x; else :y; end))
 @test ex.args[2] == QuoteNode(:x)
+
+@test Base.Cartesian.lreplace!("val_col", Base.Cartesian.LReplace{String}(:col, "col", 1)) == "val_1"