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

add pic_blk_exit

This commit is contained in:
Yuichi Nishiwaki 2014-03-10 01:36:29 +09:00
parent 851187f7bb
commit 68ea22f6eb
2 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
include/picrin/cont.h
View File

@ -40,7 +40,7 @@ struct pic_cont {
} while (0) } while (0)
#define PIC_BLK_DECREF(pic,blk) do { \ #define PIC_BLK_DECREF(pic,blk) do { \
pic_block *_a = (blk), *_b; \ pic_block *_a = (blk), *_b; \
while (_a) { \ while (_a) { \
if (! --_a->refcnt) { \ if (! --_a->refcnt) { \
_b = _a->prev; \ _b = _a->prev; \
@ -52,6 +52,17 @@ struct pic_cont {
} \ } \
} while (0) } while (0)
#define PIC_BLK_EXIT(pic) do { \
pic_block *_a; \
while (pic->blk) { \
if (pic->blk->out) \
pic_apply_argv(pic, pic->blk->out, 0); \
_a = pic->blk->prev; \
PIC_BLK_DECREF(pic, pic->blk); \
pic->blk = _a; \
} \
} while (0)
pic_value pic_values(pic_state *, size_t, ...); pic_value pic_values(pic_state *, size_t, ...);
pic_value pic_values_by_array(pic_state *, size_t, pic_value *); pic_value pic_values_by_array(pic_state *, size_t, pic_value *);
pic_value pic_values_by_list(pic_state *, pic_value); pic_value pic_values_by_list(pic_state *, pic_value);

8
src/system.c
View File

@ -7,6 +7,7 @@
#include "picrin.h" #include "picrin.h"
#include "picrin/string.h" #include "picrin/string.h"
#include "picrin/pair.h" #include "picrin/pair.h"
#include "picrin/cont.h"
static pic_value static pic_value
pic_system_cmdline(pic_state *pic) pic_system_cmdline(pic_state *pic)
@ -31,7 +32,6 @@ pic_system_exit(pic_state *pic)
{ {
pic_value v; pic_value v;
int argc, status = EXIT_SUCCESS; int argc, status = EXIT_SUCCESS;
pic_block *blk;
argc = pic_get_args(pic, "|o", &v); argc = pic_get_args(pic, "|o", &v);
if (argc == 1) { if (argc == 1) {
@ -47,11 +47,7 @@ pic_system_exit(pic_state *pic)
} }
} }
blk = pic->blk; PIC_BLK_EXIT(pic);
while (blk) {
pic_apply_argv(pic, blk->out, 0);
blk = blk->prev;
}
exit(status); exit(status);
} }