continue fixing #13744

nim-lang · Mar 25, 2020 · 0597ed5 · 0597ed5
1 parent 182d3c1
commit 0597ed5
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 2 deletions.
diff --git a/compiler/semexprs.nim b/compiler/semexprs.nim
@@ -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

diff --git a/compiler/semfold.nim b/compiler/semfold.nim
@@ -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:

diff --git a/tests/types/tcast1.nim b/tests/types/tcast1.nim
@@ -53,4 +53,6 @@ proc test_conv_to_bool =
 
 static:
   test_conv_to_bool()
-test_conv_to_bool()
+test_conv_to_bool()
+const x1 = bool(-1)
+let x2 = bool(2)