Merge pull request #598 from certik/c17

Implement passing enums to and from C

Author: certik

integration_tests/test_c_interop_05.py

@@ -12,6 +12,10 @@ def f_pi32_i32(x: CPtr) -> i32:
 def f_pstruct_i32(x: CPtr) -> i32:
     pass
 
+@ccall
+def f_enum_i32(x: i32) -> i32:
+    pass
+
 @ccall
 def driver1() -> i32:
     pass
@@ -28,6 +32,10 @@ def driver3() -> i32:
 def driver4() -> i32:
     pass
 
+@ccall
+def driver5() -> i32:
+    pass
+
 @ccallback
 def callback1() -> i32:
     xi32: i32
@@ -48,12 +56,17 @@ def callback3(p: CPtr) -> i32:
 def callback4(p: CPtr) -> i32:
     return f_pstruct_i32(p)
 
+@ccallback
+def callback5(x: i32) -> i32:
+    return f_enum_i32(x)
+
 
 def test_c_callbacks():
     assert driver1() == 4
     assert driver2() == 4
     assert driver3() == 4
     assert driver4() == 4
+    assert driver5() == 4
 
 
 test_c_callbacks()

integration_tests/test_c_interop_05b.c

@@ -12,6 +12,10 @@ int32_t f_pstruct_i32(struct Data *x) {
     return x->a+1;
 }
 
+int32_t f_enum_i32(enum MyEnum x) {
+    return (int32_t)x + 2;
+}
+
 int32_t driver1() {
     return callback1();
 }
@@ -33,3 +37,9 @@ int32_t driver4() {
     x.a = 3;
     return callback4(&x);
 }
+
+int32_t driver5() {
+    enum MyEnum x;
+    x = M_c;
+    return callback5(x);
+}

integration_tests/test_c_interop_05b.h

@@ -10,19 +10,29 @@ struct Data {
     char name[25];
 };
 
+enum MyEnum {
+    M_a = 0,
+    M_b = 1,
+    M_c = 2,
+    M_d = 3,
+};
+
 int32_t f_i32_i32(int32_t x);
 int32_t f_pi32_i32(int32_t *x);
 int32_t f_pstruct_i32(struct Data *x);
+int32_t f_enum_i32(enum MyEnum x);
 
 int32_t callback1();
 int32_t callback2(int32_t x);
 int32_t callback3(int32_t *x);
 int32_t callback4(struct Data *x);
+int32_t callback5(enum MyEnum x);
 
 int32_t driver1();
 int32_t driver2();
 int32_t driver3();
 int32_t driver4();
+int32_t driver5();
 
 
 #endif // TEST_C_INTEROP_05B