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

accept injected symbols (syntactic-closures) at the places of lambda formals

This commit is contained in:
Yuichi Nishiwaki 2013-11-28 18:40:31 +09:00
parent 6d0f75dd7e
commit e10bbac8e5
1 changed files with 18 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/macro.c
View File

@ -11,6 +11,9 @@
#define FALLTHROUGH ((void)0)
static pic_value macroexpand(pic_state *, pic_value, struct pic_senv *);
static pic_value macroexpand_list(pic_state *, pic_value, struct pic_senv *);
static pic_sym
new_uniq_sym(pic_state *pic, pic_sym base)
{
@ -55,13 +58,27 @@ new_local_senv(pic_state *pic, pic_value formals, struct pic_senv *up)
senv->xcapa = 0;
for (a = formals; pic_pair_p(a); a = pic_cdr(pic, a)) {
sym = pic_sym(pic_car(pic, a));
pic_value v = pic_car(pic, a);
if (! pic_symbol_p(v)) {
v = macroexpand(pic, v, up);
}
if (! pic_symbol_p(v)) {
pic_error(pic, "syntax error");
}
sym = pic_sym(v);
xh_put(senv->tbl, pic_symbol_name(pic, sym), (int)new_uniq_sym(pic, sym));
}
if (! pic_symbol_p(a)) {
a = macroexpand(pic, a, up);
}
if (pic_symbol_p(a)) {
sym = pic_sym(a);
xh_put(senv->tbl, pic_symbol_name(pic, sym), (int)new_uniq_sym(pic, sym));
}
else if (! pic_nil_p(a)) {
pic_error(pic, "syntax error");
}
return senv;
}
@ -134,8 +151,6 @@ pic_defmacro(pic_state *pic, const char *name, struct pic_proc *macro)
pic_defsyntax(pic, name, macro, NULL);
}
static pic_value macroexpand_list(pic_state *, pic_value, struct pic_senv *);
static pic_value
macroexpand(pic_state *pic, pic_value expr, struct pic_senv *senv)
{