X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fglsl%2Fvalidate.h;h=f1e3f5126eb8422624524979a8768165b5451396;hb=f2ad2730858046b08e8147297fa01bf3499b86a3;hp=a8c6f11c6a8e12602431abb6fd22a93b280e55fd;hpb=7d66c70e15b84cbaf6b1973db07629f5bd3e5cdf;p=libs%2Fgl.git

diff --git a/source/glsl/validate.h b/source/glsl/validate.h
index a8c6f11c..f1e3f512 100644
--- a/source/glsl/validate.h
+++ b/source/glsl/validate.h
@@ -24,24 +24,42 @@ protected:
 	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;
@@ -52,7 +70,7 @@ private:
 	bool anonymous_block;
 
 public:
-	DeclarationValidator();
+	IdentifierValidator();
 
 	void apply(Stage &s) { stage = &s; s.content.visit(*this); }
 
@@ -82,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 &);
@@ -89,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:
@@ -97,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