X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fglsl%2Fvalidate.cpp;h=e025a61bcfaa0026cdcc18fa9866070f24a5aad3;hb=7a62eb7f7550df161656616f2ece5a094b754392;hp=b8710509e8d32fe424062f6c6558976ceab6da35;hpb=3f44e477f81983c66947fe8a6d8640a3b2f9e0b3;p=libs%2Fgl.git

diff --git a/source/glsl/validate.cpp b/source/glsl/validate.cpp
index b8710509..e025a61b 100644
--- a/source/glsl/validate.cpp
+++ b/source/glsl/validate.cpp
@@ -89,17 +89,17 @@ void TypeValidator::visit(VariableDeclaration &var)
 }
 
 
-DeclarationValidator::DeclarationValidator():
+IdentifierValidator::IdentifierValidator():
 	anonymous_block(false)
 { }
 
-void DeclarationValidator::multiple_definition(const string &name, Statement &statement, Statement &previous)
+void IdentifierValidator::multiple_definition(const string &name, Statement &statement, Statement &previous)
 {
 	error(statement, format("Multiple definition of %s", name));
 	add_info(previous, "Previous definition is here");
 }
 
-Statement *DeclarationValidator::find_definition(const string &name)
+Statement *IdentifierValidator::find_definition(const string &name)
 {
 	BlockDeclarationMap *decls = &declarations[current_block];
 	BlockDeclarationMap::const_iterator i = decls->find(name);
@@ -111,7 +111,7 @@ Statement *DeclarationValidator::find_definition(const string &name)
 	return (i!=decls->end() ? i->second : 0);
 }
 
-void DeclarationValidator::check_definition(const string &name, Statement &statement)
+void IdentifierValidator::check_definition(const string &name, Statement &statement)
 {
 	if(Statement *previous = find_definition(name))
 		multiple_definition(format("'%s'", name), statement, *previous);
@@ -119,46 +119,46 @@ void DeclarationValidator::check_definition(const string &name, Statement &state
 		record_definition(name, statement);
 }
 
-void DeclarationValidator::record_definition(const string &name, Statement &statement)
+void IdentifierValidator::record_definition(const string &name, Statement &statement)
 {
 	declarations[current_block].insert(make_pair(name, &statement));
 	if(anonymous_block)
 		declarations[current_block->parent].insert(make_pair(name, &statement));
 }
 
-void DeclarationValidator::visit(TypeDeclaration &type)
+void IdentifierValidator::visit(TypeDeclaration &type)
 {
 	check_definition(type.name, type);
 }
 
-void DeclarationValidator::visit(StructDeclaration &strct)
+void IdentifierValidator::visit(StructDeclaration &strct)
 {
 	check_definition(strct.name, strct);
 	TraversingVisitor::visit(strct);
 }
 
-void DeclarationValidator::visit(VariableDeclaration &var)
+void IdentifierValidator::visit(VariableDeclaration &var)
 {
 	check_definition(var.name, var);
 	TraversingVisitor::visit(var);
 }
 
-void DeclarationValidator::visit(InterfaceBlock &iface)
+void IdentifierValidator::visit(InterfaceBlock &iface)
 {
-	string key = iface.interface+iface.name;
+	string key = iface.interface+iface.block_name;
 	map<string, InterfaceBlock *>::const_iterator i = interface_blocks.find(key);
 	if(i!=interface_blocks.end())
-		multiple_definition(format("interface block '%s %s'", iface.interface, iface.name), iface, *i->second);
+		multiple_definition(format("interface block '%s %s'", iface.interface, iface.block_name), iface, *i->second);
 	else
 		interface_blocks.insert(make_pair(key, &iface));
 
-	if(Statement *previous = find_definition(iface.name))
+	if(Statement *previous = find_definition(iface.block_name))
 	{
 		if(!dynamic_cast<InterfaceBlock *>(previous))
-			multiple_definition(format("'%s'", iface.name), iface, *previous);
+			multiple_definition(format("'%s'", iface.block_name), iface, *previous);
 	}
 	else
-		record_definition(iface.name, iface);
+		record_definition(iface.block_name, iface);
 
 	if(!iface.instance_name.empty())
 		check_definition(iface.instance_name, iface);
@@ -172,7 +172,7 @@ void DeclarationValidator::visit(InterfaceBlock &iface)
 	}
 }
 
-void DeclarationValidator::visit(FunctionDeclaration &func)
+void IdentifierValidator::visit(FunctionDeclaration &func)
 {
 	string key = func.name+func.signature;
 	map<string, FunctionDeclaration *>::const_iterator i = overloaded_functions.find(key);
@@ -279,7 +279,7 @@ void ReferenceValidator::visit(VariableDeclaration &var)
 void ReferenceValidator::visit(InterfaceBlock &iface)
 {
 	if(!iface.struct_declaration)
-		error(iface, format("Interface block '%s %s' lacks a struct declaration", iface.interface, iface.name));
+		error(iface, format("Interface block '%s %s' lacks a struct declaration", iface.interface, iface.block_name));
 	TraversingVisitor::visit(iface);
 }