diff --git a/cmd/internal/cgen/cgen.go b/cmd/internal/cgen/cgen.go index 038efc0f..bcb58aeb 100644 --- a/cmd/internal/cgen/cgen.go +++ b/cmd/internal/cgen/cgen.go @@ -226,7 +226,13 @@ func writeCtorImpls(b *bytes.Buffer, pkgName string, m *t.IDMap, n *a.Struct) er "memset(self, 0, sizeof(*self)); }\n") b.WriteString("self->magic = PUFFS_MAGIC;\n") - // TODO: set any non-zero default values. + for _, f := range n.Fields() { + f := f.Field() + if dv := f.DefaultValue(); dv != nil { + // TODO: set default values for array types. + fmt.Fprintf(b, "self->f_%s = %d;\n", f.Name().String(m), dv.ConstValue()) + } + } } // TODO: call any ctor/dtors on sub-structures. diff --git a/gen/c/gif.c b/gen/c/gif.c index 8264134d..fc361277 100644 --- a/gen/c/gif.c +++ b/gen/c/gif.c @@ -117,6 +117,7 @@ void puffs_gif_lzw_decoder_constructor(puffs_gif_lzw_decoder* self, memset(self, 0, sizeof(*self)); } self->magic = PUFFS_MAGIC; + self->f_literal_width = 8; } void puffs_gif_lzw_decoder_destructor(puffs_gif_lzw_decoder* self) { diff --git a/lang/ast/ast.go b/lang/ast/ast.go index c373fc78..3a0ca6d9 100644 --- a/lang/ast/ast.go +++ b/lang/ast/ast.go @@ -299,20 +299,23 @@ func NewVar(name t.ID, xType *TypeExpr, value *Expr) *Var { } } -// Field is a "name type" struct field: +// Field is a "name type = default_value" struct field: // - ID1: name // - LHS: +// - RHS: type Field Node -func (n *Field) Node() *Node { return (*Node)(n) } -func (n *Field) Name() t.ID { return n.id1 } -func (n *Field) XType() *TypeExpr { return n.lhs.TypeExpr() } +func (n *Field) Node() *Node { return (*Node)(n) } +func (n *Field) Name() t.ID { return n.id1 } +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) *Field { +func NewField(name t.ID, xType *TypeExpr, defaultValue *Expr) *Field { return &Field{ kind: KField, id1: name, lhs: xType.Node(), + rhs: defaultValue.Node(), } } diff --git a/lang/check/bounds.go b/lang/check/bounds.go index 5b771c29..b5456383 100644 --- a/lang/check/bounds.go +++ b/lang/check/bounds.go @@ -80,6 +80,27 @@ func invert(m *t.IDMap, n *a.Expr) (*a.Expr, error) { return o, nil } +func bcheckField(idMap *t.IDMap, n *a.Field) error { + x := n.XType() + for ; x.Inner() != nil; x = x.Inner() { + } + dv, min, max := zero, zero, zero + if o := n.DefaultValue(); o != nil { + dv = o.ConstValue() + } + if o := x.Min(); o != nil { + min = o.ConstValue() + } + if o := x.Max(); o != nil { + max = o.ConstValue() + } + if dv.Cmp(min) < 0 || dv.Cmp(max) > 0 { + return fmt.Errorf("check: default value %v is not within bounds [%v..%v] for field %q", + dv, min, max, n.Name().String(idMap)) + } + return nil +} + func (q *checker) bcheckStatement(n *a.Node) error { q.errFilename, q.errLine = n.Raw().FilenameLine() diff --git a/lang/check/check.go b/lang/check/check.go index 3c9b3f67..f6b471b7 100644 --- a/lang/check/check.go +++ b/lang/check/check.go @@ -144,7 +144,7 @@ func (c *Checker) checkUse(node *a.Node) error { return nil } -func (c *Checker) checkFields(fields []*a.Node) error { +func (c *Checker) checkFields(fields []*a.Node, banPtrTypes bool) error { if len(fields) == 0 { return nil } @@ -162,18 +162,39 @@ func (c *Checker) checkFields(fields []*a.Node) error { if err := q.tcheckTypeExpr(f.XType(), 0); err != nil { return fmt.Errorf("%v in field %q", err, c.idMap.ByID(f.Name())) } + if banPtrTypes { + for x := f.XType(); x.Inner() != nil; x = x.Inner() { + if x.PackageOrDecorator().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.idMap), c.idMap.ByID(f.Name())) + } + } + } + if dv := f.DefaultValue(); dv != nil { + if f.XType().PackageOrDecorator() != 0 { + return fmt.Errorf("check: cannot set default value for qualified type %q for field %q", + f.XType().String(c.idMap), c.idMap.ByID(f.Name())) + } + if err := q.tcheckExpr(dv, 0); err != nil { + return err + } + } + if c.flags&FlagsOnlyTypeCheck == 0 { + if err := bcheckField(c.idMap, f); err != nil { + return err + } + } fieldNames[f.Name()] = true f.Node().SetTypeChecked() } - // TODO: bounds checking. - return nil } func (c *Checker) checkStruct(node *a.Node) error { n := node.Struct() - if err := c.checkFields(n.Fields()); err != nil { + if err := c.checkFields(n.Fields(), true); err != nil { return &Error{ Err: fmt.Errorf("%v in struct %q", err, c.idMap.ByID(n.Name())), Filename: n.Filename(), @@ -200,7 +221,7 @@ func (c *Checker) checkStruct(node *a.Node) error { func (c *Checker) checkFuncSignature(node *a.Node) error { n := node.Func() - if err := c.checkFields(n.In().Fields()); err != nil { + if err := c.checkFields(n.In().Fields(), false); err != nil { return &Error{ Err: fmt.Errorf("%v in in-params for func %q", err, c.idMap.ByID(n.Name())), Filename: n.Filename(), @@ -208,7 +229,7 @@ func (c *Checker) checkFuncSignature(node *a.Node) error { } } n.In().Node().SetTypeChecked() - if err := c.checkFields(n.Out().Fields()); err != nil { + if err := c.checkFields(n.Out().Fields(), false); err != nil { return &Error{ Err: fmt.Errorf("%v in out-params for func %q", err, c.idMap.ByID(n.Name())), Filename: n.Filename(), diff --git a/lang/parse/parse.go b/lang/parse/parse.go index 039bd972..1279eff4 100644 --- a/lang/parse/parse.go +++ b/lang/parse/parse.go @@ -258,7 +258,15 @@ func (p *parser) parseFieldNode() (*a.Node, error) { if err != nil { return nil, err } - return a.NewField(name, typ).Node(), nil + defaultValue := (*a.Expr)(nil) + if p.peek1().Key() == t.KeyEq { + p.src = p.src[1:] + defaultValue, err = p.parseExpr() + if err != nil { + return nil, err + } + } + return a.NewField(name, typ, defaultValue).Node(), nil } func (p *parser) parseTypeExpr() (*a.TypeExpr, error) { diff --git a/std/gif/decode_lzw.puffs b/std/gif/decode_lzw.puffs index ab38e68a..bb82a820 100644 --- a/std/gif/decode_lzw.puffs +++ b/std/gif/decode_lzw.puffs @@ -1,8 +1,7 @@ use "std/io" pub struct lzw_decoder?( - // TODO: default values?? - literal_width u32[2..8], + literal_width u32[2..8] = 8, stack[4096] u8, suffixes[4096] u8, prefixes[4096] u16, diff --git a/test/c/gif/basic.c b/test/c/gif/basic.c index 18aacb50..164ebd7b 100644 --- a/test/c/gif/basic.c +++ b/test/c/gif/basic.c @@ -54,9 +54,9 @@ void test_puffs_version_good() { PUFFS_MAGIC); goto cleanup0; } - if (dec.f_literal_width != 0) { + if (dec.f_literal_width != 8) { FAIL("test_puffs_version_good: f_literal_width: got %u, want %u", - dec.f_literal_width, 0); + dec.f_literal_width, 8); goto cleanup0; } cleanup0: