tijmen/wassembly
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Improve syntax error reporting

Browse Source
This commit is contained in:
Tijmen van Nesselrooij
2020-08-28 20:51:02 +02:00
parent 593506a907
commit aebc1dd86d
5 changed files with 80 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
src/token/token.cpp
View File

@@ -9,7 +9,8 @@ namespace Token
type(_type),
valueType(TokenValueType::None),
isValid(validness),
data(0)
data(0),
errorMessage()
{
}
@@ -19,7 +20,8 @@ namespace Token
type(_type),
valueType(TokenValueType::String),
isValid(validness),
data(string)
data(string),
errorMessage()
{
}
@@ -29,7 +31,8 @@ namespace Token
type(_type),
valueType(TokenValueType::Integer),
isValid(validness),
data(value)
data(value),
errorMessage()
{
}
@@ -39,7 +42,8 @@ namespace Token
type(_type),
valueType(TokenValueType::Register),
isValid(validness),
data(registerType)
data(registerType),
errorMessage()
{
}
@@ -49,7 +53,8 @@ namespace Token
type(_type),
valueType(TokenValueType::Operand),
isValid(validness),
data(operandType)
data(operandType),
errorMessage()
{
}
@@ -59,28 +64,36 @@ namespace Token
type(other.type),
valueType(other.valueType),
isValid(other.isValid),
data(other.data)
data(other.data),
errorMessage(other.errorMessage)
{
}
Token Token::CreateUnknownToken(int const lineNumber, int const lineColumn)
Token Token::CreateEmptyToken(int const lineNumber, int const lineColumn)
{
return Token(TokenType::Unknown, false, lineNumber, lineColumn);
}
Token Token::CreateErrorToken(std::string const & message, TokenType const type, int const lineNumber, int const lineColumn)
{
Token token(type, false, lineNumber, lineColumn);
token.errorMessage = message;
return token;
}
Token Token::CreateStatementEndToken(int const lineNumber, int const lineColumn)
{
return Token(TokenType::StatementEnd, true, lineNumber, lineColumn);
}
Token Token::CreateLabelToken(std::string const & string, bool isValid, int const lineNumber, int const lineColumn)
Token Token::CreateLabelToken(std::string const & string, int const lineNumber, int const lineColumn)
{
return Token(TokenType::Label, string, isValid, lineNumber, lineColumn);
return Token(TokenType::Label, string, true, lineNumber, lineColumn);
}
Token Token::CreateImmediateValueToken(int const value, bool isValid, int const lineNumber, int const lineColumn)
Token Token::CreateImmediateValueToken(int const value, int const lineNumber, int const lineColumn)
{
return Token(TokenType::ImmediateInteger, value, isValid, lineNumber, lineColumn);
return Token(TokenType::ImmediateInteger, value, true, lineNumber, lineColumn);
}
Token Token::CreateRegisterToken(RegisterType const registerType, int const lineNumber, int const lineColumn)
@@ -98,9 +111,9 @@ namespace Token
return Token(TokenType::Memory, registerType, registerType != RegisterType::Unknown, lineNumber, lineColumn);
}
Token Token::CreateMemoryToken(int const value, bool isValid, int const lineNumber, int const lineColumn)
Token Token::CreateMemoryToken(int const value, int const lineNumber, int const lineColumn)
{
return Token(TokenType::Memory, value, isValid, lineNumber, lineColumn);
return Token(TokenType::Memory, value, true, lineNumber, lineColumn);
}
void Token::DebugPrint() const

60
src/token/tokenizer.cpp
View File

@@ -25,7 +25,8 @@ namespace Token
{
if (string.size() == 0)
{
return Token::CreateUnknownToken(lineNumber, lineColumn);
// TODO Should this become an error token?
return Token::CreateEmptyToken(lineNumber, lineColumn);
}
for(std::size_t i = 0; i < substitutions.size(); ++i)
@@ -48,14 +49,13 @@ namespace Token
{
return Token::CreateImmediateValueToken(
result.value(),
true,
lineNumber,
lineColumn);
}
return Token::CreateImmediateValueToken(
0,
false,
return Token::CreateErrorToken(
"Immediate cannot be parsed as an integer",
TokenType::ImmediateInteger,
lineNumber,
lineColumn);
}
@@ -79,7 +79,6 @@ namespace Token
// TODO check if label is an Operand?
return Token::CreateLabelToken(
string.substr(0, string.size() - 1),
true,
lineNumber,
lineColumn);
}
@@ -88,7 +87,11 @@ namespace Token
{
if(string.size() < 4)
{
return Token::CreateMemoryToken(0, false, lineNumber, lineColumn + 2u);
return Token::CreateErrorToken(
"Memory address statement is empty",
TokenType::Memory,
lineNumber,
lineColumn);
}
char const memoryPrefix = string[1];
@@ -101,14 +104,13 @@ namespace Token
{
return Token::CreateMemoryToken(
result.value(),
true,
lineNumber,
lineColumn);
}
return Token::CreateMemoryToken(
0,
false,
return Token::CreateErrorToken(
"Memory immediate address cannot be parsed as an integer",
TokenType::Memory,
lineNumber,
lineColumn);
}
@@ -121,13 +123,21 @@ namespace Token
}
else
{
return Token::CreateMemoryToken(0, false, lineNumber, lineColumn + 1u);
return Token::CreateErrorToken(
"Memory immediate address contains an unexpected value",
TokenType::Memory,
lineNumber,
lineColumn + 1u);
}
}
else if (prefix == '[' || postfix == ']')
{
int const errorLineColumn = (prefix == '[') ? lineColumn : (lineColumn + string.size() - 1u);
return Token::CreateMemoryToken(0, false, lineNumber, errorLineColumn);
return Token::CreateErrorToken(
"Non terminated memory address brackets",
TokenType::Memory,
lineNumber,
errorLineColumn);
}
OperandType const opType = GetOperandType(string);
@@ -137,7 +147,7 @@ namespace Token
}
// Last resort: it must be a label
return Token::CreateLabelToken(string, true, lineNumber, lineColumn);
return Token::CreateLabelToken(string, lineNumber, lineColumn);
}
bool IsWhiteSpace(char const c)
@@ -256,23 +266,20 @@ end_state_loop:
{
if (line[i] == '\'')
{
// Character literal must be exactly length 3 for now (2x ' + 1
// character in between)
if (lineColumn + 2u != i)
{
tokens.emplace_back(Token::CreateImmediateValueToken(
0,
false,
tokens.push_back(Token::CreateErrorToken(
"Character literal must be exactly 1 character long between single quotes",
TokenType::ImmediateInteger,
lineNumber,
lineColumn));
lineColumn + 1u));
}
else
{
tokens.emplace_back(Token::CreateImmediateValueToken(
tokens.push_back(Token::CreateImmediateValueToken(
line[i - 1],
true,
lineNumber,
lineColumn));
lineColumn + 1));
}
lineColumn = i;
@@ -280,10 +287,9 @@ end_state_loop:
}
}
// Non terminated character literal!
tokens.emplace_back(Token::CreateImmediateValueToken(
0,
false,
tokens.push_back(Token::CreateErrorToken(
"Non terminated character literal",
TokenType::ImmediateInteger,
lineNumber,
lineColumn));