[Truffle] Add json to stdlib.

jruby · Apr 28, 2015 · e75cd2d · chrisseaton · Apr 28, 2015 · nirvdrum
1 parent 5968ffa
commit e75cd2d
Show file tree

Hide file tree

Showing 28 changed files with 38 additions and 8 deletions.
diff --git a/lib/ruby/truffle/mri/json.rb b/lib/ruby/truffle/mri/json.rb
@@ -0,0 +1 @@
+require_relative '../../stdlib/json'
diff --git a/lib/ruby/truffle/mri/json/add/bigdecimal.rb b/lib/ruby/truffle/mri/json/add/bigdecimal.rb
@@ -0,0 +1 @@
+require_relative '../../../../stdlib/json/add/' + File.basename(__FILE__)
diff --git a/lib/ruby/truffle/mri/json/add/complex.rb b/lib/ruby/truffle/mri/json/add/complex.rb
@@ -0,0 +1 @@
+require_relative '../../../../stdlib/json/add/' + File.basename(__FILE__)
diff --git a/lib/ruby/truffle/mri/json/add/core.rb b/lib/ruby/truffle/mri/json/add/core.rb
@@ -0,0 +1 @@
+require_relative '../../../../stdlib/json/add/' + File.basename(__FILE__)
diff --git a/lib/ruby/truffle/mri/json/add/date.rb b/lib/ruby/truffle/mri/json/add/date.rb
@@ -0,0 +1 @@
+require_relative '../../../../stdlib/json/add/' + File.basename(__FILE__)
diff --git a/lib/ruby/truffle/mri/json/add/date_time.rb b/lib/ruby/truffle/mri/json/add/date_time.rb
@@ -0,0 +1 @@
+require_relative '../../../../stdlib/json/add/' + File.basename(__FILE__)
diff --git a/lib/ruby/truffle/mri/json/add/exception.rb b/lib/ruby/truffle/mri/json/add/exception.rb
@@ -0,0 +1 @@
+require_relative '../../../../stdlib/json/add/' + File.basename(__FILE__)
diff --git a/lib/ruby/truffle/mri/json/add/ostruct.rb b/lib/ruby/truffle/mri/json/add/ostruct.rb
@@ -0,0 +1 @@
+require_relative '../../../../stdlib/json/add/' + File.basename(__FILE__)
diff --git a/lib/ruby/truffle/mri/json/add/range.rb b/lib/ruby/truffle/mri/json/add/range.rb
@@ -0,0 +1 @@
+require_relative '../../../../stdlib/json/add/' + File.basename(__FILE__)
diff --git a/lib/ruby/truffle/mri/json/add/rational.rb b/lib/ruby/truffle/mri/json/add/rational.rb
@@ -0,0 +1 @@
+require_relative '../../../../stdlib/json/add/' + File.basename(__FILE__)
diff --git a/lib/ruby/truffle/mri/json/add/regexp.rb b/lib/ruby/truffle/mri/json/add/regexp.rb
@@ -0,0 +1 @@
+require_relative '../../../../stdlib/json/add/' + File.basename(__FILE__)
diff --git a/lib/ruby/truffle/mri/json/add/struct.rb b/lib/ruby/truffle/mri/json/add/struct.rb
@@ -0,0 +1 @@
+require_relative '../../../../stdlib/json/add/' + File.basename(__FILE__)
diff --git a/lib/ruby/truffle/mri/json/add/symbol.rb b/lib/ruby/truffle/mri/json/add/symbol.rb
@@ -0,0 +1 @@
+require_relative '../../../../stdlib/json/add/' + File.basename(__FILE__)
diff --git a/lib/ruby/truffle/mri/json/add/time.rb b/lib/ruby/truffle/mri/json/add/time.rb
@@ -0,0 +1 @@
+require_relative '../../../../stdlib/json/add/' + File.basename(__FILE__)
diff --git a/lib/ruby/truffle/mri/json/common.rb b/lib/ruby/truffle/mri/json/common.rb
@@ -0,0 +1 @@
+require_relative '../../../stdlib/json/' + File.basename(__FILE__)
diff --git a/lib/ruby/truffle/mri/json/ext.rb b/lib/ruby/truffle/mri/json/ext.rb
@@ -0,0 +1 @@
+require_relative '../../../stdlib/json/' + File.basename(__FILE__)
diff --git a/lib/ruby/truffle/mri/json/generic_object.rb b/lib/ruby/truffle/mri/json/generic_object.rb
@@ -0,0 +1 @@
+require_relative '../../../stdlib/json/' + File.basename(__FILE__)
diff --git a/lib/ruby/truffle/mri/json/pure.rb b/lib/ruby/truffle/mri/json/pure.rb
@@ -0,0 +1 @@
+require_relative '../../../stdlib/json/' + File.basename(__FILE__)
diff --git a/lib/ruby/truffle/mri/json/pure/generator.rb b/lib/ruby/truffle/mri/json/pure/generator.rb
@@ -0,0 +1 @@
+require_relative '../../../../stdlib/json/pure/' + File.basename(__FILE__)
diff --git a/lib/ruby/truffle/mri/json/pure/parser.rb b/lib/ruby/truffle/mri/json/pure/parser.rb
@@ -0,0 +1 @@
+require_relative '../../../../stdlib/json/pure/' + File.basename(__FILE__)
diff --git a/lib/ruby/truffle/mri/json/version.rb b/lib/ruby/truffle/mri/json/version.rb
@@ -0,0 +1 @@
+require_relative '../../../stdlib/json/' + File.basename(__FILE__)
diff --git a/test/mri/excludes_truffle/TestJSON.rb b/test/mri/excludes_truffle/TestJSON.rb
@@ -0,0 +1,3 @@
+exclude :test_big_integers, "needs investigation"
+exclude :test_load, "needs investigation"
+exclude :test_parse_json_primitive_values, "needs investigation"
diff --git a/test/mri/excludes_truffle/TestJSONEncoding.rb b/test/mri/excludes_truffle/TestJSONEncoding.rb
@@ -0,0 +1 @@
+exclude :test_generate, "needs investigation"
diff --git a/test/mri/excludes_truffle/TestJSONGenerate.rb b/test/mri/excludes_truffle/TestJSONGenerate.rb
@@ -0,0 +1,2 @@
+exclude :test_json_generate, "needs investigation"
+exclude :test_gc, "needs investigation"
diff --git a/test/mri/excludes_truffle/TestJSONStringMatching.rb b/test/mri/excludes_truffle/TestJSONStringMatching.rb
@@ -0,0 +1 @@
+exclude :test_match_date, "needs investigation"
diff --git a/test/mri/excludes_truffle/TestJSONUnicode.rb b/test/mri/excludes_truffle/TestJSONUnicode.rb
@@ -0,0 +1,2 @@
+exclude :test_chars, "needs investigation"
+exclude :test_unicode, "needs investigation"
diff --git a/test/mri_truffle.index b/test/mri_truffle.index
@@ -46,13 +46,13 @@ fileutils/test_verbose.rb
 io/console/test_io_console.rb
 # io/nonblock/test_flush.rb
 # io/wait/test_io_wait.rb
-# json/test_json.rb
-# json/test_json_addition.rb
-# json/test_json_encoding.rb
-# json/test_json_fixtures.rb
-# json/test_json_generate.rb
-# json/test_json_generic_object.rb
-# json/test_json_string_matching.rb
+json/test_json.rb
+# json/test_json_addition.rb #  cannot load such file -- bigdecimal
+json/test_json_encoding.rb
+json/test_json_fixtures.rb
+json/test_json_generate.rb
+json/test_json_generic_object.rb
+json/test_json_string_matching.rb
 # json/test_json_unicode.rb
 # logger/test_logger.rb # library not added, needs file
 matrix/test_matrix.rb

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
@@ -1054,7 +1054,7 @@ public RubyString stringResizeCapacity(RubyString string, int capacity) {
 
     }
 
-    @RubiniusPrimitive(name = "string_rindex")
+    @RubiniusPrimitive(name = "string_rindex", lowerFixnumParameters = 1)
     public static abstract class StringRindexPrimitiveNode extends RubiniusPrimitiveNode {
 
         public StringRindexPrimitiveNode(RubyContext context, SourceSection sourceSection) {