From e44ece198604ca4ff3690d065f2a5c043353be29 Mon Sep 17 00:00:00 2001
From: Justin Ethier <justin.ethier@gmail.com>
Date: Fri, 17 Apr 2015 21:54:06 -0400
Subject: [PATCH] Handle receiving a primitive as the next function after GC

---
 cyclone.h |  2 +-
 runtime.h | 30 +++++++++++++++++++++++++++++-
 2 files changed, 30 insertions(+), 2 deletions(-)

diff --git a/cyclone.h b/cyclone.h
index 9451e316..0636beaf 100644
--- a/cyclone.h
+++ b/cyclone.h
@@ -10,7 +10,7 @@
 #define CYCLONE_H
 
 /* Debug GC flag */
-#define DEBUG_GC 1
+#define DEBUG_GC 0
 
 /* Show diagnostic information for the GC when program terminate */
 #define DEBUG_SHOW_DIAG 0
diff --git a/runtime.h b/runtime.h
index 24b993cb..ff1bc3f2 100644
--- a/runtime.h
+++ b/runtime.h
@@ -1359,6 +1359,29 @@ static void Cyc_apply(int argc, closure cont, object prim, ...){
 }
 // END apply
 
+/* Extract args from given array, assuming cont is the first arg in buf */
+static void Cyc_apply_from_buf(int argc, object prim, object *buf) {
+    list args;
+    object cont;
+    int i;
+
+    if (argc == 0) {
+      printf("Internal error in Cyc_apply_from_buf, argc is 0\n");
+      exit(1);
+    }
+
+    args = alloca(sizeof(cons_type) * (argc - 1));
+    cont = buf[0];
+    
+    for (i = 1; i < argc; i++) {
+        args[i - 1].tag = cons_tag;
+        args[i - 1].cons_car = buf[i];
+        args[i - 1].cons_cdr = (i == (argc-1)) ? nil : &args[i];
+    }
+
+    apply(cont, prim, (object)&args[0]);
+}
+
 static char *transport(x, gcgen) char *x; int gcgen;
 /* Transport one object.  WARNING: x cannot be nil!!! */
 {
@@ -1797,7 +1820,12 @@ static void main_main (stack_size,heap_size,stack_base)
 //    }
 //    do_dispatch(gc_num_ans, fn, gc_cont, gc_ans);
 //  }
-  do_dispatch(gc_num_ans, ((closure)gc_cont)->fn, gc_cont, gc_ans);
+    if (type_of(gc_cont) == cons_tag || prim(gc_cont)) {
+      printf("DEBUG, prim found after GC\n");
+      Cyc_apply_from_buf(gc_num_ans, gc_cont, gc_ans);
+    } else {
+      do_dispatch(gc_num_ans, ((closure)gc_cont)->fn, gc_cont, gc_ans);
+    }
 
   /*                                                                      */
   printf("main: your setjmp and/or longjmp are broken.\n"); exit(0);}}