re-order and break-up tests to fail faster

.gitignore

@@ -1,3 +1,4 @@
 nim.cfg
 bin
 deps
+.tool-versions

cps.nim

@@ -26,7 +26,7 @@ when (NimMajor, NimMinor, NimPatch) < (1, 7, 3):
   # we recommend against threads:on without define:useMalloc
   when not defined(useMalloc) and compileOption"threads":
     {.warning:
-      "cps recommends against --threads:on without --define:useMalloc".}
+      "cps recommends --define:useMalloc when used with threads".}
 
 proc state*(c: Continuation): State {.inline.} =
   ## Get the current state of a continuation

tests/killer.nim

@@ -10,7 +10,11 @@ proc `=destroy`*(k: var Killer) {.raises: [FailError].} =
   if k.final != k.n:
     let e = getCurrentException()
     # don't obliterate current exception
-    if e.isNil or e isnot FailError or e isnot ExpectedError:
+    when defined(ExpectedError):
+      let shouldFail = e.isNil or e isnot FailError or e isnot ExpectedError
+    else:
+      let shouldFail = e.isNil or e isnot FailError
+    if shouldFail:
       fail:
         case k.n
         of 0: "uninitialized"

tests/preamble.nim

@@ -1,51 +1,58 @@
-import pkg/balls
-
-import pkg/cps except trampoline
-
-type
-  EmptyLoop = CatchableError
-  InfiniteLoop = CatchableError
-  Cont* = ref object of Continuation
-
-var jumps: int
-
-proc trampoline[T: Continuation](c: sink T) {.used.} =
-  jumps = 0
-  var c: Continuation = move c
-  while c.running:
-    # capture the exception in the environment
-    let exception = getCurrentException()
+#
+# modules and sanity checking that we want to include
+# in all test files
+#
+when not declaredInScope(InfiniteLoop):
+  import pkg/balls
+
+  import cps except trampoline
+
+  include killer
+
+  type
+    EmptyLoop = CatchableError
+    InfiniteLoop = CatchableError
+    Cont* = ref object of Continuation
+
+  var jumps: int
+
+  proc trampoline[T: Continuation](c: sink T) {.used.} =
+    jumps = 0
+    var c: Continuation = move c
+    while c.running:
+      # capture the exception in the environment
+      let exception = getCurrentException()
+      try:
+        var y = c.fn
+        var x = y(c)
+        c = x
+      except CatchableError:
+        if not c.dismissed:
+          writeStackFrames c
+        raise
+      # the current exception should not change
+      check getCurrentException() == exception
+      inc jumps
+      if jumps > 1000:
+        raise InfiniteLoop.newException: $jumps & " iterations"
+    if jumps == 0:
+      raise EmptyLoop.newException:
+        "continuations test best when they, uh, bounce"
+
+  proc noop*(c: Cont): Cont {.cpsMagic.} = c
+
+  # We have a lot of these for the purpose of control-flow validation
+  {.warning[UnreachableCode]: off.}
+
+  template shouldRun(wanted: int; body: untyped) {.used.} =
+    var measured {.inject.} = 0
     try:
-      var y = c.fn
-      var x = y(c)
-      c = x
-    except CatchableError:
-      if not c.dismissed:
-        writeStackFrames c
-      raise
-    # the current exception should not change
-    check getCurrentException() == exception
-    inc jumps
-    if jumps > 1000:
-      raise InfiniteLoop.newException: $jumps & " iterations"
-  if jumps == 0:
-    raise EmptyLoop.newException:
-      "continuations test best when they, uh, bounce"
-
-proc noop*(c: Cont): Cont {.cpsMagic.} = c
-
-# We have a lot of these for the purpose of control-flow validation
-{.warning[UnreachableCode]: off.}
-
-template shouldRun(wanted: int; body: untyped) {.used.} =
-  var measured {.inject.} = 0
-  try:
-    body
-  finally:
-    check measured == wanted:
-      if wanted == 0:         "oops; continuation ran"
-      elif measured == 0:     "continuation never ran"
-      elif measured > wanted: "continuation ran too often"
-      else:                   "continuation ran too rarely"
-
-template ran {.used, dirty.} = inc measured
+      body
+    finally:
+      check measured == wanted:
+        if wanted == 0:         "oops; continuation ran"
+        elif measured == 0:     "continuation never ran"
+        elif measured > wanted: "continuation ran too often"
+        else:                   "continuation ran too rarely"
+
+  template ran {.used, dirty.} = inc measured

tests/tloops.nim → tests/t10_loops.nim

@@ -1,8 +1,4 @@
-import balls
-import cps
-
 include preamble
-import killer
 
 suite "loops":
 

tests/tapi.nim → tests/t20_api.nim

@@ -1,5 +1,4 @@
 include preamble
-import killer
 
 import tests/exports
 
@@ -230,16 +229,19 @@ suite "cps api":
       step 2
       send(42)
       step 3
-      echo recv()
+      echo "level_two: ", recv()
+      let x = recv()
+      echo "level_two: ", x
       step 4
 
     proc level_one() {.cps:C.} =
       step 1
       level_two()
       step 5
+      echo "level_one: ", recv()
       let v = recv()
-      echo recv()
       step 6
+      check v == 0
 
     var a = whelp level_one()
     trampoline a

tests/tcc.nim → tests/t30_cc.nim

@@ -1,7 +1,4 @@
-import std/macros
-
 include preamble
-include killer
 
 suite "calling convention":
 

tests/taste.nim → tests/t40_ast.nim

@@ -1,8 +1,7 @@
-import std/macros
-import foreign
-
 include preamble
 
+import foreign
+
 suite "tasteful tests":
 
   var r = 0
@@ -403,6 +402,10 @@ suite "tasteful tests":
     proc foo() {.cps: Continuation.} =
       inc r
       let o: RootRef = new O
+      #{.push warning[CondTrue]: off.}
+      check r == 1 and o is RootRef
+      #{.pop.}
+      check o of RootObj
 
     foo()
 
@@ -420,6 +423,7 @@ suite "tasteful tests":
       # implicit conversion in assignment
       var j: int
       j = n
+      check i == n
 
     foo()
 

tests/thooks.nim → tests/t50_hooks.nim

@@ -1,3 +1,5 @@
+include preamble
+
 import std/genasts
 import std/macros
 import std/os
@@ -7,9 +9,6 @@ import std/strutils
 from cps/spec import Hook, cpsStackFrames
 from cps/hooks import findColonLit
 
-include preamble
-import killer
-
 suite "hooks":
 
   block:
@@ -53,7 +52,7 @@ suite "hooks":
           of Stack: sub
           else: astToStr c
         var path = info.filename.lastPathPart
-        path = if path == "thooks.nim": "👍" else: path
+        path = if path == "t50_hooks.nim": "👍" else: path
         found.add "$#: $# $# $#" % [ $hook, $sub, last, path ]
         body
 

tests/treturns.nim → tests/t60_returns.nim

@@ -1,9 +1,6 @@
 import std/macros
-import balls
-import cps
 
 include preamble
-import killer
 
 suite "returns and results":
 

tests/tlocals.nim → tests/t70_locals.nim

@@ -1,7 +1,4 @@
-import std/sugar
-
 include preamble
-include killer
 
 suite "locals":
 
@@ -405,21 +402,6 @@ suite "tuples":
     foo()
     check r == 2
 
-  block:
-    ## sugary procedure arguments can be used in expressions
-    r = 0
-    proc bar(x: int): int {.cps: Cont.} =
-      inc r
-      result = x * 2
-
-    proc foo(fn: (int) -> int): int {.cps: Cont.} =
-      inc r
-      result = fn: bar(2)
-      inc r
-
-    check 12 == foo(x => x * 3)
-    check r == 3
-
 type
   K = distinct object
 
@@ -519,3 +501,22 @@ suite "lifetimes":
       # destroy bar.m; eg. step == 9
 
     foo()
+
+import std/sugar
+
+suite "high-cal":
+  var r = 0
+  block:
+    ## sugary procedure arguments can be used in expressions
+    r = 0
+    proc bar(x: int): int {.cps: Cont.} =
+      inc r
+      result = x * 2
+
+    proc foo(fn: (int) -> int): int {.cps: Cont.} =
+      inc r
+      result = fn: bar(2)
+      inc r
+
+    check 12 == foo(x => x * 3)
+    check r == 3