refactoring

Author: timfel

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/frame/AccessNameNode.java

@@ -0,0 +1,59 @@
+/*
+ * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * The Universal Permissive License (UPL), Version 1.0
+ *
+ * Subject to the condition set forth below, permission is hereby granted to any
+ * person obtaining a copy of this software, associated documentation and/or
+ * data (collectively the "Software"), free of charge and under any and all
+ * copyright rights in the Software, and any and all patent rights owned or
+ * freely licensable by each licensor hereunder covering either (i) the
+ * unmodified Software as contributed to or provided by such licensor, or (ii)
+ * the Larger Works (as defined below), to deal in both
+ *
+ * (a) the Software, and
+ *
+ * (b) any piece of software and/or hardware listed in the lrgrwrks.txt file if
+ * one is included with the Software each a "Larger Work" to which the Software
+ * is contributed by such licensors),
+ *
+ * without restriction, including without limitation the rights to copy, create
+ * derivative works of, display, perform, and distribute the Software and make,
+ * use, sell, offer for sale, import, export, have made, and have sold the
+ * Software and the Larger Work(s), and to sublicense the foregoing rights on
+ * either these or other terms.
+ *
+ * This license is subject to the following condition:
+ *
+ * The above copyright notice and either this complete permission notice or at a
+ * minimum a reference to the UPL must be included in all copies or substantial
+ * portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+package com.oracle.graal.python.nodes.frame;
+
+import com.oracle.graal.python.builtins.objects.dict.PDict;
+import com.oracle.graal.python.builtins.objects.function.PArguments;
+import com.oracle.truffle.api.frame.VirtualFrame;
+
+public interface AccessNameNode {
+    default boolean hasLocals(VirtualFrame frame) {
+        // (tfel): These nodes will only ever be generated in a module scope where
+        // neither generator special args nor a ClassBodyRootNode can occur
+        return PArguments.getSpecialArgument(frame) != null;
+    }
+
+    default boolean hasLocalsDict(VirtualFrame frame) {
+        return PArguments.getSpecialArgument(frame) instanceof PDict;
+    }
+
+    public abstract String getAttributeId();
+}

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/frame/DeleteNameNode.java

@@ -53,7 +53,7 @@
 import com.oracle.truffle.api.dsl.Specialization;
 import com.oracle.truffle.api.frame.VirtualFrame;
 
-public abstract class DeleteNameNode extends StatementNode {
+public abstract class DeleteNameNode extends StatementNode implements AccessNameNode {
     @Child private DeleteGlobalNode deleteGlobalNode;
     protected final IsBuiltinClassProfile keyError = IsBuiltinClassProfile.create();
     protected final String attributeId;
@@ -66,17 +66,6 @@ public static DeleteNameNode create(String attributeId) {
         return DeleteNameNodeGen.create(attributeId);
     }
 
-    protected boolean hasLocals(VirtualFrame frame) {
-        // (tfel): This node will only ever be generated in a module scope
-        // where neither generator special args nor a ClassBodyRootNode can
-        // occur
-        return PArguments.getSpecialArgument(frame) != null;
-    }
-
-    protected boolean hasLocalsDict(VirtualFrame frame) {
-        return PArguments.getSpecialArgument(frame) instanceof PDict;
-    }
-
     private DeleteGlobalNode getDeleteGlobalNode() {
         if (deleteGlobalNode == null) {
             CompilerDirectives.transferToInterpreterAndInvalidate();
@@ -114,4 +103,8 @@ protected void readFromLocals(VirtualFrame frame,
     protected void readFromLocals(VirtualFrame frame) {
         getDeleteGlobalNode().executeVoid(frame);
     }
+
+    public String getAttributeId() {
+        return attributeId;
+    }
 }

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/frame/ReadNameNode.java

@@ -54,7 +54,7 @@
 import com.oracle.truffle.api.dsl.Specialization;
 import com.oracle.truffle.api.frame.VirtualFrame;
 
-public abstract class ReadNameNode extends ExpressionNode implements ReadNode {
+public abstract class ReadNameNode extends ExpressionNode implements ReadNode, AccessNameNode {
     @Child private ReadGlobalOrBuiltinNode readGlobalNode;
     protected final IsBuiltinClassProfile keyError = IsBuiltinClassProfile.create();
     protected final String attributeId;
@@ -67,17 +67,6 @@ public static ReadNameNode create(String attributeId) {
         return ReadNameNodeGen.create(attributeId);
     }
 
-    protected boolean hasLocals(VirtualFrame frame) {
-        // (tfel): This node will only ever be generated in a module scope
-        // where neither generator special args nor a ClassBodyRootNode can
-        // occur
-        return PArguments.getSpecialArgument(frame) != null;
-    }
-
-    protected boolean hasLocalsDict(VirtualFrame frame) {
-        return PArguments.getSpecialArgument(frame) instanceof PDict;
-    }
-
     private ReadGlobalOrBuiltinNode getReadGlobalNode() {
         if (readGlobalNode == null) {
             CompilerDirectives.transferToInterpreterAndInvalidate();

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/frame/WriteNameNode.java

@@ -52,7 +52,7 @@
 import com.oracle.truffle.api.frame.VirtualFrame;
 
 @NodeChild(value = "rhs", type = ExpressionNode.class)
-public abstract class WriteNameNode extends StatementNode implements WriteNode {
+public abstract class WriteNameNode extends StatementNode implements WriteNode, AccessNameNode {
     protected final String attributeId;
 
     protected WriteNameNode(String attributeId) {
@@ -63,17 +63,6 @@ public static WriteNameNode create(String attributeId, ExpressionNode rhs) {
         return WriteNameNodeGen.create(attributeId, rhs);
     }
 
-    protected boolean hasLocals(VirtualFrame frame) {
-        // (tfel): This node will only ever be generated in a module scope
-        // where neither generator special args nor a ClassBodyRootNode can
-        // occur
-        return PArguments.getSpecialArgument(frame) != null;
-    }
-
-    protected boolean hasLocalsDict(VirtualFrame frame) {
-        return PArguments.getSpecialArgument(frame) instanceof PDict;
-    }
-
     @Specialization(guards = "hasLocalsDict(frame)")
     protected void writeLocalsDict(VirtualFrame frame, Object value,
                     @Cached("create()") HashingCollectionNodes.SetItemNode setItem) {
@@ -124,8 +113,7 @@ public void doWrite(VirtualFrame frame, Object value) {
 
     public abstract void executeWithValue(VirtualFrame frame, Object value);
 
-    public Object getAttributeId() {
+    public String getAttributeId() {
         return attributeId;
     }
-
 }