Skip to content

Commit b493205

Browse files
committed
Revert "Merge 'isPythonInternal' and 'isInternal'."
This reverts commit 3b525ad0bbefbc1fe6929c22328bb19f82ccbb30.
1 parent ae7f56f commit b493205

File tree

9 files changed

+17
-10
lines changed

9 files changed

+17
-10
lines changed

graalpython/com.oracle.graal.python.test/src/com/oracle/graal/python/test/grammar/TestParserTranslator.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,7 @@ public Signature getSignature() {
156156
}
157157

158158
@Override
159-
public boolean isInternal() {
159+
public boolean isPythonInternal() {
160160
return false;
161161
}
162162

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/PythonCextBuiltins.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -807,7 +807,7 @@ public Signature getSignature() {
807807
}
808808

809809
@Override
810-
public boolean isInternal() {
810+
public boolean isPythonInternal() {
811811
// everything that is implemented in C is internal
812812
return true;
813813
}
@@ -1502,7 +1502,7 @@ public String toString() {
15021502
}
15031503

15041504
@Override
1505-
public boolean isInternal() {
1505+
public boolean isPythonInternal() {
15061506
return true;
15071507
}
15081508

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/code/CodeNodes.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,7 @@ public Signature getSignature() {
156156
}
157157

158158
@Override
159-
public boolean isInternal() {
159+
public boolean isPythonInternal() {
160160
return false;
161161
}
162162
});

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ public Signature getSignature() {
105105
}
106106

107107
@Override
108-
public boolean isInternal() {
108+
public boolean isPythonInternal() {
109109
return false;
110110
}
111111
}

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,8 +122,10 @@ public final Assumption getDontNeedExceptionState() {
122122
return dontNeedExceptionState;
123123
}
124124

125+
public abstract boolean isPythonInternal();
126+
125127
public static boolean isPythonInternal(RootNode rootNode) {
126-
return rootNode instanceof PRootNode && ((PRootNode) rootNode).isInternal();
128+
return rootNode instanceof PRootNode && ((PRootNode) rootNode).isPythonInternal();
127129
}
128130

129131
private static Assumption createCallerFrameAssumption() {

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@ public Frame visitFrame(FrameInstance frameInstance) {
153153
} else {
154154
// Skip frames of builtin functions (if requested) because these do not have
155155
// a Python frame in CPython.
156-
if (!(skipInternal && pRootNode.isInternal())) {
156+
if (!(skipInternal && pRootNode.isPythonInternal())) {
157157
if (i == level) {
158158
Frame frame = frameInstance.getFrame(frameAccess);
159159
assert PArguments.isPythonFrame(frame);

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/function/BuiltinFunctionRootNode.java

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -383,4 +383,9 @@ public boolean declaresExplicitSelf() {
383383
public Signature getSignature() {
384384
return signature;
385385
}
386+
387+
@Override
388+
public boolean isPythonInternal() {
389+
return true;
390+
}
386391
}

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/function/FunctionRootNode.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -178,7 +178,7 @@ public void initializeFrame(VirtualFrame frame) {
178178
}
179179

180180
@Override
181-
public boolean isInternal() {
181+
public boolean isPythonInternal() {
182182
return isRewritten;
183183
}
184184
}

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/generator/GeneratorFunctionRootNode.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -99,8 +99,8 @@ public void initializeFrame(VirtualFrame frame) {
9999
}
100100

101101
@Override
102-
public boolean isInternal() {
102+
public boolean isPythonInternal() {
103103
RootNode rootNode = callTarget.getRootNode();
104-
return rootNode instanceof PRootNode && ((PRootNode) rootNode).isInternal();
104+
return rootNode instanceof PRootNode && ((PRootNode) rootNode).isPythonInternal();
105105
}
106106
}

0 commit comments

Comments
 (0)