From 40c5328d947e7deec8a2c249e1fa3445ee6acaa7 Mon Sep 17 00:00:00 2001 From: Nigel Tao Date: Sun, 3 Jun 2018 11:03:07 +1000 Subject: [PATCH] Remove redundant builtInFuncs field --- lang/check/check.go | 16 +++++++++-- lang/check/resolve.go | 64 ++++++++++--------------------------------- lang/check/type.go | 16 ++--------- 3 files changed, 31 insertions(+), 65 deletions(-) diff --git a/lang/check/check.go b/lang/check/check.go index 20d124ae..9fa81596 100644 --- a/lang/check/check.go +++ b/lang/check/check.go @@ -23,6 +23,7 @@ import ( "path" "github.com/google/wuffs/lang/base38" + "github.com/google/wuffs/lang/builtin" "github.com/google/wuffs/lang/parse" a "github.com/google/wuffs/lang/ast" @@ -96,6 +97,19 @@ func Check(tm *t.Map, files []*a.File, resolveUse func(usePath string) ([]byte, useBaseNames: map[t.ID]struct{}{}, } + _, err := c.parseBuiltInFuncs(builtin.Funcs, false) + if err != nil { + return nil, err + } + c.builtInSliceFuncs, err = c.parseBuiltInFuncs(builtin.SliceFuncs, true) + if err != nil { + return nil, err + } + c.builtInTableFuncs, err = c.parseBuiltInFuncs(builtin.TableFuncs, true) + if err != nil { + return nil, err + } + for _, phase := range phases { for _, f := range files { if phase.kind == a.KInvalid { @@ -161,8 +175,6 @@ type Checker struct { // "foo/bar"` lines. The keys are `bar`, not `"foo/bar"`. useBaseNames map[t.ID]struct{} - // TODO: is builtInFuncs necessary? Are they are subset of funcs? - builtInFuncs map[t.QQID]*a.Func builtInSliceFuncs map[t.QQID]*a.Func builtInTableFuncs map[t.QQID]*a.Func unsortedStructs []*a.Struct diff --git a/lang/check/resolve.go b/lang/check/resolve.go index 1d2d0790..f5cd1dd3 100644 --- a/lang/check/resolve.go +++ b/lang/check/resolve.go @@ -83,41 +83,12 @@ var builtInTypeMap = typeMap{ t.IDStatus: typeExprStatus, } -func (c *Checker) builtInFunc(qqid t.QQID) (*a.Func, error) { - if c.builtInFuncs == nil { - err := error(nil) - c.builtInFuncs, err = c.parseBuiltInFuncs(builtin.Funcs, false) - if err != nil { - return nil, err - } - } - return c.builtInFuncs[qqid], nil -} - -func (c *Checker) builtInSliceFunc(qqid t.QQID) (*a.Func, error) { - if c.builtInSliceFuncs == nil { - err := error(nil) - c.builtInSliceFuncs, err = c.parseBuiltInFuncs(builtin.SliceFuncs, true) - if err != nil { - return nil, err - } - } - return c.builtInSliceFuncs[qqid], nil -} - -func (c *Checker) builtInTableFunc(qqid t.QQID) (*a.Func, error) { - if c.builtInTableFuncs == nil { - err := error(nil) - c.builtInTableFuncs, err = c.parseBuiltInFuncs(builtin.TableFuncs, true) - if err != nil { - return nil, err - } - } - return c.builtInTableFuncs[qqid], nil -} - func (c *Checker) parseBuiltInFuncs(ss []string, generic bool) (map[t.QQID]*a.Func, error) { - m := map[t.QQID]*a.Func{} + m := map[t.QQID]*a.Func(nil) + if generic { + m = map[t.QQID]*a.Func{} + } + buf := []byte(nil) opts := parse.Options{ AllowBuiltIns: true, @@ -156,7 +127,10 @@ func (c *Checker) parseBuiltInFuncs(ss []string, generic bool) (map[t.QQID]*a.Fu if err := c.checkFuncSignature(f.Node()); err != nil { return nil, err } - m[f.QQID()] = f + + if m != nil { + m[f.QQID()] = f + } } return m, nil } @@ -168,33 +142,23 @@ func (c *Checker) resolveFunc(typ *a.TypeExpr) (*a.Func, error) { lTyp := typ.Receiver() lQID := lTyp.QID() qqid := t.QQID{lQID[0], lQID[1], typ.FuncName()} + if lTyp.IsSliceType() { qqid[0] = t.IDBase qqid[1] = t.IDDagger1 - if f, err := c.builtInSliceFunc(qqid); err != nil { - return nil, err - } else if f != nil { + if f := c.builtInSliceFuncs[qqid]; f != nil { return f, nil } } else if lTyp.IsTableType() { qqid[0] = t.IDBase qqid[1] = t.IDDagger2 - if f, err := c.builtInTableFunc(qqid); err != nil { - return nil, err - } else if f != nil { + if f := c.builtInTableFuncs[qqid]; f != nil { return f, nil } - } else { - if f, err := c.builtInFunc(qqid); err != nil { - return nil, err - } else if f != nil { - return f, nil - } - if f := c.funcs[qqid]; f != nil { - return f, nil - } + } else if f := c.funcs[qqid]; f != nil { + return f, nil } return nil, fmt.Errorf("check: resolveFunc cannot look up %q", typ.Str(c.tm)) } diff --git a/lang/check/type.go b/lang/check/type.go index 93b2a596..e019d6d2 100644 --- a/lang/check/type.go +++ b/lang/check/type.go @@ -609,9 +609,7 @@ func (q *checker) tcheckDot(n *a.Expr, depth uint32) error { if lTyp.IsSliceType() { qqid[0] = t.IDBase qqid[1] = t.IDDagger1 - if f, err := q.c.builtInSliceFunc(qqid); err != nil { - return err - } else if f == nil { + if q.c.builtInSliceFuncs[qqid] == nil { return fmt.Errorf("check: no slice method %q", n.Ident().Str(q.tm)) } n.SetMType(a.NewTypeExpr(t.IDFunc, 0, n.Ident(), lTyp.Node(), nil, nil)) @@ -620,9 +618,7 @@ func (q *checker) tcheckDot(n *a.Expr, depth uint32) error { } else if lTyp.IsTableType() { qqid[0] = t.IDBase qqid[1] = t.IDDagger2 - if f, err := q.c.builtInTableFunc(qqid); err != nil { - return err - } else if f == nil { + if q.c.builtInTableFuncs[qqid] == nil { return fmt.Errorf("check: no table method %q", n.Ident().Str(q.tm)) } n.SetMType(a.NewTypeExpr(t.IDFunc, 0, n.Ident(), lTyp.Node(), nil, nil)) @@ -632,13 +628,7 @@ func (q *checker) tcheckDot(n *a.Expr, depth uint32) error { return fmt.Errorf("check: invalid type %q for dot-expression LHS %q", lTyp.Str(q.tm), lhs.Str(q.tm)) } - f, err := q.c.builtInFunc(qqid) - if err != nil { - return err - } else if f == nil { - f = q.c.funcs[qqid] - } - if f != nil { + if f := q.c.funcs[qqid]; f != nil { n.SetMType(a.NewTypeExpr(t.IDFunc, 0, n.Ident(), lTyp.Node(), nil, nil)) return nil }