Permalink
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Browse files
Merge branch 'master' into truffle-head
Conflicts: core/src/main/java/org/jruby/truffle/runtime/objectstorage/ObjectLayout.java core/src/main/java/org/jruby/truffle/runtime/objectstorage/ObjectStorage.java
- Loading branch information
Showing
with
401 additions
and 621 deletions.
- +10 −3 core/src/main/java/org/jruby/truffle/nodes/WriteConstantNode.java
- +19 −17 core/src/main/java/org/jruby/truffle/nodes/core/ArrayNodes.java
- +19 −1 core/src/main/java/org/jruby/truffle/nodes/core/ExceptionNodes.java
- +28 −4 core/src/main/java/org/jruby/truffle/nodes/core/HashNodes.java
- +17 −21 core/src/main/java/org/jruby/truffle/nodes/core/KernelNodes.java
- +71 −23 core/src/main/java/org/jruby/truffle/nodes/core/ModuleNodes.java
- +1 −1 core/src/main/java/org/jruby/truffle/runtime/core/CoreLibrary.java
- +1 −1 core/src/main/java/org/jruby/truffle/runtime/core/RubyClass.java
- +14 −7 core/src/main/java/org/jruby/truffle/runtime/core/RubyModule.java
- +1 −1 core/src/main/java/org/jruby/truffle/translator/BodyTranslator.java
- +8 −0 core/src/main/ruby/jruby/truffle/core.rb
- +9 −6 core/src/main/ruby/jruby/truffle/core/rubinius/README.md
- +33 −0 core/src/main/ruby/jruby/truffle/core/rubinius/api/shims/enumerator.rb
- +11 −0 core/src/main/ruby/jruby/truffle/core/rubinius/api/shims/lookuptable.rb
- +19 −0 core/src/main/ruby/jruby/truffle/core/rubinius/api/shims/thread.rb
- +25 −0 core/src/main/ruby/jruby/truffle/core/rubinius/api/shims/type.rb
- +23 −0 core/src/main/ruby/jruby/truffle/core/rubinius/api/shims/undefined.rb
- +57 −0 core/src/main/ruby/jruby/truffle/core/rubinius/kernel/common/array.rb
- +0 −498 core/src/main/ruby/jruby/truffle/core/rubinius/kernel/common/time.rb
- +33 −0 core/src/main/ruby/jruby/truffle/core/rubinius/kernel/common/undefined.rb
- +2 −0 spec/truffle/tags/core/kernel/eval_tags.txt
- +0 −2 spec/truffle/tags/core/struct/each_pair_tags.txt
- +0 −2 spec/truffle/tags/core/struct/each_tags.txt
- +0 −2 spec/truffle/tags/core/struct/element_reference_tags.txt
- +0 −1 spec/truffle/tags/core/struct/element_set_tags.txt
- +0 −4 spec/truffle/tags/core/struct/eql_tags.txt
- +0 −4 spec/truffle/tags/core/struct/equal_value_tags.txt
- +0 −3 spec/truffle/tags/core/struct/hash_tags.txt
- +0 −2 spec/truffle/tags/core/struct/initialize_tags.txt
- +0 −2 spec/truffle/tags/core/struct/inspect_tags.txt
- +0 −1 spec/truffle/tags/core/struct/instance_variables_tags.txt
- +0 −6 spec/truffle/tags/core/struct/new_tags.txt
- +0 −1 spec/truffle/tags/core/struct/select_tags.txt
- +0 −2 spec/truffle/tags/core/struct/struct_tags.txt
- +0 −2 spec/truffle/tags/core/struct/to_h_tags.txt
- +0 −2 spec/truffle/tags/core/struct/to_s_tags.txt
- +0 −2 spec/truffle/tags/core/struct/values_at_tags.txt
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
@@ -39,7 +39,7 @@ public RubyClassClass(RubyContext context) { | ||
|
||
@Override | ||
public RubyBasicObject newInstance(RubyNode currentNode) { | ||
return new RubyClass(getContext(), null, null, null, false); | ||
} | ||
|
||
} | ||
Oops, something went wrong.