conservatory
/
picrin
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

refactor pic_deflibrary macro. don't declare variables in for statements

This commit is contained in:
Yuichi Nishiwaki 2015-01-22 18:06:10 +09:00
parent ec87adb90b
commit 1b637d1763
4 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
contrib/03.callcc/callcc.c
View File

@ -287,6 +287,8 @@ pic_callcc_callcc(pic_state *pic)
void void
pic_init_callcc(pic_state *pic) pic_init_callcc(pic_state *pic)
{ {
pic_redefun(pic, pic->PICRIN_BASE, "call-with-current-continuation", pic_callcc_callcc); pic_deflibrary (pic, "(scheme base)") {
pic_redefun(pic, pic->PICRIN_BASE, "call/cc", pic_callcc_callcc); pic_redefun(pic, pic->PICRIN_BASE, "call-with-current-continuation", pic_callcc_callcc);
pic_redefun(pic, pic->PICRIN_BASE, "call/cc", pic_callcc_callcc);
}
} }

13
extlib/benz/include/picrin.h
View File

@ -87,7 +87,7 @@ typedef struct {
pic_code *ip; pic_code *ip;
struct pic_lib *lib; struct pic_lib *lib, *prev_lib;
pic_sym *sDEFINE, *sLAMBDA, *sIF, *sBEGIN, *sQUOTE, *sSETBANG; pic_sym *sDEFINE, *sLAMBDA, *sIF, *sBEGIN, *sQUOTE, *sSETBANG;
pic_sym *sQUASIQUOTE, *sUNQUOTE, *sUNQUOTE_SPLICING; pic_sym *sQUASIQUOTE, *sUNQUOTE, *sUNQUOTE_SPLICING;
@ -208,11 +208,12 @@ struct pic_lib *pic_open_library(pic_state *, pic_value);
struct pic_lib *pic_find_library(pic_state *, pic_value); struct pic_lib *pic_find_library(pic_state *, pic_value);
#define pic_deflibrary(pic, spec) \ #define pic_deflibrary(pic, spec) \
pic_deflibrary_helper_(pic, PIC_GENSYM(i), PIC_GENSYM(prev_lib), spec) for (((assert(pic->prev_lib == NULL)), \
#define pic_deflibrary_helper_(pic, i, prev_lib, spec) \ (pic->prev_lib = pic->lib), \
for (int i = 0; ! i; ) \ (pic->lib = pic_open_library(pic, pic_read_cstr(pic, (spec))))); \
for (struct pic_lib *prev_lib; ! i; ) \ pic->prev_lib != NULL; \
for ((prev_lib = pic->lib), pic_open_library(pic, pic_read_cstr(pic, spec)), pic_in_library(pic, pic_read_cstr(pic, spec)); ! i++; pic->lib = prev_lib) ((pic->lib = pic->prev_lib), \
(pic->prev_lib = NULL)))
void pic_import(pic_state *, pic_value); void pic_import(pic_state *, pic_value);
void pic_import_library(pic_state *, struct pic_lib *); void pic_import_library(pic_state *, struct pic_lib *);

1
extlib/benz/state.c
View File

@ -176,6 +176,7 @@ pic_open(int argc, char *argv[], char **envp)
pic->PICRIN_BASE = pic_open_library(pic, pic_read_cstr(pic, "(picrin base)")); pic->PICRIN_BASE = pic_open_library(pic, pic_read_cstr(pic, "(picrin base)"));
pic->PICRIN_USER = pic_open_library(pic, pic_read_cstr(pic, "(picrin user)")); pic->PICRIN_USER = pic_open_library(pic, pic_read_cstr(pic, "(picrin user)"));
pic->lib = pic->PICRIN_USER; pic->lib = pic->PICRIN_USER;
pic->prev_lib = NULL;
/* standard I/O */ /* standard I/O */
pic->xSTDIN = pic_make_standard_port(pic, xstdin, PIC_PORT_IN); pic->xSTDIN = pic_make_standard_port(pic, xstdin, PIC_PORT_IN);

6
src/main.c
View File

@ -42,10 +42,10 @@ pic_init_picrin(pic_state *pic)
pic_deflibrary (pic, "(scheme base)") { pic_deflibrary (pic, "(scheme base)") {
pic_defun(pic, "features", pic_features); pic_defun(pic, "features", pic_features);
pic_init_contrib(pic);
pic_load_piclib(pic);
} }
pic_init_contrib(pic);
pic_load_piclib(pic);
} }
int int