use new shared kind and hint from parser-go

Author: awalterschulze

go.mod

@@ -4,6 +4,6 @@ go 1.24
 
 tool github.com/awalterschulze/checklicense
 
-require github.com/katydid/parser-go v0.7.2
+require github.com/katydid/parser-go v0.7.4
 
 require github.com/awalterschulze/checklicense v1.0.1 // indirect

go.sum

@@ -1,4 +1,4 @@
 github.com/awalterschulze/checklicense v1.0.1 h1:7jGGGSkWC/uwlepPUQ8vkm+EZH1nIIn9orQJf9S+hD8=
 github.com/awalterschulze/checklicense v1.0.1/go.mod h1:Tx5mn8+o6YTSeqtM0rIF3ATVEdWmsPy0TxqObvFAF/U=
-github.com/katydid/parser-go v0.7.2 h1:nXkqDoTP4uU0XMLcYmqwsxfrm1ciu2GFdk1T2g0UNcs=
-github.com/katydid/parser-go v0.7.2/go.mod h1:3Oe5QRVSv2L8x7KlZooujIqsZRQXk3htVbzRvXeptzA=
+github.com/katydid/parser-go v0.7.4 h1:WSSlgw6mWuXq4rxvOf6yqT/Pau9VRk5WS1lfOyAyuWA=
+github.com/katydid/parser-go v0.7.4/go.mod h1:9Kh6lTCIkxQGHAwL7CkMg5kJlaMcb+52+wM5+JcYCuA=

json/json.go

@@ -19,8 +19,8 @@ import (
 	"io"
 
 	"github.com/katydid/parser-go-json/json/internal/pool"
-	"github.com/katydid/parser-go-json/json/parse"
-	"github.com/katydid/parser-go-json/json/token"
+	jsonparse "github.com/katydid/parser-go-json/json/parse"
+	"github.com/katydid/parser-go/parse"
 	"github.com/katydid/parser-go/parser"
 )
 
@@ -36,7 +36,7 @@ type jsonParser struct {
 	actions []action
 	state   state
 	stack   []state
-	parser  parse.Parser
+	parser  jsonparse.Parser
 	pool    pool.Pool
 }
 
@@ -46,7 +46,7 @@ func NewParser() Interface {
 	return &jsonParser{
 		stack:   make([]state, 0, 10),
 		actions: make([]action, 0, 10),
-		parser:  parse.NewParser(parse.WithAllocator(p.Alloc)),
+		parser:  jsonparse.NewParser(jsonparse.WithAllocator(p.Alloc)),
 		pool:    p,
 	}
 }
@@ -451,10 +451,10 @@ func (p *jsonParser) Bool() (bool, error) {
 	if err != nil {
 		return false, err
 	}
-	if tokenKind == token.FalseKind {
+	if tokenKind == parse.FalseKind {
 		return false, nil
 	}
-	if tokenKind == token.TrueKind {
+	if tokenKind == parse.TrueKind {
 		return true, nil
 	}
 	return false, errNotBool
@@ -468,7 +468,7 @@ func (p *jsonParser) Int() (int64, error) {
 	if err != nil {
 		return 0, err
 	}
-	if tokenKind != token.Int64Kind {
+	if tokenKind != parse.Int64Kind {
 		return 0, errNotInt
 	}
 	return castToInt64(bs), nil
@@ -493,7 +493,7 @@ func (p *jsonParser) Double() (float64, error) {
 	if err != nil {
 		return 0, err
 	}
-	if tokenKind != token.Float64Kind {
+	if tokenKind != parse.Float64Kind {
 		return 0, errNotFloat
 	}
 	return castToFloat64(bs), nil
@@ -504,7 +504,7 @@ func (p *jsonParser) String() (string, error) {
 	if err != nil {
 		return "", err
 	}
-	if tokenKind != token.StringKind && tokenKind != token.DecimalKind {
+	if tokenKind != parse.StringKind && tokenKind != parse.DecimalKind {
 		return "", errNotString
 	}
 	return castToString(bs), nil
@@ -517,7 +517,7 @@ func (p *jsonParser) Bytes() ([]byte, error) {
 	if err != nil {
 		return nil, err
 	}
-	if tokenKind == token.NullKind {
+	if tokenKind == parse.NullKind {
 		return nullBytes, nil
 	}
 	return bs, nil

json/parse/expect_test.go

@@ -18,7 +18,7 @@ import (
 	"fmt"
 	"testing"
 
-	"github.com/katydid/parser-go-json/json/token"
+	"github.com/katydid/parser-go/parse"
 )
 
 func expect[A comparable](t *testing.T, f func() (A, error), want A) {
@@ -38,7 +38,7 @@ func expectFalse(t *testing.T, tzer Parser) {
 	if err != nil {
 		t.Fatal(err)
 	}
-	if tokenKind != token.FalseKind {
+	if tokenKind != parse.FalseKind {
 		t.Fatalf("expected false, but got %v", tokenKind)
 	}
 }
@@ -49,7 +49,7 @@ func expectTrue(t *testing.T, tzer Parser) {
 	if err != nil {
 		t.Fatal(err)
 	}
-	if tokenKind != token.TrueKind {
+	if tokenKind != parse.TrueKind {
 		t.Fatalf("expected true, but got %v", tokenKind)
 	}
 }
@@ -60,7 +60,7 @@ func expectInt(t *testing.T, tzer Parser, want int64) {
 	if err != nil {
 		t.Fatal(err)
 	}
-	if tokenKind != token.Int64Kind {
+	if tokenKind != parse.Int64Kind {
 		t.Fatalf("expected int64, but got %v", tokenKind)
 	}
 	got := castToInt64(gotb)
@@ -75,7 +75,7 @@ func expectFloat(t *testing.T, tzer Parser, want float64) {
 	if err != nil {
 		t.Fatal(err)
 	}
-	if tokenKind != token.Float64Kind {
+	if tokenKind != parse.Float64Kind {
 		t.Fatalf("expected float64, but got %v", tokenKind)
 	}
 	got := castToFloat64(gotb)
@@ -90,7 +90,7 @@ func expectStr(t *testing.T, tzer Parser, want string) {
 	if err != nil {
 		t.Fatal(err)
 	}
-	if tokenKind != token.StringKind {
+	if tokenKind != parse.StringKind {
 		t.Fatalf("expected string, but got %v", tokenKind)
 	}
 	gotf := string(gotb)