Merge pull request #1849 from marcusnaslund/noabstractlist

Reduced code duplication in Lists
magic-lang · Aug 1, 2016 · 8f136c2 · 8f136c2
2 parents f5b63ce + 1998b3a
commit 8f136c2
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 7 deletions.
diff --git a/source/concurrent/SynchronizedList.ooc b/source/concurrent/SynchronizedList.ooc
@@ -55,9 +55,6 @@ SynchronizedList: class <T> extends List<T> {
 		this _backend removeAt(index)
 		this _mutex unlock()
 	}
-	removeAt: override func ~range (range: Range) {
-		this removeAt(range min, range max)
-	}
 	removeAt: override func ~indices (start, end: Int) {
 		this _mutex lock()
 		this _backend removeAt(start, end)

diff --git a/source/system/structs/List.ooc b/source/system/structs/List.ooc
@@ -15,8 +15,8 @@ List: abstract class <T> {
 	insert: abstract func (index: Int, item: T)
 	remove: abstract func ~last -> T
 	remove: abstract func ~atIndex (index: Int) -> T
-	removeAt: abstract func (index: Int)
-	removeAt: abstract func ~range (range: Range)
+	removeAt: virtual func (index: Int) { this removeAt(index, index + 1) }
+	removeAt: func ~range (range: Range) { this removeAt(range min, range max) }
 	removeAt: abstract func ~indices (start, end: Int)
 	clear: abstract func
 	reverse: abstract func -> This<T>

diff --git a/source/system/structs/VectorList.ooc b/source/system/structs/VectorList.ooc
@@ -51,8 +51,6 @@ VectorList: class <T> extends List<T>{
 		this _count -= 1
 		result
 	}
-	removeAt: override func (index: Int) { this removeAt(index, index + 1) }
-	removeAt: override func ~range (range: Range) { this removeAt(range min, range max) }
 	removeAt: override func ~indices (start, end: Int) {
 		count := end - start
 		version(safe)