X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fglsl%2Fvalidate.h;h=9477b67d70cb7a7ecc9acc38ad81e76d81af1c97;hb=d18df036b247f7f0978b547bb8ea1d624af2c4b2;hp=3efa51419d6e6c765f93839c3ed7b76218e0bfe0;hpb=d80750e7c20ea061f210b756196cc844b762b852;p=libs%2Fgl.git

diff --git a/source/glsl/validate.h b/source/glsl/validate.h
index 3efa5141..9477b67d 100644
--- a/source/glsl/validate.h
+++ b/source/glsl/validate.h
@@ -14,11 +14,14 @@ class Validator: protected TraversingVisitor
 {
 protected:
 	Stage *stage;
+	Node *last_provoker;
 
 	Validator();
 
-	void diagnose(Node &, Diagnostic::Severity, const std::string &);
+	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); }
 	void error(Node &n, const std::string &m) { diagnose(n, Diagnostic::ERR, m); }
+	void add_info(Node &, const std::string &);
 };
 
 class TypeValidator: private Validator
@@ -76,11 +79,26 @@ private:
 	virtual void visit(BasicTypeDeclaration &);
 	virtual void visit(ImageTypeDeclaration &);
 	virtual void visit(VariableReference &);
+	virtual void visit(MemberAccess &);
 	virtual void visit(InterfaceBlockReference &);
 	virtual void visit(VariableDeclaration &);
+	virtual void visit(InterfaceBlock &);
 	virtual void visit(FunctionDeclaration &);
 };
 
+class ExpressionValidator: private Validator
+{
+public:
+	void apply(Stage &s) { stage = &s; s.content.visit(*this); }
+
+private:
+	virtual void visit(Swizzle &);
+	virtual void visit(UnaryExpression &);
+	virtual void visit(BinaryExpression &);
+	virtual void visit(Assignment &);
+	virtual void visit(VariableDeclaration &);
+};
+
 } // namespace SL
 } // namespace GL
 } // namespace Msp