mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2025-06-13 13:13:26 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

objc: skip unsupported inner namespaces

Browse Source
This commit is contained in:
Alexander Alekhin 2020-11-15 19:22:05 +00:00
parent 06477743ab
commit 4c9e3723e8
1 changed files with 41 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
modules/objc/generator/gen_objc.py
View File

@ -27,6 +27,10 @@ updated_files = 0
module_imports = [] module_imports = []
# list of namespaces, which should be skipped by wrapper generator
# the list is loaded from misc/objc/gen_dict.json defined for the module only
namespace_ignore_list = []
# list of class names, which should be skipped by wrapper generator # list of class names, which should be skipped by wrapper generator
# the list is loaded from misc/objc/gen_dict.json defined for the module and its dependencies # the list is loaded from misc/objc/gen_dict.json defined for the module and its dependencies
class_ignore_list = [] class_ignore_list = []
@ -89,6 +93,14 @@ method_dict = {
modules = [] modules = []
class SkipSymbolException(Exception):
def __init__(self, text):
self.t = text
def __str__(self):
return self.t
def read_contents(fname): def read_contents(fname):
with open(fname, 'r') as f: with open(fname, 'r') as f:
data = f.read() data = f.read()
@ -122,6 +134,10 @@ class GeneralInfo():
def __init__(self, type, decl, namespaces): def __init__(self, type, decl, namespaces):
self.symbol_id, self.namespace, self.classpath, self.classname, self.name = self.parseName(decl[0], namespaces) self.symbol_id, self.namespace, self.classpath, self.classname, self.name = self.parseName(decl[0], namespaces)
for ns_ignore in namespace_ignore_list:
if self.symbol_id.startswith(ns_ignore + '.'):
raise SkipSymbolException('ignored namespace ({}): {}'.format(ns_ignore, self.symbol_id))
# parse doxygen comments # parse doxygen comments
self.params={} self.params={}
@ -709,6 +725,10 @@ class ObjectiveCWrapperGenerator(object):
if self.isWrapped(name) and not classinfo.base: if self.isWrapped(name) and not classinfo.base:
logging.warning('duplicated: %s', classinfo) logging.warning('duplicated: %s', classinfo)
return None return None
if name in self.classes: # TODO implement inner namespaces
if self.classes[name].symbol_id != classinfo.symbol_id:
logging.warning('duplicated under new id: {} (was {})'.format(classinfo.symbol_id, self.classes[name].symbol_id))
return None
self.classes[name] = classinfo self.classes[name] = classinfo
if name in type_dict and not classinfo.base: if name in type_dict and not classinfo.base:
logging.warning('duplicated: %s', classinfo) logging.warning('duplicated: %s', classinfo)
@ -812,7 +832,12 @@ class ObjectiveCWrapperGenerator(object):
elif not self.isWrapped(classname): elif not self.isWrapped(classname):
logging.warning('not found: %s', fi) logging.warning('not found: %s', fi)
else: else:
self.getClass(classname).addMethod(fi) ci = self.getClass(classname)
if ci.symbol_id != fi.symbol_id[0:fi.symbol_id.rfind('.')] and ci.symbol_id != self.Module:
# TODO fix this (inner namepaces)
logging.warning('SKIP: mismatched class: {} (class: {})'.format(fi.symbol_id, ci.symbol_id))
return
ci.addMethod(fi)
logging.info('ok: %s', fi) logging.info('ok: %s', fi)
# calc args with def val # calc args with def val
cnt = len([a for a in fi.args if a.defval]) cnt = len([a for a in fi.args if a.defval])
@ -867,17 +892,20 @@ class ObjectiveCWrapperGenerator(object):
for decl in decls: for decl in decls:
logging.info("\n--- Incoming ---\n%s", pformat(decl[:5], 4)) # without docstring logging.info("\n--- Incoming ---\n%s", pformat(decl[:5], 4)) # without docstring
name = decl[0] name = decl[0]
if name.startswith("struct") or name.startswith("class"): try:
ci = self.add_class(decl) if name.startswith("struct") or name.startswith("class"):
if ci: ci = self.add_class(decl)
ci.header_import = header_import(hdr) if ci:
elif name.startswith("const"): ci.header_import = header_import(hdr)
self.add_const(decl) elif name.startswith("const"):
elif name.startswith("enum"): self.add_const(decl)
# enum elif name.startswith("enum"):
self.add_enum(decl) # enum
else: # function self.add_enum(decl)
self.add_func(decl) else: # function
self.add_func(decl)
except SkipSymbolException as e:
logging.info('SKIP: {} due to {}'.format(name, e))
self.classes[self.Module].member_classes += manual_classes self.classes[self.Module].member_classes += manual_classes
logging.info("\n\n===== Generating... =====") logging.info("\n\n===== Generating... =====")
@ -1602,6 +1630,7 @@ if __name__ == "__main__":
if os.path.exists(gendict_fname): if os.path.exists(gendict_fname):
with open(gendict_fname) as f: with open(gendict_fname) as f:
gen_type_dict = json.load(f) gen_type_dict = json.load(f)
namespace_ignore_list = gen_type_dict.get("namespace_ignore_list", [])
class_ignore_list += gen_type_dict.get("class_ignore_list", []) class_ignore_list += gen_type_dict.get("class_ignore_list", [])
enum_ignore_list += gen_type_dict.get("enum_ignore_list", []) enum_ignore_list += gen_type_dict.get("enum_ignore_list", [])
const_ignore_list += gen_type_dict.get("const_ignore_list", []) const_ignore_list += gen_type_dict.get("const_ignore_list", [])