virtual void apply(ProgramSyntax::Stage &);
const std::string &get_result() const { return formatted; }
+ using Visitor::visit;
virtual void visit(ProgramSyntax::Block &);
virtual void visit(ProgramSyntax::Literal &);
virtual void visit(ProgramSyntax::ParenthesizedExpression &);
virtual void visit(ProgramSyntax::Conditional &);
virtual void visit(ProgramSyntax::Iteration &);
virtual void visit(ProgramSyntax::Return &);
+ virtual void visit(ProgramSyntax::Jump &);
};
template<typename T>
std::list<T *> nodes;
const ResultType &get_result() const { return nodes; }
+ using Visitor::visit;
virtual void visit(T &n) { nodes.push_back(&n); }
};
DeclarationCombiner();
+ using Visitor::visit;
virtual void visit(ProgramSyntax::Block &);
virtual void visit(ProgramSyntax::FunctionDeclaration &);
virtual void visit(ProgramSyntax::VariableDeclaration &);
VariableResolver();
virtual void apply(ProgramSyntax::Stage &);
+ using Visitor::visit;
virtual void visit(ProgramSyntax::Block &);
virtual void visit(ProgramSyntax::VariableReference &);
virtual void visit(ProgramSyntax::MemberAccess &);
{
std::map<std::string, std::vector<ProgramSyntax::FunctionDeclaration *> > functions;
+ using Visitor::visit;
virtual void visit(ProgramSyntax::FunctionCall &);
virtual void visit(ProgramSyntax::FunctionDeclaration &);
};
void flatten_block(ProgramSyntax::Block &);
void apply_and_increment(ProgramSyntax::Block &, std::list<RefPtr<ProgramSyntax::Node> >::iterator &);
+ using Visitor::visit;
virtual void visit(ProgramSyntax::Block &);
};
static std::string get_out_prefix(ProgramSyntax::StageType);
virtual void apply(ProgramSyntax::Stage &);
+ using Visitor::visit;
virtual void visit(ProgramSyntax::Block &);
std::string change_prefix(const std::string &, const std::string &) const;
bool generate_interface(ProgramSyntax::VariableDeclaration &, const std::string &, const std::string &);
struct VariableRenamer: Visitor
{
+ using Visitor::visit;
virtual void visit(ProgramSyntax::VariableReference &);
virtual void visit(ProgramSyntax::VariableDeclaration &);
};
DeclarationReorderer();
+ using Visitor::visit;
virtual void visit(ProgramSyntax::Block &);
virtual void visit(ProgramSyntax::InterfaceLayout &) { kind = LAYOUT; }
virtual void visit(ProgramSyntax::StructDeclaration &) { kind = STRUCT; }
virtual void visit(ProgramSyntax::FunctionDeclaration &) { kind = FUNCTION; }
};
+ struct InlineableFunctionLocator: Visitor
+ {
+ typedef std::set<ProgramSyntax::FunctionDeclaration *> ResultType;
+
+ std::map<ProgramSyntax::FunctionDeclaration *, unsigned> refcounts;
+ std::set<ProgramSyntax::FunctionDeclaration *> inlineable;
+ ProgramSyntax::FunctionDeclaration *in_function;
+
+ InlineableFunctionLocator();
+
+ const ResultType &get_result() const { return inlineable; }
+ using Visitor::visit;
+ virtual void visit(ProgramSyntax::FunctionCall &);
+ virtual void visit(ProgramSyntax::FunctionDeclaration &);
+ };
+
+ struct FunctionInliner: Visitor
+ {
+ std::set<ProgramSyntax::FunctionDeclaration *> inlineable;
+ unsigned extract_result;
+ RefPtr<ProgramSyntax::Expression> inline_result;
+
+ FunctionInliner();
+ FunctionInliner(const std::set<ProgramSyntax::FunctionDeclaration *> &);
+
+ void visit_and_inline(RefPtr<ProgramSyntax::Expression> &);
+ using Visitor::visit;
+ virtual void visit(ProgramSyntax::Block &);
+ virtual void visit(ProgramSyntax::UnaryExpression &);
+ virtual void visit(ProgramSyntax::BinaryExpression &);
+ virtual void visit(ProgramSyntax::FunctionCall &);
+ virtual void visit(ProgramSyntax::Return &);
+ };
+
struct ExpressionEvaluator: ProgramSyntax::NodeVisitor
{
typedef std::map<ProgramSyntax::VariableDeclaration *, ProgramSyntax::Expression *> ValueMap;
ExpressionEvaluator();
ExpressionEvaluator(const ValueMap &);
+ using ProgramSyntax::NodeVisitor::visit;
virtual void visit(ProgramSyntax::Literal &);
virtual void visit(ProgramSyntax::ParenthesizedExpression &);
virtual void visit(ProgramSyntax::VariableReference &);
ConstantConditionEliminator();
+ using Visitor::visit;
virtual void visit(ProgramSyntax::Block &);
virtual void visit(ProgramSyntax::Assignment &);
virtual void visit(ProgramSyntax::VariableDeclaration &);
struct UnusedVariableLocator: Visitor
{
- struct AssignmentList
+ struct VariableInfo
{
- std::vector<ProgramSyntax::Node *> nodes;
- bool conditional;
- bool self_referencing;
+ bool local;
+ std::vector<ProgramSyntax::Node *> assignments;
+ bool conditionally_assigned;
+ bool referenced;
+
+ VariableInfo();
};
typedef std::set<ProgramSyntax::Node *> ResultType;
- typedef std::map<ProgramSyntax::VariableDeclaration *, AssignmentList> BlockAssignmentMap;
+ typedef std::map<ProgramSyntax::VariableDeclaration *, VariableInfo> BlockVariableMap;
std::set<ProgramSyntax::Node *> unused_nodes;
std::map<ProgramSyntax::VariableDeclaration *, ProgramSyntax::Node *> aggregates;
ProgramSyntax::Node *aggregate;
- std::vector<BlockAssignmentMap> assignments;
+ std::vector<BlockVariableMap> variables;
ProgramSyntax::Assignment *assignment;
bool assignment_target;
+ bool global_scope;
UnusedVariableLocator();
virtual void apply(ProgramSyntax::Stage &);
const ResultType &get_result() const { return unused_nodes; }
+ using Visitor::visit;
virtual void visit(ProgramSyntax::VariableReference &);
virtual void visit(ProgramSyntax::MemberAccess &);
virtual void visit(ProgramSyntax::BinaryExpression &);
virtual void visit(ProgramSyntax::Assignment &);
void record_assignment(ProgramSyntax::VariableDeclaration &, ProgramSyntax::Node &, bool);
+ void clear_assignments(VariableInfo &, bool);
virtual void visit(ProgramSyntax::ExpressionStatement &);
virtual void visit(ProgramSyntax::StructDeclaration &);
virtual void visit(ProgramSyntax::VariableDeclaration &);
virtual void visit(ProgramSyntax::InterfaceBlock &);
virtual void visit(ProgramSyntax::FunctionDeclaration &);
- void merge_down_assignments();
+ void merge_down_variables();
virtual void visit(ProgramSyntax::Conditional &);
virtual void visit(ProgramSyntax::Iteration &);
};
std::set<ProgramSyntax::FunctionDeclaration *> used_definitions;
const ResultType &get_result() const { return unused_nodes; }
+ using Visitor::visit;
virtual void visit(ProgramSyntax::FunctionCall &);
virtual void visit(ProgramSyntax::FunctionDeclaration &);
};
NodeRemover() { }
NodeRemover(const std::set<ProgramSyntax::Node *> &);
+ using Visitor::visit;
virtual void visit(ProgramSyntax::Block &);
virtual void visit(ProgramSyntax::VariableDeclaration &);
};
{
Version target_version;
std::string type;
- std::string frag_out_name;
+ ProgramSyntax::VariableDeclaration *frag_out;
LegacyConverter();
LegacyConverter(const Version &);
bool check_version(const Version &);
+ using Visitor::visit;
virtual void visit(ProgramSyntax::VariableReference &);
+ virtual void visit(ProgramSyntax::Assignment &);
virtual void visit(ProgramSyntax::FunctionCall &);
virtual void visit(ProgramSyntax::VariableDeclaration &);
virtual void visit(ProgramSyntax::InterfaceBlock &);