time-strptime-wnum-cw-14241.patch - Ruby master - Ruby Issue Tracking System

Bug #14241 » time-strptime-wnum-cw-14241.patch

         # %D :: Date (%m/%d/%y)
         # %e :: Day of the month, blank-padded ( 1..31)
         # %F :: Equivalent to %Y-%m-%d (the ISO 8601 date format)
         # %g :: The last two digits of the commercial year
         # %G :: The week-based year according to ISO-8601 (week 1 starts on Monday
         #       and includes January 4)
         # %h :: Equivalent to %b
         # %H :: Hour of the day, 24-hour clock (00..23)
         # %I :: Hour of the day, 12-hour clock (01..12)
-...
           else
             year = d[:year]
             year = yield(year) if year && block_given?
             t = make_time(date, year, d[:yday], d[:mon], d[:mday], d[:hour], d[:min], d[:sec], d[:sec_fraction], d[:zone], now)
             yday = d[:yday]
             if (d[:cwyear] && !year) || ((d[:cwday] || d[:cweek]) && !(d[:mon] && d[:mday]))
               # make_time doesn't deal with cwyear/cwday/cweek
               return Date.strptime(date, format).to_time
             end
             if (d[:wnum0] || d[:wnum1]) && !yday && !(d[:mon] && d[:mday])
               yday = Date.strptime(date, format).yday
             end
             t = make_time(date, year, yday, d[:mon], d[:mday], d[:hour], d[:min], d[:sec], d[:sec_fraction], d[:zone], now)
           end
+          t
         end

         assert_equal(15, t.hour)
       end
       def test_strptime_wuvg
         assert_equal(Time.local(2019, 1, 30), Time.strptime("3 4 2019", "%w %W %Y"))
         assert_equal(Time.local(2019, 2, 7), Time.strptime("4 5 2019", "%u %U %Y"))
         assert_equal(Time.local(2019, 1, 28), Time.strptime("4 2019", "%W %Y"))
         assert_equal(Time.local(2019, 2, 3), Time.strptime("5 2019", "%U %Y"))
         assert_equal(Time.local(2019, 1, 1), Time.strptime("1 2 2019", "%V %w %G"))
         assert_equal(Time.local(2016, 1, 1), Time.strptime("53 5 15", "%V %w %g"))
         assert_equal(Time.local(2018, 12, 31), Time.strptime("1 2019", "%V %G"))
         assert_equal(Time.local(2015, 12, 28), Time.strptime("53 15", "%V %g"))
       end
       def test_nsec
         assert_equal(123456789, Time.parse("2000-01-01T00:00:00.123456789+00:00").tv_nsec)
       end

(2-2/2)