class Validator: protected TraversingVisitor
{
protected:
- Stage *stage;
- Node *last_provoker;
+ Stage *stage = 0;
+ Node *last_provoker = 0;
- Validator();
+ Validator() = default;
void diagnose(Node &, Node &, Diagnostic::Severity, const std::string &);
void diagnose(Node &n, Diagnostic::Severity s, const std::string &m) { diagnose(n, n, s, m); }
FUNCTION
};
- ScopeType scope;
- InterfaceLayout *iface_layout;
- InterfaceBlock *iface_block;
- VariableDeclaration *variable;
+ Features features;
+ ScopeType scope = GLOBAL;
+ InterfaceLayout *iface_layout = 0;
+ VariableDeclaration *iface_block = 0;
+ VariableDeclaration *variable = 0;
public:
- DeclarationValidator();
-
- void apply(Stage &s) { stage = &s; s.content.visit(*this); }
+ void apply(Stage &, const Features &);
private:
static const char *describe_variable(ScopeType);
virtual void visit(ImageTypeDeclaration &);
virtual void visit(StructDeclaration &);
virtual void visit(VariableDeclaration &);
- virtual void visit(InterfaceBlock &);
virtual void visit(FunctionDeclaration &);
};
typedef std::map<std::string, Statement *> BlockDeclarationMap;
std::map<Block *, BlockDeclarationMap> declarations;
- std::map<std::string, InterfaceBlock *> interface_blocks;
+ std::map<std::string, VariableDeclaration *> interface_blocks;
std::map<std::string, FunctionDeclaration *> overloaded_functions;
- bool anonymous_block;
+ bool anonymous_block = false;
public:
- IdentifierValidator();
-
void apply(Stage &s) { stage = &s; s.content.visit(*this); }
private:
virtual void visit(ImageTypeDeclaration &t) { visit(static_cast<TypeDeclaration &>(t)); }
virtual void visit(StructDeclaration &);
virtual void visit(VariableDeclaration &);
- virtual void visit(InterfaceBlock &);
virtual void visit(FunctionDeclaration &);
};
virtual void visit(ImageTypeDeclaration &);
virtual void visit(VariableReference &);
virtual void visit(MemberAccess &);
- virtual void visit(InterfaceBlockReference &);
virtual void visit(FunctionCall &);
virtual void visit(VariableDeclaration &);
- virtual void visit(InterfaceBlock &);
virtual void visit(FunctionDeclaration &);
};
class ExpressionValidator: private Validator
{
private:
- FunctionDeclaration *current_function;
- bool constant_expression;
+ enum ConstantKind
+ {
+ NOT_CONSTANT,
+ FIXED_CONSTANT,
+ SPEC_CONSTANT
+ };
-public:
- ExpressionValidator();
+ FunctionDeclaration *current_function = 0;
+ bool in_struct = false;
+ ConstantKind constant_expression = NOT_CONSTANT;
+public:
void apply(Stage &s) { stage = &s; s.content.visit(*this); }
private:
virtual void visit(VariableReference &);
- virtual void visit(InterfaceBlockReference &);
virtual void visit(Swizzle &);
virtual void visit(UnaryExpression &);
virtual void visit(BinaryExpression &);
virtual void visit(Assignment &);
virtual void visit(TernaryExpression &);
+ virtual void visit(StructDeclaration &);
virtual void visit(VariableDeclaration &);
virtual void visit(FunctionDeclaration &);
virtual void visit(Conditional &);
class FlowControlValidator: private Validator
{
private:
- bool reachable;
+ bool reachable = true;
public:
- FlowControlValidator();
-
void apply(Stage &s) { stage = &s; s.content.visit(*this); }
private:
void apply(Stage &s) { stage = &s; s.content.visit(*this); }
private:
- int get_location(const Layout &);
-
virtual void visit(VariableDeclaration &);
virtual void visit(FunctionDeclaration &) { }
};
private:
struct Uniform
{
- Node *node;
- TypeDeclaration *type;
+ Node *node = 0;
+ TypeDeclaration *type = 0;
std::string name;
- int location;
- unsigned loc_count;
- int desc_set;
- int bind_point;
-
- Uniform(): node(0), type(0), location(-1), loc_count(1), desc_set(0), bind_point(-1) { }
+ int location = -1;
+ unsigned loc_count = 1;
+ int desc_set = 0;
+ int bind_point = -1;
};
std::list<Uniform> uniforms;
void check_uniform(const Uniform &);
virtual void visit(VariableDeclaration &);
- virtual void visit(InterfaceBlock &);
virtual void visit(FunctionDeclaration &) { }
};