unified namespace population with 'init_submodule'

modules/python/common.cmake

@@ -48,7 +48,6 @@ ocv_list_filterout(opencv_hdrs "opencv2/optim.hpp")
 set(cv2_generated_hdrs
     "${CMAKE_CURRENT_BINARY_DIR}/pyopencv_generated_include.h"
     "${CMAKE_CURRENT_BINARY_DIR}/pyopencv_generated_funcs.h"
-    "${CMAKE_CURRENT_BINARY_DIR}/pyopencv_generated_func_tab.h"
     "${CMAKE_CURRENT_BINARY_DIR}/pyopencv_generated_types.h"
     "${CMAKE_CURRENT_BINARY_DIR}/pyopencv_generated_type_reg.h"
     "${CMAKE_CURRENT_BINARY_DIR}/pyopencv_generated_const_reg.h"

modules/python/src2/cv2.cpp

@@ -1193,8 +1193,6 @@ static int convert_to_char(PyObject *o, char *dst, const char *name = "no_name")
 #include "pyopencv_generated_funcs.h"
 
 static PyMethodDef methods[] = {
-
-#include "pyopencv_generated_func_tab.h"
   {"createTrackbar", pycvCreateTrackbar, METH_VARARGS, "createTrackbar(trackbarName, windowName, value, count, onChange) -> None"},
   {"setMouseCallback", (PyCFunction)pycvSetMouseCallback, METH_VARARGS | METH_KEYWORDS, "setMouseCallback(windowName, onMouse [, param]) -> None"},
   {NULL, NULL},
@@ -1205,9 +1203,10 @@ static PyMethodDef methods[] = {
 
 static void init_submodule(PyObject * root, const char * name, PyMethodDef * methods)
 {
+  // traverse and create nested submodules
   std::string s = name;
-  size_t i = s.find('.')+1; //  assume, that name is cv2.<name>...
+  size_t i = s.find('.');
-  while (i < s.length())
+  while (i < s.length() && i != std::string::npos)
   {
     size_t j = s.find('.', i);
     if (j == std::string::npos)
@@ -1226,6 +1225,7 @@ static void init_submodule(PyObject * root, const char * name, PyMethodDef * met
     root = submod;
   }
 
+  // populate module's dict
   PyObject * d = PyModule_GetDict(root);
   for (PyMethodDef * m = methods; m->ml_name != NULL; ++m)
   {

modules/python/src2/gen2.py

@@ -731,18 +731,23 @@ class FuncInfo(object):
         return code
 
 
+class Namespace(object):
+    def __init__(self):
+        self.funcs = {}
+        self.consts = {}
+
+
 class PythonWrapperGenerator(object):
     def __init__(self):
         self.clear()
 
     def clear(self):
         self.classes = {}
-        self.ns_funcs = {}
+        self.namespaces = {}
         self.consts = {}
         self.code_include = StringIO()
         self.code_types = StringIO()
         self.code_funcs = StringIO()
-        self.code_func_tab = StringIO()
         self.code_type_reg = StringIO()
         self.code_const_reg = StringIO()
         self.code_ns_reg = StringIO()
@@ -802,7 +807,7 @@ class PythonWrapperGenerator(object):
             cname = chunks[-1]
             func_map = self.classes[classname].methods
         else:
-            func_map = self.ns_funcs.setdefault(namespace, {})
+            func_map = self.namespaces.setdefault(namespace, Namespace()).funcs
 
         func = func_map.setdefault(name, FuncInfo(classname, name, cname, isconstructor, namespace))
         func.add_variant(decl)
@@ -813,16 +818,14 @@ class PythonWrapperGenerator(object):
     def gen_namespace(self, ns_name):
         wname = normalize_class_name(ns_name)
         self.code_ns_reg.write('static PyMethodDef methods_%s[] = {\n'%wname)
-        funclist = sorted(self.ns_funcs[ns_name].items())
+        funclist = sorted(self.namespaces[ns_name].funcs.items())
         for name, func in funclist:
             self.code_ns_reg.write(func.get_tab_entry())
         self.code_ns_reg.write('    {NULL, NULL}\n};\n\n')
 
     def gen_namespaces_reg(self):
         self.code_ns_reg.write('static void init_submodules(PyObject * root) \n{\n')
-        for ns_name in sorted(self.ns_funcs):
+        for ns_name in sorted(self.namespaces):
-            if ns_name == 'cv':
-                continue
             wname = normalize_class_name(ns_name)
             self.code_ns_reg.write('  init_submodule(root, MODULESTR"%s", methods_%s);\n' % (ns_name[2:], wname))
         self.code_ns_reg.write('};\n')
@@ -884,16 +887,11 @@ class PythonWrapperGenerator(object):
                 self.code_type_reg.write("MKTYPE2(%s);\n" % (classinfo.name,) )
 
         # step 3: generate the code for all the global functions
-        for ns in self.ns_funcs:
+        for ns_name, ns in sorted(self.namespaces.items()):
-            funclist = self.ns_funcs[ns].items()
+            for name, func in sorted(ns.funcs.items()):
-            funclist.sort()
-            for name, func in funclist:
                 code = func.gen_code(self.classes)
                 self.code_funcs.write(code)
-                if ns == 'cv':
+            self.gen_namespace(ns_name)
-                    self.code_func_tab.write(func.get_tab_entry())
-            if ns != 'cv':
-                self.gen_namespace(ns)
         self.gen_namespaces_reg()
 
         # step 4: generate the code for constants
@@ -905,7 +903,6 @@ class PythonWrapperGenerator(object):
         # That's it. Now save all the files
         self.save(output_path, "pyopencv_generated_include.h", self.code_include)
         self.save(output_path, "pyopencv_generated_funcs.h", self.code_funcs)
-        self.save(output_path, "pyopencv_generated_func_tab.h", self.code_func_tab)
         self.save(output_path, "pyopencv_generated_const_reg.h", self.code_const_reg)
         self.save(output_path, "pyopencv_generated_types.h", self.code_types)
         self.save(output_path, "pyopencv_generated_type_reg.h", self.code_type_reg)