DELETE THIS: partial rollback of branch for circleci git bisection (2)

Author: jpco

Makefile.in

@@ -56,12 +56,12 @@ VPATH = $(srcdir)
 HFILES	= config.h es.h gc.h input.h prim.h print.h sigmsgs.h \
 	  stdenv.h syntax.h term.h var.h
 CFILES	= access.c closure.c conv.c dict.c eval.c except.c fd.c gc.c glob.c \
-	  glom.c input.c heredoc.c list.c main.c match.c open.c opt.c \
+	  glom.c input.c heredoc.c history.c list.c main.c match.c open.c opt.c \
 	  prim-ctl.c prim-etc.c prim-io.c readline.c prim-sys.c prim.c \
 	  print.c proc.c sigmsgs.c signal.c split.c status.c str.c syntax.c \
 	  term.c token.c tree.c util.c var.c vec.c version.c y.tab.c dump.c
 OFILES	= access.o closure.o conv.o dict.o eval.o except.o fd.o gc.o glob.o \
-	  glom.o input.o heredoc.o list.o main.o match.o open.o opt.o \
+	  glom.o input.o heredoc.o history.o list.o main.o match.o open.o opt.o \
 	  prim-ctl.o prim-etc.o prim-io.o readline.o prim-sys.o prim.o \
 	  print.o proc.o sigmsgs.o signal.o split.o status.o str.o syntax.o \
 	  term.o token.o tree.o util.o var.o vec.o version.o y.tab.o
@@ -135,6 +135,7 @@ glob.o : glob.c es.h config.h stdenv.h gc.h
 glom.o : glom.c es.h config.h stdenv.h gc.h 
 input.o : input.c es.h config.h stdenv.h input.h 
 heredoc.o : heredoc.c es.h config.h stdenv.h gc.h input.h syntax.h 
+history.o : history.c es.h config.h stdenv.h gc.h input.h 
 list.o : list.c es.h config.h stdenv.h gc.h 
 main.o : main.c es.h config.h stdenv.h 
 match.o : match.c es.h config.h stdenv.h 

es.h

@@ -291,7 +291,7 @@ extern Boolean streq2(const char *s, const char *t1, const char *t2);
 /* input.c */
 
 extern char *prompt, *prompt2;
-extern Tree *parse(List *);
+extern Tree *parse(char *esprompt1, char *esprompt2);
 extern Tree *parsestring(const char *str);
 extern Boolean isinteractive(void);
 extern Boolean isfromfd(void);
@@ -317,10 +317,17 @@ extern void inithistory(void);
 extern void sethistory(char *file);
 extern void loghistory(char *cmd);
 extern void setmaxhistorylength(int length);
-extern void rlsetup(void);
+extern void rlsetup(Boolean fromprim);
 #endif
 
 
+/* history.c */
+
+extern void newhistbuffer(void);
+extern void addhistbuffer(char c);
+extern char *dumphistbuffer(void);
+
+
 /* opt.c */
 
 extern void esoptbegin(List *list, const char *caller, const char *usage, Boolean throws);

gc.c

@@ -471,7 +471,7 @@ extern void *pseal(void *p) {
 	if (psize == 0)
 		return p;
 
-	/* TODO: this is an overestimate since it includes garbage */
+	/* TODO: this is an overestimate since it contains garbage */
 	gcreserve(psize);
 	pmode = TRUE;
 	VERBOSE(("Reserved %d for pspace copy\n", psize));
@@ -483,9 +483,9 @@ extern void *pseal(void *p) {
 	for (sp = pspace; sp != NULL; sp = sp->next)
 		VERBOSE(("GC pspace = %ux ... %ux\n", sp->bot, sp->current));
 #endif
-	if (p != NULL) {
-		VERBOSE(("GC new space = %ux ... %ux\n", new->bot, new->top));
+	VERBOSE(("GC new space = %ux ... %ux\n", new->bot, new->top));
 
+	if (p != NULL) {
 		p = forward(p);
 		(*(TAG(p))->scan)(p);
 	}

heredoc.c

@@ -47,7 +47,7 @@ extern Tree *snarfheredoc(const char *eof, Boolean quoted) {
 
 	for (tree = NULL, tailp = &tree, buf = openbuffer(0);;) {
 		int c;
-		increment_line();
+		print_prompt2();
 		for (s = (unsigned char *) eof; (c = GETC()) == *s; s++)
 			;
 		if (*s == '\0' && (c == '\n' || c == EOF)) {

history.c

@@ -0,0 +1,49 @@
+/* history.c -- control the history file ($Revision: 1.1.1.1 $) */
+
+#include "es.h"
+#include "gc.h"
+#include "input.h"
+
+
+/*
+ * constants
+ */
+
+#define	BUFSIZE		((size_t) 4096)		/* buffer size to fill reads into */
+
+
+/*
+ * globals
+ */
+
+static Buffer *histbuffer = NULL;
+
+
+/*
+ * histbuffer -- build the history line during input and dump it as a gc-string
+ */
+
+extern void newhistbuffer() {
+	assert(histbuffer == NULL);
+	histbuffer = openbuffer(BUFSIZE);
+}
+
+extern void addhistbuffer(char c) {
+	if (histbuffer == NULL)
+		return;
+	histbuffer = bufputc(histbuffer, c);
+}
+
+extern char *dumphistbuffer() {
+	char *s;
+        size_t len;
+	assert(histbuffer != NULL);
+
+	s = sealcountedbuffer(histbuffer);
+	histbuffer = NULL;
+
+	len = strlen(s);
+	if (len > 0 && s[len - 1] == '\n')
+		s[len - 1] = '\0';
+	return s;
+}

initial.es

@@ -648,29 +648,10 @@ if {~ <=$&primitives writehistory} {
 #	The parsed code is executed only if it is non-empty, because otherwise
 #	result gets set to zero when it should not be.
 
+fn-%parse	= $&parse
 fn-%batch-loop	= $&batchloop
 fn-%is-interactive = $&isinteractive
 
-fn %parse {
-	if %is-interactive {
-		let (in = (); p = $*(1))
-		let (code = <={$&parse {
-			let (r = <={$&readline $p}) {
-				in = $in $r
-				p = $*(2)
-				result $r
-			}
-		}}) {
-			if {!~ $#fn-%write-history 0} {
-				%write-history <={%flatten \n $in}
-			}
-			result $code
-		}
-	} {
-		$&parse $&read
-	}
-}
-
 fn %interactive-loop {
 	let (result = <=true) {
 		catch @ e type msg {

input.c

@@ -22,6 +22,8 @@
  */
 
 Input *input;
+char *prompt, *prompt2;
+
 Boolean ignoreeof = FALSE;
 
 
@@ -101,8 +103,11 @@ extern void unget(Input *in, int c) {
 /* get -- get a character, filter out nulls */
 static int get(Input *in) {
 	int c;
+	Boolean uf = (in->fill == ungetfill);
 	while ((c = (in->buf < in->bufend ? *in->buf++ : (*in->fill)(in))) == '\0')
 		warn("null character ignored");
+	if (!uf && c != EOF)
+		addhistbuffer((char)c);
 	return c;
 }
 
@@ -126,9 +131,58 @@ static int eoffill(Input UNUSED *in) {
 	return EOF;
 }
 
+#if HAVE_READLINE
+/* callreadline -- readline wrapper */
+static char *callreadline(char *prompt0) {
+	char *volatile prompt = prompt0;
+	char *r;
+	if (prompt == NULL)
+		prompt = ""; /* bug fix for readline 2.0 */
+	rlsetup(FALSE);
+	interrupted = FALSE;
+	if (!setjmp(slowlabel)) {
+		slow = TRUE;
+		r = interrupted ? NULL : readline(prompt);
+		if (interrupted)
+			errno = EINTR;
+	} else {
+		r = NULL;
+		errno = EINTR;
+	}
+	slow = FALSE;
+	SIGCHK();
+	return r;
+}
+#endif
+
 /* fdfill -- fill input buffer by reading from a file descriptor */
 static int fdfill(Input *in) {
 	long nread;
+	assert(in->buf == in->bufend);
+	assert(in->fd >= 0);
+
+#if HAVE_READLINE
+	if (in->runflags & run_interactive && in->fd == 0) {
+		char *rlinebuf = NULL;
+		do {
+			rlinebuf = callreadline(prompt);
+		} while (rlinebuf == NULL && errno == EINTR);
+
+		if (rlinebuf == NULL)
+			nread = 0;
+		else {
+			nread = strlen(rlinebuf) + 1;
+			if (in->buflen < (unsigned int)nread) {
+				while (in->buflen < (unsigned int)nread)
+					in->buflen *= 2;
+				in->bufbegin = erealloc(in->bufbegin, in->buflen);
+			}
+			memcpy(in->bufbegin, rlinebuf, nread - 1);
+			in->bufbegin[nread - 1] = '\n';
+			efree(rlinebuf);
+		}
+	} else
+#endif
 	do {
 		nread = eread(in->fd, (char *) in->bufbegin, in->buflen);
 		SIGCHK();
@@ -151,69 +205,13 @@ static int fdfill(Input *in) {
 	return *in->buf++;
 }
 
-static List *fillcmd = NULL;
-
-static int cmdfill(Input *in) {
-	char *read;
-	List *result;
-	size_t nread;
-	int oldf;
-
-	assert(in->buf == in->bufend);
-	assert(in->fd >= 0);
-
-	if (fillcmd == NULL)
-		return fdfill(in);
-
-	oldf = dup(0);
-	if (dup2(in->fd, 0) == -1)
-		fail("$&parse", "dup2: %s", esstrerror(errno));
-
-	ExceptionHandler
-
-		result = eval(fillcmd, NULL, 0);
-
-	CatchException (e)
-
-		mvfd(oldf, 0);
-		throw(e);
-
-	EndExceptionHandler
-
-	mvfd(oldf, 0);
-
-	if (result == NULL) { /* eof */
-		if (!ignoreeof) {
-			close(in->fd);
-			in->fd = -1;
-			in->fill = eoffill;
-			in->runflags &= ~run_interactive;
-		}
-		return EOF;
-	}
-	read = str("%L\n", result, " ");
-
-	if ((nread = strlen(read)) > in->buflen) {
-		in->bufbegin = erealloc(in->bufbegin, nread);
-		in->buflen = nread;
-	}
-	memcpy(in->bufbegin, read, nread);
-
-	in->buf = in->bufbegin;
-	in->bufend = &in->buf[nread];
-
-	return *in->buf++;
-}
 
 /*
  * the input loop
  */
 
-
-static Boolean parsing = FALSE;
-
-/* parse -- call yyparse() and catch errors */
-extern Tree *parse(List *fc) {
+/* parse -- call yyparse(), but disable garbage collection and catch errors */
+extern Tree *parse(char *pr1, char *pr2) {
 	int result;
 	assert(error == NULL);
 
@@ -223,27 +221,17 @@ extern Tree *parse(List *fc) {
 	if (ISEOF(input))
 		throw(mklist(mkstr("eof"), NULL));
 
-	if (parsing)
-		fail("$&parse", "cannot perform nested parsing");
-
-	fillcmd = fc;
-	parsing = TRUE;
-
-	ExceptionHandler
-
-		result = yyparse();
-
-	CatchException (e)
-
-		parsing = FALSE;
-		fillcmd = NULL;
-		pseal(NULL);
-		throw(e);
-
-	EndExceptionHandler
+#if HAVE_READLINE
+	prompt = (pr1 == NULL) ? "" : pr1;
+#else
+	if (pr1 != NULL)
+		eprint("%s", pr1);
+#endif
+	prompt2 = pr2;
 
-	parsing = FALSE;
-	fillcmd = NULL;
+	gcdisable();
+	result = yyparse();
+	gcenable();
 
 	if (result || error != NULL) {
 		char *e;
@@ -340,7 +328,7 @@ extern List *runfd(int fd, const char *name, int flags) {
 
 	memzero(&in, sizeof (Input));
 	in.lineno = 1;
-	in.fill = cmdfill;
+	in.fill = fdfill;
 	in.cleanup = fdcleanup;
 	in.fd = fd;
 	registerfd(&in.fd, TRUE);
@@ -403,7 +391,7 @@ extern Tree *parseinput(Input *in) {
 	input = in;
 
 	ExceptionHandler
-		result = parse(NULL);
+		result = parse(NULL, NULL);
 		if (get(in) != EOF)
 			fail("$&parse", "more than one value in term");
 	CatchException (e)
@@ -451,7 +439,7 @@ extern Boolean isinteractive(void) {
 }
 
 extern Boolean isfromfd(void) {
-	return input == NULL ? FALSE : (input->fill == fdfill || input->fill == cmdfill);
+	return input == NULL ? FALSE : (input->fill == fdfill);
 }
 
 
@@ -464,6 +452,7 @@ extern void initinput(void) {
 	input = NULL;
 
 	/* declare the global roots */
-	globalroot(&fillcmd);
 	globalroot(&error);		/* parse errors */
+	globalroot(&prompt);		/* main prompt */
+	globalroot(&prompt2);		/* secondary prompt */
 }

input.h

@@ -36,7 +36,7 @@ extern void yyerror(char *s);
 extern const char dnw[];
 extern int yylex(void);
 extern void inityy(void);
-extern void increment_line(void);
+extern void print_prompt2(void);
 
 
 /* parse.y */