changeset 24:e1109e33b796

some work that probably needs to be trashed on requests.tp
author Mike Pavone <pavone@retrodev.com>
date Sat, 10 Aug 2013 11:53:21 -0700
parents fcd7ae66a9ee
children bb80f86c5048
files src/requests.tp
diffstat 1 files changed, 17 insertions(+), 16 deletions(-) [+]
line wrap: on
line diff
--- a/src/requests.tp	Sat Aug 10 03:56:32 2013 -0700
+++ b/src/requests.tp	Sat Aug 10 11:53:21 2013 -0700
@@ -14,10 +14,10 @@
 	}
 
 	quote <- :str {
-		"\"" . str . "\"" 
+		"\"" . str . "\""
 	}
 
-	println: str {
+	println <- :str {
 		print: str . "\n"
 	}
 
@@ -50,45 +50,46 @@
 
 	expect:in:else <- :target src doElse {
 		src find: target else: {
-			print: "parse error: expected " . target . "!\n" 
+			print: "parse error: expected " . target . "!\n"
 			doElse:
-		}		
+		}
 	}
 
 	getStrForKey:from:else <- :key :src :doElse {
 		firstKeyQuote <- expect: "\"" in: src else: doElse
-		secondQuote <- idx + (key length):
+		secondQuote <- firstKeyQuote + 1 + (key length)
 
 		#{
-			value <- 
+			value <- ""
 			rest <- src from: (value length)
 		}
 	}
 
 	getOutputs:else <- :str :fail {
-		
+
 	}
 
 	getEval:else <- :str :fail {
 		statusRest <- getStrForKey: "status" from: str else: fail
-		if (statusRest value) = "ok" { // string equality? revisit.
+		if: (statusRest value) = "ok" { // string equality? revisit.
 			outputsRest <- getOutputs: (statusRest rest) else: fail
 			#{
 				value <- #{
-					status <- statusRest.value
-					outputs <- outputsRest.value
+					status <- statusRest value
+					outputs <- outputsRest value
 				}
-				rest <- outputsRest.rest
+				rest <- outputsRest rest
 			}
-		} else {
+		} else: {
+			message <- ""
 			print: "Status was error, message: " . message
+			messageRest <- getStrForKey: "message" from: (statusRest rest) else: fail
 			#{
-				messageRest <- getStrForKey: "message" from: (statusRest rest) else: fail
 				value <- #{
-					status <- statusRest.value
-					message <- messageRest.value
+					status <- statusRest value
+					message <- messageRest value
 				}
-				rest <- messageRest.rest
+				rest <- messageRest rest
 			}
 		}
 	}