From 1af543866c820b7ff6c3fec7a8a67d95744e03d4 Mon Sep 17 00:00:00 2001 From: Nigel Tao Date: Sun, 13 Jan 2019 11:41:58 +1100 Subject: [PATCH] Add an implicit coroutine_resumed variable --- cmd/wuffs-c/internal/cgen/expr.go | 9 +++++++++ doc/changelog.md | 1 + lang/check/check.go | 3 ++- lang/token/list.go | 12 +++++++----- 4 files changed, 19 insertions(+), 6 deletions(-) diff --git a/cmd/wuffs-c/internal/cgen/expr.go b/cmd/wuffs-c/internal/cgen/expr.go index 4126dad9..a71ca4b8 100644 --- a/cmd/wuffs-c/internal/cgen/expr.go +++ b/cmd/wuffs-c/internal/cgen/expr.go @@ -59,6 +59,15 @@ func (g *gen) writeExprOther(b *buffer, n *a.Expr, depth uint32) error { if ident := n.Ident(); ident == t.IDThis { b.writes("self") + } else if ident == t.IDCoroutineResumed { + if g.currFunk.astFunc.Effect().Coroutine() { + // TODO: don't hard-code [0], and allow recursive coroutines. + b.printf("(self->private_impl.%s%s[0].coro_susp_point != 0)", + cPrefix, g.currFunk.astFunc.FuncName().Str(g.tm)) + } else { + b.writes("false") + } + } else if ident.IsStrLiteral(g.tm) { if z := g.statusMap[n.StatusQID()]; z.cName != "" { b.writes(z.cName) diff --git a/doc/changelog.md b/doc/changelog.md index 2b1922f3..24b0fee6 100644 --- a/doc/changelog.md +++ b/doc/changelog.md @@ -15,6 +15,7 @@ - Dropped the `= RHS` out of `var x T = RHS`. - Changed func out-type from struct to bare type. - Renamed the implicit `in` variable to `args`. +- Added an implicit `coroutine_resumed` variable. - Added `std/adler32`, `std/crc32` and `std/gzip`. - Spun `std/lzw` out of `std/gif`. - Spun `std/zlib` out of `std/flate`. diff --git a/lang/check/check.go b/lang/check/check.go index f82c7499..698b2528 100644 --- a/lang/check/check.go +++ b/lang/check/check.go @@ -484,7 +484,8 @@ func (c *Checker) checkFuncSignature(node *a.Node) error { inTyp.AsNode().SetMType(typeExprTypeExpr) localVars := typeMap{ - t.IDArgs: inTyp, + t.IDArgs: inTyp, + t.IDCoroutineResumed: typeExprBool, } if qqid[1] != 0 { if _, ok := c.structs[t.QID{qqid[0], qqid[1]}]; !ok { diff --git a/lang/token/list.go b/lang/token/list.go index 9cf7ea9b..0dd118cf 100644 --- a/lang/token/list.go +++ b/lang/token/list.go @@ -400,7 +400,7 @@ const ( const ( minBuiltInIdent = 0x100 minCannotAssignTo = 0x100 - maxCannotAssignTo = 0x101 + maxCannotAssignTo = 0x102 minNumTypeOrIdeal = 0x10F minNumType = 0x110 maxNumType = 0x117 @@ -409,8 +409,9 @@ const ( // -------- 0x100 block. - IDArgs = ID(0x100) - IDThis = ID(0x101) + IDArgs = ID(0x100) + IDCoroutineResumed = ID(0x101) + IDThis = ID(0x102) IDT1 = ID(0x108) IDT2 = ID(0x109) @@ -717,8 +718,9 @@ var builtInsByID = [nBuiltInIDs]string{ // -------- 0x100 block. - IDArgs: "args", - IDThis: "this", + IDArgs: "args", + IDCoroutineResumed: "coroutine_resumed", + IDThis: "this", // Some of the next few IDs are never returned by the tokenizer, as it // rejects non-ASCII input. The string representations "¶", "ℤ" etc. are