refactoring.

Author: Muhammad Hashim

.idea/modules/Kotlin2DArrays.iml

@@ -10,7 +10,7 @@ buildscript {
 }
 
 group 'com.github.mhashim6'
-version '1.0.0'
+version '1.0.1'
 
 apply plugin: 'java'
 apply plugin: 'kotlin'
@@ -23,8 +23,8 @@ repositories {
 }
 
 dependencies {
-    compile "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
-    testCompile "junit:junit:4.12"
+    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
+    testImplementation "junit:junit:4.12"
 
 }
 

build.gradle

@@ -0,0 +1,14 @@
+package mhashim6.kotlin.arrays2d
+
+data class IndexedValue2D<out T>(var x: Int, var y: Int, val value: T)
+
+class IndexingIterable2D<out T>(private val iteratorFactory: () -> Iterator2D<T>) : Iterable<IndexedValue2D<T>> {
+
+    override fun iterator(): Iterator<IndexedValue2D<T>> = IndexingIterator2D(iteratorFactory.invoke())
+}
+
+class IndexingIterator2D<out T>(private val iterator: Iterator2D<T>) : Iterator<IndexedValue2D<T>> {
+
+    override fun hasNext() = iterator.hasNext()
+    override fun next() = IndexedValue2D(iterator.x, iterator.y, iterator.next())
+}