Change output subex internals to allow structures

Also add substitute register syntactic sugar

1 files changed, 144 insertions, 0 deletions

diff --git a/main/command.go b/main/command.go
index 1d089ee..3f22821 100644
--- a/main/command.go
+++ b/main/command.go
@@ -84,6 +84,54 @@ func (cmd SubstituteValueCommand) String() string {
 	return "s/.../"
 }
 
+type IsStartCommand struct {}
+func (cmd IsStartCommand) exec(state *ProgramState) {
+	if state.start {
+		state.pc += 2
+	} else {
+		state.pc += 1
+	}
+}
+func (cmd IsStartCommand) String() string {
+	return "a"
+}
+
+type IsPrevStartCommand struct {}
+func (cmd IsPrevStartCommand) exec(state *ProgramState) {
+	if state.prevStart {
+		state.pc += 2
+	} else {
+		state.pc += 1
+	}
+}
+func (cmd IsPrevStartCommand) String() string {
+	return "A"
+}
+
+type IsEndCommand struct {}
+func (cmd IsEndCommand) exec(state *ProgramState) {
+	if state.end {
+		state.pc += 2
+	} else {
+		state.pc += 1
+	}
+}
+func (cmd IsEndCommand) String() string {
+	return "e"
+}
+
+type IsNextEndCommand struct {}
+func (cmd IsNextEndCommand) exec(state *ProgramState) {
+	if state.nextEnd {
+		state.pc += 2
+	} else {
+		state.pc += 1
+	}
+}
+func (cmd IsNextEndCommand) String() string {
+	return "E"
+}
+
 type NoopCommand struct {}
 func (cmd NoopCommand) exec(state *ProgramState) {
 	state.pc++
@@ -112,6 +160,38 @@ func (cmd AppendXRegCommand) String() string {
 	return "X"
 }
 
+type SubstituteToXRegCommand struct {
+	subex subex.Transducer
+}
+func (cmd SubstituteToXRegCommand) exec(state *ProgramState) {
+	newValue, err := runSubex(cmd.subex, state.value)
+	if err {
+		state.pc++
+	} else {
+		state.pc += 2
+		state.xreg = newValue
+	}
+}
+func (cmd SubstituteToXRegCommand) String() string {
+	return "x/.../"
+}
+
+type SubstituteAppendXRegCommand struct {
+	subex subex.Transducer
+}
+func (cmd SubstituteAppendXRegCommand) exec(state *ProgramState) {
+	newValue, err := runSubex(cmd.subex, state.value)
+	if err {
+		state.pc++
+	} else {
+		state.pc += 2
+		state.xreg = append(state.xreg, newValue...)
+	}
+}
+func (cmd SubstituteAppendXRegCommand) String() string {
+	return "X/.../"
+}
+
 type SwapYRegCommand struct {}
 func (cmd SwapYRegCommand) exec(state *ProgramState) {
 	v := state.value
@@ -132,6 +212,38 @@ func (cmd AppendYRegCommand) String() string {
 	return "Y"
 }
 
+type SubstituteToYRegCommand struct {
+	subex subex.Transducer
+}
+func (cmd SubstituteToYRegCommand) exec(state *ProgramState) {
+	newValue, err := runSubex(cmd.subex, state.value)
+	if err {
+		state.pc++
+	} else {
+		state.pc += 2
+		state.yreg = newValue
+	}
+}
+func (cmd SubstituteToYRegCommand) String() string {
+	return "y/.../"
+}
+
+type SubstituteAppendYRegCommand struct {
+	subex subex.Transducer
+}
+func (cmd SubstituteAppendYRegCommand) exec(state *ProgramState) {
+	newValue, err := runSubex(cmd.subex, state.value)
+	if err {
+		state.pc++
+	} else {
+		state.pc += 2
+		state.yreg = append(state.xreg, newValue...)
+	}
+}
+func (cmd SubstituteAppendYRegCommand) String() string {
+	return "Y/.../"
+}
+
 type SwapZRegCommand struct {}
 func (cmd SwapZRegCommand) exec(state *ProgramState) {
 	v := state.value
@@ -152,6 +264,38 @@ func (cmd AppendZRegCommand) String() string {
 	return "Z"
 }
 
+type SubstituteToZRegCommand struct {
+	subex subex.Transducer
+}
+func (cmd SubstituteToZRegCommand) exec(state *ProgramState) {
+	newValue, err := runSubex(cmd.subex, state.value)
+	if err {
+		state.pc++
+	} else {
+		state.pc += 2
+		state.zreg = newValue
+	}
+}
+func (cmd SubstituteToZRegCommand) String() string {
+	return "z/.../"
+}
+
+type SubstituteAppendZRegCommand struct {
+	subex subex.Transducer
+}
+func (cmd SubstituteAppendZRegCommand) exec(state *ProgramState) {
+	newValue, err := runSubex(cmd.subex, state.value)
+	if err {
+		state.pc++
+	} else {
+		state.pc += 2
+		state.zreg = append(state.xreg, newValue...)
+	}
+}
+func (cmd SubstituteAppendZRegCommand) String() string {
+	return "Z/.../"
+}
+
 type JumpCommand struct {
 	destination int
 }