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

diff --git a/bindings/cxx/enums.py b/bindings/cxx/enums.py
index 1941f783..25bd6f42 100644
--- a/bindings/cxx/enums.py
+++ b/bindings/cxx/enums.py
@@ -146,6 +146,15 @@ for enum, (classname, classbrief) in classes.items():
     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>;' % (
+    # 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())