TonBERRY/micropython
3
0
Fork 0
Code Pull Requests Activity

py/runtime: Implement dispatch for "reverse op" special methods.

Browse Source 
If, for class X, X.__add__(Y) doesn't exist (or returns NotImplemented),
try Y.__radd__(X) instead.

This patch could be simpler, but requires undoing operand swap and
operation switch to get non-confusing error message in case __radd__
doesn't exist.
This commit is contained in:
Paul Sokolovsky
2017-09-10 17:05:20 +03:00
parent de981040b3
commit eb84a830df
5 changed files with 48 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
py/runtime.c
View File

@@ -555,7 +555,20 @@ generic_binary_op:
}
}
// TODO implement dispatch for reverse binary ops
#if MICROPY_PY_REVERSE_SPECIAL_METHODS
if (op >= MP_BINARY_OP_OR && op <= MP_BINARY_OP_REVERSE_POWER) {
mp_obj_t t = rhs;
rhs = lhs;
lhs = t;
if (op <= MP_BINARY_OP_POWER) {
op += MP_BINARY_OP_REVERSE_OR - MP_BINARY_OP_OR;
goto generic_binary_op;
}
// Convert __rop__ back to __op__ for error message
op -= MP_BINARY_OP_REVERSE_OR - MP_BINARY_OP_OR;
}
#endif
unsupported_op:
if (MICROPY_ERROR_REPORTING == MICROPY_ERROR_REPORTING_TERSE) {