Make native binop operations at most ternary upcalls.

Author: fangerer

graalpython/com.oracle.graal.python.cext/src/abstract.c

@@ -66,74 +66,74 @@ int PyNumber_Check(PyObject *o) {
 }
 
 UPCALL_ID(PyNumber_UnaryOp);
-static PyObject * do_unaryop(PyObject *v, UnaryOp unaryop, char *unaryop_name) {
-    return UPCALL_CEXT_O(_jls_PyNumber_UnaryOp, native_to_java(v), unaryop, polyglot_from_string(unaryop_name, SRC_CS));
+static PyObject * do_unaryop(PyObject *v, UnaryOp unaryop) {
+    return UPCALL_CEXT_O(_jls_PyNumber_UnaryOp, native_to_java(v), unaryop);
 }
 
 UPCALL_ID(PyNumber_BinOp);
-static PyObject * do_binop(PyObject *v, PyObject *w, BinOp binop, char *binop_name) {
-    return UPCALL_CEXT_O(_jls_PyNumber_BinOp, native_to_java(v), native_to_java(w), binop, polyglot_from_string(binop_name, SRC_CS));
+static PyObject * do_binop(PyObject *v, PyObject *w, BinOp binop) {
+    return UPCALL_CEXT_O(_jls_PyNumber_BinOp, native_to_java(v), native_to_java(w), binop);
 }
 
 UPCALL_ID(PyNumber_InPlaceBinOp);
-static PyObject * do_inplace_binop(PyObject *v, PyObject *w, BinOp binop, char *binop_name) {
-    return UPCALL_CEXT_O(_jls_PyNumber_InPlaceBinOp, native_to_java(v), native_to_java(w), binop, polyglot_from_string(binop_name, SRC_CS));
+static PyObject * do_inplace_binop(PyObject *v, PyObject *w, BinOp binop) {
+    return UPCALL_CEXT_O(_jls_PyNumber_InPlaceBinOp, native_to_java(v), native_to_java(w), binop);
 }
 
 PyObject * PyNumber_Add(PyObject *o1, PyObject *o2) {
-	return do_binop(o1, o2, ADD, "+");
+	return do_binop(o1, o2, ADD);
 }
 
 PyObject * PyNumber_Subtract(PyObject *o1, PyObject *o2) {
-	return do_binop(o1, o2, SUB, "-");
+	return do_binop(o1, o2, SUB);
 }
 
 PyObject * PyNumber_Multiply(PyObject *o1, PyObject *o2) {
-	return do_binop(o1, o2, MUL, "*");
+	return do_binop(o1, o2, MUL);
 }
 
 PyObject * PyNumber_TrueDivide(PyObject *o1, PyObject *o2) {
-	return do_binop(o1, o2, TRUEDIV, "/");
+	return do_binop(o1, o2, TRUEDIV);
 }
 
 PyObject * PyNumber_FloorDivide(PyObject *o1, PyObject *o2) {
-	return do_binop(o1, o2, FLOORDIV, "//");
+	return do_binop(o1, o2, FLOORDIV);
 }
 
 PyObject * PyNumber_Remainder(PyObject *o1, PyObject *o2) {
-	return do_binop(o1, o2, MOD, "%");
+	return do_binop(o1, o2, MOD);
 }
 
 PyObject * PyNumber_Lshift(PyObject *o1, PyObject *o2) {
-	return do_binop(o1, o2, LSHIFT, "<<");
+	return do_binop(o1, o2, LSHIFT);
 }
 
 PyObject * PyNumber_Rshift(PyObject *o1, PyObject *o2) {
-	return do_binop(o1, o2, RSHIFT, ">>");
+	return do_binop(o1, o2, RSHIFT);
 }
 
 PyObject * PyNumber_Or(PyObject *o1, PyObject *o2) {
-	return do_binop(o1, o2, OR, "|");
+	return do_binop(o1, o2, OR);
 }
 
 PyObject * PyNumber_And(PyObject *o1, PyObject *o2) {
-	return do_binop(o1, o2, AND, "&");
+	return do_binop(o1, o2, AND);
 }
 
 PyObject * PyNumber_Xor(PyObject *o1, PyObject *o2) {
-	return do_binop(o1, o2, XOR, "^");
+	return do_binop(o1, o2, XOR);
 }
 
 PyObject * PyNumber_Positive(PyObject *o) {
-	return do_unaryop(o, POS, "+");
+	return do_unaryop(o, POS);
 }
 
 PyObject * PyNumber_Negative(PyObject *o) {
-	return do_unaryop(o, NEG, "-");
+	return do_unaryop(o, NEG);
 }
 
 PyObject * PyNumber_Invert(PyObject *o) {
-	return do_unaryop(o, INVERT, "~");
+	return do_unaryop(o, INVERT);
 }
 
 UPCALL_ID(PyNumber_Index);
@@ -145,7 +145,7 @@ PyObject * PyNumber_Index(PyObject *o) {
 }
 
 PyObject * PyNumber_InPlaceTrueDivide(PyObject *o1, PyObject *o2) {
-    return do_inplace_binop(o1, o2, TRUEDIV, "/");
+    return do_inplace_binop(o1, o2, TRUEDIV);
 }
 
 Py_ssize_t PyNumber_AsSsize_t(PyObject *item, PyObject *err) {

graalpython/lib-graalpython/python_cext.py

@@ -374,7 +374,7 @@ def PyNumber_Check(v):
 
 
 @may_raise
-def PyNumber_BinOp(v, w, binop, name):
+def PyNumber_BinOp(v, w, binop):
     if binop == 0:
         return v + w
     elif binop == 1:
@@ -398,11 +398,36 @@ def PyNumber_BinOp(v, w, binop, name):
     elif binop == 10:
         return v % w
     else:
-        raise SystemError("unknown binary operator %s" % name)
+        raise SystemError("unknown binary operator (code=%s)" % binop)
+
+
+def _binop_name(binop):
+    if binop == 0:
+        return "+"
+    elif binop == 1:
+        return "-"
+    elif binop == 2:
+        return "*"
+    elif binop == 3:
+        return "/"
+    elif binop == 4:
+        return "<<"
+    elif binop == 5:
+        return ">>"
+    elif binop == 6:
+        return "|"
+    elif binop == 7:
+        return "&"
+    elif binop == 8:
+        return "^"
+    elif binop == 9:
+        return "//"
+    elif binop == 10:
+        return "%"
 
 
 @may_raise
-def PyNumber_InPlaceBinOp(v, w, binop, name):
+def PyNumber_InPlaceBinOp(v, w, binop):
     control = v
     if binop == 0:
         v += w
@@ -427,22 +452,22 @@ def PyNumber_InPlaceBinOp(v, w, binop, name):
     elif binop == 10:
         v %= w
     else:
-        raise SystemError("unknown binary operator %s" % name)
+        raise SystemError("unknown in-place binary operator (code=%s)" % binop)
     if control is not v:
-        raise TypeError("unsupported operand type(s) for %s=: '%s' and '%s'" % (name, type(v), type(w)))
+        raise TypeError("unsupported operand type(s) for %s=: '%s' and '%s'" % (_binop_name(binop), type(v), type(w)))
     return control
 
 
 @may_raise
-def PyNumber_UnaryOp(v, unaryop, name):
+def PyNumber_UnaryOp(v, unaryop):
     if unaryop == 0:
         return +v
     elif unaryop == 1:
         return -v
     elif unaryop == 2:
         return ~v
     else:
-        raise SystemError("unknown unary operator %s" % name)
+        raise SystemError("unknown unary operator (code=%s)" % unaryop)
 
 
 @may_raise