Better error message for the subscript operator

diff --git a/source/glsl/validate.cpp b/source/glsl/validate.cpp
index 13cb5ccb23ad15e4d6e56798552ffcd35fefd381..4b38c5b755e935f0e3f477c0ecd092202e411c7f 100644 (file)
--- a/source/glsl/validate.cpp
+++ b/source/glsl/validate.cpp
@@ -338,8 +338,14 @@ void ExpressionValidator::visit(UnaryExpression &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));
+       {
+               if(binary.oper->token[0]=='[')
+                       error(binary, format("Can't index element of '%s' with '%s'",
+                               binary.left->type->name, binary.right->type->name));
+               else
+                       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);
 }
 

diff --git a/tests/glsl/invalid_subscript.glsl b/tests/glsl/invalid_subscript.glsl
new file mode 100644 (file)
index 0000000..6826fef
--- /dev/null
+++ b/tests/glsl/invalid_subscript.glsl
@@ -0,0 +1,13 @@
+#pragma MSP stage(vertex)
+layout(location=0) in vec4 position;
+layout(location=1) in float scale;
+int main()
+{
+       gl_Position = position[scale];
+       gl_Position = scale[position];
+}
+
+/* Expected error:
+<test>:6: Can't index element of 'vec4' with 'float'
+<test>:7: Can't index element of 'float' with 'vec4'
+*/