Skip to content

Commit 3c05d2d

Browse files
committed
fix compilation problems
1 parent 2c5a029 commit 3c05d2d

File tree

4 files changed

+10
-9
lines changed

4 files changed

+10
-9
lines changed

graalpython/com.oracle.graal.python.test/src/com/oracle/graal/python/test/runtime/PythonModuleTests.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
import com.oracle.graal.python.builtins.objects.module.PythonModule;
4141
import com.oracle.graal.python.builtins.objects.type.PythonBuiltinClass;
4242
import com.oracle.graal.python.nodes.BuiltinNames;
43-
import com.oracle.graal.python.nodes.SpecialAttributeNames;
43+
import com.oracle.graal.python.nodes.SpecialMethodNames;
4444
import com.oracle.graal.python.nodes.call.CallNode;
4545
import com.oracle.graal.python.runtime.PythonContext;
4646
import com.oracle.graal.python.test.PythonTests;

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

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2788,18 +2788,21 @@ public Object dictKeys(Object args, Object kwargs) {
27882788
public abstract static class IteratorTypeNode extends PythonBuiltinNode {
27892789
@SuppressWarnings("unused")
27902790
@Specialization
2791-
public Object iterator(Object args, Object kwargs) {
2792-
throw raise(TypeError, ErrorMessages.CANNOT_CREATE_INSTANCES, "'iterator'");
2791+
Object iterator(Object args, Object kwargs) {
2792+
throw raise(TypeError, ErrorMessages.CANNOT_CREATE_INSTANCES, className());
2793+
}
2794+
2795+
protected String className() {
2796+
return "'iterator'";
27932797
}
27942798
}
27952799

27962800
@Builtin(name = "arrayiterator", takesVarArgs = true, takesVarKeywordArgs = true, constructsClass = PythonBuiltinClassType.PArrayIterator, isPublic = false)
27972801
@GenerateNodeFactory
27982802
public abstract static class ArrayIteratorTypeNode extends IteratorTypeNode {
2799-
@SuppressWarnings("unused")
2800-
@Specialization
2801-
public Object iterator(Object args, Object kwargs) {
2802-
throw raise(TypeError, ErrorMessages.CANNOT_CREATE_INSTANCES, "'arrayiterator'");
2803+
@Override
2804+
protected String className() {
2805+
return "'arrayiterator'";
28032806
}
28042807
}
28052808

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,6 @@
6969
import com.oracle.graal.python.builtins.PythonBuiltinClassType;
7070
import com.oracle.graal.python.builtins.PythonBuiltins;
7171
import com.oracle.graal.python.builtins.modules.BuiltinConstructors.IntNode;
72-
import com.oracle.graal.python.builtins.modules.BuiltinConstructorsFactory.IntNodeFactory;
7372
import com.oracle.graal.python.builtins.modules.ExternalFunctionNodes.AllocFuncRootNode;
7473
import com.oracle.graal.python.builtins.modules.ExternalFunctionNodes.GetAttrFuncRootNode;
7574
import com.oracle.graal.python.builtins.modules.ExternalFunctionNodes.MethDirectRoot;

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,6 @@
7171
import com.oracle.graal.python.builtins.objects.common.DynamicObjectStorage;
7272
import com.oracle.graal.python.builtins.objects.common.PHashingCollection;
7373
import com.oracle.graal.python.builtins.objects.dict.PDict;
74-
import com.oracle.graal.python.builtins.objects.function.PArguments;
7574
import com.oracle.graal.python.builtins.objects.function.PKeyword;
7675
import com.oracle.graal.python.builtins.objects.list.PList;
7776
import com.oracle.graal.python.builtins.objects.mappingproxy.PMappingproxy;

0 commit comments

Comments
 (0)