Remove struct field initial values

This commit is contained in:
Nigel Tao committed 2018-05-29 10:56:47 +10:00
1 parent 0e498cb86d
commit 7d3662ee40
6 files changed
+18 -60

No files matched your search

-8
View File
@@ -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()
+2 -5
View File
@@ -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: <TypeExpr>
// - RHS: <nil|Expr>
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(),
}
}
-24
View File
@@ -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 {
+14 -13
View File
@@ -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(),
+1 -9
View File
@@ -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) {
+1 -1
View File
@@ -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
}