Skip to content

Cleanup some st.c and hash.c code #107

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
funny-falcon wants to merge 10 commits into from
Closed

Cleanup some st.c and hash.c code #107

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
0c00999
st.c : use real_entries in st_delete for packed tables
funny-falcon Mar 24, 2012
bec6362
st.c : remove ancient check
funny-falcon Mar 24, 2012
e8be459
st.c : remove call to iter function with error argument cause it is n…
funny-falcon Mar 24, 2012
63e622e
hash.c : remove unnecessary checks for Qundef in hash iterations
funny-falcon Mar 18, 2012
b45d21c
hash.c : do not allocate st_table when it is not necessary
funny-falcon Mar 24, 2012
91c3bdb
st.c : do not remove entry from chain until cleanup_safe
funny-falcon Mar 24, 2012
b626324
* st.c : Save deleted mark as a bit, so that st_delete_safe could be …
funny-falcon Mar 24, 2012
92724bd
* st.c : remove ST_CHECK at all
funny-falcon Mar 26, 2012
eea6088
st.c : ultra packing st_table
funny-falcon Mar 26, 2012
42b064c
st.c : st_shift
funny-falcon Mar 26, 2012
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 7 additions & 6 deletions ext/-test-/st/numhash/numhash.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,21 +42,22 @@ numhash_aset(VALUE self, VALUE key, VALUE data)
}

static int
numhash_i(st_data_t key, st_data_t value, st_data_t arg, int error)
numhash_i(st_data_t key, st_data_t value, st_data_t arg)
{
VALUE ret;
if (key == 0 && value == 0 && error == 1) rb_raise(rb_eRuntimeError, "numhash modified");
ret = rb_yield_values(3, (VALUE)key, (VALUE)value, (VALUE)arg);
if (ret == Qtrue) return ST_CHECK;
return ST_CONTINUE;
}

static VALUE
numhash_each(VALUE self)
{
st_table *table = DATA_PTR(self);
st_data_t data = (st_data_t)self;
return st_foreach_check(table, numhash_i, data, data) ? Qtrue : Qfalse;
int res;
table->safe_mode = ST_SAFEMODE;
res = st_foreach_check(table, numhash_i, (st_data_t)self);
table->safe_mode = ST_REGULAR;
return res ? Qtrue : Qfalse;
}

static int
Expand Down Expand Up @@ -99,7 +100,7 @@ static VALUE
numhash_delete_safe(VALUE self, VALUE key)
{
st_data_t val, k = (st_data_t)key;
if (st_delete_safe((st_table *)DATA_PTR(self), &k, &val, (st_data_t)self)) {
if (st_delete((st_table *)DATA_PTR(self), &k, &val)) {
return val;
}
return Qnil;
Expand Down
16 changes: 8 additions & 8 deletions ext/tk/tkutil/tkutil.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -267,7 +267,7 @@ to_strkey(key, value, hash)
VALUE hash;
{
rb_hash_aset(hash, rb_funcall(key, ID_to_s, 0, 0), value);
return ST_CHECK;
return ST_CONTINUE;
}

static VALUE
Expand All @@ -279,7 +279,7 @@ tk_symbolkey2str(self, keys)

if NIL_P(keys) return new_keys;
keys = rb_convert_type(keys, T_HASH, "Hash", "to_hash");
st_foreach_check(RHASH_TBL(keys), to_strkey, new_keys, Qundef);
st_foreach_check(RHASH_TBL(keys), to_strkey, new_keys);
return new_keys;
}

Expand Down Expand Up @@ -658,11 +658,11 @@ push_kv(key, val, args)
#endif
rb_ary_push(ary, key2keyname(key));

if (val == TK_None) return ST_CHECK;
if (val == TK_None) return ST_CONTINUE;

rb_ary_push(ary, get_eval_string_core(val, Qnil, RARRAY_PTR(args)[1]));

return ST_CHECK;
return ST_CONTINUE;
}

static VALUE
Expand All @@ -674,7 +674,7 @@ hash2kv(hash, ary, self)
volatile VALUE dst = rb_ary_new2(2 * RHASH_SIZE(hash));
volatile VALUE args = rb_ary_new3(2, dst, self);

st_foreach_check(RHASH_TBL(hash), push_kv, args, Qundef);
st_foreach_check(RHASH_TBL(hash), push_kv, args);

if (NIL_P(ary)) {
return dst;
Expand Down Expand Up @@ -702,11 +702,11 @@ push_kv_enc(key, val, args)
#endif
rb_ary_push(ary, key2keyname(key));

if (val == TK_None) return ST_CHECK;
if (val == TK_None) return ST_CONTINUE;

rb_ary_push(ary, get_eval_string_core(val, Qtrue, RARRAY_PTR(args)[1]));

return ST_CHECK;
return ST_CONTINUE;
}

static VALUE
Expand All @@ -718,7 +718,7 @@ hash2kv_enc(hash, ary, self)
volatile VALUE dst = rb_ary_new2(2 * RHASH_SIZE(hash));
volatile VALUE args = rb_ary_new3(2, dst, self);

st_foreach_check(RHASH_TBL(hash), push_kv_enc, args, Qundef);
st_foreach_check(RHASH_TBL(hash), push_kv_enc, args);

if (NIL_P(ary)) {
return dst;
Expand Down
Loading