X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fglsl%2Fvalidate.cpp;h=78d3bb4be6a82ba919ef2a6dca4d61fc232fd5de;hb=a82fcc462550d63a101aca4313807b1320789a5a;hp=1e967dc88f6f4d54f0e54f9a1f90cb499aaf7c86;hpb=734bc4a781ace5aecd98254ad1b50d52a06af0af;p=libs%2Fgl.git diff --git a/source/glsl/validate.cpp b/source/glsl/validate.cpp index 1e967dc8..78d3bb4b 100644 --- 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)