X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=bindings%2Fcxx%2Fenums.py;h=1941f783a8b3bcc92c0c606e0f3b3348aae85700;hb=fe4096fde6edf35d93bca8293172cf261e33ad8a;hp=380faf91d838dc68195fe623d73722e7b38b10d2;hpb=33c84e81975c75b73002b038a0076f384ca13d63;p=libsigrok.git

diff --git a/bindings/cxx/enums.py b/bindings/cxx/enums.py
index 380faf91..1941f783 100644
--- a/bindings/cxx/enums.py
+++ b/bindings/cxx/enums.py
@@ -66,6 +66,7 @@ for compound in index.findall('compound'):
 
 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! */"
@@ -73,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):
@@ -138,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");' % (
@@ -153,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, '};'
@@ -163,3 +145,7 @@ 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())
+
+    # Instantiate EnumValue template for SWIG wrappers
+    print >> swig, '%%template(EnumValue%s) EnumValue<%s, enum %s>;' % (
+        classname, classname, enum_name)