all: resolve PR comments and add tests

wetor · wetor · commit b184a43feafc · 2023-06-06T11:34:32.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,54 @@ 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
 		}
+		return false, nil
+	default:
+		return false, nil
 	}
-	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
+	default:
+		return false, nil
 	}
-	return false, 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
+    def __repr__(self):
+        return 'T0'
+class T1:
+    def __len__(self):
+        return 1
+    def __repr__(self):
+        return 'T1'
+class T2:
+    pass
+t0, t1, t2 = T0(), T1(), T2()
+assert list(filter(None, [1, 2, t0, t1, 3, t2, 4])) == [1, 2, t0, t1, 3, 4]
+
+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`