Move builder

Author: ohler55

oj/builder.go renamed to alt/builder.go

@@ -1,6 +1,6 @@
 // Copyright (c) 2020, Peter Ohler, All rights reserved.
 
-package oj
+package alt
 
 import (
 	"fmt"

oj/builder_test.go renamed to alt/builder_test.go

@@ -1,16 +1,16 @@
 // Copyright (c) 2020, Peter Ohler, All rights reserved.
 
-package oj_test
+package alt_test
 
 import (
 	"testing"
 
-	"github.com/ohler55/ojg/oj"
+	"github.com/ohler55/ojg/alt"
 	"github.com/ohler55/ojg/tt"
 )
 
 func TestBuilderArray(t *testing.T) {
-	var b oj.Builder
+	var b alt.Builder
 
 	err := b.Array()
 	tt.Nil(t, err, "b.Array()")
@@ -36,7 +36,7 @@ func TestBuilderArray(t *testing.T) {
 }
 
 func TestBuilderObject(t *testing.T) {
-	var b oj.Builder
+	var b alt.Builder
 
 	err := b.Object()
 	tt.Nil(t, err, "b.Object()")
@@ -63,7 +63,7 @@ func TestBuilderObject(t *testing.T) {
 }
 
 func TestBuilderMixed(t *testing.T) {
-	var b oj.Builder
+	var b alt.Builder
 
 	b.Reset() // not needed, just making sure there are not issues
 
@@ -87,7 +87,7 @@ func TestBuilderMixed(t *testing.T) {
 }
 
 func TestBuilderErrors(t *testing.T) {
-	var b oj.Builder
+	var b alt.Builder
 
 	err := b.Object("bad")
 	tt.Equal(t, "can not use a key when pushing to an array", err.Error())

notes

@@ -1,6 +1,9 @@
 
-- move oj.Builder to alt and then alias
+- field addressable rules?
+ - arbitrary? bool sometimes?
+ - how about make same type and check value and or if offsets are correct
 
+- alt unit test
 - oj unit tests
 - ojg unit tests
 - ojg.Field embedded fields

oj/oj.go

@@ -13,6 +13,9 @@ import (
 // Options is an alias for ojg.Options
 type Options = ojg.Options
 
+// Builder is an aliase for alt.Builder.
+type Builder = alt.Builder
+
 var (
 	// DefaultOptions are the default options for the this package.
 	DefaultOptions = ojg.DefaultOptions

oj/parser.go

@@ -19,6 +19,8 @@ const (
 	readBufSize   = 4096
 )
 
+var emptySlice = []interface{}{}
+
 // Parser is a reusable JSON parser. It can be reused for multiple parsings
 // which allows buffer reuse for a performance advantage.
 type Parser struct {

struct.go

@@ -77,6 +77,9 @@ func buildStruct(rt reflect.Type, x uintptr, embedded bool) (st *Struct) {
 	st = &Struct{Type: rt}
 	structMap[x] = st
 
+	// TBD create value of type rt to use for addressable and same offset
+	//
+	//rv := reflect.New(rt)
 	for u := byte(0); u < MaskSet; u++ {
 		if (MaskByTag&u) != 0 && (MaskExact&u) != 0 { // reuse previously built
 			st.Fields[u] = st.Fields[u & ^MaskExact]
@@ -139,6 +142,8 @@ func buildTagFields(rt reflect.Type, out, pretty, sen, embedded bool) (fa []*Fie
 					}
 				}
 			}
+			// TBD check field lookup vs offset (maybe vs can address)
+			//  change arg from embedded to canAddr or direct+
 			fa = append(fa, newField(f, key, omitEmpty, asString, pretty, sen, embedded))
 		}
 	}