public:
DeclarationCombiner();
- using StageVisitor::visit;
+ void apply(Stage &s) { visit(s.content); }
+
+ using BlockModifier::visit;
virtual void visit(Block &);
virtual void visit(FunctionDeclaration &);
virtual void visit(VariableDeclaration &);
};
-class VariableResolver: public StageVisitor
+class VariableResolver: public TraversingVisitor
{
private:
std::vector<Block *> blocks;
public:
VariableResolver();
- virtual void apply(Stage &);
- using StageVisitor::visit;
+ void apply(Stage &);
+
+ using TraversingVisitor::visit;
virtual void visit(Block &);
virtual void visit(VariableReference &);
virtual void visit(MemberAccess &);
virtual void visit(InterfaceBlock &);
};
-class FunctionResolver: public StageVisitor
+class FunctionResolver: public TraversingVisitor
{
private:
std::map<std::string, std::vector<FunctionDeclaration *> > functions;
public:
- using StageVisitor::visit;
+ void apply(Stage &s) { visit(s.content); }
+
+ using TraversingVisitor::visit;
virtual void visit(FunctionCall &);
virtual void visit(FunctionDeclaration &);
};
class InterfaceGenerator: public BlockModifier
{
private:
+ Stage *stage;
std::string in_prefix;
std::string out_prefix;
unsigned scope_level;
public:
InterfaceGenerator();
- static std::string get_out_prefix(StageType);
- virtual void apply(Stage &);
- using StageVisitor::visit;
+ void apply(Stage &);
+
+ 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;
bool generate_interface(VariableDeclaration &, const std::string &, const std::string &);
virtual void visit(Passthrough &);
};
-class DeclarationReorderer: public StageVisitor
+class DeclarationReorderer: public TraversingVisitor
{
private:
enum DeclarationKind
public:
DeclarationReorderer();
- using StageVisitor::visit;
+ void apply(Stage &s) { visit(s.content); }
+
+ using TraversingVisitor::visit;
virtual void visit(Block &);
virtual void visit(FunctionCall &);
virtual void visit(InterfaceLayout &) { kind = LAYOUT; }