From 5d4d8970e32e71e8f7a831e4c0d0283760edf5e2 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Alexis=20Laferri=C3=A8re?= Date: Fri, 17 Jul 2015 08:07:56 -0400 Subject: [PATCH] lib/collection: rename Container to Ref MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Alexis Laferrière --- lib/standard/collection/abstract_collection.nit | 8 ++++---- lib/standard/collection/list.nit | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) 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 -- 1.7.9.5