shithub: scc

Info  •  Files  •  Log  •  Branches

Avoid ugly error messages with non printable characters in expect

--- a/cc1/lex.c

+++ b/cc1/lex.c

@@ -385,14 +385,17 @@

 	return yytoken;

 }

-/* TODO: Remove calls to expect without a character */

 void

 expect(uint8_t tok)

 {

-	if (yytoken != tok)

-		softerror("expected '%c' before '%s'", tok, yytext);

-	else

+	if (yytoken != tok) {

+		if (isgraph(tok))

+			softerror("expected '%c' before '%s'", tok, yytext);

+		else

+			softerror("unexpected '%s'", yytext);

+	} else {

 		next();

+	}

 }

 uint8_t