Refactor cgen of question-calls

This commit is contained in:
Nigel Tao committed 2018-12-02 10:20:43 +11:00
1 parent b162747934
commit d256df0fe3
2 files changed
+15 -22

No files matched your search

+1 -1
View File
@@ -487,7 +487,7 @@ func (g *gen) writeArgs(b *buffer, args []*a.Node, depth uint32) error {
return nil
}
func (g *gen) writeBuiltinCallSuspendibles(b *buffer, n *a.Expr, depth uint32) error {
func (g *gen) writeBuiltinQuestionCall(b *buffer, n *a.Expr, depth uint32) error {
// TODO: also handle (or reject??) t.IDTry.
if n.Operator() != t.IDOpenParen {
return errNoSuchBuiltin
+14 -21
View File
@@ -102,12 +102,7 @@ func (g *gen) writeStatementAssign(b *buffer,
op t.ID, rhsExpr *a.Expr, depth uint32) error {
if rhsExpr != nil && rhsExpr.Effect().Coroutine() {
if op != t.IDEqQuestion {
if err := g.writeCoroSuspPoint(b, false); err != nil {
return err
}
}
if err := g.writeCallSuspendibles(b, rhsExpr, depth, op == t.IDEqQuestion); err != nil {
if err := g.writeQuestionCall(b, rhsExpr, depth, op == t.IDEqQuestion); err != nil {
return err
}
}
@@ -189,8 +184,10 @@ func (g *gen) writeStatementExpr(b *buffer, n *a.Expr, depth uint32) error {
}
}
if err := g.writeSuspendibles(b, n, depth); err != nil {
return err
if n.Effect().Coroutine() {
if err := g.writeQuestionCall(b, n, depth, false); err != nil {
return err
}
}
checkStatus := false
@@ -484,27 +481,23 @@ func (g *gen) writeCoroSuspPoint(b *buffer, maybeSuspend bool) error {
return nil
}
func (g *gen) writeSuspendibles(b *buffer, n *a.Expr, depth uint32) error {
if !n.Effect().Coroutine() {
return nil
}
if err := g.writeCoroSuspPoint(b, false); err != nil {
return err
}
return g.writeCallSuspendibles(b, n, depth, false)
}
func (g *gen) writeCallSuspendibles(b *buffer, n *a.Expr, depth uint32, eqQuestion bool) error {
func (g *gen) writeQuestionCall(b *buffer, n *a.Expr, depth uint32, eqQuestion bool) error {
if depth > a.MaxExprDepth {
return fmt.Errorf("expression recursion depth too large")
}
depth++
if err := g.writeSaveExprDerivedVars(b, n); err != nil {
if !eqQuestion && n.Effect().Coroutine() {
if err := g.writeCoroSuspPoint(b, false); err != nil {
return err
}
}
if err := g.writeBuiltinQuestionCall(b, n, depth); err != errNoSuchBuiltin {
return err
}
if err := g.writeBuiltinCallSuspendibles(b, n, depth); err != errNoSuchBuiltin {
if err := g.writeSaveExprDerivedVars(b, n); err != nil {
return err
}