Username404-59
/
Yerbacon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add a parsingError() function to Parser.hpp

This commit is contained in:
Username404-59 2021-11-26 16:53:14 +01:00
parent a73c7a9608
commit 6d33f05021
Signed by: Username404-59
GPG Key ID: 7AB361FBB257A5D1
1 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/headers/parsing/Parser.hpp
View File

@ -8,6 +8,13 @@
namespace Parser { namespace Parser {
typedef Yerbacon::Exception ParsingException; typedef Yerbacon::Exception ParsingException;
void error(const tok& token, const string& text, unsigned long line, const bool& quoteTokenText = false) {
throw ParsingException(quoteTokenText ? "\"" + token.toktext + "\"" + text : text, line);
}
inline void parsingError(
const tok& token, const string& text,
const bool& quoteTokenText = false
) { error(token, text, token.line, quoteTokenText); }
ParseTree parseVector(const vector<tok>& lexed) { ParseTree parseVector(const vector<tok>& lexed) {
ParseTree parseTree; ParseTree parseTree;
using namespace StandardComponents; using namespace StandardComponents;
@ -32,13 +39,19 @@ namespace Parser {
if (current.toktext == "class" || current.toktext == "structure") { if (current.toktext == "class" || current.toktext == "structure") {
if (next.toktype == IDENTIFIER) { if (next.toktype == IDENTIFIER) {
parseTree << Class(next.toktext); ++i; parseTree << Class(next.toktext); ++i;
} else throw ParsingException((not (next.toktext.empty() or next.toktype == tok::EOF_)) ? '"' + next.toktext + "\" is not a valid class identifier" : "A class identifier is required", next.line); } else {
const bool isNotBlank = (not (next.toktext.empty() or next.toktype == tok::EOF_));
parsingError(next, isNotBlank ? " is not a valid class identifier"
: "A class identifier is required", isNotBlank);
}
} else { } else {
bool isFinalDefine = nextAre({TAG, DEFINE}); bool isFinalDefine = nextAre({TAG, DEFINE});
if (isFinalDefine || next.toktype == DEFINE) { if (isFinalDefine || next.toktype == DEFINE) {
const optional previousDefinition = parseTree.findReferenceByName<Define>(current.toktext); const optional previousDefinition = parseTree.findReferenceByName<Define>(current.toktext);
if (previousDefinition.has_value() && previousDefinition.value().get().final) { if (previousDefinition.has_value()) {
throw ParsingException(current.toktext + " cannot be redefined as it is final", current.line); if (previousDefinition.value().get().final || isFinalDefine) {
parsingError(current, previousDefinition->get().final ? " cannot be redefined as it is final" : " cannot be made final after it has been declared", true);
}
} }
parseTree << Define(isFinalDefine, current.toktext); parseTree << Define(isFinalDefine, current.toktext);
i += 1 + isFinalDefine; i += 1 + isFinalDefine;