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

Commits on Aug 24, 2016

  1. Copy the full SHA
    78ea0a3 View commit details
  2. Copy the full SHA
    8d67e27 View commit details
Original file line number Diff line number Diff line change
@@ -363,7 +363,11 @@ private boolean lastCallWasSuper(FrameInstance callerFrame) {
*/
private boolean lastCallWasCallingPrivateMethod(Object self, String name) {
final InternalMethod method = ModuleOperations.lookupMethod(coreLibrary().getMetaClass(self), name);
return method != null && !method.isUndefined();
if (method != null && !method.isUndefined()) {
assert method.getVisibility().isPrivate() || method.getVisibility().isProtected();
return true;
}
return false;
}

private boolean lastCallWasVCall(FrameInstance callerFrame) {
Original file line number Diff line number Diff line change
@@ -136,7 +136,7 @@ public Object mul(

}

@CoreMethod(names = {"/", "__slash__"}, required = 1)
@CoreMethod(names = { "/", "div", "__slash__" }, required = 1)
public abstract static class DivNode extends BignumCoreMethodNode {

@TruffleBoundary
Original file line number Diff line number Diff line change
@@ -237,7 +237,7 @@ public Object mulCoerced(
}
}

@CoreMethod(names = { "/", "__slash__" }, required = 1)
@CoreMethod(names = { "/", "div", "__slash__" }, required = 1)
public abstract static class DivNode extends CoreMethodArrayArgumentsNode {

private final BranchProfile bGreaterZero = BranchProfile.create();