shader: Friendly error messages when local variable names are duplicated

Fixes #1254

internal/shader/shader.go

@@ -483,6 +483,12 @@ func (s *compileState) parseVariable(block *block, vs *ast.ValueSpec) ([]variabl
 		}
 
 		name := n.Name
+		for _, v := range append(block.vars, vars...) {
+			if v.name == name {
+				s.addError(vs.Pos(), fmt.Sprintf("duplicated local variable name: %s", name))
+				return nil, nil, nil, false
+			}
+		}
 		vars = append(vars, variable{
 			name: name,
 			typ:  t,

internal/shader/stmt.go

@@ -455,8 +455,15 @@ func (cs *compileState) assign(block *block, pos token.Pos, lhs, rhs []ast.Expr,
 			stmts = append(stmts, ss...)
 
 			if define {
+				name := e.(*ast.Ident).Name
+				for _, v := range block.vars {
+					if v.name == name {
+						cs.addError(pos, fmt.Sprintf("duplicated local variable name: %s", name))
+						return nil, false
+					}
+				}
 				v := variable{
-					name: e.(*ast.Ident).Name,
+					name: name,
 				}
 				ts, ok := cs.functionReturnTypes(block, rhs[i])
 				if !ok {
@@ -545,8 +552,15 @@ func (cs *compileState) assign(block *block, pos token.Pos, lhs, rhs []ast.Expr,
 			}
 
 			if define {
+				name := e.(*ast.Ident).Name
+				for _, v := range block.vars {
+					if v.name == name {
+						cs.addError(pos, fmt.Sprintf("duplicated local variable name: %s", name))
+						return nil, false
+					}
+				}
 				v := variable{
-					name: e.(*ast.Ident).Name,
+					name: name,
 				}
 				v.typ = rhsTypes[i]
 				block.vars = append(block.vars, v)

shader_test.go

@@ -114,3 +114,68 @@ func Fragment(position vec4, texCoord vec2, color vec4) vec4 {
 		}
 	}
 }
+
+func TestShaderShadowing(t *testing.T) {
+	_, err := NewShader([]byte(`package main
+
+func Fragment(position vec4, texCoord vec2, color vec4) vec4 {
+	var position vec4
+	return position
+}
+`))
+	if err == nil {
+		t.Errorf("error must be non-nil but was nil")
+	}
+}
+
+func TestShaderDuplicatedVariables(t *testing.T) {
+	_, err := NewShader([]byte(`package main
+
+func Fragment(position vec4, texCoord vec2, color vec4) vec4 {
+	var foo vec4
+	var foo vec4
+	return foo
+}
+`))
+	if err == nil {
+		t.Errorf("error must be non-nil but was nil")
+	}
+
+	_, err = NewShader([]byte(`package main
+
+func Fragment(position vec4, texCoord vec2, color vec4) vec4 {
+	var foo, foo vec4
+	return foo
+}
+`))
+	if err == nil {
+		t.Errorf("error must be non-nil but was nil")
+	}
+
+	_, err = NewShader([]byte(`package main
+
+func Fragment(position vec4, texCoord vec2, color vec4) vec4 {
+	var foo vec4
+	foo := vec4(0)
+	return foo
+}
+`))
+	if err == nil {
+		t.Errorf("error must be non-nil but was nil")
+	}
+
+	_, err = NewShader([]byte(`package main
+
+func Foo() (vec4, vec4) {
+	return vec4(0), vec4(0)
+}
+
+func Fragment(position vec4, texCoord vec2, color vec4) vec4 {
+	foo, foo := Foo()
+	return foo
+}
+`))
+	if err == nil {
+		t.Errorf("error must be non-nil but was nil")
+	}
+}