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

Commits on Feb 8, 2015

  1. [Truffle] Make the ambiguous argument warning a hard error.

    @chrisseaton
    chrisseaton committed Feb 8, 2015
    4
    Copy the full SHA
    a75cdb9 View commit details

  2. [Truffle] Fix ambiguous argument in String#each_line

    @chrisseaton
    chrisseaton committed Feb 8, 2015
    1
    Copy the full SHA
    4724079 View commit details
2 changes: 1 addition & 1 deletion truffle/src/main/java/org/jruby/truffle/nodes/core/CoreMethodNodeManager.java
View file
Original file line number Diff line number Diff line change
@@ -231,7 +231,7 @@ private static boolean assertNoAmbiguousDefaultArguments(MethodDetails methodDet
}

if (undefined && object) {
System.out.println("Ambiguous default argument " + (argc - i) + " in " + node.getCanonicalName());
throw new RuntimeException("Ambiguous default argument " + (argc - i) + " in " + node.getCanonicalName());
}
}
}
2 changes: 1 addition & 1 deletion truffle/src/main/java/org/jruby/truffle/nodes/core/StringNodes.java
View file
Original file line number Diff line number Diff line change
@@ -766,7 +766,7 @@ public RubyArray eachLine(VirtualFrame frame, RubyString string, @SuppressWarnin
return eachLine(frame, string, recordSeparator);
}

@Specialization
@Specialization(guards = "!isUndefinedPlaceholder(arguments[1])")
public RubyArray eachLine(VirtualFrame frame, RubyString string, Object separator) {
notDesignedForCompilation();