From 7fd7a12d75dd874153443d53bb158a501de067aa Mon Sep 17 00:00:00 2001
From: Michael Forney <mforney@mforney.org>
Date: Fri, 15 Feb 2019 16:34:31 -0800
Subject: Rearrange some fields in function types

---
 decl.c | 10 +++++-----
 type.h |  3 +--
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/decl.c b/decl.c
index 5ef5f1b..a6e4e71 100644
--- a/decl.c
+++ b/decl.c
@@ -458,9 +458,9 @@ declaratortypes(struct scope *s, struct list *result, char **name, bool allowabs
 			next();
 		func:
 			t = mktype(TYPEFUNC, NULL);
-			t->func.isprototype = 0;
-			t->func.isvararg = 0;
-			t->func.isnoreturn = 0;
+			t->func.isprototype = false;
+			t->func.isvararg = false;
+			t->func.isnoreturn = false;
 			t->func.params = NULL;
 			p = &t->func.params;
 			switch (tok.kind) {
@@ -479,7 +479,7 @@ declaratortypes(struct scope *s, struct list *result, char **name, bool allowabs
 				}
 				/* fallthrough */
 			default:
-				t->func.isprototype = 1;
+				t->func.isprototype = true;
 				for (;;) {
 					*p = parameter(s);
 					p = &(*p)->next;
@@ -487,7 +487,7 @@ declaratortypes(struct scope *s, struct list *result, char **name, bool allowabs
 						break;
 					next();
 					if (tok.kind == TELLIPSIS) {
-						t->func.isvararg = 1;
+						t->func.isvararg = true;
 						next();
 						break;
 					}
diff --git a/type.h b/type.h
index 2406974..82c3929 100644
--- a/type.h
+++ b/type.h
@@ -79,9 +79,8 @@ struct type {
 			uint64_t length;
 		} array;
 		struct {
-			int isprototype, isvararg;
+			_Bool isprototype, isvararg, isnoreturn;
 			struct parameter *params;
-			_Bool isnoreturn;
 		} func;
 		struct {
 			char *tag;
-- 
cgit v1.2.3