Merge pull request #4 from koykov/goup1.18

upgrade go to 1.18

Author: koykov

common_test.go

@@ -153,7 +153,7 @@ func assertLen(tb testing.TB, vec *Vector, path string, len int) {
 	}
 }
 
-func assertNode(tb testing.TB, vec *Vector, path string, val interface{}) {
+func assertNode(tb testing.TB, vec *Vector, path string, val any) {
 	node := vec.Dot(path)
 	var eq bool
 	switch val.(type) {

go.mod

@@ -1,9 +1,16 @@
 module github.com/koykov/jsonvector
 
-go 1.16
+go 1.18
 
 require (
-	github.com/koykov/bytealg v1.0.1
-	github.com/koykov/fastconv v1.0.0
-	github.com/koykov/vector v1.2.0
+	github.com/koykov/bytealg v1.0.2
+	github.com/koykov/fastconv v1.0.2
+	github.com/koykov/vector v1.2.2
+)
+
+require (
+	github.com/koykov/bitset v1.0.0 // indirect
+	github.com/koykov/byteptr v1.0.0 // indirect
+	github.com/koykov/byteseq v0.0.0-20230330194259-68973f3b765a // indirect
+	github.com/koykov/indirect v1.0.0 // indirect
 )

go.sum

@@ -1,12 +1,14 @@
 github.com/koykov/bitset v1.0.0 h1:2mEbAhKelhpdWqnpa+mR3HRhdMsto5od7ACOi6MIAmk=
 github.com/koykov/bitset v1.0.0/go.mod h1:DVR3bH49c1oOcNtD38h+aQq7lp1ZY91cXmjOldlTk8A=
-github.com/koykov/bytealg v1.0.1 h1:WlD9/4PMThmfQuIRVpVCujzM/3AVTEwlgvaYrErO9Nk=
-github.com/koykov/bytealg v1.0.1/go.mod h1:kMvejxwPkAt7YfHpB1PQ/utMwKpHSY54u1rCxna6Wvg=
+github.com/koykov/bytealg v1.0.2 h1:e9le4zkWnK9o1dsjlEtIPjC4JuHof+w0XsyOnYGLOvs=
+github.com/koykov/bytealg v1.0.2/go.mod h1:3jLF2zTF1XO+E9dyodNDd3kWyhavUdVUXaIwqPkikB0=
 github.com/koykov/byteptr v1.0.0 h1:tOMEM2qwfFOKTeMNgnzHKyBVWeXxiD1SduLlbzVKJJg=
 github.com/koykov/byteptr v1.0.0/go.mod h1:SSRuU7v8JgUo1deHib6Za8s6ya1PQEG2gNpRVKsO3QM=
-github.com/koykov/fastconv v1.0.0 h1:WnsCYcrrQkUWEKK4VbVX7BuGb6jFhE8Q0Ebl3eAkHic=
-github.com/koykov/fastconv v1.0.0/go.mod h1:Y7I12pumAx+2iH1Yh0X85UpywP7IET/+M7S17toJBes=
+github.com/koykov/byteseq v0.0.0-20230330194259-68973f3b765a h1:2q77e/w+8RE5VwIaR2KwcF4f+PqEemrgOiRA/xhM7S4=
+github.com/koykov/byteseq v0.0.0-20230330194259-68973f3b765a/go.mod h1:JlIJ6P3/ocuGNRbTVyP0NVRS/ExofhOS8g7mtefjefw=
+github.com/koykov/fastconv v1.0.2 h1:csOWpctD9OcpkfI07LEtqtolc4TT8Y6QG3zQvkTmhrQ=
+github.com/koykov/fastconv v1.0.2/go.mod h1:9jOx5KRGe4UKHxGiDw5Yrp/qrqn2cRwH3xvFjqqCE3c=
 github.com/koykov/indirect v1.0.0 h1:3kog1xvVUEB2142K2/AZRhnOKN2N8KNahHHkE+KT7ec=
 github.com/koykov/indirect v1.0.0/go.mod h1:2qWC0hrIHIexlKaqPA0VWEa0s2V/qxxNJv7XPncnh2I=
-github.com/koykov/vector v1.2.0 h1:ge/Mm3Pb4EUvklCbiz8RkZ5g6Qla/9eOoAUvQj9mikM=
-github.com/koykov/vector v1.2.0/go.mod h1:bBFcEbpMzM2zOSFhgG63qhdcmHEPPUPx1PxbFn2zdEg=
+github.com/koykov/vector v1.2.2 h1:VWDNjxGPHlRIfleigPliNuCLyGtkmBzH9kXHeo/a5VY=
+github.com/koykov/vector v1.2.2/go.mod h1:taIaBTVvLApbghwTnYu71CQLGLV9i2OhAo48JIr+OJI=

parser.go

@@ -70,7 +70,7 @@ func (vec *Vector) parseGeneric(depth, offset int, node *vector.Node) (int, erro
 		// Save offset of string value.
 		node.Value().TakeAddr(vec.Src()).SetOffset(offset + 1)
 		// Get index of end of string value.
-		e := bytealg.IndexByteAtLR(vec.Src(), '"', offset+1)
+		e := bytealg.IndexByteAtLUR(vec.Src(), '"', offset+1)
 		if e < 0 {
 			return vec.SrcLen(), vector.ErrUnexpEOS
 		}
@@ -83,7 +83,7 @@ func (vec *Vector) parseGeneric(depth, offset int, node *vector.Node) (int, erro
 			// Walk over double quotas and look for unescaped.
 			_ = vec.Src()[vec.SrcLen()-1]
 			for i := e; i < vec.SrcLen(); {
-				i = bytealg.IndexByteAtLR(vec.Src(), '"', i+1)
+				i = bytealg.IndexByteAtLUR(vec.Src(), '"', i+1)
 				if i < 0 {
 					e = vec.SrcLen() - 1
 					break
@@ -99,7 +99,7 @@ func (vec *Vector) parseGeneric(depth, offset int, node *vector.Node) (int, erro
 		}
 		if !node.Value().CheckBit(flagEscape) {
 			// Extra check of escaping sequences.
-			node.Value().SetBit(flagEscape, bytealg.HasByteLR(node.Value().RawBytes(), '\\'))
+			node.Value().SetBit(flagEscape, bytealg.HasByteLUR(node.Value().RawBytes(), '\\'))
 		}
 	case isDigit(vec.SrcAt(offset)):
 		// Check number node.
@@ -170,7 +170,7 @@ func (vec *Vector) parseObj(depth, offset int, node *vector.Node) (int, error) {
 		child, i := vec.GetChild(node, depth)
 		// Fill up key's offset and length.
 		child.Key().TakeAddr(vec.Src()).SetOffset(offset)
-		e := bytealg.IndexByteAtLR(vec.Src(), '"', offset+1)
+		e := bytealg.IndexByteAtLUR(vec.Src(), '"', offset+1)
 		if e < 0 {
 			return vec.SrcLen(), vector.ErrUnexpEOS
 		}
@@ -183,7 +183,7 @@ func (vec *Vector) parseObj(depth, offset int, node *vector.Node) (int, error) {
 			// Key contains escaped bytes.
 			_ = vec.Src()[vec.SrcLen()-1]
 			for i := e; i < len(vec.Src()); {
-				i = bytealg.IndexByteAtLR(vec.Src(), '"', i+1)
+				i = bytealg.IndexByteAtLUR(vec.Src(), '"', i+1)
 				if i < 0 {
 					e = vec.SrcLen() - 1
 					break
@@ -199,7 +199,7 @@ func (vec *Vector) parseObj(depth, offset int, node *vector.Node) (int, error) {
 		}
 		if !child.Key().CheckBit(flagEscape) {
 			// Extra check of escaped sequences in the key.
-			child.Key().SetBit(flagEscape, bytealg.HasByteLR(child.KeyBytes(), '\\'))
+			child.Key().SetBit(flagEscape, bytealg.HasByteLUR(child.KeyBytes(), '\\'))
 		}
 		if offset, eof = vec.skipFmt(offset); eof {
 			return offset, vector.ErrUnexpEOF

unescape.go

@@ -12,7 +12,7 @@ import (
 func Unescape(p []byte) []byte {
 	l, i := len(p), 0
 	for {
-		i = bytealg.IndexByteAtLR(p, '\\', i)
+		i = bytealg.IndexByteAtLUR(p, '\\', i)
 		if i < 0 || i+1 == l {
 			break
 		}

vector_test.go

@@ -164,6 +164,8 @@ func TestSort(t *testing.T) {
 		vec.Root().SortKeys()
 		_ = vec.Root().Beautify(&buf)
 		if !bytes.Equal(buf.Bytes(), st.fmt) {
+			println(buf.String())
+			println(string(st.fmt))
 			t.Error("sort failed")
 		}
 	})
@@ -177,6 +179,8 @@ func TestSort(t *testing.T) {
 		vec.Root().Sort()
 		_ = vec.Root().Beautify(&buf)
 		if !bytes.Equal(buf.Bytes(), st.fmt) {
+			println(buf.String())
+			println(string(st.fmt))
 			t.Error("sort failed")
 		}
 	})