Huge refactor to a more value based system, doing away with terminals. Also introduces unit testing

1 files changed, 4 insertions, 4 deletions

diff --git a/main/main.go b/main/main.go
index a506954..8e8c369 100644
--- a/main/main.go
+++ b/main/main.go
@@ -4,13 +4,13 @@ import (
 	"os"
 	"bufio"
 	"main/walk"
-	"main/json_array"
+	"main/json"
 )
 
 type Program []Command
 
 type ProgramState struct {
-	path, value, xreg, yreg, zreg []walk.Atom
+	path, value, xreg, yreg, zreg walk.ValueList
 	in walk.StredReader
 	out walk.StredWriter
 	program []Command
@@ -45,8 +45,8 @@ func main() {
 	stdout := bufio.NewWriter(os.Stdout)
 
 	state := ProgramState {
-		in: json_array.NewJSONArrayReader(stdin),
-		out: json_array.NewJSONArrayWriter(stdout),
+		in: json.NewJSONReader(stdin),
+		out: json.NewJSONWriter(stdout),
 		program: program,
 	}