refactor

decoder/compiler.go

@@ -514,11 +514,9 @@ func (self *_Compiler) compile(vt reflect.Type) (ret _Program, err error) {
 }
 
 func (self *_Compiler) compileOne(p *_Program, sp int, vt reflect.Type) {
-    println("decode compile:", vt.Name())
     /* check for recursive nesting */
     ok := self.tab[vt]
     if ok {
-        println("decode recurse:", vt.Name())
         p.rtt(_OP_recurse, vt)
         return
     }

decoder/decoder.go

@@ -17,15 +17,14 @@
 package decoder
 
 import (
-	"encoding/json"
-	"fmt"
-	"reflect"
-	"runtime"
-
-	"github.com/bytedance/sonic/internal/native"
-	"github.com/bytedance/sonic/internal/native/types"
-	"github.com/bytedance/sonic/internal/rt"
-	"github.com/bytedance/sonic/option"
+    `encoding/json`
+    `reflect`
+    `runtime`
+
+    `github.com/bytedance/sonic/internal/native`
+    `github.com/bytedance/sonic/internal/native/types`
+    `github.com/bytedance/sonic/internal/rt`
+    `github.com/bytedance/sonic/option`
 )
 
 const (
@@ -159,16 +158,12 @@ func Pretouch(vt reflect.Type, opts ...option.CompileOption) error {
     for _, opt := range opts {
         opt(&cfg)
     }
-    if vt.Kind() == reflect.Ptr {
-        vt = vt.Elem()
-    }
     return pretouchRec(map[reflect.Type]bool{vt:true}, cfg)
 }
 
 func pretouchType(_vt reflect.Type, opts option.CompileOptions) (map[reflect.Type]bool, error) {
     /* compile function */
     compiler := newCompiler().apply(opts)
-    fmt.Printf("options %#v\n", compiler.opts)
     decoder := func(vt *rt.GoType) (interface{}, error) {
         if pp, err := compiler.compile(_vt); err != nil {
             return nil, err

encoder/compiler.go

@@ -416,9 +416,7 @@ func (self *_Compiler) compile(vt reflect.Type) (ret _Program, err error) {
 func (self *_Compiler) compileOne(p *_Program, sp int, vt reflect.Type, pv bool) {
     if self.tab[vt] {
         p.rtt(_OP_recurse, vt)
-        println("encode recurse tab:", vt.Name())
     } else {
-        println("encode compile:", vt.Name())
         self.compileRec(p, sp, vt, pv)
     }
 }

encoder/encoder.go

@@ -284,13 +284,7 @@ func Pretouch(vt reflect.Type, opts ...option.CompileOption) error {
         opt(&cfg)
         break
     }
-    var m = map[reflect.Type]bool{vt:true}
-    if vt.Kind() == reflect.Ptr {
-        m[vt.Elem()] = true
-    } else {
-        m[reflect.PtrTo(vt)] = true
-    }
-    return pretouchRec(m, cfg)
+    return pretouchRec(map[reflect.Type]bool{vt:true}, cfg)
 }
 
 func pretouchType(_vt reflect.Type, opts option.CompileOptions) (map[reflect.Type]bool, error) {
@@ -320,12 +314,12 @@ func pretouchRec(vtm map[reflect.Type]bool, opts option.CompileOptions) error {
         return nil
     }
     next := make(map[reflect.Type]bool)
-    for vt, _ := range(vtm) {
+    for vt := range(vtm) {
         sub, err := pretouchType(vt, opts)
         if err != nil {
             return err
         }
-        for svt, _ := range(sub) {
+        for svt := range(sub) {
             next[svt] = true
         }
     }