fix zero allocation tests

Author: awalterschulze

json/json.go

@@ -41,10 +41,11 @@ type jsonParser struct {
 
 // NewParser returns a new JSON parser.
 func NewParser() Interface {
+	p := pool.New()
 	return &jsonParser{
 		stack:  make([]state, 0, 10),
-		parser: parse.NewParser(nil),
-		pool:   pool.New(),
+		parser: parse.NewParserWithCustomAllocator(nil, p.Alloc),
+		pool:   p,
 	}
 }
 
@@ -58,7 +59,6 @@ func (p *jsonParser) Init(buf []byte) error {
 }
 
 func (p *jsonParser) nextAtStartState(action action) error {
-	fmt.Printf("nextAtStartState\n")
 	switch action {
 	case nextAction:
 		parseKind, err := p.parser.Next()
@@ -101,7 +101,6 @@ func (p *jsonParser) nextAtStartState(action action) error {
 }
 
 func (p *jsonParser) nextInLeafState(action action) error {
-	fmt.Printf("nextInLeafState\n")
 	switch action {
 	case nextAction:
 		// We already parsed the leaf, so there is no next element.
@@ -122,7 +121,6 @@ func (p *jsonParser) nextInLeafState(action action) error {
 }
 
 func (p *jsonParser) nextAtEOF(action action) error {
-	fmt.Printf("nextAtEOF\n")
 	switch action {
 	case nextAction:
 		// If Next is called too many times, just keep on return EOF
@@ -143,7 +141,6 @@ func (p *jsonParser) nextAtEOF(action action) error {
 }
 
 func (p *jsonParser) nextInObjectAtKeyState(action action) error {
-	fmt.Printf("nextInObjectAtKeyState\n")
 	// inObjectAtKeyStateKind represents that we have scanned a key
 	switch action {
 	case nextAction:
@@ -191,7 +188,6 @@ func (p *jsonParser) nextInObjectAtKeyState(action action) error {
 }
 
 func (p *jsonParser) nextInObjectAtValueState(action action) error {
-	fmt.Printf("nextInObjectAtValueState\n")
 	// inObjectAtValueStateKind represents that we have scanned a value and Up was called.
 	switch action {
 	case nextAction:
@@ -224,7 +220,6 @@ func (p *jsonParser) nextInObjectAtValueState(action action) error {
 }
 
 func (p *jsonParser) nextInArrayIndexState(action action) error {
-	fmt.Printf("nextInArrayIndexState\n")
 	// inArrayIndexState represents that we have scanned an element, if it was null, bool, number or string and the first key of an object or .
 	switch action {
 	case nextAction:
@@ -305,7 +300,6 @@ func (p *jsonParser) nextInArrayIndexState(action action) error {
 }
 
 func (p *jsonParser) nextInArrayAfterIndexState(action action) error {
-	fmt.Printf("nextInArrayAfterIndexState\n")
 	// This is after Up was called on an element.
 	switch action {
 	case nextAction:
@@ -343,7 +337,6 @@ func (p *jsonParser) eof() error {
 }
 
 func (p *jsonParser) next() error {
-	fmt.Printf("next\n")
 	action := p.action
 	// do not forget to reset action
 	p.action = nextAction
@@ -367,22 +360,18 @@ func (p *jsonParser) next() error {
 }
 
 func (p *jsonParser) Next() error {
-	fmt.Printf("Next\n")
 	return p.next()
 }
 
 func (p *jsonParser) Down() {
-	fmt.Printf("Down\n")
 	p.action = downAction
 }
 
 func (p *jsonParser) Up() {
-	fmt.Printf("Up\n")
 	p.action = upAction
 }
 
 func (p *jsonParser) push() error {
-	fmt.Printf("push\n")
 	// Append the current state to the stack.
 	p.stack = append(p.stack, p.state)
 	p.state.kind = atStartStateKind
@@ -391,7 +380,6 @@ func (p *jsonParser) push() error {
 }
 
 func (p *jsonParser) pop() error {
-	fmt.Printf("pop\n")
 	if len(p.stack) == 0 {
 		return errPop
 	}

json/json_test.go

@@ -16,7 +16,6 @@
 package json
 
 import (
-	"fmt"
 	"testing"
 )
 
@@ -152,7 +151,6 @@ func TestParseArrayElements(t *testing.T) {
 		t.Fatal(err)
 	}
 
-	fmt.Printf("first element\n")
 	assertNoErr(t, p.Next)
 	expect(t, p.Int, 0)
 	p.Down()
@@ -161,7 +159,6 @@ func TestParseArrayElements(t *testing.T) {
 	expectEOF(t, p.Next)
 	p.Up()
 
-	fmt.Printf("second element\n")
 	assertNoErr(t, p.Next)
 	expect(t, p.Int, 1)
 	p.Down()
@@ -170,7 +167,6 @@ func TestParseArrayElements(t *testing.T) {
 	expectEOF(t, p.Next)
 	p.Up()
 
-	fmt.Printf("third element\n")
 	assertNoErr(t, p.Next)
 	expect(t, p.Int, 2)
 	p.Down()
@@ -184,7 +180,6 @@ func TestParseArrayElements(t *testing.T) {
 	expectEOF(t, p.Next)
 	p.Up()
 
-	fmt.Printf("fourth element\n")
 	assertNoErr(t, p.Next)
 	expect(t, p.Int, 3)
 	p.Down()

json/rand_test.go

@@ -22,7 +22,7 @@ import (
 	"github.com/katydid/parser-go/parser/debug"
 )
 
-func TestParseRandom(t *testing.T) {
+func TestParseRandomValues(t *testing.T) {
 	r := rand.NewRand()
 	numValues := 10000
 	values := rand.Values(r, numValues)
@@ -40,3 +40,22 @@ func TestParseRandom(t *testing.T) {
 		})
 	}
 }
+
+func TestRandomlyParseRandomValues(t *testing.T) {
+	r := rand.NewRand()
+	numValues := 10000
+	values := rand.Values(r, numValues)
+	p := NewParser()
+
+	for i := 0; i < numValues; i++ {
+		name := testrun.Name(values[i])
+		t.Run(name, func(t *testing.T) {
+			if err := p.Init(values[i]); err != nil {
+				t.Fatalf("seed = %v, err = %v, input = %v", r.Seed(), err, string(values[i]))
+			}
+			if err := debug.RandomWalk(p, r, 2, 2); err != nil {
+				t.Fatalf("seed = %v, err = %v", r.Seed(), err)
+			}
+		})
+	}
+}

json/skip_test.go

@@ -16,7 +16,6 @@
 package json
 
 import (
-	"fmt"
 	"testing"
 )
 
@@ -61,7 +60,6 @@ func TestSkipArrayElements(t *testing.T) {
 		t.Fatal(err)
 	}
 
-	fmt.Printf("first element\n")
 	assertNoErr(t, p.Next)
 	expect(t, p.Int, 0)
 	p.Down()
@@ -70,7 +68,6 @@ func TestSkipArrayElements(t *testing.T) {
 	// expectEOF(t, p.Next)
 	p.Up()
 
-	fmt.Printf("second element\n")
 	assertNoErr(t, p.Next)
 	expect(t, p.Int, 1)
 	p.Down()
@@ -79,7 +76,6 @@ func TestSkipArrayElements(t *testing.T) {
 	expectEOF(t, p.Next)
 	p.Up()
 
-	fmt.Printf("third element\n")
 	assertNoErr(t, p.Next)
 	expect(t, p.Int, 2)
 	p.Down()
@@ -93,7 +89,6 @@ func TestSkipArrayElements(t *testing.T) {
 	// expectEOF(t, p.Next)
 	p.Up()
 
-	fmt.Printf("fourth element\n")
 	assertNoErr(t, p.Next)
 	expect(t, p.Int, 3)
 	p.Down()