l3-ENSL/c-repl
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix Expr & T parsing

Browse Source
This commit is contained in:
augustin64 2023-11-10 20:02:54 +01:00
parent 46b9bc4cf4
commit 691bf3a232
1 changed files with 57 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

96
src/parser.cpp
View File

@ -56,7 +56,6 @@ Node parse(vector<Token> tokens) {
};
node = new_node;
}
}
return node;
@ -174,31 +173,42 @@ ParseReturn parse_expr(vector<Token> tokens) {
//* We construct a tree
while (tokens.size() != 0) {
NodeType type;
switch (tokens.back().type) {
case (TokenType::Plus):
type = NodeType::Plus;
break;
case (TokenType::Minus):
type = NodeType::Minus;
break;
default:
return {
.node=node,
.tokens=tokens
};
}
Token last_token;
try {
last_token = tokens.back();
tokens.pop_back();
ParseReturn ret = parse_t(tokens);
tokens = ret.tokens;
InnerNode new_node = {
.type=type,
.children={node, ret.node}
};
node = new_node;
} catch (const ParseException& pex) {
tokens.emplace_back(last_token);
return {
.node=node,
.tokens=tokens
};
}
if (tokens.size() != 0) {
if (tokens.back().type == TokenType::Plus) {
InnerNode new_node = {
.type=NodeType::Plus,
.children={node, ret.node}
};
node = new_node;
} else if (tokens.back().type == TokenType::Minus) {
InnerNode new_node = {
.type=NodeType::Minus,
.children={node, ret.node}
};
node = new_node;
}
}
}
return {
@ -220,37 +230,45 @@ ParseReturn parse_t(vector<Token> tokens) {
//* We construct a tree
while (tokens.size() != 0) {
NodeType type;
switch(tokens.back().type) {
case (TokenType::Star):
type = NodeType::Mult;
break;
case (TokenType::Slash):
type = NodeType::Div;
break;
case (TokenType::Percent):
type = NodeType::Mod;
break;
default:
return {
.node=node,
.tokens=tokens
};
}
Token last_token;
try {
last_token = tokens.back();
tokens.pop_back();
ParseReturn ret = parse_u(tokens);
tokens = ret.tokens;
InnerNode new_node = {
.type=type,
.children={node, ret.node}
};
node = new_node;
} catch (const ParseException& pex) {
tokens.emplace_back(last_token);
return {
.node=node,
.tokens=tokens
};
}
if (tokens.size() != 0) {
if (tokens.back().type == TokenType::Star) {
InnerNode new_node = {
.type=NodeType::Mult,
.children={node, ret.node}
};
node = new_node;
} else if (tokens.back().type == TokenType::Slash) {
InnerNode new_node = {
.type=NodeType::Div,
.children={node, ret.node}
};
node = new_node;
} else if (tokens.back().type == TokenType::Percent) {
InnerNode new_node = {
.type=NodeType::Mod,
.children={node, ret.node}
};
node = new_node;
}
}
}
return {