krgamestudios/Toy
1
0
Fork 0
mirror of https://github.com/krgamestudios/Toy.git synced 2026-04-15 06:44:07 +10:00
Code Issues Packages Projects Releases Wiki Activity

Added a nice error message

Browse Source
This commit is contained in:
Kayne Ruse
2024-11-02 14:39:59 +11:00
parent ef72415c21
commit 92955d56dd
2 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
source/toy_lexer.h
View File

@@ -21,8 +21,8 @@ typedef struct {
TOY_API void Toy_bindLexer(Toy_Lexer* lexer, const char* source);
TOY_API Toy_Token Toy_private_scanLexer(Toy_Lexer* lexer);
TOY_API void Toy_private_printToken(Toy_Token* token); //debugging
//util
#define TOY_BLANK_TOKEN() ((Toy_Token){TOY_TOKEN_NULL, 0, 0, NULL})
TOY_API const char* Toy_private_findKeywordByType(const Toy_TokenType type);
TOY_API Toy_TokenType Toy_private_findTypeByKeyword(const char* keyword);
TOY_API void Toy_private_printToken(Toy_Token* token);

13
source/toy_parser.c
View File

@@ -570,7 +570,14 @@ static void parsePrecedence(Toy_Bucket** bucketHandle, Toy_Parser* parser, Toy_A
ParsingRule prefix = getParsingRule(parser->previous.type)->prefix;
if (prefix == NULL) {
printError(parser, parser->previous, "Expected expression");
//make a nice error message
if (Toy_private_findKeywordByType(parser->previous.type)) {
printError(parser, parser->previous, "Found reserved keyword instead");
}
else {
printError(parser, parser->previous, "Expected expression");
}
Toy_private_emitAstError(bucketHandle, rootHandle);
return;
}
@@ -780,8 +787,8 @@ Toy_Ast* Toy_scanParser(Toy_Bucket** bucketHandle, Toy_Parser* parser) {
void Toy_resetParser(Toy_Parser* parser) {
parser->lexer = NULL;
parser->current = TOY_BLANK_TOKEN();
parser->previous = TOY_BLANK_TOKEN();
parser->current = ((Toy_Token){TOY_TOKEN_NULL, 0, 0, NULL});
parser->previous = ((Toy_Token){TOY_TOKEN_NULL, 0, 0, NULL});
parser->error = false;
parser->panic = false;