Skip to content

Commit 923a348

Browse files
msimacekmsimacek
committed
Fix function names in error messages
1 parent 2a5a42c commit 923a348

63 files changed

Lines changed: 172 additions & 183 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎graalpython/com.oracle.graal.python.annotations/src/com/oracle/graal/python/annotations/Slot.java‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,11 @@
7676
*/
7777
@Retention(RetentionPolicy.RUNTIME)
7878
@interface SlotSignature {
79+
/**
80+
* Used to supply the function name for error messages from argument parsing.
81+
*/
82+
String name() default "";
83+
7984
int minNumOfPositionalArgs() default 0;
8085

8186
int maxNumOfPositionalArgs() default -1;
@@ -91,8 +96,6 @@
9196
boolean needsFrame() default false;
9297

9398
boolean alwaysNeedsCallerFrame() default false;
94-
95-
String raiseErrorName() default "";
9699
}
97100

98101
/** See <a href="https://docs.python.org/3/c-api/typeobj.html">slot documentation</a> */

‎graalpython/com.oracle.graal.python.processor/src/com/oracle/graal/python/processor/ArgumentClinicProcessor.java‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -326,7 +326,7 @@ private void checkClinicBuiltinBaseClass(Element[] clinicBuiltinBases, TypeEleme
326326
}
327327
}
328328

329-
private AnnotationMirror findAnnotationMirror(TypeElement type, String annotationQualifiedName) {
329+
private static AnnotationMirror findAnnotationMirror(TypeElement type, String annotationQualifiedName) {
330330
for (AnnotationMirror annot : type.getAnnotationMirrors()) {
331331
String name = ((TypeElement) annot.getAnnotationType().asElement()).getQualifiedName().toString();
332332
if (name.equals(annotationQualifiedName)) {
@@ -354,7 +354,7 @@ private static AnnotationValue getAnnotationValue(AnnotationMirror annotationMir
354354
}
355355

356356
@SuppressWarnings("unchecked")
357-
private BuiltinAnnotation getBuiltinAnnotation(TypeElement type) throws ProcessingError {
357+
private static BuiltinAnnotation getBuiltinAnnotation(TypeElement type) throws ProcessingError {
358358
String builtinName = null;
359359
Stream<?> parameterNames = null;
360360
Stream<?> keywordOnlyNames = null;
@@ -363,8 +363,6 @@ private BuiltinAnnotation getBuiltinAnnotation(TypeElement type) throws Processi
363363
AnnotationMirror annot = findAnnotationMirror(type, BuiltinAnnotationClass);
364364
if (annot == null) {
365365
annot = findAnnotationMirror(type, SlotSignatureAnnotationClass);
366-
// XXX
367-
builtinName = "slot";
368366
}
369367
if (annot == null) {
370368
annot = findAnnotationMirror(type, BuiltinsAnnotationClass);

‎graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/PythonBuiltinClassType.java‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -237,7 +237,6 @@
237237
import com.oracle.graal.python.builtins.objects.method.BuiltinFunctionOrMethodBuiltins;
238238
import com.oracle.graal.python.builtins.objects.method.ClassmethodBuiltins;
239239
import com.oracle.graal.python.builtins.objects.method.ClassmethodCommonBuiltins;
240-
import com.oracle.graal.python.builtins.objects.method.DecoratedMethodBuiltins;
241240
import com.oracle.graal.python.builtins.objects.method.InstancemethodBuiltins;
242241
import com.oracle.graal.python.builtins.objects.method.MethodBuiltins;
243242
import com.oracle.graal.python.builtins.objects.method.MethodWrapperBuiltins;
@@ -393,8 +392,8 @@ public enum PythonBuiltinClassType implements TruffleObject {
393392
PSemLock("SemLock", PythonObject, "_multiprocessing"),
394393
PGraalPySemLock("SemLock", PythonObject, "_multiprocessing_graalpy"),
395394
PSocket("socket", PythonObject, J__SOCKET, SocketBuiltins.SLOTS),
396-
PStaticmethod("staticmethod", PythonObject, J_BUILTINS, Flags.PUBLIC_BASE_WDICT, TpSlots.merge(DecoratedMethodBuiltins.SLOTS, StaticmethodBuiltins.SLOTS)),
397-
PClassmethod("classmethod", PythonObject, J_BUILTINS, Flags.PUBLIC_BASE_WDICT, TpSlots.merge(DecoratedMethodBuiltins.SLOTS, ClassmethodCommonBuiltins.SLOTS, ClassmethodBuiltins.SLOTS)),
395+
PStaticmethod("staticmethod", PythonObject, J_BUILTINS, Flags.PUBLIC_BASE_WDICT, StaticmethodBuiltins.SLOTS),
396+
PClassmethod("classmethod", PythonObject, J_BUILTINS, Flags.PUBLIC_BASE_WDICT, TpSlots.merge(ClassmethodCommonBuiltins.SLOTS, ClassmethodBuiltins.SLOTS)),
398397
PInstancemethod("instancemethod", PythonObject, Flags.PUBLIC_BASE_WDICT, InstancemethodBuiltins.SLOTS),
399398
PScandirIterator("ScandirIterator", PythonObject, J_POSIX, Flags.PRIVATE_DERIVED_WODICT, ScandirIteratorBuiltins.SLOTS),
400399
PDirEntry("DirEntry", PythonObject, J_POSIX, Flags.PUBLIC_DERIVED_WODICT, DirEntryBuiltins.SLOTS),

‎graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/ArrayModuleBuiltins.java‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,6 @@
7474
import com.oracle.graal.python.nodes.function.builtins.PythonVarargsBuiltinNode;
7575
import com.oracle.graal.python.nodes.function.builtins.clinic.ArgumentClinicProvider;
7676
import com.oracle.graal.python.nodes.object.BuiltinClassProfiles.IsBuiltinClassExactProfile;
77-
import com.oracle.graal.python.nodes.util.SplitArgsNode;
7877
import com.oracle.graal.python.runtime.object.PFactory;
7978
import com.oracle.graal.python.runtime.sequence.PSequence;
8079
import com.oracle.graal.python.runtime.sequence.storage.SequenceStorage;
@@ -120,7 +119,6 @@ public void postInitialize(Python3Core core) {
120119
@Builtin(name = J_ARRAY, minNumOfPositionalArgs = 1, constructsClass = PythonBuiltinClassType.PArray, takesVarArgs = true, takesVarKeywordArgs = true, declaresExplicitSelf = true)
121120
@GenerateNodeFactory
122121
abstract static class ArrayNode extends PythonVarargsBuiltinNode {
123-
@Child private SplitArgsNode splitArgsNode;
124122

125123
@Specialization(guards = "args.length == 1 || args.length == 2")
126124
static Object array2(VirtualFrame frame, Object cls, Object[] args, PKeyword[] kwargs,

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -231,7 +231,6 @@
231231
import com.oracle.graal.python.nodes.util.CastToJavaIntExactNode;
232232
import com.oracle.graal.python.nodes.util.CastToJavaStringNode;
233233
import com.oracle.graal.python.nodes.util.CastToTruffleStringNode;
234-
import com.oracle.graal.python.nodes.util.SplitArgsNode;
235234
import com.oracle.graal.python.runtime.IndirectCallData;
236235
import com.oracle.graal.python.runtime.PythonContext;
237236
import com.oracle.graal.python.runtime.exception.PException;
@@ -1421,7 +1420,6 @@ protected static boolean isBuiltinList(Object cls) {
14211420
@GenerateNodeFactory
14221421
public abstract static class ObjectNode extends PythonVarargsBuiltinNode {
14231422

1424-
@Child private SplitArgsNode splitArgsNode;
14251423
@Child private ReportAbstractClassNode reportAbstractClassNode;
14261424

14271425
@GenerateInline(false) // Used lazily

‎graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/CodecsTruffleModuleBuiltins.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@
8282
import com.oracle.graal.python.builtins.objects.type.TpSlots;
8383
import com.oracle.graal.python.builtins.objects.type.TpSlots.GetCachedTpSlotsNode;
8484
import com.oracle.graal.python.builtins.objects.type.TypeNodes.GetBaseClassNode;
85-
import com.oracle.graal.python.builtins.objects.type.slots.TpSlotInit.CallSlotInitNode;
85+
import com.oracle.graal.python.builtins.objects.type.slots.TpSlotInit;
8686
import com.oracle.graal.python.lib.PyObjectCallMethodObjArgs;
8787
import com.oracle.graal.python.lib.PyObjectGetAttr;
8888
import com.oracle.graal.python.lib.PyObjectSetAttr;
@@ -324,7 +324,7 @@ static Object init(VirtualFrame frame, PythonObject self, Object[] args, PKeywor
324324
@Cached GetPythonObjectClassNode getClass,
325325
@Cached GetBaseClassNode getBaseClassNode,
326326
@Cached GetCachedTpSlotsNode getSlots,
327-
@Cached CallSlotInitNode callInit) {
327+
@Cached TpSlotInit.CallSlotTpInitNode callInit) {
328328
assert args.length > 0;
329329
Object base = getBaseClassNode.execute(inliningTarget, getClass.execute(inliningTarget, self));
330330
TpSlots baseSlots = getSlots.execute(inliningTarget, base);

‎graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/ProfilerBuiltins.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ protected List<? extends NodeFactory<? extends PythonBuiltinBaseNode>> getNodeFa
8383
}
8484

8585
@Slot(value = SlotKind.tp_init, isComplex = true)
86-
@SlotSignature(minNumOfPositionalArgs = 1, parameterNames = {"$self", "timer", "timeunit", "subcalls", "builtins"})
86+
@SlotSignature(name = "Profiler", minNumOfPositionalArgs = 1, parameterNames = {"$self", "timer", "timeunit", "subcalls", "builtins"})
8787
@GenerateNodeFactory
8888
abstract static class Init extends PythonBuiltinNode {
8989
@Specialization

‎graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/bz2/BZ2CompressorBuiltins.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ protected List<? extends NodeFactory<? extends PythonBuiltinBaseNode>> getNodeFa
9696
}
9797

9898
@Slot(value = SlotKind.tp_init, isComplex = true)
99-
@SlotSignature(minNumOfPositionalArgs = 1, parameterNames = {"$self", "compresslevel"})
99+
@SlotSignature(name = "BZ2Compressor", minNumOfPositionalArgs = 1, parameterNames = {"$self", "compresslevel"})
100100
@ArgumentClinic(name = "compresslevel", conversion = ClinicConversion.Int, defaultValue = "9", useDefaultForNone = true)
101101
@GenerateNodeFactory
102102
public abstract static class InitNode extends PythonBinaryClinicBuiltinNode {

‎graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/bz2/BZ2DecompressorBuiltins.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ protected List<? extends NodeFactory<? extends PythonBuiltinBaseNode>> getNodeFa
9191
}
9292

9393
@Slot(value = SlotKind.tp_init, isComplex = true)
94-
@SlotSignature(minNumOfPositionalArgs = 1, parameterNames = {"$self"})
94+
@SlotSignature(name = "BZDecompressor", minNumOfPositionalArgs = 1, parameterNames = {"$self"})
9595
@GenerateNodeFactory
9696
public abstract static class InitNode extends PythonUnaryBuiltinNode {
9797

‎graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/cjkcodecs/MultibyteIncrementalDecoderBuiltins.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@ static Object mbstreamreaderNew(VirtualFrame frame, Object type, Object err,
140140
}
141141

142142
@Slot(value = SlotKind.tp_init, isComplex = true)
143-
@SlotSignature(minNumOfPositionalArgs = 1, parameterNames = {"$self"})
143+
@SlotSignature(name = "MultibyteIncrementalDecoder", minNumOfPositionalArgs = 1, parameterNames = {"$self"})
144144
@GenerateNodeFactory
145145
public abstract static class InitNode extends PythonUnaryBuiltinNode {
146146

0 commit comments

Comments
 (0)