From 22f0078572b3c37d65e484f5da5a6033941fd6b5 Mon Sep 17 00:00:00 2001
From: Michael Forney <mforney@mforney.org>
Date: Wed, 23 Nov 2022 13:56:27 -0800
Subject: Use new spelling of keywords in error messages

---
 decl.c | 6 +++---
 expr.c | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/decl.c b/decl.c
index b8a3fad..98d7b72 100644
--- a/decl.c
+++ b/decl.c
@@ -372,14 +372,14 @@ declspecs(struct scope *s, enum storageclass *sc, enum funcspec *fs, int *align)
 			if (!align)
 				error(&tok.loc, "alignment specifier not allowed in this declaration");
 			next();
-			expect(TLPAREN, "after '_Alignas'");
+			expect(TLPAREN, "after 'alignas'");
 			other = typename(s, NULL);
 			i = other ? other->align : intconstexpr(s, false);
 			if (i & (i - 1))
 				error(&tok.loc, "invalid alignment: %d", i);
 			if (i > *align)
 				*align = i;
-			expect(TRPAREN, "to close '_Alignas' specifier");
+			expect(TRPAREN, "to close 'alignas' specifier");
 			break;
 
 		default:
@@ -900,7 +900,7 @@ decl(struct scope *s, struct func *f)
 		return false;
 	if (f) {
 		if (sc == SCTHREADLOCAL)
-			error(&tok.loc, "block scope declaration containing '_Thread_local' must contain 'static' or 'extern'");
+			error(&tok.loc, "block scope declaration containing 'thread_local' must contain 'static' or 'extern'");
 	} else {
 		/* 6.9p2 */
 		if (sc & SCAUTO)
diff --git a/expr.c b/expr.c
index 6eb1b3a..955b73f 100644
--- a/expr.c
+++ b/expr.c
@@ -184,7 +184,7 @@ exprassign(struct expr *e, struct type *t)
 	switch (t->kind) {
 	case TYPEBOOL:
 		if (!(et->prop & PROPARITH) && et->kind != TYPEPOINTER)
-			error(&tok.loc, "assignment to _Bool must be from arithmetic or pointer type");
+			error(&tok.loc, "assignment to bool must be from arithmetic or pointer type");
 		break;
 	case TYPEPOINTER:
 		if (nullpointer(e))
@@ -1056,7 +1056,7 @@ unaryexpr(struct scope *s)
 			t = NULL;
 			e = unaryexpr(s);
 		} else {
-			error(&tok.loc, "expected ')' after '_Alignof'");
+			error(&tok.loc, "expected ')' after 'alignof'");
 			return NULL;  /* unreachable */
 		}
 		if (!t) {
-- 
cgit v1.2.3