all: resolve PR comments and add tests

wetor · wetor · commit 1b2b0a2185cf · 2023-06-07T18:15:24.000+08:00
diff --git a/py/filter.go b/py/filter.go
@@ -1,4 +1,4 @@
-// Copyright 2018 The go-python Authors. All rights reserved.
+// Copyright 2023 The go-python Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
diff --git a/py/map.go b/py/map.go
@@ -1,4 +1,4 @@
-// Copyright 2018 The go-python Authors. All rights reserved.
+// Copyright 2023 The go-python Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
diff --git a/py/object.go b/py/object.go
@@ -23,48 +23,50 @@ func ObjectRepr(o Object) Object{
 }
 
 // Return whether the object is True or not
-func ObjectIsTrue(o Object) (bool, error){
-	if o == True{
+func ObjectIsTrue(o Object) (cmp bool, err error){
+	switch o{
+	case True:
 		return true, nil
-	}
-	if o == False{
+	case False:
 		return false, nil
-	}
-
-	if o == None{
+	case None:
 		return false, nil
 	}
 
-	if I, ok := o.(I__bool__); ok{
-		cmp, err := I.M__bool__()
-		if err != nil{
-			return false, err
+	var res Object
+	switch t := o.(type){
+	case I__bool__:
+		res, err = t.M__bool__()
+	case I__len__:
+		res, err = t.M__len__()
+	case *Type:
+		var ok bool
+		if res, ok, err = TypeCall0(o, "__bool__"); ok{
+			break
 		}
-		if cmp == True{
-			return true, nil
-		} else if cmp == False{
-			return false, nil
+		if res, ok, err = TypeCall0(o, "__len__"); ok{
+			break
 		}
 	}
-	if I, ok := o.(I__len__); ok{
-		l, err := I.M__len__()
-		if err != nil{
-			return false, err
-		}
-		if l.(Int) > 0{
-			return true, nil
-		} else{
-			return false, nil
-		}
+	if err != nil{
+		return false, err
+	}
+
+	switch t := res.(type){
+	case Bool:
+		return t == True, nil
+	case Int:
+		return t > 0, nil
 	}
-	return false, nil
+	return true, nil
 }
 
 // Return whether the object is True or not
 func ObjectIsSequence(o Object) bool{
-	if _, ok := o.(I__getitem__); ok{
+	switch t := o.(type){
+	case I__getitem__:
 		return true
-	} else if t, ok := o.(*Type); ok{
+	case *Type:
 		if t.GetAttrOrNil("__getitem__") != nil{
 			return true
 		}
diff --git a/py/tests/filter.py b/py/tests/filter.py
@@ -2,6 +2,27 @@
 from libtest import assertRaises
 
 doc="filter"
+class T0:
+ def __bool__(self):
+ return True
+class T1:
+ def __len__(self):
+ return 1
+class T2:
+ def __bool__(self):
+ return False
+class T3:
+ pass
+t0, t1, t2, t3 = T0(), T1(), T2(), T3()
+assert list(filter(None, [t0, t1, t2, t3])) == [t0, t1, t3]
+assert list(filter(None, [1, [], 2, ''])) == [1, 2]
+
+class T3:
+ def __len__(self):
+ raise ValueError
+t3 = T3()
+assertRaises(ValueError, list, filter(None, [t3]))
+
 class Squares:
 def __init__(self, max):
 self.max = max

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-// Copyright 2018 The go-python Authors. All rights reserved.`
	`1`	`+// Copyright 2023 The go-python Authors. All rights reserved.`
`2`	`2`	`// Use of this source code is governed by a BSD-style`
`3`	`3`	`// license that can be found in the LICENSE file.`
`4`	`4`
-Original file line number
+Diff line change
+}
 // Return whether the object is True or not
 -funcObjectIsTrue(oObject) (bool, error){
 -ifo==True{
 +funcObjectIsTrue(oObject) (cmpbool, errerror){
 +switcho{
 +caseTrue:
 returntrue, nil
 - }
 -ifo==False{
 +caseFalse:
 returnfalse, nil
 - }
+-
 -ifo==None{
 +caseNone:
 returnfalse, nil
+ }
 -ifI, ok:=o.(I__bool__); ok{
 -cmp, err:=I.M__bool__()
 -iferr!=nil{
 -returnfalse, err
 +varresObject
 +switcht:=o.(type){
 +caseI__bool__:
 +res, err=t.M__bool__()
 +caseI__len__:
 +res, err=t.M__len__()
 +case*Type:
 +varokbool
 +ifres, ok, err=TypeCall0(o, "__bool__"); ok{
 +break
+ }
 -ifcmp==True{
 -returntrue, nil
 - } elseifcmp==False{
 -returnfalse, nil
 +ifres, ok, err=TypeCall0(o, "__len__"); ok{
 +break
+ }
+ }
 -ifI, ok:=o.(I__len__); ok{
 -l, err:=I.M__len__()
 -iferr!=nil{
 -returnfalse, err
 - }
 -ifl.(Int) >0{
 -returntrue, nil
 - } else{
 -returnfalse, nil
 - }
 +iferr!=nil{
 +returnfalse, err
 + }
++
 +switcht:=res.(type){
 +caseBool:
 +returnt==True, nil
 +caseInt:
 +returnt>0, nil
+ }
 -returnfalse, nil
 +returntrue, nil
+}
 // Return whether the object is True or not
 funcObjectIsSequence(oObject) bool{
 -if_, ok:=o.(I__getitem__); ok{
 +switcht:=o.(type){
 +caseI__getitem__:
 returntrue
 -} elseift, ok:=o.(*Type); ok{
 +case*Type:
 ift.GetAttrOrNil("__getitem__") !=nil{
 returntrue
+ }
-Original file line number
+Diff line change
 fromlibtestimportassertRaises
 doc="filter"
 +classT0:
 +def__bool__(self):
 +returnTrue
 +classT1:
 +def__len__(self):
 +return1
 +classT2:
 +def__bool__(self):
 +returnFalse
 +classT3:
 +pass
 +t0, t1, t2, t3=T0(), T1(), T2(), T3()
 +assertlist(filter(None, [t0, t1, t2, t3])) == [t0, t1, t3]
 +assertlist(filter(None, [1, [], 2, ''])) == [1, 2]
++
 +classT3:
 +def__len__(self):
 +raiseValueError
 +t3=T3()
 +assertRaises(ValueError, list, filter(None, [t3]))
++
 classSquares:
 def__init__(self, max):
 self.max=max