From 5c8d81e8b536660dd2aa995c14f6c9fdaaf7707b Mon Sep 17 00:00:00 2001
From: Yuichi Nishiwaki <yuichi.nishiwaki@gmail.com>
Date: Wed, 16 Oct 2013 15:30:52 +0900
Subject: [PATCH] support closure call

---
 include/picrin.h |  6 +++++-
 src/vm.c         | 39 +++++++++++++++++++++++++++++++++++----
 2 files changed, 40 insertions(+), 5 deletions(-)

diff --git a/include/picrin.h b/include/picrin.h
index 77761db1..de4fb8f9 100644
--- a/include/picrin.h
+++ b/include/picrin.h
@@ -7,9 +7,13 @@
 #include "picconf.h"
 #include "picrin/value.h"
 
+struct pic_code;
+
 typedef struct pic_callinfo {
   struct pic_proc *proc;
   int argc;
+  struct pic_code *pc;
+  pic_value *sp;
 } pic_callinfo;
 
 typedef struct {
@@ -60,7 +64,7 @@ pic_value pic_parse(pic_state *, const char *);
 
 pic_value pic_eval(pic_state *, pic_value, struct pic_env *);
 pic_value pic_run(pic_state *, struct pic_proc *, pic_value);
-struct pic_proc *pic_codegen(pic_state *, pic_value, struct pic_env*);
+struct pic_proc *pic_codegen(pic_state *, pic_value, struct pic_env *);
 
 void pic_raise(pic_state *, const char *);
 
diff --git a/src/vm.c b/src/vm.c
index 5adc066e..5e986493 100644
--- a/src/vm.c
+++ b/src/vm.c
@@ -375,6 +375,7 @@ pic_run(pic_state *pic, struct pic_proc *proc, pic_value args)
 {
   struct pic_code *pc;
   pic_callinfo *ci;
+  pic_value val;
   int ai = pic_gc_arena_preserve(pic);
 
   pc = proc->u.irep->code;
@@ -417,17 +418,31 @@ pic_run(pic_state *pic, struct pic_proc *proc, pic_value args)
       ci = PUSHCI();
       ci->proc = proc;
       ci->argc = pc->u.i;
+      ci->pc = pc;
+      ci->sp = pic->sp;
       if (pic_proc_cfunc_p(c)) {
 	v = proc->u.cfunc(pic);
 	pic->sp -= ci->argc;
 	POPCI();
-	ci = pic->ci - 1;
 	PUSH(v);
+	pic_gc_arena_restore(pic, ai);
+	NEXT;
       }
       else {
-	pic_raise(pic, "closure call not suppoted");
+	pc = proc->u.irep->code;
+	pic_gc_arena_restore(pic, ai);
+	JUMP;
       }
-      pic_gc_arena_restore(pic, ai);
+    }
+    CASE(OP_RET) {
+      pic_value v;
+
+      v = POP();
+      pic->sp -= ci->argc;
+      ci = POPCI();
+      pc = ci->pc;
+      pic->sp = ci->sp;
+      PUSH(v);
       NEXT;
     }
     CASE(OP_LAMBDA) {
@@ -483,7 +498,23 @@ pic_run(pic_state *pic, struct pic_proc *proc, pic_value args)
 
  STOP:
   POPCI();
-  return POP();
+  val = POP();
+
+#if GC_DEBUG
+  puts("**VM END STATE**");
+  printf("stbase = %p\nsp = %p\n", pic->stbase, pic->sp);
+  printf("cibase = %p\nci = %p\n", pic->cibase, pic->ci);
+  if (pic->stbase != pic->sp) {
+    pic_value *sp;
+    printf("* stack trace:");
+    for (sp = pic->stbase; pic->sp != sp; ++sp) {
+      pic_debug(pic, *sp);
+      puts("");
+    }
+  }
+#endif
+
+  return val;
 }
 
 void