summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJérémy Zurcher <jeremy@asynk.ch>2012-05-04 10:40:01 +0200
committerJérémy Zurcher <jeremy@asynk.ch>2012-05-04 10:40:01 +0200
commit9fed8e1ae1657f97e92afb0bd28875b9fe29654a (patch)
treeaa1a037cbadcfa4ed78035ca5e959599cd5bebe4
parent06b46dd5022529f175f29838b205bdd125627d33 (diff)
downloadedoors-ruby-9fed8e1ae1657f97e92afb0bd28875b9fe29654a.zip
edoors-ruby-9fed8e1ae1657f97e92afb0bd28875b9fe29654a.tar.gz
particle: rename merge->merge! add merged_shift, remove merged_count
-rw-r--r--lib/evendoors/particle.rb10
1 files changed, 5 insertions, 5 deletions
diff --git a/lib/evendoors/particle.rb b/lib/evendoors/particle.rb
index 7b951f9..7c2af07 100644
--- a/lib/evendoors/particle.rb
+++ b/lib/evendoors/particle.rb
@@ -119,11 +119,7 @@ module EvenDoors
#
# merge particles management
#
- def merged_count
- @merged.length
- end
- #
- def merge p
+ def merge! p
@merged << p
end
#
@@ -131,6 +127,10 @@ module EvenDoors
@merged[i]
end
#
+ def merged_shift
+ @merged.shift
+ end
+ #
end
#
end