namespace GL {
namespace SL {
-class InlineableFunctionLocator: public TraversingVisitor
+class InlineableFunctionLocator: private TraversingVisitor
{
private:
std::map<FunctionDeclaration *, unsigned> refcounts;
public:
InlineableFunctionLocator();
- const std::set<FunctionDeclaration *> &apply(Stage &s) { visit(s.content); return inlineable; }
+ const std::set<FunctionDeclaration *> &apply(Stage &s) { s.content.visit(*this); return inlineable; }
- using TraversingVisitor::visit;
+private:
virtual void visit(FunctionCall &);
virtual void visit(FunctionDeclaration &);
};
-class FunctionInliner: public TraversingVisitor
+class FunctionInliner: private TraversingVisitor
{
private:
std::set<FunctionDeclaration *> inlineable;
public:
FunctionInliner();
- FunctionInliner(const std::set<FunctionDeclaration *> &);
- void apply(Stage &s) { visit(s.content); }
+ void apply(Stage &);
private:
void visit_and_inline(RefPtr<Expression> &);
-public:
- using TraversingVisitor::visit;
+
virtual void visit(Block &);
virtual void visit(UnaryExpression &);
virtual void visit(BinaryExpression &);
virtual void visit(Return &);
};
-class ConstantConditionEliminator: public BlockModifier
+class ConstantConditionEliminator: private TraversingVisitor
{
private:
- unsigned scope_level;
bool record_only;
ExpressionEvaluator::ValueMap variable_values;
+ NodeList<Statement>::iterator insert_point;
+ std::set<Node *> nodes_to_remove;
public:
ConstantConditionEliminator();
- void apply(Stage &s) { visit(s.content); }
+ void apply(Stage &);
- using BlockModifier::visit;
+private:
virtual void visit(Block &);
virtual void visit(UnaryExpression &);
virtual void visit(Assignment &);
virtual void visit(Iteration &);
};
-class UnusedVariableLocator: public TraversingVisitor
+class UnusedVariableRemover: private TraversingVisitor
{
private:
struct VariableInfo
Assignment *assignment;
bool assignment_target;
bool assign_to_subscript;
- bool global_scope;
public:
- UnusedVariableLocator();
+ UnusedVariableRemover();
- const std::set<Node *> &apply(Stage &);
+ bool apply(Stage &);
- using TraversingVisitor::visit;
+private:
virtual void visit(VariableReference &);
+ virtual void visit(InterfaceBlockReference &);
virtual void visit(MemberAccess &);
virtual void visit(BinaryExpression &);
virtual void visit(Assignment &);
-private:
void record_assignment(VariableDeclaration &, Node &, bool);
void clear_assignments(VariableInfo &, bool);
-public:
virtual void visit(ExpressionStatement &);
virtual void visit(StructDeclaration &);
virtual void visit(VariableDeclaration &);
virtual void visit(InterfaceBlock &);
virtual void visit(FunctionDeclaration &);
-private:
void merge_down_variables();
-public:
virtual void visit(Conditional &);
virtual void visit(Iteration &);
};
-class UnusedFunctionLocator: public TraversingVisitor
+class UnusedFunctionRemover: private TraversingVisitor
{
private:
std::set<Node *> unused_nodes;
std::set<FunctionDeclaration *> used_definitions;
public:
- const std::set<Node *> &apply(Stage &s) { visit(s.content); return unused_nodes; }
+ bool apply(Stage &s);
- using TraversingVisitor::visit;
+private:
virtual void visit(FunctionCall &);
virtual void visit(FunctionDeclaration &);
};