summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorAraq <rumpf_a@web.de>2019-05-29 17:06:39 +0200
committerAraq <rumpf_a@web.de>2019-05-29 17:06:39 +0200
commitdc5fa90b43471f8b341ce120b3d75766e928bd1d (patch)
tree7a2ec4fc4e1b6943c89190d76d2363e1ed0c2ec4
parent88b5dd33626dcd9a9abfd6c9e316bc6c79eb1b21 (diff)
downloadNim-dc5fa90b43471f8b341ce120b3d75766e928bd1d.tar.gz
switch should be nimOldShiftRight with the nim prefix
-rw-r--r--changelog.md2
-rw-r--r--config/nim.cfg2
-rw-r--r--lib/system.nim2
3 files changed, 3 insertions, 3 deletions
diff --git a/changelog.md b/changelog.md
index 5197c9fab..4ca248d49 100644
--- a/changelog.md
+++ b/changelog.md
@@ -46,7 +46,7 @@
 - A bug allowed `macro foo(): int = 123` to compile even though a
   macros has to return a `NimNode`. This has been fixed.
 
-- `shr` is now sign preserving. Use `-d:oldShiftRight` to enable old
+- `shr` is now sign preserving. Use `-d:nimOldShiftRight` to enable old
   behavior globally.
 
 - With the exception of `uint` and `uint64`, conversion to unsigned types
diff --git a/config/nim.cfg b/config/nim.cfg
index 7c2e0246d..fb7d02436 100644
--- a/config/nim.cfg
+++ b/config/nim.cfg
@@ -278,5 +278,5 @@ tcc.options.always = "-w"
   --multimethods:on
   --oldAst:on
   --define:nimOldCaseObjects
-  --define:oldShiftRight
+  --define:nimOldShiftRight
 @end
diff --git a/lib/system.nim b/lib/system.nim
index de5fe3690..ac91dcbac 100644
--- a/lib/system.nim
+++ b/lib/system.nim
@@ -1271,7 +1271,7 @@ else:
 
 when defined(nimNewShiftOps):
 
-  when defined(oldShiftRight) or not defined(nimAshr):
+  when defined(nimOldShiftRight) or not defined(nimAshr):
     const shrDepMessage = "`shr` will become sign preserving."
     proc `shr`*(x: int, y: SomeInteger): int {.magic: "ShrI", noSideEffect, deprecated: shrDepMessage.}
     proc `shr`*(x: int8, y: SomeInteger): int8 {.magic: "ShrI", noSideEffect, deprecated: shrDepMessage.}