[Truffle] Add basic sprintf octal support

jruby · Dec 17, 2015 · 19b5591 · 19b5591
1 parent 583558a
commit 19b5591
Showing 4 changed files with 9 additions and 2 deletions.
diff --git a/spec/truffle/tags/core/string/modulo_tags.txt b/spec/truffle/tags/core/string/modulo_tags.txt
@@ -68,7 +68,6 @@ fails:String#% supports hex formats using %X for negative numbers
 fails:String#% formats zero without prefix using %#x
 fails:String#% formats zero without prefix using %#X
 fails:String#% behaves as if calling Kernel#Integer for %b argument, if it does not respond to #to_ary
-fails:String#% behaves as if calling Kernel#Integer for %o argument, if it does not respond to #to_ary
 fails:String#% tries to convert the passed argument to an Array using #to_ary
 fails:String#% behaves as if calling Kernel#Float for %e arguments, when the passed argument does not respond to #to_ary
 fails:String#% behaves as if calling Kernel#Float for %e arguments, when the passed argument is hexadecimal string

diff --git a/truffle/src/main/java/org/jruby/truffle/format/nodes/format/FormatIntegerNode.java b/truffle/src/main/java/org/jruby/truffle/format/nodes/format/FormatIntegerNode.java
@@ -63,6 +63,10 @@ public ByteList format(int spacePadding, int zeroPadding, DynamicObject value) {
                 formatted = bigInteger.toString();
                 break;
 
+            case 'o':
+                formatted = bigInteger.toString(8).toLowerCase(Locale.ENGLISH);
+                break;
+
             case 'x':
                 formatted = bigInteger.toString(16).toLowerCase(Locale.ENGLISH);
                 break;

diff --git a/truffle/src/main/java/org/jruby/truffle/format/parser/FormatParser.java b/truffle/src/main/java/org/jruby/truffle/format/parser/FormatParser.java
@@ -117,6 +117,7 @@ public PackNode parse(FormatTokenizer tokenizer) {
                         break;
                     case 'd':
                     case 'i':
+					case 'o':
                     case 'u':
                     case 'x':
                     case 'X':
@@ -151,6 +152,9 @@ public PackNode parse(FormatTokenizer tokenizer) {
                             case 'u':
                                 format = 'd';
                                 break;
+                            case 'o':
+                                format = 'o';
+                                break;
                             case 'x':
                             case 'X':
                                 format = directive.getType();

diff --git a/truffle/src/main/java/org/jruby/truffle/format/parser/FormatTokenizer.java b/truffle/src/main/java/org/jruby/truffle/format/parser/FormatTokenizer.java
@@ -18,7 +18,7 @@
  */
 public class FormatTokenizer {
 
-    private static final String TYPE_CHARS = "%-sdiuxXfgGeE";
+    private static final String TYPE_CHARS = "%-sdiuxXfgGeEo";
 
     private final RubyContext context;
     private final ByteList format;