Always throw an error when an unexpected expression is found in Parser.hpp
Signed-off-by: Username404 <w.iron.zombie@gmail.com>
This commit is contained in:
parent
453025b18c
commit
5a96757942
@ -117,13 +117,11 @@ namespace Parser {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
if (not parseTree.empty()) {
|
||||||
|
try {
|
||||||
const component_ptr& previous = parseTree.at(parseTree.size() - 1);
|
const component_ptr& previous = parseTree.at(parseTree.size() - 1);
|
||||||
if (current.toktype == LPAR) {
|
if (current.toktype == LPAR) {
|
||||||
try {
|
|
||||||
dynamic_cast<Call&>(*previous).ParseTree::operator=(parse(subTokens));
|
dynamic_cast<Call&>(*previous).ParseTree::operator=(parse(subTokens));
|
||||||
} catch (const bad_cast&) {
|
|
||||||
parsingError(current, "Unexpected parenthesis");
|
|
||||||
}
|
|
||||||
} else if (current.toktype == LBRACE) {
|
} else if (current.toktype == LBRACE) {
|
||||||
const type_info& previous_id = previous->getId();
|
const type_info& previous_id = previous->getId();
|
||||||
if (previous_id == typeid(Function)) {
|
if (previous_id == typeid(Function)) {
|
||||||
@ -134,6 +132,8 @@ namespace Parser {
|
|||||||
} else parseTree << parse(subTokens);
|
} else parseTree << parse(subTokens);
|
||||||
i = distance(lexed.begin(), closingCharacter);
|
i = distance(lexed.begin(), closingCharacter);
|
||||||
break;
|
break;
|
||||||
|
} catch (const out_of_range&) {} catch (const bad_cast&) {}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
default: parsingError(current, " \u27F5 Unexpected character", true);
|
default: parsingError(current, " \u27F5 Unexpected character", true);
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user