From 0dd7aaf56cfc3b4d652882385279038de21bd27f Mon Sep 17 00:00:00 2001 From: Nigel Tao Date: Thu, 28 Sep 2017 11:48:27 +1000 Subject: [PATCH] Tighten struct field restrictions re pointers. --- lang/check/check.go | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/lang/check/check.go b/lang/check/check.go index dbade953..47e2404d 100644 --- a/lang/check/check.go +++ b/lang/check/check.go @@ -382,14 +382,9 @@ func (c *Checker) checkFields(fields []*a.Node, banPtrTypes bool) error { if err := q.tcheckTypeExpr(f.XType(), 0); err != nil { return fmt.Errorf("%v in field %q", err, f.Name().String(c.tm)) } - if banPtrTypes { - for x := f.XType(); x.Inner() != nil; x = x.Inner() { - if x.Decorator().Key() == t.KeyPtr { - // TODO: implement nptr (nullable pointer) types. - return fmt.Errorf("check: ptr type %q not allowed for field %q; use nptr instead", - x.String(c.tm), f.Name().String(c.tm)) - } - } + if banPtrTypes && f.XType().HasPointers() { + return fmt.Errorf("check: pointer-containing type %q not allowed for field %q", + f.XType().String(c.tm), f.Name().String(c.tm)) } if dv := f.DefaultValue(); dv != nil { if f.XType().Decorator() != 0 {