Deukhoofd/MalachScript
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Adds more parse tree stringification.
All checks were successful
continuous-integration/drone/push Build is passing
Details

Browse Source
This commit is contained in:
Deukhoofd 2021-01-04 22:54:04 +01:00
parent dbef09f4bb
commit 5c086ee066
Signed by: Deukhoofd
GPG Key ID: F63E044490819F6F
2 changed files with 35 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/Parser/Statements/ParsedStatement.hpp
View File

@ -293,6 +293,14 @@ namespace MalachScript::Parser {
const ParsedStatement* elseStatement) const ParsedStatement* elseStatement)
: ParsedStatementImpl(span), _condition(condition), _body(body), _elseStatement(elseStatement) {} : ParsedStatementImpl(span), _condition(condition), _body(body), _elseStatement(elseStatement) {}
[[nodiscard]] inline const std::unique_ptr<const ParsedStatement>& GetCondition() const noexcept {
return _condition;
}
[[nodiscard]] inline const std::unique_ptr<const ParsedStatement>& GetBody() const noexcept { return _body; }
[[nodiscard]] inline const std::unique_ptr<const ParsedStatement>& GetElseStatement() const noexcept {
return _elseStatement;
}
private: private:
std::unique_ptr<const ParsedStatement> _condition; std::unique_ptr<const ParsedStatement> _condition;
std::unique_ptr<const ParsedStatement> _body; std::unique_ptr<const ParsedStatement> _body;

29
src/Parser/Statements/ParsedStatementStringifier.hpp
View File

@ -104,7 +104,7 @@ namespace MalachScript::Parser {
} }
if (virtprop->HasGet()) { if (virtprop->HasGet()) {
auto& stat = virtprop->GetGetStatement(); auto& stat = virtprop->GetGetStatement();
auto propPrefix = prefix + " "; auto propPrefix = prefix + (isLast ? " " : "│ ");
stream << propPrefix; stream << propPrefix;
stream << (virtprop->HasSet() ? "├──" : "└──") << "Get"; stream << (virtprop->HasSet() ? "├──" : "└──") << "Get";
stream << std::endl; stream << std::endl;
@ -115,7 +115,7 @@ namespace MalachScript::Parser {
} }
if (virtprop->HasSet()) { if (virtprop->HasSet()) {
auto& stat = virtprop->GetSetStatement(); auto& stat = virtprop->GetSetStatement();
auto propPrefix = prefix + " "; auto propPrefix = prefix + (isLast ? " " : "│ ");
stream << propPrefix; stream << propPrefix;
stream << (virtprop->HasSet() ? "└──" : "├──") << "Set"; stream << (virtprop->HasSet() ? "└──" : "├──") << "Set";
stream << std::endl; stream << std::endl;
@ -133,9 +133,32 @@ namespace MalachScript::Parser {
for (size_t i = 0; i < stats.size(); i++) { for (size_t i = 0; i < stats.size(); i++) {
Stringify(stats[i].get(), stream, prefix + (isLast ? " " : "│ "), i == stats.size() - 1); Stringify(stats[i].get(), stream, prefix + (isLast ? " " : "│ "), i == stats.size() - 1);
} }
if (!stats.empty()) {
stream << std::endl;
}
break;
}
case ParsedStatementKind::If: {
auto s = static_cast<const ParsedIfStatement*>(statement);
auto propPrefix = prefix + (isLast ? " " : "│ ");
stream << std::endl;
stream << propPrefix << "├──"
<< "Condition";
stream << std::endl;
Stringify(s->GetCondition().get(), stream, propPrefix + "│ ", true);
stream << std::endl;
stream << propPrefix << (s->GetElseStatement() == nullptr ? "└──" : "├──") << "When True";
stream << std::endl;
Stringify(s->GetBody().get(), stream,
propPrefix + (s->GetElseStatement() == nullptr ? " " : "│ "), true);
if (s->GetElseStatement() != nullptr) {
stream << propPrefix << "└──"
<< "Else";
stream << std::endl;
Stringify(s->GetElseStatement().get(), stream, propPrefix + " ", true);
}
break; break;
} }
case ParsedStatementKind::If: break;
case ParsedStatementKind::Assign: break; case ParsedStatementKind::Assign: break;
case ParsedStatementKind::BinaryExpression: break; case ParsedStatementKind::BinaryExpression: break;
case ParsedStatementKind::Void: break; case ParsedStatementKind::Void: break;