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

Commits on Oct 7, 2014

  1. [Truffle] Rename a couple variable in RubyModule for clarity.

    @eregon
    eregon committed Oct 7, 2014
    Copy the full SHA
    2f874ed View commit details

  2. [Truffle] Differentiate private method from missing method.

    @eregon
    eregon committed Oct 7, 2014
    Copy the full SHA
    3b72baf View commit details

  3. [Truffle] Kernel#puts should be private.

    @eregon
    eregon committed Oct 7, 2014
    Copy the full SHA
    110926f View commit details

  4. [Truffle] Fix typo.

    @eregon
    eregon committed Oct 7, 2014
    Copy the full SHA
    74921c2 View commit details
2 changes: 1 addition & 1 deletion core/src/main/java/org/jruby/truffle/nodes/core/BasicObjectNodes.java
View file
Original file line number Diff line number Diff line change
@@ -158,7 +158,7 @@ public InitializeNode(InitializeNode prev) {
}

@Specialization
public NilPlaceholder initiailze() {
public NilPlaceholder initialize() {
return NilPlaceholder.INSTANCE;
}

2 changes: 1 addition & 1 deletion core/src/main/java/org/jruby/truffle/nodes/dispatch/DispatchNode.java
View file
Original file line number Diff line number Diff line change
@@ -106,7 +106,7 @@ protected RubyMethod lookup(

if (!ignoreVisibility && !method.isVisibleTo(this, callingSelf, receiver)) {
if (dispatchAction == Dispatch.DispatchAction.CALL_METHOD) {
throw new RaiseException(getContext().getCoreLibrary().noMethodError(name, receiver.toString(), this));
throw new RaiseException(getContext().getCoreLibrary().privateMethodError(name, receiver.toString(), this));
} else if (dispatchAction == Dispatch.DispatchAction.RESPOND_TO_METHOD) {
return null;
} else {
4 changes: 4 additions & 0 deletions core/src/main/java/org/jruby/truffle/runtime/core/CoreLibrary.java
View file
Original file line number Diff line number Diff line change
@@ -487,6 +487,10 @@ public RubyException noMethodError(String name, String object, Node currentNode)
return noMethodError(String.format("undefined method `%s' for %s", name, object), currentNode);
}

public RubyException privateMethodError(String name, String object, Node currentNode) {
return noMethodError(String.format("private method `%s' called for %s", name, object), currentNode);
}

public RubyException loadError(String message, Node currentNode) {
return new RubyException(context.getCoreLibrary().getLoadErrorClass(), context.makeString(message), RubyCallStack.getBacktrace(currentNode));
}
8 changes: 4 additions & 4 deletions core/src/main/java/org/jruby/truffle/runtime/core/RubyClass.java
View file
Original file line number Diff line number Diff line change
@@ -46,8 +46,8 @@ public RubyBasicObject newInstance(RubyNode currentNode) {

}

public RubyClass(Node currentNode, RubyModule parentModule, RubyClass rubySuperclass, String name) {
this(currentNode, parentModule, rubySuperclass, name, false);
public RubyClass(Node currentNode, RubyModule lexcialParent, RubyClass rubySuperclass, String name) {
this(currentNode, lexcialParent, rubySuperclass, name, false);
}

public RubyClass(Node currentNode, ModuleChain lexicalParent, RubyClass superclass, String name, boolean isSingleton) {
@@ -65,8 +65,8 @@ public RubyClass(Node currentNode, ModuleChain lexicalParent, RubyClass supercla
* This constructor supports initialization and solves boot-order problems and should not
* normally be used from outside this class.
*/
public RubyClass(Node currentNode, RubyContext context, RubyClass classClass, ModuleChain parentModule, RubyClass superclass, String name) {
super(context, classClass, parentModule, name);
public RubyClass(Node currentNode, RubyContext context, RubyClass classClass, ModuleChain lexicalParent, RubyClass superclass, String name) {
super(context, classClass, lexicalParent, name);

if (superclass == null) {
objectLayoutForInstances = ObjectLayout.EMPTY;
1 change: 1 addition & 0 deletions core/src/main/ruby/jruby/truffle/core/kernel.rb
View file
Original file line number Diff line number Diff line change
@@ -20,5 +20,6 @@ def puts(*args)
end
end
end
private :puts

end