增加websocket支持

vendor/github.com/bytedance/sonic/internal/encoder/compiler.go

@@ -831,7 +831,7 @@ func (self *_Compiler) compileStructFieldZero(p *_Program, vt reflect.Type) {
         case reflect.Float32   : p.add(_OP_is_zero_4)
         case reflect.Float64   : p.add(_OP_is_zero_8)
         case reflect.String    : p.add(_OP_is_nil_p1)
-        case reflect.Interface : p.add(_OP_is_nil)
+        case reflect.Interface : p.add(_OP_is_nil_p1)
         case reflect.Map       : p.add(_OP_is_zero_map)
         case reflect.Ptr       : p.add(_OP_is_nil)
         case reflect.Slice     : p.add(_OP_is_nil_p1)

vendor/github.com/bytedance/sonic/internal/encoder/encoder.go

@@ -40,8 +40,6 @@ const (
     bitNoQuoteTextMarshaler
     bitNoNullSliceOrMap
     bitValidateString
-    bitNoValidateJSONMarshaler
-    bitNoEncoderNewline 
 
     // used for recursive compile
     bitPointerValue = 63
@@ -73,13 +71,6 @@ const (
     // ValidateString indicates that encoder should validate the input string
     // before encoding it into JSON.
     ValidateString       Options = 1 << bitValidateString
-
-    // NoValidateJSONMarshaler indicates that the encoder should not validate the output string
-    // after encoding the JSONMarshaler to JSON.
-    NoValidateJSONMarshaler Options = 1 << bitNoValidateJSONMarshaler
-
-    // NoEncoderNewline indicates that the encoder should not add a newline after every message
-    NoEncoderNewline Options = 1 << bitNoEncoderNewline
   
     // CompatibleWithStd is used to be compatible with std encoder.
     CompatibleWithStd Options = SortMapKeys | EscapeHTML | CompactMarshaler
@@ -124,25 +115,6 @@ func (self *Encoder) SetValidateString(f bool) {
     }
 }
 
-// SetNoValidateJSONMarshaler specifies if option NoValidateJSONMarshaler opens
-func (self *Encoder) SetNoValidateJSONMarshaler(f bool) {
-    if f {
-        self.Opts |= NoValidateJSONMarshaler
-    } else {
-        self.Opts &= ^NoValidateJSONMarshaler
-    }
-}
-
-// SetNoEncoderNewline specifies if option NoEncoderNewline opens
-func (self *Encoder) SetNoEncoderNewline(f bool) {
-    if f {
-        self.Opts |= NoEncoderNewline
-    } else {
-        self.Opts &= ^NoEncoderNewline
-    }
-}
-
-
 // SetCompactMarshaler specifies if option CompactMarshaler opens
 func (self *Encoder) SetCompactMarshaler(f bool) {
     if f {
@@ -320,6 +292,7 @@ func Pretouch(vt reflect.Type, opts ...option.CompileOption) error {
     cfg := option.DefaultCompileOptions()
     for _, opt := range opts {
         opt(&cfg)
+        break
     }
     return pretouchRec(map[reflect.Type]uint8{vt: 0}, cfg)
 }
@@ -337,7 +310,7 @@ func Valid(data []byte) (ok bool, start int) {
     s := rt.Mem2Str(data)
     p := 0
     m := types.NewStateMachine()
-    ret := native.ValidateOne(&s, &p, m, types.F_VALIDATE_STRING)
+    ret := native.ValidateOne(&s, &p, m)
     types.FreeStateMachine(m)
 
     if ret < 0 {
@@ -352,4 +325,4 @@ func Valid(data []byte) (ok bool, start int) {
     }
 
     return true, ret
-}
+}

vendor/github.com/bytedance/sonic/internal/encoder/stream.go

@@ -36,8 +36,7 @@ func NewStreamEncoder(w io.Writer) *StreamEncoder {
 
 // Encode encodes interface{} as JSON to io.Writer
 func (enc *StreamEncoder) Encode(val interface{}) (err error) {
-    buf := newBytes()
-    out := buf
+    out := newBytes()
 
     /* encode into the buffer */
     err = EncodeInto(&out, val, enc.Opts)
@@ -55,9 +54,7 @@ func (enc *StreamEncoder) Encode(val interface{}) (err error) {
         }
 
         // according to standard library, terminate each value with a newline...
-        if enc.Opts & NoEncoderNewline == 0 {
-            buf.WriteByte('\n')
-        }
+        buf.WriteByte('\n')
 
         /* copy into io.Writer */
         _, err = io.Copy(enc.w, buf)
@@ -78,12 +75,10 @@ func (enc *StreamEncoder) Encode(val interface{}) (err error) {
         }
 
         // according to standard library, terminate each value with a newline...
-        if enc.Opts & NoEncoderNewline == 0 {
-            enc.w.Write([]byte{'\n'})
-        }
+        enc.w.Write([]byte{'\n'})
     }
 
 free_bytes:
-    freeBytes(buf)
+    freeBytes(out)
     return err
-}
+}