From fd5f104f287427fee885583bc398c137674e6af0 Mon Sep 17 00:00:00 2001
From: Bryan Newbold <bnewbold@robocracy.org>
Date: Fri, 3 Mar 2017 00:56:40 -0800
Subject: New upstream version 5f2

---
 repl.c | 39 ++++++++++++++++++++-------------------
 1 file changed, 20 insertions(+), 19 deletions(-)
 mode change 100644 => 100755 repl.c

(limited to 'repl.c')

diff --git a/repl.c b/repl.c
old mode 100644
new mode 100755
index 5e5ad10..fc81cde
--- a/repl.c
+++ b/repl.c
@@ -150,7 +150,7 @@ void scm_intprint(n, radix, port)
      SCM port;
 {
   char num_buf[INTBUFLEN];
-  lfwrite(num_buf, (sizet)sizeof(char), iint2str(n, radix, num_buf), port);
+  lfwrite(num_buf, (sizet)sizeof(char), ilong2str(n, radix, num_buf), port);
 }
 
 void scm_ipruk(hdr, ptr, port)
@@ -329,9 +329,10 @@ taloop:
       }
       lputc(')', port);
       break;
-    case tc7_Vbool: case tc7_VfixN8: case tc7_VfixZ8:
-    case tc7_VfixN16: case tc7_VfixZ16: case tc7_VfixN32: case tc7_VfixZ32:
+    case tc7_VfixN8: case tc7_VfixZ8: case tc7_VfixN16: case tc7_VfixZ16:
+    case tc7_VfixN32: case tc7_VfixZ32: case tc7_VfixN64: case tc7_VfixZ64:
     case tc7_VfloR32: case tc7_VfloC32: case tc7_VfloR64: case tc7_VfloC64:
+    case tc7_Vbool: 
       raprin1(exp, port, writing);
       break;
     case tcs_subrs:
@@ -493,8 +494,8 @@ SCM wait_for_input(args)
   port = port1;
   ports = args;
   while (1) {
-    ASRTER(NIMP(port) && OPINPORTP(port) && (BUF0 & SCM_PORTFLAGS(port)),
-	   port, pos, s_wfi);
+/*     ASRTER(NIMP(port) && OPINPORTP(port) && (BUF0 & SCM_PORTFLAGS(port)), */
+/* 	   port, pos, s_wfi); */
     if (CRDYP(port) || feof(STREAM(port))) timeout = 0;
     if (NULLP(ports)) break;
     if (ARG5 <= pos) pos = ARGn;
@@ -583,7 +584,7 @@ int scm_io_error(port, what)
 #ifdef HAVE_PIPE
 # ifdef EPIPE
   if (EPIPE==errno) {
-    if (verbose > 2) {
+    if (scm_verbose > 2) {
       err_head("WARNING");
       lputs(";;", cur_errp);
       lputs(what, cur_errp);
@@ -1508,7 +1509,7 @@ SCM scm_file_position(port, pos)
       scm_port_table[i].col = 1;
     }
     else {
-      if (2 <= verbose)
+      if (2 <= scm_verbose)
 	scm_warn("Setting file position for tracked port: ", "", port);
       SCM_PORTFLAGS(port) &= (~TRACKED);
     }
@@ -1552,7 +1553,7 @@ void growth_mon(obj, size, units, grewp)
      char *units;
      int grewp;
 {
-  if (verbose > 2)
+  if (scm_verbose > 2)
     {
       lputs((grewp ? "; grew " : "; shrank "), sys_errp);
       lputs(obj, sys_errp);
@@ -1560,7 +1561,7 @@ void growth_mon(obj, size, units, grewp)
       scm_intprint(size, -10, sys_errp);
       lputc(' ', sys_errp);
       lputs(units, sys_errp);
-      if ((verbose > 4) && (obj==s_heap)) heap_report();
+      if ((scm_verbose > 4) && (obj==s_heap)) heap_report();
       lputs("\n; ", sys_errp);
     }
 }
@@ -1568,7 +1569,7 @@ void growth_mon(obj, size, units, grewp)
 void gc_start(what)
      const char *what;
 {
-  if (verbose > 4) {
+  if (scm_verbose > 4) {
     lputs(";GC(", sys_errp);
     lputs(what, sys_errp);
     lputs(") ", sys_errp);
@@ -1584,7 +1585,7 @@ void gc_end()
 {
   gc_rt = INUM(my_time()) - gc_rt;
   gc_time_taken = gc_time_taken + gc_rt;
-  if (verbose > 4) {
+  if (scm_verbose > 4) {
     scm_intprint(time_in_msec(gc_rt), -10, sys_errp);
     lputs(".ms cpu, ", sys_errp);
     scm_intprint(gc_cells_collected, -10, sys_errp);
@@ -1609,7 +1610,7 @@ void scm_egc_end()
 }
 void repl_report()
 {
-  if (verbose > 2) {
+  if (scm_verbose > 2) {
     lfflush(cur_outp);
     lputs(";Evaluation took ", cur_errp);
     scm_intprint(time_in_msec(INUM(my_time())-rt), -10, cur_errp);
@@ -1623,7 +1624,7 @@ void repl_report()
     lputs(" env, ", cur_errp);
     scm_intprint(mallocated - lmallocated, -10, cur_errp);
     lputs(".B other\n", cur_errp);
-    if (verbose > 3) {
+    if (scm_verbose > 3) {
       lputc(';', cur_errp);
       scm_intprint(scm_gcs, -10, cur_errp);
       lputs( " gc, ", cur_errp);
@@ -1702,7 +1703,7 @@ void scm_ecache_report()
 }
 void exit_report()
 {
-  if (verbose > 2) {
+  if (scm_verbose > 2) {
     lputs(";Totals: ", cur_errp);
     scm_intprint(time_in_msec(INUM(my_time())), -10, cur_errp);
     lputs(".ms my time, ", cur_errp);
@@ -1714,7 +1715,7 @@ void exit_report()
 SCM prolixity(arg)
      SCM arg;
 {
-  int old = verbose;
+  int old = scm_verbose;
   if (!UNBNDP(arg)) {
     if (FALSEP(arg)) scm_verbose = 1;
     else scm_verbose = INUM(arg);
@@ -1733,11 +1734,11 @@ SCM repl()
     while(1) {
       if (OPOUTPORTP(cur_inp)) { /* This case for curses window */
 	lfflush(cur_outp);
-	if (verbose) lputs(PROMPT, cur_inp);
+	if (scm_verbose) lputs(PROMPT, cur_inp);
 	lfflush(cur_inp);
       }
       else {
-	if (verbose) lputs(PROMPT, cur_outp);
+	if (scm_verbose) lputs(PROMPT, cur_outp);
 	lfflush(cur_outp);
       }
       lcells_allocated = cells_allocated;
@@ -1771,7 +1772,7 @@ SCM repl()
 	x = cons(x, EOL);
       repl_report();
       if (IMP(x))
-	{if (verbose > 2) lputs(";;no values\n", cur_outp);}
+	{if (scm_verbose > 2) lputs(";;no values\n", cur_outp);}
       else if (IMP(CDR(x))) {
 	scm_iprin1(CAR(x), cur_outp, 1);
 	lputc('\n', cur_outp);
@@ -1826,7 +1827,7 @@ static void ints_viol_iprin(num)
      int num;
 {
   char num_buf[INTBUFLEN];
-  sizet i = iint2str(num+0L, 10, num_buf);
+  sizet i = ilong2str(num+0L, 10, num_buf);
   num_buf[i] = 0;
   fputs(num_buf, stderr);
 }
-- 
cgit v1.2.3