Pasha/MIRROR-LX-OriginalRepo
1
0
Fork 0
mirror of https://github.com/PashaBibko/LX.git synced 2026-04-04 01:49:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Allowed multiple functions + non "main" functions

Browse Source 
Also fixed a bug in the lexer and changed how AST is logged.
This commit is contained in:
Pasha Bibko
2025-05-08 16:03:54 +01:00
parent 794173e14f
commit 050eeb5a53
6 changed files with 56 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
Lexer/src/Lexer.cpp
View File

@@ -8,9 +8,6 @@
namespace LX
{
// Helper function for dealing with floating-point number literals //
static constexpr bool CanBePartOfNumberLiteral(const char c) { return (c == '.') || (c == 'f'); }
// Checks if the given word is a keyword before adding it to the tokens //
static void TokenizeWord(const std::string& word, std::vector<Token>& tokens, LexerInfo& info)
{
@@ -46,7 +43,7 @@ namespace LX
// Works out if the current character is alphabetic or numeric //
info.isAlpha = (current >= 'a' && current <= 'z') || (current >= 'A' && current <= 'Z');
info.isNumeric = (current >= '0' && current <= '9');
info.isNumeric = (current >= '0' && current <= '9') || (current == '.');
}
// Only does next character checks when not at the end //
@@ -57,7 +54,7 @@ namespace LX
// Sets flags depending on the value of the next character //
info.isNextCharAlpha = (next >= 'a' && next <= 'z') || (next >= 'A' && next <= 'Z');
info.isNextCharNumeric = (next >= '0' && next <= '9') || CanBePartOfNumberLiteral(next);
info.isNextCharNumeric = (next >= '0' && next <= '9') || (next == '.');
}
// Else defaults the flags to false //
@@ -150,7 +147,7 @@ namespace LX
}
// End of a number //
else if ((info.isNumeric == true || CanBePartOfNumberLiteral(current)) && info.isNextCharNumeric == false && info.lexingNumber == true)
else if (info.isNumeric == true && info.isNextCharNumeric == false && info.lexingNumber == true)
{
// Pushes the number to the token vector. Number literals are stored as string in the tokens //
std::string num(info.source.data() + info.startOfNumberLiteral, (unsigned __int64)(info.index + 1) - info.startOfNumberLiteral);
@@ -160,7 +157,7 @@ namespace LX
// During a number //
else if (info.isNumeric == true);
else if (info.lexingNumber == true && CanBePartOfNumberLiteral(current));
else if (info.lexingNumber == true);
// Start of a word //
else if (info.isAlpha == true && info.wasLastCharAlpha == false)

1
Lexer/src/Token.cpp
View File

@@ -37,6 +37,7 @@ namespace LX
TOKEN_CASE(Token::CLOSE_PAREN);
TOKEN_CASE(Token::ASSIGN);
TOKEN_CASE(Token::INT_DEC);
TOKEN_CASE(Token::COMMA);
// Default just returns it as it's numerical value //
default: return "Unknown: " + std::to_string((int)type);