X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fglsl%2Fvalidate.cpp;h=2f02400ee675a5bc159362d9e85fec755a92c9d7;hb=f639d088c478fe5d266f9f5779928735b5176976;hp=e6f0c653e45f4ad9e62c108084867dc4374c11c9;hpb=d80750e7c20ea061f210b756196cc844b762b852;p=libs%2Fgl.git

diff --git a/source/glsl/validate.cpp b/source/glsl/validate.cpp
index e6f0c653..2f02400e 100644
--- a/source/glsl/validate.cpp
+++ b/source/glsl/validate.cpp
@@ -1,3 +1,4 @@
+#include <cstring>
 #include <msp/core/raii.h>
 #include <msp/strings/format.h>
 #include "validate.h"
@@ -208,6 +209,57 @@ void ReferenceValidator::visit(FunctionDeclaration &func)
 	TraversingVisitor::visit(func);
 }
 
+
+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