X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fglsl%2Fvalidate.h;h=6cd5675a07f691f413c8786f2143fb5d2ebb3708;hb=7a62eb7f7550df161656616f2ece5a094b754392;hp=2efb5199660e149740693a04180d1ba643619d19;hpb=f526938b407e061c7424adedc34af4d1ff687f90;p=libs%2Fgl.git

diff --git a/source/glsl/validate.h b/source/glsl/validate.h
index 2efb5199..6cd5675a 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
@@ -38,17 +41,18 @@ private:
 	virtual void visit(VariableDeclaration &);
 };
 
-class DeclarationValidator: private Validator
+class IdentifierValidator: private Validator
 {
 private:
 	typedef std::map<std::string, Statement *> BlockDeclarationMap;
 
 	std::map<Block *, BlockDeclarationMap> declarations;
 	std::map<std::string, InterfaceBlock *> interface_blocks;
+	std::map<std::string, FunctionDeclaration *> overloaded_functions;
 	bool anonymous_block;
 
 public:
-	DeclarationValidator();
+	IdentifierValidator();
 
 	void apply(Stage &s) { stage = &s; s.content.visit(*this); }
 
@@ -76,7 +80,9 @@ private:
 	virtual void visit(BasicTypeDeclaration &);
 	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 &);
@@ -92,6 +98,7 @@ private:
 	virtual void visit(UnaryExpression &);
 	virtual void visit(BinaryExpression &);
 	virtual void visit(Assignment &);
+	virtual void visit(TernaryExpression &);
 	virtual void visit(VariableDeclaration &);
 };