X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fglsl%2Fvalidate.cpp;h=ea2e956d023f1e02d66b44b7771186542076dd28;hb=d18df036b247f7f0978b547bb8ea1d624af2c4b2;hp=6f0869ea141897813c4e4f3190a81082457ceed1;hpb=9bec9da4ec633a541cf6048beed99629fefae2b9;p=libs%2Fgl.git

diff --git a/source/glsl/validate.cpp b/source/glsl/validate.cpp
index 6f0869ea..ea2e956d 100644
--- a/source/glsl/validate.cpp
+++ b/source/glsl/validate.cpp
@@ -1,3 +1,5 @@
+#include <algorithm>
+#include <cstring>
 #include <msp/core/raii.h>
 #include <msp/strings/format.h>
 #include "validate.h"
@@ -9,17 +11,80 @@ namespace GL {
 namespace SL {
 
 Validator::Validator():
-	stage(0)
+	stage(0),
+	last_provoker(0)
 { }
 
-void Validator::diagnose(Node &node, Diagnostic::Severity severity, const string &message)
+void Validator::diagnose(Node &node, Node &provoking_node, Diagnostic::Severity severity, const string &message)
 {
 	Diagnostic diag;
 	diag.severity = severity;
 	diag.source = node.source;
 	diag.line = node.line;
+	diag.provoking_source = provoking_node.source;
+	diag.provoking_line = provoking_node.line;
 	diag.message = message;
 	stage->diagnostics.push_back(diag);
+
+	last_provoker = &provoking_node;
+}
+
+void Validator::add_info(Node &node, const string &message)
+{
+	if(!last_provoker)
+		throw logic_error("Tried to add info without a previous provoker");
+	diagnose(node, *last_provoker, Diagnostic::INFO, message);
+}
+
+
+TypeValidator::TypeValidator():
+	in_struct(false)
+{ }
+
+void TypeValidator::visit(BasicTypeDeclaration &type)
+{
+	if(type.kind==BasicTypeDeclaration::VECTOR)
+	{
+		BasicTypeDeclaration::Kind base_kind = BasicTypeDeclaration::VOID;
+		if(BasicTypeDeclaration *basic_base = dynamic_cast<BasicTypeDeclaration *>(type.base_type))
+			base_kind = basic_base->kind;
+		if(base_kind!=BasicTypeDeclaration::BOOL && base_kind!=BasicTypeDeclaration::INT && base_kind!=BasicTypeDeclaration::FLOAT)
+			error(type, format("Invalid base type '%s' for vector type '%s'", type.base, type.name));
+	}
+	else if(type.kind==BasicTypeDeclaration::ARRAY)
+	{
+		if(BasicTypeDeclaration *basic_base = dynamic_cast<BasicTypeDeclaration *>(type.base_type))
+			if(basic_base->kind==BasicTypeDeclaration::VOID)
+				error(type, format("Invalid base type '%s' for array type '%s'", type.base, type.name));
+	}
+}
+
+void TypeValidator::visit(ImageTypeDeclaration &type)
+{
+	BasicTypeDeclaration::Kind base_kind = BasicTypeDeclaration::VOID;
+	if(BasicTypeDeclaration *basic_base = dynamic_cast<BasicTypeDeclaration *>(type.base_type))
+		base_kind = basic_base->kind;
+	if(base_kind!=BasicTypeDeclaration::INT && base_kind!=BasicTypeDeclaration::FLOAT)
+		error(type, format("Invalid base type '%s' for image type '%s'", type.base, type.name));
+}
+
+void TypeValidator::visit(StructDeclaration &strct)
+{
+	SetFlag set_struct(in_struct);
+	TraversingVisitor::visit(strct);
+}
+
+void TypeValidator::visit(VariableDeclaration &var)
+{
+	if(in_struct)
+	{
+		if(var.layout)
+			error(var, "Struct members can't have layouts");
+		if(var.init_expression)
+			error(var, "Struct members can't have initializers");
+	}
+
+	TraversingVisitor::visit(var);
 }
 
 
@@ -30,7 +95,7 @@ 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");
+	add_info(previous, "Previous definition is here");
 }
 
 Statement *DeclarationValidator::find_definition(const string &name)
@@ -97,22 +162,44 @@ void DeclarationValidator::visit(InterfaceBlock &iface)
 	if(!iface.instance_name.empty())
 		check_definition(iface.instance_name, iface);
 
-	SetFlag set_anon(anonymous_block, iface.instance_name.empty());
-	TraversingVisitor::visit(iface);
+	if(iface.instance_name.empty() && iface.struct_declaration)
+	{
+		// Inject anonymous interface block members into the global scope
+		const map<string, VariableDeclaration *> &iface_vars = iface.struct_declaration->members.variables;
+		for(map<string, VariableDeclaration *>::const_iterator j=iface_vars.begin(); j!=iface_vars.end(); ++j)
+			check_definition(j->first, *j->second);
+	}
 }
 
 void DeclarationValidator::visit(FunctionDeclaration &func)
 {
 	if(Statement *previous = find_definition(func.name))
-		if(!dynamic_cast<FunctionDeclaration *>(previous))
+	{
+		FunctionDeclaration *prev_func = dynamic_cast<FunctionDeclaration *>(previous);
+		if(prev_func && prev_func->definition==&func)
+			declarations[current_block][func.name] = &func;
+		else
 			multiple_definition(format("'%s'", func.name), func, *previous);
+	}
+	else
+		record_definition(func.name, func);
 
-	if(func.definition==&func)
-		check_definition(func.name, func);
 	TraversingVisitor::visit(func);
 }
 
 
+void ReferenceValidator::visit(BasicTypeDeclaration &type)
+{
+	if(!type.base.empty() && !type.base_type)
+		error(type, format("Use of undeclared type '%s'", type.base));
+}
+
+void ReferenceValidator::visit(ImageTypeDeclaration &type)
+{
+	if(!type.base.empty() && !type.base_type)
+		error(type, format("Use of undeclared type '%s'", type.base));
+}
+
 void ReferenceValidator::visit(VariableReference &var)
 {
 	if(!var.declaration)
@@ -121,6 +208,13 @@ void ReferenceValidator::visit(VariableReference &var)
 		error(var, format("Use of unlinked input variable '%s'", var.name));
 }
 
+void ReferenceValidator::visit(MemberAccess &memacc)
+{
+	if(memacc.left->type && !memacc.declaration)
+		error(memacc, format("Use of undeclared member '%s'", memacc.member));
+	TraversingVisitor::visit(memacc);
+}
+
 void ReferenceValidator::visit(InterfaceBlockReference &iface)
 {
 	/* An interface block reference without a declaration should be impossible
@@ -138,6 +232,109 @@ void ReferenceValidator::visit(VariableDeclaration &var)
 	TraversingVisitor::visit(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));
+	TraversingVisitor::visit(iface);
+}
+
+void ReferenceValidator::visit(FunctionDeclaration &func)
+{
+	if(!func.return_type_declaration)
+		error(func, format("Use of undeclared type '%s'", func.return_type));
+	TraversingVisitor::visit(func);
+}
+
+
+void ExpressionValidator::visit(Swizzle &swizzle)
+{
+	unsigned size = 0;
+	if(BasicTypeDeclaration *basic = dynamic_cast<BasicTypeDeclaration *>(swizzle.left->type))
+	{
+		if(basic->kind==BasicTypeDeclaration::INT || basic->kind==BasicTypeDeclaration::FLOAT)
+			size = 1;
+		else if(basic->kind==BasicTypeDeclaration::VECTOR)
+			size = basic->size;
+	}
+
+	if(size)
+	{
+		static const char component_names[] = { 'x', 'y', 'z', 'w', 'r', 'g', 'b', 'a', 's', 't', 'p', 'q' };
+		int flavour = -1;
+		for(unsigned i=0; i<swizzle.count; ++i)
+		{
+			unsigned component_flavour = (find(component_names, component_names+12, swizzle.component_group[i])-component_names)/4;
+			if(flavour==-1)
+				flavour = component_flavour;
+			else if(flavour>=0 && component_flavour!=static_cast<unsigned>(flavour))
+			{
+				error(swizzle, format("Flavour of swizzle component '%c' is inconsistent with '%c'",
+					swizzle.component_group[i], swizzle.component_group[0]));
+				flavour = -2;
+			}
+
+			if(swizzle.components[i]>=size)
+				error(swizzle, format("Access to component '%c' which is not present in '%s'",
+					swizzle.component_group[i], swizzle.left->type->name));
+		}
+	}
+	else if(swizzle.left->type)
+		error(swizzle, format("Swizzle applied to '%s' which is neither a scalar nor a vector", swizzle.left->type->name));
+
+	TraversingVisitor::visit(swizzle);
+}
+
+void ExpressionValidator::visit(UnaryExpression &unary)
+{
+	if(unary.expression->type)
+	{
+		if(!unary.type)
+			error(unary, format("No matching operator '%s' found for '%s'", unary.oper->token, unary.expression->type->name));
+		else if((unary.oper->token[1]=='+' || unary.oper->token[1]=='-') && !unary.expression->lvalue)
+			error(unary, format("Operand of '%s' is not an lvalue", unary.oper->token));
+	}
+	TraversingVisitor::visit(unary);
+}
+
+void ExpressionValidator::visit(BinaryExpression &binary)
+{
+	if(!binary.type && binary.left->type && binary.right->type)
+		error(binary, format("No matching operator '%s' found for '%s' and '%s'",
+			binary.oper->token, binary.left->type->name, binary.right->type->name));
+	TraversingVisitor::visit(binary);
+}
+
+void ExpressionValidator::visit(Assignment &assign)
+{
+	if(assign.left->type)
+	{
+		if(!assign.left->lvalue)
+			error(assign, "Target of assignment is not an lvalue");
+		if(assign.right->type)
+		{
+			if(assign.oper->token[0]!='=')
+			{
+				if(!assign.type)
+					error(assign, format("No matching operator '%s' found for '%s' and '%s'",
+						string(assign.oper->token, strlen(assign.oper->token)-1), assign.left->type->name, assign.right->type->name));
+			}
+			else if(assign.left->type!=assign.right->type)
+				error(assign, format("Assignment to variable of type '%s' from expression of incompatible type '%s'",
+					assign.left->type->name, assign.right->type->name));
+		}
+	}
+	TraversingVisitor::visit(assign);
+}
+
+void ExpressionValidator::visit(VariableDeclaration &var)
+{
+	if(var.init_expression && var.init_expression->type && var.type_declaration && var.init_expression->type!=var.type_declaration)
+		error(var, format("Initializing a variable of type '%s' with an expression of incompatible type '%s'",
+			var.type_declaration->name, var.init_expression->type->name));
+	TraversingVisitor::visit(var);
+}
+
 } // namespace SL
 } // namespace GL
 } // namespace Msp