From dcaa2bb0859267f7d160b4a2550ab24368058e60 Mon Sep 17 00:00:00 2001 From: Nigel Tao Date: Sat, 7 Jul 2018 18:18:15 +1000 Subject: [PATCH] Inline bcheckAssignment1 --- lang/check/bounds.go | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/lang/check/bounds.go b/lang/check/bounds.go index 2681c65b..8e42b29e 100644 --- a/lang/check/bounds.go +++ b/lang/check/bounds.go @@ -348,7 +348,10 @@ func (q *checker) bcheckAssert(n *a.Assert) error { } func (q *checker) bcheckAssignment(lhs *a.Expr, op t.ID, rhs *a.Expr) error { - if err := q.bcheckAssignment1(lhs, op, rhs); err != nil { + if _, err := q.bcheckExpr(lhs, 0); err != nil { + return err + } + if err := q.bcheckAssignment2(lhs, lhs.MType(), op, rhs); err != nil { return err } // TODO: check lhs and rhs are pure expressions. @@ -415,13 +418,6 @@ func (q *checker) bcheckAssignment(lhs *a.Expr, op t.ID, rhs *a.Expr) error { return nil } -func (q *checker) bcheckAssignment1(lhs *a.Expr, op t.ID, rhs *a.Expr) error { - if _, err := q.bcheckExpr(lhs, 0); err != nil { - return err - } - return q.bcheckAssignment2(lhs, lhs.MType(), op, rhs) -} - func (q *checker) bcheckAssignment2(lhs *a.Expr, lTyp *a.TypeExpr, op t.ID, rhs *a.Expr) error { if lhs == nil && op != t.IDEq { return fmt.Errorf("check: internal error: missing LHS for op key 0x%02X", op)