Functors & zig declarators;

More tests (generated) fixed

src/bindgen/cdecl.rs

@@ -209,7 +209,11 @@ impl CDecl {
 
         // When we have an identifier, put a space between the type and the declarators
         if ident.is_some() {
-            out.write(" ");
+            if config.language == Language::Zig && self.declarators.is_empty() {
+                write!(out, "");
+            } else {
+                out.write(" ");
+            }
         }
 
         // Write the left part of declarators before the identifier
@@ -257,7 +261,7 @@ impl CDecl {
                     }
                 }
                 CDeclarator::Func(..) => {
-                    if next_is_pointer {
+                    if next_is_pointer && config.language != Language::Zig {
                         out.write("(");
                     }
                 }
@@ -286,7 +290,11 @@ impl CDecl {
             match *declarator {
                 CDeclarator::Ptr { .. } => {
                     if config.language == Language::Zig {
-                        write!(out, ": ?*{}", self.type_name);
+                        if !last_was_pointer {
+                            out.write(": ?fn");
+                        } else {
+                            write!(out, ": ?*{}", self.type_name);
+                        }
                     }
                     last_was_pointer = true;
                 }
@@ -311,7 +319,7 @@ impl CDecl {
                     last_was_pointer = false;
                 }
                 CDeclarator::Func(ref args, layout_vertical) => {
-                    if last_was_pointer {
+                    if last_was_pointer && config.language != Language::Zig {
                         out.write(")");
                     }
 

tests/expectations/export_name.zig

@@ -0,0 +1,3 @@
+const std = @import("std");
+
+extern fn do_the_thing_with_export_name() anyopaque;

tests/expectations/extern.zig

@@ -1 +1,10 @@
 const std = @import("std");
+
+pub const Normal = extern struct {
+  x: i32,
+  y: f32,
+};
+
+extern fn foo() i32;
+
+extern fn bar(a: Normal) anyopaque;

tests/expectations/extern_2.zig

@@ -1 +1,5 @@
 const std = @import("std");
+
+extern fn first() anyopaque;
+
+extern fn second() anyopaque;

tests/expectations/fns.zig

@@ -1 +1,13 @@
 const std = @import("std");
+
+pub const Fns = extern struct {
+   _noArgs: ?fn() anyopaque,
+   _anonymousArg: ?fn() anyopaque,
+   _returnsNumber: ?fn() i32,
+   _namedArgs: ?fn(first: i32, snd: i16) i8,
+   _namedArgsWildcards: ?fn(_: i32, named: i16, _1: i64) i8,
+};
+
+extern fn root(_fns: Fns) anyopaque;
+
+extern fn no_return() anyopaque;

tests/expectations/typedef.zig

@@ -1 +1,10 @@
 const std = @import("std");
+
+pub const Foo_i32__i32 = extern struct {
+  x: i32,
+  y: i32,
+};
+
+pub const IntFoo_i32 = Foo_i32__i32;
+
+extern fn root(a: IntFoo_i32) anyopaque;