Fix bitfields not generating for all types

src/opir.nim

@@ -266,10 +266,9 @@ proc genStructDecl(struct: CXCursor): JsonNode =
         else:
           mainObj[]["fields"].add val
       else:
-        if CursorIsBitField(field) != 0:
-          mainObj[]["fields"].add %*{"name": field.getName, "type": field.toNimType, "bitsize": field.getFieldDeclBitWidth}
-        else:
-          mainObj[]["fields"].add %*{"name": field.getName, "type": field.toNimType}
+        mainObj[]["fields"].add %*{"name": field.getName, "type": field.toNimType}
+      if CursorIsBitField(field) != 0:
+        mainObj[]["fields"][^1]["bitsize"] = %field.getFieldDeclBitWidth
     of CXCursor_PackedAttr:
       mainObj[]["packed"] = %true
     of CXCursor_AlignedAttr:

tests/tbitfields.h

@@ -0,0 +1,20 @@
+#include <stdint.h>
+
+typedef struct {
+  int one : 1;
+  int two : 1;
+  int three : 2;
+  int four : 4;
+} bitmap;
+
+struct bitmap2
+{
+    uint8_t frame_id : 1;
+    uint8_t end_of_frame : 1;
+    uint8_t presentation_time : 1;
+    uint8_t source_clock : 1;
+    uint8_t reserved : 1;
+    uint8_t still_image : 1;
+    uint8_t error : 1;
+    uint8_t end_of_header : 1;
+};

tests/tbitfields.nim

@@ -0,0 +1,19 @@
+import "../src/futhark"
+
+importc:
+  path "."
+  "tbitfields.h"
+
+{.emit: "#include \"tbitfields.h\"".}
+proc getCsizeofBitmap(): cint =
+  {.emit: [result, " = sizeof(bitmap);"].}
+
+proc getCsizeofHeaderInfoBitmap(): cint =
+  {.emit: [result, " = sizeof(struct bitmap2);"].}
+
+echo getCsizeofBitmap()
+echo sizeof(bitmap)
+doAssert sizeof(bitmap) == getCsizeofBitmap()
+echo getCsizeofHeaderInfoBitmap()
+echo sizeof(structBitmap2)
+doAssert sizeof(structBitmap2) == getCsizeofHeaderInfoBitmap()