Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

String operator always returning nonNull string #17809

Merged
merged 13 commits into from
Nov 8, 2024
+31 −14
Merged

String operator always returning nonNull string #17809

Changes from 1 commit
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
8463425
string operator always returning nonNull
T-Gro Sep 27, 2024
2d36985
Merge branch 'main' into 17742-nullness-issue-string-function-signatu…
T-Gro Oct 3, 2024
b44c414
Merge branch 'main' into 17742-nullness-issue-string-function-signatu…
T-Gro Oct 4, 2024
da41d3b
release notes
T-Gro Oct 15, 2024
4dc2160
Merge branch 'main' into 17742-nullness-issue-string-function-signatu…
T-Gro Oct 15, 2024
320b35a
Merge branch 'main' into 17742-nullness-issue-string-function-signatu…
T-Gro Nov 6, 2024
b422d05
Merge branch 'main' into 17742-nullness-issue-string-function-signatu…
T-Gro Nov 7, 2024
09039d3
Update docs/release-notes/.FSharp.Core/9.0.200.md
T-Gro Nov 7, 2024
4b43621
tests added
T-Gro Nov 7, 2024
850c279
Merge branch 'main' into 17742-nullness-issue-string-function-signatu…
T-Gro Nov 7, 2024
aa42f6e
Merge branch 'main' into 17742-nullness-issue-string-function-signatu…
vzarytovskii Nov 7, 2024
569777e
Merge branch 'main' into 17742-nullness-issue-string-function-signatu…
T-Gro Nov 8, 2024
e7ea264
Merge branch 'main' into 17742-nullness-issue-string-function-signatu…
T-Gro Nov 8, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 10 additions & 5 deletions src/FSharp.Core/prim-types.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -890,11 +890,16 @@ namespace Microsoft.FSharp.Core
for m = 0 to len4 - 1 do
SetArray4D dst (src1+i) (src2+j) (src3+k) (src4+m) (GetArray4D src i j k m)

let inline defaultIfNull (defaultStr:string) x =
match x with
| null -> defaultStr
| nonNullString -> nonNullString

let inline anyToString nullStr x =
match box x with
| :? IFormattable as f -> f.ToString(null, CultureInfo.InvariantCulture)
| :? IFormattable as f -> defaultIfNull nullStr (f.ToString(null, CultureInfo.InvariantCulture))
| null -> nullStr
| _ -> x.ToString()
| _ -> defaultIfNull nullStr (x.ToString())

let anyToStringShowingNull x = anyToString "null" x

Expand Down Expand Up @@ -5200,8 +5205,8 @@ namespace Microsoft.FSharp.Core
when 'T : Guid = let x = (# "" value : Guid #) in x.ToString(null, CultureInfo.InvariantCulture)
when 'T struct =
match box value with
| :? IFormattable as f -> f.ToString(null, CultureInfo.InvariantCulture)
| _ -> value.ToString()
| :? IFormattable as f -> defaultIfNull "" (f.ToString(null, CultureInfo.InvariantCulture))
| _ -> defaultIfNull "" (value.ToString())

// other common mscorlib reference types
when 'T : StringBuilder =
Expand All @@ -5210,7 +5215,7 @@ namespace Microsoft.FSharp.Core

when 'T : IFormattable =
if value = unsafeDefault<'T> then ""
else let x = (# "" value : IFormattable #) in x.ToString(null, CultureInfo.InvariantCulture)
else let x = (# "" value : IFormattable #) in defaultIfNull "" (x.ToString(null, CultureInfo.InvariantCulture))

[<NoDynamicInvocation(isLegacy=true)>]
[<CompiledName("ToChar")>]
Expand Down
Loading