From 7d3662ee4074a2d5cbcfaf78f57c5d3fbcc953f9 Mon Sep 17 00:00:00 2001 From: Nigel Tao Date: Tue, 29 May 2018 10:56:47 +1000 Subject: [PATCH] Remove struct field initial values --- cmd/wuffs-c/internal/cgen/cgen.go | 8 -------- lang/ast/ast.go | 7 ++----- lang/check/bounds.go | 24 ------------------------ lang/check/check.go | 27 ++++++++++++++------------- lang/parse/parse.go | 10 +--------- std/gif/decode_lzw.wuffs | 2 +- 6 files changed, 18 insertions(+), 60 deletions(-) diff --git a/cmd/wuffs-c/internal/cgen/cgen.go b/cmd/wuffs-c/internal/cgen/cgen.go index 088e733d..50cb33fb 100644 --- a/cmd/wuffs-c/internal/cgen/cgen.go +++ b/cmd/wuffs-c/internal/cgen/cgen.go @@ -701,14 +701,6 @@ func (g *gen) writeInitializerImpl(b *buffer, n *a.Struct) error { "memset(self, 0, sizeof(*self)); }\n") b.writes("self->private_impl.magic = WUFFS_BASE__MAGIC;\n") - for _, f := range n.Fields() { - f := f.Field() - if dv := f.DefaultValue(); dv != nil { - // TODO: set default values for array types. - b.printf("self->private_impl.%s%s = %d;\n", fPrefix, f.Name().Str(g.tm), dv.ConstValue()) - } - } - // Call any ctors on sub-structs. for _, f := range n.Fields() { f := f.Field() diff --git a/lang/ast/ast.go b/lang/ast/ast.go index 8ac9a8af..fa360dcb 100644 --- a/lang/ast/ast.go +++ b/lang/ast/ast.go @@ -472,23 +472,20 @@ func NewVar(op t.ID, name t.ID, xType *TypeExpr, value *Expr) *Var { } } -// Field is a "name type = default_value" struct field: +// Field is a "name type" struct field: // - ID2: name // - LHS: -// - RHS: type Field Node func (n *Field) Node() *Node { return (*Node)(n) } func (n *Field) Name() t.ID { return n.id2 } func (n *Field) XType() *TypeExpr { return n.lhs.TypeExpr() } -func (n *Field) DefaultValue() *Expr { return n.rhs.Expr() } -func NewField(name t.ID, xType *TypeExpr, defaultValue *Expr) *Field { +func NewField(name t.ID, xType *TypeExpr) *Field { return &Field{ kind: KField, id2: name, lhs: xType.Node(), - rhs: defaultValue.Node(), } } diff --git a/lang/check/bounds.go b/lang/check/bounds.go index 3b1528e1..f7208d27 100644 --- a/lang/check/bounds.go +++ b/lang/check/bounds.go @@ -196,30 +196,6 @@ func typeBounds(tm *t.Map, typ *a.TypeExpr) (*big.Int, *big.Int, error) { return b[0], b[1], nil } -func bcheckField(tm *t.Map, n *a.Field) error { - innTyp := n.XType().Innermost() - nMin, nMax, err := typeBounds(tm, innTyp) - if err != nil { - return err - } - if nMin == nil { - if n.DefaultValue() != nil { - return fmt.Errorf("check: explicit default value %v for field %q of non-numeric innermost type %q", - n.DefaultValue().ConstValue(), n.Name().Str(tm), innTyp.Str(tm)) - } - return nil - } - dv := zero - if o := n.DefaultValue(); o != nil { - dv = o.ConstValue() - } - if dv.Cmp(nMin) < 0 || dv.Cmp(nMax) > 0 { - return fmt.Errorf("check: default value %v is not within bounds [%v..%v] for field %q", - dv, nMin, nMax, n.Name().Str(tm)) - } - return nil -} - func (q *checker) bcheckBlock(block []*a.Node) error { loop: for _, o := range block { diff --git a/lang/check/check.go b/lang/check/check.go index 50995b15..be19e5b9 100644 --- a/lang/check/check.go +++ b/lang/check/check.go @@ -420,7 +420,7 @@ func (c *Checker) checkStructCycles(_ *a.Node) error { func (c *Checker) checkStructFields(node *a.Node) error { n := node.Struct() - if err := c.checkFields(n.Fields(), true); err != nil { + if err := c.checkFields(n.Fields(), true, true); err != nil { return &Error{ Err: fmt.Errorf("%v in struct %s", err, n.QID().Str(c.tm)), Filename: n.Filename(), @@ -431,7 +431,7 @@ func (c *Checker) checkStructFields(node *a.Node) error { return nil } -func (c *Checker) checkFields(fields []*a.Node, banPtrTypes bool) error { +func (c *Checker) checkFields(fields []*a.Node, banPtrTypes bool, checkDefaultZeroValue bool) error { if len(fields) == 0 { return nil } @@ -453,18 +453,19 @@ func (c *Checker) checkFields(fields []*a.Node, banPtrTypes bool) error { return fmt.Errorf("check: pointer-containing type %q not allowed for field %q", f.XType().Str(c.tm), f.Name().Str(c.tm)) } - if dv := f.DefaultValue(); dv != nil { - if f.XType().Decorator() != 0 { - return fmt.Errorf("check: cannot set default value for type %q for field %q", - f.XType().Str(c.tm), f.Name().Str(c.tm)) - } - if err := q.tcheckExpr(dv, 0); err != nil { + + if checkDefaultZeroValue { + innTyp := f.XType().Innermost() + fMin, fMax, err := typeBounds(c.tm, innTyp) + if err != nil { return err } + if (fMin != nil && zero.Cmp(fMin) < 0) || (fMax != nil && zero.Cmp(fMax) > 0) { + return fmt.Errorf("check: default zero value is not within bounds [%v..%v] for field %q", + fMin, fMax, f.Name().Str(c.tm)) + } } - if err := bcheckField(c.tm, f); err != nil { - return err - } + fieldNames[f.Name()] = true f.Node().SetMType(typeExprPlaceholder) } @@ -474,7 +475,7 @@ func (c *Checker) checkFields(fields []*a.Node, banPtrTypes bool) error { func (c *Checker) checkFuncSignature(node *a.Node) error { n := node.Func() - if err := c.checkFields(n.In().Fields(), false); err != nil { + if err := c.checkFields(n.In().Fields(), false, false); err != nil { return &Error{ Err: fmt.Errorf("%v in in-params for func %s", err, n.QQID().Str(c.tm)), Filename: n.Filename(), @@ -482,7 +483,7 @@ func (c *Checker) checkFuncSignature(node *a.Node) error { } } n.In().Node().SetMType(typeExprPlaceholder) - if err := c.checkFields(n.Out().Fields(), false); err != nil { + if err := c.checkFields(n.Out().Fields(), false, true); err != nil { return &Error{ Err: fmt.Errorf("%v in out-params for func %s", err, n.QQID().Str(c.tm)), Filename: n.Filename(), diff --git a/lang/parse/parse.go b/lang/parse/parse.go index c6d678a4..af3e21ed 100644 --- a/lang/parse/parse.go +++ b/lang/parse/parse.go @@ -357,15 +357,7 @@ func (p *parser) parseFieldNode() (*a.Node, error) { if err != nil { return nil, err } - defaultValue := (*a.Expr)(nil) - if p.peek1() == t.IDEq { - p.src = p.src[1:] - defaultValue, err = p.parseExpr() - if err != nil { - return nil, err - } - } - return a.NewField(name, typ, defaultValue).Node(), nil + return a.NewField(name, typ).Node(), nil } func (p *parser) parseTypeExpr() (*a.TypeExpr, error) { diff --git a/std/gif/decode_lzw.wuffs b/std/gif/decode_lzw.wuffs index faaf340b..ec28d7f6 100644 --- a/std/gif/decode_lzw.wuffs +++ b/std/gif/decode_lzw.wuffs @@ -24,7 +24,7 @@ pri struct lzw_decoder?( prefixes array[4096] base.u16[..4095], ) -pri func lzw_decoder.set_literal_width!(lw base.u32[2..8] = 8)() { +pri func lzw_decoder.set_literal_width!(lw base.u32[2..8])() { this.literal_width = in.lw }