From 9b52864932ec81033b5c9d34a81828d54192b958 Mon Sep 17 00:00:00 2001
From: Michael Forney <mforney@mforney.org>
Date: Sat, 27 Apr 2019 16:15:11 -0700
Subject: Fix some function declarator corner cases

---
 decl.c                                | 11 ++++++++++-
 test/abstract-function-declarator.c   | 16 ++++++++++++++++
 test/abstract-function-declarator.qbe |  0
 3 files changed, 26 insertions(+), 1 deletion(-)
 create mode 100644 test/abstract-function-declarator.c
 create mode 100644 test/abstract-function-declarator.qbe

diff --git a/decl.c b/decl.c
index 3ebf51a..35ba57a 100644
--- a/decl.c
+++ b/decl.c
@@ -462,8 +462,17 @@ declaratortypes(struct scope *s, struct list *result, char **name, bool allowabs
 	switch (tok.kind) {
 	case TLPAREN:
 		next();
-		if (allowabstract && tok.kind != TMUL && (tok.kind != TIDENT || istypename(s, tok.lit)))
+		switch (tok.kind) {
+		case TMUL:
+		case TLPAREN:
+			break;
+		case TIDENT:
+			if (!allowabstract || !istypename(s, tok.lit))
+				break;
+			/* fallthrough */
+		default:
 			goto func;
+		}
 		declaratortypes(s, result, name, allowabstract);
 		expect(TRPAREN, "after parenthesized declarator");
 		break;
diff --git a/test/abstract-function-declarator.c b/test/abstract-function-declarator.c
new file mode 100644
index 0000000..b6808a6
--- /dev/null
+++ b/test/abstract-function-declarator.c
@@ -0,0 +1,16 @@
+typedef int x;
+
+void f1(int(x));
+void f1(int (*)(int));
+
+void f2(int(y));
+void f2(int);
+
+void f3(int((*)));
+void f3(int *);
+
+void f4(int((*x)));
+void f4(int *);
+
+void f5(int((x)));
+void f5(int (*)(int));
diff --git a/test/abstract-function-declarator.qbe b/test/abstract-function-declarator.qbe
new file mode 100644
index 0000000..e69de29
-- 
cgit v1.2.3