cleanup extra.h
This commit is contained in:
Yuichi Nishiwaki
parent
b436207eba
commit
e6382965ef
|
|
@ -52,30 +52,6 @@ pic_errorf(pic_state *pic, const char *fmt, ...)
|
|||
pic_error(pic, "", msg, pic_nil_value(pic));
|
||||
}
|
||||
|
||||
static pic_value
|
||||
native_exception_handler(pic_state *pic)
|
||||
{
|
||||
pic_value err;
|
||||
|
||||
pic_get_args(pic, "o", &err);
|
||||
|
||||
pic->err = err;
|
||||
|
||||
pic_call(pic, pic_closure_ref(pic, 0), 1, pic_false_value(pic));
|
||||
|
||||
PIC_UNREACHABLE();
|
||||
}
|
||||
|
||||
void
|
||||
pic_push_native_handler(pic_state *pic, struct pic_cont *cont)
|
||||
{
|
||||
pic_value handler;
|
||||
|
||||
handler = pic_lambda(pic, native_exception_handler, 1, pic_make_cont(pic, cont));
|
||||
|
||||
pic_push_handler(pic, handler);
|
||||
}
|
||||
|
||||
void
|
||||
pic_push_handler(pic_state *pic, pic_value handler)
|
||||
{
|
||||
|
|
@ -103,6 +79,30 @@ pic_pop_handler(pic_state *pic)
|
|||
return pic_obj_value(*--pic->xp);
|
||||
}
|
||||
|
||||
static pic_value
|
||||
native_exception_handler(pic_state *pic)
|
||||
{
|
||||
pic_value err;
|
||||
|
||||
pic_get_args(pic, "o", &err);
|
||||
|
||||
pic->err = err;
|
||||
|
||||
pic_call(pic, pic_closure_ref(pic, 0), 1, pic_false_value(pic));
|
||||
|
||||
PIC_UNREACHABLE();
|
||||
}
|
||||
|
||||
void
|
||||
pic_push_native_handler(pic_state *pic, struct pic_cont *cont)
|
||||
{
|
||||
pic_value handler;
|
||||
|
||||
handler = pic_lambda(pic, native_exception_handler, 1, pic_make_cont(pic, cont));
|
||||
|
||||
pic_push_handler(pic, handler);
|
||||
}
|
||||
|
||||
pic_value
|
||||
pic_err(pic_state *pic)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -14,20 +14,23 @@ extern "C" {
|
|||
void *pic_default_allocf(void *, void *, size_t);
|
||||
#endif
|
||||
|
||||
pic_value pic_read(pic_state *, pic_value port);
|
||||
pic_value pic_read_cstr(pic_state *, const char *);
|
||||
|
||||
#define pic_assert_type(pic, v, type) \
|
||||
if (! pic_##type##_p(pic, v)) { \
|
||||
pic_errorf(pic, "expected " #type ", but got ~s", v); \
|
||||
}
|
||||
pic_value pic_expand(pic_state *, pic_value program, pic_value env);
|
||||
pic_value pic_eval(pic_state *, pic_value program, const char *lib);
|
||||
|
||||
void pic_load(pic_state *, pic_value port);
|
||||
void pic_load_cstr(pic_state *, const char *);
|
||||
|
||||
/* extra xfile methods */
|
||||
|
||||
xFILE *xfile_xstdin(pic_state *);
|
||||
xFILE *xfile_xstdout(pic_state *);
|
||||
xFILE *xfile_xstderr(pic_state *);
|
||||
|
||||
#define xstdin (xfile_xstdin(pic))
|
||||
#define xstdout (xfile_xstdout(pic))
|
||||
#define xstderr (xfile_xstderr(pic))
|
||||
|
||||
#if PIC_ENABLE_STDIO
|
||||
xFILE *xfopen_file(pic_state *, FILE *, const char *mode);
|
||||
#endif
|
||||
|
|
@ -35,24 +38,39 @@ xFILE *xfopen_buf(pic_state *, const char *buf, int len, const char *mode);
|
|||
int xfget_buf(pic_state *, xFILE *file, const char **buf, int *len);
|
||||
xFILE *xfopen_null(pic_state *, const char *mode);
|
||||
|
||||
#define pic_void(exec) \
|
||||
pic_void_(PIC_GENSYM(ai), exec)
|
||||
/* port manipulation */
|
||||
|
||||
#define pic_stdin(pic) pic_funcall(pic, "picrin.base", "current-input-port", 0)
|
||||
#define pic_stdout(pic) pic_funcall(pic, "picrin.base", "current-output-port", 0)
|
||||
#define pic_stderr(pic) pic_funcall(pic, "picrin.base", "current-error-port", 0)
|
||||
pic_value pic_write(pic_state *, pic_value); /* returns given obj */
|
||||
pic_value pic_fwrite(pic_state *, pic_value, xFILE *);
|
||||
void pic_printf(pic_state *, const char *, ...);
|
||||
void pic_fprintf(pic_state *, pic_value port, const char *, ...);
|
||||
pic_value pic_display(pic_state *, pic_value);
|
||||
pic_value pic_fdisplay(pic_state *, pic_value, xFILE *);
|
||||
|
||||
/* utility macros */
|
||||
|
||||
#define pic_for_each(var, list, it) \
|
||||
for (it = (list); ! pic_nil_p(pic, it); it = pic_cdr(pic, it)) \
|
||||
if ((var = pic_car(pic, it)), true)
|
||||
|
||||
#define pic_push(pic, item, place) (place = pic_cons(pic, item, place))
|
||||
#define pic_pop(pic, place) (place = pic_cdr(pic, place))
|
||||
|
||||
#define pic_assert_type(pic, v, type) do { \
|
||||
if (! pic_##type##_p(pic, v)) \
|
||||
pic_errorf(pic, "expected " #type ", but got ~s", v); \
|
||||
} while (0)
|
||||
|
||||
#define pic_void(exec) pic_void_(PIC_GENSYM(ai), exec)
|
||||
#define pic_void_(ai,exec) do { \
|
||||
size_t ai = pic_enter(pic); \
|
||||
exec; \
|
||||
pic_leave(pic, ai); \
|
||||
} while (0)
|
||||
|
||||
pic_value pic_read(pic_state *, pic_value port);
|
||||
pic_value pic_read_cstr(pic_state *, const char *);
|
||||
|
||||
pic_value pic_expand(pic_state *, pic_value program, pic_value env);
|
||||
|
||||
pic_value pic_eval(pic_state *, pic_value program, const char *lib);
|
||||
|
||||
void pic_load(pic_state *, pic_value port);
|
||||
void pic_load_cstr(pic_state *, const char *);
|
||||
|
||||
#define pic_deflibrary(pic, lib) do { \
|
||||
if (! pic_find_library(pic, lib)) { \
|
||||
pic_make_library(pic, lib); \
|
||||
|
|
@ -60,29 +78,23 @@ void pic_load_cstr(pic_state *, const char *);
|
|||
pic_in_library(pic, lib); \
|
||||
} while (0)
|
||||
|
||||
/* for pic_try & pic_catch macros */
|
||||
struct pic_cont *pic_alloca_cont(pic_state *);
|
||||
pic_value pic_make_cont(pic_state *, struct pic_cont *);
|
||||
void pic_push_native_handler(pic_state *, struct pic_cont *);
|
||||
void pic_push_handler(pic_state *, pic_value);
|
||||
pic_value pic_pop_handler(pic_state *);
|
||||
void pic_save_point(pic_state *, struct pic_cont *, PIC_JMPBUF *);
|
||||
void pic_exit_point(pic_state *);
|
||||
|
||||
/* do not return from try block! */
|
||||
|
||||
pic_value pic_err(pic_state *);
|
||||
|
||||
#define pic_try \
|
||||
pic_try_(PIC_GENSYM(cont), PIC_GENSYM(handler))
|
||||
#define pic_catch \
|
||||
pic_catch_(PIC_GENSYM(label))
|
||||
#define pic_try_(cont, handler) \
|
||||
#define pic_try pic_try_(PIC_GENSYM(cont), PIC_GENSYM(jmp))
|
||||
#define pic_try_(cont, jmp) \
|
||||
do { \
|
||||
PIC_JMPBUF jmp; \
|
||||
struct pic_cont *cont = pic_alloca_cont(pic); \
|
||||
if (PIC_SETJMP(pic, jmp) == 0) { \
|
||||
pic_save_point(pic, cont, &jmp); \
|
||||
pic_push_native_handler(pic, cont);
|
||||
#define pic_catch pic_catch_(PIC_GENSYM(label))
|
||||
#define pic_catch_(label) \
|
||||
pic_pop_handler(pic); \
|
||||
pic_exit_point(pic); \
|
||||
|
|
@ -93,30 +105,15 @@ pic_value pic_err(pic_state *);
|
|||
if (0) \
|
||||
label:
|
||||
|
||||
pic_value pic_err(pic_state *);
|
||||
|
||||
/* for debug */
|
||||
|
||||
PIC_NORETURN void pic_error(pic_state *, const char *type, const char *msg, pic_value irrs);
|
||||
|
||||
#define pic_for_each(var, list, it) \
|
||||
for (it = (list); ! pic_nil_p(pic, it); it = pic_cdr(pic, it)) \
|
||||
if ((var = pic_car(pic, it)), true)
|
||||
|
||||
#define pic_push(pic, item, place) (place = pic_cons(pic, item, place))
|
||||
#define pic_pop(pic, place) (place = pic_cdr(pic, place))
|
||||
|
||||
void pic_warnf(pic_state *, const char *, ...);
|
||||
pic_value pic_get_backtrace(pic_state *);
|
||||
void pic_print_backtrace(pic_state *, xFILE *);
|
||||
|
||||
#define pic_stdin(pic) pic_funcall(pic, "picrin.base", "current-input-port", 0)
|
||||
#define pic_stdout(pic) pic_funcall(pic, "picrin.base", "current-output-port", 0)
|
||||
#define pic_stderr(pic) pic_funcall(pic, "picrin.base", "current-error-port", 0)
|
||||
|
||||
pic_value pic_write(pic_state *, pic_value); /* returns given obj */
|
||||
pic_value pic_fwrite(pic_state *, pic_value, xFILE *);
|
||||
void pic_printf(pic_state *, const char *, ...);
|
||||
void pic_fprintf(pic_state *, pic_value port, const char *, ...);
|
||||
pic_value pic_display(pic_state *, pic_value);
|
||||
pic_value pic_fdisplay(pic_state *, pic_value, xFILE *);
|
||||
|
||||
pic_value pic_library_environment(pic_state *, const char *);
|
||||
|
||||
#if defined(__cplusplus)
|
||||
|
|
|
|||
|
|
@ -147,8 +147,7 @@ typedef unsigned long uint32_t;
|
|||
# undef GCC_VERSION
|
||||
#endif
|
||||
|
||||
#define PIC_SWAP(type,a,b) \
|
||||
PIC_SWAP_HELPER_(type, PIC_GENSYM(tmp), a, b)
|
||||
#define PIC_SWAP(type,a,b) PIC_SWAP_HELPER_(type, PIC_GENSYM(tmp), a, b)
|
||||
#define PIC_SWAP_HELPER_(type,tmp,a,b) \
|
||||
do { \
|
||||
type tmp = (a); \
|
||||
|
|
|
|||
Loading…
Reference in New Issue