'Fix' API macro parsing

source/ctod/cdeclaration.d

@@ -12,8 +12,13 @@ bool ctodTryDeclaration(ref CtodCtx ctx, ref Node node) {
 	InlineType[] inlinetypes;
 
 	bool translateDecl(string suffix, bool cInit) {
-		Decl[] decls = parseDecls(ctx, node, inlinetypes);
+		string apiMacro;
+		Decl[] decls = parseDecls(ctx, node, inlinetypes, &apiMacro);
+
 		string result = "";
+		if (apiMacro.length > 0) {
+			result ~= apiMacro ~ " ";
+		}
 		foreach(s; inlinetypes) {
 			result ~= s.toString();
 		}

source/ctod/ctype.d

@@ -294,14 +294,20 @@ bool tryParseTypeQual(ref CtodCtx ctx, ref Node node, ref CQuals quals) {
 /// Parse declarations
 /// Often a node represents a single declaration, but in case of e.g. `int x, *y;` they are split up into two
 /// declarations since in D you can't declare differently typed variables in one declaration
-Decl[] parseDecls(ref CtodCtx ctx, ref Node node, ref InlineType[] inlineTypes) {
+Decl[] parseDecls(ref CtodCtx ctx, ref Node node, ref InlineType[] inlineTypes, scope string* apiMacro = null) {
 	auto typeNode = node.childField(Field.type);
 	if (!typeNode) {
 		return null;
 	}
 	const oldLen = inlineTypes.length;
 	auto primitiveType = parseTypeNode(ctx, *typeNode, inlineTypes, false);
 
+	// This happens with API macros, which get parsed as a return type.
+	if (apiMacro && node.children.length > 1 && node.children[1].typeEnum == Sym.error) {
+		*apiMacro = primitiveType;
+		primitiveType = node.children[1].source;
+	}
+
 	// there may be multiple type_qualifier fields
 	// if (auto qualNode = node.childField(Field.type_qualifier))
 	CQuals quals;

source/ctod/test.d

@@ -151,6 +151,13 @@ union U {
 	);
 
 	test("inline static void foo(int x);", "pragma(inline, true) private void foo(int x);");
+
+	// Test API macro before function definition
+	test("WINAPI int** Whoa(void);", "WINAPI int** Whoa();");
+	// Unfortunately, tree-sitter sees this as 2 declarations with a missing ';',
+	// so there's no translation unsigned int => uint, but it should be clear what happened
+	test("MYAPI unsigned int f(void);", "MYAPI unsigned; int f();");
+
 	test("
 int main(void) {
 	static int xx;
@@ -389,7 +396,7 @@ alias B = X.B;
 
 	test("int so9 = sizeof(int) * 5;", "int so9 = int.sizeof * 5;");
 	test("int soA = sizeof(unsigned char) * 5;", "int soA = ubyte.sizeof * 5;");
-	test("int soB = = sizeof(int*) * 5;", "int soB = (int*).sizeof * 5;");
+	test("int soB = sizeof(int*) * 5;", "int soB = (int*).sizeof * 5;");
 	test("int soC = sizeof(struct mg_dns_header);", "int soC = mg_dns_header.sizeof;");
 
 	test("int of = offsetof(S, f);", "int of = S.f.offsetof;");

source/ctod/translate.d

@@ -172,9 +172,8 @@ nothrow:
 		currentTypeScope().fieldIndex++;
 	}
 
-	int uniqueIdCounter = 0;
 	string uniqueIdentifier(string suggestion) {
-		static toUpper(char c) {return cast(char) (c - (c >= 'a' && c <= 'z') * ('a' - 'A'));}
+		static char toUpper(char c) {return cast(char) (c - (c >= 'a' && c <= 'z') * ('a' - 'A'));}
 		if (suggestion.length > 0) {
 			return "_" ~ toUpper(suggestion[0]) ~ suggestion[1..$];
 		} else {

source/ctod/tree_sitter.d

@@ -254,6 +254,7 @@ enum Field : ubyte {
 
 /// Identifies a C tree-sitter node
 enum Sym : ushort {
+	error = 0xFFFF,
 	identifier = 1,
 	aux_preproc_include_token1 = 2,
 	anon_LF = 3,