add support for shift + assign

internal/shader/stmt.go

@@ -60,7 +60,7 @@ func (cs *compileState) parseStmt(block *block, fname string, stmt ast.Stmt, inP
 				return nil, false
 			}
 			stmts = append(stmts, ss...)
-		case token.ADD_ASSIGN, token.SUB_ASSIGN, token.MUL_ASSIGN, token.QUO_ASSIGN, token.REM_ASSIGN, token.AND_ASSIGN, token.OR_ASSIGN, token.XOR_ASSIGN, token.AND_NOT_ASSIGN:
+		case token.ADD_ASSIGN, token.SUB_ASSIGN, token.MUL_ASSIGN, token.QUO_ASSIGN, token.REM_ASSIGN, token.AND_ASSIGN, token.OR_ASSIGN, token.XOR_ASSIGN, token.AND_NOT_ASSIGN, token.SHL_ASSIGN, token.SHR_ASSIGN:
 			rhs, rts, ss, ok := cs.parseExpr(block, fname, stmt.Rhs[0], true)
 			if !ok {
 				return nil, false
@@ -100,6 +100,10 @@ func (cs *compileState) parseStmt(block *block, fname string, stmt ast.Stmt, inP
 				op = shaderir.Or
 			case token.XOR_ASSIGN:
 				op = shaderir.Xor
+			case token.SHL_ASSIGN:
+				op = shaderir.LeftShift
+			case token.SHR_ASSIGN:
+				op = shaderir.RightShift
 			default:
 				cs.addError(stmt.Pos(), fmt.Sprintf("unexpected token: %s", stmt.Tok))
 				return nil, false
@@ -119,6 +123,15 @@ func (cs *compileState) parseStmt(block *block, fname string, stmt ast.Stmt, inP
 					}
 					return nil, false
 				}
+				if op == shaderir.LeftShift || op == shaderir.RightShift {
+					if lts[0].Main != shaderir.Int && !lts[0].IsIntVector() {
+						cs.addError(stmt.Pos(), fmt.Sprintf("invalid operation: operator %s not defined on %s", stmt.Tok, lts[0].String()))
+					}
+					if rts[0].Main != shaderir.Int && !rts[0].IsIntVector() {
+						cs.addError(stmt.Pos(), fmt.Sprintf("invalid operation: operator %s not defined on %s", stmt.Tok, rts[0].String()))
+					}
+					return nil, false
+				}
 				if lts[0].Main == shaderir.Int && rhs[0].Const != nil {
 					if !cs.forceToInt(stmt, &rhs[0]) {
 						return nil, false
@@ -137,7 +150,7 @@ func (cs *compileState) parseStmt(block *block, fname string, stmt ast.Stmt, inP
 						}
 					}
 				case shaderir.Float:
-					if op == shaderir.And || op == shaderir.Or || op == shaderir.Xor {
+					if op == shaderir.And || op == shaderir.Or || op == shaderir.Xor || op == shaderir.LeftShift || op == shaderir.RightShift {
 						cs.addError(stmt.Pos(), fmt.Sprintf("invalid operation: operator %s not defined on %s", stmt.Tok, lts[0].String()))
 					} else if rhs[0].Const != nil &&
 						(rts[0].Main == shaderir.None || rts[0].Main == shaderir.Float) &&
@@ -148,7 +161,7 @@ func (cs *compileState) parseStmt(block *block, fname string, stmt ast.Stmt, inP
 						return nil, false
 					}
 				case shaderir.Vec2, shaderir.Vec3, shaderir.Vec4, shaderir.Mat2, shaderir.Mat3, shaderir.Mat4:
-					if op == shaderir.And || op == shaderir.Or || op == shaderir.Xor {
+					if op == shaderir.And || op == shaderir.Or || op == shaderir.Xor || op == shaderir.LeftShift || op == shaderir.RightShift {
 						cs.addError(stmt.Pos(), fmt.Sprintf("invalid operation: operator %s not defined on %s", stmt.Tok, lts[0].String()))
 					} else if (op == shaderir.MatrixMul || op == shaderir.Div) &&
 						(rts[0].Main == shaderir.Float ||

internal/shader/syntax_test.go

@@ -1341,6 +1341,7 @@ func TestSyntaxOperatorShift(t *testing.T) {
 		{stmt: "a := ivec2(1) << vec2(2); _ = a", err: true},
 		{stmt: "a := vec3(1) << ivec2(2); _ = a", err: true},
 		{stmt: "a := ivec2(1) << vec3(2); _ = a", err: true},
+
 		{stmt: "a := 1 >> 2; _ = a", err: false},
 		{stmt: "a := float(1.0) >> 2; _ = a", err: true},
 		{stmt: "a := 1 >> float(2.0); _ = a", err: true},
@@ -1379,6 +1380,83 @@ func Fragment(dstPos vec4, srcPos vec2, color vec4) vec4 {
 	}
 }
 
+func TestSyntaxOperatorShiftAssign(t *testing.T) {
+	cases := []struct {
+		stmt string
+		err  bool
+	}{
+		{stmt: "a := 1; a <<= 2; _ = a", err: false},
+		{stmt: "a := float(1.0); a <<= 2; _ = a", err: true},
+		{stmt: "a := 1; a <<= float(2.0); _ = a", err: true},
+		{stmt: "a := ivec2(1); a <<= 2; _ = a", err: false},
+		{stmt: "a := 1;  a <<= ivec2(2); _ = a", err: true},
+		{stmt: "a := ivec2(1); a <<= float(2.0); _ = a", err: true},
+		{stmt: "a := float(1.0); a <<= ivec2(2); _ = a", err: true},
+		{stmt: "a := ivec2(1); a <<= ivec2(2); _ = a", err: false},
+		{stmt: "a := ivec3(1); a <<= ivec2(2); _ = a", err: true},
+		{stmt: "a := ivec2(1); a <<= ivec3(2); _ = a", err: true},
+		{stmt: "a := 1; a <<= vec2(2); _ = a", err: true},
+		{stmt: "a := vec2(1); a <<= 2; _ = a", err: true},
+		{stmt: "a := float(1.0); a <<= vec2(2); _ = a", err: true},
+		{stmt: "a := vec2(1); a <<= float(2.0); _ = a", err: true},
+		{stmt: "a := vec2(1); a <<= vec2(2); _ = a", err: true},
+		{stmt: "a := vec2(1); a <<= vec3(2); _ = a", err: true},
+		{stmt: "a := vec3(1); a <<= vec2(2); _ = a", err: true},
+		{stmt: "a := vec2(1); a <<= ivec2(2); _ = a", err: true},
+		{stmt: "a := ivec2(1); a <<= vec2(2); _ = a", err: true},
+		{stmt: "a := vec3(1); a <<= ivec2(2); _ = a", err: true},
+		{stmt: "a := ivec2(1); a <<= vec3(2); _ = a", err: true},
+		{stmt: "const c = 2; a := 1; a <<= c; _ = a", err: false},
+		{stmt: "const c = 2; a := float(1.0); a <<= c; _ = a", err: true},
+		{stmt: "const c float = 2; a := 1; a <<= c; _ = a", err: true},
+		{stmt: "const c float = 2.0; a := 1; a <<= c; _ = a", err: true},
+		{stmt: "const c int = 2; a := ivec2(1); a <<= c; _ = a", err: false},
+		{stmt: "const c int = 2; a := vec2(1); a <<= c; _ = a", err: true},
+
+		{stmt: "a := 1; a >>= 2; _ = a", err: false},
+		{stmt: "a := float(1.0); a >>= 2; _ = a", err: true},
+		{stmt: "a := 1; a >>= float(2.0); _ = a", err: true},
+		{stmt: "a := ivec2(1); a >>= 2; _ = a", err: false},
+		{stmt: "a := 1;  a >>= ivec2(2); _ = a", err: true},
+		{stmt: "a := ivec2(1); a >>= float(2.0); _ = a", err: true},
+		{stmt: "a := float(1.0); a >>= ivec2(2); _ = a", err: true},
+		{stmt: "a := ivec2(1); a >>= ivec2(2); _ = a", err: false},
+		{stmt: "a := ivec3(1); a >>= ivec2(2); _ = a", err: true},
+		{stmt: "a := ivec2(1); a >>= ivec3(2); _ = a", err: true},
+		{stmt: "a := 1; a >>= vec2(2); _ = a", err: true},
+		{stmt: "a := vec2(1); a >>= 2; _ = a", err: true},
+		{stmt: "a := float(1.0); a >>= vec2(2); _ = a", err: true},
+		{stmt: "a := vec2(1); a >>= float(2.0); _ = a", err: true},
+		{stmt: "a := vec2(1); a >>= vec2(2); _ = a", err: true},
+		{stmt: "a := vec2(1); a >>= vec3(2); _ = a", err: true},
+		{stmt: "a := vec3(1); a >>= vec2(2); _ = a", err: true},
+		{stmt: "a := vec2(1); a >>= ivec2(2); _ = a", err: true},
+		{stmt: "a := ivec2(1); a >>= vec2(2); _ = a", err: true},
+		{stmt: "a := vec3(1); a >>= ivec2(2); _ = a", err: true},
+		{stmt: "a := ivec2(1); a >>= vec3(2); _ = a", err: true},
+		{stmt: "const c = 2; a := 1; a >>= c; _ = a", err: false},
+		{stmt: "const c = 2; a := float(1.0); a >>= c; _ = a", err: true},
+		{stmt: "const c float = 2; a := 1; a >>= c; _ = a", err: true},
+		{stmt: "const c float = 2.0; a := 1; a >>= c; _ = a", err: true},
+		{stmt: "const c int = 2; a := ivec2(1); a >>= c; _ = a", err: false},
+		{stmt: "const c int = 2; a := vec2(1); a >>= c; _ = a", err: true},
+	}
+
+	for _, c := range cases {
+		_, err := compileToIR([]byte(fmt.Sprintf(`package main
+
+func Fragment(dstPos vec4, srcPos vec2, color vec4) vec4 {
+	%s
+	return dstPos
+}`, c.stmt)))
+		if err == nil && c.err {
+			t.Errorf("%s must return an error but does not", c.stmt)
+		} else if err != nil && !c.err {
+			t.Errorf("%s must not return nil but returned %v", c.stmt, err)
+		}
+	}
+}
+
 // Issue #1971
 func TestSyntaxOperatorMultiplyAssign(t *testing.T) {
 	cases := []struct {