From 9083f01fd23fe7ea3470136ec2cd7a0d2a600b43 Mon Sep 17 00:00:00 2001
From: Araq <rumpf_a@web.de>
Date: Sun, 29 Jan 2012 01:53:09 +0100
Subject: fixed #96 as good as technically possible (debug frames are allocated
 on the C stack)

---
 lib/pure/algorithm.nim | 4 ++--
 lib/system.nim         | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'lib')

diff --git a/lib/pure/algorithm.nim b/lib/pure/algorithm.nim
index 15b0129ad..1e9a0bb4b 100755
--- a/lib/pure/algorithm.nim
+++ b/lib/pure/algorithm.nim
@@ -35,12 +35,12 @@ proc reverse*[T](a: var openArray[T]) =
   reverse(a, 0, a.high)
 
 const
-  onlySafeCode = true
+  onlySafeCode = false
 
 proc merge[T](a, b: var openArray[T], lo, m, hi: int, 
               cmp: proc (x, y: T): int, order: TSortOrder) =
   template `<-` (a, b: expr) = 
-    when true:
+    when false:
       a = b
     elif onlySafeCode:
       shallowCopy(a, b)
diff --git a/lib/system.nim b/lib/system.nim
index d9d3ebd86..11188a4c0 100755
--- a/lib/system.nim
+++ b/lib/system.nim
@@ -2129,16 +2129,16 @@ template assert*(cond: expr, msg = "") =
   ## Use ``assert`` for debugging purposes only.
   bind raiseAssert, InstantiationInfo
   when compileOption("assertions"):
-    if not cond:
-      {.line.}:
+    {.line.}:
+      if not cond:
         raiseAssert(astToStr(cond) & ' ' & msg)
 
 template doAssert*(cond: expr, msg = "") =
   ## same as `assert` but is always turned on and not affected by the
   ## ``--assertions`` command line switch.
   bind raiseAssert, InstantiationInfo
-  if not cond:
-    {.line: InstantiationInfo().}:
+  {.line: InstantiationInfo().}:
+    if not cond:
       raiseAssert(astToStr(cond) & ' ' & msg)
 
 
-- 
cgit 1.4.1-2-gfad0