more eligible decode

ast/api_amd64.go

@@ -149,26 +149,28 @@ func (self *Parser) getByPathNoValidate(path ...interface{}) (int, types.ValueTy
     return start, t, 0
 }
 
-func DecodeString(src string, pos int) (ret int, v string) {
+func DecodeString(src string, pos int, needEsc bool) (v string, ret int,  hasEsc bool) {
 	p := NewParserObj(src)
     p.p = pos
 	switch val := p.decodeValue(); val.Vt {
 	case types.V_STRING:
         str := p.s[val.Iv : p.p-1]
 		/* fast path: no escape sequence */
 		if val.Ep == -1 {
-			return p.p, str
-		}
+			return str, p.p, false
+		} else if !needEsc {
+            return str, p.p, true
+        }
 		/* unquote the string */
 		out, err := unquote(str)
 		/* check for errors */
 		if err != 0 {
-			return -int(err), ""
+			return "", -int(err), true
 		} else {
-			return p.p, out
+			return out, p.p, true
 		}
 	default:
-		return -int(_ERR_UNSUPPORT_TYPE), ""
+		return "", -int(_ERR_UNSUPPORT_TYPE), false
 	}
 }
 

ast/api_compat.go

@@ -120,21 +120,23 @@ func (self *Parser) getByPathNoValidate(path ...interface{}) (int, types.ValueTy
 }
 
 //go:nocheckptr
-func DecodeString(src string, pos int) (ret int, v string) {
+func DecodeString(src string, pos int, needEsc bool) (v string, ret int, hasEsc bool) {
     ret, ep := skipString(src, pos)
     if ep == -1 {
         (*rt.GoString)(unsafe.Pointer(&v)).Ptr = rt.IndexChar(src, pos+1)
         (*rt.GoString)(unsafe.Pointer(&v)).Len = ret - pos - 2
-        return ret, v
+        return v, ret, false
+    } else if needEsc {
+        return src[pos+1:ret-1], ret, true
     }
 
     vv, ok := unquoteBytes(rt.Str2Mem(src[pos:ret]))
     if !ok {
-        return -int(types.ERR_INVALID_CHAR), ""
+        return "", -int(types.ERR_INVALID_CHAR), true
     }
 
     runtime.KeepAlive(src)
-    return ret, rt.Mem2Str(vv)
+    return rt.Mem2Str(vv), ret, true
 }
 
 // ValidSyntax check if a json has a valid JSON syntax,

ast/decode.go

@@ -96,7 +96,7 @@ func decodeFalse(src string, pos int) (ret int) {
 
 func decodeBinary(src string, pos int) (ret int, v []byte) {
     var vv string
-    ret, vv = DecodeString(src, pos)
+    vv, ret, _ = DecodeString(src, pos, true)
     if ret < 0 {
         return ret, nil
     }

ast/raw.go

@@ -1063,7 +1063,7 @@ func (self Value) toFloat64() (float64, error) {
 }
 
 func (self Value) toString() (string, error) {
-	ret, str := DecodeString(self.js, 0)
+	str, ret, _ := DecodeString(self.js, 0, true)
 	if ret < 0 {
 		return "", NewParserObj(self.js).ExportError(types.ParsingError(-ret))
 	}