Make fillcmd work with multiple Inputs.

It's not "per-Input", but it's largely equivalent, and I don't want to
make Input a GC'd object just for a single field.

Author: jpco

initial.es

@@ -651,11 +651,15 @@ if {~ <=$&primitives writehistory} {
 fn-%batch-loop		= $&batchloop
 fn-%is-interactive	= $&isinteractive
 
+#	NOTE: $&readline might not actually exist.  we just assume it does for this
+#	proof-of-concept.
+fn-%readline	= $&readline
+
 fn %parse {
 	if %is-interactive {
 		let (in = (); p = $*(1))
 		let (code = <={$&parse {
-			let (r = <={$&readline $p}) {
+			let (r = <={%readline $p}) {
 				in = $in $r
 				p = $*(2)
 				result $r

input.c

@@ -219,12 +219,20 @@ static int cmdfill(Input *in) {
 extern Tree *parse(List *fc) {
 	int result;
 	void *oldpspace;
+	Ref(List *, oldfillcmd, fillcmd);
 
 	/* TODO: change this error message */
 	if (input->parsing)
 		fail("$&parse", "cannot perform nested parsing");
 
 	assert(input->error == NULL);
+
+	/* TODO: update this check --
+	 *
+	 *   $ es -c '<={$&parse {result echo hello world}}'
+	 *
+	 * should work.  also, ignoreeof
+	 */
 	if (ISEOF(input))
 		throw(mklist(mkstr("eof"), NULL));
 
@@ -250,7 +258,8 @@ extern Tree *parse(List *fc) {
 	EndExceptionHandler
 
 	input->parsing = FALSE;
-	fillcmd = NULL;
+	fillcmd = oldfillcmd;
+	RefEnd(oldfillcmd);
 
 	if (result || input->error != NULL) {
 		const char *e = input->error;