Record location information in all syntax nodes

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

diff --git a/source/glsl/validate.h b/source/glsl/validate.h
index f784ea45e9c4d05413f5d59aa34b6ed8155e7b0b..01f2ba4f82c75d6ce76cba2c77eef6eb43d7f707 100644 (file)
--- a/source/glsl/validate.h
+++ b/source/glsl/validate.h
@@ -17,8 +17,8 @@ protected:
 
        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 &, Diagnostic::Severity, const std::string &);
+       void error(Node &n, const std::string &m) { diagnose(n, Diagnostic::ERR, m); }
 };
 
 class DeclarationValidator: private Validator
@@ -27,6 +27,7 @@ private:
        typedef std::map<std::string, Statement *> BlockDeclarationMap;
 
        std::map<Block *, BlockDeclarationMap> declarations;
+       std::map<std::string, InterfaceBlock *> interface_blocks;
        bool anonymous_block;
 
 public:
@@ -35,9 +36,12 @@ public:
        void apply(Stage &s) { stage = &s; s.content.visit(*this); }
 
 private:
+       void multiple_definition(const std::string &, Statement &, Statement &);
        Statement *find_definition(const std::string &);
        void check_definition(const std::string &, Statement &);
+       void record_definition(const std::string &, Statement &);
 
+       virtual void visit(StructDeclaration &);
        virtual void visit(VariableDeclaration &);
        virtual void visit(InterfaceBlock &);
        virtual void visit(FunctionDeclaration &);