addjust build tag

bytedance · May 31, 2024 · d53c455 · d53c455
1 parent 9df99d8
commit d53c455
Show file tree

Hide file tree

Showing 12 changed files with 44 additions and 46 deletions.
diff --git a/compat.go b/compat.go
@@ -1,4 +1,4 @@
-// +build !amd64,!arm64 !go1.17 go1.23
+// +build !amd64,!arm64 go1.23 !go1.17 arm64,!go1.20
 
 /*
  * Copyright 2021 ByteDance Inc.

diff --git a/decode_test.go b/decode_test.go
@@ -1,4 +1,4 @@
-// +build amd64,go1.17,!go1.23 arm64,go1.17,!go1.23
+// +build amd64,go1.17,!go1.23 arm64,go1.20,!go1.23
 
 /*
  * Copyright 2021 ByteDance Inc.

diff --git a/decoder/decoder_native.go b/decoder/decoder_native.go
@@ -1,4 +1,3 @@
-//go:build (amd64 && go1.16 && !go1.23) || (arm64 && go1.20 && !go1.23)
 // +build amd64,go1.16,!go1.23 arm64,go1.20,!go1.23
 
 

diff --git a/decoder/decoder_native_test.go b/decoder/decoder_native_test.go
@@ -1,4 +1,3 @@
-//go:build (amd64 && go1.16 && !go1.23) || (arm64 && go1.20 && !go1.23)
 // +build amd64,go1.16,!go1.23 arm64,go1.20,!go1.23
 
 
@@ -275,4 +274,38 @@ func BenchmarkSkip_Sonic(b *testing.B) {
     for i:=0; i<b.N; i++ {
         _, _ = Skip(data)
     }
-}
+}
+
+
+func TestDecodeCorrupt(t *testing.T) {
+    var ds = []string{
+        `{,}`,
+        `{,"a"}`,
+        `{"a":}`,
+        `{"a":1,}`,
+        `{"a":1,"b"}`,
+        `{"a":1,"b":}`,
+        `{,"a":1 "b":2}`,
+        `{"a",:1 "b":2}`,
+        `{"a":,1 "b":2}`,
+        `{"a":1 "b",:2}`,
+        `{"a":1 "b":,2}`,
+        `{"a":1 "b":2,}`,
+        `{"a":1 "b":2}`,
+        `[,]`,
+        `[,1]`,
+        `[1,]`,
+        `[,1,2]`,
+        `[1,2,]`,
+    }
+    for _, d := range ds {
+        var o interface{}
+        _, err := decode(d, &o, false)
+        if err == nil {
+            t.Fatalf("%#v", d)
+        }
+        if !strings.Contains(err.Error(), "Syntax error"){
+            t.Fatal(err.Error())
+        }
+    }
+}
diff --git a/decoder/decoder_test.go b/decoder/decoder_test.go
@@ -20,7 +20,6 @@ import (
     `encoding/json`
     `runtime`
     `runtime/debug`
-    `strings`
     `sync`
     `testing`
     `time`
@@ -191,39 +190,6 @@ func TestSkipMismatchTypeError(t *testing.T) {
     })
 }
 
-func TestDecodeCorrupt(t *testing.T) {
-    var ds = []string{
-        `{,}`,
-        `{,"a"}`,
-        `{"a":}`,
-        `{"a":1,}`,
-        `{"a":1,"b"}`,
-        `{"a":1,"b":}`,
-        `{,"a":1 "b":2}`,
-        `{"a",:1 "b":2}`,
-        `{"a":,1 "b":2}`,
-        `{"a":1 "b",:2}`,
-        `{"a":1 "b":,2}`,
-        `{"a":1 "b":2,}`,
-        `{"a":1 "b":2}`,
-        `[,]`,
-        `[,1]`,
-        `[1,]`,
-        `[,1,2]`,
-        `[1,2,]`,
-    }
-    for _, d := range ds {
-        var o interface{}
-        _, err := decode(d, &o, false)
-        if err == nil {
-            t.Fatalf("%#v", d)
-        }
-        if !strings.Contains(err.Error(), "Syntax error"){
-            t.Fatal(err.Error())
-        }
-    }
-}
-
 func TestDecodeOption(t *testing.T) {
     var s string
     var d *Decoder

diff --git a/encode_test.go b/encode_test.go
@@ -1,4 +1,4 @@
-// +build amd64,go1.17,!go1.23 arm64,go1.17,!go1.23
+// +build amd64,go1.17,!go1.23 arm64,go1.20,!go1.23
 
 /*
  * Copyright 2021 ByteDance Inc.

diff --git a/encoder/encoder_compat.go b/encoder/encoder_compat.go
@@ -1,4 +1,4 @@
-// +build !amd64,!arm64 !go1.17 go1.23
+// +build !amd64,!arm64 go1.23 !go1.16 arm64,!go1.20
 
 /*
 * Copyright 2023 ByteDance Inc.

diff --git a/encoder/encoder_native.go b/encoder/encoder_native.go
@@ -1,4 +1,4 @@
-// +build amd64,go1.17,!go1.23 arm64,go1.17,!go1.23
+// +build amd64,go1.16,!go1.23 arm64,go1.20,!go1.23
 
 /*
  * Copyright 2023 ByteDance Inc.

diff --git a/encoder/encoder_native_test.go b/encoder/encoder_native_test.go
@@ -1,4 +1,4 @@
-// +build amd64,go1.17,!go1.23 arm64,go1.17,!go1.23
+// +build amd64,go1.16,!go1.23 arm64,go1.20,!go1.23
 
 /*
  * Copyright 2021 ByteDance Inc.

diff --git a/encoder/encoder_test.go b/encoder/encoder_test.go
@@ -246,7 +246,7 @@ func TestEncoder_Marshal_EscapeHTML_LargeJson(t *testing.T) {
     require.NoError(t, err1)
     buf2, err2 :=json.Marshal(&_BindingValue)
     require.NoError(t, err2)
-    require.Equal(t, buf1, buf2)
+    require.Equal(t, string(buf1), string(buf2))
 }
 
 var _GenericValue interface{}

diff --git a/search_test.go b/search_test.go
@@ -1,4 +1,4 @@
-// +build amd64,go1.17,!go1.23 arm64,go1.17,!go1.23
+// +build amd64,go1.17,!go1.23 arm64,go1.20,!go1.23
 
 /*
  * Copyright 2021 ByteDance Inc.

diff --git a/sonic.go b/sonic.go
@@ -1,4 +1,4 @@
-// +build amd64,go1.17,!go1.23 arm64,go1.17,!go1.23
+// +build amd64,go1.17,!go1.23 arm64,go1.20,!go1.23
 
 /*
  * Copyright 2021 ByteDance Inc.