mth/ebiten
1
0
Fork 0
mirror of https://github.com/hajimehoshi/ebiten.git synced 2024-12-26 03:38:55 +01:00
Code Issues Packages Projects Releases Wiki Activity

internal/shaderir: refactoring

Browse Source
This commit is contained in:
Hajime Hoshi 2023-09-13 03:25:42 +09:00
parent 267eadbac7
commit 320cec8869
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
internal/shader/expr.go
View File

@ -134,7 +134,7 @@ func (cs *compileState) parseExpr(block *block, fname string, expr ast.Expr, mar
} }
} }
t, ok := shaderir.TypeFromBinaryOp(op2, &lhs[0], &rhs[0], lhst, rhst) t, ok := shaderir.TypeFromBinaryOp(op2, lhst, rhst, lhs[0].Const, rhs[0].Const)
if !ok { if !ok {
// TODO: Show a better type name for untyped constants. // TODO: Show a better type name for untyped constants.
cs.addError(e.Pos(), fmt.Sprintf("types don't match: %s %s %s", lhst.String(), op, rhst.String())) cs.addError(e.Pos(), fmt.Sprintf("types don't match: %s %s %s", lhst.String(), op, rhst.String()))

10
internal/shaderir/check.go
View File

@ -68,16 +68,16 @@ func ResolveUntypedConstsForBinaryOp(lhs, rhs constant.Value, lhst, rhst Type) (
return lhs, rhs, true return lhs, rhs, true
} }
func TypeFromBinaryOp(op Op, lhs, rhs *Expr, lhst, rhst Type) (Type, bool) { func TypeFromBinaryOp(op Op, lhst, rhst Type, lhsConst, rhsConst constant.Value) (Type, bool) {
// If both are untyped consts, compare the constants and try to truncate them if necessary. // If both are untyped consts, compare the constants and try to truncate them if necessary.
if lhst.Main == None && rhst.Main == None { if lhst.Main == None && rhst.Main == None {
// Assume that the constant types are already adjusted. // Assume that the constant types are already adjusted.
if lhs.Const.Kind() != rhs.Const.Kind() { if lhsConst.Kind() != rhsConst.Kind() {
panic("shaderir: const types for a binary op must be adjusted") panic("shaderir: const types for a binary op must be adjusted")
} }
if op == AndAnd || op == OrOr { if op == AndAnd || op == OrOr {
if lhs.Const.Kind() == constant.Bool && rhs.Const.Kind() == constant.Bool { if lhsConst.Kind() == constant.Bool && rhsConst.Kind() == constant.Bool {
return Type{Main: Bool}, true return Type{Main: Bool}, true
} }
return Type{}, false return Type{}, false
@ -85,14 +85,14 @@ func TypeFromBinaryOp(op Op, lhs, rhs *Expr, lhst, rhst Type) (Type, bool) {
// For %, both operands must be integers if both are constants. Truncatable to an integer is not enough. // For %, both operands must be integers if both are constants. Truncatable to an integer is not enough.
if op == ModOp { if op == ModOp {
if lhs.Const.Kind() == constant.Int && rhs.Const.Kind() == constant.Int { if lhsConst.Kind() == constant.Int && rhsConst.Kind() == constant.Int {
return Type{Main: Int}, true return Type{Main: Int}, true
} }
return Type{}, false return Type{}, false
} }
if op == And || op == Or || op == Xor { if op == And || op == Or || op == Xor {
if lhs.Const.Kind() == constant.Int && rhs.Const.Kind() == constant.Int { if lhsConst.Kind() == constant.Int && rhsConst.Kind() == constant.Int {
return Type{Main: Int}, true return Type{Main: Int}, true
} }
return Type{}, false return Type{}, false