# HG changeset patch
# User William Morgan <bill@mrgn.org>
# Date 1376132192 25200
# Node ID fcd7ae66a9eef33be75e170d4e5726f0b193d082
# Parent  a4837071b73dd6ddb5021f76cf605a406216bfb7
cleanup.

diff -r a4837071b73d -r fcd7ae66a9ee src/requests.tp
--- a/src/requests.tp	Sat Aug 10 03:31:50 2013 -0700
+++ b/src/requests.tp	Sat Aug 10 03:56:32 2013 -0700
@@ -17,6 +17,13 @@
 		"\"" . str . "\"" 
 	}
 
+	println: str {
+		print: str . "\n"
+	}
+
+
+
+
 	evalRequest <- :id args {
 		#{
 			string <- {
@@ -41,69 +48,6 @@
 
 
 
-
-	expect:in <- :target input {
-		input find: target else: {
-			print: "expected " . target . "!\n" 
-			-1
-			//exit, it's all fucked now
-		}		
-	}
-
-	quotedVal <- :str {
-		str find: "\"" else: {
-			"expected
-		}
-	}
-
-	jsonVal:in <- :target input {
-		idx <- expect: target in: input
-		nextQuoteIdx <- idx + 
-		quotedVal: idx
-	}	
-
-	evalResponse <- :str {
-		str find: "status" else: {print: missing}
-		statIdx <- expect: "status" in: str
-		status <- requireK
-		
-		#{
-			status <- 
-			outputs <- parseArray(input)
-			message <- 
-		}
-	}
-
-
-	println: str {
-		print: str . "\n"
-	}
-
-	readObject <- :str {
-		expect "{"
-		readObjectContents: 
-		expect "}"
-	}
-
-	readObject <- :str {
-		innerStr <- readEnclosed: "{" "}"
-		elems <- split: ","
-	}
-	
-	evalResponse <- :str {
-		status <- readValForKey: "status" str
-		if status = "error" {
-			
-		} else { 
-			if status = "ok" {
-				#{
-					readEvalOutputs: 
-				}
-			}
-		}
-		
-	}
-
 	expect:in:else <- :target src doElse {
 		src find: target else: {
 			print: "parse error: expected " . target . "!\n" 
@@ -112,13 +56,22 @@
 	}
 
 	getStrForKey:from:else <- :key :src :doElse {
-		idx <- expect: "\"" in: src else: doElse
-		idx + (key length):
+		firstKeyQuote <- expect: "\"" in: src else: doElse
+		secondQuote <- idx + (key length):
+
+		#{
+			value <- 
+			rest <- src from: (value length)
+		}
+	}
+
+	getOutputs:else <- :str :fail {
+		
 	}
 
 	getEval:else <- :str :fail {
 		statusRest <- getStrForKey: "status" from: str else: fail
-		if (statusRest value) = 0 {
+		if (statusRest value) = "ok" { // string equality? revisit.
 			outputsRest <- getOutputs: (statusRest rest) else: fail
 			#{
 				value <- #{
@@ -130,12 +83,12 @@
 		} else {
 			print: "Status was error, message: " . message
 			#{
-				message <- getStrForKey: "message" from: (statusRest rest) else: fail
+				messageRest <- getStrForKey: "message" from: (statusRest rest) else: fail
 				value <- #{
 					status <- statusRest.value
-					message <- outputsRest.value
+					message <- messageRest.value
 				}
-				rest <- outputsRest.rest
+				rest <- messageRest.rest
 			}
 		}
 	}