Move IsNode to outer level

Author: msimacek

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/io/BufferedRWPairBuiltins.java

@@ -71,12 +71,12 @@
 import com.oracle.graal.python.builtins.objects.PNone;
 import com.oracle.graal.python.lib.PyObjectCallMethodObjArgs;
 import com.oracle.graal.python.lib.PyObjectGetAttr;
-import com.oracle.graal.python.nodes.expression.IsExpressionNode;
 import com.oracle.graal.python.nodes.function.PythonBuiltinBaseNode;
 import com.oracle.graal.python.nodes.function.builtins.PythonBinaryBuiltinNode;
 import com.oracle.graal.python.nodes.function.builtins.PythonQuaternaryClinicBuiltinNode;
 import com.oracle.graal.python.nodes.function.builtins.PythonUnaryBuiltinNode;
 import com.oracle.graal.python.nodes.function.builtins.clinic.ArgumentClinicProvider;
+import com.oracle.graal.python.nodes.object.IsNode;
 import com.oracle.graal.python.runtime.exception.PException;
 import com.oracle.truffle.api.dsl.Cached;
 import com.oracle.truffle.api.dsl.Fallback;
@@ -321,7 +321,7 @@ abstract static class IsAttyNode extends PythonUnaryBuiltinNode {
         Object doit(VirtualFrame frame, PRWPair self,
                         @Cached PyObjectCallMethodObjArgs callMethodWriter,
                         @Cached PyObjectCallMethodObjArgs callMethodReader,
-                        @Cached IsExpressionNode.IsNode isNode,
+                        @Cached IsNode isNode,
                         @Cached ConditionProfile isSameProfile) {
             Object res = callMethodWriter.execute(frame, self.getWriter(), ISATTY);
             if (isSameProfile.profile(isNode.isTrue(res))) {

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/io/IOBaseBuiltins.java

@@ -100,14 +100,14 @@
 import com.oracle.graal.python.nodes.attributes.SetAttributeNode;
 import com.oracle.graal.python.nodes.call.CallNode;
 import com.oracle.graal.python.nodes.control.GetNextNode;
-import com.oracle.graal.python.nodes.expression.IsExpressionNode;
 import com.oracle.graal.python.nodes.function.PythonBuiltinBaseNode;
 import com.oracle.graal.python.nodes.function.PythonBuiltinNode;
 import com.oracle.graal.python.nodes.function.builtins.PythonBinaryBuiltinNode;
 import com.oracle.graal.python.nodes.function.builtins.PythonBinaryClinicBuiltinNode;
 import com.oracle.graal.python.nodes.function.builtins.PythonUnaryBuiltinNode;
 import com.oracle.graal.python.nodes.function.builtins.clinic.ArgumentClinicProvider;
 import com.oracle.graal.python.nodes.object.IsBuiltinClassProfile;
+import com.oracle.graal.python.nodes.object.IsNode;
 import com.oracle.graal.python.runtime.exception.PException;
 import com.oracle.graal.python.util.ArrayBuilder;
 import com.oracle.truffle.api.dsl.Cached;
@@ -192,7 +192,7 @@ abstract static class CheckSeekableNode extends PythonUnaryBuiltinNode {
         @Specialization
         boolean doCheckSeekable(VirtualFrame frame, PythonObject self,
                         @Cached PyObjectCallMethodObjArgs callMethod,
-                        @Cached IsExpressionNode.IsNode isNode) {
+                        @Cached IsNode isNode) {
             Object v = callMethod.execute(frame, self, SEEKABLE);
             if (isNode.isTrue(v)) {
                 return true;
@@ -207,7 +207,7 @@ abstract static class CheckReadableNode extends PythonUnaryBuiltinNode {
         @Specialization
         boolean doCheckReadable(VirtualFrame frame, PythonObject self,
                         @Cached PyObjectCallMethodObjArgs callMethod,
-                        @Cached IsExpressionNode.IsNode isNode) {
+                        @Cached IsNode isNode) {
             Object v = callMethod.execute(frame, self, READABLE);
             if (isNode.isTrue(v)) {
                 return true;
@@ -222,7 +222,7 @@ abstract static class CheckWritableNode extends PythonUnaryBuiltinNode {
         @Specialization
         boolean doCheckWritable(VirtualFrame frame, PythonObject self,
                         @Cached PyObjectCallMethodObjArgs callMethod,
-                        @Cached IsExpressionNode.IsNode isNode) {
+                        @Cached IsNode isNode) {
             Object result = callMethod.execute(frame, self, WRITABLE);
             if (isNode.isTrue(result)) {
                 return true;

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/PythonAbstractObject.java

@@ -114,11 +114,11 @@
 import com.oracle.graal.python.nodes.call.special.CallVarargsMethodNode;
 import com.oracle.graal.python.nodes.classes.IsSubtypeNode;
 import com.oracle.graal.python.nodes.expression.CastToListExpressionNode.CastToListInteropNode;
-import com.oracle.graal.python.nodes.expression.IsExpressionNode.IsNode;
 import com.oracle.graal.python.nodes.interop.PForeignToPTypeNode;
 import com.oracle.graal.python.nodes.object.GetClassNode;
 import com.oracle.graal.python.nodes.object.GetDictIfExistsNode;
 import com.oracle.graal.python.nodes.object.IsBuiltinClassProfile;
+import com.oracle.graal.python.nodes.object.IsNode;
 import com.oracle.graal.python.nodes.util.CannotCastException;
 import com.oracle.graal.python.nodes.util.CastToJavaIntExactNode;
 import com.oracle.graal.python.nodes.util.CastToJavaStringNode;

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/cext/hpy/GraalHPyContextFunctions.java

@@ -156,11 +156,11 @@
 import com.oracle.graal.python.nodes.classes.IsSubtypeNode;
 import com.oracle.graal.python.nodes.expression.BinaryArithmetic;
 import com.oracle.graal.python.nodes.expression.InplaceArithmetic;
-import com.oracle.graal.python.nodes.expression.IsExpressionNode.IsNode;
 import com.oracle.graal.python.nodes.expression.TernaryArithmetic;
 import com.oracle.graal.python.nodes.expression.UnaryArithmetic;
 import com.oracle.graal.python.nodes.object.GetClassNode;
 import com.oracle.graal.python.nodes.object.IsBuiltinClassProfile;
+import com.oracle.graal.python.nodes.object.IsNode;
 import com.oracle.graal.python.nodes.statement.AbstractImportNode;
 import com.oracle.graal.python.nodes.util.CannotCastException;
 import com.oracle.graal.python.nodes.util.CastToJavaIntExactNode;

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/object/ObjectBuiltins.java

@@ -102,7 +102,6 @@
 import com.oracle.graal.python.nodes.expression.BinaryComparisonNode;
 import com.oracle.graal.python.nodes.expression.CoerceToBooleanNode;
 import com.oracle.graal.python.nodes.expression.ExpressionNode;
-import com.oracle.graal.python.nodes.expression.IsExpressionNode.IsNode;
 import com.oracle.graal.python.nodes.function.PythonBuiltinBaseNode;
 import com.oracle.graal.python.nodes.function.PythonBuiltinNode;
 import com.oracle.graal.python.nodes.function.builtins.PythonBinaryBuiltinNode;
@@ -117,6 +116,7 @@
 import com.oracle.graal.python.nodes.object.GetDictIfExistsNode;
 import com.oracle.graal.python.nodes.object.GetOrCreateDictNode;
 import com.oracle.graal.python.nodes.object.IsBuiltinClassProfile;
+import com.oracle.graal.python.nodes.object.IsNode;
 import com.oracle.graal.python.nodes.object.SetDictNode;
 import com.oracle.graal.python.nodes.util.CannotCastException;
 import com.oracle.graal.python.nodes.util.CastToJavaStringNode;

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/type/PythonBuiltinClass.java

@@ -34,9 +34,9 @@
 import com.oracle.graal.python.nodes.PGuards;
 import com.oracle.graal.python.nodes.PRaiseNode;
 import com.oracle.graal.python.nodes.classes.IsSubtypeNode;
-import com.oracle.graal.python.nodes.expression.IsExpressionNode;
 import com.oracle.graal.python.nodes.interop.PForeignToPTypeNode;
 import com.oracle.graal.python.nodes.object.GetClassNode;
+import com.oracle.graal.python.nodes.object.IsNode;
 import com.oracle.graal.python.runtime.GilNode;
 import com.oracle.graal.python.runtime.PythonContext;
 import com.oracle.truffle.api.CompilerAsserts;
@@ -158,7 +158,7 @@ static TriState doPBCT(PythonBuiltinClass self, PythonBuiltinClassType other) {
         static TriState doOther(PythonBuiltinClass self, Object other,
                         @Shared("convert") @Cached PForeignToPTypeNode convert,
                         @CachedLibrary(limit = "3") InteropLibrary otherLib,
-                        @Cached IsExpressionNode.IsNode isNode,
+                        @Cached IsNode isNode,
                         @Exclusive @Cached GilNode gil) {
             return self.isIdenticalOrUndefined(other, convert, otherLib, isNode, gil);
         }

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/lib/PyObjectRichCompareBool.java

@@ -54,8 +54,8 @@
 import com.oracle.graal.python.nodes.call.special.CallBinaryMethodNode;
 import com.oracle.graal.python.nodes.call.special.LookupSpecialMethodSlotNode;
 import com.oracle.graal.python.nodes.classes.IsSubtypeNode;
-import com.oracle.graal.python.nodes.expression.IsExpressionNode;
 import com.oracle.graal.python.nodes.object.GetClassNode;
+import com.oracle.graal.python.nodes.object.IsNode;
 import com.oracle.graal.python.runtime.exception.PException;
 import com.oracle.graal.python.util.OverflowException;
 import com.oracle.truffle.api.CompilerDirectives;
@@ -242,7 +242,7 @@ boolean doSS(String a, String b) {
 
         @Specialization
         boolean doGeneric(VirtualFrame frame, Object a, Object b,
-                        @Cached IsExpressionNode.IsNode isNode,
+                        @Cached IsNode isNode,
                         @Cached GetClassNode getClassA,
                         @Cached GetClassNode getClassB,
                         @Cached ConditionProfile reversedFirst,

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/PGuards.java

@@ -392,8 +392,8 @@ public static boolean isPInt(Object obj) {
 
     public static boolean isBuiltinPInt(PInt obj) {
         /*
-         * long's __class__ cannot be reassigned and other objects cannot have their class assigned
-         * to builtin dict, so it is enough to look at the initial class. PInt constructor ensures
+         * int's __class__ cannot be reassigned and other objects cannot have their class assigned
+         * to builtin int, so it is enough to look at the initial class. PInt constructor ensures
          * that it cannot be PythonBuiltinClass.
          */
         return obj.getInitialPythonClass() == PythonBuiltinClassType.PInt;

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/expression/BinaryComparisonNode.java

@@ -44,8 +44,7 @@
 import com.oracle.graal.python.nodes.expression.BinaryComparisonNodeFactory.LeNodeGen;
 import com.oracle.graal.python.nodes.expression.BinaryComparisonNodeFactory.LtNodeGen;
 import com.oracle.graal.python.nodes.expression.BinaryComparisonNodeFactory.NeNodeGen;
-import com.oracle.graal.python.nodes.expression.IsExpressionNode.IsNode;
-import com.oracle.graal.python.nodes.expression.IsExpressionNodeGen.IsNodeGen;
+import com.oracle.graal.python.nodes.object.IsNode;
 import com.oracle.graal.python.nodes.truffle.PythonArithmeticTypes;
 import com.oracle.truffle.api.CompilerDirectives;
 import com.oracle.truffle.api.dsl.Cached;
@@ -77,7 +76,7 @@ private abstract static class FallbackNode extends BinaryComparisonNode {
         protected final IsNode ensureIsNode() {
             if (isNode == null) {
                 CompilerDirectives.transferToInterpreterAndInvalidate();
-                isNode = insert(IsNodeGen.create());
+                isNode = insert(IsNode.create());
             }
             return isNode;
         }