ruby-core@ruby-lang.org archive (unofficial mirror)
 help / color / mirror / Atom feed
From: nobu@ruby-lang.org
To: ruby-core@ruby-lang.org
Subject: [ruby-core:69767] [Ruby trunk - Feature #11315] [PATCH] Add Array#^ for parity with other set-like operations.
Date: Mon, 29 Jun 2015 05:05:32 +0000	[thread overview]
Message-ID: <redmine.journal-53143.20150629050531.e81f7425858dd0a8@ruby-lang.org> (raw)
In-Reply-To: redmine.issue-11315.20150628142533@ruby-lang.org

Issue #11315 has been updated by Nobuyoshi Nakada.


`st_update` does lookup/replace/delete/insert in the callback at once.
And your patches are broken, necessary spaces are stripped.

~~~diff
diff --git a/array.c b/array.c
index 072e30d..737afa3 100644
--- a/array.c
+++ b/array.c
@@ -4200,6 +4200,14 @@ rb_ary_or(VALUE ary1, VALUE ary2)
     return ary3;
 }
 
+static int
+ary_hash_xorset(st_data_t *key, st_data_t *value, st_data_t arg, int existing)
+{
+    if (existing) return ST_DELETE;
+    *key = *value = (VALUE)arg;
+    return ST_CONTINUE;
+}
+
 /*
  *  call-seq:
  *     ary ^ other_ary     -> new_ary
@@ -4228,15 +4236,9 @@ rb_ary_xor(VALUE ary1, VALUE ary2)
     result = ary_make_hash(ary1);
 
     for (i = 0; i < RARRAY_LEN(ary2); ++i) {
-    elt = (st_data_t)RARRAY_AREF(ary2, i);
-    if (st_lookup(RHASH_TBL_RAW(seen), elt, 0)) continue;
-    st_update(RHASH_TBL_RAW(seen), elt, ary_hash_orset, elt);
-    if (st_lookup(RHASH_TBL_RAW(result), elt, 0)) {
-        st_delete(RHASH_TBL_RAW(result), &elt, 0);
-    }
-    else {
-        st_update(RHASH_TBL_RAW(result), elt, ary_hash_orset, elt);
-    }
+	elt = (st_data_t)RARRAY_AREF(ary2, i);
+	if (!st_update(RHASH_TBL_RAW(seen), elt, ary_hash_orset, elt))
+	    st_update(RHASH_TBL_RAW(result), elt, ary_hash_xorset, elt);
     }
 
     ary3 = rb_hash_values(result);
~~~

----------------------------------------
Feature #11315: [PATCH] Add Array#^ for parity with other set-like operations.
https://bugs.ruby-lang.org/issues/11315#change-53143

* Author: D.E. Akers
* Status: Open
* Priority: Normal
* Assignee: 
----------------------------------------
## Proposal

It is proposed that `Array` be given an "XOR" method which returns the symmetric difference between itself and another array.

## Rationale

`#&` and `#|` need a friend to complete the set of set-like operations on `Array`.

---Files--------------------------------
array_xor.patch (2.69 KB)
array_xor_vodka.patch (2.97 KB)
array_xor_recycle_seen.patch (3 KB)


-- 
https://bugs.ruby-lang.org/

      parent reply	other threads:[~2015-06-29  4:40 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
     [not found] <redmine.issue-11315.20150628142533@ruby-lang.org>
2015-06-28 14:25 ` [ruby-core:69762] [Ruby trunk - Bug #11315] [Open] [PATCH] Add Array#^ for parity with other set-like operations 0x0dea+redmine
2015-06-28 17:03 ` [ruby-core:69763] [Ruby trunk - Bug #11315] " 0x0dea+redmine
2015-06-28 17:10 ` [ruby-core:69764] " 0x0dea+redmine
2015-06-28 17:57 ` [ruby-core:69765] [Ruby trunk - Feature " 0x0dea+redmine
2015-06-29  5:05 ` nobu [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-list from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: https://www.ruby-lang.org/en/community/mailing-lists/

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=redmine.journal-53143.20150629050531.e81f7425858dd0a8@ruby-lang.org \
    --to=ruby-core@ruby-lang.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).