From 911977228d25a5c742ed5b8452e3198401cbc474 Mon Sep 17 00:00:00 2001 From: Nigel Tao Date: Sat, 31 Mar 2018 15:51:15 +1100 Subject: [PATCH] Allow expr's, not just literals, as const RHS's This allows "1 << 10", not just "1024", in "pri const k u32 = 1 << 10". Fixes #6 --- cmd/wuffs-c/internal/cgen/cgen.go | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/cmd/wuffs-c/internal/cgen/cgen.go b/cmd/wuffs-c/internal/cgen/cgen.go index 4c0e6aae..0fee3aaf 100644 --- a/cmd/wuffs-c/internal/cgen/cgen.go +++ b/cmd/wuffs-c/internal/cgen/cgen.go @@ -508,10 +508,7 @@ func (g *gen) writeConst(b *buffer, n *a.Const) error { } func (g *gen) writeConstList(b *buffer, n *a.Expr) error { - switch n.Operator().Key() { - case 0: - b.writes(n.ConstValue().String()) - case t.KeyDollar: + if n.Operator().Key() == t.KeyDollar { b.writeb('{') for _, o := range n.Args() { if err := g.writeConstList(b, o.Expr()); err != nil { @@ -520,7 +517,9 @@ func (g *gen) writeConstList(b *buffer, n *a.Expr) error { b.writeb(',') } b.writeb('}') - default: + } else if cv := n.ConstValue(); cv != nil { + b.writes(cv.String()) + } else { return fmt.Errorf("invalid const value %q", n.Str(g.tm)) } return nil