2 files changed, 38 insertions, 49 deletions

diff --git a/main/command.go b/main/command.go
index a0ac35e..c7b1aa9 100644
--- a/main/command.go
+++ b/main/command.go
@@ -16,16 +16,7 @@ func (cmd PrintValueCommand) exec(state *ProgramState) {
 		panic("Tried to convert invalid atoms to values")
 	}
 	path := walk.PathFromWalkValues(pathValues)
-	values, err := walk.Compound(state.value)
-	if err != nil {
-		panic("Tried to convert invalid atoms to values")
-	}
-	for _, value := range values {
-		state.out <- walk.WalkItem {
-			Value: value,
-			Path: path,
-		}
-	}
+	state.out.Print(path, state.value)
 }
 
 type SequenceCommand struct {
@@ -39,16 +30,22 @@ func (cmd SequenceCommand) exec(state *ProgramState) {
 
 type NextCommand struct {}
 func (cmd NextCommand) exec(state *ProgramState) {
-	nextItem := <- state.in
-	state.value = walk.Atomise([]walk.WalkValue{nextItem.Value})
-	state.path = walk.Atomise(nextItem.Path.ToWalkValues())
+	nextItem, err := state.in.Read()
+	if err != nil {
+		panic("Missing next value")
+	}
+	state.value = nextItem.Value
+	state.path = nextItem.Path
 }
 
 type AppendNextCommand struct {}
 func (cmd AppendNextCommand) exec(state *ProgramState) {
-	nextItem := <- state.in
-	state.value = append(state.value, walk.Atomise([]walk.WalkValue{nextItem.Value})...)
-	state.path = walk.Atomise(nextItem.Path.ToWalkValues())
+	nextItem, err := state.in.Read()
+	if err != nil {
+		panic("Missing next value")
+	}
+	state.value = append(state.value, nextItem.Value...)
+	state.path = nextItem.Path
 }
 
 type DeleteValueCommand struct {}
diff --git a/main/main.go b/main/main.go
index 564d14a..e6730de 100644
--- a/main/main.go
+++ b/main/main.go
@@ -10,8 +10,8 @@ type Program []Command
 
 type ProgramState struct {
 	path, value, xreg []walk.Atom
-	in chan walk.WalkItem
-	out chan walk.WalkItem
+	in walk.JSONIn
+	out walk.JSONOut
 	program []Command
 }
 
@@ -40,41 +40,33 @@ func main() {
 	program := Parse(tokens)
 
 	stdin := bufio.NewReader(os.Stdin)
-	dataStream := walk.Json(stdin)
 
 	state := ProgramState {
-		in: dataStream,
-		out: make(chan walk.WalkItem),
+		in: walk.NewJSONIn(stdin),
+		out: walk.NewJSONOut(),
 		program: program,
 	}
-	
-	go func () {
-		for walkItem := range dataStream {
-			state.value = walk.Atomise([]walk.WalkValue{walkItem.Value})
-			state.path = walk.Atomise(walkItem.Path.ToWalkValues())
-			for _, cmd := range state.program {
-				cmd.exec(&state)
-			}
-			if !quiet {
-				pathValues, err := walk.Compound(state.path)
-				if err != nil {
-					panic("Tried to convert invalid atoms to values")
-				}
-				path := walk.PathFromWalkValues(pathValues)
-				values, err := walk.Compound(state.value)
-				if err != nil {
-					panic("Tried to convert invalid atoms to values")
-				}
-				for _, value := range values {
-					state.out <- walk.WalkItem {
-						Value: value,
-						Path: path,
-					}
-				}
+
+	for {
+		walkItem, err := state.in.Read()
+		if err != nil {
+			break
+		}
+		state.value = walkItem.Value
+		state.path = walkItem.Path
+		for _, cmd := range state.program {
+			cmd.exec(&state)
+		}
+		if !quiet {
+			pathValues, err := walk.Compound(state.path)
+			if err != nil {
+				panic("Tried to convert invalid atoms to values")
 			}
+			path := walk.PathFromWalkValues(pathValues)
+			state.out.Print(path, state.value)
 		}
-		close(state.out)
-	}()
-	
-	walk.JsonOut(state.out)
+	}
+
+	state.in.AssertDone()
+	state.out.AssertDone()
 }
\ No newline at end of file