Mirrors/miller
1
0
Fork 0
mirror of https://github.com/johnkerl/miller.git synced 2026-08-01 20:12:19 +00:00
Code Issues Projects Releases Wiki Activity

fix break-handling in miller multi-variable for-loops

Browse source
This commit is contained in:
John Kerl 2021-01-21 00:14:04 -05:00
parent 64292ec826
commit a878fff553
3 changed files with 539 additions and 524 deletions
Download patch file Download diff file Expand all files Collapse all files

0
go/reg-test/cases/case-c-dsl-break-continue.sh → go/reg-test/cases/case-dsl-break-continue.sh
View file

1040
go/reg-test/expected/case-c-dsl-break-continue.sh.out → go/reg-test/expected/case-dsl-break-continue.sh.out
View file

File diff suppressed because it is too large Load diff

23
go/src/miller/dsl/cst/for.go
View file

@ -482,7 +482,21 @@ func (this *ForLoopMultivariableNode) Execute(state *State) (*BlockExitPayload,
state.stack.PushStackFrame()
defer state.stack.PopStackFrame()
return this.executeOuter(&mlrval, this.keyVariableNames, state)
// Miller's multi-variable loops, in the Miller DSL, have a single {...}
// but are implemented in Go via multiple, recursive functions. A break
// from any of the latter is a break from all. However, at this point, the
// break has been "broken" and should not be returned to the caller.
// Return-statements should, though.
blockExitPayload, err := this.executeOuter(&mlrval, this.keyVariableNames, state)
if blockExitPayload == nil {
return nil, err
} else {
if blockExitPayload.blockExitStatus == BLOCK_EXIT_BREAK {
return nil, err
} else {
return blockExitPayload, err
}
}
}
// ----------------------------------------------------------------
@ -510,7 +524,7 @@ func (this *ForLoopMultivariableNode) executeOuter(
}
if blockExitPayload != nil {
if blockExitPayload.blockExitStatus == BLOCK_EXIT_BREAK {
break
return blockExitPayload, nil
}
// If BLOCK_EXIT_CONTINUE, keep going -- this means the body was exited
// early but we keep going at this level
@ -540,6 +554,7 @@ func (this *ForLoopMultivariableNode) executeOuter(
}
if blockExitPayload != nil {
if blockExitPayload.blockExitStatus == BLOCK_EXIT_BREAK {
return blockExitPayload, nil
break
}
// If BLOCK_EXIT_CONTINUE, keep going -- this means the body was exited
@ -593,7 +608,7 @@ func (this *ForLoopMultivariableNode) executeInner(
}
if blockExitPayload != nil {
if blockExitPayload.blockExitStatus == BLOCK_EXIT_BREAK {
break
return blockExitPayload, nil
}
// If BLOCK_EXIT_CONTINUE, keep going -- this means the body was exited
// early but we keep going at this level
@ -625,7 +640,7 @@ func (this *ForLoopMultivariableNode) executeInner(
}
if blockExitPayload != nil {
if blockExitPayload.blockExitStatus == BLOCK_EXIT_BREAK {
break
return blockExitPayload, nil
}
// If BLOCK_EXIT_CONTINUE, keep going -- this means the body was exited
// early but we keep going at this level