Record location information in all syntax nodes

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

diff --git a/source/glsl/validate.cpp b/source/glsl/validate.cpp
index f3390048298e2708db5e307e37b0832144c7c2dd..78d3bb4be6a82ba919ef2a6dca4d61fc232fd5de 100644 (file)
--- a/source/glsl/validate.cpp
+++ b/source/glsl/validate.cpp
@@ -12,15 +12,12 @@ Validator::Validator():
        stage(0)
 { }
 
-void Validator::diagnose(Statement *statement, Diagnostic::Severity severity, const string &message)
+void Validator::diagnose(Node &node, Diagnostic::Severity severity, const string &message)
 {
        Diagnostic diag;
        diag.severity = severity;
-       if(statement)
-       {
-               diag.source = statement->source;
-               diag.line = statement->line;
-       }
+       diag.source = node.source;
+       diag.line = node.line;
        diag.message = message;
        stage->diagnostics.push_back(diag);
 }
@@ -32,8 +29,8 @@ DeclarationValidator::DeclarationValidator():
 
 void DeclarationValidator::multiple_definition(const string &name, Statement &statement, Statement &previous)
 {
-       error(&statement, format("Multiple definition of %s", name));
-       diagnose(&previous, Diagnostic::INFO, "Previous definition is here");
+       error(statement, format("Multiple definition of %s", name));
+       diagnose(previous, Diagnostic::INFO, "Previous definition is here");
 }
 
 Statement *DeclarationValidator::find_definition(const string &name)
@@ -63,6 +60,12 @@ void DeclarationValidator::record_definition(const string &name, Statement &stat
                declarations[current_block->parent].insert(make_pair(name, &statement));
 }
 
+void DeclarationValidator::visit(StructDeclaration &strct)
+{
+       check_definition(strct.name, strct);
+       TraversingVisitor::visit(strct);
+}
+
 void DeclarationValidator::visit(VariableDeclaration &var)
 {
        check_definition(var.name, var);