diff --git a/internal/cgen/expr.go b/internal/cgen/expr.go index 033bdddc..7aa94e2a 100644 --- a/internal/cgen/expr.go +++ b/internal/cgen/expr.go @@ -257,7 +257,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 := "" + opName, lhsCast := "", false op := n.Operator() switch op { @@ -276,6 +276,12 @@ func (g *gen) writeExprBinaryOp(b *buffer, n *a.Expr, depth uint32) error { case t.IDXBinaryAs: return g.writeExprAs(b, n.LHS().AsExpr(), n.RHS().AsTypeExpr(), depth) + case t.IDXBinaryShiftL, t.IDXBinaryShiftR, t.IDXBinaryTildeModShiftL: + if lhs := n.LHS().AsExpr(); lhs.ConstValue() != nil { + lhsCast = true + } + fallthrough + default: opName = cOpName(op) if opName == "" { @@ -284,13 +290,27 @@ func (g *gen) writeExprBinaryOp(b *buffer, n *a.Expr, depth uint32) error { } b.writeb('(') + + if lhsCast { + b.writes("((") + if err := g.writeCTypeName(b, n.LHS().AsExpr().MType(), "", ""); err != nil { + return err + } + b.writes(")(") + } if err := g.writeExprRepr(b, n.LHS().AsExpr(), depth); err != nil { return err } + if lhsCast { + b.writes("))") + } + b.writes(opName) + if err := g.writeExprRepr(b, n.RHS().AsExpr(), depth); err != nil { return err } + b.writeb(')') return nil } diff --git a/std/json/decode_json.wuffs b/std/json/decode_json.wuffs index aac36681..260ec9c3 100644 --- a/std/json/decode_json.wuffs +++ b/std/json/decode_json.wuffs @@ -1621,7 +1621,7 @@ pri func decoder.decode_inf_nan?(dst: base.token_writer, src: base.io_reader) { args.dst.write_simple_token_fast!( value_major: 0, value_minor: (base.TOKEN__VBC__NUMBER << 21) | - ((base.TOKEN__VBD__NUMBER__CONTENT_POS_INF as base.u32) >> neg), + (base.TOKEN__VBD__NUMBER__CONTENT_POS_INF >> neg), continued: 0, length: 9) args.src.skip_u32_fast!(actual: 9, worst_case: 9) @@ -1634,7 +1634,7 @@ pri func decoder.decode_inf_nan?(dst: base.token_writer, src: base.io_reader) { args.dst.write_simple_token_fast!( value_major: 0, value_minor: (base.TOKEN__VBC__NUMBER << 21) | - ((base.TOKEN__VBD__NUMBER__CONTENT_POS_INF as base.u32) >> neg), + (base.TOKEN__VBD__NUMBER__CONTENT_POS_INF >> neg), continued: 0, length: 4) args.src.skip_u32_fast!(actual: 4, worst_case: 4) @@ -1644,7 +1644,7 @@ pri func decoder.decode_inf_nan?(dst: base.token_writer, src: base.io_reader) { args.dst.write_simple_token_fast!( value_major: 0, value_minor: (base.TOKEN__VBC__NUMBER << 21) | - ((base.TOKEN__VBD__NUMBER__CONTENT_POS_NAN as base.u32) >> neg), + (base.TOKEN__VBD__NUMBER__CONTENT_POS_NAN >> neg), continued: 0, length: 4) args.src.skip_u32_fast!(actual: 4, worst_case: 4)