Merge pull request #137 from kornilova-l/union-value-field

Fix union helper methods for fields of value type

Author: kornilova203

bindgen/ir/Struct.cpp

@@ -260,15 +260,8 @@ std::string Union::generateHelperClass() const {
       << "(val p: native.Ptr[" << type << "]) extends AnyVal {\n";
     for (const auto &field : fields) {
         if (!field->getName().empty()) {
-            std::string getter = handleReservedWords(field->getName());
-            std::string setter = handleReservedWords(field->getName(), "_=");
-            std::shared_ptr<const Type> ftype = field->getType();
-            s << "    def " << getter << ": native.Ptr[" << ftype->str()
-              << "] = p.cast[native.Ptr[" << ftype->str() << "]]\n";
-
-            s << "    def " << setter << "(value: " << ftype->str()
-              << "): Unit = !p.cast[native.Ptr[" << ftype->str()
-              << "]] = value\n";
+            s << generateGetter(field);
+            s << generateSetter(field);
         }
     }
     s << "  }\n";
@@ -288,3 +281,22 @@ bool Union::operator==(const Type &other) const {
     }
     return false;
 }
+
+std::string Union::generateGetter(const std::shared_ptr<Field> &field) const {
+    std::string getter = handleReservedWords(field->getName());
+    std::string ftype = field->getType()->str();
+    return "    def " + getter + ": native.Ptr[" + ftype +
+           "] = p.cast[native.Ptr[" + ftype + "]]\n";
+}
+
+std::string Union::generateSetter(const std::shared_ptr<Field> &field) const {
+    std::string setter = handleReservedWords(field->getName(), "_=");
+    std::string ftype = field->getType()->str();
+    if (isAliasForType<ArrayType>(field->getType().get()) ||
+        isAliasForType<Struct>(field->getType().get())) {
+        return "    def " + setter + "(value: native.Ptr[" + ftype +
+               "]): Unit = !p.cast[native.Ptr[" + ftype + "]] = !value\n";
+    }
+    return "    def " + setter + "(value: " + ftype +
+           "): Unit = !p.cast[native.Ptr[" + ftype + "]] = value\n";
+}

bindgen/ir/Struct.h

@@ -114,6 +114,11 @@ class Union : public StructOrUnion, public ArrayType {
     bool operator==(const Type &other) const override;
 
     std::string getTypeAlias() const override;
+
+  private:
+    std::string generateGetter(const std::shared_ptr<Field> &field) const;
+
+    std::string generateSetter(const std::shared_ptr<Field> &field) const;
 };
 
 #endif // SCALA_NATIVE_BINDGEN_STRUCT_H

tests/samples/ReservedWords.scala

@@ -49,6 +49,6 @@ object ReservedWordsHelpers {
     def `forSome`: native.Ptr[`match`] = p.cast[native.Ptr[`match`]]
     def `forSome_=`(value: `match`): Unit = !p.cast[native.Ptr[`match`]] = value
     def `implicit`: native.Ptr[native.CArray[Byte, native.Nat.Digit[native.Nat._1, native.Nat._6]]] = p.cast[native.Ptr[native.CArray[Byte, native.Nat.Digit[native.Nat._1, native.Nat._6]]]]
-    def `implicit_=`(value: native.CArray[Byte, native.Nat.Digit[native.Nat._1, native.Nat._6]]): Unit = !p.cast[native.Ptr[native.CArray[Byte, native.Nat.Digit[native.Nat._1, native.Nat._6]]]] = value
+    def `implicit_=`(value: native.Ptr[native.CArray[Byte, native.Nat.Digit[native.Nat._1, native.Nat._6]]]): Unit = !p.cast[native.Ptr[native.CArray[Byte, native.Nat.Digit[native.Nat._1, native.Nat._6]]]] = !value
   }
 }

tests/samples/Union.c

@@ -52,4 +52,14 @@ int union_test_string(union values *v, enum union_op op, const char *value) {
     case UNION_TEST:
         return v->s == value || !strcmp(v->s, value);
     }
-}
+}
+
+int union_test_struct(union values *v, enum union_op op, struct s *value) {
+    switch (op) {
+    case UNION_SET:
+        v->structInUnion.a = value->a;
+        return 1;
+    case UNION_TEST:
+        return v->structInUnion.a == value->a;
+    }
+}

tests/samples/Union.h

@@ -1,9 +1,14 @@
+struct s {
+    int a;
+};
+
 union values {
     long l;
     int i;
     long long ll;
     double d;
     const char *s;
+    struct s structInUnion;
 };
 
 enum union_op { UNION_SET, UNION_TEST };
@@ -15,3 +20,4 @@ int union_test_long(union values *v, enum union_op op, long value);
 int union_test_long_long(union values *v, enum union_op op, long long value);
 int union_test_double(union values *v, enum union_op op, double value);
 int union_test_string(union values *v, enum union_op op, const char *value);
+int union_test_struct(union values *v, enum union_op op, struct s *value);

tests/samples/Union.scala

@@ -6,6 +6,7 @@ import scala.scalanative.native._
 @native.link("bindgentests")
 @native.extern
 object Union {
+  type struct_s = native.CStruct1[native.CInt]
   type union_values = native.CArray[Byte, native.Nat._8]
   type enum_union_op = native.CUnsignedInt
   def union_get_sizeof(): native.CInt = native.extern
@@ -14,6 +15,7 @@ object Union {
   def union_test_long_long(v: native.Ptr[union_values], op: enum_union_op, value: native.CLongLong): native.CInt = native.extern
   def union_test_double(v: native.Ptr[union_values], op: enum_union_op, value: native.CDouble): native.CInt = native.extern
   def union_test_string(v: native.Ptr[union_values], op: enum_union_op, value: native.CString): native.CInt = native.extern
+  def union_test_struct(v: native.Ptr[union_values], op: enum_union_op, value: native.Ptr[struct_s]): native.CInt = native.extern
 }
 
 import Union._
@@ -25,6 +27,13 @@ object UnionEnums {
 
 object UnionHelpers {
 
+  implicit class struct_s_ops(val p: native.Ptr[struct_s]) extends AnyVal {
+    def a: native.CInt = !p._1
+    def a_=(value: native.CInt): Unit = !p._1 = value
+  }
+
+  def struct_s()(implicit z: native.Zone): native.Ptr[struct_s] = native.alloc[struct_s]
+
   implicit class union_values_pos(val p: native.Ptr[union_values]) extends AnyVal {
     def l: native.Ptr[native.CLong] = p.cast[native.Ptr[native.CLong]]
     def l_=(value: native.CLong): Unit = !p.cast[native.Ptr[native.CLong]] = value
@@ -36,5 +45,7 @@ object UnionHelpers {
     def d_=(value: native.CDouble): Unit = !p.cast[native.Ptr[native.CDouble]] = value
     def s: native.Ptr[native.CString] = p.cast[native.Ptr[native.CString]]
     def s_=(value: native.CString): Unit = !p.cast[native.Ptr[native.CString]] = value
+    def structInUnion: native.Ptr[struct_s] = p.cast[native.Ptr[struct_s]]
+    def structInUnion_=(value: native.Ptr[struct_s]): Unit = !p.cast[native.Ptr[struct_s]] = !value
   }
 }

tests/samples/src/test/scala/org/scalanative/bindgen/samples/UnionTests.scala

@@ -56,6 +56,13 @@ object UnionTests extends TestSuite {
                                 UnionEnums.enum_union_op_UNION_SET,
                                 null)
         assert(!unionPtr.s == null)
+
+        val struct = alloc[Union.struct_s]
+        struct.a = 10
+        Union.union_test_struct(unionPtr,
+          UnionEnums.enum_union_op_UNION_SET,
+          struct)
+        assert(unionPtr.structInUnion.a == 10)
       }
     }
 
@@ -112,6 +119,14 @@ object UnionTests extends TestSuite {
           Union.union_test_string(unionPtr,
                                   UnionEnums.enum_union_op_UNION_TEST,
                                   null) == 1)
+
+        val struct = alloc[Union.struct_s]
+        struct.a = 10
+        unionPtr.structInUnion = struct
+        assert(
+          Union.union_test_struct(unionPtr,
+            UnionEnums.enum_union_op_UNION_TEST,
+            struct) == 1)
       }
     }
   }