Commit c6ed2bf9 authored by Hamdi Sahloul's avatar Hamdi Sahloul

opencv_js: fix a bug in handling enums using the new parser

parent 40b1dc12
...@@ -369,7 +369,7 @@ class JSWrapperGenerator(object): ...@@ -369,7 +369,7 @@ class JSWrapperGenerator(object):
return namespace, classes, chunks[-1] return namespace, classes, chunks[-1]
def add_enum(self, decl): def add_enum(self, decl):
name = decl[1] name = decl[0].rsplit(" ", 1)[1]
namespace, classes, val = self.split_decl_name(name) namespace, classes, val = self.split_decl_name(name)
namespace = '.'.join(namespace) namespace = '.'.join(namespace)
val = '_'.join(classes + [name]) val = '_'.join(classes + [name])
...@@ -384,6 +384,12 @@ class JSWrapperGenerator(object): ...@@ -384,6 +384,12 @@ class JSWrapperGenerator(object):
for item in decl[3]: for item in decl[3]:
ns.enums[name].append(item) ns.enums[name].append(item)
const_decls = decl[3]
for decl in const_decls:
name = decl[0]
self.add_const(name.replace("const ", "").strip(), decl)
def add_const(self, name, decl): def add_const(self, name, decl):
cname = name.replace('.','::') cname = name.replace('.','::')
namespace, classes, name = self.split_decl_name(name) namespace, classes, name = self.split_decl_name(name)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment