From 1004d898d5dd3b2dfd6e27833ce49d561c60a899 Mon Sep 17 00:00:00 2001 From: Nigel Tao Date: Fri, 29 Dec 2017 13:33:46 +1100 Subject: [PATCH] Add statusPkg arg to ast.NewExpr --- lang/ast/ast.go | 3 ++- lang/check/assert.go | 6 +++--- lang/check/bounds.go | 18 +++++++++--------- lang/check/data.go | 4 ++-- lang/check/gen.go | 2 +- lang/check/optimize.go | 4 ++-- lang/check/resolve.go | 6 +++--- lang/parse/parse.go | 25 +++++++++++++------------ 8 files changed, 35 insertions(+), 33 deletions(-) diff --git a/lang/ast/ast.go b/lang/ast/ast.go index 711882e6..d8386969 100644 --- a/lang/ast/ast.go +++ b/lang/ast/ast.go @@ -327,7 +327,7 @@ func (n *Expr) SetGlobalIdent() { n.flags |= FlagsGlobalIdent } func (n *Expr) SetMType(x *TypeExpr) { n.mType = x } func (n *Expr) SetProvenNotToSuspend() { n.flags |= FlagsProvenNotToSuspend } -func NewExpr(flags Flags, operator t.ID, ident t.ID, lhs *Node, mhs *Node, rhs *Node, args []*Node) *Expr { +func NewExpr(flags Flags, operator t.ID, statusPkg t.ID, ident t.ID, lhs *Node, mhs *Node, rhs *Node, args []*Node) *Expr { if lhs != nil { flags |= lhs.flags & (FlagsImpure | FlagsSuspendible) } @@ -345,6 +345,7 @@ func NewExpr(flags Flags, operator t.ID, ident t.ID, lhs *Node, mhs *Node, rhs * kind: KExpr, flags: flags, id0: operator, + id1: statusPkg, id2: ident, lhs: lhs, mhs: mhs, diff --git a/lang/check/assert.go b/lang/check/assert.go index 6504fbe2..10167eb9 100644 --- a/lang/check/assert.go +++ b/lang/check/assert.go @@ -181,7 +181,7 @@ func simplify(tm *t.Map, n *a.Expr) (*a.Expr, error) { if err != nil { return nil, err } - o := a.NewExpr(a.FlagsTypeChecked, 0, id, nil, nil, nil, nil) + o := a.NewExpr(a.FlagsTypeChecked, 0, 0, id, nil, nil, nil, nil) o.SetConstValue(ncv) o.SetMType(typeExprIdeal) return o, nil @@ -217,7 +217,7 @@ func simplify(tm *t.Map, n *a.Expr) (*a.Expr, error) { return nil, err } if l != lhs || r != rhs { - o := a.NewExpr(a.FlagsTypeChecked, op, 0, l.Node(), nil, r.Node(), nil) + o := a.NewExpr(a.FlagsTypeChecked, op, 0, 0, l.Node(), nil, r.Node(), nil) o.SetConstValue(n.ConstValue()) o.SetMType(n.MType()) return o, nil @@ -350,7 +350,7 @@ func proveReasonRequirement(q *checker, op t.ID, lhs *a.Expr, rhs *a.Expr) error "check: internal error: proveReasonRequirement token.Key (0x%02X) is not an XBinaryOp", op.Key()) } if err := q.proveBinaryOp(op.Key(), lhs, rhs); err != nil { - n := a.NewExpr(a.FlagsTypeChecked, op, 0, lhs.Node(), nil, rhs.Node(), nil) + n := a.NewExpr(a.FlagsTypeChecked, op, 0, 0, lhs.Node(), nil, rhs.Node(), nil) return fmt.Errorf("cannot prove %q: %v", n.Str(q.tm), err) } return nil diff --git a/lang/check/bounds.go b/lang/check/bounds.go index 1c9618e5..58e0db5d 100644 --- a/lang/check/bounds.go +++ b/lang/check/bounds.go @@ -47,7 +47,7 @@ var ( maxIntBits = big.NewInt(t.MaxIntBits) - zeroExpr = a.NewExpr(a.FlagsTypeChecked, 0, t.IDZero, nil, nil, nil, nil) + zeroExpr = a.NewExpr(a.FlagsTypeChecked, 0, 0, t.IDZero, nil, nil, nil, nil) ) func init() { @@ -163,7 +163,7 @@ func invert(tm *t.Map, n *a.Expr) (*a.Expr, error) { default: op, lhs, rhs = t.IDXUnaryNot, nil, n } - o := a.NewExpr(n.Node().Raw().Flags(), op, 0, lhs.Node(), nil, rhs.Node(), args) + o := a.NewExpr(n.Node().Raw().Flags(), op, 0, 0, lhs.Node(), nil, rhs.Node(), args) o.SetMType(n.MType()) return o, nil } @@ -384,7 +384,7 @@ func (q *checker) bcheckAssignment(lhs *a.Expr, op t.ID, rhs *a.Expr) error { } if lhs.Pure() && rhs.Pure() && lhs.MType().IsNumType() { - o := a.NewExpr(a.FlagsTypeChecked, t.IDXBinaryEqEq, 0, lhs.Node(), nil, rhs.Node(), nil) + o := a.NewExpr(a.FlagsTypeChecked, t.IDXBinaryEqEq, 0, 0, lhs.Node(), nil, rhs.Node(), nil) o.SetMType(lhs.MType()) q.facts.appendFact(o) } @@ -403,13 +403,13 @@ func (q *checker) bcheckAssignment(lhs *a.Expr, op t.ID, rhs *a.Expr) error { } switch op.Key() { case t.KeyPlusEq, t.KeyMinusEq: - oRHS := a.NewExpr(a.FlagsTypeChecked, op.BinaryForm(), 0, xRHS.Node(), nil, rhs.Node(), nil) + oRHS := a.NewExpr(a.FlagsTypeChecked, op.BinaryForm(), 0, 0, xRHS.Node(), nil, rhs.Node(), nil) oRHS.SetMType(xRHS.MType()) oRHS, err := simplify(q.tm, oRHS) if err != nil { return nil, err } - o := a.NewExpr(a.FlagsTypeChecked, xOp, 0, xLHS.Node(), nil, oRHS.Node(), nil) + o := a.NewExpr(a.FlagsTypeChecked, xOp, 0, 0, xLHS.Node(), nil, oRHS.Node(), nil) o.SetMType(x.MType()) return o, nil } @@ -711,7 +711,7 @@ func (q *checker) bcheckVar(n *a.Var) error { return err } } - lhs := a.NewExpr(a.FlagsTypeChecked, 0, n.Name(), nil, nil, nil, nil) + lhs := a.NewExpr(a.FlagsTypeChecked, 0, 0, n.Name(), nil, nil, nil, nil) lhs.SetMType(n.XType()) rhs := n.Value() if rhs == nil { @@ -977,9 +977,9 @@ func (q *checker) bcheckExprCall(n *a.Expr, depth uint32) error { } func makeSliceLengthExpr(slice *a.Expr) *a.Expr { - x := a.NewExpr(a.FlagsTypeChecked, t.IDDot, t.IDLength, slice.Node(), nil, nil, nil) + x := a.NewExpr(a.FlagsTypeChecked, t.IDDot, 0, t.IDLength, slice.Node(), nil, nil, nil) x.SetMType(typeExprPlaceholder) // HACK. - x = a.NewExpr(a.FlagsTypeChecked, t.IDOpenParen, 0, x.Node(), nil, nil, nil) + x = a.NewExpr(a.FlagsTypeChecked, t.IDOpenParen, 0, 0, x.Node(), nil, nil, nil) x.SetMType(typeExprU64) return x } @@ -1163,7 +1163,7 @@ func (q *checker) bcheckExprAssociativeOp(n *a.Expr, depth uint32) (*big.Int, *b if i == 0 { continue } - lhs := a.NewExpr(n.Node().Raw().Flags(), n.Operator(), n.Ident(), n.LHS(), n.MHS(), n.RHS(), args[:i]) + lhs := a.NewExpr(n.Node().Raw().Flags(), n.Operator(), 0, n.Ident(), n.LHS(), n.MHS(), n.RHS(), args[:i]) lMin, lMax, err = q.bcheckExprBinaryOp1(op, lhs, lMin, lMax, o.Expr(), depth) if err != nil { return nil, nil, err diff --git a/lang/check/data.go b/lang/check/data.go index adc96de4..57358ed2 100644 --- a/lang/check/data.go +++ b/lang/check/data.go @@ -224,7 +224,7 @@ var reasons = [...]struct { if xc0 == nil { return errFailed } - t1 := a.NewExpr(a.FlagsTypeChecked, t.IDXBinaryPlus, 0, xb0.Node(), nil, xc0.Node(), nil) + t1 := a.NewExpr(a.FlagsTypeChecked, t.IDXBinaryPlus, 0, 0, xb0.Node(), nil, xc0.Node(), nil) if err := proveReasonRequirement(q, t.IDXBinaryLessThan, xa, t1); err != nil { return err } @@ -249,7 +249,7 @@ var reasons = [...]struct { return errFailed } // a <= (c - b) - t1 := a.NewExpr(a.FlagsTypeChecked, t.IDXBinaryMinus, 0, xc.Node(), nil, xb.Node(), nil) + t1 := a.NewExpr(a.FlagsTypeChecked, t.IDXBinaryMinus, 0, 0, xc.Node(), nil, xb.Node(), nil) if err := proveReasonRequirement(q, t.IDXBinaryLessEq, xa, t1); err != nil { return err } diff --git a/lang/check/gen.go b/lang/check/gen.go index ecf397c9..665f0d07 100644 --- a/lang/check/gen.go +++ b/lang/check/gen.go @@ -201,7 +201,7 @@ func genProveReasonRequirement(n *node, name string) error { fmt.Fprintf(&out, "if err := proveReasonRequirement(q, t.ID%s, %s, %s); err != nil { return err }\n", key, l, r) } else { - fmt.Fprintf(&out, "%s := a.NewExpr(a.FlagsTypeChecked, t.ID%s, 0, %s.Node(), nil, %s.Node(), nil)\n", + fmt.Fprintf(&out, "%s := a.NewExpr(a.FlagsTypeChecked, t.ID%s, 0, 0, %s.Node(), nil, %s.Node(), nil)\n", name, key, l, r) } return nil diff --git a/lang/check/optimize.go b/lang/check/optimize.go index 3bea8700..b77f12d9 100644 --- a/lang/check/optimize.go +++ b/lang/check/optimize.go @@ -289,7 +289,7 @@ func (q *checker) optimizeIOMethodAdvance(n *a.Expr, receiver *a.Expr, advance * if err != nil { return nil, err } - o := a.NewExpr(a.FlagsTypeChecked, 0, id, nil, nil, nil, nil) + o := a.NewExpr(a.FlagsTypeChecked, 0, 0, id, nil, nil, nil, nil) o.SetConstValue(rcv) o.SetMType(typeExprIdeal) @@ -298,7 +298,7 @@ func (q *checker) optimizeIOMethodAdvance(n *a.Expr, receiver *a.Expr, advance * } n.SetProvenNotToSuspend() - return a.NewExpr(x.Node().Raw().Flags(), t.IDXBinaryGreaterEq, 0, x.LHS(), nil, o.Node(), nil), nil + return a.NewExpr(x.Node().Raw().Flags(), t.IDXBinaryGreaterEq, 0, 0, x.LHS(), nil, o.Node(), nil), nil }) } diff --git a/lang/check/resolve.go b/lang/check/resolve.go index 2b72b6e7..1924c28a 100644 --- a/lang/check/resolve.go +++ b/lang/check/resolve.go @@ -27,9 +27,9 @@ import ( ) var ( - exprIn = a.NewExpr(a.FlagsTypeChecked, 0, t.IDIn, nil, nil, nil, nil) - exprOut = a.NewExpr(a.FlagsTypeChecked, 0, t.IDOut, nil, nil, nil, nil) - exprThis = a.NewExpr(a.FlagsTypeChecked, 0, t.IDThis, nil, nil, nil, nil) + exprIn = a.NewExpr(a.FlagsTypeChecked, 0, 0, t.IDIn, nil, nil, nil, nil) + exprOut = a.NewExpr(a.FlagsTypeChecked, 0, 0, t.IDOut, nil, nil, nil, nil) + exprThis = a.NewExpr(a.FlagsTypeChecked, 0, 0, t.IDThis, nil, nil, nil, nil) ) // typeExprFoo is an *ast.Node MType (implicit type). diff --git a/lang/parse/parse.go b/lang/parse/parse.go index 38caf263..472737ae 100644 --- a/lang/parse/parse.go +++ b/lang/parse/parse.go @@ -624,7 +624,7 @@ func (p *parser) parseStatement1() (*a.Node, error) { unrollStr, p.filename, p.line()) case "1", "2", "4", "8", "16", "32", "64", "128", "256": } - unroll := a.NewExpr(0, 0, unrollID, nil, nil, nil, nil) + unroll := a.NewExpr(0, 0, 0, unrollID, nil, nil, nil, nil) label, err := p.parseLabel() if err != nil { @@ -818,7 +818,7 @@ func (p *parser) parseDollarExpr() (*a.Expr, error) { if err != nil { return nil, err } - return a.NewExpr(0, t.IDDollar, 0, nil, nil, nil, args), nil + return a.NewExpr(0, t.IDDollar, 0, 0, nil, nil, nil, args), nil } func (p *parser) parseTryExpr() (*a.Expr, error) { @@ -835,7 +835,7 @@ func (p *parser) parseTryExpr() (*a.Expr, error) { return nil, fmt.Errorf(`parse: expected function call after "try", got %q at %s:%d`, call.Str(p.tm), p.filename, p.line()) } - return a.NewExpr(call.Node().Raw().Flags(), t.IDTry, call.Ident(), + return a.NewExpr(call.Node().Raw().Flags(), t.IDTry, 0, call.Ident(), call.LHS(), call.MHS(), call.RHS(), call.Args()), nil } @@ -874,7 +874,7 @@ func (p *parser) parseExpr() (*a.Expr, error) { if op == 0 { return nil, fmt.Errorf(`parse: internal error: no binary form for token.Key 0x%02X`, x.Key()) } - return a.NewExpr(0, op, 0, lhs.Node(), nil, rhs, nil), nil + return a.NewExpr(0, op, 0, 0, lhs.Node(), nil, rhs, nil), nil } args := []*a.Node{lhs.Node(), rhs} @@ -890,7 +890,7 @@ func (p *parser) parseExpr() (*a.Expr, error) { if op == 0 { return nil, fmt.Errorf(`parse: internal error: no associative form for token.Key 0x%02X`, x.Key()) } - return a.NewExpr(0, op, 0, nil, nil, nil, args), nil + return a.NewExpr(0, op, 0, 0, nil, nil, nil, args), nil } return lhs, nil } @@ -907,11 +907,11 @@ func (p *parser) parseOperand() (*a.Expr, error) { if op == 0 { return nil, fmt.Errorf(`parse: internal error: no unary form for token.Key 0x%02X`, x.Key()) } - return a.NewExpr(0, op, 0, nil, nil, rhs.Node(), nil), nil + return a.NewExpr(0, op, 0, 0, nil, nil, rhs.Node(), nil), nil case x.IsLiteral(): p.src = p.src[1:] - return a.NewExpr(0, 0, x, nil, nil, nil, nil), nil + return a.NewExpr(0, 0, 0, x, nil, nil, nil, nil), nil default: switch x.Key() { @@ -933,12 +933,13 @@ func (p *parser) parseOperand() (*a.Expr, error) { p.src = p.src[1:] message := p.peek1() // TODO: parse the "pkg" in `error pkg."foo"`. + statusPkg := t.ID(0) if !message.IsStrLiteral() { got := p.tm.ByID(message) return nil, fmt.Errorf(`parse: expected string literal, got %q at %s:%d`, got, p.filename, p.line()) } p.src = p.src[1:] - return a.NewExpr(0, keyword, message, nil, nil, nil, nil), nil + return a.NewExpr(0, keyword, statusPkg, message, nil, nil, nil, nil), nil } } @@ -946,7 +947,7 @@ func (p *parser) parseOperand() (*a.Expr, error) { if err != nil { return nil, err } - lhs := a.NewExpr(0, 0, id, nil, nil, nil, nil) + lhs := a.NewExpr(0, 0, 0, id, nil, nil, nil, nil) for { flags := a.Flags(0) @@ -967,14 +968,14 @@ func (p *parser) parseOperand() (*a.Expr, error) { if err != nil { return nil, err } - lhs = a.NewExpr(flags, t.IDOpenParen, 0, lhs.Node(), nil, nil, args) + lhs = a.NewExpr(flags, t.IDOpenParen, 0, 0, lhs.Node(), nil, nil, args) case t.KeyOpenBracket: id0, mhs, rhs, err := p.parseBracket(t.IDColon) if err != nil { return nil, err } - lhs = a.NewExpr(0, id0, 0, lhs.Node(), mhs.Node(), rhs.Node(), nil) + lhs = a.NewExpr(0, id0, 0, 0, lhs.Node(), mhs.Node(), rhs.Node(), nil) case t.KeyDot: p.src = p.src[1:] @@ -982,7 +983,7 @@ func (p *parser) parseOperand() (*a.Expr, error) { if err != nil { return nil, err } - lhs = a.NewExpr(0, t.IDDot, selector, lhs.Node(), nil, nil, nil) + lhs = a.NewExpr(0, t.IDDot, 0, selector, lhs.Node(), nil, nil, nil) } } }