Merge pull request #10 from qiniu/develop

Release v7.0.4

Author: xushiwei

bytes.v7/replace.go

@@ -0,0 +1,50 @@
+package bytes
+
+import (
+	"bytes"
+)
+
+// ---------------------------------------------------
+
+func ReplaceAt(b []byte, off int, src, dest []byte) []byte {
+
+	nsrc, ndest := len(src), len(dest)
+	if nsrc >= ndest {
+		left := b[off+nsrc:]
+		off += copy(b[off:], dest)
+		off += copy(b[off:], left)
+		return b[:off]
+	}
+	tailoff := len(b) - (ndest - nsrc)
+	b = append(b, b[tailoff:]...)
+	copy(b[off+ndest:], b[off+nsrc:len(b)])
+	copy(b[off:], dest)
+	return b
+}
+
+func ReplaceOne(b []byte, from int, src, dest []byte) ([]byte, int) {
+
+	pos := bytes.Index(b[from:], src)
+	if pos < 0 {
+		return b, -1
+	}
+
+	from += pos
+	return ReplaceAt(b, from, src, dest), from + len(dest)
+}
+
+func Replace(b []byte, src, dest []byte, n int) []byte {
+
+	from := 0
+	for n != 0 {
+		b, from = ReplaceOne(b, from, src, dest)
+		if from < 0 {
+			break
+		}
+		n--
+	}
+	return b
+}
+
+// ---------------------------------------------------
+

bytes.v7/replace_test.go

@@ -0,0 +1,39 @@
+package bytes
+
+import (
+	"strings"
+	"testing"
+)
+
+type replaceCase struct {
+	s    string
+	src  string
+	dest string
+	n    int
+}
+
+func stringReplace(b string, src, dest string, n int) string {
+
+	return string(Replace([]byte(b), []byte(src), []byte(dest), n))
+}
+
+func TestReplace(t *testing.T) {
+
+	cases := []replaceCase{
+		{"hello, world!", "world", "xsw", -1},
+		{"hello, world world world", "world", "xsw", 1},
+		{"hello, world world world", "world", "xsw", -1},
+		{"hello, xsw!", "xsw", "world", -1},
+		{"hello, xsw xsw xsw", "xsw", "world", 1},
+		{"hello, xsw xsw xsw", "xsw", "world", -1},
+	}
+
+	for _, c := range cases {
+		ret := stringReplace(c.s, c.src, c.dest, c.n)
+		expected := strings.Replace(c.s, c.src, c.dest, c.n)
+		if ret != expected {
+			t.Fatal("Replace failed:", c, "ret:", ret, "expected:", expected)
+		}
+	}
+}
+

errors.v7/error_info.go

@@ -83,8 +83,8 @@ func Info(err error, cmd ...interface{}) *ErrorInfo {
 	return &ErrorInfo{cmd: cmd, err: Err(err), pc: pc}
 }
 
-func InfoEx(skip int, err error, cmd ...interface{}) *ErrorInfo {
-	pc, _, _, ok := runtime.Caller(skip)
+func InfoEx(calldepth int, err error, cmd ...interface{}) *ErrorInfo {
+	pc, _, _, ok := runtime.Caller(calldepth+1)
 	if !ok {
 		pc = 0
 	}

errors.v7/error_info_test.go

@@ -8,7 +8,7 @@ import (
 
 func MysqlError(err error, cmd ...interface{}) error {
 
-	return InfoEx(2, syscall.EINVAL, cmd...).Detail(err)
+	return InfoEx(1, syscall.EINVAL, cmd...).Detail(err)
 }
 
 func (r *ErrorInfo) makeError() error {