[ruby/date] Do not repeat conversions to string

ruby/date@159e1ebb7f
ruby/date@4f7b6c9b42

Author: nobu

ext/date/date_core.c

@@ -4464,18 +4464,19 @@ get_limit(VALUE opt)
 #define rb_category_warn(category, fmt) rb_warn(fmt)
 #endif
 
-static void
+static VALUE
 check_limit(VALUE str, VALUE opt)
 {
     size_t slen, limit;
-    if (NIL_P(str)) return;
+    if (NIL_P(str)) return str;
     StringValue(str);
     slen = RSTRING_LEN(str);
     limit = get_limit(opt);
     if (slen > limit) {
 	rb_raise(rb_eArgError,
 		 "string length (%"PRI_SIZE_PREFIX"u) exceeds the limit %"PRI_SIZE_PREFIX"u", slen, limit);
     }
+    return str;
 }
 
 static VALUE
@@ -4484,8 +4485,7 @@ date_s__parse_internal(int argc, VALUE *argv, VALUE klass)
     VALUE vstr, vcomp, hash, opt;
 
     argc = rb_scan_args(argc, argv, "11:", &vstr, &vcomp, &opt);
-    check_limit(vstr, opt);
-    StringValue(vstr);
+    vstr = check_limit(vstr, opt);
     if (!rb_enc_str_asciicompat_p(vstr))
 	rb_raise(rb_eArgError,
 		 "string should have ASCII compatible encoding");
@@ -4620,7 +4620,7 @@ date_s__iso8601(int argc, VALUE *argv, VALUE klass)
     VALUE str, opt;
 
     rb_scan_args(argc, argv, "1:", &str, &opt);
-    check_limit(str, opt);
+    str = check_limit(str, opt);
 
     return date__iso8601(str);
 }
@@ -4690,7 +4690,7 @@ date_s__rfc3339(int argc, VALUE *argv, VALUE klass)
     VALUE str, opt;
 
     rb_scan_args(argc, argv, "1:", &str, &opt);
-    check_limit(str, opt);
+    str = check_limit(str, opt);
 
     return date__rfc3339(str);
 }
@@ -4759,7 +4759,7 @@ date_s__xmlschema(int argc, VALUE *argv, VALUE klass)
     VALUE str, opt;
 
     rb_scan_args(argc, argv, "1:", &str, &opt);
-    check_limit(str, opt);
+    str = check_limit(str, opt);
 
     return date__xmlschema(str);
 }
@@ -4828,7 +4828,7 @@ date_s__rfc2822(int argc, VALUE *argv, VALUE klass)
     VALUE str, opt;
 
     rb_scan_args(argc, argv, "1:", &str, &opt);
-    check_limit(str, opt);
+    str = check_limit(str, opt);
 
     return date__rfc2822(str);
 }
@@ -4896,7 +4896,7 @@ date_s__httpdate(int argc, VALUE *argv, VALUE klass)
     VALUE str, opt;
 
     rb_scan_args(argc, argv, "1:", &str, &opt);
-    check_limit(str, opt);
+    str = check_limit(str, opt);
 
     return date__httpdate(str);
 }
@@ -4965,7 +4965,7 @@ date_s__jisx0301(int argc, VALUE *argv, VALUE klass)
     VALUE str, opt;
 
     rb_scan_args(argc, argv, "1:", &str, &opt);
-    check_limit(str, opt);
+    str = check_limit(str, opt);
 
     return date__jisx0301(str);
 }

test/date/test_date_parse.rb

@@ -1304,4 +1304,20 @@ def test_length_limit
 
     assert_raise(ArgumentError) { Date._parse("Jan " + "9" * 1000000) }
   end
+
+  def test_string_argument
+    s = '2001-02-03T04:05:06Z'
+    obj = Class.new(Struct.new(:to_str, :count)) do
+      def to_str
+        self.count +=1
+        super
+      end
+    end.new(s, 0)
+
+    all_assertions_foreach(nil, :_parse, :_iso8601, :_rfc3339, :_xmlschema) do |m|
+      obj.count = 0
+      assert_not_equal({}, Date.__send__(m, obj))
+      assert_equal(1, obj.count)
+    end
+  end
 end