Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 9 additions & 1 deletion ext/date/date_core.c
Original file line number Diff line number Diff line change
Expand Up @@ -4339,11 +4339,19 @@ get_limit(VALUE opt)
return 128;
}

#ifndef HAVE_RB_CATEGORY_WARN
#define rb_category_warn(category, fmt) rb_warn(fmt)
#endif

static void
check_limit(VALUE str, VALUE opt)
{
if (NIL_P(str)) return;
if (SYMBOL_P(str)) str = rb_sym2str(str);
if (SYMBOL_P(str)) {
rb_category_warn(RB_WARN_CATEGORY_DEPRECATED,
"The ability to parse Symbol is an unintentional bug and is deprecated");
str = rb_sym2str(str);
}

StringValue(str);
size_t slen = RSTRING_LEN(str);
Expand Down
1 change: 1 addition & 0 deletions ext/date/extconf.rb
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@

config_string("strict_warnflags") {|w| $warnflags += " #{w}"}

have_func("rb_category_warn")
with_werror("", {:werror => true}) do |opt, |
have_var("timezone", "time.h", opt)
have_var("altzone", "time.h", opt)
Expand Down
12 changes: 6 additions & 6 deletions test/date/test_date_parse.rb
Original file line number Diff line number Diff line change
Expand Up @@ -852,7 +852,7 @@ def test__iso8601
h = Date._iso8601(nil)
assert_equal({}, h)

h = Date._iso8601('01-02-03T04:05:06Z'.to_sym)
h = assert_warn(/deprecated/) {Date._iso8601('01-02-03T04:05:06Z'.to_sym)}
assert_equal([2001, 2, 3, 4, 5, 6, 0],
h.values_at(:year, :mon, :mday, :hour, :min, :sec, :offset))
end
Expand All @@ -874,7 +874,7 @@ def test__rfc3339
h = Date._rfc3339(nil)
assert_equal({}, h)

h = Date._rfc3339('2001-02-03T04:05:06Z'.to_sym)
h = assert_warn(/deprecated/) {Date._rfc3339('2001-02-03T04:05:06Z'.to_sym)}
assert_equal([2001, 2, 3, 4, 5, 6, 0],
h.values_at(:year, :mon, :mday, :hour, :min, :sec, :offset))
end
Expand Down Expand Up @@ -963,7 +963,7 @@ def test__xmlschema
h = Date._xmlschema(nil)
assert_equal({}, h)

h = Date._xmlschema('2001-02-03'.to_sym)
h = assert_warn(/deprecated/) {Date._xmlschema('2001-02-03'.to_sym)}
assert_equal([2001, 2, 3, nil, nil, nil, nil],
h.values_at(:year, :mon, :mday, :hour, :min, :sec, :offset))
end
Expand Down Expand Up @@ -1002,7 +1002,7 @@ def test__rfc2822
h = Date._rfc2822(nil)
assert_equal({}, h)

h = Date._rfc2822('Sat, 3 Feb 2001 04:05:06 UT'.to_sym)
h = assert_warn(/deprecated/) {Date._rfc2822('Sat, 3 Feb 2001 04:05:06 UT'.to_sym)}
assert_equal([2001, 2, 3, 4, 5, 6, 0],
h.values_at(:year, :mon, :mday, :hour, :min, :sec, :offset))
end
Expand All @@ -1029,7 +1029,7 @@ def test__httpdate
h = Date._httpdate(nil)
assert_equal({}, h)

h = Date._httpdate('Sat, 03 Feb 2001 04:05:06 GMT'.to_sym)
h = assert_warn(/deprecated/) {Date._httpdate('Sat, 03 Feb 2001 04:05:06 GMT'.to_sym)}
assert_equal([2001, 2, 3, 4, 5, 6, 0],
h.values_at(:year, :mon, :mday, :hour, :min, :sec, :offset))
end
Expand Down Expand Up @@ -1112,7 +1112,7 @@ def test__jisx0301
h = Date._jisx0301(nil)
assert_equal({}, h)

h = Date._jisx0301('H13.02.03T04:05:06.07+0100'.to_sym)
h = assert_warn(/deprecated/) {Date._jisx0301('H13.02.03T04:05:06.07+0100'.to_sym)}
assert_equal([2001, 2, 3, 4, 5, 6, 3600],
h.values_at(:year, :mon, :mday, :hour, :min, :sec, :offset))
end
Expand Down