diff options
| author | Matthias Radestock <matthias@rabbitmq.com> | 2010-10-11 23:42:17 +0100 |
|---|---|---|
| committer | Matthias Radestock <matthias@rabbitmq.com> | 2010-10-11 23:42:17 +0100 |
| commit | 088c1f341fd3c5fb4f8bbcff8ecf0fd7bf86b1be (patch) | |
| tree | f08a56a37e6defb49e41a025d33d11c6caad7f5d | |
| parent | fc49c47a99b53c8ca27382ec6cff515b753433ec (diff) | |
| download | rabbitmq-server-088c1f341fd3c5fb4f8bbcff8ecf0fd7bf86b1be.tar.gz | |
boolean_or(True, X, Y) = anything_but(False, X, Y)
| -rw-r--r-- | src/rabbit_binding.erl | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/src/rabbit_binding.erl b/src/rabbit_binding.erl index 517434c0..53c9c663 100644 --- a/src/rabbit_binding.erl +++ b/src/rabbit_binding.erl @@ -408,10 +408,6 @@ anything_but( NotThis, NotThis, This) -> This; anything_but( NotThis, This, NotThis) -> This; anything_but(_NotThis, This, This) -> This. -boolean_or( True, True, _Any) -> True; -boolean_or( True, _Any, True) -> True; -boolean_or(_True, Any, Any) -> Any. - new_deletions() -> dict:new(). add_deletion(XName, Entry, Deletions) -> @@ -423,7 +419,8 @@ combine_deletions(Deletions1, Deletions2) -> Deletions1, Deletions2). merge_entry({X1, Deleted1, Bindings1}, {X2, Deleted2, Bindings2}) -> - {anything_but(undefined, X1, X2), boolean_or(deleted, Deleted1, Deleted2), + {anything_but(undefined, X1, X2), + anything_but(not_deleted, Deleted1, Deleted2), [Bindings1 | Bindings2]}. process_deletions(Deletions) -> |