From 5cca9471ec86fc19a4e16880c51e5bc11df23fb6 Mon Sep 17 00:00:00 2001 From: Nigel Tao Date: Sun, 29 Jul 2018 14:01:57 +1000 Subject: [PATCH] Have cgen look for !?? methods not ? methods --- cmd/wuffs-c/internal/cgen/cgen.go | 3 +-- cmd/wuffs-c/internal/cgen/expr.go | 3 +-- cmd/wuffs-c/internal/cgen/func.go | 5 ++--- cmd/wuffs-c/internal/cgen/statement.go | 18 ++++++------------ 4 files changed, 10 insertions(+), 19 deletions(-) diff --git a/cmd/wuffs-c/internal/cgen/cgen.go b/cmd/wuffs-c/internal/cgen/cgen.go index 9e4a23ec..868849c0 100644 --- a/cmd/wuffs-c/internal/cgen/cgen.go +++ b/cmd/wuffs-c/internal/cgen/cgen.go @@ -669,8 +669,7 @@ func (g *gen) writeStruct(b *buffer, n *a.Struct) error { continue } o := tld.AsFunc() - // XXX: s/Optional/Coroutine/ - if o.Receiver() != n.QID() || !o.Effect().Optional() { + if o.Receiver() != n.QID() || !o.Effect().Coroutine() { continue } k := g.funks[o.QQID()] diff --git a/cmd/wuffs-c/internal/cgen/expr.go b/cmd/wuffs-c/internal/cgen/expr.go index e5a82975..6d40d583 100644 --- a/cmd/wuffs-c/internal/cgen/expr.go +++ b/cmd/wuffs-c/internal/cgen/expr.go @@ -30,8 +30,7 @@ func (g *gen) writeExpr(b *buffer, n *a.Expr, rp replacementPolicy, depth uint32 } depth++ - // XXX: s/Optional/Coroutine/ - if rp == replaceCallSuspendibles && n.Effect().RootCause() && n.Effect().Optional() { + if rp == replaceCallSuspendibles && n.Effect().RootCause() && n.Effect().Coroutine() { if g.currFunk.tempR >= g.currFunk.tempW { return fmt.Errorf("internal error: temporary variable count out of sync") } diff --git a/cmd/wuffs-c/internal/cgen/func.go b/cmd/wuffs-c/internal/cgen/func.go index 00aae75a..dada429f 100644 --- a/cmd/wuffs-c/internal/cgen/func.go +++ b/cmd/wuffs-c/internal/cgen/func.go @@ -86,8 +86,7 @@ func (g *gen) writeFuncSignature(b *buffer, n *a.Func, cpp uint32) error { } // TODO: write n's return values. - // XXX: s/Optional/Coroutine/ - if n.Effect().Optional() { + if n.Effect().Coroutine() { b.writes("wuffs_base__status ") } else if out := n.Out(); out == nil { // TODO: wuffs_base__empty_struct. @@ -175,7 +174,7 @@ func (g *gen) gatherFuncImpl(_ *buffer, n *a.Func) error { astFunc: n, cName: g.funcCName(n), public: n.Public(), - suspendible: n.Effect().Optional(), // XXX: s/Optional/Coroutine/ + suspendible: n.Effect().Coroutine(), } if err := g.writeFuncImplHeader(&g.currFunk.bHeader); err != nil { diff --git a/cmd/wuffs-c/internal/cgen/statement.go b/cmd/wuffs-c/internal/cgen/statement.go index 2c86bc4d..3923e750 100644 --- a/cmd/wuffs-c/internal/cgen/statement.go +++ b/cmd/wuffs-c/internal/cgen/statement.go @@ -43,12 +43,10 @@ func (g *gen) writeStatement(b *buffer, n *a.Node, depth uint32) error { switch n.Kind() { case a.KAssign: n := n.AsAssign() - // XXX: s/Optional/Coroutine/ - mightIntroduceTemporaries = n.LHS().Effect().Optional() || n.RHS().Effect().Optional() + mightIntroduceTemporaries = n.LHS().Effect().Coroutine() || n.RHS().Effect().Coroutine() case a.KVar: v := n.AsVar().Value() - // XXX: s/Optional/Coroutine/ - mightIntroduceTemporaries = v != nil && v.Effect().Optional() + mightIntroduceTemporaries = v != nil && v.Effect().Coroutine() } if mightIntroduceTemporaries { // Put n's code into its own block, to restrict the scope of the @@ -141,8 +139,7 @@ func (g *gen) writeStatementExpr(b *buffer, n *a.Expr, depth uint32) error { if err := g.writeSuspendibles(b, n, depth); err != nil { return err } - // XXX: s/Optional/Coroutine/ - if n.Effect().RootCause() && n.Effect().Optional() { + if n.Effect().RootCause() && n.Effect().Coroutine() { return nil } if err := g.writeExpr(b, n, replaceCallSuspendibles, depth); err != nil { @@ -222,8 +219,7 @@ func (g *gen) writeStatementIf(b *buffer, n *a.If, depth uint32) error { nCloseCurly := 1 for first := true; ; first = false { // TODO: restrict the if condition to effect-free expressions? - // XXX: s/Optional/Coroutine/ - if n.Condition().Effect().Optional() { + if n.Condition().Effect().Coroutine() { if !first { b.writeb('{') const maxCloseCurly = 1000 @@ -487,8 +483,7 @@ func (g *gen) writeCoroSuspPoint(b *buffer, maybeSuspend bool) error { } func (g *gen) writeSuspendibles(b *buffer, n *a.Expr, depth uint32) error { - // XXX: s/Optional/Coroutine/ - if !n.Effect().Optional() { + if !n.Effect().Coroutine() { return nil } if n.Operator() != t.IDTry { @@ -507,8 +502,7 @@ func (g *gen) writeCallSuspendibles(b *buffer, n *a.Expr, depth uint32) error { // The evaluation order for suspendible calls (which can have side effects) // is important here: LHS, MHS, RHS, Args and finally the node itself. - // XXX: s/Optional/Coroutine/ - if e := n.Effect(); !e.RootCause() || !e.Optional() { + if e := n.Effect(); !e.RootCause() || !e.Coroutine() { for _, o := range n.AsNode().AsRaw().SubNodes() { if o != nil && o.Kind() == a.KExpr { if err := g.writeCallSuspendibles(b, o.AsExpr(), depth); err != nil {