Implement set repr (#117)

xarus01 · corona10 · commit 0c23b142f7b5 · 2019-10-14T19:14:34.000+09:00
* Implemented __repr__ of set

* Gofmt

* Fixed test error

* Fixed test error
diff --git a/builtin/builtin.go b/builtin/builtin.go
@@ -87,8 +87,8 @@ func init() {
 		"object": py.ObjectType,
 		"range":  py.RangeType,
 		// "reversed":       py.ReversedType,
-		"set": py.SetType,
-		"slice":          py.SliceType,
+		"set":          py.SetType,
+		"slice":        py.SliceType,
 		"staticmethod": py.StaticMethodType,
 		"str":          py.StringType,
 		// "super":          py.SuperType,
diff --git a/coverage.txt b/coverage.txt
diff --git a/parser/lexer_test.go b/parser/lexer_test.go
@@ -574,7 +574,7 @@ func approxEq(a, b float64) bool {
 	log.Printf("ApproxEq(a = %#v, b = %#v)", a, b)
 	diff := a - b
 	log.Printf("ApproxEq(diff = %e)", diff)
-	if math.Abs(diff) > 1E-10 {
+	if math.Abs(diff) > 1e-10 {
 		log.Printf("ApproxEq(false)")
 		return false
 	}
diff --git a/py/range.go b/py/range.go
@@ -226,9 +226,9 @@ func computeRangeSlice(r *Range, s *Slice) (Object, error) {
 	sliceLength = computeRangeLength(startIndex, stopIndex, stepIndex)
 
 	return &Range{
-		Start: startIndex,
-		Stop: stopIndex,
-		Step: stepIndex,
+		Start:  startIndex,
+		Stop:   stopIndex,
+		Step:   stepIndex,
 		Length: sliceLength,
 	}, nil
 }
@@ -238,7 +238,6 @@ var _ I__getitem__ = (*Range)(nil)
 var _ I__iter__ = (*Range)(nil)
 var _ I_iterator = (*RangeIterator)(nil)
 
-
 func (a *Range) M__eq__(other Object) (Object, error) {
 	b, ok := other.(*Range)
 	if !ok {
diff --git a/py/range_repr110.go b/py/range_repr110.go
@@ -35,4 +35,4 @@ func (r *Range) repr() (Object, error) {
 	b.WriteString(")")
 
 	return String(b.String()), nil
-}
+}
diff --git a/py/range_repr19.go b/py/range_repr19.go
@@ -35,4 +35,4 @@ func (r *Range) repr() (Object, error) {
 	b.WriteString(")")
 
 	return String(b.String()), nil
-}
+}
diff --git a/py/set.go b/py/set.go
@@ -8,6 +8,8 @@
 
 package py
 
+import "bytes"
+
 var SetType = NewTypeX("set", "set() -> new empty set object\nset(iterable) -> new set object\n\nBuild an unordered collection of unique elements.", SetNew, nil)
 
 type SetValue struct{}
@@ -102,6 +104,25 @@ func (s *Set) M__bool__() (Object, error) {
 	return NewBool(len(s.items) > 0), nil
 }
 
+func (s *Set) M__repr__() (Object, error) {
+	var out bytes.Buffer
+	out.WriteRune('{')
+	spacer := false
+	for item := range s.items {
+		if spacer {
+			out.WriteString(", ")
+		}
+		str, err := ReprAsString(item)
+		if err != nil {
+			return nil, err
+		}
+		out.WriteString(str)
+		spacer = true
+	}
+	out.WriteRune('}')
+	return String(out.String()), nil
+}
+
 func (s *Set) M__iter__() (Object, error) {
 	items := make(Tuple, 0, len(s.items))
 	for item := range s.items {
diff --git a/py/tests/set.py b/py/tests/set.py
@@ -56,6 +56,15 @@
 d = a ^ b
 assert 1 in c
 
+doc="__repr__"
+a = {1, 2, 3}
+b = a.__repr__()
+assert "{" in b
+assert "1" in b
+assert "2" in b
+assert "3" in b
+assert "}" in b
+
 doc="set"
 a = set([1,2,3])
 b = set("set")
@@ -83,4 +92,4 @@
 assert a.__eq__({1,2,3}) == True
 assert a.__ne__({1,2,3}) == False
 
-doc="finished"
+doc="finished"
diff --git a/symtable/symtable_data_test.go b/symtable/symtable_data_test.go
@@ -514,7 +514,7 @@ var symtableTestData = []struct {
 				Children: Children{},
 			},
 		},
-	}, nil,""},
+	}, nil, ""},
 	{"def fn(a):\n    global b\n    global b\n    return b", "exec", &SymTable{
 		Type:              ModuleBlock,
 		Name:              "top",
diff --git a/time/time.go b/time/time.go
@@ -18,7 +18,7 @@ Return the current time in seconds since the Epoch.
 Fractions of a second may be present if the system clock provides them.`
 
 func time_time(self py.Object) (py.Object, error) {
-	return py.Float(time.Now().UnixNano()) / 1E9, nil
+	return py.Float(time.Now().UnixNano()) / 1e9, nil
 }
 
 // func floatclock(_Py_clock_info_t *info) (py.Object, error) {
@@ -141,7 +141,7 @@ func time_sleep(self py.Object, args py.Tuple) (py.Object, error) {
 	if secs < 0 {
 		return nil, py.ExceptionNewf(py.ValueError, "sleep length must be non-negative")
 	}
-	time.Sleep(time.Duration(secs * 1E9))
+	time.Sleep(time.Duration(secs * 1e9))
 	return py.None, nil
 }
 

Original file line number	Diff line number	Diff line change
`@@ -574,7 +574,7 @@ func approxEq(a, b float64) bool {`
`574`	`574`	`log.Printf("ApproxEq(a = %#v, b = %#v)", a, b)`
`575`	`575`	`diff := a - b`
`576`	`576`	`log.Printf("ApproxEq(diff = %e)", diff)`
`577`		`- if math.Abs(diff) > 1E-10 {`
	`577`	`+ if math.Abs(diff) > 1e-10 {`
`578`	`578`	`log.Printf("ApproxEq(false)")`
`579`	`579`	`return false`
`580`	`580`	`}`
Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@ Return the current time in seconds since the Epoch.`
`18`	`18`	Fractions of a second may be present if the system clock provides them.`
`19`	`19`
`20`	`20`	`func time_time(self py.Object) (py.Object, error) {`
`21`		`- return py.Float(time.Now().UnixNano()) / 1E9, nil`
	`21`	`+ return py.Float(time.Now().UnixNano()) / 1e9, nil`
`22`	`22`	`}`
`23`	`23`
`24`	`24`	`// func floatclock(_Py_clock_info_t *info) (py.Object, error) {`
`@@ -141,7 +141,7 @@ func time_sleep(self py.Object, args py.Tuple) (py.Object, error) {`
`141`	`141`	`if secs < 0 {`
`142`	`142`	`return nil, py.ExceptionNewf(py.ValueError, "sleep length must be non-negative")`
`143`	`143`	`}`
`144`		`- time.Sleep(time.Duration(secs * 1E9))`
	`144`	`+ time.Sleep(time.Duration(secs * 1e9))`
`145`	`145`	`return py.None, nil`
`146`	`146`	`}`
`147`	`147`