Skip to content

Commit 2022e28

Browse files
committed
Minor naming/error messages typos fixes
1 parent c40a1b7 commit 2022e28

File tree

2 files changed

+5
-7
lines changed

2 files changed

+5
-7
lines changed

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/cext/capi/PyProcsWrapper.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -390,7 +390,7 @@ int execute(Object[] arguments,
390390
callSlotNode.execute(null, inliningTarget, getSlot(), toJavaNode.execute(arguments[0]), toJavaNode.execute(arguments[1]), toJavaNode.execute(arguments[2]));
391391
return 0;
392392
} catch (Throwable t) {
393-
throw checkThrowableBeforeNative(t, "ObjobjargWrapper", getDelegate());
393+
throw checkThrowableBeforeNative(t, "SetattrWrapper", getDelegate());
394394
}
395395
} catch (PException e) {
396396
transformExceptionToNativeNode.execute(inliningTarget, e);

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

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -43,10 +43,8 @@
4343
import static com.oracle.graal.python.builtins.objects.type.slots.BuiltinSlotWrapperSignature.J_DOLLAR_SELF;
4444
import static com.oracle.graal.python.nodes.SpecialMethodNames.J___SETATTR__;
4545
import static com.oracle.graal.python.nodes.SpecialMethodNames.T___DELATTR__;
46-
import static com.oracle.graal.python.nodes.SpecialMethodNames.T___DEL__;
4746
import static com.oracle.graal.python.nodes.SpecialMethodNames.T___GETATTR__;
4847
import static com.oracle.graal.python.nodes.SpecialMethodNames.T___SETATTR__;
49-
import static com.oracle.graal.python.nodes.SpecialMethodNames.T___SET__;
5048

5149
import com.oracle.graal.python.PythonLanguage;
5250
import com.oracle.graal.python.builtins.Python3Core;
@@ -256,15 +254,15 @@ abstract static class CallNativeSlotSetAttrNode extends Node {
256254
static void callNative(VirtualFrame frame, TpSlots slots, TpSlotNative slot, Object self, Object name, Object value,
257255
@Bind("this") Node inliningTarget,
258256
@Cached GetThreadStateNode getThreadStateNode,
259-
@Cached InlinedConditionProfile isGetAttrProfile,
257+
@Cached InlinedConditionProfile isSetAttrProfile,
260258
@Cached AsCharPointerNode asCharPointerNode,
261259
@Cached FreeNode freeNode,
262260
@Cached PythonToNativeNode nameToNativeNode,
263261
@Cached PythonToNativeNode selfToNativeNode,
264262
@Cached PythonToNativeNode valueToNativeNode,
265263
@Cached ExternalFunctionInvokeNode externalInvokeNode,
266264
@Cached CheckInquiryResultNode checkResultNode) {
267-
boolean isSetAttr = isGetAttrProfile.profile(inliningTarget, slots.tp_setattr() == slot);
265+
boolean isSetAttr = isSetAttrProfile.profile(inliningTarget, slots.tp_setattr() == slot);
268266
Object nameArg;
269267
if (isSetAttr) {
270268
nameArg = asCharPointerNode.execute(name);
@@ -313,10 +311,10 @@ static void callPythonSimple(VirtualFrame frame, Node inliningTarget, TpSlotSetA
313311
TruffleString funName;
314312
if (callDel) {
315313
callable = slot.getDelattr();
316-
funName = T___DEL__;
314+
funName = T___DELATTR__;
317315
} else {
318316
callable = slot.getSetattr();
319-
funName = T___SET__;
317+
funName = T___SETATTR__;
320318
}
321319
if (callable == null) {
322320
throw raiseAttributeError(inliningTarget, raiseNode, funName);

0 commit comments

Comments
 (0)