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

Continue bool conversion fixing #13751

Merged
merged 3 commits into from
Mar 25, 2020
Merged

Continue bool conversion fixing #13751

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0597ed5
continue fixing #13744
Mar 25, 2020
f4224f6
improve style
Mar 25, 2020
4cdd23f
improve test
Mar 25, 2020
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
4 changes: 3 additions & 1 deletion compiler/semexprs.nim
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,9 @@ proc checkConvertible(c: PContext, targetTyp: PType, src: PNode): TConvStatus =
result = checkConversionBetweenObjects(d.skipTypes(abstractInst), s.skipTypes(abstractInst), pointers)
elif (targetBaseTyp.kind in IntegralTypes) and
(srcBaseTyp.kind in IntegralTypes):
if targetTyp.isOrdinalType:
if targetTyp.kind == tyBool:
discard "convOk"
elif targetTyp.isOrdinalType:
if src.kind in nkCharLit..nkUInt64Lit and
src.getInt notin firstOrd(c.config, targetTyp)..lastOrd(c.config, targetTyp):
result = convNotInRange
Expand Down
9 changes: 9 additions & 0 deletions compiler/semfold.nim
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -433,6 +433,15 @@ proc foldConv(n, a: PNode; g: ModuleGraph; check = false): PNode =
# echo high(int64)
# writeStackTrace()
case dstTyp.kind
of tyBool:
case srcTyp.kind
of tyFloat..tyFloat64:
result = newIntNodeT(int(getFloat(a) != 0.0), n, g)
of tyChar, tyUInt..tyUInt64, tyInt..tyInt64:
result = newIntNodeT(int(a.getOrdValue != 0), n, g)
else:
result = a
result.typ = n.typ
of tyInt..tyInt64, tyUInt..tyUInt64:
case srcTyp.kind
of tyFloat..tyFloat64:
Expand Down
9 changes: 8 additions & 1 deletion tests/types/tcast1.nim
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,5 +52,12 @@ proc test_conv_to_bool =


static:
doAssert(bool(0) == false)
doAssert(bool(-1) == true)
doAssert(bool(2) == true)
doAssert(bool(NaN) == true)
doAssert(bool(0.0) == false)
doAssert(bool(-0.0) == false)
test_conv_to_bool()
test_conv_to_bool()
test_conv_to_bool()