From f0341979bd419048e78603d440523fdba217afcc Mon Sep 17 00:00:00 2001
From: Dominik Picheta <dominikpicheta@gmail.com>
Date: Fri, 18 Mar 2016 19:06:34 +0000
Subject: [PATCH 1/3] Implement a `lock` template in `locks` module.

---
 lib/core/locks.nim | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/lib/core/locks.nim b/lib/core/locks.nim
index f1a74876e1..443c09fdc6 100644
--- a/lib/core/locks.nim
+++ b/lib/core/locks.nim
@@ -54,3 +54,11 @@ proc wait*(cond: var Cond, lock: var Lock) {.inline.} =
 proc signal*(cond: var Cond) {.inline.} =
   ## sends a signal to the condition variable `cond`.
   signalSysCond(cond)
+
+template lock*(a: Lock, body: stmt) =
+  a.acquire()
+  {.locks: [a].}:
+    try:
+      body
+    finally:
+      a.release()
\ No newline at end of file

From 1cc1a7faf46a50c1e7778b6f3d61ac1a5ae932c7 Mon Sep 17 00:00:00 2001
From: Dominik Picheta <dominikpicheta@gmail.com>
Date: Wed, 23 Mar 2016 12:45:36 +0000
Subject: [PATCH 2/3] Rename locks.lock tmplt to withLock and change body to
 untyped.

---
 lib/core/locks.nim | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/core/locks.nim b/lib/core/locks.nim
index 443c09fdc6..ba756a8636 100644
--- a/lib/core/locks.nim
+++ b/lib/core/locks.nim
@@ -55,7 +55,7 @@ proc signal*(cond: var Cond) {.inline.} =
   ## sends a signal to the condition variable `cond`.
   signalSysCond(cond)
 
-template lock*(a: Lock, body: stmt) =
+template withLock*(a: Lock, body: untyped) =
   a.acquire()
   {.locks: [a].}:
     try:

From 34401a3639d016de22050ac3703ce0daa78e18e7 Mon Sep 17 00:00:00 2001
From: Dominik Picheta <dominikpicheta@gmail.com>
Date: Wed, 23 Mar 2016 12:47:05 +0000
Subject: [PATCH 3/3] Documentation for `withLock`.

---
 lib/core/locks.nim | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/lib/core/locks.nim b/lib/core/locks.nim
index ba756a8636..66e0ab5208 100644
--- a/lib/core/locks.nim
+++ b/lib/core/locks.nim
@@ -56,6 +56,8 @@ proc signal*(cond: var Cond) {.inline.} =
   signalSysCond(cond)
 
 template withLock*(a: Lock, body: untyped) =
+  ## Acquires the given lock, executes the statements in body and
+  ## releases the lock after the statements finish executing.
   a.acquire()
   {.locks: [a].}:
     try: