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: bca32432979e
Choose a base ref
...
head repository: jruby/jruby
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 7b43d87f47b3
Choose a head ref
  • 3 commits
  • 3 files changed
  • 1 contributor

Commits on Aug 28, 2015

  1. [Truffle] Fix Class#superclass with prepend.

    @eregon
    eregon committed Aug 28, 2015
    Copy the full SHA
    c071bf6 View commit details

  2. [Truffle] Follow spec rename for String#encode{,!}

    @eregon
    eregon committed Aug 28, 2015
    Copy the full SHA
    e9a6dd7 View commit details

  3. [Truffle] Tag new failing spec.

    @eregon
    eregon committed Aug 28, 2015
    Copy the full SHA
    7b43d87 View commit details
8 changes: 4 additions & 4 deletions spec/truffle/tags/core/string/encode_tags.txt
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
fails(inherited - rubinius):String#encode given the :xml => :text option replaces undefined characters with their upper-case hexadecimal numeric character references
fails(inherited - rubinius):String#encode given the :xml => :attr option replaces undefined characters with their upper-case hexadecimal numeric character references
fails(inherited - rubinius):String#encode! given the :xml => :text option replaces undefined characters with their upper-case hexadecimal numeric character references
fails(inherited - rubinius):String#encode! given the :xml => :attr option replaces undefined characters with their upper-case hexadecimal numeric character references
fails(inherited - rubinius):String#encode given the xml: :text option replaces undefined characters with their upper-case hexadecimal numeric character references
fails(inherited - rubinius):String#encode given the xml: :attr option replaces undefined characters with their upper-case hexadecimal numeric character references
fails(inherited - rubinius):String#encode! given the xml: :text option replaces undefined characters with their upper-case hexadecimal numeric character references
fails(inherited - rubinius):String#encode! given the xml: :attr option replaces undefined characters with their upper-case hexadecimal numeric character references
fails:String#encode when passed options replaces invalid characters when replacing Emacs-Mule encoded strings
fails:String#encode! when passed options replaces invalid characters when replacing Emacs-Mule encoded strings
1 change: 1 addition & 0 deletions spec/truffle/tags/core/string/split_tags.txt
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
fails:String#split with String when limit is zero ignores leading and continuous whitespace when string is a single space
2 changes: 1 addition & 1 deletion truffle/src/main/java/org/jruby/truffle/nodes/core/ClassNodes.java
View file
Original file line number Diff line number Diff line change
@@ -191,7 +191,7 @@ public static DynamicObject getSuperClass(DynamicObject rubyClass) {
CompilerAsserts.neverPartOfCompilation();

for (DynamicObject ancestor : Layouts.MODULE.getFields(rubyClass).parentAncestors()) {
if (RubyGuards.isRubyClass(ancestor)) {
if (RubyGuards.isRubyClass(ancestor) && ancestor != rubyClass) {
return ancestor;
}
}