diff options
author | Araq <rumpf_a@web.de> | 2014-08-14 22:22:04 +0200 |
---|---|---|
committer | Araq <rumpf_a@web.de> | 2014-08-14 22:22:04 +0200 |
commit | 4ab56d6be02de18d5da71f97918ff7d3c78e8340 (patch) | |
tree | 42b358e982f663f62bc9610f0ae3bf460267fcbc | |
parent | 06ad50b671f4d236ac558f6fe71fc374f80ead2a (diff) | |
download | Nim-4ab56d6be02de18d5da71f97918ff7d3c78e8340.tar.gz |
some minor fixes
-rw-r--r-- | lib/system.nim | 2 | ||||
-rw-r--r-- | tests/assert/tuserassert.nim | 2 | ||||
-rw-r--r-- | tests/ccgbugs/tmissinginit.nim | 2 | ||||
-rw-r--r-- | tests/testament/specs.nim | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/lib/system.nim b/lib/system.nim index a10c673f9..0d8f63bd4 100644 --- a/lib/system.nim +++ b/lib/system.nim @@ -127,7 +127,7 @@ proc definedInScope*(x: expr): bool {. ## **Deprecated since version 0.9.6**: Use ``declaredInScope`` instead. proc declaredInScope*(x: expr): bool {. - magic: "DefinedInScope", noSideEffect, deprecated.} + magic: "DefinedInScope", noSideEffect.} ## Special compile-time procedure that checks whether `x` is ## declared in the current scope. `x` has to be an identifier. diff --git a/tests/assert/tuserassert.nim b/tests/assert/tuserassert.nim index 8710ee486..57b229ca9 100644 --- a/tests/assert/tuserassert.nim +++ b/tests/assert/tuserassert.nim @@ -3,7 +3,7 @@ discard """ """ template myAssert(cond: expr) = - when rand(3) < 3: + when 3 <= 3: let c = cond.astToStr if not cond: echo c, "ugh" diff --git a/tests/ccgbugs/tmissinginit.nim b/tests/ccgbugs/tmissinginit.nim index 36648ef8d..d440608e6 100644 --- a/tests/ccgbugs/tmissinginit.nim +++ b/tests/ccgbugs/tmissinginit.nim @@ -4,7 +4,7 @@ discard """ 0 0 [[a = nil, -b = nil]] +b = nil]]''' """ # bug #1475 diff --git a/tests/testament/specs.nim b/tests/testament/specs.nim index 6e72f4b5e..184f07c51 100644 --- a/tests/testament/specs.nim +++ b/tests/testament/specs.nim @@ -53,7 +53,7 @@ const targetToExt*: array[TTarget, string] = ["c", "cpp", "m", "js"] targetToCmd*: array[TTarget, string] = ["c", "cpp", "objc", "js"] -when not defined(parseCfgBool): +when not declared(parseCfgBool): # candidate for the stdlib: proc parseCfgBool(s: string): bool = case normalize(s) |