Merge pull request #113 from hinshun/group-drop-err

coryb · web-flow · commit 37aeaaea6719 · 2020-04-20T14:14:13.000-07:00
Fix group blocks from dropping errors
diff --git a/codegen/codegen.go b/codegen/codegen.go
@@ -366,7 +366,7 @@ func (cg *CodeGen) EmitStringBlock(ctx context.Context, scope *parser.Scope, stm
 
 func (cg *CodeGen) EmitGroupBlock(ctx context.Context, scope *parser.Scope, stmts []*parser.Stmt, ac aliasCallback, chainStart interface{}) (solver.Request, error) {
 	v, err := cg.EmitBlock(ctx, scope, parser.Group, stmts, ac, chainStart)
-	if v == nil {
+	if err != nil {
 		return nil, err
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -366,7 +366,7 @@ func (cg CodeGen) EmitStringBlock(ctx context.Context, scope parser.Scope, stm`
`366`	`366`
`367`	`367`	`func (cg CodeGen) EmitGroupBlock(ctx context.Context, scope parser.Scope, stmts []*parser.Stmt, ac aliasCallback, chainStart interface{}) (solver.Request, error) {`
`368`	`368`	`v, err := cg.EmitBlock(ctx, scope, parser.Group, stmts, ac, chainStart)`
`369`		`- if v == nil {`
	`369`	`+ if err != nil {`
`370`	`370`	`return nil, err`
`371`	`371`	`}`
`372`	`372`