Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: jruby/jruby
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 0a0adb6c7074
Choose a base ref
...
head repository: jruby/jruby
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 48f53df87d08
Choose a head ref
  • 2 commits
  • 2 files changed
  • 1 contributor

Commits on Sep 30, 2014

  1. [Truffle] Fix lexical parent of class singleton classes.

    @chrisseaton
    chrisseaton committed Sep 30, 2014
    Copy the full SHA
    c934ced View commit details

  2. [Truffle] We seem to be able to parse the anchors specs now.

    @chrisseaton
    chrisseaton committed Sep 30, 2014
    Copy the full SHA
    48f53df View commit details
Showing with 2 additions and 4 deletions.
  1. +1 −1 core/src/main/java/org/jruby/truffle/runtime/core/RubyClass.java
  2. +1 −3 spec/truffle/truffle.mspec
2 changes: 1 addition & 1 deletion core/src/main/java/org/jruby/truffle/runtime/core/RubyClass.java
View file
Original file line number Diff line number Diff line change
@@ -99,7 +99,7 @@ public RubyClass getSingletonClass(Node currentNode) {
singletonSuperclass = getSuperClass().getSingletonClass(currentNode);
}

metaClass = new RubyClass(currentNode, getParentModule(), singletonSuperclass, String.format("#<Class:%s>", getName()), true);
metaClass = new RubyClass(currentNode, getLexicalParentModule(), singletonSuperclass, String.format("#<Class:%s>", getName()), true);

return metaClass;
}
4 changes: 1 addition & 3 deletions spec/truffle/truffle.mspec
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,7 @@
class MSpecScript

set :language, [
"spec/ruby/language",
"^spec/ruby/language/regexp/anchors_spec.rb",
"^spec/ruby/language/super_spec.rb"
"spec/ruby/language"
]

set :core, [