Merge pull request #36 from gochore/dev

gochore · Mar 3, 2021 · 3d33252 · 3d33252
2 parents 5792254 + 06f509d
commit 3d33252
Show file tree

Hide file tree

Showing 26 changed files with 507 additions and 39 deletions.
diff --git a/cmd/generate/gen_x_seq.go.tmpl b/cmd/generate/gen_x_seq.go.tmpl
@@ -295,11 +295,20 @@ func (s *{{.Name}}Seq) Range(interval Interval) *{{.Name}}Seq {
 	return new{{.Name}}Seq(slice)
 }
 
-// Slice returns a sub *{{.Name}}Seq with specified index
+// Slice returns a sub *{{.Name}}Seq with specified index,
+// (1, 2) means [1:2], (-1, 2) means [:2], (-1, -1) means [:]
 func (s *{{.Name}}Seq) Slice(i, j int) *{{.Name}}Seq {
+	if i < 0 && j < 0 {
+		return s
+	}
 	sslice := s.getSlice()
-	slice := sslice[i:j]
-	return new{{.Name}}Seq(slice)
+	if i < 0 {
+		return new{{.Name}}Seq(sslice[:j])
+	}
+	if j < 0 {
+		return new{{.Name}}Seq(sslice[i:])
+	}
+	return new{{.Name}}Seq(sslice[i:j])
 }
 
 // Trim returns a *{{.Name}}Seq without elements which make fn returns true

diff --git a/cmd/generate/gen_x_seq_test.go.tmpl b/cmd/generate/gen_x_seq_test.go.tmpl
@@ -699,6 +699,33 @@ func Test{{.Name}}Seq_Slice(t *testing.T) {
 			},
 			want: data[1:3],
 		},
+		{
+			name: "left negative",
+			data: data,
+			args: args{
+				i: -1,
+				j: 3,
+			},
+			want: data[:3],
+		},
+		{
+			name: "right negative",
+			data: data,
+			args: args{
+				i: 1,
+				j: -3,
+			},
+			want: data[1:],
+		},
+		{
+			name: "all negative",
+			data: data,
+			args: args{
+				i: -1,
+				j: -3,
+			},
+			want: data[:],
+		},
 	}
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {

diff --git a/gen_float32_seq.go b/gen_float32_seq.go
diff --git a/gen_float32_seq_test.go b/gen_float32_seq_test.go
diff --git a/gen_float64_seq.go b/gen_float64_seq.go
diff --git a/gen_float64_seq_test.go b/gen_float64_seq_test.go
diff --git a/gen_int16_seq.go b/gen_int16_seq.go
diff --git a/gen_int16_seq_test.go b/gen_int16_seq_test.go
diff --git a/gen_int32_seq.go b/gen_int32_seq.go
diff --git a/gen_int32_seq_test.go b/gen_int32_seq_test.go
diff --git a/gen_int64_seq.go b/gen_int64_seq.go
diff --git a/gen_int64_seq_test.go b/gen_int64_seq_test.go
diff --git a/gen_int8_seq.go b/gen_int8_seq.go