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

cleanup

This commit is contained in:
Yuichi Nishiwaki 2014-04-05 01:30:51 +09:00
parent 16ad48aade
commit eb990b4399
1 changed files with 47 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

94
src/macro.c
View File

@ -11,40 +11,6 @@
#include "picrin/error.h" #include "picrin/error.h"
#include "picrin/box.h" #include "picrin/box.h"
pic_sym
pic_add_rename(pic_state *pic, struct pic_senv *senv, pic_sym sym)
{
pic_sym rename;
rename = pic_gensym(pic, sym);
pic_put_rename(pic, senv, sym, rename);
return rename;
}
void
pic_put_rename(pic_state *pic, struct pic_senv *senv, pic_sym sym, pic_sym rename)
{
UNUSED(pic);
xh_put(&senv->renames, sym, &rename);
}
bool
pic_find_rename(pic_state *pic, struct pic_senv *senv, pic_sym sym, pic_sym *rename)
{
xh_entry *e;
UNUSED(pic);
if ((e = xh_get(&senv->renames, sym)) == NULL) {
return false;
}
if (rename != NULL) {
*rename = xh_val(e, pic_sym);
}
return true;
}
struct pic_senv * struct pic_senv *
pic_null_syntactic_env(pic_state *pic) pic_null_syntactic_env(pic_state *pic)
{ {
@ -120,27 +86,38 @@ push_scope(pic_state *pic, pic_value formals, struct pic_senv *up, pic_value ass
return senv; return senv;
} }
static void pic_sym
define_macro(pic_state *pic, pic_sym rename, struct pic_proc *proc, struct pic_senv *senv) pic_add_rename(pic_state *pic, struct pic_senv *senv, pic_sym sym)
{ {
struct pic_macro *mac; pic_sym rename;
mac = (struct pic_macro *)pic_obj_alloc(pic, sizeof(struct pic_macro), PIC_TT_MACRO); rename = pic_gensym(pic, sym);
mac->senv = senv; pic_put_rename(pic, senv, sym, rename);
mac->proc = proc; return rename;
xh_put(&pic->macros, rename, &mac);
} }
static struct pic_macro * void
find_macro(pic_state *pic, pic_sym rename) pic_put_rename(pic_state *pic, struct pic_senv *senv, pic_sym sym, pic_sym rename)
{
UNUSED(pic);
xh_put(&senv->renames, sym, &rename);
}
bool
pic_find_rename(pic_state *pic, struct pic_senv *senv, pic_sym sym, pic_sym *rename)
{ {
xh_entry *e; xh_entry *e;
if ((e = xh_get(&pic->macros, rename)) == NULL) { UNUSED(pic);
return NULL;
if ((e = xh_get(&senv->renames, sym)) == NULL) {
return false;
} }
return xh_val(e, struct pic_macro *); if (rename != NULL) {
*rename = xh_val(e, pic_sym);
}
return true;
} }
void void
@ -180,6 +157,29 @@ pic_export(pic_state *pic, pic_sym sym)
xh_put(&pic->lib->exports, sym, &rename); xh_put(&pic->lib->exports, sym, &rename);
} }
static void
define_macro(pic_state *pic, pic_sym rename, struct pic_proc *proc, struct pic_senv *senv)
{
struct pic_macro *mac;
mac = (struct pic_macro *)pic_obj_alloc(pic, sizeof(struct pic_macro), PIC_TT_MACRO);
mac->senv = senv;
mac->proc = proc;
xh_put(&pic->macros, rename, &mac);
}
static struct pic_macro *
find_macro(pic_state *pic, pic_sym rename)
{
xh_entry *e;
if ((e = xh_get(&pic->macros, rename)) == NULL) {
return NULL;
}
return xh_val(e, struct pic_macro *);
}
void void
pic_defmacro(pic_state *pic, const char *name, struct pic_proc *macro) pic_defmacro(pic_state *pic, const char *name, struct pic_proc *macro)
{ {