Last typeerror string mismatches for %c fixes

headius · Nov 2, 2023 · 1c29bb7 · 1c29bb7
1 parent d1ea659
commit 1c29bb7
Show file tree

Hide file tree

Showing 7 changed files with 3 additions and 15 deletions.
diff --git a/core/src/main/java/org/jruby/RubyNumeric.java b/core/src/main/java/org/jruby/RubyNumeric.java
@@ -224,7 +224,8 @@ private static long other2long(IRubyObject arg) throws RaiseException {
         if (arg.isNil()) {
             throw arg.getRuntime().newTypeError("no implicit conversion from nil to integer");
         }
-        return arg.convertToInteger().getLongValue();
+
+        return ((RubyInteger) TypeConverter.convertToType(arg, arg.getRuntime().getInteger(), "to_int")).getLongValue();
     }
 
     public static long float2long(RubyFloat flt) {

diff --git a/core/src/main/java/org/jruby/util/Sprintf.java b/core/src/main/java/org/jruby/util/Sprintf.java
@@ -611,9 +611,7 @@ private static void rubySprintfToBuffer(final ByteList buf, final CharSequence c
                         n = StringSupport.codeLength(bl.getEncoding(), c);
                     }
                     else {
-                        // unsigned bits
-                        RubyInteger intValue = (RubyInteger) TypeConverter.convertToType(arg, runtime.getInteger(), "to_int");
-                        c = (int) intValue.getLongValue() & 0xFFFFFFFF;
+                        c = (int) RubyNumeric.num2long(arg) & 0xFFFFFFFF;
                         try {
                             n = StringSupport.codeLength(encoding, c);
                         } catch (EncodingException e) {

diff --git a/spec/tags/ruby/core/file/printf_tags.txt b/spec/tags/ruby/core/file/printf_tags.txt
diff --git a/spec/tags/ruby/core/kernel/printf_tags.txt b/spec/tags/ruby/core/kernel/printf_tags.txt
diff --git a/spec/tags/ruby/core/kernel/sprintf_tags.txt b/spec/tags/ruby/core/kernel/sprintf_tags.txt
@@ -1,5 +1,3 @@
 fails(compiler):Kernel#sprintf passes some tests for negative %u
-fails:Kernel#sprintf other formats c raises TypeError if argument is nil
-fails:Kernel.sprintf other formats c raises TypeError if argument is nil
 fails:Kernel#sprintf %c raises error when a codepoint isn't representable in an encoding of a format string
 fails:Kernel.sprintf %c raises error when a codepoint isn't representable in an encoding of a format string
diff --git a/spec/tags/ruby/core/string/modulo_tags.txt b/spec/tags/ruby/core/string/modulo_tags.txt
@@ -1,2 +1 @@
-fails:String#% other formats c raises TypeError if argument is nil
 fails:String#% %c raises error when a codepoint isn't representable in an encoding of a format string
diff --git a/spec/tags/ruby/library/stringio/printf_tags.txt b/spec/tags/ruby/library/stringio/printf_tags.txt
Original file line number	Diff line number	Diff line change
		@@ -1,2 +1 @@
		fails:String#% other formats c raises TypeError if argument is nil
		fails:String#% %c raises error when a codepoint isn't representable in an encoding of a format string