diff --git a/internal/cgen/expr.go b/internal/cgen/expr.go index 155e64d1..15ccfd1f 100644 --- a/internal/cgen/expr.go +++ b/internal/cgen/expr.go @@ -286,13 +286,7 @@ func (g *gen) writeExprUnaryOp(b *buffer, n *a.Expr, depth uint32) error { } func (g *gen) writeExprBinaryOp(b *buffer, n *a.Expr, depth uint32) error { - opName, lhsCast, overallCast := "", false, false - - if typ := n.MType(); typ.IsNumType() { - if u := typ.QID()[1]; u == t.IDU8 || u == t.IDU16 { - overallCast = true - } - } + opName, lhsCast, overallCast := "", false, n.MType().IsSmallInteger() op := n.Operator() switch op { diff --git a/internal/cgen/statement.go b/internal/cgen/statement.go index 628a99e6..ba7ce404 100644 --- a/internal/cgen/statement.go +++ b/internal/cgen/statement.go @@ -171,17 +171,13 @@ func (g *gen) writeStatementAssign1(b *buffer, op t.ID, lhs *a.Expr, rhs *a.Expr return fmt.Errorf("unrecognized operator %q", op.AmbiguousForm().Str(g.tm)) } - if op.IsAssign() { + if op.IsAssign() && lTyp.IsSmallInteger() { switch op { case t.IDAmpEq, t.IDPipeEq, t.IDHatEq, t.IDEq, t.IDEqQuestion: // No-op. default: - if lTyp.IsNumType() { - if u := lTyp.QID()[1]; u == t.IDU8 || u == t.IDU16 { - disableWconversion = true - } - } + disableWconversion = true } } } diff --git a/lang/ast/ast.go b/lang/ast/ast.go index 67d08f14..9aae698b 100644 --- a/lang/ast/ast.go +++ b/lang/ast/ast.go @@ -1007,6 +1007,11 @@ func (n *TypeExpr) IsContainerOfSpecificNumType(container t.ID, numType t.ID) bo return (n.id0 == container) && n.Inner().IsNumType() && (n.Inner().id2 == numType) } +func (n *TypeExpr) IsSmallInteger() bool { + return n.id0 == 0 && n.id1 == t.IDBase && + (n.id2 == t.IDU8 || n.id2 == t.IDU16) +} + func (n *TypeExpr) IsUnsignedInteger() bool { return n.id0 == 0 && n.id1 == t.IDBase && (n.id2 == t.IDU8 || n.id2 == t.IDU16 || n.id2 == t.IDU32 || n.id2 == t.IDU64)