From 6ff7459d154210a50f2e98ca6654396b12089981 Mon Sep 17 00:00:00 2001 From: Tavian Barnes Date: Tue, 23 Mar 2010 19:46:16 -0400 Subject: Standardise diagnostics a bit. --- dimension/common.rules | 2 +- dimension/grammar.epilogue | 6 +++--- dimension/lexer.l | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dimension/common.rules b/dimension/common.rules index 48b02c1..86b86ef 100644 --- a/dimension/common.rules +++ b/dimension/common.rules @@ -668,7 +668,7 @@ COLOR_KEYWORD_ITEM: IDENTIFIER { if (!symbol) { dmnsn_diagnostic(@1.first_filename, @1.first_line, @1.first_column, - "Unbound identifier '%s'", + "unbound identifier '%s'", (const char *)$1.ptr); dmnsn_delete_astnode($1); YYERROR; diff --git a/dimension/grammar.epilogue b/dimension/grammar.epilogue index a61aff5..fddf088 100644 --- a/dimension/grammar.epilogue +++ b/dimension/grammar.epilogue @@ -87,14 +87,14 @@ dmnsn_token_string(dmnsn_token_type token_type) unsigned int i = YYTRANSLATE(token_type); if (i > YYNTOKENS) { - fprintf(stderr, "Warning: unrecognised token %d.\n", (int)token_type); + fprintf(stderr, "WARNING: unrecognised token %d.\n", (int)token_type); return "unrecognized-token"; } /* Trim the quotation marks */ if (strlen(yytname[i]) - 1 >= TOKEN_SIZE) { - fprintf(stderr, "Warning: name of token %d too long.\n", (int)token_type); + fprintf(stderr, "WARNING: name of token %d too long.\n", (int)token_type); return "unrepresentable-token"; } @@ -243,7 +243,7 @@ dmnsn_astnode_string(dmnsn_astnode_type astnode_type) dmnsn_astnode_map(DMNSN_AST_MACRO, "macro"); default: - fprintf(stderr, "Warning: unrecognised astnode type %d.\n", + fprintf(stderr, "WARNING: unrecognised astnode type %d.\n", (int)astnode_type); return "unrecognized-astnode"; } diff --git a/dimension/lexer.l b/dimension/lexer.l index 3a05ca9..e299106 100644 --- a/dimension/lexer.l +++ b/dimension/lexer.l @@ -294,7 +294,7 @@ unsigned long wchar; #[\b\r\t\v ]*write RETURN_TOKEN(DMNSN_T_WRITE); #[\b\r\t\v ]*[[:alnum:]_]* { dmnsn_diagnostic(filename, yylineno, yycolumn, - "Unrecognized language directive '%s'", yytext); + "unrecognized language directive '%s'", yytext); RETURN_TOKEN(DMNSN_T_LEX_ERROR); } @@ -345,7 +345,7 @@ unsigned long wchar; (?# Fall-through) . { dmnsn_diagnostic(filename, yylineno, yycolumn, - "Unrecognized character '%c' (0x%X)", + "unrecognized character '%c' (0x%X)", (int)*yytext, (unsigned int)(unsigned char)*yytext); RETURN_TOKEN(DMNSN_T_LEX_ERROR); } -- cgit v1.2.3