From 22ccb0c370cf2690f1b1a80fe003e05c6ba5e5ed Mon Sep 17 00:00:00 2001 From: Charlie Stanton Date: Thu, 2 May 2024 21:34:53 +0100 Subject: Fix FullMerge command so it can work on non-structure values --- main/command.go | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'main/command.go') diff --git a/main/command.go b/main/command.go index e795333..bbbb036 100644 --- a/main/command.go +++ b/main/command.go @@ -143,10 +143,14 @@ type FullMergeCommand struct { } func (cmd FullMergeCommand) exec(state *ProgramState) { _, notOk := runSubex(cmd.subex, state.value) - if notOk || state.end { + if notOk { state.pc++ return } + if !state.start { + state.pc += 2 + return + } for { item, err := state.Read() -- cgit v1.2.3