namespace GL {
namespace SL {
-class DeclarationCombiner: private 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 &);
private:
virtual void visit(Block &);
virtual void visit(FunctionDeclaration &);
virtual void visit(VariableDeclaration &);
- using BlockModifier::visit;
+ using TraversingVisitor::visit;
+};
+
+class BlockResolver: private TraversingVisitor
+{
+public:
+ void apply(Stage &s) { visit(s.content); }
+
+private:
+ virtual void visit(Block &);
+ virtual void visit(InterfaceBlock &);
+ using TraversingVisitor::visit;
};
class VariableResolver: private TraversingVisitor
{
private:
- std::vector<Block *> blocks;
+ Block *builtins;
StructDeclaration *type;
- bool anonymous;
std::string block_interface;
bool record_target;
VariableDeclaration *assignment_target;
void apply(Stage &);
private:
+ Block *next_block(Block &);
+
virtual void visit(Block &);
virtual void visit(VariableReference &);
virtual void visit(MemberAccess &);
virtual void visit(StructDeclaration &);
virtual void visit(VariableDeclaration &);
virtual void visit(InterfaceBlock &);
+ virtual void visit(FunctionDeclaration &);
+ virtual void visit(Iteration &);
using TraversingVisitor::visit;
};
using TraversingVisitor::visit;
};
-class InterfaceGenerator: private 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;
+ NodeList<Statement>::iterator iface_insert_point;
+ NodeList<Statement>::iterator assignment_insert_point;
+ std::set<Node *> nodes_to_remove;
public:
InterfaceGenerator();
virtual void visit(VariableReference &);
virtual void visit(VariableDeclaration &);
virtual void visit(Passthrough &);
- using BlockModifier::visit;
+ using TraversingVisitor::visit;
};
class DeclarationReorderer: private TraversingVisitor
FUNCTION
};
- unsigned scope_level;
DeclarationKind kind;
std::set<Node *> ordered_funcs;
std::set<Node *> needed_funcs;