Implement set repr (#117)

* Implemented __repr__ of set * Gofmt * Fixed test error * Fixed test error

Author: xarus01

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,

coverage.txt

@@ -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)
-ifmath.Abs(diff) >1E-10{
+ifmath.Abs(diff) >1e-10{
 log.Printf("ApproxEq(false)")
 returnfalse
  }

parser/lexer_test.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__(otherObject) (Object, error){
 b, ok:=other.(*Range)
 if!ok{

py/range.go

@@ -35,4 +35,4 @@ func (r *Range) repr() (Object, error){
 b.WriteString(")")
 
 returnString(b.String()), nil
-}
+}

py/range_repr110.go

@@ -35,4 +35,4 @@ func (r *Range) repr() (Object, error){
 b.WriteString(")")
 
 returnString(b.String()), nil
-}
+}

py/range_repr19.go

@@ -8,6 +8,8 @@
 
 package py
 
+import"bytes"
+
 varSetType=NewTypeX("set", "set() -> new empty set object\nset(iterable) -> new set object\n\nBuild an unordered collection of unique elements.", SetNew, nil)
 
 typeSetValuestruct{}
@@ -102,6 +104,25 @@ func (s *Set) M__bool__() (Object, error){
 returnNewBool(len(s.items) >0), nil
 }
 
+func (s*Set) M__repr__() (Object, error){
+varout bytes.Buffer
+out.WriteRune('{')
+spacer:=false
+foritem:=ranges.items{
+ifspacer{
+out.WriteString(", ")
+ }
+str, err:=ReprAsString(item)
+iferr!=nil{
+returnnil, err
+ }
+out.WriteString(str)
+spacer=true
+ }
+out.WriteRune('}')
+returnString(out.String()), nil
+}
+
 func (s*Set) M__iter__() (Object, error){
 items:=make(Tuple, 0, len(s.items))
 foritem:=ranges.items{

py/set.go

@@ -56,6 +56,15 @@
 d=a^b
 assert1inc
 
+doc="__repr__"
+a={1, 2, 3}
+b=a.__repr__()
+assert"{"inb
+assert"1"inb
+assert"2"inb
+assert"3"inb
+assert"}"inb
+
 doc="set"
 a=set([1,2,3])
 b=set("set")
@@ -83,4 +92,4 @@
 asserta.__eq__({1,2,3}) ==True
 asserta.__ne__({1,2,3}) ==False
 
-doc="finished"
+doc="finished"

py/tests/set.py

@@ -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",

symtable/symtable_data_test.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.`
 
 functime_time(self py.Object) (py.Object, error){
-returnpy.Float(time.Now().UnixNano()) /1E9, nil
+returnpy.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){
 ifsecs<0{
 returnnil, py.ExceptionNewf(py.ValueError, "sleep length must be non-negative")
  }
-time.Sleep(time.Duration(secs*1E9))
+time.Sleep(time.Duration(secs*1e9))
 returnpy.None, nil
 }