summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorTimothee Cour <timothee.cour2@gmail.com>2021-07-23 14:57:47 -0700
committerGitHub <noreply@github.com>2021-07-23 14:57:47 -0700
commitcc0f02d57d4f95908df5bf82c3612ed3726c84d4 (patch)
treebe8a2b98e6c4cb5be75815c33998db15246e7276
parentfaabcfa6432cd15ecfee44a061ebf7738b16ad6c (diff)
downloadNim-cc0f02d57d4f95908df5bf82c3612ed3726c84d4.tar.gz
rename nimFpRoundtrips => nimPreviewFloatRoundtrip (#18566)
-rw-r--r--changelog.md4
-rw-r--r--compiler/nim.cfg2
-rw-r--r--lib/system/formatfloat.nim4
-rw-r--r--tests/config.nims2
-rw-r--r--tests/errmsgs/treportunused.nim2
-rw-r--r--tests/float/tfloats.nim10
6 files changed, 12 insertions, 12 deletions
diff --git a/changelog.md b/changelog.md
index 8e8b0a908..d33e24b65 100644
--- a/changelog.md
+++ b/changelog.md
@@ -112,8 +112,8 @@
 
 - `system.addFloat` and `system.$` now can produce string representations of floating point numbers
   that are minimal in size and that "roundtrip" (via the "Dragonbox" algorithm). This currently has
-  to be enabled via `-d:nimFpRoundtrips`. It is expected that this behavior becomes the new default
-  in upcoming versions.
+  to be enabled via `-d:nimPreviewFloatRoundtrip`. It is expected that this behavior becomes the new default
+  in upcoming versions, as with other `nimPreviewX` define flags.
 
 - Fixed buffer overflow bugs in `net`
 
diff --git a/compiler/nim.cfg b/compiler/nim.cfg
index f10d847ac..ec51bd463 100644
--- a/compiler/nim.cfg
+++ b/compiler/nim.cfg
@@ -4,7 +4,7 @@ hint:XDeclaredButNotUsed:off
 
 define:booting
 define:nimcore
-define:nimFpRoundtrips
+define:nimPreviewFloatRoundtrip
 
 #import:"$projectpath/testability"
 
diff --git a/lib/system/formatfloat.nim b/lib/system/formatfloat.nim
index cb46c6ea7..3bcd3257b 100644
--- a/lib/system/formatfloat.nim
+++ b/lib/system/formatfloat.nim
@@ -74,7 +74,7 @@ proc writeFloatToBufferSprintf*(buf: var array[65, char]; value: BiggestFloat):
       result = 3
 
 proc writeFloatToBuffer*(buf: var array[65, char]; value: BiggestFloat | float32): int {.inline.} =
-  when defined(nimFpRoundtrips):
+  when defined(nimPreviewFloatRoundtrip):
     writeFloatToBufferRoundtrip(buf, value)
   else:
     writeFloatToBufferSprintf(buf, value)
@@ -121,7 +121,7 @@ proc addFloat*(result: var string; x: float | float32) {.inline.} =
     s.addFloat(45.67)
     assert s == "foo:45.67"
   template impl =
-    when defined(nimFpRoundtrips):
+    when defined(nimPreviewFloatRoundtrip):
       addFloatRoundtrip(result, x)
     else:
       addFloatSprintf(result, x)
diff --git a/tests/config.nims b/tests/config.nims
index 12b303318..f876cb612 100644
--- a/tests/config.nims
+++ b/tests/config.nims
@@ -35,4 +35,4 @@ switch("define", "nimExperimentalAsyncjsThen")
 switch("define", "nimExperimentalJsfetch")
 switch("define", "nimExperimentalLinenoiseExtra")
 
-switch("define", "nimFpRoundtrips")
+switch("define", "nimPreviewFloatRoundtrip")
diff --git a/tests/errmsgs/treportunused.nim b/tests/errmsgs/treportunused.nim
index 3105b35ea..f5ee79afa 100644
--- a/tests/errmsgs/treportunused.nim
+++ b/tests/errmsgs/treportunused.nim
@@ -32,7 +32,7 @@ var s9: int
 type s10 = object
 type s11 = type(1.2)
 
-# bug #14407 (requires `compiler/nim.cfg` containing define:nimFpRoundtrips)
+# bug #14407 (requires `compiler/nim.cfg` containing define:nimPreviewFloatRoundtrip)
 let
   `v0.99` = "0.99"
   `v0.99.99` = "0.99.99"
diff --git a/tests/float/tfloats.nim b/tests/float/tfloats.nim
index 63987bb8d..480396e81 100644
--- a/tests/float/tfloats.nim
+++ b/tests/float/tfloats.nim
@@ -1,5 +1,5 @@
 discard """
-  matrix: "-d:nimFpRoundtrips; -u:nimFpRoundtrips"
+  matrix: "-d:nimPreviewFloatRoundtrip; -u:nimPreviewFloatRoundtrip"
   targets: "c cpp js"
 """
 
@@ -67,14 +67,14 @@ template main =
     block: # example 1
       let a = 0.1+0.2
       doAssert a != 0.3
-      when defined(nimFpRoundtrips):
+      when defined(nimPreviewFloatRoundtrip):
         doAssert $a == "0.30000000000000004"
       else:
         whenRuntimeJs: discard
         do: doAssert $a == "0.3"
     block: # example 2
       const a = 0.1+0.2
-      when defined(nimFpRoundtrips):
+      when defined(nimPreviewFloatRoundtrip):
         doAssert $($a, a) == """("0.30000000000000004", 0.30000000000000004)"""
       else:
         whenRuntimeJs: discard
@@ -83,13 +83,13 @@ template main =
       const a1 = 0.1+0.2
       let a2 = a1
       doAssert a1 != 0.3
-      when defined(nimFpRoundtrips):
+      when defined(nimPreviewFloatRoundtrip):
         doAssert $[$a1, $a2] == """["0.30000000000000004", "0.30000000000000004"]"""
       else:
         whenRuntimeJs: discard
         do: doAssert $[$a1, $a2] == """["0.3", "0.3"]"""
 
-  when defined(nimFpRoundtrips):
+  when defined(nimPreviewFloatRoundtrip):
     block: # bug #18148
       var a = 1.1'f32
       doAssert $a == "1.1", $a # was failing