class BlockHierarchyResolver: private TraversingVisitor
{
private:
- bool r_any_resolved;
+ bool r_any_resolved = false;
public:
- BlockHierarchyResolver(): r_any_resolved(false) { }
-
bool apply(Stage &s) { r_any_resolved = false; s.content.visit(*this); return r_any_resolved; }
private:
class TypeResolver: private TraversingVisitor
{
private:
- Stage *stage;
+ Stage *stage = 0;
std::map<TypeDeclaration *, TypeDeclaration *> alias_map;
- std::map<TypeDeclaration *, TypeDeclaration *> array_types;
+ std::map<std::pair<TypeDeclaration *, bool>, TypeDeclaration *> array_types;
NodeList<Statement>::iterator type_insert_point;
- InterfaceBlock *iface_block;
- bool r_any_resolved;
+ NodeList<Statement>::iterator block_member_type_ins_pt;
+ VariableDeclaration *iface_block = 0;
+ bool r_any_resolved = false;
public:
- TypeResolver();
-
bool apply(Stage &);
private:
virtual void visit(ImageTypeDeclaration &);
virtual void visit(StructDeclaration &);
virtual void visit(VariableDeclaration &);
- virtual void visit(InterfaceBlock &);
virtual void visit(FunctionDeclaration &);
};
-/** Resolves variable references. Variable references which match the name
-of an interface block are turned into interface block references. */
+/** Resolves variable references. */
class VariableResolver: private TraversingVisitor
{
private:
- Stage *stage;
+ Stage *stage = 0;
RefPtr<Expression> r_replacement_expr;
- bool r_any_resolved;
- bool record_target;
- bool r_self_referencing;
+ bool r_any_resolved = false;
+ bool record_target = false;
+ bool r_self_referencing = false;
Assignment::Target r_assignment_target;
- std::vector<VariableDeclaration *> redeclared_builtins;
+ std::vector<Statement *> redeclared_builtins;
std::set<Node *> nodes_to_remove;
public:
- VariableResolver();
-
bool apply(Stage &);
private:
virtual void visit(RefPtr<Expression> &);
void check_assignment_target(Statement *);
virtual void visit(VariableReference &);
- virtual void visit(InterfaceBlockReference &);
virtual void visit(MemberAccess &);
virtual void visit(Swizzle &);
virtual void visit(BinaryExpression &);
virtual void visit(Assignment &);
void merge_layouts(Layout &, const Layout &);
+ void redeclare_builtin(VariableDeclaration &, VariableDeclaration &);
virtual void visit(VariableDeclaration &);
- virtual void visit(InterfaceBlock &);
};
/** Resolves types and lvalueness of expressions. */
struct ArgumentInfo
{
- BasicTypeDeclaration *type;
- unsigned component_count;
-
- ArgumentInfo(): type(0), component_count(0) { }
+ BasicTypeDeclaration *type = 0;
+ unsigned component_count = 0;
};
- Stage *stage;
+ Stage *stage = 0;
+ const FunctionDeclaration *current_function = 0;
std::vector<BasicTypeDeclaration *> basic_types;
NodeList<Statement>::iterator insert_point;
- bool r_any_resolved;
+ bool r_any_resolved = false;
public:
- ExpressionResolver();
-
bool apply(Stage &);
private:
virtual void visit(Block &);
virtual void visit(Literal &);
virtual void visit(VariableReference &);
- virtual void visit(InterfaceBlockReference &);
virtual void visit(MemberAccess &);
virtual void visit(Swizzle &);
virtual void visit(UnaryExpression &);
virtual void visit(FunctionCall &);
virtual void visit(BasicTypeDeclaration &);
virtual void visit(VariableDeclaration &);
+ virtual void visit(FunctionDeclaration &);
+ virtual void visit(Return &);
};
/** Resolves function declarations and calls. */
class FunctionResolver: private TraversingVisitor
{
private:
- Stage *stage;
+ Stage *stage = 0;
std::map<std::string, std::vector<FunctionDeclaration *> > declarations;
- bool r_any_resolved;
+ bool r_any_resolved = false;
public:
bool apply(Stage &);