diff --git a/lang/ast/ast.go b/lang/ast/ast.go index 26cc6ac0..9d613ac7 100644 --- a/lang/ast/ast.go +++ b/lang/ast/ast.go @@ -189,9 +189,11 @@ type Node struct { list2 []*Node } -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) 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 } func (n *Node) Arg() *Arg { return (*Arg)(n) } func (n *Node) Assert() *Assert { return (*Assert)(n) } diff --git a/lang/check/check.go b/lang/check/check.go index a603fc78..7d6a54de 100644 --- a/lang/check/check.go +++ b/lang/check/check.go @@ -112,9 +112,17 @@ func Check(tm *t.Map, files []*a.File, resolveUse func(usePath string) ([]byte, return nil, err } } + f.Node().SetMType(typeExprPlaceholder) f.Node().SetTypeChecked() } } + + for _, f := range files { + if err := allTypeChecked(tm, f.Node()); err != nil { + return nil, err + } + } + return c, nil } @@ -197,6 +205,8 @@ func (c *Checker) checkPackageID(node *a.Node) error { } c.packageID = u c.otherPackageID = n + n.Node().SetMType(typeExprPlaceholder) + n.Node().SetTypeChecked() return nil } @@ -286,6 +296,8 @@ func (c *Checker) checkUse(node *a.Node) error { } } c.useBaseNames[baseName] = struct{}{} + node.SetMType(typeExprPlaceholder) + node.SetTypeChecked() return nil } @@ -302,6 +314,7 @@ func (c *Checker) checkStatus(node *a.Node) error { } } c.statuses[qid] = n + n.Node().SetMType(typeExprPlaceholder) n.Node().SetTypeChecked() return nil } @@ -353,6 +366,7 @@ func (c *Checker) checkConst(node *a.Node) error { if err := c.checkConstElement(n.Value(), nMin, nMax, nLists); err != nil { return fmt.Errorf("check: %v for %s", err, qid.Str(c.tm)) } + n.Node().SetMType(typeExprPlaceholder) n.Node().SetTypeChecked() return nil } @@ -417,6 +431,7 @@ func (c *Checker) checkStructFields(node *a.Node) error { Line: n.Line(), } } + n.Node().SetMType(typeExprPlaceholder) n.Node().SetTypeChecked() return nil } @@ -456,6 +471,7 @@ func (c *Checker) checkFields(fields []*a.Node, banPtrTypes bool) error { return err } fieldNames[f.Name()] = true + f.Node().SetMType(typeExprPlaceholder) f.Node().SetTypeChecked() } @@ -471,6 +487,7 @@ func (c *Checker) checkFuncSignature(node *a.Node) error { Line: n.Line(), } } + n.In().Node().SetMType(typeExprPlaceholder) n.In().Node().SetTypeChecked() if err := c.checkFields(n.Out().Fields(), false); err != nil { return &Error{ @@ -479,6 +496,7 @@ func (c *Checker) checkFuncSignature(node *a.Node) error { Line: n.Line(), } } + n.Out().Node().SetMType(typeExprPlaceholder) n.Out().Node().SetTypeChecked() // TODO: check somewhere that, if n.Out() is non-empty (or we are @@ -504,9 +522,11 @@ 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, @@ -521,8 +541,10 @@ 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 } @@ -592,35 +614,34 @@ func (c *Checker) checkFuncBody(node *a.Node) error { } } + n.Node().SetMType(typeExprPlaceholder) n.Node().SetTypeChecked() - if err := n.Node().Walk(func(o *a.Node) error { - if !o.TypeChecked() { + 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 { switch o.Kind() { case a.KExpr: return fmt.Errorf("check: internal error: unchecked %s node %q", - o.Kind(), o.Expr().Str(q.tm)) + o.Kind(), o.Expr().Str(tm)) case a.KTypeExpr: return fmt.Errorf("check: internal error: unchecked %s node %q", - o.Kind(), o.TypeExpr().Str(q.tm)) + o.Kind(), o.TypeExpr().Str(tm)) } return fmt.Errorf("check: internal error: unchecked %s node", o.Kind()) } if o.Kind() == a.KExpr { o := o.Expr() - if typ := o.MType(); typ == nil { - return fmt.Errorf("check: internal error: expression %q has no (implicit) type", - o.Str(q.tm)) - } else if typ.IsIdeal() && o.ConstValue() == nil { + if typ.IsIdeal() && o.ConstValue() == nil { return fmt.Errorf("check: internal error: expression %q has ideal number type "+ - "but no const value", o.Str(q.tm)) + "but no const value", o.Str(tm)) } } return nil - }); err != nil { - return err - } - - return nil + }) } func (c *Checker) checkFieldMethodCollisions(node *a.Node) error { diff --git a/lang/check/resolve.go b/lang/check/resolve.go index 039abc39..787437e0 100644 --- a/lang/check/resolve.go +++ b/lang/check/resolve.go @@ -34,9 +34,10 @@ var ( // typeExprFoo is an *ast.Node MType (implicit type). var ( - typeExprGeneric = a.NewTypeExpr(0, t.IDBase, t.IDDiamond, nil, nil, nil) - typeExprIdeal = a.NewTypeExpr(0, t.IDBase, t.IDDoubleZ, nil, nil, nil) - typeExprList = a.NewTypeExpr(0, t.IDBase, t.IDDollar, nil, nil, nil) + typeExprGeneric = a.NewTypeExpr(0, t.IDBase, t.IDDiamond, nil, nil, nil) + typeExprIdeal = a.NewTypeExpr(0, t.IDBase, t.IDDoubleZ, nil, nil, nil) + typeExprList = a.NewTypeExpr(0, t.IDBase, t.IDDollar, nil, nil, nil) + typeExprPlaceholder = a.NewTypeExpr(0, t.IDBase, t.IDPilcrow, nil, nil, nil) typeExprU8 = a.NewTypeExpr(0, t.IDBase, t.IDU8, nil, nil, nil) typeExprU16 = a.NewTypeExpr(0, t.IDBase, t.IDU16, nil, nil, nil) diff --git a/lang/check/type.go b/lang/check/type.go index a6bafb2a..c535e4f5 100644 --- a/lang/check/type.go +++ b/lang/check/type.go @@ -113,6 +113,7 @@ 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 @@ -150,6 +151,7 @@ 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 @@ -239,6 +241,7 @@ func (q *checker) tcheckStatement(n *a.Node) error { return fmt.Errorf("check: unrecognized ast.Kind (%s) for tcheckStatement", n.Kind()) } + n.SetMType(typeExprPlaceholder) n.SetTypeChecked() return nil } @@ -256,6 +259,7 @@ func (q *checker) tcheckAssert(n *a.Assert) error { if err := q.tcheckExpr(o.Arg().Value(), 0); err != nil { return err } + o.SetMType(typeExprPlaceholder) o.SetTypeChecked() } // TODO: check that there are no side effects. @@ -328,6 +332,7 @@ 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 } @@ -342,6 +347,7 @@ func (q *checker) tcheckArg(n *a.Arg, inField *a.Field, genericType *a.TypeExpr, if err := q.tcheckEq(inField.Name(), nil, inFieldTyp, n.Value(), n.Value().MType()); err != nil { return err } + n.Node().SetMType(typeExprPlaceholder) n.Node().SetTypeChecked() return nil } @@ -351,6 +357,7 @@ func (q *checker) tcheckLoop(n a.Loop) error { if err := q.tcheckAssert(o.Assert()); err != nil { return err } + o.SetMType(typeExprPlaceholder) o.SetTypeChecked() } q.jumpTargets = append(q.jumpTargets, n) @@ -1006,6 +1013,7 @@ swtch: default: return fmt.Errorf("check: %q is not a type", typ.Str(q.tm)) } + typ.Node().SetMType(typeExprPlaceholder) typ.Node().SetTypeChecked() return nil } diff --git a/lang/token/list.go b/lang/token/list.go index e83fb177..738c3562 100644 --- a/lang/token/list.go +++ b/lang/token/list.go @@ -402,6 +402,7 @@ const ( IDCapitalT = ID(0x105) IDImageConfig = ID(0x106) + IDPilcrow = ID(0x10D) IDDiamond = ID(0x10E) // It is important that IDDoubleZ is right next to the IDI8..IDU64 block. @@ -587,11 +588,16 @@ var builtInsByID = [nBuiltInIDs]string{ IDCapitalT: "T", IDImageConfig: "image_config", - // IDDiamond and IDDoubleZ are never returned by the tokenizer, as the - // tokenizer rejects non-ASCII input. - // - // The string representations ""◊ and "ℤ" are specifically non-ASCII so - // that no user-defined (non built-in) identifier will conflict with them. + // The next few IDs are never returned by the tokenizer, as it rejects + // non-ASCII input. The string representations "¶", "◊" and "ℤ" are + // specifically non-ASCII so that no user-defined (non built-in) identifier + // will conflict with them. + + // IDPilcrow is used by the type checker to build a placeholder MType for + // AST nodes that aren't expression nodes, such as struct definition nodes + // and statement nodes. Its presence means that the non-expression node is + // type checked. + IDPilcrow: "¶", // U+00B6 PILCROW SIGN // IDDiamond is used by the type checker as a dummy-valued built-in ID to // represent a generic type.