kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

variable.c: setup_const_entry

Browse source 
* variable.c (setup_const_entry): extract rb_const_entry_t setup
  from rb_const_set.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@50287 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2015-04-13 07:54:52 +00:00
parent 938910492c
commit 3124d55a3c
1 changed files with 12 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
variable.c
View file

@ -20,6 +20,8 @@
st_table *rb_global_tbl;
static ID autoload, classpath, tmp_classpath, classid;
static void setup_const_entry(rb_const_entry_t *, VALUE, VALUE, rb_const_flag_t);
void
Init_var_tables(void)
{
@ -2208,6 +2210,7 @@ rb_const_set(VALUE klass, ID id, VALUE val)
{
rb_const_entry_t *ce;
rb_const_flag_t visibility = CONST_PUBLIC;
st_table *tbl = RCLASS_CONST_TBL(klass);
if (NIL_P(klass)) {
rb_raise(rb_eTypeError, "no class/module to define constant %"PRIsVALUE"",
@ -2215,8 +2218,8 @@ rb_const_set(VALUE klass, ID id, VALUE val)
}
check_before_mod_set(klass, id, val, "constant");
if (!RCLASS_CONST_TBL(klass)) {
RCLASS_CONST_TBL(klass) = st_init_numtable();
if (!tbl) {
RCLASS_CONST_TBL(klass) = tbl = st_init_numtable();
}
else {
ce = rb_const_lookup(klass, id);
@ -2256,11 +2259,16 @@ rb_const_set(VALUE klass, ID id, VALUE val)
rb_clear_constant_cache();
ce = ZALLOC(rb_const_entry_t);
setup_const_entry(ce, klass, val, visibility);
st_insert(tbl, (st_data_t)id, (st_data_t)ce);
}
static void
setup_const_entry(rb_const_entry_t *ce, VALUE klass, VALUE val, rb_const_flag_t visibility)
{
ce->flag = visibility;
ce->line = rb_sourceline();
st_insert(RCLASS_CONST_TBL(klass), (st_data_t)id, (st_data_t)ce);
RB_OBJ_WRITE(klass, &ce->value, val);
RB_OBJ_WRITE(klass, &ce->file, rb_sourcefilename());
}