commit 0dfe292406508e3ae74016540368a4e4795c967c
author Gavin Howard <yzena.tech@gmail.com> Tue May 22 13:57:02 2018 -0600
committer Gavin Howard <yzena.tech@gmail.com> Tue Aug 28 17:11:26 2018 -0600
tree 139386cd6eca9c71c4e7f41a27875d8efc0828df
parent 6a804cf00e73c0b4f14b72570008e917a2b239da

Make interrupts work better

Now they can interrupt some ongoing calculations. It is not entirely
practical to test for it everywhere, but this is a good start.

src/program.c

diff --git a/src/program.c b/src/program.c
index 8d259c6..afcf629 100644
--- a/src/program.c
+++ b/src/program.c
@@ -1038,7 +1038,7 @@
   return status;
 }
 
-BcStatus bc_program_reset(BcProgram *p, BcStatus status, bool sig) {
+BcStatus bc_program_reset(BcProgram *p, BcStatus status) {
 
   BcFunc *func;
   BcInstPtr *ip;
@@ -1050,11 +1050,13 @@
   ip = bc_vec_top(&p->stack);
   ip->idx = func->code.len;
 
-  bcg.sig_int_catches += sig;
+  if (!status && bcg.signe && !bcg.interactive) return BC_STATUS_QUIT;
 
-  if (!status && sig && !bcg.interactive) return BC_STATUS_QUIT;
+  bcg.sigc += bcg.signe;
+  bcg.signe = bcg.sig != bcg.sigc;
 
-  if (!status && bcg.interactive) {
+  if ((!status || status == BC_STATUS_EXEC_SIGNAL) && bcg.interactive) {
+    status = BC_STATUS_SUCCESS;
     fprintf(stderr, "%s", bc_program_ready_prompt);
     fflush(stderr);
   }
@@ -1070,7 +1072,7 @@
   BcResult result;
   BcFunc *func;
   BcInstPtr *ip;
-  bool cond, sig;
+  bool cond;
   const char **string, *s;
 
   status = BC_STATUS_SUCCESS;
@@ -1318,10 +1320,8 @@
       }
     }
 
-    sig = bcg.sig_int != bcg.sig_int_catches;
-
-    if ((status && status != BC_STATUS_QUIT) || sig)
-      status = bc_program_reset(p, status, sig);
+    if ((status && status != BC_STATUS_QUIT) || bcg.signe)
+      status = bc_program_reset(p, status);
 
     // We keep getting these because if the size of the
     // stack changes, pointers may end up being invalid.
@@ -1436,8 +1436,8 @@
 
     if (putchar('\n') == EOF) status = BC_STATUS_IO_ERR;
 
-    sig = bcg.sig_int != bcg.sig_int_catches;
-    if (status || sig) status = bc_program_reset(p, status, sig);
+    sig = bcg.sig != bcg.sigc;
+    if (status || sig) status = bc_program_reset(p, status);
   }
 
   return status;