Merge branch 'master-3.4.x'

dotty-cps-async · Jul 18, 2024 · 95cc42d · 95cc42d
2 parents 4c51228 + c71879e
commit 95cc42d
Showing 1 changed file with 9 additions and 2 deletions.
diff --git a/native/src/test/scala/cps/ComputationBound.scala b/native/src/test/scala/cps/ComputationBound.scala
@@ -51,8 +51,15 @@ trait ComputationBound[+T] {
             ComputationBound.advanceDeferredQueueTicks(timeRest, ref.get().isDefined).flatMap{ r =>
               ref.get match
                 case Some(v) => op(v).runTicksDeadline(deadline)
-                case None => 
-                  Future failed (new TimeoutException(s"ref $ref is empty"))
+                case None =>
+                  if (deadline >= System.currentTimeMillis) then
+                    Future failed (new TimeoutException(s"ref is empty in $w up to timeout (not completed)"))
+                  else
+                    ComputationBound.advanceDeferredQueueTicks(timeRest, ref.get().isDefined).flatMap{ r =>
+                      ref.get match
+                        case Some(v) => op(v).runTicksDeadline(deadline)
+                        case None => Future failed (new TimeoutException(s"ref is empty in $w up to second timeout (not completed)"))
+                    }
             }
           else
             println(s"failed: wwaiting for $ref in $w")