From 42facb38e615b357ae0d8f50db5c50edaa75bbfd Mon Sep 17 00:00:00 2001
From: Michael Forney <mforney@mforney.org>
Date: Fri, 22 Mar 2024 00:33:31 -0700
Subject: Use C23 spelling of typeof in tests

---
 decl.c                                        | 2 +-
 test/bitfield-integer-promotion-long.c        | 6 +++---
 test/char-const-u8.c                          | 2 +-
 test/initializer-replace-local-string-wide.c  | 2 +-
 test/initializer-replace-static-string-wide.c | 2 +-
 test/initializer-string-wide.c                | 4 ++--
 test/typeof-array.c                           | 2 +-
 test/typeof-decay.c                           | 2 +-
 test/typeof.c                                 | 6 +++---
 9 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/decl.c b/decl.c
index a0da3a9..3a84a02 100644
--- a/decl.c
+++ b/decl.c
@@ -418,7 +418,7 @@ declspecs(struct scope *s, enum storageclass *sc, enum funcspec *fs, int *align)
 				delexpr(e);
 			}
 			++ntypes;
-			expect(TRPAREN, "to close '__typeof__'");
+			expect(TRPAREN, "to close 'typeof'");
 			break;
 
 		/* 6.7.5 Alignment specifier */
diff --git a/test/bitfield-integer-promotion-long.c b/test/bitfield-integer-promotion-long.c
index fc51fbc..d467a98 100644
--- a/test/bitfield-integer-promotion-long.c
+++ b/test/bitfield-integer-promotion-long.c
@@ -1,6 +1,6 @@
 struct {unsigned long x:31;} s1;
 struct {unsigned long x:32;} s2;
 struct {unsigned long x:33;} s3;
-int c1 = __builtin_types_compatible_p(__typeof__(+s1.x), int);
-int c2 = __builtin_types_compatible_p(__typeof__(+s2.x), unsigned);
-int c3 = __builtin_types_compatible_p(__typeof__(+s3.x), unsigned long);
+int c1 = __builtin_types_compatible_p(typeof(+s1.x), int);
+int c2 = __builtin_types_compatible_p(typeof(+s2.x), unsigned);
+int c3 = __builtin_types_compatible_p(typeof(+s3.x), unsigned long);
diff --git a/test/char-const-u8.c b/test/char-const-u8.c
index 9f20452..08d80e0 100644
--- a/test/char-const-u8.c
+++ b/test/char-const-u8.c
@@ -1,3 +1,3 @@
 unsigned char u8 = u8'a';
-_Static_assert(__builtin_types_compatible_p(__typeof__(u8'b'), unsigned char),
+_Static_assert(__builtin_types_compatible_p(typeof(u8'b'), unsigned char),
 	"UTF-8 character constant has incorrect type");
diff --git a/test/initializer-replace-local-string-wide.c b/test/initializer-replace-local-string-wide.c
index 366020f..760ee42 100644
--- a/test/initializer-replace-local-string-wide.c
+++ b/test/initializer-replace-local-string-wide.c
@@ -2,7 +2,7 @@ void f(void) {
 	struct {
 		unsigned short u[6];
 		unsigned U[6];
-		__typeof__(L' ') L[6];
+		typeof(L' ') L[6];
 	} x = {
 		.u[0] = u'x',
 		.u[4] = u'y',
diff --git a/test/initializer-replace-static-string-wide.c b/test/initializer-replace-static-string-wide.c
index b6c348a..867c0d2 100644
--- a/test/initializer-replace-static-string-wide.c
+++ b/test/initializer-replace-static-string-wide.c
@@ -13,7 +13,7 @@ struct {
 };
 
 struct {
-	__typeof__(L' ') s[5];
+	typeof(L' ') s[5];
 } L = {
 	.s = L"aα€😐",
 	.s[3] = L'😃',
diff --git a/test/initializer-string-wide.c b/test/initializer-string-wide.c
index 85b8019..2a09718 100644
--- a/test/initializer-string-wide.c
+++ b/test/initializer-string-wide.c
@@ -2,12 +2,12 @@ char s[] = "aα€😀\xAA\xBBBB\xCCCCCCCC";
 char u8[] = u8"aα€😀\xAA\xBBBB\xCCCCCCCC";
 unsigned short u[] = u"aα€😀\xAA\xBBBB\xCCCCCCCC";
 unsigned U[] = U"aα€😀\xAA\xBBBB\xCCCCCCCC";
-__typeof__(L' ') L[] = L"aα€😀\xAA\xBBBB\xCCCCCCCC";
+typeof(L' ') L[] = L"aα€😀\xAA\xBBBB\xCCCCCCCC";
 
 void f(void) {
 	char s[] = "aα€😀\xAA\xBBBB\xCCCCCCCC";
 	char u8[] = u8"aα€😀\xAA\xBBBB\xCCCCCCCC";
 	unsigned short u[] = u"aα€😀\xAA\xBBBB\xCCCCCCCC";
 	unsigned U[] = U"aα€😀\xAA\xBBBB\xCCCCCCCC";
-	__typeof__(L' ') L[] = L"aα€😀\xAA\xBBBB\xCCCCCCCC";
+	typeof(L' ') L[] = L"aα€😀\xAA\xBBBB\xCCCCCCCC";
 }
diff --git a/test/typeof-array.c b/test/typeof-array.c
index 07ac863..383d626 100644
--- a/test/typeof-array.c
+++ b/test/typeof-array.c
@@ -1,2 +1,2 @@
 int x[5];
-__typeof__(x) y;
+typeof(x) y;
diff --git a/test/typeof-decay.c b/test/typeof-decay.c
index 1e38d82..c96dc3c 100644
--- a/test/typeof-decay.c
+++ b/test/typeof-decay.c
@@ -1,2 +1,2 @@
 char a[4];
-__typeof__(a) a;
+typeof(a) a;
diff --git a/test/typeof.c b/test/typeof.c
index 2b67dad..fe4ec6d 100644
--- a/test/typeof.c
+++ b/test/typeof.c
@@ -1,9 +1,9 @@
 int f(char *);
-__typeof__(f) f, g;
+typeof(f) f, g;
 
-__typeof__(g(0)) x;
+typeof(g(0)) x;
 int x;
 
 typedef int *t;
-const __typeof__(t) y;
+const typeof(t) y;
 int *const y;
-- 
cgit v1.2.3