Skip to content

Commit 2f6c2b3

Browse files
committed
Rename SetAttrWrapper to ObjobjargWrapper
1 parent 2d239a1 commit 2f6c2b3

File tree

3 files changed

+8
-8
lines changed

3 files changed

+8
-8
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,7 @@ public Object execute(Object[] arguments,
147147
// execute
148148
return toSulongNode.execute(callNode.execute(null, getDelegate(), pArgs, kwArgsArray));
149149
} catch (Throwable t) {
150-
throw checkThrowableBeforeNative(t, "SetAttrWrapper", getDelegate());
150+
throw checkThrowableBeforeNative(t, "MethKeywords", getDelegate());
151151
}
152152
} catch (PException e) {
153153
transformExceptionToNativeNode.execute(inliningTarget, e);

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -350,9 +350,9 @@ protected String getSignature() {
350350
}
351351

352352
@ExportLibrary(InteropLibrary.class)
353-
public static final class SetAttrWrapper extends PyProcsWrapper {
353+
public static final class ObjobjargWrapper extends PyProcsWrapper {
354354

355-
public SetAttrWrapper(Object delegate) {
355+
public ObjobjargWrapper(Object delegate) {
356356
super(delegate);
357357
}
358358

@@ -375,7 +375,7 @@ int execute(Object[] arguments,
375375
callTernaryMethodNode.execute(null, getDelegate(), toJavaNode.execute(arguments[0]), toJavaNode.execute(arguments[1]), toJavaNode.execute(arguments[2]));
376376
return 0;
377377
} catch (Throwable t) {
378-
throw checkThrowableBeforeNative(t, "SetAttrWrapper", getDelegate());
378+
throw checkThrowableBeforeNative(t, "ObjobjargWrapper", getDelegate());
379379
}
380380
} catch (PException e) {
381381
transformExceptionToNativeNode.execute(null, inliningTarget, e);

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -158,8 +158,8 @@
158158
import com.oracle.graal.python.builtins.objects.cext.capi.PyProcsWrapper.InitWrapper;
159159
import com.oracle.graal.python.builtins.objects.cext.capi.PyProcsWrapper.InquiryWrapper;
160160
import com.oracle.graal.python.builtins.objects.cext.capi.PyProcsWrapper.LenfuncWrapper;
161+
import com.oracle.graal.python.builtins.objects.cext.capi.PyProcsWrapper.ObjobjargWrapper;
161162
import com.oracle.graal.python.builtins.objects.cext.capi.PyProcsWrapper.RichcmpFunctionWrapper;
162-
import com.oracle.graal.python.builtins.objects.cext.capi.PyProcsWrapper.SetAttrWrapper;
163163
import com.oracle.graal.python.builtins.objects.cext.capi.PyProcsWrapper.SsizeargfuncWrapper;
164164
import com.oracle.graal.python.builtins.objects.cext.capi.PyProcsWrapper.SsizeobjargfuncWrapper;
165165
import com.oracle.graal.python.builtins.objects.cext.capi.PyProcsWrapper.TernaryFunctionWrapper;
@@ -179,14 +179,14 @@ public enum SlotMethodDef {
179179
TP_ITERNEXT(PyTypeObject__tp_iternext, T___NEXT__, UnaryFuncWrapper::new),
180180
TP_REPR(PyTypeObject__tp_repr, T___REPR__, UnaryFuncWrapper::new),
181181
TP_RICHCOMPARE(PyTypeObject__tp_richcompare, T___TRUFFLE_RICHCOMPARE__, RichcmpFunctionWrapper::new),
182-
TP_SETATTRO(PyTypeObject__tp_setattro, T___SETATTR__, SetAttrWrapper::new),
182+
TP_SETATTRO(PyTypeObject__tp_setattro, T___SETATTR__, ObjobjargWrapper::new),
183183
TP_STR(PyTypeObject__tp_str, T___STR__, UnaryFuncWrapper::new),
184184
TP_DESCR_GET(PyTypeObject__tp_descr_get, T___GET__, DescrGetFunctionWrapper::new),
185-
TP_DESCR_SET(PyTypeObject__tp_descr_set, T___SET__, SetAttrWrapper::new),
185+
TP_DESCR_SET(PyTypeObject__tp_descr_set, T___SET__, ObjobjargWrapper::new),
186186

187187
MP_LENGTH(PyMappingMethods__mp_length, T___LEN__, LenfuncWrapper::new, MethodsFlags.MP_LENGTH),
188188
MP_SUBSCRIPT(PyMappingMethods__mp_subscript, T___GETITEM__, BinaryFuncWrapper::new, MethodsFlags.MP_SUBSCRIPT),
189-
MP_ASS_SUBSCRIPT(PyMappingMethods__mp_ass_subscript, T___SETITEM__, SetAttrWrapper::new, MethodsFlags.MP_ASS_SUBSCRIPT),
189+
MP_ASS_SUBSCRIPT(PyMappingMethods__mp_ass_subscript, T___SETITEM__, ObjobjargWrapper::new, MethodsFlags.MP_ASS_SUBSCRIPT),
190190

191191
AM_AWAIT(PyAsyncMethods__am_await, T___AWAIT__, UnaryFuncWrapper::new, MethodsFlags.AM_AWAIT),
192192
AM_AITER(PyAsyncMethods__am_aiter, T___AITER__, UnaryFuncWrapper::new, MethodsFlags.AM_AITER),

0 commit comments

Comments
 (0)