Separate ranges for version 1.9 and 1.10

HyeockJinKim · HyeockJinKim · commit 2cb76fd750af · 2019-09-21T03:21:18.000+09:00
diff --git a/py/range.go b/py/range.go
@@ -6,10 +6,6 @@
 
 package py
 
-import (
-	"strings"
-)
-
 // A python Range object
 // FIXME one day support BigInts too!
 type Range struct {
@@ -112,34 +108,6 @@ func (r *Range) M__str__() (Object, error) {
 	return r.M__repr__()
 }
 
-func (r *Range) repr() (Object, error) {
-	var b strings.Builder
-	b.WriteString("range(")
-	start, err := ReprAsString(r.Start)
-	if err != nil {
-		return nil, err
-	}
-	stop, err := ReprAsString(r.Stop)
-	if err != nil {
-		return nil, err
-	}
-	b.WriteString(start)
-	b.WriteString(", ")
-	b.WriteString(stop)
-
-	if r.Step != 1 {
-		step, err := ReprAsString(r.Step)
-		if err != nil {
-			return nil, err
-		}
-		b.WriteString(", ")
-		b.WriteString(step)
-	}
-	b.WriteString(")")
-
-	return String(b.String()), nil
-}
-
 func (r *Range) M__repr__() (Object, error) {
 	return r.repr()
 }
@@ -196,58 +164,3 @@ func computeRangeLength(start, stop, step Int) Int {
 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 {
-		return NotImplemented, nil
-	}
-
-	if a.Length != b.Length {
-		return False, nil
-	}
-
-	if a.Length == 0 {
-		return True, nil
-	}
-	if a.Start != b.Start {
-		return False, nil
-	}
-
-	if a.Step == 1 {
-		return True, nil
-	}
-	if a.Step != b.Step {
-		return False, nil
-	}
-
-	return True, nil
-}
-
-func (a *Range) M__ne__(other Object) (Object, error) {
-	b, ok := other.(*Range)
-	if !ok {
-		return NotImplemented, nil
-	}
-
-	if a.Length != b.Length {
-		return True, nil
-	}
-
-	if a.Length == 0 {
-		return False, nil
-	}
-	if a.Start != b.Start {
-		return True, nil
-	}
-
-	if a.Step == 1 {
-		return False, nil
-	}
-	if a.Step != b.Step {
-		return True, nil
-	}
-
-	return False, nil
-}
diff --git a/py/range_repr110.go b/py/range_repr110.go
@@ -0,0 +1,38 @@
+// Copyright 2018 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.
+
+// +build go1.9
+// Range object
+
+package py
+
+import "strings"
+
+func (r *Range) repr() (Object, error) {
+	var b strings.Builder
+	b.WriteString("range(")
+	start, err := ReprAsString(r.Start)
+	if err != nil {
+		return nil, err
+	}
+	stop, err := ReprAsString(r.Stop)
+	if err != nil {
+		return nil, err
+	}
+	b.WriteString(start)
+	b.WriteString(", ")
+	b.WriteString(stop)
+
+	if r.Step != 1 {
+		step, err := ReprAsString(r.Step)
+		if err != nil {
+			return nil, err
+		}
+		b.WriteString(", ")
+		b.WriteString(step)
+	}
+	b.WriteString(")")
+
+	return String(b.String()), nil
+}
diff --git a/py/range_repr19.go b/py/range_repr19.go
@@ -0,0 +1,38 @@
+// Copyright 2018 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.
+
+// +build !go1.9
+// Range object
+
+package py
+
+import "bytes"
+
+func (r *Range) repr() (Object, error) {
+	var b bytes.Buffer
+	b.WriteString("range(")
+	start, err := ReprAsString(r.Start)
+	if err != nil {
+		return nil, err
+	}
+	stop, err := ReprAsString(r.Stop)
+	if err != nil {
+		return nil, err
+	}
+	b.WriteString(start)
+	b.WriteString(", ")
+	b.WriteString(stop)
+
+	if r.Step != 1 {
+		step, err := ReprAsString(r.Step)
+		if err != nil {
+			return nil, err
+		}
+		b.WriteString(", ")
+		b.WriteString(step)
+	}
+	b.WriteString(")")
+
+	return String(b.String()), nil
+}
