diff options
Diffstat (limited to 'tests/closure')
-rw-r--r-- | tests/closure/tclosure.nim | 2 | ||||
-rw-r--r-- | tests/closure/tclosure2.nim | 16 | ||||
-rw-r--r-- | tests/closure/tclosure3.nim | 2 | ||||
-rw-r--r-- | tests/closure/tclosurebug2.nim | 12 | ||||
-rw-r--r-- | tests/closure/tinterf.nim | 4 | ||||
-rw-r--r-- | tests/closure/tinvalidclosure2.nim | 4 | ||||
-rw-r--r-- | tests/closure/tjester.nim | 2 | ||||
-rw-r--r-- | tests/closure/tnestedclosure.nim | 2 | ||||
-rw-r--r-- | tests/closure/tnestedproc.nim | 4 | ||||
-rw-r--r-- | tests/closure/uclosures.nim | 2 |
10 files changed, 25 insertions, 25 deletions
diff --git a/tests/closure/tclosure.nim b/tests/closure/tclosure.nim index 445a99b6d..09d48436e 100644 --- a/tests/closure/tclosure.nim +++ b/tests/closure/tclosure.nim @@ -41,7 +41,7 @@ type proc getInterf(): ITest = var shared: int - + return (setter: proc (x: int) = shared = x, getter: proc (): int = return shared) diff --git a/tests/closure/tclosure2.nim b/tests/closure/tclosure2.nim index d2c16eac9..d331388cf 100644 --- a/tests/closure/tclosure2.nim +++ b/tests/closure/tclosure2.nim @@ -33,13 +33,13 @@ when true: for xxxx in 0..9: var i = 0 proc bx = - if i > 10: + if i > 10: echo xxxx return i += 1 #for j in 0 .. 0: echo i bx() - + bx() echo i @@ -50,11 +50,11 @@ when true: var x = start-1 #let dummy = proc = # discard start - - result = proc (): int = + + result = proc (): int = #var x = 9 for i in 0 .. 0: x = x + 1 - + return x var a = accumulator(3) @@ -69,7 +69,7 @@ when true: for i in 0..3: echo "py" py() - + outer() @@ -80,7 +80,7 @@ when true: if n < 0: result = errorValue elif n <= 1: result = 1 else: result = n * fac(n-1) - + proc px() {.closure.} = echo "px" @@ -93,7 +93,7 @@ when true: "xyz": py } mapping[0][1]() - + echo fac(3) diff --git a/tests/closure/tclosure3.nim b/tests/closure/tclosure3.nim index bb217387f..8f6f4a70f 100644 --- a/tests/closure/tclosure3.nim +++ b/tests/closure/tclosure3.nim @@ -13,7 +13,7 @@ proc main = for i in 0 .. n-1: let val = s[i]() if val != $(i*i): echo "bug ", val - + if getOccupiedMem() > 3000_000: quit("still a leak!") echo "success" diff --git a/tests/closure/tclosurebug2.nim b/tests/closure/tclosurebug2.nim index 12e4e3509..581b735bf 100644 --- a/tests/closure/tclosurebug2.nim +++ b/tests/closure/tclosurebug2.nim @@ -111,7 +111,7 @@ proc hasKey*[A, B](t: TOrderedTable[A, B], key: A): bool = ## returns true iff `key` is in the table `t`. result = rawGet(t, key) >= 0 -proc rawInsert[A, B](t: var TOrderedTable[A, B], +proc rawInsert[A, B](t: var TOrderedTable[A, B], data: var TOrderedKeyValuePairSeq[A, B], key: A, val: B) = rawInsertImpl() @@ -128,7 +128,7 @@ proc enlarge[A, B](t: var TOrderedTable[A, B]) = t.last = -1 while h >= 0: var nxt = t.data[h].next - if t.data[h].slot == seFilled: + if t.data[h].slot == seFilled: rawInsert(t, n, t.data[h].key, t.data[h].val) h = nxt swap(t.data, n) @@ -150,16 +150,16 @@ proc initOrderedTable*[A, B](initialSize=64): TOrderedTable[A, B] = result.last = -1 newSeq(result.data, initialSize) -proc toOrderedTable*[A, B](pairs: openarray[tuple[key: A, +proc toOrderedTable*[A, B](pairs: openarray[tuple[key: A, val: B]]): TOrderedTable[A, B] = ## creates a new ordered hash table that contains the given `pairs`. result = initOrderedTable[A, B](nextPowerOfTwo(pairs.len+10)) for key, val in items(pairs): result[key] = val -proc sort*[A, B](t: var TOrderedTable[A,B], +proc sort*[A, B](t: var TOrderedTable[A,B], cmp: proc (x, y: tuple[key: A, val: B]): int {.closure.}) = ## sorts the ordered table so that the entry with the highest counter comes - ## first. This is destructive (with the advantage of being efficient)! + ## first. This is destructive (with the advantage of being efficient)! ## You must not modify `t` afterwards! ## You can use the iterators `pairs`, `keys`, and `values` to iterate over ## `t` in the sorted order. @@ -186,7 +186,7 @@ proc sort*[A, B](t: var TOrderedTable[A,B], let item1 = (x.key, x.val) let item2 = (y.key, y.val) return cmp(item1, item2) - + while rawCmp(t.data[j-h], t.data[j]) <= 0: swap(t.data[j], t.data[j-h]) j = j-h diff --git a/tests/closure/tinterf.nim b/tests/closure/tinterf.nim index 726fac9f6..1ac6da945 100644 --- a/tests/closure/tinterf.nim +++ b/tests/closure/tinterf.nim @@ -10,8 +10,8 @@ type proc getInterf(): ITest = var shared1, shared2: int - - return (setter: proc (x: int) = + + return (setter: proc (x: int) = shared1 = x shared2 = x + 10, getter1: proc (): int = result = shared1, diff --git a/tests/closure/tinvalidclosure2.nim b/tests/closure/tinvalidclosure2.nim index 20e465c12..845559309 100644 --- a/tests/closure/tinvalidclosure2.nim +++ b/tests/closure/tinvalidclosure2.nim @@ -3,12 +3,12 @@ discard """ errormsg: "illegal capture 'A'" """ -proc outer() = +proc outer() = var A: int proc ugh[T](x: T) {.cdecl.} = echo "ugha", A, x - + ugh[int](12) outer() diff --git a/tests/closure/tjester.nim b/tests/closure/tjester.nim index 48e5186f0..3bd10120a 100644 --- a/tests/closure/tjester.nim +++ b/tests/closure/tjester.nim @@ -17,7 +17,7 @@ proc cbOuter(response: string) {.closure, discardable.} = var iterVar = fooIter iterVar().data yield Future[int](data: foo()) - + var iterVar2 = cbIter proc cb2() {.closure.} = try: diff --git a/tests/closure/tnestedclosure.nim b/tests/closure/tnestedclosure.nim index c8f1e231b..67e196f66 100644 --- a/tests/closure/tnestedclosure.nim +++ b/tests/closure/tnestedclosure.nim @@ -45,7 +45,7 @@ proc cbOuter() = proc fooIter() = echo response fooIter() - + cbIter() cbOuter() diff --git a/tests/closure/tnestedproc.nim b/tests/closure/tnestedproc.nim index 49ec6f9a7..7eeeff198 100644 --- a/tests/closure/tnestedproc.nim +++ b/tests/closure/tnestedproc.nim @@ -2,10 +2,10 @@ discard """ output: "11" """ -proc p(x, y: int): int = +proc p(x, y: int): int = result = x + y -echo p((proc (): int = +echo p((proc (): int = var x = 7 return x)(), (proc (): int = return 4)()) diff --git a/tests/closure/uclosures.nim b/tests/closure/uclosures.nim index 6eea29ca1..817bfec6b 100644 --- a/tests/closure/uclosures.nim +++ b/tests/closure/uclosures.nim @@ -2,7 +2,7 @@ import unittest test "loop variables are captured by copy": var funcs: seq[proc (): int {.closure.}] = @[] - + for i in 0..10: let ii = i funcs.add do -> int: return ii * ii |