namespace GL {
namespace SL {
-class DeclarationCombiner: public BlockModifier
+class DeclarationCombiner: private TraversingVisitor
{
private:
bool toplevel;
std::map<std::string, std::vector<FunctionDeclaration *> > functions;
std::map<std::string, VariableDeclaration *> variables;
+ std::set<Node *> nodes_to_remove;
public:
DeclarationCombiner();
- void apply(Stage &s) { visit(s.content); }
+ void apply(Stage &);
- using BlockModifier::visit;
+private:
virtual void visit(Block &);
virtual void visit(FunctionDeclaration &);
virtual void visit(VariableDeclaration &);
+ using TraversingVisitor::visit;
};
-class VariableResolver: public TraversingVisitor
+class VariableResolver: private TraversingVisitor
{
private:
std::vector<Block *> blocks;
void apply(Stage &);
- using TraversingVisitor::visit;
+private:
virtual void visit(Block &);
virtual void visit(VariableReference &);
virtual void visit(MemberAccess &);
virtual void visit(StructDeclaration &);
virtual void visit(VariableDeclaration &);
virtual void visit(InterfaceBlock &);
+ using TraversingVisitor::visit;
};
-class FunctionResolver: public TraversingVisitor
+class FunctionResolver: private TraversingVisitor
{
private:
std::map<std::string, std::vector<FunctionDeclaration *> > functions;
public:
void apply(Stage &s) { visit(s.content); }
- using TraversingVisitor::visit;
+private:
virtual void visit(FunctionCall &);
virtual void visit(FunctionDeclaration &);
+ using TraversingVisitor::visit;
};
-class InterfaceGenerator: public BlockModifier
+class InterfaceGenerator: private TraversingVisitor
{
private:
Stage *stage;
std::string in_prefix;
std::string out_prefix;
unsigned scope_level;
- std::map<std::string, RefPtr<VariableDeclaration> > iface_declarations;
+ Block *current_block;
+ NodeList<Statement>::iterator iface_insert_point;
+ NodeList<Statement>::iterator assignment_insert_point;
+ std::set<Node *> nodes_to_remove;
public:
InterfaceGenerator();
void apply(Stage &);
+private:
static std::string get_out_prefix(Stage::Type);
- using BlockModifier::visit;
- virtual void visit(Block &);
std::string change_prefix(const std::string &, const std::string &) const;
+ virtual void visit(Block &);
bool generate_interface(VariableDeclaration &, const std::string &, const std::string &);
ExpressionStatement &insert_assignment(const std::string &, Expression *);
virtual void visit(VariableReference &);
virtual void visit(VariableDeclaration &);
virtual void visit(Passthrough &);
+ using TraversingVisitor::visit;
};
-class DeclarationReorderer: public TraversingVisitor
+class DeclarationReorderer: private TraversingVisitor
{
private:
enum DeclarationKind
void apply(Stage &s) { visit(s.content); }
- using TraversingVisitor::visit;
+private:
virtual void visit(Block &);
virtual void visit(FunctionCall &);
virtual void visit(InterfaceLayout &) { kind = LAYOUT; }
virtual void visit(VariableDeclaration &);
virtual void visit(InterfaceBlock &) { kind = VARIABLE; }
virtual void visit(FunctionDeclaration &);
+ using TraversingVisitor::visit;
};
} // namespace SL