generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #4093 from mshabunin:python-bases

Browse Source
This commit is contained in:
Vadim Pisarevsky
2015-06-17 11:55:07 +00:00
parent d882797fbd 78ddc567f9
commit 66216ea2be
1 changed files with 16 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
modules/python/src2/gen2.py
View File

@@ -757,19 +757,6 @@ class PythonWrapperGenerator(object):
sys.exit(-1)
self.classes[classinfo.name] = classinfo
if classinfo.base:
chunks = classinfo.base.split('_')
base = '_'.join(chunks)
while base not in self.classes and len(chunks)>1:
del chunks[-2]
base = '_'.join(chunks)
if base not in self.classes:
print("Generator error: unable to resolve base %s for %s"
% (classinfo.base, classinfo.name))
sys.exit(-1)
classinfo.base = base
classinfo.isalgorithm |= self.classes[base].isalgorithm
def split_decl_name(self, name):
chunks = name.split('.')
namespace = chunks[:-1]
@@ -881,6 +868,22 @@ class PythonWrapperGenerator(object):
# function
self.add_func(decl)
# step 1.5 check if all base classes exist
for name, classinfo in self.classes.items():
if classinfo.base:
chunks = classinfo.base.split('_')
base = '_'.join(chunks)
while base not in self.classes and len(chunks)>1:
del chunks[-2]
base = '_'.join(chunks)
if base not in self.classes:
print("Generator error: unable to resolve base %s for %s"
% (classinfo.base, classinfo.name))
sys.exit(-1)
classinfo.base = base
classinfo.isalgorithm |= self.classes[base].isalgorithm
self.classes[name] = classinfo
# step 2: generate code for the classes and their methods
classlist = list(self.classes.items())
classlist.sort()