AbleOS/holey-toys
2
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

More specific error messages

Browse source
This commit is contained in:
Igor M 2024-03-17 14:10:36 +02:00
parent 7b098ff98c
commit dc06b1b6d8
2 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/directive.c
View file

@ -76,7 +76,7 @@ static AsmError push_data(char *input, size_t len, ByteVec *out, Token *tok,
} }
out->len += tok->num; out->len += tok->num;
} else { } else {
return ErrUnexpectedToken; return ErrNeedsDataLiteral;
} }
*tok = token(input, len, tok->start + tok->len); *tok = token(input, len, tok->start + tok->len);
if (tok->kind == TokNewline || tok->kind == TokEOF) { if (tok->kind == TokNewline || tok->kind == TokEOF) {
@ -85,7 +85,7 @@ static AsmError push_data(char *input, size_t len, ByteVec *out, Token *tok,
if (tok->kind == TokComma) { if (tok->kind == TokComma) {
continue; continue;
} }
return ErrInvalidToken; return ErrNeedCommaOrNewline;
} }
} }

4
src/error.h
View file

@ -26,6 +26,8 @@ typedef enum AsmError_e {
ErrStringDataNotByte, ErrStringDataNotByte,
ErrAlignNeedsNumber, ErrAlignNeedsNumber,
ErrAlignNeedsPow2, ErrAlignNeedsPow2,
ErrNeedCommaOrNewline,
ErrNeedsDataLiteral,
} AsmError; } AsmError;
char *ERRORS[] = { char *ERRORS[] = {
"Success", "Success",
@ -55,4 +57,6 @@ char *ERRORS[] = {
"String literals can be used only in .db directive", "String literals can be used only in .db directive",
".align requires a number", ".align requires a number",
".align requires a power of two as an argument", ".align requires a power of two as an argument",
"Need comma or newline after data literal",
"Data literal expects a number or a string",
}; };