From: Alexis Laferrière Date: Fri, 17 Jul 2015 12:07:56 +0000 (-0400) Subject: lib/collection: rename Container to Ref X-Git-Tag: v0.7.7~25^2~1 X-Git-Url: http://nitlanguage.org?hp=b0dbd98a1dab926a2e797cc20c327c0fb75f1e8a lib/collection: rename Container to Ref Signed-off-by: Alexis Laferrière --- diff --git a/lib/standard/collection/abstract_collection.nit b/lib/standard/collection/abstract_collection.nit index 16e4b1e..39938bd 100644 --- a/lib/standard/collection/abstract_collection.nit +++ b/lib/standard/collection/abstract_collection.nit @@ -282,7 +282,7 @@ end # # Also used when one want to give a single element when a full # collection is expected -class Container[E] +class Ref[E] super Collection[E] redef fun first do return item @@ -304,14 +304,14 @@ class Container[E] end end - redef fun iterator do return new ContainerIterator[E](self) + redef fun iterator do return new RefIterator[E](self) # The stored item var item: E is writable end # This iterator is quite stupid since it is used for only one item. -private class ContainerIterator[E] +private class RefIterator[E] super Iterator[E] redef fun item do return _container.item @@ -319,7 +319,7 @@ private class ContainerIterator[E] redef var is_ok = true - var container: Container[E] + var container: Ref[E] end # Items can be removed from this collection diff --git a/lib/standard/collection/list.nit b/lib/standard/collection/list.nit index 2cdc431..021a80c 100644 --- a/lib/standard/collection/list.nit +++ b/lib/standard/collection/list.nit @@ -327,7 +327,7 @@ end # Linked nodes that constitute a linked list. private class ListNode[E] - super Container[E] + super Ref[E] # The next node. var next: nullable ListNode[E] = null