X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=bindings%2Fcxx%2Fenums.py;h=25bd6f428271a939cd7fa6a8bba2c5c5f44e7e6c;hb=444d6a3975787583494fa91cbb20c26d0ac858b5;hp=fdc8e8e3dcda46a68c0afeb3cdaf41a3b01e4227;hpb=84c870852af95aebf9c1c2fd3e30350b8c2c029a;p=libsigrok.git

diff --git a/bindings/cxx/enums.py b/bindings/cxx/enums.py
index fdc8e8e3..25bd6f42 100644
--- a/bindings/cxx/enums.py
+++ b/bindings/cxx/enums.py
@@ -26,6 +26,10 @@ index_file = sys.argv[1]
 # Get directory this script is in.
 dirname = os.path.dirname(os.path.realpath(__file__))
 
+outdirname = "bindings/cxx"
+if not os.path.exists(os.path.join(outdirname, 'include/libsigrok')):
+    os.makedirs(os.path.join(outdirname, 'include/libsigrok'))
+
 mapping = dict([
     ('sr_loglevel', ('LogLevel', 'Log verbosity level')),
     ('sr_packettype', ('PacketType', 'Type of datafeed packet')),
@@ -60,8 +64,9 @@ for compound in index.findall('compound'):
             if name in mapping:
                 classes[member] = mapping[name]
 
-header = open(os.path.join(dirname, 'include/libsigrok/enums.hpp'), 'w')
-code = open(os.path.join(dirname, 'enums.cpp'), 'w')
+header = open(os.path.join(outdirname, 'include/libsigrok/enums.hpp'), 'w')
+code = open(os.path.join(outdirname, 'enums.cpp'), 'w')
+swig = open(os.path.join(outdirname, '../swig/enums.i'), 'w')
 
 for file in (header, code):
     print >> file, "/* Generated file - edit enums.py instead! */"
@@ -69,30 +74,15 @@ for file in (header, code):
 # Template for beginning of class declaration and public members.
 header_public_template = """
 /** {brief} */
-class SR_API {classname} : public EnumValue<enum {enumname}>
+class SR_API {classname} : public EnumValue<{classname}, enum {enumname}>
 {{
 public:
-    static const {classname} *get(int id);
 """
 
 # Template for beginning of private members.
 header_private_template = """
-private:
-    static const std::map<enum {enumname}, const {classname} *> values;
-    {classname}(enum {enumname} id, const char name[]);
-"""
-
-# Template for class method definitions.
-code_template = """
-{classname}::{classname}(enum {enumname} id, const char name[]) :
-    EnumValue<enum {enumname}>(id, name)
-{{
-}}
-
-const {classname} *{classname}::get(int id)
-{{
-    return {classname}::values.at(static_cast<{enumname}>(id));
-}}
+protected:
+    {classname}(enum {enumname} id, const char name[]) : EnumValue(id, name) {{}}
 """
 
 def get_text(node):
@@ -134,10 +124,6 @@ for enum, (classname, classbrief) in classes.items():
     # End class declaration
     print >> header, '};'
 
-    # Begin class code
-    print >> code, code_template.format(
-        classname=classname, enumname=enum_name)
-
     # Define private constants for each enum value
     for name, trimmed_name in zip(member_names, trimmed_names):
         print >> code, 'const %s %s::_%s = %s(%s, "%s");' % (
@@ -149,8 +135,8 @@ for enum, (classname, classbrief) in classes.items():
             classname, classname, trimmed_name, classname, trimmed_name)
 
     # Define map of enum values to constants
-    print >> code, 'const std::map<enum %s, const %s *> %s::values = {' % (
-        enum_name, classname, classname)
+    print >> code, 'template<> const std::map<const enum %s, const %s * const> EnumValue<%s, enum %s>::_values = {' % (
+        enum_name, classname, classname, enum_name)
     for name, trimmed_name in zip(member_names, trimmed_names):
         print >> code, '\t{%s, %s::%s},' % (name, classname, trimmed_name)
     print >> code, '};'
@@ -159,3 +145,16 @@ for enum, (classname, classbrief) in classes.items():
     filename = os.path.join(dirname, "%s_methods.cpp" % classname)
     if os.path.exists(filename):
         print >> code, str.join('', open(filename).readlines())
+
+    # Map EnumValue::id() and EnumValue::name() as SWIG attributes.
+    print >> swig, '%%attribute(sigrok::%s, int, id, id);' % classname
+    print >> swig, '%%attributestring(sigrok::%s, std::string, name, name);' % classname
+
+    # Instantiate EnumValue template for SWIG
+    print >> swig, '%%template(EnumValue%s) sigrok::EnumValue<sigrok::%s, enum %s>;' % (
+        classname, classname, enum_name)
+
+    # Declare additional attributes if present
+    filename = os.path.join(dirname, "%s_methods.i" % classname)
+    if os.path.exists(filename):
+        print >> swig, str.join('', open(filename).readlines())