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

pic_lookup_identifier -> pic_find_identifier

This commit is contained in:
Yuichi Nishiwaki 2016-02-18 16:38:59 +09:00
parent 95740b86a0
commit 7816be80c1
3 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
extlib/benz/bool.c
View File

@ -45,8 +45,8 @@ internal_equal_p(pic_state *pic, pic_value x, pic_value y, int depth, khash_t(m)
id1 = pic_id_ptr(x); id1 = pic_id_ptr(x);
id2 = pic_id_ptr(y); id2 = pic_id_ptr(y);
s1 = pic_lookup_identifier(pic, id1->u.id.id, id1->u.id.env); s1 = pic_find_identifier(pic, id1->u.id.id, id1->u.id.env);
s2 = pic_lookup_identifier(pic, id2->u.id.id, id2->u.id.env); s2 = pic_find_identifier(pic, id2->u.id.id, id2->u.id.env);
return s1 == s2; return s1 == s2;
} }

1
extlib/benz/include/picrin/macro.h
View File

@ -27,7 +27,6 @@ struct pic_env *pic_make_env(pic_state *, struct pic_env *);
pic_sym *pic_add_identifier(pic_state *, pic_id *, struct pic_env *); pic_sym *pic_add_identifier(pic_state *, pic_id *, struct pic_env *);
pic_sym *pic_put_identifier(pic_state *, pic_id *, pic_sym *, struct pic_env *); pic_sym *pic_put_identifier(pic_state *, pic_id *, pic_sym *, struct pic_env *);
pic_sym *pic_find_identifier(pic_state *, pic_id *, struct pic_env *); pic_sym *pic_find_identifier(pic_state *, pic_id *, struct pic_env *);
pic_sym *pic_lookup_identifier(pic_state *, pic_id *, struct pic_env *);
pic_value pic_expand(pic_state *, pic_value, struct pic_env *); pic_value pic_expand(pic_state *, pic_value, struct pic_env *);

18
extlib/benz/macro.c
View File

@ -64,7 +64,7 @@ pic_put_identifier(pic_state *pic, pic_id *id, pic_sym *uid, struct pic_env *env
} }
pic_sym * pic_sym *
pic_find_identifier(pic_state PIC_UNUSED(*pic), pic_id *id, struct pic_env *env) search_scope(pic_state *pic, pic_id *id, struct pic_env *env)
{ {
khiter_t it; khiter_t it;
@ -76,12 +76,12 @@ pic_find_identifier(pic_state PIC_UNUSED(*pic), pic_id *id, struct pic_env *env)
} }
static pic_sym * static pic_sym *
lookup(pic_state *pic, pic_id *id, struct pic_env *env) search(pic_state *pic, pic_id *id, struct pic_env *env)
{ {
pic_sym *uid = NULL; pic_sym *uid = NULL;
while (env != NULL) { while (env != NULL) {
uid = pic_find_identifier(pic, id, env); uid = search_scope(pic, id, env);
if (uid != NULL) { if (uid != NULL) {
break; break;
} }
@ -91,11 +91,11 @@ lookup(pic_state *pic, pic_id *id, struct pic_env *env)
} }
pic_sym * pic_sym *
pic_lookup_identifier(pic_state *pic, pic_id *id, struct pic_env *env) pic_find_identifier(pic_state *pic, pic_id *id, struct pic_env *env)
{ {
pic_sym *uid; pic_sym *uid;
while ((uid = lookup(pic, id, env)) == NULL) { while ((uid = search(pic, id, env)) == NULL) {
if (pic_sym_p(pic_obj_value(id))) { if (pic_sym_p(pic_obj_value(id))) {
break; break;
} }
@ -152,7 +152,7 @@ expand_var(pic_state *pic, pic_id *id, struct pic_env *env, pic_value deferred)
struct pic_proc *mac; struct pic_proc *mac;
pic_sym *functor; pic_sym *functor;
functor = pic_lookup_identifier(pic, id, env); functor = pic_find_identifier(pic, id, env);
if ((mac = find_macro(pic, functor)) != NULL) { if ((mac = find_macro(pic, functor)) != NULL) {
return expand(pic, pic_call(pic, mac, 2, pic_obj_value(id), pic_obj_value(env)), env, deferred); return expand(pic, pic_call(pic, mac, 2, pic_obj_value(id), pic_obj_value(env)), env, deferred);
@ -248,7 +248,7 @@ expand_define(pic_state *pic, pic_value expr, struct pic_env *env, pic_value def
pic_value val; pic_value val;
id = pic_id_ptr(pic_cadr(pic, expr)); id = pic_id_ptr(pic_cadr(pic, expr));
if ((uid = pic_find_identifier(pic, id, env)) == NULL) { if ((uid = search_scope(pic, id, env)) == NULL) {
uid = pic_add_identifier(pic, id, env); uid = pic_add_identifier(pic, id, env);
} else { } else {
shadow_macro(pic, uid); shadow_macro(pic, uid);
@ -267,7 +267,7 @@ expand_defmacro(pic_state *pic, pic_value expr, struct pic_env *env)
pic_sym *uid; pic_sym *uid;
id = pic_id_ptr(pic_cadr(pic, expr)); id = pic_id_ptr(pic_cadr(pic, expr));
if ((uid = pic_find_identifier(pic, id, env)) == NULL) { if ((uid = search_scope(pic, id, env)) == NULL) {
uid = pic_add_identifier(pic, id, env); uid = pic_add_identifier(pic, id, env);
} }
@ -299,7 +299,7 @@ expand_node(pic_state *pic, pic_value expr, struct pic_env *env, pic_value defer
if (pic_id_p(pic_car(pic, expr))) { if (pic_id_p(pic_car(pic, expr))) {
pic_sym *functor; pic_sym *functor;
functor = pic_lookup_identifier(pic, pic_id_ptr(pic_car(pic, expr)), env); functor = pic_find_identifier(pic, pic_id_ptr(pic_car(pic, expr)), env);
if (functor == pic->sDEFINE_MACRO) { if (functor == pic->sDEFINE_MACRO) {
return expand_defmacro(pic, expr, env); return expand_defmacro(pic, expr, env);