This is necessary for keeping track of output lines and translating error
locations.
ProgramCompiler::Formatter::Formatter():
indent(0),
ProgramCompiler::Formatter::Formatter():
indent(0),
- parameter_list(false),
- else_if(0)
{ }
void ProgramCompiler::Formatter::apply(ProgramSyntax::Stage &s)
{ }
void ProgramCompiler::Formatter::apply(ProgramSyntax::Stage &s)
- formatted += format("#version %d%02d", ver.major, ver.minor);
+ append(format("#version %d%02d", ver.major, ver.minor));
if(api==OPENGL_ES2 && ver>=Version(3, 0))
if(api==OPENGL_ES2 && ver>=Version(3, 0))
formatted += '\n';
}
for(vector<const Extension *>::const_iterator i=s.required_extensions.begin(); i!=s.required_extensions.end(); ++i)
formatted += '\n';
}
for(vector<const Extension *>::const_iterator i=s.required_extensions.begin(); i!=s.required_extensions.end(); ++i)
- formatted += format("#extension %s: require\n", (*i)->get_name());
+ append(format("#extension %s: require\n", (*i)->get_name()));
if(!s.required_extensions.empty())
formatted += '\n';
Visitor::apply(s);
}
if(!s.required_extensions.empty())
formatted += '\n';
Visitor::apply(s);
}
+void ProgramCompiler::Formatter::append(const string &text)
+{
+ formatted += text;
+}
+
+void ProgramCompiler::Formatter::append(char c)
+{
+ formatted += c;
+}
+
void ProgramCompiler::Formatter::visit(Literal &literal)
{
void ProgramCompiler::Formatter::visit(Literal &literal)
{
- formatted += literal.token;
}
void ProgramCompiler::Formatter::visit(ParenthesizedExpression &parexpr)
{
}
void ProgramCompiler::Formatter::visit(ParenthesizedExpression &parexpr)
{
parexpr.expression->visit(*this);
parexpr.expression->visit(*this);
}
void ProgramCompiler::Formatter::visit(VariableReference &var)
{
}
void ProgramCompiler::Formatter::visit(VariableReference &var)
{
}
void ProgramCompiler::Formatter::visit(MemberAccess &memacc)
{
memacc.left->visit(*this);
}
void ProgramCompiler::Formatter::visit(MemberAccess &memacc)
{
memacc.left->visit(*this);
- formatted += format(".%s", memacc.member);
+ append(format(".%s", memacc.member));
}
void ProgramCompiler::Formatter::visit(UnaryExpression &unary)
{
if(unary.prefix)
}
void ProgramCompiler::Formatter::visit(UnaryExpression &unary)
{
if(unary.prefix)
- formatted += unary.oper;
unary.expression->visit(*this);
if(!unary.prefix)
unary.expression->visit(*this);
if(!unary.prefix)
- formatted += unary.oper;
}
void ProgramCompiler::Formatter::visit(BinaryExpression &binary)
{
binary.left->visit(*this);
}
void ProgramCompiler::Formatter::visit(BinaryExpression &binary)
{
binary.left->visit(*this);
- formatted += binary.oper;
binary.right->visit(*this);
binary.right->visit(*this);
- formatted += binary.after;
}
void ProgramCompiler::Formatter::visit(Assignment &assign)
{
assign.left->visit(*this);
}
void ProgramCompiler::Formatter::visit(Assignment &assign)
{
assign.left->visit(*this);
- formatted += format(" %s ", assign.oper);
+ append(format(" %s ", assign.oper));
assign.right->visit(*this);
}
void ProgramCompiler::Formatter::visit(FunctionCall &call)
{
assign.right->visit(*this);
}
void ProgramCompiler::Formatter::visit(FunctionCall &call)
{
- formatted += format("%s(", call.name);
+ append(format("%s(", call.name));
for(NodeArray<Expression>::iterator i=call.arguments.begin(); i!=call.arguments.end(); ++i)
{
if(i!=call.arguments.begin())
for(NodeArray<Expression>::iterator i=call.arguments.begin(); i!=call.arguments.end(); ++i)
{
if(i!=call.arguments.begin())
}
void ProgramCompiler::Formatter::visit(ExpressionStatement &expr)
{
expr.expression->visit(*this);
}
void ProgramCompiler::Formatter::visit(ExpressionStatement &expr)
{
expr.expression->visit(*this);
}
void ProgramCompiler::Formatter::visit(Block &block)
{
}
void ProgramCompiler::Formatter::visit(Block &block)
{
- if(else_if)
- --else_if;
-
unsigned brace_indent = indent;
bool use_braces = (block.use_braces || (indent && block.body.size()!=1));
if(use_braces)
unsigned brace_indent = indent;
bool use_braces = (block.use_braces || (indent && block.body.size()!=1));
if(use_braces)
- formatted += format("%s{\n", string(brace_indent*2, ' '));
+ append(format("%s{\n", string(brace_indent*2, ' ')));
SetForScope<unsigned> set(indent, indent+(indent>0 || use_braces));
string spaces(indent*2, ' ');
for(NodeList<Statement>::iterator i=block.body.begin(); i!=block.body.end(); ++i)
{
if(i!=block.body.begin())
SetForScope<unsigned> set(indent, indent+(indent>0 || use_braces));
string spaces(indent*2, ' ');
for(NodeList<Statement>::iterator i=block.body.begin(); i!=block.body.end(); ++i)
{
if(i!=block.body.begin())
- formatted += '\n';
- formatted += spaces;
+ append('\n');
+ append(spaces);
- formatted += format("\n%s}", string(brace_indent*2, ' '));
+ append(format("\n%s}", string(brace_indent*2, ' ')));
}
void ProgramCompiler::Formatter::visit(Import &import)
{
}
void ProgramCompiler::Formatter::visit(Import &import)
{
- formatted += format("import %s;", import.module);
+ append(format("import %s;", import.module));
}
void ProgramCompiler::Formatter::visit(Precision &prec)
{
}
void ProgramCompiler::Formatter::visit(Precision &prec)
{
- formatted += format("precision %s %s;", prec.precision, prec.type);
+ append(format("precision %s %s;", prec.precision, prec.type));
}
void ProgramCompiler::Formatter::visit(Layout &layout)
{
}
void ProgramCompiler::Formatter::visit(Layout &layout)
{
- formatted += "layout(";
for(vector<Layout::Qualifier>::const_iterator i=layout.qualifiers.begin(); i!=layout.qualifiers.end(); ++i)
{
if(i!=layout.qualifiers.begin())
for(vector<Layout::Qualifier>::const_iterator i=layout.qualifiers.begin(); i!=layout.qualifiers.end(); ++i)
{
if(i!=layout.qualifiers.begin())
- formatted += ", ";
- formatted += i->identifier;
+ append(", ");
+ append(i->identifier);
- formatted += format("=%s", i->value);
+ append(format("=%s", i->value));
}
void ProgramCompiler::Formatter::visit(InterfaceLayout &layout)
{
layout.layout.visit(*this);
}
void ProgramCompiler::Formatter::visit(InterfaceLayout &layout)
{
layout.layout.visit(*this);
- formatted += format(" %s;", layout.interface);
+ append(format(" %s;", layout.interface));
}
void ProgramCompiler::Formatter::visit(StructDeclaration &strct)
{
}
void ProgramCompiler::Formatter::visit(StructDeclaration &strct)
{
- formatted += format("struct %s\n", strct.name);
+ append(format("struct %s\n", strct.name));
strct.members.visit(*this);
strct.members.visit(*this);
}
void ProgramCompiler::Formatter::visit(VariableDeclaration &var)
}
void ProgramCompiler::Formatter::visit(VariableDeclaration &var)
if(var.layout)
{
var.layout->visit(*this);
if(var.layout)
{
var.layout->visit(*this);
if(!var.interpolation.empty())
if(!var.interpolation.empty())
- formatted += format("%s ", var.interpolation);
+ append(format("%s ", var.interpolation));
if(!var.sampling.empty())
if(!var.sampling.empty())
- formatted += format("%s ", var.sampling);
+ append(format("%s ", var.sampling));
if(!var.interface.empty() && var.interface!=block_interface)
{
string interface = var.interface;
if(!var.interface.empty() && var.interface!=block_interface)
{
string interface = var.interface;
else if((stage->type==VERTEX && var.interface=="out") || (stage->type==FRAGMENT && var.interface=="in"))
interface = "varying";
}
else if((stage->type==VERTEX && var.interface=="out") || (stage->type==FRAGMENT && var.interface=="in"))
interface = "varying";
}
- formatted += format("%s ", interface);
+ append(format("%s ", interface));
}
if(!var.precision.empty())
}
if(!var.precision.empty())
- formatted += format("%s ", var.precision);
- formatted += format("%s %s", var.type, var.name);
+ append(format("%s ", var.precision));
+ append(format("%s %s", var.type, var.name));
if(var.array_size)
var.array_size->visit(*this);
if(var.array_size)
var.array_size->visit(*this);
}
if(var.init_expression)
{
}
if(var.init_expression)
{
var.init_expression->visit(*this);
}
if(!parameter_list)
var.init_expression->visit(*this);
}
if(!parameter_list)
}
void ProgramCompiler::Formatter::visit(InterfaceBlock &iface)
{
SetForScope<string> set(block_interface, iface.interface);
}
void ProgramCompiler::Formatter::visit(InterfaceBlock &iface)
{
SetForScope<string> set(block_interface, iface.interface);
- formatted += format("%s %s\n", iface.interface, iface.name);
+ append(format("%s %s\n", iface.interface, iface.name));
iface.members.visit(*this);
iface.members.visit(*this);
}
void ProgramCompiler::Formatter::visit(FunctionDeclaration &func)
{
}
void ProgramCompiler::Formatter::visit(FunctionDeclaration &func)
{
- formatted += format("%s %s(", func.return_type, func.name);
+ append(format("%s %s(", func.return_type, func.name));
for(NodeArray<VariableDeclaration>::iterator i=func.parameters.begin(); i!=func.parameters.end(); ++i)
{
if(i!=func.parameters.begin())
for(NodeArray<VariableDeclaration>::iterator i=func.parameters.begin(); i!=func.parameters.end(); ++i)
{
if(i!=func.parameters.begin())
SetFlag set(parameter_list);
(*i)->visit(*this);
}
SetFlag set(parameter_list);
(*i)->visit(*this);
}
if(func.definition==&func)
{
if(func.definition==&func)
{
func.body.visit(*this);
}
else
func.body.visit(*this);
}
else
}
void ProgramCompiler::Formatter::visit(Conditional &cond)
{
}
void ProgramCompiler::Formatter::visit(Conditional &cond)
{
- if(else_if)
- formatted.replace(formatted.rfind('\n'), string::npos, 1, ' ');
-
- indent -= else_if;
-
- formatted += "if(";
cond.condition->visit(*this);
cond.condition->visit(*this);
cond.body.visit(*this);
if(!cond.else_body.body.empty())
{
cond.body.visit(*this);
if(!cond.else_body.body.empty())
{
- formatted += format("\n%selse\n", string(indent*2, ' '));
- SetForScope<unsigned> set(else_if, 2);
- cond.else_body.visit(*this);
+ Conditional *else_cond = dynamic_cast<Conditional *>(cond.else_body.body.front().get());
+ if(cond.else_body.body.size()==1 && else_cond)
+ {
+ append(format("\n%selse ", string(indent*2, ' ')));
+ else_cond->visit(*this);
+ }
+ else
+ {
+ append(format("\n%selse\n", string(indent*2, ' ')));
+ cond.else_body.visit(*this);
+ }
{
if(!iter.init_statement && iter.condition && !iter.loop_expression)
{
{
if(!iter.init_statement && iter.condition && !iter.loop_expression)
{
iter.condition->visit(*this);
iter.condition->visit(*this);
if(iter.init_statement)
iter.init_statement->visit(*this);
else
if(iter.init_statement)
iter.init_statement->visit(*this);
else
iter.condition->visit(*this);
}
iter.condition->visit(*this);
}
if(iter.loop_expression)
{
if(iter.loop_expression)
{
iter.loop_expression->visit(*this);
}
iter.loop_expression->visit(*this);
}
}
if(iter.body.body.empty())
}
if(iter.body.body.empty())
iter.body.visit(*this);
}
}
void ProgramCompiler::Formatter::visit(Return &ret)
{
iter.body.visit(*this);
}
}
void ProgramCompiler::Formatter::visit(Return &ret)
{
ret.expression->visit(*this);
}
ret.expression->visit(*this);
}
}
void ProgramCompiler::Formatter::visit(Jump &jump)
{
}
void ProgramCompiler::Formatter::visit(Jump &jump)
{
- formatted += jump.keyword;
- formatted += ';';
+ append(jump.keyword);
+ append(';');
std::string formatted;
unsigned indent;
bool parameter_list;
std::string formatted;
unsigned indent;
bool parameter_list;
std::string block_interface;
Formatter();
std::string block_interface;
Formatter();
virtual void apply(ProgramSyntax::Stage &);
const std::string &get_result() const { return formatted; }
using Visitor::visit;
virtual void apply(ProgramSyntax::Stage &);
const std::string &get_result() const { return formatted; }
using Visitor::visit;
+ void append(const std::string &);
+ void append(char);
virtual void visit(ProgramSyntax::Block &);
virtual void visit(ProgramSyntax::Literal &);
virtual void visit(ProgramSyntax::ParenthesizedExpression &);
virtual void visit(ProgramSyntax::Block &);
virtual void visit(ProgramSyntax::Literal &);
virtual void visit(ProgramSyntax::ParenthesizedExpression &);