Fixed do notation label hack; Updated README.md; Updated to 1.1.0-beta-22.

Author: h0tk3y

build.gradle

@@ -1,5 +1,5 @@
 buildscript {
-    ext.kotlin_version = '1.1.0-beta-22'
+    ext.kotlin_version = '1.1.0-beta-38'
 
     repositories {
         mavenCentral()
@@ -17,10 +17,16 @@ repositories {
     maven { url "http://dl.bintray.com/kotlin/kotlin-eap-1.1"}
 }
 
+kotlin {
+    experimental {
+        coroutines 'enable'
+    }
+}
+
 dependencies {
     compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
     compile "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version"
-    compile 'org.jetbrains.kotlinx:kotlinx-coroutines-core:0.4-beta'
+    compile 'org.jetbrains.kotlinx:kotlinx-coroutines-core:0.6-beta'
     testCompile "junit:junit:4.12"
 }
 

src/main/kotlin/com/github/h0tk3y/kotlinMonads/ContinuationUtils.kt

@@ -0,0 +1,25 @@
+package com.github.h0tk3y.kotlinMonads
+
+import kotlin.coroutines.experimental.Continuation
+
+private val coroutineImplClass by lazy { Class.forName("kotlin.coroutines.experimental.jvm.internal.CoroutineImpl") }
+
+private val labelField by lazy { coroutineImplClass.getDeclaredField("label").apply { isAccessible = true } }
+private val completionField by lazy { coroutineImplClass.getDeclaredField("completion").apply { isAccessible = true } }
+
+private var <T> Continuation<T>.label
+    get() = labelField.get(this)
+    set(value) = labelField.set(this@label, value)
+
+private var <T> Continuation<T>.completion: Continuation<*>?
+    get() = completionField.get(this) as Continuation<*>
+    set(value) = completionField.set(this@completion, value)
+
+internal var <T> Continuation<T>.stackLabels: List<Any>
+    get() = if (coroutineImplClass.isInstance(this)) listOf(label) + completion?.stackLabels.orEmpty() else emptyList()
+    set(value) {
+        if (coroutineImplClass.isInstance(this)) {
+            label = value.first()
+            completion?.stackLabels = value.subList(1, value.size)
+        }
+    }

src/main/kotlin/com/github/h0tk3y/kotlinMonads/DoNotation.kt

@@ -3,12 +3,12 @@
 package com.github.h0tk3y.kotlinMonads
 
 import java.io.Serializable
-import kotlin.coroutines.Continuation
-import kotlin.coroutines.EmptyCoroutineContext
-import kotlin.coroutines.RestrictsSuspension
-import kotlin.coroutines.intrinsics.SUSPENDED_MARKER
-import kotlin.coroutines.intrinsics.suspendCoroutineOrReturn
-import kotlin.coroutines.startCoroutine
+import kotlin.coroutines.experimental.Continuation
+import kotlin.coroutines.experimental.EmptyCoroutineContext
+import kotlin.coroutines.experimental.RestrictsSuspension
+import kotlin.coroutines.experimental.intrinsics.COROUTINE_SUSPENDED
+import kotlin.coroutines.experimental.intrinsics.suspendCoroutineOrReturn
+import kotlin.coroutines.experimental.startCoroutine
 
 fun <M : Monad<M, *>, T, R> Monad<M, T>.bindDo(c: suspend DoController<M>.(T) -> Monad<M, R>): Monad<M, R> =
         bind { t ->
@@ -26,23 +26,14 @@ fun <M : Monad<M, *>, R> doReturning(aReturn: Return<M>,
     return controller.returnedMonad as Monad<M, R>
 }
 
-private val labelField by lazy {
-    val jClass = Class.forName("kotlin.jvm.internal.CoroutineImpl")
-    return@lazy jClass.getDeclaredField("label").apply { isAccessible = true }
-}
-
-private var <T> Continuation<T>.label
-    get() = labelField.get(this)
-    set(value) = labelField.set(this@label, value)
-
 @RestrictsSuspension
 class DoController<M : Monad<M, *>>(private val returning: Return<M>) :
         Serializable, Return<M> by returning, Continuation<Monad<M, *>> {
 
     override val context = EmptyCoroutineContext
 
     override fun resume(value: Monad<M, *>) {
-        returnedMonad = value //here is where the biggest magic happens
+        returnedMonad = value
     }
 
     override fun resumeWithException(exception: Throwable) {
@@ -52,13 +43,13 @@ class DoController<M : Monad<M, *>>(private val returning: Return<M>) :
     internal lateinit var returnedMonad: Monad<M, *>
 
     suspend fun <T> bind(m: Monad<M, T>): T = suspendCoroutineOrReturn { c ->
-        val labelHere = c.label // save the label
+        val labelHere = c.stackLabels // save the whole coroutine stack labels
         returnedMonad = m.bind { x ->
-            c.label = labelHere
+            c.stackLabels = labelHere
             c.resume(x)
             returnedMonad
         }
-        SUSPENDED_MARKER
+        COROUTINE_SUSPENDED
     }
 
     suspend fun <T> then(m: Monad<M, T>): Unit {