AnarchistGamers/woof
1
0
Fork 0
mirror of https://github.com/fabiangreffrath/woof.git synced 2025-09-26 06:20:16 -04:00
Code Issues Packages Projects Releases Wiki Activity

umapinfo: fix error reporting if token == TK_NoToken

Browse Source
This commit is contained in:
Roman Fomin 2021-10-19 14:53:15 +07:00
parent d87c9534f9
commit 7ed32e611a
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Source/u_scanner.c
View File

@ -472,11 +472,13 @@ boolean U_GetNextLineToken(u_scanner_t* scanner)
void U_ErrorToken(u_scanner_t* s, int token) void U_ErrorToken(u_scanner_t* s, int token)
{ {
if (token < TK_NumSpecialTokens && s->token < TK_NumSpecialTokens) if (token < TK_NumSpecialTokens && s->token >= TK_Identifier && s->token < TK_NumSpecialTokens)
U_Error(s, "Expected %s but got %s '%s' instead.", U_TokenNames[token], U_TokenNames[(int)s->token], s->string); U_Error(s, "Expected %s but got %s '%s' instead.", U_TokenNames[token], U_TokenNames[(int)s->token], s->string);
else if (token < TK_NumSpecialTokens && s->token >= TK_NumSpecialTokens) else if (token < TK_NumSpecialTokens && s->token >= TK_NumSpecialTokens)
U_Error(s, "Expected %s but got '%c' instead.", U_TokenNames[token], s->token); U_Error(s, "Expected %s but got '%c' instead.", U_TokenNames[token], s->token);
else if (token >= TK_NumSpecialTokens && s->token < TK_NumSpecialTokens) else if (token < TK_NumSpecialTokens && s->token == TK_NoToken)
U_Error(s, "Expected %s", U_TokenNames[token]);
else if (token >= TK_NumSpecialTokens && s->token >= TK_Identifier && s->token < TK_NumSpecialTokens)
U_Error(s, "Expected '%c' but got %s '%s' instead.", token, U_TokenNames[(int)s->token], s->string); U_Error(s, "Expected '%c' but got %s '%s' instead.", token, U_TokenNames[(int)s->token], s->string);
else else
U_Error(s, "Expected '%c' but got '%c' instead.", token, s->token); U_Error(s, "Expected '%c' but got '%c' instead.", token, s->token);