st: move out ST_CHECK from st_foreach

funny-falcon · funny-falcon · commit f67294a1bea3 · 2012-03-09T03:44:36.000+04:00
diff --git a/ext/tk/tkutil/tkutil.c b/ext/tk/tkutil/tkutil.c
@@ -266,7 +266,6 @@ to_strkey(key, value, hash)
     VALUE value;
     VALUE hash;
 {
-    if (key == Qundef) return ST_CONTINUE;
     rb_hash_aset(hash, rb_funcall(key, ID_to_s, 0, 0), value);
     return ST_CHECK;
 }
@@ -280,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(RHASH_TBL(keys), to_strkey, new_keys);
+    st_foreach_check(RHASH_TBL(keys), to_strkey, new_keys, Qundef);
     return new_keys;
 }
 
@@ -653,7 +652,6 @@ push_kv(key, val, args)
 
     ary = RARRAY_PTR(args)[0];
 
-    if (key == Qundef) return ST_CONTINUE;
 #if 0
     rb_ary_push(ary, key2keyname(key));
     if (val != TK_None) rb_ary_push(ary, val);
@@ -676,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(RHASH_TBL(hash), push_kv, args);
+    st_foreach_check(RHASH_TBL(hash), push_kv, args, Qundef);
 
     if (NIL_P(ary)) {
         return dst;
@@ -695,7 +693,6 @@ push_kv_enc(key, val, args)
 
     ary = RARRAY_PTR(args)[0];
 
-    if (key == Qundef) return ST_CONTINUE;
 #if 0
     rb_ary_push(ary, key2keyname(key));
     if (val != TK_None) {
@@ -721,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(RHASH_TBL(hash), push_kv_enc, args);
+    st_foreach_check(RHASH_TBL(hash), push_kv_enc, args, Qundef);
 
     if (NIL_P(ary)) {
         return dst;
diff --git a/st.c b/st.c
@@ -970,20 +970,13 @@ st_foreach(st_table *table, int (*func)(ANYARGS), st_data_t arg)
             retval = (*func)(key, val, arg);
 	    if (!table->entries_packed) {
 		FIND_ENTRY(table, ptr, key, i);
-		if (retval == ST_CHECK) {
-		    if (!ptr) goto deleted;
-		    goto unpacked_continue;
-		}
+                if (!ptr) return 0;
 		goto unpacked;
 	    }
             switch (retval) {
-	      case ST_CHECK:	/* check if hash is modified during iteration */
-                if (i != find_packed_index(table, key)) {
-		    goto deleted;
-                }
-		/* fall through */
 	      case ST_CONTINUE:
 		break;
+              case ST_CHECK:
 	      case ST_STOP:
 		return 0;
 	      case ST_DELETE:
@@ -1004,20 +997,10 @@ st_foreach(st_table *table, int (*func)(ANYARGS), st_data_t arg)
 	    retval = (*func)(ptr->key, ptr->record, arg);
 	  unpacked:
 	    switch (retval) {
-	      case ST_CHECK:	/* check if hash is modified during iteration */
-		for (tmp = table->bins[i]; tmp != ptr; tmp = tmp->next) {
-		    if (!tmp) {
-		      deleted:
-			/* call func with error notice */
-			retval = (*func)(0, 0, arg, 1);
-			return 1;
-		    }
-		}
-		/* fall through */
 	      case ST_CONTINUE:
-	      unpacked_continue:
 		ptr = ptr->fore;
 		break;
+              case ST_CHECK:
 	      case ST_STOP:
 		return 0;
 	      case ST_DELETE:
