X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fglsl%2Fvalidate.h;h=f1e3f5126eb8422624524979a8768165b5451396;hb=ddb8e4ceea602d90ca7d9dc2637b9285610787bd;hp=b64973276536e2dbc653ac30f142866ccb3b3fcb;hpb=4181ceb89a2d538712c81826da610e7e8583e9a5;p=libs%2Fgl.git

diff --git a/source/glsl/validate.h b/source/glsl/validate.h
index b6497327..f1e3f512 100644
--- a/source/glsl/validate.h
+++ b/source/glsl/validate.h
@@ -14,41 +14,63 @@ 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
+class DeclarationValidator: private Validator
 {
 private:
-	bool in_struct;
+	enum ScopeType
+	{
+		GLOBAL,
+		STRUCT,
+		INTERFACE_BLOCK,
+		FUNCTION_PARAM,
+		FUNCTION
+	};
+
+	ScopeType scope;
+	InterfaceLayout *iface_layout;
+	InterfaceBlock *iface_block;
+	VariableDeclaration *variable;
 
 public:
-	TypeValidator();
+	DeclarationValidator();
 
 	void apply(Stage &s) { stage = &s; s.content.visit(*this); }
 
 private:
+	static const char *describe_variable(ScopeType);
+
+	virtual void visit(Layout &);
+	virtual void visit(InterfaceLayout &);
 	virtual void visit(BasicTypeDeclaration &);
 	virtual void visit(ImageTypeDeclaration &);
 	virtual void visit(StructDeclaration &);
 	virtual void visit(VariableDeclaration &);
+	virtual void visit(InterfaceBlock &);
+	virtual void visit(FunctionDeclaration &);
 };
 
-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); }
 
@@ -78,6 +100,7 @@ private:
 	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 &);
@@ -85,7 +108,12 @@ private:
 
 class ExpressionValidator: private Validator
 {
+private:
+	FunctionDeclaration *current_function;
+
 public:
+	ExpressionValidator();
+
 	void apply(Stage &s) { stage = &s; s.content.visit(*this); }
 
 private:
@@ -93,7 +121,10 @@ private:
 	virtual void visit(UnaryExpression &);
 	virtual void visit(BinaryExpression &);
 	virtual void visit(Assignment &);
+	virtual void visit(TernaryExpression &);
 	virtual void visit(VariableDeclaration &);
+	virtual void visit(FunctionDeclaration &);
+	virtual void visit(Return &);
 };
 
 } // namespace SL