diff --git a/lang/ast/ast.go b/lang/ast/ast.go index 9d613ac7..f514d7d5 100644 --- a/lang/ast/ast.go +++ b/lang/ast/ast.go @@ -95,7 +95,7 @@ const ( FlagsCallImpure = Flags(0x00000004) FlagsCallSuspendible = Flags(0x00000008) FlagsPublic = Flags(0x00000010) - FlagsTypeChecked = Flags(0x00000020) + flagsUnused = Flags(0x00000020) FlagsHasBreak = Flags(0x00000040) FlagsHasContinue = Flags(0x00000080) FlagsGlobalIdent = Flags(0x00000100) @@ -190,8 +190,6 @@ type Node struct { } func (n *Node) Kind() Kind { return n.kind } -func (n *Node) TypeChecked() bool { return n.flags&FlagsTypeChecked != 0 } -func (n *Node) SetTypeChecked() { n.flags |= FlagsTypeChecked } func (n *Node) MType() *TypeExpr { return n.mType } func (n *Node) SetMType(x *TypeExpr) { n.mType = x } diff --git a/lang/check/assert.go b/lang/check/assert.go index f1f774c7..457fd661 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, 0, id, nil, nil, nil, nil) + o := a.NewExpr(0, 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, 0, l.Node(), nil, r.Node(), nil) + o := a.NewExpr(0, 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 (0x%02X) is not an XBinaryOp", op) } if err := q.proveBinaryOp(op, lhs, rhs); err != nil { - n := a.NewExpr(a.FlagsTypeChecked, op, 0, 0, lhs.Node(), nil, rhs.Node(), nil) + n := a.NewExpr(0, 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 35d35c4c..efa23cae 100644 --- a/lang/check/bounds.go +++ b/lang/check/bounds.go @@ -48,7 +48,7 @@ var ( maxIntBits = big.NewInt(t.MaxIntBits) - zeroExpr = a.NewExpr(a.FlagsTypeChecked, 0, 0, t.ID0, nil, nil, nil, nil) + zeroExpr = a.NewExpr(0, 0, 0, t.ID0, nil, nil, nil, nil) ) func init() { @@ -404,7 +404,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, 0, lhs.Node(), nil, rhs.Node(), nil) + o := a.NewExpr(0, t.IDXBinaryEqEq, 0, 0, lhs.Node(), nil, rhs.Node(), nil) o.SetMType(lhs.MType()) q.facts.appendFact(o) } @@ -423,13 +423,13 @@ func (q *checker) bcheckAssignment(lhs *a.Expr, op t.ID, rhs *a.Expr) error { } switch op { case t.IDPlusEq, t.IDMinusEq: - oRHS := a.NewExpr(a.FlagsTypeChecked, op.BinaryForm(), 0, 0, xRHS.Node(), nil, rhs.Node(), nil) + oRHS := a.NewExpr(0, 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, 0, xLHS.Node(), nil, oRHS.Node(), nil) + o := a.NewExpr(0, xOp, 0, 0, xLHS.Node(), nil, oRHS.Node(), nil) o.SetMType(x.MType()) return o, nil } @@ -737,7 +737,7 @@ func (q *checker) bcheckVar(n *a.Var, iterateVariable bool) error { return nil } - lhs := a.NewExpr(a.FlagsTypeChecked, 0, 0, n.Name(), nil, nil, nil, nil) + lhs := a.NewExpr(0, 0, 0, n.Name(), nil, nil, nil, nil) lhs.SetMType(n.XType()) rhs := n.Value() if rhs == nil { @@ -963,9 +963,9 @@ func (q *checker) bcheckExprCall(n *a.Expr, depth uint32) error { // makeSliceLength returns "x.length()". func makeSliceLength(slice *a.Expr) *a.Expr { - x := a.NewExpr(a.FlagsTypeChecked, t.IDDot, 0, t.IDLength, slice.Node(), nil, nil, nil) + x := a.NewExpr(0, t.IDDot, 0, t.IDLength, slice.Node(), nil, nil, nil) x.SetMType(a.NewTypeExpr(t.IDFunc, 0, t.IDLength, slice.MType().Node(), nil, nil)) - x = a.NewExpr(a.FlagsTypeChecked, t.IDOpenParen, 0, 0, x.Node(), nil, nil, nil) + x = a.NewExpr(0, t.IDOpenParen, 0, 0, x.Node(), nil, nil, nil) x.SetMType(typeExprU64) return x } @@ -974,7 +974,7 @@ func makeSliceLength(slice *a.Expr) *a.Expr { // // n must be the t.ID of a small power of 2. func makeSliceLengthEqEq(x t.ID, xTyp *a.TypeExpr, n t.ID) *a.Expr { - xExpr := a.NewExpr(a.FlagsTypeChecked, 0, 0, x, nil, nil, nil, nil) + xExpr := a.NewExpr(0, 0, 0, x, nil, nil, nil, nil) xExpr.SetMType(xTyp) lhs := makeSliceLength(xExpr) @@ -983,11 +983,11 @@ func makeSliceLengthEqEq(x t.ID, xTyp *a.TypeExpr, n t.ID) *a.Expr { if nValue == 0 { panic("check: internal error: makeSliceLengthEqEq called but not with a small power of 2") } - rhs := a.NewExpr(a.FlagsTypeChecked, 0, 0, n, nil, nil, nil, nil) + rhs := a.NewExpr(0, 0, 0, n, nil, nil, nil, nil) rhs.SetConstValue(big.NewInt(int64(nValue))) rhs.SetMType(typeExprIdeal) - ret := a.NewExpr(a.FlagsTypeChecked, t.IDXBinaryEqEq, 0, 0, lhs.Node(), nil, rhs.Node(), nil) + ret := a.NewExpr(0, t.IDXBinaryEqEq, 0, 0, lhs.Node(), nil, rhs.Node(), nil) ret.SetMType(typeExprBool) return ret } diff --git a/lang/check/check.go b/lang/check/check.go index 7d6a54de..d8906ecf 100644 --- a/lang/check/check.go +++ b/lang/check/check.go @@ -113,7 +113,6 @@ func Check(tm *t.Map, files []*a.File, resolveUse func(usePath string) ([]byte, } } f.Node().SetMType(typeExprPlaceholder) - f.Node().SetTypeChecked() } } @@ -206,7 +205,6 @@ func (c *Checker) checkPackageID(node *a.Node) error { c.packageID = u c.otherPackageID = n n.Node().SetMType(typeExprPlaceholder) - n.Node().SetTypeChecked() return nil } @@ -297,7 +295,6 @@ func (c *Checker) checkUse(node *a.Node) error { } c.useBaseNames[baseName] = struct{}{} node.SetMType(typeExprPlaceholder) - node.SetTypeChecked() return nil } @@ -315,7 +312,6 @@ func (c *Checker) checkStatus(node *a.Node) error { } c.statuses[qid] = n n.Node().SetMType(typeExprPlaceholder) - n.Node().SetTypeChecked() return nil } @@ -367,7 +363,6 @@ func (c *Checker) checkConst(node *a.Node) error { return fmt.Errorf("check: %v for %s", err, qid.Str(c.tm)) } n.Node().SetMType(typeExprPlaceholder) - n.Node().SetTypeChecked() return nil } @@ -432,7 +427,6 @@ func (c *Checker) checkStructFields(node *a.Node) error { } } n.Node().SetMType(typeExprPlaceholder) - n.Node().SetTypeChecked() return nil } @@ -472,7 +466,6 @@ func (c *Checker) checkFields(fields []*a.Node, banPtrTypes bool) error { } fieldNames[f.Name()] = true f.Node().SetMType(typeExprPlaceholder) - f.Node().SetTypeChecked() } return nil @@ -488,7 +481,6 @@ func (c *Checker) checkFuncSignature(node *a.Node) error { } } n.In().Node().SetMType(typeExprPlaceholder) - n.In().Node().SetTypeChecked() if err := c.checkFields(n.Out().Fields(), false); err != nil { return &Error{ Err: fmt.Errorf("%v in out-params for func %s", err, n.QQID().Str(c.tm)), @@ -497,7 +489,6 @@ func (c *Checker) checkFuncSignature(node *a.Node) error { } } n.Out().Node().SetMType(typeExprPlaceholder) - n.Out().Node().SetTypeChecked() // TODO: check somewhere that, if n.Out() is non-empty (or we are // suspendible), that we end with a return statement? Or is that an @@ -523,11 +514,9 @@ func (c *Checker) checkFuncSignature(node *a.Node) error { iQID := n.In().QID() inTyp := a.NewTypeExpr(0, iQID[0], iQID[1], nil, nil, nil) inTyp.Node().SetMType(typeExprPlaceholder) - inTyp.Node().SetTypeChecked() oQID := n.Out().QID() outTyp := a.NewTypeExpr(0, oQID[0], oQID[1], nil, nil, nil) outTyp.Node().SetMType(typeExprPlaceholder) - outTyp.Node().SetTypeChecked() localVars := typeMap{ t.IDIn: inTyp, t.IDOut: outTyp, @@ -542,10 +531,8 @@ func (c *Checker) checkFuncSignature(node *a.Node) error { } sTyp := a.NewTypeExpr(0, qqid[0], qqid[1], nil, nil, nil) sTyp.Node().SetMType(typeExprPlaceholder) - sTyp.Node().SetTypeChecked() pTyp := a.NewTypeExpr(t.IDPtr, 0, 0, nil, nil, sTyp) pTyp.Node().SetMType(typeExprPlaceholder) - pTyp.Node().SetTypeChecked() localVars[t.IDThis] = pTyp } c.funcs[qqid] = n @@ -615,14 +602,13 @@ func (c *Checker) checkFuncBody(node *a.Node) error { } n.Node().SetMType(typeExprPlaceholder) - n.Node().SetTypeChecked() return nil } func allTypeChecked(tm *t.Map, n *a.Node) error { return n.Walk(func(o *a.Node) error { typ := o.MType() - if !o.TypeChecked() || typ == nil { + if typ == nil { switch o.Kind() { case a.KExpr: return fmt.Errorf("check: internal error: unchecked %s node %q", diff --git a/lang/check/data.go b/lang/check/data.go index e1435c37..82d21a3c 100644 --- a/lang/check/data.go +++ b/lang/check/data.go @@ -248,7 +248,7 @@ var reasons = [...]struct { if xc0 == nil { return errFailed } - t1 := a.NewExpr(a.FlagsTypeChecked, t.IDXBinaryPlus, 0, 0, xb0.Node(), nil, xc0.Node(), nil) + t1 := a.NewExpr(0, t.IDXBinaryPlus, 0, 0, xb0.Node(), nil, xc0.Node(), nil) if err := proveReasonRequirement(q, t.IDXBinaryLessThan, xa, t1); err != nil { return err } @@ -273,7 +273,7 @@ var reasons = [...]struct { return errFailed } // a <= (c - b) - t1 := a.NewExpr(a.FlagsTypeChecked, t.IDXBinaryMinus, 0, 0, xc.Node(), nil, xb.Node(), nil) + t1 := a.NewExpr(0, 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 4784fcce..eff29521 100644 --- a/lang/check/gen.go +++ b/lang/check/gen.go @@ -203,7 +203,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, 0, %s.Node(), nil, %s.Node(), nil)\n", + fmt.Fprintf(&out, "%s := a.NewExpr(0, 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 90478554..96ec0701 100644 --- a/lang/check/optimize.go +++ b/lang/check/optimize.go @@ -263,7 +263,7 @@ func (q *checker) optimizeIOMethodAdvance(n *a.Expr, receiver *a.Expr, advance * if err != nil { return nil, err } - o := a.NewExpr(a.FlagsTypeChecked, 0, 0, id, nil, nil, nil, nil) + o := a.NewExpr(0, 0, 0, id, nil, nil, nil, nil) o.SetConstValue(rcv) o.SetMType(typeExprIdeal) diff --git a/lang/check/resolve.go b/lang/check/resolve.go index 787437e0..4a01f785 100644 --- a/lang/check/resolve.go +++ b/lang/check/resolve.go @@ -27,9 +27,9 @@ import ( ) var ( - 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) + exprIn = a.NewExpr(0, 0, 0, t.IDIn, nil, nil, nil, nil) + exprOut = a.NewExpr(0, 0, 0, t.IDOut, nil, nil, nil, nil) + exprThis = a.NewExpr(0, 0, 0, t.IDThis, nil, nil, nil, nil) ) // typeExprFoo is an *ast.Node MType (implicit type). diff --git a/lang/check/type.go b/lang/check/type.go index c535e4f5..94ef7a9d 100644 --- a/lang/check/type.go +++ b/lang/check/type.go @@ -114,7 +114,6 @@ func (q *checker) tcheckStatement(n *a.Node) error { } for n := n.If(); n != nil; n = n.ElseIf() { n.Node().SetMType(typeExprPlaceholder) - n.Node().SetTypeChecked() } return nil @@ -152,7 +151,6 @@ func (q *checker) tcheckStatement(n *a.Node) error { } for n := n.Iterate(); n != nil; n = n.ElseIterate() { n.Node().SetMType(typeExprPlaceholder) - n.Node().SetTypeChecked() } return nil @@ -196,7 +194,7 @@ func (q *checker) tcheckStatement(n *a.Node) error { case a.KVar: n := n.Var() - if !n.XType().Node().TypeChecked() { + if n.XType().Node().MType() == nil { return fmt.Errorf("check: internal error: unchecked type expression %q", n.XType().Str(q.tm)) } if value := n.Value(); value != nil { @@ -242,7 +240,6 @@ func (q *checker) tcheckStatement(n *a.Node) error { } n.SetMType(typeExprPlaceholder) - n.SetTypeChecked() return nil } @@ -260,7 +257,6 @@ func (q *checker) tcheckAssert(n *a.Assert) error { return err } o.SetMType(typeExprPlaceholder) - o.SetTypeChecked() } // TODO: check that there are no side effects. return nil @@ -333,7 +329,6 @@ func (q *checker) tcheckArg(n *a.Arg, inField *a.Field, genericType *a.TypeExpr, if inField == nil { // TODO: panic. n.Node().SetMType(typeExprPlaceholder) - n.Node().SetTypeChecked() return nil } @@ -348,7 +343,6 @@ func (q *checker) tcheckArg(n *a.Arg, inField *a.Field, genericType *a.TypeExpr, return err } n.Node().SetMType(typeExprPlaceholder) - n.Node().SetTypeChecked() return nil } @@ -358,7 +352,6 @@ func (q *checker) tcheckLoop(n a.Loop) error { return err } o.SetMType(typeExprPlaceholder) - o.SetTypeChecked() } q.jumpTargets = append(q.jumpTargets, n) defer func() { @@ -396,7 +389,6 @@ func (q *checker) tcheckExpr(n *a.Expr, depth uint32) error { return err } } - n.Node().SetTypeChecked() return nil } @@ -1014,7 +1006,6 @@ swtch: return fmt.Errorf("check: %q is not a type", typ.Str(q.tm)) } typ.Node().SetMType(typeExprPlaceholder) - typ.Node().SetTypeChecked() return nil }