Add tests for big struct fields

Author: kornilova203

bindgen/ir/Struct.cpp

@@ -95,7 +95,7 @@ std::string Struct::generateHelperClass() const {
 
 bool Struct::hasHelperMethods() const {
     if (!isRepresentedAsStruct()) {
-        return false;
+        return !fields.empty();
     }
     return !isPacked && !fields.empty();
 }

bindgen/ir/Struct.h

@@ -83,12 +83,12 @@ class Struct : public StructOrUnion,
     bool isRepresentedAsStruct() const;
 
     /**
-     * @return implicit helper class for struct that is represented as CStruct.
+     * @return helper class methods for struct that is represented as CStruct.
      */
     std::string generateHelperClassMethodsForStructRepresentation() const;
 
     /**
-     * @return implicit helper class for struct that is represented as CArray.
+     * @return helper class methods for struct that is represented as CArray.
      */
     std::string generateHelperClassMethodsForArrayRepresentation() const;
 

tests/samples/Struct.c

@@ -37,3 +37,34 @@ char getCharFromAnonymousStruct(struct structWithAnonymousStruct *s) {
 char getIntFromAnonymousStruct(struct structWithAnonymousStruct *s) {
     return s->anonymousStruct.i;
 }
+
+int struct_test_long(struct bigStruct *s, enum struct_op op, long value) {
+    switch (op) {
+    case STRUCT_SET:
+        s->one = value;
+        return 1;
+    case STRUCT_TEST:
+        return s->one == value;
+    }
+}
+
+int struct_test_double(struct bigStruct *s, enum struct_op op, double value) {
+    switch (op) {
+    case STRUCT_SET:
+        s->five = value;
+        return 1;
+    case STRUCT_TEST:
+        return s->five == value;
+    }
+}
+
+int struct_test_point(struct bigStruct *s, enum struct_op op,
+                      struct point *value) {
+    switch (op) {
+    case STRUCT_SET:
+        s->six = *value;
+        return 1;
+    case STRUCT_TEST:
+        return (s->six.x == value->x) && (s->six.y == value->y);
+    }
+}

tests/samples/Struct.h

@@ -26,8 +26,8 @@ struct bigStruct {
     int three;
     float four;
     double five;
-    point_s six;
-    int seven;
+    struct point six;
+    struct point *seven;
     int eight;
     int nine;
     int ten;
@@ -63,3 +63,10 @@ struct __attribute__((__packed__)) packedStruct { // no helper methods
 char getCharFromAnonymousStruct(struct structWithAnonymousStruct *s);
 
 char getIntFromAnonymousStruct(struct structWithAnonymousStruct *s);
+
+enum struct_op { STRUCT_SET, STRUCT_TEST };
+
+int struct_test_long(struct bigStruct *s, enum struct_op op, long value);
+int struct_test_double(struct bigStruct *s, enum struct_op op, double value);
+int struct_test_point(struct bigStruct *s, enum struct_op op,
+                      struct point *value);

tests/samples/Struct.scala

@@ -14,12 +14,16 @@ object Struct {
   type struct_bigStruct = native.CArray[Byte, native.Nat.Digit[native.Nat._1, native.Nat.Digit[native.Nat._1, native.Nat._2]]]
   type struct_structWithAnonymousStruct = native.CStruct2[native.CInt, native.CArray[Byte, native.Nat._8]]
   type struct_packedStruct = native.CStruct1[native.CChar]
+  type enum_struct_op = native.CUnsignedInt
   def setPoints(points: native.Ptr[struct_points], x1: native.CInt, y1: native.CInt, x2: native.CInt, y2: native.CInt): Unit = native.extern
   def getPoint(points: native.Ptr[struct_points], pointIndex: enum_pointIndex): native.CInt = native.extern
   def createPoint(): native.Ptr[struct_point] = native.extern
   def getBigStructSize(): native.CInt = native.extern
   def getCharFromAnonymousStruct(s: native.Ptr[struct_structWithAnonymousStruct]): native.CChar = native.extern
   def getIntFromAnonymousStruct(s: native.Ptr[struct_structWithAnonymousStruct]): native.CChar = native.extern
+  def struct_test_long(s: native.Ptr[struct_bigStruct], op: enum_struct_op, value: native.CLong): native.CInt = native.extern
+  def struct_test_double(s: native.Ptr[struct_bigStruct], op: enum_struct_op, value: native.CDouble): native.CInt = native.extern
+  def struct_test_point(s: native.Ptr[struct_bigStruct], op: enum_struct_op, value: native.Ptr[struct_point]): native.CInt = native.extern
 }
 
 import Struct._
@@ -29,6 +33,9 @@ object StructEnums {
   final val enum_pointIndex_Y1: enum_pointIndex = 1.toUInt
   final val enum_pointIndex_X2: enum_pointIndex = 2.toUInt
   final val enum_pointIndex_Y2: enum_pointIndex = 3.toUInt
+
+  final val enum_struct_op_STRUCT_SET: enum_struct_op = 0.toUInt
+  final val enum_struct_op_STRUCT_TEST: enum_struct_op = 1.toUInt
 }
 
 object StructHelpers {
@@ -62,42 +69,42 @@ object StructHelpers {
     def four_=(value: native.CFloat): Unit = !(p._1 + 16).cast[native.Ptr[native.CFloat]] = value
     def five: native.CDouble = !(p._1 + 24).cast[native.Ptr[native.CDouble]]
     def five_=(value: native.CDouble): Unit = !(p._1 + 24).cast[native.Ptr[native.CDouble]] = value
-    def six: native.Ptr[struct_point] = !(p._1 + 32).cast[native.Ptr[native.Ptr[struct_point]]]
-    def six_=(value: native.Ptr[struct_point]): Unit = !(p._1 + 32).cast[native.Ptr[native.Ptr[struct_point]]] = value
-    def seven: native.CInt = !(p._1 + 40).cast[native.Ptr[native.CInt]]
-    def seven_=(value: native.CInt): Unit = !(p._1 + 40).cast[native.Ptr[native.CInt]] = value
-    def eight: native.CInt = !(p._1 + 44).cast[native.Ptr[native.CInt]]
-    def eight_=(value: native.CInt): Unit = !(p._1 + 44).cast[native.Ptr[native.CInt]] = value
-    def nine: native.CInt = !(p._1 + 48).cast[native.Ptr[native.CInt]]
-    def nine_=(value: native.CInt): Unit = !(p._1 + 48).cast[native.Ptr[native.CInt]] = value
-    def ten: native.CInt = !(p._1 + 52).cast[native.Ptr[native.CInt]]
-    def ten_=(value: native.CInt): Unit = !(p._1 + 52).cast[native.Ptr[native.CInt]] = value
-    def eleven: native.CInt = !(p._1 + 56).cast[native.Ptr[native.CInt]]
-    def eleven_=(value: native.CInt): Unit = !(p._1 + 56).cast[native.Ptr[native.CInt]] = value
-    def twelve: native.CInt = !(p._1 + 60).cast[native.Ptr[native.CInt]]
-    def twelve_=(value: native.CInt): Unit = !(p._1 + 60).cast[native.Ptr[native.CInt]] = value
-    def thirteen: native.CInt = !(p._1 + 64).cast[native.Ptr[native.CInt]]
-    def thirteen_=(value: native.CInt): Unit = !(p._1 + 64).cast[native.Ptr[native.CInt]] = value
-    def fourteen: native.CInt = !(p._1 + 68).cast[native.Ptr[native.CInt]]
-    def fourteen_=(value: native.CInt): Unit = !(p._1 + 68).cast[native.Ptr[native.CInt]] = value
-    def fifteen: native.CInt = !(p._1 + 72).cast[native.Ptr[native.CInt]]
-    def fifteen_=(value: native.CInt): Unit = !(p._1 + 72).cast[native.Ptr[native.CInt]] = value
-    def sixteen: native.CInt = !(p._1 + 76).cast[native.Ptr[native.CInt]]
-    def sixteen_=(value: native.CInt): Unit = !(p._1 + 76).cast[native.Ptr[native.CInt]] = value
-    def seventeen: native.CInt = !(p._1 + 80).cast[native.Ptr[native.CInt]]
-    def seventeen_=(value: native.CInt): Unit = !(p._1 + 80).cast[native.Ptr[native.CInt]] = value
-    def eighteen: native.CInt = !(p._1 + 84).cast[native.Ptr[native.CInt]]
-    def eighteen_=(value: native.CInt): Unit = !(p._1 + 84).cast[native.Ptr[native.CInt]] = value
-    def nineteen: native.CInt = !(p._1 + 88).cast[native.Ptr[native.CInt]]
-    def nineteen_=(value: native.CInt): Unit = !(p._1 + 88).cast[native.Ptr[native.CInt]] = value
-    def twenty: native.CInt = !(p._1 + 92).cast[native.Ptr[native.CInt]]
-    def twenty_=(value: native.CInt): Unit = !(p._1 + 92).cast[native.Ptr[native.CInt]] = value
-    def twentyOne: native.CInt = !(p._1 + 96).cast[native.Ptr[native.CInt]]
-    def twentyOne_=(value: native.CInt): Unit = !(p._1 + 96).cast[native.Ptr[native.CInt]] = value
-    def twentyTwo: native.CInt = !(p._1 + 100).cast[native.Ptr[native.CInt]]
-    def twentyTwo_=(value: native.CInt): Unit = !(p._1 + 100).cast[native.Ptr[native.CInt]] = value
-    def twentyThree: native.CInt = !(p._1 + 104).cast[native.Ptr[native.CInt]]
-    def twentyThree_=(value: native.CInt): Unit = !(p._1 + 104).cast[native.Ptr[native.CInt]] = value
+    def six: native.Ptr[struct_point] = (p._1 + 32).cast[native.Ptr[struct_point]]
+    def six_=(value: native.Ptr[struct_point]): Unit = !(p._1 + 32).cast[native.Ptr[struct_point]] = !value
+    def seven: native.Ptr[struct_point] = !(p._1 + 40).cast[native.Ptr[native.Ptr[struct_point]]]
+    def seven_=(value: native.Ptr[struct_point]): Unit = !(p._1 + 40).cast[native.Ptr[native.Ptr[struct_point]]] = value
+    def eight: native.CInt = !(p._1 + 48).cast[native.Ptr[native.CInt]]
+    def eight_=(value: native.CInt): Unit = !(p._1 + 48).cast[native.Ptr[native.CInt]] = value
+    def nine: native.CInt = !(p._1 + 52).cast[native.Ptr[native.CInt]]
+    def nine_=(value: native.CInt): Unit = !(p._1 + 52).cast[native.Ptr[native.CInt]] = value
+    def ten: native.CInt = !(p._1 + 56).cast[native.Ptr[native.CInt]]
+    def ten_=(value: native.CInt): Unit = !(p._1 + 56).cast[native.Ptr[native.CInt]] = value
+    def eleven: native.CInt = !(p._1 + 60).cast[native.Ptr[native.CInt]]
+    def eleven_=(value: native.CInt): Unit = !(p._1 + 60).cast[native.Ptr[native.CInt]] = value
+    def twelve: native.CInt = !(p._1 + 64).cast[native.Ptr[native.CInt]]
+    def twelve_=(value: native.CInt): Unit = !(p._1 + 64).cast[native.Ptr[native.CInt]] = value
+    def thirteen: native.CInt = !(p._1 + 68).cast[native.Ptr[native.CInt]]
+    def thirteen_=(value: native.CInt): Unit = !(p._1 + 68).cast[native.Ptr[native.CInt]] = value
+    def fourteen: native.CInt = !(p._1 + 72).cast[native.Ptr[native.CInt]]
+    def fourteen_=(value: native.CInt): Unit = !(p._1 + 72).cast[native.Ptr[native.CInt]] = value
+    def fifteen: native.CInt = !(p._1 + 76).cast[native.Ptr[native.CInt]]
+    def fifteen_=(value: native.CInt): Unit = !(p._1 + 76).cast[native.Ptr[native.CInt]] = value
+    def sixteen: native.CInt = !(p._1 + 80).cast[native.Ptr[native.CInt]]
+    def sixteen_=(value: native.CInt): Unit = !(p._1 + 80).cast[native.Ptr[native.CInt]] = value
+    def seventeen: native.CInt = !(p._1 + 84).cast[native.Ptr[native.CInt]]
+    def seventeen_=(value: native.CInt): Unit = !(p._1 + 84).cast[native.Ptr[native.CInt]] = value
+    def eighteen: native.CInt = !(p._1 + 88).cast[native.Ptr[native.CInt]]
+    def eighteen_=(value: native.CInt): Unit = !(p._1 + 88).cast[native.Ptr[native.CInt]] = value
+    def nineteen: native.CInt = !(p._1 + 92).cast[native.Ptr[native.CInt]]
+    def nineteen_=(value: native.CInt): Unit = !(p._1 + 92).cast[native.Ptr[native.CInt]] = value
+    def twenty: native.CInt = !(p._1 + 96).cast[native.Ptr[native.CInt]]
+    def twenty_=(value: native.CInt): Unit = !(p._1 + 96).cast[native.Ptr[native.CInt]] = value
+    def twentyOne: native.CInt = !(p._1 + 100).cast[native.Ptr[native.CInt]]
+    def twentyOne_=(value: native.CInt): Unit = !(p._1 + 100).cast[native.Ptr[native.CInt]] = value
+    def twentyTwo: native.CInt = !(p._1 + 104).cast[native.Ptr[native.CInt]]
+    def twentyTwo_=(value: native.CInt): Unit = !(p._1 + 104).cast[native.Ptr[native.CInt]] = value
+    def twentyThree: native.CInt = !(p._1 + 108).cast[native.Ptr[native.CInt]]
+    def twentyThree_=(value: native.CInt): Unit = !(p._1 + 108).cast[native.Ptr[native.CInt]] = value
   }
 
   def struct_bigStruct()(implicit z: native.Zone): native.Ptr[struct_bigStruct] = native.alloc[struct_bigStruct]

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

@@ -60,5 +60,49 @@ object StructTests extends TestSuite {
         assert(42 == Struct.getIntFromAnonymousStruct(structWithAnonymousStruct))
       }
     }
+
+    'getFieldOfBigStruct - {
+      Zone { implicit zone: Zone =>
+        val structPtr = alloc[Struct.struct_bigStruct]
+        for (value <- Seq(Long.MinValue, -1, 0, 1, Long.MaxValue)) {
+          Struct.struct_test_long(structPtr, enum_struct_op_STRUCT_SET, value)
+          assert(structPtr.one == value)
+        }
+
+        for (value <- Seq(Double.MinValue, -1, 0, 1, Double.MaxValue)) {
+          Struct.struct_test_double(structPtr, enum_struct_op_STRUCT_SET, value)
+          assert(structPtr.five == value)
+        }
+
+        val pointPtr = alloc[Struct.point]
+        pointPtr.x = 5
+        pointPtr.y = 10
+
+        Struct.struct_test_point(structPtr, enum_struct_op_STRUCT_SET, pointPtr)
+        assert(structPtr.six.x == pointPtr.x)
+        assert(structPtr.six.y == pointPtr.y)
+      }
+    }
+
+    'setFieldOfBigStruct - {
+      Zone { implicit zone: Zone =>
+        val structPtr = alloc[Struct.struct_bigStruct]
+        for (value <- Seq(Long.MinValue, -1, 0, 1, Long.MaxValue)) {
+          structPtr.one = value
+          assert(Struct.struct_test_long(structPtr, enum_struct_op_STRUCT_TEST, value) == 1)
+        }
+
+        for (value <- Seq(Double.MinValue, -1, 0, 1, Double.MaxValue)) {
+          structPtr.five = value
+          assert(Struct.struct_test_double(structPtr, enum_struct_op_STRUCT_TEST, value) == 1)
+        }
+
+        val pointPtr = alloc[Struct.point]
+        pointPtr.x = 5
+        pointPtr.y = 10
+        structPtr.six = pointPtr
+        assert(Struct.struct_test_point(structPtr, enum_struct_op_STRUCT_TEST, pointPtr) == 1)
+      }
+    }
   }
 }