Validate return types of overloaded functions

[libs/gl.git] / source / glsl / validate.h

diff --git a/source/glsl/validate.h b/source/glsl/validate.h
index 42c74230c4f90637208b4fb9ca42388f82ad123b..a8c6f11c6a8e12602431abb6fd22a93b280e55fd 100644 (file)
--- a/source/glsl/validate.h
+++ b/source/glsl/validate.h
@@ -14,11 +14,31 @@ class Validator: protected TraversingVisitor
 {
 protected:
        Stage *stage;
+       Node *last_provoker;
 
        Validator();
 
-       void diagnose(Statement *, Diagnostic::Severity, const std::string &);
-       void error(Statement *s, const std::string &m) { diagnose(s, Diagnostic::ERR, m); }
+       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
+{
+private:
+       bool in_struct;
+
+public:
+       TypeValidator();
+
+       void apply(Stage &s) { stage = &s; s.content.visit(*this); }
+
+private:
+       virtual void visit(BasicTypeDeclaration &);
+       virtual void visit(ImageTypeDeclaration &);
+       virtual void visit(StructDeclaration &);
+       virtual void visit(VariableDeclaration &);
 };
 
 class DeclarationValidator: private Validator
@@ -28,6 +48,7 @@ private:
 
        std::map<Block *, BlockDeclarationMap> declarations;
        std::map<std::string, InterfaceBlock *> interface_blocks;
+       std::map<std::string, FunctionDeclaration *> overloaded_functions;
        bool anonymous_block;
 
 public:
@@ -41,11 +62,44 @@ private:
        void check_definition(const std::string &, Statement &);
        void record_definition(const std::string &, Statement &);
 
+       virtual void visit(TypeDeclaration &);
+       virtual void visit(BasicTypeDeclaration &t) { visit(static_cast<TypeDeclaration &>(t)); }
+       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 &);
 };
 
+class ReferenceValidator: private Validator
+{
+public:
+       void apply(Stage &s) { stage = &s; s.content.visit(*this); }
+
+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