-
-
Notifications
You must be signed in to change notification settings - Fork 925
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #4025 from jruby/truffle-name-error-layout-with-re…
…ceiver [Truffle] Add NameError layout with receiver
- 9.4.12.0
- 9.4.11.0
- 9.4.10.0
- 9.4.9.0
- 9.4.8.0
- 9.4.7.0
- 9.4.6.0
- 9.4.5.0
- 9.4.4.0
- 9.4.3.0
- 9.4.2.0
- 9.4.1.0
- 9.4.0.0
- 9.3.15.0
- 9.3.14.0
- 9.3.13.0
- 9.3.12.0
- 9.3.11.0
- 9.3.10.0
- 9.3.9.0
- 9.3.8.0
- 9.3.7.0
- 9.3.6.0
- 9.3.5.0
- 9.3.4.0
- 9.3.3.0
- 9.3.2.0
- 9.3.1.0
- 9.3.0.0
- 9.2.21.0
- 9.2.20.1
- 9.2.20.0
- 9.2.19.0
- 9.2.18.0
- 9.2.17.0
- 9.2.16.0
- 9.2.15.0
- 9.2.14.0
- 9.2.13.0
- 9.2.12.0
- 9.2.11.1
- 9.2.11.0
- 9.2.10.0
- 9.2.9.0
- 9.2.8.0
- 9.2.7.0
- 9.2.6.0
- 9.2.5.0
- 9.2.4.1
- 9.2.4.0
- 9.2.3.0
- 9.2.2.0
- 9.2.1.0
- 9.2.0.0
- 9.1.17.0
- 9.1.16.0
- 9.1.15.0
- 9.1.14.0
- 9.1.13.0
- 9.1.12.0
- 9.1.11.0
- 9.1.10.0
- 9.1.9.0
- 9.1.8.0
- 9.1.7.0
- 9.1.6.0
- 9.1.5.0
- 9.1.4.0
- 9.1.3.0
Showing
17 changed files
with
195 additions
and
62 deletions.
There are no files selected for viewing
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
38 changes: 38 additions & 0 deletions
38
truffle/src/main/java/org/jruby/truffle/core/exception/NameErrorLayout.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,38 @@ | ||
/* | ||
* Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved. This | ||
* code is released under a tri EPL/GPL/LGPL license. You can use it, | ||
* redistribute it and/or modify it under the terms of the: | ||
* | ||
* Eclipse Public License version 1.0 | ||
* GNU General Public License version 2 | ||
* GNU Lesser General Public License version 2.1 | ||
*/ | ||
package org.jruby.truffle.core.exception; | ||
|
||
import com.oracle.truffle.api.object.DynamicObject; | ||
import com.oracle.truffle.api.object.DynamicObjectFactory; | ||
import com.oracle.truffle.api.object.dsl.Layout; | ||
import com.oracle.truffle.api.object.dsl.Nullable; | ||
import org.jruby.truffle.language.backtrace.Backtrace; | ||
|
||
@Layout | ||
public interface NameErrorLayout extends ExceptionLayout { | ||
|
||
DynamicObjectFactory createNameErrorShape( | ||
DynamicObject logicalClass, | ||
DynamicObject metaClass); | ||
|
||
DynamicObject createNameError( | ||
DynamicObjectFactory factory, | ||
Object message, | ||
@Nullable Backtrace backtrace, | ||
@Nullable Object receiver, | ||
Object name); | ||
|
||
Object getName(DynamicObject object); | ||
void setName(DynamicObject object, Object value); | ||
|
||
Object getReceiver(DynamicObject object); | ||
void setReceiver(DynamicObject object, Object value); | ||
|
||
} |
85 changes: 85 additions & 0 deletions
85
truffle/src/main/java/org/jruby/truffle/core/exception/NameErrorNodes.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,85 @@ | ||
/* | ||
* Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved. This | ||
* code is released under a tri EPL/GPL/LGPL license. You can use it, | ||
* redistribute it and/or modify it under the terms of the: | ||
* | ||
* Eclipse Public License version 1.0 | ||
* GNU General Public License version 2 | ||
* GNU Lesser General Public License version 2.1 | ||
*/ | ||
package org.jruby.truffle.core.exception; | ||
|
||
import com.oracle.truffle.api.dsl.Specialization; | ||
import com.oracle.truffle.api.object.DynamicObject; | ||
import com.oracle.truffle.api.source.SourceSection; | ||
import org.jruby.truffle.Layouts; | ||
import org.jruby.truffle.RubyContext; | ||
import org.jruby.truffle.builtins.CoreClass; | ||
import org.jruby.truffle.builtins.CoreMethod; | ||
import org.jruby.truffle.builtins.CoreMethodArrayArgumentsNode; | ||
import org.jruby.truffle.builtins.Primitive; | ||
import org.jruby.truffle.builtins.PrimitiveArrayArgumentsNode; | ||
import org.jruby.truffle.language.control.RaiseException; | ||
import org.jruby.truffle.language.objects.AllocateObjectNode; | ||
import org.jruby.truffle.language.objects.AllocateObjectNodeGen; | ||
|
||
@CoreClass("NameError") | ||
public abstract class NameErrorNodes { | ||
|
||
@CoreMethod(names = "allocate", constructor = true) | ||
public abstract static class AllocateNode extends CoreMethodArrayArgumentsNode { | ||
|
||
@Child private AllocateObjectNode allocateObjectNode; | ||
|
||
public AllocateNode(RubyContext context, SourceSection sourceSection) { | ||
super(context, sourceSection); | ||
allocateObjectNode = AllocateObjectNodeGen.create(context, sourceSection, null, null); | ||
} | ||
|
||
@Specialization | ||
public DynamicObject allocateNameError(DynamicObject rubyClass) { | ||
return allocateObjectNode.allocate(rubyClass, nil(), null, null, nil()); | ||
} | ||
|
||
} | ||
|
||
@CoreMethod(names = "name") | ||
public abstract static class NameNode extends CoreMethodArrayArgumentsNode { | ||
|
||
@Specialization | ||
public Object name(DynamicObject self) { | ||
return Layouts.NAME_ERROR.getName(self); | ||
} | ||
|
||
} | ||
|
||
@CoreMethod(names = "receiver") | ||
public abstract static class ReceiverNode extends CoreMethodArrayArgumentsNode { | ||
|
||
@Specialization | ||
public Object receiver(DynamicObject self) { | ||
final Object receiver = Layouts.NAME_ERROR.getReceiver(self); | ||
|
||
// TODO BJF July 21, 2016 Implement name error in message field | ||
|
||
if (receiver == null) { | ||
throw new RaiseException(coreExceptions().argumentErrorNoReceiver(this)); | ||
} | ||
return receiver; | ||
} | ||
|
||
} | ||
|
||
@Primitive(name = "name_error_set_name") | ||
public abstract static class NameSetNode extends PrimitiveArrayArgumentsNode { | ||
|
||
@Specialization | ||
public Object setName(DynamicObject error, Object name) { | ||
Layouts.NAME_ERROR.setName(error, name); | ||
return name; | ||
} | ||
|
||
} | ||
|
||
|
||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters