Replace "= try foo" with "=? foo"

This commit is contained in:
Nigel Tao committed 2018-12-01 13:11:47 +11:00
1 parent ad9851ea75
commit 9741eada02
14 files changed
+75 -82

No files matched your search

-2
View File
@@ -303,8 +303,6 @@ func (h *resumabilityHelper) doExpr1(r resumabilities, n *a.Expr, sef subExprFil
switch n.Operator() {
case t.IDOpenParen:
r.raiseNoneToWeak()
case t.IDTry:
// No-op.
default:
return fmt.Errorf("unrecognized ast.Expr coroutine operator")
}
+17 -12
View File
@@ -402,11 +402,18 @@ func (g *gen) writeStatementRet(b *buffer, n *a.Ret, depth uint32) error {
}
func (g *gen) writeStatementVar(b *buffer, n *a.Var, depth uint32) error {
if v := n.Value(); v != nil {
if err := g.writeSuspendibles(b, v, depth); err != nil {
if v := n.Value(); v != nil && v.Effect().Coroutine() {
eqQuestion := n.Operator() == t.IDEqQuestion
if !eqQuestion {
if err := g.writeCoroSuspPoint(b, false); err != nil {
return err
}
}
if err := g.writeCallSuspendibles(b, v, depth, eqQuestion); err != nil {
return err
}
}
if nTyp := n.XType(); nTyp.IsArrayType() {
if n.Value() != nil {
// TODO: something like:
@@ -512,15 +519,13 @@ func (g *gen) writeSuspendibles(b *buffer, n *a.Expr, depth uint32) error {
if !n.Effect().Coroutine() {
return nil
}
if n.Operator() != t.IDTry {
if err := g.writeCoroSuspPoint(b, false); err != nil {
return err
}
if err := g.writeCoroSuspPoint(b, false); err != nil {
return err
}
return g.writeCallSuspendibles(b, n, depth)
return g.writeCallSuspendibles(b, n, depth, false)
}
func (g *gen) writeCallSuspendibles(b *buffer, n *a.Expr, depth uint32) error {
func (g *gen) writeCallSuspendibles(b *buffer, n *a.Expr, depth uint32, eqQuestion bool) error {
if depth > a.MaxExprDepth {
return fmt.Errorf("expression recursion depth too large")
}
@@ -531,14 +536,14 @@ func (g *gen) writeCallSuspendibles(b *buffer, n *a.Expr, depth uint32) error {
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 {
if err := g.writeCallSuspendibles(b, o.AsExpr(), depth, false); err != nil {
return err
}
}
}
for _, o := range n.Args() {
if o != nil && o.Kind() == a.KExpr {
if err := g.writeCallSuspendibles(b, o.AsExpr(), depth); err != nil {
if err := g.writeCallSuspendibles(b, o.AsExpr(), depth, false); err != nil {
return err
}
}
@@ -554,7 +559,7 @@ func (g *gen) writeCallSuspendibles(b *buffer, n *a.Expr, depth uint32) error {
return err
}
if n.Operator() == t.IDTry {
if eqQuestion {
if g.currFunk.tempW > maxTemp {
return fmt.Errorf("too many temporary variables required")
}
@@ -575,7 +580,7 @@ func (g *gen) writeCallSuspendibles(b *buffer, n *a.Expr, depth uint32) error {
return err
}
if n.Operator() != t.IDTry {
if !eqQuestion {
b.writes("if (status) { goto suspend; }\n")
}
return nil
+2 -2
View File
@@ -180,7 +180,7 @@ func (g *gen) writeLoadExprDerivedVars(b *buffer, n *a.Expr) error {
if g.currFunk.derivedVars == nil {
return nil
}
if k := n.Operator(); k != t.IDOpenParen && k != t.IDTry {
if n.Operator() != t.IDOpenParen {
return nil
}
for _, o := range n.Args() {
@@ -205,7 +205,7 @@ func (g *gen) writeSaveExprDerivedVars(b *buffer, n *a.Expr) error {
if g.currFunk.derivedVars == nil {
return nil
}
if k := n.Operator(); k != t.IDOpenParen && k != t.IDTry {
if n.Operator() != t.IDOpenParen {
return nil
}
for _, o := range n.Args() {