From f7095028f0d1eb4ca979b46d608822c57f56e52d Mon Sep 17 00:00:00 2001 From: Nigel Tao Date: Sat, 13 May 2017 15:36:37 +1000 Subject: [PATCH] Check struct declarations. --- lang/check/check.go | 71 ++++++++++++++++++++++++++++++++++++--------- lang/check/type.go | 8 +++-- lang/token/list.go | 11 +++++++ 3 files changed, 73 insertions(+), 17 deletions(-) diff --git a/lang/check/check.go b/lang/check/check.go index 44971aad..2463f84a 100644 --- a/lang/check/check.go +++ b/lang/check/check.go @@ -24,6 +24,11 @@ func numeric(n *a.TypeExpr) bool { return n == TypeExprIdealNumber || n.IsNumTyp // TypeMap maps from variable names (as token IDs) to types. type TypeMap map[t.ID]*a.TypeExpr +type Struct struct { + ID t.ID + Struct *a.Struct +} + type Func struct { QID t.QID Func *a.Func @@ -48,8 +53,9 @@ func Check(m *t.IDMap, files ...*a.File) (*Checker, error) { } c := &Checker{ - idMap: m, - funcs: map[t.QID]Func{}, + idMap: m, + structs: map[t.ID]Struct{}, + funcs: map[t.QID]Func{}, } for _, phase := range phases { for _, f := range files { @@ -77,8 +83,9 @@ var phases = [...]struct { } type Checker struct { - idMap *t.IDMap - funcs map[t.QID]Func + idMap *t.IDMap + structs map[t.ID]Struct + funcs map[t.QID]Func } func (c *Checker) Funcs() map[t.QID]Func { return c.funcs } @@ -88,23 +95,59 @@ func (c *Checker) checkUse(n *a.Node) error { return nil } +func (c *Checker) checkParams(params []*a.Node) error { + if len(params) == 0 { + return nil + } + tc := &typeChecker{ + c: c, + idMap: c.idMap, + } + fieldNames := map[t.ID]bool{} + for _, n := range params { + p := n.Param() + if _, ok := fieldNames[p.Name()]; ok { + return fmt.Errorf("check: duplicate field %q", c.idMap.ByID(p.Name())) + } + if err := tc.checkTypeExpr(p.XType()); err != nil { + return fmt.Errorf("%v in field %q", err, c.idMap.ByID(p.Name())) + } + fieldNames[p.Name()] = true + } + return nil +} + func (c *Checker) checkStruct(n *a.Node) error { - // TODO. + s := n.Struct() + if err := c.checkParams(s.Fields()); err != nil { + return fmt.Errorf("%v in struct %q at %s:%d", err, c.idMap.ByID(s.Name()), s.Filename(), s.Line()) + } + id := s.Name() + if other, ok := c.structs[id]; ok { + return fmt.Errorf("check: duplicate struct %q at %s:%d and %s:%d", + c.idMap.ByID(id), other.Struct.Filename(), other.Struct.Line(), s.Filename(), s.Line()) + } + c.structs[id] = Struct{ + ID: id, + Struct: s, + } return nil } func (c *Checker) checkFuncSignature(n *a.Node) error { f := n.Func() - - // TODO: check the in and out params. - + if err := c.checkParams(f.InParams()); err != nil { + return fmt.Errorf("%v in in-params for func %q at %s:%d", + err, c.idMap.ByID(f.Name()), f.Filename(), f.Line()) + } + if err := c.checkParams(f.OutParams()); err != nil { + return fmt.Errorf("%v in out-params for func %q at %s:%d", + err, c.idMap.ByID(f.Name()), f.Filename(), f.Line()) + } qid := f.QID() - if _, ok := c.funcs[qid]; ok { - if qid[0] == 0 { - return fmt.Errorf(`check: duplicate function "%s"`, c.idMap.ByID(qid[1])) - } else { - return fmt.Errorf(`check: duplicate function "%s.%s"`, c.idMap.ByID(qid[0]), c.idMap.ByID(qid[1])) - } + if other, ok := c.funcs[qid]; ok { + return fmt.Errorf("check: duplicate function %q at %s:%d and %s:%d", + qid.String(c.idMap), other.Func.Filename(), other.Func.Line(), f.Filename(), f.Line()) } c.funcs[qid] = Func{ QID: qid, diff --git a/lang/check/type.go b/lang/check/type.go index 4592783d..87713794 100644 --- a/lang/check/type.go +++ b/lang/check/type.go @@ -215,9 +215,11 @@ func (c *typeChecker) checkExprOther(n *a.Expr) error { return nil case id1.IsIdent(): - if typ, ok := c.typeMap[id1]; ok { - n.SetMType(typ) - return nil + if c.typeMap != nil { + if typ, ok := c.typeMap[id1]; ok { + n.SetMType(typ) + return nil + } } // TODO: look for (global) names (constants, funcs, structs). return fmt.Errorf("check: unrecognized identifier %q", c.idMap.ByID(id1)) diff --git a/lang/token/list.go b/lang/token/list.go index 8e82a42d..56ecf610 100644 --- a/lang/token/list.go +++ b/lang/token/list.go @@ -46,6 +46,9 @@ const ( // ID combines a Key and Flags. type ID uint32 +// String returns a string form of x. +func (x ID) String(m *IDMap) string { return m.ByID(x) } + func (x ID) AmbiguousForm() ID { return ambiguousForms[0xFF&(x>>KeyShift)] } func (x ID) UnaryForm() ID { return unaryForms[0xFF&(x>>KeyShift)] } func (x ID) BinaryForm() ID { return binaryForms[0xFF&(x>>KeyShift)] } @@ -75,6 +78,14 @@ func (x ID) IsNumType() bool { return Flags(x)&FlagsNumType != 0 } // "bar"'s. QID[0] may be 0 for a plain "bar". type QID [2]ID +// String returns a string form of x. +func (x QID) String(m *IDMap) string { + if x[0] == 0 { + return m.ByID(x[1]) + } + return m.ByID(x[0]) + "." + m.ByID(x[1]) +} + // Token combines an ID and the line number it was seen. type Token struct { ID ID