Ribbit/ribbitvulkanadditions
1
0
Fork 0
forked from eden-emu/eden
Code Pull requests Activity

video_core/shader/ast: Rename Ident() to Indent()

Browse source 
This can be confusing, given "ident" is generally used as a shorthand
for "identifier".
This commit is contained in:
Lioncash 2019-10-17 20:05:25 -04:00
parent 1a00cb5680
commit 4f14102a05
1 changed files with 13 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

26
src/video_core/shader/ast.cpp
View file

@ -251,7 +251,7 @@ public:
void operator()(const ASTIfThen& ast) { void operator()(const ASTIfThen& ast) {
ExprPrinter expr_parser{}; ExprPrinter expr_parser{};
std::visit(expr_parser, *ast.condition); std::visit(expr_parser, *ast.condition);
inner += fmt::format("{}if ({}) {{\n", Ident(), expr_parser.GetResult()); inner += fmt::format("{}if ({}) {{\n", Indent(), expr_parser.GetResult());
scope++; scope++;
ASTNode current = ast.nodes.GetFirst(); ASTNode current = ast.nodes.GetFirst();
while (current) { while (current) {
@ -259,11 +259,11 @@ public:
current = current->GetNext(); current = current->GetNext();
} }
scope--; scope--;
inner += fmt::format("{}}}\n", Ident()); inner += fmt::format("{}}}\n", Indent());
} }
void operator()(const ASTIfElse& ast) { void operator()(const ASTIfElse& ast) {
inner += Ident() + "else {\n"; inner += Indent() + "else {\n";
scope++; scope++;
ASTNode current = ast.nodes.GetFirst(); ASTNode current = ast.nodes.GetFirst();
while (current) { while (current) {
@ -271,21 +271,21 @@ public:
current = current->GetNext(); current = current->GetNext();
} }
scope--; scope--;
inner += Ident() + "}\n"; inner += Indent() + "}\n";
} }
void operator()(const ASTBlockEncoded& ast) { void operator()(const ASTBlockEncoded& ast) {
inner += fmt::format("{}Block({}, {});\n", Ident(), ast.start, ast.end); inner += fmt::format("{}Block({}, {});\n", Indent(), ast.start, ast.end);
} }
void operator()(const ASTBlockDecoded& ast) { void operator()(const ASTBlockDecoded& ast) {
inner += Ident() + "Block;\n"; inner += Indent() + "Block;\n";
} }
void operator()(const ASTVarSet& ast) { void operator()(const ASTVarSet& ast) {
ExprPrinter expr_parser{}; ExprPrinter expr_parser{};
std::visit(expr_parser, *ast.condition); std::visit(expr_parser, *ast.condition);
inner += fmt::format("{}V{} := {};\n", Ident(), ast.index, expr_parser.GetResult()); inner += fmt::format("{}V{} := {};\n", Indent(), ast.index, expr_parser.GetResult());
} }
void operator()(const ASTLabel& ast) { void operator()(const ASTLabel& ast) {
@ -296,13 +296,13 @@ public:
ExprPrinter expr_parser{}; ExprPrinter expr_parser{};
std::visit(expr_parser, *ast.condition); std::visit(expr_parser, *ast.condition);
inner += inner +=
fmt::format("{}({}) -> goto Label_{};\n", Ident(), expr_parser.GetResult(), ast.label); fmt::format("{}({}) -> goto Label_{};\n", Indent(), expr_parser.GetResult(), ast.label);
} }
void operator()(const ASTDoWhile& ast) { void operator()(const ASTDoWhile& ast) {
ExprPrinter expr_parser{}; ExprPrinter expr_parser{};
std::visit(expr_parser, *ast.condition); std::visit(expr_parser, *ast.condition);
inner += fmt::format("{}do {{\n", Ident()); inner += fmt::format("{}do {{\n", Indent());
scope++; scope++;
ASTNode current = ast.nodes.GetFirst(); ASTNode current = ast.nodes.GetFirst();
while (current) { while (current) {
@ -310,23 +310,23 @@ public:
current = current->GetNext(); current = current->GetNext();
} }
scope--; scope--;
inner += fmt::format("{}}} while ({});\n", Ident(), expr_parser.GetResult()); inner += fmt::format("{}}} while ({});\n", Indent(), expr_parser.GetResult());
} }
void operator()(const ASTReturn& ast) { void operator()(const ASTReturn& ast) {
ExprPrinter expr_parser{}; ExprPrinter expr_parser{};
std::visit(expr_parser, *ast.condition); std::visit(expr_parser, *ast.condition);
inner += fmt::format("{}({}) -> {};\n", Ident(), expr_parser.GetResult(), inner += fmt::format("{}({}) -> {};\n", Indent(), expr_parser.GetResult(),
ast.kills ? "discard" : "exit"); ast.kills ? "discard" : "exit");
} }
void operator()(const ASTBreak& ast) { void operator()(const ASTBreak& ast) {
ExprPrinter expr_parser{}; ExprPrinter expr_parser{};
std::visit(expr_parser, *ast.condition); std::visit(expr_parser, *ast.condition);
inner += fmt::format("{}({}) -> break;\n", Ident(), expr_parser.GetResult()); inner += fmt::format("{}({}) -> break;\n", Indent(), expr_parser.GetResult());
} }
std::string& Ident() { std::string& Indent() {
if (memo_scope == scope) { if (memo_scope == scope) {
return tabs_memo; return tabs_memo;
} }