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

inline global_ref and global_def.

This commit is contained in:
Yuichi Nishiwaki 2014-07-27 20:56:19 +09:00
parent 38076e738e
commit 1ae29c8449
1 changed files with 10 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
src/vm.c
View File

@ -387,20 +387,8 @@ pic_get_args(pic_state *pic, const char *format, ...)
return i - 1; return i - 1;
} }
static xh_entry * void
global_ref(pic_state *pic, const char *name) pic_define(pic_state *pic, const char *name, pic_value val)
{
pic_sym sym, rename;
sym = pic_intern_cstr(pic, name);
if (! pic_find_rename(pic, pic->lib->env, sym, &rename)) {
return NULL;
}
return xh_get_int(&pic->globals, rename);
}
static void
global_def(pic_state *pic, const char *name, pic_value val)
{ {
pic_sym sym, rename; pic_sym sym, rename;
@ -412,29 +400,25 @@ global_def(pic_state *pic, const char *name, pic_value val)
pic_warn(pic, "redefining global"); pic_warn(pic, "redefining global");
} }
xh_put_int(&pic->globals, rename, &val);
}
void
pic_define(pic_state *pic, const char *name, pic_value val)
{
/* push to the global arena */ /* push to the global arena */
global_def(pic, name, val); xh_put_int(&pic->globals, rename, &val);
/* export! */ /* export! */
pic_export(pic, pic_intern_cstr(pic, name)); pic_export(pic, sym);
} }
pic_value pic_value
pic_ref(pic_state *pic, const char *name) pic_ref(pic_state *pic, const char *name)
{ {
xh_entry *e; pic_sym sym, rename;
e = global_ref(pic, name); sym = pic_intern_cstr(pic, name);
if (e == NULL) {
if (! pic_find_rename(pic, pic->lib->env, sym, &rename)) {
pic_errorf(pic, "symbol \"%s\" not defined", name); pic_errorf(pic, "symbol \"%s\" not defined", name);
} }
return xh_val(e, pic_value);
return xh_val(xh_get_int(&pic->globals, rename), pic_value);
} }
/* void */ /* void */