nobu	2012-03-29 16:36:12 +0900 (Thu, 29 Mar 2012)

  New Revision: 35170

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=35170

  Log:
    * st.c (st_update): add existing parameter to the callback function.

  Modified files:
    trunk/ChangeLog
    trunk/ext/-test-/st/update/update.c
    trunk/gc.c
    trunk/include/ruby/st.h
    trunk/load.c
    trunk/st.c
    trunk/test/-ext-/st/test_update.rb

Index: include/ruby/st.h
===================================================================
--- include/ruby/st.h	(revision 35169)
+++ include/ruby/st.h	(revision 35170)
@@ -121,7 +121,8 @@
 int st_insert2(st_table *, st_data_t, st_data_t, st_data_t (*)(st_data_t));
 int st_lookup(st_table *, st_data_t, st_data_t *);
 int st_get_key(st_table *, st_data_t, st_data_t *);
-int st_update(st_table *table, st_data_t key, int (*func)(st_data_t key, st_data_t *value, st_data_t arg), st_data_t arg);
+typedef int st_update_callback_func(st_data_t key, st_data_t *value, st_data_t arg, int existing);
+int st_update(st_table *table, st_data_t key, st_update_callback_func *func, st_data_t arg);
 int st_foreach(st_table *, int (*)(ANYARGS), st_data_t);
 int st_foreach_check(st_table *, int (*)(ANYARGS), st_data_t, st_data_t);
 int st_reverse_foreach(st_table *, int (*)(ANYARGS), st_data_t);
Index: ChangeLog
===================================================================
--- ChangeLog	(revision 35169)
+++ ChangeLog	(revision 35170)
@@ -1,3 +1,7 @@
+Thu Mar 29 16:36:10 2012  Nobuyoshi Nakada  <nobu@r...>
+
+	* st.c (st_update): add existing parameter to the callback function.
+
 Thu Mar 29 16:35:32 2012  Nobuyoshi Nakada  <nobu@r...>
 
 	* lib/test/unit.rb (terminal_width, del_status_line, put_status):
Index: load.c
===================================================================
--- load.c	(revision 35169)
+++ load.c	(revision 35170)
@@ -417,9 +417,10 @@
 }
 
 static int
-release_barrier(st_data_t key, st_data_t *value, st_data_t done)
+release_barrier(st_data_t key, st_data_t *value, st_data_t done, int existing)
 {
     VALUE barrier = (VALUE)*value;
+    if (!existing) return ST_STOP;
     if (done ? rb_barrier_destroy(barrier) : rb_barrier_release(barrier)) {
 	/* still in-use */
 	return ST_CONTINUE;
Index: st.c
===================================================================
--- st.c	(revision 35169)
+++ st.c	(revision 35170)
@@ -825,12 +825,12 @@
 }
 
 int
-st_update(st_table *table, st_data_t key, int (*func)(st_data_t key, st_data_t *value, st_data_t arg), st_data_t arg)
+st_update(st_table *table, st_data_t key, st_update_callback_func *func, st_data_t arg)
 {
     st_index_t hash_val, bin_pos;
     register st_table_entry *ptr, **last, *tmp;
-    st_data_t value;
-    int retval;
+    st_data_t value = 0;
+    int retval, existing = 0;
 
     hash_val = do_hash(key, table);
 
@@ -838,38 +838,49 @@
 	st_index_t i = find_packed_index(table, hash_val, key);
 	if (i < table->real_entries) {
 	    value = PVAL(table, i);
-	    retval = (*func)(key, &value, arg);
+	    existing = 1;
+	}
+	{
+	    retval = (*func)(key, &value, arg, existing);
 	    if (!table->entries_packed) {
 		FIND_ENTRY(table, ptr, hash_val, bin_pos);
-		if (ptr == 0) return 0;
 		goto unpacked;
 	    }
 	    switch (retval) {
 	      case ST_CONTINUE:
+		if (!existing) {
+		    add_packed_direct(table, key, value, hash_val);
+		    break;
+		}
 		PVAL_SET(table, i, value);
 		break;
 	      case ST_DELETE:
+		if (!existing) break;
 		remove_packed_entry(table, i);
 	    }
-	    return 1;
 	}
-	return 0;
+	return existing;
     }
 
     FIND_ENTRY(table, ptr, hash_val, bin_pos);
 
-    if (ptr == 0) {
-	return 0;
+    if (ptr != 0) {
+	value = ptr->record;
+	existing = 1;
     }
-    else {
-	value = ptr->record;
-	retval = (*func)(ptr->key, &value, arg);
+    {
+	retval = (*func)(ptr->key, &value, arg, existing);
       unpacked:
 	switch (retval) {
 	  case ST_CONTINUE:
+	    if (!existing) {
+		add_direct(table, key, value, hash_val, hash_val % table->num_bins);
+		break;
+	    }
 	    ptr->record = value;
 	    break;
 	  case ST_DELETE:
+	    if (!existing) break;
 	    last = &table->bins[bin_pos];
 	    for (; (tmp = *last) != 0; last = &tmp->next) {
 		if (ptr == tmp) {
@@ -882,7 +893,7 @@
 	    }
 	    break;
 	}
-	return 1;
+	return existing;
     }
 }
 
Index: gc.c
===================================================================
--- gc.c	(revision 35169)
+++ gc.c	(revision 35170)
@@ -3672,9 +3672,10 @@
 }
 
 static int
-wmap_final_func(st_data_t key, st_data_t *value, st_data_t arg)
+wmap_final_func(st_data_t key, st_data_t *value, st_data_t arg, int existing)
 {
     VALUE obj = (VALUE)key, ary = (VALUE)*value;
+    if (!existing) return ST_STOP;
     rb_ary_delete(ary, obj);
     if (!RARRAY_LEN(ary)) return ST_DELETE;
     return ST_CONTINUE;
Index: ext/-test-/st/update/update.c
===================================================================
--- ext/-test-/st/update/update.c	(revision 35169)
+++ ext/-test-/st/update/update.c	(revision 35170)
@@ -2,9 +2,9 @@
 #include <ruby/st.h>
 
 static int
-update_func(st_data_t key, st_data_t *value, st_data_t arg)
+update_func(st_data_t key, st_data_t *value, st_data_t arg, int existing)
 {
-    VALUE ret = rb_yield_values(2, (VALUE)key, (VALUE)*value);
+    VALUE ret = rb_yield_values(existing ? 2 : 1, (VALUE)key, (VALUE)*value);
     switch (ret) {
       case Qfalse:
 	return ST_STOP;
Index: test/-ext-/st/test_update.rb
===================================================================
--- test/-ext-/st/test_update.rb	(revision 35169)
+++ test/-ext-/st/test_update.rb	(revision 35170)
@@ -10,9 +10,8 @@
     end
 
     def test_notfound
-      called = false
-      assert_equal(false, @tbl.st_update(:c) {called = true})
-      assert_equal(false, called)
+      assert_equal(false, @tbl.st_update(:c) {42})
+      assert_equal({a: 1, b: 2, c: 42}, @tbl)
     end
 
     def test_continue

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/