Optimization: Added more helpers for code generation

* This adds "//" (floor division) and "/" (true division), but not
  yet classical division (Python2).

* More helpers are now created in the templates, even if they are
  rather specific, they can still share the common part, e.g.
  argument conversion to double or long, and fallback to the long
  slot.

* This also adds the template names to the generated files, which
  is something we mean to do.

* Also gives an error when a missing operation is encountered.

nuitka/build/SingleExe.scons

@@ -928,6 +928,9 @@ if standalone_mode:
     if "linux" in sys.platform:
         env.Append(LIBS=["dl"])
 
+if not msvc_mode:
+    env.Append(LIBS=["m"])
+
 if no_python_warnings:
     env.Append(CPPDEFINES=["_NUITKA_NO_PYTHON_WARNINGS"])
 
@@ -1234,7 +1237,7 @@ elif not module_mode or (macosx_target and not static_libpython):
             env.Append(LIBS=["python" + python_abi_version])
 
     if python_prefix != "/usr" and "linux" in sys.platform:
-        env.Append(LIBS=["dl", "pthread", "util", "rt", "m"])
+        env.Append(LIBS=["dl", "pthread", "util", "rt"])
 
         if gcc_mode and not clang_mode:
             env.Append(LINKFLAGS=["-export-dynamic"])

nuitka/build/include/nuitka/helper/operations.h

@@ -70,8 +70,9 @@ NUITKA_MAY_BE_UNUSED static PyObject *BINARY_OPERATION(binary_api api, PyObject
 
 // Generated helpers to execute operations on fully or partially known types.
 #include "nuitka/helper/operations_binary_add.h"
-#include "nuitka/helper/operations_binary_mul.h"
 #include "nuitka/helper/operations_binary_sub.h"
+#include "nuitka/helper/operations_binary_mul.h"
+#include "nuitka/helper/operations_binary_floordiv.h"
 
 NUITKA_MAY_BE_UNUSED static bool BINARY_OPERATION_INPLACE(binary_api api, PyObject **operand1, PyObject *operand2) {
     assert(operand1);

nuitka/build/include/nuitka/helper/operations_binary_add.h

@@ -15,7 +15,7 @@
 //     See the License for the specific language governing permissions and
 //     limitations under the License.
 //
-/* WARNING, this code is GENERATED. Modify the template instead! */
+/* WARNING, this code is GENERATED. Modify the template HelperOperationBinary.c.j2 instead! */
 /* C helpers for type specialized "+" (ADD) operations */
 
 #if PYTHON_VERSION < 300

nuitka/build/include/nuitka/helper/operations_binary_floordiv.h

@@ -0,0 +1,81 @@
+//     Copyright 2019, Kay Hayen, mailto:[email protected]
+//
+//     Part of "Nuitka", an optimizing Python compiler that is compatible and
+//     integrates with CPython, but also works on its own.
+//
+//     Licensed under the Apache License, Version 2.0 (the "License");
+//     you may not use this file except in compliance with the License.
+//     You may obtain a copy of the License at
+//
+//        http://www.apache.org/licenses/LICENSE-2.0
+//
+//     Unless required by applicable law or agreed to in writing, software
+//     distributed under the License is distributed on an "AS IS" BASIS,
+//     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//     See the License for the specific language governing permissions and
+//     limitations under the License.
+//
+/* WARNING, this code is GENERATED. Modify the template HelperOperationBinary.c.j2 instead! */
+/* C helpers for type specialized "//" (FLOORDIV) operations */
+
+#if PYTHON_VERSION < 300
+/* Code referring to "OBJECT" corresponds to any Python object and "INT" to Python2 'int'. */
+extern PyObject *BINARY_OPERATION_FLOORDIV_OBJECT_INT(PyObject *operand1, PyObject *operand2);
+#endif
+
+#if PYTHON_VERSION < 300
+/* Code referring to "INT" corresponds to Python2 'int' and "OBJECT" to any Python object. */
+extern PyObject *BINARY_OPERATION_FLOORDIV_INT_OBJECT(PyObject *operand1, PyObject *operand2);
+#endif
+
+#if PYTHON_VERSION < 300
+/* Code referring to "INT" corresponds to Python2 'int' and "INT" to Python2 'int'. */
+extern PyObject *BINARY_OPERATION_FLOORDIV_INT_INT(PyObject *operand1, PyObject *operand2);
+#endif
+
+/* Code referring to "OBJECT" corresponds to any Python object and "LONG" to Python2 'long', Python3 'int'. */
+extern PyObject *BINARY_OPERATION_FLOORDIV_OBJECT_LONG(PyObject *operand1, PyObject *operand2);
+
+/* Code referring to "LONG" corresponds to Python2 'long', Python3 'int' and "OBJECT" to any Python object. */
+extern PyObject *BINARY_OPERATION_FLOORDIV_LONG_OBJECT(PyObject *operand1, PyObject *operand2);
+
+/* Code referring to "LONG" corresponds to Python2 'long', Python3 'int' and "LONG" to Python2 'long', Python3 'int'. */
+extern PyObject *BINARY_OPERATION_FLOORDIV_LONG_LONG(PyObject *operand1, PyObject *operand2);
+
+/* Code referring to "OBJECT" corresponds to any Python object and "FLOAT" to Python 'float'. */
+extern PyObject *BINARY_OPERATION_FLOORDIV_OBJECT_FLOAT(PyObject *operand1, PyObject *operand2);
+
+/* Code referring to "FLOAT" corresponds to Python 'float' and "OBJECT" to any Python object. */
+extern PyObject *BINARY_OPERATION_FLOORDIV_FLOAT_OBJECT(PyObject *operand1, PyObject *operand2);
+
+/* Code referring to "FLOAT" corresponds to Python 'float' and "FLOAT" to Python 'float'. */
+extern PyObject *BINARY_OPERATION_FLOORDIV_FLOAT_FLOAT(PyObject *operand1, PyObject *operand2);
+
+/* Code referring to "FLOAT" corresponds to Python 'float' and "LONG" to Python2 'long', Python3 'int'. */
+extern PyObject *BINARY_OPERATION_FLOORDIV_FLOAT_LONG(PyObject *operand1, PyObject *operand2);
+
+/* Code referring to "LONG" corresponds to Python2 'long', Python3 'int' and "FLOAT" to Python 'float'. */
+extern PyObject *BINARY_OPERATION_FLOORDIV_LONG_FLOAT(PyObject *operand1, PyObject *operand2);
+
+#if PYTHON_VERSION < 300
+/* Code referring to "FLOAT" corresponds to Python 'float' and "INT" to Python2 'int'. */
+extern PyObject *BINARY_OPERATION_FLOORDIV_FLOAT_INT(PyObject *operand1, PyObject *operand2);
+#endif
+
+#if PYTHON_VERSION < 300
+/* Code referring to "INT" corresponds to Python2 'int' and "FLOAT" to Python 'float'. */
+extern PyObject *BINARY_OPERATION_FLOORDIV_INT_FLOAT(PyObject *operand1, PyObject *operand2);
+#endif
+
+#if PYTHON_VERSION < 300
+/* Code referring to "LONG" corresponds to Python2 'long', Python3 'int' and "INT" to Python2 'int'. */
+extern PyObject *BINARY_OPERATION_FLOORDIV_LONG_INT(PyObject *operand1, PyObject *operand2);
+#endif
+
+#if PYTHON_VERSION < 300
+/* Code referring to "INT" corresponds to Python2 'int' and "LONG" to Python2 'long', Python3 'int'. */
+extern PyObject *BINARY_OPERATION_FLOORDIV_INT_LONG(PyObject *operand1, PyObject *operand2);
+#endif
+
+/* Code referring to "OBJECT" corresponds to any Python object and "OBJECT" to any Python object. */
+extern PyObject *BINARY_OPERATION_FLOORDIV_OBJECT_OBJECT(PyObject *operand1, PyObject *operand2);

nuitka/build/include/nuitka/helper/operations_binary_mul.h

@@ -15,7 +15,7 @@
 //     See the License for the specific language governing permissions and
 //     limitations under the License.
 //
-/* WARNING, this code is GENERATED. Modify the template instead! */
+/* WARNING, this code is GENERATED. Modify the template HelperOperationBinary.c.j2 instead! */
 /* C helpers for type specialized "*" (MUL) operations */
 
 #if PYTHON_VERSION < 300

nuitka/build/include/nuitka/helper/operations_binary_sub.h

@@ -15,7 +15,7 @@
 //     See the License for the specific language governing permissions and
 //     limitations under the License.
 //
-/* WARNING, this code is GENERATED. Modify the template instead! */
+/* WARNING, this code is GENERATED. Modify the template HelperOperationBinary.c.j2 instead! */
 /* C helpers for type specialized "-" (SUB) operations */
 
 #if PYTHON_VERSION < 300

nuitka/build/include/nuitka/helper/operations_binary_truediv.h

@@ -0,0 +1,81 @@
+//     Copyright 2019, Kay Hayen, mailto:[email protected]
+//
+//     Part of "Nuitka", an optimizing Python compiler that is compatible and
+//     integrates with CPython, but also works on its own.
+//
+//     Licensed under the Apache License, Version 2.0 (the "License");
+//     you may not use this file except in compliance with the License.
+//     You may obtain a copy of the License at
+//
+//        http://www.apache.org/licenses/LICENSE-2.0
+//
+//     Unless required by applicable law or agreed to in writing, software
+//     distributed under the License is distributed on an "AS IS" BASIS,
+//     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//     See the License for the specific language governing permissions and
+//     limitations under the License.
+//
+/* WARNING, this code is GENERATED. Modify the template HelperOperationBinary.c.j2 instead! */
+/* C helpers for type specialized "/" (TRUEDIV) operations */
+
+#if PYTHON_VERSION < 300
+/* Code referring to "OBJECT" corresponds to any Python object and "INT" to Python2 'int'. */
+extern PyObject *BINARY_OPERATION_TRUEDIV_OBJECT_INT(PyObject *operand1, PyObject *operand2);
+#endif
+
+#if PYTHON_VERSION < 300
+/* Code referring to "INT" corresponds to Python2 'int' and "OBJECT" to any Python object. */
+extern PyObject *BINARY_OPERATION_TRUEDIV_INT_OBJECT(PyObject *operand1, PyObject *operand2);
+#endif
+
+#if PYTHON_VERSION < 300
+/* Code referring to "INT" corresponds to Python2 'int' and "INT" to Python2 'int'. */
+extern PyObject *BINARY_OPERATION_TRUEDIV_INT_INT(PyObject *operand1, PyObject *operand2);
+#endif
+
+/* Code referring to "OBJECT" corresponds to any Python object and "LONG" to Python2 'long', Python3 'int'. */
+extern PyObject *BINARY_OPERATION_TRUEDIV_OBJECT_LONG(PyObject *operand1, PyObject *operand2);
+
+/* Code referring to "LONG" corresponds to Python2 'long', Python3 'int' and "OBJECT" to any Python object. */
+extern PyObject *BINARY_OPERATION_TRUEDIV_LONG_OBJECT(PyObject *operand1, PyObject *operand2);
+
+/* Code referring to "LONG" corresponds to Python2 'long', Python3 'int' and "LONG" to Python2 'long', Python3 'int'. */
+extern PyObject *BINARY_OPERATION_TRUEDIV_LONG_LONG(PyObject *operand1, PyObject *operand2);
+
+/* Code referring to "OBJECT" corresponds to any Python object and "FLOAT" to Python 'float'. */
+extern PyObject *BINARY_OPERATION_TRUEDIV_OBJECT_FLOAT(PyObject *operand1, PyObject *operand2);
+
+/* Code referring to "FLOAT" corresponds to Python 'float' and "OBJECT" to any Python object. */
+extern PyObject *BINARY_OPERATION_TRUEDIV_FLOAT_OBJECT(PyObject *operand1, PyObject *operand2);
+
+/* Code referring to "FLOAT" corresponds to Python 'float' and "FLOAT" to Python 'float'. */
+extern PyObject *BINARY_OPERATION_TRUEDIV_FLOAT_FLOAT(PyObject *operand1, PyObject *operand2);
+
+/* Code referring to "FLOAT" corresponds to Python 'float' and "LONG" to Python2 'long', Python3 'int'. */
+extern PyObject *BINARY_OPERATION_TRUEDIV_FLOAT_LONG(PyObject *operand1, PyObject *operand2);
+
+/* Code referring to "LONG" corresponds to Python2 'long', Python3 'int' and "FLOAT" to Python 'float'. */
+extern PyObject *BINARY_OPERATION_TRUEDIV_LONG_FLOAT(PyObject *operand1, PyObject *operand2);
+
+#if PYTHON_VERSION < 300
+/* Code referring to "FLOAT" corresponds to Python 'float' and "INT" to Python2 'int'. */
+extern PyObject *BINARY_OPERATION_TRUEDIV_FLOAT_INT(PyObject *operand1, PyObject *operand2);
+#endif
+
+#if PYTHON_VERSION < 300
+/* Code referring to "INT" corresponds to Python2 'int' and "FLOAT" to Python 'float'. */
+extern PyObject *BINARY_OPERATION_TRUEDIV_INT_FLOAT(PyObject *operand1, PyObject *operand2);
+#endif
+
+#if PYTHON_VERSION < 300
+/* Code referring to "LONG" corresponds to Python2 'long', Python3 'int' and "INT" to Python2 'int'. */
+extern PyObject *BINARY_OPERATION_TRUEDIV_LONG_INT(PyObject *operand1, PyObject *operand2);
+#endif
+
+#if PYTHON_VERSION < 300
+/* Code referring to "INT" corresponds to Python2 'int' and "LONG" to Python2 'long', Python3 'int'. */
+extern PyObject *BINARY_OPERATION_TRUEDIV_INT_LONG(PyObject *operand1, PyObject *operand2);
+#endif
+
+/* Code referring to "OBJECT" corresponds to any Python object and "OBJECT" to any Python object. */
+extern PyObject *BINARY_OPERATION_TRUEDIV_OBJECT_OBJECT(PyObject *operand1, PyObject *operand2);

nuitka/build/static_src/CompiledCodeHelpers.c

@@ -1990,8 +1990,10 @@ void _initSlotIternext() {
 #include "HelpersAttributes.c"
 
 #include "HelpersOperationBinaryAdd.c"
+#include "HelpersOperationBinaryFloordiv.c"
 #include "HelpersOperationBinaryMul.c"
 #include "HelpersOperationBinarySub.c"
+#include "HelpersOperationBinaryTruediv.c"
 
 #include "HelpersOperationBinaryInplaceAdd.c"
 

nuitka/build/static_src/HelpersOperationBinaryAdd.c

@@ -15,7 +15,7 @@
 //     See the License for the specific language governing permissions and
 //     limitations under the License.
 //
-/* WARNING, this code is GENERATED. Modify the template instead! */
+/* WARNING, this code is GENERATED. Modify the template HelperOperationBinary.c.j2 instead! */
 #include "HelpersOperationBinaryAddUtils.c"
 /* C helpers for type specialized "+" (ADD) operations */
 
@@ -36,10 +36,11 @@ static PyObject *SLOT_nb_add_INT_INT(PyObject *operand1, PyObject *operand2) {
     const long b = PyInt_AS_LONG(operand2);
 
     const long x = (long)((unsigned long)a + b);
-    if ((x ^ a) >= 0 || (x ^ b) >= 0)
+    if ((x ^ a) >= 0 || (x ^ b) >= 0) {
         return PyInt_FromLong(x);
+    }
 
-    // TODO: Could in-line and specialize this too.
+    // TODO: Could in-line and specialize this as well.
     PyObject *o = PyLong_Type.tp_as_number->nb_add(operand1, operand2);
     assert(o != Py_NotImplemented);
     return o;
@@ -1582,7 +1583,10 @@ static PyObject *SLOT_nb_add_FLOAT_FLOAT(PyObject *operand1, PyObject *operand2)
     assert(NEW_STYLE_NUMBER(operand2));
 #endif
 
-    return PyFloat_FromDouble(PyFloat_AS_DOUBLE(operand1) + PyFloat_AS_DOUBLE(operand2));
+    double a = PyFloat_AS_DOUBLE(operand1);
+    double b = PyFloat_AS_DOUBLE(operand2);
+
+    return PyFloat_FromDouble(a + b);
 }
 /* Code referring to "OBJECT" corresponds to any Python object and "FLOAT" to Python 'float'. */
 PyObject *BINARY_OPERATION_ADD_OBJECT_FLOAT(PyObject *operand1, PyObject *operand2) {