Remove the !? effect, leaving only ! and !??

This commit is contained in:
Nigel Tao committed 2018-12-29 13:36:38 +11:00
1 parent d4be1fdf72
commit 1ea32b3745
7 files changed
+20 -28

No files matched your search

+6 -6
View File
@@ -87,7 +87,7 @@ func (g *gen) writeFuncSignature(b *buffer, n *a.Func, cpp uint32) error {
} }
// TODO: write n's return values. // TODO: write n's return values.
if n.Effect().Optional() { if n.Effect().Coroutine() {
b.writes("wuffs_base__status ") b.writes("wuffs_base__status ")
} else if out := n.Out(); out == nil { } else if out := n.Out(); out == nil {
b.writes("wuffs_base__empty_struct ") b.writes("wuffs_base__empty_struct ")
@@ -178,7 +178,7 @@ func (g *gen) gatherFuncImpl(_ *buffer, n *a.Func) error {
astFunc: n, astFunc: n,
cName: g.funcCName(n), cName: g.funcCName(n),
returnsStatus: n.Effect().Optional() || returnsStatus: n.Effect().Coroutine() ||
((n.Out() != nil) && n.Out().IsStatus()), ((n.Out() != nil) && n.Out().IsStatus()),
} }
@@ -258,7 +258,7 @@ func (g *gen) writeFuncImplPrologue(b *buffer) error {
} }
} }
if g.currFunk.astFunc.Effect().Optional() || if g.currFunk.astFunc.Effect().Coroutine() ||
(g.currFunk.returnsStatus && (len(g.currFunk.derivedVars) > 0)) { (g.currFunk.returnsStatus && (len(g.currFunk.derivedVars) > 0)) {
// TODO: rename the "status" variable to "ret"? // TODO: rename the "status" variable to "ret"?
b.printf("wuffs_base__status status = NULL;\n") b.printf("wuffs_base__status status = NULL;\n")
@@ -334,7 +334,7 @@ func (g *gen) writeFuncImplBodySuspend(b *buffer) error {
} }
func (g *gen) writeFuncImplEpilogue(b *buffer) error { func (g *gen) writeFuncImplEpilogue(b *buffer) error {
if g.currFunk.astFunc.Effect().Optional() || if g.currFunk.astFunc.Effect().Coroutine() ||
(g.currFunk.returnsStatus && (len(g.currFunk.derivedVars) > 0)) { (g.currFunk.returnsStatus && (len(g.currFunk.derivedVars) > 0)) {
b.writes("goto exit;exit:") // The goto avoids the "unused label" warning. b.writes("goto exit;exit:") // The goto avoids the "unused label" warning.
@@ -350,7 +350,7 @@ func (g *gen) writeFuncImplEpilogue(b *buffer) error {
b.writes("\n") b.writes("\n")
} }
if g.currFunk.astFunc.Effect().Optional() || if g.currFunk.astFunc.Effect().Coroutine() ||
(g.currFunk.returnsStatus && (len(g.currFunk.derivedVars) > 0)) { (g.currFunk.returnsStatus && (len(g.currFunk.derivedVars) > 0)) {
if g.currFunk.astFunc.Public() { if g.currFunk.astFunc.Public() {
@@ -424,7 +424,7 @@ func (g *gen) writeFuncImplArgChecks(b *buffer, n *a.Func) error {
} }
b.writes(") {") b.writes(") {")
b.writes("self->private_impl.magic = WUFFS_BASE__DISABLED;\n") b.writes("self->private_impl.magic = WUFFS_BASE__DISABLED;\n")
if g.currFunk.astFunc.Effect().Optional() { if g.currFunk.astFunc.Effect().Coroutine() {
b.writes("return wuffs_base__error__bad_argument;\n\n") b.writes("return wuffs_base__error__bad_argument;\n\n")
} else { } else {
// TODO: don't assume that the return type is empty. // TODO: don't assume that the return type is empty.
+5 -9
View File
@@ -103,7 +103,7 @@ func (g *gen) writeStatementAssign0(b *buffer, op t.ID, lhs *a.Expr, rhs *a.Expr
return false, err return false, err
} }
doWork, hack := (lhs == nil) || rhs.Effect().Optional(), false doWork, hack := (lhs == nil) || rhs.Effect().Coroutine(), false
if !doWork && (rhs.Operator() == t.IDOpenParen) && (len(g.currFunk.derivedVars) > 0) { if !doWork && (rhs.Operator() == t.IDOpenParen) && (len(g.currFunk.derivedVars) > 0) {
// TODO: tighten this heuristic for filtering out all but user-defined // TODO: tighten this heuristic for filtering out all but user-defined
// method receivers. // method receivers.
@@ -146,7 +146,7 @@ func (g *gen) writeStatementAssign0(b *buffer, op t.ID, lhs *a.Expr, rhs *a.Expr
return false, err return false, err
} }
b.writes("status = ") b.writes("status = ")
} else if rhs.Effect().Optional() { } else if rhs.Effect().Coroutine() {
b.writes("status = ") b.writes("status = ")
} }
@@ -161,12 +161,8 @@ func (g *gen) writeStatementAssign0(b *buffer, op t.ID, lhs *a.Expr, rhs *a.Expr
} }
} }
if op != t.IDEqQuestion && rhs.Effect().Optional() { if op != t.IDEqQuestion && rhs.Effect().Coroutine() {
target := "exit" b.writes("if (status) { goto suspend; }\n")
if rhs.Effect().Coroutine() {
target = "suspend"
}
b.printf("if (status) { goto %s; }\n", target)
} }
} }
@@ -397,7 +393,7 @@ func (g *gen) writeStatementJump(b *buffer, n *a.Jump, depth uint32) error {
func (g *gen) writeStatementRet(b *buffer, n *a.Ret, depth uint32) error { func (g *gen) writeStatementRet(b *buffer, n *a.Ret, depth uint32) error {
retExpr := n.Value() retExpr := n.Value()
if g.currFunk.astFunc.Effect().Optional() || if g.currFunk.astFunc.Effect().Coroutine() ||
(g.currFunk.returnsStatus && (len(g.currFunk.derivedVars) > 0)) { (g.currFunk.returnsStatus && (len(g.currFunk.derivedVars) > 0)) {
isOK := false isOK := false
+2 -6
View File
@@ -110,8 +110,7 @@ type Effect uint8
const ( const (
EffectImpure = Effect(0x01) EffectImpure = Effect(0x01)
EffectOptional = Effect(0x02) // TODO: rename to Statusful or Throws? EffectCoroutine = Effect(0x02)
EffectCoroutine = Effect(0x04)
effectMask = Effect(0xFF) effectMask = Effect(0xFF)
) )
@@ -120,7 +119,6 @@ func (e Effect) AsFlags() Flags { return Flags(e) }
func (e Effect) Pure() bool { return e == 0 } func (e Effect) Pure() bool { return e == 0 }
func (e Effect) Impure() bool { return e&EffectImpure != 0 } func (e Effect) Impure() bool { return e&EffectImpure != 0 }
func (e Effect) Optional() bool { return e&EffectOptional != 0 }
func (e Effect) Coroutine() bool { return e&EffectCoroutine != 0 } func (e Effect) Coroutine() bool { return e&EffectCoroutine != 0 }
func (e Effect) WeakerThan(o Effect) bool { return e < o } func (e Effect) WeakerThan(o Effect) bool { return e < o }
@@ -131,9 +129,7 @@ func (e Effect) String() string {
return "" return ""
case EffectImpure: case EffectImpure:
return "!" return "!"
case EffectImpure | EffectOptional: case EffectImpure | EffectCoroutine:
return "!?"
case EffectImpure | EffectOptional | EffectCoroutine:
return "!??" return "!??"
} }
return "‽INVALID_EFFECT‽" return "‽INVALID_EFFECT‽"
+1 -1
View File
@@ -298,7 +298,7 @@ func (q *checker) bcheckStatement(n *a.Node) error {
case a.KRet: case a.KRet:
n := n.AsRet() n := n.AsRet()
lTyp := q.astFunc.Out() lTyp := q.astFunc.Out()
if q.astFunc.Effect().Optional() { if q.astFunc.Effect().Coroutine() {
lTyp = typeExprStatus lTyp = typeExprStatus
} else if lTyp == nil { } else if lTyp == nil {
return fmt.Errorf("TODO: allow returning nothing") return fmt.Errorf("TODO: allow returning nothing")
+1 -1
View File
@@ -433,7 +433,7 @@ func (c *Checker) checkFuncSignature(node *a.Node) error {
} }
setPlaceholderMBoundsMType(n.In().AsNode()) setPlaceholderMBoundsMType(n.In().AsNode())
if out := n.Out(); out != nil { if out := n.Out(); out != nil {
if n.Effect().Optional() && n.Receiver()[0] != t.IDBase { if n.Effect().Coroutine() && n.Receiver()[0] != t.IDBase {
return &Error{ return &Error{
Err: fmt.Errorf("func %s has ? effect but non-empty return type", n.QQID().Str(c.tm)), Err: fmt.Errorf("func %s has ? effect but non-empty return type", n.QQID().Str(c.tm)),
Filename: n.Filename(), Filename: n.Filename(),
+2 -2
View File
@@ -170,7 +170,7 @@ func (q *checker) tcheckStatement(n *a.Node) error {
case a.KRet: case a.KRet:
n := n.AsRet() n := n.AsRet()
lTyp := q.astFunc.Out() lTyp := q.astFunc.Out()
if q.astFunc.Effect().Optional() { if q.astFunc.Effect().Coroutine() {
lTyp = typeExprStatus lTyp = typeExprStatus
} else if lTyp == nil { } else if lTyp == nil {
return fmt.Errorf("TODO: allow returning nothing") return fmt.Errorf("TODO: allow returning nothing")
@@ -545,7 +545,7 @@ func (q *checker) tcheckExprCall(n *a.Expr, depth uint32) error {
oTyp := f.Out() oTyp := f.Out()
if oTyp == nil { if oTyp == nil {
if n.Effect().Optional() { if n.Effect().Coroutine() {
n.SetMType(typeExprStatus) n.SetMType(typeExprStatus)
} else { } else {
n.SetMType(typeExprEmptyStruct) n.SetMType(typeExprEmptyStruct)
+3 -3
View File
@@ -683,7 +683,7 @@ func (p *parser) parseAssignNode() (*a.Node, error) {
} }
if op == t.IDEqQuestion { if op == t.IDEqQuestion {
if (rhs.Operator() != t.IDOpenParen) || (!rhs.Effect().Optional()) { if (rhs.Operator() != t.IDOpenParen) || (!rhs.Effect().Coroutine()) {
return nil, fmt.Errorf(`parse: expected ?-function call after "=?", got %q at %s:%d`, return nil, fmt.Errorf(`parse: expected ?-function call after "=?", got %q at %s:%d`,
rhs.Str(p.tm), p.filename, p.line()) rhs.Str(p.tm), p.filename, p.line())
} }
@@ -1170,8 +1170,8 @@ func (p *parser) parseEffect() a.Effect {
} }
p.src = p.src[1:] p.src = p.src[1:]
if p.peek1() != t.IDQuestion { if p.peek1() != t.IDQuestion {
return a.EffectImpure | a.EffectOptional panic("TODO: delete")
} }
p.src = p.src[1:] p.src = p.src[1:]
return a.EffectImpure | a.EffectOptional | a.EffectCoroutine return a.EffectImpure | a.EffectCoroutine
} }