Add return keyword
This commit is contained in:
parent
69276515b1
commit
6d608f00cd
@ -16,11 +16,11 @@ enum class TokenType {
|
||||
Identifier, Litteral, Plus, Minus, DoublePlus, DoubleMinus, DoubleEqual, Land,
|
||||
Lor, Lt, Gt, Leq, Geq, NotEqual, Not, Star, Slash, Percent, Equal, Semicolon,
|
||||
LParenthese, RParenthese, LCurlyBracket, RCurlyBracket, If, Else, While, For,
|
||||
Break, Continue, Comma
|
||||
Break, Continue, Return, Comma
|
||||
};
|
||||
|
||||
enum class Type {
|
||||
Int, Double
|
||||
Int, Double, Void
|
||||
};
|
||||
|
||||
using TokenData = variant<int, double, string, Type>;
|
||||
|
@ -17,6 +17,7 @@ vector<tuple<string, TokenType>> simpleTokens = {
|
||||
{ "for", TokenType::For },
|
||||
{ "break", TokenType::Break },
|
||||
{ "continue", TokenType::Continue },
|
||||
{ "return", TokenType::Return },
|
||||
{ "++", TokenType::DoublePlus },
|
||||
{ "--", TokenType::DoubleMinus },
|
||||
{ "==", TokenType::DoubleEqual },
|
||||
@ -46,6 +47,7 @@ string _debug_get_type_name(Type type) {
|
||||
switch (type) {
|
||||
case Type::Int: return "INT";
|
||||
case Type::Double: return "DOUBLE";
|
||||
case Type::Void: return "VOID";
|
||||
default: return "Unknown";
|
||||
}
|
||||
}
|
||||
@ -82,6 +84,7 @@ string _debug_get_token_type_name(TokenType type) {
|
||||
case TokenType::For: return "For";
|
||||
case TokenType::Break: return "Break";
|
||||
case TokenType::Continue: return "Continue";
|
||||
case TokenType::Return: return "Return";
|
||||
case TokenType::Comma: return "Comma";
|
||||
default: return "Unknown";
|
||||
}
|
||||
@ -184,6 +187,9 @@ void _debug_print_token(Token token) {
|
||||
case TokenType::Continue:
|
||||
cout << "Continue";
|
||||
break;
|
||||
case TokenType::Return:
|
||||
cout << "Return";
|
||||
break;
|
||||
case TokenType::Comma:
|
||||
cout << "Comma";
|
||||
break;
|
||||
|
@ -11,7 +11,7 @@ int main() {
|
||||
|
||||
/* All tokens */
|
||||
vector<string> inputs = {
|
||||
"int", "a", "=", "x", "++", "--", "==", "&&", "||", "<", ">", "<=", ">=", "!=", "!", "*", "/", "%", "=", ";", "(", ")", "{", "}", "if", "else", "while", "for", "break", "continue", ","
|
||||
"int", "a", "=", "x", "++", "--", "==", "&&", "||", "<", ">", "<=", ">=", "!=", "!", "*", "/", "%", "=", ";", "(", ")", "{", "}", "if", "else", "while", "for", "break", "continue", "return", ","
|
||||
};
|
||||
|
||||
vector<TokenType> expectedTypes = {
|
||||
@ -21,7 +21,7 @@ int main() {
|
||||
TokenType::Not, TokenType::Star, TokenType::Slash, TokenType::Percent, TokenType::Equal,
|
||||
TokenType::Semicolon, TokenType::LParenthese, TokenType::RParenthese, TokenType::LCurlyBracket,
|
||||
TokenType::RCurlyBracket, TokenType::If, TokenType::Else, TokenType::While, TokenType::For,
|
||||
TokenType::Break, TokenType::Continue, TokenType::Comma
|
||||
TokenType::Break, TokenType::Continue, TokenType::Return, TokenType::Comma
|
||||
};
|
||||
|
||||
for (size_t i = 0; i < inputs.size(); i++) {
|
||||
|
Loading…
Reference in New Issue
Block a user