Skip to content
Snippets Groups Projects
Commit ffc57072 authored by Florian Angerer's avatar Florian Angerer
Browse files

Cleanup

parent 491edc7d
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/builtin/base/infix/SpecialsUtils.java
+ 3
− 24
View file @ ffc57072
......@@ -37,12 +37,9 @@ import com.oracle.truffle.r.nodes.attributes.SpecialAttributesFunctions.GetDimAt
import com.oracle.truffle.r.nodes.attributes.SpecialAttributesFunctions.GetNamesAttributeNode;
import com.oracle.truffle.r.nodes.builtin.base.infix.SpecialsUtilsFactory.ConvertIndexNodeGen;
import com.oracle.truffle.r.nodes.builtin.base.infix.SpecialsUtilsFactory.ConvertValueNodeGen;
import com.oracle.truffle.r.nodes.builtin.base.infix.SpecialsUtilsFactory.ProfiledSubscriptSpecial2NodeGen;
import com.oracle.truffle.r.nodes.builtin.base.infix.SpecialsUtilsFactory.ProfiledSubscriptSpecialNodeGen;
import com.oracle.truffle.r.nodes.builtin.base.infix.SpecialsUtilsFactory.ProfiledSubsetSpecial2NodeGen;
import com.oracle.truffle.r.nodes.builtin.base.infix.SpecialsUtilsFactory.ProfiledSubsetSpecialNodeGen;
import com.oracle.truffle.r.nodes.function.ClassHierarchyNode;
import com.oracle.truffle.r.runtime.ArgumentsSignature;
import com.oracle.truffle.r.runtime.RInternalError;
import com.oracle.truffle.r.runtime.data.RDoubleVector;
import com.oracle.truffle.r.runtime.data.RIntVector;
import com.oracle.truffle.r.runtime.data.RList;
......@@ -83,7 +80,7 @@ class SpecialsUtils {
}
protected SubscriptSpecialBase createAccessNode() {
return null;
throw RInternalError.shouldNotReachHere();
}
@Specialization(limit = "CACHE_LIMIT", guards = "vector.getClass() == clazz")
......@@ -111,11 +108,6 @@ class SpecialsUtils {
protected SubscriptSpecialBase createAccessNode() {
return SubscriptSpecialNodeGen.create(inReplacement);
}
public static ProfiledSubscriptSpecial create(boolean inReplacement, SubscriptSpecial accessNode, RNode vectorNode, ConvertIndex indexNode) {
return ProfiledSubscriptSpecialNodeGen.create(inReplacement, accessNode, vectorNode, indexNode);
}
}
public abstract static class ProfiledSubsetSpecial extends ProfiledSubscriptSpecialBase {
......@@ -130,11 +122,6 @@ class SpecialsUtils {
protected SubscriptSpecialBase createAccessNode() {
return SubsetSpecialNodeGen.create(inReplacement);
}
public static ProfiledSubsetSpecial create(boolean inReplacement, SubsetSpecial accessNode, RNode vectorNode, ConvertIndex indexNode) {
return ProfiledSubsetSpecialNodeGen.create(inReplacement, accessNode, vectorNode, indexNode);
}
}
@NodeChild(value = "vector", type = RNode.class)
......@@ -151,7 +138,7 @@ class SpecialsUtils {
}
protected SubscriptSpecial2Base createAccessNode() {
return null;
throw RInternalError.shouldNotReachHere();
}
@Specialization(limit = "CACHE_LIMIT", guards = "vector.getClass() == clazz")
......@@ -181,10 +168,6 @@ class SpecialsUtils {
protected SubscriptSpecial2Base createAccessNode() {
return SubscriptSpecial2NodeGen.create(inReplacement);
}
public static ProfiledSubscriptSpecial2 create(boolean inReplacement, SubscriptSpecial2 accessNode, RNode vectorNode, ConvertIndex indexNode1, ConvertIndex indexNode2) {
return ProfiledSubscriptSpecial2NodeGen.create(inReplacement, accessNode, vectorNode, indexNode1, indexNode2);
}
}
public abstract static class ProfiledSubsetSpecial2 extends ProfiledSubscriptSpecial2Base {
......@@ -199,10 +182,6 @@ class SpecialsUtils {
protected SubscriptSpecial2Base createAccessNode() {
return SubsetSpecial2NodeGen.create(inReplacement);
}
public static ProfiledSubsetSpecial2 create(boolean inReplacement, SubsetSpecial2 accessNode, RNode vectorNode, ConvertIndex indexNode1, ConvertIndex indexNode2) {
return ProfiledSubsetSpecial2NodeGen.create(inReplacement, accessNode, vectorNode, indexNode1, indexNode2);
}
}
/**
......
com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/builtin/base/infix/Subscript.java
+ 4
− 4
View file @ ffc57072
......@@ -37,10 +37,10 @@ import com.oracle.truffle.r.nodes.access.vector.ExtractListElement;
import com.oracle.truffle.r.nodes.access.vector.ExtractVectorNode;
import com.oracle.truffle.r.nodes.builtin.RBuiltinNode;
import com.oracle.truffle.r.nodes.builtin.base.infix.SpecialsUtils.ConvertIndex;
import com.oracle.truffle.r.nodes.builtin.base.infix.SpecialsUtils.ProfiledSubscriptSpecial;
import com.oracle.truffle.r.nodes.builtin.base.infix.SpecialsUtils.ProfiledSubscriptSpecial2;
import com.oracle.truffle.r.nodes.builtin.base.infix.SpecialsUtils.SubscriptSpecial2Common1;
import com.oracle.truffle.r.nodes.builtin.base.infix.SpecialsUtils.SubscriptSpecialCommon1;
import com.oracle.truffle.r.nodes.builtin.base.infix.SpecialsUtilsFactory.ProfiledSubscriptSpecial2NodeGen;
import com.oracle.truffle.r.nodes.builtin.base.infix.SpecialsUtilsFactory.ProfiledSubscriptSpecialNodeGen;
import com.oracle.truffle.r.nodes.function.ClassHierarchyNode;
import com.oracle.truffle.r.nodes.function.ClassHierarchyNodeGen;
import com.oracle.truffle.r.runtime.ArgumentsSignature;
......@@ -162,7 +162,7 @@ abstract class SubscriptSpecial extends SubscriptSpecialBase {
}
public static RNode create(boolean inReplacement, RNode profiledVector, ConvertIndex index) {
return ProfiledSubscriptSpecial.create(inReplacement, SubscriptSpecialNodeGen.create(inReplacement), profiledVector, index);
return ProfiledSubscriptSpecialNodeGen.create(inReplacement, profiledVector, index);
}
}
......@@ -179,7 +179,7 @@ abstract class SubscriptSpecial2 extends SubscriptSpecial2Base {
}
public static RNode create(boolean inReplacement, RNode vectorNode, ConvertIndex index1, ConvertIndex index2) {
return ProfiledSubscriptSpecial2.create(inReplacement, SubscriptSpecial2NodeGen.create(inReplacement), vectorNode, index1, index2);
return ProfiledSubscriptSpecial2NodeGen.create(inReplacement, vectorNode, index1, index2);
}
}
......
com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/builtin/base/infix/Subset.java
+ 4
− 4
View file @ ffc57072
......@@ -36,8 +36,8 @@ import com.oracle.truffle.r.nodes.access.vector.ExtractVectorNode;
import com.oracle.truffle.r.nodes.attributes.SpecialAttributesFunctions.GetNamesAttributeNode;
import com.oracle.truffle.r.nodes.builtin.RBuiltinNode;
import com.oracle.truffle.r.nodes.builtin.base.infix.SpecialsUtils.ConvertIndex;
import com.oracle.truffle.r.nodes.builtin.base.infix.SpecialsUtils.ProfiledSubsetSpecial;
import com.oracle.truffle.r.nodes.builtin.base.infix.SpecialsUtils.ProfiledSubsetSpecial2;
import com.oracle.truffle.r.nodes.builtin.base.infix.SpecialsUtilsFactory.ProfiledSubsetSpecial2NodeGen;
import com.oracle.truffle.r.nodes.builtin.base.infix.SpecialsUtilsFactory.ProfiledSubsetSpecialNodeGen;
import com.oracle.truffle.r.runtime.ArgumentsSignature;
import com.oracle.truffle.r.runtime.RRuntime;
import com.oracle.truffle.r.runtime.builtins.RBuiltin;
......@@ -84,7 +84,7 @@ abstract class SubsetSpecial extends SubscriptSpecialBase {
}
public static RNode create(boolean inReplacement, RNode vectorNode, ConvertIndex index) {
return ProfiledSubsetSpecial.create(inReplacement, null, vectorNode, index);
return ProfiledSubsetSpecialNodeGen.create(inReplacement, vectorNode, index);
}
}
......@@ -112,7 +112,7 @@ abstract class SubsetSpecial2 extends SubscriptSpecial2Base {
}
public static RNode create(boolean inReplacement, RNode vectorNode, ConvertIndex index1, ConvertIndex index2) {
return ProfiledSubsetSpecial2.create(inReplacement, null, vectorNode, index1, index2);
return ProfiledSubsetSpecial2NodeGen.create(inReplacement, vectorNode, index1, index2);
}
}
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment