Skip to content

Commit

Permalink
Merge pull request #11844 from tanmaykm/regexfix
Browse files Browse the repository at this point in the history
fix regex serialization
  • Loading branch information
StefanKarpinski committed Jun 26, 2015
2 parents 68ffe11 + 124f496 commit 412918a
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion base/dates/io.jl
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ function DateFormat(f::AbstractString,locale::AbstractString="english")
for (i,k) in enumerate(s)
k == "" && break
tran = i >= endof(s) ? r"$" : match(Regex("(?<=$(s[i])).*(?=$(s[i+1]))"),f).match
slot = tran == "" || tran == r"$" ? FixedWidthSlot : DelimitedSlot
slot = tran == "" ? FixedWidthSlot : DelimitedSlot
width = length(k)
typ = 'E' in k ? DayOfWeekSlot : 'e' in k ? DayOfWeekSlot :
'y' in k ? Year : 'm' in k ? Month :
Expand Down

0 comments on commit 412918a

Please sign in to comment.