From 8a9d6ef5970eea2a42ff9eb537f2a3f5e56aec2c Mon Sep 17 00:00:00 2001 From: Charlie Stanton Date: Wed, 19 Apr 2023 16:54:53 +0100 Subject: Upgrades the substitute command to also act as a filter Substitute now captures the command after it and only runs it if the substitution is a success --- main/parse.go | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) (limited to 'main/parse.go') diff --git a/main/parse.go b/main/parse.go index bf2f0ac..aed87cc 100644 --- a/main/parse.go +++ b/main/parse.go @@ -234,7 +234,18 @@ func (p *parser) parseBasicCommand(commandChar rune) Command { return AppendNextCommand{} case 's': subex := p.parseSubex() - return SubstituteCommand {subex: subex} + var next Command + token := p.peek() + switch token.typ { + case TokenEOF, TokenRBrace: + next = NoopCommand{} + default: + next = p.parseCommand() + } + return SubstituteCommand { + subex: subex, + next: next, + } case 'i': items := p.parseLiterals() return PrintLiteralsCommand {items: items} -- cgit v1.2.3