warn macro redefinition only when transformer object slot is being overwritten

This commit is contained in:
Yuichi Nishiwaki 2015-06-17 00:11:02 +09:00
parent 490c97cd81
commit 62b7c1a0f9
1 changed files with 3 additions and 2 deletions

View File

@ -51,6 +51,9 @@ resolve(pic_state *pic, pic_value var, struct pic_env *env)
static void static void
define_macro(pic_state *pic, pic_sym *uid, struct pic_proc *mac) define_macro(pic_state *pic, pic_sym *uid, struct pic_proc *mac)
{ {
if (pic_dict_has(pic, pic->macros, uid)) {
pic_warnf(pic, "redefining syntax variable: ~s", pic_obj_value(uid));
}
pic_dict_set(pic, pic->macros, uid, pic_obj_value(mac)); pic_dict_set(pic, pic->macros, uid, pic_obj_value(mac));
} }
@ -209,8 +212,6 @@ expand_defmacro(pic_state *pic, pic_value expr, struct pic_env *env)
} }
if ((uid = pic_find_variable(pic, env, var)) == NULL) { if ((uid = pic_find_variable(pic, env, var)) == NULL) {
uid = pic_add_variable(pic, env, var); uid = pic_add_variable(pic, env, var);
} else {
pic_warnf(pic, "redefining syntax variable: ~s", var);
} }
val = pic_cadr(pic, pic_cdr(pic, expr)); val = pic_cadr(pic, pic_cdr(pic, expr));