summary refs log tree commit diff stats
path: root/tests/parallel
diff options
context:
space:
mode:
authorArne Döring <arne.doering@gmx.net>2017-07-25 09:28:23 +0200
committerAndreas Rumpf <rumpf_a@web.de>2017-07-25 09:28:23 +0200
commit000b8afd26fa16684a116d9afe798ea94df9c270 (patch)
treee5295df748b90c5027e44adfa3a442031534572c /tests/parallel
parent52ff244d5d2775fa4d13f4e2b9a996f411281312 (diff)
downloadNim-000b8afd26fa16684a116d9afe798ea94df9c270.tar.gz
Remove expr/stmt (#5857)
Diffstat (limited to 'tests/parallel')
-rw-r--r--tests/parallel/tconvexhull.nim4
-rw-r--r--tests/parallel/tguard1.nim2
-rw-r--r--tests/parallel/tguard2.nim2
-rw-r--r--tests/parallel/tptr_to_ref.nim2
4 files changed, 5 insertions, 5 deletions
diff --git a/tests/parallel/tconvexhull.nim b/tests/parallel/tconvexhull.nim
index dffe5339b..c4990bf2d 100644
--- a/tests/parallel/tconvexhull.nim
+++ b/tests/parallel/tconvexhull.nim
@@ -20,10 +20,10 @@ proc cmpPoint(a, b: Point): int =
   if result == 0:
     result = cmp(a.y, b.y)
 
-template cross[T](o, a, b: T): expr =
+template cross[T](o, a, b: T): untyped =
   (a.x - o.x) * (b.y - o.y) - (a.y - o.y) * (b.x - o.x)
 
-template pro(): expr =
+template pro(): untyped =
   while lr1 > 0 and cross(result[lr1 - 1], result[lr1], p[i]) <= 0:
     discard result.pop
     lr1 -= 1
diff --git a/tests/parallel/tguard1.nim b/tests/parallel/tguard1.nim
index 3e0c131c5..c7972d225 100644
--- a/tests/parallel/tguard1.nim
+++ b/tests/parallel/tguard1.nim
@@ -24,7 +24,7 @@ var
 
 c.i = 89
 
-template atomicRead(L, x): expr =
+template atomicRead(L, x): untyped =
   {.locks: [L].}:
     x
 
diff --git a/tests/parallel/tguard2.nim b/tests/parallel/tguard2.nim
index b69ea3371..661893bb5 100644
--- a/tests/parallel/tguard2.nim
+++ b/tests/parallel/tguard2.nim
@@ -13,7 +13,7 @@ var
 
 c.i = 89
 
-template atomicRead(L, x): expr =
+template atomicRead(L, x): untyped =
   {.locks: [L].}:
     x
 
diff --git a/tests/parallel/tptr_to_ref.nim b/tests/parallel/tptr_to_ref.nim
index 229c247ce..fee210dcd 100644
--- a/tests/parallel/tptr_to_ref.nim
+++ b/tests/parallel/tptr_to_ref.nim
@@ -14,7 +14,7 @@ type
     processes {.guard: lock.}: array[0..MAX_WORKERS-1, foreign ptr Process]
 
 # Hold a lock for a statement.
-template hold(lock: Lock, body: stmt) =
+template hold(lock: Lock, body: untyped) =
   lock.acquire
   defer: lock.release
   {.locks: [lock].}: