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

add define_macro

This commit is contained in:
Yuichi Nishiwaki 2014-04-04 12:55:51 +09:00
parent 0823149e4f
commit 845778eefb
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/macro.c
View File

@ -142,6 +142,12 @@ add_macro(pic_state *pic, pic_sym rename, struct pic_macro *mac)
xh_put(&pic->macros, rename, &mac); xh_put(&pic->macros, rename, &mac);
} }
static void
define_macro(pic_state *pic, pic_sym rename, struct pic_proc *proc, struct pic_senv *senv)
{
add_macro(pic, rename, macro_new(pic, proc, senv));
}
static struct pic_macro * static struct pic_macro *
find_macro(pic_state *pic, pic_sym rename) find_macro(pic_state *pic, pic_sym rename)
{ {
@ -233,16 +239,12 @@ pic_export(pic_state *pic, pic_sym sym)
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)
{ {
struct pic_macro *mac;
pic_sym sym, rename; pic_sym sym, rename;
/* new macro */
mac = macro_new(pic, macro, NULL);
/* symbol registration */ /* symbol registration */
sym = pic_intern_cstr(pic, name); sym = pic_intern_cstr(pic, name);
rename = pic_add_rename(pic, pic->lib->senv, sym); rename = pic_add_rename(pic, pic->lib->senv, sym);
add_macro(pic, rename, mac); define_macro(pic, rename, macro, NULL);
/* auto export! */ /* auto export! */
pic_export(pic, sym); pic_export(pic, sym);
@ -386,7 +388,7 @@ macroexpand_defsyntax(pic_state *pic, pic_value expr, struct pic_senv *senv, pic
pic_errorf(pic, "macro definition \"~s\" evaluates to non-procedure object", var); pic_errorf(pic, "macro definition \"~s\" evaluates to non-procedure object", var);
} }
add_macro(pic, rename, macro_new(pic, pic_proc_ptr(val), senv)); define_macro(pic, rename, pic_proc_ptr(val), senv);
return pic_none_value(); return pic_none_value();
} }
@ -433,7 +435,7 @@ macroexpand_defmacro(pic_state *pic, pic_value expr, struct pic_senv *senv)
pic_errorf(pic, "macro definition \"~s\" evaluates to non-procedure object", var); pic_errorf(pic, "macro definition \"~s\" evaluates to non-procedure object", var);
} }
add_macro(pic, rename, macro_new(pic, pic_proc_ptr(val), NULL)); define_macro(pic, rename, pic_proc_ptr(val), NULL);
return pic_none_value(); return pic_none_value();
} }