From ee27dffa9e2f94e7fb123115fd5c66914a08b1a1 Mon Sep 17 00:00:00 2001 From: Nigel Tao Date: Fri, 2 Jun 2017 12:21:28 +1000 Subject: [PATCH] Update facts after "x -= y". --- gen/c/gif.c | 1 - lang/check/assert.go | 23 +++++++++++++++++++++++ lang/check/bounds.go | 7 +++---- std/gif/decode_lzw.puffs | 4 ---- 4 files changed, 26 insertions(+), 9 deletions(-) diff --git a/gen/c/gif.c b/gen/c/gif.c index 459b371b..1bc300f2 100644 --- a/gen/c/gif.c +++ b/gen/c/gif.c @@ -170,7 +170,6 @@ puffs_gif_status puffs_gif_lzw_decoder_decode(puffs_gif_lzw_decoder* self) { v_bits >>= v_width; v_n_bits -= v_width; goto label_0_break; - v_n_bits = 0; } label_0_break:; diff --git a/lang/check/assert.go b/lang/check/assert.go index 67941e55..b30b46e0 100644 --- a/lang/check/assert.go +++ b/lang/check/assert.go @@ -112,6 +112,29 @@ func refine(fact *a.Expr, id t.ID) (*big.Int, *big.Int) { return nil, nil } +// simplify returns a simplified form of n. For example, (x - x) becomes 0. +func simplify(n *a.Expr) *a.Expr { + // TODO: be rigorous about this, not ad hoc. + switch op, lhs, rhs := parseBinaryOp(n); op.Key() { + case t.KeyXBinaryPlus: + // TODO: constant folding, so ((x + 1) + 1) becomes (x + 2). + + case t.KeyXBinaryMinus: + if lhs.Eq(rhs) { + return zeroExpr + } + if lOp, lLHS, lRHS := parseBinaryOp(lhs); lOp.Key() == t.KeyXBinaryPlus { + if lLHS.Eq(rhs) { + return lRHS + } + if lRHS.Eq(rhs) { + return lLHS + } + } + } + return n +} + func argValue(m *t.IDMap, args []*a.Node, name string) *a.Expr { if x := m.ByName(name); x != 0 { for _, a := range args { diff --git a/lang/check/bounds.go b/lang/check/bounds.go index 9c007a67..c16b054b 100644 --- a/lang/check/bounds.go +++ b/lang/check/bounds.go @@ -247,11 +247,10 @@ func (q *checker) bcheckAssignment(lhs *a.Expr, op t.ID, rhs *a.Expr) error { return nil } switch op.Key() { - case t.KeyPlusEq: - // TODO: fold constants, so that ((x + 1) + 1) becomes (x + 2)? - oRHS := a.NewExpr(a.FlagsTypeChecked, t.IDXBinaryPlus, 0, xRHS.Node(), nil, rhs.Node(), nil) + case t.KeyPlusEq, t.KeyMinusEq: + oRHS := a.NewExpr(a.FlagsTypeChecked, op.BinaryForm(), 0, xRHS.Node(), nil, rhs.Node(), nil) oRHS.SetMType(xRHS.MType()) - o := a.NewExpr(a.FlagsTypeChecked, xOp, 0, xLHS.Node(), nil, oRHS.Node(), nil) + o := a.NewExpr(a.FlagsTypeChecked, xOp, 0, xLHS.Node(), nil, simplify(oRHS).Node(), nil) o.SetMType(x.MType()) return o } diff --git a/std/gif/decode_lzw.puffs b/std/gif/decode_lzw.puffs index 757cb47b..a1a511e0 100644 --- a/std/gif/decode_lzw.puffs +++ b/std/gif/decode_lzw.puffs @@ -35,9 +35,5 @@ pub func lzw_decoder.decode?(dst ptr io.buf1, src ptr io.buf1, src_final bool)() // TODO: implement. break - - // TODO: process n_bits further so that (n_bits < 8) and remove this - // temporary hack. - n_bits = 0 } }