Merge pull request jruby#7996 from enebo/printf_temp_fixes

Add %aA for printf and friends
headius · Nov 2, 2023 · 931c4fc · 931c4fc
2 parents edf1eea + 917474d
commit 931c4fc
Show file tree

Hide file tree

Showing 8 changed files with 307 additions and 272 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
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
diff --git a/spec/tags/ruby/core/string/modulo_tags.txt b/spec/tags/ruby/core/string/modulo_tags.txt
diff --git a/spec/tags/ruby/core/string/percent_tags.txt b/spec/tags/ruby/core/string/percent_tags.txt