diff --git a/lang/check/resolve.go b/lang/check/resolve.go index 3b974b69..b31f243c 100644 --- a/lang/check/resolve.go +++ b/lang/check/resolve.go @@ -134,8 +134,9 @@ func (c *Checker) resolveFunc(typ *a.TypeExpr) (*a.Func, error) { if typ.Decorator().Key() != t.KeyOpenParen { return nil, fmt.Errorf("check: resolveFunc cannot look up non-func TypeExpr %q", typ.Str(c.tm)) } - qid := t.QID{typ.Receiver().Name(), typ.Name()} - switch lTyp := typ.Receiver(); lTyp.Decorator().Key() { + lTyp := typ.Receiver() + qid := t.QID{lTyp.Name(), typ.Name()} + switch lTyp.Decorator().Key() { case 0: if f, err := c.builtInFunc(qid); err != nil { return nil, err @@ -147,6 +148,7 @@ func (c *Checker) resolveFunc(typ *a.TypeExpr) (*a.Func, error) { } case t.KeyColon: + // lTyp is a slice. qid[0] = t.IDDiamond if f, err := c.builtInSliceFunc(qid); err != nil { return nil, err @@ -155,6 +157,7 @@ func (c *Checker) resolveFunc(typ *a.TypeExpr) (*a.Func, error) { } default: + // lTyp is from a used package: `use "foo"` followed by `foo.bar`. u := c.usees[lTyp.Decorator()] if u == nil { return nil, fmt.Errorf("check: cannot resolve %q in type %q", diff --git a/lang/check/type.go b/lang/check/type.go index fbd3e7b1..cea76a56 100644 --- a/lang/check/type.go +++ b/lang/check/type.go @@ -681,35 +681,35 @@ func (q *checker) tcheckDot(n *a.Expr, depth uint32) error { return err } lTyp := lhs.MType().Pointee() + qid := t.QID{lTyp.Name(), n.ID1()} + switch lTyp.Decorator().Key() { + case 0: + // No-op. - if lTyp.Decorator() != 0 { - if lTyp.IsSliceType() { - f, err := q.c.builtInSliceFunc(t.QID{t.IDDiamond, n.ID1()}) - if err != nil { - return err - } - if f == nil { - return fmt.Errorf("check: no slice method %q", n.ID1().Str(q.tm)) - } - n.SetMType(a.NewTypeExpr(t.IDOpenParen, n.ID1(), lTyp.Node(), nil, nil)) - return nil + case t.KeyColon: + // lTyp is a slice. + qid[0] = t.IDDiamond + if f, err := q.c.builtInSliceFunc(qid); err != nil { + return err + } else if f == nil { + return fmt.Errorf("check: no slice method %q", n.ID1().Str(q.tm)) } + n.SetMType(a.NewTypeExpr(t.IDOpenParen, n.ID1(), lTyp.Node(), nil, nil)) + return nil + default: // lTyp is from a used package: `use "foo"` followed by `foo.bar`. - u := q.c.usees[lTyp.Decorator()] - if u == nil { + if u := q.c.usees[lTyp.Decorator()]; u == nil { return fmt.Errorf("check: cannot resolve %q in type %q for expression %q", lTyp.Decorator().Str(q.tm), lTyp.Str(q.tm), lhs.Str(q.tm)) + } else if u.funcs[qid] == nil { + return fmt.Errorf("check: no method named %q found in type %q for expression %q", + n.ID1().Str(q.tm), lTyp.Str(q.tm), n.Str(q.tm)) } - if f := u.funcs[t.QID{lTyp.Name(), n.ID1()}]; f != nil { - n.SetMType(a.NewTypeExpr(t.IDOpenParen, n.ID1(), lTyp.Node(), nil, nil)) - return nil - } - return fmt.Errorf("check: no method named %q found in type %q for expression %q", - n.ID1().Str(q.tm), lTyp.Str(q.tm), n.Str(q.tm)) + n.SetMType(a.NewTypeExpr(t.IDOpenParen, n.ID1(), lTyp.Node(), nil, nil)) + return nil } - qid := t.QID{lTyp.Name(), n.ID1()} f, err := q.c.builtInFunc(qid) if err != nil { return err