Deukhoofd/MalachScript
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fixes issue in lexing numerical base consuming character after it, removes test for invalid numerical base.
All checks were successful
continuous-integration/drone/push Build is passing
Details

Browse Source
This commit is contained in:
Deukhoofd
2021-01-06 11:48:24 +01:00
parent cf8d6ce18b
commit 034dcb118b
4 changed files with 17 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/Diagnostics/DiagnosticType.hpp
View File

@@ -5,7 +5,6 @@
namespace MalachScript::Diagnostics {
enum class DiagnosticType : uint8_t {
UnknownCharacter,
InvalidNumericalBase,
ExpectedEndOfString,
UnexpectedToken,
DoubleProperty,

2
src/Diagnostics/DiagnosticTypeEN_US.hpp
View File

@@ -11,8 +11,6 @@ namespace MalachScript::Diagnostics {
switch (diag->GetType()) {
case DiagnosticType::UnknownCharacter:
return util::Format("Unknown character: '{0}'", diag->GetFormats());
case DiagnosticType::InvalidNumericalBase:
return util::Format("Invalid numerical base: '0{0}'", diag->GetFormats());
case DiagnosticType::ExpectedEndOfString:
return util::Format("Expected end of string, found {0}", diag->GetFormats());
case DiagnosticType::UnexpectedToken:

21
src/Parser/Lexer/Lexer.cpp
View File

@@ -292,16 +292,27 @@ namespace MalachScript::Parser {
auto secondChar = Peek();
auto secondValue = LexDecimalValue(secondChar);
if (secondChar != '.' && secondValue == 255) {
Progress();
switch (secondChar) {
case 'x':
case 'X': numericalSystem = 16; break;
case 'X':
Progress();
numericalSystem = 16;
break;
case 'd':
case 'D': numericalSystem = 10; break;
case 'D':
Progress();
numericalSystem = 10;
break;
case 'o':
case 'O': numericalSystem = 8; break;
case 'O':
Progress();
numericalSystem = 8;
break;
case 'b':
case 'B': numericalSystem = 2; break;
case 'B':
Progress();
numericalSystem = 2;
break;
default: return Create<IntegerLiteral>(TextSpan(_position - 1, _position), 0);
}
}