Fold Expr statements into Assign statements

This commit is contained in:
Nigel Tao committed 2018-12-27 17:36:08 +11:00
1 parent 796c8ccc30
commit c9e6ee6fb3
6 files changed
+34 -38

No files matched your search

+2 -3
View File
@@ -414,9 +414,9 @@ func NewArg(name t.ID, value *Expr) *Arg {
}
}
// Assign is "LHS = RHS" or "LHS op= RHS":
// Assign is "LHS = RHS" or "LHS op= RHS" or "RHS":
// - ID0: operator
// - LHS: <Expr>
// - LHS: <nil|Expr>
// - RHS: <Expr>
type Assign Node
@@ -791,7 +791,6 @@ const MaxBodyDepth = 255
// Statement means one of:
// - Assert
// - Assign
// - Expr
// - IOBind
// - If
// - Iterate
+19 -13
View File
@@ -230,12 +230,6 @@ func (q *checker) bcheckStatement(n *a.Node) error {
return err
}
case a.KExpr:
n := n.AsExpr()
if _, err := q.bcheckExpr(n, 0); err != nil {
return err
}
case a.KIOBind:
n := n.AsIOBind()
if _, err := q.bcheckExpr(n.IO(), 0); err != nil {
@@ -372,14 +366,23 @@ 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.bcheckExpr(lhs, 0); err != nil {
return err
lTyp := (*a.TypeExpr)(nil)
if lhs != nil {
if _, err := q.bcheckExpr(lhs, 0); err != nil {
return err
}
lTyp = lhs.MType()
}
nb, err := q.bcheckAssignment1(lhs, lhs.MType(), op, rhs)
nb, err := q.bcheckAssignment1(lhs, lTyp, op, rhs)
if err != nil {
return err
}
if lhs == nil {
return nil
}
if op == t.IDEq {
// Drop any facts involving lhs.
if err := q.facts.update(func(x *a.Expr) (*a.Expr, error) {
@@ -457,9 +460,12 @@ func (q *checker) bcheckAssignment1(lhs *a.Expr, lTyp *a.TypeExpr, op t.ID, rhs
return bounds{}, fmt.Errorf("check: internal error: missing LHS for op key 0x%02X", op)
}
lb, err := q.bcheckTypeExpr(lTyp)
if err != nil {
return bounds{}, err
lb, err := bounds{}, (error)(nil)
if lTyp != nil {
lb, err = q.bcheckTypeExpr(lTyp)
if err != nil {
return bounds{}, err
}
}
rb := bounds{}
@@ -472,7 +478,7 @@ func (q *checker) bcheckAssignment1(lhs *a.Expr, lTyp *a.TypeExpr, op t.ID, rhs
return bounds{}, err
}
if (rb[0].Cmp(lb[0]) < 0) || (rb[1].Cmp(lb[1]) > 0) {
if (lTyp != nil) && ((rb[0].Cmp(lb[0]) < 0) || (rb[1].Cmp(lb[1]) > 0)) {
if op == t.IDEq {
return bounds{}, fmt.Errorf("check: expression %q bounds %v is not within bounds %v",
rhs.Str(q.tm), rb, lb)
+6 -6
View File
@@ -57,9 +57,6 @@ func (q *checker) tcheckStatement(n *a.Node) error {
return err
}
case a.KExpr:
return q.tcheckExpr(n.AsExpr(), 0)
case a.KIf:
for n := n.AsIf(); n != nil; n = n.ElseIf() {
cond := n.Condition()
@@ -256,12 +253,15 @@ func (q *checker) tcheckEq(lID t.ID, lhs *a.Expr, lTyp *a.TypeExpr, rhs *a.Expr,
}
func (q *checker) tcheckAssign(n *a.Assign) error {
lhs := n.LHS()
rhs := n.RHS()
if err := q.tcheckExpr(lhs, 0); err != nil {
if err := q.tcheckExpr(rhs, 0); err != nil {
return err
}
if err := q.tcheckExpr(rhs, 0); err != nil {
lhs := n.LHS()
if lhs == nil {
return nil
}
if err := q.tcheckExpr(lhs, 0); err != nil {
return err
}
lTyp := lhs.MType()
+2 -3
View File
@@ -701,6 +701,8 @@ func (p *parser) parseAssignNode() (*a.Node, error) {
rhs.Str(p.tm), p.filename, p.line())
}
}
} else {
op = t.IDEq
}
if p.funcEffect.WeakerThan(rhs.Effect()) {
@@ -708,9 +710,6 @@ func (p *parser) parseAssignNode() (*a.Node, error) {
rhs.Str(p.tm), rhs.Effect(), p.funcEffect, p.filename, p.line())
}
if lhs == nil {
return rhs.AsNode(), nil
}
return a.NewAssign(op, lhs, rhs).AsNode(), nil
}