More strict MutateToInt(), MutateToArray() added

Author: vvitkovskiy

insane.go

@@ -1240,6 +1240,17 @@ func (n *Node) MutateToObject() *Node {
 	return n
 }
 
+func (n *Node) MutateToArray() *Node {
+	if n == nil || n.bits&hellBitField == hellBitField {
+		return n
+	}
+
+	n.bits = hellBitArray
+	n.nodes = n.nodes[:0]
+
+	return n
+}
+
 func (n *Node) MutateToStrict() *StrictNode {
 	return &StrictNode{n}
 }
@@ -1486,22 +1497,27 @@ func (n *Node) AsInt() int {
 		return 0
 	}
 
+	if n.bits&hellBitTypeFilter == hellBitEscapedString {
+		n.unescapeStr()
+	}
+
 	switch n.bits & hellBitTypeFilter {
 	case hellBitString:
-		return int(math.Round(decodeFloat64(n.data)))
-	case hellBitEscapedString:
-		n.unescapeStr()
-		return int(math.Round(decodeFloat64(n.data)))
+		fallthrough
+	case hellBitField:
+		fallthrough
 	case hellBitNumber:
-		return int(math.Round(decodeFloat64(n.data)))
+		if strings.IndexByte(n.data, '.') != -1 {
+			return int(math.Round(decodeFloat64(n.data)))
+		} else {
+			return int(decodeInt64(n.data))
+		}
 	case hellBitTrue:
 		return 1
 	case hellBitFalse:
 		return 0
 	case hellBitNull:
 		return 0
-	case hellBitField:
-		return int(math.Round(decodeFloat64(n.data)))
 	case hellBitEscapedField:
 		panic("insane json really goes outta its mind")
 	default:
@@ -1520,6 +1536,50 @@ func (n *StrictNode) AsInt() (int, error) {
 	return int(num), nil
 }
 
+func (n *Node) AsInt64() int64 {
+	if n == nil {
+		return 0
+	}
+
+	if n.bits&hellBitTypeFilter == hellBitEscapedString {
+		n.unescapeStr()
+	}
+
+	switch n.bits & hellBitTypeFilter {
+	case hellBitString:
+		fallthrough
+	case hellBitField:
+		fallthrough
+	case hellBitNumber:
+		if strings.IndexByte(n.data, '.') != -1 {
+			return int64(math.Round(decodeFloat64(n.data)))
+		} else {
+			return decodeInt64(n.data)
+		}
+	case hellBitTrue:
+		return 1
+	case hellBitFalse:
+		return 0
+	case hellBitNull:
+		return 0
+	case hellBitEscapedField:
+		panic("insane json really goes outta its mind")
+	default:
+		return 0
+	}
+}
+
+func (n *StrictNode) AsInt64() (int64, error) {
+	if n == nil || n.bits&hellBitNumber != hellBitNumber {
+		return 0, ErrNotNumber
+	}
+	num := decodeInt64(n.data)
+	if num == 0 && n.data != "0" {
+		return 0, ErrNotNumber
+	}
+	return num, nil
+}
+
 func (n *Node) AsFloat() float64 {
 	switch n.bits & hellBitTypeFilter {
 	case hellBitString:
@@ -2213,4 +2273,3 @@ func insaneErr(err error, json string, offset int) error {
 
 	return errors.New(fmt.Sprintf("%s near `%s`\n%s", err.Error(), str, pointer))
 }
-

insane.s

@@ -2,14 +2,11 @@ package insaneJSON
 
 import (
 	"bufio"
-	"bytes"
 	"fmt"
 	"io/ioutil"
 	"math/rand"
 	"os"
-	"reflect"
 	"testing"
-	"unsafe"
 )
 
 type workload struct {
@@ -267,130 +264,4 @@ func BenchmarkValueEscapeString(b *testing.B) {
 			out = escapeString(out[:0], test.s)
 		}
 	}
-}
-
-func BenchmarkNg1(b *testing.B) {
-	content, err := ioutil.ReadFile("benchdata/insane.json")
-	if err != nil {
-		panic(err.Error())
-	}
-
-	b.SetBytes(int64(len(content)))
-	x := 0
-	for i := 0; i < b.N; i++ {
-		for _, c := range content {
-			if c == '{' || c == '}' || c == '[' || c == ']' || c == '"' || c == ',' {
-				x++
-			}
-		}
-	}
-
-	fmt.Printf("\ncount: %d\n", x/b.N)
-}
-
-func BenchmarkNg2(b *testing.B) {
-	content, err := ioutil.ReadFile("benchdata/insane.json")
-	if err != nil {
-		panic(err.Error())
-	}
-
-	b.SetBytes(int64(len(content)))
-	x := 0
-	m := make([]byte, 256)
-	m['{'] = 1
-	m['}'] = 1
-	m['['] = 1
-	m[']'] = 1
-	m[','] = 1
-	m['"'] = 1
-	for i := 0; i < b.N; i++ {
-		for i := 0; i < len(content); i += 8 {
-			l := content[i : i+8]
-			if m[l[0]]+m[l[1]]+m[l[2]]+m[l[3]]+m[l[4]]+m[l[5]]+m[l[6]]+m[l[7]] > 0 {
-				if m[l[0]] == 1 {
-					x++
-				}
-				if m[l[1]] == 1 {
-					x++
-				}
-				if m[l[2]] == 1 {
-					x++
-				}
-				if m[l[3]] == 1 {
-					x++
-				}
-				if m[l[4]] == 1 {
-					x++
-				}
-				if m[l[5]] == 1 {
-					x++
-				}
-				if m[l[6]] == 1 {
-					x++
-				}
-				if m[l[7]] == 1 {
-					x++
-				}
-			}
-		}
-	}
-
-	fmt.Printf("\ncount: %d\n", x/b.N)
-}
-
-func BenchmarkNg3(b *testing.B) {
-	content, err := ioutil.ReadFile("benchdata/insane.json")
-	if err != nil {
-		panic(err.Error())
-	}
-
-	b.SetBytes(int64(len(content)))
-	x := 0
-	root := Spawn()
-	for i := 0; i < b.N; i++ {
-		_ = root.DecodeBytes(content)
-	}
-
-	fmt.Printf("\ncount: %d\n", x/b.N)
-}
-
-func BenchmarkNg4(b *testing.B) {
-	content, err := ioutil.ReadFile("benchdata/insane.json")
-	if err != nil {
-		panic(err.Error())
-	}
-
-	header := (*reflect.SliceHeader)(unsafe.Pointer(&content))
-
-	ccc := content
-	header2 := (*reflect.SliceHeader)(unsafe.Pointer(&ccc))
-	b.SetBytes(int64(len(content)))
-	x := 0
-	flows := []byte(`{}[],`)
-	for i := 0; i < b.N; i++ {
-		for _, flow := range flows {
-			header2.Len = header.Len
-			header2.Data = header.Data
-			header2.Cap = header.Cap
-			data := &header2.Data
-			l := &header2.Len
-			for {
-				pos := bytes.IndexByte(*(*[]byte)(unsafe.Pointer(header2)), flow) + 1
-				if pos <= 0 {
-					fmt.Printf("pos: %d\n", pos)
-					break
-				}
-				x++
-				*data += uintptr(pos)
-				*l -= pos
-			}
-		}
-	}
-
-	fmt.Printf("\ncount: %d\n", x/b.N)
-}
-
-func BenchmarkNg5(b *testing.B) {
-	r1, r2 := InsaneSkipWC_([]byte(`                         .`), []byte(`........`))
-	fmt.Printf("res=%d/%d\n", r1%256, r2%256)
-}
+}