Merge remote-tracking branch 'upstream/master' into native-record

Conflicts:
	include/picrin/value.h
	piclib/prelude.scm
	src/codegen.c
	src/gc.c
	src/init.c
	src/macro.c
	src/vm.c
	src/write.c

include/picrin.h

@@ -57,18 +57,11 @@ typedef struct {
   struct pic_env *up;
 } pic_callinfo;
 
-typedef struct pic_block {
-  struct pic_block *prev;
-  int depth;
-  struct pic_proc *in, *out;
-  unsigned refcnt;
-} pic_block;
-
 typedef struct {
   int argc;
   char **argv, **envp;
 
-  pic_block *blk;
+  struct pic_block *blk;
 
   pic_value *sp;
   pic_value *stbase, *stend;
@@ -78,6 +71,8 @@ typedef struct {
 
   pic_code *ip;
 
+  struct pic_lib *lib;
+
   pic_sym sDEFINE, sLAMBDA, sIF, sBEGIN, sQUOTE, sSETBANG;
   pic_sym sQUASIQUOTE, sUNQUOTE, sUNQUOTE_SPLICING;
   pic_sym sDEFINE_SYNTAX;
@@ -95,20 +90,17 @@ typedef struct {
   int sym_cnt;
   int uniq_sym_cnt;
 
-  xhash global_tbl;
-  pic_value *globals;
-  size_t glen, gcapa;
-
+  xhash globals;
   xhash macros;
+  pic_value libs;
 
-  pic_value lib_tbl;
-  struct pic_lib *lib;
-
+  bool rfcase;
   xhash rlabels;
 
   jmp_buf *jmp;
   struct pic_error *err;
   struct pic_jmpbuf *try_jmps;
+  size_t try_jmp_size, try_jmp_idx;
 
   struct pic_heap *heap;
   struct pic_object **arena;
@@ -151,7 +143,6 @@ pic_value pic_funcall(pic_state *pic, const char *name, pic_list args);
 struct pic_proc *pic_get_proc(pic_state *);
 int pic_get_args(pic_state *, const char *, ...);
 void pic_defun(pic_state *, const char *, pic_func_t);
-void pic_defmacro(pic_state *, const char *, struct pic_proc *);
 
 bool pic_equal_p(pic_state *, pic_value, pic_value);
 
@@ -159,6 +150,7 @@ pic_sym pic_intern(pic_state *, const char *, size_t);
 pic_sym pic_intern_cstr(pic_state *, const char *);
 const char *pic_symbol_name(pic_state *, pic_sym);
 pic_sym pic_gensym(pic_state *, pic_sym);
+pic_sym pic_ungensym(pic_state *, pic_sym);
 bool pic_interned_p(pic_state *, pic_sym);
 
 char *pic_strdup(pic_state *, const char *);
@@ -180,17 +172,17 @@ pic_value pic_apply3(pic_state *, struct pic_proc *, pic_value, pic_value, pic_v
 pic_value pic_apply4(pic_state *, struct pic_proc *, pic_value, pic_value, pic_value, pic_value);
 pic_value pic_apply5(pic_state *, struct pic_proc *, pic_value, pic_value, pic_value, pic_value, pic_value);
 pic_value pic_apply_trampoline(pic_state *, struct pic_proc *, pic_value);
-pic_value pic_eval(pic_state *, pic_value);
-struct pic_proc *pic_compile(pic_state *, pic_value);
-pic_value pic_macroexpand(pic_state *, pic_value);
+pic_value pic_eval(pic_state *, pic_value, struct pic_lib *);
+struct pic_proc *pic_compile(pic_state *, pic_value, struct pic_lib *);
+pic_value pic_macroexpand(pic_state *, pic_value, struct pic_lib *);
 
 void pic_in_library(pic_state *, pic_value);
 struct pic_lib *pic_make_library(pic_state *, pic_value);
 struct pic_lib *pic_find_library(pic_state *, pic_value);
 
-#define pic_deflibrary(spec)                                            \
-  pic_deflibrary_helper__(GENSYM(i), GENSYM(prev_lib), spec)
-#define pic_deflibrary_helper__(i, prev_lib, spec)                      \
+#define pic_deflibrary(pic, spec)                                       \
+  pic_deflibrary_helper__(pic, GENSYM(i), GENSYM(prev_lib), spec)
+#define pic_deflibrary_helper__(pic, i, prev_lib, spec)                 \
   for (int i = 0; ! i; )                                                \
     for (struct pic_lib *prev_lib; ! i; )                               \
       for ((prev_lib = pic->lib), pic_make_library(pic, pic_read_cstr(pic, spec)), pic_in_library(pic, pic_read_cstr(pic, spec)); ! i++; pic->lib = prev_lib)

include/picrin/config.h

@@ -26,8 +26,6 @@
 
 /* #define PIC_RESCUE_SIZE 30 */
 
-/* #define PIC_GLOBALS_SIZE 1024 */
-
 /* #define PIC_SYM_POOL_SIZE 128 */
 
 /* #define PIC_IREP_SIZE 8 */
@@ -93,10 +91,6 @@
 # define PIC_RESCUE_SIZE 30
 #endif
 
-#ifndef PIC_GLOBALS_SIZE
-# define PIC_GLOBALS_SIZE 1024
-#endif
-
 #ifndef PIC_SYM_POOL_SIZE
 # define PIC_SYM_POOL_SIZE 128
 #endif

include/picrin/cont.h

@@ -9,11 +9,18 @@
 extern "C" {
 #endif
 
+struct pic_block {
+  PIC_OBJECT_HEADER
+  struct pic_block *prev;
+  int depth;
+  struct pic_proc *in, *out;
+};
+
 struct pic_cont {
   PIC_OBJECT_HEADER
   jmp_buf jmp;
 
-  pic_block *blk;
+  struct pic_block *blk;
 
   char *stk_pos, *stk_ptr;
   ptrdiff_t stk_len;
@@ -30,37 +37,12 @@ struct pic_cont {
   size_t arena_size;
   int arena_idx;
 
+  struct pic_jmpbuf *try_jmps;
+  size_t try_jmp_idx, try_jmp_size;
+
   pic_value results;
 };
 
-#define PIC_BLK_INCREF(pic,blk) do {		\
-    (blk)->refcnt++;				\
-  } while (0)
-
-#define PIC_BLK_DECREF(pic,blk) do {			\
-    pic_block *_a = (blk), *_b;                         \
-    while (_a) {					\
-      if (! --_a->refcnt) {				\
-	_b = _a->prev;					\
-	pic_free((pic), _a);				\
-	_a = _b;					\
-      } else {						\
-	break;						\
-      }							\
-    }							\
-  } while (0)
-
-#define PIC_BLK_EXIT(pic) do {                           \
-    pic_block *_a;                                       \
-    while (pic->blk) {                                   \
-      if (pic->blk->out)                                 \
-        pic_apply0(pic, pic->blk->out);                  \
-      _a = pic->blk->prev;                               \
-      PIC_BLK_DECREF(pic, pic->blk);                     \
-      pic->blk = _a;                                     \
-    }                                                    \
-  } while (0)
-
 pic_value pic_values0(pic_state *);
 pic_value pic_values1(pic_state *, pic_value);
 pic_value pic_values2(pic_state *, pic_value, pic_value);

include/picrin/error.h

@@ -11,17 +11,19 @@ extern "C" {
 
 struct pic_jmpbuf {
   jmp_buf here;
-  pic_callinfo *ci;
-  pic_value *sp;
+  struct pic_proc *handler;
+  ptrdiff_t ci_offset;
+  ptrdiff_t sp_offset;
   pic_code *ip;
   jmp_buf *prev_jmp;
-  struct pic_jmpbuf *prev;
 };
 
 /* do not return from try block! */
 
 #define pic_try                                 \
-  pic_push_try(pic);                            \
+  pic_try_with_handler(NULL)
+#define pic_try_with_handler(handler)           \
+  pic_push_try(pic, handler);                   \
   if (setjmp(*pic->jmp) == 0)                   \
     do
 #define pic_catch                               \
@@ -29,7 +31,7 @@ struct pic_jmpbuf {
   else                                          \
     if (pic_pop_try(pic), 1)
 
-void pic_push_try(pic_state *);
+void pic_push_try(pic_state *, struct pic_proc *);
 void pic_pop_try(pic_state *);
 
 noreturn void pic_throw(pic_state *, short, const char *, pic_value);

include/picrin/value.h

@@ -13,7 +13,7 @@ extern "C" {
  * pic_sym is just an alias to unsigned int.
  */
 
-typedef unsigned pic_sym;
+typedef int pic_sym;
 
 /**
  * `undef` values never seen from user-end: that is,
@@ -116,7 +116,8 @@ enum pic_tt {
   PIC_TT_IREP,
   PIC_TT_DATA,
   PIC_TT_DICT,
-  PIC_TT_RECORD
+  PIC_TT_RECORD,
+  PIC_TT_BLK,
 };
 
 #define PIC_OBJECT_HEADER			\
@@ -271,6 +272,8 @@ pic_type_repr(enum pic_tt tt)
     return "dict";
   case PIC_TT_RECORD:
     return "record";
+  case PIC_TT_BLK:
+    return "block";
   }
   UNREACHABLE();
 }