python: Fix string conversions for Python 3.

[libsigrok.git] / bindings / java / org / sigrok / core / classes / classes.i

diff --git a/bindings/java/org/sigrok/core/classes/classes.i b/bindings/java/org/sigrok/core/classes/classes.i
index ba95144b74e4827554f1bc10727071aca271394b..7a61bfd55d2610b7bfa5b0da333b7868fbfaaeaa 100644 (file)
--- a/bindings/java/org/sigrok/core/classes/classes.i
+++ b/bindings/java/org/sigrok/core/classes/classes.i
@@ -75,7 +75,7 @@ namespace Glib {
   jlong value;
   for (auto entry : $1)
   {
-    *(CValue **) &value = new CValue(entry);
+    value = reinterpret_cast<intptr_t>(new CValue(entry));
     jenv->CallObjectMethod($result, Vector_add,
       jenv->NewObject(Value, Value_init, value, true));
   }
@@ -149,8 +149,7 @@ MAP_COMMON(std::string, std::shared_ptr<sigrok::ClassName>, String, ClassName)
   jlong value;
   for (auto entry : $1)
   {
-    *(std::shared_ptr< sigrok::ClassName > **)&value =
-      new std::shared_ptr< sigrok::ClassName>(entry.second);
+    value = reinterpret_cast<intptr_t>(new std::shared_ptr< sigrok::ClassName>(entry.second));
     jenv->CallObjectMethod($result, HashMap_put,
       jenv->NewStringUTF(entry.first.c_str()),
       jenv->NewObject(Value, Value_init, value, true));
@@ -185,14 +184,52 @@ MAP_COMMON(const sigrok::ConfigKey *, Glib::VariantBase, ConfigKey, Variant)
   jlong value;
   for (auto entry : $1)
   {
-    *(const sigrok::ConfigKey **) &key = entry.first;
-    *(Glib::VariantBase **) &value = new Glib::VariantBase(entry.second);
+    key = reinterpret_cast<intptr_t>(entry.first);
+    value = reinterpret_cast<intptr_t>(new Glib::VariantBase(entry.second));
     jenv->CallObjectMethod($result, HashMap_put,
       jenv->NewObject(ConfigKey, ConfigKey_init, key, false));
       jenv->NewObject(Variant, Variant_init, value, true));
   }
 }
 
+/* Specialisation for ConfigKey->set<Capability> maps */
+
+MAP_COMMON(const sigrok::ConfigKey *, std::set<enum sigrok::Capability>,
+  ConfigKey, java.util.Set<Capability>)
+
+%typemap(jni) std::map<const sigrok::ConfigKey *, std::set<enum sigrok::Capability> > "jobject"
+%typemap(jtype) std::map<const sigrok::ConfigKey *, std::set<enum sigrok::Capability> >
+  "java.util.Map<ConfigKey,java.util.Set<Capability>>"
+
+%typemap(out) std::map<const sigrok::ConfigKey *, std::set<enum sigrok::Capability> > {
+  jclass HashMap = jenv->FindClass("java/util/HashMap");
+  jmethodID HashMap_init = jenv->GetMethodID(HashMap, "<init>", "()V");
+  jmethodID HashMap_put = jenv->GetMethodID(HashMap, "put",
+    "(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;");
+  jclass HashSet = jenv->FindClass("java/util/HashSet");
+  jmethodID HashSet_init = jenv->GetMethodID(HashSet, "<init>", "()V");
+  jmethodID HashSet_add = jenv->GetMethodID(HashSet, "add",
+    "(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;");
+  jclass ConfigKey = jenv->FindClass("org/sigrok/core/classes/ConfigKey");
+  jmethodID ConfigKey_init = jenv->GetMethodID(ConfigKey, "<init>", "(JZ)V");
+  jclass Capability = jenv->FindClass("org/sigrok/core/classes/Capability");
+  jmethodID Capability_swigToEnum = jenv->GetStaticMethodID(Capability,
+    "swigToEnum", "(I)Lorg/sigrok/core/classes/Capability;");
+  $result = jenv->NewObject(HashMap, HashMap_init);
+  jlong key;
+  for (auto map_entry : $1)
+  {
+    key = reinterpret_cast<intptr_t>(map_entry.first);
+    jobject value = jenv->NewObject(HashSet, HashSet_init);
+    for (auto &set_entry : map_entry.second)
+      jenv->CallObjectMethod(value, HashSet_add,
+        jenv->CallStaticObjectMethod(Capability,
+          Capability_swigToEnum, set_entry));
+    jenv->CallObjectMethod($result, HashMap_put,
+      jenv->NewObject(ConfigKey, ConfigKey_init, key, false), value);
+  }
+}
+
 /* Pass JNIEnv parameter to C++ extension methods requiring it. */
 
 %typemap(in, numinputs=0) JNIEnv * %{
@@ -230,7 +267,7 @@ typedef jobject jlogcallback;
       std::string message)
     {
       jlong loglevel_addr;
-      *(const sigrok::LogLevel **) &loglevel_addr = loglevel;
+      loglevel_addr = reinterpret_cast<intptr_t>(loglevel);
       jobject loglevel_obj = env->NewObject(
         LogLevel, LogLevel_init, loglevel_addr, false);
       jobject message_obj = env->NewStringUTF(message.c_str());
@@ -276,10 +313,8 @@ typedef jobject jdatafeedcallback;
     {
       jlong device_addr;
       jlong packet_addr;
-      *(std::shared_ptr<sigrok::Device> **) &device_addr =
-        new std::shared_ptr<sigrok::Device>(device);
-      *(std::shared_ptr<sigrok::Packet> **) &packet_addr =
-        new std::shared_ptr<sigrok::Packet>(packet);
+      device_addr = reinterpret_cast<intptr_t>(new std::shared_ptr<sigrok::Device>(device));
+      packet_addr = reinterpret_cast<intptr_t>(new std::shared_ptr<sigrok::Packet>(packet));
       jobject device_obj = env->NewObject(
         Device, Device_init, device_addr, true);
       jobject packet_obj = env->NewObject(
@@ -293,20 +328,13 @@ typedef jobject jdatafeedcallback;
 
 %include "doc.i"
 
-%define %attributevector(Class, Type, Name, Get)
-%attributeval(sigrok::Class, Type, Name, Get);
-%enddef
-
-%define %attributemap(Class, Type, Name, Get)
-%attributeval(sigrok::Class, Type, Name, Get);
-%enddef
-
 %define %enumextras(Class)
 %enddef
 
 /* Ignore these for now, need fixes. */
 %ignore sigrok::Context::create_analog_packet;
 %ignore sigrok::Context::create_meta_packet;
+%ignore sigrok::Meta::config;
 
 %include "bindings/swig/classes.i"