fix(bool): type(bool)() is not None (followup 511e0f2); bool [] is True

Author: litlighilit

Objects/boolobject.nim

@@ -3,10 +3,14 @@ import pyobject
 declarePyType Bool(tpToken):
   b: bool
 
-proc newPyBool(b: bool): PyBoolObject = 
+proc newPyBoolInner(b: bool): PyBoolObject = 
   result = newPyBoolSimple()
   result.b = b
 
 
-let pyTrueObj* = newPyBool(true)
-let pyFalseObj* = newPyBool(false)
+let pyTrueObj* = newPyBoolInner(true)  ## singleton
+let pyFalseObj* = newPyBoolInner(false)  ## singleton
+
+proc newPyBool*(b: bool): PyBoolObject =
+  if b: pyTrueObj
+  else: pyFalseObj

Objects/boolobjectImpl.nim

@@ -7,6 +7,7 @@ import exceptions
 import stringobject
 import boolobject
 import numobjects
+import ./noneobject
 
 export boolobject
 
@@ -16,11 +17,7 @@ method `$`*(obj: PyBoolObject): string =
 methodMacroTmpl(Bool)
 
 implBoolMagic Not:
-  if self == pyTrueObj:
-    pyFalseObj
-  else:
-    pyTrueObj
-
+  newPyBool self != pyTrueObj
 
 implBoolMagic bool:
   self
@@ -29,35 +26,23 @@ implBoolMagic bool:
 implBoolMagic And:
   let otherBoolObj = other.callMagic(bool)
   errorIfNotBool(otherBoolObj, "__bool__")
-  if self.b and PyBoolObject(otherBoolObj).b:
-    return pyTrueObj
-  else:
-    return pyFalseObj
+  newPyBool self.b and PyBoolObject(otherBoolObj).b
 
 implBoolMagic Xor:
   let otherBoolObj = other.callMagic(bool)
   errorIfNotBool(otherBoolObj, "__bool__")
-  if self.b xor PyBoolObject(otherBoolObj).b:
-    return pyTrueObj
-  else:
-    return pyFalseObj
+  newPyBool self.b xor PyBoolObject(otherBoolObj).b
 
 implBoolMagic Or:
   let otherBoolObj = other.callMagic(bool)
   errorIfNotBool(otherBoolObj, "__bool__")
-  if self.b or PyBoolObject(otherBoolObj).b:
-    return pyTrueObj
-  else:
-    return pyFalseObj
+  newPyBool self.b or PyBoolObject(otherBoolObj).b
 
 implBoolMagic eq:
   let otherBoolObj = other.callMagic(bool)
   errorIfNotBool(otherBoolObj, "__bool__")
   let otherBool = PyBoolObject(otherBoolObj).b
-  if self.b == otherBool:
-    return pyTrueObj
-  else:
-    return pyFalseObj
+  newPyBool self.b == otherBool
 
 implBoolMagic repr:
   if self.b:
@@ -67,3 +52,22 @@ implBoolMagic repr:
 
 implBoolMagic hash:
   newPyInt(Hash(self.b))
+
+
+proc PyObject_IsTrue*(v: PyObject): bool =
+  if v == pyTrueObj: return true
+  if v == pyFalseObj: return false
+  if v == pyNone: return false
+  let boolMag = v.getMagic(bool)
+  if not boolMag.isNil:
+    return boolMag(v).PyBoolObject.b
+  elif not v.getMagic(len).isNil:
+    return v.getMagic(len)(v).PyIntObject.positive
+  # We currently don't define:
+  #   as_sequence
+  #   as_mapping
+  return true
+
+implBoolMagic New(tp: PyObject, obj: PyObject):
+  newPyBool PyObject_IsTrue obj
+