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

add pic_import

This commit is contained in:
Yuichi Nishiwaki 2014-01-08 15:38:31 +09:00
parent 33cbf5ff6a
commit dccc234fd9
2 changed files with 42 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/picrin.h
View File

@ -138,6 +138,7 @@ struct pic_lib *pic_find_library(pic_state *, pic_value);
pic->lib = lib__; \ pic->lib = lib__; \
} while (0) } while (0)
void pic_import(pic_state *, pic_value);
void pic_export(pic_state *, pic_sym); void pic_export(pic_state *, pic_sym);
void pic_abort(pic_state *, const char *); void pic_abort(pic_state *, const char *);

76
src/macro.c
View File

@ -190,6 +190,46 @@ strip(pic_state *pic, pic_value expr)
return expr; return expr;
} }
void
pic_import(pic_state *pic, pic_value spec)
{
struct pic_lib *lib;
struct xh_iterator it;
lib = pic_find_library(pic, spec);
if (! lib) {
pic_error(pic, "library not found");
}
it = xh_begin(lib->exports);
while (! xh_isend(&it)) {
#if DEBUG
if (it.e->val >= 0) {
printf("* importing %s as %s\n", it.e->key, pic_symbol_name(pic, (pic_sym)it.e->val));
}
else {
printf("* importing %s\n", it.e->key);
}
#endif
if (it.e->val >= 0) {
xh_put(pic->lib->senv->tbl, it.e->key, it.e->val);
}
else { /* syntax object */
int idx;
struct pic_senv *senv = pic->lib->senv;
idx = senv->xlen;
if (idx >= senv->xcapa) {
pic_abort(pic, "macro table overflow");
}
/* bring macro object from imported lib */
senv->stx[idx] = lib->senv->stx[~it.e->val];
xh_put(senv->tbl, it.e->key, ~idx);
senv->xlen++;
}
xh_next(lib->exports, &it);
}
}
void void
pic_export(pic_state *pic, pic_sym sym) pic_export(pic_state *pic, pic_sym sym)
{ {
@ -300,44 +340,10 @@ macroexpand(pic_state *pic, pic_value expr, struct pic_senv *senv)
return pic_none_value(); return pic_none_value();
} }
case PIC_STX_IMPORT: { case PIC_STX_IMPORT: {
struct pic_lib *lib;
struct xh_iterator it;
for (v = pic_cdr(pic, expr); ! pic_nil_p(v); v = pic_cdr(pic, v)) { for (v = pic_cdr(pic, expr); ! pic_nil_p(v); v = pic_cdr(pic, v)) {
pic_value spec = pic_car(pic, v); pic_value spec = pic_car(pic, v);
lib = pic_find_library(pic, spec); pic_import(pic, spec);
if (! lib) {
pic_error(pic, "library not found");
}
it = xh_begin(lib->exports);
while (! xh_isend(&it)) {
#if DEBUG
if (it.e->val >= 0) {
printf("* importing %s as %s\n", it.e->key, pic_symbol_name(pic, (pic_sym)it.e->val));
}
else {
printf("* importing %s\n", it.e->key);
}
#endif
if (it.e->val >= 0) {
xh_put(pic->lib->senv->tbl, it.e->key, it.e->val);
}
else { /* syntax object */
int idx;
struct pic_senv *senv = pic->lib->senv;
idx = senv->xlen;
if (idx >= senv->xcapa) {
pic_abort(pic, "macro table overflow");
}
/* bring macro object from imported lib */
senv->stx[idx] = lib->senv->stx[~it.e->val];
xh_put(senv->tbl, it.e->key, ~idx);
senv->xlen++;
}
xh_next(lib->exports, &it);
}
} }
return pic_none_value(); return pic_none_value();
} }