[Truffle] Add lowerFixnumParameters to fix scanf tests;

jruby · Apr 26, 2015 · 04d4ba5 · 04d4ba5
1 parent 6213244
commit 04d4ba5
Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/test/mri_truffle.index b/test/mri_truffle.index
@@ -237,7 +237,7 @@ ruby/test_unicode_escape.rb
 ruby/test_variable.rb
 ruby/test_whileuntil.rb
 ruby/test_yield.rb
-# scanf/test_scanf.rb # Fails when run as suite
+scanf/test_scanf.rb
 # scanf/test_scanfblocks.rb
 # socket/test_basicsocket.rb
 # socket/test_nonblock.rb

diff --git a/truffle/src/main/java/org/jruby/truffle/nodes/rubinius/ByteArrayNodes.java b/truffle/src/main/java/org/jruby/truffle/nodes/rubinius/ByteArrayNodes.java
@@ -24,7 +24,7 @@
 @CoreClass(name = "Rubinius::ByteArray")
 public abstract class ByteArrayNodes {
 
-    @CoreMethod(names = "get_byte", required = 1)
+    @CoreMethod(names = "get_byte", required = 1, lowerFixnumParameters = 0)
     public abstract static class GetByteNode extends CoreMethodNode {
 
         public GetByteNode(RubyContext context, SourceSection sourceSection) {
@@ -108,7 +108,7 @@ public int size(RubiniusByteArray bytes) {
 
     }
 
-    @CoreMethod(names = "locate", required = 3)
+    @CoreMethod(names = "locate", required = 3, lowerFixnumParameters = {1, 2})
     public abstract static class LocateNode extends CoreMethodNode {
 
         public LocateNode(RubyContext context, SourceSection sourceSection) {

diff --git a/truffle/src/main/java/org/jruby/truffle/nodes/rubinius/IOPrimitiveNodes.java b/truffle/src/main/java/org/jruby/truffle/nodes/rubinius/IOPrimitiveNodes.java
@@ -220,7 +220,7 @@ public int close(VirtualFrame frame, RubyBasicObject io) {
 
     }
 
-    @RubiniusPrimitive(name = "io_seek")
+    @RubiniusPrimitive(name = "io_seek", lowerFixnumParameters = {0, 1})
     public static abstract class IOSeekPrimitiveNode extends RubiniusPrimitiveNode {
 
         public IOSeekPrimitiveNode(RubyContext context, SourceSection sourceSection) {

diff --git a/truffle/src/main/java/org/jruby/truffle/nodes/rubinius/StringPrimitiveNodes.java b/truffle/src/main/java/org/jruby/truffle/nodes/rubinius/StringPrimitiveNodes.java
@@ -648,7 +648,7 @@ public Object stringToF(RubyString string) {
 
     }
 
-    @RubiniusPrimitive(name = "string_index")
+    @RubiniusPrimitive(name = "string_index", lowerFixnumParameters = 1)
     public static abstract class StringIndexPrimitiveNode extends RubiniusPrimitiveNode {
 
         public StringIndexPrimitiveNode(RubyContext context, SourceSection sourceSection) {
@@ -1359,7 +1359,7 @@ private RubyString makeSubstring(RubyString string, int beg, int len) {
 
     }
 
-    @RubiniusPrimitive(name = "string_from_bytearray", needsSelf = false, lowerFixnumParameters = {0, 1})
+    @RubiniusPrimitive(name = "string_from_bytearray", needsSelf = false, lowerFixnumParameters = {1, 2})
     public static abstract class StringFromByteArrayPrimitiveNode extends RubiniusPrimitiveNode {
 
         public StringFromByteArrayPrimitiveNode(RubyContext context, SourceSection sourceSection) {