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

Commits on Mar 4, 2015

  1. [Truffle] Fix Time#+ enough to get benchmark-ips running again.

    @chrisseaton
    chrisseaton committed Mar 4, 2015
    Copy the full SHA
    bf85ff9 View commit details

  2. [Truffle] Fix %ns formatting.

    @chrisseaton
    chrisseaton committed Mar 4, 2015
    Copy the full SHA
    94b968c View commit details
5 changes: 3 additions & 2 deletions truffle/src/main/java/org/jruby/truffle/nodes/core/TimeNodes.java
View file
Original file line number Diff line number Diff line change
@@ -13,6 +13,7 @@
import com.oracle.truffle.api.source.SourceSection;
import org.joda.time.DateTimeZone;
import org.jruby.truffle.runtime.RubyContext;
import org.jruby.truffle.runtime.core.RubyNilClass;
import org.jruby.truffle.runtime.core.RubyTime;

@CoreClass(name = "Time")
@@ -65,8 +66,8 @@ public InternalOffsetNode(InternalOffsetNode prev) {
}

@Specialization
public Object internalOffset(RubyTime time) {
throw new UnsupportedOperationException("_offset");
public RubyNilClass internalOffset(RubyTime time) {
return getContext().getCoreLibrary().getNilObject();
}
}

3 changes: 1 addition & 2 deletions truffle/src/main/java/org/jruby/truffle/runtime/core/StringFormatter.java
View file
Original file line number Diff line number Diff line change
@@ -146,8 +146,7 @@ public static void format(RubyContext context, PrintStream stream, String format
}
case 's': {
formatBuilder.append("s");
assert formatBuilder.toString().equals("%s");
stream.print(DebugOperations.send(context, values.get(v), "to_s", null));
stream.printf(formatBuilder.toString(), DebugOperations.send(context, values.get(v), "to_s", null));
break;
}