diff --git a/_rsrch/microbench/multihoisting/soln/solnStructures.go b/_rsrch/microbench/multihoisting/soln/solnStructures.go index 6ab2599d8de3b0173bd674cb79b697ecb0beaafe..d4d0ed41b3fd5b75f0e26f1db69b15b7e989c587 100644 --- a/_rsrch/microbench/multihoisting/soln/solnStructures.go +++ b/_rsrch/microbench/multihoisting/soln/solnStructures.go @@ -1,6 +1,6 @@ package solution -// -- dms3ld schema --> +// -- ld schema --> /* type Stroct struct { foo Strooct diff --git a/_rsrch/microbench/typedbuilders/neu/neu.go b/_rsrch/microbench/typedbuilders/neu/neu.go index b98385aab633e5936c2d5886b366b092447beef2..7cf284a24f0a878fac593e0bc61230336426c3d0 100644 --- a/_rsrch/microbench/typedbuilders/neu/neu.go +++ b/_rsrch/microbench/typedbuilders/neu/neu.go @@ -29,10 +29,10 @@ type Foo__Content struct { // even if you kick the can down the road with builder funcs... your choices are put all symbols in munges of func name, // or else you'll still just end up with more constants needing to be exported somewhere. - F1 String // `dms3ldsch:"String"` - F2 String // `dms3ldsch:"optional String"` - F3 String // `dms3ldsch:"optional nullable String"` - F4 String // `dms3ldsch:"nullable String"` + F1 String // `ldsch:"String"` + F2 String // `ldsch:"optional String"` + F3 String // `ldsch:"optional nullable String"` + F4 String // `ldsch:"nullable String"` } func (d Foo__Content) Build() Foo { diff --git a/_rsrch/microbench/typedbuilders/typedbuilders_test.go b/_rsrch/microbench/typedbuilders/typedbuilders_test.go index 628a6de45c7dddcf1cfc702f3d6eb7d9ad26c914..500217dd3ac2683dddcb24af908e2fce5ba3b0f0 100644 --- a/_rsrch/microbench/typedbuilders/typedbuilders_test.go +++ b/_rsrch/microbench/typedbuilders/typedbuilders_test.go @@ -27,10 +27,10 @@ var sink interface{} // Stroct is an example of the kind of struct we're already generating from schemas. type Stroct struct { - f1 String // `dms3ldsch:"String"` - f2 *String // `dms3ldsch:"optional String"` - f3 *String // `dms3ldsch:"optional nullable String"` - f4 *String // `dms3ldsch:"nullable String"` + f1 String // `ldsch:"String"` + f2 *String // `ldsch:"optional String"` + f3 *String // `ldsch:"optional nullable String"` + f4 *String // `ldsch:"nullable String"` f3__exists bool } @@ -45,7 +45,7 @@ type Stroct__Content struct { } // String is a another type we're already generating from schemas. -// (It has to conform to the dms3ld 'Node' interfaces, so it's more than a plain golang string.) +// (It has to conform to the ld 'Node' interfaces, so it's more than a plain golang string.) type String string // MaybeString is a proposed part of the way we might handle typed builders. @@ -55,7 +55,7 @@ type MaybeString struct { String String } -// Maybe is a const used for an enum. It would be defined in the dms3ld packages. +// Maybe is a const used for an enum. It would be defined in the ld packages. // (It's all in the same file here -- but the other types would be in codegen output; this one would not.) type Maybe uint8 diff --git a/adl/rot13adl/example_test.go b/adl/rot13adl/example_test.go index 24626044c68de05e0611507f38bcbc0d529ec4fe..4b6270c8bcc92b95d25d7cfffcc238206d9535d0 100644 --- a/adl/rot13adl/example_test.go +++ b/adl/rot13adl/example_test.go @@ -65,14 +65,14 @@ func ExampleLoadingToADL() { storage := &storage.Memory{} linkSystem.StorageReadOpener = storage.OpenRead linkSystem.StorageWriteOpener = storage.OpenWrite - linkSystem.NodeReifier = func(_ dms3ld.LinkContext, nd dms3ld.Node, _ *dms3ld.LinkSystem) (dms3ld.Node, error) { + linkSystem.NodeReifier = func(_ ld.LinkContext, nd ld.Node, _ *ld.LinkSystem) (ld.Node, error) { return rot13adl.Reify(nd) } - lnk, err := linkSystem.Store(dms3ld.LinkContext{Ctx: context.Background()}, lp, substrateNode) + lnk, err := linkSystem.Store(ld.LinkContext{Ctx: context.Background()}, lp, substrateNode) fmt.Printf("storage error: %v\n", err) // reload from storage, but this time the NodeReifier function should give us the ADL - syntheticView, err := linkSystem.Load(dms3ld.LinkContext{Ctx: context.Background()}, lnk, rot13adl.Prototype.SubstrateRoot) + syntheticView, err := linkSystem.Load(ld.LinkContext{Ctx: context.Background()}, lnk, rot13adl.Prototype.SubstrateRoot) fmt.Printf("load error: %v\n", err) // We can inspect the synthetic ADL node like any other node! diff --git a/adl/rot13adl/rot13node.go b/adl/rot13adl/rot13node.go index 100abe24db2843171e43d2a23101abf67bf54617..84311a08fbeff65a181cf5b8f79a1de7b1e2b877 100644 --- a/adl/rot13adl/rot13node.go +++ b/adl/rot13adl/rot13node.go @@ -15,19 +15,20 @@ - optionally, use `SubstrateRootPrototype` as the prototype for loading the raw substrate data; any kind of Node is a valid input to Reify, but this one will generally have optimal performance. - take the synthesized form and inspect its substrate data: - - the `Substrate()` method will return another dms3ld.Node which is the root of the raw substrate data, - and can be walked normally like any other dms3ld.Node. + - the `Substrate()` method will return another ld.Node which is the root of the raw substrate data, + and can be walked normally like any other ld.Node. */ package rot13adl import ( + "gitlab.dms3.io/ld/go-ld-prime" "gitlab.dms3.io/ld/go-ld-prime/node/mixins" "gitlab.dms3.io/ld/go-ld-prime/schema" ) // -- Node --> -var _ dms3ld.Node = (R13String)(nil) +var _ ld.Node = (R13String)(nil) type R13String = *_R13String @@ -36,25 +37,25 @@ type _R13String struct { synthesized string // the content that the ADL presents. calculated proactively from the original, in this implementation (though you could imagine implementing it lazily, in either direction, too). } -func (*_R13String) Kind() dms3ld.Kind { - return dms3ld.Kind_String +func (*_R13String) Kind() ld.Kind { + return ld.Kind_String } -func (*_R13String) LookupByString(string) (dms3ld.Node, error) { +func (*_R13String) LookupByString(string) (ld.Node, error) { return mixins.String{TypeName: "rot13adl.R13String"}.LookupByString("") } -func (*_R13String) LookupByNode(dms3ld.Node) (dms3ld.Node, error) { +func (*_R13String) LookupByNode(ld.Node) (ld.Node, error) { return mixins.String{TypeName: "rot13adl.R13String"}.LookupByNode(nil) } -func (*_R13String) LookupByIndex(idx int64) (dms3ld.Node, error) { +func (*_R13String) LookupByIndex(idx int64) (ld.Node, error) { return mixins.String{TypeName: "rot13adl.R13String"}.LookupByIndex(0) } -func (*_R13String) LookupBySegment(seg dms3ld.PathSegment) (dms3ld.Node, error) { +func (*_R13String) LookupBySegment(seg ld.PathSegment) (ld.Node, error) { return mixins.String{TypeName: "rot13adl.R13String"}.LookupBySegment(seg) } -func (*_R13String) MapIterator() dms3ld.MapIterator { +func (*_R13String) MapIterator() ld.MapIterator { return nil } -func (*_R13String) ListIterator() dms3ld.ListIterator { +func (*_R13String) ListIterator() ld.ListIterator { return nil } func (*_R13String) Length() int64 { @@ -81,16 +82,16 @@ func (n *_R13String) AsString() (string, error) { func (*_R13String) AsBytes() ([]byte, error) { return mixins.String{TypeName: "rot13adl.R13String"}.AsBytes() } -func (*_R13String) AsLink() (dms3ld.Link, error) { +func (*_R13String) AsLink() (ld.Link, error) { return mixins.String{TypeName: "rot13adl.R13String"}.AsLink() } -func (*_R13String) Prototype() dms3ld.NodePrototype { +func (*_R13String) Prototype() ld.NodePrototype { return _R13String__Prototype{} } // -- NodePrototype --> -var _ dms3ld.NodePrototype = _R13String__Prototype{} +var _ ld.NodePrototype = _R13String__Prototype{} type _R13String__Prototype struct { // There's no configuration to this ADL. @@ -106,19 +107,19 @@ type _R13String__Prototype struct { // An ADL that does multi-block stuff might also need functions like a LinkLoader passed in through here. } -func (np _R13String__Prototype) NewBuilder() dms3ld.NodeBuilder { +func (np _R13String__Prototype) NewBuilder() ld.NodeBuilder { return &_R13String__Builder{} } // -- NodeBuilder --> -var _ dms3ld.NodeBuilder = (*_R13String__Builder)(nil) +var _ ld.NodeBuilder = (*_R13String__Builder)(nil) type _R13String__Builder struct { _R13String__Assembler } -func (nb *_R13String__Builder) Build() dms3ld.Node { +func (nb *_R13String__Builder) Build() ld.Node { if nb.m != schema.Maybe_Value { panic("invalid state: cannot call Build on an assembler that's not finished") } @@ -130,17 +131,17 @@ func (nb *_R13String__Builder) Reset() { // -- NodeAssembler --> -var _ dms3ld.NodeAssembler = (*_R13String__Assembler)(nil) +var _ ld.NodeAssembler = (*_R13String__Assembler)(nil) type _R13String__Assembler struct { w *_R13String m schema.Maybe // REVIEW: if the package where this Maybe enum lives is maybe not the right home for it after all. Or should this line use something different? We're only using some of its values after all. } -func (_R13String__Assembler) BeginMap(sizeHint int64) (dms3ld.MapAssembler, error) { +func (_R13String__Assembler) BeginMap(sizeHint int64) (ld.MapAssembler, error) { return mixins.StringAssembler{TypeName: "rot13adl.R13String"}.BeginMap(0) } -func (_R13String__Assembler) BeginList(sizeHint int64) (dms3ld.ListAssembler, error) { +func (_R13String__Assembler) BeginList(sizeHint int64) (ld.ListAssembler, error) { return mixins.StringAssembler{TypeName: "rot13adl.R13String"}.BeginList(0) } func (na *_R13String__Assembler) AssignNull() error { @@ -171,10 +172,10 @@ func (na *_R13String__Assembler) AssignString(v string) error { func (_R13String__Assembler) AssignBytes([]byte) error { return mixins.StringAssembler{TypeName: "rot13adl.R13String"}.AssignBytes(nil) } -func (_R13String__Assembler) AssignLink(dms3ld.Link) error { +func (_R13String__Assembler) AssignLink(ld.Link) error { return mixins.StringAssembler{TypeName: "rot13adl.R13String"}.AssignLink(nil) } -func (na *_R13String__Assembler) AssignNode(v dms3ld.Node) error { +func (na *_R13String__Assembler) AssignNode(v ld.Node) error { if v.IsNull() { return na.AssignNull() } @@ -193,6 +194,6 @@ func (na *_R13String__Assembler) AssignNode(v dms3ld.Node) error { return na.AssignString(v2) } } -func (_R13String__Assembler) Prototype() dms3ld.NodePrototype { +func (_R13String__Assembler) Prototype() ld.NodePrototype { return _R13String__Prototype{} } diff --git a/adl/rot13adl/rot13node_test.go b/adl/rot13adl/rot13node_test.go index 62cde3dba616ea1bcb9f68d3dc096ca97d5760c6..32f4d314b9656471adc93e943675ecba5e73ab98 100644 --- a/adl/rot13adl/rot13node_test.go +++ b/adl/rot13adl/rot13node_test.go @@ -5,6 +5,7 @@ import ( . "github.com/warpfork/go-wish" + "gitlab.dms3.io/ld/go-ld-prime" basicnode "gitlab.dms3.io/ld/go-ld-prime/node/basic" ) @@ -39,7 +40,7 @@ func TestReify(t *testing.T) { synth, err := Reify(sn) // Inspect the resulting high level node. Require(t, err, ShouldEqual, nil) - Wish(t, synth.Kind(), ShouldEqual, dms3ld.Kind_String) + Wish(t, synth.Kind(), ShouldEqual, ld.Kind_String) s, err := synth.AsString() Wish(t, err, ShouldEqual, nil) Wish(t, s, ShouldEqual, "abcd") @@ -53,7 +54,7 @@ func TestReify(t *testing.T) { synth, err := Reify(sn) // Inspect the resulting high level node. Require(t, err, ShouldEqual, nil) - Wish(t, synth.Kind(), ShouldEqual, dms3ld.Kind_String) + Wish(t, synth.Kind(), ShouldEqual, ld.Kind_String) s, err := synth.AsString() Wish(t, err, ShouldEqual, nil) Wish(t, s, ShouldEqual, "abcd") diff --git a/adl/rot13adl/rot13reification.go b/adl/rot13adl/rot13reification.go index 801e930b9e1acbcf93116ef0853d50ba64ff973c..ea5ece7ec9f6d7ed254b8fa67f52c2d9d75c2fcf 100644 --- a/adl/rot13adl/rot13reification.go +++ b/adl/rot13adl/rot13reification.go @@ -2,6 +2,8 @@ package rot13adl import ( "fmt" + + "gitlab.dms3.io/ld/go-ld-prime" ) // Reify examines data in a Node to see if it matches the shape for valid substrate data for this ADL, @@ -10,7 +12,7 @@ import ( // Reify returns a new Node which exhibits the logical behaviors of the ADL; // otherwise, it returns an error. // -// The input data can be any implementation of dms3ld.Node; +// The input data can be any implementation of ld.Node; // it will be considered purely through that interface. // // If your application is expecting ADL data, this pipeline can be optimized @@ -38,7 +40,7 @@ import ( // Reification for multiblock ADLs might also need link loader systems as a parameter here // so they can capture them as config and hold them for use in future operations that do lazy loading. // -func Reify(maybeSubstrateRoot dms3ld.Node) (dms3ld.Node, error) { +func Reify(maybeSubstrateRoot ld.Node) (ld.Node, error) { // Reify is often very easy to implement, // especially if you have an DMS3LD Schema that specifies the shape of the substrate data: // We can just check if the data in maybeSubstrateRoot happens to already be exactly the right type, diff --git a/adl/rot13adl/rot13substrate.go b/adl/rot13adl/rot13substrate.go index 4e508494935fb5a4228ab0bc920427cf7db07b20..81f1e154044ef4d96a19f6fb172b3fb0db025be4 100644 --- a/adl/rot13adl/rot13substrate.go +++ b/adl/rot13adl/rot13substrate.go @@ -7,7 +7,7 @@ import ( ) // Substrate returns the root node of the raw internal data form of the ADL's content. -func (n *_R13String) Substrate() dms3ld.Node { +func (n *_R13String) Substrate() ld.Node { // This is a very minor twist in the case of the rot13 ADL. // However, for larger ADLs (especially those relating to multi-block collections), // this could be quite a bit more involved, and would almost certainly be the root node of a larger tree. @@ -16,7 +16,7 @@ func (n *_R13String) Substrate() dms3ld.Node { // -- Node --> -var _ dms3ld.Node = (*_Substrate)(nil) +var _ ld.Node = (*_Substrate)(nil) // Somewhat unusually for an ADL, there's only one substrate node type, // and we actually made it have the same in-memory structure as the synthesized view node. @@ -30,25 +30,25 @@ type _Substrate _R13String // and I'm not sure what, if any, suffix actually makes meaningful sense to a user either. // I added the segment ".internal." to the middle of the name mangle; does this seem helpful? -func (*_Substrate) Kind() dms3ld.Kind { - return dms3ld.Kind_String +func (*_Substrate) Kind() ld.Kind { + return ld.Kind_String } -func (*_Substrate) LookupByString(string) (dms3ld.Node, error) { +func (*_Substrate) LookupByString(string) (ld.Node, error) { return mixins.String{TypeName: "rot13adl.internal.Substrate"}.LookupByString("") } -func (*_Substrate) LookupByNode(dms3ld.Node) (dms3ld.Node, error) { +func (*_Substrate) LookupByNode(ld.Node) (ld.Node, error) { return mixins.String{TypeName: "rot13adl.internal.Substrate"}.LookupByNode(nil) } -func (*_Substrate) LookupByIndex(idx int64) (dms3ld.Node, error) { +func (*_Substrate) LookupByIndex(idx int64) (ld.Node, error) { return mixins.String{TypeName: "rot13adl.internal.Substrate"}.LookupByIndex(0) } -func (*_Substrate) LookupBySegment(seg dms3ld.PathSegment) (dms3ld.Node, error) { +func (*_Substrate) LookupBySegment(seg ld.PathSegment) (ld.Node, error) { return mixins.String{TypeName: "rot13adl.internal.Substrate"}.LookupBySegment(seg) } -func (*_Substrate) MapIterator() dms3ld.MapIterator { +func (*_Substrate) MapIterator() ld.MapIterator { return nil } -func (*_Substrate) ListIterator() dms3ld.ListIterator { +func (*_Substrate) ListIterator() ld.ListIterator { return nil } func (*_Substrate) Length() int64 { @@ -75,34 +75,34 @@ func (n *_Substrate) AsString() (string, error) { func (*_Substrate) AsBytes() ([]byte, error) { return mixins.String{TypeName: "rot13adl.internal.Substrate"}.AsBytes() } -func (*_Substrate) AsLink() (dms3ld.Link, error) { +func (*_Substrate) AsLink() (ld.Link, error) { return mixins.String{TypeName: "rot13adl.internal.Substrate"}.AsLink() } -func (*_Substrate) Prototype() dms3ld.NodePrototype { +func (*_Substrate) Prototype() ld.NodePrototype { return _Substrate__Prototype{} } // -- NodePrototype --> -var _ dms3ld.NodePrototype = _Substrate__Prototype{} +var _ ld.NodePrototype = _Substrate__Prototype{} type _Substrate__Prototype struct { // There's no configuration to this ADL. } -func (np _Substrate__Prototype) NewBuilder() dms3ld.NodeBuilder { +func (np _Substrate__Prototype) NewBuilder() ld.NodeBuilder { return &_Substrate__Builder{} } // -- NodeBuilder --> -var _ dms3ld.NodeBuilder = (*_Substrate__Builder)(nil) +var _ ld.NodeBuilder = (*_Substrate__Builder)(nil) type _Substrate__Builder struct { _Substrate__Assembler } -func (nb *_Substrate__Builder) Build() dms3ld.Node { +func (nb *_Substrate__Builder) Build() ld.Node { if nb.m != schema.Maybe_Value { panic("invalid state: cannot call Build on an assembler that's not finished") } @@ -114,17 +114,17 @@ func (nb *_Substrate__Builder) Reset() { // -- NodeAssembler --> -var _ dms3ld.NodeAssembler = (*_Substrate__Assembler)(nil) +var _ ld.NodeAssembler = (*_Substrate__Assembler)(nil) type _Substrate__Assembler struct { w *_Substrate m schema.Maybe // REVIEW: if the package where this Maybe enum lives is maybe not the right home for it after all. Or should this line use something different? We're only using some of its values after all. } -func (_Substrate__Assembler) BeginMap(sizeHint int64) (dms3ld.MapAssembler, error) { +func (_Substrate__Assembler) BeginMap(sizeHint int64) (ld.MapAssembler, error) { return mixins.StringAssembler{TypeName: "rot13adl.internal.Substrate"}.BeginMap(0) } -func (_Substrate__Assembler) BeginList(sizeHint int64) (dms3ld.ListAssembler, error) { +func (_Substrate__Assembler) BeginList(sizeHint int64) (ld.ListAssembler, error) { return mixins.StringAssembler{TypeName: "rot13adl.internal.Substrate"}.BeginList(0) } func (na *_Substrate__Assembler) AssignNull() error { @@ -155,10 +155,10 @@ func (na *_Substrate__Assembler) AssignString(v string) error { func (_Substrate__Assembler) AssignBytes([]byte) error { return mixins.StringAssembler{TypeName: "rot13adl.internal.Substrate"}.AssignBytes(nil) } -func (_Substrate__Assembler) AssignLink(dms3ld.Link) error { +func (_Substrate__Assembler) AssignLink(ld.Link) error { return mixins.StringAssembler{TypeName: "rot13adl.internal.Substrate"}.AssignLink(nil) } -func (na *_Substrate__Assembler) AssignNode(v dms3ld.Node) error { +func (na *_Substrate__Assembler) AssignNode(v ld.Node) error { if v.IsNull() { return na.AssignNull() } @@ -177,6 +177,6 @@ func (na *_Substrate__Assembler) AssignNode(v dms3ld.Node) error { return na.AssignString(v2) } } -func (_Substrate__Assembler) Prototype() dms3ld.NodePrototype { +func (_Substrate__Assembler) Prototype() ld.NodePrototype { return _Substrate__Prototype{} } diff --git a/codec/api.go b/codec/api.go index 747560ecbc54e7d681554197dfdd89dc7e45ac0f..ad261696f3632bcfa25676199f25d3dadaec6f85 100644 --- a/codec/api.go +++ b/codec/api.go @@ -4,9 +4,9 @@ import ( "gitlab.dms3.io/ld/go-ld-prime" ) -// Encoder is defined in the root dms3ld package; this alias is just for documentation and discoverability. +// Encoder is defined in the root ld package; this alias is just for documentation and discoverability. // -// Encoder functions can be composed into an dms3ld.LinkSystem to provide +// Encoder functions can be composed into an ld.LinkSystem to provide // a "one stop shop" API for handling content addressable storage. // Encoder functions can also be used directly if you want to handle serial data streams. // @@ -30,12 +30,12 @@ import ( // in all scenarios that use codecs indirectly. // There is also no standard interface for such configurations: by nature, // if they exist at all, they vary per codec. -type Encoder = dms3ld.Encoder +type Encoder = ld.Encoder -// Decoder is defined in the root dms3ld package; this alias is just for documentation and discoverability. +// Decoder is defined in the root ld package; this alias is just for documentation and discoverability. // // Most of the documentation for Encoder also applies wholesale to the Decoder interface. -type Decoder = dms3ld.Decoder +type Decoder = ld.Decoder type ErrBudgetExhausted struct{} diff --git a/codec/cbor/multicodec.go b/codec/cbor/multicodec.go index 7ce08304c77f0d318ccb5f22596555fc80ee506c..a78903e92e0e12fae8ebcd6684a3b379836afef7 100644 --- a/codec/cbor/multicodec.go +++ b/codec/cbor/multicodec.go @@ -11,8 +11,8 @@ import ( ) var ( - _ dms3ld.Decoder = Decode - _ dms3ld.Encoder = Encode + _ ld.Decoder = Decode + _ ld.Encoder = Encode ) func init() { @@ -20,10 +20,10 @@ func init() { multicodec.RegisterDecoder(0x51, Decode) } -func Decode(na dms3ld.NodeAssembler, r io.Reader) error { +func Decode(na ld.NodeAssembler, r io.Reader) error { return dagcbor.Unmarshal(na, cbor.NewDecoder(cbor.DecodeOptions{}, r), false) } -func Encode(n dms3ld.Node, w io.Writer) error { +func Encode(n ld.Node, w io.Writer) error { return dagcbor.Marshal(n, cbor.NewEncoder(w), false) } diff --git a/codec/codectools/token.go b/codec/codectools/token.go index beedba58ca685c98384cc1ee9d1e4cf48bdf1b57..68b11b3949f1414ab3f2865d30e9fdbfd657e550 100644 --- a/codec/codectools/token.go +++ b/codec/codectools/token.go @@ -7,25 +7,25 @@ import ( type Token struct { Kind TokenKind - Length int64 // Present for MapOpen or ListOpen. May be -1 for "unknown" (e.g. a json tokenizer will yield this). - Bool bool // Value. Union: only has meaning if Kind is TokenKind_Bool. - Int int64 // Value. Union: only has meaning if Kind is TokenKind_Int. - Float float64 // Value. Union: only has meaning if Kind is TokenKind_Float. - Str string // Value. Union: only has meaning if Kind is TokenKind_String. ('Str' rather than 'String' to avoid collision with method.) - Bytes []byte // Value. Union: only has meaning if Kind is TokenKind_Bytes. - Link dms3ld.Link // Value. Union: only has meaning if Kind is TokenKind_Link. + Length int64 // Present for MapOpen or ListOpen. May be -1 for "unknown" (e.g. a json tokenizer will yield this). + Bool bool // Value. Union: only has meaning if Kind is TokenKind_Bool. + Int int64 // Value. Union: only has meaning if Kind is TokenKind_Int. + Float float64 // Value. Union: only has meaning if Kind is TokenKind_Float. + Str string // Value. Union: only has meaning if Kind is TokenKind_String. ('Str' rather than 'String' to avoid collision with method.) + Bytes []byte // Value. Union: only has meaning if Kind is TokenKind_Bytes. + Link ld.Link // Value. Union: only has meaning if Kind is TokenKind_Link. - Node dms3ld.Node // Direct pointer to the original data, if this token is used to communicate data during a walk of existing in-memory data. Absent when token is being used during deserialization. + Node ld.Node // Direct pointer to the original data, if this token is used to communicate data during a walk of existing in-memory data. Absent when token is being used during deserialization. // The following fields all track position and progress: // (These may be useful to copy into any error messages if errors arise.) // (Implementations may assume token reuse and treat these as state keeping; // you may experience position accounting accuracy problems if *not* reusing tokens or if zeroing these fields.) - pth []dms3ld.PathSegment // Set by token producers (whether marshallers or deserializers) to track logical position. - offset int64 // Set by deserializers (for both textual or binary formats alike) to track progress. - lineOffset int64 // Set by deserializers that work with textual data. May be ignored by binary deserializers. - columnOffset int64 // Set by deserializers that work with textual data. May be ignored by binary deserializers. + pth []ld.PathSegment // Set by token producers (whether marshallers or deserializers) to track logical position. + offset int64 // Set by deserializers (for both textual or binary formats alike) to track progress. + lineOffset int64 // Set by deserializers that work with textual data. May be ignored by binary deserializers. + columnOffset int64 // Set by deserializers that work with textual data. May be ignored by binary deserializers. } func (tk Token) String() string { diff --git a/codec/codectools/token_consumers.go b/codec/codectools/token_consumers.go index 38754c61492a28cfbeba86fefef600053f07493a..f55bc328719d8a5204d0da395b9851c2cc8881c7 100644 --- a/codec/codectools/token_consumers.go +++ b/codec/codectools/token_consumers.go @@ -7,8 +7,8 @@ import ( "gitlab.dms3.io/ld/go-ld-prime/codec" ) -// TokenAssemble takes an dms3ld.NodeAssembler and a TokenReader, -// and repeatedly pumps the TokenReader for tokens and feeds their data into the dms3ld.NodeAssembler +// TokenAssemble takes an ld.NodeAssembler and a TokenReader, +// and repeatedly pumps the TokenReader for tokens and feeds their data into the ld.NodeAssembler // until it finishes a complete value. // // To compare and contrast to other token oriented tools: @@ -19,7 +19,7 @@ import ( // TokenAssemble does not enforce the "map keys must be strings" rule which is present in the Data Model; // it will also happily do even recursive structures in map keys, // meaning it can be used when handling schema values like maps with complex keys. -func TokenAssemble(na dms3ld.NodeAssembler, tr TokenReader, budget int64) error { +func TokenAssemble(na ld.NodeAssembler, tr TokenReader, budget int64) error { tk, err := tr(&budget) if err != nil { return err @@ -27,7 +27,7 @@ func TokenAssemble(na dms3ld.NodeAssembler, tr TokenReader, budget int64) error return tokenAssemble(na, tk, tr, &budget) } -func tokenAssemble(na dms3ld.NodeAssembler, tk *Token, tr TokenReader, budget *int64) error { +func tokenAssemble(na ld.NodeAssembler, tk *Token, tr TokenReader, budget *int64) error { if *budget < 0 { return codec.ErrBudgetExhausted{} } @@ -131,17 +131,17 @@ type TokenAssembler struct { } type assemblerStackRow struct { - state uint8 // 0: assign this node; 1: continue list; 2: continue map with key; 3: continue map with value. - na dms3ld.NodeAssembler // Always present. - la dms3ld.ListAssembler // At most one of these is present. - ma dms3ld.MapAssembler // At most one of these is present. + state uint8 // 0: assign this node; 1: continue list; 2: continue map with key; 3: continue map with value. + na ld.NodeAssembler // Always present. + la ld.ListAssembler // At most one of these is present. + ma ld.MapAssembler // At most one of these is present. } type assemblerStack []assemblerStackRow func (stk assemblerStack) Tip() *assemblerStackRow { return &stk[len(stk)-1] } -func (stk *assemblerStack) Push(na dms3ld.NodeAssembler) { +func (stk *assemblerStack) Push(na ld.NodeAssembler) { *stk = append(*stk, assemblerStackRow{na: na}) } func (stk *assemblerStack) Pop() { @@ -151,7 +151,7 @@ func (stk *assemblerStack) Pop() { *stk = (*stk)[0 : len(*stk)-1] } -func (ta *TokenAssembler) Initialize(na dms3ld.NodeAssembler, budget int64) { +func (ta *TokenAssembler) Initialize(na ld.NodeAssembler, budget int64) { if ta.stk == nil { ta.stk = make(assemblerStack, 0, 10) } else { diff --git a/codec/codectools/token_producers.go b/codec/codectools/token_producers.go index 3b65ffd76ccb4528ffd5ee22e82008598b9a703e..4e5de7a9c0a3dbfee9a72325678895340cba2e52 100644 --- a/codec/codectools/token_producers.go +++ b/codec/codectools/token_producers.go @@ -6,7 +6,7 @@ import ( "io" ) -// TokenWalk walks an dms3ld Node and repeatedly calls the visitFn, +// TokenWalk walks an ld Node and repeatedly calls the visitFn, // calling it once for every "token" yielded by the walk. // Every map and list is yielded as a token at their beginning, // and another token when they're finished; @@ -28,7 +28,7 @@ import ( // (e.g. anything other than a MapOpen or a ListOpen) has no effect. // // TokenAssembler is the rough dual of TokenWalk. -func TokenWalk(n dms3ld.Node, visitFn func(tk *Token) error) error { +func TokenWalk(n ld.Node, visitFn func(tk *Token) error) error { // TokenWalk would be trivial to implement over NodeTokenizer, // but we do a distinct implementation here because NodeTokenizer's resumable implementation means it needs a user-space stack, // and to reuse that would require allocations which this method (since it's not resumable in the same way) can easily avoid (or at least, keep on the stack). @@ -37,9 +37,9 @@ func TokenWalk(n dms3ld.Node, visitFn func(tk *Token) error) error { return tokenWalk(&tk, n, visitFn) } -func tokenWalk(tk *Token, n dms3ld.Node, visitFn func(*Token) error) error { +func tokenWalk(tk *Token, n ld.Node, visitFn func(*Token) error) error { switch n.Kind() { - case dms3ld.Kind_Map: + case ld.Kind_Map: tk.Kind = TokenKind_MapOpen tk.Length = n.Length() tk.Node = n @@ -62,7 +62,7 @@ func tokenWalk(tk *Token, n dms3ld.Node, visitFn func(*Token) error) error { tk.Kind = TokenKind_MapClose tk.Node = n return visitFn(tk) - case dms3ld.Kind_List: + case ld.Kind_List: tk.Kind = TokenKind_ListOpen tk.Length = n.Length() tk.Node = n @@ -82,31 +82,31 @@ func tokenWalk(tk *Token, n dms3ld.Node, visitFn func(*Token) error) error { tk.Kind = TokenKind_ListClose tk.Node = n return visitFn(tk) - case dms3ld.Kind_Null: + case ld.Kind_Null: tk.Kind = TokenKind_Null return visitFn(tk) - case dms3ld.Kind_Bool: + case ld.Kind_Bool: tk.Kind = TokenKind_Bool tk.Bool, _ = n.AsBool() return visitFn(tk) - case dms3ld.Kind_Int: + case ld.Kind_Int: tk.Kind = TokenKind_Int i, _ := n.AsInt() - tk.Int = int64(i) // TODO: upgrade all of dms3ld to use high precision int consistently + tk.Int = int64(i) // TODO: upgrade all of ld to use high precision int consistently return visitFn(tk) - case dms3ld.Kind_Float: + case ld.Kind_Float: tk.Kind = TokenKind_Float tk.Float, _ = n.AsFloat() return visitFn(tk) - case dms3ld.Kind_String: + case ld.Kind_String: tk.Kind = TokenKind_String tk.Str, _ = n.AsString() return visitFn(tk) - case dms3ld.Kind_Bytes: + case ld.Kind_Bytes: tk.Kind = TokenKind_Bytes tk.Bytes, _ = n.AsBytes() return visitFn(tk) - case dms3ld.Kind_Link: + case ld.Kind_Link: tk.Kind = TokenKind_Link tk.Link, _ = n.AsLink() return visitFn(tk) @@ -120,7 +120,7 @@ var TokenWalkSkip = errors.New("token walk: skip") // --- the stepwise token producer system (more complicated; has a userland stack) is below --> -// A TokenReader can be produced from any dms3ld.Node using NodeTokenizer. +// A TokenReader can be produced from any ld.Node using NodeTokenizer. // TokenReader are also commonly implemented by codec packages, // wherein they're created over a serial data stream and tokenize that stream when pumped. // @@ -145,7 +145,7 @@ type NodeTokenizer struct { stk nodeTokenizerStack } -func (nt *NodeTokenizer) Initialize(n dms3ld.Node) { +func (nt *NodeTokenizer) Initialize(n ld.Node) { if nt.stk == nil { nt.stk = make(nodeTokenizerStack, 0, 10) } else { @@ -155,11 +155,11 @@ func (nt *NodeTokenizer) Initialize(n dms3ld.Node) { } type nodeTokenizerStackRow struct { - state uint8 // 0: start this node; 1: continue list; 2: continue map with key; 3: continue map with value. - n dms3ld.Node // Always present. - litr dms3ld.ListIterator // At most one of these is present. - mitr dms3ld.MapIterator // At most one of these is present. - mval dms3ld.Node // The value to resume at when in state 3. + state uint8 // 0: start this node; 1: continue list; 2: continue map with key; 3: continue map with value. + n ld.Node // Always present. + litr ld.ListIterator // At most one of these is present. + mitr ld.MapIterator // At most one of these is present. + mval ld.Node // The value to resume at when in state 3. } type nodeTokenizerStack []nodeTokenizerStackRow @@ -167,7 +167,7 @@ type nodeTokenizerStack []nodeTokenizerStackRow func (stk nodeTokenizerStack) Tip() *nodeTokenizerStackRow { return &stk[len(stk)-1] } -func (stk *nodeTokenizerStack) Push(n dms3ld.Node) { +func (stk *nodeTokenizerStack) Push(n ld.Node) { *stk = append(*stk, nodeTokenizerStackRow{n: n}) } func (stk *nodeTokenizerStack) Pop() { @@ -194,51 +194,51 @@ func (nt *NodeTokenizer) ReadToken() (next *Token, err error) { switch tip.state { case 0: switch tip.n.Kind() { - case dms3ld.Kind_Map: + case ld.Kind_Map: nt.tk.Kind = TokenKind_MapOpen nt.tk.Length = tip.n.Length() nt.tk.Node = tip.n tip.state = 2 tip.mitr = tip.n.MapIterator() return &nt.tk, nil - case dms3ld.Kind_List: + case ld.Kind_List: nt.tk.Kind = TokenKind_ListOpen nt.tk.Length = tip.n.Length() nt.tk.Node = tip.n tip.state = 1 tip.litr = tip.n.ListIterator() return &nt.tk, nil - case dms3ld.Kind_Null: + case ld.Kind_Null: nt.tk.Kind = TokenKind_Null nt.stk.Pop() return &nt.tk, nil - case dms3ld.Kind_Bool: + case ld.Kind_Bool: nt.tk.Kind = TokenKind_Bool nt.tk.Bool, _ = tip.n.AsBool() nt.stk.Pop() return &nt.tk, nil - case dms3ld.Kind_Int: + case ld.Kind_Int: nt.tk.Kind = TokenKind_Int i, _ := tip.n.AsInt() - nt.tk.Int = int64(i) // TODO: upgrade all of dms3ld to use high precision int consistently + nt.tk.Int = int64(i) // TODO: upgrade all of ld to use high precision int consistently nt.stk.Pop() return &nt.tk, nil - case dms3ld.Kind_Float: + case ld.Kind_Float: nt.tk.Kind = TokenKind_Float nt.tk.Float, _ = tip.n.AsFloat() nt.stk.Pop() return &nt.tk, nil - case dms3ld.Kind_String: + case ld.Kind_String: nt.tk.Kind = TokenKind_String nt.tk.Str, _ = tip.n.AsString() nt.stk.Pop() return &nt.tk, nil - case dms3ld.Kind_Bytes: + case ld.Kind_Bytes: nt.tk.Kind = TokenKind_Bytes nt.tk.Bytes, _ = tip.n.AsBytes() nt.stk.Pop() return &nt.tk, nil - case dms3ld.Kind_Link: + case ld.Kind_Link: nt.tk.Kind = TokenKind_Link nt.tk.Link, _ = tip.n.AsLink() nt.stk.Pop() diff --git a/codec/codectools/token_test.go b/codec/codectools/token_test.go index 15b07cdcb75689fb63185386888d5165ea69660c..3cc8723eff7a90b50ba72b994c1b1fea357b3e3d 100644 --- a/codec/codectools/token_test.go +++ b/codec/codectools/token_test.go @@ -8,7 +8,7 @@ import ( ) var tokenFixtures = []struct { - value dms3ld.Node + value ld.Node sequence []Token }{ { diff --git a/codec/dagcbor/doc.go b/codec/dagcbor/doc.go index 10e09a5a3ec93241a655a488c6b8908846024e87..cbbadad133a0e4f5018cca0306e73c5fdc6abd9d 100644 --- a/codec/dagcbor/doc.go +++ b/codec/dagcbor/doc.go @@ -1,7 +1,7 @@ /* The dagcbor package provides a DAG-CBOR codec implementation. - The Encode and Decode functions match the dms3ld.Encoder and dms3ld.Decoder function interfaces, + The Encode and Decode functions match the ld.Encoder and ld.Decoder function interfaces, and can be registered with the go-ld-prime/multicodec package for easy usage with systems such as CIDs. Importing this package will automatically have the side-effect of registering Encode and Decode diff --git a/codec/dagcbor/marshal.go b/codec/dagcbor/marshal.go index 46fc5977f502935c531951eedd61cfb4638dec95..7cf17f0130b257de40ace9a74c38e64fe5b64996 100644 --- a/codec/dagcbor/marshal.go +++ b/codec/dagcbor/marshal.go @@ -6,28 +6,28 @@ import ( "github.com/polydawn/refmt/shared" "github.com/polydawn/refmt/tok" - dms3ld "gitlab.dms3.io/ld/go-ld-prime" + ld "gitlab.dms3.io/ld/go-ld-prime" cidlink "gitlab.dms3.io/ld/go-ld-prime/linking/cid" ) // This file should be identical to the general feature in the parent package, -// except for the `case dms3ld.Kind_Link` block, +// except for the `case ld.Kind_Link` block, // which is dag-cbor's special sauce for schemafree links. -func Marshal(n dms3ld.Node, sink shared.TokenSink, allowLinks bool) error { +func Marshal(n ld.Node, sink shared.TokenSink, allowLinks bool) error { var tk tok.Token return marshal(n, &tk, sink, allowLinks) } -func marshal(n dms3ld.Node, tk *tok.Token, sink shared.TokenSink, allowLinks bool) error { +func marshal(n ld.Node, tk *tok.Token, sink shared.TokenSink, allowLinks bool) error { switch n.Kind() { - case dms3ld.Kind_Invalid: + case ld.Kind_Invalid: return fmt.Errorf("cannot traverse a node that is absent") - case dms3ld.Kind_Null: + case ld.Kind_Null: tk.Type = tok.TNull _, err := sink.Step(tk) return err - case dms3ld.Kind_Map: + case ld.Kind_Map: // Emit start of map. tk.Type = tok.TMapOpen tk.Length = int(n.Length()) // TODO: overflow check @@ -56,7 +56,7 @@ func marshal(n dms3ld.Node, tk *tok.Token, sink shared.TokenSink, allowLinks boo tk.Type = tok.TMapClose _, err := sink.Step(tk) return err - case dms3ld.Kind_List: + case ld.Kind_List: // Emit start of list. tk.Type = tok.TArrOpen l := n.Length() @@ -78,7 +78,7 @@ func marshal(n dms3ld.Node, tk *tok.Token, sink shared.TokenSink, allowLinks boo tk.Type = tok.TArrClose _, err := sink.Step(tk) return err - case dms3ld.Kind_Bool: + case ld.Kind_Bool: v, err := n.AsBool() if err != nil { return err @@ -87,7 +87,7 @@ func marshal(n dms3ld.Node, tk *tok.Token, sink shared.TokenSink, allowLinks boo tk.Bool = v _, err = sink.Step(tk) return err - case dms3ld.Kind_Int: + case ld.Kind_Int: v, err := n.AsInt() if err != nil { return err @@ -96,7 +96,7 @@ func marshal(n dms3ld.Node, tk *tok.Token, sink shared.TokenSink, allowLinks boo tk.Int = int64(v) _, err = sink.Step(tk) return err - case dms3ld.Kind_Float: + case ld.Kind_Float: v, err := n.AsFloat() if err != nil { return err @@ -105,7 +105,7 @@ func marshal(n dms3ld.Node, tk *tok.Token, sink shared.TokenSink, allowLinks boo tk.Float64 = v _, err = sink.Step(tk) return err - case dms3ld.Kind_String: + case ld.Kind_String: v, err := n.AsString() if err != nil { return err @@ -114,7 +114,7 @@ func marshal(n dms3ld.Node, tk *tok.Token, sink shared.TokenSink, allowLinks boo tk.Str = v _, err = sink.Step(tk) return err - case dms3ld.Kind_Bytes: + case ld.Kind_Bytes: v, err := n.AsBytes() if err != nil { return err @@ -123,9 +123,9 @@ func marshal(n dms3ld.Node, tk *tok.Token, sink shared.TokenSink, allowLinks boo tk.Bytes = v _, err = sink.Step(tk) return err - case dms3ld.Kind_Link: + case ld.Kind_Link: if !allowLinks { - return fmt.Errorf("cannot Marshal dms3ld links to CBOR") + return fmt.Errorf("cannot Marshal ld links to CBOR") } v, err := n.AsLink() if err != nil { diff --git a/codec/dagcbor/multicodec.go b/codec/dagcbor/multicodec.go index 699d6ae9149fadb1f8e309354d3e5b5091687386..284cb627cffc8584465a76992c27a5c297f16d5d 100644 --- a/codec/dagcbor/multicodec.go +++ b/codec/dagcbor/multicodec.go @@ -5,13 +5,13 @@ import ( "github.com/polydawn/refmt/cbor" - "gitlab.dms3.io/ld/go-ld-prime" + "gitlab.dms3.io/ld/go-ld-prime" "gitlab.dms3.io/ld/go-ld-prime/multicodec" ) var ( - _ dms3ld.Decoder = Decode - _ dms3ld.Encoder = Encode + _ ld.Decoder = Decode + _ ld.Encoder = Encode ) func init() { @@ -19,7 +19,7 @@ func init() { multicodec.RegisterDecoder(0x71, Decode) } -func Decode(na dms3ld.NodeAssembler, r io.Reader) error { +func Decode(na ld.NodeAssembler, r io.Reader) error { // Probe for a builtin fast path. Shortcut to that if possible. type detectFastPath interface { DecodeDagCbor(io.Reader) error @@ -31,7 +31,7 @@ func Decode(na dms3ld.NodeAssembler, r io.Reader) error { return Unmarshal(na, cbor.NewDecoder(cbor.DecodeOptions{}, r), true) } -func Encode(n dms3ld.Node, w io.Writer) error { +func Encode(n ld.Node, w io.Writer) error { // Probe for a builtin fast path. Shortcut to that if possible. type detectFastPath interface { EncodeDagCbor(io.Writer) error diff --git a/codec/dagcbor/roundtripCidlink_test.go b/codec/dagcbor/roundtripCidlink_test.go index 8aaf65fa678d48c1380d1498ff3a5a18974e7bd3..7bfd1d5c0befde6b2c1eb4a7d8fd7ac81f67fe7f 100644 --- a/codec/dagcbor/roundtripCidlink_test.go +++ b/codec/dagcbor/roundtripCidlink_test.go @@ -8,7 +8,7 @@ import ( . "github.com/warpfork/go-wish" cid "gitlab.dms3.io/dms3/public/go-cid" - dms3ld "gitlab.dms3.io/ld/go-ld-prime" + ld "gitlab.dms3.io/ld/go-ld-prime" cidlink "gitlab.dms3.io/ld/go-ld-prime/linking/cid" basicnode "gitlab.dms3.io/ld/go-ld-prime/node/basic" ) @@ -23,17 +23,17 @@ func TestRoundtripCidlink(t *testing.T) { lsys := cidlink.DefaultLinkSystem() buf := bytes.Buffer{} - lsys.StorageWriteOpener = func(lnkCtx dms3ld.LinkContext) (io.Writer, dms3ld.BlockWriteCommitter, error) { - return &buf, func(lnk dms3ld.Link) error { return nil }, nil + lsys.StorageWriteOpener = func(lnkCtx ld.LinkContext) (io.Writer, ld.BlockWriteCommitter, error) { + return &buf, func(lnk ld.Link) error { return nil }, nil } - lsys.StorageReadOpener = func(lnkCtx dms3ld.LinkContext, lnk dms3ld.Link) (io.Reader, error) { + lsys.StorageReadOpener = func(lnkCtx ld.LinkContext, lnk ld.Link) (io.Reader, error) { return bytes.NewReader(buf.Bytes()), nil } - lnk, err := lsys.Store(dms3ld.LinkContext{}, lp, n) + lnk, err := lsys.Store(ld.LinkContext{}, lp, n) Require(t, err, ShouldEqual, nil) - n2, err := lsys.Load(dms3ld.LinkContext{}, lnk, basicnode.Prototype.Any) + n2, err := lsys.Load(ld.LinkContext{}, lnk, basicnode.Prototype.Any) Require(t, err, ShouldEqual, nil) Wish(t, n2, ShouldEqual, n) } diff --git a/codec/dagcbor/unmarshal.go b/codec/dagcbor/unmarshal.go index d97e89d2af59bbb507e792e9d94bee48d187d186..bea8577e6599f1b5b33285103cf062d238f6955c 100644 --- a/codec/dagcbor/unmarshal.go +++ b/codec/dagcbor/unmarshal.go @@ -9,7 +9,7 @@ import ( "github.com/polydawn/refmt/tok" cid "gitlab.dms3.io/dms3/public/go-cid" - dms3ld "gitlab.dms3.io/ld/go-ld-prime" + ld "gitlab.dms3.io/ld/go-ld-prime" cidlink "gitlab.dms3.io/ld/go-ld-prime/linking/cid" ) @@ -27,7 +27,7 @@ const ( // except for the `case tok.TBytes` block, // which has dag-cbor's special sauce for detecting schemafree links. -func Unmarshal(na dms3ld.NodeAssembler, tokSrc shared.TokenSource, allowLinks bool) error { +func Unmarshal(na ld.NodeAssembler, tokSrc shared.TokenSource, allowLinks bool) error { // Have a gas budget, which will be decremented as we allocate memory, and an error returned when execeeded (or about to be exceeded). // This is a DoS defense mechanism. // It's *roughly* in units of bytes (but only very, VERY roughly) -- it also treats words as 1 in many cases. @@ -36,7 +36,7 @@ func Unmarshal(na dms3ld.NodeAssembler, tokSrc shared.TokenSource, allowLinks bo return unmarshal1(na, tokSrc, &gas, allowLinks) } -func unmarshal1(na dms3ld.NodeAssembler, tokSrc shared.TokenSource, gas *int, allowLinks bool) error { +func unmarshal1(na ld.NodeAssembler, tokSrc shared.TokenSource, gas *int, allowLinks bool) error { var tk tok.Token done, err := tokSrc.Step(&tk) if err != nil { @@ -50,7 +50,7 @@ func unmarshal1(na dms3ld.NodeAssembler, tokSrc shared.TokenSource, gas *int, al // starts with the first token already primed. Necessary to get recursion // to flow right without a peek+unpeek system. -func unmarshal2(na dms3ld.NodeAssembler, tokSrc shared.TokenSource, tk *tok.Token, gas *int, allowLinks bool) error { +func unmarshal2(na ld.NodeAssembler, tokSrc shared.TokenSource, tk *tok.Token, gas *int, allowLinks bool) error { // FUTURE: check for schema.TypedNodeBuilder that's going to parse a Link (they can slurp any token kind they want). switch tk.Type { case tok.TMapOpen: diff --git a/codec/dagjson/marshal.go b/codec/dagjson/marshal.go index 267af730cefe0bf837f65e8aec9d8534909cfc7d..e5490f0da684274a319e74ec684f6b885f6e567d 100644 --- a/codec/dagjson/marshal.go +++ b/codec/dagjson/marshal.go @@ -8,12 +8,12 @@ import ( "github.com/polydawn/refmt/shared" "github.com/polydawn/refmt/tok" - dms3ld "gitlab.dms3.io/ld/go-ld-prime" + ld "gitlab.dms3.io/ld/go-ld-prime" cidlink "gitlab.dms3.io/ld/go-ld-prime/linking/cid" ) // This should be identical to the general feature in the parent package, -// except for the `case dms3ld.Kind_Link` block, +// except for the `case ld.Kind_Link` block, // which is dag-json's special sauce for schemafree links. type MarshalOptions struct { @@ -30,16 +30,16 @@ type MarshalOptions struct { SortMapKeys bool } -func Marshal(n dms3ld.Node, sink shared.TokenSink, options MarshalOptions) error { +func Marshal(n ld.Node, sink shared.TokenSink, options MarshalOptions) error { var tk tok.Token switch n.Kind() { - case dms3ld.Kind_Invalid: + case ld.Kind_Invalid: return fmt.Errorf("cannot traverse a node that is absent") - case dms3ld.Kind_Null: + case ld.Kind_Null: tk.Type = tok.TNull _, err := sink.Step(&tk) return err - case dms3ld.Kind_Map: + case ld.Kind_Map: // Emit start of map. tk.Type = tok.TMapOpen tk.Length = int(n.Length()) // TODO: overflow check @@ -50,7 +50,7 @@ func Marshal(n dms3ld.Node, sink shared.TokenSink, options MarshalOptions) error // Collect map entries, then sort by key type entry struct { key string - value dms3ld.Node + value ld.Node } entries := []entry{} for itr := n.MapIterator(); !itr.Done(); { @@ -100,7 +100,7 @@ func Marshal(n dms3ld.Node, sink shared.TokenSink, options MarshalOptions) error tk.Type = tok.TMapClose _, err := sink.Step(&tk) return err - case dms3ld.Kind_List: + case ld.Kind_List: // Emit start of list. tk.Type = tok.TArrOpen l := n.Length() @@ -122,7 +122,7 @@ func Marshal(n dms3ld.Node, sink shared.TokenSink, options MarshalOptions) error tk.Type = tok.TArrClose _, err := sink.Step(&tk) return err - case dms3ld.Kind_Bool: + case ld.Kind_Bool: v, err := n.AsBool() if err != nil { return err @@ -131,7 +131,7 @@ func Marshal(n dms3ld.Node, sink shared.TokenSink, options MarshalOptions) error tk.Bool = v _, err = sink.Step(&tk) return err - case dms3ld.Kind_Int: + case ld.Kind_Int: v, err := n.AsInt() if err != nil { return err @@ -140,7 +140,7 @@ func Marshal(n dms3ld.Node, sink shared.TokenSink, options MarshalOptions) error tk.Int = int64(v) _, err = sink.Step(&tk) return err - case dms3ld.Kind_Float: + case ld.Kind_Float: v, err := n.AsFloat() if err != nil { return err @@ -149,7 +149,7 @@ func Marshal(n dms3ld.Node, sink shared.TokenSink, options MarshalOptions) error tk.Float64 = v _, err = sink.Step(&tk) return err - case dms3ld.Kind_String: + case ld.Kind_String: v, err := n.AsString() if err != nil { return err @@ -158,7 +158,7 @@ func Marshal(n dms3ld.Node, sink shared.TokenSink, options MarshalOptions) error tk.Str = v _, err = sink.Step(&tk) return err - case dms3ld.Kind_Bytes: + case ld.Kind_Bytes: v, err := n.AsBytes() if err != nil { return err @@ -204,9 +204,9 @@ func Marshal(n dms3ld.Node, sink shared.TokenSink, options MarshalOptions) error _, err = sink.Step(&tk) return err } - case dms3ld.Kind_Link: + case ld.Kind_Link: if !options.EncodeLinks { - return fmt.Errorf("cannot Marshal dms3ld links to JSON") + return fmt.Errorf("cannot Marshal ld links to JSON") } v, err := n.AsLink() if err != nil { diff --git a/codec/dagjson/multicodec.go b/codec/dagjson/multicodec.go index a4f192fe4b9720e9d2f3eaeb5f22cd0e22d50e3f..88b1775863317bf58e05d78d6456209c168515e1 100644 --- a/codec/dagjson/multicodec.go +++ b/codec/dagjson/multicodec.go @@ -6,13 +6,13 @@ import ( "github.com/polydawn/refmt/json" - dms3ld "gitlab.dms3.io/ld/go-ld-prime" + ld "gitlab.dms3.io/ld/go-ld-prime" "gitlab.dms3.io/ld/go-ld-prime/multicodec" ) var ( - _ dms3ld.Decoder = Decode - _ dms3ld.Encoder = Encode + _ ld.Decoder = Decode + _ ld.Encoder = Encode ) func init() { @@ -20,7 +20,7 @@ func init() { multicodec.RegisterDecoder(0x0129, Decode) } -func Decode(na dms3ld.NodeAssembler, r io.Reader) error { +func Decode(na ld.NodeAssembler, r io.Reader) error { err := Unmarshal(na, json.NewDecoder(r), UnmarshalOptions{ ParseLinks: true, ParseBytes: true, @@ -52,7 +52,7 @@ func Decode(na dms3ld.NodeAssembler, r io.Reader) error { } } -func Encode(n dms3ld.Node, w io.Writer) error { +func Encode(n ld.Node, w io.Writer) error { // Shell out directly to generic inspection path. // (There's not really any fastpaths of note for json.) // Write another function if you need to tune encoding options about whitespace. diff --git a/codec/dagjson/roundtripCidlink_test.go b/codec/dagjson/roundtripCidlink_test.go index 41c841ef9274c0f130677c6d434344533a73fcc7..ac8fda6ee66f1db01ccfcdda4a5f2e5aff90f7bd 100644 --- a/codec/dagjson/roundtripCidlink_test.go +++ b/codec/dagjson/roundtripCidlink_test.go @@ -9,7 +9,7 @@ import ( . "github.com/warpfork/go-wish" cid "gitlab.dms3.io/dms3/public/go-cid" - dms3ld "gitlab.dms3.io/ld/go-ld-prime" + ld "gitlab.dms3.io/ld/go-ld-prime" cidlink "gitlab.dms3.io/ld/go-ld-prime/linking/cid" basicnode "gitlab.dms3.io/ld/go-ld-prime/node/basic" ) @@ -24,17 +24,17 @@ func TestRoundtripCidlink(t *testing.T) { lsys := cidlink.DefaultLinkSystem() buf := bytes.Buffer{} - lsys.StorageWriteOpener = func(lnkCtx dms3ld.LinkContext) (io.Writer, dms3ld.BlockWriteCommitter, error) { - return &buf, func(lnk dms3ld.Link) error { return nil }, nil + lsys.StorageWriteOpener = func(lnkCtx ld.LinkContext) (io.Writer, ld.BlockWriteCommitter, error) { + return &buf, func(lnk ld.Link) error { return nil }, nil } - lsys.StorageReadOpener = func(lnkCtx dms3ld.LinkContext, lnk dms3ld.Link) (io.Reader, error) { + lsys.StorageReadOpener = func(lnkCtx ld.LinkContext, lnk ld.Link) (io.Reader, error) { return bytes.NewReader(buf.Bytes()), nil } - lnk, err := lsys.Store(dms3ld.LinkContext{}, lp, n) + lnk, err := lsys.Store(ld.LinkContext{}, lp, n) Require(t, err, ShouldEqual, nil) - n2, err := lsys.Load(dms3ld.LinkContext{}, lnk, basicnode.Prototype.Any) + n2, err := lsys.Load(ld.LinkContext{}, lnk, basicnode.Prototype.Any) Require(t, err, ShouldEqual, nil) Wish(t, n2, ShouldEqual, nSorted) } @@ -60,8 +60,8 @@ func TestUnmarshalTrickyMapContainingLink(t *testing.T) { err := Decode(nb, strings.NewReader(tricky)) Require(t, err, ShouldEqual, nil) n := nb.Build() - Wish(t, n.Kind(), ShouldEqual, dms3ld.Kind_Map) + Wish(t, n.Kind(), ShouldEqual, ld.Kind_Map) n2, err := n.LookupByString("/") Require(t, err, ShouldEqual, nil) - Wish(t, n2.Kind(), ShouldEqual, dms3ld.Kind_Link) + Wish(t, n2.Kind(), ShouldEqual, ld.Kind_Link) } diff --git a/codec/dagjson/unmarshal.go b/codec/dagjson/unmarshal.go index 083aefbbd206705067c724892d37c29baacca770..9ace418ed0a37a0feb1e54c641177d0fc2ccb10c 100644 --- a/codec/dagjson/unmarshal.go +++ b/codec/dagjson/unmarshal.go @@ -8,7 +8,7 @@ import ( "github.com/polydawn/refmt/tok" cid "gitlab.dms3.io/dms3/public/go-cid" - dms3ld "gitlab.dms3.io/ld/go-ld-prime" + ld "gitlab.dms3.io/ld/go-ld-prime" cidlink "gitlab.dms3.io/ld/go-ld-prime/linking/cid" ) @@ -30,7 +30,7 @@ type UnmarshalOptions struct { ParseBytes bool } -func Unmarshal(na dms3ld.NodeAssembler, tokSrc shared.TokenSource, options UnmarshalOptions) error { +func Unmarshal(na ld.NodeAssembler, tokSrc shared.TokenSource, options UnmarshalOptions) error { var st unmarshalState st.options = options done, err := tokSrc.Step(&st.tk[0]) @@ -127,7 +127,7 @@ func (st *unmarshalState) ensure(tokSrc shared.TokenSource, lookahead int) error // in case of error, the error should just rise. // If the bool return is true, we got a link, and you should not // continue to attempt to build a map. -func (st *unmarshalState) linkLookahead(na dms3ld.NodeAssembler, tokSrc shared.TokenSource) (bool, error) { +func (st *unmarshalState) linkLookahead(na ld.NodeAssembler, tokSrc shared.TokenSource) (bool, error) { // Peek next token. If it's a "/" string, link is still a possibility if err := st.ensure(tokSrc, 1); err != nil { return false, err @@ -169,7 +169,7 @@ func (st *unmarshalState) linkLookahead(na dms3ld.NodeAssembler, tokSrc shared.T return true, nil } -func (st *unmarshalState) bytesLookahead(na dms3ld.NodeAssembler, tokSrc shared.TokenSource) (bool, error) { +func (st *unmarshalState) bytesLookahead(na ld.NodeAssembler, tokSrc shared.TokenSource) (bool, error) { // Peek next token. If it's a "/" string, bytes is still a possibility if err := st.ensure(tokSrc, 1); err != nil { return false, err @@ -233,7 +233,7 @@ func (st *unmarshalState) bytesLookahead(na dms3ld.NodeAssembler, tokSrc shared. // starts with the first token already primed. Necessary to get recursion // to flow right without a peek+unpeek system. -func (st *unmarshalState) unmarshal(na dms3ld.NodeAssembler, tokSrc shared.TokenSource) error { +func (st *unmarshalState) unmarshal(na ld.NodeAssembler, tokSrc shared.TokenSource) error { // FUTURE: check for schema.TypedNodeBuilder that's going to parse a Link (they can slurp any token kind they want). switch st.tk[0].Type { case tok.TMapOpen: diff --git a/codec/dagjson2/doc.go b/codec/dagjson2/doc.go index 9f4064423e45b4eaf716606cb7ba4b8d551d105d..dabaf9e46729beebfb93e3084d78e8d803ef94b1 100644 --- a/codec/dagjson2/doc.go +++ b/codec/dagjson2/doc.go @@ -5,7 +5,7 @@ // - You might want to use `ReusableEncoder` and `ReusableDecoder` types and their configuration options, // then use their Encode and Decode methods with that additional control. // - You might want to use the lower-level TokenReader and TokenWriter tools to process the serial data -// as a stream, without necessary creating dms3ld Nodes at all. +// as a stream, without necessary creating ld Nodes at all. // - (this is a stretch) You might want to use some of the individual token processing functions, // perhaps as part of a totally new codec that just happens to share some behaviors with this one. // diff --git a/codec/dagjson2/json_unmarshaller.go b/codec/dagjson2/json_unmarshaller.go index b92b0a5177b562d68baad12f56717770a5c0b2f4..1ee31821efc238abdc5b4780076cf94a7f7cdb30 100644 --- a/codec/dagjson2/json_unmarshaller.go +++ b/codec/dagjson2/json_unmarshaller.go @@ -16,7 +16,7 @@ import ( // // This function is the same as the function found for DAG-JSON // in the default multicodec registry. -func Unmarshal(into dms3ld.NodeAssembler, input io.Reader) error { +func Unmarshal(into ld.NodeAssembler, input io.Reader) error { // FUTURE: consider doing a whole sync.Pool jazz around this. r := ReusableUnmarshaller{} r.SetDecoderConfig(jsontoken.DecoderConfig{ @@ -48,7 +48,7 @@ func (r *ReusableUnmarshaller) SetInitialBudget(budget int64) { r.InitialBudget = budget } -func (r *ReusableUnmarshaller) Unmarshal(into dms3ld.NodeAssembler, input io.Reader) error { +func (r *ReusableUnmarshaller) Unmarshal(into ld.NodeAssembler, input io.Reader) error { r.d.Init(input) return codectools.TokenAssemble(into, r.d.Step, r.InitialBudget) } diff --git a/codec/json/multicodec.go b/codec/json/multicodec.go index 0bca36c167c3f3f8ccbfd987ddbdaf7572c787f4..52d7ae9aae5ef173953539f9b3d2ddc4544d0916 100644 --- a/codec/json/multicodec.go +++ b/codec/json/multicodec.go @@ -11,8 +11,8 @@ import ( ) var ( - _ dms3ld.Decoder = Decode - _ dms3ld.Encoder = Encode + _ ld.Decoder = Decode + _ ld.Encoder = Encode ) func init() { @@ -20,7 +20,7 @@ func init() { multicodec.RegisterDecoder(0x0200, Decode) } -func Decode(na dms3ld.NodeAssembler, r io.Reader) error { +func Decode(na ld.NodeAssembler, r io.Reader) error { // Shell out directly to generic builder path. // (There's not really any fastpaths of note for json.) err := dagjson.Unmarshal(na, rfmtjson.NewDecoder(r), dagjson.UnmarshalOptions{ @@ -54,7 +54,7 @@ func Decode(na dms3ld.NodeAssembler, r io.Reader) error { } } -func Encode(n dms3ld.Node, w io.Writer) error { +func Encode(n ld.Node, w io.Writer) error { // Shell out directly to generic inspection path. // (There's not really any fastpaths of note for json.) // Write another function if you need to tune encoding options about whitespace. diff --git a/codec/jst/jst.go b/codec/jst/jst.go index a4cfb1499263c146cda92e6b957dd09ec70774be..3bc7b5899d378d6de3682dc5cdfbbc4f64660445 100644 --- a/codec/jst/jst.go +++ b/codec/jst/jst.go @@ -37,13 +37,13 @@ import ( "bytes" "io" - dms3ld "gitlab.dms3.io/ld/go-ld-prime" + ld "gitlab.dms3.io/ld/go-ld-prime" "gitlab.dms3.io/ld/go-ld-prime/codec/dagjson" "gitlab.dms3.io/ld/go-ld-prime/codec/json" basicnode "gitlab.dms3.io/ld/go-ld-prime/node/basic" ) -func Marshal(n dms3ld.Node, w io.Writer) error { +func Marshal(n ld.Node, w io.Writer) error { ctx := state{ cfg: Config{ Indent: []byte{' ', ' '}, @@ -58,7 +58,7 @@ func Marshal(n dms3ld.Node, w io.Writer) error { return marshal(&ctx, n, w) } -func MarshalConfigured(cfg Config, n dms3ld.Node, w io.Writer) error { +func MarshalConfigured(cfg Config, n ld.Node, w io.Writer) error { ctx := state{ cfg: cfg, } @@ -74,7 +74,7 @@ func MarshalConfigured(cfg Config, n dms3ld.Node, w io.Writer) error { type state struct { cfg Config - path []dms3ld.PathSegment // TODO replace with PathBuffer... once you, you know, write it. + path []ld.PathSegment // TODO replace with PathBuffer... once you, you know, write it. stack []step tables map[tableGroupID]*table spare bytes.Buffer @@ -172,12 +172,12 @@ func (tab *table) Finalize() { } } -func (tab *table) IsRow(n dms3ld.Node) bool { +func (tab *table) IsRow(n ld.Node) bool { // FUTURE: this entire function's behavior might be *heavily* redirected by config. // Having it attached to the table struct might not even be sensible by the end of the day. // Alternately: unclear if we need this function at all, if the "trailing" and "ownLine" entryStyle can simply carry the day for all userstories like comments and etc. switch n.Kind() { - case dms3ld.Kind_Map: + case ld.Kind_Map: if n.Length() < 1 { return false } @@ -187,7 +187,7 @@ func (tab *table) IsRow(n dms3ld.Node) bool { return true } return columnName(ks) == tab.cols[0] - case dms3ld.Kind_List: + case ld.Kind_List: // FUTURE: maybe this could be 'true', but it requires very different logic. And it's not in my first-draft pareto priority choices. return false default: @@ -198,19 +198,19 @@ func (tab *table) IsRow(n dms3ld.Node) bool { // Discerns if the given node starts a table, and if so, what string to use as tableGroupID for cross-table alignment. // By default, the tableGroupID is just the first key in the first row. // (We might extend the tableGroupID heuristic later, perhaps to also include the last key we saw on the path here, etc). -func peekMightBeTable(ctx *state, n dms3ld.Node) (bool, tableGroupID) { +func peekMightBeTable(ctx *state, n ld.Node) (bool, tableGroupID) { // FUTURE: might need to apply a selector or other rules from ctx.cfg to say additonal "no"s. // FUTURE: the ctx.cfg can also override what the tableGroupID is. switch n.Kind() { - case dms3ld.Kind_Map: + case ld.Kind_Map: // TODO: maps can definitely be tables! but gonna come back to this. and by default, they're not. return false, "" - case dms3ld.Kind_List: + case ld.Kind_List: if n.Length() < 1 { return false, "" } n0, _ := n.LookupByIndex(0) - if n0.Kind() != dms3ld.Kind_Map { + if n0.Kind() != ld.Kind_Map { return false, "" } if n0.Length() < 1 { @@ -226,11 +226,11 @@ func peekMightBeTable(ctx *state, n dms3ld.Node) (bool, tableGroupID) { // Applies itself and other stride functions recursively (have to, because: // some row values might themselves be tables, // which removes them from the column flow and changes our size counting). -func stride(ctx *state, n dms3ld.Node) error { +func stride(ctx *state, n ld.Node) error { switch n.Kind() { - case dms3ld.Kind_Map: + case ld.Kind_Map: panic("todo") - case dms3ld.Kind_List: + case ld.Kind_List: return strideList(ctx, n) default: // There's never anything we need to record for scalars that their parents don't already note. @@ -238,7 +238,7 @@ func stride(ctx *state, n dms3ld.Node) error { } } -func strideList(ctx *state, listNode dms3ld.Node) error { +func strideList(ctx *state, listNode ld.Node) error { isTable, tgid := peekMightBeTable(ctx, listNode) if !isTable { return nil @@ -281,11 +281,11 @@ func strideList(ctx *state, listNode dms3ld.Node) error { return nil } -func marshal(ctx *state, n dms3ld.Node, w io.Writer) error { +func marshal(ctx *state, n ld.Node, w io.Writer) error { switch n.Kind() { - case dms3ld.Kind_Map: + case ld.Kind_Map: panic("todo") - case dms3ld.Kind_List: + case ld.Kind_List: return marshalList(ctx, n, w) default: return marshalPlain(ctx, n, w) @@ -295,7 +295,7 @@ func marshal(ctx *state, n dms3ld.Node, w io.Writer) error { // this function is probably a placeholder. // It doesn't colorize or anything else. To replace it with something clever that does, // we'll have to tear deeper into the plumbing level of json serializers; will, but later. -func marshalPlain(ctx *state, n dms3ld.Node, w io.Writer) error { +func marshalPlain(ctx *state, n ld.Node, w io.Writer) error { err := dagjson.Encode(n, w) // never indent here: these values will always end up being emitted mid-line. if err != nil { return recordErrorPosition(ctx, err) @@ -303,7 +303,7 @@ func marshalPlain(ctx *state, n dms3ld.Node, w io.Writer) error { return nil } -func marshalList(ctx *state, listNode dms3ld.Node, w io.Writer) error { +func marshalList(ctx *state, listNode ld.Node, w io.Writer) error { isTab, tgid := peekMightBeTable(ctx, listNode) if !isTab { return marshalPlain(ctx, listNode, w) @@ -331,8 +331,8 @@ func marshalList(ctx *state, listNode dms3ld.Node, w io.Writer) error { w.Write([]byte{']'}) return nil } -func marshalListValue(ctx *state, tab *table, row dms3ld.Node, w io.Writer) error { - if row.Kind() != dms3ld.Kind_Map { +func marshalListValue(ctx *state, tab *table, row ld.Node, w io.Writer) error { + if row.Kind() != ld.Kind_Map { // TODO make this a lot more open... scalars aren't exactly "rows" for example but we can surely print them just fine. panic("table rows can only be maps at present") } @@ -463,7 +463,7 @@ func marshalListValue(ctx *state, tab *table, row dms3ld.Node, w io.Writer) erro return nil } -func emitKey(ctx *state, k dms3ld.Node, w io.Writer) error { +func emitKey(ctx *state, k ld.Node, w io.Writer) error { if ctx.cfg.Color.Enabled { w.Write(ctx.cfg.Color.KeyHighlight) } diff --git a/codec/jst/util.go b/codec/jst/util.go index 3a5fa7e6be99aefd758bb5b960a3ea9abdae4f76..2331382b1310e2ea6a24bed765c4954057c4b47b 100644 --- a/codec/jst/util.go +++ b/codec/jst/util.go @@ -4,7 +4,7 @@ import ( "fmt" "io" - dms3ld "gitlab.dms3.io/ld/go-ld-prime" + ld "gitlab.dms3.io/ld/go-ld-prime" ) func max(a, b int) int { // honestly golang @@ -14,7 +14,7 @@ func max(a, b int) int { // honestly golang return b } -func mustFirstKeyAsString(mapNode dms3ld.Node) string { +func mustFirstKeyAsString(mapNode ld.Node) string { itr := mapNode.MapIterator() k, _, err := itr.Next() if err != nil { @@ -37,7 +37,7 @@ func indexOf(list []columnName, cn columnName) int { } type codecAborted struct { - p dms3ld.Path + p ld.Path e error } @@ -50,7 +50,7 @@ func (e codecAborted) Error() string { // a better system might also count byte and line offsets in the serial form (but this would require also integrating with the serial code pretty closely). // a spectacularly general system might be ready to count serial offsets *twice* *or* path offsets *twice* (but this is simply waiting for someone's enthusiasm). func recordErrorPosition(ctx *state, e error) error { - return codecAborted{dms3ld.Path{ /*TODO*/ }, e} + return codecAborted{ld.Path{ /*TODO*/ }, e} } // not yet used, but you'd probably want this for better error position purposes. diff --git a/codec/marshal.go b/codec/marshal.go index b78802c4b9899f23f608cecdcf28474061767e2f..3eb981fd04e7056e4a22c0792cd4695fde90f519 100644 --- a/codec/marshal.go +++ b/codec/marshal.go @@ -6,7 +6,7 @@ import ( "github.com/polydawn/refmt/shared" "github.com/polydawn/refmt/tok" - dms3ld "gitlab.dms3.io/ld/go-ld-prime" + ld "gitlab.dms3.io/ld/go-ld-prime" ) // Marshal provides a very general node-to-tokens marshalling feature. @@ -17,20 +17,20 @@ import ( // to clarify how links should be encoded through their type info. // (The dag-cbor and dag-json formats can be used if links are of CID // implementation and need to be encoded in a schemafree way.) -func Marshal(n dms3ld.Node, sink shared.TokenSink) error { +func Marshal(n ld.Node, sink shared.TokenSink) error { var tk tok.Token return marshal(n, &tk, sink) } -func marshal(n dms3ld.Node, tk *tok.Token, sink shared.TokenSink) error { +func marshal(n ld.Node, tk *tok.Token, sink shared.TokenSink) error { switch n.Kind() { - case dms3ld.Kind_Invalid: + case ld.Kind_Invalid: return fmt.Errorf("cannot traverse a node that is absent") - case dms3ld.Kind_Null: + case ld.Kind_Null: tk.Type = tok.TNull _, err := sink.Step(tk) return err - case dms3ld.Kind_Map: + case ld.Kind_Map: // Emit start of map. tk.Type = tok.TMapOpen tk.Length = int(n.Length()) // TODO: overflow check @@ -59,7 +59,7 @@ func marshal(n dms3ld.Node, tk *tok.Token, sink shared.TokenSink) error { tk.Type = tok.TMapClose _, err := sink.Step(tk) return err - case dms3ld.Kind_List: + case ld.Kind_List: // Emit start of list. tk.Type = tok.TArrOpen l := n.Length() @@ -81,7 +81,7 @@ func marshal(n dms3ld.Node, tk *tok.Token, sink shared.TokenSink) error { tk.Type = tok.TArrClose _, err := sink.Step(tk) return err - case dms3ld.Kind_Bool: + case ld.Kind_Bool: v, err := n.AsBool() if err != nil { return err @@ -90,7 +90,7 @@ func marshal(n dms3ld.Node, tk *tok.Token, sink shared.TokenSink) error { tk.Bool = v _, err = sink.Step(tk) return err - case dms3ld.Kind_Int: + case ld.Kind_Int: v, err := n.AsInt() if err != nil { return err @@ -99,7 +99,7 @@ func marshal(n dms3ld.Node, tk *tok.Token, sink shared.TokenSink) error { tk.Int = int64(v) _, err = sink.Step(tk) return err - case dms3ld.Kind_Float: + case ld.Kind_Float: v, err := n.AsFloat() if err != nil { return err @@ -108,7 +108,7 @@ func marshal(n dms3ld.Node, tk *tok.Token, sink shared.TokenSink) error { tk.Float64 = v _, err = sink.Step(tk) return err - case dms3ld.Kind_String: + case ld.Kind_String: v, err := n.AsString() if err != nil { return err @@ -117,7 +117,7 @@ func marshal(n dms3ld.Node, tk *tok.Token, sink shared.TokenSink) error { tk.Str = v _, err = sink.Step(tk) return err - case dms3ld.Kind_Bytes: + case ld.Kind_Bytes: v, err := n.AsBytes() if err != nil { return err @@ -126,7 +126,7 @@ func marshal(n dms3ld.Node, tk *tok.Token, sink shared.TokenSink) error { tk.Bytes = v _, err = sink.Step(tk) return err - case dms3ld.Kind_Link: + case ld.Kind_Link: return fmt.Errorf("link emission not supported by this codec without a schema! (maybe you want dag-cbor or dag-json)") default: panic("unreachable") diff --git a/codec/raw/codec.go b/codec/raw/codec.go index c700491fd7d2624e60011f81ba702f662e9562ef..70b7d1b62afef4ad6d71b984f7f97ba1e0633654 100644 --- a/codec/raw/codec.go +++ b/codec/raw/codec.go @@ -11,7 +11,7 @@ import ( "io" "io/ioutil" - dms3ld "gitlab.dms3.io/ld/go-ld-prime" + ld "gitlab.dms3.io/ld/go-ld-prime" "gitlab.dms3.io/ld/go-ld-prime/multicodec" ) @@ -19,8 +19,8 @@ import ( const rawMulticodec = 0x55 var ( - _ dms3ld.Decoder = Decode - _ dms3ld.Encoder = Encode + _ ld.Decoder = Decode + _ ld.Encoder = Encode ) func init() { @@ -40,7 +40,7 @@ func init() { // with an io.Reader: // // Decode([...], struct{io.Reader}{buf}) -func Decode(am dms3ld.NodeAssembler, r io.Reader) error { +func Decode(am ld.NodeAssembler, r io.Reader) error { var data []byte if buf, ok := r.(interface{ Bytes() []byte }); ok { data = buf.Bytes() @@ -58,7 +58,7 @@ func Decode(am dms3ld.NodeAssembler, r io.Reader) error { // // Note that Encode won't copy the node's bytes as returned by AsBytes, but the // call to Write will typically have to copy the bytes anyway. -func Encode(node dms3ld.Node, w io.Writer) error { +func Encode(node ld.Node, w io.Writer) error { data, err := node.AsBytes() if err != nil { return err diff --git a/codec/raw/codec_test.go b/codec/raw/codec_test.go index 9e57ff658489126694aea45938bc0d37a56eb287..27e5e13f2bb1392ed0d63d6895236d4d6048a440 100644 --- a/codec/raw/codec_test.go +++ b/codec/raw/codec_test.go @@ -8,7 +8,7 @@ import ( qt "github.com/frankban/quicktest" "gitlab.dms3.io/dms3/public/go-cid" - dms3ld "gitlab.dms3.io/ld/go-ld-prime" + ld "gitlab.dms3.io/ld/go-ld-prime" cidlink "gitlab.dms3.io/ld/go-ld-prime/linking/cid" basicnode "gitlab.dms3.io/ld/go-ld-prime/node/basic" ) @@ -58,17 +58,17 @@ func TestRoundtripCidlink(t *testing.T) { lsys := cidlink.DefaultLinkSystem() buf := bytes.Buffer{} - lsys.StorageWriteOpener = func(lnkCtx dms3ld.LinkContext) (io.Writer, dms3ld.BlockWriteCommitter, error) { - return &buf, func(lnk dms3ld.Link) error { return nil }, nil + lsys.StorageWriteOpener = func(lnkCtx ld.LinkContext) (io.Writer, ld.BlockWriteCommitter, error) { + return &buf, func(lnk ld.Link) error { return nil }, nil } - lsys.StorageReadOpener = func(lnkCtx dms3ld.LinkContext, lnk dms3ld.Link) (io.Reader, error) { + lsys.StorageReadOpener = func(lnkCtx ld.LinkContext, lnk ld.Link) (io.Reader, error) { return bytes.NewReader(buf.Bytes()), nil } - lnk, err := lsys.Store(dms3ld.LinkContext{}, lp, node) + lnk, err := lsys.Store(ld.LinkContext{}, lp, node) qt.Assert(t, err, qt.IsNil) - newNode, err := lsys.Load(dms3ld.LinkContext{}, lnk, basicnode.Prototype__Any{}) + newNode, err := lsys.Load(ld.LinkContext{}, lnk, basicnode.Prototype__Any{}) qt.Assert(t, err, qt.IsNil) qt.Assert(t, newNode, qt.DeepEquals, node) } diff --git a/codec/unmarshal.go b/codec/unmarshal.go index 8c2e8b5e1865cdff961c50dd4cb7a4293429f49f..6612e15466e1e4f50603e4fbf17c1479be9ee610 100644 --- a/codec/unmarshal.go +++ b/codec/unmarshal.go @@ -7,15 +7,15 @@ import ( "github.com/polydawn/refmt/shared" "github.com/polydawn/refmt/tok" - dms3ld "gitlab.dms3.io/ld/go-ld-prime" + ld "gitlab.dms3.io/ld/go-ld-prime" ) -// wishlist: if we could reconstruct the dms3ld.Path of an error while +// wishlist: if we could reconstruct the ld.Path of an error while // *unwinding* from that error... that'd be nice. // (trying to build it proactively would waste tons of allocs on the happy path.) // we can do this; it just requires well-typed errors and a bunch of work. -// Tests for all this are in the dms3ld.Node impl tests! +// Tests for all this are in the ld.Node impl tests! // They're effectively doing double duty: testing the builders, too. // (Is that sensible? Should it be refactored? Not sure; maybe!) @@ -36,7 +36,7 @@ import ( // to clarify how links should be decoded through their type info. // (The dag-cbor and dag-json formats can be used if links are of CID // implementation and need to be decoded in a schemafree way.) -func Unmarshal(na dms3ld.NodeAssembler, tokSrc shared.TokenSource) error { +func Unmarshal(na ld.NodeAssembler, tokSrc shared.TokenSource) error { var tk tok.Token done, err := tokSrc.Step(&tk) if err != nil { @@ -50,7 +50,7 @@ func Unmarshal(na dms3ld.NodeAssembler, tokSrc shared.TokenSource) error { // starts with the first token already primed. Necessary to get recursion // to flow right without a peek+unpeek system. -func unmarshal(na dms3ld.NodeAssembler, tokSrc shared.TokenSource, tk *tok.Token) error { +func unmarshal(na ld.NodeAssembler, tokSrc shared.TokenSource, tk *tok.Token) error { // FUTURE: check for schema.TypedNodeBuilder that's going to parse a Link (they can slurp any token kind they want). switch tk.Type { case tok.TMapOpen: diff --git a/doc.go b/doc.go index a7d238272aae1fe418f3a336603ec2c1b5faa2d7..084db1aacb827d506ea80023fa8d5ae85eeaff83 100644 --- a/doc.go +++ b/doc.go @@ -69,4 +69,4 @@ // any use of schemas with codegen tooling will provide more ergnomic options; // or you can make your own function decorators that do what *you* need. // -package dms3ld +package ld diff --git a/equal.go b/equal.go index 25559904e13e49af23b0705310685d938a3334b1..3a6bfdbcaa2e4401083916d9df03ba919275e6af 100644 --- a/equal.go +++ b/equal.go @@ -1,4 +1,4 @@ -package dms3ld +package ld // DeepEqual reports whether x and y are "deeply equal" as DMS3LD nodes. // This is similar to reflect.DeepEqual, but based around the Node interface. diff --git a/equal_test.go b/equal_test.go index aa39dab710906608af941457b1db1e2ce80e59de..1a06d22c43d8e6ec40b1c9d680675697adb3ea75 100644 --- a/equal_test.go +++ b/equal_test.go @@ -1,10 +1,10 @@ -package dms3ld_test +package ld_test import ( "testing" "gitlab.dms3.io/dms3/public/go-cid" - dms3ld "gitlab.dms3.io/ld/go-ld-prime" + ld "gitlab.dms3.io/ld/go-ld-prime" "gitlab.dms3.io/ld/go-ld-prime/fluent/qp" cidlink "gitlab.dms3.io/ld/go-ld-prime/linking/cid" basic "gitlab.dms3.io/ld/go-ld-prime/node/basic" // shorter name for the tests @@ -12,17 +12,17 @@ import ( var ( globalNode = basic.NewString("global") - globalLink = func() dms3ld.Link { + globalLink = func() ld.Link { someCid, _ := cid.Cast([]byte{1, 85, 0, 5, 0, 1, 2, 3, 4}) return cidlink.Link{Cid: someCid} }() - globalLink2 = func() dms3ld.Link { + globalLink2 = func() ld.Link { someCid, _ := cid.Cast([]byte{1, 85, 0, 5, 0, 5, 6, 7, 8}) return cidlink.Link{Cid: someCid} }() ) -func qpMust(node dms3ld.Node, err error) dms3ld.Node { +func qpMust(node ld.Node, err error) ld.Node { if err != nil { panic(err) } @@ -31,7 +31,7 @@ func qpMust(node dms3ld.Node, err error) dms3ld.Node { var deepEqualTests = []struct { name string - left, right dms3ld.Node + left, right ld.Node want bool }{ {"MismatchingKinds", basic.NewBool(true), basic.NewInt(3), false}, @@ -40,8 +40,8 @@ var deepEqualTests = []struct { // Repeated basicnode.New invocations might return different pointers. {"SameNodeDiffPointer", basic.NewString("same"), basic.NewString("same"), true}, - {"SameKindNull", dms3ld.Null, dms3ld.Null, true}, - {"DiffKindNull", dms3ld.Null, dms3ld.Absent, false}, + {"SameKindNull", ld.Null, ld.Null, true}, + {"DiffKindNull", ld.Null, ld.Absent, false}, {"SameKindBool", basic.NewBool(true), basic.NewBool(true), true}, {"DiffKindBool", basic.NewBool(true), basic.NewBool(false), false}, {"SameKindInt", basic.NewInt(12), basic.NewInt(12), true}, @@ -57,11 +57,11 @@ var deepEqualTests = []struct { { "SameKindList", - qpMust(qp.BuildList(basic.Prototype.Any, -1, func(am dms3ld.ListAssembler) { + qpMust(qp.BuildList(basic.Prototype.Any, -1, func(am ld.ListAssembler) { qp.ListEntry(am, qp.Int(7)) qp.ListEntry(am, qp.Int(8)) })), - qpMust(qp.BuildList(basic.Prototype.Any, -1, func(am dms3ld.ListAssembler) { + qpMust(qp.BuildList(basic.Prototype.Any, -1, func(am ld.ListAssembler) { qp.ListEntry(am, qp.Int(7)) qp.ListEntry(am, qp.Int(8)) })), @@ -69,22 +69,22 @@ var deepEqualTests = []struct { }, { "DiffKindList_length", - qpMust(qp.BuildList(basic.Prototype.Any, -1, func(am dms3ld.ListAssembler) { + qpMust(qp.BuildList(basic.Prototype.Any, -1, func(am ld.ListAssembler) { qp.ListEntry(am, qp.Int(7)) qp.ListEntry(am, qp.Int(8)) })), - qpMust(qp.BuildList(basic.Prototype.Any, -1, func(am dms3ld.ListAssembler) { + qpMust(qp.BuildList(basic.Prototype.Any, -1, func(am ld.ListAssembler) { qp.ListEntry(am, qp.Int(7)) })), false, }, { "DiffKindList_elems", - qpMust(qp.BuildList(basic.Prototype.Any, -1, func(am dms3ld.ListAssembler) { + qpMust(qp.BuildList(basic.Prototype.Any, -1, func(am ld.ListAssembler) { qp.ListEntry(am, qp.Int(7)) qp.ListEntry(am, qp.Int(8)) })), - qpMust(qp.BuildList(basic.Prototype.Any, -1, func(am dms3ld.ListAssembler) { + qpMust(qp.BuildList(basic.Prototype.Any, -1, func(am ld.ListAssembler) { qp.ListEntry(am, qp.Int(3)) qp.ListEntry(am, qp.Int(2)) })), @@ -93,11 +93,11 @@ var deepEqualTests = []struct { { "SameKindMap", - qpMust(qp.BuildMap(basic.Prototype.Any, -1, func(am dms3ld.MapAssembler) { + qpMust(qp.BuildMap(basic.Prototype.Any, -1, func(am ld.MapAssembler) { qp.MapEntry(am, "foo", qp.Int(7)) qp.MapEntry(am, "bar", qp.Int(8)) })), - qpMust(qp.BuildMap(basic.Prototype.Any, -1, func(am dms3ld.MapAssembler) { + qpMust(qp.BuildMap(basic.Prototype.Any, -1, func(am ld.MapAssembler) { qp.MapEntry(am, "foo", qp.Int(7)) qp.MapEntry(am, "bar", qp.Int(8)) })), @@ -105,22 +105,22 @@ var deepEqualTests = []struct { }, { "DiffKindMap_length", - qpMust(qp.BuildMap(basic.Prototype.Any, -1, func(am dms3ld.MapAssembler) { + qpMust(qp.BuildMap(basic.Prototype.Any, -1, func(am ld.MapAssembler) { qp.MapEntry(am, "foo", qp.Int(7)) qp.MapEntry(am, "bar", qp.Int(8)) })), - qpMust(qp.BuildMap(basic.Prototype.Any, -1, func(am dms3ld.MapAssembler) { + qpMust(qp.BuildMap(basic.Prototype.Any, -1, func(am ld.MapAssembler) { qp.MapEntry(am, "foo", qp.Int(7)) })), false, }, { "DiffKindMap_elems", - qpMust(qp.BuildMap(basic.Prototype.Any, -1, func(am dms3ld.MapAssembler) { + qpMust(qp.BuildMap(basic.Prototype.Any, -1, func(am ld.MapAssembler) { qp.MapEntry(am, "foo", qp.Int(7)) qp.MapEntry(am, "bar", qp.Int(8)) })), - qpMust(qp.BuildMap(basic.Prototype.Any, -1, func(am dms3ld.MapAssembler) { + qpMust(qp.BuildMap(basic.Prototype.Any, -1, func(am ld.MapAssembler) { qp.MapEntry(am, "foo", qp.Int(3)) qp.MapEntry(am, "baz", qp.Int(8)) })), @@ -138,7 +138,7 @@ func TestDeepEqual(t *testing.T) { t.Run(tc.name, func(t *testing.T) { t.Parallel() - got := dms3ld.DeepEqual(tc.left, tc.right) + got := ld.DeepEqual(tc.left, tc.right) if got != tc.want { t.Fatalf("DeepEqual got %v, want %v", got, tc.want) } diff --git a/errors.go b/errors.go index f6814a8365b848c213b99183faaefa0363364204..df180c240e3a6b1313e17b7bab2926fd4efddbbd 100644 --- a/errors.go +++ b/errors.go @@ -1,4 +1,4 @@ -package dms3ld +package ld import ( "fmt" diff --git a/examples_test.go b/examples_test.go index 7fc2255cba8ca91707c8f0cea60bd3b0328ccd77..552dde389a596202ed79e192c948d4d73e8e06af 100644 --- a/examples_test.go +++ b/examples_test.go @@ -1,4 +1,4 @@ -package dms3ld_test +package ld_test import ( "fmt" diff --git a/fluent/bench_test.go b/fluent/bench_test.go index 12b39ee09666c905167d72513daf84066be14717..1e62304b29c8e7b4f4b33d62525280dd7ecca9d8 100644 --- a/fluent/bench_test.go +++ b/fluent/bench_test.go @@ -14,12 +14,12 @@ import ( func BenchmarkQp(b *testing.B) { b.ReportAllocs() - f2 := func(na dms3ld.NodeAssembler, a string, b string, c string, d []string) { - qp.Map(4, func(ma dms3ld.MapAssembler) { + f2 := func(na ld.NodeAssembler, a string, b string, c string, d []string) { + qp.Map(4, func(ma ld.MapAssembler) { qp.MapEntry(ma, "destination", qp.String(a)) qp.MapEntry(ma, "type", qp.String(b)) qp.MapEntry(ma, "source", qp.String(c)) - qp.MapEntry(ma, "options", qp.List(int64(len(d)), func(la dms3ld.ListAssembler) { + qp.MapEntry(ma, "options", qp.List(int64(len(d)), func(la ld.ListAssembler) { for _, s := range d { qp.ListEntry(la, qp.String(s)) } @@ -27,7 +27,7 @@ func BenchmarkQp(b *testing.B) { })(na) } for i := 0; i < b.N; i++ { - n, err := qp.BuildList(basicnode.Prototype.Any, -1, func(la dms3ld.ListAssembler) { + n, err := qp.BuildList(basicnode.Prototype.Any, -1, func(la ld.ListAssembler) { f2(la.AssembleValue(), // TODO: forgot to check error? "/", "overlay", @@ -49,7 +49,7 @@ func BenchmarkQp(b *testing.B) { func BenchmarkUnmarshal(b *testing.B) { b.ReportAllocs() - var n dms3ld.Node + var n ld.Node var err error serial := `[{ "destination": "/", @@ -77,7 +77,7 @@ func BenchmarkUnmarshal(b *testing.B) { func BenchmarkFluent(b *testing.B) { b.ReportAllocs() - var n dms3ld.Node + var n ld.Node var err error for i := 0; i < b.N; i++ { n, err = fluent.BuildList(basicnode.Prototype.Any, -1, func(la fluent.ListAssembler) { @@ -102,7 +102,7 @@ func BenchmarkFluent(b *testing.B) { func BenchmarkReflect(b *testing.B) { b.ReportAllocs() - var n dms3ld.Node + var n ld.Node var err error val := []interface{}{ map[string]interface{}{ @@ -128,7 +128,7 @@ func BenchmarkReflect(b *testing.B) { func BenchmarkReflectIncludingInitialization(b *testing.B) { b.ReportAllocs() - var n dms3ld.Node + var n ld.Node var err error for i := 0; i < b.N; i++ { n, err = fluent.Reflect(basicnode.Prototype.Any, []interface{}{ @@ -153,7 +153,7 @@ func BenchmarkReflectIncludingInitialization(b *testing.B) { func BenchmarkAgonizinglyBare(b *testing.B) { b.ReportAllocs() - var n dms3ld.Node + var n ld.Node var err error for i := 0; i < b.N; i++ { n, err = fab() @@ -164,7 +164,7 @@ func BenchmarkAgonizinglyBare(b *testing.B) { } } -func fab() (dms3ld.Node, error) { +func fab() (ld.Node, error) { nb := basicnode.Prototype.Any.NewBuilder() la1, err := nb.BeginList(-1) if err != nil { diff --git a/fluent/fluentBuilder.go b/fluent/fluentBuilder.go index fd243858364c173ccce9296d53710c3baf4d0351..f519c07153f70919f54e3f836b08fa586571b9da 100644 --- a/fluent/fluentBuilder.go +++ b/fluent/fluentBuilder.go @@ -1,10 +1,10 @@ package fluent import ( - dms3ld "gitlab.dms3.io/ld/go-ld-prime" + ld "gitlab.dms3.io/ld/go-ld-prime" ) -func Build(np dms3ld.NodePrototype, fn func(NodeAssembler)) (dms3ld.Node, error) { +func Build(np ld.NodePrototype, fn func(NodeAssembler)) (ld.Node, error) { nb := np.NewBuilder() fna := WrapAssembler(nb) err := Recover(func() { @@ -15,26 +15,26 @@ func Build(np dms3ld.NodePrototype, fn func(NodeAssembler)) (dms3ld.Node, error) } return nb.Build(), nil } -func BuildMap(np dms3ld.NodePrototype, sizeHint int64, fn func(MapAssembler)) (dms3ld.Node, error) { +func BuildMap(np ld.NodePrototype, sizeHint int64, fn func(MapAssembler)) (ld.Node, error) { return Build(np, func(fna NodeAssembler) { fna.CreateMap(sizeHint, fn) }) } -func BuildList(np dms3ld.NodePrototype, sizeHint int64, fn func(ListAssembler)) (dms3ld.Node, error) { +func BuildList(np ld.NodePrototype, sizeHint int64, fn func(ListAssembler)) (ld.Node, error) { return Build(np, func(fna NodeAssembler) { fna.CreateList(sizeHint, fn) }) } -func MustBuild(np dms3ld.NodePrototype, fn func(NodeAssembler)) dms3ld.Node { +func MustBuild(np ld.NodePrototype, fn func(NodeAssembler)) ld.Node { nb := np.NewBuilder() fn(WrapAssembler(nb)) return nb.Build() } -func MustBuildMap(np dms3ld.NodePrototype, sizeHint int64, fn func(MapAssembler)) dms3ld.Node { +func MustBuildMap(np ld.NodePrototype, sizeHint int64, fn func(MapAssembler)) ld.Node { return MustBuild(np, func(fna NodeAssembler) { fna.CreateMap(sizeHint, fn) }) } -func MustBuildList(np dms3ld.NodePrototype, sizeHint int64, fn func(ListAssembler)) dms3ld.Node { +func MustBuildList(np ld.NodePrototype, sizeHint int64, fn func(ListAssembler)) ld.Node { return MustBuild(np, func(fna NodeAssembler) { fna.CreateList(sizeHint, fn) }) } -func WrapAssembler(na dms3ld.NodeAssembler) NodeAssembler { +func WrapAssembler(na ld.NodeAssembler) NodeAssembler { return &nodeAssembler{na} } @@ -52,10 +52,10 @@ type NodeAssembler interface { AssignFloat(float64) AssignString(string) AssignBytes([]byte) - AssignLink(dms3ld.Link) - AssignNode(dms3ld.Node) + AssignLink(ld.Link) + AssignNode(ld.Node) - Prototype() dms3ld.NodePrototype + Prototype() ld.NodePrototype } // MapAssembler is the same as the interface in the core package, except: @@ -69,8 +69,8 @@ type MapAssembler interface { AssembleEntry(k string) NodeAssembler - KeyPrototype() dms3ld.NodePrototype - ValuePrototype(k string) dms3ld.NodePrototype + KeyPrototype() ld.NodePrototype + ValuePrototype(k string) ld.NodePrototype } // ListAssembler is the same as the interface in the core package, except: @@ -81,11 +81,11 @@ type MapAssembler interface { type ListAssembler interface { AssembleValue() NodeAssembler - ValuePrototype(idx int64) dms3ld.NodePrototype + ValuePrototype(idx int64) ld.NodePrototype } type nodeAssembler struct { - na dms3ld.NodeAssembler + na ld.NodeAssembler } func (fna *nodeAssembler) CreateMap(sizeHint int64, fn func(MapAssembler)) { @@ -138,22 +138,22 @@ func (fna *nodeAssembler) AssignBytes(v []byte) { panic(Error{err}) } } -func (fna *nodeAssembler) AssignLink(v dms3ld.Link) { +func (fna *nodeAssembler) AssignLink(v ld.Link) { if err := fna.na.AssignLink(v); err != nil { panic(Error{err}) } } -func (fna *nodeAssembler) AssignNode(v dms3ld.Node) { +func (fna *nodeAssembler) AssignNode(v ld.Node) { if err := fna.na.AssignNode(v); err != nil { panic(Error{err}) } } -func (fna *nodeAssembler) Prototype() dms3ld.NodePrototype { +func (fna *nodeAssembler) Prototype() ld.NodePrototype { return fna.na.Prototype() } type mapNodeAssembler struct { - ma dms3ld.MapAssembler + ma ld.MapAssembler } func (fma *mapNodeAssembler) AssembleKey() NodeAssembler { @@ -169,20 +169,20 @@ func (fma *mapNodeAssembler) AssembleEntry(k string) NodeAssembler { } return &nodeAssembler{va} } -func (fma *mapNodeAssembler) KeyPrototype() dms3ld.NodePrototype { +func (fma *mapNodeAssembler) KeyPrototype() ld.NodePrototype { return fma.ma.KeyPrototype() } -func (fma *mapNodeAssembler) ValuePrototype(k string) dms3ld.NodePrototype { +func (fma *mapNodeAssembler) ValuePrototype(k string) ld.NodePrototype { return fma.ma.ValuePrototype(k) } type listNodeAssembler struct { - la dms3ld.ListAssembler + la ld.ListAssembler } func (fla *listNodeAssembler) AssembleValue() NodeAssembler { return &nodeAssembler{fla.la.AssembleValue()} } -func (fla *listNodeAssembler) ValuePrototype(idx int64) dms3ld.NodePrototype { +func (fla *listNodeAssembler) ValuePrototype(idx int64) ld.NodePrototype { return fla.la.ValuePrototype(idx) } diff --git a/fluent/fluentBuilder_test.go b/fluent/fluentBuilder_test.go index 505bff082efc91195925cd74eb0645aea9a78441..243119be899eaf6961308da3300eeda714a34b46 100644 --- a/fluent/fluentBuilder_test.go +++ b/fluent/fluentBuilder_test.go @@ -5,7 +5,7 @@ import ( . "github.com/warpfork/go-wish" - dms3ld "gitlab.dms3.io/ld/go-ld-prime" + ld "gitlab.dms3.io/ld/go-ld-prime" "gitlab.dms3.io/ld/go-ld-prime/fluent" "gitlab.dms3.io/ld/go-ld-prime/must" basicnode "gitlab.dms3.io/ld/go-ld-prime/node/basic" @@ -16,7 +16,7 @@ func TestBuild(t *testing.T) { n := fluent.MustBuild(basicnode.Prototype__String{}, func(fna fluent.NodeAssembler) { fna.AssignString("fine") }) - Wish(t, n.Kind(), ShouldEqual, dms3ld.Kind_String) + Wish(t, n.Kind(), ShouldEqual, ld.Kind_String) v2, err := n.AsString() Wish(t, err, ShouldEqual, nil) Wish(t, v2, ShouldEqual, "fine") @@ -33,7 +33,7 @@ func TestBuild(t *testing.T) { }) }) }) - Wish(t, n.Kind(), ShouldEqual, dms3ld.Kind_Map) + Wish(t, n.Kind(), ShouldEqual, ld.Kind_Map) Wish(t, n.Length(), ShouldEqual, int64(3)) Wish(t, must.String(must.Node(n.LookupByString("k1"))), ShouldEqual, "fine") Wish(t, must.String(must.Node(n.LookupByString("k2"))), ShouldEqual, "super") @@ -55,19 +55,19 @@ func TestBuild(t *testing.T) { }) }) }) - Wish(t, n.Kind(), ShouldEqual, dms3ld.Kind_List) + Wish(t, n.Kind(), ShouldEqual, ld.Kind_List) Wish(t, n.Length(), ShouldEqual, int64(1)) n = must.Node(n.LookupByIndex(0)) - Wish(t, n.Kind(), ShouldEqual, dms3ld.Kind_List) + Wish(t, n.Kind(), ShouldEqual, ld.Kind_List) Wish(t, n.Length(), ShouldEqual, int64(1)) n = must.Node(n.LookupByIndex(0)) - Wish(t, n.Kind(), ShouldEqual, dms3ld.Kind_List) + Wish(t, n.Kind(), ShouldEqual, ld.Kind_List) Wish(t, n.Length(), ShouldEqual, int64(1)) n = must.Node(n.LookupByIndex(0)) - Wish(t, n.Kind(), ShouldEqual, dms3ld.Kind_List) + Wish(t, n.Kind(), ShouldEqual, ld.Kind_List) Wish(t, n.Length(), ShouldEqual, int64(1)) n = must.Node(n.LookupByIndex(0)) - Wish(t, n.Kind(), ShouldEqual, dms3ld.Kind_Int) + Wish(t, n.Kind(), ShouldEqual, ld.Kind_Int) Wish(t, must.Int(n), ShouldEqual, int64(2)) }) } diff --git a/fluent/fluentRecover_test.go b/fluent/fluentRecover_test.go index 39af5bc19f8f68398caee3789422497b81a9ed91..b44730c5558d4395932ae2dce88f035b228fbb75 100644 --- a/fluent/fluentRecover_test.go +++ b/fluent/fluentRecover_test.go @@ -5,7 +5,7 @@ import ( . "github.com/warpfork/go-wish" - dms3ld "gitlab.dms3.io/ld/go-ld-prime" + ld "gitlab.dms3.io/ld/go-ld-prime" "gitlab.dms3.io/ld/go-ld-prime/fluent" basicnode "gitlab.dms3.io/ld/go-ld-prime/node/basic" ) @@ -20,7 +20,7 @@ func TestRecover(t *testing.T) { t.Fatal("should not be reached") }), ShouldEqual, - fluent.Error{dms3ld.ErrWrongKind{TypeName: "string", MethodName: "AssignInt", AppropriateKind: dms3ld.KindSet_JustInt, ActualKind: dms3ld.Kind_String}}, + fluent.Error{ld.ErrWrongKind{TypeName: "string", MethodName: "AssignInt", AppropriateKind: ld.KindSet_JustInt, ActualKind: ld.Kind_String}}, ) }) t.Run("correct build should return nil", func(t *testing.T) { diff --git a/fluent/qp/example_test.go b/fluent/qp/example_test.go index 4229a0c7a0ecb8148e4afeb1c72cf185adb3fad3..b9396a539bdd4c01985d9ddfb1cb59e83e4b7459 100644 --- a/fluent/qp/example_test.go +++ b/fluent/qp/example_test.go @@ -3,6 +3,7 @@ package qp_test import ( "os" + ld "gitlab.dms3.io/ld/go-ld-prime" "gitlab.dms3.io/ld/go-ld-prime/codec/dagjson" "gitlab.dms3.io/ld/go-ld-prime/fluent/qp" basicnode "gitlab.dms3.io/ld/go-ld-prime/node/basic" @@ -11,14 +12,14 @@ import ( // TODO: can we make ListEntry/MapEntry less verbose? func Example() { - n, err := qp.BuildMap(basicnode.Prototype.Any, 4, func(ma dms3ld.MapAssembler) { + n, err := qp.BuildMap(basicnode.Prototype.Any, 4, func(ma ld.MapAssembler) { qp.MapEntry(ma, "some key", qp.String("some value")) qp.MapEntry(ma, "another key", qp.String("another value")) - qp.MapEntry(ma, "nested map", qp.Map(2, func(ma dms3ld.MapAssembler) { + qp.MapEntry(ma, "nested map", qp.Map(2, func(ma ld.MapAssembler) { qp.MapEntry(ma, "deeper entries", qp.String("deeper values")) qp.MapEntry(ma, "more deeper entries", qp.String("more deeper values")) })) - qp.MapEntry(ma, "nested list", qp.List(2, func(la dms3ld.ListAssembler) { + qp.MapEntry(ma, "nested list", qp.List(2, func(la ld.ListAssembler) { qp.ListEntry(la, qp.Int(1)) qp.ListEntry(la, qp.Int(2)) })) diff --git a/fluent/qp/qp.go b/fluent/qp/qp.go index 1ccc2a71a20e16a17bf7a2ab26d07f9c9f2f3f33..bafd412c714fac5fc90e1d87153903625137b421 100644 --- a/fluent/qp/qp.go +++ b/fluent/qp/qp.go @@ -16,12 +16,12 @@ package qp import ( "fmt" - dms3ld "gitlab.dms3.io/ld/go-ld-prime" + ld "gitlab.dms3.io/ld/go-ld-prime" ) -type Assemble = func(dms3ld.NodeAssembler) +type Assemble = func(ld.NodeAssembler) -func BuildMap(np dms3ld.NodePrototype, sizeHint int64, fn func(dms3ld.MapAssembler)) (_ dms3ld.Node, err error) { +func BuildMap(np ld.NodePrototype, sizeHint int64, fn func(ld.MapAssembler)) (_ ld.Node, err error) { defer func() { if r := recover(); r != nil { if rerr, ok := r.(error); ok { @@ -39,10 +39,10 @@ func BuildMap(np dms3ld.NodePrototype, sizeHint int64, fn func(dms3ld.MapAssembl type mapParams struct { sizeHint int64 - fn func(dms3ld.MapAssembler) + fn func(ld.MapAssembler) } -func (mp mapParams) Assemble(na dms3ld.NodeAssembler) { +func (mp mapParams) Assemble(na ld.NodeAssembler) { ma, err := na.BeginMap(mp.sizeHint) if err != nil { panic(err) @@ -53,11 +53,11 @@ func (mp mapParams) Assemble(na dms3ld.NodeAssembler) { } } -func Map(sizeHint int64, fn func(dms3ld.MapAssembler)) Assemble { +func Map(sizeHint int64, fn func(ld.MapAssembler)) Assemble { return mapParams{sizeHint, fn}.Assemble } -func MapEntry(ma dms3ld.MapAssembler, k string, fn Assemble) { +func MapEntry(ma ld.MapAssembler, k string, fn Assemble) { na, err := ma.AssembleEntry(k) if err != nil { panic(err) @@ -65,7 +65,7 @@ func MapEntry(ma dms3ld.MapAssembler, k string, fn Assemble) { fn(na) } -func BuildList(np dms3ld.NodePrototype, sizeHint int64, fn func(dms3ld.ListAssembler)) (_ dms3ld.Node, err error) { +func BuildList(np ld.NodePrototype, sizeHint int64, fn func(ld.ListAssembler)) (_ ld.Node, err error) { defer func() { if r := recover(); r != nil { if rerr, ok := r.(error); ok { @@ -83,10 +83,10 @@ func BuildList(np dms3ld.NodePrototype, sizeHint int64, fn func(dms3ld.ListAssem type listParams struct { sizeHint int64 - fn func(dms3ld.ListAssembler) + fn func(ld.ListAssembler) } -func (lp listParams) Assemble(na dms3ld.NodeAssembler) { +func (lp listParams) Assemble(na ld.NodeAssembler) { la, err := na.BeginList(lp.sizeHint) if err != nil { panic(err) @@ -97,17 +97,17 @@ func (lp listParams) Assemble(na dms3ld.NodeAssembler) { } } -func List(sizeHint int64, fn func(dms3ld.ListAssembler)) Assemble { +func List(sizeHint int64, fn func(ld.ListAssembler)) Assemble { return listParams{sizeHint, fn}.Assemble } -func ListEntry(la dms3ld.ListAssembler, fn Assemble) { +func ListEntry(la ld.ListAssembler, fn Assemble) { fn(la.AssembleValue()) } type nullParam struct{} -func (s nullParam) Assemble(na dms3ld.NodeAssembler) { +func (s nullParam) Assemble(na ld.NodeAssembler) { if err := na.AssignNull(); err != nil { panic(err) } @@ -119,7 +119,7 @@ func Null() Assemble { type boolParam bool -func (s boolParam) Assemble(na dms3ld.NodeAssembler) { +func (s boolParam) Assemble(na ld.NodeAssembler) { if err := na.AssignBool(bool(s)); err != nil { panic(err) } @@ -131,7 +131,7 @@ func Bool(b bool) Assemble { type intParam int64 -func (i intParam) Assemble(na dms3ld.NodeAssembler) { +func (i intParam) Assemble(na ld.NodeAssembler) { if err := na.AssignInt(int64(i)); err != nil { panic(err) } @@ -143,7 +143,7 @@ func Int(i int64) Assemble { type floatParam float64 -func (f floatParam) Assemble(na dms3ld.NodeAssembler) { +func (f floatParam) Assemble(na ld.NodeAssembler) { if err := na.AssignFloat(float64(f)); err != nil { panic(err) } @@ -155,7 +155,7 @@ func Float(f float64) Assemble { type stringParam string -func (s stringParam) Assemble(na dms3ld.NodeAssembler) { +func (s stringParam) Assemble(na ld.NodeAssembler) { if err := na.AssignString(string(s)); err != nil { panic(err) } @@ -167,7 +167,7 @@ func String(s string) Assemble { type bytesParam []byte -func (p bytesParam) Assemble(na dms3ld.NodeAssembler) { +func (p bytesParam) Assemble(na ld.NodeAssembler) { if err := na.AssignBytes([]byte(p)); err != nil { panic(err) } @@ -178,29 +178,29 @@ func Bytes(p []byte) Assemble { } type linkParam struct { - x dms3ld.Link + x ld.Link } -func (l linkParam) Assemble(na dms3ld.NodeAssembler) { - if err := na.AssignLink(dms3ld.Link(l.x)); err != nil { +func (l linkParam) Assemble(na ld.NodeAssembler) { + if err := na.AssignLink(ld.Link(l.x)); err != nil { panic(err) } } -func Link(l dms3ld.Link) Assemble { +func Link(l ld.Link) Assemble { return linkParam{l}.Assemble } type nodeParam struct { - x dms3ld.Node + x ld.Node } -func (n nodeParam) Assemble(na dms3ld.NodeAssembler) { - if err := na.AssignNode(dms3ld.Node(n.x)); err != nil { +func (n nodeParam) Assemble(na ld.NodeAssembler) { + if err := na.AssignNode(ld.Node(n.x)); err != nil { panic(err) } } -func Node(n dms3ld.Node) Assemble { +func Node(n ld.Node) Assemble { return nodeParam{n}.Assemble } diff --git a/fluent/reflect.go b/fluent/reflect.go index 0bc321bef8b2e7b822694d0085b9b945cabf40b7..63983119d85c34590b890f50b00e0c9bd6a164a7 100644 --- a/fluent/reflect.go +++ b/fluent/reflect.go @@ -47,13 +47,13 @@ import ( // Other features in the fluent package will typically out-perform this, // and using NodeAssemblers directly (without any fluent tools) will be much faster. // Only use this function if performance is not of consequence. -func Reflect(np dms3ld.NodePrototype, i interface{}) (dms3ld.Node, error) { +func Reflect(np ld.NodePrototype, i interface{}) (ld.Node, error) { return defaultReflector.Reflect(np, i) } // MustReflect is a shortcut for Reflect but panics on any error. // It is useful if you need a single return value for function composition purposes. -func MustReflect(np dms3ld.NodePrototype, i interface{}) dms3ld.Node { +func MustReflect(np ld.NodePrototype, i interface{}) ld.Node { n, err := Reflect(np, i) if err != nil { panic(err) @@ -66,7 +66,7 @@ func MustReflect(np dms3ld.NodePrototype, i interface{}) dms3ld.Node { // This may be useful if you need more direct control over allocations, // or want to fill in only part of a larger node assembly process using the reflect tool. // Data is accumulated by the NodeAssembler parameter, so no Node is returned. -func ReflectIntoAssembler(na dms3ld.NodeAssembler, i interface{}) error { +func ReflectIntoAssembler(na ld.NodeAssembler, i interface{}) error { return defaultReflector.ReflectIntoAssembler(na, i) } @@ -92,7 +92,7 @@ type Reflector struct { // Reflect is as per the package-scope function of the same name and signature, // but using the configuration in the Reflector struct. // See the package-scope function for documentation. -func (rcfg Reflector) Reflect(np dms3ld.NodePrototype, i interface{}) (dms3ld.Node, error) { +func (rcfg Reflector) Reflect(np ld.NodePrototype, i interface{}) (ld.Node, error) { nb := np.NewBuilder() if err := rcfg.ReflectIntoAssembler(nb, i); err != nil { return nil, err @@ -103,7 +103,7 @@ func (rcfg Reflector) Reflect(np dms3ld.NodePrototype, i interface{}) (dms3ld.No // ReflectIntoAssembler is as per the package-scope function of the same name and signature, // but using the configuration in the Reflector struct. // See the package-scope function for documentation. -func (rcfg Reflector) ReflectIntoAssembler(na dms3ld.NodeAssembler, i interface{}) error { +func (rcfg Reflector) ReflectIntoAssembler(na ld.NodeAssembler, i interface{}) error { // Cover the most common values with a type-switch, as it's faster than reflection. switch x := i.(type) { case map[string]string: diff --git a/fluent/reflect_test.go b/fluent/reflect_test.go index d4e834d3e1537156c8691a32813634d06564a591..ae7afdd9a9d256e238e93c12ec6f6ebaf2828a95 100644 --- a/fluent/reflect_test.go +++ b/fluent/reflect_test.go @@ -5,7 +5,7 @@ import ( . "github.com/warpfork/go-wish" - dms3ld "gitlab.dms3.io/ld/go-ld-prime" + ld "gitlab.dms3.io/ld/go-ld-prime" "gitlab.dms3.io/ld/go-ld-prime/fluent" "gitlab.dms3.io/ld/go-ld-prime/must" basicnode "gitlab.dms3.io/ld/go-ld-prime/node/basic" @@ -23,7 +23,7 @@ func TestReflect(t *testing.T) { }, }) Wish(t, err, ShouldEqual, nil) - Wish(t, n.Kind(), ShouldEqual, dms3ld.Kind_Map) + Wish(t, n.Kind(), ShouldEqual, ld.Kind_Map) t.Run("CorrectContents", func(t *testing.T) { Wish(t, n.Length(), ShouldEqual, int64(3)) Wish(t, must.String(must.Node(n.LookupByString("k1"))), ShouldEqual, "fine") @@ -67,7 +67,7 @@ func TestReflect(t *testing.T) { M: Woo{"thanks", "really"}, }) Wish(t, err, ShouldEqual, nil) - Wish(t, n.Kind(), ShouldEqual, dms3ld.Kind_Map) + Wish(t, n.Kind(), ShouldEqual, ld.Kind_Map) t.Run("CorrectContents", func(t *testing.T) { Wish(t, n.Length(), ShouldEqual, int64(3)) Wish(t, must.String(must.Node(n.LookupByString("X"))), ShouldEqual, "fine") @@ -99,7 +99,7 @@ func TestReflect(t *testing.T) { } n, err := fluent.Reflect(basicnode.Prototype.Any, Bar{"foo"}) Wish(t, err, ShouldEqual, nil) - Wish(t, n.Kind(), ShouldEqual, dms3ld.Kind_Map) + Wish(t, n.Kind(), ShouldEqual, ld.Kind_Map) Wish(t, must.String(must.Node(n.LookupByString("Z"))), ShouldEqual, "foo") }) t.Run("Interface", func(t *testing.T) { @@ -108,16 +108,16 @@ func TestReflect(t *testing.T) { } n, err := fluent.Reflect(basicnode.Prototype.Any, Zaz{map[string]interface{}{"wow": "wee"}}) Wish(t, err, ShouldEqual, nil) - Wish(t, n.Kind(), ShouldEqual, dms3ld.Kind_Map) + Wish(t, n.Kind(), ShouldEqual, ld.Kind_Map) n, err = n.LookupByString("Z") Wish(t, err, ShouldEqual, nil) - Wish(t, n.Kind(), ShouldEqual, dms3ld.Kind_Map) + Wish(t, n.Kind(), ShouldEqual, ld.Kind_Map) Wish(t, must.String(must.Node(n.LookupByString("wow"))), ShouldEqual, "wee") }) t.Run("Bytes", func(t *testing.T) { n, err := fluent.Reflect(basicnode.Prototype.Any, []byte{0x1, 0x2, 0x3}) Wish(t, err, ShouldEqual, nil) - Wish(t, n.Kind(), ShouldEqual, dms3ld.Kind_Bytes) + Wish(t, n.Kind(), ShouldEqual, ld.Kind_Bytes) b, err := n.AsBytes() Wish(t, err, ShouldEqual, nil) Wish(t, b, ShouldEqual, []byte{0x1, 0x2, 0x3}) @@ -129,10 +129,10 @@ func TestReflect(t *testing.T) { } n, err := fluent.Reflect(basicnode.Prototype.Any, Bar{[]byte{0x1, 0x2, 0x3}}) Wish(t, err, ShouldEqual, nil) - Wish(t, n.Kind(), ShouldEqual, dms3ld.Kind_Map) + Wish(t, n.Kind(), ShouldEqual, ld.Kind_Map) n, err = n.LookupByString("Z") Wish(t, err, ShouldEqual, nil) - Wish(t, n.Kind(), ShouldEqual, dms3ld.Kind_Bytes) + Wish(t, n.Kind(), ShouldEqual, ld.Kind_Bytes) b, err := n.AsBytes() Wish(t, err, ShouldEqual, nil) Wish(t, b, ShouldEqual, []byte{0x1, 0x2, 0x3}) @@ -143,10 +143,10 @@ func TestReflect(t *testing.T) { } n, err := fluent.Reflect(basicnode.Prototype.Any, Zaz{[]byte{0x1, 0x2, 0x3}}) Wish(t, err, ShouldEqual, nil) - Wish(t, n.Kind(), ShouldEqual, dms3ld.Kind_Map) + Wish(t, n.Kind(), ShouldEqual, ld.Kind_Map) n, err = n.LookupByString("Z") Wish(t, err, ShouldEqual, nil) - Wish(t, n.Kind(), ShouldEqual, dms3ld.Kind_Bytes) + Wish(t, n.Kind(), ShouldEqual, ld.Kind_Bytes) b, err := n.AsBytes() Wish(t, err, ShouldEqual, nil) Wish(t, b, ShouldEqual, []byte{0x1, 0x2, 0x3}) diff --git a/go.mod b/go.mod index 6cad83b964138bcb9e80a8da86387ae97c52806d..a8ab34805cc5be3848c70db8a3ac47eb463a75b9 100644 --- a/go.mod +++ b/go.mod @@ -8,5 +8,5 @@ require ( github.com/polydawn/refmt v0.0.0-20190807091052-3d65705ee9f1 github.com/smartystreets/goconvey v1.6.4 // indirect github.com/warpfork/go-wish v0.0.0-20200122115046-b9ea61034e4a - gitlab.dms3.io/dms3/public/go-cid v0.0.1 + gitlab.dms3.io/dms3/public/go-cid v0.0.2 ) diff --git a/go.sum b/go.sum index 93f2f1788ae2e74197a46ee079310c10de36bb75..230f36933b375b241bf6f81ba74ed399c053df4f 100644 --- a/go.sum +++ b/go.sum @@ -44,8 +44,8 @@ github.com/spaolacci/murmur3 v1.1.0 h1:7c1g84S4BPRrfL5Xrdp6fOJ206sU9y293DDHaoy0b github.com/spaolacci/murmur3 v1.1.0/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA= github.com/warpfork/go-wish v0.0.0-20200122115046-b9ea61034e4a h1:G++j5e0OC488te356JvdhaM8YS6nMsjLAYF7JxCv07w= github.com/warpfork/go-wish v0.0.0-20200122115046-b9ea61034e4a/go.mod h1:x6AKhvSSexNrVSrViXSHUEbICjmGXhtgABaHIySUSGw= -gitlab.dms3.io/dms3/public/go-cid v0.0.1 h1:qs4dtkDigcLGY/58dIZaFjKLt+orrTcmTBvtqaM3570= -gitlab.dms3.io/dms3/public/go-cid v0.0.1/go.mod h1:GQw3gc4CSrFY+aX6M+OBQDlg0p5/eQJoRrayaZzkAOQ= +gitlab.dms3.io/dms3/public/go-cid v0.0.2 h1:DLI843W/j0Khbx2gLo1B+8YZPGybMeK5k6R8cSOxvr0= +gitlab.dms3.io/dms3/public/go-cid v0.0.2/go.mod h1:GQw3gc4CSrFY+aX6M+OBQDlg0p5/eQJoRrayaZzkAOQ= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20190611184440-5c40567a22f8/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20210220033148-5ea612d1eb83 h1:/ZScEX8SfEmUGRHs0gxpqteO5nfNW6axyZbBdw9A12g= diff --git a/kind.go b/kind.go index d33fdc4e48a7bc1379bc0b7faf5474d54fd8fdd6..ef5ebd8b1a6534c330c4e2512e986cea10561500 100644 --- a/kind.go +++ b/kind.go @@ -1,4 +1,4 @@ -package dms3ld +package ld // Kind represents the primitive kind in the DMS3LD data model. // All of these kinds map directly onto serializable data. diff --git a/link.go b/link.go index 6a3633f7e415ee5e7bee79245731f2092b630d3a..5784cc5b3a4d33e2881afe6408853ccbfd73355f 100644 --- a/link.go +++ b/link.go @@ -1,4 +1,4 @@ -package dms3ld +package ld import ( "context" @@ -7,13 +7,13 @@ import ( // Link is a special kind of value in DMS3LD which can be "loaded" to access more nodes. // // Nodes can be a Link: "link" is one of the kinds in the DMS3LD Data Model; -// and accordingly there is an `dms3ld.Kind_Link` enum value, and Node has an `AsLink` method. +// and accordingly there is an `ld.Kind_Link` enum value, and Node has an `AsLink` method. // // Links are considered a scalar value in the DMS3LD Data Model, // but when "loaded", the result can be any other DMS3LD kind: // maps, lists, strings, etc. // -// Link is an interface in the go-dms3ld-prime implementation, +// Link is an interface in the go-ld-prime implementation, // but the most common instantiation of it comes from the `linking/cid` package, // and represents CIDs (see https://github.com/multiformats/cid). // @@ -43,7 +43,7 @@ type Link interface { // LinkPrototype encapsulates any implementation details and parameters // necessary for creating a Link, expect for the hash result itself. // -// LinkPrototype, like Link, is an interface in go-dms3ld-prime, +// LinkPrototype, like Link, is an interface in go-ld-prime, // but the most common instantiation of it comes from the `linking/cid` package, // and represents CIDs (see https://github.com/multiformats/cid). // If using CIDs as an implementation, LinkPrototype will encapsulate information diff --git a/linking.go b/linking.go index d7901b63cc9286a9acef095c787b09342fdf3871..3c9296fa2e98f95d6081815efc51c0ef3f049e06 100644 --- a/linking.go +++ b/linking.go @@ -1,4 +1,4 @@ -package dms3ld +package ld import ( "context" diff --git a/linking/cid/cidLink.go b/linking/cid/cidLink.go index ab10623e3666fe056a3fe0f41942e7c2ab1cecb5..647a75be96e38ac1b51e903ba3e44789203d114b 100644 --- a/linking/cid/cidLink.go +++ b/linking/cid/cidLink.go @@ -5,26 +5,26 @@ import ( multihash "github.com/multiformats/go-multihash" cid "gitlab.dms3.io/dms3/public/go-cid" - dms3ld "gitlab.dms3.io/ld/go-ld-prime" + ld "gitlab.dms3.io/ld/go-ld-prime" ) var ( - _ dms3ld.Link = Link{} - _ dms3ld.LinkPrototype = LinkPrototype{} + _ ld.Link = Link{} + _ ld.LinkPrototype = LinkPrototype{} ) -// Link implements the dms3ld.Link interface using a CID. +// Link implements the ld.Link interface using a CID. // See https://gitlab.dms3.io/dms3/public/go-cid for more information about CIDs. // // When using this value, typically you'll use it as `Link`, and not `*Link`. -// This includes when handling the value as an `dms3ld.Link` interface -- the non-pointer form is typically preferable. -// This is because the dms3ld.Link inteface is often desirable to be able to use as a golang map key, +// This includes when handling the value as an `ld.Link` interface -- the non-pointer form is typically preferable. +// This is because the ld.Link inteface is often desirable to be able to use as a golang map key, // and in that context, pointers would not result in the desired behavior. type Link struct { cid.Cid } -func (lnk Link) Prototype() dms3ld.LinkPrototype { +func (lnk Link) Prototype() ld.LinkPrototype { return LinkPrototype{lnk.Cid.Prefix()} } func (lnk Link) String() string { @@ -35,7 +35,7 @@ type LinkPrototype struct { cid.Prefix } -func (lp LinkPrototype) BuildLink(hashsum []byte) dms3ld.Link { +func (lp LinkPrototype) BuildLink(hashsum []byte) ld.Link { // Does this method body look surprisingly complex? I agree. // We actually have to do all this work. The go-cid package doesn't expose a constructor that just lets us directly set the bytes and the prefix numbers next to each other. // No, `cid.Prefix.Sum` is not the method you are looking for: that expects the whole data body. diff --git a/linking/cid/linksystem.go b/linking/cid/linksystem.go index 28595aabd6e546c5ba142f0cc28bd5662669f7c8..15d616b785cafe16c8ad6087946efb9c6fb444c6 100644 --- a/linking/cid/linksystem.go +++ b/linking/cid/linksystem.go @@ -5,19 +5,19 @@ import ( "hash" multihash "github.com/multiformats/go-multihash/core" - dms3ld "gitlab.dms3.io/ld/go-ld-prime" + ld "gitlab.dms3.io/ld/go-ld-prime" "gitlab.dms3.io/ld/go-ld-prime/multicodec" ) -// DefaultLinkSystem returns an dms3ld.LinkSystem which uses cidlink.Link for dms3ld.Link. +// DefaultLinkSystem returns an ld.LinkSystem which uses cidlink.Link for ld.Link. // During selection of encoders, decoders, and hashers, it examines the multicodec indicator numbers and multihash indicator numbers from the CID, -// and uses the default global multicodec registry (see the go-dms3ld-prime/multicodec package) for resolving codec implementations, +// and uses the default global multicodec registry (see the go-ld-prime/multicodec package) for resolving codec implementations, // and the default global multihash registry (see the go-multihash/core package) for resolving multihash implementations. // // No storage functions are present in the returned LinkSystem. // The caller can assign those themselves as desired. -func DefaultLinkSystem() dms3ld.LinkSystem { +func DefaultLinkSystem() ld.LinkSystem { return LinkSystemUsingMulticodecRegistry(multicodec.DefaultRegistry) } @@ -26,9 +26,9 @@ func DefaultLinkSystem() dms3ld.LinkSystem { // This can help create a LinkSystem which uses different multicodec implementations than the global registry. // (Sometimes this can be desired if you want some parts of a program to support a more limited suite of codecs than other parts of the program, // or needed to use a different multicodec registry than the global one for synchronization purposes, or etc.) -func LinkSystemUsingMulticodecRegistry(mcReg multicodec.Registry) dms3ld.LinkSystem { - return dms3ld.LinkSystem{ - EncoderChooser: func(lp dms3ld.LinkPrototype) (dms3ld.Encoder, error) { +func LinkSystemUsingMulticodecRegistry(mcReg multicodec.Registry) ld.LinkSystem { + return ld.LinkSystem{ + EncoderChooser: func(lp ld.LinkPrototype) (ld.Encoder, error) { switch lp2 := lp.(type) { case LinkPrototype: fn, err := mcReg.LookupEncoder(lp2.GetCodec()) @@ -40,7 +40,7 @@ func LinkSystemUsingMulticodecRegistry(mcReg multicodec.Registry) dms3ld.LinkSys return nil, fmt.Errorf("this encoderChooser can only handle cidlink.LinkPrototype; got %T", lp) } }, - DecoderChooser: func(lnk dms3ld.Link) (dms3ld.Decoder, error) { + DecoderChooser: func(lnk ld.Link) (ld.Decoder, error) { lp := lnk.Prototype() switch lp2 := lp.(type) { case LinkPrototype: @@ -53,7 +53,7 @@ func LinkSystemUsingMulticodecRegistry(mcReg multicodec.Registry) dms3ld.LinkSys return nil, fmt.Errorf("this decoderChooser can only handle cidlink.LinkPrototype; got %T", lp) } }, - HasherChooser: func(lp dms3ld.LinkPrototype) (hash.Hash, error) { + HasherChooser: func(lp ld.LinkPrototype) (hash.Hash, error) { switch lp2 := lp.(type) { case LinkPrototype: h, err := multihash.GetHasher(lp2.MhType) diff --git a/linkingExamples_test.go b/linkingExamples_test.go index b17c8a0551a8ae30dc41f49d83bd2287222c5e81..48679479a37af96441e26da31b6e0e4e94755e0b 100644 --- a/linkingExamples_test.go +++ b/linkingExamples_test.go @@ -1,11 +1,11 @@ -package dms3ld_test +package ld_test import ( "fmt" "gitlab.dms3.io/dms3/public/go-cid" - dms3ld "gitlab.dms3.io/ld/go-ld-prime" + ld "gitlab.dms3.io/ld/go-ld-prime" _ "gitlab.dms3.io/ld/go-ld-prime/codec/dagcbor" "gitlab.dms3.io/ld/go-ld-prime/fluent" cidlink "gitlab.dms3.io/ld/go-ld-prime/linking/cid" @@ -36,7 +36,7 @@ func ExampleLinkSystem_Store() { // We want to store the serialized data somewhere. // We'll use an in-memory store for this. (It's a package scoped variable.) // You can use any kind of storage system here; - // you just need a function that conforms to the dms3ld.BlockWriteOpener interface. + // you just need a function that conforms to the ld.BlockWriteOpener interface. lsys.StorageWriteOpener = (&store).OpenWrite // To create any links, first we need a LinkPrototype. @@ -68,9 +68,9 @@ func ExampleLinkSystem_Store() { // Now: time to apply the LinkSystem, and do the actual store operation! lnk, err := lsys.Store( - dms3ld.LinkContext{}, // The zero value is fine. Configure it it you want cancellability or other features. - lp, // The LinkPrototype says what codec and hashing to use. - n, // And here's our data. + ld.LinkContext{}, // The zero value is fine. Configure it it you want cancellability or other features. + lp, // The LinkPrototype says what codec and hashing to use. + n, // And here's our data. ) if err != nil { panic(err) @@ -103,10 +103,10 @@ func ExampleLinkSystem_Load() { // We'll use an in-memory store for this. (It's a package scoped variable.) // (This particular memory store was filled with the data we'll load earlier, during ExampleLinkSystem_Store.) // You can use any kind of storage system here; - // you just need a function that conforms to the dms3ld.BlockReadOpener interface. + // you just need a function that conforms to the ld.BlockReadOpener interface. lsys.StorageReadOpener = (&store).OpenRead - // We'll need to decide what in-memory implementation of dms3ld.Node we want to use. + // We'll need to decide what in-memory implementation of ld.Node we want to use. // Here, we'll use the "basicnode" implementation. This is a good getting-started choice. // But you could also use other implementations, or even a code-generated type with special features! np := basicnode.Prototype.Any @@ -117,9 +117,9 @@ func ExampleLinkSystem_Load() { // Apply the LinkSystem, and ask it to load our link! n, err := lsys.Load( - dms3ld.LinkContext{}, // The zero value is fine. Configure it it you want cancellability or other features. - lnk, // The Link we want to load! - np, // The NodePrototype says what kind of Node we want as a result. + ld.LinkContext{}, // The zero value is fine. Configure it it you want cancellability or other features. + lnk, // The Link we want to load! + np, // The NodePrototype says what kind of Node we want as a result. ) if err != nil { panic(err) diff --git a/linksystem.go b/linksystem.go index ffa5cbdafc3e470332a6a4ee4ff5f483570fbae2..8ee65d1ffa0a062bbb2bbc71116a689c7c43e0fe 100644 --- a/linksystem.go +++ b/linksystem.go @@ -1,4 +1,4 @@ -package dms3ld +package ld import ( "fmt" @@ -67,7 +67,7 @@ type ( // // An Encoder works with Nodes. // If you have a native golang structure, and want to serialize it using an Encoder, - // you'll need to figure out how to transform that golang structure into an dms3ld.Node tree first. + // you'll need to figure out how to transform that golang structure into an ld.Node tree first. // // It may be useful to understand "multicodecs" when working with Encoders. // In DMS3LD, a system called "multicodecs" is typically used to describe encoding foramts. diff --git a/multicodec/defaultRegistry.go b/multicodec/defaultRegistry.go index d12e1f1fac5338cb5db4c644f3ef5453a3e3bc52..b9219278120b0b96f3dffed82aef3c43081f4c49 100644 --- a/multicodec/defaultRegistry.go +++ b/multicodec/defaultRegistry.go @@ -1,7 +1,7 @@ package multicodec import ( - dms3ld "gitlab.dms3.io/ld/go-ld-prime" + ld "gitlab.dms3.io/ld/go-ld-prime" ) // DefaultRegistry is a multicodec.Registry instance which is global to the program, @@ -22,7 +22,7 @@ import ( // and eschew using the global default. var DefaultRegistry = Registry{} -// RegisterEncoder updates the global DefaultRegistry to map a multicodec indicator number to the given dms3ld.Encoder function. +// RegisterEncoder updates the global DefaultRegistry to map a multicodec indicator number to the given ld.Encoder function. // The encoder functions registered can be subsequently looked up using LookupEncoder. // It is a shortcut to the RegisterEncoder method on the global DefaultRegistry. // @@ -40,20 +40,20 @@ var DefaultRegistry = Registry{} // This should have the desired effect because the root of the import tree has its init time effect last. // Alternatively, one can just avoid use of this registry entirely: // do this by making a LinkSystem that uses a custom EncoderChooser function. -func RegisterEncoder(indicator uint64, encodeFunc dms3ld.Encoder) { +func RegisterEncoder(indicator uint64, encodeFunc ld.Encoder) { DefaultRegistry.RegisterEncoder(indicator, encodeFunc) } -// LookupEncoder yields an dms3ld.Encoder function matching a multicodec indicator code number. +// LookupEncoder yields an ld.Encoder function matching a multicodec indicator code number. // It is a shortcut to the LookupEncoder method on the global DefaultRegistry. // // To be available from this lookup function, an encoder must have been registered // for this indicator number by an earlier call to the RegisterEncoder function. -func LookupEncoder(indicator uint64) (dms3ld.Encoder, error) { +func LookupEncoder(indicator uint64) (ld.Encoder, error) { return DefaultRegistry.LookupEncoder(indicator) } -// ListEncoders returns a list of multicodec indicators for which an dms3ld.Encoder is registered. +// ListEncoders returns a list of multicodec indicators for which an ld.Encoder is registered. // The list is in no particular order. // It is a shortcut to the ListEncoders method on the global DefaultRegistry. // @@ -69,7 +69,7 @@ func ListEncoders() []uint64 { return DefaultRegistry.ListEncoders() } -// RegisterDecoder updates the global DefaultRegistry a map a multicodec indicator number to the given dms3ld.Decoder function. +// RegisterDecoder updates the global DefaultRegistry a map a multicodec indicator number to the given ld.Decoder function. // The decoder functions registered can be subsequently looked up using LookupDecoder. // It is a shortcut to the RegisterDecoder method on the global DefaultRegistry. // @@ -87,20 +87,20 @@ func ListEncoders() []uint64 { // This should have the desired effect because the root of the import tree has its init time effect last. // Alternatively, one can just avoid use of this registry entirely: // do this by making a LinkSystem that uses a custom DecoderChooser function. -func RegisterDecoder(indicator uint64, decodeFunc dms3ld.Decoder) { +func RegisterDecoder(indicator uint64, decodeFunc ld.Decoder) { DefaultRegistry.RegisterDecoder(indicator, decodeFunc) } -// LookupDecoder yields an dms3ld.Decoder function matching a multicodec indicator code number. +// LookupDecoder yields an ld.Decoder function matching a multicodec indicator code number. // It is a shortcut to the LookupDecoder method on the global DefaultRegistry. // // To be available from this lookup function, an decoder must have been registered // for this indicator number by an earlier call to the RegisterDecoder function. -func LookupDecoder(indicator uint64) (dms3ld.Decoder, error) { +func LookupDecoder(indicator uint64) (ld.Decoder, error) { return DefaultRegistry.LookupDecoder(indicator) } -// ListDecoders returns a list of multicodec indicators for which an dms3ld.Decoder is registered. +// ListDecoders returns a list of multicodec indicators for which an ld.Decoder is registered. // The list is in no particular order. // It is a shortcut to the ListDecoders method on the global DefaultRegistry. // diff --git a/multicodec/registry.go b/multicodec/registry.go index f3ccff42a12b7ed48403b60846adb5bed680686a..aa2b3214f91aa12c2fd34bfa0cb51bb696642195 100644 --- a/multicodec/registry.go +++ b/multicodec/registry.go @@ -6,9 +6,9 @@ import ( "gitlab.dms3.io/ld/go-ld-prime" ) -// Registry is a structure for storing mappings of multicodec indicator numbers to dms3ld.Encoder and dms3ld.Decoder functions. +// Registry is a structure for storing mappings of multicodec indicator numbers to ld.Encoder and ld.Decoder functions. // -// The most typical usage of this structure is in combination with an dms3ld.LinkSystem. +// The most typical usage of this structure is in combination with an ld.LinkSystem. // For example, a linksystem using CIDs and a custom multicodec registry can be constructed // using cidlink.LinkSystemUsingMulticodecRegistry. // @@ -16,7 +16,7 @@ import ( // (Typically, it is recommended to do initialization earlier in a program, before fanning out goroutines; // this avoids the need for mutexing overhead.) // -// go-dms3ld-prime also has a default registry, which has the same methods as this structure, but are at package scope. +// go-ld-prime also has a default registry, which has the same methods as this structure, but are at package scope. // Some systems, like cidlink.DefaultLinkSystem, will use this default registry. // However, this default registry is global to the entire program. // This Registry type is for helping if you wish to make your own registry which does not share that global state. @@ -26,21 +26,21 @@ import ( // You should not use indicator numbers which are not specified in that table // (however, there is nothing in this implementation that will attempt to stop you, either; please behave). type Registry struct { - encoders map[uint64]dms3ld.Encoder - decoders map[uint64]dms3ld.Decoder + encoders map[uint64]ld.Encoder + decoders map[uint64]ld.Decoder } func (r *Registry) ensureInit() { if r.encoders != nil { return } - r.encoders = make(map[uint64]dms3ld.Encoder) - r.decoders = make(map[uint64]dms3ld.Decoder) + r.encoders = make(map[uint64]ld.Encoder) + r.decoders = make(map[uint64]ld.Decoder) } -// RegisterEncoder updates a simple map of multicodec indicator number to dms3ld.Encoder function. +// RegisterEncoder updates a simple map of multicodec indicator number to ld.Encoder function. // The encoder functions registered can be subsequently looked up using LookupEncoder. -func (r *Registry) RegisterEncoder(indicator uint64, encodeFunc dms3ld.Encoder) { +func (r *Registry) RegisterEncoder(indicator uint64, encodeFunc ld.Encoder) { r.ensureInit() if encodeFunc == nil { panic("not sensible to attempt to register a nil function") @@ -48,11 +48,11 @@ func (r *Registry) RegisterEncoder(indicator uint64, encodeFunc dms3ld.Encoder) r.encoders[indicator] = encodeFunc } -// LookupEncoder yields an dms3ld.Encoder function matching a multicodec indicator code number. +// LookupEncoder yields an ld.Encoder function matching a multicodec indicator code number. // // To be available from this lookup function, an encoder must have been registered // for this indicator number by an earlier call to the RegisterEncoder function. -func (r *Registry) LookupEncoder(indicator uint64) (dms3ld.Encoder, error) { +func (r *Registry) LookupEncoder(indicator uint64) (ld.Encoder, error) { encodeFunc, exists := r.encoders[indicator] if !exists { return nil, fmt.Errorf("no encoder registered for multicodec code %d (0x%x)", indicator, indicator) @@ -60,7 +60,7 @@ func (r *Registry) LookupEncoder(indicator uint64) (dms3ld.Encoder, error) { return encodeFunc, nil } -// ListEncoders returns a list of multicodec indicators for which an dms3ld.Encoder is registered. +// ListEncoders returns a list of multicodec indicators for which an ld.Encoder is registered. // The list is in no particular order. func (r *Registry) ListEncoders() []uint64 { encoders := make([]uint64, 0, len(r.encoders)) @@ -70,9 +70,9 @@ func (r *Registry) ListEncoders() []uint64 { return encoders } -// RegisterDecoder updates a simple map of multicodec indicator number to dms3ld.Decoder function. +// RegisterDecoder updates a simple map of multicodec indicator number to ld.Decoder function. // The decoder functions registered can be subsequently looked up using LookupDecoder. -func (r *Registry) RegisterDecoder(indicator uint64, decodeFunc dms3ld.Decoder) { +func (r *Registry) RegisterDecoder(indicator uint64, decodeFunc ld.Decoder) { r.ensureInit() if decodeFunc == nil { panic("not sensible to attempt to register a nil function") @@ -80,11 +80,11 @@ func (r *Registry) RegisterDecoder(indicator uint64, decodeFunc dms3ld.Decoder) r.decoders[indicator] = decodeFunc } -// LookupDecoder yields an dms3ld.Decoder function matching a multicodec indicator code number. +// LookupDecoder yields an ld.Decoder function matching a multicodec indicator code number. // // To be available from this lookup function, an decoder must have been registered // for this indicator number by an earlier call to the RegisterDecoder function. -func (r *Registry) LookupDecoder(indicator uint64) (dms3ld.Decoder, error) { +func (r *Registry) LookupDecoder(indicator uint64) (ld.Decoder, error) { decodeFunc, exists := r.decoders[indicator] if !exists { return nil, fmt.Errorf("no decoder registered for multicodec code %d (0x%x)", indicator, indicator) @@ -92,7 +92,7 @@ func (r *Registry) LookupDecoder(indicator uint64) (dms3ld.Decoder, error) { return decodeFunc, nil } -// ListDecoders returns a list of multicodec indicators for which an dms3ld.Decoder is registered. +// ListDecoders returns a list of multicodec indicators for which an ld.Decoder is registered. // The list is in no particular order. func (r *Registry) ListDecoders() []uint64 { decoders := make([]uint64, 0, len(r.decoders)) diff --git a/must/must.go b/must/must.go index 2f28ba6c247fa95b7fcc5be42d1055fcfba98722..2033e1bb552c2be928c6e854bddef96bcf788ad8 100644 --- a/must/must.go +++ b/must/must.go @@ -17,7 +17,7 @@ package must import ( - dms3ld "gitlab.dms3.io/ld/go-ld-prime" + ld "gitlab.dms3.io/ld/go-ld-prime" "gitlab.dms3.io/ld/go-ld-prime/schema" ) @@ -38,7 +38,7 @@ func NotError(e error) { // // must.Node(SomeNodeBuilder{}.CreateString("a")) // -func Node(n dms3ld.Node, e error) dms3ld.Node { +func Node(n ld.Node, e error) ld.Node { if e != nil { panic(e) } @@ -47,14 +47,14 @@ func Node(n dms3ld.Node, e error) dms3ld.Node { // must.TypedNode helps write pointfree/chainable-style code // by taking a Node and an error and transforming any error into a panic. -// It will also cast the `dms3ld.Node` to a `schema.TypedNode`, panicking if impossible. +// It will also cast the `ld.Node` to a `schema.TypedNode`, panicking if impossible. // // Because golang supports implied destructuring of multiple-return functions // into arguments for another funtion of matching arity, it can be used like this: // // must.TypedNode(SomeNodeBuilder{}.CreateString("a")) // -func TypedNode(n dms3ld.Node, e error) schema.TypedNode { +func TypedNode(n ld.Node, e error) schema.TypedNode { if e != nil { panic(e) } @@ -71,7 +71,7 @@ func True(v bool) { // must.String unboxes the given Node via AsString, // panicking in the case that the Node isn't of string kind, // and otherwise returning the bare native string. -func String(n dms3ld.Node) string { +func String(n ld.Node) string { if v, err := n.AsString(); err != nil { panic(err) } else { @@ -82,7 +82,7 @@ func String(n dms3ld.Node) string { // must.Int unboxes the given Node via AsInt, // panicking in the case that the Node isn't of int kind, // and otherwise returning the bare native int. -func Int(n dms3ld.Node) int64 { +func Int(n ld.Node) int64 { if v, err := n.AsInt(); err != nil { panic(err) } else { diff --git a/node.go b/node.go index f5c2eca6dfaba0e60d9737b01dadc8608bc0244a..8676266e758111597172427e17c739cc96922a44 100644 --- a/node.go +++ b/node.go @@ -1,4 +1,4 @@ -package dms3ld +package ld // Node represents a value in DMS3LD. Any point in a tree of data is a node: // scalar values (like int64, string, etc) are nodes, and @@ -137,7 +137,7 @@ type Node interface { // unambiguously make the distinction between values that are // present-and-null versus values that are absent. // - // Absent nodes respond to `Kind()` as `dms3ld.Kind_Null`, + // Absent nodes respond to `Kind()` as `ld.Kind_Null`, // for lack of any better descriptive value; you should therefore // always check IsAbsent rather than just a switch on kind // when it may be important to handle absent values distinctly. diff --git a/node/basic/any.go b/node/basic/any.go index e7aab32ce68f42ed09228e7cf66b50cbfbdedf4c..3767a7cd2df1d40f590ffbd903e995ae4cb2da28 100644 --- a/node/basic/any.go +++ b/node/basic/any.go @@ -1,14 +1,14 @@ package basicnode import ( - dms3ld "gitlab.dms3.io/ld/go-ld-prime" + ld "gitlab.dms3.io/ld/go-ld-prime" ) var ( - //_ dms3ld.Node = &anyNode{} - _ dms3ld.NodePrototype = Prototype__Any{} - _ dms3ld.NodeBuilder = &anyBuilder{} - //_ dms3ld.NodeAssembler = &anyAssembler{} + //_ ld.Node = &anyNode{} + _ ld.NodePrototype = Prototype__Any{} + _ ld.NodeBuilder = &anyBuilder{} + //_ ld.NodeAssembler = &anyAssembler{} ) // Note that we don't use a "var _" declaration to assert that Chooser @@ -21,7 +21,7 @@ var ( // or with another chooser layer on top, such as: // // prototypeChooser := dagpb.AddSupportToChooser(basicnode.Chooser) -func Chooser(_ dms3ld.Link, _ dms3ld.LinkContext) (dms3ld.NodePrototype, error) { +func Chooser(_ ld.Link, _ ld.LinkContext) (ld.NodePrototype, error) { return Prototype__Any{}, nil } @@ -31,7 +31,7 @@ func Chooser(_ dms3ld.Link, _ dms3ld.LinkContext) (dms3ld.NodePrototype, error) // REVIEW: if there's any point in keeping this around. It's here for completeness, // but not currently used anywhere in package, and also not currently exported. // type anyNode struct { -// kind dms3ld.Kind +// kind ld.Kind // // plainMap // plainList @@ -51,7 +51,7 @@ func Chooser(_ dms3ld.Link, _ dms3ld.LinkContext) (dms3ld.NodePrototype, error) type Prototype__Any struct{} -func (Prototype__Any) NewBuilder() dms3ld.NodeBuilder { +func (Prototype__Any) NewBuilder() ld.NodeBuilder { return &anyBuilder{} } @@ -71,7 +71,7 @@ type anyBuilder struct { // kind is set on first interaction, and used to select which builder to delegate 'Build' to! // As soon as it's been set to a value other than zero (being "Invalid"), all other Assign/Begin calls will fail since something is already in progress. // May also be set to the magic value '99', which means "i dunno, I'm just carrying another node of unknown prototype". - kind dms3ld.Kind + kind ld.Kind // Only one of the following ends up being used... // but we don't know in advance which one, so all are embeded here. @@ -84,117 +84,117 @@ type anyBuilder struct { mapBuilder plainMap__Builder listBuilder plainList__Builder - scalarNode dms3ld.Node + scalarNode ld.Node } func (nb *anyBuilder) Reset() { *nb = anyBuilder{} } -func (nb *anyBuilder) BeginMap(sizeHint int64) (dms3ld.MapAssembler, error) { - if nb.kind != dms3ld.Kind_Invalid { +func (nb *anyBuilder) BeginMap(sizeHint int64) (ld.MapAssembler, error) { + if nb.kind != ld.Kind_Invalid { panic("misuse") } - nb.kind = dms3ld.Kind_Map + nb.kind = ld.Kind_Map nb.mapBuilder.w = &plainMap{} return nb.mapBuilder.BeginMap(sizeHint) } -func (nb *anyBuilder) BeginList(sizeHint int64) (dms3ld.ListAssembler, error) { - if nb.kind != dms3ld.Kind_Invalid { +func (nb *anyBuilder) BeginList(sizeHint int64) (ld.ListAssembler, error) { + if nb.kind != ld.Kind_Invalid { panic("misuse") } - nb.kind = dms3ld.Kind_List + nb.kind = ld.Kind_List nb.listBuilder.w = &plainList{} return nb.listBuilder.BeginList(sizeHint) } func (nb *anyBuilder) AssignNull() error { - if nb.kind != dms3ld.Kind_Invalid { + if nb.kind != ld.Kind_Invalid { panic("misuse") } - nb.kind = dms3ld.Kind_Null + nb.kind = ld.Kind_Null return nil } func (nb *anyBuilder) AssignBool(v bool) error { - if nb.kind != dms3ld.Kind_Invalid { + if nb.kind != ld.Kind_Invalid { panic("misuse") } - nb.kind = dms3ld.Kind_Bool + nb.kind = ld.Kind_Bool nb.scalarNode = NewBool(v) return nil } func (nb *anyBuilder) AssignInt(v int64) error { - if nb.kind != dms3ld.Kind_Invalid { + if nb.kind != ld.Kind_Invalid { panic("misuse") } - nb.kind = dms3ld.Kind_Int + nb.kind = ld.Kind_Int nb.scalarNode = NewInt(v) return nil } func (nb *anyBuilder) AssignFloat(v float64) error { - if nb.kind != dms3ld.Kind_Invalid { + if nb.kind != ld.Kind_Invalid { panic("misuse") } - nb.kind = dms3ld.Kind_Float + nb.kind = ld.Kind_Float nb.scalarNode = NewFloat(v) return nil } func (nb *anyBuilder) AssignString(v string) error { - if nb.kind != dms3ld.Kind_Invalid { + if nb.kind != ld.Kind_Invalid { panic("misuse") } - nb.kind = dms3ld.Kind_String + nb.kind = ld.Kind_String nb.scalarNode = NewString(v) return nil } func (nb *anyBuilder) AssignBytes(v []byte) error { - if nb.kind != dms3ld.Kind_Invalid { + if nb.kind != ld.Kind_Invalid { panic("misuse") } - nb.kind = dms3ld.Kind_Bytes + nb.kind = ld.Kind_Bytes nb.scalarNode = NewBytes(v) return nil } -func (nb *anyBuilder) AssignLink(v dms3ld.Link) error { - if nb.kind != dms3ld.Kind_Invalid { +func (nb *anyBuilder) AssignLink(v ld.Link) error { + if nb.kind != ld.Kind_Invalid { panic("misuse") } - nb.kind = dms3ld.Kind_Link + nb.kind = ld.Kind_Link nb.scalarNode = NewLink(v) return nil } -func (nb *anyBuilder) AssignNode(v dms3ld.Node) error { - if nb.kind != dms3ld.Kind_Invalid { +func (nb *anyBuilder) AssignNode(v ld.Node) error { + if nb.kind != ld.Kind_Invalid { panic("misuse") } nb.kind = 99 nb.scalarNode = v return nil } -func (anyBuilder) Prototype() dms3ld.NodePrototype { +func (anyBuilder) Prototype() ld.NodePrototype { return Prototype__Any{} } -func (nb *anyBuilder) Build() dms3ld.Node { +func (nb *anyBuilder) Build() ld.Node { switch nb.kind { - case dms3ld.Kind_Invalid: + case ld.Kind_Invalid: panic("misuse") - case dms3ld.Kind_Map: + case ld.Kind_Map: return nb.mapBuilder.Build() - case dms3ld.Kind_List: + case ld.Kind_List: return nb.listBuilder.Build() - case dms3ld.Kind_Null: - return dms3ld.Null - case dms3ld.Kind_Bool: + case ld.Kind_Null: + return ld.Null + case ld.Kind_Bool: return nb.scalarNode - case dms3ld.Kind_Int: + case ld.Kind_Int: return nb.scalarNode - case dms3ld.Kind_Float: + case ld.Kind_Float: return nb.scalarNode - case dms3ld.Kind_String: + case ld.Kind_String: return nb.scalarNode - case dms3ld.Kind_Bytes: + case ld.Kind_Bytes: return nb.scalarNode - case dms3ld.Kind_Link: + case ld.Kind_Link: return nb.scalarNode case 99: return nb.scalarNode diff --git a/node/basic/bool.go b/node/basic/bool.go index 10d2c2f785a401285b6d599695334df28b8ada77..71171321481828d679f405c4afd76bb1b7b74141 100644 --- a/node/basic/bool.go +++ b/node/basic/bool.go @@ -1,46 +1,46 @@ package basicnode import ( - dms3ld "gitlab.dms3.io/ld/go-ld-prime" + ld "gitlab.dms3.io/ld/go-ld-prime" "gitlab.dms3.io/ld/go-ld-prime/node/mixins" ) var ( - _ dms3ld.Node = plainBool(false) - _ dms3ld.NodePrototype = Prototype__Bool{} - _ dms3ld.NodeBuilder = &plainBool__Builder{} - _ dms3ld.NodeAssembler = &plainBool__Assembler{} + _ ld.Node = plainBool(false) + _ ld.NodePrototype = Prototype__Bool{} + _ ld.NodeBuilder = &plainBool__Builder{} + _ ld.NodeAssembler = &plainBool__Assembler{} ) -func NewBool(value bool) dms3ld.Node { +func NewBool(value bool) ld.Node { v := plainBool(value) return &v } -// plainBool is a simple boxed boolean that complies with dms3ld.Node. +// plainBool is a simple boxed boolean that complies with ld.Node. type plainBool bool // -- Node interface methods --> -func (plainBool) Kind() dms3ld.Kind { - return dms3ld.Kind_Bool +func (plainBool) Kind() ld.Kind { + return ld.Kind_Bool } -func (plainBool) LookupByString(string) (dms3ld.Node, error) { +func (plainBool) LookupByString(string) (ld.Node, error) { return mixins.Bool{TypeName: "bool"}.LookupByString("") } -func (plainBool) LookupByNode(key dms3ld.Node) (dms3ld.Node, error) { +func (plainBool) LookupByNode(key ld.Node) (ld.Node, error) { return mixins.Bool{TypeName: "bool"}.LookupByNode(nil) } -func (plainBool) LookupByIndex(idx int64) (dms3ld.Node, error) { +func (plainBool) LookupByIndex(idx int64) (ld.Node, error) { return mixins.Bool{TypeName: "bool"}.LookupByIndex(0) } -func (plainBool) LookupBySegment(seg dms3ld.PathSegment) (dms3ld.Node, error) { +func (plainBool) LookupBySegment(seg ld.PathSegment) (ld.Node, error) { return mixins.Bool{TypeName: "bool"}.LookupBySegment(seg) } -func (plainBool) MapIterator() dms3ld.MapIterator { +func (plainBool) MapIterator() ld.MapIterator { return nil } -func (plainBool) ListIterator() dms3ld.ListIterator { +func (plainBool) ListIterator() ld.ListIterator { return nil } func (plainBool) Length() int64 { @@ -67,10 +67,10 @@ func (plainBool) AsString() (string, error) { func (plainBool) AsBytes() ([]byte, error) { return mixins.Bool{TypeName: "bool"}.AsBytes() } -func (plainBool) AsLink() (dms3ld.Link, error) { +func (plainBool) AsLink() (ld.Link, error) { return mixins.Bool{TypeName: "bool"}.AsLink() } -func (plainBool) Prototype() dms3ld.NodePrototype { +func (plainBool) Prototype() ld.NodePrototype { return Prototype__Bool{} } @@ -78,7 +78,7 @@ func (plainBool) Prototype() dms3ld.NodePrototype { type Prototype__Bool struct{} -func (Prototype__Bool) NewBuilder() dms3ld.NodeBuilder { +func (Prototype__Bool) NewBuilder() ld.NodeBuilder { var w plainBool return &plainBool__Builder{plainBool__Assembler{w: &w}} } @@ -89,7 +89,7 @@ type plainBool__Builder struct { plainBool__Assembler } -func (nb *plainBool__Builder) Build() dms3ld.Node { +func (nb *plainBool__Builder) Build() ld.Node { return nb.w } func (nb *plainBool__Builder) Reset() { @@ -103,10 +103,10 @@ type plainBool__Assembler struct { w *plainBool } -func (plainBool__Assembler) BeginMap(sizeHint int64) (dms3ld.MapAssembler, error) { +func (plainBool__Assembler) BeginMap(sizeHint int64) (ld.MapAssembler, error) { return mixins.BoolAssembler{TypeName: "bool"}.BeginMap(0) } -func (plainBool__Assembler) BeginList(sizeHint int64) (dms3ld.ListAssembler, error) { +func (plainBool__Assembler) BeginList(sizeHint int64) (ld.ListAssembler, error) { return mixins.BoolAssembler{TypeName: "bool"}.BeginList(0) } func (plainBool__Assembler) AssignNull() error { @@ -128,10 +128,10 @@ func (plainBool__Assembler) AssignString(string) error { func (plainBool__Assembler) AssignBytes([]byte) error { return mixins.BoolAssembler{TypeName: "bool"}.AssignBytes(nil) } -func (plainBool__Assembler) AssignLink(dms3ld.Link) error { +func (plainBool__Assembler) AssignLink(ld.Link) error { return mixins.BoolAssembler{TypeName: "bool"}.AssignLink(nil) } -func (na *plainBool__Assembler) AssignNode(v dms3ld.Node) error { +func (na *plainBool__Assembler) AssignNode(v ld.Node) error { if v2, err := v.AsBool(); err != nil { return err } else { @@ -139,6 +139,6 @@ func (na *plainBool__Assembler) AssignNode(v dms3ld.Node) error { return nil } } -func (plainBool__Assembler) Prototype() dms3ld.NodePrototype { +func (plainBool__Assembler) Prototype() ld.NodePrototype { return Prototype__Bool{} } diff --git a/node/basic/bytes.go b/node/basic/bytes.go index ad37d66af77c9b00542df9a608b3305099d7320e..a8a1612b127fcf021b08ba60144b238eb396fdb7 100644 --- a/node/basic/bytes.go +++ b/node/basic/bytes.go @@ -1,46 +1,46 @@ package basicnode import ( - dms3ld "gitlab.dms3.io/ld/go-ld-prime" + ld "gitlab.dms3.io/ld/go-ld-prime" "gitlab.dms3.io/ld/go-ld-prime/node/mixins" ) var ( - _ dms3ld.Node = plainBytes(nil) - _ dms3ld.NodePrototype = Prototype__Bytes{} - _ dms3ld.NodeBuilder = &plainBytes__Builder{} - _ dms3ld.NodeAssembler = &plainBytes__Assembler{} + _ ld.Node = plainBytes(nil) + _ ld.NodePrototype = Prototype__Bytes{} + _ ld.NodeBuilder = &plainBytes__Builder{} + _ ld.NodeAssembler = &plainBytes__Assembler{} ) -func NewBytes(value []byte) dms3ld.Node { +func NewBytes(value []byte) ld.Node { v := plainBytes(value) return &v } -// plainBytes is a simple boxed byte slice that complies with dms3ld.Node. +// plainBytes is a simple boxed byte slice that complies with ld.Node. type plainBytes []byte // -- Node interface methods --> -func (plainBytes) Kind() dms3ld.Kind { - return dms3ld.Kind_Bytes +func (plainBytes) Kind() ld.Kind { + return ld.Kind_Bytes } -func (plainBytes) LookupByString(string) (dms3ld.Node, error) { +func (plainBytes) LookupByString(string) (ld.Node, error) { return mixins.Bytes{TypeName: "bytes"}.LookupByString("") } -func (plainBytes) LookupByNode(key dms3ld.Node) (dms3ld.Node, error) { +func (plainBytes) LookupByNode(key ld.Node) (ld.Node, error) { return mixins.Bytes{TypeName: "bytes"}.LookupByNode(nil) } -func (plainBytes) LookupByIndex(idx int64) (dms3ld.Node, error) { +func (plainBytes) LookupByIndex(idx int64) (ld.Node, error) { return mixins.Bytes{TypeName: "bytes"}.LookupByIndex(0) } -func (plainBytes) LookupBySegment(seg dms3ld.PathSegment) (dms3ld.Node, error) { +func (plainBytes) LookupBySegment(seg ld.PathSegment) (ld.Node, error) { return mixins.Bytes{TypeName: "bytes"}.LookupBySegment(seg) } -func (plainBytes) MapIterator() dms3ld.MapIterator { +func (plainBytes) MapIterator() ld.MapIterator { return nil } -func (plainBytes) ListIterator() dms3ld.ListIterator { +func (plainBytes) ListIterator() ld.ListIterator { return nil } func (plainBytes) Length() int64 { @@ -67,10 +67,10 @@ func (plainBytes) AsString() (string, error) { func (n plainBytes) AsBytes() ([]byte, error) { return []byte(n), nil } -func (plainBytes) AsLink() (dms3ld.Link, error) { +func (plainBytes) AsLink() (ld.Link, error) { return mixins.Bytes{TypeName: "bytes"}.AsLink() } -func (plainBytes) Prototype() dms3ld.NodePrototype { +func (plainBytes) Prototype() ld.NodePrototype { return Prototype__Bytes{} } @@ -78,7 +78,7 @@ func (plainBytes) Prototype() dms3ld.NodePrototype { type Prototype__Bytes struct{} -func (Prototype__Bytes) NewBuilder() dms3ld.NodeBuilder { +func (Prototype__Bytes) NewBuilder() ld.NodeBuilder { var w plainBytes return &plainBytes__Builder{plainBytes__Assembler{w: &w}} } @@ -89,7 +89,7 @@ type plainBytes__Builder struct { plainBytes__Assembler } -func (nb *plainBytes__Builder) Build() dms3ld.Node { +func (nb *plainBytes__Builder) Build() ld.Node { return nb.w } func (nb *plainBytes__Builder) Reset() { @@ -103,10 +103,10 @@ type plainBytes__Assembler struct { w *plainBytes } -func (plainBytes__Assembler) BeginMap(sizeHint int64) (dms3ld.MapAssembler, error) { +func (plainBytes__Assembler) BeginMap(sizeHint int64) (ld.MapAssembler, error) { return mixins.BytesAssembler{TypeName: "bytes"}.BeginMap(0) } -func (plainBytes__Assembler) BeginList(sizeHint int64) (dms3ld.ListAssembler, error) { +func (plainBytes__Assembler) BeginList(sizeHint int64) (ld.ListAssembler, error) { return mixins.BytesAssembler{TypeName: "bytes"}.BeginList(0) } func (plainBytes__Assembler) AssignNull() error { @@ -128,10 +128,10 @@ func (na *plainBytes__Assembler) AssignBytes(v []byte) error { *na.w = plainBytes(v) return nil } -func (plainBytes__Assembler) AssignLink(dms3ld.Link) error { +func (plainBytes__Assembler) AssignLink(ld.Link) error { return mixins.BytesAssembler{TypeName: "bytes"}.AssignLink(nil) } -func (na *plainBytes__Assembler) AssignNode(v dms3ld.Node) error { +func (na *plainBytes__Assembler) AssignNode(v ld.Node) error { if v2, err := v.AsBytes(); err != nil { return err } else { @@ -139,6 +139,6 @@ func (na *plainBytes__Assembler) AssignNode(v dms3ld.Node) error { return nil } } -func (plainBytes__Assembler) Prototype() dms3ld.NodePrototype { +func (plainBytes__Assembler) Prototype() ld.NodePrototype { return Prototype__Bytes{} } diff --git a/node/basic/float.go b/node/basic/float.go index 06f772786cb2a80288d6b7551fcc421dbb4c0780..fb4252d4665d8290c944be4c99f59e56024c0e33 100644 --- a/node/basic/float.go +++ b/node/basic/float.go @@ -1,46 +1,46 @@ package basicnode import ( - dms3ld "gitlab.dms3.io/ld/go-ld-prime" + ld "gitlab.dms3.io/ld/go-ld-prime" "gitlab.dms3.io/ld/go-ld-prime/node/mixins" ) var ( - _ dms3ld.Node = plainFloat(0) - _ dms3ld.NodePrototype = Prototype__Float{} - _ dms3ld.NodeBuilder = &plainFloat__Builder{} - _ dms3ld.NodeAssembler = &plainFloat__Assembler{} + _ ld.Node = plainFloat(0) + _ ld.NodePrototype = Prototype__Float{} + _ ld.NodeBuilder = &plainFloat__Builder{} + _ ld.NodeAssembler = &plainFloat__Assembler{} ) -func NewFloat(value float64) dms3ld.Node { +func NewFloat(value float64) ld.Node { v := plainFloat(value) return &v } -// plainFloat is a simple boxed float that complies with dms3ld.Node. +// plainFloat is a simple boxed float that complies with ld.Node. type plainFloat float64 // -- Node interface methods --> -func (plainFloat) Kind() dms3ld.Kind { - return dms3ld.Kind_Float +func (plainFloat) Kind() ld.Kind { + return ld.Kind_Float } -func (plainFloat) LookupByString(string) (dms3ld.Node, error) { +func (plainFloat) LookupByString(string) (ld.Node, error) { return mixins.Float{TypeName: "float"}.LookupByString("") } -func (plainFloat) LookupByNode(key dms3ld.Node) (dms3ld.Node, error) { +func (plainFloat) LookupByNode(key ld.Node) (ld.Node, error) { return mixins.Float{TypeName: "float"}.LookupByNode(nil) } -func (plainFloat) LookupByIndex(idx int64) (dms3ld.Node, error) { +func (plainFloat) LookupByIndex(idx int64) (ld.Node, error) { return mixins.Float{TypeName: "float"}.LookupByIndex(0) } -func (plainFloat) LookupBySegment(seg dms3ld.PathSegment) (dms3ld.Node, error) { +func (plainFloat) LookupBySegment(seg ld.PathSegment) (ld.Node, error) { return mixins.Float{TypeName: "float"}.LookupBySegment(seg) } -func (plainFloat) MapIterator() dms3ld.MapIterator { +func (plainFloat) MapIterator() ld.MapIterator { return nil } -func (plainFloat) ListIterator() dms3ld.ListIterator { +func (plainFloat) ListIterator() ld.ListIterator { return nil } func (plainFloat) Length() int64 { @@ -67,10 +67,10 @@ func (plainFloat) AsString() (string, error) { func (plainFloat) AsBytes() ([]byte, error) { return mixins.Float{TypeName: "float"}.AsBytes() } -func (plainFloat) AsLink() (dms3ld.Link, error) { +func (plainFloat) AsLink() (ld.Link, error) { return mixins.Float{TypeName: "float"}.AsLink() } -func (plainFloat) Prototype() dms3ld.NodePrototype { +func (plainFloat) Prototype() ld.NodePrototype { return Prototype__Float{} } @@ -78,7 +78,7 @@ func (plainFloat) Prototype() dms3ld.NodePrototype { type Prototype__Float struct{} -func (Prototype__Float) NewBuilder() dms3ld.NodeBuilder { +func (Prototype__Float) NewBuilder() ld.NodeBuilder { var w plainFloat return &plainFloat__Builder{plainFloat__Assembler{w: &w}} } @@ -89,7 +89,7 @@ type plainFloat__Builder struct { plainFloat__Assembler } -func (nb *plainFloat__Builder) Build() dms3ld.Node { +func (nb *plainFloat__Builder) Build() ld.Node { return nb.w } func (nb *plainFloat__Builder) Reset() { @@ -103,10 +103,10 @@ type plainFloat__Assembler struct { w *plainFloat } -func (plainFloat__Assembler) BeginMap(sizeHint int64) (dms3ld.MapAssembler, error) { +func (plainFloat__Assembler) BeginMap(sizeHint int64) (ld.MapAssembler, error) { return mixins.FloatAssembler{TypeName: "float"}.BeginMap(0) } -func (plainFloat__Assembler) BeginList(sizeHint int64) (dms3ld.ListAssembler, error) { +func (plainFloat__Assembler) BeginList(sizeHint int64) (ld.ListAssembler, error) { return mixins.FloatAssembler{TypeName: "float"}.BeginList(0) } func (plainFloat__Assembler) AssignNull() error { @@ -128,10 +128,10 @@ func (plainFloat__Assembler) AssignString(string) error { func (plainFloat__Assembler) AssignBytes([]byte) error { return mixins.FloatAssembler{TypeName: "float"}.AssignBytes(nil) } -func (plainFloat__Assembler) AssignLink(dms3ld.Link) error { +func (plainFloat__Assembler) AssignLink(ld.Link) error { return mixins.FloatAssembler{TypeName: "float"}.AssignLink(nil) } -func (na *plainFloat__Assembler) AssignNode(v dms3ld.Node) error { +func (na *plainFloat__Assembler) AssignNode(v ld.Node) error { if v2, err := v.AsFloat(); err != nil { return err } else { @@ -139,6 +139,6 @@ func (na *plainFloat__Assembler) AssignNode(v dms3ld.Node) error { return nil } } -func (plainFloat__Assembler) Prototype() dms3ld.NodePrototype { +func (plainFloat__Assembler) Prototype() ld.NodePrototype { return Prototype__Float{} } diff --git a/node/basic/int.go b/node/basic/int.go index 45f8226a15237cbfbbc1f9e3f99e7a940919715f..a298adc30d70c13903804093d2cd537db3464a38 100644 --- a/node/basic/int.go +++ b/node/basic/int.go @@ -1,46 +1,46 @@ package basicnode import ( - dms3ld "gitlab.dms3.io/ld/go-ld-prime" + ld "gitlab.dms3.io/ld/go-ld-prime" "gitlab.dms3.io/ld/go-ld-prime/node/mixins" ) var ( - _ dms3ld.Node = plainInt(0) - _ dms3ld.NodePrototype = Prototype__Int{} - _ dms3ld.NodeBuilder = &plainInt__Builder{} - _ dms3ld.NodeAssembler = &plainInt__Assembler{} + _ ld.Node = plainInt(0) + _ ld.NodePrototype = Prototype__Int{} + _ ld.NodeBuilder = &plainInt__Builder{} + _ ld.NodeAssembler = &plainInt__Assembler{} ) -func NewInt(value int64) dms3ld.Node { +func NewInt(value int64) ld.Node { v := plainInt(value) return &v } -// plainInt is a simple boxed int that complies with dms3ld.Node. +// plainInt is a simple boxed int that complies with ld.Node. type plainInt int64 // -- Node interface methods --> -func (plainInt) Kind() dms3ld.Kind { - return dms3ld.Kind_Int +func (plainInt) Kind() ld.Kind { + return ld.Kind_Int } -func (plainInt) LookupByString(string) (dms3ld.Node, error) { +func (plainInt) LookupByString(string) (ld.Node, error) { return mixins.Int{TypeName: "int"}.LookupByString("") } -func (plainInt) LookupByNode(key dms3ld.Node) (dms3ld.Node, error) { +func (plainInt) LookupByNode(key ld.Node) (ld.Node, error) { return mixins.Int{TypeName: "int"}.LookupByNode(nil) } -func (plainInt) LookupByIndex(idx int64) (dms3ld.Node, error) { +func (plainInt) LookupByIndex(idx int64) (ld.Node, error) { return mixins.Int{TypeName: "int"}.LookupByIndex(0) } -func (plainInt) LookupBySegment(seg dms3ld.PathSegment) (dms3ld.Node, error) { +func (plainInt) LookupBySegment(seg ld.PathSegment) (ld.Node, error) { return mixins.Int{TypeName: "int"}.LookupBySegment(seg) } -func (plainInt) MapIterator() dms3ld.MapIterator { +func (plainInt) MapIterator() ld.MapIterator { return nil } -func (plainInt) ListIterator() dms3ld.ListIterator { +func (plainInt) ListIterator() ld.ListIterator { return nil } func (plainInt) Length() int64 { @@ -67,10 +67,10 @@ func (plainInt) AsString() (string, error) { func (plainInt) AsBytes() ([]byte, error) { return mixins.Int{TypeName: "int"}.AsBytes() } -func (plainInt) AsLink() (dms3ld.Link, error) { +func (plainInt) AsLink() (ld.Link, error) { return mixins.Int{TypeName: "int"}.AsLink() } -func (plainInt) Prototype() dms3ld.NodePrototype { +func (plainInt) Prototype() ld.NodePrototype { return Prototype__Int{} } @@ -78,7 +78,7 @@ func (plainInt) Prototype() dms3ld.NodePrototype { type Prototype__Int struct{} -func (Prototype__Int) NewBuilder() dms3ld.NodeBuilder { +func (Prototype__Int) NewBuilder() ld.NodeBuilder { var w plainInt return &plainInt__Builder{plainInt__Assembler{w: &w}} } @@ -89,7 +89,7 @@ type plainInt__Builder struct { plainInt__Assembler } -func (nb *plainInt__Builder) Build() dms3ld.Node { +func (nb *plainInt__Builder) Build() ld.Node { return nb.w } func (nb *plainInt__Builder) Reset() { @@ -103,10 +103,10 @@ type plainInt__Assembler struct { w *plainInt } -func (plainInt__Assembler) BeginMap(sizeHint int64) (dms3ld.MapAssembler, error) { +func (plainInt__Assembler) BeginMap(sizeHint int64) (ld.MapAssembler, error) { return mixins.IntAssembler{TypeName: "int"}.BeginMap(0) } -func (plainInt__Assembler) BeginList(sizeHint int64) (dms3ld.ListAssembler, error) { +func (plainInt__Assembler) BeginList(sizeHint int64) (ld.ListAssembler, error) { return mixins.IntAssembler{TypeName: "int"}.BeginList(0) } func (plainInt__Assembler) AssignNull() error { @@ -128,10 +128,10 @@ func (plainInt__Assembler) AssignString(string) error { func (plainInt__Assembler) AssignBytes([]byte) error { return mixins.IntAssembler{TypeName: "int"}.AssignBytes(nil) } -func (plainInt__Assembler) AssignLink(dms3ld.Link) error { +func (plainInt__Assembler) AssignLink(ld.Link) error { return mixins.IntAssembler{TypeName: "int"}.AssignLink(nil) } -func (na *plainInt__Assembler) AssignNode(v dms3ld.Node) error { +func (na *plainInt__Assembler) AssignNode(v ld.Node) error { if v2, err := v.AsInt(); err != nil { return err } else { @@ -139,6 +139,6 @@ func (na *plainInt__Assembler) AssignNode(v dms3ld.Node) error { return nil } } -func (plainInt__Assembler) Prototype() dms3ld.NodePrototype { +func (plainInt__Assembler) Prototype() ld.NodePrototype { return Prototype__Int{} } diff --git a/node/basic/link.go b/node/basic/link.go index 2778930babc2d6b0a951bc76fb90d961bb936503..bd8a8e960beaf1ac9bbaa607ca021733ff64ec2a 100644 --- a/node/basic/link.go +++ b/node/basic/link.go @@ -1,47 +1,47 @@ package basicnode import ( - dms3ld "gitlab.dms3.io/ld/go-ld-prime" + ld "gitlab.dms3.io/ld/go-ld-prime" "gitlab.dms3.io/ld/go-ld-prime/node/mixins" ) var ( - _ dms3ld.Node = &plainLink{} - _ dms3ld.NodePrototype = Prototype__Link{} - _ dms3ld.NodeBuilder = &plainLink__Builder{} - _ dms3ld.NodeAssembler = &plainLink__Assembler{} + _ ld.Node = &plainLink{} + _ ld.NodePrototype = Prototype__Link{} + _ ld.NodeBuilder = &plainLink__Builder{} + _ ld.NodeAssembler = &plainLink__Assembler{} ) -func NewLink(value dms3ld.Link) dms3ld.Node { +func NewLink(value ld.Link) ld.Node { return &plainLink{value} } -// plainLink is a simple box around a Link that complies with dms3ld.Node. +// plainLink is a simple box around a Link that complies with ld.Node. type plainLink struct { - x dms3ld.Link + x ld.Link } // -- Node interface methods --> -func (plainLink) Kind() dms3ld.Kind { - return dms3ld.Kind_Link +func (plainLink) Kind() ld.Kind { + return ld.Kind_Link } -func (plainLink) LookupByString(string) (dms3ld.Node, error) { +func (plainLink) LookupByString(string) (ld.Node, error) { return mixins.Link{TypeName: "link"}.LookupByString("") } -func (plainLink) LookupByNode(key dms3ld.Node) (dms3ld.Node, error) { +func (plainLink) LookupByNode(key ld.Node) (ld.Node, error) { return mixins.Link{TypeName: "link"}.LookupByNode(nil) } -func (plainLink) LookupByIndex(idx int64) (dms3ld.Node, error) { +func (plainLink) LookupByIndex(idx int64) (ld.Node, error) { return mixins.Link{TypeName: "link"}.LookupByIndex(0) } -func (plainLink) LookupBySegment(seg dms3ld.PathSegment) (dms3ld.Node, error) { +func (plainLink) LookupBySegment(seg ld.PathSegment) (ld.Node, error) { return mixins.Link{TypeName: "link"}.LookupBySegment(seg) } -func (plainLink) MapIterator() dms3ld.MapIterator { +func (plainLink) MapIterator() ld.MapIterator { return nil } -func (plainLink) ListIterator() dms3ld.ListIterator { +func (plainLink) ListIterator() ld.ListIterator { return nil } func (plainLink) Length() int64 { @@ -68,10 +68,10 @@ func (plainLink) AsString() (string, error) { func (plainLink) AsBytes() ([]byte, error) { return mixins.Link{TypeName: "link"}.AsBytes() } -func (n *plainLink) AsLink() (dms3ld.Link, error) { +func (n *plainLink) AsLink() (ld.Link, error) { return n.x, nil } -func (plainLink) Prototype() dms3ld.NodePrototype { +func (plainLink) Prototype() ld.NodePrototype { return Prototype__Link{} } @@ -79,7 +79,7 @@ func (plainLink) Prototype() dms3ld.NodePrototype { type Prototype__Link struct{} -func (Prototype__Link) NewBuilder() dms3ld.NodeBuilder { +func (Prototype__Link) NewBuilder() ld.NodeBuilder { var w plainLink return &plainLink__Builder{plainLink__Assembler{w: &w}} } @@ -90,7 +90,7 @@ type plainLink__Builder struct { plainLink__Assembler } -func (nb *plainLink__Builder) Build() dms3ld.Node { +func (nb *plainLink__Builder) Build() ld.Node { return nb.w } func (nb *plainLink__Builder) Reset() { @@ -104,10 +104,10 @@ type plainLink__Assembler struct { w *plainLink } -func (plainLink__Assembler) BeginMap(sizeHint int64) (dms3ld.MapAssembler, error) { +func (plainLink__Assembler) BeginMap(sizeHint int64) (ld.MapAssembler, error) { return mixins.LinkAssembler{TypeName: "link"}.BeginMap(0) } -func (plainLink__Assembler) BeginList(sizeHint int64) (dms3ld.ListAssembler, error) { +func (plainLink__Assembler) BeginList(sizeHint int64) (ld.ListAssembler, error) { return mixins.LinkAssembler{TypeName: "link"}.BeginList(0) } func (plainLink__Assembler) AssignNull() error { @@ -128,11 +128,11 @@ func (plainLink__Assembler) AssignString(string) error { func (plainLink__Assembler) AssignBytes([]byte) error { return mixins.LinkAssembler{TypeName: "link"}.AssignBytes(nil) } -func (na *plainLink__Assembler) AssignLink(v dms3ld.Link) error { +func (na *plainLink__Assembler) AssignLink(v ld.Link) error { na.w.x = v return nil } -func (na *plainLink__Assembler) AssignNode(v dms3ld.Node) error { +func (na *plainLink__Assembler) AssignNode(v ld.Node) error { if v2, err := v.AsLink(); err != nil { return err } else { @@ -140,6 +140,6 @@ func (na *plainLink__Assembler) AssignNode(v dms3ld.Node) error { return nil } } -func (plainLink__Assembler) Prototype() dms3ld.NodePrototype { +func (plainLink__Assembler) Prototype() ld.NodePrototype { return Prototype__Link{} } diff --git a/node/basic/list.go b/node/basic/list.go index b6be5b41072288d59b80555c612cda11445437cf..f17bc055eb827c7ba8a764cd975a24e54f7d187c 100644 --- a/node/basic/list.go +++ b/node/basic/list.go @@ -1,52 +1,52 @@ package basicnode import ( - dms3ld "gitlab.dms3.io/ld/go-ld-prime" + ld "gitlab.dms3.io/ld/go-ld-prime" "gitlab.dms3.io/ld/go-ld-prime/node/mixins" ) var ( - _ dms3ld.Node = &plainList{} - _ dms3ld.NodePrototype = Prototype__List{} - _ dms3ld.NodeBuilder = &plainList__Builder{} - _ dms3ld.NodeAssembler = &plainList__Assembler{} + _ ld.Node = &plainList{} + _ ld.NodePrototype = Prototype__List{} + _ ld.NodeBuilder = &plainList__Builder{} + _ ld.NodeAssembler = &plainList__Assembler{} ) -// plainList is a concrete type that provides a list-kind dms3ld.Node. +// plainList is a concrete type that provides a list-kind ld.Node. // It can contain any kind of value. // plainList is also embedded in the 'any' struct and usable from there. type plainList struct { - x []dms3ld.Node + x []ld.Node } // -- Node interface methods --> -func (plainList) Kind() dms3ld.Kind { - return dms3ld.Kind_List +func (plainList) Kind() ld.Kind { + return ld.Kind_List } -func (plainList) LookupByString(string) (dms3ld.Node, error) { +func (plainList) LookupByString(string) (ld.Node, error) { return mixins.List{TypeName: "list"}.LookupByString("") } -func (plainList) LookupByNode(dms3ld.Node) (dms3ld.Node, error) { +func (plainList) LookupByNode(ld.Node) (ld.Node, error) { return mixins.List{TypeName: "list"}.LookupByNode(nil) } -func (n *plainList) LookupByIndex(idx int64) (dms3ld.Node, error) { +func (n *plainList) LookupByIndex(idx int64) (ld.Node, error) { if n.Length() <= idx { - return nil, dms3ld.ErrNotExists{Segment: dms3ld.PathSegmentOfInt(idx)} + return nil, ld.ErrNotExists{Segment: ld.PathSegmentOfInt(idx)} } return n.x[idx], nil } -func (n *plainList) LookupBySegment(seg dms3ld.PathSegment) (dms3ld.Node, error) { +func (n *plainList) LookupBySegment(seg ld.PathSegment) (ld.Node, error) { idx, err := seg.Index() if err != nil { - return nil, dms3ld.ErrInvalidSegmentForList{TroubleSegment: seg, Reason: err} + return nil, ld.ErrInvalidSegmentForList{TroubleSegment: seg, Reason: err} } return n.LookupByIndex(idx) } -func (plainList) MapIterator() dms3ld.MapIterator { +func (plainList) MapIterator() ld.MapIterator { return nil } -func (n *plainList) ListIterator() dms3ld.ListIterator { +func (n *plainList) ListIterator() ld.ListIterator { return &plainList_ListIterator{n, 0} } func (n *plainList) Length() int64 { @@ -73,10 +73,10 @@ func (plainList) AsString() (string, error) { func (plainList) AsBytes() ([]byte, error) { return mixins.List{TypeName: "list"}.AsBytes() } -func (plainList) AsLink() (dms3ld.Link, error) { +func (plainList) AsLink() (ld.Link, error) { return mixins.List{TypeName: "list"}.AsLink() } -func (plainList) Prototype() dms3ld.NodePrototype { +func (plainList) Prototype() ld.NodePrototype { return Prototype__List{} } @@ -85,9 +85,9 @@ type plainList_ListIterator struct { idx int } -func (itr *plainList_ListIterator) Next() (idx int64, v dms3ld.Node, _ error) { +func (itr *plainList_ListIterator) Next() (idx int64, v ld.Node, _ error) { if itr.Done() { - return -1, nil, dms3ld.ErrIteratorOverread{} + return -1, nil, ld.ErrIteratorOverread{} } v = itr.n.x[itr.idx] idx = int64(itr.idx) @@ -102,7 +102,7 @@ func (itr *plainList_ListIterator) Done() bool { type Prototype__List struct{} -func (Prototype__List) NewBuilder() dms3ld.NodeBuilder { +func (Prototype__List) NewBuilder() ld.NodeBuilder { return &plainList__Builder{plainList__Assembler{w: &plainList{}}} } @@ -112,7 +112,7 @@ type plainList__Builder struct { plainList__Assembler } -func (nb *plainList__Builder) Build() dms3ld.Node { +func (nb *plainList__Builder) Build() ld.Node { if nb.state != laState_finished { panic("invalid state: assembler must be 'finished' before Build can be called!") } @@ -147,15 +147,15 @@ const ( laState_finished // 'w' will also be nil, but this is a politer statement ) -func (plainList__Assembler) BeginMap(sizeHint int64) (dms3ld.MapAssembler, error) { +func (plainList__Assembler) BeginMap(sizeHint int64) (ld.MapAssembler, error) { return mixins.ListAssembler{TypeName: "list"}.BeginMap(0) } -func (na *plainList__Assembler) BeginList(sizeHint int64) (dms3ld.ListAssembler, error) { +func (na *plainList__Assembler) BeginList(sizeHint int64) (ld.ListAssembler, error) { if sizeHint < 0 { sizeHint = 0 } // Allocate storage space. - na.w.x = make([]dms3ld.Node, 0, sizeHint) + na.w.x = make([]ld.Node, 0, sizeHint) // That's it; return self as the ListAssembler. We already have all the right methods on this structure. return na, nil } @@ -177,10 +177,10 @@ func (plainList__Assembler) AssignString(string) error { func (plainList__Assembler) AssignBytes([]byte) error { return mixins.ListAssembler{TypeName: "list"}.AssignBytes(nil) } -func (plainList__Assembler) AssignLink(dms3ld.Link) error { +func (plainList__Assembler) AssignLink(ld.Link) error { return mixins.ListAssembler{TypeName: "list"}.AssignLink(nil) } -func (na *plainList__Assembler) AssignNode(v dms3ld.Node) error { +func (na *plainList__Assembler) AssignNode(v ld.Node) error { // Sanity check, then update, assembler state. // Update of state to 'finished' comes later; where exactly depends on if shortcuts apply. if na.state != laState_initial { @@ -198,8 +198,8 @@ func (na *plainList__Assembler) AssignNode(v dms3ld.Node) error { } // If the above shortcut didn't work, resort to a generic copy. // We call AssignNode for all the child values, giving them a chance to hit shortcuts even if we didn't. - if v.Kind() != dms3ld.Kind_List { - return dms3ld.ErrWrongKind{TypeName: "list", MethodName: "AssignNode", AppropriateKind: dms3ld.KindSet_JustList, ActualKind: v.Kind()} + if v.Kind() != ld.Kind_List { + return ld.ErrWrongKind{TypeName: "list", MethodName: "AssignNode", AppropriateKind: ld.KindSet_JustList, ActualKind: v.Kind()} } itr := v.ListIterator() for !itr.Done() { @@ -213,7 +213,7 @@ func (na *plainList__Assembler) AssignNode(v dms3ld.Node) error { } return na.Finish() } -func (plainList__Assembler) Prototype() dms3ld.NodePrototype { +func (plainList__Assembler) Prototype() ld.NodePrototype { return Prototype__List{} } @@ -221,7 +221,7 @@ func (plainList__Assembler) Prototype() dms3ld.NodePrototype { // AssembleValue is part of conforming to ListAssembler, which we do on // plainList__Assembler so that BeginList can just return a retyped pointer rather than new object. -func (la *plainList__Assembler) AssembleValue() dms3ld.NodeAssembler { +func (la *plainList__Assembler) AssembleValue() ld.NodeAssembler { // Sanity check, then update, assembler state. if la.state != laState_initial { panic("misuse") @@ -243,20 +243,20 @@ func (la *plainList__Assembler) Finish() error { // validators could run and report errors promptly, if this type had any. return nil } -func (plainList__Assembler) ValuePrototype(_ int64) dms3ld.NodePrototype { +func (plainList__Assembler) ValuePrototype(_ int64) ld.NodePrototype { return Prototype__Any{} } // -- ListAssembler.ValueAssembler --> -func (lva *plainList__ValueAssembler) BeginMap(sizeHint int64) (dms3ld.MapAssembler, error) { +func (lva *plainList__ValueAssembler) BeginMap(sizeHint int64) (ld.MapAssembler, error) { ma := plainList__ValueAssemblerMap{} ma.ca.w = &plainMap{} ma.p = lva.la _, err := ma.ca.BeginMap(sizeHint) return &ma, err } -func (lva *plainList__ValueAssembler) BeginList(sizeHint int64) (dms3ld.ListAssembler, error) { +func (lva *plainList__ValueAssembler) BeginList(sizeHint int64) (ld.ListAssembler, error) { la := plainList__ValueAssemblerList{} la.ca.w = &plainList{} la.p = lva.la @@ -264,7 +264,7 @@ func (lva *plainList__ValueAssembler) BeginList(sizeHint int64) (dms3ld.ListAsse return &la, err } func (lva *plainList__ValueAssembler) AssignNull() error { - return lva.AssignNode(dms3ld.Null) + return lva.AssignNode(ld.Null) } func (lva *plainList__ValueAssembler) AssignBool(v bool) error { vb := plainBool(v) @@ -286,17 +286,17 @@ func (lva *plainList__ValueAssembler) AssignBytes(v []byte) error { vb := plainBytes(v) return lva.AssignNode(&vb) } -func (lva *plainList__ValueAssembler) AssignLink(v dms3ld.Link) error { +func (lva *plainList__ValueAssembler) AssignLink(v ld.Link) error { vb := plainLink{v} return lva.AssignNode(&vb) } -func (lva *plainList__ValueAssembler) AssignNode(v dms3ld.Node) error { +func (lva *plainList__ValueAssembler) AssignNode(v ld.Node) error { lva.la.w.x = append(lva.la.w.x, v) lva.la.state = laState_initial lva.la = nil // invalidate self to prevent further incorrect use. return nil } -func (plainList__ValueAssembler) Prototype() dms3ld.NodePrototype { +func (plainList__ValueAssembler) Prototype() ld.NodePrototype { return Prototype__Any{} } @@ -309,19 +309,19 @@ type plainList__ValueAssemblerMap struct { // just embedding plainMap__Assembler also behaves correctly, // but causes a lot of unnecessary autogenerated functions in the final binary. -func (ma *plainList__ValueAssemblerMap) AssembleEntry(k string) (dms3ld.NodeAssembler, error) { +func (ma *plainList__ValueAssemblerMap) AssembleEntry(k string) (ld.NodeAssembler, error) { return ma.ca.AssembleEntry(k) } -func (ma *plainList__ValueAssemblerMap) AssembleKey() dms3ld.NodeAssembler { +func (ma *plainList__ValueAssemblerMap) AssembleKey() ld.NodeAssembler { return ma.ca.AssembleKey() } -func (ma *plainList__ValueAssemblerMap) AssembleValue() dms3ld.NodeAssembler { +func (ma *plainList__ValueAssemblerMap) AssembleValue() ld.NodeAssembler { return ma.ca.AssembleValue() } -func (plainList__ValueAssemblerMap) KeyPrototype() dms3ld.NodePrototype { +func (plainList__ValueAssemblerMap) KeyPrototype() ld.NodePrototype { return Prototype__String{} } -func (plainList__ValueAssemblerMap) ValuePrototype(_ string) dms3ld.NodePrototype { +func (plainList__ValueAssemblerMap) ValuePrototype(_ string) ld.NodePrototype { return Prototype__Any{} } @@ -343,10 +343,10 @@ type plainList__ValueAssemblerList struct { // just embedding plainList__Assembler also behaves correctly, // but causes a lot of unnecessary autogenerated functions in the final binary. -func (la *plainList__ValueAssemblerList) AssembleValue() dms3ld.NodeAssembler { +func (la *plainList__ValueAssemblerList) AssembleValue() ld.NodeAssembler { return la.ca.AssembleValue() } -func (plainList__ValueAssemblerList) ValuePrototype(_ int64) dms3ld.NodePrototype { +func (plainList__ValueAssemblerList) ValuePrototype(_ int64) ld.NodePrototype { return Prototype__Any{} } diff --git a/node/basic/map.go b/node/basic/map.go index ac92197188ce9cb20a9604e9cd15be11daea98d8..a2889615e2950651039005e696ac16f0229db9a7 100644 --- a/node/basic/map.go +++ b/node/basic/map.go @@ -3,60 +3,60 @@ package basicnode import ( "fmt" - dms3ld "gitlab.dms3.io/ld/go-ld-prime" + ld "gitlab.dms3.io/ld/go-ld-prime" "gitlab.dms3.io/ld/go-ld-prime/node/mixins" ) var ( - _ dms3ld.Node = &plainMap{} - _ dms3ld.NodePrototype = Prototype__Map{} - _ dms3ld.NodeBuilder = &plainMap__Builder{} - _ dms3ld.NodeAssembler = &plainMap__Assembler{} + _ ld.Node = &plainMap{} + _ ld.NodePrototype = Prototype__Map{} + _ ld.NodeBuilder = &plainMap__Builder{} + _ ld.NodeAssembler = &plainMap__Assembler{} ) -// plainMap is a concrete type that provides a map-kind dms3ld.Node. +// plainMap is a concrete type that provides a map-kind ld.Node. // It can contain any kind of value. // plainMap is also embedded in the 'any' struct and usable from there. type plainMap struct { - m map[string]dms3ld.Node // string key -- even if a runtime schema wrapper is using us for storage, we must have a comparable type here, and string is all we know. - t []plainMap__Entry // table for fast iteration, order keeping, and yielding pointers to enable alloc/conv amortization. + m map[string]ld.Node // string key -- even if a runtime schema wrapper is using us for storage, we must have a comparable type here, and string is all we know. + t []plainMap__Entry // table for fast iteration, order keeping, and yielding pointers to enable alloc/conv amortization. } type plainMap__Entry struct { k plainString // address of this used when we return keys as nodes, such as in iterators. Need in one place to amortize shifts to heap when ptr'ing for iface. - v dms3ld.Node // identical to map values. keeping them here simplifies iteration. (in codegen'd maps, this position is also part of amortization, but in this implementation, that's less useful.) + v ld.Node // identical to map values. keeping them here simplifies iteration. (in codegen'd maps, this position is also part of amortization, but in this implementation, that's less useful.) // note on alternate implementations: 'v' could also use the 'any' type, and thus amortize value allocations. the memory size trade would be large however, so we don't, here. } // -- Node interface methods --> -func (plainMap) Kind() dms3ld.Kind { - return dms3ld.Kind_Map +func (plainMap) Kind() ld.Kind { + return ld.Kind_Map } -func (n *plainMap) LookupByString(key string) (dms3ld.Node, error) { +func (n *plainMap) LookupByString(key string) (ld.Node, error) { v, exists := n.m[key] if !exists { - return nil, dms3ld.ErrNotExists{Segment: dms3ld.PathSegmentOfString(key)} + return nil, ld.ErrNotExists{Segment: ld.PathSegmentOfString(key)} } return v, nil } -func (n *plainMap) LookupByNode(key dms3ld.Node) (dms3ld.Node, error) { +func (n *plainMap) LookupByNode(key ld.Node) (ld.Node, error) { ks, err := key.AsString() if err != nil { return nil, err } return n.LookupByString(ks) } -func (plainMap) LookupByIndex(idx int64) (dms3ld.Node, error) { +func (plainMap) LookupByIndex(idx int64) (ld.Node, error) { return mixins.Map{TypeName: "map"}.LookupByIndex(0) } -func (n *plainMap) LookupBySegment(seg dms3ld.PathSegment) (dms3ld.Node, error) { +func (n *plainMap) LookupBySegment(seg ld.PathSegment) (ld.Node, error) { return n.LookupByString(seg.String()) } -func (n *plainMap) MapIterator() dms3ld.MapIterator { +func (n *plainMap) MapIterator() ld.MapIterator { return &plainMap_MapIterator{n, 0} } -func (plainMap) ListIterator() dms3ld.ListIterator { +func (plainMap) ListIterator() ld.ListIterator { return nil } func (n *plainMap) Length() int64 { @@ -83,10 +83,10 @@ func (plainMap) AsString() (string, error) { func (plainMap) AsBytes() ([]byte, error) { return mixins.Map{TypeName: "map"}.AsBytes() } -func (plainMap) AsLink() (dms3ld.Link, error) { +func (plainMap) AsLink() (ld.Link, error) { return mixins.Map{TypeName: "map"}.AsLink() } -func (plainMap) Prototype() dms3ld.NodePrototype { +func (plainMap) Prototype() ld.NodePrototype { return Prototype__Map{} } @@ -95,9 +95,9 @@ type plainMap_MapIterator struct { idx int } -func (itr *plainMap_MapIterator) Next() (k dms3ld.Node, v dms3ld.Node, _ error) { +func (itr *plainMap_MapIterator) Next() (k ld.Node, v ld.Node, _ error) { if itr.Done() { - return nil, nil, dms3ld.ErrIteratorOverread{} + return nil, nil, ld.ErrIteratorOverread{} } k = &itr.n.t[itr.idx].k v = itr.n.t[itr.idx].v @@ -112,7 +112,7 @@ func (itr *plainMap_MapIterator) Done() bool { type Prototype__Map struct{} -func (Prototype__Map) NewBuilder() dms3ld.NodeBuilder { +func (Prototype__Map) NewBuilder() ld.NodeBuilder { return &plainMap__Builder{plainMap__Assembler{w: &plainMap{}}} } @@ -122,7 +122,7 @@ type plainMap__Builder struct { plainMap__Assembler } -func (nb *plainMap__Builder) Build() dms3ld.Node { +func (nb *plainMap__Builder) Build() ld.Node { if nb.state != maState_finished { panic("invalid state: assembler must be 'finished' before Build can be called!") } @@ -162,17 +162,17 @@ const ( maState_finished // 'w' will also be nil, but this is a politer statement ) -func (na *plainMap__Assembler) BeginMap(sizeHint int64) (dms3ld.MapAssembler, error) { +func (na *plainMap__Assembler) BeginMap(sizeHint int64) (ld.MapAssembler, error) { if sizeHint < 0 { sizeHint = 0 } // Allocate storage space. na.w.t = make([]plainMap__Entry, 0, sizeHint) - na.w.m = make(map[string]dms3ld.Node, sizeHint) + na.w.m = make(map[string]ld.Node, sizeHint) // That's it; return self as the MapAssembler. We already have all the right methods on this structure. return na, nil } -func (plainMap__Assembler) BeginList(sizeHint int64) (dms3ld.ListAssembler, error) { +func (plainMap__Assembler) BeginList(sizeHint int64) (ld.ListAssembler, error) { return mixins.MapAssembler{TypeName: "map"}.BeginList(0) } func (plainMap__Assembler) AssignNull() error { @@ -193,10 +193,10 @@ func (plainMap__Assembler) AssignString(string) error { func (plainMap__Assembler) AssignBytes([]byte) error { return mixins.MapAssembler{TypeName: "map"}.AssignBytes(nil) } -func (plainMap__Assembler) AssignLink(dms3ld.Link) error { +func (plainMap__Assembler) AssignLink(ld.Link) error { return mixins.MapAssembler{TypeName: "map"}.AssignLink(nil) } -func (na *plainMap__Assembler) AssignNode(v dms3ld.Node) error { +func (na *plainMap__Assembler) AssignNode(v ld.Node) error { // Sanity check assembler state. // Update of state to 'finished' comes later; where exactly depends on if shortcuts apply. if na.state != maState_initial { @@ -214,8 +214,8 @@ func (na *plainMap__Assembler) AssignNode(v dms3ld.Node) error { } // If the above shortcut didn't work, resort to a generic copy. // We call AssignNode for all the child values, giving them a chance to hit shortcuts even if we didn't. - if v.Kind() != dms3ld.Kind_Map { - return dms3ld.ErrWrongKind{TypeName: "map", MethodName: "AssignNode", AppropriateKind: dms3ld.KindSet_JustMap, ActualKind: v.Kind()} + if v.Kind() != ld.Kind_Map { + return ld.ErrWrongKind{TypeName: "map", MethodName: "AssignNode", AppropriateKind: ld.KindSet_JustMap, ActualKind: v.Kind()} } itr := v.MapIterator() for !itr.Done() { @@ -232,7 +232,7 @@ func (na *plainMap__Assembler) AssignNode(v dms3ld.Node) error { } return na.Finish() } -func (plainMap__Assembler) Prototype() dms3ld.NodePrototype { +func (plainMap__Assembler) Prototype() ld.NodePrototype { return Prototype__Map{} } @@ -240,7 +240,7 @@ func (plainMap__Assembler) Prototype() dms3ld.NodePrototype { // AssembleEntry is part of conforming to MapAssembler, which we do on // plainMap__Assembler so that BeginMap can just return a retyped pointer rather than new object. -func (ma *plainMap__Assembler) AssembleEntry(k string) (dms3ld.NodeAssembler, error) { +func (ma *plainMap__Assembler) AssembleEntry(k string) (ld.NodeAssembler, error) { // Sanity check assembler state. // Update of state comes after possible key rejection. if ma.state != maState_initial { @@ -249,7 +249,7 @@ func (ma *plainMap__Assembler) AssembleEntry(k string) (dms3ld.NodeAssembler, er // Check for dup keys; error if so. _, exists := ma.w.m[k] if exists { - return nil, dms3ld.ErrRepeatedMapKey{Key: plainString(k)} + return nil, ld.ErrRepeatedMapKey{Key: plainString(k)} } ma.state = maState_midValue ma.w.t = append(ma.w.t, plainMap__Entry{k: plainString(k)}) @@ -260,7 +260,7 @@ func (ma *plainMap__Assembler) AssembleEntry(k string) (dms3ld.NodeAssembler, er // AssembleKey is part of conforming to MapAssembler, which we do on // plainMap__Assembler so that BeginMap can just return a retyped pointer rather than new object. -func (ma *plainMap__Assembler) AssembleKey() dms3ld.NodeAssembler { +func (ma *plainMap__Assembler) AssembleKey() ld.NodeAssembler { // Sanity check, then update, assembler state. if ma.state != maState_initial { panic("misuse") @@ -273,7 +273,7 @@ func (ma *plainMap__Assembler) AssembleKey() dms3ld.NodeAssembler { // AssembleValue is part of conforming to MapAssembler, which we do on // plainMap__Assembler so that BeginMap can just return a retyped pointer rather than new object. -func (ma *plainMap__Assembler) AssembleValue() dms3ld.NodeAssembler { +func (ma *plainMap__Assembler) AssembleValue() ld.NodeAssembler { // Sanity check, then update, assembler state. if ma.state != maState_expectValue { panic("misuse") @@ -295,19 +295,19 @@ func (ma *plainMap__Assembler) Finish() error { // validators could run and report errors promptly, if this type had any. return nil } -func (plainMap__Assembler) KeyPrototype() dms3ld.NodePrototype { +func (plainMap__Assembler) KeyPrototype() ld.NodePrototype { return Prototype__String{} } -func (plainMap__Assembler) ValuePrototype(_ string) dms3ld.NodePrototype { +func (plainMap__Assembler) ValuePrototype(_ string) ld.NodePrototype { return Prototype__Any{} } // -- MapAssembler.KeyAssembler --> -func (plainMap__KeyAssembler) BeginMap(sizeHint int64) (dms3ld.MapAssembler, error) { +func (plainMap__KeyAssembler) BeginMap(sizeHint int64) (ld.MapAssembler, error) { return mixins.StringAssembler{TypeName: "string"}.BeginMap(0) } -func (plainMap__KeyAssembler) BeginList(sizeHint int64) (dms3ld.ListAssembler, error) { +func (plainMap__KeyAssembler) BeginList(sizeHint int64) (ld.ListAssembler, error) { return mixins.StringAssembler{TypeName: "string"}.BeginList(0) } func (plainMap__KeyAssembler) AssignNull() error { @@ -329,7 +329,7 @@ func (mka *plainMap__KeyAssembler) AssignString(v string) error { if exists { mka.ma.state = maState_initial mka.ma = nil // invalidate self to prevent further incorrect use. - return dms3ld.ErrRepeatedMapKey{Key: plainString(v)} + return ld.ErrRepeatedMapKey{Key: plainString(v)} } // Assign the key into the end of the entry table; // we'll be doing map insertions after we get the value in hand. @@ -345,30 +345,30 @@ func (mka *plainMap__KeyAssembler) AssignString(v string) error { func (plainMap__KeyAssembler) AssignBytes([]byte) error { return mixins.StringAssembler{TypeName: "string"}.AssignBytes(nil) } -func (plainMap__KeyAssembler) AssignLink(dms3ld.Link) error { +func (plainMap__KeyAssembler) AssignLink(ld.Link) error { return mixins.StringAssembler{TypeName: "string"}.AssignLink(nil) } -func (mka *plainMap__KeyAssembler) AssignNode(v dms3ld.Node) error { +func (mka *plainMap__KeyAssembler) AssignNode(v ld.Node) error { vs, err := v.AsString() if err != nil { return fmt.Errorf("cannot assign non-string node into map key assembler") // FIXME:errors: this doesn't quite fit in ErrWrongKind cleanly; new error type? } return mka.AssignString(vs) } -func (plainMap__KeyAssembler) Prototype() dms3ld.NodePrototype { +func (plainMap__KeyAssembler) Prototype() ld.NodePrototype { return Prototype__String{} } // -- MapAssembler.ValueAssembler --> -func (mva *plainMap__ValueAssembler) BeginMap(sizeHint int64) (dms3ld.MapAssembler, error) { +func (mva *plainMap__ValueAssembler) BeginMap(sizeHint int64) (ld.MapAssembler, error) { ma := plainMap__ValueAssemblerMap{} ma.ca.w = &plainMap{} ma.p = mva.ma _, err := ma.ca.BeginMap(sizeHint) return &ma, err } -func (mva *plainMap__ValueAssembler) BeginList(sizeHint int64) (dms3ld.ListAssembler, error) { +func (mva *plainMap__ValueAssembler) BeginList(sizeHint int64) (ld.ListAssembler, error) { la := plainMap__ValueAssemblerList{} la.ca.w = &plainList{} la.p = mva.ma @@ -376,7 +376,7 @@ func (mva *plainMap__ValueAssembler) BeginList(sizeHint int64) (dms3ld.ListAssem return &la, err } func (mva *plainMap__ValueAssembler) AssignNull() error { - return mva.AssignNode(dms3ld.Null) + return mva.AssignNode(ld.Null) } func (mva *plainMap__ValueAssembler) AssignBool(v bool) error { vb := plainBool(v) @@ -398,11 +398,11 @@ func (mva *plainMap__ValueAssembler) AssignBytes(v []byte) error { vb := plainBytes(v) return mva.AssignNode(&vb) } -func (mva *plainMap__ValueAssembler) AssignLink(v dms3ld.Link) error { +func (mva *plainMap__ValueAssembler) AssignLink(v ld.Link) error { vb := plainLink{v} return mva.AssignNode(&vb) } -func (mva *plainMap__ValueAssembler) AssignNode(v dms3ld.Node) error { +func (mva *plainMap__ValueAssembler) AssignNode(v ld.Node) error { l := len(mva.ma.w.t) - 1 mva.ma.w.t[l].v = v mva.ma.w.m[string(mva.ma.w.t[l].k)] = v @@ -410,7 +410,7 @@ func (mva *plainMap__ValueAssembler) AssignNode(v dms3ld.Node) error { mva.ma = nil // invalidate self to prevent further incorrect use. return nil } -func (plainMap__ValueAssembler) Prototype() dms3ld.NodePrototype { +func (plainMap__ValueAssembler) Prototype() ld.NodePrototype { return Prototype__Any{} } @@ -423,19 +423,19 @@ type plainMap__ValueAssemblerMap struct { // just embedding plainMap__Assembler also behaves correctly, // but causes a lot of unnecessary autogenerated functions in the final binary. -func (ma *plainMap__ValueAssemblerMap) AssembleEntry(k string) (dms3ld.NodeAssembler, error) { +func (ma *plainMap__ValueAssemblerMap) AssembleEntry(k string) (ld.NodeAssembler, error) { return ma.ca.AssembleEntry(k) } -func (ma *plainMap__ValueAssemblerMap) AssembleKey() dms3ld.NodeAssembler { +func (ma *plainMap__ValueAssemblerMap) AssembleKey() ld.NodeAssembler { return ma.ca.AssembleKey() } -func (ma *plainMap__ValueAssemblerMap) AssembleValue() dms3ld.NodeAssembler { +func (ma *plainMap__ValueAssemblerMap) AssembleValue() ld.NodeAssembler { return ma.ca.AssembleValue() } -func (plainMap__ValueAssemblerMap) KeyPrototype() dms3ld.NodePrototype { +func (plainMap__ValueAssemblerMap) KeyPrototype() ld.NodePrototype { return Prototype__String{} } -func (plainMap__ValueAssemblerMap) ValuePrototype(_ string) dms3ld.NodePrototype { +func (plainMap__ValueAssemblerMap) ValuePrototype(_ string) ld.NodePrototype { return Prototype__Any{} } @@ -457,10 +457,10 @@ type plainMap__ValueAssemblerList struct { // just embedding plainList__Assembler also behaves correctly, // but causes a lot of unnecessary autogenerated functions in the final binary. -func (la *plainMap__ValueAssemblerList) AssembleValue() dms3ld.NodeAssembler { +func (la *plainMap__ValueAssemblerList) AssembleValue() ld.NodeAssembler { return la.ca.AssembleValue() } -func (plainMap__ValueAssemblerList) ValuePrototype(_ int64) dms3ld.NodePrototype { +func (plainMap__ValueAssemblerList) ValuePrototype(_ int64) ld.NodePrototype { return Prototype__Any{} } diff --git a/node/basic/string.go b/node/basic/string.go index 181db78a6c7ccb277a11473155799e5ccdbabe99..0da316f7908daa51b7a0045f826f9c96c643ac52 100644 --- a/node/basic/string.go +++ b/node/basic/string.go @@ -1,23 +1,23 @@ package basicnode import ( - dms3ld "gitlab.dms3.io/ld/go-ld-prime" + ld "gitlab.dms3.io/ld/go-ld-prime" "gitlab.dms3.io/ld/go-ld-prime/node/mixins" ) var ( - _ dms3ld.Node = plainString("") - _ dms3ld.NodePrototype = Prototype__String{} - _ dms3ld.NodeBuilder = &plainString__Builder{} - _ dms3ld.NodeAssembler = &plainString__Assembler{} + _ ld.Node = plainString("") + _ ld.NodePrototype = Prototype__String{} + _ ld.NodeBuilder = &plainString__Builder{} + _ ld.NodeAssembler = &plainString__Assembler{} ) -func NewString(value string) dms3ld.Node { +func NewString(value string) ld.Node { v := plainString(value) return &v } -// plainString is a simple boxed string that complies with dms3ld.Node. +// plainString is a simple boxed string that complies with ld.Node. // It's useful for many things, such as boxing map keys. // // The implementation is a simple typedef of a string; @@ -27,25 +27,25 @@ type plainString string // -- Node interface methods --> -func (plainString) Kind() dms3ld.Kind { - return dms3ld.Kind_String +func (plainString) Kind() ld.Kind { + return ld.Kind_String } -func (plainString) LookupByString(string) (dms3ld.Node, error) { +func (plainString) LookupByString(string) (ld.Node, error) { return mixins.String{TypeName: "string"}.LookupByString("") } -func (plainString) LookupByNode(key dms3ld.Node) (dms3ld.Node, error) { +func (plainString) LookupByNode(key ld.Node) (ld.Node, error) { return mixins.String{TypeName: "string"}.LookupByNode(nil) } -func (plainString) LookupByIndex(idx int64) (dms3ld.Node, error) { +func (plainString) LookupByIndex(idx int64) (ld.Node, error) { return mixins.String{TypeName: "string"}.LookupByIndex(0) } -func (plainString) LookupBySegment(seg dms3ld.PathSegment) (dms3ld.Node, error) { +func (plainString) LookupBySegment(seg ld.PathSegment) (ld.Node, error) { return mixins.String{TypeName: "string"}.LookupBySegment(seg) } -func (plainString) MapIterator() dms3ld.MapIterator { +func (plainString) MapIterator() ld.MapIterator { return nil } -func (plainString) ListIterator() dms3ld.ListIterator { +func (plainString) ListIterator() ld.ListIterator { return nil } func (plainString) Length() int64 { @@ -72,10 +72,10 @@ func (x plainString) AsString() (string, error) { func (plainString) AsBytes() ([]byte, error) { return mixins.String{TypeName: "string"}.AsBytes() } -func (plainString) AsLink() (dms3ld.Link, error) { +func (plainString) AsLink() (ld.Link, error) { return mixins.String{TypeName: "string"}.AsLink() } -func (plainString) Prototype() dms3ld.NodePrototype { +func (plainString) Prototype() ld.NodePrototype { return Prototype__String{} } @@ -83,7 +83,7 @@ func (plainString) Prototype() dms3ld.NodePrototype { type Prototype__String struct{} -func (Prototype__String) NewBuilder() dms3ld.NodeBuilder { +func (Prototype__String) NewBuilder() ld.NodeBuilder { var w plainString return &plainString__Builder{plainString__Assembler{w: &w}} } @@ -94,7 +94,7 @@ type plainString__Builder struct { plainString__Assembler } -func (nb *plainString__Builder) Build() dms3ld.Node { +func (nb *plainString__Builder) Build() ld.Node { return nb.w } func (nb *plainString__Builder) Reset() { @@ -108,10 +108,10 @@ type plainString__Assembler struct { w *plainString } -func (plainString__Assembler) BeginMap(sizeHint int64) (dms3ld.MapAssembler, error) { +func (plainString__Assembler) BeginMap(sizeHint int64) (ld.MapAssembler, error) { return mixins.StringAssembler{TypeName: "string"}.BeginMap(0) } -func (plainString__Assembler) BeginList(sizeHint int64) (dms3ld.ListAssembler, error) { +func (plainString__Assembler) BeginList(sizeHint int64) (ld.ListAssembler, error) { return mixins.StringAssembler{TypeName: "string"}.BeginList(0) } func (plainString__Assembler) AssignNull() error { @@ -133,10 +133,10 @@ func (na *plainString__Assembler) AssignString(v string) error { func (plainString__Assembler) AssignBytes([]byte) error { return mixins.StringAssembler{TypeName: "string"}.AssignBytes(nil) } -func (plainString__Assembler) AssignLink(dms3ld.Link) error { +func (plainString__Assembler) AssignLink(ld.Link) error { return mixins.StringAssembler{TypeName: "string"}.AssignLink(nil) } -func (na *plainString__Assembler) AssignNode(v dms3ld.Node) error { +func (na *plainString__Assembler) AssignNode(v ld.Node) error { if v2, err := v.AsString(); err != nil { return err } else { @@ -144,6 +144,6 @@ func (na *plainString__Assembler) AssignNode(v dms3ld.Node) error { return nil } } -func (plainString__Assembler) Prototype() dms3ld.NodePrototype { +func (plainString__Assembler) Prototype() ld.NodePrototype { return Prototype__String{} } diff --git a/node/bindnode/api.go b/node/bindnode/api.go index 5404258cdd8c59da36ff81e05c0b31c5225967b8..47fda8407d4002d0d662edec0db5556ed5dca5b5 100644 --- a/node/bindnode/api.go +++ b/node/bindnode/api.go @@ -1,15 +1,15 @@ -// Package bindnode provides an dms3ld.Node implementation via Go reflection. +// Package bindnode provides an ld.Node implementation via Go reflection. package bindnode import ( "reflect" - dms3ld "gitlab.dms3.io/ld/go-ld-prime" + ld "gitlab.dms3.io/ld/go-ld-prime" "gitlab.dms3.io/ld/go-ld-prime/schema" ) // Prototype implements a schema.TypedPrototype given a Go pointer type and an -// DMS3LD schema type. Note that the result is also an dms3ld.NodePrototype. +// DMS3LD schema type. Note that the result is also an ld.NodePrototype. // // If both the Go type and schema type are supplied, it is assumed that they are // compatible with one another. @@ -49,7 +49,7 @@ func Prototype(ptrType interface{}, schemaType schema.Type) schema.TypedPrototyp } // Wrap implements a schema.TypedNode given a non-nil pointer to a Go value and an -// DMS3LD schema type. Note that the result is also an dms3ld.Node. +// DMS3LD schema type. Note that the result is also an ld.Node. // // Wrap is meant to be used when one already has a Go value with data. // As such, ptrVal must not be nil. @@ -74,11 +74,11 @@ func Wrap(ptrVal interface{}, schemaType schema.Type) schema.TypedNode { return &_node{val: goVal, schemaType: schemaType} } -// Unwrap takes an dms3ld.Node implemented by Prototype or Wrap, +// Unwrap takes an ld.Node implemented by Prototype or Wrap, // and returns a pointer to the inner Go value. // // Unwrap returns nil if the node isn't implemented by this package. -func Unwrap(node dms3ld.Node) (ptr interface{}) { +func Unwrap(node ld.Node) (ptr interface{}) { var val reflect.Value switch node := node.(type) { case *_node: diff --git a/node/bindnode/example_test.go b/node/bindnode/example_test.go index c1c78cdd38a201cef2fc8bf3d3cc9d8706a278c8..4818e9d2f53796eed47b9df8a5b6e0ed5de19e69 100644 --- a/node/bindnode/example_test.go +++ b/node/bindnode/example_test.go @@ -3,7 +3,7 @@ package bindnode_test import ( "os" - dms3ld "gitlab.dms3.io/ld/go-ld-prime" + ld "gitlab.dms3.io/ld/go-ld-prime" "gitlab.dms3.io/ld/go-ld-prime/codec/dagjson" "gitlab.dms3.io/ld/go-ld-prime/fluent/qp" "gitlab.dms3.io/ld/go-ld-prime/node/bindnode" @@ -63,9 +63,9 @@ func ExamplePrototype_onlySchema() { schemaType := ts.TypeByName("Person") proto := bindnode.Prototype(nil, schemaType) - node, err := qp.BuildMap(proto, -1, func(ma dms3ld.MapAssembler) { + node, err := qp.BuildMap(proto, -1, func(ma ld.MapAssembler) { qp.MapEntry(ma, "Name", qp.String("Michael")) - qp.MapEntry(ma, "Friends", qp.List(-1, func(la dms3ld.ListAssembler) { + qp.MapEntry(ma, "Friends", qp.List(-1, func(la ld.ListAssembler) { qp.ListEntry(la, qp.String("Sarah")) qp.ListEntry(la, qp.String("Alex")) })) diff --git a/node/bindnode/node.go b/node/bindnode/node.go index 4c5173f704645a7378e81ff023b78c721ef2ae2f..0373eaecf2c49e6e4b1a7e6f021050e0761227a4 100644 --- a/node/bindnode/node.go +++ b/node/bindnode/node.go @@ -4,7 +4,7 @@ import ( "fmt" "reflect" - dms3ld "gitlab.dms3.io/ld/go-ld-prime" + ld "gitlab.dms3.io/ld/go-ld-prime" basicnode "gitlab.dms3.io/ld/go-ld-prime/node/basic" "gitlab.dms3.io/ld/go-ld-prime/schema" ) @@ -12,32 +12,32 @@ import ( // Assert that we implement all the interfaces as expected. // Grouped by the interfaces to implement, roughly. var ( - _ dms3ld.NodePrototype = (*_prototype)(nil) + _ ld.NodePrototype = (*_prototype)(nil) _ schema.TypedPrototype = (*_prototype)(nil) - _ dms3ld.NodePrototype = (*_prototypeRepr)(nil) + _ ld.NodePrototype = (*_prototypeRepr)(nil) - _ dms3ld.Node = (*_node)(nil) + _ ld.Node = (*_node)(nil) _ schema.TypedNode = (*_node)(nil) - _ dms3ld.Node = (*_nodeRepr)(nil) - - _ dms3ld.NodeBuilder = (*_builder)(nil) - _ dms3ld.NodeAssembler = (*_assembler)(nil) - _ dms3ld.NodeBuilder = (*_builderRepr)(nil) - _ dms3ld.NodeAssembler = (*_assemblerRepr)(nil) - - _ dms3ld.MapAssembler = (*_structAssembler)(nil) - _ dms3ld.MapIterator = (*_structIterator)(nil) - _ dms3ld.MapAssembler = (*_structAssemblerRepr)(nil) - _ dms3ld.MapIterator = (*_structIteratorRepr)(nil) - - _ dms3ld.ListAssembler = (*_listAssembler)(nil) - _ dms3ld.ListIterator = (*_listIterator)(nil) - _ dms3ld.ListAssembler = (*_listAssemblerRepr)(nil) - - _ dms3ld.MapAssembler = (*_unionAssembler)(nil) - _ dms3ld.MapIterator = (*_unionIterator)(nil) - _ dms3ld.MapAssembler = (*_unionAssemblerRepr)(nil) - _ dms3ld.MapIterator = (*_unionIteratorRepr)(nil) + _ ld.Node = (*_nodeRepr)(nil) + + _ ld.NodeBuilder = (*_builder)(nil) + _ ld.NodeAssembler = (*_assembler)(nil) + _ ld.NodeBuilder = (*_builderRepr)(nil) + _ ld.NodeAssembler = (*_assemblerRepr)(nil) + + _ ld.MapAssembler = (*_structAssembler)(nil) + _ ld.MapIterator = (*_structIterator)(nil) + _ ld.MapAssembler = (*_structAssemblerRepr)(nil) + _ ld.MapIterator = (*_structIteratorRepr)(nil) + + _ ld.ListAssembler = (*_listAssembler)(nil) + _ ld.ListIterator = (*_listIterator)(nil) + _ ld.ListAssembler = (*_listAssemblerRepr)(nil) + + _ ld.MapAssembler = (*_unionAssembler)(nil) + _ ld.MapIterator = (*_unionIterator)(nil) + _ ld.MapAssembler = (*_unionAssemblerRepr)(nil) + _ ld.MapIterator = (*_unionIteratorRepr)(nil) ) type _prototype struct { @@ -45,7 +45,7 @@ type _prototype struct { goType reflect.Type // non-pointer } -func (w *_prototype) NewBuilder() dms3ld.NodeBuilder { +func (w *_prototype) NewBuilder() ld.NodeBuilder { return &_builder{_assembler{ schemaType: w.schemaType, val: reflect.New(w.goType).Elem(), @@ -56,7 +56,7 @@ func (w *_prototype) Type() schema.Type { return w.schemaType } -func (w *_prototype) Representation() dms3ld.NodePrototype { +func (w *_prototype) Representation() ld.NodePrototype { return (*_prototypeRepr)(w) } @@ -66,7 +66,7 @@ var ( goTypeFloat = reflect.TypeOf(0.0) goTypeString = reflect.TypeOf("") goTypeBytes = reflect.TypeOf([]byte{}) - goTypeLink = reflect.TypeOf((*dms3ld.Link)(nil)).Elem() + goTypeLink = reflect.TypeOf((*ld.Link)(nil)).Elem() schemaTypeFieldName = schema.SpawnString("fieldNameString") ) @@ -86,20 +86,20 @@ func (w *_node) Type() schema.Type { return w.schemaType } -func (w *_node) Representation() dms3ld.Node { +func (w *_node) Representation() ld.Node { return (*_nodeRepr)(w) } -func (w *_node) Kind() dms3ld.Kind { +func (w *_node) Kind() ld.Kind { return w.schemaType.TypeKind().ActsLike() } -func (w *_node) LookupByString(key string) (dms3ld.Node, error) { +func (w *_node) LookupByString(key string) (ld.Node, error) { switch typ := w.schemaType.(type) { case *schema.TypeStruct: field := typ.Field(key) if field == nil { - return nil, dms3ld.ErrInvalidKey{ + return nil, ld.ErrInvalidKey{ TypeName: typ.Name().String(), Key: basicnode.NewString(key), } @@ -110,13 +110,13 @@ func (w *_node) LookupByString(key string) (dms3ld.Node, error) { } if field.IsOptional() { if fval.IsNil() { - return dms3ld.Absent, nil + return ld.Absent, nil } fval = fval.Elem() } if field.IsNullable() { if fval.IsNil() { - return dms3ld.Null, nil + return ld.Null, nil } fval = fval.Elem() } @@ -143,7 +143,7 @@ func (w *_node) LookupByString(key string) (dms3ld.Node, error) { } fval := valuesVal.MapIndex(kval) if !fval.IsValid() { // not found - return nil, dms3ld.ErrNotExists{Segment: dms3ld.PathSegmentOfString(key)} + return nil, ld.ErrNotExists{Segment: ld.PathSegmentOfString(key)} } // TODO: Error/panic if fval.IsNil() && !typ.ValueIsNullable()? // Otherwise we could have two non-equal Go values (nil map, @@ -151,7 +151,7 @@ func (w *_node) LookupByString(key string) (dms3ld.Node, error) { // node when the field is not nullable. if typ.ValueIsNullable() { if fval.IsNil() { - return dms3ld.Null, nil + return ld.Null, nil } fval = fval.Elem() } @@ -171,11 +171,11 @@ func (w *_node) LookupByString(key string) (dms3ld.Node, error) { } } if mtyp == nil { // not found - return nil, dms3ld.ErrNotExists{Segment: dms3ld.PathSegmentOfString(key)} + return nil, ld.ErrNotExists{Segment: ld.PathSegmentOfString(key)} } haveIdx := int(w.val.FieldByName("Index").Int()) if haveIdx != idx { // mismatching type - return nil, dms3ld.ErrNotExists{Segment: dms3ld.PathSegmentOfString(key)} + return nil, ld.ErrNotExists{Segment: ld.PathSegmentOfString(key)} } mval := w.val.FieldByName("Value").Elem() node := &_node{ @@ -184,76 +184,76 @@ func (w *_node) LookupByString(key string) (dms3ld.Node, error) { } return node, nil } - return nil, dms3ld.ErrWrongKind{ + return nil, ld.ErrWrongKind{ TypeName: w.schemaType.Name().String(), MethodName: "LookupByString", // TODO } } -func (w *_node) LookupByIndex(idx int64) (dms3ld.Node, error) { +func (w *_node) LookupByIndex(idx int64) (ld.Node, error) { switch typ := w.schemaType.(type) { case *schema.TypeList: if idx < 0 || int(idx) >= w.val.Len() { - return nil, dms3ld.ErrNotExists{Segment: dms3ld.PathSegmentOfInt(idx)} + return nil, ld.ErrNotExists{Segment: ld.PathSegmentOfInt(idx)} } val := w.val.Index(int(idx)) if typ.ValueIsNullable() { if val.IsNil() { - return dms3ld.Null, nil + return ld.Null, nil } val = val.Elem() } return &_node{schemaType: typ.ValueType(), val: val}, nil } - return nil, dms3ld.ErrWrongKind{ + return nil, ld.ErrWrongKind{ TypeName: w.schemaType.Name().String(), MethodName: "LookupByIndex", // TODO } } -func (w *_node) LookupBySegment(seg dms3ld.PathSegment) (dms3ld.Node, error) { +func (w *_node) LookupBySegment(seg ld.PathSegment) (ld.Node, error) { switch w.Kind() { - case dms3ld.Kind_Map: + case ld.Kind_Map: return w.LookupByString(seg.String()) - case dms3ld.Kind_List: + case ld.Kind_List: idx, err := seg.Index() if err != nil { return nil, err } return w.LookupByIndex(idx) } - return nil, dms3ld.ErrWrongKind{ + return nil, ld.ErrWrongKind{ TypeName: w.schemaType.Name().String(), MethodName: "LookupBySegment", // TODO } } -func (w *_node) LookupByNode(key dms3ld.Node) (dms3ld.Node, error) { +func (w *_node) LookupByNode(key ld.Node) (ld.Node, error) { switch w.Kind() { - case dms3ld.Kind_Map: + case ld.Kind_Map: s, err := key.AsString() if err != nil { return nil, err } return w.LookupByString(s) - case dms3ld.Kind_List: + case ld.Kind_List: i, err := key.AsInt() if err != nil { return nil, err } return w.LookupByIndex(i) } - return nil, dms3ld.ErrWrongKind{ + return nil, ld.ErrWrongKind{ TypeName: w.schemaType.Name().String(), MethodName: "LookupByNode", // TODO } } -func (w *_node) MapIterator() dms3ld.MapIterator { +func (w *_node) MapIterator() ld.MapIterator { switch typ := w.schemaType.(type) { case *schema.TypeStruct: return &_structIterator{ @@ -277,7 +277,7 @@ func (w *_node) MapIterator() dms3ld.MapIterator { return nil } -func (w *_node) ListIterator() dms3ld.ListIterator { +func (w *_node) ListIterator() ld.ListIterator { val := w.val if val.Type().Kind() == reflect.Ptr { if !val.IsNil() { @@ -293,7 +293,7 @@ func (w *_node) ListIterator() dms3ld.ListIterator { func (w *_node) Length() int64 { switch w.Kind() { - case dms3ld.Kind_Map: + case ld.Kind_Map: switch typ := w.schemaType.(type) { case *schema.TypeStruct: return int64(len(typ.Fields())) @@ -301,7 +301,7 @@ func (w *_node) Length() int64 { return 1 } return int64(w.val.FieldByName("Keys").Len()) - case dms3ld.Kind_List: + case ld.Kind_List: return int64(w.val.Len()) } return -1 @@ -318,8 +318,8 @@ func (w *_node) IsNull() bool { } func (w *_node) AsBool() (bool, error) { - if w.Kind() != dms3ld.Kind_Bool { - return false, dms3ld.ErrWrongKind{ + if w.Kind() != ld.Kind_Bool { + return false, ld.ErrWrongKind{ TypeName: w.schemaType.Name().String(), MethodName: "AsBool", // TODO @@ -329,8 +329,8 @@ func (w *_node) AsBool() (bool, error) { } func (w *_node) AsInt() (int64, error) { - if w.Kind() != dms3ld.Kind_Int { - return 0, dms3ld.ErrWrongKind{ + if w.Kind() != ld.Kind_Int { + return 0, ld.ErrWrongKind{ TypeName: w.schemaType.Name().String(), MethodName: "AsInt", // TODO @@ -340,8 +340,8 @@ func (w *_node) AsInt() (int64, error) { } func (w *_node) AsFloat() (float64, error) { - if w.Kind() != dms3ld.Kind_Float { - return 0, dms3ld.ErrWrongKind{ + if w.Kind() != ld.Kind_Float { + return 0, ld.ErrWrongKind{ TypeName: w.schemaType.Name().String(), MethodName: "AsFloat", // TODO @@ -351,8 +351,8 @@ func (w *_node) AsFloat() (float64, error) { } func (w *_node) AsString() (string, error) { - if w.Kind() != dms3ld.Kind_String { - return "", dms3ld.ErrWrongKind{ + if w.Kind() != ld.Kind_String { + return "", ld.ErrWrongKind{ TypeName: w.schemaType.Name().String(), MethodName: "AsString", // TODO @@ -362,8 +362,8 @@ func (w *_node) AsString() (string, error) { } func (w *_node) AsBytes() ([]byte, error) { - if w.Kind() != dms3ld.Kind_Bytes { - return nil, dms3ld.ErrWrongKind{ + if w.Kind() != ld.Kind_Bytes { + return nil, ld.ErrWrongKind{ TypeName: w.schemaType.Name().String(), MethodName: "AsBytes", // TODO @@ -372,19 +372,19 @@ func (w *_node) AsBytes() ([]byte, error) { return w.val.Bytes(), nil } -func (w *_node) AsLink() (dms3ld.Link, error) { - if w.Kind() != dms3ld.Kind_Link { - return nil, dms3ld.ErrWrongKind{ +func (w *_node) AsLink() (ld.Link, error) { + if w.Kind() != ld.Kind_Link { + return nil, ld.ErrWrongKind{ TypeName: w.schemaType.Name().String(), MethodName: "AsLink", // TODO } } - link, _ := w.val.Interface().(dms3ld.Link) + link, _ := w.val.Interface().(ld.Link) return link, nil } -func (w *_node) Prototype() dms3ld.NodePrototype { +func (w *_node) Prototype() ld.NodePrototype { panic("TODO: Prototype") } @@ -392,7 +392,7 @@ type _builder struct { _assembler } -func (w *_builder) Build() dms3ld.Node { +func (w *_builder) Build() ld.Node { // TODO: should we panic if no Assign call was made, just like codegen? return &_node{schemaType: w.schemaType, val: w.val} } @@ -419,15 +419,15 @@ func (w *_assembler) nonPtrVal() reflect.Value { return val } -func (w *_assembler) kind() dms3ld.Kind { +func (w *_assembler) kind() ld.Kind { return w.schemaType.TypeKind().ActsLike() } -func (w *_assembler) Representation() dms3ld.NodeAssembler { +func (w *_assembler) Representation() ld.NodeAssembler { return (*_assemblerRepr)(w) } -func (w *_assembler) BeginMap(sizeHint int64) (dms3ld.MapAssembler, error) { +func (w *_assembler) BeginMap(sizeHint int64) (ld.MapAssembler, error) { switch typ := w.schemaType.(type) { case *schema.TypeStruct: val := w.nonPtrVal() @@ -459,14 +459,14 @@ func (w *_assembler) BeginMap(sizeHint int64) (dms3ld.MapAssembler, error) { finish: w.finish, }, nil } - return nil, dms3ld.ErrWrongKind{ + return nil, ld.ErrWrongKind{ TypeName: w.schemaType.Name().String(), MethodName: "BeginMap", // TODO } } -func (w *_assembler) BeginList(sizeHint int64) (dms3ld.ListAssembler, error) { +func (w *_assembler) BeginList(sizeHint int64) (ld.ListAssembler, error) { switch typ := w.schemaType.(type) { case *schema.TypeList: val := w.nonPtrVal() @@ -476,7 +476,7 @@ func (w *_assembler) BeginList(sizeHint int64) (dms3ld.ListAssembler, error) { finish: w.finish, }, nil } - return nil, dms3ld.ErrWrongKind{ + return nil, ld.ErrWrongKind{ TypeName: w.schemaType.Name().String(), MethodName: "BeginList", // TODO @@ -485,7 +485,7 @@ func (w *_assembler) BeginList(sizeHint int64) (dms3ld.ListAssembler, error) { func (w *_assembler) AssignNull() error { if !w.nullable { - return dms3ld.ErrWrongKind{ + return ld.ErrWrongKind{ TypeName: w.schemaType.Name().String(), MethodName: "AssignNull", // TODO @@ -501,11 +501,11 @@ func (w *_assembler) AssignNull() error { } func (w *_assembler) AssignBool(b bool) error { - if w.kind() != dms3ld.Kind_Bool { - return dms3ld.ErrWrongKind{ + if w.kind() != ld.Kind_Bool { + return ld.ErrWrongKind{ TypeName: w.schemaType.Name().String(), MethodName: "AssignBool", - AppropriateKind: dms3ld.KindSet{dms3ld.Kind_Bool}, + AppropriateKind: ld.KindSet{ld.Kind_Bool}, ActualKind: w.kind(), } } @@ -519,11 +519,11 @@ func (w *_assembler) AssignBool(b bool) error { } func (w *_assembler) AssignInt(i int64) error { - if w.kind() != dms3ld.Kind_Int { - return dms3ld.ErrWrongKind{ + if w.kind() != ld.Kind_Int { + return ld.ErrWrongKind{ TypeName: w.schemaType.Name().String(), MethodName: "AssignInt", - AppropriateKind: dms3ld.KindSet{dms3ld.Kind_Int}, + AppropriateKind: ld.KindSet{ld.Kind_Int}, ActualKind: w.kind(), } } @@ -537,11 +537,11 @@ func (w *_assembler) AssignInt(i int64) error { } func (w *_assembler) AssignFloat(f float64) error { - if w.kind() != dms3ld.Kind_Float { - return dms3ld.ErrWrongKind{ + if w.kind() != ld.Kind_Float { + return ld.ErrWrongKind{ TypeName: w.schemaType.Name().String(), MethodName: "AssignFloat", - AppropriateKind: dms3ld.KindSet{dms3ld.Kind_Float}, + AppropriateKind: ld.KindSet{ld.Kind_Float}, ActualKind: w.kind(), } } @@ -555,11 +555,11 @@ func (w *_assembler) AssignFloat(f float64) error { } func (w *_assembler) AssignString(s string) error { - if w.kind() != dms3ld.Kind_String { - return dms3ld.ErrWrongKind{ + if w.kind() != ld.Kind_String { + return ld.ErrWrongKind{ TypeName: w.schemaType.Name().String(), MethodName: "AssignString", - AppropriateKind: dms3ld.KindSet{dms3ld.Kind_String}, + AppropriateKind: ld.KindSet{ld.Kind_String}, ActualKind: w.kind(), } } @@ -573,11 +573,11 @@ func (w *_assembler) AssignString(s string) error { } func (w *_assembler) AssignBytes(p []byte) error { - if w.kind() != dms3ld.Kind_Bytes { - return dms3ld.ErrWrongKind{ + if w.kind() != ld.Kind_Bytes { + return ld.ErrWrongKind{ TypeName: w.schemaType.Name().String(), MethodName: "AssignBytes", - AppropriateKind: dms3ld.KindSet{dms3ld.Kind_Bytes}, + AppropriateKind: ld.KindSet{ld.Kind_Bytes}, ActualKind: w.kind(), } } @@ -585,10 +585,10 @@ func (w *_assembler) AssignBytes(p []byte) error { return nil } -func (w *_assembler) AssignLink(link dms3ld.Link) error { +func (w *_assembler) AssignLink(link ld.Link) error { newVal := reflect.ValueOf(link) if !newVal.Type().AssignableTo(w.val.Type()) { - return dms3ld.ErrWrongKind{ + return ld.ErrWrongKind{ TypeName: w.schemaType.Name().String(), MethodName: "AssignLink", // TODO @@ -603,7 +603,7 @@ func (w *_assembler) AssignLink(link dms3ld.Link) error { return nil } -func (w *_assembler) AssignNode(node dms3ld.Node) error { +func (w *_assembler) AssignNode(node ld.Node) error { // TODO: does this ever trigger? // newVal := reflect.ValueOf(node) // if newVal.Type().AssignableTo(w.val.Type()) { @@ -611,10 +611,10 @@ func (w *_assembler) AssignNode(node dms3ld.Node) error { // return nil // } switch node.Kind() { - case dms3ld.Kind_Map: + case ld.Kind_Map: itr := node.MapIterator() // TODO: consider reusing this code from elsewhere, - // via something like dms3ld.BlindCopyMap. + // via something like ld.BlindCopyMap. am, err := w.BeginMap(-1) // TODO: length? if err != nil { return err @@ -632,7 +632,7 @@ func (w *_assembler) AssignNode(node dms3ld.Node) error { } } return am.Finish() - case dms3ld.Kind_List: + case ld.Kind_List: itr := node.ListIterator() am, err := w.BeginList(-1) // TODO: length? if err != nil { @@ -649,50 +649,50 @@ func (w *_assembler) AssignNode(node dms3ld.Node) error { } return am.Finish() - case dms3ld.Kind_Bool: + case ld.Kind_Bool: b, err := node.AsBool() if err != nil { return err } return w.AssignBool(b) - case dms3ld.Kind_Int: + case ld.Kind_Int: i, err := node.AsInt() if err != nil { return err } return w.AssignInt(i) - case dms3ld.Kind_Float: + case ld.Kind_Float: f, err := node.AsFloat() if err != nil { return err } return w.AssignFloat(f) - case dms3ld.Kind_String: + case ld.Kind_String: s, err := node.AsString() if err != nil { return err } return w.AssignString(s) - case dms3ld.Kind_Bytes: + case ld.Kind_Bytes: p, err := node.AsBytes() if err != nil { return err } return w.AssignBytes(p) - case dms3ld.Kind_Link: + case ld.Kind_Link: l, err := node.AsLink() if err != nil { return err } return w.AssignLink(l) - case dms3ld.Kind_Null: + case ld.Kind_Null: return w.AssignNull() } // fmt.Println(w.val.Type(), reflect.TypeOf(node)) panic(fmt.Sprintf("TODO: %v %v", w.val.Type(), node.Kind())) } -func (w *_assembler) Prototype() dms3ld.NodePrototype { +func (w *_assembler) Prototype() ld.NodePrototype { panic("TODO: Assembler.Prototype") } @@ -717,7 +717,7 @@ type _structAssembler struct { nextIndex int // only used by repr.go } -func (w *_structAssembler) AssembleKey() dms3ld.NodeAssembler { +func (w *_structAssembler) AssembleKey() ld.NodeAssembler { w.curKey = _assembler{ schemaType: schemaTypeFieldName, val: reflect.New(goTypeString).Elem(), @@ -725,13 +725,13 @@ func (w *_structAssembler) AssembleKey() dms3ld.NodeAssembler { return &w.curKey } -func (w *_structAssembler) AssembleValue() dms3ld.NodeAssembler { +func (w *_structAssembler) AssembleValue() ld.NodeAssembler { // TODO: optimize this to do one lookup by name name := w.curKey.val.String() field := w.schemaType.Field(name) if field == nil { panic(name) - // return nil, dms3ld.ErrInvalidKey{ + // return nil, ld.ErrInvalidKey{ // TypeName: w.schemaType.Name().String(), // Key: basicnode.NewString(name), // } @@ -757,7 +757,7 @@ func (w *_structAssembler) AssembleValue() dms3ld.NodeAssembler { } } -func (w *_structAssembler) AssembleEntry(k string) (dms3ld.NodeAssembler, error) { +func (w *_structAssembler) AssembleEntry(k string) (ld.NodeAssembler, error) { if err := w.AssembleKey().AssignString(k); err != nil { return nil, err } @@ -774,7 +774,7 @@ func (w *_structAssembler) Finish() error { } } if len(missing) > 0 { - return dms3ld.ErrMissingRequiredField{Missing: missing} + return ld.ErrMissingRequiredField{Missing: missing} } if w.finish != nil { if err := w.finish(); err != nil { @@ -784,11 +784,11 @@ func (w *_structAssembler) Finish() error { return nil } -func (w *_structAssembler) KeyPrototype() dms3ld.NodePrototype { +func (w *_structAssembler) KeyPrototype() ld.NodePrototype { return &_prototype{schemaType: schemaTypeFieldName, goType: goTypeString} } -func (w *_structAssembler) ValuePrototype(k string) dms3ld.NodePrototype { +func (w *_structAssembler) ValuePrototype(k string) ld.NodePrototype { panic("TODO: struct ValuePrototype") } @@ -805,7 +805,7 @@ type _mapAssembler struct { nextIndex int // only used by repr.go } -func (w *_mapAssembler) AssembleKey() dms3ld.NodeAssembler { +func (w *_mapAssembler) AssembleKey() ld.NodeAssembler { w.curKey = _assembler{ schemaType: w.schemaType.KeyType(), val: reflect.New(w.valuesVal.Type().Key()).Elem(), @@ -813,7 +813,7 @@ func (w *_mapAssembler) AssembleKey() dms3ld.NodeAssembler { return &w.curKey } -func (w *_mapAssembler) AssembleValue() dms3ld.NodeAssembler { +func (w *_mapAssembler) AssembleValue() ld.NodeAssembler { kval := w.curKey.val val := reflect.New(w.valuesVal.Type().Elem()).Elem() finish := func() error { @@ -833,7 +833,7 @@ func (w *_mapAssembler) AssembleValue() dms3ld.NodeAssembler { } } -func (w *_mapAssembler) AssembleEntry(k string) (dms3ld.NodeAssembler, error) { +func (w *_mapAssembler) AssembleEntry(k string) (ld.NodeAssembler, error) { if err := w.AssembleKey().AssignString(k); err != nil { return nil, err } @@ -850,11 +850,11 @@ func (w *_mapAssembler) Finish() error { return nil } -func (w *_mapAssembler) KeyPrototype() dms3ld.NodePrototype { +func (w *_mapAssembler) KeyPrototype() ld.NodePrototype { return &_prototype{schemaType: w.schemaType.KeyType(), goType: w.valuesVal.Type().Key()} } -func (w *_mapAssembler) ValuePrototype(k string) dms3ld.NodePrototype { +func (w *_mapAssembler) ValuePrototype(k string) ld.NodePrototype { panic("TODO: struct ValuePrototype") } @@ -864,7 +864,7 @@ type _listAssembler struct { finish func() error } -func (w *_listAssembler) AssembleValue() dms3ld.NodeAssembler { +func (w *_listAssembler) AssembleValue() ld.NodeAssembler { goType := w.val.Type().Elem() // TODO: use a finish func to append w.val.Set(reflect.Append(w.val, reflect.New(goType).Elem())) @@ -884,7 +884,7 @@ func (w *_listAssembler) Finish() error { return nil } -func (w *_listAssembler) ValuePrototype(idx int64) dms3ld.NodePrototype { +func (w *_listAssembler) ValuePrototype(idx int64) ld.NodePrototype { panic("TODO: list ValuePrototype") } @@ -900,7 +900,7 @@ type _unionAssembler struct { nextIndex int // only used by repr.go } -func (w *_unionAssembler) AssembleKey() dms3ld.NodeAssembler { +func (w *_unionAssembler) AssembleKey() ld.NodeAssembler { w.curKey = _assembler{ schemaType: schemaTypeFieldName, val: reflect.New(goTypeString).Elem(), @@ -908,7 +908,7 @@ func (w *_unionAssembler) AssembleKey() dms3ld.NodeAssembler { return &w.curKey } -func (w *_unionAssembler) AssembleValue() dms3ld.NodeAssembler { +func (w *_unionAssembler) AssembleValue() ld.NodeAssembler { name := w.curKey.val.String() var idx int var mtyp schema.Type @@ -921,7 +921,7 @@ func (w *_unionAssembler) AssembleValue() dms3ld.NodeAssembler { } if mtyp == nil { panic("TODO: missing member") - // return nil, dms3ld.ErrInvalidKey{ + // return nil, ld.ErrInvalidKey{ // TypeName: w.schemaType.Name().String(), // Key: basicnode.NewString(name), // } @@ -941,7 +941,7 @@ func (w *_unionAssembler) AssembleValue() dms3ld.NodeAssembler { } } -func (w *_unionAssembler) AssembleEntry(k string) (dms3ld.NodeAssembler, error) { +func (w *_unionAssembler) AssembleEntry(k string) (ld.NodeAssembler, error) { if err := w.AssembleKey().AssignString(k); err != nil { return nil, err } @@ -958,11 +958,11 @@ func (w *_unionAssembler) Finish() error { return nil } -func (w *_unionAssembler) KeyPrototype() dms3ld.NodePrototype { +func (w *_unionAssembler) KeyPrototype() ld.NodePrototype { return &_prototype{schemaType: schemaTypeFieldName, goType: goTypeString} } -func (w *_unionAssembler) ValuePrototype(k string) dms3ld.NodePrototype { +func (w *_unionAssembler) ValuePrototype(k string) ld.NodePrototype { panic("TODO: struct ValuePrototype") } @@ -977,9 +977,9 @@ type _structIterator struct { reprEnd int } -func (w *_structIterator) Next() (key, value dms3ld.Node, _ error) { +func (w *_structIterator) Next() (key, value ld.Node, _ error) { if w.Done() { - return nil, nil, dms3ld.ErrIteratorOverread{} + return nil, nil, ld.ErrIteratorOverread{} } field := w.fields[w.nextIndex] val := w.val.Field(w.nextIndex) @@ -987,13 +987,13 @@ func (w *_structIterator) Next() (key, value dms3ld.Node, _ error) { key = basicnode.NewString(field.Name()) if field.IsOptional() { if val.IsNil() { - return key, dms3ld.Absent, nil + return key, ld.Absent, nil } val = val.Elem() } if field.IsNullable() { if val.IsNil() { - return key, dms3ld.Null, nil + return key, ld.Null, nil } val = val.Elem() } @@ -1015,9 +1015,9 @@ type _mapIterator struct { nextIndex int } -func (w *_mapIterator) Next() (key, value dms3ld.Node, _ error) { +func (w *_mapIterator) Next() (key, value ld.Node, _ error) { if w.Done() { - return nil, nil, dms3ld.ErrIteratorOverread{} + return nil, nil, ld.ErrIteratorOverread{} } goKey := w.keysVal.Index(w.nextIndex) val := w.valuesVal.MapIndex(goKey) @@ -1029,7 +1029,7 @@ func (w *_mapIterator) Next() (key, value dms3ld.Node, _ error) { } if w.schemaType.ValueIsNullable() { if val.IsNil() { - return key, dms3ld.Null, nil + return key, ld.Null, nil } val = val.Elem() } @@ -1050,16 +1050,16 @@ type _listIterator struct { nextIndex int } -func (w *_listIterator) Next() (index int64, value dms3ld.Node, _ error) { +func (w *_listIterator) Next() (index int64, value ld.Node, _ error) { if w.Done() { - return 0, nil, dms3ld.ErrIteratorOverread{} + return 0, nil, ld.ErrIteratorOverread{} } idx := int64(w.nextIndex) val := w.val.Index(w.nextIndex) w.nextIndex++ if w.schemaType.ValueIsNullable() { if val.IsNil() { - return idx, dms3ld.Null, nil + return idx, ld.Null, nil } val = val.Elem() } @@ -1079,9 +1079,9 @@ type _unionIterator struct { done bool } -func (w *_unionIterator) Next() (key, value dms3ld.Node, _ error) { +func (w *_unionIterator) Next() (key, value ld.Node, _ error) { if w.Done() { - return nil, nil, dms3ld.ErrIteratorOverread{} + return nil, nil, ld.ErrIteratorOverread{} } w.done = true @@ -1104,9 +1104,9 @@ func (w *_unionIterator) Done() bool { // TODO: consider making our own Node interface, like: // // type WrappedNode interface { -// dms3ld.Node +// ld.Node // Unwrap() (ptr interface) // } // -// Pros: API is easier to understand, harder to mix up with other dms3ld.Nodes. -// Cons: One usually only has an dms3ld.Node, and type assertions can be weird. +// Pros: API is easier to understand, harder to mix up with other ld.Nodes. +// Cons: One usually only has an ld.Node, and type assertions can be weird. diff --git a/node/bindnode/repr.go b/node/bindnode/repr.go index 8fbac1f7318dba3f5d5f4e621c9ed8cf61b84839..6a6178b007187b9ca989fa523d21677c3c97de39 100644 --- a/node/bindnode/repr.go +++ b/node/bindnode/repr.go @@ -5,16 +5,16 @@ import ( "reflect" "strings" - dms3ld "gitlab.dms3.io/ld/go-ld-prime" + ld "gitlab.dms3.io/ld/go-ld-prime" basicnode "gitlab.dms3.io/ld/go-ld-prime/node/basic" "gitlab.dms3.io/ld/go-ld-prime/schema" ) -func reprNode(node dms3ld.Node) dms3ld.Node { +func reprNode(node ld.Node) ld.Node { if node, ok := node.(schema.TypedNode); ok { return node.Representation() } - // dms3ld.Absent and dms3ld.Null are not typed. + // ld.Absent and ld.Null are not typed. // TODO: is this a problem? surely a typed struct's fields are always // typed, even when absent or null. return node @@ -32,7 +32,7 @@ func reprStrategy(typ schema.Type) interface{} { type _prototypeRepr _prototype -func (w *_prototypeRepr) NewBuilder() dms3ld.NodeBuilder { +func (w *_prototypeRepr) NewBuilder() ld.NodeBuilder { return &_builderRepr{_assemblerRepr{ schemaType: w.schemaType, val: reflect.New(w.goType).Elem(), @@ -41,22 +41,22 @@ func (w *_prototypeRepr) NewBuilder() dms3ld.NodeBuilder { type _nodeRepr _node -func (w *_nodeRepr) Kind() dms3ld.Kind { +func (w *_nodeRepr) Kind() ld.Kind { switch stg := reprStrategy(w.schemaType).(type) { case schema.StructRepresentation_Stringjoin: - return dms3ld.Kind_String + return ld.Kind_String case schema.StructRepresentation_Map: - return dms3ld.Kind_Map + return ld.Kind_Map case schema.StructRepresentation_Tuple: - return dms3ld.Kind_List + return ld.Kind_List case schema.UnionRepresentation_Keyed: - return dms3ld.Kind_Map + return ld.Kind_Map case schema.UnionRepresentation_Kinded: haveIdx := int(w.val.FieldByName("Index").Int()) mtyp := w.schemaType.(*schema.TypeUnion).Members()[haveIdx] return mtyp.TypeKind().ActsLike() case schema.UnionRepresentation_Stringprefix: - return dms3ld.Kind_String + return ld.Kind_String case nil: return (*_node)(w).Kind() default: @@ -105,7 +105,7 @@ func inboundMappedType(typ *schema.TypeUnion, stg schema.UnionRepresentation_Key return key // fallback to the same key } -func (w *_nodeRepr) asKinded(stg schema.UnionRepresentation_Kinded, kind dms3ld.Kind) *_nodeRepr { +func (w *_nodeRepr) asKinded(stg schema.UnionRepresentation_Kinded, kind ld.Kind) *_nodeRepr { name := stg.GetMember(kind) members := w.schemaType.(*schema.TypeUnion).Members() for _, member := range members { @@ -120,9 +120,9 @@ func (w *_nodeRepr) asKinded(stg schema.UnionRepresentation_Kinded, kind dms3ld. return nil } -func (w *_nodeRepr) LookupByString(key string) (dms3ld.Node, error) { +func (w *_nodeRepr) LookupByString(key string) (ld.Node, error) { if stg, ok := reprStrategy(w.schemaType).(schema.UnionRepresentation_Kinded); ok { - w = w.asKinded(stg, dms3ld.Kind_Map) + w = w.asKinded(stg, ld.Kind_Map) } switch stg := reprStrategy(w.schemaType).(type) { case schema.StructRepresentation_Map: @@ -150,7 +150,7 @@ func (w *_nodeRepr) LookupByString(key string) (dms3ld.Node, error) { } } -func (w *_nodeRepr) LookupByIndex(idx int64) (dms3ld.Node, error) { +func (w *_nodeRepr) LookupByIndex(idx int64) (ld.Node, error) { switch stg := reprStrategy(w.schemaType).(type) { case schema.StructRepresentation_Tuple: fields := w.schemaType.(*schema.TypeStruct).Fields() @@ -171,49 +171,49 @@ func (w *_nodeRepr) LookupByIndex(idx int64) (dms3ld.Node, error) { } } -func (w *_nodeRepr) LookupBySegment(seg dms3ld.PathSegment) (dms3ld.Node, error) { +func (w *_nodeRepr) LookupBySegment(seg ld.PathSegment) (ld.Node, error) { switch w.Kind() { - case dms3ld.Kind_Map: + case ld.Kind_Map: return w.LookupByString(seg.String()) - case dms3ld.Kind_List: + case ld.Kind_List: idx, err := seg.Index() if err != nil { return nil, err } return w.LookupByIndex(idx) } - return nil, dms3ld.ErrWrongKind{ + return nil, ld.ErrWrongKind{ TypeName: w.schemaType.Name().String(), MethodName: "LookupBySegment", // TODO } } -func (w *_nodeRepr) LookupByNode(key dms3ld.Node) (dms3ld.Node, error) { +func (w *_nodeRepr) LookupByNode(key ld.Node) (ld.Node, error) { switch w.Kind() { - case dms3ld.Kind_Map: + case ld.Kind_Map: s, err := key.AsString() if err != nil { return nil, err } return w.LookupByString(s) - case dms3ld.Kind_List: + case ld.Kind_List: i, err := key.AsInt() if err != nil { return nil, err } return w.LookupByIndex(i) } - return nil, dms3ld.ErrWrongKind{ + return nil, ld.ErrWrongKind{ TypeName: w.schemaType.Name().String(), MethodName: "LookupByNode", // TODO } } -func (w *_nodeRepr) MapIterator() dms3ld.MapIterator { +func (w *_nodeRepr) MapIterator() ld.MapIterator { if stg, ok := reprStrategy(w.schemaType).(schema.UnionRepresentation_Kinded); ok { - w = w.asKinded(stg, dms3ld.Kind_Map) + w = w.asKinded(stg, ld.Kind_Map) } switch stg := reprStrategy(w.schemaType).(type) { case schema.StructRepresentation_Map: @@ -230,7 +230,7 @@ func (w *_nodeRepr) MapIterator() dms3ld.MapIterator { } } -func (w *_nodeRepr) ListIterator() dms3ld.ListIterator { +func (w *_nodeRepr) ListIterator() ld.ListIterator { if reprStrategy(w.schemaType) == nil { return (*_node)(w).ListIterator() } @@ -287,10 +287,10 @@ func (w *_nodeRepr) AsBool() (bool, error) { if reprStrategy(w.schemaType) == nil { return (*_node)(w).AsBool() } - return false, dms3ld.ErrWrongKind{ + return false, ld.ErrWrongKind{ TypeName: w.schemaType.Name().String(), MethodName: "AsBool", - AppropriateKind: dms3ld.KindSet_JustBool, + AppropriateKind: ld.KindSet_JustBool, // TODO } } @@ -299,10 +299,10 @@ func (w *_nodeRepr) AsInt() (int64, error) { if reprStrategy(w.schemaType) == nil { return (*_node)(w).AsInt() } - return 0, dms3ld.ErrWrongKind{ + return 0, ld.ErrWrongKind{ TypeName: w.schemaType.Name().String(), MethodName: "AsInt", - AppropriateKind: dms3ld.KindSet_JustInt, + AppropriateKind: ld.KindSet_JustInt, // TODO } } @@ -311,10 +311,10 @@ func (w *_nodeRepr) AsFloat() (float64, error) { if reprStrategy(w.schemaType) == nil { return (*_node)(w).AsFloat() } - return 0, dms3ld.ErrWrongKind{ + return 0, ld.ErrWrongKind{ TypeName: w.schemaType.Name().String(), MethodName: "AsFloat", - AppropriateKind: dms3ld.KindSet_JustFloat, + AppropriateKind: ld.KindSet_JustFloat, // TODO } } @@ -354,7 +354,7 @@ func (w *_nodeRepr) AsString() (string, error) { name := stg.GetDiscriminant(mtyp) return name + stg.GetDelim() + s, nil case schema.UnionRepresentation_Kinded: - w = w.asKinded(stg, dms3ld.Kind_String) + w = w.asKinded(stg, ld.Kind_String) // continues below case nil: // continues below @@ -368,27 +368,27 @@ func (w *_nodeRepr) AsBytes() ([]byte, error) { if reprStrategy(w.schemaType) == nil { return (*_node)(w).AsBytes() } - return nil, dms3ld.ErrWrongKind{ + return nil, ld.ErrWrongKind{ TypeName: w.schemaType.Name().String(), MethodName: "AsBytes", - AppropriateKind: dms3ld.KindSet_JustBytes, + AppropriateKind: ld.KindSet_JustBytes, // TODO } } -func (w *_nodeRepr) AsLink() (dms3ld.Link, error) { +func (w *_nodeRepr) AsLink() (ld.Link, error) { if reprStrategy(w.schemaType) == nil { return (*_node)(w).AsLink() } - return nil, dms3ld.ErrWrongKind{ + return nil, ld.ErrWrongKind{ TypeName: w.schemaType.Name().String(), MethodName: "AsLink", - AppropriateKind: dms3ld.KindSet_JustLink, + AppropriateKind: ld.KindSet_JustLink, // TODO } } -func (w *_nodeRepr) Prototype() dms3ld.NodePrototype { +func (w *_nodeRepr) Prototype() ld.NodePrototype { panic("TODO: Prototype") } @@ -402,7 +402,7 @@ type _builderRepr struct { // The solution might be to add a way to go from the repr node to its parent // typed node. -func (w *_builderRepr) Build() dms3ld.Node { +func (w *_builderRepr) Build() ld.Node { // TODO: see the notes above. // return &_nodeRepr{schemaType: w.schemaType, val: w.val} return &_node{schemaType: w.schemaType, val: w.val} @@ -420,11 +420,11 @@ type _assemblerRepr struct { nullable bool } -func assemblerRepr(am dms3ld.NodeAssembler) *_assemblerRepr { +func assemblerRepr(am ld.NodeAssembler) *_assemblerRepr { return (*_assemblerRepr)(am.(*_assembler)) } -func (w *_assemblerRepr) asKinded(stg schema.UnionRepresentation_Kinded, kind dms3ld.Kind) *_assemblerRepr { +func (w *_assemblerRepr) asKinded(stg schema.UnionRepresentation_Kinded, kind ld.Kind) *_assemblerRepr { name := stg.GetMember(kind) members := w.schemaType.(*schema.TypeUnion).Members() for idx, member := range members { @@ -452,9 +452,9 @@ func (w *_assemblerRepr) asKinded(stg schema.UnionRepresentation_Kinded, kind dm return nil } -func (w *_assemblerRepr) BeginMap(sizeHint int64) (dms3ld.MapAssembler, error) { +func (w *_assemblerRepr) BeginMap(sizeHint int64) (ld.MapAssembler, error) { if stg, ok := reprStrategy(w.schemaType).(schema.UnionRepresentation_Kinded); ok { - w = w.asKinded(stg, dms3ld.Kind_Map) + w = w.asKinded(stg, ld.Kind_Map) } asm, err := (*_assembler)(w).BeginMap(sizeHint) if err != nil { @@ -472,7 +472,7 @@ func (w *_assemblerRepr) BeginMap(sizeHint int64) (dms3ld.MapAssembler, error) { } } -func (w *_assemblerRepr) BeginList(sizeHint int64) (dms3ld.ListAssembler, error) { +func (w *_assemblerRepr) BeginList(sizeHint int64) (ld.ListAssembler, error) { switch stg := reprStrategy(w.schemaType).(type) { case schema.StructRepresentation_Tuple: asm, err := (*_assembler)(w).BeginMap(sizeHint) @@ -551,7 +551,7 @@ func (w *_assemblerRepr) AssignString(s string) error { } return mapAsm.Finish() case schema.UnionRepresentation_Kinded: - name := stg.GetMember(dms3ld.Kind_String) + name := stg.GetMember(ld.Kind_String) members := w.schemaType.(*schema.TypeUnion).Members() for idx, member := range members { if member.Name() != name { @@ -608,7 +608,7 @@ func (w *_assemblerRepr) AssignBytes(p []byte) error { } } -func (w *_assemblerRepr) AssignLink(link dms3ld.Link) error { +func (w *_assemblerRepr) AssignLink(link ld.Link) error { switch stg := reprStrategy(w.schemaType).(type) { case nil: return (*_assembler)(w).AssignLink(link) @@ -617,7 +617,7 @@ func (w *_assemblerRepr) AssignLink(link dms3ld.Link) error { } } -func (w *_assemblerRepr) AssignNode(node dms3ld.Node) error { +func (w *_assemblerRepr) AssignNode(node ld.Node) error { switch stg := reprStrategy(w.schemaType).(type) { case nil: return (*_assembler)(w).AssignNode(node) @@ -626,13 +626,13 @@ func (w *_assemblerRepr) AssignNode(node dms3ld.Node) error { } } -func (w *_assemblerRepr) Prototype() dms3ld.NodePrototype { +func (w *_assemblerRepr) Prototype() ld.NodePrototype { panic("TODO: Assembler.Prototype") } type _structAssemblerRepr _structAssembler -func (w *_structAssemblerRepr) AssembleKey() dms3ld.NodeAssembler { +func (w *_structAssemblerRepr) AssembleKey() ld.NodeAssembler { switch stg := reprStrategy(w.schemaType).(type) { case schema.StructRepresentation_Map: return (*_structAssembler)(w).AssembleKey() @@ -641,7 +641,7 @@ func (w *_structAssemblerRepr) AssembleKey() dms3ld.NodeAssembler { } } -func (w *_structAssemblerRepr) AssembleValue() dms3ld.NodeAssembler { +func (w *_structAssemblerRepr) AssembleValue() ld.NodeAssembler { switch stg := reprStrategy(w.schemaType).(type) { case schema.StructRepresentation_Map: key := w.curKey.val.String() @@ -656,7 +656,7 @@ func (w *_structAssemblerRepr) AssembleValue() dms3ld.NodeAssembler { } } -func (w *_structAssemblerRepr) AssembleEntry(k string) (dms3ld.NodeAssembler, error) { +func (w *_structAssemblerRepr) AssembleEntry(k string) (ld.NodeAssembler, error) { if err := w.AssembleKey().AssignString(k); err != nil { return nil, err } @@ -668,7 +668,7 @@ func (w *_structAssemblerRepr) Finish() error { switch stg := reprStrategy(w.schemaType).(type) { case schema.StructRepresentation_Map: err := (*_structAssembler)(w).Finish() - if err, ok := err.(dms3ld.ErrMissingRequiredField); ok { + if err, ok := err.(ld.ErrMissingRequiredField); ok { for i, name := range err.Missing { serial := outboundMappedKey(stg, name) if serial != name { @@ -682,17 +682,17 @@ func (w *_structAssemblerRepr) Finish() error { } } -func (w *_structAssemblerRepr) KeyPrototype() dms3ld.NodePrototype { +func (w *_structAssemblerRepr) KeyPrototype() ld.NodePrototype { panic("TODO") } -func (w *_structAssemblerRepr) ValuePrototype(k string) dms3ld.NodePrototype { +func (w *_structAssemblerRepr) ValuePrototype(k string) ld.NodePrototype { panic("TODO: struct ValuePrototype") } type _mapAssemblerRepr _mapAssembler -func (w *_mapAssemblerRepr) AssembleKey() dms3ld.NodeAssembler { +func (w *_mapAssemblerRepr) AssembleKey() ld.NodeAssembler { switch stg := reprStrategy(w.schemaType).(type) { case nil: asm := (*_mapAssembler)(w).AssembleKey() @@ -702,7 +702,7 @@ func (w *_mapAssemblerRepr) AssembleKey() dms3ld.NodeAssembler { } } -func (w *_mapAssemblerRepr) AssembleValue() dms3ld.NodeAssembler { +func (w *_mapAssemblerRepr) AssembleValue() ld.NodeAssembler { switch stg := reprStrategy(w.schemaType).(type) { case nil: asm := (*_mapAssembler)(w).AssembleValue() @@ -712,7 +712,7 @@ func (w *_mapAssemblerRepr) AssembleValue() dms3ld.NodeAssembler { } } -func (w *_mapAssemblerRepr) AssembleEntry(k string) (dms3ld.NodeAssembler, error) { +func (w *_mapAssemblerRepr) AssembleEntry(k string) (ld.NodeAssembler, error) { if err := w.AssembleKey().AssignString(k); err != nil { return nil, err } @@ -729,17 +729,17 @@ func (w *_mapAssemblerRepr) Finish() error { } } -func (w *_mapAssemblerRepr) KeyPrototype() dms3ld.NodePrototype { +func (w *_mapAssemblerRepr) KeyPrototype() ld.NodePrototype { panic("TODO") } -func (w *_mapAssemblerRepr) ValuePrototype(k string) dms3ld.NodePrototype { +func (w *_mapAssemblerRepr) ValuePrototype(k string) ld.NodePrototype { panic("TODO: struct ValuePrototype") } type _listStructAssemblerRepr _structAssembler -func (w *_listStructAssemblerRepr) AssembleValue() dms3ld.NodeAssembler { +func (w *_listStructAssemblerRepr) AssembleValue() ld.NodeAssembler { switch stg := reprStrategy(w.schemaType).(type) { case schema.StructRepresentation_Tuple: fields := w.schemaType.Fields() @@ -766,14 +766,14 @@ func (w *_listStructAssemblerRepr) Finish() error { } } -func (w *_listStructAssemblerRepr) ValuePrototype(idx int64) dms3ld.NodePrototype { +func (w *_listStructAssemblerRepr) ValuePrototype(idx int64) ld.NodePrototype { panic("TODO: list ValuePrototype") } // Note that lists do not have any representation strategy right now. type _listAssemblerRepr _listAssembler -func (w *_listAssemblerRepr) AssembleValue() dms3ld.NodeAssembler { +func (w *_listAssemblerRepr) AssembleValue() ld.NodeAssembler { asm := (*_listAssembler)(w).AssembleValue() return (*_assemblerRepr)(asm.(*_assembler)) } @@ -782,13 +782,13 @@ func (w *_listAssemblerRepr) Finish() error { return (*_listAssembler)(w).Finish() } -func (w *_listAssemblerRepr) ValuePrototype(idx int64) dms3ld.NodePrototype { +func (w *_listAssemblerRepr) ValuePrototype(idx int64) ld.NodePrototype { panic("TODO: list ValuePrototype") } type _unionAssemblerRepr _unionAssembler -func (w *_unionAssemblerRepr) AssembleKey() dms3ld.NodeAssembler { +func (w *_unionAssemblerRepr) AssembleKey() ld.NodeAssembler { switch stg := reprStrategy(w.schemaType).(type) { case schema.UnionRepresentation_Keyed: return (*_unionAssembler)(w).AssembleKey() @@ -797,7 +797,7 @@ func (w *_unionAssemblerRepr) AssembleKey() dms3ld.NodeAssembler { } } -func (w *_unionAssemblerRepr) AssembleValue() dms3ld.NodeAssembler { +func (w *_unionAssemblerRepr) AssembleValue() ld.NodeAssembler { switch stg := reprStrategy(w.schemaType).(type) { case schema.UnionRepresentation_Keyed: key := w.curKey.val.String() @@ -812,7 +812,7 @@ func (w *_unionAssemblerRepr) AssembleValue() dms3ld.NodeAssembler { } } -func (w *_unionAssemblerRepr) AssembleEntry(k string) (dms3ld.NodeAssembler, error) { +func (w *_unionAssemblerRepr) AssembleEntry(k string) (ld.NodeAssembler, error) { if err := w.AssembleKey().AssignString(k); err != nil { return nil, err } @@ -829,17 +829,17 @@ func (w *_unionAssemblerRepr) Finish() error { } } -func (w *_unionAssemblerRepr) KeyPrototype() dms3ld.NodePrototype { +func (w *_unionAssemblerRepr) KeyPrototype() ld.NodePrototype { panic("TODO") } -func (w *_unionAssemblerRepr) ValuePrototype(k string) dms3ld.NodePrototype { +func (w *_unionAssemblerRepr) ValuePrototype(k string) ld.NodePrototype { panic("TODO: struct ValuePrototype") } type _structIteratorRepr _structIterator -func (w *_structIteratorRepr) Next() (key, value dms3ld.Node, _ error) { +func (w *_structIteratorRepr) Next() (key, value ld.Node, _ error) { switch stg := reprStrategy(w.schemaType).(type) { case schema.StructRepresentation_Map: _skipAbsent: @@ -874,7 +874,7 @@ func (w *_structIteratorRepr) Done() bool { type _unionIteratorRepr _unionIterator -func (w *_unionIteratorRepr) Next() (key, value dms3ld.Node, _ error) { +func (w *_unionIteratorRepr) Next() (key, value ld.Node, _ error) { switch stg := reprStrategy(w.schemaType).(type) { case schema.UnionRepresentation_Keyed: key, value, err := (*_unionIterator)(w).Next() diff --git a/node/bindnode/schema_test.go b/node/bindnode/schema_test.go index 191eb041943e5daa3216dbecb0c595f5be5f08d3..054448a5d7c4ecba5777ecbd519496905a673c58 100644 --- a/node/bindnode/schema_test.go +++ b/node/bindnode/schema_test.go @@ -34,7 +34,7 @@ func (e *bindEngine) Init(t *testing.T, ts schema.TypeSystem) { e.ts = ts } -func (e *bindEngine) PrototypeByName(name string) dms3ld.NodePrototype { +func (e *bindEngine) PrototypeByName(name string) ld.NodePrototype { wantRepr := strings.HasSuffix(name, ".Repr") if wantRepr { name = strings.TrimSuffix(name, ".Repr") diff --git a/node/doc.go b/node/doc.go index 2e62a3f8056f182d6149eeabdaccfa55aa10c342..21b7071997992bfb22725007199f4a0002cf0d9c 100644 --- a/node/doc.go +++ b/node/doc.go @@ -4,7 +4,7 @@ There's no code in this package itself; it's just for grouping. - The `Node` interface itself is in the `dms3ld` package, + The `Node` interface itself is in the `ld` package, which is the parent of this. The 'node/mixins' package contains reusable component code for building diff --git a/node/gendemo/dms3ldsch_minima.go b/node/gendemo/ldsch_minima.go similarity index 55% rename from node/gendemo/dms3ldsch_minima.go rename to node/gendemo/ldsch_minima.go index 6c5d9b79deea0a6ee1d41be3de4c2abfc5a6ee39..f8c741347f618bd66aa2ac97892fa16f0dbe7dec 100644 --- a/node/gendemo/dms3ldsch_minima.go +++ b/node/gendemo/ldsch_minima.go @@ -1,11 +1,11 @@ package gendemo -// Code generated by go-dms3ld-prime gengo. DO NOT EDIT. +// Code generated by go-ld-prime gengo. DO NOT EDIT. import ( "fmt" - dms3ld "gitlab.dms3.io/ld/go-ld-prime" + ld "gitlab.dms3.io/ld/go-ld-prime" "gitlab.dms3.io/ld/go-ld-prime/schema" ) @@ -36,16 +36,16 @@ type _ErrorThunkAssembler struct { e error } -func (ea _ErrorThunkAssembler) BeginMap(_ int64) (dms3ld.MapAssembler, error) { return nil, ea.e } -func (ea _ErrorThunkAssembler) BeginList(_ int64) (dms3ld.ListAssembler, error) { return nil, ea.e } -func (ea _ErrorThunkAssembler) AssignNull() error { return ea.e } -func (ea _ErrorThunkAssembler) AssignBool(bool) error { return ea.e } -func (ea _ErrorThunkAssembler) AssignInt(int64) error { return ea.e } -func (ea _ErrorThunkAssembler) AssignFloat(float64) error { return ea.e } -func (ea _ErrorThunkAssembler) AssignString(string) error { return ea.e } -func (ea _ErrorThunkAssembler) AssignBytes([]byte) error { return ea.e } -func (ea _ErrorThunkAssembler) AssignLink(dms3ld.Link) error { return ea.e } -func (ea _ErrorThunkAssembler) AssignNode(dms3ld.Node) error { return ea.e } -func (ea _ErrorThunkAssembler) Prototype() dms3ld.NodePrototype { +func (ea _ErrorThunkAssembler) BeginMap(_ int64) (ld.MapAssembler, error) { return nil, ea.e } +func (ea _ErrorThunkAssembler) BeginList(_ int64) (ld.ListAssembler, error) { return nil, ea.e } +func (ea _ErrorThunkAssembler) AssignNull() error { return ea.e } +func (ea _ErrorThunkAssembler) AssignBool(bool) error { return ea.e } +func (ea _ErrorThunkAssembler) AssignInt(int64) error { return ea.e } +func (ea _ErrorThunkAssembler) AssignFloat(float64) error { return ea.e } +func (ea _ErrorThunkAssembler) AssignString(string) error { return ea.e } +func (ea _ErrorThunkAssembler) AssignBytes([]byte) error { return ea.e } +func (ea _ErrorThunkAssembler) AssignLink(ld.Link) error { return ea.e } +func (ea _ErrorThunkAssembler) AssignNode(ld.Node) error { return ea.e } +func (ea _ErrorThunkAssembler) Prototype() ld.NodePrototype { panic(fmt.Errorf("cannot get prototype from error-carrying assembler: already derailed with error: %w", ea.e)) } diff --git a/node/gendemo/dms3ldsch_satisfaction.go b/node/gendemo/ldsch_satisfaction.go similarity index 81% rename from node/gendemo/dms3ldsch_satisfaction.go rename to node/gendemo/ldsch_satisfaction.go index 72c54cbea6ee12c680cd7adbbc18cb49a82b42c6..06de8a827e993bacfd884c089b8674c582ac9e54 100644 --- a/node/gendemo/dms3ldsch_satisfaction.go +++ b/node/gendemo/ldsch_satisfaction.go @@ -1,9 +1,9 @@ package gendemo -// Code generated by go-dms3ld-prime gengo. DO NOT EDIT. +// Code generated by go-ld-prime gengo. DO NOT EDIT. import ( - dms3ld "gitlab.dms3.io/ld/go-ld-prime" + ld "gitlab.dms3.io/ld/go-ld-prime" "gitlab.dms3.io/ld/go-ld-prime/node/mixins" "gitlab.dms3.io/ld/go-ld-prime/schema" ) @@ -31,12 +31,12 @@ func (m MaybeInt) IsAbsent() bool { func (m MaybeInt) Exists() bool { return m.m == schema.Maybe_Value } -func (m MaybeInt) AsNode() dms3ld.Node { +func (m MaybeInt) AsNode() ld.Node { switch m.m { case schema.Maybe_Absent: - return dms3ld.Absent + return ld.Absent case schema.Maybe_Null: - return dms3ld.Null + return ld.Null case schema.Maybe_Value: return &m.v default: @@ -50,28 +50,28 @@ func (m MaybeInt) Must() Int { return &m.v } -var _ dms3ld.Node = (Int)(&_Int{}) +var _ ld.Node = (Int)(&_Int{}) var _ schema.TypedNode = (Int)(&_Int{}) -func (Int) Kind() dms3ld.Kind { - return dms3ld.Kind_Int +func (Int) Kind() ld.Kind { + return ld.Kind_Int } -func (Int) LookupByString(string) (dms3ld.Node, error) { +func (Int) LookupByString(string) (ld.Node, error) { return mixins.Int{TypeName: "gendemo.Int"}.LookupByString("") } -func (Int) LookupByNode(dms3ld.Node) (dms3ld.Node, error) { +func (Int) LookupByNode(ld.Node) (ld.Node, error) { return mixins.Int{TypeName: "gendemo.Int"}.LookupByNode(nil) } -func (Int) LookupByIndex(idx int64) (dms3ld.Node, error) { +func (Int) LookupByIndex(idx int64) (ld.Node, error) { return mixins.Int{TypeName: "gendemo.Int"}.LookupByIndex(0) } -func (Int) LookupBySegment(seg dms3ld.PathSegment) (dms3ld.Node, error) { +func (Int) LookupBySegment(seg ld.PathSegment) (ld.Node, error) { return mixins.Int{TypeName: "gendemo.Int"}.LookupBySegment(seg) } -func (Int) MapIterator() dms3ld.MapIterator { +func (Int) MapIterator() ld.MapIterator { return nil } -func (Int) ListIterator() dms3ld.ListIterator { +func (Int) ListIterator() ld.ListIterator { return nil } func (Int) Length() int64 { @@ -98,16 +98,16 @@ func (Int) AsString() (string, error) { func (Int) AsBytes() ([]byte, error) { return mixins.Int{TypeName: "gendemo.Int"}.AsBytes() } -func (Int) AsLink() (dms3ld.Link, error) { +func (Int) AsLink() (ld.Link, error) { return mixins.Int{TypeName: "gendemo.Int"}.AsLink() } -func (Int) Prototype() dms3ld.NodePrototype { +func (Int) Prototype() ld.NodePrototype { return _Int__Prototype{} } type _Int__Prototype struct{} -func (_Int__Prototype) NewBuilder() dms3ld.NodeBuilder { +func (_Int__Prototype) NewBuilder() ld.NodeBuilder { var nb _Int__Builder nb.Reset() return &nb @@ -117,7 +117,7 @@ type _Int__Builder struct { _Int__Assembler } -func (nb *_Int__Builder) Build() dms3ld.Node { +func (nb *_Int__Builder) Build() ld.Node { if *nb.m != schema.Maybe_Value { panic("invalid state: cannot call Build on an assembler that's not finished") } @@ -135,10 +135,10 @@ type _Int__Assembler struct { } func (na *_Int__Assembler) reset() {} -func (_Int__Assembler) BeginMap(sizeHint int64) (dms3ld.MapAssembler, error) { +func (_Int__Assembler) BeginMap(sizeHint int64) (ld.MapAssembler, error) { return mixins.IntAssembler{TypeName: "gendemo.Int"}.BeginMap(0) } -func (_Int__Assembler) BeginList(sizeHint int64) (dms3ld.ListAssembler, error) { +func (_Int__Assembler) BeginList(sizeHint int64) (ld.ListAssembler, error) { return mixins.IntAssembler{TypeName: "gendemo.Int"}.BeginList(0) } func (na *_Int__Assembler) AssignNull() error { @@ -174,10 +174,10 @@ func (_Int__Assembler) AssignString(string) error { func (_Int__Assembler) AssignBytes([]byte) error { return mixins.IntAssembler{TypeName: "gendemo.Int"}.AssignBytes(nil) } -func (_Int__Assembler) AssignLink(dms3ld.Link) error { +func (_Int__Assembler) AssignLink(ld.Link) error { return mixins.IntAssembler{TypeName: "gendemo.Int"}.AssignLink(nil) } -func (na *_Int__Assembler) AssignNode(v dms3ld.Node) error { +func (na *_Int__Assembler) AssignNode(v ld.Node) error { if v.IsNull() { return na.AssignNull() } @@ -196,19 +196,19 @@ func (na *_Int__Assembler) AssignNode(v dms3ld.Node) error { return na.AssignInt(v2) } } -func (_Int__Assembler) Prototype() dms3ld.NodePrototype { +func (_Int__Assembler) Prototype() ld.NodePrototype { return _Int__Prototype{} } func (Int) Type() schema.Type { return nil /*TODO:typelit*/ } -func (n Int) Representation() dms3ld.Node { +func (n Int) Representation() ld.Node { return (*_Int__Repr)(n) } type _Int__Repr = _Int -var _ dms3ld.Node = &_Int__Repr{} +var _ ld.Node = &_Int__Repr{} type _Int__ReprPrototype = _Int__Prototype type _Int__ReprAssembler = _Int__Assembler @@ -271,12 +271,12 @@ func (m MaybeMap__String__Msg3) IsAbsent() bool { func (m MaybeMap__String__Msg3) Exists() bool { return m.m == schema.Maybe_Value } -func (m MaybeMap__String__Msg3) AsNode() dms3ld.Node { +func (m MaybeMap__String__Msg3) AsNode() ld.Node { switch m.m { case schema.Maybe_Absent: - return dms3ld.Absent + return ld.Absent case schema.Maybe_Null: - return dms3ld.Null + return ld.Null case schema.Maybe_Value: return &m.v default: @@ -290,42 +290,42 @@ func (m MaybeMap__String__Msg3) Must() Map__String__Msg3 { return &m.v } -var _ dms3ld.Node = (Map__String__Msg3)(&_Map__String__Msg3{}) +var _ ld.Node = (Map__String__Msg3)(&_Map__String__Msg3{}) var _ schema.TypedNode = (Map__String__Msg3)(&_Map__String__Msg3{}) -func (Map__String__Msg3) Kind() dms3ld.Kind { - return dms3ld.Kind_Map +func (Map__String__Msg3) Kind() ld.Kind { + return ld.Kind_Map } -func (n Map__String__Msg3) LookupByString(k string) (dms3ld.Node, error) { +func (n Map__String__Msg3) LookupByString(k string) (ld.Node, error) { var k2 _String if err := (_String__Prototype{}).fromString(&k2, k); err != nil { return nil, err // TODO wrap in some kind of ErrInvalidKey } v, exists := n.m[k2] if !exists { - return nil, dms3ld.ErrNotExists{Segment: dms3ld.PathSegmentOfString(k)} + return nil, ld.ErrNotExists{Segment: ld.PathSegmentOfString(k)} } return v, nil } -func (n Map__String__Msg3) LookupByNode(k dms3ld.Node) (dms3ld.Node, error) { +func (n Map__String__Msg3) LookupByNode(k ld.Node) (ld.Node, error) { k2, ok := k.(String) if !ok { panic("todo invalid key type error") - // 'dms3ld.ErrInvalidKey{TypeName:"gendemo.Map__String__Msg3", Key:&_String{k}}' doesn't quite cut it: need room to explain the type, and it's not guaranteed k can be turned into a string at all + // 'ld.ErrInvalidKey{TypeName:"gendemo.Map__String__Msg3", Key:&_String{k}}' doesn't quite cut it: need room to explain the type, and it's not guaranteed k can be turned into a string at all } v, exists := n.m[*k2] if !exists { - return nil, dms3ld.ErrNotExists{Segment: dms3ld.PathSegmentOfString(k2.String())} + return nil, ld.ErrNotExists{Segment: ld.PathSegmentOfString(k2.String())} } return v, nil } -func (Map__String__Msg3) LookupByIndex(idx int64) (dms3ld.Node, error) { +func (Map__String__Msg3) LookupByIndex(idx int64) (ld.Node, error) { return mixins.Map{TypeName: "gendemo.Map__String__Msg3"}.LookupByIndex(0) } -func (n Map__String__Msg3) LookupBySegment(seg dms3ld.PathSegment) (dms3ld.Node, error) { +func (n Map__String__Msg3) LookupBySegment(seg ld.PathSegment) (ld.Node, error) { return n.LookupByString(seg.String()) } -func (n Map__String__Msg3) MapIterator() dms3ld.MapIterator { +func (n Map__String__Msg3) MapIterator() ld.MapIterator { return &_Map__String__Msg3__MapItr{n, 0} } @@ -334,9 +334,9 @@ type _Map__String__Msg3__MapItr struct { idx int } -func (itr *_Map__String__Msg3__MapItr) Next() (k dms3ld.Node, v dms3ld.Node, _ error) { +func (itr *_Map__String__Msg3__MapItr) Next() (k ld.Node, v ld.Node, _ error) { if itr.idx >= len(itr.n.t) { - return nil, nil, dms3ld.ErrIteratorOverread{} + return nil, nil, ld.ErrIteratorOverread{} } x := &itr.n.t[itr.idx] k = &x.k @@ -348,7 +348,7 @@ func (itr *_Map__String__Msg3__MapItr) Done() bool { return itr.idx >= len(itr.n.t) } -func (Map__String__Msg3) ListIterator() dms3ld.ListIterator { +func (Map__String__Msg3) ListIterator() ld.ListIterator { return nil } func (n Map__String__Msg3) Length() int64 { @@ -375,16 +375,16 @@ func (Map__String__Msg3) AsString() (string, error) { func (Map__String__Msg3) AsBytes() ([]byte, error) { return mixins.Map{TypeName: "gendemo.Map__String__Msg3"}.AsBytes() } -func (Map__String__Msg3) AsLink() (dms3ld.Link, error) { +func (Map__String__Msg3) AsLink() (ld.Link, error) { return mixins.Map{TypeName: "gendemo.Map__String__Msg3"}.AsLink() } -func (Map__String__Msg3) Prototype() dms3ld.NodePrototype { +func (Map__String__Msg3) Prototype() ld.NodePrototype { return _Map__String__Msg3__Prototype{} } type _Map__String__Msg3__Prototype struct{} -func (_Map__String__Msg3__Prototype) NewBuilder() dms3ld.NodeBuilder { +func (_Map__String__Msg3__Prototype) NewBuilder() ld.NodeBuilder { var nb _Map__String__Msg3__Builder nb.Reset() return &nb @@ -394,7 +394,7 @@ type _Map__String__Msg3__Builder struct { _Map__String__Msg3__Assembler } -func (nb *_Map__String__Msg3__Builder) Build() dms3ld.Node { +func (nb *_Map__String__Msg3__Builder) Build() ld.Node { if *nb.m != schema.Maybe_Value { panic("invalid state: cannot call Build on an assembler that's not finished") } @@ -421,7 +421,7 @@ func (na *_Map__String__Msg3__Assembler) reset() { na.ka.reset() na.va.reset() } -func (na *_Map__String__Msg3__Assembler) BeginMap(sizeHint int64) (dms3ld.MapAssembler, error) { +func (na *_Map__String__Msg3__Assembler) BeginMap(sizeHint int64) (ld.MapAssembler, error) { switch *na.m { case schema.Maybe_Value, schema.Maybe_Null: panic("invalid state: cannot assign into assembler that's already finished") @@ -436,7 +436,7 @@ func (na *_Map__String__Msg3__Assembler) BeginMap(sizeHint int64) (dms3ld.MapAss na.w.t = make([]_Map__String__Msg3__entry, 0, sizeHint) return na, nil } -func (_Map__String__Msg3__Assembler) BeginList(sizeHint int64) (dms3ld.ListAssembler, error) { +func (_Map__String__Msg3__Assembler) BeginList(sizeHint int64) (ld.ListAssembler, error) { return mixins.MapAssembler{TypeName: "gendemo.Map__String__Msg3"}.BeginList(0) } func (na *_Map__String__Msg3__Assembler) AssignNull() error { @@ -468,10 +468,10 @@ func (_Map__String__Msg3__Assembler) AssignString(string) error { func (_Map__String__Msg3__Assembler) AssignBytes([]byte) error { return mixins.MapAssembler{TypeName: "gendemo.Map__String__Msg3"}.AssignBytes(nil) } -func (_Map__String__Msg3__Assembler) AssignLink(dms3ld.Link) error { +func (_Map__String__Msg3__Assembler) AssignLink(ld.Link) error { return mixins.MapAssembler{TypeName: "gendemo.Map__String__Msg3"}.AssignLink(nil) } -func (na *_Map__String__Msg3__Assembler) AssignNode(v dms3ld.Node) error { +func (na *_Map__String__Msg3__Assembler) AssignNode(v ld.Node) error { if v.IsNull() { return na.AssignNull() } @@ -486,8 +486,8 @@ func (na *_Map__String__Msg3__Assembler) AssignNode(v dms3ld.Node) error { *na.m = schema.Maybe_Value return nil } - if v.Kind() != dms3ld.Kind_Map { - return dms3ld.ErrWrongKind{TypeName: "gendemo.Map__String__Msg3", MethodName: "AssignNode", AppropriateKind: dms3ld.KindSet_JustMap, ActualKind: v.Kind()} + if v.Kind() != ld.Kind_Map { + return ld.ErrWrongKind{TypeName: "gendemo.Map__String__Msg3", MethodName: "AssignNode", AppropriateKind: ld.KindSet_JustMap, ActualKind: v.Kind()} } itr := v.MapIterator() for !itr.Done() { @@ -504,7 +504,7 @@ func (na *_Map__String__Msg3__Assembler) AssignNode(v dms3ld.Node) error { } return na.Finish() } -func (_Map__String__Msg3__Assembler) Prototype() dms3ld.NodePrototype { +func (_Map__String__Msg3__Assembler) Prototype() ld.NodePrototype { return _Map__String__Msg3__Prototype{} } func (ma *_Map__String__Msg3__Assembler) keyFinishTidy() bool { @@ -535,7 +535,7 @@ func (ma *_Map__String__Msg3__Assembler) valueFinishTidy() bool { return false } } -func (ma *_Map__String__Msg3__Assembler) AssembleEntry(k string) (dms3ld.NodeAssembler, error) { +func (ma *_Map__String__Msg3__Assembler) AssembleEntry(k string) (ld.NodeAssembler, error) { switch ma.state { case maState_initial: // carry on @@ -556,7 +556,7 @@ func (ma *_Map__String__Msg3__Assembler) AssembleEntry(k string) (dms3ld.NodeAss return nil, err // TODO wrap in some kind of ErrInvalidKey } if _, exists := ma.w.m[k2]; exists { - return nil, dms3ld.ErrRepeatedMapKey{Key: &k2} + return nil, ld.ErrRepeatedMapKey{Key: &k2} } ma.w.t = append(ma.w.t, _Map__String__Msg3__entry{k: k2}) tz := &ma.w.t[len(ma.w.t)-1] @@ -567,7 +567,7 @@ func (ma *_Map__String__Msg3__Assembler) AssembleEntry(k string) (dms3ld.NodeAss ma.va.m = &ma.cm return &ma.va, nil } -func (ma *_Map__String__Msg3__Assembler) AssembleKey() dms3ld.NodeAssembler { +func (ma *_Map__String__Msg3__Assembler) AssembleKey() ld.NodeAssembler { switch ma.state { case maState_initial: // carry on @@ -588,7 +588,7 @@ func (ma *_Map__String__Msg3__Assembler) AssembleKey() dms3ld.NodeAssembler { ma.ka.w = &ma.w.t[len(ma.w.t)-1].k return &ma.ka } -func (ma *_Map__String__Msg3__Assembler) AssembleValue() dms3ld.NodeAssembler { +func (ma *_Map__String__Msg3__Assembler) AssembleValue() ld.NodeAssembler { switch ma.state { case maState_initial: panic("invalid state: AssembleValue cannot be called when no key is primed") @@ -625,55 +625,55 @@ func (ma *_Map__String__Msg3__Assembler) Finish() error { *ma.m = schema.Maybe_Value return nil } -func (ma *_Map__String__Msg3__Assembler) KeyPrototype() dms3ld.NodePrototype { +func (ma *_Map__String__Msg3__Assembler) KeyPrototype() ld.NodePrototype { return _String__Prototype{} } -func (ma *_Map__String__Msg3__Assembler) ValuePrototype(_ string) dms3ld.NodePrototype { +func (ma *_Map__String__Msg3__Assembler) ValuePrototype(_ string) ld.NodePrototype { return _Msg3__Prototype{} } func (Map__String__Msg3) Type() schema.Type { return nil /*TODO:typelit*/ } -func (n Map__String__Msg3) Representation() dms3ld.Node { +func (n Map__String__Msg3) Representation() ld.Node { return (*_Map__String__Msg3__Repr)(n) } type _Map__String__Msg3__Repr _Map__String__Msg3 -var _ dms3ld.Node = &_Map__String__Msg3__Repr{} +var _ ld.Node = &_Map__String__Msg3__Repr{} -func (_Map__String__Msg3__Repr) Kind() dms3ld.Kind { - return dms3ld.Kind_Map +func (_Map__String__Msg3__Repr) Kind() ld.Kind { + return ld.Kind_Map } -func (nr *_Map__String__Msg3__Repr) LookupByString(k string) (dms3ld.Node, error) { +func (nr *_Map__String__Msg3__Repr) LookupByString(k string) (ld.Node, error) { v, err := (Map__String__Msg3)(nr).LookupByString(k) - if err != nil || v == dms3ld.Null { + if err != nil || v == ld.Null { return v, err } return v.(Msg3).Representation(), nil } -func (nr *_Map__String__Msg3__Repr) LookupByNode(k dms3ld.Node) (dms3ld.Node, error) { +func (nr *_Map__String__Msg3__Repr) LookupByNode(k ld.Node) (ld.Node, error) { v, err := (Map__String__Msg3)(nr).LookupByNode(k) - if err != nil || v == dms3ld.Null { + if err != nil || v == ld.Null { return v, err } return v.(Msg3).Representation(), nil } -func (_Map__String__Msg3__Repr) LookupByIndex(idx int64) (dms3ld.Node, error) { +func (_Map__String__Msg3__Repr) LookupByIndex(idx int64) (ld.Node, error) { return mixins.Map{TypeName: "gendemo.Map__String__Msg3.Repr"}.LookupByIndex(0) } -func (n _Map__String__Msg3__Repr) LookupBySegment(seg dms3ld.PathSegment) (dms3ld.Node, error) { +func (n _Map__String__Msg3__Repr) LookupBySegment(seg ld.PathSegment) (ld.Node, error) { return n.LookupByString(seg.String()) } -func (nr *_Map__String__Msg3__Repr) MapIterator() dms3ld.MapIterator { +func (nr *_Map__String__Msg3__Repr) MapIterator() ld.MapIterator { return &_Map__String__Msg3__ReprMapItr{(Map__String__Msg3)(nr), 0} } type _Map__String__Msg3__ReprMapItr _Map__String__Msg3__MapItr -func (itr *_Map__String__Msg3__ReprMapItr) Next() (k dms3ld.Node, v dms3ld.Node, err error) { +func (itr *_Map__String__Msg3__ReprMapItr) Next() (k ld.Node, v ld.Node, err error) { k, v, err = (*_Map__String__Msg3__MapItr)(itr).Next() - if err != nil || v == dms3ld.Null { + if err != nil || v == ld.Null { return } return k, v.(Msg3).Representation(), nil @@ -682,7 +682,7 @@ func (itr *_Map__String__Msg3__ReprMapItr) Done() bool { return (*_Map__String__Msg3__MapItr)(itr).Done() } -func (_Map__String__Msg3__Repr) ListIterator() dms3ld.ListIterator { +func (_Map__String__Msg3__Repr) ListIterator() ld.ListIterator { return nil } func (rn *_Map__String__Msg3__Repr) Length() int64 { @@ -709,16 +709,16 @@ func (_Map__String__Msg3__Repr) AsString() (string, error) { func (_Map__String__Msg3__Repr) AsBytes() ([]byte, error) { return mixins.Map{TypeName: "gendemo.Map__String__Msg3.Repr"}.AsBytes() } -func (_Map__String__Msg3__Repr) AsLink() (dms3ld.Link, error) { +func (_Map__String__Msg3__Repr) AsLink() (ld.Link, error) { return mixins.Map{TypeName: "gendemo.Map__String__Msg3.Repr"}.AsLink() } -func (_Map__String__Msg3__Repr) Prototype() dms3ld.NodePrototype { +func (_Map__String__Msg3__Repr) Prototype() ld.NodePrototype { return _Map__String__Msg3__ReprPrototype{} } type _Map__String__Msg3__ReprPrototype struct{} -func (_Map__String__Msg3__ReprPrototype) NewBuilder() dms3ld.NodeBuilder { +func (_Map__String__Msg3__ReprPrototype) NewBuilder() ld.NodeBuilder { var nb _Map__String__Msg3__ReprBuilder nb.Reset() return &nb @@ -728,7 +728,7 @@ type _Map__String__Msg3__ReprBuilder struct { _Map__String__Msg3__ReprAssembler } -func (nb *_Map__String__Msg3__ReprBuilder) Build() dms3ld.Node { +func (nb *_Map__String__Msg3__ReprBuilder) Build() ld.Node { if *nb.m != schema.Maybe_Value { panic("invalid state: cannot call Build on an assembler that's not finished") } @@ -755,7 +755,7 @@ func (na *_Map__String__Msg3__ReprAssembler) reset() { na.ka.reset() na.va.reset() } -func (na *_Map__String__Msg3__ReprAssembler) BeginMap(sizeHint int64) (dms3ld.MapAssembler, error) { +func (na *_Map__String__Msg3__ReprAssembler) BeginMap(sizeHint int64) (ld.MapAssembler, error) { switch *na.m { case schema.Maybe_Value, schema.Maybe_Null: panic("invalid state: cannot assign into assembler that's already finished") @@ -770,7 +770,7 @@ func (na *_Map__String__Msg3__ReprAssembler) BeginMap(sizeHint int64) (dms3ld.Ma na.w.t = make([]_Map__String__Msg3__entry, 0, sizeHint) return na, nil } -func (_Map__String__Msg3__ReprAssembler) BeginList(sizeHint int64) (dms3ld.ListAssembler, error) { +func (_Map__String__Msg3__ReprAssembler) BeginList(sizeHint int64) (ld.ListAssembler, error) { return mixins.MapAssembler{TypeName: "gendemo.Map__String__Msg3.Repr"}.BeginList(0) } func (na *_Map__String__Msg3__ReprAssembler) AssignNull() error { @@ -802,10 +802,10 @@ func (_Map__String__Msg3__ReprAssembler) AssignString(string) error { func (_Map__String__Msg3__ReprAssembler) AssignBytes([]byte) error { return mixins.MapAssembler{TypeName: "gendemo.Map__String__Msg3.Repr"}.AssignBytes(nil) } -func (_Map__String__Msg3__ReprAssembler) AssignLink(dms3ld.Link) error { +func (_Map__String__Msg3__ReprAssembler) AssignLink(ld.Link) error { return mixins.MapAssembler{TypeName: "gendemo.Map__String__Msg3.Repr"}.AssignLink(nil) } -func (na *_Map__String__Msg3__ReprAssembler) AssignNode(v dms3ld.Node) error { +func (na *_Map__String__Msg3__ReprAssembler) AssignNode(v ld.Node) error { if v.IsNull() { return na.AssignNull() } @@ -820,8 +820,8 @@ func (na *_Map__String__Msg3__ReprAssembler) AssignNode(v dms3ld.Node) error { *na.m = schema.Maybe_Value return nil } - if v.Kind() != dms3ld.Kind_Map { - return dms3ld.ErrWrongKind{TypeName: "gendemo.Map__String__Msg3.Repr", MethodName: "AssignNode", AppropriateKind: dms3ld.KindSet_JustMap, ActualKind: v.Kind()} + if v.Kind() != ld.Kind_Map { + return ld.ErrWrongKind{TypeName: "gendemo.Map__String__Msg3.Repr", MethodName: "AssignNode", AppropriateKind: ld.KindSet_JustMap, ActualKind: v.Kind()} } itr := v.MapIterator() for !itr.Done() { @@ -838,7 +838,7 @@ func (na *_Map__String__Msg3__ReprAssembler) AssignNode(v dms3ld.Node) error { } return na.Finish() } -func (_Map__String__Msg3__ReprAssembler) Prototype() dms3ld.NodePrototype { +func (_Map__String__Msg3__ReprAssembler) Prototype() ld.NodePrototype { return _Map__String__Msg3__ReprPrototype{} } func (ma *_Map__String__Msg3__ReprAssembler) keyFinishTidy() bool { @@ -869,7 +869,7 @@ func (ma *_Map__String__Msg3__ReprAssembler) valueFinishTidy() bool { return false } } -func (ma *_Map__String__Msg3__ReprAssembler) AssembleEntry(k string) (dms3ld.NodeAssembler, error) { +func (ma *_Map__String__Msg3__ReprAssembler) AssembleEntry(k string) (ld.NodeAssembler, error) { switch ma.state { case maState_initial: // carry on @@ -890,7 +890,7 @@ func (ma *_Map__String__Msg3__ReprAssembler) AssembleEntry(k string) (dms3ld.Nod return nil, err // TODO wrap in some kind of ErrInvalidKey } if _, exists := ma.w.m[k2]; exists { - return nil, dms3ld.ErrRepeatedMapKey{Key: &k2} + return nil, ld.ErrRepeatedMapKey{Key: &k2} } ma.w.t = append(ma.w.t, _Map__String__Msg3__entry{k: k2}) tz := &ma.w.t[len(ma.w.t)-1] @@ -901,7 +901,7 @@ func (ma *_Map__String__Msg3__ReprAssembler) AssembleEntry(k string) (dms3ld.Nod ma.va.m = &ma.cm return &ma.va, nil } -func (ma *_Map__String__Msg3__ReprAssembler) AssembleKey() dms3ld.NodeAssembler { +func (ma *_Map__String__Msg3__ReprAssembler) AssembleKey() ld.NodeAssembler { switch ma.state { case maState_initial: // carry on @@ -922,7 +922,7 @@ func (ma *_Map__String__Msg3__ReprAssembler) AssembleKey() dms3ld.NodeAssembler ma.ka.w = &ma.w.t[len(ma.w.t)-1].k return &ma.ka } -func (ma *_Map__String__Msg3__ReprAssembler) AssembleValue() dms3ld.NodeAssembler { +func (ma *_Map__String__Msg3__ReprAssembler) AssembleValue() ld.NodeAssembler { switch ma.state { case maState_initial: panic("invalid state: AssembleValue cannot be called when no key is primed") @@ -959,10 +959,10 @@ func (ma *_Map__String__Msg3__ReprAssembler) Finish() error { *ma.m = schema.Maybe_Value return nil } -func (ma *_Map__String__Msg3__ReprAssembler) KeyPrototype() dms3ld.NodePrototype { +func (ma *_Map__String__Msg3__ReprAssembler) KeyPrototype() ld.NodePrototype { return _String__ReprPrototype{} } -func (ma *_Map__String__Msg3__ReprAssembler) ValuePrototype(_ string) dms3ld.NodePrototype { +func (ma *_Map__String__Msg3__ReprAssembler) ValuePrototype(_ string) ld.NodePrototype { return _Msg3__ReprPrototype{} } @@ -991,12 +991,12 @@ func (m MaybeMsg3) IsAbsent() bool { func (m MaybeMsg3) Exists() bool { return m.m == schema.Maybe_Value } -func (m MaybeMsg3) AsNode() dms3ld.Node { +func (m MaybeMsg3) AsNode() ld.Node { switch m.m { case schema.Maybe_Absent: - return dms3ld.Absent + return ld.Absent case schema.Maybe_Null: - return dms3ld.Null + return ld.Null case schema.Maybe_Value: return m.v default: @@ -1015,13 +1015,13 @@ var ( fieldName__Msg3_Woot = _String{"woot"} fieldName__Msg3_Waga = _String{"waga"} ) -var _ dms3ld.Node = (Msg3)(&_Msg3{}) +var _ ld.Node = (Msg3)(&_Msg3{}) var _ schema.TypedNode = (Msg3)(&_Msg3{}) -func (Msg3) Kind() dms3ld.Kind { - return dms3ld.Kind_Map +func (Msg3) Kind() ld.Kind { + return ld.Kind_Map } -func (n Msg3) LookupByString(key string) (dms3ld.Node, error) { +func (n Msg3) LookupByString(key string) (ld.Node, error) { switch key { case "whee": return &n.whee, nil @@ -1030,23 +1030,23 @@ func (n Msg3) LookupByString(key string) (dms3ld.Node, error) { case "waga": return &n.waga, nil default: - return nil, schema.ErrNoSuchField{Type: nil /*TODO*/, Field: dms3ld.PathSegmentOfString(key)} + return nil, schema.ErrNoSuchField{Type: nil /*TODO*/, Field: ld.PathSegmentOfString(key)} } } -func (n Msg3) LookupByNode(key dms3ld.Node) (dms3ld.Node, error) { +func (n Msg3) LookupByNode(key ld.Node) (ld.Node, error) { ks, err := key.AsString() if err != nil { return nil, err } return n.LookupByString(ks) } -func (Msg3) LookupByIndex(idx int64) (dms3ld.Node, error) { +func (Msg3) LookupByIndex(idx int64) (ld.Node, error) { return mixins.Map{TypeName: "gendemo.Msg3"}.LookupByIndex(0) } -func (n Msg3) LookupBySegment(seg dms3ld.PathSegment) (dms3ld.Node, error) { +func (n Msg3) LookupBySegment(seg ld.PathSegment) (ld.Node, error) { return n.LookupByString(seg.String()) } -func (n Msg3) MapIterator() dms3ld.MapIterator { +func (n Msg3) MapIterator() ld.MapIterator { return &_Msg3__MapItr{n, 0} } @@ -1055,9 +1055,9 @@ type _Msg3__MapItr struct { idx int } -func (itr *_Msg3__MapItr) Next() (k dms3ld.Node, v dms3ld.Node, _ error) { +func (itr *_Msg3__MapItr) Next() (k ld.Node, v ld.Node, _ error) { if itr.idx >= 3 { - return nil, nil, dms3ld.ErrIteratorOverread{} + return nil, nil, ld.ErrIteratorOverread{} } switch itr.idx { case 0: @@ -1079,7 +1079,7 @@ func (itr *_Msg3__MapItr) Done() bool { return itr.idx >= 3 } -func (Msg3) ListIterator() dms3ld.ListIterator { +func (Msg3) ListIterator() ld.ListIterator { return nil } func (Msg3) Length() int64 { @@ -1106,16 +1106,16 @@ func (Msg3) AsString() (string, error) { func (Msg3) AsBytes() ([]byte, error) { return mixins.Map{TypeName: "gendemo.Msg3"}.AsBytes() } -func (Msg3) AsLink() (dms3ld.Link, error) { +func (Msg3) AsLink() (ld.Link, error) { return mixins.Map{TypeName: "gendemo.Msg3"}.AsLink() } -func (Msg3) Prototype() dms3ld.NodePrototype { +func (Msg3) Prototype() ld.NodePrototype { return _Msg3__Prototype{} } type _Msg3__Prototype struct{} -func (_Msg3__Prototype) NewBuilder() dms3ld.NodeBuilder { +func (_Msg3__Prototype) NewBuilder() ld.NodeBuilder { var nb _Msg3__Builder nb.Reset() return &nb @@ -1125,7 +1125,7 @@ type _Msg3__Builder struct { _Msg3__Assembler } -func (nb *_Msg3__Builder) Build() dms3ld.Node { +func (nb *_Msg3__Builder) Build() ld.Node { if *nb.m != schema.Maybe_Value { panic("invalid state: cannot call Build on an assembler that's not finished") } @@ -1165,7 +1165,7 @@ var ( fieldBits__Msg3_sufficient = 0 + 1<<0 + 1<<1 + 1<<2 ) -func (na *_Msg3__Assembler) BeginMap(int64) (dms3ld.MapAssembler, error) { +func (na *_Msg3__Assembler) BeginMap(int64) (ld.MapAssembler, error) { switch *na.m { case schema.Maybe_Value, schema.Maybe_Null: panic("invalid state: cannot assign into assembler that's already finished") @@ -1178,7 +1178,7 @@ func (na *_Msg3__Assembler) BeginMap(int64) (dms3ld.MapAssembler, error) { } return na, nil } -func (_Msg3__Assembler) BeginList(sizeHint int64) (dms3ld.ListAssembler, error) { +func (_Msg3__Assembler) BeginList(sizeHint int64) (ld.ListAssembler, error) { return mixins.MapAssembler{TypeName: "gendemo.Msg3"}.BeginList(0) } func (na *_Msg3__Assembler) AssignNull() error { @@ -1210,10 +1210,10 @@ func (_Msg3__Assembler) AssignString(string) error { func (_Msg3__Assembler) AssignBytes([]byte) error { return mixins.MapAssembler{TypeName: "gendemo.Msg3"}.AssignBytes(nil) } -func (_Msg3__Assembler) AssignLink(dms3ld.Link) error { +func (_Msg3__Assembler) AssignLink(ld.Link) error { return mixins.MapAssembler{TypeName: "gendemo.Msg3"}.AssignLink(nil) } -func (na *_Msg3__Assembler) AssignNode(v dms3ld.Node) error { +func (na *_Msg3__Assembler) AssignNode(v ld.Node) error { if v.IsNull() { return na.AssignNull() } @@ -1233,8 +1233,8 @@ func (na *_Msg3__Assembler) AssignNode(v dms3ld.Node) error { *na.m = schema.Maybe_Value return nil } - if v.Kind() != dms3ld.Kind_Map { - return dms3ld.ErrWrongKind{TypeName: "gendemo.Msg3", MethodName: "AssignNode", AppropriateKind: dms3ld.KindSet_JustMap, ActualKind: v.Kind()} + if v.Kind() != ld.Kind_Map { + return ld.ErrWrongKind{TypeName: "gendemo.Msg3", MethodName: "AssignNode", AppropriateKind: ld.KindSet_JustMap, ActualKind: v.Kind()} } itr := v.MapIterator() for !itr.Done() { @@ -1251,7 +1251,7 @@ func (na *_Msg3__Assembler) AssignNode(v dms3ld.Node) error { } return na.Finish() } -func (_Msg3__Assembler) Prototype() dms3ld.NodePrototype { +func (_Msg3__Assembler) Prototype() ld.NodePrototype { return _Msg3__Prototype{} } func (ma *_Msg3__Assembler) valueFinishTidy() bool { @@ -1290,7 +1290,7 @@ func (ma *_Msg3__Assembler) valueFinishTidy() bool { panic("unreachable") } } -func (ma *_Msg3__Assembler) AssembleEntry(k string) (dms3ld.NodeAssembler, error) { +func (ma *_Msg3__Assembler) AssembleEntry(k string) (ld.NodeAssembler, error) { switch ma.state { case maState_initial: // carry on @@ -1308,7 +1308,7 @@ func (ma *_Msg3__Assembler) AssembleEntry(k string) (dms3ld.NodeAssembler, error switch k { case "whee": if ma.s&fieldBit__Msg3_Whee != 0 { - return nil, dms3ld.ErrRepeatedMapKey{Key: &fieldName__Msg3_Whee} + return nil, ld.ErrRepeatedMapKey{Key: &fieldName__Msg3_Whee} } ma.s += fieldBit__Msg3_Whee ma.state = maState_midValue @@ -1318,7 +1318,7 @@ func (ma *_Msg3__Assembler) AssembleEntry(k string) (dms3ld.NodeAssembler, error return &ma.ca_whee, nil case "woot": if ma.s&fieldBit__Msg3_Woot != 0 { - return nil, dms3ld.ErrRepeatedMapKey{Key: &fieldName__Msg3_Woot} + return nil, ld.ErrRepeatedMapKey{Key: &fieldName__Msg3_Woot} } ma.s += fieldBit__Msg3_Woot ma.state = maState_midValue @@ -1328,7 +1328,7 @@ func (ma *_Msg3__Assembler) AssembleEntry(k string) (dms3ld.NodeAssembler, error return &ma.ca_woot, nil case "waga": if ma.s&fieldBit__Msg3_Waga != 0 { - return nil, dms3ld.ErrRepeatedMapKey{Key: &fieldName__Msg3_Waga} + return nil, ld.ErrRepeatedMapKey{Key: &fieldName__Msg3_Waga} } ma.s += fieldBit__Msg3_Waga ma.state = maState_midValue @@ -1337,9 +1337,9 @@ func (ma *_Msg3__Assembler) AssembleEntry(k string) (dms3ld.NodeAssembler, error ma.ca_waga.m = &ma.cm return &ma.ca_waga, nil } - return nil, dms3ld.ErrInvalidKey{TypeName: "gendemo.Msg3", Key: &_String{k}} + return nil, ld.ErrInvalidKey{TypeName: "gendemo.Msg3", Key: &_String{k}} } -func (ma *_Msg3__Assembler) AssembleKey() dms3ld.NodeAssembler { +func (ma *_Msg3__Assembler) AssembleKey() ld.NodeAssembler { switch ma.state { case maState_initial: // carry on @@ -1357,7 +1357,7 @@ func (ma *_Msg3__Assembler) AssembleKey() dms3ld.NodeAssembler { ma.state = maState_midKey return (*_Msg3__KeyAssembler)(ma) } -func (ma *_Msg3__Assembler) AssembleValue() dms3ld.NodeAssembler { +func (ma *_Msg3__Assembler) AssembleValue() ld.NodeAssembler { switch ma.state { case maState_initial: panic("invalid state: AssembleValue cannot be called when no key is primed") @@ -1404,7 +1404,7 @@ func (ma *_Msg3__Assembler) Finish() error { panic("invalid state: Finish cannot be called on an assembler that's already finished") } if ma.s&fieldBits__Msg3_sufficient != fieldBits__Msg3_sufficient { - err := dms3ld.ErrMissingRequiredField{Missing: make([]string, 0)} + err := ld.ErrMissingRequiredField{Missing: make([]string, 0)} if ma.s&fieldBit__Msg3_Whee == 0 { err.Missing = append(err.Missing, "whee") } @@ -1420,19 +1420,19 @@ func (ma *_Msg3__Assembler) Finish() error { *ma.m = schema.Maybe_Value return nil } -func (ma *_Msg3__Assembler) KeyPrototype() dms3ld.NodePrototype { +func (ma *_Msg3__Assembler) KeyPrototype() ld.NodePrototype { return _String__Prototype{} } -func (ma *_Msg3__Assembler) ValuePrototype(k string) dms3ld.NodePrototype { +func (ma *_Msg3__Assembler) ValuePrototype(k string) ld.NodePrototype { panic("todo structbuilder mapassembler valueprototype") } type _Msg3__KeyAssembler _Msg3__Assembler -func (_Msg3__KeyAssembler) BeginMap(sizeHint int64) (dms3ld.MapAssembler, error) { +func (_Msg3__KeyAssembler) BeginMap(sizeHint int64) (ld.MapAssembler, error) { return mixins.StringAssembler{TypeName: "gendemo.Msg3.KeyAssembler"}.BeginMap(0) } -func (_Msg3__KeyAssembler) BeginList(sizeHint int64) (dms3ld.ListAssembler, error) { +func (_Msg3__KeyAssembler) BeginList(sizeHint int64) (ld.ListAssembler, error) { return mixins.StringAssembler{TypeName: "gendemo.Msg3.KeyAssembler"}.BeginList(0) } func (na *_Msg3__KeyAssembler) AssignNull() error { @@ -1454,50 +1454,50 @@ func (ka *_Msg3__KeyAssembler) AssignString(k string) error { switch k { case "whee": if ka.s&fieldBit__Msg3_Whee != 0 { - return dms3ld.ErrRepeatedMapKey{Key: &fieldName__Msg3_Whee} + return ld.ErrRepeatedMapKey{Key: &fieldName__Msg3_Whee} } ka.s += fieldBit__Msg3_Whee ka.state = maState_expectValue ka.f = 0 case "woot": if ka.s&fieldBit__Msg3_Woot != 0 { - return dms3ld.ErrRepeatedMapKey{Key: &fieldName__Msg3_Woot} + return ld.ErrRepeatedMapKey{Key: &fieldName__Msg3_Woot} } ka.s += fieldBit__Msg3_Woot ka.state = maState_expectValue ka.f = 1 case "waga": if ka.s&fieldBit__Msg3_Waga != 0 { - return dms3ld.ErrRepeatedMapKey{Key: &fieldName__Msg3_Waga} + return ld.ErrRepeatedMapKey{Key: &fieldName__Msg3_Waga} } ka.s += fieldBit__Msg3_Waga ka.state = maState_expectValue ka.f = 2 default: - return dms3ld.ErrInvalidKey{TypeName: "gendemo.Msg3", Key: &_String{k}} + return ld.ErrInvalidKey{TypeName: "gendemo.Msg3", Key: &_String{k}} } return nil } func (_Msg3__KeyAssembler) AssignBytes([]byte) error { return mixins.StringAssembler{TypeName: "gendemo.Msg3.KeyAssembler"}.AssignBytes(nil) } -func (_Msg3__KeyAssembler) AssignLink(dms3ld.Link) error { +func (_Msg3__KeyAssembler) AssignLink(ld.Link) error { return mixins.StringAssembler{TypeName: "gendemo.Msg3.KeyAssembler"}.AssignLink(nil) } -func (ka *_Msg3__KeyAssembler) AssignNode(v dms3ld.Node) error { +func (ka *_Msg3__KeyAssembler) AssignNode(v ld.Node) error { if v2, err := v.AsString(); err != nil { return err } else { return ka.AssignString(v2) } } -func (_Msg3__KeyAssembler) Prototype() dms3ld.NodePrototype { +func (_Msg3__KeyAssembler) Prototype() ld.NodePrototype { return _String__Prototype{} } func (Msg3) Type() schema.Type { return nil /*TODO:typelit*/ } -func (n Msg3) Representation() dms3ld.Node { +func (n Msg3) Representation() ld.Node { return (*_Msg3__Repr)(n) } @@ -1508,12 +1508,12 @@ var ( fieldName__Msg3_Woot_serial = _String{"woot"} fieldName__Msg3_Waga_serial = _String{"waga"} ) -var _ dms3ld.Node = &_Msg3__Repr{} +var _ ld.Node = &_Msg3__Repr{} -func (_Msg3__Repr) Kind() dms3ld.Kind { - return dms3ld.Kind_Map +func (_Msg3__Repr) Kind() ld.Kind { + return ld.Kind_Map } -func (n *_Msg3__Repr) LookupByString(key string) (dms3ld.Node, error) { +func (n *_Msg3__Repr) LookupByString(key string) (ld.Node, error) { switch key { case "whee": return n.whee.Representation(), nil @@ -1522,23 +1522,23 @@ func (n *_Msg3__Repr) LookupByString(key string) (dms3ld.Node, error) { case "waga": return n.waga.Representation(), nil default: - return nil, schema.ErrNoSuchField{Type: nil /*TODO*/, Field: dms3ld.PathSegmentOfString(key)} + return nil, schema.ErrNoSuchField{Type: nil /*TODO*/, Field: ld.PathSegmentOfString(key)} } } -func (n *_Msg3__Repr) LookupByNode(key dms3ld.Node) (dms3ld.Node, error) { +func (n *_Msg3__Repr) LookupByNode(key ld.Node) (ld.Node, error) { ks, err := key.AsString() if err != nil { return nil, err } return n.LookupByString(ks) } -func (_Msg3__Repr) LookupByIndex(idx int64) (dms3ld.Node, error) { +func (_Msg3__Repr) LookupByIndex(idx int64) (ld.Node, error) { return mixins.Map{TypeName: "gendemo.Msg3.Repr"}.LookupByIndex(0) } -func (n _Msg3__Repr) LookupBySegment(seg dms3ld.PathSegment) (dms3ld.Node, error) { +func (n _Msg3__Repr) LookupBySegment(seg ld.PathSegment) (ld.Node, error) { return n.LookupByString(seg.String()) } -func (n *_Msg3__Repr) MapIterator() dms3ld.MapIterator { +func (n *_Msg3__Repr) MapIterator() ld.MapIterator { return &_Msg3__ReprMapItr{n, 0} } @@ -1547,9 +1547,9 @@ type _Msg3__ReprMapItr struct { idx int } -func (itr *_Msg3__ReprMapItr) Next() (k dms3ld.Node, v dms3ld.Node, _ error) { +func (itr *_Msg3__ReprMapItr) Next() (k ld.Node, v ld.Node, _ error) { if itr.idx >= 3 { - return nil, nil, dms3ld.ErrIteratorOverread{} + return nil, nil, ld.ErrIteratorOverread{} } switch itr.idx { case 0: @@ -1570,7 +1570,7 @@ func (itr *_Msg3__ReprMapItr) Next() (k dms3ld.Node, v dms3ld.Node, _ error) { func (itr *_Msg3__ReprMapItr) Done() bool { return itr.idx >= 3 } -func (_Msg3__Repr) ListIterator() dms3ld.ListIterator { +func (_Msg3__Repr) ListIterator() ld.ListIterator { return nil } func (rn *_Msg3__Repr) Length() int64 { @@ -1598,16 +1598,16 @@ func (_Msg3__Repr) AsString() (string, error) { func (_Msg3__Repr) AsBytes() ([]byte, error) { return mixins.Map{TypeName: "gendemo.Msg3.Repr"}.AsBytes() } -func (_Msg3__Repr) AsLink() (dms3ld.Link, error) { +func (_Msg3__Repr) AsLink() (ld.Link, error) { return mixins.Map{TypeName: "gendemo.Msg3.Repr"}.AsLink() } -func (_Msg3__Repr) Prototype() dms3ld.NodePrototype { +func (_Msg3__Repr) Prototype() ld.NodePrototype { return _Msg3__ReprPrototype{} } type _Msg3__ReprPrototype struct{} -func (_Msg3__ReprPrototype) NewBuilder() dms3ld.NodeBuilder { +func (_Msg3__ReprPrototype) NewBuilder() ld.NodeBuilder { var nb _Msg3__ReprBuilder nb.Reset() return &nb @@ -1617,7 +1617,7 @@ type _Msg3__ReprBuilder struct { _Msg3__ReprAssembler } -func (nb *_Msg3__ReprBuilder) Build() dms3ld.Node { +func (nb *_Msg3__ReprBuilder) Build() ld.Node { if *nb.m != schema.Maybe_Value { panic("invalid state: cannot call Build on an assembler that's not finished") } @@ -1649,7 +1649,7 @@ func (na *_Msg3__ReprAssembler) reset() { na.ca_woot.reset() na.ca_waga.reset() } -func (na *_Msg3__ReprAssembler) BeginMap(int64) (dms3ld.MapAssembler, error) { +func (na *_Msg3__ReprAssembler) BeginMap(int64) (ld.MapAssembler, error) { switch *na.m { case schema.Maybe_Value, schema.Maybe_Null: panic("invalid state: cannot assign into assembler that's already finished") @@ -1662,7 +1662,7 @@ func (na *_Msg3__ReprAssembler) BeginMap(int64) (dms3ld.MapAssembler, error) { } return na, nil } -func (_Msg3__ReprAssembler) BeginList(sizeHint int64) (dms3ld.ListAssembler, error) { +func (_Msg3__ReprAssembler) BeginList(sizeHint int64) (ld.ListAssembler, error) { return mixins.MapAssembler{TypeName: "gendemo.Msg3.Repr"}.BeginList(0) } func (na *_Msg3__ReprAssembler) AssignNull() error { @@ -1694,10 +1694,10 @@ func (_Msg3__ReprAssembler) AssignString(string) error { func (_Msg3__ReprAssembler) AssignBytes([]byte) error { return mixins.MapAssembler{TypeName: "gendemo.Msg3.Repr"}.AssignBytes(nil) } -func (_Msg3__ReprAssembler) AssignLink(dms3ld.Link) error { +func (_Msg3__ReprAssembler) AssignLink(ld.Link) error { return mixins.MapAssembler{TypeName: "gendemo.Msg3.Repr"}.AssignLink(nil) } -func (na *_Msg3__ReprAssembler) AssignNode(v dms3ld.Node) error { +func (na *_Msg3__ReprAssembler) AssignNode(v ld.Node) error { if v.IsNull() { return na.AssignNull() } @@ -1717,8 +1717,8 @@ func (na *_Msg3__ReprAssembler) AssignNode(v dms3ld.Node) error { *na.m = schema.Maybe_Value return nil } - if v.Kind() != dms3ld.Kind_Map { - return dms3ld.ErrWrongKind{TypeName: "gendemo.Msg3.Repr", MethodName: "AssignNode", AppropriateKind: dms3ld.KindSet_JustMap, ActualKind: v.Kind()} + if v.Kind() != ld.Kind_Map { + return ld.ErrWrongKind{TypeName: "gendemo.Msg3.Repr", MethodName: "AssignNode", AppropriateKind: ld.KindSet_JustMap, ActualKind: v.Kind()} } itr := v.MapIterator() for !itr.Done() { @@ -1735,7 +1735,7 @@ func (na *_Msg3__ReprAssembler) AssignNode(v dms3ld.Node) error { } return na.Finish() } -func (_Msg3__ReprAssembler) Prototype() dms3ld.NodePrototype { +func (_Msg3__ReprAssembler) Prototype() ld.NodePrototype { return _Msg3__ReprPrototype{} } func (ma *_Msg3__ReprAssembler) valueFinishTidy() bool { @@ -1771,7 +1771,7 @@ func (ma *_Msg3__ReprAssembler) valueFinishTidy() bool { panic("unreachable") } } -func (ma *_Msg3__ReprAssembler) AssembleEntry(k string) (dms3ld.NodeAssembler, error) { +func (ma *_Msg3__ReprAssembler) AssembleEntry(k string) (ld.NodeAssembler, error) { switch ma.state { case maState_initial: // carry on @@ -1789,7 +1789,7 @@ func (ma *_Msg3__ReprAssembler) AssembleEntry(k string) (dms3ld.NodeAssembler, e switch k { case "whee": if ma.s&fieldBit__Msg3_Whee != 0 { - return nil, dms3ld.ErrRepeatedMapKey{Key: &fieldName__Msg3_Whee_serial} + return nil, ld.ErrRepeatedMapKey{Key: &fieldName__Msg3_Whee_serial} } ma.s += fieldBit__Msg3_Whee ma.state = maState_midValue @@ -1799,7 +1799,7 @@ func (ma *_Msg3__ReprAssembler) AssembleEntry(k string) (dms3ld.NodeAssembler, e return &ma.ca_whee, nil case "woot": if ma.s&fieldBit__Msg3_Woot != 0 { - return nil, dms3ld.ErrRepeatedMapKey{Key: &fieldName__Msg3_Woot_serial} + return nil, ld.ErrRepeatedMapKey{Key: &fieldName__Msg3_Woot_serial} } ma.s += fieldBit__Msg3_Woot ma.state = maState_midValue @@ -1809,7 +1809,7 @@ func (ma *_Msg3__ReprAssembler) AssembleEntry(k string) (dms3ld.NodeAssembler, e return &ma.ca_woot, nil case "waga": if ma.s&fieldBit__Msg3_Waga != 0 { - return nil, dms3ld.ErrRepeatedMapKey{Key: &fieldName__Msg3_Waga_serial} + return nil, ld.ErrRepeatedMapKey{Key: &fieldName__Msg3_Waga_serial} } ma.s += fieldBit__Msg3_Waga ma.state = maState_midValue @@ -1819,9 +1819,9 @@ func (ma *_Msg3__ReprAssembler) AssembleEntry(k string) (dms3ld.NodeAssembler, e return &ma.ca_waga, nil default: } - return nil, dms3ld.ErrInvalidKey{TypeName: "gendemo.Msg3.Repr", Key: &_String{k}} + return nil, ld.ErrInvalidKey{TypeName: "gendemo.Msg3.Repr", Key: &_String{k}} } -func (ma *_Msg3__ReprAssembler) AssembleKey() dms3ld.NodeAssembler { +func (ma *_Msg3__ReprAssembler) AssembleKey() ld.NodeAssembler { switch ma.state { case maState_initial: // carry on @@ -1839,7 +1839,7 @@ func (ma *_Msg3__ReprAssembler) AssembleKey() dms3ld.NodeAssembler { ma.state = maState_midKey return (*_Msg3__ReprKeyAssembler)(ma) } -func (ma *_Msg3__ReprAssembler) AssembleValue() dms3ld.NodeAssembler { +func (ma *_Msg3__ReprAssembler) AssembleValue() ld.NodeAssembler { switch ma.state { case maState_initial: panic("invalid state: AssembleValue cannot be called when no key is primed") @@ -1886,7 +1886,7 @@ func (ma *_Msg3__ReprAssembler) Finish() error { panic("invalid state: Finish cannot be called on an assembler that's already finished") } if ma.s&fieldBits__Msg3_sufficient != fieldBits__Msg3_sufficient { - err := dms3ld.ErrMissingRequiredField{Missing: make([]string, 0)} + err := ld.ErrMissingRequiredField{Missing: make([]string, 0)} if ma.s&fieldBit__Msg3_Whee == 0 { err.Missing = append(err.Missing, "whee") } @@ -1902,19 +1902,19 @@ func (ma *_Msg3__ReprAssembler) Finish() error { *ma.m = schema.Maybe_Value return nil } -func (ma *_Msg3__ReprAssembler) KeyPrototype() dms3ld.NodePrototype { +func (ma *_Msg3__ReprAssembler) KeyPrototype() ld.NodePrototype { return _String__Prototype{} } -func (ma *_Msg3__ReprAssembler) ValuePrototype(k string) dms3ld.NodePrototype { +func (ma *_Msg3__ReprAssembler) ValuePrototype(k string) ld.NodePrototype { panic("todo structbuilder mapassembler repr valueprototype") } type _Msg3__ReprKeyAssembler _Msg3__ReprAssembler -func (_Msg3__ReprKeyAssembler) BeginMap(sizeHint int64) (dms3ld.MapAssembler, error) { +func (_Msg3__ReprKeyAssembler) BeginMap(sizeHint int64) (ld.MapAssembler, error) { return mixins.StringAssembler{TypeName: "gendemo.Msg3.Repr.KeyAssembler"}.BeginMap(0) } -func (_Msg3__ReprKeyAssembler) BeginList(sizeHint int64) (dms3ld.ListAssembler, error) { +func (_Msg3__ReprKeyAssembler) BeginList(sizeHint int64) (ld.ListAssembler, error) { return mixins.StringAssembler{TypeName: "gendemo.Msg3.Repr.KeyAssembler"}.BeginList(0) } func (na *_Msg3__ReprKeyAssembler) AssignNull() error { @@ -1936,7 +1936,7 @@ func (ka *_Msg3__ReprKeyAssembler) AssignString(k string) error { switch k { case "whee": if ka.s&fieldBit__Msg3_Whee != 0 { - return dms3ld.ErrRepeatedMapKey{Key: &fieldName__Msg3_Whee_serial} + return ld.ErrRepeatedMapKey{Key: &fieldName__Msg3_Whee_serial} } ka.s += fieldBit__Msg3_Whee ka.state = maState_expectValue @@ -1944,7 +1944,7 @@ func (ka *_Msg3__ReprKeyAssembler) AssignString(k string) error { return nil case "woot": if ka.s&fieldBit__Msg3_Woot != 0 { - return dms3ld.ErrRepeatedMapKey{Key: &fieldName__Msg3_Woot_serial} + return ld.ErrRepeatedMapKey{Key: &fieldName__Msg3_Woot_serial} } ka.s += fieldBit__Msg3_Woot ka.state = maState_expectValue @@ -1952,29 +1952,29 @@ func (ka *_Msg3__ReprKeyAssembler) AssignString(k string) error { return nil case "waga": if ka.s&fieldBit__Msg3_Waga != 0 { - return dms3ld.ErrRepeatedMapKey{Key: &fieldName__Msg3_Waga_serial} + return ld.ErrRepeatedMapKey{Key: &fieldName__Msg3_Waga_serial} } ka.s += fieldBit__Msg3_Waga ka.state = maState_expectValue ka.f = 2 return nil } - return dms3ld.ErrInvalidKey{TypeName: "gendemo.Msg3.Repr", Key: &_String{k}} + return ld.ErrInvalidKey{TypeName: "gendemo.Msg3.Repr", Key: &_String{k}} } func (_Msg3__ReprKeyAssembler) AssignBytes([]byte) error { return mixins.StringAssembler{TypeName: "gendemo.Msg3.Repr.KeyAssembler"}.AssignBytes(nil) } -func (_Msg3__ReprKeyAssembler) AssignLink(dms3ld.Link) error { +func (_Msg3__ReprKeyAssembler) AssignLink(ld.Link) error { return mixins.StringAssembler{TypeName: "gendemo.Msg3.Repr.KeyAssembler"}.AssignLink(nil) } -func (ka *_Msg3__ReprKeyAssembler) AssignNode(v dms3ld.Node) error { +func (ka *_Msg3__ReprKeyAssembler) AssignNode(v ld.Node) error { if v2, err := v.AsString(); err != nil { return err } else { return ka.AssignString(v2) } } -func (_Msg3__ReprKeyAssembler) Prototype() dms3ld.NodePrototype { +func (_Msg3__ReprKeyAssembler) Prototype() ld.NodePrototype { return _String__Prototype{} } @@ -2005,12 +2005,12 @@ func (m MaybeString) IsAbsent() bool { func (m MaybeString) Exists() bool { return m.m == schema.Maybe_Value } -func (m MaybeString) AsNode() dms3ld.Node { +func (m MaybeString) AsNode() ld.Node { switch m.m { case schema.Maybe_Absent: - return dms3ld.Absent + return ld.Absent case schema.Maybe_Null: - return dms3ld.Null + return ld.Null case schema.Maybe_Value: return &m.v default: @@ -2024,28 +2024,28 @@ func (m MaybeString) Must() String { return &m.v } -var _ dms3ld.Node = (String)(&_String{}) +var _ ld.Node = (String)(&_String{}) var _ schema.TypedNode = (String)(&_String{}) -func (String) Kind() dms3ld.Kind { - return dms3ld.Kind_String +func (String) Kind() ld.Kind { + return ld.Kind_String } -func (String) LookupByString(string) (dms3ld.Node, error) { +func (String) LookupByString(string) (ld.Node, error) { return mixins.String{TypeName: "gendemo.String"}.LookupByString("") } -func (String) LookupByNode(dms3ld.Node) (dms3ld.Node, error) { +func (String) LookupByNode(ld.Node) (ld.Node, error) { return mixins.String{TypeName: "gendemo.String"}.LookupByNode(nil) } -func (String) LookupByIndex(idx int64) (dms3ld.Node, error) { +func (String) LookupByIndex(idx int64) (ld.Node, error) { return mixins.String{TypeName: "gendemo.String"}.LookupByIndex(0) } -func (String) LookupBySegment(seg dms3ld.PathSegment) (dms3ld.Node, error) { +func (String) LookupBySegment(seg ld.PathSegment) (ld.Node, error) { return mixins.String{TypeName: "gendemo.String"}.LookupBySegment(seg) } -func (String) MapIterator() dms3ld.MapIterator { +func (String) MapIterator() ld.MapIterator { return nil } -func (String) ListIterator() dms3ld.ListIterator { +func (String) ListIterator() ld.ListIterator { return nil } func (String) Length() int64 { @@ -2072,16 +2072,16 @@ func (n String) AsString() (string, error) { func (String) AsBytes() ([]byte, error) { return mixins.String{TypeName: "gendemo.String"}.AsBytes() } -func (String) AsLink() (dms3ld.Link, error) { +func (String) AsLink() (ld.Link, error) { return mixins.String{TypeName: "gendemo.String"}.AsLink() } -func (String) Prototype() dms3ld.NodePrototype { +func (String) Prototype() ld.NodePrototype { return _String__Prototype{} } type _String__Prototype struct{} -func (_String__Prototype) NewBuilder() dms3ld.NodeBuilder { +func (_String__Prototype) NewBuilder() ld.NodeBuilder { var nb _String__Builder nb.Reset() return &nb @@ -2091,7 +2091,7 @@ type _String__Builder struct { _String__Assembler } -func (nb *_String__Builder) Build() dms3ld.Node { +func (nb *_String__Builder) Build() ld.Node { if *nb.m != schema.Maybe_Value { panic("invalid state: cannot call Build on an assembler that's not finished") } @@ -2109,10 +2109,10 @@ type _String__Assembler struct { } func (na *_String__Assembler) reset() {} -func (_String__Assembler) BeginMap(sizeHint int64) (dms3ld.MapAssembler, error) { +func (_String__Assembler) BeginMap(sizeHint int64) (ld.MapAssembler, error) { return mixins.StringAssembler{TypeName: "gendemo.String"}.BeginMap(0) } -func (_String__Assembler) BeginList(sizeHint int64) (dms3ld.ListAssembler, error) { +func (_String__Assembler) BeginList(sizeHint int64) (ld.ListAssembler, error) { return mixins.StringAssembler{TypeName: "gendemo.String"}.BeginList(0) } func (na *_String__Assembler) AssignNull() error { @@ -2148,10 +2148,10 @@ func (na *_String__Assembler) AssignString(v string) error { func (_String__Assembler) AssignBytes([]byte) error { return mixins.StringAssembler{TypeName: "gendemo.String"}.AssignBytes(nil) } -func (_String__Assembler) AssignLink(dms3ld.Link) error { +func (_String__Assembler) AssignLink(ld.Link) error { return mixins.StringAssembler{TypeName: "gendemo.String"}.AssignLink(nil) } -func (na *_String__Assembler) AssignNode(v dms3ld.Node) error { +func (na *_String__Assembler) AssignNode(v ld.Node) error { if v.IsNull() { return na.AssignNull() } @@ -2170,19 +2170,19 @@ func (na *_String__Assembler) AssignNode(v dms3ld.Node) error { return na.AssignString(v2) } } -func (_String__Assembler) Prototype() dms3ld.NodePrototype { +func (_String__Assembler) Prototype() ld.NodePrototype { return _String__Prototype{} } func (String) Type() schema.Type { return nil /*TODO:typelit*/ } -func (n String) Representation() dms3ld.Node { +func (n String) Representation() ld.Node { return (*_String__Repr)(n) } type _String__Repr = _String -var _ dms3ld.Node = &_String__Repr{} +var _ ld.Node = &_String__Repr{} type _String__ReprPrototype = _String__Prototype type _String__ReprAssembler = _String__Assembler diff --git a/node/gendemo/dms3ldsch_types.go b/node/gendemo/ldsch_types.go similarity index 89% rename from node/gendemo/dms3ldsch_types.go rename to node/gendemo/ldsch_types.go index f4908dc05b7865f7ce55e98a562c02781d9282d7..cafd1d938f6ffd76994fa1fc28427d1285e07787 100644 --- a/node/gendemo/dms3ldsch_types.go +++ b/node/gendemo/ldsch_types.go @@ -1,12 +1,12 @@ package gendemo -// Code generated by go-dms3ld-prime gengo. DO NOT EDIT. +// Code generated by go-ld-prime gengo. DO NOT EDIT. import ( - dms3ld "gitlab.dms3.io/ld/go-ld-prime" + ld "gitlab.dms3.io/ld/go-ld-prime" ) -var _ dms3ld.Node = nil // suppress errors when this dependency is not referenced +var _ ld.Node = nil // suppress errors when this dependency is not referenced // Type is a struct embeding a NodePrototype/Type for every Node implementation in this package. // One of its major uses is to start the construction of a value. // You can use it like this: diff --git a/node/mixins/bool.go b/node/mixins/bool.go index d4c9345eeff8427d41550e92f3b4277df6b29945..54a4b9f4c9749ead52e7aa2546c5d2721b78966e 100644 --- a/node/mixins/bool.go +++ b/node/mixins/bool.go @@ -1,7 +1,7 @@ package mixins import ( - dms3ld "gitlab.dms3.io/ld/go-ld-prime" + ld "gitlab.dms3.io/ld/go-ld-prime" ) // Bool can be embedded in a struct to provide all the methods that @@ -19,25 +19,25 @@ type Bool struct { TypeName string } -func (Bool) Kind() dms3ld.Kind { - return dms3ld.Kind_Bool +func (Bool) Kind() ld.Kind { + return ld.Kind_Bool } -func (x Bool) LookupByString(string) (dms3ld.Node, error) { - return nil, dms3ld.ErrWrongKind{TypeName: x.TypeName, MethodName: "LookupByString", AppropriateKind: dms3ld.KindSet_JustMap, ActualKind: dms3ld.Kind_Bool} +func (x Bool) LookupByString(string) (ld.Node, error) { + return nil, ld.ErrWrongKind{TypeName: x.TypeName, MethodName: "LookupByString", AppropriateKind: ld.KindSet_JustMap, ActualKind: ld.Kind_Bool} } -func (x Bool) LookupByNode(key dms3ld.Node) (dms3ld.Node, error) { - return nil, dms3ld.ErrWrongKind{TypeName: x.TypeName, MethodName: "LookupByNode", AppropriateKind: dms3ld.KindSet_JustMap, ActualKind: dms3ld.Kind_Bool} +func (x Bool) LookupByNode(key ld.Node) (ld.Node, error) { + return nil, ld.ErrWrongKind{TypeName: x.TypeName, MethodName: "LookupByNode", AppropriateKind: ld.KindSet_JustMap, ActualKind: ld.Kind_Bool} } -func (x Bool) LookupByIndex(idx int64) (dms3ld.Node, error) { - return nil, dms3ld.ErrWrongKind{TypeName: x.TypeName, MethodName: "LookupByIndex", AppropriateKind: dms3ld.KindSet_JustList, ActualKind: dms3ld.Kind_Bool} +func (x Bool) LookupByIndex(idx int64) (ld.Node, error) { + return nil, ld.ErrWrongKind{TypeName: x.TypeName, MethodName: "LookupByIndex", AppropriateKind: ld.KindSet_JustList, ActualKind: ld.Kind_Bool} } -func (x Bool) LookupBySegment(dms3ld.PathSegment) (dms3ld.Node, error) { - return nil, dms3ld.ErrWrongKind{TypeName: x.TypeName, MethodName: "LookupBySegment", AppropriateKind: dms3ld.KindSet_Recursive, ActualKind: dms3ld.Kind_Bool} +func (x Bool) LookupBySegment(ld.PathSegment) (ld.Node, error) { + return nil, ld.ErrWrongKind{TypeName: x.TypeName, MethodName: "LookupBySegment", AppropriateKind: ld.KindSet_Recursive, ActualKind: ld.Kind_Bool} } -func (Bool) MapIterator() dms3ld.MapIterator { +func (Bool) MapIterator() ld.MapIterator { return nil } -func (Bool) ListIterator() dms3ld.ListIterator { +func (Bool) ListIterator() ld.ListIterator { return nil } func (Bool) Length() int64 { @@ -50,19 +50,19 @@ func (Bool) IsNull() bool { return false } func (x Bool) AsInt() (int64, error) { - return 0, dms3ld.ErrWrongKind{TypeName: x.TypeName, MethodName: "AsInt", AppropriateKind: dms3ld.KindSet_JustInt, ActualKind: dms3ld.Kind_Bool} + return 0, ld.ErrWrongKind{TypeName: x.TypeName, MethodName: "AsInt", AppropriateKind: ld.KindSet_JustInt, ActualKind: ld.Kind_Bool} } func (x Bool) AsFloat() (float64, error) { - return 0, dms3ld.ErrWrongKind{TypeName: x.TypeName, MethodName: "AsFloat", AppropriateKind: dms3ld.KindSet_JustFloat, ActualKind: dms3ld.Kind_Bool} + return 0, ld.ErrWrongKind{TypeName: x.TypeName, MethodName: "AsFloat", AppropriateKind: ld.KindSet_JustFloat, ActualKind: ld.Kind_Bool} } func (x Bool) AsString() (string, error) { - return "", dms3ld.ErrWrongKind{TypeName: x.TypeName, MethodName: "AsString", AppropriateKind: dms3ld.KindSet_JustString, ActualKind: dms3ld.Kind_Bool} + return "", ld.ErrWrongKind{TypeName: x.TypeName, MethodName: "AsString", AppropriateKind: ld.KindSet_JustString, ActualKind: ld.Kind_Bool} } func (x Bool) AsBytes() ([]byte, error) { - return nil, dms3ld.ErrWrongKind{TypeName: x.TypeName, MethodName: "AsBytes", AppropriateKind: dms3ld.KindSet_JustBytes, ActualKind: dms3ld.Kind_Bool} + return nil, ld.ErrWrongKind{TypeName: x.TypeName, MethodName: "AsBytes", AppropriateKind: ld.KindSet_JustBytes, ActualKind: ld.Kind_Bool} } -func (x Bool) AsLink() (dms3ld.Link, error) { - return nil, dms3ld.ErrWrongKind{TypeName: x.TypeName, MethodName: "AsLink", AppropriateKind: dms3ld.KindSet_JustLink, ActualKind: dms3ld.Kind_Bool} +func (x Bool) AsLink() (ld.Link, error) { + return nil, ld.ErrWrongKind{TypeName: x.TypeName, MethodName: "AsLink", AppropriateKind: ld.KindSet_JustLink, ActualKind: ld.Kind_Bool} } // BoolAssembler has similar purpose as Bool, but for (you guessed it) @@ -71,27 +71,27 @@ type BoolAssembler struct { TypeName string } -func (x BoolAssembler) BeginMap(sizeHint int64) (dms3ld.MapAssembler, error) { - return nil, dms3ld.ErrWrongKind{TypeName: x.TypeName, MethodName: "BeginMap", AppropriateKind: dms3ld.KindSet_JustMap, ActualKind: dms3ld.Kind_Bool} +func (x BoolAssembler) BeginMap(sizeHint int64) (ld.MapAssembler, error) { + return nil, ld.ErrWrongKind{TypeName: x.TypeName, MethodName: "BeginMap", AppropriateKind: ld.KindSet_JustMap, ActualKind: ld.Kind_Bool} } -func (x BoolAssembler) BeginList(sizeHint int64) (dms3ld.ListAssembler, error) { - return nil, dms3ld.ErrWrongKind{TypeName: x.TypeName, MethodName: "BeginList", AppropriateKind: dms3ld.KindSet_JustList, ActualKind: dms3ld.Kind_Bool} +func (x BoolAssembler) BeginList(sizeHint int64) (ld.ListAssembler, error) { + return nil, ld.ErrWrongKind{TypeName: x.TypeName, MethodName: "BeginList", AppropriateKind: ld.KindSet_JustList, ActualKind: ld.Kind_Bool} } func (x BoolAssembler) AssignNull() error { - return dms3ld.ErrWrongKind{TypeName: x.TypeName, MethodName: "AssignNull", AppropriateKind: dms3ld.KindSet_JustNull, ActualKind: dms3ld.Kind_Bool} + return ld.ErrWrongKind{TypeName: x.TypeName, MethodName: "AssignNull", AppropriateKind: ld.KindSet_JustNull, ActualKind: ld.Kind_Bool} } func (x BoolAssembler) AssignInt(int64) error { - return dms3ld.ErrWrongKind{TypeName: x.TypeName, MethodName: "AssignInt", AppropriateKind: dms3ld.KindSet_JustInt, ActualKind: dms3ld.Kind_Bool} + return ld.ErrWrongKind{TypeName: x.TypeName, MethodName: "AssignInt", AppropriateKind: ld.KindSet_JustInt, ActualKind: ld.Kind_Bool} } func (x BoolAssembler) AssignFloat(float64) error { - return dms3ld.ErrWrongKind{TypeName: x.TypeName, MethodName: "AssignFloat", AppropriateKind: dms3ld.KindSet_JustFloat, ActualKind: dms3ld.Kind_Bool} + return ld.ErrWrongKind{TypeName: x.TypeName, MethodName: "AssignFloat", AppropriateKind: ld.KindSet_JustFloat, ActualKind: ld.Kind_Bool} } func (x BoolAssembler) AssignString(string) error { - return dms3ld.ErrWrongKind{TypeName: x.TypeName, MethodName: "AssignString", AppropriateKind: dms3ld.KindSet_JustString, ActualKind: dms3ld.Kind_Bool} + return ld.ErrWrongKind{TypeName: x.TypeName, MethodName: "AssignString", AppropriateKind: ld.KindSet_JustString, ActualKind: ld.Kind_Bool} } func (x BoolAssembler) AssignBytes([]byte) error { - return dms3ld.ErrWrongKind{TypeName: x.TypeName, MethodName: "AssignBytes", AppropriateKind: dms3ld.KindSet_JustBytes, ActualKind: dms3ld.Kind_Bool} + return ld.ErrWrongKind{TypeName: x.TypeName, MethodName: "AssignBytes", AppropriateKind: ld.KindSet_JustBytes, ActualKind: ld.Kind_Bool} } -func (x BoolAssembler) AssignLink(dms3ld.Link) error { - return dms3ld.ErrWrongKind{TypeName: x.TypeName, MethodName: "AssignLink", AppropriateKind: dms3ld.KindSet_JustLink, ActualKind: dms3ld.Kind_Bool} +func (x BoolAssembler) AssignLink(ld.Link) error { + return ld.ErrWrongKind{TypeName: x.TypeName, MethodName: "AssignLink", AppropriateKind: ld.KindSet_JustLink, ActualKind: ld.Kind_Bool} } diff --git a/node/mixins/bytes.go b/node/mixins/bytes.go index 24fc60ac60307b784ecc820b88f1bb0767cde0e0..c3315472589a9dae368d061346cea27ee08489b5 100644 --- a/node/mixins/bytes.go +++ b/node/mixins/bytes.go @@ -1,7 +1,7 @@ package mixins import ( - dms3ld "gitlab.dms3.io/ld/go-ld-prime" + ld "gitlab.dms3.io/ld/go-ld-prime" ) // Bytes can be embedded in a struct to provide all the methods that @@ -19,25 +19,25 @@ type Bytes struct { TypeName string } -func (Bytes) Kind() dms3ld.Kind { - return dms3ld.Kind_Bytes +func (Bytes) Kind() ld.Kind { + return ld.Kind_Bytes } -func (x Bytes) LookupByString(string) (dms3ld.Node, error) { - return nil, dms3ld.ErrWrongKind{TypeName: x.TypeName, MethodName: "LookupByString", AppropriateKind: dms3ld.KindSet_JustMap, ActualKind: dms3ld.Kind_Bytes} +func (x Bytes) LookupByString(string) (ld.Node, error) { + return nil, ld.ErrWrongKind{TypeName: x.TypeName, MethodName: "LookupByString", AppropriateKind: ld.KindSet_JustMap, ActualKind: ld.Kind_Bytes} } -func (x Bytes) LookupByNode(key dms3ld.Node) (dms3ld.Node, error) { - return nil, dms3ld.ErrWrongKind{TypeName: x.TypeName, MethodName: "LookupByNode", AppropriateKind: dms3ld.KindSet_JustMap, ActualKind: dms3ld.Kind_Bytes} +func (x Bytes) LookupByNode(key ld.Node) (ld.Node, error) { + return nil, ld.ErrWrongKind{TypeName: x.TypeName, MethodName: "LookupByNode", AppropriateKind: ld.KindSet_JustMap, ActualKind: ld.Kind_Bytes} } -func (x Bytes) LookupByIndex(idx int64) (dms3ld.Node, error) { - return nil, dms3ld.ErrWrongKind{TypeName: x.TypeName, MethodName: "LookupByIndex", AppropriateKind: dms3ld.KindSet_JustList, ActualKind: dms3ld.Kind_Bytes} +func (x Bytes) LookupByIndex(idx int64) (ld.Node, error) { + return nil, ld.ErrWrongKind{TypeName: x.TypeName, MethodName: "LookupByIndex", AppropriateKind: ld.KindSet_JustList, ActualKind: ld.Kind_Bytes} } -func (x Bytes) LookupBySegment(dms3ld.PathSegment) (dms3ld.Node, error) { - return nil, dms3ld.ErrWrongKind{TypeName: x.TypeName, MethodName: "LookupBySegment", AppropriateKind: dms3ld.KindSet_Recursive, ActualKind: dms3ld.Kind_Bytes} +func (x Bytes) LookupBySegment(ld.PathSegment) (ld.Node, error) { + return nil, ld.ErrWrongKind{TypeName: x.TypeName, MethodName: "LookupBySegment", AppropriateKind: ld.KindSet_Recursive, ActualKind: ld.Kind_Bytes} } -func (Bytes) MapIterator() dms3ld.MapIterator { +func (Bytes) MapIterator() ld.MapIterator { return nil } -func (Bytes) ListIterator() dms3ld.ListIterator { +func (Bytes) ListIterator() ld.ListIterator { return nil } func (Bytes) Length() int64 { @@ -50,19 +50,19 @@ func (Bytes) IsNull() bool { return false } func (x Bytes) AsBool() (bool, error) { - return false, dms3ld.ErrWrongKind{TypeName: x.TypeName, MethodName: "AsBool", AppropriateKind: dms3ld.KindSet_JustBool, ActualKind: dms3ld.Kind_Bytes} + return false, ld.ErrWrongKind{TypeName: x.TypeName, MethodName: "AsBool", AppropriateKind: ld.KindSet_JustBool, ActualKind: ld.Kind_Bytes} } func (x Bytes) AsInt() (int64, error) { - return 0, dms3ld.ErrWrongKind{TypeName: x.TypeName, MethodName: "AsInt", AppropriateKind: dms3ld.KindSet_JustInt, ActualKind: dms3ld.Kind_Bytes} + return 0, ld.ErrWrongKind{TypeName: x.TypeName, MethodName: "AsInt", AppropriateKind: ld.KindSet_JustInt, ActualKind: ld.Kind_Bytes} } func (x Bytes) AsFloat() (float64, error) { - return 0, dms3ld.ErrWrongKind{TypeName: x.TypeName, MethodName: "AsFloat", AppropriateKind: dms3ld.KindSet_JustFloat, ActualKind: dms3ld.Kind_Bytes} + return 0, ld.ErrWrongKind{TypeName: x.TypeName, MethodName: "AsFloat", AppropriateKind: ld.KindSet_JustFloat, ActualKind: ld.Kind_Bytes} } func (x Bytes) AsString() (string, error) { - return "", dms3ld.ErrWrongKind{TypeName: x.TypeName, MethodName: "AsString", AppropriateKind: dms3ld.KindSet_JustString, ActualKind: dms3ld.Kind_Bytes} + return "", ld.ErrWrongKind{TypeName: x.TypeName, MethodName: "AsString", AppropriateKind: ld.KindSet_JustString, ActualKind: ld.Kind_Bytes} } -func (x Bytes) AsLink() (dms3ld.Link, error) { - return nil, dms3ld.ErrWrongKind{TypeName: x.TypeName, MethodName: "AsLink", AppropriateKind: dms3ld.KindSet_JustLink, ActualKind: dms3ld.Kind_Bytes} +func (x Bytes) AsLink() (ld.Link, error) { + return nil, ld.ErrWrongKind{TypeName: x.TypeName, MethodName: "AsLink", AppropriateKind: ld.KindSet_JustLink, ActualKind: ld.Kind_Bytes} } // BytesAssembler has similar purpose as Bytes, but for (you guessed it) @@ -71,27 +71,27 @@ type BytesAssembler struct { TypeName string } -func (x BytesAssembler) BeginMap(sizeHint int64) (dms3ld.MapAssembler, error) { - return nil, dms3ld.ErrWrongKind{TypeName: x.TypeName, MethodName: "BeginMap", AppropriateKind: dms3ld.KindSet_JustMap, ActualKind: dms3ld.Kind_Bytes} +func (x BytesAssembler) BeginMap(sizeHint int64) (ld.MapAssembler, error) { + return nil, ld.ErrWrongKind{TypeName: x.TypeName, MethodName: "BeginMap", AppropriateKind: ld.KindSet_JustMap, ActualKind: ld.Kind_Bytes} } -func (x BytesAssembler) BeginList(sizeHint int64) (dms3ld.ListAssembler, error) { - return nil, dms3ld.ErrWrongKind{TypeName: x.TypeName, MethodName: "BeginList", AppropriateKind: dms3ld.KindSet_JustList, ActualKind: dms3ld.Kind_Bytes} +func (x BytesAssembler) BeginList(sizeHint int64) (ld.ListAssembler, error) { + return nil, ld.ErrWrongKind{TypeName: x.TypeName, MethodName: "BeginList", AppropriateKind: ld.KindSet_JustList, ActualKind: ld.Kind_Bytes} } func (x BytesAssembler) AssignNull() error { - return dms3ld.ErrWrongKind{TypeName: x.TypeName, MethodName: "AssignNull", AppropriateKind: dms3ld.KindSet_JustNull, ActualKind: dms3ld.Kind_Bytes} + return ld.ErrWrongKind{TypeName: x.TypeName, MethodName: "AssignNull", AppropriateKind: ld.KindSet_JustNull, ActualKind: ld.Kind_Bytes} } func (x BytesAssembler) AssignBool(bool) error { - return dms3ld.ErrWrongKind{TypeName: x.TypeName, MethodName: "AssignBool", AppropriateKind: dms3ld.KindSet_JustBool, ActualKind: dms3ld.Kind_Bytes} + return ld.ErrWrongKind{TypeName: x.TypeName, MethodName: "AssignBool", AppropriateKind: ld.KindSet_JustBool, ActualKind: ld.Kind_Bytes} } func (x BytesAssembler) AssignInt(int64) error { - return dms3ld.ErrWrongKind{TypeName: x.TypeName, MethodName: "AssignInt", AppropriateKind: dms3ld.KindSet_JustInt, ActualKind: dms3ld.Kind_Bytes} + return ld.ErrWrongKind{TypeName: x.TypeName, MethodName: "AssignInt", AppropriateKind: ld.KindSet_JustInt, ActualKind: ld.Kind_Bytes} } func (x BytesAssembler) AssignFloat(float64) error { - return dms3ld.ErrWrongKind{TypeName: x.TypeName, MethodName: "AssignFloat", AppropriateKind: dms3ld.KindSet_JustFloat, ActualKind: dms3ld.Kind_Bytes} + return ld.ErrWrongKind{TypeName: x.TypeName, MethodName: "AssignFloat", AppropriateKind: ld.KindSet_JustFloat, ActualKind: ld.Kind_Bytes} } func (x BytesAssembler) AssignString(string) error { - return dms3ld.ErrWrongKind{TypeName: x.TypeName, MethodName: "AssignString", AppropriateKind: dms3ld.KindSet_JustString, ActualKind: dms3ld.Kind_Bytes} + return ld.ErrWrongKind{TypeName: x.TypeName, MethodName: "AssignString", AppropriateKind: ld.KindSet_JustString, ActualKind: ld.Kind_Bytes} } -func (x BytesAssembler) AssignLink(dms3ld.Link) error { - return dms3ld.ErrWrongKind{TypeName: x.TypeName, MethodName: "AssignLink", AppropriateKind: dms3ld.KindSet_JustLink, ActualKind: dms3ld.Kind_Bytes} +func (x BytesAssembler) AssignLink(ld.Link) error { + return ld.ErrWrongKind{TypeName: x.TypeName, MethodName: "AssignLink", AppropriateKind: ld.KindSet_JustLink, ActualKind: ld.Kind_Bytes} } diff --git a/node/mixins/float.go b/node/mixins/float.go index 7f26477f79ad459bd2c82762d9f61ff1f6c0a75e..b3df0fb0dbe950eb2d33eccb7d229141680af1ad 100644 --- a/node/mixins/float.go +++ b/node/mixins/float.go @@ -1,7 +1,7 @@ package mixins import ( - dms3ld "gitlab.dms3.io/ld/go-ld-prime" + ld "gitlab.dms3.io/ld/go-ld-prime" ) // Float can be embedded in a struct to provide all the methods that @@ -19,25 +19,25 @@ type Float struct { TypeName string } -func (Float) Kind() dms3ld.Kind { - return dms3ld.Kind_Float +func (Float) Kind() ld.Kind { + return ld.Kind_Float } -func (x Float) LookupByString(string) (dms3ld.Node, error) { - return nil, dms3ld.ErrWrongKind{TypeName: x.TypeName, MethodName: "LookupByString", AppropriateKind: dms3ld.KindSet_JustMap, ActualKind: dms3ld.Kind_Float} +func (x Float) LookupByString(string) (ld.Node, error) { + return nil, ld.ErrWrongKind{TypeName: x.TypeName, MethodName: "LookupByString", AppropriateKind: ld.KindSet_JustMap, ActualKind: ld.Kind_Float} } -func (x Float) LookupByNode(key dms3ld.Node) (dms3ld.Node, error) { - return nil, dms3ld.ErrWrongKind{TypeName: x.TypeName, MethodName: "LookupByNode", AppropriateKind: dms3ld.KindSet_JustMap, ActualKind: dms3ld.Kind_Float} +func (x Float) LookupByNode(key ld.Node) (ld.Node, error) { + return nil, ld.ErrWrongKind{TypeName: x.TypeName, MethodName: "LookupByNode", AppropriateKind: ld.KindSet_JustMap, ActualKind: ld.Kind_Float} } -func (x Float) LookupByIndex(idx int64) (dms3ld.Node, error) { - return nil, dms3ld.ErrWrongKind{TypeName: x.TypeName, MethodName: "LookupByIndex", AppropriateKind: dms3ld.KindSet_JustList, ActualKind: dms3ld.Kind_Float} +func (x Float) LookupByIndex(idx int64) (ld.Node, error) { + return nil, ld.ErrWrongKind{TypeName: x.TypeName, MethodName: "LookupByIndex", AppropriateKind: ld.KindSet_JustList, ActualKind: ld.Kind_Float} } -func (x Float) LookupBySegment(dms3ld.PathSegment) (dms3ld.Node, error) { - return nil, dms3ld.ErrWrongKind{TypeName: x.TypeName, MethodName: "LookupBySegment", AppropriateKind: dms3ld.KindSet_Recursive, ActualKind: dms3ld.Kind_Float} +func (x Float) LookupBySegment(ld.PathSegment) (ld.Node, error) { + return nil, ld.ErrWrongKind{TypeName: x.TypeName, MethodName: "LookupBySegment", AppropriateKind: ld.KindSet_Recursive, ActualKind: ld.Kind_Float} } -func (Float) MapIterator() dms3ld.MapIterator { +func (Float) MapIterator() ld.MapIterator { return nil } -func (Float) ListIterator() dms3ld.ListIterator { +func (Float) ListIterator() ld.ListIterator { return nil } func (Float) Length() int64 { @@ -50,19 +50,19 @@ func (Float) IsNull() bool { return false } func (x Float) AsBool() (bool, error) { - return false, dms3ld.ErrWrongKind{TypeName: x.TypeName, MethodName: "AsBool", AppropriateKind: dms3ld.KindSet_JustBool, ActualKind: dms3ld.Kind_Float} + return false, ld.ErrWrongKind{TypeName: x.TypeName, MethodName: "AsBool", AppropriateKind: ld.KindSet_JustBool, ActualKind: ld.Kind_Float} } func (x Float) AsInt() (int64, error) { - return 0, dms3ld.ErrWrongKind{TypeName: x.TypeName, MethodName: "AsInt", AppropriateKind: dms3ld.KindSet_JustInt, ActualKind: dms3ld.Kind_Float} + return 0, ld.ErrWrongKind{TypeName: x.TypeName, MethodName: "AsInt", AppropriateKind: ld.KindSet_JustInt, ActualKind: ld.Kind_Float} } func (x Float) AsString() (string, error) { - return "", dms3ld.ErrWrongKind{TypeName: x.TypeName, MethodName: "AsString", AppropriateKind: dms3ld.KindSet_JustString, ActualKind: dms3ld.Kind_Float} + return "", ld.ErrWrongKind{TypeName: x.TypeName, MethodName: "AsString", AppropriateKind: ld.KindSet_JustString, ActualKind: ld.Kind_Float} } func (x Float) AsBytes() ([]byte, error) { - return nil, dms3ld.ErrWrongKind{TypeName: x.TypeName, MethodName: "AsBytes", AppropriateKind: dms3ld.KindSet_JustBytes, ActualKind: dms3ld.Kind_Float} + return nil, ld.ErrWrongKind{TypeName: x.TypeName, MethodName: "AsBytes", AppropriateKind: ld.KindSet_JustBytes, ActualKind: ld.Kind_Float} } -func (x Float) AsLink() (dms3ld.Link, error) { - return nil, dms3ld.ErrWrongKind{TypeName: x.TypeName, MethodName: "AsLink", AppropriateKind: dms3ld.KindSet_JustLink, ActualKind: dms3ld.Kind_Float} +func (x Float) AsLink() (ld.Link, error) { + return nil, ld.ErrWrongKind{TypeName: x.TypeName, MethodName: "AsLink", AppropriateKind: ld.KindSet_JustLink, ActualKind: ld.Kind_Float} } // FloatAssembler has similar purpose as Float, but for (you guessed it) @@ -71,27 +71,27 @@ type FloatAssembler struct { TypeName string } -func (x FloatAssembler) BeginMap(sizeHint int64) (dms3ld.MapAssembler, error) { - return nil, dms3ld.ErrWrongKind{TypeName: x.TypeName, MethodName: "BeginMap", AppropriateKind: dms3ld.KindSet_JustMap, ActualKind: dms3ld.Kind_Float} +func (x FloatAssembler) BeginMap(sizeHint int64) (ld.MapAssembler, error) { + return nil, ld.ErrWrongKind{TypeName: x.TypeName, MethodName: "BeginMap", AppropriateKind: ld.KindSet_JustMap, ActualKind: ld.Kind_Float} } -func (x FloatAssembler) BeginList(sizeHint int64) (dms3ld.ListAssembler, error) { - return nil, dms3ld.ErrWrongKind{TypeName: x.TypeName, MethodName: "BeginList", AppropriateKind: dms3ld.KindSet_JustList, ActualKind: dms3ld.Kind_Float} +func (x FloatAssembler) BeginList(sizeHint int64) (ld.ListAssembler, error) { + return nil, ld.ErrWrongKind{TypeName: x.TypeName, MethodName: "BeginList", AppropriateKind: ld.KindSet_JustList, ActualKind: ld.Kind_Float} } func (x FloatAssembler) AssignNull() error { - return dms3ld.ErrWrongKind{TypeName: x.TypeName, MethodName: "AssignNull", AppropriateKind: dms3ld.KindSet_JustNull, ActualKind: dms3ld.Kind_Float} + return ld.ErrWrongKind{TypeName: x.TypeName, MethodName: "AssignNull", AppropriateKind: ld.KindSet_JustNull, ActualKind: ld.Kind_Float} } func (x FloatAssembler) AssignBool(bool) error { - return dms3ld.ErrWrongKind{TypeName: x.TypeName, MethodName: "AssignBool", AppropriateKind: dms3ld.KindSet_JustBool, ActualKind: dms3ld.Kind_Float} + return ld.ErrWrongKind{TypeName: x.TypeName, MethodName: "AssignBool", AppropriateKind: ld.KindSet_JustBool, ActualKind: ld.Kind_Float} } func (x FloatAssembler) AssignInt(int64) error { - return dms3ld.ErrWrongKind{TypeName: x.TypeName, MethodName: "AssignInt", AppropriateKind: dms3ld.KindSet_JustInt, ActualKind: dms3ld.Kind_Float} + return ld.ErrWrongKind{TypeName: x.TypeName, MethodName: "AssignInt", AppropriateKind: ld.KindSet_JustInt, ActualKind: ld.Kind_Float} } func (x FloatAssembler) AssignString(string) error { - return dms3ld.ErrWrongKind{TypeName: x.TypeName, MethodName: "AssignString", AppropriateKind: dms3ld.KindSet_JustString, ActualKind: dms3ld.Kind_Float} + return ld.ErrWrongKind{TypeName: x.TypeName, MethodName: "AssignString", AppropriateKind: ld.KindSet_JustString, ActualKind: ld.Kind_Float} } func (x FloatAssembler) AssignBytes([]byte) error { - return dms3ld.ErrWrongKind{TypeName: x.TypeName, MethodName: "AssignBytes", AppropriateKind: dms3ld.KindSet_JustBytes, ActualKind: dms3ld.Kind_Float} + return ld.ErrWrongKind{TypeName: x.TypeName, MethodName: "AssignBytes", AppropriateKind: ld.KindSet_JustBytes, ActualKind: ld.Kind_Float} } -func (x FloatAssembler) AssignLink(dms3ld.Link) error { - return dms3ld.ErrWrongKind{TypeName: x.TypeName, MethodName: "AssignLink", AppropriateKind: dms3ld.KindSet_JustLink, ActualKind: dms3ld.Kind_Float} +func (x FloatAssembler) AssignLink(ld.Link) error { + return ld.ErrWrongKind{TypeName: x.TypeName, MethodName: "AssignLink", AppropriateKind: ld.KindSet_JustLink, ActualKind: ld.Kind_Float} } diff --git a/node/mixins/int.go b/node/mixins/int.go index e78c24bbcde1735953fe5aa23ac97a2ed729aef7..18b0ab472c66f577fd16b4378d6f22c3c31c7650 100644 --- a/node/mixins/int.go +++ b/node/mixins/int.go @@ -1,7 +1,7 @@ package mixins import ( - dms3ld "gitlab.dms3.io/ld/go-ld-prime" + ld "gitlab.dms3.io/ld/go-ld-prime" ) // Int can be embedded in a struct to provide all the methods that @@ -19,25 +19,25 @@ type Int struct { TypeName string } -func (Int) Kind() dms3ld.Kind { - return dms3ld.Kind_Int +func (Int) Kind() ld.Kind { + return ld.Kind_Int } -func (x Int) LookupByString(string) (dms3ld.Node, error) { - return nil, dms3ld.ErrWrongKind{TypeName: x.TypeName, MethodName: "LookupByString", AppropriateKind: dms3ld.KindSet_JustMap, ActualKind: dms3ld.Kind_Int} +func (x Int) LookupByString(string) (ld.Node, error) { + return nil, ld.ErrWrongKind{TypeName: x.TypeName, MethodName: "LookupByString", AppropriateKind: ld.KindSet_JustMap, ActualKind: ld.Kind_Int} } -func (x Int) LookupByNode(key dms3ld.Node) (dms3ld.Node, error) { - return nil, dms3ld.ErrWrongKind{TypeName: x.TypeName, MethodName: "LookupByNode", AppropriateKind: dms3ld.KindSet_JustMap, ActualKind: dms3ld.Kind_Int} +func (x Int) LookupByNode(key ld.Node) (ld.Node, error) { + return nil, ld.ErrWrongKind{TypeName: x.TypeName, MethodName: "LookupByNode", AppropriateKind: ld.KindSet_JustMap, ActualKind: ld.Kind_Int} } -func (x Int) LookupByIndex(idx int64) (dms3ld.Node, error) { - return nil, dms3ld.ErrWrongKind{TypeName: x.TypeName, MethodName: "LookupByIndex", AppropriateKind: dms3ld.KindSet_JustList, ActualKind: dms3ld.Kind_Int} +func (x Int) LookupByIndex(idx int64) (ld.Node, error) { + return nil, ld.ErrWrongKind{TypeName: x.TypeName, MethodName: "LookupByIndex", AppropriateKind: ld.KindSet_JustList, ActualKind: ld.Kind_Int} } -func (x Int) LookupBySegment(dms3ld.PathSegment) (dms3ld.Node, error) { - return nil, dms3ld.ErrWrongKind{TypeName: x.TypeName, MethodName: "LookupBySegment", AppropriateKind: dms3ld.KindSet_Recursive, ActualKind: dms3ld.Kind_Int} +func (x Int) LookupBySegment(ld.PathSegment) (ld.Node, error) { + return nil, ld.ErrWrongKind{TypeName: x.TypeName, MethodName: "LookupBySegment", AppropriateKind: ld.KindSet_Recursive, ActualKind: ld.Kind_Int} } -func (Int) MapIterator() dms3ld.MapIterator { +func (Int) MapIterator() ld.MapIterator { return nil } -func (Int) ListIterator() dms3ld.ListIterator { +func (Int) ListIterator() ld.ListIterator { return nil } func (Int) Length() int64 { @@ -50,19 +50,19 @@ func (Int) IsNull() bool { return false } func (x Int) AsBool() (bool, error) { - return false, dms3ld.ErrWrongKind{TypeName: x.TypeName, MethodName: "AsBool", AppropriateKind: dms3ld.KindSet_JustBool, ActualKind: dms3ld.Kind_Int} + return false, ld.ErrWrongKind{TypeName: x.TypeName, MethodName: "AsBool", AppropriateKind: ld.KindSet_JustBool, ActualKind: ld.Kind_Int} } func (x Int) AsFloat() (float64, error) { - return 0, dms3ld.ErrWrongKind{TypeName: x.TypeName, MethodName: "AsFloat", AppropriateKind: dms3ld.KindSet_JustFloat, ActualKind: dms3ld.Kind_Int} + return 0, ld.ErrWrongKind{TypeName: x.TypeName, MethodName: "AsFloat", AppropriateKind: ld.KindSet_JustFloat, ActualKind: ld.Kind_Int} } func (x Int) AsString() (string, error) { - return "", dms3ld.ErrWrongKind{TypeName: x.TypeName, MethodName: "AsString", AppropriateKind: dms3ld.KindSet_JustString, ActualKind: dms3ld.Kind_Int} + return "", ld.ErrWrongKind{TypeName: x.TypeName, MethodName: "AsString", AppropriateKind: ld.KindSet_JustString, ActualKind: ld.Kind_Int} } func (x Int) AsBytes() ([]byte, error) { - return nil, dms3ld.ErrWrongKind{TypeName: x.TypeName, MethodName: "AsBytes", AppropriateKind: dms3ld.KindSet_JustBytes, ActualKind: dms3ld.Kind_Int} + return nil, ld.ErrWrongKind{TypeName: x.TypeName, MethodName: "AsBytes", AppropriateKind: ld.KindSet_JustBytes, ActualKind: ld.Kind_Int} } -func (x Int) AsLink() (dms3ld.Link, error) { - return nil, dms3ld.ErrWrongKind{TypeName: x.TypeName, MethodName: "AsLink", AppropriateKind: dms3ld.KindSet_JustLink, ActualKind: dms3ld.Kind_Int} +func (x Int) AsLink() (ld.Link, error) { + return nil, ld.ErrWrongKind{TypeName: x.TypeName, MethodName: "AsLink", AppropriateKind: ld.KindSet_JustLink, ActualKind: ld.Kind_Int} } // IntAssembler has similar purpose as Int, but for (you guessed it) @@ -71,27 +71,27 @@ type IntAssembler struct { TypeName string } -func (x IntAssembler) BeginMap(sizeHint int64) (dms3ld.MapAssembler, error) { - return nil, dms3ld.ErrWrongKind{TypeName: x.TypeName, MethodName: "BeginMap", AppropriateKind: dms3ld.KindSet_JustMap, ActualKind: dms3ld.Kind_Int} +func (x IntAssembler) BeginMap(sizeHint int64) (ld.MapAssembler, error) { + return nil, ld.ErrWrongKind{TypeName: x.TypeName, MethodName: "BeginMap", AppropriateKind: ld.KindSet_JustMap, ActualKind: ld.Kind_Int} } -func (x IntAssembler) BeginList(sizeHint int64) (dms3ld.ListAssembler, error) { - return nil, dms3ld.ErrWrongKind{TypeName: x.TypeName, MethodName: "BeginList", AppropriateKind: dms3ld.KindSet_JustList, ActualKind: dms3ld.Kind_Int} +func (x IntAssembler) BeginList(sizeHint int64) (ld.ListAssembler, error) { + return nil, ld.ErrWrongKind{TypeName: x.TypeName, MethodName: "BeginList", AppropriateKind: ld.KindSet_JustList, ActualKind: ld.Kind_Int} } func (x IntAssembler) AssignNull() error { - return dms3ld.ErrWrongKind{TypeName: x.TypeName, MethodName: "AssignNull", AppropriateKind: dms3ld.KindSet_JustNull, ActualKind: dms3ld.Kind_Int} + return ld.ErrWrongKind{TypeName: x.TypeName, MethodName: "AssignNull", AppropriateKind: ld.KindSet_JustNull, ActualKind: ld.Kind_Int} } func (x IntAssembler) AssignBool(bool) error { - return dms3ld.ErrWrongKind{TypeName: x.TypeName, MethodName: "AssignBool", AppropriateKind: dms3ld.KindSet_JustBool, ActualKind: dms3ld.Kind_Int} + return ld.ErrWrongKind{TypeName: x.TypeName, MethodName: "AssignBool", AppropriateKind: ld.KindSet_JustBool, ActualKind: ld.Kind_Int} } func (x IntAssembler) AssignFloat(float64) error { - return dms3ld.ErrWrongKind{TypeName: x.TypeName, MethodName: "AssignFloat", AppropriateKind: dms3ld.KindSet_JustFloat, ActualKind: dms3ld.Kind_Int} + return ld.ErrWrongKind{TypeName: x.TypeName, MethodName: "AssignFloat", AppropriateKind: ld.KindSet_JustFloat, ActualKind: ld.Kind_Int} } func (x IntAssembler) AssignString(string) error { - return dms3ld.ErrWrongKind{TypeName: x.TypeName, MethodName: "AssignString", AppropriateKind: dms3ld.KindSet_JustString, ActualKind: dms3ld.Kind_Int} + return ld.ErrWrongKind{TypeName: x.TypeName, MethodName: "AssignString", AppropriateKind: ld.KindSet_JustString, ActualKind: ld.Kind_Int} } func (x IntAssembler) AssignBytes([]byte) error { - return dms3ld.ErrWrongKind{TypeName: x.TypeName, MethodName: "AssignBytes", AppropriateKind: dms3ld.KindSet_JustBytes, ActualKind: dms3ld.Kind_Int} + return ld.ErrWrongKind{TypeName: x.TypeName, MethodName: "AssignBytes", AppropriateKind: ld.KindSet_JustBytes, ActualKind: ld.Kind_Int} } -func (x IntAssembler) AssignLink(dms3ld.Link) error { - return dms3ld.ErrWrongKind{TypeName: x.TypeName, MethodName: "AssignLink", AppropriateKind: dms3ld.KindSet_JustLink, ActualKind: dms3ld.Kind_Int} +func (x IntAssembler) AssignLink(ld.Link) error { + return ld.ErrWrongKind{TypeName: x.TypeName, MethodName: "AssignLink", AppropriateKind: ld.KindSet_JustLink, ActualKind: ld.Kind_Int} } diff --git a/node/mixins/link.go b/node/mixins/link.go index 9a3f62e2f138e1f7118ddee2afe3288a7400c13d..a3d04113a0e82dbee55c109426d6ba0a0947f95d 100644 --- a/node/mixins/link.go +++ b/node/mixins/link.go @@ -1,7 +1,7 @@ package mixins import ( - dms3ld "gitlab.dms3.io/ld/go-ld-prime" + ld "gitlab.dms3.io/ld/go-ld-prime" ) // Link can be embedded in a struct to provide all the methods that @@ -19,25 +19,25 @@ type Link struct { TypeName string } -func (Link) Kind() dms3ld.Kind { - return dms3ld.Kind_Link +func (Link) Kind() ld.Kind { + return ld.Kind_Link } -func (x Link) LookupByString(string) (dms3ld.Node, error) { - return nil, dms3ld.ErrWrongKind{TypeName: x.TypeName, MethodName: "LookupByString", AppropriateKind: dms3ld.KindSet_JustMap, ActualKind: dms3ld.Kind_Link} +func (x Link) LookupByString(string) (ld.Node, error) { + return nil, ld.ErrWrongKind{TypeName: x.TypeName, MethodName: "LookupByString", AppropriateKind: ld.KindSet_JustMap, ActualKind: ld.Kind_Link} } -func (x Link) LookupByNode(key dms3ld.Node) (dms3ld.Node, error) { - return nil, dms3ld.ErrWrongKind{TypeName: x.TypeName, MethodName: "LookupByNode", AppropriateKind: dms3ld.KindSet_JustMap, ActualKind: dms3ld.Kind_Link} +func (x Link) LookupByNode(key ld.Node) (ld.Node, error) { + return nil, ld.ErrWrongKind{TypeName: x.TypeName, MethodName: "LookupByNode", AppropriateKind: ld.KindSet_JustMap, ActualKind: ld.Kind_Link} } -func (x Link) LookupByIndex(idx int64) (dms3ld.Node, error) { - return nil, dms3ld.ErrWrongKind{TypeName: x.TypeName, MethodName: "LookupByIndex", AppropriateKind: dms3ld.KindSet_JustList, ActualKind: dms3ld.Kind_Link} +func (x Link) LookupByIndex(idx int64) (ld.Node, error) { + return nil, ld.ErrWrongKind{TypeName: x.TypeName, MethodName: "LookupByIndex", AppropriateKind: ld.KindSet_JustList, ActualKind: ld.Kind_Link} } -func (x Link) LookupBySegment(dms3ld.PathSegment) (dms3ld.Node, error) { - return nil, dms3ld.ErrWrongKind{TypeName: x.TypeName, MethodName: "LookupBySegment", AppropriateKind: dms3ld.KindSet_Recursive, ActualKind: dms3ld.Kind_Link} +func (x Link) LookupBySegment(ld.PathSegment) (ld.Node, error) { + return nil, ld.ErrWrongKind{TypeName: x.TypeName, MethodName: "LookupBySegment", AppropriateKind: ld.KindSet_Recursive, ActualKind: ld.Kind_Link} } -func (Link) MapIterator() dms3ld.MapIterator { +func (Link) MapIterator() ld.MapIterator { return nil } -func (Link) ListIterator() dms3ld.ListIterator { +func (Link) ListIterator() ld.ListIterator { return nil } func (Link) Length() int64 { @@ -50,19 +50,19 @@ func (Link) IsNull() bool { return false } func (x Link) AsBool() (bool, error) { - return false, dms3ld.ErrWrongKind{TypeName: x.TypeName, MethodName: "AsBool", AppropriateKind: dms3ld.KindSet_JustBool, ActualKind: dms3ld.Kind_Link} + return false, ld.ErrWrongKind{TypeName: x.TypeName, MethodName: "AsBool", AppropriateKind: ld.KindSet_JustBool, ActualKind: ld.Kind_Link} } func (x Link) AsInt() (int64, error) { - return 0, dms3ld.ErrWrongKind{TypeName: x.TypeName, MethodName: "AsInt", AppropriateKind: dms3ld.KindSet_JustInt, ActualKind: dms3ld.Kind_Link} + return 0, ld.ErrWrongKind{TypeName: x.TypeName, MethodName: "AsInt", AppropriateKind: ld.KindSet_JustInt, ActualKind: ld.Kind_Link} } func (x Link) AsFloat() (float64, error) { - return 0, dms3ld.ErrWrongKind{TypeName: x.TypeName, MethodName: "AsFloat", AppropriateKind: dms3ld.KindSet_JustFloat, ActualKind: dms3ld.Kind_Link} + return 0, ld.ErrWrongKind{TypeName: x.TypeName, MethodName: "AsFloat", AppropriateKind: ld.KindSet_JustFloat, ActualKind: ld.Kind_Link} } func (x Link) AsString() (string, error) { - return "", dms3ld.ErrWrongKind{TypeName: x.TypeName, MethodName: "AsString", AppropriateKind: dms3ld.KindSet_JustString, ActualKind: dms3ld.Kind_Link} + return "", ld.ErrWrongKind{TypeName: x.TypeName, MethodName: "AsString", AppropriateKind: ld.KindSet_JustString, ActualKind: ld.Kind_Link} } func (x Link) AsBytes() ([]byte, error) { - return nil, dms3ld.ErrWrongKind{TypeName: x.TypeName, MethodName: "AsBytes", AppropriateKind: dms3ld.KindSet_JustBytes, ActualKind: dms3ld.Kind_Link} + return nil, ld.ErrWrongKind{TypeName: x.TypeName, MethodName: "AsBytes", AppropriateKind: ld.KindSet_JustBytes, ActualKind: ld.Kind_Link} } // LinkAssembler has similar purpose as Link, but for (you guessed it) @@ -71,27 +71,27 @@ type LinkAssembler struct { TypeName string } -func (x LinkAssembler) BeginMap(sizeHint int64) (dms3ld.MapAssembler, error) { - return nil, dms3ld.ErrWrongKind{TypeName: x.TypeName, MethodName: "BeginMap", AppropriateKind: dms3ld.KindSet_JustMap, ActualKind: dms3ld.Kind_Link} +func (x LinkAssembler) BeginMap(sizeHint int64) (ld.MapAssembler, error) { + return nil, ld.ErrWrongKind{TypeName: x.TypeName, MethodName: "BeginMap", AppropriateKind: ld.KindSet_JustMap, ActualKind: ld.Kind_Link} } -func (x LinkAssembler) BeginList(sizeHint int64) (dms3ld.ListAssembler, error) { - return nil, dms3ld.ErrWrongKind{TypeName: x.TypeName, MethodName: "BeginList", AppropriateKind: dms3ld.KindSet_JustList, ActualKind: dms3ld.Kind_Link} +func (x LinkAssembler) BeginList(sizeHint int64) (ld.ListAssembler, error) { + return nil, ld.ErrWrongKind{TypeName: x.TypeName, MethodName: "BeginList", AppropriateKind: ld.KindSet_JustList, ActualKind: ld.Kind_Link} } func (x LinkAssembler) AssignNull() error { - return dms3ld.ErrWrongKind{TypeName: x.TypeName, MethodName: "AssignNull", AppropriateKind: dms3ld.KindSet_JustNull, ActualKind: dms3ld.Kind_Link} + return ld.ErrWrongKind{TypeName: x.TypeName, MethodName: "AssignNull", AppropriateKind: ld.KindSet_JustNull, ActualKind: ld.Kind_Link} } func (x LinkAssembler) AssignBool(bool) error { - return dms3ld.ErrWrongKind{TypeName: x.TypeName, MethodName: "AssignBool", AppropriateKind: dms3ld.KindSet_JustBool, ActualKind: dms3ld.Kind_Link} + return ld.ErrWrongKind{TypeName: x.TypeName, MethodName: "AssignBool", AppropriateKind: ld.KindSet_JustBool, ActualKind: ld.Kind_Link} } func (x LinkAssembler) AssignInt(int64) error { - return dms3ld.ErrWrongKind{TypeName: x.TypeName, MethodName: "AssignInt", AppropriateKind: dms3ld.KindSet_JustInt, ActualKind: dms3ld.Kind_Link} + return ld.ErrWrongKind{TypeName: x.TypeName, MethodName: "AssignInt", AppropriateKind: ld.KindSet_JustInt, ActualKind: ld.Kind_Link} } func (x LinkAssembler) AssignFloat(float64) error { - return dms3ld.ErrWrongKind{TypeName: x.TypeName, MethodName: "AssignFloat", AppropriateKind: dms3ld.KindSet_JustFloat, ActualKind: dms3ld.Kind_Link} + return ld.ErrWrongKind{TypeName: x.TypeName, MethodName: "AssignFloat", AppropriateKind: ld.KindSet_JustFloat, ActualKind: ld.Kind_Link} } func (x LinkAssembler) AssignString(string) error { - return dms3ld.ErrWrongKind{TypeName: x.TypeName, MethodName: "AssignString", AppropriateKind: dms3ld.KindSet_JustString, ActualKind: dms3ld.Kind_Link} + return ld.ErrWrongKind{TypeName: x.TypeName, MethodName: "AssignString", AppropriateKind: ld.KindSet_JustString, ActualKind: ld.Kind_Link} } func (x LinkAssembler) AssignBytes([]byte) error { - return dms3ld.ErrWrongKind{TypeName: x.TypeName, MethodName: "AssignBytes", AppropriateKind: dms3ld.KindSet_JustBytes, ActualKind: dms3ld.Kind_Link} + return ld.ErrWrongKind{TypeName: x.TypeName, MethodName: "AssignBytes", AppropriateKind: ld.KindSet_JustBytes, ActualKind: ld.Kind_Link} } diff --git a/node/mixins/list.go b/node/mixins/list.go index 1c0bd0d05476a2fb786c23c1f7fa752585498c97..84df8676fddf693feb66a7c5898812e6f7f3a5c5 100644 --- a/node/mixins/list.go +++ b/node/mixins/list.go @@ -1,7 +1,7 @@ package mixins import ( - dms3ld "gitlab.dms3.io/ld/go-ld-prime" + ld "gitlab.dms3.io/ld/go-ld-prime" ) // List can be embedded in a struct to provide all the methods that @@ -19,16 +19,16 @@ type List struct { TypeName string } -func (List) Kind() dms3ld.Kind { - return dms3ld.Kind_List +func (List) Kind() ld.Kind { + return ld.Kind_List } -func (x List) LookupByString(string) (dms3ld.Node, error) { - return nil, dms3ld.ErrWrongKind{TypeName: x.TypeName, MethodName: "LookupByString", AppropriateKind: dms3ld.KindSet_JustMap, ActualKind: dms3ld.Kind_List} +func (x List) LookupByString(string) (ld.Node, error) { + return nil, ld.ErrWrongKind{TypeName: x.TypeName, MethodName: "LookupByString", AppropriateKind: ld.KindSet_JustMap, ActualKind: ld.Kind_List} } -func (x List) LookupByNode(key dms3ld.Node) (dms3ld.Node, error) { - return nil, dms3ld.ErrWrongKind{TypeName: x.TypeName, MethodName: "LookupByNode", AppropriateKind: dms3ld.KindSet_JustMap, ActualKind: dms3ld.Kind_List} +func (x List) LookupByNode(key ld.Node) (ld.Node, error) { + return nil, ld.ErrWrongKind{TypeName: x.TypeName, MethodName: "LookupByNode", AppropriateKind: ld.KindSet_JustMap, ActualKind: ld.Kind_List} } -func (List) MapIterator() dms3ld.MapIterator { +func (List) MapIterator() ld.MapIterator { return nil } func (List) IsAbsent() bool { @@ -38,22 +38,22 @@ func (List) IsNull() bool { return false } func (x List) AsBool() (bool, error) { - return false, dms3ld.ErrWrongKind{TypeName: x.TypeName, MethodName: "AsBool", AppropriateKind: dms3ld.KindSet_JustBool, ActualKind: dms3ld.Kind_List} + return false, ld.ErrWrongKind{TypeName: x.TypeName, MethodName: "AsBool", AppropriateKind: ld.KindSet_JustBool, ActualKind: ld.Kind_List} } func (x List) AsInt() (int64, error) { - return 0, dms3ld.ErrWrongKind{TypeName: x.TypeName, MethodName: "AsInt", AppropriateKind: dms3ld.KindSet_JustInt, ActualKind: dms3ld.Kind_List} + return 0, ld.ErrWrongKind{TypeName: x.TypeName, MethodName: "AsInt", AppropriateKind: ld.KindSet_JustInt, ActualKind: ld.Kind_List} } func (x List) AsFloat() (float64, error) { - return 0, dms3ld.ErrWrongKind{TypeName: x.TypeName, MethodName: "AsFloat", AppropriateKind: dms3ld.KindSet_JustFloat, ActualKind: dms3ld.Kind_List} + return 0, ld.ErrWrongKind{TypeName: x.TypeName, MethodName: "AsFloat", AppropriateKind: ld.KindSet_JustFloat, ActualKind: ld.Kind_List} } func (x List) AsString() (string, error) { - return "", dms3ld.ErrWrongKind{TypeName: x.TypeName, MethodName: "AsString", AppropriateKind: dms3ld.KindSet_JustString, ActualKind: dms3ld.Kind_List} + return "", ld.ErrWrongKind{TypeName: x.TypeName, MethodName: "AsString", AppropriateKind: ld.KindSet_JustString, ActualKind: ld.Kind_List} } func (x List) AsBytes() ([]byte, error) { - return nil, dms3ld.ErrWrongKind{TypeName: x.TypeName, MethodName: "AsBytes", AppropriateKind: dms3ld.KindSet_JustBytes, ActualKind: dms3ld.Kind_List} + return nil, ld.ErrWrongKind{TypeName: x.TypeName, MethodName: "AsBytes", AppropriateKind: ld.KindSet_JustBytes, ActualKind: ld.Kind_List} } -func (x List) AsLink() (dms3ld.Link, error) { - return nil, dms3ld.ErrWrongKind{TypeName: x.TypeName, MethodName: "AsLink", AppropriateKind: dms3ld.KindSet_JustLink, ActualKind: dms3ld.Kind_List} +func (x List) AsLink() (ld.Link, error) { + return nil, ld.ErrWrongKind{TypeName: x.TypeName, MethodName: "AsLink", AppropriateKind: ld.KindSet_JustLink, ActualKind: ld.Kind_List} } // ListAssembler has similar purpose as List, but for (you guessed it) @@ -62,27 +62,27 @@ type ListAssembler struct { TypeName string } -func (x ListAssembler) BeginMap(sizeHint int64) (dms3ld.MapAssembler, error) { - return nil, dms3ld.ErrWrongKind{TypeName: x.TypeName, MethodName: "BeginMap", AppropriateKind: dms3ld.KindSet_JustMap, ActualKind: dms3ld.Kind_List} +func (x ListAssembler) BeginMap(sizeHint int64) (ld.MapAssembler, error) { + return nil, ld.ErrWrongKind{TypeName: x.TypeName, MethodName: "BeginMap", AppropriateKind: ld.KindSet_JustMap, ActualKind: ld.Kind_List} } func (x ListAssembler) AssignNull() error { - return dms3ld.ErrWrongKind{TypeName: x.TypeName, MethodName: "AssignNull", AppropriateKind: dms3ld.KindSet_JustNull, ActualKind: dms3ld.Kind_List} + return ld.ErrWrongKind{TypeName: x.TypeName, MethodName: "AssignNull", AppropriateKind: ld.KindSet_JustNull, ActualKind: ld.Kind_List} } func (x ListAssembler) AssignBool(bool) error { - return dms3ld.ErrWrongKind{TypeName: x.TypeName, MethodName: "AssignBool", AppropriateKind: dms3ld.KindSet_JustBool, ActualKind: dms3ld.Kind_List} + return ld.ErrWrongKind{TypeName: x.TypeName, MethodName: "AssignBool", AppropriateKind: ld.KindSet_JustBool, ActualKind: ld.Kind_List} } func (x ListAssembler) AssignInt(int64) error { - return dms3ld.ErrWrongKind{TypeName: x.TypeName, MethodName: "AssignInt", AppropriateKind: dms3ld.KindSet_JustInt, ActualKind: dms3ld.Kind_List} + return ld.ErrWrongKind{TypeName: x.TypeName, MethodName: "AssignInt", AppropriateKind: ld.KindSet_JustInt, ActualKind: ld.Kind_List} } func (x ListAssembler) AssignFloat(float64) error { - return dms3ld.ErrWrongKind{TypeName: x.TypeName, MethodName: "AssignFloat", AppropriateKind: dms3ld.KindSet_JustFloat, ActualKind: dms3ld.Kind_List} + return ld.ErrWrongKind{TypeName: x.TypeName, MethodName: "AssignFloat", AppropriateKind: ld.KindSet_JustFloat, ActualKind: ld.Kind_List} } func (x ListAssembler) AssignString(string) error { - return dms3ld.ErrWrongKind{TypeName: x.TypeName, MethodName: "AssignString", AppropriateKind: dms3ld.KindSet_JustString, ActualKind: dms3ld.Kind_List} + return ld.ErrWrongKind{TypeName: x.TypeName, MethodName: "AssignString", AppropriateKind: ld.KindSet_JustString, ActualKind: ld.Kind_List} } func (x ListAssembler) AssignBytes([]byte) error { - return dms3ld.ErrWrongKind{TypeName: x.TypeName, MethodName: "AssignBytes", AppropriateKind: dms3ld.KindSet_JustBytes, ActualKind: dms3ld.Kind_List} + return ld.ErrWrongKind{TypeName: x.TypeName, MethodName: "AssignBytes", AppropriateKind: ld.KindSet_JustBytes, ActualKind: ld.Kind_List} } -func (x ListAssembler) AssignLink(dms3ld.Link) error { - return dms3ld.ErrWrongKind{TypeName: x.TypeName, MethodName: "AssignLink", AppropriateKind: dms3ld.KindSet_JustLink, ActualKind: dms3ld.Kind_List} +func (x ListAssembler) AssignLink(ld.Link) error { + return ld.ErrWrongKind{TypeName: x.TypeName, MethodName: "AssignLink", AppropriateKind: ld.KindSet_JustLink, ActualKind: ld.Kind_List} } diff --git a/node/mixins/map.go b/node/mixins/map.go index 115d7855b7dd36be6157e887cda5c23a3e98a859..b404d9df7234078f44620d5e3cd8e272faee50bf 100644 --- a/node/mixins/map.go +++ b/node/mixins/map.go @@ -1,7 +1,7 @@ package mixins import ( - dms3ld "gitlab.dms3.io/ld/go-ld-prime" + ld "gitlab.dms3.io/ld/go-ld-prime" ) // Map can be embedded in a struct to provide all the methods that @@ -19,13 +19,13 @@ type Map struct { TypeName string } -func (Map) Kind() dms3ld.Kind { - return dms3ld.Kind_Map +func (Map) Kind() ld.Kind { + return ld.Kind_Map } -func (x Map) LookupByIndex(idx int64) (dms3ld.Node, error) { - return nil, dms3ld.ErrWrongKind{TypeName: x.TypeName, MethodName: "LookupByIndex", AppropriateKind: dms3ld.KindSet_JustList, ActualKind: dms3ld.Kind_Map} +func (x Map) LookupByIndex(idx int64) (ld.Node, error) { + return nil, ld.ErrWrongKind{TypeName: x.TypeName, MethodName: "LookupByIndex", AppropriateKind: ld.KindSet_JustList, ActualKind: ld.Kind_Map} } -func (Map) ListIterator() dms3ld.ListIterator { +func (Map) ListIterator() ld.ListIterator { return nil } func (Map) IsAbsent() bool { @@ -35,22 +35,22 @@ func (Map) IsNull() bool { return false } func (x Map) AsBool() (bool, error) { - return false, dms3ld.ErrWrongKind{TypeName: x.TypeName, MethodName: "AsBool", AppropriateKind: dms3ld.KindSet_JustBool, ActualKind: dms3ld.Kind_Map} + return false, ld.ErrWrongKind{TypeName: x.TypeName, MethodName: "AsBool", AppropriateKind: ld.KindSet_JustBool, ActualKind: ld.Kind_Map} } func (x Map) AsInt() (int64, error) { - return 0, dms3ld.ErrWrongKind{TypeName: x.TypeName, MethodName: "AsInt", AppropriateKind: dms3ld.KindSet_JustInt, ActualKind: dms3ld.Kind_Map} + return 0, ld.ErrWrongKind{TypeName: x.TypeName, MethodName: "AsInt", AppropriateKind: ld.KindSet_JustInt, ActualKind: ld.Kind_Map} } func (x Map) AsFloat() (float64, error) { - return 0, dms3ld.ErrWrongKind{TypeName: x.TypeName, MethodName: "AsFloat", AppropriateKind: dms3ld.KindSet_JustFloat, ActualKind: dms3ld.Kind_Map} + return 0, ld.ErrWrongKind{TypeName: x.TypeName, MethodName: "AsFloat", AppropriateKind: ld.KindSet_JustFloat, ActualKind: ld.Kind_Map} } func (x Map) AsString() (string, error) { - return "", dms3ld.ErrWrongKind{TypeName: x.TypeName, MethodName: "AsString", AppropriateKind: dms3ld.KindSet_JustString, ActualKind: dms3ld.Kind_Map} + return "", ld.ErrWrongKind{TypeName: x.TypeName, MethodName: "AsString", AppropriateKind: ld.KindSet_JustString, ActualKind: ld.Kind_Map} } func (x Map) AsBytes() ([]byte, error) { - return nil, dms3ld.ErrWrongKind{TypeName: x.TypeName, MethodName: "AsBytes", AppropriateKind: dms3ld.KindSet_JustBytes, ActualKind: dms3ld.Kind_Map} + return nil, ld.ErrWrongKind{TypeName: x.TypeName, MethodName: "AsBytes", AppropriateKind: ld.KindSet_JustBytes, ActualKind: ld.Kind_Map} } -func (x Map) AsLink() (dms3ld.Link, error) { - return nil, dms3ld.ErrWrongKind{TypeName: x.TypeName, MethodName: "AsLink", AppropriateKind: dms3ld.KindSet_JustLink, ActualKind: dms3ld.Kind_Map} +func (x Map) AsLink() (ld.Link, error) { + return nil, ld.ErrWrongKind{TypeName: x.TypeName, MethodName: "AsLink", AppropriateKind: ld.KindSet_JustLink, ActualKind: ld.Kind_Map} } // MapAssembler has similar purpose as Map, but for (you guessed it) @@ -59,27 +59,27 @@ type MapAssembler struct { TypeName string } -func (x MapAssembler) BeginList(sizeHint int64) (dms3ld.ListAssembler, error) { - return nil, dms3ld.ErrWrongKind{TypeName: x.TypeName, MethodName: "BeginList", AppropriateKind: dms3ld.KindSet_JustList, ActualKind: dms3ld.Kind_Map} +func (x MapAssembler) BeginList(sizeHint int64) (ld.ListAssembler, error) { + return nil, ld.ErrWrongKind{TypeName: x.TypeName, MethodName: "BeginList", AppropriateKind: ld.KindSet_JustList, ActualKind: ld.Kind_Map} } func (x MapAssembler) AssignNull() error { - return dms3ld.ErrWrongKind{TypeName: x.TypeName, MethodName: "AssignNull", AppropriateKind: dms3ld.KindSet_JustNull, ActualKind: dms3ld.Kind_Map} + return ld.ErrWrongKind{TypeName: x.TypeName, MethodName: "AssignNull", AppropriateKind: ld.KindSet_JustNull, ActualKind: ld.Kind_Map} } func (x MapAssembler) AssignBool(bool) error { - return dms3ld.ErrWrongKind{TypeName: x.TypeName, MethodName: "AssignBool", AppropriateKind: dms3ld.KindSet_JustBool, ActualKind: dms3ld.Kind_Map} + return ld.ErrWrongKind{TypeName: x.TypeName, MethodName: "AssignBool", AppropriateKind: ld.KindSet_JustBool, ActualKind: ld.Kind_Map} } func (x MapAssembler) AssignInt(int64) error { - return dms3ld.ErrWrongKind{TypeName: x.TypeName, MethodName: "AssignInt", AppropriateKind: dms3ld.KindSet_JustInt, ActualKind: dms3ld.Kind_Map} + return ld.ErrWrongKind{TypeName: x.TypeName, MethodName: "AssignInt", AppropriateKind: ld.KindSet_JustInt, ActualKind: ld.Kind_Map} } func (x MapAssembler) AssignFloat(float64) error { - return dms3ld.ErrWrongKind{TypeName: x.TypeName, MethodName: "AssignFloat", AppropriateKind: dms3ld.KindSet_JustFloat, ActualKind: dms3ld.Kind_Map} + return ld.ErrWrongKind{TypeName: x.TypeName, MethodName: "AssignFloat", AppropriateKind: ld.KindSet_JustFloat, ActualKind: ld.Kind_Map} } func (x MapAssembler) AssignString(string) error { - return dms3ld.ErrWrongKind{TypeName: x.TypeName, MethodName: "AssignString", AppropriateKind: dms3ld.KindSet_JustString, ActualKind: dms3ld.Kind_Map} + return ld.ErrWrongKind{TypeName: x.TypeName, MethodName: "AssignString", AppropriateKind: ld.KindSet_JustString, ActualKind: ld.Kind_Map} } func (x MapAssembler) AssignBytes([]byte) error { - return dms3ld.ErrWrongKind{TypeName: x.TypeName, MethodName: "AssignBytes", AppropriateKind: dms3ld.KindSet_JustBytes, ActualKind: dms3ld.Kind_Map} + return ld.ErrWrongKind{TypeName: x.TypeName, MethodName: "AssignBytes", AppropriateKind: ld.KindSet_JustBytes, ActualKind: ld.Kind_Map} } -func (x MapAssembler) AssignLink(dms3ld.Link) error { - return dms3ld.ErrWrongKind{TypeName: x.TypeName, MethodName: "AssignLink", AppropriateKind: dms3ld.KindSet_JustLink, ActualKind: dms3ld.Kind_Map} +func (x MapAssembler) AssignLink(ld.Link) error { + return ld.ErrWrongKind{TypeName: x.TypeName, MethodName: "AssignLink", AppropriateKind: ld.KindSet_JustLink, ActualKind: ld.Kind_Map} } diff --git a/node/mixins/string.go b/node/mixins/string.go index 83fe8a2897d57d679334a306b8fae65acc62c7db..e8bf0876eecfa35969ef638faf3e30394e1ee462 100644 --- a/node/mixins/string.go +++ b/node/mixins/string.go @@ -1,7 +1,7 @@ package mixins import ( - dms3ld "gitlab.dms3.io/ld/go-ld-prime" + ld "gitlab.dms3.io/ld/go-ld-prime" ) // String can be embedded in a struct to provide all the methods that @@ -19,25 +19,25 @@ type String struct { TypeName string } -func (String) Kind() dms3ld.Kind { - return dms3ld.Kind_String +func (String) Kind() ld.Kind { + return ld.Kind_String } -func (x String) LookupByString(string) (dms3ld.Node, error) { - return nil, dms3ld.ErrWrongKind{TypeName: x.TypeName, MethodName: "LookupByString", AppropriateKind: dms3ld.KindSet_JustMap, ActualKind: dms3ld.Kind_String} +func (x String) LookupByString(string) (ld.Node, error) { + return nil, ld.ErrWrongKind{TypeName: x.TypeName, MethodName: "LookupByString", AppropriateKind: ld.KindSet_JustMap, ActualKind: ld.Kind_String} } -func (x String) LookupByNode(key dms3ld.Node) (dms3ld.Node, error) { - return nil, dms3ld.ErrWrongKind{TypeName: x.TypeName, MethodName: "LookupByNode", AppropriateKind: dms3ld.KindSet_JustMap, ActualKind: dms3ld.Kind_String} +func (x String) LookupByNode(key ld.Node) (ld.Node, error) { + return nil, ld.ErrWrongKind{TypeName: x.TypeName, MethodName: "LookupByNode", AppropriateKind: ld.KindSet_JustMap, ActualKind: ld.Kind_String} } -func (x String) LookupByIndex(idx int64) (dms3ld.Node, error) { - return nil, dms3ld.ErrWrongKind{TypeName: x.TypeName, MethodName: "LookupByIndex", AppropriateKind: dms3ld.KindSet_JustList, ActualKind: dms3ld.Kind_String} +func (x String) LookupByIndex(idx int64) (ld.Node, error) { + return nil, ld.ErrWrongKind{TypeName: x.TypeName, MethodName: "LookupByIndex", AppropriateKind: ld.KindSet_JustList, ActualKind: ld.Kind_String} } -func (x String) LookupBySegment(dms3ld.PathSegment) (dms3ld.Node, error) { - return nil, dms3ld.ErrWrongKind{TypeName: x.TypeName, MethodName: "LookupBySegment", AppropriateKind: dms3ld.KindSet_Recursive, ActualKind: dms3ld.Kind_String} +func (x String) LookupBySegment(ld.PathSegment) (ld.Node, error) { + return nil, ld.ErrWrongKind{TypeName: x.TypeName, MethodName: "LookupBySegment", AppropriateKind: ld.KindSet_Recursive, ActualKind: ld.Kind_String} } -func (String) MapIterator() dms3ld.MapIterator { +func (String) MapIterator() ld.MapIterator { return nil } -func (String) ListIterator() dms3ld.ListIterator { +func (String) ListIterator() ld.ListIterator { return nil } func (String) Length() int64 { @@ -50,19 +50,19 @@ func (String) IsNull() bool { return false } func (x String) AsBool() (bool, error) { - return false, dms3ld.ErrWrongKind{TypeName: x.TypeName, MethodName: "AsBool", AppropriateKind: dms3ld.KindSet_JustBool, ActualKind: dms3ld.Kind_String} + return false, ld.ErrWrongKind{TypeName: x.TypeName, MethodName: "AsBool", AppropriateKind: ld.KindSet_JustBool, ActualKind: ld.Kind_String} } func (x String) AsInt() (int64, error) { - return 0, dms3ld.ErrWrongKind{TypeName: x.TypeName, MethodName: "AsInt", AppropriateKind: dms3ld.KindSet_JustInt, ActualKind: dms3ld.Kind_String} + return 0, ld.ErrWrongKind{TypeName: x.TypeName, MethodName: "AsInt", AppropriateKind: ld.KindSet_JustInt, ActualKind: ld.Kind_String} } func (x String) AsFloat() (float64, error) { - return 0, dms3ld.ErrWrongKind{TypeName: x.TypeName, MethodName: "AsFloat", AppropriateKind: dms3ld.KindSet_JustFloat, ActualKind: dms3ld.Kind_String} + return 0, ld.ErrWrongKind{TypeName: x.TypeName, MethodName: "AsFloat", AppropriateKind: ld.KindSet_JustFloat, ActualKind: ld.Kind_String} } func (x String) AsBytes() ([]byte, error) { - return nil, dms3ld.ErrWrongKind{TypeName: x.TypeName, MethodName: "AsBytes", AppropriateKind: dms3ld.KindSet_JustBytes, ActualKind: dms3ld.Kind_String} + return nil, ld.ErrWrongKind{TypeName: x.TypeName, MethodName: "AsBytes", AppropriateKind: ld.KindSet_JustBytes, ActualKind: ld.Kind_String} } -func (x String) AsLink() (dms3ld.Link, error) { - return nil, dms3ld.ErrWrongKind{TypeName: x.TypeName, MethodName: "AsLink", AppropriateKind: dms3ld.KindSet_JustLink, ActualKind: dms3ld.Kind_String} +func (x String) AsLink() (ld.Link, error) { + return nil, ld.ErrWrongKind{TypeName: x.TypeName, MethodName: "AsLink", AppropriateKind: ld.KindSet_JustLink, ActualKind: ld.Kind_String} } // StringAssembler has similar purpose as String, but for (you guessed it) @@ -71,27 +71,27 @@ type StringAssembler struct { TypeName string } -func (x StringAssembler) BeginMap(sizeHint int64) (dms3ld.MapAssembler, error) { - return nil, dms3ld.ErrWrongKind{TypeName: x.TypeName, MethodName: "BeginMap", AppropriateKind: dms3ld.KindSet_JustMap, ActualKind: dms3ld.Kind_String} +func (x StringAssembler) BeginMap(sizeHint int64) (ld.MapAssembler, error) { + return nil, ld.ErrWrongKind{TypeName: x.TypeName, MethodName: "BeginMap", AppropriateKind: ld.KindSet_JustMap, ActualKind: ld.Kind_String} } -func (x StringAssembler) BeginList(sizeHint int64) (dms3ld.ListAssembler, error) { - return nil, dms3ld.ErrWrongKind{TypeName: x.TypeName, MethodName: "BeginList", AppropriateKind: dms3ld.KindSet_JustList, ActualKind: dms3ld.Kind_String} +func (x StringAssembler) BeginList(sizeHint int64) (ld.ListAssembler, error) { + return nil, ld.ErrWrongKind{TypeName: x.TypeName, MethodName: "BeginList", AppropriateKind: ld.KindSet_JustList, ActualKind: ld.Kind_String} } func (x StringAssembler) AssignNull() error { - return dms3ld.ErrWrongKind{TypeName: x.TypeName, MethodName: "AssignNull", AppropriateKind: dms3ld.KindSet_JustNull, ActualKind: dms3ld.Kind_String} + return ld.ErrWrongKind{TypeName: x.TypeName, MethodName: "AssignNull", AppropriateKind: ld.KindSet_JustNull, ActualKind: ld.Kind_String} } func (x StringAssembler) AssignBool(bool) error { - return dms3ld.ErrWrongKind{TypeName: x.TypeName, MethodName: "AssignBool", AppropriateKind: dms3ld.KindSet_JustBool, ActualKind: dms3ld.Kind_String} + return ld.ErrWrongKind{TypeName: x.TypeName, MethodName: "AssignBool", AppropriateKind: ld.KindSet_JustBool, ActualKind: ld.Kind_String} } func (x StringAssembler) AssignInt(int64) error { - return dms3ld.ErrWrongKind{TypeName: x.TypeName, MethodName: "AssignInt", AppropriateKind: dms3ld.KindSet_JustInt, ActualKind: dms3ld.Kind_String} + return ld.ErrWrongKind{TypeName: x.TypeName, MethodName: "AssignInt", AppropriateKind: ld.KindSet_JustInt, ActualKind: ld.Kind_String} } func (x StringAssembler) AssignFloat(float64) error { - return dms3ld.ErrWrongKind{TypeName: x.TypeName, MethodName: "AssignFloat", AppropriateKind: dms3ld.KindSet_JustFloat, ActualKind: dms3ld.Kind_String} + return ld.ErrWrongKind{TypeName: x.TypeName, MethodName: "AssignFloat", AppropriateKind: ld.KindSet_JustFloat, ActualKind: ld.Kind_String} } func (x StringAssembler) AssignBytes([]byte) error { - return dms3ld.ErrWrongKind{TypeName: x.TypeName, MethodName: "AssignBytes", AppropriateKind: dms3ld.KindSet_JustBytes, ActualKind: dms3ld.Kind_String} + return ld.ErrWrongKind{TypeName: x.TypeName, MethodName: "AssignBytes", AppropriateKind: ld.KindSet_JustBytes, ActualKind: ld.Kind_String} } -func (x StringAssembler) AssignLink(dms3ld.Link) error { - return dms3ld.ErrWrongKind{TypeName: x.TypeName, MethodName: "AssignLink", AppropriateKind: dms3ld.KindSet_JustLink, ActualKind: dms3ld.Kind_String} +func (x StringAssembler) AssignLink(ld.Link) error { + return ld.ErrWrongKind{TypeName: x.TypeName, MethodName: "AssignLink", AppropriateKind: ld.KindSet_JustLink, ActualKind: ld.Kind_String} } diff --git a/node/tests/corpus/corpus.go b/node/tests/corpus/corpus.go index cdf3aa96e2a2aba0e6e431b806e4dec32adb8a92..be27e5eaf605742b4d8de72d1dc29404639cef47 100644 --- a/node/tests/corpus/corpus.go +++ b/node/tests/corpus/corpus.go @@ -3,7 +3,7 @@ Values come as JSON strings. It is assumed you can unmarshal those. The reason we do this is so that this corpus package doesn't import - any particular concrete implementation of dms3ld.Node... since that would + any particular concrete implementation of ld.Node... since that would make it ironically incapable of being used for that Node's tests. The naming convention is roughly as follows: diff --git a/node/tests/listSpecs.go b/node/tests/listSpecs.go index f092483067fb9ec93aee2a036758523887394347..1a688426227371289abc64663e6e8697324b5888 100644 --- a/node/tests/listSpecs.go +++ b/node/tests/listSpecs.go @@ -5,12 +5,12 @@ import ( . "github.com/warpfork/go-wish" - dms3ld "gitlab.dms3.io/ld/go-ld-prime" + ld "gitlab.dms3.io/ld/go-ld-prime" "gitlab.dms3.io/ld/go-ld-prime/fluent" "gitlab.dms3.io/ld/go-ld-prime/must" ) -func SpecTestListString(t *testing.T, np dms3ld.NodePrototype) { +func SpecTestListString(t *testing.T, np ld.NodePrototype) { t.Run("list, 3 entries", func(t *testing.T) { n := fluent.MustBuildList(np, 3, func(la fluent.ListAssembler) { la.AssembleValue().AssignString("one") @@ -55,7 +55,7 @@ func SpecTestListString(t *testing.T, np dms3ld.NodePrototype) { Wish(t, itr.Done(), ShouldEqual, true) idx, v, err = itr.Next() - Wish(t, err, ShouldEqual, dms3ld.ErrIteratorOverread{}) + Wish(t, err, ShouldEqual, ld.ErrIteratorOverread{}) Wish(t, idx, ShouldEqual, int64(-1)) Wish(t, v, ShouldEqual, nil) }) diff --git a/node/tests/mapBenchmarks.go b/node/tests/mapBenchmarks.go index 9a67a2d0cf72851a0a280cc40f20f11e07288d6b..6f9a84a77aafce410d3b504ce87f08658f0f3074 100644 --- a/node/tests/mapBenchmarks.go +++ b/node/tests/mapBenchmarks.go @@ -3,17 +3,17 @@ package tests import ( "testing" - dms3ld "gitlab.dms3.io/ld/go-ld-prime" + ld "gitlab.dms3.io/ld/go-ld-prime" "gitlab.dms3.io/ld/go-ld-prime/must" ) -func SpecBenchmarkMapStrInt_3n_AssembleStandard(b *testing.B, np dms3ld.NodePrototype) { +func SpecBenchmarkMapStrInt_3n_AssembleStandard(b *testing.B, np ld.NodePrototype) { for i := 0; i < b.N; i++ { sink = buildMapStrIntN3(np) } } -func SpecBenchmarkMapStrInt_3n_AssembleEntry(b *testing.B, np dms3ld.NodePrototype) { +func SpecBenchmarkMapStrInt_3n_AssembleEntry(b *testing.B, np ld.NodePrototype) { for i := 0; i < b.N; i++ { nb := np.NewBuilder() ma, err := nb.BeginMap(3) @@ -40,7 +40,7 @@ func SpecBenchmarkMapStrInt_3n_AssembleEntry(b *testing.B, np dms3ld.NodePrototy } } -func SpecBenchmarkMapStrInt_3n_Iteration(b *testing.B, np dms3ld.NodePrototype) { +func SpecBenchmarkMapStrInt_3n_Iteration(b *testing.B, np ld.NodePrototype) { n := buildMapStrIntN3(np) b.ResetTimer() for i := 0; i < b.N; i++ { @@ -54,13 +54,13 @@ func SpecBenchmarkMapStrInt_3n_Iteration(b *testing.B, np dms3ld.NodePrototype) // n25 --> -func SpecBenchmarkMapStrInt_25n_AssembleStandard(b *testing.B, np dms3ld.NodePrototype) { +func SpecBenchmarkMapStrInt_25n_AssembleStandard(b *testing.B, np ld.NodePrototype) { for i := 0; i < b.N; i++ { sink = buildMapStrIntN25(np) } } -func SpecBenchmarkMapStrInt_25n_AssembleEntry(b *testing.B, np dms3ld.NodePrototype) { +func SpecBenchmarkMapStrInt_25n_AssembleEntry(b *testing.B, np ld.NodePrototype) { for i := 0; i < b.N; i++ { nb := np.NewBuilder() ma, err := nb.BeginMap(25) @@ -79,7 +79,7 @@ func SpecBenchmarkMapStrInt_25n_AssembleEntry(b *testing.B, np dms3ld.NodeProtot } } -func SpecBenchmarkMapStrInt_25n_Iteration(b *testing.B, np dms3ld.NodePrototype) { +func SpecBenchmarkMapStrInt_25n_Iteration(b *testing.B, np ld.NodePrototype) { n := buildMapStrIntN25(np) b.ResetTimer() for i := 0; i < b.N; i++ { diff --git a/node/tests/mapFixtures.go b/node/tests/mapFixtures.go index 8c5d412a4df4dc44a6c38990d6068411c072d1e4..d67c473680f1f3b01e2987ef79380164e3cdcabe 100644 --- a/node/tests/mapFixtures.go +++ b/node/tests/mapFixtures.go @@ -3,7 +3,7 @@ package tests import ( "fmt" - dms3ld "gitlab.dms3.io/ld/go-ld-prime" + ld "gitlab.dms3.io/ld/go-ld-prime" "gitlab.dms3.io/ld/go-ld-prime/must" ) @@ -22,7 +22,7 @@ func init() { } // extracted for reuse between correctness tests and benchmarks -func buildMapStrIntN3(np dms3ld.NodePrototype) dms3ld.Node { +func buildMapStrIntN3(np ld.NodePrototype) ld.Node { nb := np.NewBuilder() ma, err := nb.BeginMap(3) must.NotError(err) @@ -37,7 +37,7 @@ func buildMapStrIntN3(np dms3ld.NodePrototype) dms3ld.Node { } // extracted for reuse across benchmarks -func buildMapStrIntN25(np dms3ld.NodePrototype) dms3ld.Node { +func buildMapStrIntN25(np ld.NodePrototype) ld.Node { nb := np.NewBuilder() ma, err := nb.BeginMap(25) must.NotError(err) diff --git a/node/tests/mapSpecs.go b/node/tests/mapSpecs.go index 1214afa741f28112827272525bc5f926bf4b0723..64c3dca6893ca5080fb3646927ad91e8cdae0e22 100644 --- a/node/tests/mapSpecs.go +++ b/node/tests/mapSpecs.go @@ -5,11 +5,11 @@ import ( . "github.com/warpfork/go-wish" - dms3ld "gitlab.dms3.io/ld/go-ld-prime" + ld "gitlab.dms3.io/ld/go-ld-prime" "gitlab.dms3.io/ld/go-ld-prime/must" ) -func SpecTestMapStrInt(t *testing.T, np dms3ld.NodePrototype) { +func SpecTestMapStrInt(t *testing.T, np ld.NodePrototype) { t.Run("map, 3 entries", func(t *testing.T) { n := buildMapStrIntN3(np) t.Run("reads back out", func(t *testing.T) { @@ -68,13 +68,13 @@ func SpecTestMapStrInt(t *testing.T, np dms3ld.NodePrototype) { Wish(t, itr.Done(), ShouldEqual, true) k, v, err = itr.Next() - Wish(t, err, ShouldEqual, dms3ld.ErrIteratorOverread{}) + Wish(t, err, ShouldEqual, ld.ErrIteratorOverread{}) Wish(t, k, ShouldEqual, nil) Wish(t, v, ShouldEqual, nil) }) t.Run("reads for absent keys error sensibly", func(t *testing.T) { v, err := n.LookupByString("nope") - Wish(t, err, ShouldBeSameTypeAs, dms3ld.ErrNotExists{}) + Wish(t, err, ShouldBeSameTypeAs, ld.ErrNotExists{}) Wish(t, err.Error(), ShouldEqual, `key not found: "nope"`) Wish(t, v, ShouldEqual, nil) }) @@ -92,7 +92,7 @@ func SpecTestMapStrInt(t *testing.T, np dms3ld.NodePrototype) { panic(err) } if err := ma.AssembleKey().AssignString("whee"); err != nil { - Wish(t, err, ShouldBeSameTypeAs, dms3ld.ErrRepeatedMapKey{}) + Wish(t, err, ShouldBeSameTypeAs, ld.ErrRepeatedMapKey{}) // No string assertion at present -- how that should be presented for typed stuff is unsettled // (and if it's clever, it'll differ from untyped, which will mean no assertion possible!). } @@ -136,13 +136,13 @@ func SpecTestMapStrInt(t *testing.T, np dms3ld.NodePrototype) { }) } -func SpecTestMapStrMapStrInt(t *testing.T, np dms3ld.NodePrototype) { +func SpecTestMapStrMapStrInt(t *testing.T, np ld.NodePrototype) { t.Run("map>", func(t *testing.T) { nb := np.NewBuilder() ma, err := nb.BeginMap(3) must.NotError(err) must.NotError(ma.AssembleKey().AssignString("whee")) - func(ma dms3ld.MapAssembler, err error) { + func(ma ld.MapAssembler, err error) { must.NotError(ma.AssembleKey().AssignString("m1k1")) must.NotError(ma.AssembleValue().AssignInt(1)) must.NotError(ma.AssembleKey().AssignString("m1k2")) @@ -150,7 +150,7 @@ func SpecTestMapStrMapStrInt(t *testing.T, np dms3ld.NodePrototype) { must.NotError(ma.Finish()) }(ma.AssembleValue().BeginMap(2)) must.NotError(ma.AssembleKey().AssignString("woot")) - func(ma dms3ld.MapAssembler, err error) { + func(ma ld.MapAssembler, err error) { must.NotError(ma.AssembleKey().AssignString("m2k1")) must.NotError(ma.AssembleValue().AssignInt(3)) must.NotError(ma.AssembleKey().AssignString("m2k2")) @@ -158,7 +158,7 @@ func SpecTestMapStrMapStrInt(t *testing.T, np dms3ld.NodePrototype) { must.NotError(ma.Finish()) }(ma.AssembleValue().BeginMap(2)) must.NotError(ma.AssembleKey().AssignString("waga")) - func(ma dms3ld.MapAssembler, err error) { + func(ma ld.MapAssembler, err error) { must.NotError(ma.AssembleKey().AssignString("m3k1")) must.NotError(ma.AssembleValue().AssignInt(5)) must.NotError(ma.AssembleKey().AssignString("m3k2")) @@ -187,26 +187,26 @@ func SpecTestMapStrMapStrInt(t *testing.T, np dms3ld.NodePrototype) { }) } -func SpecTestMapStrListStr(t *testing.T, np dms3ld.NodePrototype) { +func SpecTestMapStrListStr(t *testing.T, np ld.NodePrototype) { t.Run("map>", func(t *testing.T) { nb := np.NewBuilder() ma, err := nb.BeginMap(3) must.NotError(err) must.NotError(ma.AssembleKey().AssignString("asdf")) - func(la dms3ld.ListAssembler, err error) { + func(la ld.ListAssembler, err error) { must.NotError(la.AssembleValue().AssignString("eleven")) must.NotError(la.AssembleValue().AssignString("twelve")) must.NotError(la.AssembleValue().AssignString("thirteen")) must.NotError(la.Finish()) }(ma.AssembleValue().BeginList(3)) must.NotError(ma.AssembleKey().AssignString("qwer")) - func(la dms3ld.ListAssembler, err error) { + func(la ld.ListAssembler, err error) { must.NotError(la.AssembleValue().AssignString("twentyone")) must.NotError(la.AssembleValue().AssignString("twentytwo")) must.NotError(la.Finish()) }(ma.AssembleValue().BeginList(2)) must.NotError(ma.AssembleKey().AssignString("zxcv")) - func(la dms3ld.ListAssembler, err error) { + func(la ld.ListAssembler, err error) { must.NotError(la.AssembleValue().AssignString("thirtyone")) must.NotError(la.Finish()) }(ma.AssembleValue().BeginList(1)) diff --git a/node/tests/marshalBenchmarks.go b/node/tests/marshalBenchmarks.go index 265295cac7dc0a7228ed869cbb6e7c4b53579114..522692b187aa9e9f88692cd0b8df87b534f22a4e 100644 --- a/node/tests/marshalBenchmarks.go +++ b/node/tests/marshalBenchmarks.go @@ -9,7 +9,7 @@ import ( refmtjson "github.com/polydawn/refmt/json" "github.com/polydawn/refmt/tok" - dms3ld "gitlab.dms3.io/ld/go-ld-prime" + ld "gitlab.dms3.io/ld/go-ld-prime" "gitlab.dms3.io/ld/go-ld-prime/codec" "gitlab.dms3.io/ld/go-ld-prime/must" "gitlab.dms3.io/ld/go-ld-prime/node/tests/corpus" @@ -24,7 +24,7 @@ import ( // - we can make direct comparisons to the standard library json marshalling // and unmarshalling, thus having a back-of-the-envelope baseline to compare. -func BenchmarkSpec_Marshal_Map3StrInt(b *testing.B, np dms3ld.NodePrototype) { +func BenchmarkSpec_Marshal_Map3StrInt(b *testing.B, np ld.NodePrototype) { nb := np.NewBuilder() must.NotError(codec.Unmarshal(nb, refmtjson.NewDecoder(strings.NewReader(`{"whee":1,"woot":2,"waga":3}`)))) n := nb.Build() @@ -40,7 +40,7 @@ func BenchmarkSpec_Marshal_Map3StrInt(b *testing.B, np dms3ld.NodePrototype) { } } -func BenchmarkSpec_Marshal_Map3StrInt_CodecNull(b *testing.B, np dms3ld.NodePrototype) { +func BenchmarkSpec_Marshal_Map3StrInt_CodecNull(b *testing.B, np ld.NodePrototype) { nb := np.NewBuilder() must.NotError(codec.Unmarshal(nb, refmtjson.NewDecoder(strings.NewReader(`{"whee":1,"woot":2,"waga":3}`)))) n := nb.Build() @@ -63,7 +63,7 @@ func (nullTokenSink) Step(_ *tok.Token) (bool, error) { return false, nil } -func BenchmarkSpec_Marshal_MapNStrMap3StrInt(b *testing.B, np dms3ld.NodePrototype) { +func BenchmarkSpec_Marshal_MapNStrMap3StrInt(b *testing.B, np ld.NodePrototype) { for _, n := range []int{0, 1, 2, 4, 8, 16, 32} { b.Run(fmt.Sprintf("n=%d", n), func(b *testing.B) { msg := corpus.MapNStrMap3StrInt(n) diff --git a/node/tests/schemaLists.go b/node/tests/schemaLists.go index 6e1b0ec0b6d2330f6136c1777b7b9cc89a54ad27..392bdb06c76684061129b89c2dd85f4abc59bdf7 100644 --- a/node/tests/schemaLists.go +++ b/node/tests/schemaLists.go @@ -32,31 +32,31 @@ func SchemaTestListsContainingMaybe(t *testing.T, engine Engine) { la.AssembleValue().AssignString("2") }).(schema.TypedNode) t.Run("typed-read", func(t *testing.T) { - Require(t, n.Kind(), ShouldEqual, dms3ld.Kind_List) + Require(t, n.Kind(), ShouldEqual, ld.Kind_List) Wish(t, n.Length(), ShouldEqual, int64(2)) Wish(t, must.String(must.Node(n.LookupByIndex(0))), ShouldEqual, "1") Wish(t, must.String(must.Node(n.LookupByIndex(1))), ShouldEqual, "2") - Wish(t, must.String(must.Node(n.LookupBySegment(dms3ld.PathSegmentOfInt(0)))), ShouldEqual, "1") + Wish(t, must.String(must.Node(n.LookupBySegment(ld.PathSegmentOfInt(0)))), ShouldEqual, "1") Wish(t, must.String(must.Node(n.LookupByNode(basicnode.NewInt(0)))), ShouldEqual, "1") _, err := n.LookupByIndex(3) - Wish(t, err, ShouldBeSameTypeAs, dms3ld.ErrNotExists{}) + Wish(t, err, ShouldBeSameTypeAs, ld.ErrNotExists{}) }) t.Run("repr-read", func(t *testing.T) { nr := n.Representation() - Require(t, nr.Kind(), ShouldEqual, dms3ld.Kind_List) + Require(t, nr.Kind(), ShouldEqual, ld.Kind_List) Wish(t, nr.Length(), ShouldEqual, int64(2)) Wish(t, must.String(must.Node(nr.LookupByIndex(0))), ShouldEqual, "1") Wish(t, must.String(must.Node(nr.LookupByIndex(1))), ShouldEqual, "2") - Wish(t, must.String(must.Node(n.LookupBySegment(dms3ld.PathSegmentOfInt(0)))), ShouldEqual, "1") + Wish(t, must.String(must.Node(n.LookupBySegment(ld.PathSegmentOfInt(0)))), ShouldEqual, "1") Wish(t, must.String(must.Node(n.LookupByNode(basicnode.NewInt(0)))), ShouldEqual, "1") _, err := n.LookupByIndex(3) - Wish(t, err, ShouldBeSameTypeAs, dms3ld.ErrNotExists{}) + Wish(t, err, ShouldBeSameTypeAs, ld.ErrNotExists{}) }) }) t.Run("repr-create", func(t *testing.T) { @@ -64,7 +64,7 @@ func SchemaTestListsContainingMaybe(t *testing.T, engine Engine) { la.AssembleValue().AssignString("1") la.AssembleValue().AssignString("2") }) - Wish(t, dms3ld.DeepEqual(n, nr), ShouldEqual, true) + Wish(t, ld.DeepEqual(n, nr), ShouldEqual, true) }) }) t.Run("nullable", func(t *testing.T) { @@ -77,21 +77,21 @@ func SchemaTestListsContainingMaybe(t *testing.T, engine Engine) { la.AssembleValue().AssignNull() }).(schema.TypedNode) t.Run("typed-read", func(t *testing.T) { - Require(t, n.Kind(), ShouldEqual, dms3ld.Kind_List) + Require(t, n.Kind(), ShouldEqual, ld.Kind_List) Wish(t, n.Length(), ShouldEqual, int64(2)) Wish(t, must.String(must.Node(n.LookupByIndex(0))), ShouldEqual, "1") - Wish(t, must.Node(n.LookupByIndex(1)), ShouldEqual, dms3ld.Null) + Wish(t, must.Node(n.LookupByIndex(1)), ShouldEqual, ld.Null) _, err := n.LookupByIndex(3) - Wish(t, err, ShouldBeSameTypeAs, dms3ld.ErrNotExists{}) + Wish(t, err, ShouldBeSameTypeAs, ld.ErrNotExists{}) }) t.Run("repr-read", func(t *testing.T) { nr := n.Representation() - Require(t, nr.Kind(), ShouldEqual, dms3ld.Kind_List) + Require(t, nr.Kind(), ShouldEqual, ld.Kind_List) Wish(t, nr.Length(), ShouldEqual, int64(2)) Wish(t, must.String(must.Node(n.LookupByIndex(0))), ShouldEqual, "1") - Wish(t, must.Node(n.LookupByIndex(1)), ShouldEqual, dms3ld.Null) + Wish(t, must.Node(n.LookupByIndex(1)), ShouldEqual, ld.Null) _, err := n.LookupByIndex(3) - Wish(t, err, ShouldBeSameTypeAs, dms3ld.ErrNotExists{}) + Wish(t, err, ShouldBeSameTypeAs, ld.ErrNotExists{}) }) }) t.Run("repr-create", func(t *testing.T) { @@ -99,7 +99,7 @@ func SchemaTestListsContainingMaybe(t *testing.T, engine Engine) { la.AssembleValue().AssignString("1") la.AssembleValue().AssignNull() }) - Wish(t, dms3ld.DeepEqual(n, nr), ShouldEqual, true) + Wish(t, ld.DeepEqual(n, nr), ShouldEqual, true) }) }) } @@ -145,7 +145,7 @@ func SchemaTestListsContainingLists(t *testing.T, engine Engine) { }) }).(schema.TypedNode) t.Run("typed-read", func(t *testing.T) { - Require(t, n.Kind(), ShouldEqual, dms3ld.Kind_List) + Require(t, n.Kind(), ShouldEqual, ld.Kind_List) Require(t, n.Length(), ShouldEqual, int64(3)) Require(t, must.Node(n.LookupByIndex(0)).Length(), ShouldEqual, int64(3)) Require(t, must.Node(n.LookupByIndex(1)).Length(), ShouldEqual, int64(1)) @@ -158,7 +158,7 @@ func SchemaTestListsContainingLists(t *testing.T, engine Engine) { }) t.Run("repr-read", func(t *testing.T) { nr := n.Representation() - Require(t, nr.Kind(), ShouldEqual, dms3ld.Kind_List) + Require(t, nr.Kind(), ShouldEqual, ld.Kind_List) Require(t, nr.Length(), ShouldEqual, int64(3)) Require(t, must.Node(nr.LookupByIndex(0)).Length(), ShouldEqual, int64(3)) Require(t, must.Node(nr.LookupByIndex(1)).Length(), ShouldEqual, int64(1)) @@ -186,6 +186,6 @@ func SchemaTestListsContainingLists(t *testing.T, engine Engine) { la.AssembleValue().CreateMap(1, func(ma fluent.MapAssembler) { ma.AssembleEntry("encoded").AssignString("32") }) }) }) - Wish(t, dms3ld.DeepEqual(n, nr), ShouldEqual, true) + Wish(t, ld.DeepEqual(n, nr), ShouldEqual, true) }) } diff --git a/node/tests/schemaMaps.go b/node/tests/schemaMaps.go index 52d43167921fb0ba61124e16f704145a9fc5672e..be0bc8fad4920eab34f1f4bf832ffebcc2017651 100644 --- a/node/tests/schemaMaps.go +++ b/node/tests/schemaMaps.go @@ -30,21 +30,21 @@ func SchemaTestMapsContainingMaybe(t *testing.T, engine Engine) { ma.AssembleEntry("two").AssignString("2") }).(schema.TypedNode) t.Run("typed-read", func(t *testing.T) { - Require(t, n.Kind(), ShouldEqual, dms3ld.Kind_Map) + Require(t, n.Kind(), ShouldEqual, ld.Kind_Map) Wish(t, n.Length(), ShouldEqual, int64(2)) Wish(t, must.String(must.Node(n.LookupByString("one"))), ShouldEqual, "1") Wish(t, must.String(must.Node(n.LookupByString("two"))), ShouldEqual, "2") _, err := n.LookupByString("miss") - Wish(t, err, ShouldBeSameTypeAs, dms3ld.ErrNotExists{}) + Wish(t, err, ShouldBeSameTypeAs, ld.ErrNotExists{}) }) t.Run("repr-read", func(t *testing.T) { nr := n.Representation() - Require(t, nr.Kind(), ShouldEqual, dms3ld.Kind_Map) + Require(t, nr.Kind(), ShouldEqual, ld.Kind_Map) Wish(t, nr.Length(), ShouldEqual, int64(2)) Wish(t, must.String(must.Node(nr.LookupByString("one"))), ShouldEqual, "1") Wish(t, must.String(must.Node(nr.LookupByString("two"))), ShouldEqual, "2") _, err := nr.LookupByString("miss") - Wish(t, err, ShouldBeSameTypeAs, dms3ld.ErrNotExists{}) + Wish(t, err, ShouldBeSameTypeAs, ld.ErrNotExists{}) }) }) t.Run("repr-create", func(t *testing.T) { @@ -52,7 +52,7 @@ func SchemaTestMapsContainingMaybe(t *testing.T, engine Engine) { ma.AssembleEntry("one").AssignString("1") ma.AssembleEntry("two").AssignString("2") }) - Wish(t, dms3ld.DeepEqual(n, nr), ShouldEqual, true) + Wish(t, ld.DeepEqual(n, nr), ShouldEqual, true) }) }) t.Run("nullable", func(t *testing.T) { @@ -65,21 +65,21 @@ func SchemaTestMapsContainingMaybe(t *testing.T, engine Engine) { ma.AssembleEntry("none").AssignNull() }).(schema.TypedNode) t.Run("typed-read", func(t *testing.T) { - Require(t, n.Kind(), ShouldEqual, dms3ld.Kind_Map) + Require(t, n.Kind(), ShouldEqual, ld.Kind_Map) Wish(t, n.Length(), ShouldEqual, int64(2)) Wish(t, must.String(must.Node(n.LookupByString("one"))), ShouldEqual, "1") - Wish(t, must.Node(n.LookupByString("none")), ShouldEqual, dms3ld.Null) + Wish(t, must.Node(n.LookupByString("none")), ShouldEqual, ld.Null) _, err := n.LookupByString("miss") - Wish(t, err, ShouldBeSameTypeAs, dms3ld.ErrNotExists{}) + Wish(t, err, ShouldBeSameTypeAs, ld.ErrNotExists{}) }) t.Run("repr-read", func(t *testing.T) { nr := n.Representation() - Require(t, nr.Kind(), ShouldEqual, dms3ld.Kind_Map) + Require(t, nr.Kind(), ShouldEqual, ld.Kind_Map) Wish(t, nr.Length(), ShouldEqual, int64(2)) Wish(t, must.String(must.Node(nr.LookupByString("one"))), ShouldEqual, "1") - Wish(t, must.Node(nr.LookupByString("none")), ShouldEqual, dms3ld.Null) + Wish(t, must.Node(nr.LookupByString("none")), ShouldEqual, ld.Null) _, err := nr.LookupByString("miss") - Wish(t, err, ShouldBeSameTypeAs, dms3ld.ErrNotExists{}) + Wish(t, err, ShouldBeSameTypeAs, ld.ErrNotExists{}) }) }) t.Run("repr-create", func(t *testing.T) { @@ -87,7 +87,7 @@ func SchemaTestMapsContainingMaybe(t *testing.T, engine Engine) { ma.AssembleEntry("one").AssignString("1") ma.AssembleEntry("none").AssignNull() }) - Wish(t, dms3ld.DeepEqual(n, nr), ShouldEqual, true) + Wish(t, ld.DeepEqual(n, nr), ShouldEqual, true) }) }) } @@ -116,7 +116,7 @@ func SchemaTestMapsContainingMaps(t *testing.T, engine Engine) { np := engine.PrototypeByName("Map__String__nullableMap__String__Frub") nrp := engine.PrototypeByName("Map__String__nullableMap__String__Frub.Repr") - creation := func(t *testing.T, np dms3ld.NodePrototype, fieldName string) schema.TypedNode { + creation := func(t *testing.T, np ld.NodePrototype, fieldName string) schema.TypedNode { return fluent.MustBuildMap(np, 3, func(ma fluent.MapAssembler) { ma.AssembleEntry("one").CreateMap(2, func(ma fluent.MapAssembler) { ma.AssembleEntry("zot").CreateMap(1, func(ma fluent.MapAssembler) { ma.AssembleEntry(fieldName).AssignString("11") }) @@ -128,37 +128,37 @@ func SchemaTestMapsContainingMaps(t *testing.T, engine Engine) { ma.AssembleEntry("none").AssignNull() }).(schema.TypedNode) } - reading := func(t *testing.T, n dms3ld.Node, fieldName string) { - withNode(n, func(n dms3ld.Node) { - Require(t, n.Kind(), ShouldEqual, dms3ld.Kind_Map) + reading := func(t *testing.T, n ld.Node, fieldName string) { + withNode(n, func(n ld.Node) { + Require(t, n.Kind(), ShouldEqual, ld.Kind_Map) Wish(t, n.Length(), ShouldEqual, int64(3)) - withNode(must.Node(n.LookupByString("one")), func(n dms3ld.Node) { - Require(t, n.Kind(), ShouldEqual, dms3ld.Kind_Map) + withNode(must.Node(n.LookupByString("one")), func(n ld.Node) { + Require(t, n.Kind(), ShouldEqual, ld.Kind_Map) Wish(t, n.Length(), ShouldEqual, int64(2)) - withNode(must.Node(n.LookupByString("zot")), func(n dms3ld.Node) { - Require(t, n.Kind(), ShouldEqual, dms3ld.Kind_Map) + withNode(must.Node(n.LookupByString("zot")), func(n ld.Node) { + Require(t, n.Kind(), ShouldEqual, ld.Kind_Map) Wish(t, n.Length(), ShouldEqual, int64(1)) Wish(t, must.String(must.Node(n.LookupByString(fieldName))), ShouldEqual, "11") }) - withNode(must.Node(n.LookupByString("zop")), func(n dms3ld.Node) { - Require(t, n.Kind(), ShouldEqual, dms3ld.Kind_Map) + withNode(must.Node(n.LookupByString("zop")), func(n ld.Node) { + Require(t, n.Kind(), ShouldEqual, ld.Kind_Map) Wish(t, n.Length(), ShouldEqual, int64(1)) Wish(t, must.String(must.Node(n.LookupByString(fieldName))), ShouldEqual, "12") }) }) - withNode(must.Node(n.LookupByString("two")), func(n dms3ld.Node) { + withNode(must.Node(n.LookupByString("two")), func(n ld.Node) { Wish(t, n.Length(), ShouldEqual, int64(1)) - withNode(must.Node(n.LookupByString("zim")), func(n dms3ld.Node) { - Require(t, n.Kind(), ShouldEqual, dms3ld.Kind_Map) + withNode(must.Node(n.LookupByString("zim")), func(n ld.Node) { + Require(t, n.Kind(), ShouldEqual, ld.Kind_Map) Wish(t, n.Length(), ShouldEqual, int64(1)) Wish(t, must.String(must.Node(n.LookupByString(fieldName))), ShouldEqual, "21") }) }) - withNode(must.Node(n.LookupByString("none")), func(n dms3ld.Node) { - Wish(t, dms3ld.DeepEqual(n, dms3ld.Null), ShouldEqual, true) + withNode(must.Node(n.LookupByString("none")), func(n ld.Node) { + Wish(t, ld.DeepEqual(n, ld.Null), ShouldEqual, true) }) _, err := n.LookupByString("miss") - Wish(t, err, ShouldBeSameTypeAs, dms3ld.ErrNotExists{}) + Wish(t, err, ShouldBeSameTypeAs, ld.ErrNotExists{}) }) } var n schema.TypedNode @@ -173,7 +173,7 @@ func SchemaTestMapsContainingMaps(t *testing.T, engine Engine) { }) t.Run("repr-create", func(t *testing.T) { nr := creation(t, nrp, "encoded") - Wish(t, dms3ld.DeepEqual(n, nr), ShouldEqual, true) + Wish(t, ld.DeepEqual(n, nr), ShouldEqual, true) }) } @@ -214,18 +214,18 @@ func SchemaTestMapsWithComplexKeys(t *testing.T, engine Engine) { ma.AssembleValue().AssignString("3") }).(schema.TypedNode) t.Run("typed-read", func(t *testing.T) { - Require(t, n.Kind(), ShouldEqual, dms3ld.Kind_Map) + Require(t, n.Kind(), ShouldEqual, ld.Kind_Map) Wish(t, n.Length(), ShouldEqual, int64(3)) n2 := must.Node(n.LookupByString("c:d")) - Require(t, n2.Kind(), ShouldEqual, dms3ld.Kind_String) + Require(t, n2.Kind(), ShouldEqual, ld.Kind_String) Wish(t, must.String(n2), ShouldEqual, "2") }) t.Run("repr-read", func(t *testing.T) { nr := n.Representation() - Require(t, nr.Kind(), ShouldEqual, dms3ld.Kind_Map) + Require(t, nr.Kind(), ShouldEqual, ld.Kind_Map) Wish(t, nr.Length(), ShouldEqual, int64(3)) n2 := must.Node(nr.LookupByString("c:d")) - Require(t, n2.Kind(), ShouldEqual, dms3ld.Kind_String) + Require(t, n2.Kind(), ShouldEqual, ld.Kind_String) Wish(t, must.String(n2), ShouldEqual, "2") }) }) @@ -235,6 +235,6 @@ func SchemaTestMapsWithComplexKeys(t *testing.T, engine Engine) { ma.AssembleEntry("c:d").AssignString("2") ma.AssembleEntry("e:f").AssignString("3") }) - Wish(t, dms3ld.DeepEqual(n, nr), ShouldEqual, true) + Wish(t, ld.DeepEqual(n, nr), ShouldEqual, true) }) } diff --git a/node/tests/schemaScalars.go b/node/tests/schemaScalars.go index f9600097539a89929f4c1ffffce21bd4cabc059a..20ab6bb1c0a83dd717b535653c8e8ad662e4bdb8 100644 --- a/node/tests/schemaScalars.go +++ b/node/tests/schemaScalars.go @@ -9,7 +9,7 @@ import ( "gitlab.dms3.io/ld/go-ld-prime/schema" ) -func assignValue(am dms3ld.NodeAssembler, value interface{}) error { +func assignValue(am ld.NodeAssembler, value interface{}) error { switch value := value.(type) { case bool: return am.AssignBool(value) @@ -39,14 +39,14 @@ func SchemaTestScalars(t *testing.T, engine Engine) { var tests = []struct { name string - kind dms3ld.Kind + kind ld.Kind value interface{} }{ - {"Bool", dms3ld.Kind_Bool, true}, - {"Int", dms3ld.Kind_Int, int64(23)}, - {"Float", dms3ld.Kind_Float, 12.25}, - {"String", dms3ld.Kind_String, "foo"}, - {"Bytes", dms3ld.Kind_Bytes, []byte("bar")}, + {"Bool", ld.Kind_Bool, true}, + {"Int", ld.Kind_Int, int64(23)}, + {"Float", ld.Kind_Float, 12.25}, + {"String", ld.Kind_String, "foo"}, + {"Bytes", ld.Kind_Bytes, []byte("bar")}, } // We test each of the five scalar prototypes in subtests. @@ -108,15 +108,15 @@ func SchemaTestScalars(t *testing.T, engine Engine) { var gotValue interface{} err = nil switch testAssign.kind { - case dms3ld.Kind_Bool: + case ld.Kind_Bool: gotValue, err = n.AsBool() - case dms3ld.Kind_Int: + case ld.Kind_Int: gotValue, err = n.AsInt() - case dms3ld.Kind_Float: + case ld.Kind_Float: gotValue, err = n.AsFloat() - case dms3ld.Kind_String: + case ld.Kind_String: gotValue, err = n.AsString() - case dms3ld.Kind_Bytes: + case ld.Kind_Bytes: gotValue, err = n.AsBytes() default: t.Fatal(testAssign.kind) diff --git a/node/tests/schemaStruct.go b/node/tests/schemaStruct.go index bd0d538e78430fd0cef5c27260f0c3ea2af7db89..63e8fd0752d0a833a9aad1382aeacc7b9f39d4c3 100644 --- a/node/tests/schemaStruct.go +++ b/node/tests/schemaStruct.go @@ -42,7 +42,7 @@ func SchemaTestRequiredFields(t *testing.T, engine Engine) { ma, _ := nb.BeginMap(0) err := ma.Finish() - Wish(t, err, ShouldBeSameTypeAs, dms3ld.ErrMissingRequiredField{}) + Wish(t, err, ShouldBeSameTypeAs, ld.ErrMissingRequiredField{}) Wish(t, err.Error(), ShouldEqual, `missing required fields: a,b`) }) t.Run("building-representation-without-required-fields-errors", func(t *testing.T) { @@ -52,7 +52,7 @@ func SchemaTestRequiredFields(t *testing.T, engine Engine) { ma, _ := nb.BeginMap(0) err := ma.Finish() - Wish(t, err, ShouldBeSameTypeAs, dms3ld.ErrMissingRequiredField{}) + Wish(t, err, ShouldBeSameTypeAs, ld.ErrMissingRequiredField{}) Wish(t, err.Error(), ShouldEqual, `missing required fields: a,b`) }) t.Run("building-representation-with-renames-without-required-fields-errors", func(t *testing.T) { @@ -62,7 +62,7 @@ func SchemaTestRequiredFields(t *testing.T, engine Engine) { ma, _ := nb.BeginMap(0) err := ma.Finish() - Wish(t, err, ShouldBeSameTypeAs, dms3ld.ErrMissingRequiredField{}) + Wish(t, err, ShouldBeSameTypeAs, ld.ErrMissingRequiredField{}) Wish(t, err.Error(), ShouldEqual, `missing required fields: a,b (serial:"z")`) }) } @@ -99,33 +99,33 @@ func SchemaTestStructNesting(t *testing.T, engine Engine) { }) }).(schema.TypedNode) t.Run("typed-read", func(t *testing.T) { - Require(t, n.Kind(), ShouldEqual, dms3ld.Kind_Map) + Require(t, n.Kind(), ShouldEqual, ld.Kind_Map) Wish(t, n.Length(), ShouldEqual, int64(1)) n2 := must.Node(n.LookupByString("x")) - Require(t, n2.Kind(), ShouldEqual, dms3ld.Kind_Map) + Require(t, n2.Kind(), ShouldEqual, ld.Kind_Map) - n2Seg := must.Node(n.LookupBySegment(dms3ld.PathSegmentOfString("x"))) - Wish(t, dms3ld.DeepEqual(n2, n2Seg), ShouldEqual, true) + n2Seg := must.Node(n.LookupBySegment(ld.PathSegmentOfString("x"))) + Wish(t, ld.DeepEqual(n2, n2Seg), ShouldEqual, true) n2Node := must.Node(n.LookupByNode(basicnode.NewString("x"))) - Wish(t, dms3ld.DeepEqual(n2, n2Node), ShouldEqual, true) + Wish(t, ld.DeepEqual(n2, n2Node), ShouldEqual, true) Wish(t, must.String(must.Node(n2.LookupByString("s"))), ShouldEqual, "woo") }) t.Run("repr-read", func(t *testing.T) { nr := n.Representation() - Require(t, nr.Kind(), ShouldEqual, dms3ld.Kind_Map) + Require(t, nr.Kind(), ShouldEqual, ld.Kind_Map) Wish(t, nr.Length(), ShouldEqual, int64(1)) n2 := must.Node(nr.LookupByString("r")) - Require(t, n2.Kind(), ShouldEqual, dms3ld.Kind_Map) + Require(t, n2.Kind(), ShouldEqual, ld.Kind_Map) - n2Seg := must.Node(nr.LookupBySegment(dms3ld.PathSegmentOfString("r"))) - Wish(t, dms3ld.DeepEqual(n2, n2Seg), ShouldEqual, true) + n2Seg := must.Node(nr.LookupBySegment(ld.PathSegmentOfString("r"))) + Wish(t, ld.DeepEqual(n2, n2Seg), ShouldEqual, true) n2Node := must.Node(nr.LookupByNode(basicnode.NewString("r"))) - Wish(t, dms3ld.DeepEqual(n2, n2Node), ShouldEqual, true) + Wish(t, ld.DeepEqual(n2, n2Node), ShouldEqual, true) Wish(t, must.String(must.Node(n2.LookupByString("q"))), ShouldEqual, "woo") }) @@ -136,6 +136,6 @@ func SchemaTestStructNesting(t *testing.T, engine Engine) { ma.AssembleEntry("q").AssignString("woo") }) }) - Wish(t, dms3ld.DeepEqual(n, nr), ShouldEqual, true) + Wish(t, ld.DeepEqual(n, nr), ShouldEqual, true) }) } diff --git a/node/tests/schemaStructReprStringjoin.go b/node/tests/schemaStructReprStringjoin.go index c0c62f5f35a08384166bea51ec531f04d84f7bee..590cc638b3b2b8e9a1db262fe7eea8ff8c04c329 100644 --- a/node/tests/schemaStructReprStringjoin.go +++ b/node/tests/schemaStructReprStringjoin.go @@ -5,6 +5,7 @@ import ( . "github.com/warpfork/go-wish" + "gitlab.dms3.io/ld/go-ld-prime" "gitlab.dms3.io/ld/go-ld-prime/fluent" "gitlab.dms3.io/ld/go-ld-prime/must" "gitlab.dms3.io/ld/go-ld-prime/schema" @@ -50,13 +51,13 @@ func SchemaTestStructReprStringjoin(t *testing.T, engine Engine) { ma.AssembleEntry("field").AssignString("valoo") }).(schema.TypedNode) t.Run("typed-read", func(t *testing.T) { - Require(t, n.Kind(), ShouldEqual, dms3ld.Kind_Map) + Require(t, n.Kind(), ShouldEqual, ld.Kind_Map) Wish(t, n.Length(), ShouldEqual, int64(1)) Wish(t, must.String(must.Node(n.LookupByString("field"))), ShouldEqual, "valoo") }) t.Run("repr-read", func(t *testing.T) { nr := n.Representation() - Require(t, nr.Kind(), ShouldEqual, dms3ld.Kind_String) + Require(t, nr.Kind(), ShouldEqual, ld.Kind_String) Wish(t, must.String(nr), ShouldEqual, "valoo") }) }) @@ -64,7 +65,7 @@ func SchemaTestStructReprStringjoin(t *testing.T, engine Engine) { nr := fluent.MustBuild(nrp, func(na fluent.NodeAssembler) { na.AssignString("valoo") }) - Wish(t, dms3ld.DeepEqual(n, nr), ShouldEqual, true) + Wish(t, ld.DeepEqual(n, nr), ShouldEqual, true) }) }) @@ -78,14 +79,14 @@ func SchemaTestStructReprStringjoin(t *testing.T, engine Engine) { ma.AssembleEntry("bar").AssignString("v2") }).(schema.TypedNode) t.Run("typed-read", func(t *testing.T) { - Require(t, n.Kind(), ShouldEqual, dms3ld.Kind_Map) + Require(t, n.Kind(), ShouldEqual, ld.Kind_Map) Wish(t, n.Length(), ShouldEqual, int64(2)) Wish(t, must.String(must.Node(n.LookupByString("foo"))), ShouldEqual, "v1") Wish(t, must.String(must.Node(n.LookupByString("bar"))), ShouldEqual, "v2") }) t.Run("repr-read", func(t *testing.T) { nr := n.Representation() - Require(t, nr.Kind(), ShouldEqual, dms3ld.Kind_String) + Require(t, nr.Kind(), ShouldEqual, ld.Kind_String) Wish(t, must.String(nr), ShouldEqual, "v1:v2") }) }) @@ -93,7 +94,7 @@ func SchemaTestStructReprStringjoin(t *testing.T, engine Engine) { nr := fluent.MustBuild(nrp, func(na fluent.NodeAssembler) { na.AssignString("v1:v2") }) - Wish(t, dms3ld.DeepEqual(n, nr), ShouldEqual, true) + Wish(t, ld.DeepEqual(n, nr), ShouldEqual, true) }) }) @@ -111,7 +112,7 @@ func SchemaTestStructReprStringjoin(t *testing.T, engine Engine) { ma.AssembleEntry("bar").AssignString("v4") }).(schema.TypedNode) t.Run("typed-read", func(t *testing.T) { - Require(t, n.Kind(), ShouldEqual, dms3ld.Kind_Map) + Require(t, n.Kind(), ShouldEqual, ld.Kind_Map) Wish(t, n.Length(), ShouldEqual, int64(3)) Wish(t, must.String(must.Node(n.LookupByString("foo"))), ShouldEqual, "v1") Wish(t, must.String(must.Node(n.LookupByString("bar"))), ShouldEqual, "v4") @@ -122,7 +123,7 @@ func SchemaTestStructReprStringjoin(t *testing.T, engine Engine) { }) t.Run("repr-read", func(t *testing.T) { nr := n.Representation() - Require(t, nr.Kind(), ShouldEqual, dms3ld.Kind_String) + Require(t, nr.Kind(), ShouldEqual, ld.Kind_String) Wish(t, must.String(nr), ShouldEqual, "v1-v2:v3-v4") }) }) @@ -130,7 +131,7 @@ func SchemaTestStructReprStringjoin(t *testing.T, engine Engine) { nr := fluent.MustBuild(nrp, func(na fluent.NodeAssembler) { na.AssignString("v1-v2:v3-v4") }) - Wish(t, dms3ld.DeepEqual(n, nr), ShouldEqual, true) + Wish(t, ld.DeepEqual(n, nr), ShouldEqual, true) }) }) } diff --git a/node/tests/schemaStructReprTuple.go b/node/tests/schemaStructReprTuple.go index 7bc355b63b44819fdff2ec942ba02398e9e06838..87bb7fcd3314c4b7e0a4d54eb07ad1e7e89f8af3 100644 --- a/node/tests/schemaStructReprTuple.go +++ b/node/tests/schemaStructReprTuple.go @@ -40,13 +40,13 @@ func SchemaTestStructReprTuple(t *testing.T, engine Engine) { ma.AssembleEntry("field").AssignString("valoo") }).(schema.TypedNode) t.Run("typed-read", func(t *testing.T) { - Require(t, n.Kind(), ShouldEqual, dms3ld.Kind_Map) + Require(t, n.Kind(), ShouldEqual, ld.Kind_Map) Wish(t, n.Length(), ShouldEqual, int64(1)) Wish(t, must.String(must.Node(n.LookupByString("field"))), ShouldEqual, "valoo") }) t.Run("repr-read", func(t *testing.T) { nr := n.Representation() - Require(t, nr.Kind(), ShouldEqual, dms3ld.Kind_List) + Require(t, nr.Kind(), ShouldEqual, ld.Kind_List) Wish(t, nr.Length(), ShouldEqual, int64(1)) Wish(t, must.String(must.Node(nr.LookupByIndex(0))), ShouldEqual, "valoo") }) @@ -55,7 +55,7 @@ func SchemaTestStructReprTuple(t *testing.T, engine Engine) { nr := fluent.MustBuildList(nrp, 1, func(la fluent.ListAssembler) { la.AssembleValue().AssignString("valoo") }) - Wish(t, dms3ld.DeepEqual(n, nr), ShouldEqual, true) + Wish(t, ld.DeepEqual(n, nr), ShouldEqual, true) }) }) @@ -71,7 +71,7 @@ func SchemaTestStructReprTuple(t *testing.T, engine Engine) { ma.AssembleEntry("qux").AssignString("3") }).(schema.TypedNode) t.Run("typed-read", func(t *testing.T) { - Require(t, n.Kind(), ShouldEqual, dms3ld.Kind_Map) + Require(t, n.Kind(), ShouldEqual, ld.Kind_Map) Wish(t, n.Length(), ShouldEqual, int64(4)) Wish(t, must.String(must.Node(n.LookupByString("foo"))), ShouldEqual, "0") Wish(t, must.String(must.Node(n.LookupByString("bar"))), ShouldEqual, "1") @@ -80,7 +80,7 @@ func SchemaTestStructReprTuple(t *testing.T, engine Engine) { }) t.Run("repr-read", func(t *testing.T) { nr := n.Representation() - Require(t, nr.Kind(), ShouldEqual, dms3ld.Kind_List) + Require(t, nr.Kind(), ShouldEqual, ld.Kind_List) Wish(t, nr.Length(), ShouldEqual, int64(4)) Wish(t, must.String(must.Node(nr.LookupByIndex(0))), ShouldEqual, "0") Wish(t, must.String(must.Node(nr.LookupByIndex(1))), ShouldEqual, "1") @@ -95,7 +95,7 @@ func SchemaTestStructReprTuple(t *testing.T, engine Engine) { la.AssembleValue().AssignString("2") la.AssembleValue().AssignString("3") }) - Wish(t, dms3ld.DeepEqual(n, nr), ShouldEqual, true) + Wish(t, ld.DeepEqual(n, nr), ShouldEqual, true) }) }) @@ -109,19 +109,19 @@ func SchemaTestStructReprTuple(t *testing.T, engine Engine) { ma.AssembleEntry("bar").AssignNull() }).(schema.TypedNode) t.Run("typed-read", func(t *testing.T) { - Require(t, n.Kind(), ShouldEqual, dms3ld.Kind_Map) + Require(t, n.Kind(), ShouldEqual, ld.Kind_Map) Wish(t, n.Length(), ShouldEqual, int64(4)) Wish(t, must.String(must.Node(n.LookupByString("foo"))), ShouldEqual, "0") - Wish(t, must.Node(n.LookupByString("bar")), ShouldEqual, dms3ld.Null) - Wish(t, must.Node(n.LookupByString("baz")), ShouldEqual, dms3ld.Absent) - Wish(t, must.Node(n.LookupByString("qux")), ShouldEqual, dms3ld.Absent) + Wish(t, must.Node(n.LookupByString("bar")), ShouldEqual, ld.Null) + Wish(t, must.Node(n.LookupByString("baz")), ShouldEqual, ld.Absent) + Wish(t, must.Node(n.LookupByString("qux")), ShouldEqual, ld.Absent) }) t.Run("repr-read", func(t *testing.T) { nr := n.Representation() - Require(t, nr.Kind(), ShouldEqual, dms3ld.Kind_List) + Require(t, nr.Kind(), ShouldEqual, ld.Kind_List) Wish(t, nr.Length(), ShouldEqual, int64(2)) Wish(t, must.String(must.Node(nr.LookupByIndex(0))), ShouldEqual, "0") - Wish(t, must.Node(nr.LookupByIndex(1)), ShouldEqual, dms3ld.Null) + Wish(t, must.Node(nr.LookupByIndex(1)), ShouldEqual, ld.Null) }) }) t.Run("repr-create", func(t *testing.T) { @@ -129,7 +129,7 @@ func SchemaTestStructReprTuple(t *testing.T, engine Engine) { la.AssembleValue().AssignString("0") la.AssembleValue().AssignNull() }) - Wish(t, dms3ld.DeepEqual(n, nr), ShouldEqual, true) + Wish(t, ld.DeepEqual(n, nr), ShouldEqual, true) }) }) } diff --git a/node/tests/schemaStructsContainingMaybe.go b/node/tests/schemaStructsContainingMaybe.go index d557ff84619cde0051f6a043a542a1b6ec247440..22fe042187efa942a39225a0b8664a8b5e9fba44 100644 --- a/node/tests/schemaStructsContainingMaybe.go +++ b/node/tests/schemaStructsContainingMaybe.go @@ -48,7 +48,7 @@ func SchemaTestStructsContainingMaybe(t *testing.T, engine Engine) { typeJson: `{"f1":"a","f2":"b","f3":"c","f4":"d","f5":"e"}`, reprJson: `{"f5":"e","r1":"a","r2":"b","r3":"c","r4":"d"}`, typePoints: []testcasePoint{ - {"", dms3ld.Kind_Map}, + {"", ld.Kind_Map}, {"f1", "a"}, {"f2", "b"}, {"f3", "c"}, @@ -56,7 +56,7 @@ func SchemaTestStructsContainingMaybe(t *testing.T, engine Engine) { {"f5", "e"}, }, reprPoints: []testcasePoint{ - {"", dms3ld.Kind_Map}, + {"", ld.Kind_Map}, {"r1", "a"}, {"r2", "b"}, {"r3", "c"}, @@ -69,19 +69,19 @@ func SchemaTestStructsContainingMaybe(t *testing.T, engine Engine) { typeJson: `{"f1":"a","f2":"b","f3":null,"f4":null,"f5":"e"}`, reprJson: `{"f5":"e","r1":"a","r2":"b","r3":null,"r4":null}`, typePoints: []testcasePoint{ - {"", dms3ld.Kind_Map}, + {"", ld.Kind_Map}, {"f1", "a"}, {"f2", "b"}, - {"f3", dms3ld.Null}, - {"f4", dms3ld.Null}, + {"f3", ld.Null}, + {"f4", ld.Null}, {"f5", "e"}, }, reprPoints: []testcasePoint{ - {"", dms3ld.Kind_Map}, + {"", ld.Kind_Map}, {"r1", "a"}, {"r2", "b"}, - {"r3", dms3ld.Null}, - {"r4", dms3ld.Null}, + {"r3", ld.Null}, + {"r4", ld.Null}, {"f5", "e"}, }, }, @@ -90,26 +90,26 @@ func SchemaTestStructsContainingMaybe(t *testing.T, engine Engine) { typeJson: `{"f1":"a","f3":"c","f5":"e"}`, reprJson: `{"f5":"e","r1":"a","r3":"c"}`, typePoints: []testcasePoint{ - {"", dms3ld.Kind_Map}, + {"", ld.Kind_Map}, {"f1", "a"}, - {"f2", dms3ld.Absent}, + {"f2", ld.Absent}, {"f3", "c"}, - {"f4", dms3ld.Absent}, + {"f4", ld.Absent}, {"f5", "e"}, }, reprPoints: []testcasePoint{ - {"", dms3ld.Kind_Map}, + {"", ld.Kind_Map}, {"r1", "a"}, - //{"r2", dms3ld.ErrNotExists{}}, // TODO: need better error typing from traversal package. + //{"r2", ld.ErrNotExists{}}, // TODO: need better error typing from traversal package. {"r3", "c"}, - //{"r4", dms3ld.ErrNotExists{}}, // TODO: need better error typing from traversal package. + //{"r4", ld.ErrNotExists{}}, // TODO: need better error typing from traversal package. {"f5", "e"}, }, typeItr: []entry{ {"f1", "a"}, - {"f2", dms3ld.Absent}, + {"f2", ld.Absent}, {"f3", "c"}, - {"f4", dms3ld.Absent}, + {"f4", ld.Absent}, {"f5", "e"}, }, }, @@ -118,27 +118,27 @@ func SchemaTestStructsContainingMaybe(t *testing.T, engine Engine) { typeJson: `{"f1":"a","f2":"b","f3":null}`, reprJson: `{"r1":"a","r2":"b","r3":null}`, typePoints: []testcasePoint{ - {"", dms3ld.Kind_Map}, + {"", ld.Kind_Map}, {"f1", "a"}, {"f2", "b"}, - {"f3", dms3ld.Null}, - {"f4", dms3ld.Absent}, - {"f5", dms3ld.Absent}, + {"f3", ld.Null}, + {"f4", ld.Absent}, + {"f5", ld.Absent}, }, reprPoints: []testcasePoint{ - {"", dms3ld.Kind_Map}, + {"", ld.Kind_Map}, {"r1", "a"}, {"r2", "b"}, - {"r3", dms3ld.Null}, - //{"r4", dms3ld.ErrNotExists{}}, // TODO: need better error typing from traversal package. - //{"f5", dms3ld.ErrNotExists{}}, // TODO: need better error typing from traversal package. + {"r3", ld.Null}, + //{"r4", ld.ErrNotExists{}}, // TODO: need better error typing from traversal package. + //{"f5", ld.ErrNotExists{}}, // TODO: need better error typing from traversal package. }, typeItr: []entry{ {"f1", "a"}, {"f2", "b"}, - {"f3", dms3ld.Null}, - {"f4", dms3ld.Absent}, - {"f5", dms3ld.Absent}, + {"f3", ld.Null}, + {"f4", ld.Absent}, + {"f5", ld.Absent}, }, }, } diff --git a/node/tests/schemaUnions.go b/node/tests/schemaUnions.go index 0bf3cab4569aa9c80358ad158435513fe86f45d9..610b5ea0b36f57c2a08f7aba5cc3723aae0ff1d8 100644 --- a/node/tests/schemaUnions.go +++ b/node/tests/schemaUnions.go @@ -3,6 +3,7 @@ package tests import ( "testing" + "gitlab.dms3.io/ld/go-ld-prime" "gitlab.dms3.io/ld/go-ld-prime/schema" ) @@ -29,14 +30,14 @@ func SchemaTestUnionKeyed(t *testing.T, engine Engine) { typeJson: `{"String":"whee"}`, reprJson: `{"a":"whee"}`, typePoints: []testcasePoint{ - {"", dms3ld.Kind_Map}, + {"", ld.Kind_Map}, {"String", "whee"}, - //{"Strung", dms3ld.ErrNotExists{}}, // TODO: need better error typing from traversal package. + //{"Strung", ld.ErrNotExists{}}, // TODO: need better error typing from traversal package. }, reprPoints: []testcasePoint{ - {"", dms3ld.Kind_Map}, + {"", ld.Kind_Map}, {"a", "whee"}, - //{"b", dms3ld.ErrNotExists{}}, // TODO: need better error typing from traversal package. + //{"b", ld.ErrNotExists{}}, // TODO: need better error typing from traversal package. }, }, { @@ -44,13 +45,13 @@ func SchemaTestUnionKeyed(t *testing.T, engine Engine) { typeJson: `{"Strung":"whee"}`, reprJson: `{"b":"whee"}`, typePoints: []testcasePoint{ - {"", dms3ld.Kind_Map}, - //{"String", dms3ld.ErrNotExists{}}, // TODO: need better error typing from traversal package. + {"", ld.Kind_Map}, + //{"String", ld.ErrNotExists{}}, // TODO: need better error typing from traversal package. {"Strung", "whee"}, }, reprPoints: []testcasePoint{ - {"", dms3ld.Kind_Map}, - //{"a", dms3ld.ErrNotExists{}}, // TODO: need better error typing from traversal package. + {"", ld.Kind_Map}, + //{"a", ld.ErrNotExists{}}, // TODO: need better error typing from traversal package. {"b", "whee"}, }, }, @@ -100,14 +101,14 @@ func SchemaTestUnionKeyedComplexChildren(t *testing.T, engine Engine) { typeJson: `{"String":"whee"}`, reprJson: `{"a":"whee"}`, typePoints: []testcasePoint{ - {"", dms3ld.Kind_Map}, + {"", ld.Kind_Map}, {"String", "whee"}, - //{"SmolStruct", dms3ld.ErrNotExists{}}, // TODO: need better error typing from traversal package. + //{"SmolStruct", ld.ErrNotExists{}}, // TODO: need better error typing from traversal package. }, reprPoints: []testcasePoint{ - {"", dms3ld.Kind_Map}, + {"", ld.Kind_Map}, {"a", "whee"}, - //{"b", dms3ld.ErrNotExists{}}, // TODO: need better error typing from traversal package. + //{"b", ld.ErrNotExists{}}, // TODO: need better error typing from traversal package. }, }, { @@ -115,15 +116,15 @@ func SchemaTestUnionKeyedComplexChildren(t *testing.T, engine Engine) { typeJson: `{"SmolStruct":{"s":"whee"}}`, reprJson: `{"b":{"q":"whee"}}`, typePoints: []testcasePoint{ - {"", dms3ld.Kind_Map}, - //{"String", dms3ld.ErrNotExists{}}, // TODO: need better error typing from traversal package. - {"SmolStruct", dms3ld.Kind_Map}, + {"", ld.Kind_Map}, + //{"String", ld.ErrNotExists{}}, // TODO: need better error typing from traversal package. + {"SmolStruct", ld.Kind_Map}, {"SmolStruct/s", "whee"}, }, reprPoints: []testcasePoint{ - {"", dms3ld.Kind_Map}, - //{"a", dms3ld.ErrNotExists{}}, // TODO: need better error typing from traversal package. - {"b", dms3ld.Kind_Map}, + {"", ld.Kind_Map}, + //{"a", ld.ErrNotExists{}}, // TODO: need better error typing from traversal package. + {"b", ld.Kind_Map}, {"b/q", "whee"}, }, }, diff --git a/node/tests/schemaUnionsKinded.go b/node/tests/schemaUnionsKinded.go index 286bbbb9bed9251501cdf3e81533242d1de39147..13769f672af99be401507fabc068d4b76cc2bd82 100644 --- a/node/tests/schemaUnionsKinded.go +++ b/node/tests/schemaUnionsKinded.go @@ -24,9 +24,9 @@ func SchemaTestUnionKinded(t *testing.T, engine Engine) { "String", "SmolStruct", }, - schema.SpawnUnionRepresentationKinded(map[dms3ld.Kind]schema.TypeName{ - dms3ld.Kind_String: "String", - dms3ld.Kind_Map: "SmolStruct", + schema.SpawnUnionRepresentationKinded(map[ld.Kind]schema.TypeName{ + ld.Kind_String: "String", + ld.Kind_Map: "SmolStruct", }), )) engine.Init(t, ts) @@ -39,12 +39,12 @@ func SchemaTestUnionKinded(t *testing.T, engine Engine) { typeJson: `{"String":"whee"}`, reprJson: `"whee"`, typePoints: []testcasePoint{ - {"", dms3ld.Kind_Map}, + {"", ld.Kind_Map}, {"String", "whee"}, - //{"SmolStruct", dms3ld.ErrNotExists{}}, // TODO: need better error typing from traversal package. + //{"SmolStruct", ld.ErrNotExists{}}, // TODO: need better error typing from traversal package. }, reprPoints: []testcasePoint{ - {"", dms3ld.Kind_String}, + {"", ld.Kind_String}, {"", "whee"}, }, }, @@ -53,13 +53,13 @@ func SchemaTestUnionKinded(t *testing.T, engine Engine) { typeJson: `{"SmolStruct":{"s":"whee"}}`, reprJson: `{"q":"whee"}`, typePoints: []testcasePoint{ - {"", dms3ld.Kind_Map}, - //{"String", dms3ld.ErrNotExists{}}, // TODO: need better error typing from traversal package. - {"SmolStruct", dms3ld.Kind_Map}, + {"", ld.Kind_Map}, + //{"String", ld.ErrNotExists{}}, // TODO: need better error typing from traversal package. + {"SmolStruct", ld.Kind_Map}, {"SmolStruct/s", "whee"}, }, reprPoints: []testcasePoint{ - {"", dms3ld.Kind_Map}, + {"", ld.Kind_Map}, {"q", "whee"}, }, }, diff --git a/node/tests/schemaUnionsStringprefix.go b/node/tests/schemaUnionsStringprefix.go index 32e042f63c6a1f336c346b7b91535ec2fa89a6ec..80408f4c2774b31a612b28a7f805ed5ab645004d 100644 --- a/node/tests/schemaUnionsStringprefix.go +++ b/node/tests/schemaUnionsStringprefix.go @@ -41,12 +41,12 @@ func SchemaTestUnionStringprefix(t *testing.T, engine Engine) { typeJson: `{"String":"whee"}`, reprJson: `"simple:whee"`, typePoints: []testcasePoint{ - {"", dms3ld.Kind_Map}, + {"", ld.Kind_Map}, {"String", "whee"}, - //{"SmolStruct", dms3ld.ErrNotExists{}}, // TODO: need better error typing from traversal package. + //{"SmolStruct", ld.ErrNotExists{}}, // TODO: need better error typing from traversal package. }, reprPoints: []testcasePoint{ - {"", dms3ld.Kind_String}, + {"", ld.Kind_String}, {"", "simple:whee"}, }, }, @@ -55,14 +55,14 @@ func SchemaTestUnionStringprefix(t *testing.T, engine Engine) { typeJson: `{"SmolStruct":{"a":"whee","b":"woo"}}`, reprJson: `"complex:whee:woo"`, typePoints: []testcasePoint{ - {"", dms3ld.Kind_Map}, - //{"String", dms3ld.ErrNotExists{}}, // TODO: need better error typing from traversal package. - {"SmolStruct", dms3ld.Kind_Map}, + {"", ld.Kind_Map}, + //{"String", ld.ErrNotExists{}}, // TODO: need better error typing from traversal package. + {"SmolStruct", ld.Kind_Map}, {"SmolStruct/a", "whee"}, {"SmolStruct/b", "woo"}, }, reprPoints: []testcasePoint{ - {"", dms3ld.Kind_String}, + {"", ld.Kind_String}, {"", "complex:whee:woo"}, }, }, diff --git a/node/tests/stringSpecs.go b/node/tests/stringSpecs.go index cb7ba3adb5878ea9504b3d989ea8d4e69a55d8b8..45bc7fb50bcd51660cd0435bf41511ca134eb204 100644 --- a/node/tests/stringSpecs.go +++ b/node/tests/stringSpecs.go @@ -5,17 +5,17 @@ import ( . "github.com/warpfork/go-wish" - dms3ld "gitlab.dms3.io/ld/go-ld-prime" + ld "gitlab.dms3.io/ld/go-ld-prime" ) -func SpecTestString(t *testing.T, np dms3ld.NodePrototype) { +func SpecTestString(t *testing.T, np ld.NodePrototype) { t.Run("string node", func(t *testing.T) { nb := np.NewBuilder() err := nb.AssignString("asdf") Wish(t, err, ShouldEqual, nil) n := nb.Build() - Wish(t, n.Kind(), ShouldEqual, dms3ld.Kind_String) + Wish(t, n.Kind(), ShouldEqual, ld.Kind_String) Wish(t, n.IsNull(), ShouldEqual, false) x, err := n.AsString() Wish(t, err, ShouldEqual, nil) diff --git a/node/tests/testEngine.go b/node/tests/testEngine.go index 8d8c63c2b848d3ff49eb88a98eccfcfaede6e3e5..98c9ffaec6a4b8600fa97e7eee9b6bfed1368dcb 100644 --- a/node/tests/testEngine.go +++ b/node/tests/testEngine.go @@ -3,7 +3,7 @@ package tests import ( "testing" - dms3ld "gitlab.dms3.io/ld/go-ld-prime" + ld "gitlab.dms3.io/ld/go-ld-prime" "gitlab.dms3.io/ld/go-ld-prime/schema" ) @@ -18,5 +18,5 @@ import ( // their representation prototypes can be obtained by appending ".Repr". type Engine interface { Init(t *testing.T, ts schema.TypeSystem) - PrototypeByName(name string) dms3ld.NodePrototype + PrototypeByName(name string) ld.NodePrototype } diff --git a/node/tests/testcase.go b/node/tests/testcase.go index f3b85f9a38bbe42fa497613c95de6ffdc79dba88..6b7243307cf0c6a7e394711ffd9a15e3e0a75fa6 100644 --- a/node/tests/testcase.go +++ b/node/tests/testcase.go @@ -85,10 +85,10 @@ type entry struct { value interface{} // same rules as testcasePoint.expect } -func (tcase testcase) Test(t *testing.T, np, npr dms3ld.NodePrototype) { +func (tcase testcase) Test(t *testing.T, np, npr ld.NodePrototype) { t.Run(tcase.name, func(t *testing.T) { // We'll produce either one or two nodes, depending on the fixture; if two, we'll be expecting them to be equal. - var n, n2 dms3ld.Node + var n, n2 ld.Node // Attempt to produce a node by using unmarshal on type-level fixture data and the type-level NodePrototype. // This exercises creating a value using the AssembleEntry path (but note, not AssembleKey+AssembleValue path). @@ -124,7 +124,7 @@ func (tcase testcase) Test(t *testing.T, np, npr dms3ld.NodePrototype) { } if n2 != nil { t.Run("type-create and repr-create match", func(t *testing.T) { - Wish(t, dms3ld.DeepEqual(n, n2), ShouldEqual, true) + Wish(t, ld.DeepEqual(n, n2), ShouldEqual, true) }) } @@ -171,7 +171,7 @@ func (tcase testcase) Test(t *testing.T, np, npr dms3ld.NodePrototype) { k, v, err := itr.Next() Wish(t, k, ShouldEqual, nil) Wish(t, v, ShouldEqual, nil) - Wish(t, err, ShouldEqual, dms3ld.ErrIteratorOverread{}) + Wish(t, err, ShouldEqual, ld.ErrIteratorOverread{}) } else if tcase.typeJson != "" { t.Run("type-marshal", func(t *testing.T) { testMarshal(t, n, tcase.typeJson) @@ -188,7 +188,7 @@ func (tcase testcase) Test(t *testing.T, np, npr dms3ld.NodePrototype) { }) } -func testUnmarshal(t *testing.T, np dms3ld.NodePrototype, data string, expectFail error) dms3ld.Node { +func testUnmarshal(t *testing.T, np ld.NodePrototype, data string, expectFail error) ld.Node { t.Helper() nb := np.NewBuilder() err := dagjson.Decode(nb, strings.NewReader(data)) @@ -205,7 +205,7 @@ func testUnmarshal(t *testing.T, np dms3ld.NodePrototype, data string, expectFai return nb.Build() } -func testMarshal(t *testing.T, n dms3ld.Node, data string) { +func testMarshal(t *testing.T, n ld.Node, data string) { t.Helper() // We'll marshal with "pretty" linebreaks and indents (and re-format the fixture to the same) for better diffing. prettyprint := json.EncodeOptions{Line: []byte{'\n'}, Indent: []byte{'\t'}} @@ -221,9 +221,9 @@ func testMarshal(t *testing.T, n dms3ld.Node, data string) { Wish(t, buf.String(), ShouldEqual, reformat(data, prettyprint)) } -func wishPoint(t *testing.T, n dms3ld.Node, point testcasePoint) { +func wishPoint(t *testing.T, n ld.Node, point testcasePoint) { t.Helper() - reached, err := traversal.Get(n, dms3ld.ParsePath(point.path)) + reached, err := traversal.Get(n, ld.ParsePath(point.path)) switch point.expect.(type) { case error: Wish(t, err, ShouldBeSameTypeAs, point.expect) @@ -242,33 +242,33 @@ func wishPoint(t *testing.T, n dms3ld.Node, point testcasePoint) { // // If the expected value is a primitive string, it'll AsStrong on the Node; etc. // -// Using an dms3ld.Kind value is also possible, which will just check the kind and not the value contents. +// Using an ld.Kind value is also possible, which will just check the kind and not the value contents. // -// If an dms3ld.Node is the expected value, a full deep ShouldEqual is used as normal. +// If an ld.Node is the expected value, a full deep ShouldEqual is used as normal. func closeEnough(actual, expected interface{}) (string, bool) { if expected == nil { return ShouldEqual(actual, nil) } - a, ok := actual.(dms3ld.Node) + a, ok := actual.(ld.Node) if !ok { - return "this checker only supports checking dms3ld.Node values", false + return "this checker only supports checking ld.Node values", false } switch expected.(type) { - case dms3ld.Kind: + case ld.Kind: return ShouldEqual(a.Kind(), expected) case string: - if a.Kind() != dms3ld.Kind_String { + if a.Kind() != ld.Kind_String { return fmt.Sprintf("expected something with kind string, got kind %s", a.Kind()), false } x, _ := a.AsString() return ShouldEqual(x, expected) case int: - if a.Kind() != dms3ld.Kind_Int { + if a.Kind() != ld.Kind_Int { return fmt.Sprintf("expected something with kind int, got kind %s", a.Kind()), false } x, _ := a.AsInt() return ShouldEqual(x, expected) - case dms3ld.Node: + case ld.Node: return ShouldEqual(actual, expected) default: return fmt.Sprintf("this checker doesn't support an expected value of type %T", expected), false diff --git a/node/tests/testutil.go b/node/tests/testutil.go index 3b9e59f1fec6d6ed46eafa47fdf172c262f4020e..25c289b5e4d5ecaac81d99b3186c58476f252779 100644 --- a/node/tests/testutil.go +++ b/node/tests/testutil.go @@ -1,7 +1,7 @@ package tests import ( - dms3ld "gitlab.dms3.io/ld/go-ld-prime" + ld "gitlab.dms3.io/ld/go-ld-prime" ) // This file is full of helper functions. Most are moderately embarassing. @@ -10,14 +10,14 @@ import ( // they'd probably be much less fragile and give better error messages that way. // On the other hand, the functions for condensing two-arg returns wouldn't go away anyway. -func plz(n dms3ld.Node, e error) dms3ld.Node { +func plz(n ld.Node, e error) ld.Node { if e != nil { panic(e) } return n } -func plzStr(n dms3ld.Node, e error) string { +func plzStr(n ld.Node, e error) string { if e != nil { panic(e) } @@ -28,7 +28,7 @@ func plzStr(n dms3ld.Node, e error) string { } } -func str(n dms3ld.Node) string { +func str(n ld.Node) string { if s, ok := n.AsString(); ok == nil { return s } else { @@ -36,7 +36,7 @@ func str(n dms3ld.Node) string { } } -func erp(n dms3ld.Node, e error) interface{} { +func erp(n ld.Node, e error) interface{} { if e != nil { return e } @@ -44,6 +44,6 @@ func erp(n dms3ld.Node, e error) interface{} { } // purely to syntactically flip large inline closures so we can see the argument at the top rather than the bottom of the block. -func withNode(n dms3ld.Node, cb func(n dms3ld.Node)) { +func withNode(n ld.Node, cb func(n ld.Node)) { cb(n) } diff --git a/node/tests/traversalBenchmarks.go b/node/tests/traversalBenchmarks.go index 618736c2db0a574d340f0558aa1483d69cada673..e5a5a573ffaac9f6ad96747f4745c8b50885d91e 100644 --- a/node/tests/traversalBenchmarks.go +++ b/node/tests/traversalBenchmarks.go @@ -4,12 +4,12 @@ import ( "fmt" "testing" - dms3ld "gitlab.dms3.io/ld/go-ld-prime" + ld "gitlab.dms3.io/ld/go-ld-prime" "gitlab.dms3.io/ld/go-ld-prime/node/tests/corpus" "gitlab.dms3.io/ld/go-ld-prime/traversal" ) -func BenchmarkSpec_Walk_Map3StrInt(b *testing.B, np dms3ld.NodePrototype) { +func BenchmarkSpec_Walk_Map3StrInt(b *testing.B, np ld.NodePrototype) { node := mustNodeFromJsonString(np, corpus.Map3StrInt()) sel := mustSelectorFromJsonString(np, `{"a":{">":{".":{}}}}`) b.ResetTimer() @@ -17,7 +17,7 @@ func BenchmarkSpec_Walk_Map3StrInt(b *testing.B, np dms3ld.NodePrototype) { var visitCountSanityCheck int for i := 0; i < b.N; i++ { visitCountSanityCheck = 0 - traversal.WalkMatching(node, sel, func(tp traversal.Progress, n dms3ld.Node) error { + traversal.WalkMatching(node, sel, func(tp traversal.Progress, n ld.Node) error { visitCountSanityCheck++ // this sanity check is sufficiently cheap to be worth it return nil // no need to do anything here; just care about exercising the walk internals. }) @@ -27,7 +27,7 @@ func BenchmarkSpec_Walk_Map3StrInt(b *testing.B, np dms3ld.NodePrototype) { } } -func BenchmarkSpec_Walk_MapNStrMap3StrInt(b *testing.B, np dms3ld.NodePrototype) { +func BenchmarkSpec_Walk_MapNStrMap3StrInt(b *testing.B, np ld.NodePrototype) { sel := mustSelectorFromJsonString(np, `{"a":{">":{"a":{">":{".":{}}}}}}`) for _, n := range []int{0, 1, 2, 4, 8, 16, 32} { @@ -38,7 +38,7 @@ func BenchmarkSpec_Walk_MapNStrMap3StrInt(b *testing.B, np dms3ld.NodePrototype) var visitCountSanityCheck int for i := 0; i < b.N; i++ { visitCountSanityCheck = 0 - traversal.WalkMatching(node, sel, func(tp traversal.Progress, n dms3ld.Node) error { + traversal.WalkMatching(node, sel, func(tp traversal.Progress, n ld.Node) error { visitCountSanityCheck++ // this sanity check is sufficiently cheap to be worth it return nil // no need to do anything here; just care about exercising the walk internals. }) diff --git a/node/tests/unmarshalBenchmarks.go b/node/tests/unmarshalBenchmarks.go index a9a18be0628b9899ff505b7c24b97ec84ff45146..3ab2262ba7f851fd14912af06104dda69e036ee9 100644 --- a/node/tests/unmarshalBenchmarks.go +++ b/node/tests/unmarshalBenchmarks.go @@ -8,7 +8,7 @@ import ( refmtjson "github.com/polydawn/refmt/json" - dms3ld "gitlab.dms3.io/ld/go-ld-prime" + ld "gitlab.dms3.io/ld/go-ld-prime" "gitlab.dms3.io/ld/go-ld-prime/codec" "gitlab.dms3.io/ld/go-ld-prime/node/tests/corpus" ) @@ -22,7 +22,7 @@ import ( // - we can make direct comparisons to the standard library json marshalling // and unmarshalling, thus having a back-of-the-envelope baseline to compare. -func BenchmarkSpec_Unmarshal_Map3StrInt(b *testing.B, np dms3ld.NodePrototype) { +func BenchmarkSpec_Unmarshal_Map3StrInt(b *testing.B, np ld.NodePrototype) { var err error for i := 0; i < b.N; i++ { nb := np.NewBuilder() @@ -34,13 +34,13 @@ func BenchmarkSpec_Unmarshal_Map3StrInt(b *testing.B, np dms3ld.NodePrototype) { } } -func BenchmarkSpec_Unmarshal_MapNStrMap3StrInt(b *testing.B, np dms3ld.NodePrototype) { +func BenchmarkSpec_Unmarshal_MapNStrMap3StrInt(b *testing.B, np ld.NodePrototype) { for _, n := range []int{0, 1, 2, 4, 8, 16, 32} { b.Run(fmt.Sprintf("n=%d", n), func(b *testing.B) { msg := corpus.MapNStrMap3StrInt(n) b.ResetTimer() - var node dms3ld.Node + var node ld.Node var err error nb := np.NewBuilder() for i := 0; i < b.N; i++ { diff --git a/node/tests/util.go b/node/tests/util.go index fea6947c2ffee18d19292143f51b12a875dcad29..bf5c25792b34335be7978e21cd988c183e74627b 100644 --- a/node/tests/util.go +++ b/node/tests/util.go @@ -5,7 +5,7 @@ import ( refmtjson "github.com/polydawn/refmt/json" - dms3ld "gitlab.dms3.io/ld/go-ld-prime" + ld "gitlab.dms3.io/ld/go-ld-prime" "gitlab.dms3.io/ld/go-ld-prime/codec" "gitlab.dms3.io/ld/go-ld-prime/must" "gitlab.dms3.io/ld/go-ld-prime/traversal/selector" @@ -15,13 +15,13 @@ import ( // in order to defuse the possibility of their work being elided. var sink interface{} -func mustNodeFromJsonString(np dms3ld.NodePrototype, str string) dms3ld.Node { +func mustNodeFromJsonString(np ld.NodePrototype, str string) ld.Node { nb := np.NewBuilder() must.NotError(codec.Unmarshal(nb, refmtjson.NewDecoder(strings.NewReader(str)))) return nb.Build() } -func mustSelectorFromJsonString(np dms3ld.NodePrototype, str string) selector.Selector { +func mustSelectorFromJsonString(np ld.NodePrototype, str string) selector.Selector { // Needing an 'ns' parameter here is sort of off-topic, to be honest. // Someday the selector package will probably contain codegen'd nodes of its own schema, and we'll use those unconditionally. // For now... we'll just use whatever node you're already testing, because it oughta work diff --git a/nodeBuilder.go b/nodeBuilder.go index 3e002c8968fced45190bcbdcffae3baad6a927c6..334864297476065845eb21687480ce42f20ff799 100644 --- a/nodeBuilder.go +++ b/nodeBuilder.go @@ -1,4 +1,4 @@ -package dms3ld +package ld // NodeAssembler is the interface that describes all the ways we can set values // in a node that's under construction. diff --git a/path.go b/path.go index a1d40b535356e1135e47cc94f28237c1ed0ddb4f..15f583fbd4ad940941839518e73acdb61094db69 100644 --- a/path.go +++ b/path.go @@ -1,4 +1,4 @@ -package dms3ld +package ld import ( "strings" diff --git a/pathSegment.go b/pathSegment.go index 89cc3ee3c68c6102f4c42c7bb74b2f74b9d127da..3d1da994cda650ca81e4459c3cde8a11ba67c2ec 100644 --- a/pathSegment.go +++ b/pathSegment.go @@ -1,4 +1,4 @@ -package dms3ld +package ld import ( "strconv" diff --git a/path_test.go b/path_test.go index 4ccaa027759d443ee4d10c9ed5524cf8d527d3cb..e5227732b5a4c8b482093697347d5e0a485c714b 100644 --- a/path_test.go +++ b/path_test.go @@ -1,4 +1,4 @@ -package dms3ld +package ld import ( "testing" diff --git a/schema/dmt/gen.go b/schema/dmt/gen.go index 7e8c95da3d3802415aafa1dac71b3b450e1e00b1..1810fe523fbdc7b04d31210315eacedf3cc0ead9 100644 --- a/schema/dmt/gen.go +++ b/schema/dmt/gen.go @@ -6,6 +6,7 @@ package main import ( "fmt" + "gitlab.dms3.io/ld/go-ld-prime" "gitlab.dms3.io/ld/go-ld-prime/schema" gengo "gitlab.dms3.io/ld/go-ld-prime/schema/gen/go" ) @@ -80,9 +81,9 @@ func main() { "TypeName", "TypeDefnInline", }, - schema.SpawnUnionRepresentationKinded(map[dms3ld.Kind]schema.TypeName{ - dms3ld.Kind_String: "TypeName", - dms3ld.Kind_Map: "TypeDefnInline", + schema.SpawnUnionRepresentationKinded(map[ld.Kind]schema.TypeName{ + ld.Kind_String: "TypeName", + ld.Kind_Map: "TypeDefnInline", }), )) ts.Accumulate(schema.SpawnUnion("TypeDefnInline", // n.b. previously called "TypeTerm". @@ -370,12 +371,12 @@ func main() { "Int", "Float", }, - schema.SpawnUnionRepresentationKinded(map[dms3ld.Kind]schema.TypeName{ - dms3ld.Kind_Bool: "Bool", - dms3ld.Kind_String: "String", - dms3ld.Kind_Bytes: "Bytes", - dms3ld.Kind_Int: "Int", - dms3ld.Kind_Float: "Float", + schema.SpawnUnionRepresentationKinded(map[ld.Kind]schema.TypeName{ + ld.Kind_Bool: "Bool", + ld.Kind_String: "String", + ld.Kind_Bytes: "Bytes", + ld.Kind_Int: "Int", + ld.Kind_Float: "Float", }), )) diff --git a/schema/dmt/dms3ldsch_minima.go b/schema/dmt/ldsch_minima.go similarity index 57% rename from schema/dmt/dms3ldsch_minima.go rename to schema/dmt/ldsch_minima.go index b0f5df3b5eb3e98a7dbdb768b78d16691624c12d..089f36f74645190997c952ad049db8efb5b0f21b 100644 --- a/schema/dmt/dms3ldsch_minima.go +++ b/schema/dmt/ldsch_minima.go @@ -1,6 +1,6 @@ package schemadmt -// Code generated by go-dms3ld-prime gengo. DO NOT EDIT. +// Code generated by go-ld-prime gengo. DO NOT EDIT. import ( "fmt" @@ -36,16 +36,16 @@ type _ErrorThunkAssembler struct { e error } -func (ea _ErrorThunkAssembler) BeginMap(_ int64) (dms3ld.MapAssembler, error) { return nil, ea.e } -func (ea _ErrorThunkAssembler) BeginList(_ int64) (dms3ld.ListAssembler, error) { return nil, ea.e } -func (ea _ErrorThunkAssembler) AssignNull() error { return ea.e } -func (ea _ErrorThunkAssembler) AssignBool(bool) error { return ea.e } -func (ea _ErrorThunkAssembler) AssignInt(int64) error { return ea.e } -func (ea _ErrorThunkAssembler) AssignFloat(float64) error { return ea.e } -func (ea _ErrorThunkAssembler) AssignString(string) error { return ea.e } -func (ea _ErrorThunkAssembler) AssignBytes([]byte) error { return ea.e } -func (ea _ErrorThunkAssembler) AssignLink(dms3ld.Link) error { return ea.e } -func (ea _ErrorThunkAssembler) AssignNode(dms3ld.Node) error { return ea.e } -func (ea _ErrorThunkAssembler) Prototype() dms3ld.NodePrototype { +func (ea _ErrorThunkAssembler) BeginMap(_ int64) (ld.MapAssembler, error) { return nil, ea.e } +func (ea _ErrorThunkAssembler) BeginList(_ int64) (ld.ListAssembler, error) { return nil, ea.e } +func (ea _ErrorThunkAssembler) AssignNull() error { return ea.e } +func (ea _ErrorThunkAssembler) AssignBool(bool) error { return ea.e } +func (ea _ErrorThunkAssembler) AssignInt(int64) error { return ea.e } +func (ea _ErrorThunkAssembler) AssignFloat(float64) error { return ea.e } +func (ea _ErrorThunkAssembler) AssignString(string) error { return ea.e } +func (ea _ErrorThunkAssembler) AssignBytes([]byte) error { return ea.e } +func (ea _ErrorThunkAssembler) AssignLink(ld.Link) error { return ea.e } +func (ea _ErrorThunkAssembler) AssignNode(ld.Node) error { return ea.e } +func (ea _ErrorThunkAssembler) Prototype() ld.NodePrototype { panic(fmt.Errorf("cannot get prototype from error-carrying assembler: already derailed with error: %w", ea.e)) } diff --git a/schema/dmt/dms3ldsch_satisfaction.go b/schema/dmt/ldsch_satisfaction.go similarity index 83% rename from schema/dmt/dms3ldsch_satisfaction.go rename to schema/dmt/ldsch_satisfaction.go index 368025c89c7bc608a68d11866fb2918b60b2b981..70f68c1da1ed1fc2402a595933a6b001456d9654 100644 --- a/schema/dmt/dms3ldsch_satisfaction.go +++ b/schema/dmt/ldsch_satisfaction.go @@ -1,9 +1,9 @@ package schemadmt -// Code generated by go-dms3ld-prime gengo. DO NOT EDIT. +// Code generated by go-ld-prime gengo. DO NOT EDIT. import ( - dms3ld "gitlab.dms3.io/ld/go-ld-prime" + ld "gitlab.dms3.io/ld/go-ld-prime" "gitlab.dms3.io/ld/go-ld-prime/node/mixins" "gitlab.dms3.io/ld/go-ld-prime/schema" ) @@ -40,12 +40,12 @@ func (m MaybeAnyScalar) IsAbsent() bool { func (m MaybeAnyScalar) Exists() bool { return m.m == schema.Maybe_Value } -func (m MaybeAnyScalar) AsNode() dms3ld.Node { +func (m MaybeAnyScalar) AsNode() ld.Node { switch m.m { case schema.Maybe_Absent: - return dms3ld.Absent + return ld.Absent case schema.Maybe_Null: - return dms3ld.Null + return ld.Null case schema.Maybe_Value: return m.v default: @@ -66,57 +66,57 @@ var ( memberName__AnyScalar_Int = _String{"Int"} memberName__AnyScalar_Float = _String{"Float"} ) -var _ dms3ld.Node = (AnyScalar)(&_AnyScalar{}) +var _ ld.Node = (AnyScalar)(&_AnyScalar{}) var _ schema.TypedNode = (AnyScalar)(&_AnyScalar{}) -func (AnyScalar) Kind() dms3ld.Kind { - return dms3ld.Kind_Map +func (AnyScalar) Kind() ld.Kind { + return ld.Kind_Map } -func (n AnyScalar) LookupByString(key string) (dms3ld.Node, error) { +func (n AnyScalar) LookupByString(key string) (ld.Node, error) { switch key { case "Bool": if n.tag != 1 { - return nil, dms3ld.ErrNotExists{Segment: dms3ld.PathSegmentOfString(key)} + return nil, ld.ErrNotExists{Segment: ld.PathSegmentOfString(key)} } return &n.x1, nil case "String": if n.tag != 2 { - return nil, dms3ld.ErrNotExists{Segment: dms3ld.PathSegmentOfString(key)} + return nil, ld.ErrNotExists{Segment: ld.PathSegmentOfString(key)} } return &n.x2, nil case "Bytes": if n.tag != 3 { - return nil, dms3ld.ErrNotExists{Segment: dms3ld.PathSegmentOfString(key)} + return nil, ld.ErrNotExists{Segment: ld.PathSegmentOfString(key)} } return &n.x3, nil case "Int": if n.tag != 4 { - return nil, dms3ld.ErrNotExists{Segment: dms3ld.PathSegmentOfString(key)} + return nil, ld.ErrNotExists{Segment: ld.PathSegmentOfString(key)} } return &n.x4, nil case "Float": if n.tag != 5 { - return nil, dms3ld.ErrNotExists{Segment: dms3ld.PathSegmentOfString(key)} + return nil, ld.ErrNotExists{Segment: ld.PathSegmentOfString(key)} } return &n.x5, nil default: - return nil, schema.ErrNoSuchField{Type: nil /*TODO*/, Field: dms3ld.PathSegmentOfString(key)} + return nil, schema.ErrNoSuchField{Type: nil /*TODO*/, Field: ld.PathSegmentOfString(key)} } } -func (n AnyScalar) LookupByNode(key dms3ld.Node) (dms3ld.Node, error) { +func (n AnyScalar) LookupByNode(key ld.Node) (ld.Node, error) { ks, err := key.AsString() if err != nil { return nil, err } return n.LookupByString(ks) } -func (AnyScalar) LookupByIndex(idx int64) (dms3ld.Node, error) { +func (AnyScalar) LookupByIndex(idx int64) (ld.Node, error) { return mixins.Map{TypeName: "schemadmt.AnyScalar"}.LookupByIndex(0) } -func (n AnyScalar) LookupBySegment(seg dms3ld.PathSegment) (dms3ld.Node, error) { +func (n AnyScalar) LookupBySegment(seg ld.PathSegment) (ld.Node, error) { return n.LookupByString(seg.String()) } -func (n AnyScalar) MapIterator() dms3ld.MapIterator { +func (n AnyScalar) MapIterator() ld.MapIterator { return &_AnyScalar__MapItr{n, false} } @@ -125,9 +125,9 @@ type _AnyScalar__MapItr struct { done bool } -func (itr *_AnyScalar__MapItr) Next() (k dms3ld.Node, v dms3ld.Node, _ error) { +func (itr *_AnyScalar__MapItr) Next() (k ld.Node, v ld.Node, _ error) { if itr.done { - return nil, nil, dms3ld.ErrIteratorOverread{} + return nil, nil, ld.ErrIteratorOverread{} } switch itr.n.tag { case 1: @@ -150,7 +150,7 @@ func (itr *_AnyScalar__MapItr) Done() bool { return itr.done } -func (AnyScalar) ListIterator() dms3ld.ListIterator { +func (AnyScalar) ListIterator() ld.ListIterator { return nil } func (AnyScalar) Length() int64 { @@ -177,16 +177,16 @@ func (AnyScalar) AsString() (string, error) { func (AnyScalar) AsBytes() ([]byte, error) { return mixins.Map{TypeName: "schemadmt.AnyScalar"}.AsBytes() } -func (AnyScalar) AsLink() (dms3ld.Link, error) { +func (AnyScalar) AsLink() (ld.Link, error) { return mixins.Map{TypeName: "schemadmt.AnyScalar"}.AsLink() } -func (AnyScalar) Prototype() dms3ld.NodePrototype { +func (AnyScalar) Prototype() ld.NodePrototype { return _AnyScalar__Prototype{} } type _AnyScalar__Prototype struct{} -func (_AnyScalar__Prototype) NewBuilder() dms3ld.NodeBuilder { +func (_AnyScalar__Prototype) NewBuilder() ld.NodeBuilder { var nb _AnyScalar__Builder nb.Reset() return &nb @@ -196,7 +196,7 @@ type _AnyScalar__Builder struct { _AnyScalar__Assembler } -func (nb *_AnyScalar__Builder) Build() dms3ld.Node { +func (nb *_AnyScalar__Builder) Build() ld.Node { if *nb.m != schema.Maybe_Value { panic("invalid state: cannot call Build on an assembler that's not finished") } @@ -251,7 +251,7 @@ func (na *_AnyScalar__Assembler) reset() { na.ca = 0 na.cm = schema.Maybe_Absent } -func (na *_AnyScalar__Assembler) BeginMap(int64) (dms3ld.MapAssembler, error) { +func (na *_AnyScalar__Assembler) BeginMap(int64) (ld.MapAssembler, error) { switch *na.m { case schema.Maybe_Value, schema.Maybe_Null: panic("invalid state: cannot assign into assembler that's already finished") @@ -264,7 +264,7 @@ func (na *_AnyScalar__Assembler) BeginMap(int64) (dms3ld.MapAssembler, error) { } return na, nil } -func (_AnyScalar__Assembler) BeginList(sizeHint int64) (dms3ld.ListAssembler, error) { +func (_AnyScalar__Assembler) BeginList(sizeHint int64) (ld.ListAssembler, error) { return mixins.MapAssembler{TypeName: "schemadmt.AnyScalar"}.BeginList(0) } func (na *_AnyScalar__Assembler) AssignNull() error { @@ -296,10 +296,10 @@ func (_AnyScalar__Assembler) AssignString(string) error { func (_AnyScalar__Assembler) AssignBytes([]byte) error { return mixins.MapAssembler{TypeName: "schemadmt.AnyScalar"}.AssignBytes(nil) } -func (_AnyScalar__Assembler) AssignLink(dms3ld.Link) error { +func (_AnyScalar__Assembler) AssignLink(ld.Link) error { return mixins.MapAssembler{TypeName: "schemadmt.AnyScalar"}.AssignLink(nil) } -func (na *_AnyScalar__Assembler) AssignNode(v dms3ld.Node) error { +func (na *_AnyScalar__Assembler) AssignNode(v ld.Node) error { if v.IsNull() { return na.AssignNull() } @@ -319,8 +319,8 @@ func (na *_AnyScalar__Assembler) AssignNode(v dms3ld.Node) error { *na.m = schema.Maybe_Value return nil } - if v.Kind() != dms3ld.Kind_Map { - return dms3ld.ErrWrongKind{TypeName: "schemadmt.AnyScalar", MethodName: "AssignNode", AppropriateKind: dms3ld.KindSet_JustMap, ActualKind: v.Kind()} + if v.Kind() != ld.Kind_Map { + return ld.ErrWrongKind{TypeName: "schemadmt.AnyScalar", MethodName: "AssignNode", AppropriateKind: ld.KindSet_JustMap, ActualKind: v.Kind()} } itr := v.MapIterator() for !itr.Done() { @@ -337,7 +337,7 @@ func (na *_AnyScalar__Assembler) AssignNode(v dms3ld.Node) error { } return na.Finish() } -func (_AnyScalar__Assembler) Prototype() dms3ld.NodePrototype { +func (_AnyScalar__Assembler) Prototype() ld.NodePrototype { return _AnyScalar__Prototype{} } func (ma *_AnyScalar__Assembler) valueFinishTidy() bool { @@ -349,7 +349,7 @@ func (ma *_AnyScalar__Assembler) valueFinishTidy() bool { return false } } -func (ma *_AnyScalar__Assembler) AssembleEntry(k string) (dms3ld.NodeAssembler, error) { +func (ma *_AnyScalar__Assembler) AssembleEntry(k string) (ld.NodeAssembler, error) { switch ma.state { case maState_initial: // carry on @@ -404,9 +404,9 @@ func (ma *_AnyScalar__Assembler) AssembleEntry(k string) (dms3ld.NodeAssembler, ma.ca5.m = &ma.cm return &ma.ca5, nil } - return nil, dms3ld.ErrInvalidKey{TypeName: "schemadmt.AnyScalar", Key: &_String{k}} + return nil, ld.ErrInvalidKey{TypeName: "schemadmt.AnyScalar", Key: &_String{k}} } -func (ma *_AnyScalar__Assembler) AssembleKey() dms3ld.NodeAssembler { +func (ma *_AnyScalar__Assembler) AssembleKey() ld.NodeAssembler { switch ma.state { case maState_initial: // carry on @@ -424,7 +424,7 @@ func (ma *_AnyScalar__Assembler) AssembleKey() dms3ld.NodeAssembler { ma.state = maState_midKey return (*_AnyScalar__KeyAssembler)(ma) } -func (ma *_AnyScalar__Assembler) AssembleValue() dms3ld.NodeAssembler { +func (ma *_AnyScalar__Assembler) AssembleValue() ld.NodeAssembler { switch ma.state { case maState_initial: panic("invalid state: AssembleValue cannot be called when no key is primed") @@ -485,10 +485,10 @@ func (ma *_AnyScalar__Assembler) Finish() error { *ma.m = schema.Maybe_Value return nil } -func (ma *_AnyScalar__Assembler) KeyPrototype() dms3ld.NodePrototype { +func (ma *_AnyScalar__Assembler) KeyPrototype() ld.NodePrototype { return _String__Prototype{} } -func (ma *_AnyScalar__Assembler) ValuePrototype(k string) dms3ld.NodePrototype { +func (ma *_AnyScalar__Assembler) ValuePrototype(k string) ld.NodePrototype { switch k { case "Bool": return _Bool__Prototype{} @@ -507,10 +507,10 @@ func (ma *_AnyScalar__Assembler) ValuePrototype(k string) dms3ld.NodePrototype { type _AnyScalar__KeyAssembler _AnyScalar__Assembler -func (_AnyScalar__KeyAssembler) BeginMap(sizeHint int64) (dms3ld.MapAssembler, error) { +func (_AnyScalar__KeyAssembler) BeginMap(sizeHint int64) (ld.MapAssembler, error) { return mixins.StringAssembler{TypeName: "schemadmt.AnyScalar.KeyAssembler"}.BeginMap(0) } -func (_AnyScalar__KeyAssembler) BeginList(sizeHint int64) (dms3ld.ListAssembler, error) { +func (_AnyScalar__KeyAssembler) BeginList(sizeHint int64) (ld.ListAssembler, error) { return mixins.StringAssembler{TypeName: "schemadmt.AnyScalar.KeyAssembler"}.BeginList(0) } func (na *_AnyScalar__KeyAssembler) AssignNull() error { @@ -559,67 +559,67 @@ func (ka *_AnyScalar__KeyAssembler) AssignString(k string) error { ka.state = maState_expectValue return nil } - return dms3ld.ErrInvalidKey{TypeName: "schemadmt.AnyScalar", Key: &_String{k}} // TODO: error quality: ErrInvalidUnionDiscriminant ? + return ld.ErrInvalidKey{TypeName: "schemadmt.AnyScalar", Key: &_String{k}} // TODO: error quality: ErrInvalidUnionDiscriminant ? } func (_AnyScalar__KeyAssembler) AssignBytes([]byte) error { return mixins.StringAssembler{TypeName: "schemadmt.AnyScalar.KeyAssembler"}.AssignBytes(nil) } -func (_AnyScalar__KeyAssembler) AssignLink(dms3ld.Link) error { +func (_AnyScalar__KeyAssembler) AssignLink(ld.Link) error { return mixins.StringAssembler{TypeName: "schemadmt.AnyScalar.KeyAssembler"}.AssignLink(nil) } -func (ka *_AnyScalar__KeyAssembler) AssignNode(v dms3ld.Node) error { +func (ka *_AnyScalar__KeyAssembler) AssignNode(v ld.Node) error { if v2, err := v.AsString(); err != nil { return err } else { return ka.AssignString(v2) } } -func (_AnyScalar__KeyAssembler) Prototype() dms3ld.NodePrototype { +func (_AnyScalar__KeyAssembler) Prototype() ld.NodePrototype { return _String__Prototype{} } func (AnyScalar) Type() schema.Type { return nil /*TODO:typelit*/ } -func (n AnyScalar) Representation() dms3ld.Node { +func (n AnyScalar) Representation() ld.Node { return (*_AnyScalar__Repr)(n) } type _AnyScalar__Repr _AnyScalar -var _ dms3ld.Node = &_AnyScalar__Repr{} +var _ ld.Node = &_AnyScalar__Repr{} -func (n *_AnyScalar__Repr) Kind() dms3ld.Kind { +func (n *_AnyScalar__Repr) Kind() ld.Kind { switch n.tag { case 1: - return dms3ld.Kind_Bool + return ld.Kind_Bool case 2: - return dms3ld.Kind_String + return ld.Kind_String case 3: - return dms3ld.Kind_Bytes + return ld.Kind_Bytes case 4: - return dms3ld.Kind_Int + return ld.Kind_Int case 5: - return dms3ld.Kind_Float + return ld.Kind_Float default: panic("unreachable") } } -func (n *_AnyScalar__Repr) LookupByString(key string) (dms3ld.Node, error) { - return nil, dms3ld.ErrWrongKind{TypeName: "schemadmt.AnyScalar.Repr", MethodName: "LookupByString", AppropriateKind: dms3ld.KindSet_JustMap, ActualKind: n.Kind()} +func (n *_AnyScalar__Repr) LookupByString(key string) (ld.Node, error) { + return nil, ld.ErrWrongKind{TypeName: "schemadmt.AnyScalar.Repr", MethodName: "LookupByString", AppropriateKind: ld.KindSet_JustMap, ActualKind: n.Kind()} } -func (n *_AnyScalar__Repr) LookupByNode(key dms3ld.Node) (dms3ld.Node, error) { - return nil, dms3ld.ErrWrongKind{TypeName: "schemadmt.AnyScalar.Repr", MethodName: "LookupByNode", AppropriateKind: dms3ld.KindSet_Recursive, ActualKind: n.Kind()} +func (n *_AnyScalar__Repr) LookupByNode(key ld.Node) (ld.Node, error) { + return nil, ld.ErrWrongKind{TypeName: "schemadmt.AnyScalar.Repr", MethodName: "LookupByNode", AppropriateKind: ld.KindSet_Recursive, ActualKind: n.Kind()} } -func (n *_AnyScalar__Repr) LookupByIndex(idx int64) (dms3ld.Node, error) { - return nil, dms3ld.ErrWrongKind{TypeName: "schemadmt.AnyScalar.Repr", MethodName: "LookupByIndex", AppropriateKind: dms3ld.KindSet_JustList, ActualKind: n.Kind()} +func (n *_AnyScalar__Repr) LookupByIndex(idx int64) (ld.Node, error) { + return nil, ld.ErrWrongKind{TypeName: "schemadmt.AnyScalar.Repr", MethodName: "LookupByIndex", AppropriateKind: ld.KindSet_JustList, ActualKind: n.Kind()} } -func (n *_AnyScalar__Repr) LookupBySegment(seg dms3ld.PathSegment) (dms3ld.Node, error) { - return nil, dms3ld.ErrWrongKind{TypeName: "schemadmt.AnyScalar.Repr", MethodName: "LookupBySegment", AppropriateKind: dms3ld.KindSet_Recursive, ActualKind: n.Kind()} +func (n *_AnyScalar__Repr) LookupBySegment(seg ld.PathSegment) (ld.Node, error) { + return nil, ld.ErrWrongKind{TypeName: "schemadmt.AnyScalar.Repr", MethodName: "LookupBySegment", AppropriateKind: ld.KindSet_Recursive, ActualKind: n.Kind()} } -func (n *_AnyScalar__Repr) MapIterator() dms3ld.MapIterator { +func (n *_AnyScalar__Repr) MapIterator() ld.MapIterator { return nil } -func (n *_AnyScalar__Repr) ListIterator() dms3ld.ListIterator { +func (n *_AnyScalar__Repr) ListIterator() ld.ListIterator { return nil } func (n *_AnyScalar__Repr) Length() int64 { @@ -636,7 +636,7 @@ func (n *_AnyScalar__Repr) AsBool() (bool, error) { case 1: return n.x1.Representation().AsBool() default: - return false, dms3ld.ErrWrongKind{TypeName: "schemadmt.AnyScalar.Repr", MethodName: "AsBool", AppropriateKind: dms3ld.KindSet_JustBool, ActualKind: n.Kind()} + return false, ld.ErrWrongKind{TypeName: "schemadmt.AnyScalar.Repr", MethodName: "AsBool", AppropriateKind: ld.KindSet_JustBool, ActualKind: n.Kind()} } } func (n *_AnyScalar__Repr) AsInt() (int64, error) { @@ -644,7 +644,7 @@ func (n *_AnyScalar__Repr) AsInt() (int64, error) { case 4: return n.x4.Representation().AsInt() default: - return 0, dms3ld.ErrWrongKind{TypeName: "schemadmt.AnyScalar.Repr", MethodName: "AsInt", AppropriateKind: dms3ld.KindSet_JustInt, ActualKind: n.Kind()} + return 0, ld.ErrWrongKind{TypeName: "schemadmt.AnyScalar.Repr", MethodName: "AsInt", AppropriateKind: ld.KindSet_JustInt, ActualKind: n.Kind()} } } func (n *_AnyScalar__Repr) AsFloat() (float64, error) { @@ -652,7 +652,7 @@ func (n *_AnyScalar__Repr) AsFloat() (float64, error) { case 5: return n.x5.Representation().AsFloat() default: - return 0, dms3ld.ErrWrongKind{TypeName: "schemadmt.AnyScalar.Repr", MethodName: "AsFloat", AppropriateKind: dms3ld.KindSet_JustFloat, ActualKind: n.Kind()} + return 0, ld.ErrWrongKind{TypeName: "schemadmt.AnyScalar.Repr", MethodName: "AsFloat", AppropriateKind: ld.KindSet_JustFloat, ActualKind: n.Kind()} } } func (n *_AnyScalar__Repr) AsString() (string, error) { @@ -660,7 +660,7 @@ func (n *_AnyScalar__Repr) AsString() (string, error) { case 2: return n.x2.Representation().AsString() default: - return "", dms3ld.ErrWrongKind{TypeName: "schemadmt.AnyScalar.Repr", MethodName: "AsString", AppropriateKind: dms3ld.KindSet_JustString, ActualKind: n.Kind()} + return "", ld.ErrWrongKind{TypeName: "schemadmt.AnyScalar.Repr", MethodName: "AsString", AppropriateKind: ld.KindSet_JustString, ActualKind: n.Kind()} } } func (n *_AnyScalar__Repr) AsBytes() ([]byte, error) { @@ -668,19 +668,19 @@ func (n *_AnyScalar__Repr) AsBytes() ([]byte, error) { case 3: return n.x3.Representation().AsBytes() default: - return nil, dms3ld.ErrWrongKind{TypeName: "schemadmt.AnyScalar.Repr", MethodName: "AsBytes", AppropriateKind: dms3ld.KindSet_JustBytes, ActualKind: n.Kind()} + return nil, ld.ErrWrongKind{TypeName: "schemadmt.AnyScalar.Repr", MethodName: "AsBytes", AppropriateKind: ld.KindSet_JustBytes, ActualKind: n.Kind()} } } -func (n *_AnyScalar__Repr) AsLink() (dms3ld.Link, error) { - return nil, dms3ld.ErrWrongKind{TypeName: "schemadmt.AnyScalar.Repr", MethodName: "AsLink", AppropriateKind: dms3ld.KindSet_JustLink, ActualKind: n.Kind()} +func (n *_AnyScalar__Repr) AsLink() (ld.Link, error) { + return nil, ld.ErrWrongKind{TypeName: "schemadmt.AnyScalar.Repr", MethodName: "AsLink", AppropriateKind: ld.KindSet_JustLink, ActualKind: n.Kind()} } -func (_AnyScalar__Repr) Prototype() dms3ld.NodePrototype { +func (_AnyScalar__Repr) Prototype() ld.NodePrototype { return _AnyScalar__ReprPrototype{} } type _AnyScalar__ReprPrototype struct{} -func (_AnyScalar__ReprPrototype) NewBuilder() dms3ld.NodeBuilder { +func (_AnyScalar__ReprPrototype) NewBuilder() ld.NodeBuilder { var nb _AnyScalar__ReprBuilder nb.Reset() return &nb @@ -690,7 +690,7 @@ type _AnyScalar__ReprBuilder struct { _AnyScalar__ReprAssembler } -func (nb *_AnyScalar__ReprBuilder) Build() dms3ld.Node { +func (nb *_AnyScalar__ReprBuilder) Build() ld.Node { if *nb.m != schema.Maybe_Value { panic("invalid state: cannot call Build on an assembler that's not finished") } @@ -732,7 +732,7 @@ func (na *_AnyScalar__ReprAssembler) reset() { } na.ca = 0 } -func (na *_AnyScalar__ReprAssembler) BeginMap(sizeHint int64) (dms3ld.MapAssembler, error) { +func (na *_AnyScalar__ReprAssembler) BeginMap(sizeHint int64) (ld.MapAssembler, error) { switch *na.m { case schema.Maybe_Value, schema.Maybe_Null: panic("invalid state: cannot assign into assembler that's already finished") @@ -741,7 +741,7 @@ func (na *_AnyScalar__ReprAssembler) BeginMap(sizeHint int64) (dms3ld.MapAssembl } return nil, schema.ErrNotUnionStructure{TypeName: "schemadmt.AnyScalar.Repr", Detail: "BeginMap called but is not valid for any of the kinds that are valid members of this union"} } -func (na *_AnyScalar__ReprAssembler) BeginList(sizeHint int64) (dms3ld.ListAssembler, error) { +func (na *_AnyScalar__ReprAssembler) BeginList(sizeHint int64) (ld.ListAssembler, error) { switch *na.m { case schema.Maybe_Value, schema.Maybe_Null: panic("invalid state: cannot assign into assembler that's already finished") @@ -839,7 +839,7 @@ func (na *_AnyScalar__ReprAssembler) AssignBytes(v []byte) error { na.ca3.m = na.m return na.ca3.AssignBytes(v) } -func (na *_AnyScalar__ReprAssembler) AssignLink(v dms3ld.Link) error { +func (na *_AnyScalar__ReprAssembler) AssignLink(v ld.Link) error { switch *na.m { case schema.Maybe_Value, schema.Maybe_Null: panic("invalid state: cannot assign into assembler that's already finished") @@ -848,7 +848,7 @@ func (na *_AnyScalar__ReprAssembler) AssignLink(v dms3ld.Link) error { } return schema.ErrNotUnionStructure{TypeName: "schemadmt.AnyScalar.Repr", Detail: "AssignLink called but is not valid for any of the kinds that are valid members of this union"} } -func (na *_AnyScalar__ReprAssembler) AssignNode(v dms3ld.Node) error { +func (na *_AnyScalar__ReprAssembler) AssignNode(v ld.Node) error { if v.IsNull() { return na.AssignNull() } @@ -869,22 +869,22 @@ func (na *_AnyScalar__ReprAssembler) AssignNode(v dms3ld.Node) error { return nil } switch v.Kind() { - case dms3ld.Kind_Bool: + case ld.Kind_Bool: v2, _ := v.AsBool() return na.AssignBool(v2) - case dms3ld.Kind_Int: + case ld.Kind_Int: v2, _ := v.AsInt() return na.AssignInt(v2) - case dms3ld.Kind_Float: + case ld.Kind_Float: v2, _ := v.AsFloat() return na.AssignFloat(v2) - case dms3ld.Kind_String: + case ld.Kind_String: v2, _ := v.AsString() return na.AssignString(v2) - case dms3ld.Kind_Bytes: + case ld.Kind_Bytes: v2, _ := v.AsBytes() return na.AssignBytes(v2) - case dms3ld.Kind_Map: + case ld.Kind_Map: na, err := na.BeginMap(v.Length()) if err != nil { return err @@ -903,7 +903,7 @@ func (na *_AnyScalar__ReprAssembler) AssignNode(v dms3ld.Node) error { } } return na.Finish() - case dms3ld.Kind_List: + case ld.Kind_List: na, err := na.BeginList(v.Length()) if err != nil { return err @@ -919,14 +919,14 @@ func (na *_AnyScalar__ReprAssembler) AssignNode(v dms3ld.Node) error { } } return na.Finish() - case dms3ld.Kind_Link: + case ld.Kind_Link: v2, _ := v.AsLink() return na.AssignLink(v2) default: panic("unreachable") } } -func (na *_AnyScalar__ReprAssembler) Prototype() dms3ld.NodePrototype { +func (na *_AnyScalar__ReprAssembler) Prototype() ld.NodePrototype { return _AnyScalar__ReprPrototype{} } @@ -953,12 +953,12 @@ func (m MaybeBool) IsAbsent() bool { func (m MaybeBool) Exists() bool { return m.m == schema.Maybe_Value } -func (m MaybeBool) AsNode() dms3ld.Node { +func (m MaybeBool) AsNode() ld.Node { switch m.m { case schema.Maybe_Absent: - return dms3ld.Absent + return ld.Absent case schema.Maybe_Null: - return dms3ld.Null + return ld.Null case schema.Maybe_Value: return &m.v default: @@ -972,28 +972,28 @@ func (m MaybeBool) Must() Bool { return &m.v } -var _ dms3ld.Node = (Bool)(&_Bool{}) +var _ ld.Node = (Bool)(&_Bool{}) var _ schema.TypedNode = (Bool)(&_Bool{}) -func (Bool) Kind() dms3ld.Kind { - return dms3ld.Kind_Bool +func (Bool) Kind() ld.Kind { + return ld.Kind_Bool } -func (Bool) LookupByString(string) (dms3ld.Node, error) { +func (Bool) LookupByString(string) (ld.Node, error) { return mixins.Bool{TypeName: "schemadmt.Bool"}.LookupByString("") } -func (Bool) LookupByNode(dms3ld.Node) (dms3ld.Node, error) { +func (Bool) LookupByNode(ld.Node) (ld.Node, error) { return mixins.Bool{TypeName: "schemadmt.Bool"}.LookupByNode(nil) } -func (Bool) LookupByIndex(idx int64) (dms3ld.Node, error) { +func (Bool) LookupByIndex(idx int64) (ld.Node, error) { return mixins.Bool{TypeName: "schemadmt.Bool"}.LookupByIndex(0) } -func (Bool) LookupBySegment(seg dms3ld.PathSegment) (dms3ld.Node, error) { +func (Bool) LookupBySegment(seg ld.PathSegment) (ld.Node, error) { return mixins.Bool{TypeName: "schemadmt.Bool"}.LookupBySegment(seg) } -func (Bool) MapIterator() dms3ld.MapIterator { +func (Bool) MapIterator() ld.MapIterator { return nil } -func (Bool) ListIterator() dms3ld.ListIterator { +func (Bool) ListIterator() ld.ListIterator { return nil } func (Bool) Length() int64 { @@ -1020,16 +1020,16 @@ func (Bool) AsString() (string, error) { func (Bool) AsBytes() ([]byte, error) { return mixins.Bool{TypeName: "schemadmt.Bool"}.AsBytes() } -func (Bool) AsLink() (dms3ld.Link, error) { +func (Bool) AsLink() (ld.Link, error) { return mixins.Bool{TypeName: "schemadmt.Bool"}.AsLink() } -func (Bool) Prototype() dms3ld.NodePrototype { +func (Bool) Prototype() ld.NodePrototype { return _Bool__Prototype{} } type _Bool__Prototype struct{} -func (_Bool__Prototype) NewBuilder() dms3ld.NodeBuilder { +func (_Bool__Prototype) NewBuilder() ld.NodeBuilder { var nb _Bool__Builder nb.Reset() return &nb @@ -1039,7 +1039,7 @@ type _Bool__Builder struct { _Bool__Assembler } -func (nb *_Bool__Builder) Build() dms3ld.Node { +func (nb *_Bool__Builder) Build() ld.Node { if *nb.m != schema.Maybe_Value { panic("invalid state: cannot call Build on an assembler that's not finished") } @@ -1057,10 +1057,10 @@ type _Bool__Assembler struct { } func (na *_Bool__Assembler) reset() {} -func (_Bool__Assembler) BeginMap(sizeHint int64) (dms3ld.MapAssembler, error) { +func (_Bool__Assembler) BeginMap(sizeHint int64) (ld.MapAssembler, error) { return mixins.BoolAssembler{TypeName: "schemadmt.Bool"}.BeginMap(0) } -func (_Bool__Assembler) BeginList(sizeHint int64) (dms3ld.ListAssembler, error) { +func (_Bool__Assembler) BeginList(sizeHint int64) (ld.ListAssembler, error) { return mixins.BoolAssembler{TypeName: "schemadmt.Bool"}.BeginList(0) } func (na *_Bool__Assembler) AssignNull() error { @@ -1096,10 +1096,10 @@ func (_Bool__Assembler) AssignString(string) error { func (_Bool__Assembler) AssignBytes([]byte) error { return mixins.BoolAssembler{TypeName: "schemadmt.Bool"}.AssignBytes(nil) } -func (_Bool__Assembler) AssignLink(dms3ld.Link) error { +func (_Bool__Assembler) AssignLink(ld.Link) error { return mixins.BoolAssembler{TypeName: "schemadmt.Bool"}.AssignLink(nil) } -func (na *_Bool__Assembler) AssignNode(v dms3ld.Node) error { +func (na *_Bool__Assembler) AssignNode(v ld.Node) error { if v.IsNull() { return na.AssignNull() } @@ -1118,19 +1118,19 @@ func (na *_Bool__Assembler) AssignNode(v dms3ld.Node) error { return na.AssignBool(v2) } } -func (_Bool__Assembler) Prototype() dms3ld.NodePrototype { +func (_Bool__Assembler) Prototype() ld.NodePrototype { return _Bool__Prototype{} } func (Bool) Type() schema.Type { return nil /*TODO:typelit*/ } -func (n Bool) Representation() dms3ld.Node { +func (n Bool) Representation() ld.Node { return (*_Bool__Repr)(n) } type _Bool__Repr = _Bool -var _ dms3ld.Node = &_Bool__Repr{} +var _ ld.Node = &_Bool__Repr{} type _Bool__ReprPrototype = _Bool__Prototype type _Bool__ReprAssembler = _Bool__Assembler @@ -1158,12 +1158,12 @@ func (m MaybeBytes) IsAbsent() bool { func (m MaybeBytes) Exists() bool { return m.m == schema.Maybe_Value } -func (m MaybeBytes) AsNode() dms3ld.Node { +func (m MaybeBytes) AsNode() ld.Node { switch m.m { case schema.Maybe_Absent: - return dms3ld.Absent + return ld.Absent case schema.Maybe_Null: - return dms3ld.Null + return ld.Null case schema.Maybe_Value: return &m.v default: @@ -1177,28 +1177,28 @@ func (m MaybeBytes) Must() Bytes { return &m.v } -var _ dms3ld.Node = (Bytes)(&_Bytes{}) +var _ ld.Node = (Bytes)(&_Bytes{}) var _ schema.TypedNode = (Bytes)(&_Bytes{}) -func (Bytes) Kind() dms3ld.Kind { - return dms3ld.Kind_Bytes +func (Bytes) Kind() ld.Kind { + return ld.Kind_Bytes } -func (Bytes) LookupByString(string) (dms3ld.Node, error) { +func (Bytes) LookupByString(string) (ld.Node, error) { return mixins.Bytes{TypeName: "schemadmt.Bytes"}.LookupByString("") } -func (Bytes) LookupByNode(dms3ld.Node) (dms3ld.Node, error) { +func (Bytes) LookupByNode(ld.Node) (ld.Node, error) { return mixins.Bytes{TypeName: "schemadmt.Bytes"}.LookupByNode(nil) } -func (Bytes) LookupByIndex(idx int64) (dms3ld.Node, error) { +func (Bytes) LookupByIndex(idx int64) (ld.Node, error) { return mixins.Bytes{TypeName: "schemadmt.Bytes"}.LookupByIndex(0) } -func (Bytes) LookupBySegment(seg dms3ld.PathSegment) (dms3ld.Node, error) { +func (Bytes) LookupBySegment(seg ld.PathSegment) (ld.Node, error) { return mixins.Bytes{TypeName: "schemadmt.Bytes"}.LookupBySegment(seg) } -func (Bytes) MapIterator() dms3ld.MapIterator { +func (Bytes) MapIterator() ld.MapIterator { return nil } -func (Bytes) ListIterator() dms3ld.ListIterator { +func (Bytes) ListIterator() ld.ListIterator { return nil } func (Bytes) Length() int64 { @@ -1225,16 +1225,16 @@ func (Bytes) AsString() (string, error) { func (n Bytes) AsBytes() ([]byte, error) { return n.x, nil } -func (Bytes) AsLink() (dms3ld.Link, error) { +func (Bytes) AsLink() (ld.Link, error) { return mixins.Bytes{TypeName: "schemadmt.Bytes"}.AsLink() } -func (Bytes) Prototype() dms3ld.NodePrototype { +func (Bytes) Prototype() ld.NodePrototype { return _Bytes__Prototype{} } type _Bytes__Prototype struct{} -func (_Bytes__Prototype) NewBuilder() dms3ld.NodeBuilder { +func (_Bytes__Prototype) NewBuilder() ld.NodeBuilder { var nb _Bytes__Builder nb.Reset() return &nb @@ -1244,7 +1244,7 @@ type _Bytes__Builder struct { _Bytes__Assembler } -func (nb *_Bytes__Builder) Build() dms3ld.Node { +func (nb *_Bytes__Builder) Build() ld.Node { if *nb.m != schema.Maybe_Value { panic("invalid state: cannot call Build on an assembler that's not finished") } @@ -1262,10 +1262,10 @@ type _Bytes__Assembler struct { } func (na *_Bytes__Assembler) reset() {} -func (_Bytes__Assembler) BeginMap(sizeHint int64) (dms3ld.MapAssembler, error) { +func (_Bytes__Assembler) BeginMap(sizeHint int64) (ld.MapAssembler, error) { return mixins.BytesAssembler{TypeName: "schemadmt.Bytes"}.BeginMap(0) } -func (_Bytes__Assembler) BeginList(sizeHint int64) (dms3ld.ListAssembler, error) { +func (_Bytes__Assembler) BeginList(sizeHint int64) (ld.ListAssembler, error) { return mixins.BytesAssembler{TypeName: "schemadmt.Bytes"}.BeginList(0) } func (na *_Bytes__Assembler) AssignNull() error { @@ -1301,10 +1301,10 @@ func (na *_Bytes__Assembler) AssignBytes(v []byte) error { *na.m = schema.Maybe_Value return nil } -func (_Bytes__Assembler) AssignLink(dms3ld.Link) error { +func (_Bytes__Assembler) AssignLink(ld.Link) error { return mixins.BytesAssembler{TypeName: "schemadmt.Bytes"}.AssignLink(nil) } -func (na *_Bytes__Assembler) AssignNode(v dms3ld.Node) error { +func (na *_Bytes__Assembler) AssignNode(v ld.Node) error { if v.IsNull() { return na.AssignNull() } @@ -1323,19 +1323,19 @@ func (na *_Bytes__Assembler) AssignNode(v dms3ld.Node) error { return na.AssignBytes(v2) } } -func (_Bytes__Assembler) Prototype() dms3ld.NodePrototype { +func (_Bytes__Assembler) Prototype() ld.NodePrototype { return _Bytes__Prototype{} } func (Bytes) Type() schema.Type { return nil /*TODO:typelit*/ } -func (n Bytes) Representation() dms3ld.Node { +func (n Bytes) Representation() ld.Node { return (*_Bytes__Repr)(n) } type _Bytes__Repr = _Bytes -var _ dms3ld.Node = &_Bytes__Repr{} +var _ ld.Node = &_Bytes__Repr{} type _Bytes__ReprPrototype = _Bytes__Prototype type _Bytes__ReprAssembler = _Bytes__Assembler @@ -1366,12 +1366,12 @@ func (m MaybeEnumRepresentation) IsAbsent() bool { func (m MaybeEnumRepresentation) Exists() bool { return m.m == schema.Maybe_Value } -func (m MaybeEnumRepresentation) AsNode() dms3ld.Node { +func (m MaybeEnumRepresentation) AsNode() ld.Node { switch m.m { case schema.Maybe_Absent: - return dms3ld.Absent + return ld.Absent case schema.Maybe_Null: - return dms3ld.Null + return ld.Null case schema.Maybe_Value: return m.v default: @@ -1389,42 +1389,42 @@ var ( memberName__EnumRepresentation_EnumRepresentation_String = _String{"EnumRepresentation_String"} memberName__EnumRepresentation_EnumRepresentation_Int = _String{"EnumRepresentation_Int"} ) -var _ dms3ld.Node = (EnumRepresentation)(&_EnumRepresentation{}) +var _ ld.Node = (EnumRepresentation)(&_EnumRepresentation{}) var _ schema.TypedNode = (EnumRepresentation)(&_EnumRepresentation{}) -func (EnumRepresentation) Kind() dms3ld.Kind { - return dms3ld.Kind_Map +func (EnumRepresentation) Kind() ld.Kind { + return ld.Kind_Map } -func (n EnumRepresentation) LookupByString(key string) (dms3ld.Node, error) { +func (n EnumRepresentation) LookupByString(key string) (ld.Node, error) { switch key { case "EnumRepresentation_String": if n.tag != 1 { - return nil, dms3ld.ErrNotExists{Segment: dms3ld.PathSegmentOfString(key)} + return nil, ld.ErrNotExists{Segment: ld.PathSegmentOfString(key)} } return &n.x1, nil case "EnumRepresentation_Int": if n.tag != 2 { - return nil, dms3ld.ErrNotExists{Segment: dms3ld.PathSegmentOfString(key)} + return nil, ld.ErrNotExists{Segment: ld.PathSegmentOfString(key)} } return &n.x2, nil default: - return nil, schema.ErrNoSuchField{Type: nil /*TODO*/, Field: dms3ld.PathSegmentOfString(key)} + return nil, schema.ErrNoSuchField{Type: nil /*TODO*/, Field: ld.PathSegmentOfString(key)} } } -func (n EnumRepresentation) LookupByNode(key dms3ld.Node) (dms3ld.Node, error) { +func (n EnumRepresentation) LookupByNode(key ld.Node) (ld.Node, error) { ks, err := key.AsString() if err != nil { return nil, err } return n.LookupByString(ks) } -func (EnumRepresentation) LookupByIndex(idx int64) (dms3ld.Node, error) { +func (EnumRepresentation) LookupByIndex(idx int64) (ld.Node, error) { return mixins.Map{TypeName: "schemadmt.EnumRepresentation"}.LookupByIndex(0) } -func (n EnumRepresentation) LookupBySegment(seg dms3ld.PathSegment) (dms3ld.Node, error) { +func (n EnumRepresentation) LookupBySegment(seg ld.PathSegment) (ld.Node, error) { return n.LookupByString(seg.String()) } -func (n EnumRepresentation) MapIterator() dms3ld.MapIterator { +func (n EnumRepresentation) MapIterator() ld.MapIterator { return &_EnumRepresentation__MapItr{n, false} } @@ -1433,9 +1433,9 @@ type _EnumRepresentation__MapItr struct { done bool } -func (itr *_EnumRepresentation__MapItr) Next() (k dms3ld.Node, v dms3ld.Node, _ error) { +func (itr *_EnumRepresentation__MapItr) Next() (k ld.Node, v ld.Node, _ error) { if itr.done { - return nil, nil, dms3ld.ErrIteratorOverread{} + return nil, nil, ld.ErrIteratorOverread{} } switch itr.n.tag { case 1: @@ -1452,7 +1452,7 @@ func (itr *_EnumRepresentation__MapItr) Done() bool { return itr.done } -func (EnumRepresentation) ListIterator() dms3ld.ListIterator { +func (EnumRepresentation) ListIterator() ld.ListIterator { return nil } func (EnumRepresentation) Length() int64 { @@ -1479,16 +1479,16 @@ func (EnumRepresentation) AsString() (string, error) { func (EnumRepresentation) AsBytes() ([]byte, error) { return mixins.Map{TypeName: "schemadmt.EnumRepresentation"}.AsBytes() } -func (EnumRepresentation) AsLink() (dms3ld.Link, error) { +func (EnumRepresentation) AsLink() (ld.Link, error) { return mixins.Map{TypeName: "schemadmt.EnumRepresentation"}.AsLink() } -func (EnumRepresentation) Prototype() dms3ld.NodePrototype { +func (EnumRepresentation) Prototype() ld.NodePrototype { return _EnumRepresentation__Prototype{} } type _EnumRepresentation__Prototype struct{} -func (_EnumRepresentation__Prototype) NewBuilder() dms3ld.NodeBuilder { +func (_EnumRepresentation__Prototype) NewBuilder() ld.NodeBuilder { var nb _EnumRepresentation__Builder nb.Reset() return &nb @@ -1498,7 +1498,7 @@ type _EnumRepresentation__Builder struct { _EnumRepresentation__Assembler } -func (nb *_EnumRepresentation__Builder) Build() dms3ld.Node { +func (nb *_EnumRepresentation__Builder) Build() ld.Node { if *nb.m != schema.Maybe_Value { panic("invalid state: cannot call Build on an assembler that's not finished") } @@ -1538,7 +1538,7 @@ func (na *_EnumRepresentation__Assembler) reset() { na.ca = 0 na.cm = schema.Maybe_Absent } -func (na *_EnumRepresentation__Assembler) BeginMap(int64) (dms3ld.MapAssembler, error) { +func (na *_EnumRepresentation__Assembler) BeginMap(int64) (ld.MapAssembler, error) { switch *na.m { case schema.Maybe_Value, schema.Maybe_Null: panic("invalid state: cannot assign into assembler that's already finished") @@ -1551,7 +1551,7 @@ func (na *_EnumRepresentation__Assembler) BeginMap(int64) (dms3ld.MapAssembler, } return na, nil } -func (_EnumRepresentation__Assembler) BeginList(sizeHint int64) (dms3ld.ListAssembler, error) { +func (_EnumRepresentation__Assembler) BeginList(sizeHint int64) (ld.ListAssembler, error) { return mixins.MapAssembler{TypeName: "schemadmt.EnumRepresentation"}.BeginList(0) } func (na *_EnumRepresentation__Assembler) AssignNull() error { @@ -1583,10 +1583,10 @@ func (_EnumRepresentation__Assembler) AssignString(string) error { func (_EnumRepresentation__Assembler) AssignBytes([]byte) error { return mixins.MapAssembler{TypeName: "schemadmt.EnumRepresentation"}.AssignBytes(nil) } -func (_EnumRepresentation__Assembler) AssignLink(dms3ld.Link) error { +func (_EnumRepresentation__Assembler) AssignLink(ld.Link) error { return mixins.MapAssembler{TypeName: "schemadmt.EnumRepresentation"}.AssignLink(nil) } -func (na *_EnumRepresentation__Assembler) AssignNode(v dms3ld.Node) error { +func (na *_EnumRepresentation__Assembler) AssignNode(v ld.Node) error { if v.IsNull() { return na.AssignNull() } @@ -1606,8 +1606,8 @@ func (na *_EnumRepresentation__Assembler) AssignNode(v dms3ld.Node) error { *na.m = schema.Maybe_Value return nil } - if v.Kind() != dms3ld.Kind_Map { - return dms3ld.ErrWrongKind{TypeName: "schemadmt.EnumRepresentation", MethodName: "AssignNode", AppropriateKind: dms3ld.KindSet_JustMap, ActualKind: v.Kind()} + if v.Kind() != ld.Kind_Map { + return ld.ErrWrongKind{TypeName: "schemadmt.EnumRepresentation", MethodName: "AssignNode", AppropriateKind: ld.KindSet_JustMap, ActualKind: v.Kind()} } itr := v.MapIterator() for !itr.Done() { @@ -1624,7 +1624,7 @@ func (na *_EnumRepresentation__Assembler) AssignNode(v dms3ld.Node) error { } return na.Finish() } -func (_EnumRepresentation__Assembler) Prototype() dms3ld.NodePrototype { +func (_EnumRepresentation__Assembler) Prototype() ld.NodePrototype { return _EnumRepresentation__Prototype{} } func (ma *_EnumRepresentation__Assembler) valueFinishTidy() bool { @@ -1636,7 +1636,7 @@ func (ma *_EnumRepresentation__Assembler) valueFinishTidy() bool { return false } } -func (ma *_EnumRepresentation__Assembler) AssembleEntry(k string) (dms3ld.NodeAssembler, error) { +func (ma *_EnumRepresentation__Assembler) AssembleEntry(k string) (ld.NodeAssembler, error) { switch ma.state { case maState_initial: // carry on @@ -1670,9 +1670,9 @@ func (ma *_EnumRepresentation__Assembler) AssembleEntry(k string) (dms3ld.NodeAs ma.ca2.m = &ma.cm return &ma.ca2, nil } - return nil, dms3ld.ErrInvalidKey{TypeName: "schemadmt.EnumRepresentation", Key: &_String{k}} + return nil, ld.ErrInvalidKey{TypeName: "schemadmt.EnumRepresentation", Key: &_String{k}} } -func (ma *_EnumRepresentation__Assembler) AssembleKey() dms3ld.NodeAssembler { +func (ma *_EnumRepresentation__Assembler) AssembleKey() ld.NodeAssembler { switch ma.state { case maState_initial: // carry on @@ -1690,7 +1690,7 @@ func (ma *_EnumRepresentation__Assembler) AssembleKey() dms3ld.NodeAssembler { ma.state = maState_midKey return (*_EnumRepresentation__KeyAssembler)(ma) } -func (ma *_EnumRepresentation__Assembler) AssembleValue() dms3ld.NodeAssembler { +func (ma *_EnumRepresentation__Assembler) AssembleValue() ld.NodeAssembler { switch ma.state { case maState_initial: panic("invalid state: AssembleValue cannot be called when no key is primed") @@ -1739,10 +1739,10 @@ func (ma *_EnumRepresentation__Assembler) Finish() error { *ma.m = schema.Maybe_Value return nil } -func (ma *_EnumRepresentation__Assembler) KeyPrototype() dms3ld.NodePrototype { +func (ma *_EnumRepresentation__Assembler) KeyPrototype() ld.NodePrototype { return _String__Prototype{} } -func (ma *_EnumRepresentation__Assembler) ValuePrototype(k string) dms3ld.NodePrototype { +func (ma *_EnumRepresentation__Assembler) ValuePrototype(k string) ld.NodePrototype { switch k { case "EnumRepresentation_String": return _EnumRepresentation_String__Prototype{} @@ -1755,10 +1755,10 @@ func (ma *_EnumRepresentation__Assembler) ValuePrototype(k string) dms3ld.NodePr type _EnumRepresentation__KeyAssembler _EnumRepresentation__Assembler -func (_EnumRepresentation__KeyAssembler) BeginMap(sizeHint int64) (dms3ld.MapAssembler, error) { +func (_EnumRepresentation__KeyAssembler) BeginMap(sizeHint int64) (ld.MapAssembler, error) { return mixins.StringAssembler{TypeName: "schemadmt.EnumRepresentation.KeyAssembler"}.BeginMap(0) } -func (_EnumRepresentation__KeyAssembler) BeginList(sizeHint int64) (dms3ld.ListAssembler, error) { +func (_EnumRepresentation__KeyAssembler) BeginList(sizeHint int64) (ld.ListAssembler, error) { return mixins.StringAssembler{TypeName: "schemadmt.EnumRepresentation.KeyAssembler"}.BeginList(0) } func (na *_EnumRepresentation__KeyAssembler) AssignNull() error { @@ -1792,28 +1792,28 @@ func (ka *_EnumRepresentation__KeyAssembler) AssignString(k string) error { ka.state = maState_expectValue return nil } - return dms3ld.ErrInvalidKey{TypeName: "schemadmt.EnumRepresentation", Key: &_String{k}} // TODO: error quality: ErrInvalidUnionDiscriminant ? + return ld.ErrInvalidKey{TypeName: "schemadmt.EnumRepresentation", Key: &_String{k}} // TODO: error quality: ErrInvalidUnionDiscriminant ? } func (_EnumRepresentation__KeyAssembler) AssignBytes([]byte) error { return mixins.StringAssembler{TypeName: "schemadmt.EnumRepresentation.KeyAssembler"}.AssignBytes(nil) } -func (_EnumRepresentation__KeyAssembler) AssignLink(dms3ld.Link) error { +func (_EnumRepresentation__KeyAssembler) AssignLink(ld.Link) error { return mixins.StringAssembler{TypeName: "schemadmt.EnumRepresentation.KeyAssembler"}.AssignLink(nil) } -func (ka *_EnumRepresentation__KeyAssembler) AssignNode(v dms3ld.Node) error { +func (ka *_EnumRepresentation__KeyAssembler) AssignNode(v ld.Node) error { if v2, err := v.AsString(); err != nil { return err } else { return ka.AssignString(v2) } } -func (_EnumRepresentation__KeyAssembler) Prototype() dms3ld.NodePrototype { +func (_EnumRepresentation__KeyAssembler) Prototype() ld.NodePrototype { return _String__Prototype{} } func (EnumRepresentation) Type() schema.Type { return nil /*TODO:typelit*/ } -func (n EnumRepresentation) Representation() dms3ld.Node { +func (n EnumRepresentation) Representation() ld.Node { return (*_EnumRepresentation__Repr)(n) } @@ -1823,41 +1823,41 @@ var ( memberName__EnumRepresentation_EnumRepresentation_String_serial = _String{"string"} memberName__EnumRepresentation_EnumRepresentation_Int_serial = _String{"int"} ) -var _ dms3ld.Node = &_EnumRepresentation__Repr{} +var _ ld.Node = &_EnumRepresentation__Repr{} -func (_EnumRepresentation__Repr) Kind() dms3ld.Kind { - return dms3ld.Kind_Map +func (_EnumRepresentation__Repr) Kind() ld.Kind { + return ld.Kind_Map } -func (n *_EnumRepresentation__Repr) LookupByString(key string) (dms3ld.Node, error) { +func (n *_EnumRepresentation__Repr) LookupByString(key string) (ld.Node, error) { switch key { case "string": if n.tag != 1 { - return nil, dms3ld.ErrNotExists{Segment: dms3ld.PathSegmentOfString(key)} + return nil, ld.ErrNotExists{Segment: ld.PathSegmentOfString(key)} } return n.x1.Representation(), nil case "int": if n.tag != 2 { - return nil, dms3ld.ErrNotExists{Segment: dms3ld.PathSegmentOfString(key)} + return nil, ld.ErrNotExists{Segment: ld.PathSegmentOfString(key)} } return n.x2.Representation(), nil default: - return nil, schema.ErrNoSuchField{Type: nil /*TODO*/, Field: dms3ld.PathSegmentOfString(key)} + return nil, schema.ErrNoSuchField{Type: nil /*TODO*/, Field: ld.PathSegmentOfString(key)} } } -func (n *_EnumRepresentation__Repr) LookupByNode(key dms3ld.Node) (dms3ld.Node, error) { +func (n *_EnumRepresentation__Repr) LookupByNode(key ld.Node) (ld.Node, error) { ks, err := key.AsString() if err != nil { return nil, err } return n.LookupByString(ks) } -func (_EnumRepresentation__Repr) LookupByIndex(idx int64) (dms3ld.Node, error) { +func (_EnumRepresentation__Repr) LookupByIndex(idx int64) (ld.Node, error) { return mixins.Map{TypeName: "schemadmt.EnumRepresentation.Repr"}.LookupByIndex(0) } -func (n _EnumRepresentation__Repr) LookupBySegment(seg dms3ld.PathSegment) (dms3ld.Node, error) { +func (n _EnumRepresentation__Repr) LookupBySegment(seg ld.PathSegment) (ld.Node, error) { return n.LookupByString(seg.String()) } -func (n *_EnumRepresentation__Repr) MapIterator() dms3ld.MapIterator { +func (n *_EnumRepresentation__Repr) MapIterator() ld.MapIterator { return &_EnumRepresentation__ReprMapItr{n, false} } @@ -1866,9 +1866,9 @@ type _EnumRepresentation__ReprMapItr struct { done bool } -func (itr *_EnumRepresentation__ReprMapItr) Next() (k dms3ld.Node, v dms3ld.Node, _ error) { +func (itr *_EnumRepresentation__ReprMapItr) Next() (k ld.Node, v ld.Node, _ error) { if itr.done { - return nil, nil, dms3ld.ErrIteratorOverread{} + return nil, nil, ld.ErrIteratorOverread{} } switch itr.n.tag { case 1: @@ -1885,7 +1885,7 @@ func (itr *_EnumRepresentation__ReprMapItr) Done() bool { return itr.done } -func (_EnumRepresentation__Repr) ListIterator() dms3ld.ListIterator { +func (_EnumRepresentation__Repr) ListIterator() ld.ListIterator { return nil } func (_EnumRepresentation__Repr) Length() int64 { @@ -1912,16 +1912,16 @@ func (_EnumRepresentation__Repr) AsString() (string, error) { func (_EnumRepresentation__Repr) AsBytes() ([]byte, error) { return mixins.Map{TypeName: "schemadmt.EnumRepresentation.Repr"}.AsBytes() } -func (_EnumRepresentation__Repr) AsLink() (dms3ld.Link, error) { +func (_EnumRepresentation__Repr) AsLink() (ld.Link, error) { return mixins.Map{TypeName: "schemadmt.EnumRepresentation.Repr"}.AsLink() } -func (_EnumRepresentation__Repr) Prototype() dms3ld.NodePrototype { +func (_EnumRepresentation__Repr) Prototype() ld.NodePrototype { return _EnumRepresentation__ReprPrototype{} } type _EnumRepresentation__ReprPrototype struct{} -func (_EnumRepresentation__ReprPrototype) NewBuilder() dms3ld.NodeBuilder { +func (_EnumRepresentation__ReprPrototype) NewBuilder() ld.NodeBuilder { var nb _EnumRepresentation__ReprBuilder nb.Reset() return &nb @@ -1931,7 +1931,7 @@ type _EnumRepresentation__ReprBuilder struct { _EnumRepresentation__ReprAssembler } -func (nb *_EnumRepresentation__ReprBuilder) Build() dms3ld.Node { +func (nb *_EnumRepresentation__ReprBuilder) Build() ld.Node { if *nb.m != schema.Maybe_Value { panic("invalid state: cannot call Build on an assembler that's not finished") } @@ -1971,7 +1971,7 @@ func (na *_EnumRepresentation__ReprAssembler) reset() { na.ca = 0 na.cm = schema.Maybe_Absent } -func (na *_EnumRepresentation__ReprAssembler) BeginMap(int64) (dms3ld.MapAssembler, error) { +func (na *_EnumRepresentation__ReprAssembler) BeginMap(int64) (ld.MapAssembler, error) { switch *na.m { case schema.Maybe_Value, schema.Maybe_Null: panic("invalid state: cannot assign into assembler that's already finished") @@ -1984,7 +1984,7 @@ func (na *_EnumRepresentation__ReprAssembler) BeginMap(int64) (dms3ld.MapAssembl } return na, nil } -func (_EnumRepresentation__ReprAssembler) BeginList(sizeHint int64) (dms3ld.ListAssembler, error) { +func (_EnumRepresentation__ReprAssembler) BeginList(sizeHint int64) (ld.ListAssembler, error) { return mixins.MapAssembler{TypeName: "schemadmt.EnumRepresentation.Repr"}.BeginList(0) } func (na *_EnumRepresentation__ReprAssembler) AssignNull() error { @@ -2016,10 +2016,10 @@ func (_EnumRepresentation__ReprAssembler) AssignString(string) error { func (_EnumRepresentation__ReprAssembler) AssignBytes([]byte) error { return mixins.MapAssembler{TypeName: "schemadmt.EnumRepresentation.Repr"}.AssignBytes(nil) } -func (_EnumRepresentation__ReprAssembler) AssignLink(dms3ld.Link) error { +func (_EnumRepresentation__ReprAssembler) AssignLink(ld.Link) error { return mixins.MapAssembler{TypeName: "schemadmt.EnumRepresentation.Repr"}.AssignLink(nil) } -func (na *_EnumRepresentation__ReprAssembler) AssignNode(v dms3ld.Node) error { +func (na *_EnumRepresentation__ReprAssembler) AssignNode(v ld.Node) error { if v.IsNull() { return na.AssignNull() } @@ -2039,8 +2039,8 @@ func (na *_EnumRepresentation__ReprAssembler) AssignNode(v dms3ld.Node) error { *na.m = schema.Maybe_Value return nil } - if v.Kind() != dms3ld.Kind_Map { - return dms3ld.ErrWrongKind{TypeName: "schemadmt.EnumRepresentation.Repr", MethodName: "AssignNode", AppropriateKind: dms3ld.KindSet_JustMap, ActualKind: v.Kind()} + if v.Kind() != ld.Kind_Map { + return ld.ErrWrongKind{TypeName: "schemadmt.EnumRepresentation.Repr", MethodName: "AssignNode", AppropriateKind: ld.KindSet_JustMap, ActualKind: v.Kind()} } itr := v.MapIterator() for !itr.Done() { @@ -2057,7 +2057,7 @@ func (na *_EnumRepresentation__ReprAssembler) AssignNode(v dms3ld.Node) error { } return na.Finish() } -func (_EnumRepresentation__ReprAssembler) Prototype() dms3ld.NodePrototype { +func (_EnumRepresentation__ReprAssembler) Prototype() ld.NodePrototype { return _EnumRepresentation__ReprPrototype{} } func (ma *_EnumRepresentation__ReprAssembler) valueFinishTidy() bool { @@ -2069,7 +2069,7 @@ func (ma *_EnumRepresentation__ReprAssembler) valueFinishTidy() bool { return false } } -func (ma *_EnumRepresentation__ReprAssembler) AssembleEntry(k string) (dms3ld.NodeAssembler, error) { +func (ma *_EnumRepresentation__ReprAssembler) AssembleEntry(k string) (ld.NodeAssembler, error) { switch ma.state { case maState_initial: // carry on @@ -2103,9 +2103,9 @@ func (ma *_EnumRepresentation__ReprAssembler) AssembleEntry(k string) (dms3ld.No ma.ca2.m = &ma.cm return &ma.ca2, nil } - return nil, dms3ld.ErrInvalidKey{TypeName: "schemadmt.EnumRepresentation.Repr", Key: &_String{k}} + return nil, ld.ErrInvalidKey{TypeName: "schemadmt.EnumRepresentation.Repr", Key: &_String{k}} } -func (ma *_EnumRepresentation__ReprAssembler) AssembleKey() dms3ld.NodeAssembler { +func (ma *_EnumRepresentation__ReprAssembler) AssembleKey() ld.NodeAssembler { switch ma.state { case maState_initial: // carry on @@ -2123,7 +2123,7 @@ func (ma *_EnumRepresentation__ReprAssembler) AssembleKey() dms3ld.NodeAssembler ma.state = maState_midKey return (*_EnumRepresentation__ReprKeyAssembler)(ma) } -func (ma *_EnumRepresentation__ReprAssembler) AssembleValue() dms3ld.NodeAssembler { +func (ma *_EnumRepresentation__ReprAssembler) AssembleValue() ld.NodeAssembler { switch ma.state { case maState_initial: panic("invalid state: AssembleValue cannot be called when no key is primed") @@ -2172,10 +2172,10 @@ func (ma *_EnumRepresentation__ReprAssembler) Finish() error { *ma.m = schema.Maybe_Value return nil } -func (ma *_EnumRepresentation__ReprAssembler) KeyPrototype() dms3ld.NodePrototype { +func (ma *_EnumRepresentation__ReprAssembler) KeyPrototype() ld.NodePrototype { return _String__Prototype{} } -func (ma *_EnumRepresentation__ReprAssembler) ValuePrototype(k string) dms3ld.NodePrototype { +func (ma *_EnumRepresentation__ReprAssembler) ValuePrototype(k string) ld.NodePrototype { switch k { case "EnumRepresentation_String": return _EnumRepresentation_String__ReprPrototype{} @@ -2188,10 +2188,10 @@ func (ma *_EnumRepresentation__ReprAssembler) ValuePrototype(k string) dms3ld.No type _EnumRepresentation__ReprKeyAssembler _EnumRepresentation__ReprAssembler -func (_EnumRepresentation__ReprKeyAssembler) BeginMap(sizeHint int64) (dms3ld.MapAssembler, error) { +func (_EnumRepresentation__ReprKeyAssembler) BeginMap(sizeHint int64) (ld.MapAssembler, error) { return mixins.StringAssembler{TypeName: "schemadmt.EnumRepresentation.Repr.KeyAssembler"}.BeginMap(0) } -func (_EnumRepresentation__ReprKeyAssembler) BeginList(sizeHint int64) (dms3ld.ListAssembler, error) { +func (_EnumRepresentation__ReprKeyAssembler) BeginList(sizeHint int64) (ld.ListAssembler, error) { return mixins.StringAssembler{TypeName: "schemadmt.EnumRepresentation.Repr.KeyAssembler"}.BeginList(0) } func (na *_EnumRepresentation__ReprKeyAssembler) AssignNull() error { @@ -2225,22 +2225,22 @@ func (ka *_EnumRepresentation__ReprKeyAssembler) AssignString(k string) error { ka.state = maState_expectValue return nil } - return dms3ld.ErrInvalidKey{TypeName: "schemadmt.EnumRepresentation.Repr", Key: &_String{k}} // TODO: error quality: ErrInvalidUnionDiscriminant ? + return ld.ErrInvalidKey{TypeName: "schemadmt.EnumRepresentation.Repr", Key: &_String{k}} // TODO: error quality: ErrInvalidUnionDiscriminant ? } func (_EnumRepresentation__ReprKeyAssembler) AssignBytes([]byte) error { return mixins.StringAssembler{TypeName: "schemadmt.EnumRepresentation.Repr.KeyAssembler"}.AssignBytes(nil) } -func (_EnumRepresentation__ReprKeyAssembler) AssignLink(dms3ld.Link) error { +func (_EnumRepresentation__ReprKeyAssembler) AssignLink(ld.Link) error { return mixins.StringAssembler{TypeName: "schemadmt.EnumRepresentation.Repr.KeyAssembler"}.AssignLink(nil) } -func (ka *_EnumRepresentation__ReprKeyAssembler) AssignNode(v dms3ld.Node) error { +func (ka *_EnumRepresentation__ReprKeyAssembler) AssignNode(v ld.Node) error { if v2, err := v.AsString(); err != nil { return err } else { return ka.AssignString(v2) } } -func (_EnumRepresentation__ReprKeyAssembler) Prototype() dms3ld.NodePrototype { +func (_EnumRepresentation__ReprKeyAssembler) Prototype() ld.NodePrototype { return _String__Prototype{} } @@ -2302,12 +2302,12 @@ func (m MaybeEnumRepresentation_Int) IsAbsent() bool { func (m MaybeEnumRepresentation_Int) Exists() bool { return m.m == schema.Maybe_Value } -func (m MaybeEnumRepresentation_Int) AsNode() dms3ld.Node { +func (m MaybeEnumRepresentation_Int) AsNode() ld.Node { switch m.m { case schema.Maybe_Absent: - return dms3ld.Absent + return ld.Absent case schema.Maybe_Null: - return dms3ld.Null + return ld.Null case schema.Maybe_Value: return &m.v default: @@ -2321,42 +2321,42 @@ func (m MaybeEnumRepresentation_Int) Must() EnumRepresentation_Int { return &m.v } -var _ dms3ld.Node = (EnumRepresentation_Int)(&_EnumRepresentation_Int{}) +var _ ld.Node = (EnumRepresentation_Int)(&_EnumRepresentation_Int{}) var _ schema.TypedNode = (EnumRepresentation_Int)(&_EnumRepresentation_Int{}) -func (EnumRepresentation_Int) Kind() dms3ld.Kind { - return dms3ld.Kind_Map +func (EnumRepresentation_Int) Kind() ld.Kind { + return ld.Kind_Map } -func (n EnumRepresentation_Int) LookupByString(k string) (dms3ld.Node, error) { +func (n EnumRepresentation_Int) LookupByString(k string) (ld.Node, error) { var k2 _EnumValue if err := (_EnumValue__Prototype{}).fromString(&k2, k); err != nil { return nil, err // TODO wrap in some kind of ErrInvalidKey } v, exists := n.m[k2] if !exists { - return nil, dms3ld.ErrNotExists{Segment: dms3ld.PathSegmentOfString(k)} + return nil, ld.ErrNotExists{Segment: ld.PathSegmentOfString(k)} } return v, nil } -func (n EnumRepresentation_Int) LookupByNode(k dms3ld.Node) (dms3ld.Node, error) { +func (n EnumRepresentation_Int) LookupByNode(k ld.Node) (ld.Node, error) { k2, ok := k.(EnumValue) if !ok { panic("todo invalid key type error") - // 'dms3ld.ErrInvalidKey{TypeName:"schemadmt.EnumRepresentation_Int", Key:&_String{k}}' doesn't quite cut it: need room to explain the type, and it's not guaranteed k can be turned into a string at all + // 'ld.ErrInvalidKey{TypeName:"schemadmt.EnumRepresentation_Int", Key:&_String{k}}' doesn't quite cut it: need room to explain the type, and it's not guaranteed k can be turned into a string at all } v, exists := n.m[*k2] if !exists { - return nil, dms3ld.ErrNotExists{Segment: dms3ld.PathSegmentOfString(k2.String())} + return nil, ld.ErrNotExists{Segment: ld.PathSegmentOfString(k2.String())} } return v, nil } -func (EnumRepresentation_Int) LookupByIndex(idx int64) (dms3ld.Node, error) { +func (EnumRepresentation_Int) LookupByIndex(idx int64) (ld.Node, error) { return mixins.Map{TypeName: "schemadmt.EnumRepresentation_Int"}.LookupByIndex(0) } -func (n EnumRepresentation_Int) LookupBySegment(seg dms3ld.PathSegment) (dms3ld.Node, error) { +func (n EnumRepresentation_Int) LookupBySegment(seg ld.PathSegment) (ld.Node, error) { return n.LookupByString(seg.String()) } -func (n EnumRepresentation_Int) MapIterator() dms3ld.MapIterator { +func (n EnumRepresentation_Int) MapIterator() ld.MapIterator { return &_EnumRepresentation_Int__MapItr{n, 0} } @@ -2365,9 +2365,9 @@ type _EnumRepresentation_Int__MapItr struct { idx int } -func (itr *_EnumRepresentation_Int__MapItr) Next() (k dms3ld.Node, v dms3ld.Node, _ error) { +func (itr *_EnumRepresentation_Int__MapItr) Next() (k ld.Node, v ld.Node, _ error) { if itr.idx >= len(itr.n.t) { - return nil, nil, dms3ld.ErrIteratorOverread{} + return nil, nil, ld.ErrIteratorOverread{} } x := &itr.n.t[itr.idx] k = &x.k @@ -2379,7 +2379,7 @@ func (itr *_EnumRepresentation_Int__MapItr) Done() bool { return itr.idx >= len(itr.n.t) } -func (EnumRepresentation_Int) ListIterator() dms3ld.ListIterator { +func (EnumRepresentation_Int) ListIterator() ld.ListIterator { return nil } func (n EnumRepresentation_Int) Length() int64 { @@ -2406,16 +2406,16 @@ func (EnumRepresentation_Int) AsString() (string, error) { func (EnumRepresentation_Int) AsBytes() ([]byte, error) { return mixins.Map{TypeName: "schemadmt.EnumRepresentation_Int"}.AsBytes() } -func (EnumRepresentation_Int) AsLink() (dms3ld.Link, error) { +func (EnumRepresentation_Int) AsLink() (ld.Link, error) { return mixins.Map{TypeName: "schemadmt.EnumRepresentation_Int"}.AsLink() } -func (EnumRepresentation_Int) Prototype() dms3ld.NodePrototype { +func (EnumRepresentation_Int) Prototype() ld.NodePrototype { return _EnumRepresentation_Int__Prototype{} } type _EnumRepresentation_Int__Prototype struct{} -func (_EnumRepresentation_Int__Prototype) NewBuilder() dms3ld.NodeBuilder { +func (_EnumRepresentation_Int__Prototype) NewBuilder() ld.NodeBuilder { var nb _EnumRepresentation_Int__Builder nb.Reset() return &nb @@ -2425,7 +2425,7 @@ type _EnumRepresentation_Int__Builder struct { _EnumRepresentation_Int__Assembler } -func (nb *_EnumRepresentation_Int__Builder) Build() dms3ld.Node { +func (nb *_EnumRepresentation_Int__Builder) Build() ld.Node { if *nb.m != schema.Maybe_Value { panic("invalid state: cannot call Build on an assembler that's not finished") } @@ -2452,7 +2452,7 @@ func (na *_EnumRepresentation_Int__Assembler) reset() { na.ka.reset() na.va.reset() } -func (na *_EnumRepresentation_Int__Assembler) BeginMap(sizeHint int64) (dms3ld.MapAssembler, error) { +func (na *_EnumRepresentation_Int__Assembler) BeginMap(sizeHint int64) (ld.MapAssembler, error) { switch *na.m { case schema.Maybe_Value, schema.Maybe_Null: panic("invalid state: cannot assign into assembler that's already finished") @@ -2467,7 +2467,7 @@ func (na *_EnumRepresentation_Int__Assembler) BeginMap(sizeHint int64) (dms3ld.M na.w.t = make([]_EnumRepresentation_Int__entry, 0, sizeHint) return na, nil } -func (_EnumRepresentation_Int__Assembler) BeginList(sizeHint int64) (dms3ld.ListAssembler, error) { +func (_EnumRepresentation_Int__Assembler) BeginList(sizeHint int64) (ld.ListAssembler, error) { return mixins.MapAssembler{TypeName: "schemadmt.EnumRepresentation_Int"}.BeginList(0) } func (na *_EnumRepresentation_Int__Assembler) AssignNull() error { @@ -2499,10 +2499,10 @@ func (_EnumRepresentation_Int__Assembler) AssignString(string) error { func (_EnumRepresentation_Int__Assembler) AssignBytes([]byte) error { return mixins.MapAssembler{TypeName: "schemadmt.EnumRepresentation_Int"}.AssignBytes(nil) } -func (_EnumRepresentation_Int__Assembler) AssignLink(dms3ld.Link) error { +func (_EnumRepresentation_Int__Assembler) AssignLink(ld.Link) error { return mixins.MapAssembler{TypeName: "schemadmt.EnumRepresentation_Int"}.AssignLink(nil) } -func (na *_EnumRepresentation_Int__Assembler) AssignNode(v dms3ld.Node) error { +func (na *_EnumRepresentation_Int__Assembler) AssignNode(v ld.Node) error { if v.IsNull() { return na.AssignNull() } @@ -2517,8 +2517,8 @@ func (na *_EnumRepresentation_Int__Assembler) AssignNode(v dms3ld.Node) error { *na.m = schema.Maybe_Value return nil } - if v.Kind() != dms3ld.Kind_Map { - return dms3ld.ErrWrongKind{TypeName: "schemadmt.EnumRepresentation_Int", MethodName: "AssignNode", AppropriateKind: dms3ld.KindSet_JustMap, ActualKind: v.Kind()} + if v.Kind() != ld.Kind_Map { + return ld.ErrWrongKind{TypeName: "schemadmt.EnumRepresentation_Int", MethodName: "AssignNode", AppropriateKind: ld.KindSet_JustMap, ActualKind: v.Kind()} } itr := v.MapIterator() for !itr.Done() { @@ -2535,7 +2535,7 @@ func (na *_EnumRepresentation_Int__Assembler) AssignNode(v dms3ld.Node) error { } return na.Finish() } -func (_EnumRepresentation_Int__Assembler) Prototype() dms3ld.NodePrototype { +func (_EnumRepresentation_Int__Assembler) Prototype() ld.NodePrototype { return _EnumRepresentation_Int__Prototype{} } func (ma *_EnumRepresentation_Int__Assembler) keyFinishTidy() bool { @@ -2566,7 +2566,7 @@ func (ma *_EnumRepresentation_Int__Assembler) valueFinishTidy() bool { return false } } -func (ma *_EnumRepresentation_Int__Assembler) AssembleEntry(k string) (dms3ld.NodeAssembler, error) { +func (ma *_EnumRepresentation_Int__Assembler) AssembleEntry(k string) (ld.NodeAssembler, error) { switch ma.state { case maState_initial: // carry on @@ -2587,7 +2587,7 @@ func (ma *_EnumRepresentation_Int__Assembler) AssembleEntry(k string) (dms3ld.No return nil, err // TODO wrap in some kind of ErrInvalidKey } if _, exists := ma.w.m[k2]; exists { - return nil, dms3ld.ErrRepeatedMapKey{Key: &k2} + return nil, ld.ErrRepeatedMapKey{Key: &k2} } ma.w.t = append(ma.w.t, _EnumRepresentation_Int__entry{k: k2}) tz := &ma.w.t[len(ma.w.t)-1] @@ -2598,7 +2598,7 @@ func (ma *_EnumRepresentation_Int__Assembler) AssembleEntry(k string) (dms3ld.No ma.va.m = &ma.cm return &ma.va, nil } -func (ma *_EnumRepresentation_Int__Assembler) AssembleKey() dms3ld.NodeAssembler { +func (ma *_EnumRepresentation_Int__Assembler) AssembleKey() ld.NodeAssembler { switch ma.state { case maState_initial: // carry on @@ -2619,7 +2619,7 @@ func (ma *_EnumRepresentation_Int__Assembler) AssembleKey() dms3ld.NodeAssembler ma.ka.w = &ma.w.t[len(ma.w.t)-1].k return &ma.ka } -func (ma *_EnumRepresentation_Int__Assembler) AssembleValue() dms3ld.NodeAssembler { +func (ma *_EnumRepresentation_Int__Assembler) AssembleValue() ld.NodeAssembler { switch ma.state { case maState_initial: panic("invalid state: AssembleValue cannot be called when no key is primed") @@ -2656,55 +2656,55 @@ func (ma *_EnumRepresentation_Int__Assembler) Finish() error { *ma.m = schema.Maybe_Value return nil } -func (ma *_EnumRepresentation_Int__Assembler) KeyPrototype() dms3ld.NodePrototype { +func (ma *_EnumRepresentation_Int__Assembler) KeyPrototype() ld.NodePrototype { return _EnumValue__Prototype{} } -func (ma *_EnumRepresentation_Int__Assembler) ValuePrototype(_ string) dms3ld.NodePrototype { +func (ma *_EnumRepresentation_Int__Assembler) ValuePrototype(_ string) ld.NodePrototype { return _Int__Prototype{} } func (EnumRepresentation_Int) Type() schema.Type { return nil /*TODO:typelit*/ } -func (n EnumRepresentation_Int) Representation() dms3ld.Node { +func (n EnumRepresentation_Int) Representation() ld.Node { return (*_EnumRepresentation_Int__Repr)(n) } type _EnumRepresentation_Int__Repr _EnumRepresentation_Int -var _ dms3ld.Node = &_EnumRepresentation_Int__Repr{} +var _ ld.Node = &_EnumRepresentation_Int__Repr{} -func (_EnumRepresentation_Int__Repr) Kind() dms3ld.Kind { - return dms3ld.Kind_Map +func (_EnumRepresentation_Int__Repr) Kind() ld.Kind { + return ld.Kind_Map } -func (nr *_EnumRepresentation_Int__Repr) LookupByString(k string) (dms3ld.Node, error) { +func (nr *_EnumRepresentation_Int__Repr) LookupByString(k string) (ld.Node, error) { v, err := (EnumRepresentation_Int)(nr).LookupByString(k) - if err != nil || v == dms3ld.Null { + if err != nil || v == ld.Null { return v, err } return v.(Int).Representation(), nil } -func (nr *_EnumRepresentation_Int__Repr) LookupByNode(k dms3ld.Node) (dms3ld.Node, error) { +func (nr *_EnumRepresentation_Int__Repr) LookupByNode(k ld.Node) (ld.Node, error) { v, err := (EnumRepresentation_Int)(nr).LookupByNode(k) - if err != nil || v == dms3ld.Null { + if err != nil || v == ld.Null { return v, err } return v.(Int).Representation(), nil } -func (_EnumRepresentation_Int__Repr) LookupByIndex(idx int64) (dms3ld.Node, error) { +func (_EnumRepresentation_Int__Repr) LookupByIndex(idx int64) (ld.Node, error) { return mixins.Map{TypeName: "schemadmt.EnumRepresentation_Int.Repr"}.LookupByIndex(0) } -func (n _EnumRepresentation_Int__Repr) LookupBySegment(seg dms3ld.PathSegment) (dms3ld.Node, error) { +func (n _EnumRepresentation_Int__Repr) LookupBySegment(seg ld.PathSegment) (ld.Node, error) { return n.LookupByString(seg.String()) } -func (nr *_EnumRepresentation_Int__Repr) MapIterator() dms3ld.MapIterator { +func (nr *_EnumRepresentation_Int__Repr) MapIterator() ld.MapIterator { return &_EnumRepresentation_Int__ReprMapItr{(EnumRepresentation_Int)(nr), 0} } type _EnumRepresentation_Int__ReprMapItr _EnumRepresentation_Int__MapItr -func (itr *_EnumRepresentation_Int__ReprMapItr) Next() (k dms3ld.Node, v dms3ld.Node, err error) { +func (itr *_EnumRepresentation_Int__ReprMapItr) Next() (k ld.Node, v ld.Node, err error) { k, v, err = (*_EnumRepresentation_Int__MapItr)(itr).Next() - if err != nil || v == dms3ld.Null { + if err != nil || v == ld.Null { return } return k, v.(Int).Representation(), nil @@ -2713,7 +2713,7 @@ func (itr *_EnumRepresentation_Int__ReprMapItr) Done() bool { return (*_EnumRepresentation_Int__MapItr)(itr).Done() } -func (_EnumRepresentation_Int__Repr) ListIterator() dms3ld.ListIterator { +func (_EnumRepresentation_Int__Repr) ListIterator() ld.ListIterator { return nil } func (rn *_EnumRepresentation_Int__Repr) Length() int64 { @@ -2740,16 +2740,16 @@ func (_EnumRepresentation_Int__Repr) AsString() (string, error) { func (_EnumRepresentation_Int__Repr) AsBytes() ([]byte, error) { return mixins.Map{TypeName: "schemadmt.EnumRepresentation_Int.Repr"}.AsBytes() } -func (_EnumRepresentation_Int__Repr) AsLink() (dms3ld.Link, error) { +func (_EnumRepresentation_Int__Repr) AsLink() (ld.Link, error) { return mixins.Map{TypeName: "schemadmt.EnumRepresentation_Int.Repr"}.AsLink() } -func (_EnumRepresentation_Int__Repr) Prototype() dms3ld.NodePrototype { +func (_EnumRepresentation_Int__Repr) Prototype() ld.NodePrototype { return _EnumRepresentation_Int__ReprPrototype{} } type _EnumRepresentation_Int__ReprPrototype struct{} -func (_EnumRepresentation_Int__ReprPrototype) NewBuilder() dms3ld.NodeBuilder { +func (_EnumRepresentation_Int__ReprPrototype) NewBuilder() ld.NodeBuilder { var nb _EnumRepresentation_Int__ReprBuilder nb.Reset() return &nb @@ -2759,7 +2759,7 @@ type _EnumRepresentation_Int__ReprBuilder struct { _EnumRepresentation_Int__ReprAssembler } -func (nb *_EnumRepresentation_Int__ReprBuilder) Build() dms3ld.Node { +func (nb *_EnumRepresentation_Int__ReprBuilder) Build() ld.Node { if *nb.m != schema.Maybe_Value { panic("invalid state: cannot call Build on an assembler that's not finished") } @@ -2786,7 +2786,7 @@ func (na *_EnumRepresentation_Int__ReprAssembler) reset() { na.ka.reset() na.va.reset() } -func (na *_EnumRepresentation_Int__ReprAssembler) BeginMap(sizeHint int64) (dms3ld.MapAssembler, error) { +func (na *_EnumRepresentation_Int__ReprAssembler) BeginMap(sizeHint int64) (ld.MapAssembler, error) { switch *na.m { case schema.Maybe_Value, schema.Maybe_Null: panic("invalid state: cannot assign into assembler that's already finished") @@ -2801,7 +2801,7 @@ func (na *_EnumRepresentation_Int__ReprAssembler) BeginMap(sizeHint int64) (dms3 na.w.t = make([]_EnumRepresentation_Int__entry, 0, sizeHint) return na, nil } -func (_EnumRepresentation_Int__ReprAssembler) BeginList(sizeHint int64) (dms3ld.ListAssembler, error) { +func (_EnumRepresentation_Int__ReprAssembler) BeginList(sizeHint int64) (ld.ListAssembler, error) { return mixins.MapAssembler{TypeName: "schemadmt.EnumRepresentation_Int.Repr"}.BeginList(0) } func (na *_EnumRepresentation_Int__ReprAssembler) AssignNull() error { @@ -2833,10 +2833,10 @@ func (_EnumRepresentation_Int__ReprAssembler) AssignString(string) error { func (_EnumRepresentation_Int__ReprAssembler) AssignBytes([]byte) error { return mixins.MapAssembler{TypeName: "schemadmt.EnumRepresentation_Int.Repr"}.AssignBytes(nil) } -func (_EnumRepresentation_Int__ReprAssembler) AssignLink(dms3ld.Link) error { +func (_EnumRepresentation_Int__ReprAssembler) AssignLink(ld.Link) error { return mixins.MapAssembler{TypeName: "schemadmt.EnumRepresentation_Int.Repr"}.AssignLink(nil) } -func (na *_EnumRepresentation_Int__ReprAssembler) AssignNode(v dms3ld.Node) error { +func (na *_EnumRepresentation_Int__ReprAssembler) AssignNode(v ld.Node) error { if v.IsNull() { return na.AssignNull() } @@ -2851,8 +2851,8 @@ func (na *_EnumRepresentation_Int__ReprAssembler) AssignNode(v dms3ld.Node) erro *na.m = schema.Maybe_Value return nil } - if v.Kind() != dms3ld.Kind_Map { - return dms3ld.ErrWrongKind{TypeName: "schemadmt.EnumRepresentation_Int.Repr", MethodName: "AssignNode", AppropriateKind: dms3ld.KindSet_JustMap, ActualKind: v.Kind()} + if v.Kind() != ld.Kind_Map { + return ld.ErrWrongKind{TypeName: "schemadmt.EnumRepresentation_Int.Repr", MethodName: "AssignNode", AppropriateKind: ld.KindSet_JustMap, ActualKind: v.Kind()} } itr := v.MapIterator() for !itr.Done() { @@ -2869,7 +2869,7 @@ func (na *_EnumRepresentation_Int__ReprAssembler) AssignNode(v dms3ld.Node) erro } return na.Finish() } -func (_EnumRepresentation_Int__ReprAssembler) Prototype() dms3ld.NodePrototype { +func (_EnumRepresentation_Int__ReprAssembler) Prototype() ld.NodePrototype { return _EnumRepresentation_Int__ReprPrototype{} } func (ma *_EnumRepresentation_Int__ReprAssembler) keyFinishTidy() bool { @@ -2900,7 +2900,7 @@ func (ma *_EnumRepresentation_Int__ReprAssembler) valueFinishTidy() bool { return false } } -func (ma *_EnumRepresentation_Int__ReprAssembler) AssembleEntry(k string) (dms3ld.NodeAssembler, error) { +func (ma *_EnumRepresentation_Int__ReprAssembler) AssembleEntry(k string) (ld.NodeAssembler, error) { switch ma.state { case maState_initial: // carry on @@ -2921,7 +2921,7 @@ func (ma *_EnumRepresentation_Int__ReprAssembler) AssembleEntry(k string) (dms3l return nil, err // TODO wrap in some kind of ErrInvalidKey } if _, exists := ma.w.m[k2]; exists { - return nil, dms3ld.ErrRepeatedMapKey{Key: &k2} + return nil, ld.ErrRepeatedMapKey{Key: &k2} } ma.w.t = append(ma.w.t, _EnumRepresentation_Int__entry{k: k2}) tz := &ma.w.t[len(ma.w.t)-1] @@ -2932,7 +2932,7 @@ func (ma *_EnumRepresentation_Int__ReprAssembler) AssembleEntry(k string) (dms3l ma.va.m = &ma.cm return &ma.va, nil } -func (ma *_EnumRepresentation_Int__ReprAssembler) AssembleKey() dms3ld.NodeAssembler { +func (ma *_EnumRepresentation_Int__ReprAssembler) AssembleKey() ld.NodeAssembler { switch ma.state { case maState_initial: // carry on @@ -2953,7 +2953,7 @@ func (ma *_EnumRepresentation_Int__ReprAssembler) AssembleKey() dms3ld.NodeAssem ma.ka.w = &ma.w.t[len(ma.w.t)-1].k return &ma.ka } -func (ma *_EnumRepresentation_Int__ReprAssembler) AssembleValue() dms3ld.NodeAssembler { +func (ma *_EnumRepresentation_Int__ReprAssembler) AssembleValue() ld.NodeAssembler { switch ma.state { case maState_initial: panic("invalid state: AssembleValue cannot be called when no key is primed") @@ -2990,10 +2990,10 @@ func (ma *_EnumRepresentation_Int__ReprAssembler) Finish() error { *ma.m = schema.Maybe_Value return nil } -func (ma *_EnumRepresentation_Int__ReprAssembler) KeyPrototype() dms3ld.NodePrototype { +func (ma *_EnumRepresentation_Int__ReprAssembler) KeyPrototype() ld.NodePrototype { return _EnumValue__ReprPrototype{} } -func (ma *_EnumRepresentation_Int__ReprAssembler) ValuePrototype(_ string) dms3ld.NodePrototype { +func (ma *_EnumRepresentation_Int__ReprAssembler) ValuePrototype(_ string) ld.NodePrototype { return _Int__ReprPrototype{} } @@ -3055,12 +3055,12 @@ func (m MaybeEnumRepresentation_String) IsAbsent() bool { func (m MaybeEnumRepresentation_String) Exists() bool { return m.m == schema.Maybe_Value } -func (m MaybeEnumRepresentation_String) AsNode() dms3ld.Node { +func (m MaybeEnumRepresentation_String) AsNode() ld.Node { switch m.m { case schema.Maybe_Absent: - return dms3ld.Absent + return ld.Absent case schema.Maybe_Null: - return dms3ld.Null + return ld.Null case schema.Maybe_Value: return &m.v default: @@ -3074,42 +3074,42 @@ func (m MaybeEnumRepresentation_String) Must() EnumRepresentation_String { return &m.v } -var _ dms3ld.Node = (EnumRepresentation_String)(&_EnumRepresentation_String{}) +var _ ld.Node = (EnumRepresentation_String)(&_EnumRepresentation_String{}) var _ schema.TypedNode = (EnumRepresentation_String)(&_EnumRepresentation_String{}) -func (EnumRepresentation_String) Kind() dms3ld.Kind { - return dms3ld.Kind_Map +func (EnumRepresentation_String) Kind() ld.Kind { + return ld.Kind_Map } -func (n EnumRepresentation_String) LookupByString(k string) (dms3ld.Node, error) { +func (n EnumRepresentation_String) LookupByString(k string) (ld.Node, error) { var k2 _EnumValue if err := (_EnumValue__Prototype{}).fromString(&k2, k); err != nil { return nil, err // TODO wrap in some kind of ErrInvalidKey } v, exists := n.m[k2] if !exists { - return nil, dms3ld.ErrNotExists{Segment: dms3ld.PathSegmentOfString(k)} + return nil, ld.ErrNotExists{Segment: ld.PathSegmentOfString(k)} } return v, nil } -func (n EnumRepresentation_String) LookupByNode(k dms3ld.Node) (dms3ld.Node, error) { +func (n EnumRepresentation_String) LookupByNode(k ld.Node) (ld.Node, error) { k2, ok := k.(EnumValue) if !ok { panic("todo invalid key type error") - // 'dms3ld.ErrInvalidKey{TypeName:"schemadmt.EnumRepresentation_String", Key:&_String{k}}' doesn't quite cut it: need room to explain the type, and it's not guaranteed k can be turned into a string at all + // 'ld.ErrInvalidKey{TypeName:"schemadmt.EnumRepresentation_String", Key:&_String{k}}' doesn't quite cut it: need room to explain the type, and it's not guaranteed k can be turned into a string at all } v, exists := n.m[*k2] if !exists { - return nil, dms3ld.ErrNotExists{Segment: dms3ld.PathSegmentOfString(k2.String())} + return nil, ld.ErrNotExists{Segment: ld.PathSegmentOfString(k2.String())} } return v, nil } -func (EnumRepresentation_String) LookupByIndex(idx int64) (dms3ld.Node, error) { +func (EnumRepresentation_String) LookupByIndex(idx int64) (ld.Node, error) { return mixins.Map{TypeName: "schemadmt.EnumRepresentation_String"}.LookupByIndex(0) } -func (n EnumRepresentation_String) LookupBySegment(seg dms3ld.PathSegment) (dms3ld.Node, error) { +func (n EnumRepresentation_String) LookupBySegment(seg ld.PathSegment) (ld.Node, error) { return n.LookupByString(seg.String()) } -func (n EnumRepresentation_String) MapIterator() dms3ld.MapIterator { +func (n EnumRepresentation_String) MapIterator() ld.MapIterator { return &_EnumRepresentation_String__MapItr{n, 0} } @@ -3118,9 +3118,9 @@ type _EnumRepresentation_String__MapItr struct { idx int } -func (itr *_EnumRepresentation_String__MapItr) Next() (k dms3ld.Node, v dms3ld.Node, _ error) { +func (itr *_EnumRepresentation_String__MapItr) Next() (k ld.Node, v ld.Node, _ error) { if itr.idx >= len(itr.n.t) { - return nil, nil, dms3ld.ErrIteratorOverread{} + return nil, nil, ld.ErrIteratorOverread{} } x := &itr.n.t[itr.idx] k = &x.k @@ -3132,7 +3132,7 @@ func (itr *_EnumRepresentation_String__MapItr) Done() bool { return itr.idx >= len(itr.n.t) } -func (EnumRepresentation_String) ListIterator() dms3ld.ListIterator { +func (EnumRepresentation_String) ListIterator() ld.ListIterator { return nil } func (n EnumRepresentation_String) Length() int64 { @@ -3159,16 +3159,16 @@ func (EnumRepresentation_String) AsString() (string, error) { func (EnumRepresentation_String) AsBytes() ([]byte, error) { return mixins.Map{TypeName: "schemadmt.EnumRepresentation_String"}.AsBytes() } -func (EnumRepresentation_String) AsLink() (dms3ld.Link, error) { +func (EnumRepresentation_String) AsLink() (ld.Link, error) { return mixins.Map{TypeName: "schemadmt.EnumRepresentation_String"}.AsLink() } -func (EnumRepresentation_String) Prototype() dms3ld.NodePrototype { +func (EnumRepresentation_String) Prototype() ld.NodePrototype { return _EnumRepresentation_String__Prototype{} } type _EnumRepresentation_String__Prototype struct{} -func (_EnumRepresentation_String__Prototype) NewBuilder() dms3ld.NodeBuilder { +func (_EnumRepresentation_String__Prototype) NewBuilder() ld.NodeBuilder { var nb _EnumRepresentation_String__Builder nb.Reset() return &nb @@ -3178,7 +3178,7 @@ type _EnumRepresentation_String__Builder struct { _EnumRepresentation_String__Assembler } -func (nb *_EnumRepresentation_String__Builder) Build() dms3ld.Node { +func (nb *_EnumRepresentation_String__Builder) Build() ld.Node { if *nb.m != schema.Maybe_Value { panic("invalid state: cannot call Build on an assembler that's not finished") } @@ -3205,7 +3205,7 @@ func (na *_EnumRepresentation_String__Assembler) reset() { na.ka.reset() na.va.reset() } -func (na *_EnumRepresentation_String__Assembler) BeginMap(sizeHint int64) (dms3ld.MapAssembler, error) { +func (na *_EnumRepresentation_String__Assembler) BeginMap(sizeHint int64) (ld.MapAssembler, error) { switch *na.m { case schema.Maybe_Value, schema.Maybe_Null: panic("invalid state: cannot assign into assembler that's already finished") @@ -3220,7 +3220,7 @@ func (na *_EnumRepresentation_String__Assembler) BeginMap(sizeHint int64) (dms3l na.w.t = make([]_EnumRepresentation_String__entry, 0, sizeHint) return na, nil } -func (_EnumRepresentation_String__Assembler) BeginList(sizeHint int64) (dms3ld.ListAssembler, error) { +func (_EnumRepresentation_String__Assembler) BeginList(sizeHint int64) (ld.ListAssembler, error) { return mixins.MapAssembler{TypeName: "schemadmt.EnumRepresentation_String"}.BeginList(0) } func (na *_EnumRepresentation_String__Assembler) AssignNull() error { @@ -3252,10 +3252,10 @@ func (_EnumRepresentation_String__Assembler) AssignString(string) error { func (_EnumRepresentation_String__Assembler) AssignBytes([]byte) error { return mixins.MapAssembler{TypeName: "schemadmt.EnumRepresentation_String"}.AssignBytes(nil) } -func (_EnumRepresentation_String__Assembler) AssignLink(dms3ld.Link) error { +func (_EnumRepresentation_String__Assembler) AssignLink(ld.Link) error { return mixins.MapAssembler{TypeName: "schemadmt.EnumRepresentation_String"}.AssignLink(nil) } -func (na *_EnumRepresentation_String__Assembler) AssignNode(v dms3ld.Node) error { +func (na *_EnumRepresentation_String__Assembler) AssignNode(v ld.Node) error { if v.IsNull() { return na.AssignNull() } @@ -3270,8 +3270,8 @@ func (na *_EnumRepresentation_String__Assembler) AssignNode(v dms3ld.Node) error *na.m = schema.Maybe_Value return nil } - if v.Kind() != dms3ld.Kind_Map { - return dms3ld.ErrWrongKind{TypeName: "schemadmt.EnumRepresentation_String", MethodName: "AssignNode", AppropriateKind: dms3ld.KindSet_JustMap, ActualKind: v.Kind()} + if v.Kind() != ld.Kind_Map { + return ld.ErrWrongKind{TypeName: "schemadmt.EnumRepresentation_String", MethodName: "AssignNode", AppropriateKind: ld.KindSet_JustMap, ActualKind: v.Kind()} } itr := v.MapIterator() for !itr.Done() { @@ -3288,7 +3288,7 @@ func (na *_EnumRepresentation_String__Assembler) AssignNode(v dms3ld.Node) error } return na.Finish() } -func (_EnumRepresentation_String__Assembler) Prototype() dms3ld.NodePrototype { +func (_EnumRepresentation_String__Assembler) Prototype() ld.NodePrototype { return _EnumRepresentation_String__Prototype{} } func (ma *_EnumRepresentation_String__Assembler) keyFinishTidy() bool { @@ -3319,7 +3319,7 @@ func (ma *_EnumRepresentation_String__Assembler) valueFinishTidy() bool { return false } } -func (ma *_EnumRepresentation_String__Assembler) AssembleEntry(k string) (dms3ld.NodeAssembler, error) { +func (ma *_EnumRepresentation_String__Assembler) AssembleEntry(k string) (ld.NodeAssembler, error) { switch ma.state { case maState_initial: // carry on @@ -3340,7 +3340,7 @@ func (ma *_EnumRepresentation_String__Assembler) AssembleEntry(k string) (dms3ld return nil, err // TODO wrap in some kind of ErrInvalidKey } if _, exists := ma.w.m[k2]; exists { - return nil, dms3ld.ErrRepeatedMapKey{Key: &k2} + return nil, ld.ErrRepeatedMapKey{Key: &k2} } ma.w.t = append(ma.w.t, _EnumRepresentation_String__entry{k: k2}) tz := &ma.w.t[len(ma.w.t)-1] @@ -3351,7 +3351,7 @@ func (ma *_EnumRepresentation_String__Assembler) AssembleEntry(k string) (dms3ld ma.va.m = &ma.cm return &ma.va, nil } -func (ma *_EnumRepresentation_String__Assembler) AssembleKey() dms3ld.NodeAssembler { +func (ma *_EnumRepresentation_String__Assembler) AssembleKey() ld.NodeAssembler { switch ma.state { case maState_initial: // carry on @@ -3372,7 +3372,7 @@ func (ma *_EnumRepresentation_String__Assembler) AssembleKey() dms3ld.NodeAssemb ma.ka.w = &ma.w.t[len(ma.w.t)-1].k return &ma.ka } -func (ma *_EnumRepresentation_String__Assembler) AssembleValue() dms3ld.NodeAssembler { +func (ma *_EnumRepresentation_String__Assembler) AssembleValue() ld.NodeAssembler { switch ma.state { case maState_initial: panic("invalid state: AssembleValue cannot be called when no key is primed") @@ -3409,55 +3409,55 @@ func (ma *_EnumRepresentation_String__Assembler) Finish() error { *ma.m = schema.Maybe_Value return nil } -func (ma *_EnumRepresentation_String__Assembler) KeyPrototype() dms3ld.NodePrototype { +func (ma *_EnumRepresentation_String__Assembler) KeyPrototype() ld.NodePrototype { return _EnumValue__Prototype{} } -func (ma *_EnumRepresentation_String__Assembler) ValuePrototype(_ string) dms3ld.NodePrototype { +func (ma *_EnumRepresentation_String__Assembler) ValuePrototype(_ string) ld.NodePrototype { return _String__Prototype{} } func (EnumRepresentation_String) Type() schema.Type { return nil /*TODO:typelit*/ } -func (n EnumRepresentation_String) Representation() dms3ld.Node { +func (n EnumRepresentation_String) Representation() ld.Node { return (*_EnumRepresentation_String__Repr)(n) } type _EnumRepresentation_String__Repr _EnumRepresentation_String -var _ dms3ld.Node = &_EnumRepresentation_String__Repr{} +var _ ld.Node = &_EnumRepresentation_String__Repr{} -func (_EnumRepresentation_String__Repr) Kind() dms3ld.Kind { - return dms3ld.Kind_Map +func (_EnumRepresentation_String__Repr) Kind() ld.Kind { + return ld.Kind_Map } -func (nr *_EnumRepresentation_String__Repr) LookupByString(k string) (dms3ld.Node, error) { +func (nr *_EnumRepresentation_String__Repr) LookupByString(k string) (ld.Node, error) { v, err := (EnumRepresentation_String)(nr).LookupByString(k) - if err != nil || v == dms3ld.Null { + if err != nil || v == ld.Null { return v, err } return v.(String).Representation(), nil } -func (nr *_EnumRepresentation_String__Repr) LookupByNode(k dms3ld.Node) (dms3ld.Node, error) { +func (nr *_EnumRepresentation_String__Repr) LookupByNode(k ld.Node) (ld.Node, error) { v, err := (EnumRepresentation_String)(nr).LookupByNode(k) - if err != nil || v == dms3ld.Null { + if err != nil || v == ld.Null { return v, err } return v.(String).Representation(), nil } -func (_EnumRepresentation_String__Repr) LookupByIndex(idx int64) (dms3ld.Node, error) { +func (_EnumRepresentation_String__Repr) LookupByIndex(idx int64) (ld.Node, error) { return mixins.Map{TypeName: "schemadmt.EnumRepresentation_String.Repr"}.LookupByIndex(0) } -func (n _EnumRepresentation_String__Repr) LookupBySegment(seg dms3ld.PathSegment) (dms3ld.Node, error) { +func (n _EnumRepresentation_String__Repr) LookupBySegment(seg ld.PathSegment) (ld.Node, error) { return n.LookupByString(seg.String()) } -func (nr *_EnumRepresentation_String__Repr) MapIterator() dms3ld.MapIterator { +func (nr *_EnumRepresentation_String__Repr) MapIterator() ld.MapIterator { return &_EnumRepresentation_String__ReprMapItr{(EnumRepresentation_String)(nr), 0} } type _EnumRepresentation_String__ReprMapItr _EnumRepresentation_String__MapItr -func (itr *_EnumRepresentation_String__ReprMapItr) Next() (k dms3ld.Node, v dms3ld.Node, err error) { +func (itr *_EnumRepresentation_String__ReprMapItr) Next() (k ld.Node, v ld.Node, err error) { k, v, err = (*_EnumRepresentation_String__MapItr)(itr).Next() - if err != nil || v == dms3ld.Null { + if err != nil || v == ld.Null { return } return k, v.(String).Representation(), nil @@ -3466,7 +3466,7 @@ func (itr *_EnumRepresentation_String__ReprMapItr) Done() bool { return (*_EnumRepresentation_String__MapItr)(itr).Done() } -func (_EnumRepresentation_String__Repr) ListIterator() dms3ld.ListIterator { +func (_EnumRepresentation_String__Repr) ListIterator() ld.ListIterator { return nil } func (rn *_EnumRepresentation_String__Repr) Length() int64 { @@ -3493,16 +3493,16 @@ func (_EnumRepresentation_String__Repr) AsString() (string, error) { func (_EnumRepresentation_String__Repr) AsBytes() ([]byte, error) { return mixins.Map{TypeName: "schemadmt.EnumRepresentation_String.Repr"}.AsBytes() } -func (_EnumRepresentation_String__Repr) AsLink() (dms3ld.Link, error) { +func (_EnumRepresentation_String__Repr) AsLink() (ld.Link, error) { return mixins.Map{TypeName: "schemadmt.EnumRepresentation_String.Repr"}.AsLink() } -func (_EnumRepresentation_String__Repr) Prototype() dms3ld.NodePrototype { +func (_EnumRepresentation_String__Repr) Prototype() ld.NodePrototype { return _EnumRepresentation_String__ReprPrototype{} } type _EnumRepresentation_String__ReprPrototype struct{} -func (_EnumRepresentation_String__ReprPrototype) NewBuilder() dms3ld.NodeBuilder { +func (_EnumRepresentation_String__ReprPrototype) NewBuilder() ld.NodeBuilder { var nb _EnumRepresentation_String__ReprBuilder nb.Reset() return &nb @@ -3512,7 +3512,7 @@ type _EnumRepresentation_String__ReprBuilder struct { _EnumRepresentation_String__ReprAssembler } -func (nb *_EnumRepresentation_String__ReprBuilder) Build() dms3ld.Node { +func (nb *_EnumRepresentation_String__ReprBuilder) Build() ld.Node { if *nb.m != schema.Maybe_Value { panic("invalid state: cannot call Build on an assembler that's not finished") } @@ -3539,7 +3539,7 @@ func (na *_EnumRepresentation_String__ReprAssembler) reset() { na.ka.reset() na.va.reset() } -func (na *_EnumRepresentation_String__ReprAssembler) BeginMap(sizeHint int64) (dms3ld.MapAssembler, error) { +func (na *_EnumRepresentation_String__ReprAssembler) BeginMap(sizeHint int64) (ld.MapAssembler, error) { switch *na.m { case schema.Maybe_Value, schema.Maybe_Null: panic("invalid state: cannot assign into assembler that's already finished") @@ -3554,7 +3554,7 @@ func (na *_EnumRepresentation_String__ReprAssembler) BeginMap(sizeHint int64) (d na.w.t = make([]_EnumRepresentation_String__entry, 0, sizeHint) return na, nil } -func (_EnumRepresentation_String__ReprAssembler) BeginList(sizeHint int64) (dms3ld.ListAssembler, error) { +func (_EnumRepresentation_String__ReprAssembler) BeginList(sizeHint int64) (ld.ListAssembler, error) { return mixins.MapAssembler{TypeName: "schemadmt.EnumRepresentation_String.Repr"}.BeginList(0) } func (na *_EnumRepresentation_String__ReprAssembler) AssignNull() error { @@ -3586,10 +3586,10 @@ func (_EnumRepresentation_String__ReprAssembler) AssignString(string) error { func (_EnumRepresentation_String__ReprAssembler) AssignBytes([]byte) error { return mixins.MapAssembler{TypeName: "schemadmt.EnumRepresentation_String.Repr"}.AssignBytes(nil) } -func (_EnumRepresentation_String__ReprAssembler) AssignLink(dms3ld.Link) error { +func (_EnumRepresentation_String__ReprAssembler) AssignLink(ld.Link) error { return mixins.MapAssembler{TypeName: "schemadmt.EnumRepresentation_String.Repr"}.AssignLink(nil) } -func (na *_EnumRepresentation_String__ReprAssembler) AssignNode(v dms3ld.Node) error { +func (na *_EnumRepresentation_String__ReprAssembler) AssignNode(v ld.Node) error { if v.IsNull() { return na.AssignNull() } @@ -3604,8 +3604,8 @@ func (na *_EnumRepresentation_String__ReprAssembler) AssignNode(v dms3ld.Node) e *na.m = schema.Maybe_Value return nil } - if v.Kind() != dms3ld.Kind_Map { - return dms3ld.ErrWrongKind{TypeName: "schemadmt.EnumRepresentation_String.Repr", MethodName: "AssignNode", AppropriateKind: dms3ld.KindSet_JustMap, ActualKind: v.Kind()} + if v.Kind() != ld.Kind_Map { + return ld.ErrWrongKind{TypeName: "schemadmt.EnumRepresentation_String.Repr", MethodName: "AssignNode", AppropriateKind: ld.KindSet_JustMap, ActualKind: v.Kind()} } itr := v.MapIterator() for !itr.Done() { @@ -3622,7 +3622,7 @@ func (na *_EnumRepresentation_String__ReprAssembler) AssignNode(v dms3ld.Node) e } return na.Finish() } -func (_EnumRepresentation_String__ReprAssembler) Prototype() dms3ld.NodePrototype { +func (_EnumRepresentation_String__ReprAssembler) Prototype() ld.NodePrototype { return _EnumRepresentation_String__ReprPrototype{} } func (ma *_EnumRepresentation_String__ReprAssembler) keyFinishTidy() bool { @@ -3653,7 +3653,7 @@ func (ma *_EnumRepresentation_String__ReprAssembler) valueFinishTidy() bool { return false } } -func (ma *_EnumRepresentation_String__ReprAssembler) AssembleEntry(k string) (dms3ld.NodeAssembler, error) { +func (ma *_EnumRepresentation_String__ReprAssembler) AssembleEntry(k string) (ld.NodeAssembler, error) { switch ma.state { case maState_initial: // carry on @@ -3674,7 +3674,7 @@ func (ma *_EnumRepresentation_String__ReprAssembler) AssembleEntry(k string) (dm return nil, err // TODO wrap in some kind of ErrInvalidKey } if _, exists := ma.w.m[k2]; exists { - return nil, dms3ld.ErrRepeatedMapKey{Key: &k2} + return nil, ld.ErrRepeatedMapKey{Key: &k2} } ma.w.t = append(ma.w.t, _EnumRepresentation_String__entry{k: k2}) tz := &ma.w.t[len(ma.w.t)-1] @@ -3685,7 +3685,7 @@ func (ma *_EnumRepresentation_String__ReprAssembler) AssembleEntry(k string) (dm ma.va.m = &ma.cm return &ma.va, nil } -func (ma *_EnumRepresentation_String__ReprAssembler) AssembleKey() dms3ld.NodeAssembler { +func (ma *_EnumRepresentation_String__ReprAssembler) AssembleKey() ld.NodeAssembler { switch ma.state { case maState_initial: // carry on @@ -3706,7 +3706,7 @@ func (ma *_EnumRepresentation_String__ReprAssembler) AssembleKey() dms3ld.NodeAs ma.ka.w = &ma.w.t[len(ma.w.t)-1].k return &ma.ka } -func (ma *_EnumRepresentation_String__ReprAssembler) AssembleValue() dms3ld.NodeAssembler { +func (ma *_EnumRepresentation_String__ReprAssembler) AssembleValue() ld.NodeAssembler { switch ma.state { case maState_initial: panic("invalid state: AssembleValue cannot be called when no key is primed") @@ -3743,10 +3743,10 @@ func (ma *_EnumRepresentation_String__ReprAssembler) Finish() error { *ma.m = schema.Maybe_Value return nil } -func (ma *_EnumRepresentation_String__ReprAssembler) KeyPrototype() dms3ld.NodePrototype { +func (ma *_EnumRepresentation_String__ReprAssembler) KeyPrototype() ld.NodePrototype { return _EnumValue__ReprPrototype{} } -func (ma *_EnumRepresentation_String__ReprAssembler) ValuePrototype(_ string) dms3ld.NodePrototype { +func (ma *_EnumRepresentation_String__ReprAssembler) ValuePrototype(_ string) ld.NodePrototype { return _String__ReprPrototype{} } @@ -3777,12 +3777,12 @@ func (m MaybeEnumValue) IsAbsent() bool { func (m MaybeEnumValue) Exists() bool { return m.m == schema.Maybe_Value } -func (m MaybeEnumValue) AsNode() dms3ld.Node { +func (m MaybeEnumValue) AsNode() ld.Node { switch m.m { case schema.Maybe_Absent: - return dms3ld.Absent + return ld.Absent case schema.Maybe_Null: - return dms3ld.Null + return ld.Null case schema.Maybe_Value: return &m.v default: @@ -3796,28 +3796,28 @@ func (m MaybeEnumValue) Must() EnumValue { return &m.v } -var _ dms3ld.Node = (EnumValue)(&_EnumValue{}) +var _ ld.Node = (EnumValue)(&_EnumValue{}) var _ schema.TypedNode = (EnumValue)(&_EnumValue{}) -func (EnumValue) Kind() dms3ld.Kind { - return dms3ld.Kind_String +func (EnumValue) Kind() ld.Kind { + return ld.Kind_String } -func (EnumValue) LookupByString(string) (dms3ld.Node, error) { +func (EnumValue) LookupByString(string) (ld.Node, error) { return mixins.String{TypeName: "schemadmt.EnumValue"}.LookupByString("") } -func (EnumValue) LookupByNode(dms3ld.Node) (dms3ld.Node, error) { +func (EnumValue) LookupByNode(ld.Node) (ld.Node, error) { return mixins.String{TypeName: "schemadmt.EnumValue"}.LookupByNode(nil) } -func (EnumValue) LookupByIndex(idx int64) (dms3ld.Node, error) { +func (EnumValue) LookupByIndex(idx int64) (ld.Node, error) { return mixins.String{TypeName: "schemadmt.EnumValue"}.LookupByIndex(0) } -func (EnumValue) LookupBySegment(seg dms3ld.PathSegment) (dms3ld.Node, error) { +func (EnumValue) LookupBySegment(seg ld.PathSegment) (ld.Node, error) { return mixins.String{TypeName: "schemadmt.EnumValue"}.LookupBySegment(seg) } -func (EnumValue) MapIterator() dms3ld.MapIterator { +func (EnumValue) MapIterator() ld.MapIterator { return nil } -func (EnumValue) ListIterator() dms3ld.ListIterator { +func (EnumValue) ListIterator() ld.ListIterator { return nil } func (EnumValue) Length() int64 { @@ -3844,16 +3844,16 @@ func (n EnumValue) AsString() (string, error) { func (EnumValue) AsBytes() ([]byte, error) { return mixins.String{TypeName: "schemadmt.EnumValue"}.AsBytes() } -func (EnumValue) AsLink() (dms3ld.Link, error) { +func (EnumValue) AsLink() (ld.Link, error) { return mixins.String{TypeName: "schemadmt.EnumValue"}.AsLink() } -func (EnumValue) Prototype() dms3ld.NodePrototype { +func (EnumValue) Prototype() ld.NodePrototype { return _EnumValue__Prototype{} } type _EnumValue__Prototype struct{} -func (_EnumValue__Prototype) NewBuilder() dms3ld.NodeBuilder { +func (_EnumValue__Prototype) NewBuilder() ld.NodeBuilder { var nb _EnumValue__Builder nb.Reset() return &nb @@ -3863,7 +3863,7 @@ type _EnumValue__Builder struct { _EnumValue__Assembler } -func (nb *_EnumValue__Builder) Build() dms3ld.Node { +func (nb *_EnumValue__Builder) Build() ld.Node { if *nb.m != schema.Maybe_Value { panic("invalid state: cannot call Build on an assembler that's not finished") } @@ -3881,10 +3881,10 @@ type _EnumValue__Assembler struct { } func (na *_EnumValue__Assembler) reset() {} -func (_EnumValue__Assembler) BeginMap(sizeHint int64) (dms3ld.MapAssembler, error) { +func (_EnumValue__Assembler) BeginMap(sizeHint int64) (ld.MapAssembler, error) { return mixins.StringAssembler{TypeName: "schemadmt.EnumValue"}.BeginMap(0) } -func (_EnumValue__Assembler) BeginList(sizeHint int64) (dms3ld.ListAssembler, error) { +func (_EnumValue__Assembler) BeginList(sizeHint int64) (ld.ListAssembler, error) { return mixins.StringAssembler{TypeName: "schemadmt.EnumValue"}.BeginList(0) } func (na *_EnumValue__Assembler) AssignNull() error { @@ -3920,10 +3920,10 @@ func (na *_EnumValue__Assembler) AssignString(v string) error { func (_EnumValue__Assembler) AssignBytes([]byte) error { return mixins.StringAssembler{TypeName: "schemadmt.EnumValue"}.AssignBytes(nil) } -func (_EnumValue__Assembler) AssignLink(dms3ld.Link) error { +func (_EnumValue__Assembler) AssignLink(ld.Link) error { return mixins.StringAssembler{TypeName: "schemadmt.EnumValue"}.AssignLink(nil) } -func (na *_EnumValue__Assembler) AssignNode(v dms3ld.Node) error { +func (na *_EnumValue__Assembler) AssignNode(v ld.Node) error { if v.IsNull() { return na.AssignNull() } @@ -3942,19 +3942,19 @@ func (na *_EnumValue__Assembler) AssignNode(v dms3ld.Node) error { return na.AssignString(v2) } } -func (_EnumValue__Assembler) Prototype() dms3ld.NodePrototype { +func (_EnumValue__Assembler) Prototype() ld.NodePrototype { return _EnumValue__Prototype{} } func (EnumValue) Type() schema.Type { return nil /*TODO:typelit*/ } -func (n EnumValue) Representation() dms3ld.Node { +func (n EnumValue) Representation() ld.Node { return (*_EnumValue__Repr)(n) } type _EnumValue__Repr = _EnumValue -var _ dms3ld.Node = &_EnumValue__Repr{} +var _ ld.Node = &_EnumValue__Repr{} type _EnumValue__ReprPrototype = _EnumValue__Prototype type _EnumValue__ReprAssembler = _EnumValue__Assembler @@ -3986,12 +3986,12 @@ func (m MaybeFieldName) IsAbsent() bool { func (m MaybeFieldName) Exists() bool { return m.m == schema.Maybe_Value } -func (m MaybeFieldName) AsNode() dms3ld.Node { +func (m MaybeFieldName) AsNode() ld.Node { switch m.m { case schema.Maybe_Absent: - return dms3ld.Absent + return ld.Absent case schema.Maybe_Null: - return dms3ld.Null + return ld.Null case schema.Maybe_Value: return &m.v default: @@ -4005,28 +4005,28 @@ func (m MaybeFieldName) Must() FieldName { return &m.v } -var _ dms3ld.Node = (FieldName)(&_FieldName{}) +var _ ld.Node = (FieldName)(&_FieldName{}) var _ schema.TypedNode = (FieldName)(&_FieldName{}) -func (FieldName) Kind() dms3ld.Kind { - return dms3ld.Kind_String +func (FieldName) Kind() ld.Kind { + return ld.Kind_String } -func (FieldName) LookupByString(string) (dms3ld.Node, error) { +func (FieldName) LookupByString(string) (ld.Node, error) { return mixins.String{TypeName: "schemadmt.FieldName"}.LookupByString("") } -func (FieldName) LookupByNode(dms3ld.Node) (dms3ld.Node, error) { +func (FieldName) LookupByNode(ld.Node) (ld.Node, error) { return mixins.String{TypeName: "schemadmt.FieldName"}.LookupByNode(nil) } -func (FieldName) LookupByIndex(idx int64) (dms3ld.Node, error) { +func (FieldName) LookupByIndex(idx int64) (ld.Node, error) { return mixins.String{TypeName: "schemadmt.FieldName"}.LookupByIndex(0) } -func (FieldName) LookupBySegment(seg dms3ld.PathSegment) (dms3ld.Node, error) { +func (FieldName) LookupBySegment(seg ld.PathSegment) (ld.Node, error) { return mixins.String{TypeName: "schemadmt.FieldName"}.LookupBySegment(seg) } -func (FieldName) MapIterator() dms3ld.MapIterator { +func (FieldName) MapIterator() ld.MapIterator { return nil } -func (FieldName) ListIterator() dms3ld.ListIterator { +func (FieldName) ListIterator() ld.ListIterator { return nil } func (FieldName) Length() int64 { @@ -4053,16 +4053,16 @@ func (n FieldName) AsString() (string, error) { func (FieldName) AsBytes() ([]byte, error) { return mixins.String{TypeName: "schemadmt.FieldName"}.AsBytes() } -func (FieldName) AsLink() (dms3ld.Link, error) { +func (FieldName) AsLink() (ld.Link, error) { return mixins.String{TypeName: "schemadmt.FieldName"}.AsLink() } -func (FieldName) Prototype() dms3ld.NodePrototype { +func (FieldName) Prototype() ld.NodePrototype { return _FieldName__Prototype{} } type _FieldName__Prototype struct{} -func (_FieldName__Prototype) NewBuilder() dms3ld.NodeBuilder { +func (_FieldName__Prototype) NewBuilder() ld.NodeBuilder { var nb _FieldName__Builder nb.Reset() return &nb @@ -4072,7 +4072,7 @@ type _FieldName__Builder struct { _FieldName__Assembler } -func (nb *_FieldName__Builder) Build() dms3ld.Node { +func (nb *_FieldName__Builder) Build() ld.Node { if *nb.m != schema.Maybe_Value { panic("invalid state: cannot call Build on an assembler that's not finished") } @@ -4090,10 +4090,10 @@ type _FieldName__Assembler struct { } func (na *_FieldName__Assembler) reset() {} -func (_FieldName__Assembler) BeginMap(sizeHint int64) (dms3ld.MapAssembler, error) { +func (_FieldName__Assembler) BeginMap(sizeHint int64) (ld.MapAssembler, error) { return mixins.StringAssembler{TypeName: "schemadmt.FieldName"}.BeginMap(0) } -func (_FieldName__Assembler) BeginList(sizeHint int64) (dms3ld.ListAssembler, error) { +func (_FieldName__Assembler) BeginList(sizeHint int64) (ld.ListAssembler, error) { return mixins.StringAssembler{TypeName: "schemadmt.FieldName"}.BeginList(0) } func (na *_FieldName__Assembler) AssignNull() error { @@ -4129,10 +4129,10 @@ func (na *_FieldName__Assembler) AssignString(v string) error { func (_FieldName__Assembler) AssignBytes([]byte) error { return mixins.StringAssembler{TypeName: "schemadmt.FieldName"}.AssignBytes(nil) } -func (_FieldName__Assembler) AssignLink(dms3ld.Link) error { +func (_FieldName__Assembler) AssignLink(ld.Link) error { return mixins.StringAssembler{TypeName: "schemadmt.FieldName"}.AssignLink(nil) } -func (na *_FieldName__Assembler) AssignNode(v dms3ld.Node) error { +func (na *_FieldName__Assembler) AssignNode(v ld.Node) error { if v.IsNull() { return na.AssignNull() } @@ -4151,19 +4151,19 @@ func (na *_FieldName__Assembler) AssignNode(v dms3ld.Node) error { return na.AssignString(v2) } } -func (_FieldName__Assembler) Prototype() dms3ld.NodePrototype { +func (_FieldName__Assembler) Prototype() ld.NodePrototype { return _FieldName__Prototype{} } func (FieldName) Type() schema.Type { return nil /*TODO:typelit*/ } -func (n FieldName) Representation() dms3ld.Node { +func (n FieldName) Representation() ld.Node { return (*_FieldName__Repr)(n) } type _FieldName__Repr = _FieldName -var _ dms3ld.Node = &_FieldName__Repr{} +var _ ld.Node = &_FieldName__Repr{} type _FieldName__ReprPrototype = _FieldName__Prototype type _FieldName__ReprAssembler = _FieldName__Assembler @@ -4191,12 +4191,12 @@ func (m MaybeFloat) IsAbsent() bool { func (m MaybeFloat) Exists() bool { return m.m == schema.Maybe_Value } -func (m MaybeFloat) AsNode() dms3ld.Node { +func (m MaybeFloat) AsNode() ld.Node { switch m.m { case schema.Maybe_Absent: - return dms3ld.Absent + return ld.Absent case schema.Maybe_Null: - return dms3ld.Null + return ld.Null case schema.Maybe_Value: return &m.v default: @@ -4210,28 +4210,28 @@ func (m MaybeFloat) Must() Float { return &m.v } -var _ dms3ld.Node = (Float)(&_Float{}) +var _ ld.Node = (Float)(&_Float{}) var _ schema.TypedNode = (Float)(&_Float{}) -func (Float) Kind() dms3ld.Kind { - return dms3ld.Kind_Float +func (Float) Kind() ld.Kind { + return ld.Kind_Float } -func (Float) LookupByString(string) (dms3ld.Node, error) { +func (Float) LookupByString(string) (ld.Node, error) { return mixins.Float{TypeName: "schemadmt.Float"}.LookupByString("") } -func (Float) LookupByNode(dms3ld.Node) (dms3ld.Node, error) { +func (Float) LookupByNode(ld.Node) (ld.Node, error) { return mixins.Float{TypeName: "schemadmt.Float"}.LookupByNode(nil) } -func (Float) LookupByIndex(idx int64) (dms3ld.Node, error) { +func (Float) LookupByIndex(idx int64) (ld.Node, error) { return mixins.Float{TypeName: "schemadmt.Float"}.LookupByIndex(0) } -func (Float) LookupBySegment(seg dms3ld.PathSegment) (dms3ld.Node, error) { +func (Float) LookupBySegment(seg ld.PathSegment) (ld.Node, error) { return mixins.Float{TypeName: "schemadmt.Float"}.LookupBySegment(seg) } -func (Float) MapIterator() dms3ld.MapIterator { +func (Float) MapIterator() ld.MapIterator { return nil } -func (Float) ListIterator() dms3ld.ListIterator { +func (Float) ListIterator() ld.ListIterator { return nil } func (Float) Length() int64 { @@ -4258,16 +4258,16 @@ func (Float) AsString() (string, error) { func (Float) AsBytes() ([]byte, error) { return mixins.Float{TypeName: "schemadmt.Float"}.AsBytes() } -func (Float) AsLink() (dms3ld.Link, error) { +func (Float) AsLink() (ld.Link, error) { return mixins.Float{TypeName: "schemadmt.Float"}.AsLink() } -func (Float) Prototype() dms3ld.NodePrototype { +func (Float) Prototype() ld.NodePrototype { return _Float__Prototype{} } type _Float__Prototype struct{} -func (_Float__Prototype) NewBuilder() dms3ld.NodeBuilder { +func (_Float__Prototype) NewBuilder() ld.NodeBuilder { var nb _Float__Builder nb.Reset() return &nb @@ -4277,7 +4277,7 @@ type _Float__Builder struct { _Float__Assembler } -func (nb *_Float__Builder) Build() dms3ld.Node { +func (nb *_Float__Builder) Build() ld.Node { if *nb.m != schema.Maybe_Value { panic("invalid state: cannot call Build on an assembler that's not finished") } @@ -4295,10 +4295,10 @@ type _Float__Assembler struct { } func (na *_Float__Assembler) reset() {} -func (_Float__Assembler) BeginMap(sizeHint int64) (dms3ld.MapAssembler, error) { +func (_Float__Assembler) BeginMap(sizeHint int64) (ld.MapAssembler, error) { return mixins.FloatAssembler{TypeName: "schemadmt.Float"}.BeginMap(0) } -func (_Float__Assembler) BeginList(sizeHint int64) (dms3ld.ListAssembler, error) { +func (_Float__Assembler) BeginList(sizeHint int64) (ld.ListAssembler, error) { return mixins.FloatAssembler{TypeName: "schemadmt.Float"}.BeginList(0) } func (na *_Float__Assembler) AssignNull() error { @@ -4334,10 +4334,10 @@ func (_Float__Assembler) AssignString(string) error { func (_Float__Assembler) AssignBytes([]byte) error { return mixins.FloatAssembler{TypeName: "schemadmt.Float"}.AssignBytes(nil) } -func (_Float__Assembler) AssignLink(dms3ld.Link) error { +func (_Float__Assembler) AssignLink(ld.Link) error { return mixins.FloatAssembler{TypeName: "schemadmt.Float"}.AssignLink(nil) } -func (na *_Float__Assembler) AssignNode(v dms3ld.Node) error { +func (na *_Float__Assembler) AssignNode(v ld.Node) error { if v.IsNull() { return na.AssignNull() } @@ -4356,19 +4356,19 @@ func (na *_Float__Assembler) AssignNode(v dms3ld.Node) error { return na.AssignFloat(v2) } } -func (_Float__Assembler) Prototype() dms3ld.NodePrototype { +func (_Float__Assembler) Prototype() ld.NodePrototype { return _Float__Prototype{} } func (Float) Type() schema.Type { return nil /*TODO:typelit*/ } -func (n Float) Representation() dms3ld.Node { +func (n Float) Representation() ld.Node { return (*_Float__Repr)(n) } type _Float__Repr = _Float -var _ dms3ld.Node = &_Float__Repr{} +var _ ld.Node = &_Float__Repr{} type _Float__ReprPrototype = _Float__Prototype type _Float__ReprAssembler = _Float__Assembler @@ -4396,12 +4396,12 @@ func (m MaybeInt) IsAbsent() bool { func (m MaybeInt) Exists() bool { return m.m == schema.Maybe_Value } -func (m MaybeInt) AsNode() dms3ld.Node { +func (m MaybeInt) AsNode() ld.Node { switch m.m { case schema.Maybe_Absent: - return dms3ld.Absent + return ld.Absent case schema.Maybe_Null: - return dms3ld.Null + return ld.Null case schema.Maybe_Value: return &m.v default: @@ -4415,28 +4415,28 @@ func (m MaybeInt) Must() Int { return &m.v } -var _ dms3ld.Node = (Int)(&_Int{}) +var _ ld.Node = (Int)(&_Int{}) var _ schema.TypedNode = (Int)(&_Int{}) -func (Int) Kind() dms3ld.Kind { - return dms3ld.Kind_Int +func (Int) Kind() ld.Kind { + return ld.Kind_Int } -func (Int) LookupByString(string) (dms3ld.Node, error) { +func (Int) LookupByString(string) (ld.Node, error) { return mixins.Int{TypeName: "schemadmt.Int"}.LookupByString("") } -func (Int) LookupByNode(dms3ld.Node) (dms3ld.Node, error) { +func (Int) LookupByNode(ld.Node) (ld.Node, error) { return mixins.Int{TypeName: "schemadmt.Int"}.LookupByNode(nil) } -func (Int) LookupByIndex(idx int64) (dms3ld.Node, error) { +func (Int) LookupByIndex(idx int64) (ld.Node, error) { return mixins.Int{TypeName: "schemadmt.Int"}.LookupByIndex(0) } -func (Int) LookupBySegment(seg dms3ld.PathSegment) (dms3ld.Node, error) { +func (Int) LookupBySegment(seg ld.PathSegment) (ld.Node, error) { return mixins.Int{TypeName: "schemadmt.Int"}.LookupBySegment(seg) } -func (Int) MapIterator() dms3ld.MapIterator { +func (Int) MapIterator() ld.MapIterator { return nil } -func (Int) ListIterator() dms3ld.ListIterator { +func (Int) ListIterator() ld.ListIterator { return nil } func (Int) Length() int64 { @@ -4463,16 +4463,16 @@ func (Int) AsString() (string, error) { func (Int) AsBytes() ([]byte, error) { return mixins.Int{TypeName: "schemadmt.Int"}.AsBytes() } -func (Int) AsLink() (dms3ld.Link, error) { +func (Int) AsLink() (ld.Link, error) { return mixins.Int{TypeName: "schemadmt.Int"}.AsLink() } -func (Int) Prototype() dms3ld.NodePrototype { +func (Int) Prototype() ld.NodePrototype { return _Int__Prototype{} } type _Int__Prototype struct{} -func (_Int__Prototype) NewBuilder() dms3ld.NodeBuilder { +func (_Int__Prototype) NewBuilder() ld.NodeBuilder { var nb _Int__Builder nb.Reset() return &nb @@ -4482,7 +4482,7 @@ type _Int__Builder struct { _Int__Assembler } -func (nb *_Int__Builder) Build() dms3ld.Node { +func (nb *_Int__Builder) Build() ld.Node { if *nb.m != schema.Maybe_Value { panic("invalid state: cannot call Build on an assembler that's not finished") } @@ -4500,10 +4500,10 @@ type _Int__Assembler struct { } func (na *_Int__Assembler) reset() {} -func (_Int__Assembler) BeginMap(sizeHint int64) (dms3ld.MapAssembler, error) { +func (_Int__Assembler) BeginMap(sizeHint int64) (ld.MapAssembler, error) { return mixins.IntAssembler{TypeName: "schemadmt.Int"}.BeginMap(0) } -func (_Int__Assembler) BeginList(sizeHint int64) (dms3ld.ListAssembler, error) { +func (_Int__Assembler) BeginList(sizeHint int64) (ld.ListAssembler, error) { return mixins.IntAssembler{TypeName: "schemadmt.Int"}.BeginList(0) } func (na *_Int__Assembler) AssignNull() error { @@ -4539,10 +4539,10 @@ func (_Int__Assembler) AssignString(string) error { func (_Int__Assembler) AssignBytes([]byte) error { return mixins.IntAssembler{TypeName: "schemadmt.Int"}.AssignBytes(nil) } -func (_Int__Assembler) AssignLink(dms3ld.Link) error { +func (_Int__Assembler) AssignLink(ld.Link) error { return mixins.IntAssembler{TypeName: "schemadmt.Int"}.AssignLink(nil) } -func (na *_Int__Assembler) AssignNode(v dms3ld.Node) error { +func (na *_Int__Assembler) AssignNode(v ld.Node) error { if v.IsNull() { return na.AssignNull() } @@ -4561,19 +4561,19 @@ func (na *_Int__Assembler) AssignNode(v dms3ld.Node) error { return na.AssignInt(v2) } } -func (_Int__Assembler) Prototype() dms3ld.NodePrototype { +func (_Int__Assembler) Prototype() ld.NodePrototype { return _Int__Prototype{} } func (Int) Type() schema.Type { return nil /*TODO:typelit*/ } -func (n Int) Representation() dms3ld.Node { +func (n Int) Representation() ld.Node { return (*_Int__Repr)(n) } type _Int__Repr = _Int -var _ dms3ld.Node = &_Int__Repr{} +var _ ld.Node = &_Int__Repr{} type _Int__ReprPrototype = _Int__Prototype type _Int__ReprAssembler = _Int__Assembler @@ -4602,12 +4602,12 @@ func (m MaybeListRepresentation) IsAbsent() bool { func (m MaybeListRepresentation) Exists() bool { return m.m == schema.Maybe_Value } -func (m MaybeListRepresentation) AsNode() dms3ld.Node { +func (m MaybeListRepresentation) AsNode() ld.Node { switch m.m { case schema.Maybe_Absent: - return dms3ld.Absent + return ld.Absent case schema.Maybe_Null: - return dms3ld.Null + return ld.Null case schema.Maybe_Value: return m.v default: @@ -4624,37 +4624,37 @@ func (m MaybeListRepresentation) Must() ListRepresentation { var ( memberName__ListRepresentation_ListRepresentation_List = _String{"ListRepresentation_List"} ) -var _ dms3ld.Node = (ListRepresentation)(&_ListRepresentation{}) +var _ ld.Node = (ListRepresentation)(&_ListRepresentation{}) var _ schema.TypedNode = (ListRepresentation)(&_ListRepresentation{}) -func (ListRepresentation) Kind() dms3ld.Kind { - return dms3ld.Kind_Map +func (ListRepresentation) Kind() ld.Kind { + return ld.Kind_Map } -func (n ListRepresentation) LookupByString(key string) (dms3ld.Node, error) { +func (n ListRepresentation) LookupByString(key string) (ld.Node, error) { switch key { case "ListRepresentation_List": if n.tag != 1 { - return nil, dms3ld.ErrNotExists{Segment: dms3ld.PathSegmentOfString(key)} + return nil, ld.ErrNotExists{Segment: ld.PathSegmentOfString(key)} } return &n.x1, nil default: - return nil, schema.ErrNoSuchField{Type: nil /*TODO*/, Field: dms3ld.PathSegmentOfString(key)} + return nil, schema.ErrNoSuchField{Type: nil /*TODO*/, Field: ld.PathSegmentOfString(key)} } } -func (n ListRepresentation) LookupByNode(key dms3ld.Node) (dms3ld.Node, error) { +func (n ListRepresentation) LookupByNode(key ld.Node) (ld.Node, error) { ks, err := key.AsString() if err != nil { return nil, err } return n.LookupByString(ks) } -func (ListRepresentation) LookupByIndex(idx int64) (dms3ld.Node, error) { +func (ListRepresentation) LookupByIndex(idx int64) (ld.Node, error) { return mixins.Map{TypeName: "schemadmt.ListRepresentation"}.LookupByIndex(0) } -func (n ListRepresentation) LookupBySegment(seg dms3ld.PathSegment) (dms3ld.Node, error) { +func (n ListRepresentation) LookupBySegment(seg ld.PathSegment) (ld.Node, error) { return n.LookupByString(seg.String()) } -func (n ListRepresentation) MapIterator() dms3ld.MapIterator { +func (n ListRepresentation) MapIterator() ld.MapIterator { return &_ListRepresentation__MapItr{n, false} } @@ -4663,9 +4663,9 @@ type _ListRepresentation__MapItr struct { done bool } -func (itr *_ListRepresentation__MapItr) Next() (k dms3ld.Node, v dms3ld.Node, _ error) { +func (itr *_ListRepresentation__MapItr) Next() (k ld.Node, v ld.Node, _ error) { if itr.done { - return nil, nil, dms3ld.ErrIteratorOverread{} + return nil, nil, ld.ErrIteratorOverread{} } switch itr.n.tag { case 1: @@ -4680,7 +4680,7 @@ func (itr *_ListRepresentation__MapItr) Done() bool { return itr.done } -func (ListRepresentation) ListIterator() dms3ld.ListIterator { +func (ListRepresentation) ListIterator() ld.ListIterator { return nil } func (ListRepresentation) Length() int64 { @@ -4707,16 +4707,16 @@ func (ListRepresentation) AsString() (string, error) { func (ListRepresentation) AsBytes() ([]byte, error) { return mixins.Map{TypeName: "schemadmt.ListRepresentation"}.AsBytes() } -func (ListRepresentation) AsLink() (dms3ld.Link, error) { +func (ListRepresentation) AsLink() (ld.Link, error) { return mixins.Map{TypeName: "schemadmt.ListRepresentation"}.AsLink() } -func (ListRepresentation) Prototype() dms3ld.NodePrototype { +func (ListRepresentation) Prototype() ld.NodePrototype { return _ListRepresentation__Prototype{} } type _ListRepresentation__Prototype struct{} -func (_ListRepresentation__Prototype) NewBuilder() dms3ld.NodeBuilder { +func (_ListRepresentation__Prototype) NewBuilder() ld.NodeBuilder { var nb _ListRepresentation__Builder nb.Reset() return &nb @@ -4726,7 +4726,7 @@ type _ListRepresentation__Builder struct { _ListRepresentation__Assembler } -func (nb *_ListRepresentation__Builder) Build() dms3ld.Node { +func (nb *_ListRepresentation__Builder) Build() ld.Node { if *nb.m != schema.Maybe_Value { panic("invalid state: cannot call Build on an assembler that's not finished") } @@ -4761,7 +4761,7 @@ func (na *_ListRepresentation__Assembler) reset() { na.ca = 0 na.cm = schema.Maybe_Absent } -func (na *_ListRepresentation__Assembler) BeginMap(int64) (dms3ld.MapAssembler, error) { +func (na *_ListRepresentation__Assembler) BeginMap(int64) (ld.MapAssembler, error) { switch *na.m { case schema.Maybe_Value, schema.Maybe_Null: panic("invalid state: cannot assign into assembler that's already finished") @@ -4774,7 +4774,7 @@ func (na *_ListRepresentation__Assembler) BeginMap(int64) (dms3ld.MapAssembler, } return na, nil } -func (_ListRepresentation__Assembler) BeginList(sizeHint int64) (dms3ld.ListAssembler, error) { +func (_ListRepresentation__Assembler) BeginList(sizeHint int64) (ld.ListAssembler, error) { return mixins.MapAssembler{TypeName: "schemadmt.ListRepresentation"}.BeginList(0) } func (na *_ListRepresentation__Assembler) AssignNull() error { @@ -4806,10 +4806,10 @@ func (_ListRepresentation__Assembler) AssignString(string) error { func (_ListRepresentation__Assembler) AssignBytes([]byte) error { return mixins.MapAssembler{TypeName: "schemadmt.ListRepresentation"}.AssignBytes(nil) } -func (_ListRepresentation__Assembler) AssignLink(dms3ld.Link) error { +func (_ListRepresentation__Assembler) AssignLink(ld.Link) error { return mixins.MapAssembler{TypeName: "schemadmt.ListRepresentation"}.AssignLink(nil) } -func (na *_ListRepresentation__Assembler) AssignNode(v dms3ld.Node) error { +func (na *_ListRepresentation__Assembler) AssignNode(v ld.Node) error { if v.IsNull() { return na.AssignNull() } @@ -4829,8 +4829,8 @@ func (na *_ListRepresentation__Assembler) AssignNode(v dms3ld.Node) error { *na.m = schema.Maybe_Value return nil } - if v.Kind() != dms3ld.Kind_Map { - return dms3ld.ErrWrongKind{TypeName: "schemadmt.ListRepresentation", MethodName: "AssignNode", AppropriateKind: dms3ld.KindSet_JustMap, ActualKind: v.Kind()} + if v.Kind() != ld.Kind_Map { + return ld.ErrWrongKind{TypeName: "schemadmt.ListRepresentation", MethodName: "AssignNode", AppropriateKind: ld.KindSet_JustMap, ActualKind: v.Kind()} } itr := v.MapIterator() for !itr.Done() { @@ -4847,7 +4847,7 @@ func (na *_ListRepresentation__Assembler) AssignNode(v dms3ld.Node) error { } return na.Finish() } -func (_ListRepresentation__Assembler) Prototype() dms3ld.NodePrototype { +func (_ListRepresentation__Assembler) Prototype() ld.NodePrototype { return _ListRepresentation__Prototype{} } func (ma *_ListRepresentation__Assembler) valueFinishTidy() bool { @@ -4859,7 +4859,7 @@ func (ma *_ListRepresentation__Assembler) valueFinishTidy() bool { return false } } -func (ma *_ListRepresentation__Assembler) AssembleEntry(k string) (dms3ld.NodeAssembler, error) { +func (ma *_ListRepresentation__Assembler) AssembleEntry(k string) (ld.NodeAssembler, error) { switch ma.state { case maState_initial: // carry on @@ -4886,9 +4886,9 @@ func (ma *_ListRepresentation__Assembler) AssembleEntry(k string) (dms3ld.NodeAs ma.ca1.m = &ma.cm return &ma.ca1, nil } - return nil, dms3ld.ErrInvalidKey{TypeName: "schemadmt.ListRepresentation", Key: &_String{k}} + return nil, ld.ErrInvalidKey{TypeName: "schemadmt.ListRepresentation", Key: &_String{k}} } -func (ma *_ListRepresentation__Assembler) AssembleKey() dms3ld.NodeAssembler { +func (ma *_ListRepresentation__Assembler) AssembleKey() ld.NodeAssembler { switch ma.state { case maState_initial: // carry on @@ -4906,7 +4906,7 @@ func (ma *_ListRepresentation__Assembler) AssembleKey() dms3ld.NodeAssembler { ma.state = maState_midKey return (*_ListRepresentation__KeyAssembler)(ma) } -func (ma *_ListRepresentation__Assembler) AssembleValue() dms3ld.NodeAssembler { +func (ma *_ListRepresentation__Assembler) AssembleValue() ld.NodeAssembler { switch ma.state { case maState_initial: panic("invalid state: AssembleValue cannot be called when no key is primed") @@ -4951,10 +4951,10 @@ func (ma *_ListRepresentation__Assembler) Finish() error { *ma.m = schema.Maybe_Value return nil } -func (ma *_ListRepresentation__Assembler) KeyPrototype() dms3ld.NodePrototype { +func (ma *_ListRepresentation__Assembler) KeyPrototype() ld.NodePrototype { return _String__Prototype{} } -func (ma *_ListRepresentation__Assembler) ValuePrototype(k string) dms3ld.NodePrototype { +func (ma *_ListRepresentation__Assembler) ValuePrototype(k string) ld.NodePrototype { switch k { case "ListRepresentation_List": return _ListRepresentation_List__Prototype{} @@ -4965,10 +4965,10 @@ func (ma *_ListRepresentation__Assembler) ValuePrototype(k string) dms3ld.NodePr type _ListRepresentation__KeyAssembler _ListRepresentation__Assembler -func (_ListRepresentation__KeyAssembler) BeginMap(sizeHint int64) (dms3ld.MapAssembler, error) { +func (_ListRepresentation__KeyAssembler) BeginMap(sizeHint int64) (ld.MapAssembler, error) { return mixins.StringAssembler{TypeName: "schemadmt.ListRepresentation.KeyAssembler"}.BeginMap(0) } -func (_ListRepresentation__KeyAssembler) BeginList(sizeHint int64) (dms3ld.ListAssembler, error) { +func (_ListRepresentation__KeyAssembler) BeginList(sizeHint int64) (ld.ListAssembler, error) { return mixins.StringAssembler{TypeName: "schemadmt.ListRepresentation.KeyAssembler"}.BeginList(0) } func (na *_ListRepresentation__KeyAssembler) AssignNull() error { @@ -4997,28 +4997,28 @@ func (ka *_ListRepresentation__KeyAssembler) AssignString(k string) error { ka.state = maState_expectValue return nil } - return dms3ld.ErrInvalidKey{TypeName: "schemadmt.ListRepresentation", Key: &_String{k}} // TODO: error quality: ErrInvalidUnionDiscriminant ? + return ld.ErrInvalidKey{TypeName: "schemadmt.ListRepresentation", Key: &_String{k}} // TODO: error quality: ErrInvalidUnionDiscriminant ? } func (_ListRepresentation__KeyAssembler) AssignBytes([]byte) error { return mixins.StringAssembler{TypeName: "schemadmt.ListRepresentation.KeyAssembler"}.AssignBytes(nil) } -func (_ListRepresentation__KeyAssembler) AssignLink(dms3ld.Link) error { +func (_ListRepresentation__KeyAssembler) AssignLink(ld.Link) error { return mixins.StringAssembler{TypeName: "schemadmt.ListRepresentation.KeyAssembler"}.AssignLink(nil) } -func (ka *_ListRepresentation__KeyAssembler) AssignNode(v dms3ld.Node) error { +func (ka *_ListRepresentation__KeyAssembler) AssignNode(v ld.Node) error { if v2, err := v.AsString(); err != nil { return err } else { return ka.AssignString(v2) } } -func (_ListRepresentation__KeyAssembler) Prototype() dms3ld.NodePrototype { +func (_ListRepresentation__KeyAssembler) Prototype() ld.NodePrototype { return _String__Prototype{} } func (ListRepresentation) Type() schema.Type { return nil /*TODO:typelit*/ } -func (n ListRepresentation) Representation() dms3ld.Node { +func (n ListRepresentation) Representation() ld.Node { return (*_ListRepresentation__Repr)(n) } @@ -5027,36 +5027,36 @@ type _ListRepresentation__Repr _ListRepresentation var ( memberName__ListRepresentation_ListRepresentation_List_serial = _String{"list"} ) -var _ dms3ld.Node = &_ListRepresentation__Repr{} +var _ ld.Node = &_ListRepresentation__Repr{} -func (_ListRepresentation__Repr) Kind() dms3ld.Kind { - return dms3ld.Kind_Map +func (_ListRepresentation__Repr) Kind() ld.Kind { + return ld.Kind_Map } -func (n *_ListRepresentation__Repr) LookupByString(key string) (dms3ld.Node, error) { +func (n *_ListRepresentation__Repr) LookupByString(key string) (ld.Node, error) { switch key { case "list": if n.tag != 1 { - return nil, dms3ld.ErrNotExists{Segment: dms3ld.PathSegmentOfString(key)} + return nil, ld.ErrNotExists{Segment: ld.PathSegmentOfString(key)} } return n.x1.Representation(), nil default: - return nil, schema.ErrNoSuchField{Type: nil /*TODO*/, Field: dms3ld.PathSegmentOfString(key)} + return nil, schema.ErrNoSuchField{Type: nil /*TODO*/, Field: ld.PathSegmentOfString(key)} } } -func (n *_ListRepresentation__Repr) LookupByNode(key dms3ld.Node) (dms3ld.Node, error) { +func (n *_ListRepresentation__Repr) LookupByNode(key ld.Node) (ld.Node, error) { ks, err := key.AsString() if err != nil { return nil, err } return n.LookupByString(ks) } -func (_ListRepresentation__Repr) LookupByIndex(idx int64) (dms3ld.Node, error) { +func (_ListRepresentation__Repr) LookupByIndex(idx int64) (ld.Node, error) { return mixins.Map{TypeName: "schemadmt.ListRepresentation.Repr"}.LookupByIndex(0) } -func (n _ListRepresentation__Repr) LookupBySegment(seg dms3ld.PathSegment) (dms3ld.Node, error) { +func (n _ListRepresentation__Repr) LookupBySegment(seg ld.PathSegment) (ld.Node, error) { return n.LookupByString(seg.String()) } -func (n *_ListRepresentation__Repr) MapIterator() dms3ld.MapIterator { +func (n *_ListRepresentation__Repr) MapIterator() ld.MapIterator { return &_ListRepresentation__ReprMapItr{n, false} } @@ -5065,9 +5065,9 @@ type _ListRepresentation__ReprMapItr struct { done bool } -func (itr *_ListRepresentation__ReprMapItr) Next() (k dms3ld.Node, v dms3ld.Node, _ error) { +func (itr *_ListRepresentation__ReprMapItr) Next() (k ld.Node, v ld.Node, _ error) { if itr.done { - return nil, nil, dms3ld.ErrIteratorOverread{} + return nil, nil, ld.ErrIteratorOverread{} } switch itr.n.tag { case 1: @@ -5082,7 +5082,7 @@ func (itr *_ListRepresentation__ReprMapItr) Done() bool { return itr.done } -func (_ListRepresentation__Repr) ListIterator() dms3ld.ListIterator { +func (_ListRepresentation__Repr) ListIterator() ld.ListIterator { return nil } func (_ListRepresentation__Repr) Length() int64 { @@ -5109,16 +5109,16 @@ func (_ListRepresentation__Repr) AsString() (string, error) { func (_ListRepresentation__Repr) AsBytes() ([]byte, error) { return mixins.Map{TypeName: "schemadmt.ListRepresentation.Repr"}.AsBytes() } -func (_ListRepresentation__Repr) AsLink() (dms3ld.Link, error) { +func (_ListRepresentation__Repr) AsLink() (ld.Link, error) { return mixins.Map{TypeName: "schemadmt.ListRepresentation.Repr"}.AsLink() } -func (_ListRepresentation__Repr) Prototype() dms3ld.NodePrototype { +func (_ListRepresentation__Repr) Prototype() ld.NodePrototype { return _ListRepresentation__ReprPrototype{} } type _ListRepresentation__ReprPrototype struct{} -func (_ListRepresentation__ReprPrototype) NewBuilder() dms3ld.NodeBuilder { +func (_ListRepresentation__ReprPrototype) NewBuilder() ld.NodeBuilder { var nb _ListRepresentation__ReprBuilder nb.Reset() return &nb @@ -5128,7 +5128,7 @@ type _ListRepresentation__ReprBuilder struct { _ListRepresentation__ReprAssembler } -func (nb *_ListRepresentation__ReprBuilder) Build() dms3ld.Node { +func (nb *_ListRepresentation__ReprBuilder) Build() ld.Node { if *nb.m != schema.Maybe_Value { panic("invalid state: cannot call Build on an assembler that's not finished") } @@ -5163,7 +5163,7 @@ func (na *_ListRepresentation__ReprAssembler) reset() { na.ca = 0 na.cm = schema.Maybe_Absent } -func (na *_ListRepresentation__ReprAssembler) BeginMap(int64) (dms3ld.MapAssembler, error) { +func (na *_ListRepresentation__ReprAssembler) BeginMap(int64) (ld.MapAssembler, error) { switch *na.m { case schema.Maybe_Value, schema.Maybe_Null: panic("invalid state: cannot assign into assembler that's already finished") @@ -5176,7 +5176,7 @@ func (na *_ListRepresentation__ReprAssembler) BeginMap(int64) (dms3ld.MapAssembl } return na, nil } -func (_ListRepresentation__ReprAssembler) BeginList(sizeHint int64) (dms3ld.ListAssembler, error) { +func (_ListRepresentation__ReprAssembler) BeginList(sizeHint int64) (ld.ListAssembler, error) { return mixins.MapAssembler{TypeName: "schemadmt.ListRepresentation.Repr"}.BeginList(0) } func (na *_ListRepresentation__ReprAssembler) AssignNull() error { @@ -5208,10 +5208,10 @@ func (_ListRepresentation__ReprAssembler) AssignString(string) error { func (_ListRepresentation__ReprAssembler) AssignBytes([]byte) error { return mixins.MapAssembler{TypeName: "schemadmt.ListRepresentation.Repr"}.AssignBytes(nil) } -func (_ListRepresentation__ReprAssembler) AssignLink(dms3ld.Link) error { +func (_ListRepresentation__ReprAssembler) AssignLink(ld.Link) error { return mixins.MapAssembler{TypeName: "schemadmt.ListRepresentation.Repr"}.AssignLink(nil) } -func (na *_ListRepresentation__ReprAssembler) AssignNode(v dms3ld.Node) error { +func (na *_ListRepresentation__ReprAssembler) AssignNode(v ld.Node) error { if v.IsNull() { return na.AssignNull() } @@ -5231,8 +5231,8 @@ func (na *_ListRepresentation__ReprAssembler) AssignNode(v dms3ld.Node) error { *na.m = schema.Maybe_Value return nil } - if v.Kind() != dms3ld.Kind_Map { - return dms3ld.ErrWrongKind{TypeName: "schemadmt.ListRepresentation.Repr", MethodName: "AssignNode", AppropriateKind: dms3ld.KindSet_JustMap, ActualKind: v.Kind()} + if v.Kind() != ld.Kind_Map { + return ld.ErrWrongKind{TypeName: "schemadmt.ListRepresentation.Repr", MethodName: "AssignNode", AppropriateKind: ld.KindSet_JustMap, ActualKind: v.Kind()} } itr := v.MapIterator() for !itr.Done() { @@ -5249,7 +5249,7 @@ func (na *_ListRepresentation__ReprAssembler) AssignNode(v dms3ld.Node) error { } return na.Finish() } -func (_ListRepresentation__ReprAssembler) Prototype() dms3ld.NodePrototype { +func (_ListRepresentation__ReprAssembler) Prototype() ld.NodePrototype { return _ListRepresentation__ReprPrototype{} } func (ma *_ListRepresentation__ReprAssembler) valueFinishTidy() bool { @@ -5261,7 +5261,7 @@ func (ma *_ListRepresentation__ReprAssembler) valueFinishTidy() bool { return false } } -func (ma *_ListRepresentation__ReprAssembler) AssembleEntry(k string) (dms3ld.NodeAssembler, error) { +func (ma *_ListRepresentation__ReprAssembler) AssembleEntry(k string) (ld.NodeAssembler, error) { switch ma.state { case maState_initial: // carry on @@ -5288,9 +5288,9 @@ func (ma *_ListRepresentation__ReprAssembler) AssembleEntry(k string) (dms3ld.No ma.ca1.m = &ma.cm return &ma.ca1, nil } - return nil, dms3ld.ErrInvalidKey{TypeName: "schemadmt.ListRepresentation.Repr", Key: &_String{k}} + return nil, ld.ErrInvalidKey{TypeName: "schemadmt.ListRepresentation.Repr", Key: &_String{k}} } -func (ma *_ListRepresentation__ReprAssembler) AssembleKey() dms3ld.NodeAssembler { +func (ma *_ListRepresentation__ReprAssembler) AssembleKey() ld.NodeAssembler { switch ma.state { case maState_initial: // carry on @@ -5308,7 +5308,7 @@ func (ma *_ListRepresentation__ReprAssembler) AssembleKey() dms3ld.NodeAssembler ma.state = maState_midKey return (*_ListRepresentation__ReprKeyAssembler)(ma) } -func (ma *_ListRepresentation__ReprAssembler) AssembleValue() dms3ld.NodeAssembler { +func (ma *_ListRepresentation__ReprAssembler) AssembleValue() ld.NodeAssembler { switch ma.state { case maState_initial: panic("invalid state: AssembleValue cannot be called when no key is primed") @@ -5353,10 +5353,10 @@ func (ma *_ListRepresentation__ReprAssembler) Finish() error { *ma.m = schema.Maybe_Value return nil } -func (ma *_ListRepresentation__ReprAssembler) KeyPrototype() dms3ld.NodePrototype { +func (ma *_ListRepresentation__ReprAssembler) KeyPrototype() ld.NodePrototype { return _String__Prototype{} } -func (ma *_ListRepresentation__ReprAssembler) ValuePrototype(k string) dms3ld.NodePrototype { +func (ma *_ListRepresentation__ReprAssembler) ValuePrototype(k string) ld.NodePrototype { switch k { case "ListRepresentation_List": return _ListRepresentation_List__ReprPrototype{} @@ -5367,10 +5367,10 @@ func (ma *_ListRepresentation__ReprAssembler) ValuePrototype(k string) dms3ld.No type _ListRepresentation__ReprKeyAssembler _ListRepresentation__ReprAssembler -func (_ListRepresentation__ReprKeyAssembler) BeginMap(sizeHint int64) (dms3ld.MapAssembler, error) { +func (_ListRepresentation__ReprKeyAssembler) BeginMap(sizeHint int64) (ld.MapAssembler, error) { return mixins.StringAssembler{TypeName: "schemadmt.ListRepresentation.Repr.KeyAssembler"}.BeginMap(0) } -func (_ListRepresentation__ReprKeyAssembler) BeginList(sizeHint int64) (dms3ld.ListAssembler, error) { +func (_ListRepresentation__ReprKeyAssembler) BeginList(sizeHint int64) (ld.ListAssembler, error) { return mixins.StringAssembler{TypeName: "schemadmt.ListRepresentation.Repr.KeyAssembler"}.BeginList(0) } func (na *_ListRepresentation__ReprKeyAssembler) AssignNull() error { @@ -5399,22 +5399,22 @@ func (ka *_ListRepresentation__ReprKeyAssembler) AssignString(k string) error { ka.state = maState_expectValue return nil } - return dms3ld.ErrInvalidKey{TypeName: "schemadmt.ListRepresentation.Repr", Key: &_String{k}} // TODO: error quality: ErrInvalidUnionDiscriminant ? + return ld.ErrInvalidKey{TypeName: "schemadmt.ListRepresentation.Repr", Key: &_String{k}} // TODO: error quality: ErrInvalidUnionDiscriminant ? } func (_ListRepresentation__ReprKeyAssembler) AssignBytes([]byte) error { return mixins.StringAssembler{TypeName: "schemadmt.ListRepresentation.Repr.KeyAssembler"}.AssignBytes(nil) } -func (_ListRepresentation__ReprKeyAssembler) AssignLink(dms3ld.Link) error { +func (_ListRepresentation__ReprKeyAssembler) AssignLink(ld.Link) error { return mixins.StringAssembler{TypeName: "schemadmt.ListRepresentation.Repr.KeyAssembler"}.AssignLink(nil) } -func (ka *_ListRepresentation__ReprKeyAssembler) AssignNode(v dms3ld.Node) error { +func (ka *_ListRepresentation__ReprKeyAssembler) AssignNode(v ld.Node) error { if v2, err := v.AsString(); err != nil { return err } else { return ka.AssignString(v2) } } -func (_ListRepresentation__ReprKeyAssembler) Prototype() dms3ld.NodePrototype { +func (_ListRepresentation__ReprKeyAssembler) Prototype() ld.NodePrototype { return _String__Prototype{} } @@ -5433,12 +5433,12 @@ func (m MaybeListRepresentation_List) IsAbsent() bool { func (m MaybeListRepresentation_List) Exists() bool { return m.m == schema.Maybe_Value } -func (m MaybeListRepresentation_List) AsNode() dms3ld.Node { +func (m MaybeListRepresentation_List) AsNode() ld.Node { switch m.m { case schema.Maybe_Absent: - return dms3ld.Absent + return ld.Absent case schema.Maybe_Null: - return dms3ld.Null + return ld.Null case schema.Maybe_Value: return m.v default: @@ -5453,32 +5453,32 @@ func (m MaybeListRepresentation_List) Must() ListRepresentation_List { } var () -var _ dms3ld.Node = (ListRepresentation_List)(&_ListRepresentation_List{}) +var _ ld.Node = (ListRepresentation_List)(&_ListRepresentation_List{}) var _ schema.TypedNode = (ListRepresentation_List)(&_ListRepresentation_List{}) -func (ListRepresentation_List) Kind() dms3ld.Kind { - return dms3ld.Kind_Map +func (ListRepresentation_List) Kind() ld.Kind { + return ld.Kind_Map } -func (n ListRepresentation_List) LookupByString(key string) (dms3ld.Node, error) { +func (n ListRepresentation_List) LookupByString(key string) (ld.Node, error) { switch key { default: - return nil, schema.ErrNoSuchField{Type: nil /*TODO*/, Field: dms3ld.PathSegmentOfString(key)} + return nil, schema.ErrNoSuchField{Type: nil /*TODO*/, Field: ld.PathSegmentOfString(key)} } } -func (n ListRepresentation_List) LookupByNode(key dms3ld.Node) (dms3ld.Node, error) { +func (n ListRepresentation_List) LookupByNode(key ld.Node) (ld.Node, error) { ks, err := key.AsString() if err != nil { return nil, err } return n.LookupByString(ks) } -func (ListRepresentation_List) LookupByIndex(idx int64) (dms3ld.Node, error) { +func (ListRepresentation_List) LookupByIndex(idx int64) (ld.Node, error) { return mixins.Map{TypeName: "schemadmt.ListRepresentation_List"}.LookupByIndex(0) } -func (n ListRepresentation_List) LookupBySegment(seg dms3ld.PathSegment) (dms3ld.Node, error) { +func (n ListRepresentation_List) LookupBySegment(seg ld.PathSegment) (ld.Node, error) { return n.LookupByString(seg.String()) } -func (n ListRepresentation_List) MapIterator() dms3ld.MapIterator { +func (n ListRepresentation_List) MapIterator() ld.MapIterator { return &_ListRepresentation_List__MapItr{n, 0} } @@ -5487,15 +5487,15 @@ type _ListRepresentation_List__MapItr struct { idx int } -func (itr *_ListRepresentation_List__MapItr) Next() (k dms3ld.Node, v dms3ld.Node, _ error) { - return nil, nil, dms3ld.ErrIteratorOverread{} +func (itr *_ListRepresentation_List__MapItr) Next() (k ld.Node, v ld.Node, _ error) { + return nil, nil, ld.ErrIteratorOverread{} } func (itr *_ListRepresentation_List__MapItr) Done() bool { return itr.idx >= 0 } -func (ListRepresentation_List) ListIterator() dms3ld.ListIterator { +func (ListRepresentation_List) ListIterator() ld.ListIterator { return nil } func (ListRepresentation_List) Length() int64 { @@ -5522,16 +5522,16 @@ func (ListRepresentation_List) AsString() (string, error) { func (ListRepresentation_List) AsBytes() ([]byte, error) { return mixins.Map{TypeName: "schemadmt.ListRepresentation_List"}.AsBytes() } -func (ListRepresentation_List) AsLink() (dms3ld.Link, error) { +func (ListRepresentation_List) AsLink() (ld.Link, error) { return mixins.Map{TypeName: "schemadmt.ListRepresentation_List"}.AsLink() } -func (ListRepresentation_List) Prototype() dms3ld.NodePrototype { +func (ListRepresentation_List) Prototype() ld.NodePrototype { return _ListRepresentation_List__Prototype{} } type _ListRepresentation_List__Prototype struct{} -func (_ListRepresentation_List__Prototype) NewBuilder() dms3ld.NodeBuilder { +func (_ListRepresentation_List__Prototype) NewBuilder() ld.NodeBuilder { var nb _ListRepresentation_List__Builder nb.Reset() return &nb @@ -5541,7 +5541,7 @@ type _ListRepresentation_List__Builder struct { _ListRepresentation_List__Assembler } -func (nb *_ListRepresentation_List__Builder) Build() dms3ld.Node { +func (nb *_ListRepresentation_List__Builder) Build() ld.Node { if *nb.m != schema.Maybe_Value { panic("invalid state: cannot call Build on an assembler that's not finished") } @@ -5572,7 +5572,7 @@ var ( fieldBits__ListRepresentation_List_sufficient = 0 ) -func (na *_ListRepresentation_List__Assembler) BeginMap(int64) (dms3ld.MapAssembler, error) { +func (na *_ListRepresentation_List__Assembler) BeginMap(int64) (ld.MapAssembler, error) { switch *na.m { case schema.Maybe_Value, schema.Maybe_Null: panic("invalid state: cannot assign into assembler that's already finished") @@ -5585,7 +5585,7 @@ func (na *_ListRepresentation_List__Assembler) BeginMap(int64) (dms3ld.MapAssemb } return na, nil } -func (_ListRepresentation_List__Assembler) BeginList(sizeHint int64) (dms3ld.ListAssembler, error) { +func (_ListRepresentation_List__Assembler) BeginList(sizeHint int64) (ld.ListAssembler, error) { return mixins.MapAssembler{TypeName: "schemadmt.ListRepresentation_List"}.BeginList(0) } func (na *_ListRepresentation_List__Assembler) AssignNull() error { @@ -5617,10 +5617,10 @@ func (_ListRepresentation_List__Assembler) AssignString(string) error { func (_ListRepresentation_List__Assembler) AssignBytes([]byte) error { return mixins.MapAssembler{TypeName: "schemadmt.ListRepresentation_List"}.AssignBytes(nil) } -func (_ListRepresentation_List__Assembler) AssignLink(dms3ld.Link) error { +func (_ListRepresentation_List__Assembler) AssignLink(ld.Link) error { return mixins.MapAssembler{TypeName: "schemadmt.ListRepresentation_List"}.AssignLink(nil) } -func (na *_ListRepresentation_List__Assembler) AssignNode(v dms3ld.Node) error { +func (na *_ListRepresentation_List__Assembler) AssignNode(v ld.Node) error { if v.IsNull() { return na.AssignNull() } @@ -5640,8 +5640,8 @@ func (na *_ListRepresentation_List__Assembler) AssignNode(v dms3ld.Node) error { *na.m = schema.Maybe_Value return nil } - if v.Kind() != dms3ld.Kind_Map { - return dms3ld.ErrWrongKind{TypeName: "schemadmt.ListRepresentation_List", MethodName: "AssignNode", AppropriateKind: dms3ld.KindSet_JustMap, ActualKind: v.Kind()} + if v.Kind() != ld.Kind_Map { + return ld.ErrWrongKind{TypeName: "schemadmt.ListRepresentation_List", MethodName: "AssignNode", AppropriateKind: ld.KindSet_JustMap, ActualKind: v.Kind()} } itr := v.MapIterator() for !itr.Done() { @@ -5658,7 +5658,7 @@ func (na *_ListRepresentation_List__Assembler) AssignNode(v dms3ld.Node) error { } return na.Finish() } -func (_ListRepresentation_List__Assembler) Prototype() dms3ld.NodePrototype { +func (_ListRepresentation_List__Assembler) Prototype() ld.NodePrototype { return _ListRepresentation_List__Prototype{} } func (ma *_ListRepresentation_List__Assembler) valueFinishTidy() bool { @@ -5667,7 +5667,7 @@ func (ma *_ListRepresentation_List__Assembler) valueFinishTidy() bool { panic("unreachable") } } -func (ma *_ListRepresentation_List__Assembler) AssembleEntry(k string) (dms3ld.NodeAssembler, error) { +func (ma *_ListRepresentation_List__Assembler) AssembleEntry(k string) (ld.NodeAssembler, error) { switch ma.state { case maState_initial: // carry on @@ -5682,9 +5682,9 @@ func (ma *_ListRepresentation_List__Assembler) AssembleEntry(k string) (dms3ld.N case maState_finished: panic("invalid state: AssembleEntry cannot be called on an assembler that's already finished") } - return nil, dms3ld.ErrInvalidKey{TypeName: "schemadmt.ListRepresentation_List", Key: &_String{k}} + return nil, ld.ErrInvalidKey{TypeName: "schemadmt.ListRepresentation_List", Key: &_String{k}} } -func (ma *_ListRepresentation_List__Assembler) AssembleKey() dms3ld.NodeAssembler { +func (ma *_ListRepresentation_List__Assembler) AssembleKey() ld.NodeAssembler { switch ma.state { case maState_initial: // carry on @@ -5702,7 +5702,7 @@ func (ma *_ListRepresentation_List__Assembler) AssembleKey() dms3ld.NodeAssemble ma.state = maState_midKey return (*_ListRepresentation_List__KeyAssembler)(ma) } -func (ma *_ListRepresentation_List__Assembler) AssembleValue() dms3ld.NodeAssembler { +func (ma *_ListRepresentation_List__Assembler) AssembleValue() ld.NodeAssembler { switch ma.state { case maState_initial: panic("invalid state: AssembleValue cannot be called when no key is primed") @@ -5737,26 +5737,26 @@ func (ma *_ListRepresentation_List__Assembler) Finish() error { panic("invalid state: Finish cannot be called on an assembler that's already finished") } if ma.s&fieldBits__ListRepresentation_List_sufficient != fieldBits__ListRepresentation_List_sufficient { - err := dms3ld.ErrMissingRequiredField{Missing: make([]string, 0)} + err := ld.ErrMissingRequiredField{Missing: make([]string, 0)} return err } ma.state = maState_finished *ma.m = schema.Maybe_Value return nil } -func (ma *_ListRepresentation_List__Assembler) KeyPrototype() dms3ld.NodePrototype { +func (ma *_ListRepresentation_List__Assembler) KeyPrototype() ld.NodePrototype { return _String__Prototype{} } -func (ma *_ListRepresentation_List__Assembler) ValuePrototype(k string) dms3ld.NodePrototype { +func (ma *_ListRepresentation_List__Assembler) ValuePrototype(k string) ld.NodePrototype { panic("todo structbuilder mapassembler valueprototype") } type _ListRepresentation_List__KeyAssembler _ListRepresentation_List__Assembler -func (_ListRepresentation_List__KeyAssembler) BeginMap(sizeHint int64) (dms3ld.MapAssembler, error) { +func (_ListRepresentation_List__KeyAssembler) BeginMap(sizeHint int64) (ld.MapAssembler, error) { return mixins.StringAssembler{TypeName: "schemadmt.ListRepresentation_List.KeyAssembler"}.BeginMap(0) } -func (_ListRepresentation_List__KeyAssembler) BeginList(sizeHint int64) (dms3ld.ListAssembler, error) { +func (_ListRepresentation_List__KeyAssembler) BeginList(sizeHint int64) (ld.ListAssembler, error) { return mixins.StringAssembler{TypeName: "schemadmt.ListRepresentation_List.KeyAssembler"}.BeginList(0) } func (na *_ListRepresentation_List__KeyAssembler) AssignNull() error { @@ -5777,61 +5777,61 @@ func (ka *_ListRepresentation_List__KeyAssembler) AssignString(k string) error { } switch k { default: - return dms3ld.ErrInvalidKey{TypeName: "schemadmt.ListRepresentation_List", Key: &_String{k}} + return ld.ErrInvalidKey{TypeName: "schemadmt.ListRepresentation_List", Key: &_String{k}} } return nil } func (_ListRepresentation_List__KeyAssembler) AssignBytes([]byte) error { return mixins.StringAssembler{TypeName: "schemadmt.ListRepresentation_List.KeyAssembler"}.AssignBytes(nil) } -func (_ListRepresentation_List__KeyAssembler) AssignLink(dms3ld.Link) error { +func (_ListRepresentation_List__KeyAssembler) AssignLink(ld.Link) error { return mixins.StringAssembler{TypeName: "schemadmt.ListRepresentation_List.KeyAssembler"}.AssignLink(nil) } -func (ka *_ListRepresentation_List__KeyAssembler) AssignNode(v dms3ld.Node) error { +func (ka *_ListRepresentation_List__KeyAssembler) AssignNode(v ld.Node) error { if v2, err := v.AsString(); err != nil { return err } else { return ka.AssignString(v2) } } -func (_ListRepresentation_List__KeyAssembler) Prototype() dms3ld.NodePrototype { +func (_ListRepresentation_List__KeyAssembler) Prototype() ld.NodePrototype { return _String__Prototype{} } func (ListRepresentation_List) Type() schema.Type { return nil /*TODO:typelit*/ } -func (n ListRepresentation_List) Representation() dms3ld.Node { +func (n ListRepresentation_List) Representation() ld.Node { return (*_ListRepresentation_List__Repr)(n) } type _ListRepresentation_List__Repr _ListRepresentation_List var () -var _ dms3ld.Node = &_ListRepresentation_List__Repr{} +var _ ld.Node = &_ListRepresentation_List__Repr{} -func (_ListRepresentation_List__Repr) Kind() dms3ld.Kind { - return dms3ld.Kind_Map +func (_ListRepresentation_List__Repr) Kind() ld.Kind { + return ld.Kind_Map } -func (n *_ListRepresentation_List__Repr) LookupByString(key string) (dms3ld.Node, error) { +func (n *_ListRepresentation_List__Repr) LookupByString(key string) (ld.Node, error) { switch key { default: - return nil, schema.ErrNoSuchField{Type: nil /*TODO*/, Field: dms3ld.PathSegmentOfString(key)} + return nil, schema.ErrNoSuchField{Type: nil /*TODO*/, Field: ld.PathSegmentOfString(key)} } } -func (n *_ListRepresentation_List__Repr) LookupByNode(key dms3ld.Node) (dms3ld.Node, error) { +func (n *_ListRepresentation_List__Repr) LookupByNode(key ld.Node) (ld.Node, error) { ks, err := key.AsString() if err != nil { return nil, err } return n.LookupByString(ks) } -func (_ListRepresentation_List__Repr) LookupByIndex(idx int64) (dms3ld.Node, error) { +func (_ListRepresentation_List__Repr) LookupByIndex(idx int64) (ld.Node, error) { return mixins.Map{TypeName: "schemadmt.ListRepresentation_List.Repr"}.LookupByIndex(0) } -func (n _ListRepresentation_List__Repr) LookupBySegment(seg dms3ld.PathSegment) (dms3ld.Node, error) { +func (n _ListRepresentation_List__Repr) LookupBySegment(seg ld.PathSegment) (ld.Node, error) { return n.LookupByString(seg.String()) } -func (n *_ListRepresentation_List__Repr) MapIterator() dms3ld.MapIterator { +func (n *_ListRepresentation_List__Repr) MapIterator() ld.MapIterator { return &_ListRepresentation_List__ReprMapItr{n, 0} } @@ -5840,14 +5840,14 @@ type _ListRepresentation_List__ReprMapItr struct { idx int } -func (itr *_ListRepresentation_List__ReprMapItr) Next() (k dms3ld.Node, v dms3ld.Node, _ error) { - return nil, nil, dms3ld.ErrIteratorOverread{} +func (itr *_ListRepresentation_List__ReprMapItr) Next() (k ld.Node, v ld.Node, _ error) { + return nil, nil, ld.ErrIteratorOverread{} } func (itr *_ListRepresentation_List__ReprMapItr) Done() bool { return itr.idx >= 0 } -func (_ListRepresentation_List__Repr) ListIterator() dms3ld.ListIterator { +func (_ListRepresentation_List__Repr) ListIterator() ld.ListIterator { return nil } func (rn *_ListRepresentation_List__Repr) Length() int64 { @@ -5875,16 +5875,16 @@ func (_ListRepresentation_List__Repr) AsString() (string, error) { func (_ListRepresentation_List__Repr) AsBytes() ([]byte, error) { return mixins.Map{TypeName: "schemadmt.ListRepresentation_List.Repr"}.AsBytes() } -func (_ListRepresentation_List__Repr) AsLink() (dms3ld.Link, error) { +func (_ListRepresentation_List__Repr) AsLink() (ld.Link, error) { return mixins.Map{TypeName: "schemadmt.ListRepresentation_List.Repr"}.AsLink() } -func (_ListRepresentation_List__Repr) Prototype() dms3ld.NodePrototype { +func (_ListRepresentation_List__Repr) Prototype() ld.NodePrototype { return _ListRepresentation_List__ReprPrototype{} } type _ListRepresentation_List__ReprPrototype struct{} -func (_ListRepresentation_List__ReprPrototype) NewBuilder() dms3ld.NodeBuilder { +func (_ListRepresentation_List__ReprPrototype) NewBuilder() ld.NodeBuilder { var nb _ListRepresentation_List__ReprBuilder nb.Reset() return &nb @@ -5894,7 +5894,7 @@ type _ListRepresentation_List__ReprBuilder struct { _ListRepresentation_List__ReprAssembler } -func (nb *_ListRepresentation_List__ReprBuilder) Build() dms3ld.Node { +func (nb *_ListRepresentation_List__ReprBuilder) Build() ld.Node { if *nb.m != schema.Maybe_Value { panic("invalid state: cannot call Build on an assembler that's not finished") } @@ -5920,7 +5920,7 @@ func (na *_ListRepresentation_List__ReprAssembler) reset() { na.state = maState_initial na.s = 0 } -func (na *_ListRepresentation_List__ReprAssembler) BeginMap(int64) (dms3ld.MapAssembler, error) { +func (na *_ListRepresentation_List__ReprAssembler) BeginMap(int64) (ld.MapAssembler, error) { switch *na.m { case schema.Maybe_Value, schema.Maybe_Null: panic("invalid state: cannot assign into assembler that's already finished") @@ -5933,7 +5933,7 @@ func (na *_ListRepresentation_List__ReprAssembler) BeginMap(int64) (dms3ld.MapAs } return na, nil } -func (_ListRepresentation_List__ReprAssembler) BeginList(sizeHint int64) (dms3ld.ListAssembler, error) { +func (_ListRepresentation_List__ReprAssembler) BeginList(sizeHint int64) (ld.ListAssembler, error) { return mixins.MapAssembler{TypeName: "schemadmt.ListRepresentation_List.Repr"}.BeginList(0) } func (na *_ListRepresentation_List__ReprAssembler) AssignNull() error { @@ -5965,10 +5965,10 @@ func (_ListRepresentation_List__ReprAssembler) AssignString(string) error { func (_ListRepresentation_List__ReprAssembler) AssignBytes([]byte) error { return mixins.MapAssembler{TypeName: "schemadmt.ListRepresentation_List.Repr"}.AssignBytes(nil) } -func (_ListRepresentation_List__ReprAssembler) AssignLink(dms3ld.Link) error { +func (_ListRepresentation_List__ReprAssembler) AssignLink(ld.Link) error { return mixins.MapAssembler{TypeName: "schemadmt.ListRepresentation_List.Repr"}.AssignLink(nil) } -func (na *_ListRepresentation_List__ReprAssembler) AssignNode(v dms3ld.Node) error { +func (na *_ListRepresentation_List__ReprAssembler) AssignNode(v ld.Node) error { if v.IsNull() { return na.AssignNull() } @@ -5988,8 +5988,8 @@ func (na *_ListRepresentation_List__ReprAssembler) AssignNode(v dms3ld.Node) err *na.m = schema.Maybe_Value return nil } - if v.Kind() != dms3ld.Kind_Map { - return dms3ld.ErrWrongKind{TypeName: "schemadmt.ListRepresentation_List.Repr", MethodName: "AssignNode", AppropriateKind: dms3ld.KindSet_JustMap, ActualKind: v.Kind()} + if v.Kind() != ld.Kind_Map { + return ld.ErrWrongKind{TypeName: "schemadmt.ListRepresentation_List.Repr", MethodName: "AssignNode", AppropriateKind: ld.KindSet_JustMap, ActualKind: v.Kind()} } itr := v.MapIterator() for !itr.Done() { @@ -6006,7 +6006,7 @@ func (na *_ListRepresentation_List__ReprAssembler) AssignNode(v dms3ld.Node) err } return na.Finish() } -func (_ListRepresentation_List__ReprAssembler) Prototype() dms3ld.NodePrototype { +func (_ListRepresentation_List__ReprAssembler) Prototype() ld.NodePrototype { return _ListRepresentation_List__ReprPrototype{} } func (ma *_ListRepresentation_List__ReprAssembler) valueFinishTidy() bool { @@ -6015,7 +6015,7 @@ func (ma *_ListRepresentation_List__ReprAssembler) valueFinishTidy() bool { panic("unreachable") } } -func (ma *_ListRepresentation_List__ReprAssembler) AssembleEntry(k string) (dms3ld.NodeAssembler, error) { +func (ma *_ListRepresentation_List__ReprAssembler) AssembleEntry(k string) (ld.NodeAssembler, error) { switch ma.state { case maState_initial: // carry on @@ -6030,9 +6030,9 @@ func (ma *_ListRepresentation_List__ReprAssembler) AssembleEntry(k string) (dms3 case maState_finished: panic("invalid state: AssembleEntry cannot be called on an assembler that's already finished") } - return nil, dms3ld.ErrInvalidKey{TypeName: "schemadmt.ListRepresentation_List.Repr", Key: &_String{k}} + return nil, ld.ErrInvalidKey{TypeName: "schemadmt.ListRepresentation_List.Repr", Key: &_String{k}} } -func (ma *_ListRepresentation_List__ReprAssembler) AssembleKey() dms3ld.NodeAssembler { +func (ma *_ListRepresentation_List__ReprAssembler) AssembleKey() ld.NodeAssembler { switch ma.state { case maState_initial: // carry on @@ -6050,7 +6050,7 @@ func (ma *_ListRepresentation_List__ReprAssembler) AssembleKey() dms3ld.NodeAsse ma.state = maState_midKey return (*_ListRepresentation_List__ReprKeyAssembler)(ma) } -func (ma *_ListRepresentation_List__ReprAssembler) AssembleValue() dms3ld.NodeAssembler { +func (ma *_ListRepresentation_List__ReprAssembler) AssembleValue() ld.NodeAssembler { switch ma.state { case maState_initial: panic("invalid state: AssembleValue cannot be called when no key is primed") @@ -6085,26 +6085,26 @@ func (ma *_ListRepresentation_List__ReprAssembler) Finish() error { panic("invalid state: Finish cannot be called on an assembler that's already finished") } if ma.s&fieldBits__ListRepresentation_List_sufficient != fieldBits__ListRepresentation_List_sufficient { - err := dms3ld.ErrMissingRequiredField{Missing: make([]string, 0)} + err := ld.ErrMissingRequiredField{Missing: make([]string, 0)} return err } ma.state = maState_finished *ma.m = schema.Maybe_Value return nil } -func (ma *_ListRepresentation_List__ReprAssembler) KeyPrototype() dms3ld.NodePrototype { +func (ma *_ListRepresentation_List__ReprAssembler) KeyPrototype() ld.NodePrototype { return _String__Prototype{} } -func (ma *_ListRepresentation_List__ReprAssembler) ValuePrototype(k string) dms3ld.NodePrototype { +func (ma *_ListRepresentation_List__ReprAssembler) ValuePrototype(k string) ld.NodePrototype { panic("todo structbuilder mapassembler repr valueprototype") } type _ListRepresentation_List__ReprKeyAssembler _ListRepresentation_List__ReprAssembler -func (_ListRepresentation_List__ReprKeyAssembler) BeginMap(sizeHint int64) (dms3ld.MapAssembler, error) { +func (_ListRepresentation_List__ReprKeyAssembler) BeginMap(sizeHint int64) (ld.MapAssembler, error) { return mixins.StringAssembler{TypeName: "schemadmt.ListRepresentation_List.Repr.KeyAssembler"}.BeginMap(0) } -func (_ListRepresentation_List__ReprKeyAssembler) BeginList(sizeHint int64) (dms3ld.ListAssembler, error) { +func (_ListRepresentation_List__ReprKeyAssembler) BeginList(sizeHint int64) (ld.ListAssembler, error) { return mixins.StringAssembler{TypeName: "schemadmt.ListRepresentation_List.Repr.KeyAssembler"}.BeginList(0) } func (na *_ListRepresentation_List__ReprKeyAssembler) AssignNull() error { @@ -6123,22 +6123,22 @@ func (ka *_ListRepresentation_List__ReprKeyAssembler) AssignString(k string) err if ka.state != maState_midKey { panic("misuse: KeyAssembler held beyond its valid lifetime") } - return dms3ld.ErrInvalidKey{TypeName: "schemadmt.ListRepresentation_List.Repr", Key: &_String{k}} + return ld.ErrInvalidKey{TypeName: "schemadmt.ListRepresentation_List.Repr", Key: &_String{k}} } func (_ListRepresentation_List__ReprKeyAssembler) AssignBytes([]byte) error { return mixins.StringAssembler{TypeName: "schemadmt.ListRepresentation_List.Repr.KeyAssembler"}.AssignBytes(nil) } -func (_ListRepresentation_List__ReprKeyAssembler) AssignLink(dms3ld.Link) error { +func (_ListRepresentation_List__ReprKeyAssembler) AssignLink(ld.Link) error { return mixins.StringAssembler{TypeName: "schemadmt.ListRepresentation_List.Repr.KeyAssembler"}.AssignLink(nil) } -func (ka *_ListRepresentation_List__ReprKeyAssembler) AssignNode(v dms3ld.Node) error { +func (ka *_ListRepresentation_List__ReprKeyAssembler) AssignNode(v ld.Node) error { if v2, err := v.AsString(); err != nil { return err } else { return ka.AssignString(v2) } } -func (_ListRepresentation_List__ReprKeyAssembler) Prototype() dms3ld.NodePrototype { +func (_ListRepresentation_List__ReprKeyAssembler) Prototype() ld.NodePrototype { return _String__Prototype{} } @@ -6199,12 +6199,12 @@ func (m MaybeList__FieldName) IsAbsent() bool { func (m MaybeList__FieldName) Exists() bool { return m.m == schema.Maybe_Value } -func (m MaybeList__FieldName) AsNode() dms3ld.Node { +func (m MaybeList__FieldName) AsNode() ld.Node { switch m.m { case schema.Maybe_Absent: - return dms3ld.Absent + return ld.Absent case schema.Maybe_Null: - return dms3ld.Null + return ld.Null case schema.Maybe_Value: return &m.v default: @@ -6218,40 +6218,40 @@ func (m MaybeList__FieldName) Must() List__FieldName { return &m.v } -var _ dms3ld.Node = (List__FieldName)(&_List__FieldName{}) +var _ ld.Node = (List__FieldName)(&_List__FieldName{}) var _ schema.TypedNode = (List__FieldName)(&_List__FieldName{}) -func (List__FieldName) Kind() dms3ld.Kind { - return dms3ld.Kind_List +func (List__FieldName) Kind() ld.Kind { + return ld.Kind_List } -func (List__FieldName) LookupByString(string) (dms3ld.Node, error) { +func (List__FieldName) LookupByString(string) (ld.Node, error) { return mixins.List{TypeName: "schemadmt.List__FieldName"}.LookupByString("") } -func (n List__FieldName) LookupByNode(k dms3ld.Node) (dms3ld.Node, error) { +func (n List__FieldName) LookupByNode(k ld.Node) (ld.Node, error) { idx, err := k.AsInt() if err != nil { return nil, err } return n.LookupByIndex(idx) } -func (n List__FieldName) LookupByIndex(idx int64) (dms3ld.Node, error) { +func (n List__FieldName) LookupByIndex(idx int64) (ld.Node, error) { if n.Length() <= idx { - return nil, dms3ld.ErrNotExists{Segment: dms3ld.PathSegmentOfInt(idx)} + return nil, ld.ErrNotExists{Segment: ld.PathSegmentOfInt(idx)} } v := &n.x[idx] return v, nil } -func (n List__FieldName) LookupBySegment(seg dms3ld.PathSegment) (dms3ld.Node, error) { +func (n List__FieldName) LookupBySegment(seg ld.PathSegment) (ld.Node, error) { i, err := seg.Index() if err != nil { - return nil, dms3ld.ErrInvalidSegmentForList{TypeName: "schemadmt.List__FieldName", TroubleSegment: seg, Reason: err} + return nil, ld.ErrInvalidSegmentForList{TypeName: "schemadmt.List__FieldName", TroubleSegment: seg, Reason: err} } return n.LookupByIndex(i) } -func (List__FieldName) MapIterator() dms3ld.MapIterator { +func (List__FieldName) MapIterator() ld.MapIterator { return nil } -func (n List__FieldName) ListIterator() dms3ld.ListIterator { +func (n List__FieldName) ListIterator() ld.ListIterator { return &_List__FieldName__ListItr{n, 0} } @@ -6260,9 +6260,9 @@ type _List__FieldName__ListItr struct { idx int } -func (itr *_List__FieldName__ListItr) Next() (idx int64, v dms3ld.Node, _ error) { +func (itr *_List__FieldName__ListItr) Next() (idx int64, v ld.Node, _ error) { if itr.idx >= len(itr.n.x) { - return -1, nil, dms3ld.ErrIteratorOverread{} + return -1, nil, ld.ErrIteratorOverread{} } idx = int64(itr.idx) x := &itr.n.x[itr.idx] @@ -6298,16 +6298,16 @@ func (List__FieldName) AsString() (string, error) { func (List__FieldName) AsBytes() ([]byte, error) { return mixins.List{TypeName: "schemadmt.List__FieldName"}.AsBytes() } -func (List__FieldName) AsLink() (dms3ld.Link, error) { +func (List__FieldName) AsLink() (ld.Link, error) { return mixins.List{TypeName: "schemadmt.List__FieldName"}.AsLink() } -func (List__FieldName) Prototype() dms3ld.NodePrototype { +func (List__FieldName) Prototype() ld.NodePrototype { return _List__FieldName__Prototype{} } type _List__FieldName__Prototype struct{} -func (_List__FieldName__Prototype) NewBuilder() dms3ld.NodeBuilder { +func (_List__FieldName__Prototype) NewBuilder() ld.NodeBuilder { var nb _List__FieldName__Builder nb.Reset() return &nb @@ -6317,7 +6317,7 @@ type _List__FieldName__Builder struct { _List__FieldName__Assembler } -func (nb *_List__FieldName__Builder) Build() dms3ld.Node { +func (nb *_List__FieldName__Builder) Build() ld.Node { if *nb.m != schema.Maybe_Value { panic("invalid state: cannot call Build on an assembler that's not finished") } @@ -6342,10 +6342,10 @@ func (na *_List__FieldName__Assembler) reset() { na.state = laState_initial na.va.reset() } -func (_List__FieldName__Assembler) BeginMap(sizeHint int64) (dms3ld.MapAssembler, error) { +func (_List__FieldName__Assembler) BeginMap(sizeHint int64) (ld.MapAssembler, error) { return mixins.ListAssembler{TypeName: "schemadmt.List__FieldName"}.BeginMap(0) } -func (na *_List__FieldName__Assembler) BeginList(sizeHint int64) (dms3ld.ListAssembler, error) { +func (na *_List__FieldName__Assembler) BeginList(sizeHint int64) (ld.ListAssembler, error) { switch *na.m { case schema.Maybe_Value, schema.Maybe_Null: panic("invalid state: cannot assign into assembler that's already finished") @@ -6390,10 +6390,10 @@ func (_List__FieldName__Assembler) AssignString(string) error { func (_List__FieldName__Assembler) AssignBytes([]byte) error { return mixins.ListAssembler{TypeName: "schemadmt.List__FieldName"}.AssignBytes(nil) } -func (_List__FieldName__Assembler) AssignLink(dms3ld.Link) error { +func (_List__FieldName__Assembler) AssignLink(ld.Link) error { return mixins.ListAssembler{TypeName: "schemadmt.List__FieldName"}.AssignLink(nil) } -func (na *_List__FieldName__Assembler) AssignNode(v dms3ld.Node) error { +func (na *_List__FieldName__Assembler) AssignNode(v ld.Node) error { if v.IsNull() { return na.AssignNull() } @@ -6408,8 +6408,8 @@ func (na *_List__FieldName__Assembler) AssignNode(v dms3ld.Node) error { *na.m = schema.Maybe_Value return nil } - if v.Kind() != dms3ld.Kind_List { - return dms3ld.ErrWrongKind{TypeName: "schemadmt.List__FieldName", MethodName: "AssignNode", AppropriateKind: dms3ld.KindSet_JustList, ActualKind: v.Kind()} + if v.Kind() != ld.Kind_List { + return ld.ErrWrongKind{TypeName: "schemadmt.List__FieldName", MethodName: "AssignNode", AppropriateKind: ld.KindSet_JustList, ActualKind: v.Kind()} } itr := v.ListIterator() for !itr.Done() { @@ -6423,7 +6423,7 @@ func (na *_List__FieldName__Assembler) AssignNode(v dms3ld.Node) error { } return na.Finish() } -func (_List__FieldName__Assembler) Prototype() dms3ld.NodePrototype { +func (_List__FieldName__Assembler) Prototype() ld.NodePrototype { return _List__FieldName__Prototype{} } func (la *_List__FieldName__Assembler) valueFinishTidy() bool { @@ -6438,7 +6438,7 @@ func (la *_List__FieldName__Assembler) valueFinishTidy() bool { return false } } -func (la *_List__FieldName__Assembler) AssembleValue() dms3ld.NodeAssembler { +func (la *_List__FieldName__Assembler) AssembleValue() ld.NodeAssembler { switch la.state { case laState_initial: // carry on @@ -6471,59 +6471,59 @@ func (la *_List__FieldName__Assembler) Finish() error { *la.m = schema.Maybe_Value return nil } -func (la *_List__FieldName__Assembler) ValuePrototype(_ int64) dms3ld.NodePrototype { +func (la *_List__FieldName__Assembler) ValuePrototype(_ int64) ld.NodePrototype { return _FieldName__Prototype{} } func (List__FieldName) Type() schema.Type { return nil /*TODO:typelit*/ } -func (n List__FieldName) Representation() dms3ld.Node { +func (n List__FieldName) Representation() ld.Node { return (*_List__FieldName__Repr)(n) } type _List__FieldName__Repr _List__FieldName -var _ dms3ld.Node = &_List__FieldName__Repr{} +var _ ld.Node = &_List__FieldName__Repr{} -func (_List__FieldName__Repr) Kind() dms3ld.Kind { - return dms3ld.Kind_List +func (_List__FieldName__Repr) Kind() ld.Kind { + return ld.Kind_List } -func (_List__FieldName__Repr) LookupByString(string) (dms3ld.Node, error) { +func (_List__FieldName__Repr) LookupByString(string) (ld.Node, error) { return mixins.List{TypeName: "schemadmt.List__FieldName.Repr"}.LookupByString("") } -func (nr *_List__FieldName__Repr) LookupByNode(k dms3ld.Node) (dms3ld.Node, error) { +func (nr *_List__FieldName__Repr) LookupByNode(k ld.Node) (ld.Node, error) { v, err := (List__FieldName)(nr).LookupByNode(k) - if err != nil || v == dms3ld.Null { + if err != nil || v == ld.Null { return v, err } return v.(FieldName).Representation(), nil } -func (nr *_List__FieldName__Repr) LookupByIndex(idx int64) (dms3ld.Node, error) { +func (nr *_List__FieldName__Repr) LookupByIndex(idx int64) (ld.Node, error) { v, err := (List__FieldName)(nr).LookupByIndex(idx) - if err != nil || v == dms3ld.Null { + if err != nil || v == ld.Null { return v, err } return v.(FieldName).Representation(), nil } -func (n _List__FieldName__Repr) LookupBySegment(seg dms3ld.PathSegment) (dms3ld.Node, error) { +func (n _List__FieldName__Repr) LookupBySegment(seg ld.PathSegment) (ld.Node, error) { i, err := seg.Index() if err != nil { - return nil, dms3ld.ErrInvalidSegmentForList{TypeName: "schemadmt.List__FieldName.Repr", TroubleSegment: seg, Reason: err} + return nil, ld.ErrInvalidSegmentForList{TypeName: "schemadmt.List__FieldName.Repr", TroubleSegment: seg, Reason: err} } return n.LookupByIndex(i) } -func (_List__FieldName__Repr) MapIterator() dms3ld.MapIterator { +func (_List__FieldName__Repr) MapIterator() ld.MapIterator { return nil } -func (nr *_List__FieldName__Repr) ListIterator() dms3ld.ListIterator { +func (nr *_List__FieldName__Repr) ListIterator() ld.ListIterator { return &_List__FieldName__ReprListItr{(List__FieldName)(nr), 0} } type _List__FieldName__ReprListItr _List__FieldName__ListItr -func (itr *_List__FieldName__ReprListItr) Next() (idx int64, v dms3ld.Node, err error) { +func (itr *_List__FieldName__ReprListItr) Next() (idx int64, v ld.Node, err error) { idx, v, err = (*_List__FieldName__ListItr)(itr).Next() - if err != nil || v == dms3ld.Null { + if err != nil || v == ld.Null { return } return idx, v.(FieldName).Representation(), nil @@ -6556,16 +6556,16 @@ func (_List__FieldName__Repr) AsString() (string, error) { func (_List__FieldName__Repr) AsBytes() ([]byte, error) { return mixins.List{TypeName: "schemadmt.List__FieldName.Repr"}.AsBytes() } -func (_List__FieldName__Repr) AsLink() (dms3ld.Link, error) { +func (_List__FieldName__Repr) AsLink() (ld.Link, error) { return mixins.List{TypeName: "schemadmt.List__FieldName.Repr"}.AsLink() } -func (_List__FieldName__Repr) Prototype() dms3ld.NodePrototype { +func (_List__FieldName__Repr) Prototype() ld.NodePrototype { return _List__FieldName__ReprPrototype{} } type _List__FieldName__ReprPrototype struct{} -func (_List__FieldName__ReprPrototype) NewBuilder() dms3ld.NodeBuilder { +func (_List__FieldName__ReprPrototype) NewBuilder() ld.NodeBuilder { var nb _List__FieldName__ReprBuilder nb.Reset() return &nb @@ -6575,7 +6575,7 @@ type _List__FieldName__ReprBuilder struct { _List__FieldName__ReprAssembler } -func (nb *_List__FieldName__ReprBuilder) Build() dms3ld.Node { +func (nb *_List__FieldName__ReprBuilder) Build() ld.Node { if *nb.m != schema.Maybe_Value { panic("invalid state: cannot call Build on an assembler that's not finished") } @@ -6600,10 +6600,10 @@ func (na *_List__FieldName__ReprAssembler) reset() { na.state = laState_initial na.va.reset() } -func (_List__FieldName__ReprAssembler) BeginMap(sizeHint int64) (dms3ld.MapAssembler, error) { +func (_List__FieldName__ReprAssembler) BeginMap(sizeHint int64) (ld.MapAssembler, error) { return mixins.ListAssembler{TypeName: "schemadmt.List__FieldName.Repr"}.BeginMap(0) } -func (na *_List__FieldName__ReprAssembler) BeginList(sizeHint int64) (dms3ld.ListAssembler, error) { +func (na *_List__FieldName__ReprAssembler) BeginList(sizeHint int64) (ld.ListAssembler, error) { switch *na.m { case schema.Maybe_Value, schema.Maybe_Null: panic("invalid state: cannot assign into assembler that's already finished") @@ -6648,10 +6648,10 @@ func (_List__FieldName__ReprAssembler) AssignString(string) error { func (_List__FieldName__ReprAssembler) AssignBytes([]byte) error { return mixins.ListAssembler{TypeName: "schemadmt.List__FieldName.Repr"}.AssignBytes(nil) } -func (_List__FieldName__ReprAssembler) AssignLink(dms3ld.Link) error { +func (_List__FieldName__ReprAssembler) AssignLink(ld.Link) error { return mixins.ListAssembler{TypeName: "schemadmt.List__FieldName.Repr"}.AssignLink(nil) } -func (na *_List__FieldName__ReprAssembler) AssignNode(v dms3ld.Node) error { +func (na *_List__FieldName__ReprAssembler) AssignNode(v ld.Node) error { if v.IsNull() { return na.AssignNull() } @@ -6666,8 +6666,8 @@ func (na *_List__FieldName__ReprAssembler) AssignNode(v dms3ld.Node) error { *na.m = schema.Maybe_Value return nil } - if v.Kind() != dms3ld.Kind_List { - return dms3ld.ErrWrongKind{TypeName: "schemadmt.List__FieldName.Repr", MethodName: "AssignNode", AppropriateKind: dms3ld.KindSet_JustList, ActualKind: v.Kind()} + if v.Kind() != ld.Kind_List { + return ld.ErrWrongKind{TypeName: "schemadmt.List__FieldName.Repr", MethodName: "AssignNode", AppropriateKind: ld.KindSet_JustList, ActualKind: v.Kind()} } itr := v.ListIterator() for !itr.Done() { @@ -6681,7 +6681,7 @@ func (na *_List__FieldName__ReprAssembler) AssignNode(v dms3ld.Node) error { } return na.Finish() } -func (_List__FieldName__ReprAssembler) Prototype() dms3ld.NodePrototype { +func (_List__FieldName__ReprAssembler) Prototype() ld.NodePrototype { return _List__FieldName__ReprPrototype{} } func (la *_List__FieldName__ReprAssembler) valueFinishTidy() bool { @@ -6696,7 +6696,7 @@ func (la *_List__FieldName__ReprAssembler) valueFinishTidy() bool { return false } } -func (la *_List__FieldName__ReprAssembler) AssembleValue() dms3ld.NodeAssembler { +func (la *_List__FieldName__ReprAssembler) AssembleValue() ld.NodeAssembler { switch la.state { case laState_initial: // carry on @@ -6729,7 +6729,7 @@ func (la *_List__FieldName__ReprAssembler) Finish() error { *la.m = schema.Maybe_Value return nil } -func (la *_List__FieldName__ReprAssembler) ValuePrototype(_ int64) dms3ld.NodePrototype { +func (la *_List__FieldName__ReprAssembler) ValuePrototype(_ int64) ld.NodePrototype { return _FieldName__ReprPrototype{} } @@ -6790,12 +6790,12 @@ func (m MaybeList__TypeName) IsAbsent() bool { func (m MaybeList__TypeName) Exists() bool { return m.m == schema.Maybe_Value } -func (m MaybeList__TypeName) AsNode() dms3ld.Node { +func (m MaybeList__TypeName) AsNode() ld.Node { switch m.m { case schema.Maybe_Absent: - return dms3ld.Absent + return ld.Absent case schema.Maybe_Null: - return dms3ld.Null + return ld.Null case schema.Maybe_Value: return &m.v default: @@ -6809,40 +6809,40 @@ func (m MaybeList__TypeName) Must() List__TypeName { return &m.v } -var _ dms3ld.Node = (List__TypeName)(&_List__TypeName{}) +var _ ld.Node = (List__TypeName)(&_List__TypeName{}) var _ schema.TypedNode = (List__TypeName)(&_List__TypeName{}) -func (List__TypeName) Kind() dms3ld.Kind { - return dms3ld.Kind_List +func (List__TypeName) Kind() ld.Kind { + return ld.Kind_List } -func (List__TypeName) LookupByString(string) (dms3ld.Node, error) { +func (List__TypeName) LookupByString(string) (ld.Node, error) { return mixins.List{TypeName: "schemadmt.List__TypeName"}.LookupByString("") } -func (n List__TypeName) LookupByNode(k dms3ld.Node) (dms3ld.Node, error) { +func (n List__TypeName) LookupByNode(k ld.Node) (ld.Node, error) { idx, err := k.AsInt() if err != nil { return nil, err } return n.LookupByIndex(idx) } -func (n List__TypeName) LookupByIndex(idx int64) (dms3ld.Node, error) { +func (n List__TypeName) LookupByIndex(idx int64) (ld.Node, error) { if n.Length() <= idx { - return nil, dms3ld.ErrNotExists{Segment: dms3ld.PathSegmentOfInt(idx)} + return nil, ld.ErrNotExists{Segment: ld.PathSegmentOfInt(idx)} } v := &n.x[idx] return v, nil } -func (n List__TypeName) LookupBySegment(seg dms3ld.PathSegment) (dms3ld.Node, error) { +func (n List__TypeName) LookupBySegment(seg ld.PathSegment) (ld.Node, error) { i, err := seg.Index() if err != nil { - return nil, dms3ld.ErrInvalidSegmentForList{TypeName: "schemadmt.List__TypeName", TroubleSegment: seg, Reason: err} + return nil, ld.ErrInvalidSegmentForList{TypeName: "schemadmt.List__TypeName", TroubleSegment: seg, Reason: err} } return n.LookupByIndex(i) } -func (List__TypeName) MapIterator() dms3ld.MapIterator { +func (List__TypeName) MapIterator() ld.MapIterator { return nil } -func (n List__TypeName) ListIterator() dms3ld.ListIterator { +func (n List__TypeName) ListIterator() ld.ListIterator { return &_List__TypeName__ListItr{n, 0} } @@ -6851,9 +6851,9 @@ type _List__TypeName__ListItr struct { idx int } -func (itr *_List__TypeName__ListItr) Next() (idx int64, v dms3ld.Node, _ error) { +func (itr *_List__TypeName__ListItr) Next() (idx int64, v ld.Node, _ error) { if itr.idx >= len(itr.n.x) { - return -1, nil, dms3ld.ErrIteratorOverread{} + return -1, nil, ld.ErrIteratorOverread{} } idx = int64(itr.idx) x := &itr.n.x[itr.idx] @@ -6889,16 +6889,16 @@ func (List__TypeName) AsString() (string, error) { func (List__TypeName) AsBytes() ([]byte, error) { return mixins.List{TypeName: "schemadmt.List__TypeName"}.AsBytes() } -func (List__TypeName) AsLink() (dms3ld.Link, error) { +func (List__TypeName) AsLink() (ld.Link, error) { return mixins.List{TypeName: "schemadmt.List__TypeName"}.AsLink() } -func (List__TypeName) Prototype() dms3ld.NodePrototype { +func (List__TypeName) Prototype() ld.NodePrototype { return _List__TypeName__Prototype{} } type _List__TypeName__Prototype struct{} -func (_List__TypeName__Prototype) NewBuilder() dms3ld.NodeBuilder { +func (_List__TypeName__Prototype) NewBuilder() ld.NodeBuilder { var nb _List__TypeName__Builder nb.Reset() return &nb @@ -6908,7 +6908,7 @@ type _List__TypeName__Builder struct { _List__TypeName__Assembler } -func (nb *_List__TypeName__Builder) Build() dms3ld.Node { +func (nb *_List__TypeName__Builder) Build() ld.Node { if *nb.m != schema.Maybe_Value { panic("invalid state: cannot call Build on an assembler that's not finished") } @@ -6933,10 +6933,10 @@ func (na *_List__TypeName__Assembler) reset() { na.state = laState_initial na.va.reset() } -func (_List__TypeName__Assembler) BeginMap(sizeHint int64) (dms3ld.MapAssembler, error) { +func (_List__TypeName__Assembler) BeginMap(sizeHint int64) (ld.MapAssembler, error) { return mixins.ListAssembler{TypeName: "schemadmt.List__TypeName"}.BeginMap(0) } -func (na *_List__TypeName__Assembler) BeginList(sizeHint int64) (dms3ld.ListAssembler, error) { +func (na *_List__TypeName__Assembler) BeginList(sizeHint int64) (ld.ListAssembler, error) { switch *na.m { case schema.Maybe_Value, schema.Maybe_Null: panic("invalid state: cannot assign into assembler that's already finished") @@ -6981,10 +6981,10 @@ func (_List__TypeName__Assembler) AssignString(string) error { func (_List__TypeName__Assembler) AssignBytes([]byte) error { return mixins.ListAssembler{TypeName: "schemadmt.List__TypeName"}.AssignBytes(nil) } -func (_List__TypeName__Assembler) AssignLink(dms3ld.Link) error { +func (_List__TypeName__Assembler) AssignLink(ld.Link) error { return mixins.ListAssembler{TypeName: "schemadmt.List__TypeName"}.AssignLink(nil) } -func (na *_List__TypeName__Assembler) AssignNode(v dms3ld.Node) error { +func (na *_List__TypeName__Assembler) AssignNode(v ld.Node) error { if v.IsNull() { return na.AssignNull() } @@ -6999,8 +6999,8 @@ func (na *_List__TypeName__Assembler) AssignNode(v dms3ld.Node) error { *na.m = schema.Maybe_Value return nil } - if v.Kind() != dms3ld.Kind_List { - return dms3ld.ErrWrongKind{TypeName: "schemadmt.List__TypeName", MethodName: "AssignNode", AppropriateKind: dms3ld.KindSet_JustList, ActualKind: v.Kind()} + if v.Kind() != ld.Kind_List { + return ld.ErrWrongKind{TypeName: "schemadmt.List__TypeName", MethodName: "AssignNode", AppropriateKind: ld.KindSet_JustList, ActualKind: v.Kind()} } itr := v.ListIterator() for !itr.Done() { @@ -7014,7 +7014,7 @@ func (na *_List__TypeName__Assembler) AssignNode(v dms3ld.Node) error { } return na.Finish() } -func (_List__TypeName__Assembler) Prototype() dms3ld.NodePrototype { +func (_List__TypeName__Assembler) Prototype() ld.NodePrototype { return _List__TypeName__Prototype{} } func (la *_List__TypeName__Assembler) valueFinishTidy() bool { @@ -7029,7 +7029,7 @@ func (la *_List__TypeName__Assembler) valueFinishTidy() bool { return false } } -func (la *_List__TypeName__Assembler) AssembleValue() dms3ld.NodeAssembler { +func (la *_List__TypeName__Assembler) AssembleValue() ld.NodeAssembler { switch la.state { case laState_initial: // carry on @@ -7062,59 +7062,59 @@ func (la *_List__TypeName__Assembler) Finish() error { *la.m = schema.Maybe_Value return nil } -func (la *_List__TypeName__Assembler) ValuePrototype(_ int64) dms3ld.NodePrototype { +func (la *_List__TypeName__Assembler) ValuePrototype(_ int64) ld.NodePrototype { return _TypeName__Prototype{} } func (List__TypeName) Type() schema.Type { return nil /*TODO:typelit*/ } -func (n List__TypeName) Representation() dms3ld.Node { +func (n List__TypeName) Representation() ld.Node { return (*_List__TypeName__Repr)(n) } type _List__TypeName__Repr _List__TypeName -var _ dms3ld.Node = &_List__TypeName__Repr{} +var _ ld.Node = &_List__TypeName__Repr{} -func (_List__TypeName__Repr) Kind() dms3ld.Kind { - return dms3ld.Kind_List +func (_List__TypeName__Repr) Kind() ld.Kind { + return ld.Kind_List } -func (_List__TypeName__Repr) LookupByString(string) (dms3ld.Node, error) { +func (_List__TypeName__Repr) LookupByString(string) (ld.Node, error) { return mixins.List{TypeName: "schemadmt.List__TypeName.Repr"}.LookupByString("") } -func (nr *_List__TypeName__Repr) LookupByNode(k dms3ld.Node) (dms3ld.Node, error) { +func (nr *_List__TypeName__Repr) LookupByNode(k ld.Node) (ld.Node, error) { v, err := (List__TypeName)(nr).LookupByNode(k) - if err != nil || v == dms3ld.Null { + if err != nil || v == ld.Null { return v, err } return v.(TypeName).Representation(), nil } -func (nr *_List__TypeName__Repr) LookupByIndex(idx int64) (dms3ld.Node, error) { +func (nr *_List__TypeName__Repr) LookupByIndex(idx int64) (ld.Node, error) { v, err := (List__TypeName)(nr).LookupByIndex(idx) - if err != nil || v == dms3ld.Null { + if err != nil || v == ld.Null { return v, err } return v.(TypeName).Representation(), nil } -func (n _List__TypeName__Repr) LookupBySegment(seg dms3ld.PathSegment) (dms3ld.Node, error) { +func (n _List__TypeName__Repr) LookupBySegment(seg ld.PathSegment) (ld.Node, error) { i, err := seg.Index() if err != nil { - return nil, dms3ld.ErrInvalidSegmentForList{TypeName: "schemadmt.List__TypeName.Repr", TroubleSegment: seg, Reason: err} + return nil, ld.ErrInvalidSegmentForList{TypeName: "schemadmt.List__TypeName.Repr", TroubleSegment: seg, Reason: err} } return n.LookupByIndex(i) } -func (_List__TypeName__Repr) MapIterator() dms3ld.MapIterator { +func (_List__TypeName__Repr) MapIterator() ld.MapIterator { return nil } -func (nr *_List__TypeName__Repr) ListIterator() dms3ld.ListIterator { +func (nr *_List__TypeName__Repr) ListIterator() ld.ListIterator { return &_List__TypeName__ReprListItr{(List__TypeName)(nr), 0} } type _List__TypeName__ReprListItr _List__TypeName__ListItr -func (itr *_List__TypeName__ReprListItr) Next() (idx int64, v dms3ld.Node, err error) { +func (itr *_List__TypeName__ReprListItr) Next() (idx int64, v ld.Node, err error) { idx, v, err = (*_List__TypeName__ListItr)(itr).Next() - if err != nil || v == dms3ld.Null { + if err != nil || v == ld.Null { return } return idx, v.(TypeName).Representation(), nil @@ -7147,16 +7147,16 @@ func (_List__TypeName__Repr) AsString() (string, error) { func (_List__TypeName__Repr) AsBytes() ([]byte, error) { return mixins.List{TypeName: "schemadmt.List__TypeName.Repr"}.AsBytes() } -func (_List__TypeName__Repr) AsLink() (dms3ld.Link, error) { +func (_List__TypeName__Repr) AsLink() (ld.Link, error) { return mixins.List{TypeName: "schemadmt.List__TypeName.Repr"}.AsLink() } -func (_List__TypeName__Repr) Prototype() dms3ld.NodePrototype { +func (_List__TypeName__Repr) Prototype() ld.NodePrototype { return _List__TypeName__ReprPrototype{} } type _List__TypeName__ReprPrototype struct{} -func (_List__TypeName__ReprPrototype) NewBuilder() dms3ld.NodeBuilder { +func (_List__TypeName__ReprPrototype) NewBuilder() ld.NodeBuilder { var nb _List__TypeName__ReprBuilder nb.Reset() return &nb @@ -7166,7 +7166,7 @@ type _List__TypeName__ReprBuilder struct { _List__TypeName__ReprAssembler } -func (nb *_List__TypeName__ReprBuilder) Build() dms3ld.Node { +func (nb *_List__TypeName__ReprBuilder) Build() ld.Node { if *nb.m != schema.Maybe_Value { panic("invalid state: cannot call Build on an assembler that's not finished") } @@ -7191,10 +7191,10 @@ func (na *_List__TypeName__ReprAssembler) reset() { na.state = laState_initial na.va.reset() } -func (_List__TypeName__ReprAssembler) BeginMap(sizeHint int64) (dms3ld.MapAssembler, error) { +func (_List__TypeName__ReprAssembler) BeginMap(sizeHint int64) (ld.MapAssembler, error) { return mixins.ListAssembler{TypeName: "schemadmt.List__TypeName.Repr"}.BeginMap(0) } -func (na *_List__TypeName__ReprAssembler) BeginList(sizeHint int64) (dms3ld.ListAssembler, error) { +func (na *_List__TypeName__ReprAssembler) BeginList(sizeHint int64) (ld.ListAssembler, error) { switch *na.m { case schema.Maybe_Value, schema.Maybe_Null: panic("invalid state: cannot assign into assembler that's already finished") @@ -7239,10 +7239,10 @@ func (_List__TypeName__ReprAssembler) AssignString(string) error { func (_List__TypeName__ReprAssembler) AssignBytes([]byte) error { return mixins.ListAssembler{TypeName: "schemadmt.List__TypeName.Repr"}.AssignBytes(nil) } -func (_List__TypeName__ReprAssembler) AssignLink(dms3ld.Link) error { +func (_List__TypeName__ReprAssembler) AssignLink(ld.Link) error { return mixins.ListAssembler{TypeName: "schemadmt.List__TypeName.Repr"}.AssignLink(nil) } -func (na *_List__TypeName__ReprAssembler) AssignNode(v dms3ld.Node) error { +func (na *_List__TypeName__ReprAssembler) AssignNode(v ld.Node) error { if v.IsNull() { return na.AssignNull() } @@ -7257,8 +7257,8 @@ func (na *_List__TypeName__ReprAssembler) AssignNode(v dms3ld.Node) error { *na.m = schema.Maybe_Value return nil } - if v.Kind() != dms3ld.Kind_List { - return dms3ld.ErrWrongKind{TypeName: "schemadmt.List__TypeName.Repr", MethodName: "AssignNode", AppropriateKind: dms3ld.KindSet_JustList, ActualKind: v.Kind()} + if v.Kind() != ld.Kind_List { + return ld.ErrWrongKind{TypeName: "schemadmt.List__TypeName.Repr", MethodName: "AssignNode", AppropriateKind: ld.KindSet_JustList, ActualKind: v.Kind()} } itr := v.ListIterator() for !itr.Done() { @@ -7272,7 +7272,7 @@ func (na *_List__TypeName__ReprAssembler) AssignNode(v dms3ld.Node) error { } return na.Finish() } -func (_List__TypeName__ReprAssembler) Prototype() dms3ld.NodePrototype { +func (_List__TypeName__ReprAssembler) Prototype() ld.NodePrototype { return _List__TypeName__ReprPrototype{} } func (la *_List__TypeName__ReprAssembler) valueFinishTidy() bool { @@ -7287,7 +7287,7 @@ func (la *_List__TypeName__ReprAssembler) valueFinishTidy() bool { return false } } -func (la *_List__TypeName__ReprAssembler) AssembleValue() dms3ld.NodeAssembler { +func (la *_List__TypeName__ReprAssembler) AssembleValue() ld.NodeAssembler { switch la.state { case laState_initial: // carry on @@ -7320,7 +7320,7 @@ func (la *_List__TypeName__ReprAssembler) Finish() error { *la.m = schema.Maybe_Value return nil } -func (la *_List__TypeName__ReprAssembler) ValuePrototype(_ int64) dms3ld.NodePrototype { +func (la *_List__TypeName__ReprAssembler) ValuePrototype(_ int64) ld.NodePrototype { return _TypeName__ReprPrototype{} } @@ -7352,12 +7352,12 @@ func (m MaybeMapRepresentation) IsAbsent() bool { func (m MaybeMapRepresentation) Exists() bool { return m.m == schema.Maybe_Value } -func (m MaybeMapRepresentation) AsNode() dms3ld.Node { +func (m MaybeMapRepresentation) AsNode() ld.Node { switch m.m { case schema.Maybe_Absent: - return dms3ld.Absent + return ld.Absent case schema.Maybe_Null: - return dms3ld.Null + return ld.Null case schema.Maybe_Value: return m.v default: @@ -7376,47 +7376,47 @@ var ( memberName__MapRepresentation_MapRepresentation_Stringpairs = _String{"MapRepresentation_Stringpairs"} memberName__MapRepresentation_MapRepresentation_Listpairs = _String{"MapRepresentation_Listpairs"} ) -var _ dms3ld.Node = (MapRepresentation)(&_MapRepresentation{}) +var _ ld.Node = (MapRepresentation)(&_MapRepresentation{}) var _ schema.TypedNode = (MapRepresentation)(&_MapRepresentation{}) -func (MapRepresentation) Kind() dms3ld.Kind { - return dms3ld.Kind_Map +func (MapRepresentation) Kind() ld.Kind { + return ld.Kind_Map } -func (n MapRepresentation) LookupByString(key string) (dms3ld.Node, error) { +func (n MapRepresentation) LookupByString(key string) (ld.Node, error) { switch key { case "MapRepresentation_Map": if n.tag != 1 { - return nil, dms3ld.ErrNotExists{Segment: dms3ld.PathSegmentOfString(key)} + return nil, ld.ErrNotExists{Segment: ld.PathSegmentOfString(key)} } return &n.x1, nil case "MapRepresentation_Stringpairs": if n.tag != 2 { - return nil, dms3ld.ErrNotExists{Segment: dms3ld.PathSegmentOfString(key)} + return nil, ld.ErrNotExists{Segment: ld.PathSegmentOfString(key)} } return &n.x2, nil case "MapRepresentation_Listpairs": if n.tag != 3 { - return nil, dms3ld.ErrNotExists{Segment: dms3ld.PathSegmentOfString(key)} + return nil, ld.ErrNotExists{Segment: ld.PathSegmentOfString(key)} } return &n.x3, nil default: - return nil, schema.ErrNoSuchField{Type: nil /*TODO*/, Field: dms3ld.PathSegmentOfString(key)} + return nil, schema.ErrNoSuchField{Type: nil /*TODO*/, Field: ld.PathSegmentOfString(key)} } } -func (n MapRepresentation) LookupByNode(key dms3ld.Node) (dms3ld.Node, error) { +func (n MapRepresentation) LookupByNode(key ld.Node) (ld.Node, error) { ks, err := key.AsString() if err != nil { return nil, err } return n.LookupByString(ks) } -func (MapRepresentation) LookupByIndex(idx int64) (dms3ld.Node, error) { +func (MapRepresentation) LookupByIndex(idx int64) (ld.Node, error) { return mixins.Map{TypeName: "schemadmt.MapRepresentation"}.LookupByIndex(0) } -func (n MapRepresentation) LookupBySegment(seg dms3ld.PathSegment) (dms3ld.Node, error) { +func (n MapRepresentation) LookupBySegment(seg ld.PathSegment) (ld.Node, error) { return n.LookupByString(seg.String()) } -func (n MapRepresentation) MapIterator() dms3ld.MapIterator { +func (n MapRepresentation) MapIterator() ld.MapIterator { return &_MapRepresentation__MapItr{n, false} } @@ -7425,9 +7425,9 @@ type _MapRepresentation__MapItr struct { done bool } -func (itr *_MapRepresentation__MapItr) Next() (k dms3ld.Node, v dms3ld.Node, _ error) { +func (itr *_MapRepresentation__MapItr) Next() (k ld.Node, v ld.Node, _ error) { if itr.done { - return nil, nil, dms3ld.ErrIteratorOverread{} + return nil, nil, ld.ErrIteratorOverread{} } switch itr.n.tag { case 1: @@ -7446,7 +7446,7 @@ func (itr *_MapRepresentation__MapItr) Done() bool { return itr.done } -func (MapRepresentation) ListIterator() dms3ld.ListIterator { +func (MapRepresentation) ListIterator() ld.ListIterator { return nil } func (MapRepresentation) Length() int64 { @@ -7473,16 +7473,16 @@ func (MapRepresentation) AsString() (string, error) { func (MapRepresentation) AsBytes() ([]byte, error) { return mixins.Map{TypeName: "schemadmt.MapRepresentation"}.AsBytes() } -func (MapRepresentation) AsLink() (dms3ld.Link, error) { +func (MapRepresentation) AsLink() (ld.Link, error) { return mixins.Map{TypeName: "schemadmt.MapRepresentation"}.AsLink() } -func (MapRepresentation) Prototype() dms3ld.NodePrototype { +func (MapRepresentation) Prototype() ld.NodePrototype { return _MapRepresentation__Prototype{} } type _MapRepresentation__Prototype struct{} -func (_MapRepresentation__Prototype) NewBuilder() dms3ld.NodeBuilder { +func (_MapRepresentation__Prototype) NewBuilder() ld.NodeBuilder { var nb _MapRepresentation__Builder nb.Reset() return &nb @@ -7492,7 +7492,7 @@ type _MapRepresentation__Builder struct { _MapRepresentation__Assembler } -func (nb *_MapRepresentation__Builder) Build() dms3ld.Node { +func (nb *_MapRepresentation__Builder) Build() ld.Node { if *nb.m != schema.Maybe_Value { panic("invalid state: cannot call Build on an assembler that's not finished") } @@ -7537,7 +7537,7 @@ func (na *_MapRepresentation__Assembler) reset() { na.ca = 0 na.cm = schema.Maybe_Absent } -func (na *_MapRepresentation__Assembler) BeginMap(int64) (dms3ld.MapAssembler, error) { +func (na *_MapRepresentation__Assembler) BeginMap(int64) (ld.MapAssembler, error) { switch *na.m { case schema.Maybe_Value, schema.Maybe_Null: panic("invalid state: cannot assign into assembler that's already finished") @@ -7550,7 +7550,7 @@ func (na *_MapRepresentation__Assembler) BeginMap(int64) (dms3ld.MapAssembler, e } return na, nil } -func (_MapRepresentation__Assembler) BeginList(sizeHint int64) (dms3ld.ListAssembler, error) { +func (_MapRepresentation__Assembler) BeginList(sizeHint int64) (ld.ListAssembler, error) { return mixins.MapAssembler{TypeName: "schemadmt.MapRepresentation"}.BeginList(0) } func (na *_MapRepresentation__Assembler) AssignNull() error { @@ -7582,10 +7582,10 @@ func (_MapRepresentation__Assembler) AssignString(string) error { func (_MapRepresentation__Assembler) AssignBytes([]byte) error { return mixins.MapAssembler{TypeName: "schemadmt.MapRepresentation"}.AssignBytes(nil) } -func (_MapRepresentation__Assembler) AssignLink(dms3ld.Link) error { +func (_MapRepresentation__Assembler) AssignLink(ld.Link) error { return mixins.MapAssembler{TypeName: "schemadmt.MapRepresentation"}.AssignLink(nil) } -func (na *_MapRepresentation__Assembler) AssignNode(v dms3ld.Node) error { +func (na *_MapRepresentation__Assembler) AssignNode(v ld.Node) error { if v.IsNull() { return na.AssignNull() } @@ -7605,8 +7605,8 @@ func (na *_MapRepresentation__Assembler) AssignNode(v dms3ld.Node) error { *na.m = schema.Maybe_Value return nil } - if v.Kind() != dms3ld.Kind_Map { - return dms3ld.ErrWrongKind{TypeName: "schemadmt.MapRepresentation", MethodName: "AssignNode", AppropriateKind: dms3ld.KindSet_JustMap, ActualKind: v.Kind()} + if v.Kind() != ld.Kind_Map { + return ld.ErrWrongKind{TypeName: "schemadmt.MapRepresentation", MethodName: "AssignNode", AppropriateKind: ld.KindSet_JustMap, ActualKind: v.Kind()} } itr := v.MapIterator() for !itr.Done() { @@ -7623,7 +7623,7 @@ func (na *_MapRepresentation__Assembler) AssignNode(v dms3ld.Node) error { } return na.Finish() } -func (_MapRepresentation__Assembler) Prototype() dms3ld.NodePrototype { +func (_MapRepresentation__Assembler) Prototype() ld.NodePrototype { return _MapRepresentation__Prototype{} } func (ma *_MapRepresentation__Assembler) valueFinishTidy() bool { @@ -7635,7 +7635,7 @@ func (ma *_MapRepresentation__Assembler) valueFinishTidy() bool { return false } } -func (ma *_MapRepresentation__Assembler) AssembleEntry(k string) (dms3ld.NodeAssembler, error) { +func (ma *_MapRepresentation__Assembler) AssembleEntry(k string) (ld.NodeAssembler, error) { switch ma.state { case maState_initial: // carry on @@ -7676,9 +7676,9 @@ func (ma *_MapRepresentation__Assembler) AssembleEntry(k string) (dms3ld.NodeAss ma.ca3.m = &ma.cm return &ma.ca3, nil } - return nil, dms3ld.ErrInvalidKey{TypeName: "schemadmt.MapRepresentation", Key: &_String{k}} + return nil, ld.ErrInvalidKey{TypeName: "schemadmt.MapRepresentation", Key: &_String{k}} } -func (ma *_MapRepresentation__Assembler) AssembleKey() dms3ld.NodeAssembler { +func (ma *_MapRepresentation__Assembler) AssembleKey() ld.NodeAssembler { switch ma.state { case maState_initial: // carry on @@ -7696,7 +7696,7 @@ func (ma *_MapRepresentation__Assembler) AssembleKey() dms3ld.NodeAssembler { ma.state = maState_midKey return (*_MapRepresentation__KeyAssembler)(ma) } -func (ma *_MapRepresentation__Assembler) AssembleValue() dms3ld.NodeAssembler { +func (ma *_MapRepresentation__Assembler) AssembleValue() ld.NodeAssembler { switch ma.state { case maState_initial: panic("invalid state: AssembleValue cannot be called when no key is primed") @@ -7749,10 +7749,10 @@ func (ma *_MapRepresentation__Assembler) Finish() error { *ma.m = schema.Maybe_Value return nil } -func (ma *_MapRepresentation__Assembler) KeyPrototype() dms3ld.NodePrototype { +func (ma *_MapRepresentation__Assembler) KeyPrototype() ld.NodePrototype { return _String__Prototype{} } -func (ma *_MapRepresentation__Assembler) ValuePrototype(k string) dms3ld.NodePrototype { +func (ma *_MapRepresentation__Assembler) ValuePrototype(k string) ld.NodePrototype { switch k { case "MapRepresentation_Map": return _MapRepresentation_Map__Prototype{} @@ -7767,10 +7767,10 @@ func (ma *_MapRepresentation__Assembler) ValuePrototype(k string) dms3ld.NodePro type _MapRepresentation__KeyAssembler _MapRepresentation__Assembler -func (_MapRepresentation__KeyAssembler) BeginMap(sizeHint int64) (dms3ld.MapAssembler, error) { +func (_MapRepresentation__KeyAssembler) BeginMap(sizeHint int64) (ld.MapAssembler, error) { return mixins.StringAssembler{TypeName: "schemadmt.MapRepresentation.KeyAssembler"}.BeginMap(0) } -func (_MapRepresentation__KeyAssembler) BeginList(sizeHint int64) (dms3ld.ListAssembler, error) { +func (_MapRepresentation__KeyAssembler) BeginList(sizeHint int64) (ld.ListAssembler, error) { return mixins.StringAssembler{TypeName: "schemadmt.MapRepresentation.KeyAssembler"}.BeginList(0) } func (na *_MapRepresentation__KeyAssembler) AssignNull() error { @@ -7809,28 +7809,28 @@ func (ka *_MapRepresentation__KeyAssembler) AssignString(k string) error { ka.state = maState_expectValue return nil } - return dms3ld.ErrInvalidKey{TypeName: "schemadmt.MapRepresentation", Key: &_String{k}} // TODO: error quality: ErrInvalidUnionDiscriminant ? + return ld.ErrInvalidKey{TypeName: "schemadmt.MapRepresentation", Key: &_String{k}} // TODO: error quality: ErrInvalidUnionDiscriminant ? } func (_MapRepresentation__KeyAssembler) AssignBytes([]byte) error { return mixins.StringAssembler{TypeName: "schemadmt.MapRepresentation.KeyAssembler"}.AssignBytes(nil) } -func (_MapRepresentation__KeyAssembler) AssignLink(dms3ld.Link) error { +func (_MapRepresentation__KeyAssembler) AssignLink(ld.Link) error { return mixins.StringAssembler{TypeName: "schemadmt.MapRepresentation.KeyAssembler"}.AssignLink(nil) } -func (ka *_MapRepresentation__KeyAssembler) AssignNode(v dms3ld.Node) error { +func (ka *_MapRepresentation__KeyAssembler) AssignNode(v ld.Node) error { if v2, err := v.AsString(); err != nil { return err } else { return ka.AssignString(v2) } } -func (_MapRepresentation__KeyAssembler) Prototype() dms3ld.NodePrototype { +func (_MapRepresentation__KeyAssembler) Prototype() ld.NodePrototype { return _String__Prototype{} } func (MapRepresentation) Type() schema.Type { return nil /*TODO:typelit*/ } -func (n MapRepresentation) Representation() dms3ld.Node { +func (n MapRepresentation) Representation() ld.Node { return (*_MapRepresentation__Repr)(n) } @@ -7841,46 +7841,46 @@ var ( memberName__MapRepresentation_MapRepresentation_Stringpairs_serial = _String{"stringpairs"} memberName__MapRepresentation_MapRepresentation_Listpairs_serial = _String{"listpairs"} ) -var _ dms3ld.Node = &_MapRepresentation__Repr{} +var _ ld.Node = &_MapRepresentation__Repr{} -func (_MapRepresentation__Repr) Kind() dms3ld.Kind { - return dms3ld.Kind_Map +func (_MapRepresentation__Repr) Kind() ld.Kind { + return ld.Kind_Map } -func (n *_MapRepresentation__Repr) LookupByString(key string) (dms3ld.Node, error) { +func (n *_MapRepresentation__Repr) LookupByString(key string) (ld.Node, error) { switch key { case "map": if n.tag != 1 { - return nil, dms3ld.ErrNotExists{Segment: dms3ld.PathSegmentOfString(key)} + return nil, ld.ErrNotExists{Segment: ld.PathSegmentOfString(key)} } return n.x1.Representation(), nil case "stringpairs": if n.tag != 2 { - return nil, dms3ld.ErrNotExists{Segment: dms3ld.PathSegmentOfString(key)} + return nil, ld.ErrNotExists{Segment: ld.PathSegmentOfString(key)} } return n.x2.Representation(), nil case "listpairs": if n.tag != 3 { - return nil, dms3ld.ErrNotExists{Segment: dms3ld.PathSegmentOfString(key)} + return nil, ld.ErrNotExists{Segment: ld.PathSegmentOfString(key)} } return n.x3.Representation(), nil default: - return nil, schema.ErrNoSuchField{Type: nil /*TODO*/, Field: dms3ld.PathSegmentOfString(key)} + return nil, schema.ErrNoSuchField{Type: nil /*TODO*/, Field: ld.PathSegmentOfString(key)} } } -func (n *_MapRepresentation__Repr) LookupByNode(key dms3ld.Node) (dms3ld.Node, error) { +func (n *_MapRepresentation__Repr) LookupByNode(key ld.Node) (ld.Node, error) { ks, err := key.AsString() if err != nil { return nil, err } return n.LookupByString(ks) } -func (_MapRepresentation__Repr) LookupByIndex(idx int64) (dms3ld.Node, error) { +func (_MapRepresentation__Repr) LookupByIndex(idx int64) (ld.Node, error) { return mixins.Map{TypeName: "schemadmt.MapRepresentation.Repr"}.LookupByIndex(0) } -func (n _MapRepresentation__Repr) LookupBySegment(seg dms3ld.PathSegment) (dms3ld.Node, error) { +func (n _MapRepresentation__Repr) LookupBySegment(seg ld.PathSegment) (ld.Node, error) { return n.LookupByString(seg.String()) } -func (n *_MapRepresentation__Repr) MapIterator() dms3ld.MapIterator { +func (n *_MapRepresentation__Repr) MapIterator() ld.MapIterator { return &_MapRepresentation__ReprMapItr{n, false} } @@ -7889,9 +7889,9 @@ type _MapRepresentation__ReprMapItr struct { done bool } -func (itr *_MapRepresentation__ReprMapItr) Next() (k dms3ld.Node, v dms3ld.Node, _ error) { +func (itr *_MapRepresentation__ReprMapItr) Next() (k ld.Node, v ld.Node, _ error) { if itr.done { - return nil, nil, dms3ld.ErrIteratorOverread{} + return nil, nil, ld.ErrIteratorOverread{} } switch itr.n.tag { case 1: @@ -7910,7 +7910,7 @@ func (itr *_MapRepresentation__ReprMapItr) Done() bool { return itr.done } -func (_MapRepresentation__Repr) ListIterator() dms3ld.ListIterator { +func (_MapRepresentation__Repr) ListIterator() ld.ListIterator { return nil } func (_MapRepresentation__Repr) Length() int64 { @@ -7937,16 +7937,16 @@ func (_MapRepresentation__Repr) AsString() (string, error) { func (_MapRepresentation__Repr) AsBytes() ([]byte, error) { return mixins.Map{TypeName: "schemadmt.MapRepresentation.Repr"}.AsBytes() } -func (_MapRepresentation__Repr) AsLink() (dms3ld.Link, error) { +func (_MapRepresentation__Repr) AsLink() (ld.Link, error) { return mixins.Map{TypeName: "schemadmt.MapRepresentation.Repr"}.AsLink() } -func (_MapRepresentation__Repr) Prototype() dms3ld.NodePrototype { +func (_MapRepresentation__Repr) Prototype() ld.NodePrototype { return _MapRepresentation__ReprPrototype{} } type _MapRepresentation__ReprPrototype struct{} -func (_MapRepresentation__ReprPrototype) NewBuilder() dms3ld.NodeBuilder { +func (_MapRepresentation__ReprPrototype) NewBuilder() ld.NodeBuilder { var nb _MapRepresentation__ReprBuilder nb.Reset() return &nb @@ -7956,7 +7956,7 @@ type _MapRepresentation__ReprBuilder struct { _MapRepresentation__ReprAssembler } -func (nb *_MapRepresentation__ReprBuilder) Build() dms3ld.Node { +func (nb *_MapRepresentation__ReprBuilder) Build() ld.Node { if *nb.m != schema.Maybe_Value { panic("invalid state: cannot call Build on an assembler that's not finished") } @@ -8001,7 +8001,7 @@ func (na *_MapRepresentation__ReprAssembler) reset() { na.ca = 0 na.cm = schema.Maybe_Absent } -func (na *_MapRepresentation__ReprAssembler) BeginMap(int64) (dms3ld.MapAssembler, error) { +func (na *_MapRepresentation__ReprAssembler) BeginMap(int64) (ld.MapAssembler, error) { switch *na.m { case schema.Maybe_Value, schema.Maybe_Null: panic("invalid state: cannot assign into assembler that's already finished") @@ -8014,7 +8014,7 @@ func (na *_MapRepresentation__ReprAssembler) BeginMap(int64) (dms3ld.MapAssemble } return na, nil } -func (_MapRepresentation__ReprAssembler) BeginList(sizeHint int64) (dms3ld.ListAssembler, error) { +func (_MapRepresentation__ReprAssembler) BeginList(sizeHint int64) (ld.ListAssembler, error) { return mixins.MapAssembler{TypeName: "schemadmt.MapRepresentation.Repr"}.BeginList(0) } func (na *_MapRepresentation__ReprAssembler) AssignNull() error { @@ -8046,10 +8046,10 @@ func (_MapRepresentation__ReprAssembler) AssignString(string) error { func (_MapRepresentation__ReprAssembler) AssignBytes([]byte) error { return mixins.MapAssembler{TypeName: "schemadmt.MapRepresentation.Repr"}.AssignBytes(nil) } -func (_MapRepresentation__ReprAssembler) AssignLink(dms3ld.Link) error { +func (_MapRepresentation__ReprAssembler) AssignLink(ld.Link) error { return mixins.MapAssembler{TypeName: "schemadmt.MapRepresentation.Repr"}.AssignLink(nil) } -func (na *_MapRepresentation__ReprAssembler) AssignNode(v dms3ld.Node) error { +func (na *_MapRepresentation__ReprAssembler) AssignNode(v ld.Node) error { if v.IsNull() { return na.AssignNull() } @@ -8069,8 +8069,8 @@ func (na *_MapRepresentation__ReprAssembler) AssignNode(v dms3ld.Node) error { *na.m = schema.Maybe_Value return nil } - if v.Kind() != dms3ld.Kind_Map { - return dms3ld.ErrWrongKind{TypeName: "schemadmt.MapRepresentation.Repr", MethodName: "AssignNode", AppropriateKind: dms3ld.KindSet_JustMap, ActualKind: v.Kind()} + if v.Kind() != ld.Kind_Map { + return ld.ErrWrongKind{TypeName: "schemadmt.MapRepresentation.Repr", MethodName: "AssignNode", AppropriateKind: ld.KindSet_JustMap, ActualKind: v.Kind()} } itr := v.MapIterator() for !itr.Done() { @@ -8087,7 +8087,7 @@ func (na *_MapRepresentation__ReprAssembler) AssignNode(v dms3ld.Node) error { } return na.Finish() } -func (_MapRepresentation__ReprAssembler) Prototype() dms3ld.NodePrototype { +func (_MapRepresentation__ReprAssembler) Prototype() ld.NodePrototype { return _MapRepresentation__ReprPrototype{} } func (ma *_MapRepresentation__ReprAssembler) valueFinishTidy() bool { @@ -8099,7 +8099,7 @@ func (ma *_MapRepresentation__ReprAssembler) valueFinishTidy() bool { return false } } -func (ma *_MapRepresentation__ReprAssembler) AssembleEntry(k string) (dms3ld.NodeAssembler, error) { +func (ma *_MapRepresentation__ReprAssembler) AssembleEntry(k string) (ld.NodeAssembler, error) { switch ma.state { case maState_initial: // carry on @@ -8140,9 +8140,9 @@ func (ma *_MapRepresentation__ReprAssembler) AssembleEntry(k string) (dms3ld.Nod ma.ca3.m = &ma.cm return &ma.ca3, nil } - return nil, dms3ld.ErrInvalidKey{TypeName: "schemadmt.MapRepresentation.Repr", Key: &_String{k}} + return nil, ld.ErrInvalidKey{TypeName: "schemadmt.MapRepresentation.Repr", Key: &_String{k}} } -func (ma *_MapRepresentation__ReprAssembler) AssembleKey() dms3ld.NodeAssembler { +func (ma *_MapRepresentation__ReprAssembler) AssembleKey() ld.NodeAssembler { switch ma.state { case maState_initial: // carry on @@ -8160,7 +8160,7 @@ func (ma *_MapRepresentation__ReprAssembler) AssembleKey() dms3ld.NodeAssembler ma.state = maState_midKey return (*_MapRepresentation__ReprKeyAssembler)(ma) } -func (ma *_MapRepresentation__ReprAssembler) AssembleValue() dms3ld.NodeAssembler { +func (ma *_MapRepresentation__ReprAssembler) AssembleValue() ld.NodeAssembler { switch ma.state { case maState_initial: panic("invalid state: AssembleValue cannot be called when no key is primed") @@ -8213,10 +8213,10 @@ func (ma *_MapRepresentation__ReprAssembler) Finish() error { *ma.m = schema.Maybe_Value return nil } -func (ma *_MapRepresentation__ReprAssembler) KeyPrototype() dms3ld.NodePrototype { +func (ma *_MapRepresentation__ReprAssembler) KeyPrototype() ld.NodePrototype { return _String__Prototype{} } -func (ma *_MapRepresentation__ReprAssembler) ValuePrototype(k string) dms3ld.NodePrototype { +func (ma *_MapRepresentation__ReprAssembler) ValuePrototype(k string) ld.NodePrototype { switch k { case "MapRepresentation_Map": return _MapRepresentation_Map__ReprPrototype{} @@ -8231,10 +8231,10 @@ func (ma *_MapRepresentation__ReprAssembler) ValuePrototype(k string) dms3ld.Nod type _MapRepresentation__ReprKeyAssembler _MapRepresentation__ReprAssembler -func (_MapRepresentation__ReprKeyAssembler) BeginMap(sizeHint int64) (dms3ld.MapAssembler, error) { +func (_MapRepresentation__ReprKeyAssembler) BeginMap(sizeHint int64) (ld.MapAssembler, error) { return mixins.StringAssembler{TypeName: "schemadmt.MapRepresentation.Repr.KeyAssembler"}.BeginMap(0) } -func (_MapRepresentation__ReprKeyAssembler) BeginList(sizeHint int64) (dms3ld.ListAssembler, error) { +func (_MapRepresentation__ReprKeyAssembler) BeginList(sizeHint int64) (ld.ListAssembler, error) { return mixins.StringAssembler{TypeName: "schemadmt.MapRepresentation.Repr.KeyAssembler"}.BeginList(0) } func (na *_MapRepresentation__ReprKeyAssembler) AssignNull() error { @@ -8273,22 +8273,22 @@ func (ka *_MapRepresentation__ReprKeyAssembler) AssignString(k string) error { ka.state = maState_expectValue return nil } - return dms3ld.ErrInvalidKey{TypeName: "schemadmt.MapRepresentation.Repr", Key: &_String{k}} // TODO: error quality: ErrInvalidUnionDiscriminant ? + return ld.ErrInvalidKey{TypeName: "schemadmt.MapRepresentation.Repr", Key: &_String{k}} // TODO: error quality: ErrInvalidUnionDiscriminant ? } func (_MapRepresentation__ReprKeyAssembler) AssignBytes([]byte) error { return mixins.StringAssembler{TypeName: "schemadmt.MapRepresentation.Repr.KeyAssembler"}.AssignBytes(nil) } -func (_MapRepresentation__ReprKeyAssembler) AssignLink(dms3ld.Link) error { +func (_MapRepresentation__ReprKeyAssembler) AssignLink(ld.Link) error { return mixins.StringAssembler{TypeName: "schemadmt.MapRepresentation.Repr.KeyAssembler"}.AssignLink(nil) } -func (ka *_MapRepresentation__ReprKeyAssembler) AssignNode(v dms3ld.Node) error { +func (ka *_MapRepresentation__ReprKeyAssembler) AssignNode(v ld.Node) error { if v2, err := v.AsString(); err != nil { return err } else { return ka.AssignString(v2) } } -func (_MapRepresentation__ReprKeyAssembler) Prototype() dms3ld.NodePrototype { +func (_MapRepresentation__ReprKeyAssembler) Prototype() ld.NodePrototype { return _String__Prototype{} } @@ -8307,12 +8307,12 @@ func (m MaybeMapRepresentation_Listpairs) IsAbsent() bool { func (m MaybeMapRepresentation_Listpairs) Exists() bool { return m.m == schema.Maybe_Value } -func (m MaybeMapRepresentation_Listpairs) AsNode() dms3ld.Node { +func (m MaybeMapRepresentation_Listpairs) AsNode() ld.Node { switch m.m { case schema.Maybe_Absent: - return dms3ld.Absent + return ld.Absent case schema.Maybe_Null: - return dms3ld.Null + return ld.Null case schema.Maybe_Value: return m.v default: @@ -8327,32 +8327,32 @@ func (m MaybeMapRepresentation_Listpairs) Must() MapRepresentation_Listpairs { } var () -var _ dms3ld.Node = (MapRepresentation_Listpairs)(&_MapRepresentation_Listpairs{}) +var _ ld.Node = (MapRepresentation_Listpairs)(&_MapRepresentation_Listpairs{}) var _ schema.TypedNode = (MapRepresentation_Listpairs)(&_MapRepresentation_Listpairs{}) -func (MapRepresentation_Listpairs) Kind() dms3ld.Kind { - return dms3ld.Kind_Map +func (MapRepresentation_Listpairs) Kind() ld.Kind { + return ld.Kind_Map } -func (n MapRepresentation_Listpairs) LookupByString(key string) (dms3ld.Node, error) { +func (n MapRepresentation_Listpairs) LookupByString(key string) (ld.Node, error) { switch key { default: - return nil, schema.ErrNoSuchField{Type: nil /*TODO*/, Field: dms3ld.PathSegmentOfString(key)} + return nil, schema.ErrNoSuchField{Type: nil /*TODO*/, Field: ld.PathSegmentOfString(key)} } } -func (n MapRepresentation_Listpairs) LookupByNode(key dms3ld.Node) (dms3ld.Node, error) { +func (n MapRepresentation_Listpairs) LookupByNode(key ld.Node) (ld.Node, error) { ks, err := key.AsString() if err != nil { return nil, err } return n.LookupByString(ks) } -func (MapRepresentation_Listpairs) LookupByIndex(idx int64) (dms3ld.Node, error) { +func (MapRepresentation_Listpairs) LookupByIndex(idx int64) (ld.Node, error) { return mixins.Map{TypeName: "schemadmt.MapRepresentation_Listpairs"}.LookupByIndex(0) } -func (n MapRepresentation_Listpairs) LookupBySegment(seg dms3ld.PathSegment) (dms3ld.Node, error) { +func (n MapRepresentation_Listpairs) LookupBySegment(seg ld.PathSegment) (ld.Node, error) { return n.LookupByString(seg.String()) } -func (n MapRepresentation_Listpairs) MapIterator() dms3ld.MapIterator { +func (n MapRepresentation_Listpairs) MapIterator() ld.MapIterator { return &_MapRepresentation_Listpairs__MapItr{n, 0} } @@ -8361,15 +8361,15 @@ type _MapRepresentation_Listpairs__MapItr struct { idx int } -func (itr *_MapRepresentation_Listpairs__MapItr) Next() (k dms3ld.Node, v dms3ld.Node, _ error) { - return nil, nil, dms3ld.ErrIteratorOverread{} +func (itr *_MapRepresentation_Listpairs__MapItr) Next() (k ld.Node, v ld.Node, _ error) { + return nil, nil, ld.ErrIteratorOverread{} } func (itr *_MapRepresentation_Listpairs__MapItr) Done() bool { return itr.idx >= 0 } -func (MapRepresentation_Listpairs) ListIterator() dms3ld.ListIterator { +func (MapRepresentation_Listpairs) ListIterator() ld.ListIterator { return nil } func (MapRepresentation_Listpairs) Length() int64 { @@ -8396,16 +8396,16 @@ func (MapRepresentation_Listpairs) AsString() (string, error) { func (MapRepresentation_Listpairs) AsBytes() ([]byte, error) { return mixins.Map{TypeName: "schemadmt.MapRepresentation_Listpairs"}.AsBytes() } -func (MapRepresentation_Listpairs) AsLink() (dms3ld.Link, error) { +func (MapRepresentation_Listpairs) AsLink() (ld.Link, error) { return mixins.Map{TypeName: "schemadmt.MapRepresentation_Listpairs"}.AsLink() } -func (MapRepresentation_Listpairs) Prototype() dms3ld.NodePrototype { +func (MapRepresentation_Listpairs) Prototype() ld.NodePrototype { return _MapRepresentation_Listpairs__Prototype{} } type _MapRepresentation_Listpairs__Prototype struct{} -func (_MapRepresentation_Listpairs__Prototype) NewBuilder() dms3ld.NodeBuilder { +func (_MapRepresentation_Listpairs__Prototype) NewBuilder() ld.NodeBuilder { var nb _MapRepresentation_Listpairs__Builder nb.Reset() return &nb @@ -8415,7 +8415,7 @@ type _MapRepresentation_Listpairs__Builder struct { _MapRepresentation_Listpairs__Assembler } -func (nb *_MapRepresentation_Listpairs__Builder) Build() dms3ld.Node { +func (nb *_MapRepresentation_Listpairs__Builder) Build() ld.Node { if *nb.m != schema.Maybe_Value { panic("invalid state: cannot call Build on an assembler that's not finished") } @@ -8446,7 +8446,7 @@ var ( fieldBits__MapRepresentation_Listpairs_sufficient = 0 ) -func (na *_MapRepresentation_Listpairs__Assembler) BeginMap(int64) (dms3ld.MapAssembler, error) { +func (na *_MapRepresentation_Listpairs__Assembler) BeginMap(int64) (ld.MapAssembler, error) { switch *na.m { case schema.Maybe_Value, schema.Maybe_Null: panic("invalid state: cannot assign into assembler that's already finished") @@ -8459,7 +8459,7 @@ func (na *_MapRepresentation_Listpairs__Assembler) BeginMap(int64) (dms3ld.MapAs } return na, nil } -func (_MapRepresentation_Listpairs__Assembler) BeginList(sizeHint int64) (dms3ld.ListAssembler, error) { +func (_MapRepresentation_Listpairs__Assembler) BeginList(sizeHint int64) (ld.ListAssembler, error) { return mixins.MapAssembler{TypeName: "schemadmt.MapRepresentation_Listpairs"}.BeginList(0) } func (na *_MapRepresentation_Listpairs__Assembler) AssignNull() error { @@ -8491,10 +8491,10 @@ func (_MapRepresentation_Listpairs__Assembler) AssignString(string) error { func (_MapRepresentation_Listpairs__Assembler) AssignBytes([]byte) error { return mixins.MapAssembler{TypeName: "schemadmt.MapRepresentation_Listpairs"}.AssignBytes(nil) } -func (_MapRepresentation_Listpairs__Assembler) AssignLink(dms3ld.Link) error { +func (_MapRepresentation_Listpairs__Assembler) AssignLink(ld.Link) error { return mixins.MapAssembler{TypeName: "schemadmt.MapRepresentation_Listpairs"}.AssignLink(nil) } -func (na *_MapRepresentation_Listpairs__Assembler) AssignNode(v dms3ld.Node) error { +func (na *_MapRepresentation_Listpairs__Assembler) AssignNode(v ld.Node) error { if v.IsNull() { return na.AssignNull() } @@ -8514,8 +8514,8 @@ func (na *_MapRepresentation_Listpairs__Assembler) AssignNode(v dms3ld.Node) err *na.m = schema.Maybe_Value return nil } - if v.Kind() != dms3ld.Kind_Map { - return dms3ld.ErrWrongKind{TypeName: "schemadmt.MapRepresentation_Listpairs", MethodName: "AssignNode", AppropriateKind: dms3ld.KindSet_JustMap, ActualKind: v.Kind()} + if v.Kind() != ld.Kind_Map { + return ld.ErrWrongKind{TypeName: "schemadmt.MapRepresentation_Listpairs", MethodName: "AssignNode", AppropriateKind: ld.KindSet_JustMap, ActualKind: v.Kind()} } itr := v.MapIterator() for !itr.Done() { @@ -8532,7 +8532,7 @@ func (na *_MapRepresentation_Listpairs__Assembler) AssignNode(v dms3ld.Node) err } return na.Finish() } -func (_MapRepresentation_Listpairs__Assembler) Prototype() dms3ld.NodePrototype { +func (_MapRepresentation_Listpairs__Assembler) Prototype() ld.NodePrototype { return _MapRepresentation_Listpairs__Prototype{} } func (ma *_MapRepresentation_Listpairs__Assembler) valueFinishTidy() bool { @@ -8541,7 +8541,7 @@ func (ma *_MapRepresentation_Listpairs__Assembler) valueFinishTidy() bool { panic("unreachable") } } -func (ma *_MapRepresentation_Listpairs__Assembler) AssembleEntry(k string) (dms3ld.NodeAssembler, error) { +func (ma *_MapRepresentation_Listpairs__Assembler) AssembleEntry(k string) (ld.NodeAssembler, error) { switch ma.state { case maState_initial: // carry on @@ -8556,9 +8556,9 @@ func (ma *_MapRepresentation_Listpairs__Assembler) AssembleEntry(k string) (dms3 case maState_finished: panic("invalid state: AssembleEntry cannot be called on an assembler that's already finished") } - return nil, dms3ld.ErrInvalidKey{TypeName: "schemadmt.MapRepresentation_Listpairs", Key: &_String{k}} + return nil, ld.ErrInvalidKey{TypeName: "schemadmt.MapRepresentation_Listpairs", Key: &_String{k}} } -func (ma *_MapRepresentation_Listpairs__Assembler) AssembleKey() dms3ld.NodeAssembler { +func (ma *_MapRepresentation_Listpairs__Assembler) AssembleKey() ld.NodeAssembler { switch ma.state { case maState_initial: // carry on @@ -8576,7 +8576,7 @@ func (ma *_MapRepresentation_Listpairs__Assembler) AssembleKey() dms3ld.NodeAsse ma.state = maState_midKey return (*_MapRepresentation_Listpairs__KeyAssembler)(ma) } -func (ma *_MapRepresentation_Listpairs__Assembler) AssembleValue() dms3ld.NodeAssembler { +func (ma *_MapRepresentation_Listpairs__Assembler) AssembleValue() ld.NodeAssembler { switch ma.state { case maState_initial: panic("invalid state: AssembleValue cannot be called when no key is primed") @@ -8611,26 +8611,26 @@ func (ma *_MapRepresentation_Listpairs__Assembler) Finish() error { panic("invalid state: Finish cannot be called on an assembler that's already finished") } if ma.s&fieldBits__MapRepresentation_Listpairs_sufficient != fieldBits__MapRepresentation_Listpairs_sufficient { - err := dms3ld.ErrMissingRequiredField{Missing: make([]string, 0)} + err := ld.ErrMissingRequiredField{Missing: make([]string, 0)} return err } ma.state = maState_finished *ma.m = schema.Maybe_Value return nil } -func (ma *_MapRepresentation_Listpairs__Assembler) KeyPrototype() dms3ld.NodePrototype { +func (ma *_MapRepresentation_Listpairs__Assembler) KeyPrototype() ld.NodePrototype { return _String__Prototype{} } -func (ma *_MapRepresentation_Listpairs__Assembler) ValuePrototype(k string) dms3ld.NodePrototype { +func (ma *_MapRepresentation_Listpairs__Assembler) ValuePrototype(k string) ld.NodePrototype { panic("todo structbuilder mapassembler valueprototype") } type _MapRepresentation_Listpairs__KeyAssembler _MapRepresentation_Listpairs__Assembler -func (_MapRepresentation_Listpairs__KeyAssembler) BeginMap(sizeHint int64) (dms3ld.MapAssembler, error) { +func (_MapRepresentation_Listpairs__KeyAssembler) BeginMap(sizeHint int64) (ld.MapAssembler, error) { return mixins.StringAssembler{TypeName: "schemadmt.MapRepresentation_Listpairs.KeyAssembler"}.BeginMap(0) } -func (_MapRepresentation_Listpairs__KeyAssembler) BeginList(sizeHint int64) (dms3ld.ListAssembler, error) { +func (_MapRepresentation_Listpairs__KeyAssembler) BeginList(sizeHint int64) (ld.ListAssembler, error) { return mixins.StringAssembler{TypeName: "schemadmt.MapRepresentation_Listpairs.KeyAssembler"}.BeginList(0) } func (na *_MapRepresentation_Listpairs__KeyAssembler) AssignNull() error { @@ -8651,61 +8651,61 @@ func (ka *_MapRepresentation_Listpairs__KeyAssembler) AssignString(k string) err } switch k { default: - return dms3ld.ErrInvalidKey{TypeName: "schemadmt.MapRepresentation_Listpairs", Key: &_String{k}} + return ld.ErrInvalidKey{TypeName: "schemadmt.MapRepresentation_Listpairs", Key: &_String{k}} } return nil } func (_MapRepresentation_Listpairs__KeyAssembler) AssignBytes([]byte) error { return mixins.StringAssembler{TypeName: "schemadmt.MapRepresentation_Listpairs.KeyAssembler"}.AssignBytes(nil) } -func (_MapRepresentation_Listpairs__KeyAssembler) AssignLink(dms3ld.Link) error { +func (_MapRepresentation_Listpairs__KeyAssembler) AssignLink(ld.Link) error { return mixins.StringAssembler{TypeName: "schemadmt.MapRepresentation_Listpairs.KeyAssembler"}.AssignLink(nil) } -func (ka *_MapRepresentation_Listpairs__KeyAssembler) AssignNode(v dms3ld.Node) error { +func (ka *_MapRepresentation_Listpairs__KeyAssembler) AssignNode(v ld.Node) error { if v2, err := v.AsString(); err != nil { return err } else { return ka.AssignString(v2) } } -func (_MapRepresentation_Listpairs__KeyAssembler) Prototype() dms3ld.NodePrototype { +func (_MapRepresentation_Listpairs__KeyAssembler) Prototype() ld.NodePrototype { return _String__Prototype{} } func (MapRepresentation_Listpairs) Type() schema.Type { return nil /*TODO:typelit*/ } -func (n MapRepresentation_Listpairs) Representation() dms3ld.Node { +func (n MapRepresentation_Listpairs) Representation() ld.Node { return (*_MapRepresentation_Listpairs__Repr)(n) } type _MapRepresentation_Listpairs__Repr _MapRepresentation_Listpairs var () -var _ dms3ld.Node = &_MapRepresentation_Listpairs__Repr{} +var _ ld.Node = &_MapRepresentation_Listpairs__Repr{} -func (_MapRepresentation_Listpairs__Repr) Kind() dms3ld.Kind { - return dms3ld.Kind_Map +func (_MapRepresentation_Listpairs__Repr) Kind() ld.Kind { + return ld.Kind_Map } -func (n *_MapRepresentation_Listpairs__Repr) LookupByString(key string) (dms3ld.Node, error) { +func (n *_MapRepresentation_Listpairs__Repr) LookupByString(key string) (ld.Node, error) { switch key { default: - return nil, schema.ErrNoSuchField{Type: nil /*TODO*/, Field: dms3ld.PathSegmentOfString(key)} + return nil, schema.ErrNoSuchField{Type: nil /*TODO*/, Field: ld.PathSegmentOfString(key)} } } -func (n *_MapRepresentation_Listpairs__Repr) LookupByNode(key dms3ld.Node) (dms3ld.Node, error) { +func (n *_MapRepresentation_Listpairs__Repr) LookupByNode(key ld.Node) (ld.Node, error) { ks, err := key.AsString() if err != nil { return nil, err } return n.LookupByString(ks) } -func (_MapRepresentation_Listpairs__Repr) LookupByIndex(idx int64) (dms3ld.Node, error) { +func (_MapRepresentation_Listpairs__Repr) LookupByIndex(idx int64) (ld.Node, error) { return mixins.Map{TypeName: "schemadmt.MapRepresentation_Listpairs.Repr"}.LookupByIndex(0) } -func (n _MapRepresentation_Listpairs__Repr) LookupBySegment(seg dms3ld.PathSegment) (dms3ld.Node, error) { +func (n _MapRepresentation_Listpairs__Repr) LookupBySegment(seg ld.PathSegment) (ld.Node, error) { return n.LookupByString(seg.String()) } -func (n *_MapRepresentation_Listpairs__Repr) MapIterator() dms3ld.MapIterator { +func (n *_MapRepresentation_Listpairs__Repr) MapIterator() ld.MapIterator { return &_MapRepresentation_Listpairs__ReprMapItr{n, 0} } @@ -8714,14 +8714,14 @@ type _MapRepresentation_Listpairs__ReprMapItr struct { idx int } -func (itr *_MapRepresentation_Listpairs__ReprMapItr) Next() (k dms3ld.Node, v dms3ld.Node, _ error) { - return nil, nil, dms3ld.ErrIteratorOverread{} +func (itr *_MapRepresentation_Listpairs__ReprMapItr) Next() (k ld.Node, v ld.Node, _ error) { + return nil, nil, ld.ErrIteratorOverread{} } func (itr *_MapRepresentation_Listpairs__ReprMapItr) Done() bool { return itr.idx >= 0 } -func (_MapRepresentation_Listpairs__Repr) ListIterator() dms3ld.ListIterator { +func (_MapRepresentation_Listpairs__Repr) ListIterator() ld.ListIterator { return nil } func (rn *_MapRepresentation_Listpairs__Repr) Length() int64 { @@ -8749,16 +8749,16 @@ func (_MapRepresentation_Listpairs__Repr) AsString() (string, error) { func (_MapRepresentation_Listpairs__Repr) AsBytes() ([]byte, error) { return mixins.Map{TypeName: "schemadmt.MapRepresentation_Listpairs.Repr"}.AsBytes() } -func (_MapRepresentation_Listpairs__Repr) AsLink() (dms3ld.Link, error) { +func (_MapRepresentation_Listpairs__Repr) AsLink() (ld.Link, error) { return mixins.Map{TypeName: "schemadmt.MapRepresentation_Listpairs.Repr"}.AsLink() } -func (_MapRepresentation_Listpairs__Repr) Prototype() dms3ld.NodePrototype { +func (_MapRepresentation_Listpairs__Repr) Prototype() ld.NodePrototype { return _MapRepresentation_Listpairs__ReprPrototype{} } type _MapRepresentation_Listpairs__ReprPrototype struct{} -func (_MapRepresentation_Listpairs__ReprPrototype) NewBuilder() dms3ld.NodeBuilder { +func (_MapRepresentation_Listpairs__ReprPrototype) NewBuilder() ld.NodeBuilder { var nb _MapRepresentation_Listpairs__ReprBuilder nb.Reset() return &nb @@ -8768,7 +8768,7 @@ type _MapRepresentation_Listpairs__ReprBuilder struct { _MapRepresentation_Listpairs__ReprAssembler } -func (nb *_MapRepresentation_Listpairs__ReprBuilder) Build() dms3ld.Node { +func (nb *_MapRepresentation_Listpairs__ReprBuilder) Build() ld.Node { if *nb.m != schema.Maybe_Value { panic("invalid state: cannot call Build on an assembler that's not finished") } @@ -8794,7 +8794,7 @@ func (na *_MapRepresentation_Listpairs__ReprAssembler) reset() { na.state = maState_initial na.s = 0 } -func (na *_MapRepresentation_Listpairs__ReprAssembler) BeginMap(int64) (dms3ld.MapAssembler, error) { +func (na *_MapRepresentation_Listpairs__ReprAssembler) BeginMap(int64) (ld.MapAssembler, error) { switch *na.m { case schema.Maybe_Value, schema.Maybe_Null: panic("invalid state: cannot assign into assembler that's already finished") @@ -8807,7 +8807,7 @@ func (na *_MapRepresentation_Listpairs__ReprAssembler) BeginMap(int64) (dms3ld.M } return na, nil } -func (_MapRepresentation_Listpairs__ReprAssembler) BeginList(sizeHint int64) (dms3ld.ListAssembler, error) { +func (_MapRepresentation_Listpairs__ReprAssembler) BeginList(sizeHint int64) (ld.ListAssembler, error) { return mixins.MapAssembler{TypeName: "schemadmt.MapRepresentation_Listpairs.Repr"}.BeginList(0) } func (na *_MapRepresentation_Listpairs__ReprAssembler) AssignNull() error { @@ -8839,10 +8839,10 @@ func (_MapRepresentation_Listpairs__ReprAssembler) AssignString(string) error { func (_MapRepresentation_Listpairs__ReprAssembler) AssignBytes([]byte) error { return mixins.MapAssembler{TypeName: "schemadmt.MapRepresentation_Listpairs.Repr"}.AssignBytes(nil) } -func (_MapRepresentation_Listpairs__ReprAssembler) AssignLink(dms3ld.Link) error { +func (_MapRepresentation_Listpairs__ReprAssembler) AssignLink(ld.Link) error { return mixins.MapAssembler{TypeName: "schemadmt.MapRepresentation_Listpairs.Repr"}.AssignLink(nil) } -func (na *_MapRepresentation_Listpairs__ReprAssembler) AssignNode(v dms3ld.Node) error { +func (na *_MapRepresentation_Listpairs__ReprAssembler) AssignNode(v ld.Node) error { if v.IsNull() { return na.AssignNull() } @@ -8862,8 +8862,8 @@ func (na *_MapRepresentation_Listpairs__ReprAssembler) AssignNode(v dms3ld.Node) *na.m = schema.Maybe_Value return nil } - if v.Kind() != dms3ld.Kind_Map { - return dms3ld.ErrWrongKind{TypeName: "schemadmt.MapRepresentation_Listpairs.Repr", MethodName: "AssignNode", AppropriateKind: dms3ld.KindSet_JustMap, ActualKind: v.Kind()} + if v.Kind() != ld.Kind_Map { + return ld.ErrWrongKind{TypeName: "schemadmt.MapRepresentation_Listpairs.Repr", MethodName: "AssignNode", AppropriateKind: ld.KindSet_JustMap, ActualKind: v.Kind()} } itr := v.MapIterator() for !itr.Done() { @@ -8880,7 +8880,7 @@ func (na *_MapRepresentation_Listpairs__ReprAssembler) AssignNode(v dms3ld.Node) } return na.Finish() } -func (_MapRepresentation_Listpairs__ReprAssembler) Prototype() dms3ld.NodePrototype { +func (_MapRepresentation_Listpairs__ReprAssembler) Prototype() ld.NodePrototype { return _MapRepresentation_Listpairs__ReprPrototype{} } func (ma *_MapRepresentation_Listpairs__ReprAssembler) valueFinishTidy() bool { @@ -8889,7 +8889,7 @@ func (ma *_MapRepresentation_Listpairs__ReprAssembler) valueFinishTidy() bool { panic("unreachable") } } -func (ma *_MapRepresentation_Listpairs__ReprAssembler) AssembleEntry(k string) (dms3ld.NodeAssembler, error) { +func (ma *_MapRepresentation_Listpairs__ReprAssembler) AssembleEntry(k string) (ld.NodeAssembler, error) { switch ma.state { case maState_initial: // carry on @@ -8904,9 +8904,9 @@ func (ma *_MapRepresentation_Listpairs__ReprAssembler) AssembleEntry(k string) ( case maState_finished: panic("invalid state: AssembleEntry cannot be called on an assembler that's already finished") } - return nil, dms3ld.ErrInvalidKey{TypeName: "schemadmt.MapRepresentation_Listpairs.Repr", Key: &_String{k}} + return nil, ld.ErrInvalidKey{TypeName: "schemadmt.MapRepresentation_Listpairs.Repr", Key: &_String{k}} } -func (ma *_MapRepresentation_Listpairs__ReprAssembler) AssembleKey() dms3ld.NodeAssembler { +func (ma *_MapRepresentation_Listpairs__ReprAssembler) AssembleKey() ld.NodeAssembler { switch ma.state { case maState_initial: // carry on @@ -8924,7 +8924,7 @@ func (ma *_MapRepresentation_Listpairs__ReprAssembler) AssembleKey() dms3ld.Node ma.state = maState_midKey return (*_MapRepresentation_Listpairs__ReprKeyAssembler)(ma) } -func (ma *_MapRepresentation_Listpairs__ReprAssembler) AssembleValue() dms3ld.NodeAssembler { +func (ma *_MapRepresentation_Listpairs__ReprAssembler) AssembleValue() ld.NodeAssembler { switch ma.state { case maState_initial: panic("invalid state: AssembleValue cannot be called when no key is primed") @@ -8959,26 +8959,26 @@ func (ma *_MapRepresentation_Listpairs__ReprAssembler) Finish() error { panic("invalid state: Finish cannot be called on an assembler that's already finished") } if ma.s&fieldBits__MapRepresentation_Listpairs_sufficient != fieldBits__MapRepresentation_Listpairs_sufficient { - err := dms3ld.ErrMissingRequiredField{Missing: make([]string, 0)} + err := ld.ErrMissingRequiredField{Missing: make([]string, 0)} return err } ma.state = maState_finished *ma.m = schema.Maybe_Value return nil } -func (ma *_MapRepresentation_Listpairs__ReprAssembler) KeyPrototype() dms3ld.NodePrototype { +func (ma *_MapRepresentation_Listpairs__ReprAssembler) KeyPrototype() ld.NodePrototype { return _String__Prototype{} } -func (ma *_MapRepresentation_Listpairs__ReprAssembler) ValuePrototype(k string) dms3ld.NodePrototype { +func (ma *_MapRepresentation_Listpairs__ReprAssembler) ValuePrototype(k string) ld.NodePrototype { panic("todo structbuilder mapassembler repr valueprototype") } type _MapRepresentation_Listpairs__ReprKeyAssembler _MapRepresentation_Listpairs__ReprAssembler -func (_MapRepresentation_Listpairs__ReprKeyAssembler) BeginMap(sizeHint int64) (dms3ld.MapAssembler, error) { +func (_MapRepresentation_Listpairs__ReprKeyAssembler) BeginMap(sizeHint int64) (ld.MapAssembler, error) { return mixins.StringAssembler{TypeName: "schemadmt.MapRepresentation_Listpairs.Repr.KeyAssembler"}.BeginMap(0) } -func (_MapRepresentation_Listpairs__ReprKeyAssembler) BeginList(sizeHint int64) (dms3ld.ListAssembler, error) { +func (_MapRepresentation_Listpairs__ReprKeyAssembler) BeginList(sizeHint int64) (ld.ListAssembler, error) { return mixins.StringAssembler{TypeName: "schemadmt.MapRepresentation_Listpairs.Repr.KeyAssembler"}.BeginList(0) } func (na *_MapRepresentation_Listpairs__ReprKeyAssembler) AssignNull() error { @@ -8997,22 +8997,22 @@ func (ka *_MapRepresentation_Listpairs__ReprKeyAssembler) AssignString(k string) if ka.state != maState_midKey { panic("misuse: KeyAssembler held beyond its valid lifetime") } - return dms3ld.ErrInvalidKey{TypeName: "schemadmt.MapRepresentation_Listpairs.Repr", Key: &_String{k}} + return ld.ErrInvalidKey{TypeName: "schemadmt.MapRepresentation_Listpairs.Repr", Key: &_String{k}} } func (_MapRepresentation_Listpairs__ReprKeyAssembler) AssignBytes([]byte) error { return mixins.StringAssembler{TypeName: "schemadmt.MapRepresentation_Listpairs.Repr.KeyAssembler"}.AssignBytes(nil) } -func (_MapRepresentation_Listpairs__ReprKeyAssembler) AssignLink(dms3ld.Link) error { +func (_MapRepresentation_Listpairs__ReprKeyAssembler) AssignLink(ld.Link) error { return mixins.StringAssembler{TypeName: "schemadmt.MapRepresentation_Listpairs.Repr.KeyAssembler"}.AssignLink(nil) } -func (ka *_MapRepresentation_Listpairs__ReprKeyAssembler) AssignNode(v dms3ld.Node) error { +func (ka *_MapRepresentation_Listpairs__ReprKeyAssembler) AssignNode(v ld.Node) error { if v2, err := v.AsString(); err != nil { return err } else { return ka.AssignString(v2) } } -func (_MapRepresentation_Listpairs__ReprKeyAssembler) Prototype() dms3ld.NodePrototype { +func (_MapRepresentation_Listpairs__ReprKeyAssembler) Prototype() ld.NodePrototype { return _String__Prototype{} } @@ -9031,12 +9031,12 @@ func (m MaybeMapRepresentation_Map) IsAbsent() bool { func (m MaybeMapRepresentation_Map) Exists() bool { return m.m == schema.Maybe_Value } -func (m MaybeMapRepresentation_Map) AsNode() dms3ld.Node { +func (m MaybeMapRepresentation_Map) AsNode() ld.Node { switch m.m { case schema.Maybe_Absent: - return dms3ld.Absent + return ld.Absent case schema.Maybe_Null: - return dms3ld.Null + return ld.Null case schema.Maybe_Value: return m.v default: @@ -9051,32 +9051,32 @@ func (m MaybeMapRepresentation_Map) Must() MapRepresentation_Map { } var () -var _ dms3ld.Node = (MapRepresentation_Map)(&_MapRepresentation_Map{}) +var _ ld.Node = (MapRepresentation_Map)(&_MapRepresentation_Map{}) var _ schema.TypedNode = (MapRepresentation_Map)(&_MapRepresentation_Map{}) -func (MapRepresentation_Map) Kind() dms3ld.Kind { - return dms3ld.Kind_Map +func (MapRepresentation_Map) Kind() ld.Kind { + return ld.Kind_Map } -func (n MapRepresentation_Map) LookupByString(key string) (dms3ld.Node, error) { +func (n MapRepresentation_Map) LookupByString(key string) (ld.Node, error) { switch key { default: - return nil, schema.ErrNoSuchField{Type: nil /*TODO*/, Field: dms3ld.PathSegmentOfString(key)} + return nil, schema.ErrNoSuchField{Type: nil /*TODO*/, Field: ld.PathSegmentOfString(key)} } } -func (n MapRepresentation_Map) LookupByNode(key dms3ld.Node) (dms3ld.Node, error) { +func (n MapRepresentation_Map) LookupByNode(key ld.Node) (ld.Node, error) { ks, err := key.AsString() if err != nil { return nil, err } return n.LookupByString(ks) } -func (MapRepresentation_Map) LookupByIndex(idx int64) (dms3ld.Node, error) { +func (MapRepresentation_Map) LookupByIndex(idx int64) (ld.Node, error) { return mixins.Map{TypeName: "schemadmt.MapRepresentation_Map"}.LookupByIndex(0) } -func (n MapRepresentation_Map) LookupBySegment(seg dms3ld.PathSegment) (dms3ld.Node, error) { +func (n MapRepresentation_Map) LookupBySegment(seg ld.PathSegment) (ld.Node, error) { return n.LookupByString(seg.String()) } -func (n MapRepresentation_Map) MapIterator() dms3ld.MapIterator { +func (n MapRepresentation_Map) MapIterator() ld.MapIterator { return &_MapRepresentation_Map__MapItr{n, 0} } @@ -9085,15 +9085,15 @@ type _MapRepresentation_Map__MapItr struct { idx int } -func (itr *_MapRepresentation_Map__MapItr) Next() (k dms3ld.Node, v dms3ld.Node, _ error) { - return nil, nil, dms3ld.ErrIteratorOverread{} +func (itr *_MapRepresentation_Map__MapItr) Next() (k ld.Node, v ld.Node, _ error) { + return nil, nil, ld.ErrIteratorOverread{} } func (itr *_MapRepresentation_Map__MapItr) Done() bool { return itr.idx >= 0 } -func (MapRepresentation_Map) ListIterator() dms3ld.ListIterator { +func (MapRepresentation_Map) ListIterator() ld.ListIterator { return nil } func (MapRepresentation_Map) Length() int64 { @@ -9120,16 +9120,16 @@ func (MapRepresentation_Map) AsString() (string, error) { func (MapRepresentation_Map) AsBytes() ([]byte, error) { return mixins.Map{TypeName: "schemadmt.MapRepresentation_Map"}.AsBytes() } -func (MapRepresentation_Map) AsLink() (dms3ld.Link, error) { +func (MapRepresentation_Map) AsLink() (ld.Link, error) { return mixins.Map{TypeName: "schemadmt.MapRepresentation_Map"}.AsLink() } -func (MapRepresentation_Map) Prototype() dms3ld.NodePrototype { +func (MapRepresentation_Map) Prototype() ld.NodePrototype { return _MapRepresentation_Map__Prototype{} } type _MapRepresentation_Map__Prototype struct{} -func (_MapRepresentation_Map__Prototype) NewBuilder() dms3ld.NodeBuilder { +func (_MapRepresentation_Map__Prototype) NewBuilder() ld.NodeBuilder { var nb _MapRepresentation_Map__Builder nb.Reset() return &nb @@ -9139,7 +9139,7 @@ type _MapRepresentation_Map__Builder struct { _MapRepresentation_Map__Assembler } -func (nb *_MapRepresentation_Map__Builder) Build() dms3ld.Node { +func (nb *_MapRepresentation_Map__Builder) Build() ld.Node { if *nb.m != schema.Maybe_Value { panic("invalid state: cannot call Build on an assembler that's not finished") } @@ -9170,7 +9170,7 @@ var ( fieldBits__MapRepresentation_Map_sufficient = 0 ) -func (na *_MapRepresentation_Map__Assembler) BeginMap(int64) (dms3ld.MapAssembler, error) { +func (na *_MapRepresentation_Map__Assembler) BeginMap(int64) (ld.MapAssembler, error) { switch *na.m { case schema.Maybe_Value, schema.Maybe_Null: panic("invalid state: cannot assign into assembler that's already finished") @@ -9183,7 +9183,7 @@ func (na *_MapRepresentation_Map__Assembler) BeginMap(int64) (dms3ld.MapAssemble } return na, nil } -func (_MapRepresentation_Map__Assembler) BeginList(sizeHint int64) (dms3ld.ListAssembler, error) { +func (_MapRepresentation_Map__Assembler) BeginList(sizeHint int64) (ld.ListAssembler, error) { return mixins.MapAssembler{TypeName: "schemadmt.MapRepresentation_Map"}.BeginList(0) } func (na *_MapRepresentation_Map__Assembler) AssignNull() error { @@ -9215,10 +9215,10 @@ func (_MapRepresentation_Map__Assembler) AssignString(string) error { func (_MapRepresentation_Map__Assembler) AssignBytes([]byte) error { return mixins.MapAssembler{TypeName: "schemadmt.MapRepresentation_Map"}.AssignBytes(nil) } -func (_MapRepresentation_Map__Assembler) AssignLink(dms3ld.Link) error { +func (_MapRepresentation_Map__Assembler) AssignLink(ld.Link) error { return mixins.MapAssembler{TypeName: "schemadmt.MapRepresentation_Map"}.AssignLink(nil) } -func (na *_MapRepresentation_Map__Assembler) AssignNode(v dms3ld.Node) error { +func (na *_MapRepresentation_Map__Assembler) AssignNode(v ld.Node) error { if v.IsNull() { return na.AssignNull() } @@ -9238,8 +9238,8 @@ func (na *_MapRepresentation_Map__Assembler) AssignNode(v dms3ld.Node) error { *na.m = schema.Maybe_Value return nil } - if v.Kind() != dms3ld.Kind_Map { - return dms3ld.ErrWrongKind{TypeName: "schemadmt.MapRepresentation_Map", MethodName: "AssignNode", AppropriateKind: dms3ld.KindSet_JustMap, ActualKind: v.Kind()} + if v.Kind() != ld.Kind_Map { + return ld.ErrWrongKind{TypeName: "schemadmt.MapRepresentation_Map", MethodName: "AssignNode", AppropriateKind: ld.KindSet_JustMap, ActualKind: v.Kind()} } itr := v.MapIterator() for !itr.Done() { @@ -9256,7 +9256,7 @@ func (na *_MapRepresentation_Map__Assembler) AssignNode(v dms3ld.Node) error { } return na.Finish() } -func (_MapRepresentation_Map__Assembler) Prototype() dms3ld.NodePrototype { +func (_MapRepresentation_Map__Assembler) Prototype() ld.NodePrototype { return _MapRepresentation_Map__Prototype{} } func (ma *_MapRepresentation_Map__Assembler) valueFinishTidy() bool { @@ -9265,7 +9265,7 @@ func (ma *_MapRepresentation_Map__Assembler) valueFinishTidy() bool { panic("unreachable") } } -func (ma *_MapRepresentation_Map__Assembler) AssembleEntry(k string) (dms3ld.NodeAssembler, error) { +func (ma *_MapRepresentation_Map__Assembler) AssembleEntry(k string) (ld.NodeAssembler, error) { switch ma.state { case maState_initial: // carry on @@ -9280,9 +9280,9 @@ func (ma *_MapRepresentation_Map__Assembler) AssembleEntry(k string) (dms3ld.Nod case maState_finished: panic("invalid state: AssembleEntry cannot be called on an assembler that's already finished") } - return nil, dms3ld.ErrInvalidKey{TypeName: "schemadmt.MapRepresentation_Map", Key: &_String{k}} + return nil, ld.ErrInvalidKey{TypeName: "schemadmt.MapRepresentation_Map", Key: &_String{k}} } -func (ma *_MapRepresentation_Map__Assembler) AssembleKey() dms3ld.NodeAssembler { +func (ma *_MapRepresentation_Map__Assembler) AssembleKey() ld.NodeAssembler { switch ma.state { case maState_initial: // carry on @@ -9300,7 +9300,7 @@ func (ma *_MapRepresentation_Map__Assembler) AssembleKey() dms3ld.NodeAssembler ma.state = maState_midKey return (*_MapRepresentation_Map__KeyAssembler)(ma) } -func (ma *_MapRepresentation_Map__Assembler) AssembleValue() dms3ld.NodeAssembler { +func (ma *_MapRepresentation_Map__Assembler) AssembleValue() ld.NodeAssembler { switch ma.state { case maState_initial: panic("invalid state: AssembleValue cannot be called when no key is primed") @@ -9335,26 +9335,26 @@ func (ma *_MapRepresentation_Map__Assembler) Finish() error { panic("invalid state: Finish cannot be called on an assembler that's already finished") } if ma.s&fieldBits__MapRepresentation_Map_sufficient != fieldBits__MapRepresentation_Map_sufficient { - err := dms3ld.ErrMissingRequiredField{Missing: make([]string, 0)} + err := ld.ErrMissingRequiredField{Missing: make([]string, 0)} return err } ma.state = maState_finished *ma.m = schema.Maybe_Value return nil } -func (ma *_MapRepresentation_Map__Assembler) KeyPrototype() dms3ld.NodePrototype { +func (ma *_MapRepresentation_Map__Assembler) KeyPrototype() ld.NodePrototype { return _String__Prototype{} } -func (ma *_MapRepresentation_Map__Assembler) ValuePrototype(k string) dms3ld.NodePrototype { +func (ma *_MapRepresentation_Map__Assembler) ValuePrototype(k string) ld.NodePrototype { panic("todo structbuilder mapassembler valueprototype") } type _MapRepresentation_Map__KeyAssembler _MapRepresentation_Map__Assembler -func (_MapRepresentation_Map__KeyAssembler) BeginMap(sizeHint int64) (dms3ld.MapAssembler, error) { +func (_MapRepresentation_Map__KeyAssembler) BeginMap(sizeHint int64) (ld.MapAssembler, error) { return mixins.StringAssembler{TypeName: "schemadmt.MapRepresentation_Map.KeyAssembler"}.BeginMap(0) } -func (_MapRepresentation_Map__KeyAssembler) BeginList(sizeHint int64) (dms3ld.ListAssembler, error) { +func (_MapRepresentation_Map__KeyAssembler) BeginList(sizeHint int64) (ld.ListAssembler, error) { return mixins.StringAssembler{TypeName: "schemadmt.MapRepresentation_Map.KeyAssembler"}.BeginList(0) } func (na *_MapRepresentation_Map__KeyAssembler) AssignNull() error { @@ -9375,61 +9375,61 @@ func (ka *_MapRepresentation_Map__KeyAssembler) AssignString(k string) error { } switch k { default: - return dms3ld.ErrInvalidKey{TypeName: "schemadmt.MapRepresentation_Map", Key: &_String{k}} + return ld.ErrInvalidKey{TypeName: "schemadmt.MapRepresentation_Map", Key: &_String{k}} } return nil } func (_MapRepresentation_Map__KeyAssembler) AssignBytes([]byte) error { return mixins.StringAssembler{TypeName: "schemadmt.MapRepresentation_Map.KeyAssembler"}.AssignBytes(nil) } -func (_MapRepresentation_Map__KeyAssembler) AssignLink(dms3ld.Link) error { +func (_MapRepresentation_Map__KeyAssembler) AssignLink(ld.Link) error { return mixins.StringAssembler{TypeName: "schemadmt.MapRepresentation_Map.KeyAssembler"}.AssignLink(nil) } -func (ka *_MapRepresentation_Map__KeyAssembler) AssignNode(v dms3ld.Node) error { +func (ka *_MapRepresentation_Map__KeyAssembler) AssignNode(v ld.Node) error { if v2, err := v.AsString(); err != nil { return err } else { return ka.AssignString(v2) } } -func (_MapRepresentation_Map__KeyAssembler) Prototype() dms3ld.NodePrototype { +func (_MapRepresentation_Map__KeyAssembler) Prototype() ld.NodePrototype { return _String__Prototype{} } func (MapRepresentation_Map) Type() schema.Type { return nil /*TODO:typelit*/ } -func (n MapRepresentation_Map) Representation() dms3ld.Node { +func (n MapRepresentation_Map) Representation() ld.Node { return (*_MapRepresentation_Map__Repr)(n) } type _MapRepresentation_Map__Repr _MapRepresentation_Map var () -var _ dms3ld.Node = &_MapRepresentation_Map__Repr{} +var _ ld.Node = &_MapRepresentation_Map__Repr{} -func (_MapRepresentation_Map__Repr) Kind() dms3ld.Kind { - return dms3ld.Kind_Map +func (_MapRepresentation_Map__Repr) Kind() ld.Kind { + return ld.Kind_Map } -func (n *_MapRepresentation_Map__Repr) LookupByString(key string) (dms3ld.Node, error) { +func (n *_MapRepresentation_Map__Repr) LookupByString(key string) (ld.Node, error) { switch key { default: - return nil, schema.ErrNoSuchField{Type: nil /*TODO*/, Field: dms3ld.PathSegmentOfString(key)} + return nil, schema.ErrNoSuchField{Type: nil /*TODO*/, Field: ld.PathSegmentOfString(key)} } } -func (n *_MapRepresentation_Map__Repr) LookupByNode(key dms3ld.Node) (dms3ld.Node, error) { +func (n *_MapRepresentation_Map__Repr) LookupByNode(key ld.Node) (ld.Node, error) { ks, err := key.AsString() if err != nil { return nil, err } return n.LookupByString(ks) } -func (_MapRepresentation_Map__Repr) LookupByIndex(idx int64) (dms3ld.Node, error) { +func (_MapRepresentation_Map__Repr) LookupByIndex(idx int64) (ld.Node, error) { return mixins.Map{TypeName: "schemadmt.MapRepresentation_Map.Repr"}.LookupByIndex(0) } -func (n _MapRepresentation_Map__Repr) LookupBySegment(seg dms3ld.PathSegment) (dms3ld.Node, error) { +func (n _MapRepresentation_Map__Repr) LookupBySegment(seg ld.PathSegment) (ld.Node, error) { return n.LookupByString(seg.String()) } -func (n *_MapRepresentation_Map__Repr) MapIterator() dms3ld.MapIterator { +func (n *_MapRepresentation_Map__Repr) MapIterator() ld.MapIterator { return &_MapRepresentation_Map__ReprMapItr{n, 0} } @@ -9438,14 +9438,14 @@ type _MapRepresentation_Map__ReprMapItr struct { idx int } -func (itr *_MapRepresentation_Map__ReprMapItr) Next() (k dms3ld.Node, v dms3ld.Node, _ error) { - return nil, nil, dms3ld.ErrIteratorOverread{} +func (itr *_MapRepresentation_Map__ReprMapItr) Next() (k ld.Node, v ld.Node, _ error) { + return nil, nil, ld.ErrIteratorOverread{} } func (itr *_MapRepresentation_Map__ReprMapItr) Done() bool { return itr.idx >= 0 } -func (_MapRepresentation_Map__Repr) ListIterator() dms3ld.ListIterator { +func (_MapRepresentation_Map__Repr) ListIterator() ld.ListIterator { return nil } func (rn *_MapRepresentation_Map__Repr) Length() int64 { @@ -9473,16 +9473,16 @@ func (_MapRepresentation_Map__Repr) AsString() (string, error) { func (_MapRepresentation_Map__Repr) AsBytes() ([]byte, error) { return mixins.Map{TypeName: "schemadmt.MapRepresentation_Map.Repr"}.AsBytes() } -func (_MapRepresentation_Map__Repr) AsLink() (dms3ld.Link, error) { +func (_MapRepresentation_Map__Repr) AsLink() (ld.Link, error) { return mixins.Map{TypeName: "schemadmt.MapRepresentation_Map.Repr"}.AsLink() } -func (_MapRepresentation_Map__Repr) Prototype() dms3ld.NodePrototype { +func (_MapRepresentation_Map__Repr) Prototype() ld.NodePrototype { return _MapRepresentation_Map__ReprPrototype{} } type _MapRepresentation_Map__ReprPrototype struct{} -func (_MapRepresentation_Map__ReprPrototype) NewBuilder() dms3ld.NodeBuilder { +func (_MapRepresentation_Map__ReprPrototype) NewBuilder() ld.NodeBuilder { var nb _MapRepresentation_Map__ReprBuilder nb.Reset() return &nb @@ -9492,7 +9492,7 @@ type _MapRepresentation_Map__ReprBuilder struct { _MapRepresentation_Map__ReprAssembler } -func (nb *_MapRepresentation_Map__ReprBuilder) Build() dms3ld.Node { +func (nb *_MapRepresentation_Map__ReprBuilder) Build() ld.Node { if *nb.m != schema.Maybe_Value { panic("invalid state: cannot call Build on an assembler that's not finished") } @@ -9518,7 +9518,7 @@ func (na *_MapRepresentation_Map__ReprAssembler) reset() { na.state = maState_initial na.s = 0 } -func (na *_MapRepresentation_Map__ReprAssembler) BeginMap(int64) (dms3ld.MapAssembler, error) { +func (na *_MapRepresentation_Map__ReprAssembler) BeginMap(int64) (ld.MapAssembler, error) { switch *na.m { case schema.Maybe_Value, schema.Maybe_Null: panic("invalid state: cannot assign into assembler that's already finished") @@ -9531,7 +9531,7 @@ func (na *_MapRepresentation_Map__ReprAssembler) BeginMap(int64) (dms3ld.MapAsse } return na, nil } -func (_MapRepresentation_Map__ReprAssembler) BeginList(sizeHint int64) (dms3ld.ListAssembler, error) { +func (_MapRepresentation_Map__ReprAssembler) BeginList(sizeHint int64) (ld.ListAssembler, error) { return mixins.MapAssembler{TypeName: "schemadmt.MapRepresentation_Map.Repr"}.BeginList(0) } func (na *_MapRepresentation_Map__ReprAssembler) AssignNull() error { @@ -9563,10 +9563,10 @@ func (_MapRepresentation_Map__ReprAssembler) AssignString(string) error { func (_MapRepresentation_Map__ReprAssembler) AssignBytes([]byte) error { return mixins.MapAssembler{TypeName: "schemadmt.MapRepresentation_Map.Repr"}.AssignBytes(nil) } -func (_MapRepresentation_Map__ReprAssembler) AssignLink(dms3ld.Link) error { +func (_MapRepresentation_Map__ReprAssembler) AssignLink(ld.Link) error { return mixins.MapAssembler{TypeName: "schemadmt.MapRepresentation_Map.Repr"}.AssignLink(nil) } -func (na *_MapRepresentation_Map__ReprAssembler) AssignNode(v dms3ld.Node) error { +func (na *_MapRepresentation_Map__ReprAssembler) AssignNode(v ld.Node) error { if v.IsNull() { return na.AssignNull() } @@ -9586,8 +9586,8 @@ func (na *_MapRepresentation_Map__ReprAssembler) AssignNode(v dms3ld.Node) error *na.m = schema.Maybe_Value return nil } - if v.Kind() != dms3ld.Kind_Map { - return dms3ld.ErrWrongKind{TypeName: "schemadmt.MapRepresentation_Map.Repr", MethodName: "AssignNode", AppropriateKind: dms3ld.KindSet_JustMap, ActualKind: v.Kind()} + if v.Kind() != ld.Kind_Map { + return ld.ErrWrongKind{TypeName: "schemadmt.MapRepresentation_Map.Repr", MethodName: "AssignNode", AppropriateKind: ld.KindSet_JustMap, ActualKind: v.Kind()} } itr := v.MapIterator() for !itr.Done() { @@ -9604,7 +9604,7 @@ func (na *_MapRepresentation_Map__ReprAssembler) AssignNode(v dms3ld.Node) error } return na.Finish() } -func (_MapRepresentation_Map__ReprAssembler) Prototype() dms3ld.NodePrototype { +func (_MapRepresentation_Map__ReprAssembler) Prototype() ld.NodePrototype { return _MapRepresentation_Map__ReprPrototype{} } func (ma *_MapRepresentation_Map__ReprAssembler) valueFinishTidy() bool { @@ -9613,7 +9613,7 @@ func (ma *_MapRepresentation_Map__ReprAssembler) valueFinishTidy() bool { panic("unreachable") } } -func (ma *_MapRepresentation_Map__ReprAssembler) AssembleEntry(k string) (dms3ld.NodeAssembler, error) { +func (ma *_MapRepresentation_Map__ReprAssembler) AssembleEntry(k string) (ld.NodeAssembler, error) { switch ma.state { case maState_initial: // carry on @@ -9628,9 +9628,9 @@ func (ma *_MapRepresentation_Map__ReprAssembler) AssembleEntry(k string) (dms3ld case maState_finished: panic("invalid state: AssembleEntry cannot be called on an assembler that's already finished") } - return nil, dms3ld.ErrInvalidKey{TypeName: "schemadmt.MapRepresentation_Map.Repr", Key: &_String{k}} + return nil, ld.ErrInvalidKey{TypeName: "schemadmt.MapRepresentation_Map.Repr", Key: &_String{k}} } -func (ma *_MapRepresentation_Map__ReprAssembler) AssembleKey() dms3ld.NodeAssembler { +func (ma *_MapRepresentation_Map__ReprAssembler) AssembleKey() ld.NodeAssembler { switch ma.state { case maState_initial: // carry on @@ -9648,7 +9648,7 @@ func (ma *_MapRepresentation_Map__ReprAssembler) AssembleKey() dms3ld.NodeAssemb ma.state = maState_midKey return (*_MapRepresentation_Map__ReprKeyAssembler)(ma) } -func (ma *_MapRepresentation_Map__ReprAssembler) AssembleValue() dms3ld.NodeAssembler { +func (ma *_MapRepresentation_Map__ReprAssembler) AssembleValue() ld.NodeAssembler { switch ma.state { case maState_initial: panic("invalid state: AssembleValue cannot be called when no key is primed") @@ -9683,26 +9683,26 @@ func (ma *_MapRepresentation_Map__ReprAssembler) Finish() error { panic("invalid state: Finish cannot be called on an assembler that's already finished") } if ma.s&fieldBits__MapRepresentation_Map_sufficient != fieldBits__MapRepresentation_Map_sufficient { - err := dms3ld.ErrMissingRequiredField{Missing: make([]string, 0)} + err := ld.ErrMissingRequiredField{Missing: make([]string, 0)} return err } ma.state = maState_finished *ma.m = schema.Maybe_Value return nil } -func (ma *_MapRepresentation_Map__ReprAssembler) KeyPrototype() dms3ld.NodePrototype { +func (ma *_MapRepresentation_Map__ReprAssembler) KeyPrototype() ld.NodePrototype { return _String__Prototype{} } -func (ma *_MapRepresentation_Map__ReprAssembler) ValuePrototype(k string) dms3ld.NodePrototype { +func (ma *_MapRepresentation_Map__ReprAssembler) ValuePrototype(k string) ld.NodePrototype { panic("todo structbuilder mapassembler repr valueprototype") } type _MapRepresentation_Map__ReprKeyAssembler _MapRepresentation_Map__ReprAssembler -func (_MapRepresentation_Map__ReprKeyAssembler) BeginMap(sizeHint int64) (dms3ld.MapAssembler, error) { +func (_MapRepresentation_Map__ReprKeyAssembler) BeginMap(sizeHint int64) (ld.MapAssembler, error) { return mixins.StringAssembler{TypeName: "schemadmt.MapRepresentation_Map.Repr.KeyAssembler"}.BeginMap(0) } -func (_MapRepresentation_Map__ReprKeyAssembler) BeginList(sizeHint int64) (dms3ld.ListAssembler, error) { +func (_MapRepresentation_Map__ReprKeyAssembler) BeginList(sizeHint int64) (ld.ListAssembler, error) { return mixins.StringAssembler{TypeName: "schemadmt.MapRepresentation_Map.Repr.KeyAssembler"}.BeginList(0) } func (na *_MapRepresentation_Map__ReprKeyAssembler) AssignNull() error { @@ -9721,22 +9721,22 @@ func (ka *_MapRepresentation_Map__ReprKeyAssembler) AssignString(k string) error if ka.state != maState_midKey { panic("misuse: KeyAssembler held beyond its valid lifetime") } - return dms3ld.ErrInvalidKey{TypeName: "schemadmt.MapRepresentation_Map.Repr", Key: &_String{k}} + return ld.ErrInvalidKey{TypeName: "schemadmt.MapRepresentation_Map.Repr", Key: &_String{k}} } func (_MapRepresentation_Map__ReprKeyAssembler) AssignBytes([]byte) error { return mixins.StringAssembler{TypeName: "schemadmt.MapRepresentation_Map.Repr.KeyAssembler"}.AssignBytes(nil) } -func (_MapRepresentation_Map__ReprKeyAssembler) AssignLink(dms3ld.Link) error { +func (_MapRepresentation_Map__ReprKeyAssembler) AssignLink(ld.Link) error { return mixins.StringAssembler{TypeName: "schemadmt.MapRepresentation_Map.Repr.KeyAssembler"}.AssignLink(nil) } -func (ka *_MapRepresentation_Map__ReprKeyAssembler) AssignNode(v dms3ld.Node) error { +func (ka *_MapRepresentation_Map__ReprKeyAssembler) AssignNode(v ld.Node) error { if v2, err := v.AsString(); err != nil { return err } else { return ka.AssignString(v2) } } -func (_MapRepresentation_Map__ReprKeyAssembler) Prototype() dms3ld.NodePrototype { +func (_MapRepresentation_Map__ReprKeyAssembler) Prototype() ld.NodePrototype { return _String__Prototype{} } @@ -9762,12 +9762,12 @@ func (m MaybeMapRepresentation_Stringpairs) IsAbsent() bool { func (m MaybeMapRepresentation_Stringpairs) Exists() bool { return m.m == schema.Maybe_Value } -func (m MaybeMapRepresentation_Stringpairs) AsNode() dms3ld.Node { +func (m MaybeMapRepresentation_Stringpairs) AsNode() ld.Node { switch m.m { case schema.Maybe_Absent: - return dms3ld.Absent + return ld.Absent case schema.Maybe_Null: - return dms3ld.Null + return ld.Null case schema.Maybe_Value: return m.v default: @@ -9785,36 +9785,36 @@ var ( fieldName__MapRepresentation_Stringpairs_InnerDelim = _String{"innerDelim"} fieldName__MapRepresentation_Stringpairs_EntryDelim = _String{"entryDelim"} ) -var _ dms3ld.Node = (MapRepresentation_Stringpairs)(&_MapRepresentation_Stringpairs{}) +var _ ld.Node = (MapRepresentation_Stringpairs)(&_MapRepresentation_Stringpairs{}) var _ schema.TypedNode = (MapRepresentation_Stringpairs)(&_MapRepresentation_Stringpairs{}) -func (MapRepresentation_Stringpairs) Kind() dms3ld.Kind { - return dms3ld.Kind_Map +func (MapRepresentation_Stringpairs) Kind() ld.Kind { + return ld.Kind_Map } -func (n MapRepresentation_Stringpairs) LookupByString(key string) (dms3ld.Node, error) { +func (n MapRepresentation_Stringpairs) LookupByString(key string) (ld.Node, error) { switch key { case "innerDelim": return &n.innerDelim, nil case "entryDelim": return &n.entryDelim, nil default: - return nil, schema.ErrNoSuchField{Type: nil /*TODO*/, Field: dms3ld.PathSegmentOfString(key)} + return nil, schema.ErrNoSuchField{Type: nil /*TODO*/, Field: ld.PathSegmentOfString(key)} } } -func (n MapRepresentation_Stringpairs) LookupByNode(key dms3ld.Node) (dms3ld.Node, error) { +func (n MapRepresentation_Stringpairs) LookupByNode(key ld.Node) (ld.Node, error) { ks, err := key.AsString() if err != nil { return nil, err } return n.LookupByString(ks) } -func (MapRepresentation_Stringpairs) LookupByIndex(idx int64) (dms3ld.Node, error) { +func (MapRepresentation_Stringpairs) LookupByIndex(idx int64) (ld.Node, error) { return mixins.Map{TypeName: "schemadmt.MapRepresentation_Stringpairs"}.LookupByIndex(0) } -func (n MapRepresentation_Stringpairs) LookupBySegment(seg dms3ld.PathSegment) (dms3ld.Node, error) { +func (n MapRepresentation_Stringpairs) LookupBySegment(seg ld.PathSegment) (ld.Node, error) { return n.LookupByString(seg.String()) } -func (n MapRepresentation_Stringpairs) MapIterator() dms3ld.MapIterator { +func (n MapRepresentation_Stringpairs) MapIterator() ld.MapIterator { return &_MapRepresentation_Stringpairs__MapItr{n, 0} } @@ -9823,9 +9823,9 @@ type _MapRepresentation_Stringpairs__MapItr struct { idx int } -func (itr *_MapRepresentation_Stringpairs__MapItr) Next() (k dms3ld.Node, v dms3ld.Node, _ error) { +func (itr *_MapRepresentation_Stringpairs__MapItr) Next() (k ld.Node, v ld.Node, _ error) { if itr.idx >= 2 { - return nil, nil, dms3ld.ErrIteratorOverread{} + return nil, nil, ld.ErrIteratorOverread{} } switch itr.idx { case 0: @@ -9844,7 +9844,7 @@ func (itr *_MapRepresentation_Stringpairs__MapItr) Done() bool { return itr.idx >= 2 } -func (MapRepresentation_Stringpairs) ListIterator() dms3ld.ListIterator { +func (MapRepresentation_Stringpairs) ListIterator() ld.ListIterator { return nil } func (MapRepresentation_Stringpairs) Length() int64 { @@ -9871,16 +9871,16 @@ func (MapRepresentation_Stringpairs) AsString() (string, error) { func (MapRepresentation_Stringpairs) AsBytes() ([]byte, error) { return mixins.Map{TypeName: "schemadmt.MapRepresentation_Stringpairs"}.AsBytes() } -func (MapRepresentation_Stringpairs) AsLink() (dms3ld.Link, error) { +func (MapRepresentation_Stringpairs) AsLink() (ld.Link, error) { return mixins.Map{TypeName: "schemadmt.MapRepresentation_Stringpairs"}.AsLink() } -func (MapRepresentation_Stringpairs) Prototype() dms3ld.NodePrototype { +func (MapRepresentation_Stringpairs) Prototype() ld.NodePrototype { return _MapRepresentation_Stringpairs__Prototype{} } type _MapRepresentation_Stringpairs__Prototype struct{} -func (_MapRepresentation_Stringpairs__Prototype) NewBuilder() dms3ld.NodeBuilder { +func (_MapRepresentation_Stringpairs__Prototype) NewBuilder() ld.NodeBuilder { var nb _MapRepresentation_Stringpairs__Builder nb.Reset() return &nb @@ -9890,7 +9890,7 @@ type _MapRepresentation_Stringpairs__Builder struct { _MapRepresentation_Stringpairs__Assembler } -func (nb *_MapRepresentation_Stringpairs__Builder) Build() dms3ld.Node { +func (nb *_MapRepresentation_Stringpairs__Builder) Build() ld.Node { if *nb.m != schema.Maybe_Value { panic("invalid state: cannot call Build on an assembler that's not finished") } @@ -9927,7 +9927,7 @@ var ( fieldBits__MapRepresentation_Stringpairs_sufficient = 0 + 1<<0 + 1<<1 ) -func (na *_MapRepresentation_Stringpairs__Assembler) BeginMap(int64) (dms3ld.MapAssembler, error) { +func (na *_MapRepresentation_Stringpairs__Assembler) BeginMap(int64) (ld.MapAssembler, error) { switch *na.m { case schema.Maybe_Value, schema.Maybe_Null: panic("invalid state: cannot assign into assembler that's already finished") @@ -9940,7 +9940,7 @@ func (na *_MapRepresentation_Stringpairs__Assembler) BeginMap(int64) (dms3ld.Map } return na, nil } -func (_MapRepresentation_Stringpairs__Assembler) BeginList(sizeHint int64) (dms3ld.ListAssembler, error) { +func (_MapRepresentation_Stringpairs__Assembler) BeginList(sizeHint int64) (ld.ListAssembler, error) { return mixins.MapAssembler{TypeName: "schemadmt.MapRepresentation_Stringpairs"}.BeginList(0) } func (na *_MapRepresentation_Stringpairs__Assembler) AssignNull() error { @@ -9972,10 +9972,10 @@ func (_MapRepresentation_Stringpairs__Assembler) AssignString(string) error { func (_MapRepresentation_Stringpairs__Assembler) AssignBytes([]byte) error { return mixins.MapAssembler{TypeName: "schemadmt.MapRepresentation_Stringpairs"}.AssignBytes(nil) } -func (_MapRepresentation_Stringpairs__Assembler) AssignLink(dms3ld.Link) error { +func (_MapRepresentation_Stringpairs__Assembler) AssignLink(ld.Link) error { return mixins.MapAssembler{TypeName: "schemadmt.MapRepresentation_Stringpairs"}.AssignLink(nil) } -func (na *_MapRepresentation_Stringpairs__Assembler) AssignNode(v dms3ld.Node) error { +func (na *_MapRepresentation_Stringpairs__Assembler) AssignNode(v ld.Node) error { if v.IsNull() { return na.AssignNull() } @@ -9995,8 +9995,8 @@ func (na *_MapRepresentation_Stringpairs__Assembler) AssignNode(v dms3ld.Node) e *na.m = schema.Maybe_Value return nil } - if v.Kind() != dms3ld.Kind_Map { - return dms3ld.ErrWrongKind{TypeName: "schemadmt.MapRepresentation_Stringpairs", MethodName: "AssignNode", AppropriateKind: dms3ld.KindSet_JustMap, ActualKind: v.Kind()} + if v.Kind() != ld.Kind_Map { + return ld.ErrWrongKind{TypeName: "schemadmt.MapRepresentation_Stringpairs", MethodName: "AssignNode", AppropriateKind: ld.KindSet_JustMap, ActualKind: v.Kind()} } itr := v.MapIterator() for !itr.Done() { @@ -10013,7 +10013,7 @@ func (na *_MapRepresentation_Stringpairs__Assembler) AssignNode(v dms3ld.Node) e } return na.Finish() } -func (_MapRepresentation_Stringpairs__Assembler) Prototype() dms3ld.NodePrototype { +func (_MapRepresentation_Stringpairs__Assembler) Prototype() ld.NodePrototype { return _MapRepresentation_Stringpairs__Prototype{} } func (ma *_MapRepresentation_Stringpairs__Assembler) valueFinishTidy() bool { @@ -10042,7 +10042,7 @@ func (ma *_MapRepresentation_Stringpairs__Assembler) valueFinishTidy() bool { panic("unreachable") } } -func (ma *_MapRepresentation_Stringpairs__Assembler) AssembleEntry(k string) (dms3ld.NodeAssembler, error) { +func (ma *_MapRepresentation_Stringpairs__Assembler) AssembleEntry(k string) (ld.NodeAssembler, error) { switch ma.state { case maState_initial: // carry on @@ -10060,7 +10060,7 @@ func (ma *_MapRepresentation_Stringpairs__Assembler) AssembleEntry(k string) (dm switch k { case "innerDelim": if ma.s&fieldBit__MapRepresentation_Stringpairs_InnerDelim != 0 { - return nil, dms3ld.ErrRepeatedMapKey{Key: &fieldName__MapRepresentation_Stringpairs_InnerDelim} + return nil, ld.ErrRepeatedMapKey{Key: &fieldName__MapRepresentation_Stringpairs_InnerDelim} } ma.s += fieldBit__MapRepresentation_Stringpairs_InnerDelim ma.state = maState_midValue @@ -10070,7 +10070,7 @@ func (ma *_MapRepresentation_Stringpairs__Assembler) AssembleEntry(k string) (dm return &ma.ca_innerDelim, nil case "entryDelim": if ma.s&fieldBit__MapRepresentation_Stringpairs_EntryDelim != 0 { - return nil, dms3ld.ErrRepeatedMapKey{Key: &fieldName__MapRepresentation_Stringpairs_EntryDelim} + return nil, ld.ErrRepeatedMapKey{Key: &fieldName__MapRepresentation_Stringpairs_EntryDelim} } ma.s += fieldBit__MapRepresentation_Stringpairs_EntryDelim ma.state = maState_midValue @@ -10079,9 +10079,9 @@ func (ma *_MapRepresentation_Stringpairs__Assembler) AssembleEntry(k string) (dm ma.ca_entryDelim.m = &ma.cm return &ma.ca_entryDelim, nil } - return nil, dms3ld.ErrInvalidKey{TypeName: "schemadmt.MapRepresentation_Stringpairs", Key: &_String{k}} + return nil, ld.ErrInvalidKey{TypeName: "schemadmt.MapRepresentation_Stringpairs", Key: &_String{k}} } -func (ma *_MapRepresentation_Stringpairs__Assembler) AssembleKey() dms3ld.NodeAssembler { +func (ma *_MapRepresentation_Stringpairs__Assembler) AssembleKey() ld.NodeAssembler { switch ma.state { case maState_initial: // carry on @@ -10099,7 +10099,7 @@ func (ma *_MapRepresentation_Stringpairs__Assembler) AssembleKey() dms3ld.NodeAs ma.state = maState_midKey return (*_MapRepresentation_Stringpairs__KeyAssembler)(ma) } -func (ma *_MapRepresentation_Stringpairs__Assembler) AssembleValue() dms3ld.NodeAssembler { +func (ma *_MapRepresentation_Stringpairs__Assembler) AssembleValue() ld.NodeAssembler { switch ma.state { case maState_initial: panic("invalid state: AssembleValue cannot be called when no key is primed") @@ -10142,7 +10142,7 @@ func (ma *_MapRepresentation_Stringpairs__Assembler) Finish() error { panic("invalid state: Finish cannot be called on an assembler that's already finished") } if ma.s&fieldBits__MapRepresentation_Stringpairs_sufficient != fieldBits__MapRepresentation_Stringpairs_sufficient { - err := dms3ld.ErrMissingRequiredField{Missing: make([]string, 0)} + err := ld.ErrMissingRequiredField{Missing: make([]string, 0)} if ma.s&fieldBit__MapRepresentation_Stringpairs_InnerDelim == 0 { err.Missing = append(err.Missing, "innerDelim") } @@ -10155,19 +10155,19 @@ func (ma *_MapRepresentation_Stringpairs__Assembler) Finish() error { *ma.m = schema.Maybe_Value return nil } -func (ma *_MapRepresentation_Stringpairs__Assembler) KeyPrototype() dms3ld.NodePrototype { +func (ma *_MapRepresentation_Stringpairs__Assembler) KeyPrototype() ld.NodePrototype { return _String__Prototype{} } -func (ma *_MapRepresentation_Stringpairs__Assembler) ValuePrototype(k string) dms3ld.NodePrototype { +func (ma *_MapRepresentation_Stringpairs__Assembler) ValuePrototype(k string) ld.NodePrototype { panic("todo structbuilder mapassembler valueprototype") } type _MapRepresentation_Stringpairs__KeyAssembler _MapRepresentation_Stringpairs__Assembler -func (_MapRepresentation_Stringpairs__KeyAssembler) BeginMap(sizeHint int64) (dms3ld.MapAssembler, error) { +func (_MapRepresentation_Stringpairs__KeyAssembler) BeginMap(sizeHint int64) (ld.MapAssembler, error) { return mixins.StringAssembler{TypeName: "schemadmt.MapRepresentation_Stringpairs.KeyAssembler"}.BeginMap(0) } -func (_MapRepresentation_Stringpairs__KeyAssembler) BeginList(sizeHint int64) (dms3ld.ListAssembler, error) { +func (_MapRepresentation_Stringpairs__KeyAssembler) BeginList(sizeHint int64) (ld.ListAssembler, error) { return mixins.StringAssembler{TypeName: "schemadmt.MapRepresentation_Stringpairs.KeyAssembler"}.BeginList(0) } func (na *_MapRepresentation_Stringpairs__KeyAssembler) AssignNull() error { @@ -10189,43 +10189,43 @@ func (ka *_MapRepresentation_Stringpairs__KeyAssembler) AssignString(k string) e switch k { case "innerDelim": if ka.s&fieldBit__MapRepresentation_Stringpairs_InnerDelim != 0 { - return dms3ld.ErrRepeatedMapKey{Key: &fieldName__MapRepresentation_Stringpairs_InnerDelim} + return ld.ErrRepeatedMapKey{Key: &fieldName__MapRepresentation_Stringpairs_InnerDelim} } ka.s += fieldBit__MapRepresentation_Stringpairs_InnerDelim ka.state = maState_expectValue ka.f = 0 case "entryDelim": if ka.s&fieldBit__MapRepresentation_Stringpairs_EntryDelim != 0 { - return dms3ld.ErrRepeatedMapKey{Key: &fieldName__MapRepresentation_Stringpairs_EntryDelim} + return ld.ErrRepeatedMapKey{Key: &fieldName__MapRepresentation_Stringpairs_EntryDelim} } ka.s += fieldBit__MapRepresentation_Stringpairs_EntryDelim ka.state = maState_expectValue ka.f = 1 default: - return dms3ld.ErrInvalidKey{TypeName: "schemadmt.MapRepresentation_Stringpairs", Key: &_String{k}} + return ld.ErrInvalidKey{TypeName: "schemadmt.MapRepresentation_Stringpairs", Key: &_String{k}} } return nil } func (_MapRepresentation_Stringpairs__KeyAssembler) AssignBytes([]byte) error { return mixins.StringAssembler{TypeName: "schemadmt.MapRepresentation_Stringpairs.KeyAssembler"}.AssignBytes(nil) } -func (_MapRepresentation_Stringpairs__KeyAssembler) AssignLink(dms3ld.Link) error { +func (_MapRepresentation_Stringpairs__KeyAssembler) AssignLink(ld.Link) error { return mixins.StringAssembler{TypeName: "schemadmt.MapRepresentation_Stringpairs.KeyAssembler"}.AssignLink(nil) } -func (ka *_MapRepresentation_Stringpairs__KeyAssembler) AssignNode(v dms3ld.Node) error { +func (ka *_MapRepresentation_Stringpairs__KeyAssembler) AssignNode(v ld.Node) error { if v2, err := v.AsString(); err != nil { return err } else { return ka.AssignString(v2) } } -func (_MapRepresentation_Stringpairs__KeyAssembler) Prototype() dms3ld.NodePrototype { +func (_MapRepresentation_Stringpairs__KeyAssembler) Prototype() ld.NodePrototype { return _String__Prototype{} } func (MapRepresentation_Stringpairs) Type() schema.Type { return nil /*TODO:typelit*/ } -func (n MapRepresentation_Stringpairs) Representation() dms3ld.Node { +func (n MapRepresentation_Stringpairs) Representation() ld.Node { return (*_MapRepresentation_Stringpairs__Repr)(n) } @@ -10235,35 +10235,35 @@ var ( fieldName__MapRepresentation_Stringpairs_InnerDelim_serial = _String{"innerDelim"} fieldName__MapRepresentation_Stringpairs_EntryDelim_serial = _String{"entryDelim"} ) -var _ dms3ld.Node = &_MapRepresentation_Stringpairs__Repr{} +var _ ld.Node = &_MapRepresentation_Stringpairs__Repr{} -func (_MapRepresentation_Stringpairs__Repr) Kind() dms3ld.Kind { - return dms3ld.Kind_Map +func (_MapRepresentation_Stringpairs__Repr) Kind() ld.Kind { + return ld.Kind_Map } -func (n *_MapRepresentation_Stringpairs__Repr) LookupByString(key string) (dms3ld.Node, error) { +func (n *_MapRepresentation_Stringpairs__Repr) LookupByString(key string) (ld.Node, error) { switch key { case "innerDelim": return n.innerDelim.Representation(), nil case "entryDelim": return n.entryDelim.Representation(), nil default: - return nil, schema.ErrNoSuchField{Type: nil /*TODO*/, Field: dms3ld.PathSegmentOfString(key)} + return nil, schema.ErrNoSuchField{Type: nil /*TODO*/, Field: ld.PathSegmentOfString(key)} } } -func (n *_MapRepresentation_Stringpairs__Repr) LookupByNode(key dms3ld.Node) (dms3ld.Node, error) { +func (n *_MapRepresentation_Stringpairs__Repr) LookupByNode(key ld.Node) (ld.Node, error) { ks, err := key.AsString() if err != nil { return nil, err } return n.LookupByString(ks) } -func (_MapRepresentation_Stringpairs__Repr) LookupByIndex(idx int64) (dms3ld.Node, error) { +func (_MapRepresentation_Stringpairs__Repr) LookupByIndex(idx int64) (ld.Node, error) { return mixins.Map{TypeName: "schemadmt.MapRepresentation_Stringpairs.Repr"}.LookupByIndex(0) } -func (n _MapRepresentation_Stringpairs__Repr) LookupBySegment(seg dms3ld.PathSegment) (dms3ld.Node, error) { +func (n _MapRepresentation_Stringpairs__Repr) LookupBySegment(seg ld.PathSegment) (ld.Node, error) { return n.LookupByString(seg.String()) } -func (n *_MapRepresentation_Stringpairs__Repr) MapIterator() dms3ld.MapIterator { +func (n *_MapRepresentation_Stringpairs__Repr) MapIterator() ld.MapIterator { return &_MapRepresentation_Stringpairs__ReprMapItr{n, 0} } @@ -10272,9 +10272,9 @@ type _MapRepresentation_Stringpairs__ReprMapItr struct { idx int } -func (itr *_MapRepresentation_Stringpairs__ReprMapItr) Next() (k dms3ld.Node, v dms3ld.Node, _ error) { +func (itr *_MapRepresentation_Stringpairs__ReprMapItr) Next() (k ld.Node, v ld.Node, _ error) { if itr.idx >= 2 { - return nil, nil, dms3ld.ErrIteratorOverread{} + return nil, nil, ld.ErrIteratorOverread{} } switch itr.idx { case 0: @@ -10292,7 +10292,7 @@ func (itr *_MapRepresentation_Stringpairs__ReprMapItr) Next() (k dms3ld.Node, v func (itr *_MapRepresentation_Stringpairs__ReprMapItr) Done() bool { return itr.idx >= 2 } -func (_MapRepresentation_Stringpairs__Repr) ListIterator() dms3ld.ListIterator { +func (_MapRepresentation_Stringpairs__Repr) ListIterator() ld.ListIterator { return nil } func (rn *_MapRepresentation_Stringpairs__Repr) Length() int64 { @@ -10320,16 +10320,16 @@ func (_MapRepresentation_Stringpairs__Repr) AsString() (string, error) { func (_MapRepresentation_Stringpairs__Repr) AsBytes() ([]byte, error) { return mixins.Map{TypeName: "schemadmt.MapRepresentation_Stringpairs.Repr"}.AsBytes() } -func (_MapRepresentation_Stringpairs__Repr) AsLink() (dms3ld.Link, error) { +func (_MapRepresentation_Stringpairs__Repr) AsLink() (ld.Link, error) { return mixins.Map{TypeName: "schemadmt.MapRepresentation_Stringpairs.Repr"}.AsLink() } -func (_MapRepresentation_Stringpairs__Repr) Prototype() dms3ld.NodePrototype { +func (_MapRepresentation_Stringpairs__Repr) Prototype() ld.NodePrototype { return _MapRepresentation_Stringpairs__ReprPrototype{} } type _MapRepresentation_Stringpairs__ReprPrototype struct{} -func (_MapRepresentation_Stringpairs__ReprPrototype) NewBuilder() dms3ld.NodeBuilder { +func (_MapRepresentation_Stringpairs__ReprPrototype) NewBuilder() ld.NodeBuilder { var nb _MapRepresentation_Stringpairs__ReprBuilder nb.Reset() return &nb @@ -10339,7 +10339,7 @@ type _MapRepresentation_Stringpairs__ReprBuilder struct { _MapRepresentation_Stringpairs__ReprAssembler } -func (nb *_MapRepresentation_Stringpairs__ReprBuilder) Build() dms3ld.Node { +func (nb *_MapRepresentation_Stringpairs__ReprBuilder) Build() ld.Node { if *nb.m != schema.Maybe_Value { panic("invalid state: cannot call Build on an assembler that's not finished") } @@ -10369,7 +10369,7 @@ func (na *_MapRepresentation_Stringpairs__ReprAssembler) reset() { na.ca_innerDelim.reset() na.ca_entryDelim.reset() } -func (na *_MapRepresentation_Stringpairs__ReprAssembler) BeginMap(int64) (dms3ld.MapAssembler, error) { +func (na *_MapRepresentation_Stringpairs__ReprAssembler) BeginMap(int64) (ld.MapAssembler, error) { switch *na.m { case schema.Maybe_Value, schema.Maybe_Null: panic("invalid state: cannot assign into assembler that's already finished") @@ -10382,7 +10382,7 @@ func (na *_MapRepresentation_Stringpairs__ReprAssembler) BeginMap(int64) (dms3ld } return na, nil } -func (_MapRepresentation_Stringpairs__ReprAssembler) BeginList(sizeHint int64) (dms3ld.ListAssembler, error) { +func (_MapRepresentation_Stringpairs__ReprAssembler) BeginList(sizeHint int64) (ld.ListAssembler, error) { return mixins.MapAssembler{TypeName: "schemadmt.MapRepresentation_Stringpairs.Repr"}.BeginList(0) } func (na *_MapRepresentation_Stringpairs__ReprAssembler) AssignNull() error { @@ -10414,10 +10414,10 @@ func (_MapRepresentation_Stringpairs__ReprAssembler) AssignString(string) error func (_MapRepresentation_Stringpairs__ReprAssembler) AssignBytes([]byte) error { return mixins.MapAssembler{TypeName: "schemadmt.MapRepresentation_Stringpairs.Repr"}.AssignBytes(nil) } -func (_MapRepresentation_Stringpairs__ReprAssembler) AssignLink(dms3ld.Link) error { +func (_MapRepresentation_Stringpairs__ReprAssembler) AssignLink(ld.Link) error { return mixins.MapAssembler{TypeName: "schemadmt.MapRepresentation_Stringpairs.Repr"}.AssignLink(nil) } -func (na *_MapRepresentation_Stringpairs__ReprAssembler) AssignNode(v dms3ld.Node) error { +func (na *_MapRepresentation_Stringpairs__ReprAssembler) AssignNode(v ld.Node) error { if v.IsNull() { return na.AssignNull() } @@ -10437,8 +10437,8 @@ func (na *_MapRepresentation_Stringpairs__ReprAssembler) AssignNode(v dms3ld.Nod *na.m = schema.Maybe_Value return nil } - if v.Kind() != dms3ld.Kind_Map { - return dms3ld.ErrWrongKind{TypeName: "schemadmt.MapRepresentation_Stringpairs.Repr", MethodName: "AssignNode", AppropriateKind: dms3ld.KindSet_JustMap, ActualKind: v.Kind()} + if v.Kind() != ld.Kind_Map { + return ld.ErrWrongKind{TypeName: "schemadmt.MapRepresentation_Stringpairs.Repr", MethodName: "AssignNode", AppropriateKind: ld.KindSet_JustMap, ActualKind: v.Kind()} } itr := v.MapIterator() for !itr.Done() { @@ -10455,7 +10455,7 @@ func (na *_MapRepresentation_Stringpairs__ReprAssembler) AssignNode(v dms3ld.Nod } return na.Finish() } -func (_MapRepresentation_Stringpairs__ReprAssembler) Prototype() dms3ld.NodePrototype { +func (_MapRepresentation_Stringpairs__ReprAssembler) Prototype() ld.NodePrototype { return _MapRepresentation_Stringpairs__ReprPrototype{} } func (ma *_MapRepresentation_Stringpairs__ReprAssembler) valueFinishTidy() bool { @@ -10482,7 +10482,7 @@ func (ma *_MapRepresentation_Stringpairs__ReprAssembler) valueFinishTidy() bool panic("unreachable") } } -func (ma *_MapRepresentation_Stringpairs__ReprAssembler) AssembleEntry(k string) (dms3ld.NodeAssembler, error) { +func (ma *_MapRepresentation_Stringpairs__ReprAssembler) AssembleEntry(k string) (ld.NodeAssembler, error) { switch ma.state { case maState_initial: // carry on @@ -10500,7 +10500,7 @@ func (ma *_MapRepresentation_Stringpairs__ReprAssembler) AssembleEntry(k string) switch k { case "innerDelim": if ma.s&fieldBit__MapRepresentation_Stringpairs_InnerDelim != 0 { - return nil, dms3ld.ErrRepeatedMapKey{Key: &fieldName__MapRepresentation_Stringpairs_InnerDelim_serial} + return nil, ld.ErrRepeatedMapKey{Key: &fieldName__MapRepresentation_Stringpairs_InnerDelim_serial} } ma.s += fieldBit__MapRepresentation_Stringpairs_InnerDelim ma.state = maState_midValue @@ -10510,7 +10510,7 @@ func (ma *_MapRepresentation_Stringpairs__ReprAssembler) AssembleEntry(k string) return &ma.ca_innerDelim, nil case "entryDelim": if ma.s&fieldBit__MapRepresentation_Stringpairs_EntryDelim != 0 { - return nil, dms3ld.ErrRepeatedMapKey{Key: &fieldName__MapRepresentation_Stringpairs_EntryDelim_serial} + return nil, ld.ErrRepeatedMapKey{Key: &fieldName__MapRepresentation_Stringpairs_EntryDelim_serial} } ma.s += fieldBit__MapRepresentation_Stringpairs_EntryDelim ma.state = maState_midValue @@ -10520,9 +10520,9 @@ func (ma *_MapRepresentation_Stringpairs__ReprAssembler) AssembleEntry(k string) return &ma.ca_entryDelim, nil default: } - return nil, dms3ld.ErrInvalidKey{TypeName: "schemadmt.MapRepresentation_Stringpairs.Repr", Key: &_String{k}} + return nil, ld.ErrInvalidKey{TypeName: "schemadmt.MapRepresentation_Stringpairs.Repr", Key: &_String{k}} } -func (ma *_MapRepresentation_Stringpairs__ReprAssembler) AssembleKey() dms3ld.NodeAssembler { +func (ma *_MapRepresentation_Stringpairs__ReprAssembler) AssembleKey() ld.NodeAssembler { switch ma.state { case maState_initial: // carry on @@ -10540,7 +10540,7 @@ func (ma *_MapRepresentation_Stringpairs__ReprAssembler) AssembleKey() dms3ld.No ma.state = maState_midKey return (*_MapRepresentation_Stringpairs__ReprKeyAssembler)(ma) } -func (ma *_MapRepresentation_Stringpairs__ReprAssembler) AssembleValue() dms3ld.NodeAssembler { +func (ma *_MapRepresentation_Stringpairs__ReprAssembler) AssembleValue() ld.NodeAssembler { switch ma.state { case maState_initial: panic("invalid state: AssembleValue cannot be called when no key is primed") @@ -10583,7 +10583,7 @@ func (ma *_MapRepresentation_Stringpairs__ReprAssembler) Finish() error { panic("invalid state: Finish cannot be called on an assembler that's already finished") } if ma.s&fieldBits__MapRepresentation_Stringpairs_sufficient != fieldBits__MapRepresentation_Stringpairs_sufficient { - err := dms3ld.ErrMissingRequiredField{Missing: make([]string, 0)} + err := ld.ErrMissingRequiredField{Missing: make([]string, 0)} if ma.s&fieldBit__MapRepresentation_Stringpairs_InnerDelim == 0 { err.Missing = append(err.Missing, "innerDelim") } @@ -10596,19 +10596,19 @@ func (ma *_MapRepresentation_Stringpairs__ReprAssembler) Finish() error { *ma.m = schema.Maybe_Value return nil } -func (ma *_MapRepresentation_Stringpairs__ReprAssembler) KeyPrototype() dms3ld.NodePrototype { +func (ma *_MapRepresentation_Stringpairs__ReprAssembler) KeyPrototype() ld.NodePrototype { return _String__Prototype{} } -func (ma *_MapRepresentation_Stringpairs__ReprAssembler) ValuePrototype(k string) dms3ld.NodePrototype { +func (ma *_MapRepresentation_Stringpairs__ReprAssembler) ValuePrototype(k string) ld.NodePrototype { panic("todo structbuilder mapassembler repr valueprototype") } type _MapRepresentation_Stringpairs__ReprKeyAssembler _MapRepresentation_Stringpairs__ReprAssembler -func (_MapRepresentation_Stringpairs__ReprKeyAssembler) BeginMap(sizeHint int64) (dms3ld.MapAssembler, error) { +func (_MapRepresentation_Stringpairs__ReprKeyAssembler) BeginMap(sizeHint int64) (ld.MapAssembler, error) { return mixins.StringAssembler{TypeName: "schemadmt.MapRepresentation_Stringpairs.Repr.KeyAssembler"}.BeginMap(0) } -func (_MapRepresentation_Stringpairs__ReprKeyAssembler) BeginList(sizeHint int64) (dms3ld.ListAssembler, error) { +func (_MapRepresentation_Stringpairs__ReprKeyAssembler) BeginList(sizeHint int64) (ld.ListAssembler, error) { return mixins.StringAssembler{TypeName: "schemadmt.MapRepresentation_Stringpairs.Repr.KeyAssembler"}.BeginList(0) } func (na *_MapRepresentation_Stringpairs__ReprKeyAssembler) AssignNull() error { @@ -10630,7 +10630,7 @@ func (ka *_MapRepresentation_Stringpairs__ReprKeyAssembler) AssignString(k strin switch k { case "innerDelim": if ka.s&fieldBit__MapRepresentation_Stringpairs_InnerDelim != 0 { - return dms3ld.ErrRepeatedMapKey{Key: &fieldName__MapRepresentation_Stringpairs_InnerDelim_serial} + return ld.ErrRepeatedMapKey{Key: &fieldName__MapRepresentation_Stringpairs_InnerDelim_serial} } ka.s += fieldBit__MapRepresentation_Stringpairs_InnerDelim ka.state = maState_expectValue @@ -10638,29 +10638,29 @@ func (ka *_MapRepresentation_Stringpairs__ReprKeyAssembler) AssignString(k strin return nil case "entryDelim": if ka.s&fieldBit__MapRepresentation_Stringpairs_EntryDelim != 0 { - return dms3ld.ErrRepeatedMapKey{Key: &fieldName__MapRepresentation_Stringpairs_EntryDelim_serial} + return ld.ErrRepeatedMapKey{Key: &fieldName__MapRepresentation_Stringpairs_EntryDelim_serial} } ka.s += fieldBit__MapRepresentation_Stringpairs_EntryDelim ka.state = maState_expectValue ka.f = 1 return nil } - return dms3ld.ErrInvalidKey{TypeName: "schemadmt.MapRepresentation_Stringpairs.Repr", Key: &_String{k}} + return ld.ErrInvalidKey{TypeName: "schemadmt.MapRepresentation_Stringpairs.Repr", Key: &_String{k}} } func (_MapRepresentation_Stringpairs__ReprKeyAssembler) AssignBytes([]byte) error { return mixins.StringAssembler{TypeName: "schemadmt.MapRepresentation_Stringpairs.Repr.KeyAssembler"}.AssignBytes(nil) } -func (_MapRepresentation_Stringpairs__ReprKeyAssembler) AssignLink(dms3ld.Link) error { +func (_MapRepresentation_Stringpairs__ReprKeyAssembler) AssignLink(ld.Link) error { return mixins.StringAssembler{TypeName: "schemadmt.MapRepresentation_Stringpairs.Repr.KeyAssembler"}.AssignLink(nil) } -func (ka *_MapRepresentation_Stringpairs__ReprKeyAssembler) AssignNode(v dms3ld.Node) error { +func (ka *_MapRepresentation_Stringpairs__ReprKeyAssembler) AssignNode(v ld.Node) error { if v2, err := v.AsString(); err != nil { return err } else { return ka.AssignString(v2) } } -func (_MapRepresentation_Stringpairs__ReprKeyAssembler) Prototype() dms3ld.NodePrototype { +func (_MapRepresentation_Stringpairs__ReprKeyAssembler) Prototype() ld.NodePrototype { return _String__Prototype{} } @@ -10722,12 +10722,12 @@ func (m MaybeMap__EnumValue__Unit) IsAbsent() bool { func (m MaybeMap__EnumValue__Unit) Exists() bool { return m.m == schema.Maybe_Value } -func (m MaybeMap__EnumValue__Unit) AsNode() dms3ld.Node { +func (m MaybeMap__EnumValue__Unit) AsNode() ld.Node { switch m.m { case schema.Maybe_Absent: - return dms3ld.Absent + return ld.Absent case schema.Maybe_Null: - return dms3ld.Null + return ld.Null case schema.Maybe_Value: return &m.v default: @@ -10741,42 +10741,42 @@ func (m MaybeMap__EnumValue__Unit) Must() Map__EnumValue__Unit { return &m.v } -var _ dms3ld.Node = (Map__EnumValue__Unit)(&_Map__EnumValue__Unit{}) +var _ ld.Node = (Map__EnumValue__Unit)(&_Map__EnumValue__Unit{}) var _ schema.TypedNode = (Map__EnumValue__Unit)(&_Map__EnumValue__Unit{}) -func (Map__EnumValue__Unit) Kind() dms3ld.Kind { - return dms3ld.Kind_Map +func (Map__EnumValue__Unit) Kind() ld.Kind { + return ld.Kind_Map } -func (n Map__EnumValue__Unit) LookupByString(k string) (dms3ld.Node, error) { +func (n Map__EnumValue__Unit) LookupByString(k string) (ld.Node, error) { var k2 _EnumValue if err := (_EnumValue__Prototype{}).fromString(&k2, k); err != nil { return nil, err // TODO wrap in some kind of ErrInvalidKey } v, exists := n.m[k2] if !exists { - return nil, dms3ld.ErrNotExists{Segment: dms3ld.PathSegmentOfString(k)} + return nil, ld.ErrNotExists{Segment: ld.PathSegmentOfString(k)} } return v, nil } -func (n Map__EnumValue__Unit) LookupByNode(k dms3ld.Node) (dms3ld.Node, error) { +func (n Map__EnumValue__Unit) LookupByNode(k ld.Node) (ld.Node, error) { k2, ok := k.(EnumValue) if !ok { panic("todo invalid key type error") - // 'dms3ld.ErrInvalidKey{TypeName:"schemadmt.Map__EnumValue__Unit", Key:&_String{k}}' doesn't quite cut it: need room to explain the type, and it's not guaranteed k can be turned into a string at all + // 'ld.ErrInvalidKey{TypeName:"schemadmt.Map__EnumValue__Unit", Key:&_String{k}}' doesn't quite cut it: need room to explain the type, and it's not guaranteed k can be turned into a string at all } v, exists := n.m[*k2] if !exists { - return nil, dms3ld.ErrNotExists{Segment: dms3ld.PathSegmentOfString(k2.String())} + return nil, ld.ErrNotExists{Segment: ld.PathSegmentOfString(k2.String())} } return v, nil } -func (Map__EnumValue__Unit) LookupByIndex(idx int64) (dms3ld.Node, error) { +func (Map__EnumValue__Unit) LookupByIndex(idx int64) (ld.Node, error) { return mixins.Map{TypeName: "schemadmt.Map__EnumValue__Unit"}.LookupByIndex(0) } -func (n Map__EnumValue__Unit) LookupBySegment(seg dms3ld.PathSegment) (dms3ld.Node, error) { +func (n Map__EnumValue__Unit) LookupBySegment(seg ld.PathSegment) (ld.Node, error) { return n.LookupByString(seg.String()) } -func (n Map__EnumValue__Unit) MapIterator() dms3ld.MapIterator { +func (n Map__EnumValue__Unit) MapIterator() ld.MapIterator { return &_Map__EnumValue__Unit__MapItr{n, 0} } @@ -10785,9 +10785,9 @@ type _Map__EnumValue__Unit__MapItr struct { idx int } -func (itr *_Map__EnumValue__Unit__MapItr) Next() (k dms3ld.Node, v dms3ld.Node, _ error) { +func (itr *_Map__EnumValue__Unit__MapItr) Next() (k ld.Node, v ld.Node, _ error) { if itr.idx >= len(itr.n.t) { - return nil, nil, dms3ld.ErrIteratorOverread{} + return nil, nil, ld.ErrIteratorOverread{} } x := &itr.n.t[itr.idx] k = &x.k @@ -10799,7 +10799,7 @@ func (itr *_Map__EnumValue__Unit__MapItr) Done() bool { return itr.idx >= len(itr.n.t) } -func (Map__EnumValue__Unit) ListIterator() dms3ld.ListIterator { +func (Map__EnumValue__Unit) ListIterator() ld.ListIterator { return nil } func (n Map__EnumValue__Unit) Length() int64 { @@ -10826,16 +10826,16 @@ func (Map__EnumValue__Unit) AsString() (string, error) { func (Map__EnumValue__Unit) AsBytes() ([]byte, error) { return mixins.Map{TypeName: "schemadmt.Map__EnumValue__Unit"}.AsBytes() } -func (Map__EnumValue__Unit) AsLink() (dms3ld.Link, error) { +func (Map__EnumValue__Unit) AsLink() (ld.Link, error) { return mixins.Map{TypeName: "schemadmt.Map__EnumValue__Unit"}.AsLink() } -func (Map__EnumValue__Unit) Prototype() dms3ld.NodePrototype { +func (Map__EnumValue__Unit) Prototype() ld.NodePrototype { return _Map__EnumValue__Unit__Prototype{} } type _Map__EnumValue__Unit__Prototype struct{} -func (_Map__EnumValue__Unit__Prototype) NewBuilder() dms3ld.NodeBuilder { +func (_Map__EnumValue__Unit__Prototype) NewBuilder() ld.NodeBuilder { var nb _Map__EnumValue__Unit__Builder nb.Reset() return &nb @@ -10845,7 +10845,7 @@ type _Map__EnumValue__Unit__Builder struct { _Map__EnumValue__Unit__Assembler } -func (nb *_Map__EnumValue__Unit__Builder) Build() dms3ld.Node { +func (nb *_Map__EnumValue__Unit__Builder) Build() ld.Node { if *nb.m != schema.Maybe_Value { panic("invalid state: cannot call Build on an assembler that's not finished") } @@ -10872,7 +10872,7 @@ func (na *_Map__EnumValue__Unit__Assembler) reset() { na.ka.reset() na.va.reset() } -func (na *_Map__EnumValue__Unit__Assembler) BeginMap(sizeHint int64) (dms3ld.MapAssembler, error) { +func (na *_Map__EnumValue__Unit__Assembler) BeginMap(sizeHint int64) (ld.MapAssembler, error) { switch *na.m { case schema.Maybe_Value, schema.Maybe_Null: panic("invalid state: cannot assign into assembler that's already finished") @@ -10887,7 +10887,7 @@ func (na *_Map__EnumValue__Unit__Assembler) BeginMap(sizeHint int64) (dms3ld.Map na.w.t = make([]_Map__EnumValue__Unit__entry, 0, sizeHint) return na, nil } -func (_Map__EnumValue__Unit__Assembler) BeginList(sizeHint int64) (dms3ld.ListAssembler, error) { +func (_Map__EnumValue__Unit__Assembler) BeginList(sizeHint int64) (ld.ListAssembler, error) { return mixins.MapAssembler{TypeName: "schemadmt.Map__EnumValue__Unit"}.BeginList(0) } func (na *_Map__EnumValue__Unit__Assembler) AssignNull() error { @@ -10919,10 +10919,10 @@ func (_Map__EnumValue__Unit__Assembler) AssignString(string) error { func (_Map__EnumValue__Unit__Assembler) AssignBytes([]byte) error { return mixins.MapAssembler{TypeName: "schemadmt.Map__EnumValue__Unit"}.AssignBytes(nil) } -func (_Map__EnumValue__Unit__Assembler) AssignLink(dms3ld.Link) error { +func (_Map__EnumValue__Unit__Assembler) AssignLink(ld.Link) error { return mixins.MapAssembler{TypeName: "schemadmt.Map__EnumValue__Unit"}.AssignLink(nil) } -func (na *_Map__EnumValue__Unit__Assembler) AssignNode(v dms3ld.Node) error { +func (na *_Map__EnumValue__Unit__Assembler) AssignNode(v ld.Node) error { if v.IsNull() { return na.AssignNull() } @@ -10937,8 +10937,8 @@ func (na *_Map__EnumValue__Unit__Assembler) AssignNode(v dms3ld.Node) error { *na.m = schema.Maybe_Value return nil } - if v.Kind() != dms3ld.Kind_Map { - return dms3ld.ErrWrongKind{TypeName: "schemadmt.Map__EnumValue__Unit", MethodName: "AssignNode", AppropriateKind: dms3ld.KindSet_JustMap, ActualKind: v.Kind()} + if v.Kind() != ld.Kind_Map { + return ld.ErrWrongKind{TypeName: "schemadmt.Map__EnumValue__Unit", MethodName: "AssignNode", AppropriateKind: ld.KindSet_JustMap, ActualKind: v.Kind()} } itr := v.MapIterator() for !itr.Done() { @@ -10955,7 +10955,7 @@ func (na *_Map__EnumValue__Unit__Assembler) AssignNode(v dms3ld.Node) error { } return na.Finish() } -func (_Map__EnumValue__Unit__Assembler) Prototype() dms3ld.NodePrototype { +func (_Map__EnumValue__Unit__Assembler) Prototype() ld.NodePrototype { return _Map__EnumValue__Unit__Prototype{} } func (ma *_Map__EnumValue__Unit__Assembler) keyFinishTidy() bool { @@ -10986,7 +10986,7 @@ func (ma *_Map__EnumValue__Unit__Assembler) valueFinishTidy() bool { return false } } -func (ma *_Map__EnumValue__Unit__Assembler) AssembleEntry(k string) (dms3ld.NodeAssembler, error) { +func (ma *_Map__EnumValue__Unit__Assembler) AssembleEntry(k string) (ld.NodeAssembler, error) { switch ma.state { case maState_initial: // carry on @@ -11007,7 +11007,7 @@ func (ma *_Map__EnumValue__Unit__Assembler) AssembleEntry(k string) (dms3ld.Node return nil, err // TODO wrap in some kind of ErrInvalidKey } if _, exists := ma.w.m[k2]; exists { - return nil, dms3ld.ErrRepeatedMapKey{Key: &k2} + return nil, ld.ErrRepeatedMapKey{Key: &k2} } ma.w.t = append(ma.w.t, _Map__EnumValue__Unit__entry{k: k2}) tz := &ma.w.t[len(ma.w.t)-1] @@ -11018,7 +11018,7 @@ func (ma *_Map__EnumValue__Unit__Assembler) AssembleEntry(k string) (dms3ld.Node ma.va.m = &ma.cm return &ma.va, nil } -func (ma *_Map__EnumValue__Unit__Assembler) AssembleKey() dms3ld.NodeAssembler { +func (ma *_Map__EnumValue__Unit__Assembler) AssembleKey() ld.NodeAssembler { switch ma.state { case maState_initial: // carry on @@ -11039,7 +11039,7 @@ func (ma *_Map__EnumValue__Unit__Assembler) AssembleKey() dms3ld.NodeAssembler { ma.ka.w = &ma.w.t[len(ma.w.t)-1].k return &ma.ka } -func (ma *_Map__EnumValue__Unit__Assembler) AssembleValue() dms3ld.NodeAssembler { +func (ma *_Map__EnumValue__Unit__Assembler) AssembleValue() ld.NodeAssembler { switch ma.state { case maState_initial: panic("invalid state: AssembleValue cannot be called when no key is primed") @@ -11076,55 +11076,55 @@ func (ma *_Map__EnumValue__Unit__Assembler) Finish() error { *ma.m = schema.Maybe_Value return nil } -func (ma *_Map__EnumValue__Unit__Assembler) KeyPrototype() dms3ld.NodePrototype { +func (ma *_Map__EnumValue__Unit__Assembler) KeyPrototype() ld.NodePrototype { return _EnumValue__Prototype{} } -func (ma *_Map__EnumValue__Unit__Assembler) ValuePrototype(_ string) dms3ld.NodePrototype { +func (ma *_Map__EnumValue__Unit__Assembler) ValuePrototype(_ string) ld.NodePrototype { return _Unit__Prototype{} } func (Map__EnumValue__Unit) Type() schema.Type { return nil /*TODO:typelit*/ } -func (n Map__EnumValue__Unit) Representation() dms3ld.Node { +func (n Map__EnumValue__Unit) Representation() ld.Node { return (*_Map__EnumValue__Unit__Repr)(n) } type _Map__EnumValue__Unit__Repr _Map__EnumValue__Unit -var _ dms3ld.Node = &_Map__EnumValue__Unit__Repr{} +var _ ld.Node = &_Map__EnumValue__Unit__Repr{} -func (_Map__EnumValue__Unit__Repr) Kind() dms3ld.Kind { - return dms3ld.Kind_Map +func (_Map__EnumValue__Unit__Repr) Kind() ld.Kind { + return ld.Kind_Map } -func (nr *_Map__EnumValue__Unit__Repr) LookupByString(k string) (dms3ld.Node, error) { +func (nr *_Map__EnumValue__Unit__Repr) LookupByString(k string) (ld.Node, error) { v, err := (Map__EnumValue__Unit)(nr).LookupByString(k) - if err != nil || v == dms3ld.Null { + if err != nil || v == ld.Null { return v, err } return v.(Unit).Representation(), nil } -func (nr *_Map__EnumValue__Unit__Repr) LookupByNode(k dms3ld.Node) (dms3ld.Node, error) { +func (nr *_Map__EnumValue__Unit__Repr) LookupByNode(k ld.Node) (ld.Node, error) { v, err := (Map__EnumValue__Unit)(nr).LookupByNode(k) - if err != nil || v == dms3ld.Null { + if err != nil || v == ld.Null { return v, err } return v.(Unit).Representation(), nil } -func (_Map__EnumValue__Unit__Repr) LookupByIndex(idx int64) (dms3ld.Node, error) { +func (_Map__EnumValue__Unit__Repr) LookupByIndex(idx int64) (ld.Node, error) { return mixins.Map{TypeName: "schemadmt.Map__EnumValue__Unit.Repr"}.LookupByIndex(0) } -func (n _Map__EnumValue__Unit__Repr) LookupBySegment(seg dms3ld.PathSegment) (dms3ld.Node, error) { +func (n _Map__EnumValue__Unit__Repr) LookupBySegment(seg ld.PathSegment) (ld.Node, error) { return n.LookupByString(seg.String()) } -func (nr *_Map__EnumValue__Unit__Repr) MapIterator() dms3ld.MapIterator { +func (nr *_Map__EnumValue__Unit__Repr) MapIterator() ld.MapIterator { return &_Map__EnumValue__Unit__ReprMapItr{(Map__EnumValue__Unit)(nr), 0} } type _Map__EnumValue__Unit__ReprMapItr _Map__EnumValue__Unit__MapItr -func (itr *_Map__EnumValue__Unit__ReprMapItr) Next() (k dms3ld.Node, v dms3ld.Node, err error) { +func (itr *_Map__EnumValue__Unit__ReprMapItr) Next() (k ld.Node, v ld.Node, err error) { k, v, err = (*_Map__EnumValue__Unit__MapItr)(itr).Next() - if err != nil || v == dms3ld.Null { + if err != nil || v == ld.Null { return } return k, v.(Unit).Representation(), nil @@ -11133,7 +11133,7 @@ func (itr *_Map__EnumValue__Unit__ReprMapItr) Done() bool { return (*_Map__EnumValue__Unit__MapItr)(itr).Done() } -func (_Map__EnumValue__Unit__Repr) ListIterator() dms3ld.ListIterator { +func (_Map__EnumValue__Unit__Repr) ListIterator() ld.ListIterator { return nil } func (rn *_Map__EnumValue__Unit__Repr) Length() int64 { @@ -11160,16 +11160,16 @@ func (_Map__EnumValue__Unit__Repr) AsString() (string, error) { func (_Map__EnumValue__Unit__Repr) AsBytes() ([]byte, error) { return mixins.Map{TypeName: "schemadmt.Map__EnumValue__Unit.Repr"}.AsBytes() } -func (_Map__EnumValue__Unit__Repr) AsLink() (dms3ld.Link, error) { +func (_Map__EnumValue__Unit__Repr) AsLink() (ld.Link, error) { return mixins.Map{TypeName: "schemadmt.Map__EnumValue__Unit.Repr"}.AsLink() } -func (_Map__EnumValue__Unit__Repr) Prototype() dms3ld.NodePrototype { +func (_Map__EnumValue__Unit__Repr) Prototype() ld.NodePrototype { return _Map__EnumValue__Unit__ReprPrototype{} } type _Map__EnumValue__Unit__ReprPrototype struct{} -func (_Map__EnumValue__Unit__ReprPrototype) NewBuilder() dms3ld.NodeBuilder { +func (_Map__EnumValue__Unit__ReprPrototype) NewBuilder() ld.NodeBuilder { var nb _Map__EnumValue__Unit__ReprBuilder nb.Reset() return &nb @@ -11179,7 +11179,7 @@ type _Map__EnumValue__Unit__ReprBuilder struct { _Map__EnumValue__Unit__ReprAssembler } -func (nb *_Map__EnumValue__Unit__ReprBuilder) Build() dms3ld.Node { +func (nb *_Map__EnumValue__Unit__ReprBuilder) Build() ld.Node { if *nb.m != schema.Maybe_Value { panic("invalid state: cannot call Build on an assembler that's not finished") } @@ -11206,7 +11206,7 @@ func (na *_Map__EnumValue__Unit__ReprAssembler) reset() { na.ka.reset() na.va.reset() } -func (na *_Map__EnumValue__Unit__ReprAssembler) BeginMap(sizeHint int64) (dms3ld.MapAssembler, error) { +func (na *_Map__EnumValue__Unit__ReprAssembler) BeginMap(sizeHint int64) (ld.MapAssembler, error) { switch *na.m { case schema.Maybe_Value, schema.Maybe_Null: panic("invalid state: cannot assign into assembler that's already finished") @@ -11221,7 +11221,7 @@ func (na *_Map__EnumValue__Unit__ReprAssembler) BeginMap(sizeHint int64) (dms3ld na.w.t = make([]_Map__EnumValue__Unit__entry, 0, sizeHint) return na, nil } -func (_Map__EnumValue__Unit__ReprAssembler) BeginList(sizeHint int64) (dms3ld.ListAssembler, error) { +func (_Map__EnumValue__Unit__ReprAssembler) BeginList(sizeHint int64) (ld.ListAssembler, error) { return mixins.MapAssembler{TypeName: "schemadmt.Map__EnumValue__Unit.Repr"}.BeginList(0) } func (na *_Map__EnumValue__Unit__ReprAssembler) AssignNull() error { @@ -11253,10 +11253,10 @@ func (_Map__EnumValue__Unit__ReprAssembler) AssignString(string) error { func (_Map__EnumValue__Unit__ReprAssembler) AssignBytes([]byte) error { return mixins.MapAssembler{TypeName: "schemadmt.Map__EnumValue__Unit.Repr"}.AssignBytes(nil) } -func (_Map__EnumValue__Unit__ReprAssembler) AssignLink(dms3ld.Link) error { +func (_Map__EnumValue__Unit__ReprAssembler) AssignLink(ld.Link) error { return mixins.MapAssembler{TypeName: "schemadmt.Map__EnumValue__Unit.Repr"}.AssignLink(nil) } -func (na *_Map__EnumValue__Unit__ReprAssembler) AssignNode(v dms3ld.Node) error { +func (na *_Map__EnumValue__Unit__ReprAssembler) AssignNode(v ld.Node) error { if v.IsNull() { return na.AssignNull() } @@ -11271,8 +11271,8 @@ func (na *_Map__EnumValue__Unit__ReprAssembler) AssignNode(v dms3ld.Node) error *na.m = schema.Maybe_Value return nil } - if v.Kind() != dms3ld.Kind_Map { - return dms3ld.ErrWrongKind{TypeName: "schemadmt.Map__EnumValue__Unit.Repr", MethodName: "AssignNode", AppropriateKind: dms3ld.KindSet_JustMap, ActualKind: v.Kind()} + if v.Kind() != ld.Kind_Map { + return ld.ErrWrongKind{TypeName: "schemadmt.Map__EnumValue__Unit.Repr", MethodName: "AssignNode", AppropriateKind: ld.KindSet_JustMap, ActualKind: v.Kind()} } itr := v.MapIterator() for !itr.Done() { @@ -11289,7 +11289,7 @@ func (na *_Map__EnumValue__Unit__ReprAssembler) AssignNode(v dms3ld.Node) error } return na.Finish() } -func (_Map__EnumValue__Unit__ReprAssembler) Prototype() dms3ld.NodePrototype { +func (_Map__EnumValue__Unit__ReprAssembler) Prototype() ld.NodePrototype { return _Map__EnumValue__Unit__ReprPrototype{} } func (ma *_Map__EnumValue__Unit__ReprAssembler) keyFinishTidy() bool { @@ -11320,7 +11320,7 @@ func (ma *_Map__EnumValue__Unit__ReprAssembler) valueFinishTidy() bool { return false } } -func (ma *_Map__EnumValue__Unit__ReprAssembler) AssembleEntry(k string) (dms3ld.NodeAssembler, error) { +func (ma *_Map__EnumValue__Unit__ReprAssembler) AssembleEntry(k string) (ld.NodeAssembler, error) { switch ma.state { case maState_initial: // carry on @@ -11341,7 +11341,7 @@ func (ma *_Map__EnumValue__Unit__ReprAssembler) AssembleEntry(k string) (dms3ld. return nil, err // TODO wrap in some kind of ErrInvalidKey } if _, exists := ma.w.m[k2]; exists { - return nil, dms3ld.ErrRepeatedMapKey{Key: &k2} + return nil, ld.ErrRepeatedMapKey{Key: &k2} } ma.w.t = append(ma.w.t, _Map__EnumValue__Unit__entry{k: k2}) tz := &ma.w.t[len(ma.w.t)-1] @@ -11352,7 +11352,7 @@ func (ma *_Map__EnumValue__Unit__ReprAssembler) AssembleEntry(k string) (dms3ld. ma.va.m = &ma.cm return &ma.va, nil } -func (ma *_Map__EnumValue__Unit__ReprAssembler) AssembleKey() dms3ld.NodeAssembler { +func (ma *_Map__EnumValue__Unit__ReprAssembler) AssembleKey() ld.NodeAssembler { switch ma.state { case maState_initial: // carry on @@ -11373,7 +11373,7 @@ func (ma *_Map__EnumValue__Unit__ReprAssembler) AssembleKey() dms3ld.NodeAssembl ma.ka.w = &ma.w.t[len(ma.w.t)-1].k return &ma.ka } -func (ma *_Map__EnumValue__Unit__ReprAssembler) AssembleValue() dms3ld.NodeAssembler { +func (ma *_Map__EnumValue__Unit__ReprAssembler) AssembleValue() ld.NodeAssembler { switch ma.state { case maState_initial: panic("invalid state: AssembleValue cannot be called when no key is primed") @@ -11410,10 +11410,10 @@ func (ma *_Map__EnumValue__Unit__ReprAssembler) Finish() error { *ma.m = schema.Maybe_Value return nil } -func (ma *_Map__EnumValue__Unit__ReprAssembler) KeyPrototype() dms3ld.NodePrototype { +func (ma *_Map__EnumValue__Unit__ReprAssembler) KeyPrototype() ld.NodePrototype { return _EnumValue__ReprPrototype{} } -func (ma *_Map__EnumValue__Unit__ReprAssembler) ValuePrototype(_ string) dms3ld.NodePrototype { +func (ma *_Map__EnumValue__Unit__ReprAssembler) ValuePrototype(_ string) ld.NodePrototype { return _Unit__ReprPrototype{} } @@ -11475,12 +11475,12 @@ func (m MaybeMap__FieldName__StructField) IsAbsent() bool { func (m MaybeMap__FieldName__StructField) Exists() bool { return m.m == schema.Maybe_Value } -func (m MaybeMap__FieldName__StructField) AsNode() dms3ld.Node { +func (m MaybeMap__FieldName__StructField) AsNode() ld.Node { switch m.m { case schema.Maybe_Absent: - return dms3ld.Absent + return ld.Absent case schema.Maybe_Null: - return dms3ld.Null + return ld.Null case schema.Maybe_Value: return &m.v default: @@ -11494,42 +11494,42 @@ func (m MaybeMap__FieldName__StructField) Must() Map__FieldName__StructField { return &m.v } -var _ dms3ld.Node = (Map__FieldName__StructField)(&_Map__FieldName__StructField{}) +var _ ld.Node = (Map__FieldName__StructField)(&_Map__FieldName__StructField{}) var _ schema.TypedNode = (Map__FieldName__StructField)(&_Map__FieldName__StructField{}) -func (Map__FieldName__StructField) Kind() dms3ld.Kind { - return dms3ld.Kind_Map +func (Map__FieldName__StructField) Kind() ld.Kind { + return ld.Kind_Map } -func (n Map__FieldName__StructField) LookupByString(k string) (dms3ld.Node, error) { +func (n Map__FieldName__StructField) LookupByString(k string) (ld.Node, error) { var k2 _FieldName if err := (_FieldName__Prototype{}).fromString(&k2, k); err != nil { return nil, err // TODO wrap in some kind of ErrInvalidKey } v, exists := n.m[k2] if !exists { - return nil, dms3ld.ErrNotExists{Segment: dms3ld.PathSegmentOfString(k)} + return nil, ld.ErrNotExists{Segment: ld.PathSegmentOfString(k)} } return v, nil } -func (n Map__FieldName__StructField) LookupByNode(k dms3ld.Node) (dms3ld.Node, error) { +func (n Map__FieldName__StructField) LookupByNode(k ld.Node) (ld.Node, error) { k2, ok := k.(FieldName) if !ok { panic("todo invalid key type error") - // 'dms3ld.ErrInvalidKey{TypeName:"schemadmt.Map__FieldName__StructField", Key:&_String{k}}' doesn't quite cut it: need room to explain the type, and it's not guaranteed k can be turned into a string at all + // 'ld.ErrInvalidKey{TypeName:"schemadmt.Map__FieldName__StructField", Key:&_String{k}}' doesn't quite cut it: need room to explain the type, and it's not guaranteed k can be turned into a string at all } v, exists := n.m[*k2] if !exists { - return nil, dms3ld.ErrNotExists{Segment: dms3ld.PathSegmentOfString(k2.String())} + return nil, ld.ErrNotExists{Segment: ld.PathSegmentOfString(k2.String())} } return v, nil } -func (Map__FieldName__StructField) LookupByIndex(idx int64) (dms3ld.Node, error) { +func (Map__FieldName__StructField) LookupByIndex(idx int64) (ld.Node, error) { return mixins.Map{TypeName: "schemadmt.Map__FieldName__StructField"}.LookupByIndex(0) } -func (n Map__FieldName__StructField) LookupBySegment(seg dms3ld.PathSegment) (dms3ld.Node, error) { +func (n Map__FieldName__StructField) LookupBySegment(seg ld.PathSegment) (ld.Node, error) { return n.LookupByString(seg.String()) } -func (n Map__FieldName__StructField) MapIterator() dms3ld.MapIterator { +func (n Map__FieldName__StructField) MapIterator() ld.MapIterator { return &_Map__FieldName__StructField__MapItr{n, 0} } @@ -11538,9 +11538,9 @@ type _Map__FieldName__StructField__MapItr struct { idx int } -func (itr *_Map__FieldName__StructField__MapItr) Next() (k dms3ld.Node, v dms3ld.Node, _ error) { +func (itr *_Map__FieldName__StructField__MapItr) Next() (k ld.Node, v ld.Node, _ error) { if itr.idx >= len(itr.n.t) { - return nil, nil, dms3ld.ErrIteratorOverread{} + return nil, nil, ld.ErrIteratorOverread{} } x := &itr.n.t[itr.idx] k = &x.k @@ -11552,7 +11552,7 @@ func (itr *_Map__FieldName__StructField__MapItr) Done() bool { return itr.idx >= len(itr.n.t) } -func (Map__FieldName__StructField) ListIterator() dms3ld.ListIterator { +func (Map__FieldName__StructField) ListIterator() ld.ListIterator { return nil } func (n Map__FieldName__StructField) Length() int64 { @@ -11579,16 +11579,16 @@ func (Map__FieldName__StructField) AsString() (string, error) { func (Map__FieldName__StructField) AsBytes() ([]byte, error) { return mixins.Map{TypeName: "schemadmt.Map__FieldName__StructField"}.AsBytes() } -func (Map__FieldName__StructField) AsLink() (dms3ld.Link, error) { +func (Map__FieldName__StructField) AsLink() (ld.Link, error) { return mixins.Map{TypeName: "schemadmt.Map__FieldName__StructField"}.AsLink() } -func (Map__FieldName__StructField) Prototype() dms3ld.NodePrototype { +func (Map__FieldName__StructField) Prototype() ld.NodePrototype { return _Map__FieldName__StructField__Prototype{} } type _Map__FieldName__StructField__Prototype struct{} -func (_Map__FieldName__StructField__Prototype) NewBuilder() dms3ld.NodeBuilder { +func (_Map__FieldName__StructField__Prototype) NewBuilder() ld.NodeBuilder { var nb _Map__FieldName__StructField__Builder nb.Reset() return &nb @@ -11598,7 +11598,7 @@ type _Map__FieldName__StructField__Builder struct { _Map__FieldName__StructField__Assembler } -func (nb *_Map__FieldName__StructField__Builder) Build() dms3ld.Node { +func (nb *_Map__FieldName__StructField__Builder) Build() ld.Node { if *nb.m != schema.Maybe_Value { panic("invalid state: cannot call Build on an assembler that's not finished") } @@ -11625,7 +11625,7 @@ func (na *_Map__FieldName__StructField__Assembler) reset() { na.ka.reset() na.va.reset() } -func (na *_Map__FieldName__StructField__Assembler) BeginMap(sizeHint int64) (dms3ld.MapAssembler, error) { +func (na *_Map__FieldName__StructField__Assembler) BeginMap(sizeHint int64) (ld.MapAssembler, error) { switch *na.m { case schema.Maybe_Value, schema.Maybe_Null: panic("invalid state: cannot assign into assembler that's already finished") @@ -11640,7 +11640,7 @@ func (na *_Map__FieldName__StructField__Assembler) BeginMap(sizeHint int64) (dms na.w.t = make([]_Map__FieldName__StructField__entry, 0, sizeHint) return na, nil } -func (_Map__FieldName__StructField__Assembler) BeginList(sizeHint int64) (dms3ld.ListAssembler, error) { +func (_Map__FieldName__StructField__Assembler) BeginList(sizeHint int64) (ld.ListAssembler, error) { return mixins.MapAssembler{TypeName: "schemadmt.Map__FieldName__StructField"}.BeginList(0) } func (na *_Map__FieldName__StructField__Assembler) AssignNull() error { @@ -11672,10 +11672,10 @@ func (_Map__FieldName__StructField__Assembler) AssignString(string) error { func (_Map__FieldName__StructField__Assembler) AssignBytes([]byte) error { return mixins.MapAssembler{TypeName: "schemadmt.Map__FieldName__StructField"}.AssignBytes(nil) } -func (_Map__FieldName__StructField__Assembler) AssignLink(dms3ld.Link) error { +func (_Map__FieldName__StructField__Assembler) AssignLink(ld.Link) error { return mixins.MapAssembler{TypeName: "schemadmt.Map__FieldName__StructField"}.AssignLink(nil) } -func (na *_Map__FieldName__StructField__Assembler) AssignNode(v dms3ld.Node) error { +func (na *_Map__FieldName__StructField__Assembler) AssignNode(v ld.Node) error { if v.IsNull() { return na.AssignNull() } @@ -11690,8 +11690,8 @@ func (na *_Map__FieldName__StructField__Assembler) AssignNode(v dms3ld.Node) err *na.m = schema.Maybe_Value return nil } - if v.Kind() != dms3ld.Kind_Map { - return dms3ld.ErrWrongKind{TypeName: "schemadmt.Map__FieldName__StructField", MethodName: "AssignNode", AppropriateKind: dms3ld.KindSet_JustMap, ActualKind: v.Kind()} + if v.Kind() != ld.Kind_Map { + return ld.ErrWrongKind{TypeName: "schemadmt.Map__FieldName__StructField", MethodName: "AssignNode", AppropriateKind: ld.KindSet_JustMap, ActualKind: v.Kind()} } itr := v.MapIterator() for !itr.Done() { @@ -11708,7 +11708,7 @@ func (na *_Map__FieldName__StructField__Assembler) AssignNode(v dms3ld.Node) err } return na.Finish() } -func (_Map__FieldName__StructField__Assembler) Prototype() dms3ld.NodePrototype { +func (_Map__FieldName__StructField__Assembler) Prototype() ld.NodePrototype { return _Map__FieldName__StructField__Prototype{} } func (ma *_Map__FieldName__StructField__Assembler) keyFinishTidy() bool { @@ -11739,7 +11739,7 @@ func (ma *_Map__FieldName__StructField__Assembler) valueFinishTidy() bool { return false } } -func (ma *_Map__FieldName__StructField__Assembler) AssembleEntry(k string) (dms3ld.NodeAssembler, error) { +func (ma *_Map__FieldName__StructField__Assembler) AssembleEntry(k string) (ld.NodeAssembler, error) { switch ma.state { case maState_initial: // carry on @@ -11760,7 +11760,7 @@ func (ma *_Map__FieldName__StructField__Assembler) AssembleEntry(k string) (dms3 return nil, err // TODO wrap in some kind of ErrInvalidKey } if _, exists := ma.w.m[k2]; exists { - return nil, dms3ld.ErrRepeatedMapKey{Key: &k2} + return nil, ld.ErrRepeatedMapKey{Key: &k2} } ma.w.t = append(ma.w.t, _Map__FieldName__StructField__entry{k: k2}) tz := &ma.w.t[len(ma.w.t)-1] @@ -11771,7 +11771,7 @@ func (ma *_Map__FieldName__StructField__Assembler) AssembleEntry(k string) (dms3 ma.va.m = &ma.cm return &ma.va, nil } -func (ma *_Map__FieldName__StructField__Assembler) AssembleKey() dms3ld.NodeAssembler { +func (ma *_Map__FieldName__StructField__Assembler) AssembleKey() ld.NodeAssembler { switch ma.state { case maState_initial: // carry on @@ -11792,7 +11792,7 @@ func (ma *_Map__FieldName__StructField__Assembler) AssembleKey() dms3ld.NodeAsse ma.ka.w = &ma.w.t[len(ma.w.t)-1].k return &ma.ka } -func (ma *_Map__FieldName__StructField__Assembler) AssembleValue() dms3ld.NodeAssembler { +func (ma *_Map__FieldName__StructField__Assembler) AssembleValue() ld.NodeAssembler { switch ma.state { case maState_initial: panic("invalid state: AssembleValue cannot be called when no key is primed") @@ -11829,55 +11829,55 @@ func (ma *_Map__FieldName__StructField__Assembler) Finish() error { *ma.m = schema.Maybe_Value return nil } -func (ma *_Map__FieldName__StructField__Assembler) KeyPrototype() dms3ld.NodePrototype { +func (ma *_Map__FieldName__StructField__Assembler) KeyPrototype() ld.NodePrototype { return _FieldName__Prototype{} } -func (ma *_Map__FieldName__StructField__Assembler) ValuePrototype(_ string) dms3ld.NodePrototype { +func (ma *_Map__FieldName__StructField__Assembler) ValuePrototype(_ string) ld.NodePrototype { return _StructField__Prototype{} } func (Map__FieldName__StructField) Type() schema.Type { return nil /*TODO:typelit*/ } -func (n Map__FieldName__StructField) Representation() dms3ld.Node { +func (n Map__FieldName__StructField) Representation() ld.Node { return (*_Map__FieldName__StructField__Repr)(n) } type _Map__FieldName__StructField__Repr _Map__FieldName__StructField -var _ dms3ld.Node = &_Map__FieldName__StructField__Repr{} +var _ ld.Node = &_Map__FieldName__StructField__Repr{} -func (_Map__FieldName__StructField__Repr) Kind() dms3ld.Kind { - return dms3ld.Kind_Map +func (_Map__FieldName__StructField__Repr) Kind() ld.Kind { + return ld.Kind_Map } -func (nr *_Map__FieldName__StructField__Repr) LookupByString(k string) (dms3ld.Node, error) { +func (nr *_Map__FieldName__StructField__Repr) LookupByString(k string) (ld.Node, error) { v, err := (Map__FieldName__StructField)(nr).LookupByString(k) - if err != nil || v == dms3ld.Null { + if err != nil || v == ld.Null { return v, err } return v.(StructField).Representation(), nil } -func (nr *_Map__FieldName__StructField__Repr) LookupByNode(k dms3ld.Node) (dms3ld.Node, error) { +func (nr *_Map__FieldName__StructField__Repr) LookupByNode(k ld.Node) (ld.Node, error) { v, err := (Map__FieldName__StructField)(nr).LookupByNode(k) - if err != nil || v == dms3ld.Null { + if err != nil || v == ld.Null { return v, err } return v.(StructField).Representation(), nil } -func (_Map__FieldName__StructField__Repr) LookupByIndex(idx int64) (dms3ld.Node, error) { +func (_Map__FieldName__StructField__Repr) LookupByIndex(idx int64) (ld.Node, error) { return mixins.Map{TypeName: "schemadmt.Map__FieldName__StructField.Repr"}.LookupByIndex(0) } -func (n _Map__FieldName__StructField__Repr) LookupBySegment(seg dms3ld.PathSegment) (dms3ld.Node, error) { +func (n _Map__FieldName__StructField__Repr) LookupBySegment(seg ld.PathSegment) (ld.Node, error) { return n.LookupByString(seg.String()) } -func (nr *_Map__FieldName__StructField__Repr) MapIterator() dms3ld.MapIterator { +func (nr *_Map__FieldName__StructField__Repr) MapIterator() ld.MapIterator { return &_Map__FieldName__StructField__ReprMapItr{(Map__FieldName__StructField)(nr), 0} } type _Map__FieldName__StructField__ReprMapItr _Map__FieldName__StructField__MapItr -func (itr *_Map__FieldName__StructField__ReprMapItr) Next() (k dms3ld.Node, v dms3ld.Node, err error) { +func (itr *_Map__FieldName__StructField__ReprMapItr) Next() (k ld.Node, v ld.Node, err error) { k, v, err = (*_Map__FieldName__StructField__MapItr)(itr).Next() - if err != nil || v == dms3ld.Null { + if err != nil || v == ld.Null { return } return k, v.(StructField).Representation(), nil @@ -11886,7 +11886,7 @@ func (itr *_Map__FieldName__StructField__ReprMapItr) Done() bool { return (*_Map__FieldName__StructField__MapItr)(itr).Done() } -func (_Map__FieldName__StructField__Repr) ListIterator() dms3ld.ListIterator { +func (_Map__FieldName__StructField__Repr) ListIterator() ld.ListIterator { return nil } func (rn *_Map__FieldName__StructField__Repr) Length() int64 { @@ -11913,16 +11913,16 @@ func (_Map__FieldName__StructField__Repr) AsString() (string, error) { func (_Map__FieldName__StructField__Repr) AsBytes() ([]byte, error) { return mixins.Map{TypeName: "schemadmt.Map__FieldName__StructField.Repr"}.AsBytes() } -func (_Map__FieldName__StructField__Repr) AsLink() (dms3ld.Link, error) { +func (_Map__FieldName__StructField__Repr) AsLink() (ld.Link, error) { return mixins.Map{TypeName: "schemadmt.Map__FieldName__StructField.Repr"}.AsLink() } -func (_Map__FieldName__StructField__Repr) Prototype() dms3ld.NodePrototype { +func (_Map__FieldName__StructField__Repr) Prototype() ld.NodePrototype { return _Map__FieldName__StructField__ReprPrototype{} } type _Map__FieldName__StructField__ReprPrototype struct{} -func (_Map__FieldName__StructField__ReprPrototype) NewBuilder() dms3ld.NodeBuilder { +func (_Map__FieldName__StructField__ReprPrototype) NewBuilder() ld.NodeBuilder { var nb _Map__FieldName__StructField__ReprBuilder nb.Reset() return &nb @@ -11932,7 +11932,7 @@ type _Map__FieldName__StructField__ReprBuilder struct { _Map__FieldName__StructField__ReprAssembler } -func (nb *_Map__FieldName__StructField__ReprBuilder) Build() dms3ld.Node { +func (nb *_Map__FieldName__StructField__ReprBuilder) Build() ld.Node { if *nb.m != schema.Maybe_Value { panic("invalid state: cannot call Build on an assembler that's not finished") } @@ -11959,7 +11959,7 @@ func (na *_Map__FieldName__StructField__ReprAssembler) reset() { na.ka.reset() na.va.reset() } -func (na *_Map__FieldName__StructField__ReprAssembler) BeginMap(sizeHint int64) (dms3ld.MapAssembler, error) { +func (na *_Map__FieldName__StructField__ReprAssembler) BeginMap(sizeHint int64) (ld.MapAssembler, error) { switch *na.m { case schema.Maybe_Value, schema.Maybe_Null: panic("invalid state: cannot assign into assembler that's already finished") @@ -11974,7 +11974,7 @@ func (na *_Map__FieldName__StructField__ReprAssembler) BeginMap(sizeHint int64) na.w.t = make([]_Map__FieldName__StructField__entry, 0, sizeHint) return na, nil } -func (_Map__FieldName__StructField__ReprAssembler) BeginList(sizeHint int64) (dms3ld.ListAssembler, error) { +func (_Map__FieldName__StructField__ReprAssembler) BeginList(sizeHint int64) (ld.ListAssembler, error) { return mixins.MapAssembler{TypeName: "schemadmt.Map__FieldName__StructField.Repr"}.BeginList(0) } func (na *_Map__FieldName__StructField__ReprAssembler) AssignNull() error { @@ -12006,10 +12006,10 @@ func (_Map__FieldName__StructField__ReprAssembler) AssignString(string) error { func (_Map__FieldName__StructField__ReprAssembler) AssignBytes([]byte) error { return mixins.MapAssembler{TypeName: "schemadmt.Map__FieldName__StructField.Repr"}.AssignBytes(nil) } -func (_Map__FieldName__StructField__ReprAssembler) AssignLink(dms3ld.Link) error { +func (_Map__FieldName__StructField__ReprAssembler) AssignLink(ld.Link) error { return mixins.MapAssembler{TypeName: "schemadmt.Map__FieldName__StructField.Repr"}.AssignLink(nil) } -func (na *_Map__FieldName__StructField__ReprAssembler) AssignNode(v dms3ld.Node) error { +func (na *_Map__FieldName__StructField__ReprAssembler) AssignNode(v ld.Node) error { if v.IsNull() { return na.AssignNull() } @@ -12024,8 +12024,8 @@ func (na *_Map__FieldName__StructField__ReprAssembler) AssignNode(v dms3ld.Node) *na.m = schema.Maybe_Value return nil } - if v.Kind() != dms3ld.Kind_Map { - return dms3ld.ErrWrongKind{TypeName: "schemadmt.Map__FieldName__StructField.Repr", MethodName: "AssignNode", AppropriateKind: dms3ld.KindSet_JustMap, ActualKind: v.Kind()} + if v.Kind() != ld.Kind_Map { + return ld.ErrWrongKind{TypeName: "schemadmt.Map__FieldName__StructField.Repr", MethodName: "AssignNode", AppropriateKind: ld.KindSet_JustMap, ActualKind: v.Kind()} } itr := v.MapIterator() for !itr.Done() { @@ -12042,7 +12042,7 @@ func (na *_Map__FieldName__StructField__ReprAssembler) AssignNode(v dms3ld.Node) } return na.Finish() } -func (_Map__FieldName__StructField__ReprAssembler) Prototype() dms3ld.NodePrototype { +func (_Map__FieldName__StructField__ReprAssembler) Prototype() ld.NodePrototype { return _Map__FieldName__StructField__ReprPrototype{} } func (ma *_Map__FieldName__StructField__ReprAssembler) keyFinishTidy() bool { @@ -12073,7 +12073,7 @@ func (ma *_Map__FieldName__StructField__ReprAssembler) valueFinishTidy() bool { return false } } -func (ma *_Map__FieldName__StructField__ReprAssembler) AssembleEntry(k string) (dms3ld.NodeAssembler, error) { +func (ma *_Map__FieldName__StructField__ReprAssembler) AssembleEntry(k string) (ld.NodeAssembler, error) { switch ma.state { case maState_initial: // carry on @@ -12094,7 +12094,7 @@ func (ma *_Map__FieldName__StructField__ReprAssembler) AssembleEntry(k string) ( return nil, err // TODO wrap in some kind of ErrInvalidKey } if _, exists := ma.w.m[k2]; exists { - return nil, dms3ld.ErrRepeatedMapKey{Key: &k2} + return nil, ld.ErrRepeatedMapKey{Key: &k2} } ma.w.t = append(ma.w.t, _Map__FieldName__StructField__entry{k: k2}) tz := &ma.w.t[len(ma.w.t)-1] @@ -12105,7 +12105,7 @@ func (ma *_Map__FieldName__StructField__ReprAssembler) AssembleEntry(k string) ( ma.va.m = &ma.cm return &ma.va, nil } -func (ma *_Map__FieldName__StructField__ReprAssembler) AssembleKey() dms3ld.NodeAssembler { +func (ma *_Map__FieldName__StructField__ReprAssembler) AssembleKey() ld.NodeAssembler { switch ma.state { case maState_initial: // carry on @@ -12126,7 +12126,7 @@ func (ma *_Map__FieldName__StructField__ReprAssembler) AssembleKey() dms3ld.Node ma.ka.w = &ma.w.t[len(ma.w.t)-1].k return &ma.ka } -func (ma *_Map__FieldName__StructField__ReprAssembler) AssembleValue() dms3ld.NodeAssembler { +func (ma *_Map__FieldName__StructField__ReprAssembler) AssembleValue() ld.NodeAssembler { switch ma.state { case maState_initial: panic("invalid state: AssembleValue cannot be called when no key is primed") @@ -12163,10 +12163,10 @@ func (ma *_Map__FieldName__StructField__ReprAssembler) Finish() error { *ma.m = schema.Maybe_Value return nil } -func (ma *_Map__FieldName__StructField__ReprAssembler) KeyPrototype() dms3ld.NodePrototype { +func (ma *_Map__FieldName__StructField__ReprAssembler) KeyPrototype() ld.NodePrototype { return _FieldName__ReprPrototype{} } -func (ma *_Map__FieldName__StructField__ReprAssembler) ValuePrototype(_ string) dms3ld.NodePrototype { +func (ma *_Map__FieldName__StructField__ReprAssembler) ValuePrototype(_ string) ld.NodePrototype { return _StructField__ReprPrototype{} } @@ -12228,12 +12228,12 @@ func (m MaybeMap__FieldName__StructRepresentation_Map_FieldDetails) IsAbsent() b func (m MaybeMap__FieldName__StructRepresentation_Map_FieldDetails) Exists() bool { return m.m == schema.Maybe_Value } -func (m MaybeMap__FieldName__StructRepresentation_Map_FieldDetails) AsNode() dms3ld.Node { +func (m MaybeMap__FieldName__StructRepresentation_Map_FieldDetails) AsNode() ld.Node { switch m.m { case schema.Maybe_Absent: - return dms3ld.Absent + return ld.Absent case schema.Maybe_Null: - return dms3ld.Null + return ld.Null case schema.Maybe_Value: return &m.v default: @@ -12247,42 +12247,42 @@ func (m MaybeMap__FieldName__StructRepresentation_Map_FieldDetails) Must() Map__ return &m.v } -var _ dms3ld.Node = (Map__FieldName__StructRepresentation_Map_FieldDetails)(&_Map__FieldName__StructRepresentation_Map_FieldDetails{}) +var _ ld.Node = (Map__FieldName__StructRepresentation_Map_FieldDetails)(&_Map__FieldName__StructRepresentation_Map_FieldDetails{}) var _ schema.TypedNode = (Map__FieldName__StructRepresentation_Map_FieldDetails)(&_Map__FieldName__StructRepresentation_Map_FieldDetails{}) -func (Map__FieldName__StructRepresentation_Map_FieldDetails) Kind() dms3ld.Kind { - return dms3ld.Kind_Map +func (Map__FieldName__StructRepresentation_Map_FieldDetails) Kind() ld.Kind { + return ld.Kind_Map } -func (n Map__FieldName__StructRepresentation_Map_FieldDetails) LookupByString(k string) (dms3ld.Node, error) { +func (n Map__FieldName__StructRepresentation_Map_FieldDetails) LookupByString(k string) (ld.Node, error) { var k2 _FieldName if err := (_FieldName__Prototype{}).fromString(&k2, k); err != nil { return nil, err // TODO wrap in some kind of ErrInvalidKey } v, exists := n.m[k2] if !exists { - return nil, dms3ld.ErrNotExists{Segment: dms3ld.PathSegmentOfString(k)} + return nil, ld.ErrNotExists{Segment: ld.PathSegmentOfString(k)} } return v, nil } -func (n Map__FieldName__StructRepresentation_Map_FieldDetails) LookupByNode(k dms3ld.Node) (dms3ld.Node, error) { +func (n Map__FieldName__StructRepresentation_Map_FieldDetails) LookupByNode(k ld.Node) (ld.Node, error) { k2, ok := k.(FieldName) if !ok { panic("todo invalid key type error") - // 'dms3ld.ErrInvalidKey{TypeName:"schemadmt.Map__FieldName__StructRepresentation_Map_FieldDetails", Key:&_String{k}}' doesn't quite cut it: need room to explain the type, and it's not guaranteed k can be turned into a string at all + // 'ld.ErrInvalidKey{TypeName:"schemadmt.Map__FieldName__StructRepresentation_Map_FieldDetails", Key:&_String{k}}' doesn't quite cut it: need room to explain the type, and it's not guaranteed k can be turned into a string at all } v, exists := n.m[*k2] if !exists { - return nil, dms3ld.ErrNotExists{Segment: dms3ld.PathSegmentOfString(k2.String())} + return nil, ld.ErrNotExists{Segment: ld.PathSegmentOfString(k2.String())} } return v, nil } -func (Map__FieldName__StructRepresentation_Map_FieldDetails) LookupByIndex(idx int64) (dms3ld.Node, error) { +func (Map__FieldName__StructRepresentation_Map_FieldDetails) LookupByIndex(idx int64) (ld.Node, error) { return mixins.Map{TypeName: "schemadmt.Map__FieldName__StructRepresentation_Map_FieldDetails"}.LookupByIndex(0) } -func (n Map__FieldName__StructRepresentation_Map_FieldDetails) LookupBySegment(seg dms3ld.PathSegment) (dms3ld.Node, error) { +func (n Map__FieldName__StructRepresentation_Map_FieldDetails) LookupBySegment(seg ld.PathSegment) (ld.Node, error) { return n.LookupByString(seg.String()) } -func (n Map__FieldName__StructRepresentation_Map_FieldDetails) MapIterator() dms3ld.MapIterator { +func (n Map__FieldName__StructRepresentation_Map_FieldDetails) MapIterator() ld.MapIterator { return &_Map__FieldName__StructRepresentation_Map_FieldDetails__MapItr{n, 0} } @@ -12291,9 +12291,9 @@ type _Map__FieldName__StructRepresentation_Map_FieldDetails__MapItr struct { idx int } -func (itr *_Map__FieldName__StructRepresentation_Map_FieldDetails__MapItr) Next() (k dms3ld.Node, v dms3ld.Node, _ error) { +func (itr *_Map__FieldName__StructRepresentation_Map_FieldDetails__MapItr) Next() (k ld.Node, v ld.Node, _ error) { if itr.idx >= len(itr.n.t) { - return nil, nil, dms3ld.ErrIteratorOverread{} + return nil, nil, ld.ErrIteratorOverread{} } x := &itr.n.t[itr.idx] k = &x.k @@ -12305,7 +12305,7 @@ func (itr *_Map__FieldName__StructRepresentation_Map_FieldDetails__MapItr) Done( return itr.idx >= len(itr.n.t) } -func (Map__FieldName__StructRepresentation_Map_FieldDetails) ListIterator() dms3ld.ListIterator { +func (Map__FieldName__StructRepresentation_Map_FieldDetails) ListIterator() ld.ListIterator { return nil } func (n Map__FieldName__StructRepresentation_Map_FieldDetails) Length() int64 { @@ -12332,16 +12332,16 @@ func (Map__FieldName__StructRepresentation_Map_FieldDetails) AsString() (string, func (Map__FieldName__StructRepresentation_Map_FieldDetails) AsBytes() ([]byte, error) { return mixins.Map{TypeName: "schemadmt.Map__FieldName__StructRepresentation_Map_FieldDetails"}.AsBytes() } -func (Map__FieldName__StructRepresentation_Map_FieldDetails) AsLink() (dms3ld.Link, error) { +func (Map__FieldName__StructRepresentation_Map_FieldDetails) AsLink() (ld.Link, error) { return mixins.Map{TypeName: "schemadmt.Map__FieldName__StructRepresentation_Map_FieldDetails"}.AsLink() } -func (Map__FieldName__StructRepresentation_Map_FieldDetails) Prototype() dms3ld.NodePrototype { +func (Map__FieldName__StructRepresentation_Map_FieldDetails) Prototype() ld.NodePrototype { return _Map__FieldName__StructRepresentation_Map_FieldDetails__Prototype{} } type _Map__FieldName__StructRepresentation_Map_FieldDetails__Prototype struct{} -func (_Map__FieldName__StructRepresentation_Map_FieldDetails__Prototype) NewBuilder() dms3ld.NodeBuilder { +func (_Map__FieldName__StructRepresentation_Map_FieldDetails__Prototype) NewBuilder() ld.NodeBuilder { var nb _Map__FieldName__StructRepresentation_Map_FieldDetails__Builder nb.Reset() return &nb @@ -12351,7 +12351,7 @@ type _Map__FieldName__StructRepresentation_Map_FieldDetails__Builder struct { _Map__FieldName__StructRepresentation_Map_FieldDetails__Assembler } -func (nb *_Map__FieldName__StructRepresentation_Map_FieldDetails__Builder) Build() dms3ld.Node { +func (nb *_Map__FieldName__StructRepresentation_Map_FieldDetails__Builder) Build() ld.Node { if *nb.m != schema.Maybe_Value { panic("invalid state: cannot call Build on an assembler that's not finished") } @@ -12378,7 +12378,7 @@ func (na *_Map__FieldName__StructRepresentation_Map_FieldDetails__Assembler) res na.ka.reset() na.va.reset() } -func (na *_Map__FieldName__StructRepresentation_Map_FieldDetails__Assembler) BeginMap(sizeHint int64) (dms3ld.MapAssembler, error) { +func (na *_Map__FieldName__StructRepresentation_Map_FieldDetails__Assembler) BeginMap(sizeHint int64) (ld.MapAssembler, error) { switch *na.m { case schema.Maybe_Value, schema.Maybe_Null: panic("invalid state: cannot assign into assembler that's already finished") @@ -12393,7 +12393,7 @@ func (na *_Map__FieldName__StructRepresentation_Map_FieldDetails__Assembler) Beg na.w.t = make([]_Map__FieldName__StructRepresentation_Map_FieldDetails__entry, 0, sizeHint) return na, nil } -func (_Map__FieldName__StructRepresentation_Map_FieldDetails__Assembler) BeginList(sizeHint int64) (dms3ld.ListAssembler, error) { +func (_Map__FieldName__StructRepresentation_Map_FieldDetails__Assembler) BeginList(sizeHint int64) (ld.ListAssembler, error) { return mixins.MapAssembler{TypeName: "schemadmt.Map__FieldName__StructRepresentation_Map_FieldDetails"}.BeginList(0) } func (na *_Map__FieldName__StructRepresentation_Map_FieldDetails__Assembler) AssignNull() error { @@ -12425,10 +12425,10 @@ func (_Map__FieldName__StructRepresentation_Map_FieldDetails__Assembler) AssignS func (_Map__FieldName__StructRepresentation_Map_FieldDetails__Assembler) AssignBytes([]byte) error { return mixins.MapAssembler{TypeName: "schemadmt.Map__FieldName__StructRepresentation_Map_FieldDetails"}.AssignBytes(nil) } -func (_Map__FieldName__StructRepresentation_Map_FieldDetails__Assembler) AssignLink(dms3ld.Link) error { +func (_Map__FieldName__StructRepresentation_Map_FieldDetails__Assembler) AssignLink(ld.Link) error { return mixins.MapAssembler{TypeName: "schemadmt.Map__FieldName__StructRepresentation_Map_FieldDetails"}.AssignLink(nil) } -func (na *_Map__FieldName__StructRepresentation_Map_FieldDetails__Assembler) AssignNode(v dms3ld.Node) error { +func (na *_Map__FieldName__StructRepresentation_Map_FieldDetails__Assembler) AssignNode(v ld.Node) error { if v.IsNull() { return na.AssignNull() } @@ -12443,8 +12443,8 @@ func (na *_Map__FieldName__StructRepresentation_Map_FieldDetails__Assembler) Ass *na.m = schema.Maybe_Value return nil } - if v.Kind() != dms3ld.Kind_Map { - return dms3ld.ErrWrongKind{TypeName: "schemadmt.Map__FieldName__StructRepresentation_Map_FieldDetails", MethodName: "AssignNode", AppropriateKind: dms3ld.KindSet_JustMap, ActualKind: v.Kind()} + if v.Kind() != ld.Kind_Map { + return ld.ErrWrongKind{TypeName: "schemadmt.Map__FieldName__StructRepresentation_Map_FieldDetails", MethodName: "AssignNode", AppropriateKind: ld.KindSet_JustMap, ActualKind: v.Kind()} } itr := v.MapIterator() for !itr.Done() { @@ -12461,7 +12461,7 @@ func (na *_Map__FieldName__StructRepresentation_Map_FieldDetails__Assembler) Ass } return na.Finish() } -func (_Map__FieldName__StructRepresentation_Map_FieldDetails__Assembler) Prototype() dms3ld.NodePrototype { +func (_Map__FieldName__StructRepresentation_Map_FieldDetails__Assembler) Prototype() ld.NodePrototype { return _Map__FieldName__StructRepresentation_Map_FieldDetails__Prototype{} } func (ma *_Map__FieldName__StructRepresentation_Map_FieldDetails__Assembler) keyFinishTidy() bool { @@ -12492,7 +12492,7 @@ func (ma *_Map__FieldName__StructRepresentation_Map_FieldDetails__Assembler) val return false } } -func (ma *_Map__FieldName__StructRepresentation_Map_FieldDetails__Assembler) AssembleEntry(k string) (dms3ld.NodeAssembler, error) { +func (ma *_Map__FieldName__StructRepresentation_Map_FieldDetails__Assembler) AssembleEntry(k string) (ld.NodeAssembler, error) { switch ma.state { case maState_initial: // carry on @@ -12513,7 +12513,7 @@ func (ma *_Map__FieldName__StructRepresentation_Map_FieldDetails__Assembler) Ass return nil, err // TODO wrap in some kind of ErrInvalidKey } if _, exists := ma.w.m[k2]; exists { - return nil, dms3ld.ErrRepeatedMapKey{Key: &k2} + return nil, ld.ErrRepeatedMapKey{Key: &k2} } ma.w.t = append(ma.w.t, _Map__FieldName__StructRepresentation_Map_FieldDetails__entry{k: k2}) tz := &ma.w.t[len(ma.w.t)-1] @@ -12524,7 +12524,7 @@ func (ma *_Map__FieldName__StructRepresentation_Map_FieldDetails__Assembler) Ass ma.va.m = &ma.cm return &ma.va, nil } -func (ma *_Map__FieldName__StructRepresentation_Map_FieldDetails__Assembler) AssembleKey() dms3ld.NodeAssembler { +func (ma *_Map__FieldName__StructRepresentation_Map_FieldDetails__Assembler) AssembleKey() ld.NodeAssembler { switch ma.state { case maState_initial: // carry on @@ -12545,7 +12545,7 @@ func (ma *_Map__FieldName__StructRepresentation_Map_FieldDetails__Assembler) Ass ma.ka.w = &ma.w.t[len(ma.w.t)-1].k return &ma.ka } -func (ma *_Map__FieldName__StructRepresentation_Map_FieldDetails__Assembler) AssembleValue() dms3ld.NodeAssembler { +func (ma *_Map__FieldName__StructRepresentation_Map_FieldDetails__Assembler) AssembleValue() ld.NodeAssembler { switch ma.state { case maState_initial: panic("invalid state: AssembleValue cannot be called when no key is primed") @@ -12582,55 +12582,55 @@ func (ma *_Map__FieldName__StructRepresentation_Map_FieldDetails__Assembler) Fin *ma.m = schema.Maybe_Value return nil } -func (ma *_Map__FieldName__StructRepresentation_Map_FieldDetails__Assembler) KeyPrototype() dms3ld.NodePrototype { +func (ma *_Map__FieldName__StructRepresentation_Map_FieldDetails__Assembler) KeyPrototype() ld.NodePrototype { return _FieldName__Prototype{} } -func (ma *_Map__FieldName__StructRepresentation_Map_FieldDetails__Assembler) ValuePrototype(_ string) dms3ld.NodePrototype { +func (ma *_Map__FieldName__StructRepresentation_Map_FieldDetails__Assembler) ValuePrototype(_ string) ld.NodePrototype { return _StructRepresentation_Map_FieldDetails__Prototype{} } func (Map__FieldName__StructRepresentation_Map_FieldDetails) Type() schema.Type { return nil /*TODO:typelit*/ } -func (n Map__FieldName__StructRepresentation_Map_FieldDetails) Representation() dms3ld.Node { +func (n Map__FieldName__StructRepresentation_Map_FieldDetails) Representation() ld.Node { return (*_Map__FieldName__StructRepresentation_Map_FieldDetails__Repr)(n) } type _Map__FieldName__StructRepresentation_Map_FieldDetails__Repr _Map__FieldName__StructRepresentation_Map_FieldDetails -var _ dms3ld.Node = &_Map__FieldName__StructRepresentation_Map_FieldDetails__Repr{} +var _ ld.Node = &_Map__FieldName__StructRepresentation_Map_FieldDetails__Repr{} -func (_Map__FieldName__StructRepresentation_Map_FieldDetails__Repr) Kind() dms3ld.Kind { - return dms3ld.Kind_Map +func (_Map__FieldName__StructRepresentation_Map_FieldDetails__Repr) Kind() ld.Kind { + return ld.Kind_Map } -func (nr *_Map__FieldName__StructRepresentation_Map_FieldDetails__Repr) LookupByString(k string) (dms3ld.Node, error) { +func (nr *_Map__FieldName__StructRepresentation_Map_FieldDetails__Repr) LookupByString(k string) (ld.Node, error) { v, err := (Map__FieldName__StructRepresentation_Map_FieldDetails)(nr).LookupByString(k) - if err != nil || v == dms3ld.Null { + if err != nil || v == ld.Null { return v, err } return v.(StructRepresentation_Map_FieldDetails).Representation(), nil } -func (nr *_Map__FieldName__StructRepresentation_Map_FieldDetails__Repr) LookupByNode(k dms3ld.Node) (dms3ld.Node, error) { +func (nr *_Map__FieldName__StructRepresentation_Map_FieldDetails__Repr) LookupByNode(k ld.Node) (ld.Node, error) { v, err := (Map__FieldName__StructRepresentation_Map_FieldDetails)(nr).LookupByNode(k) - if err != nil || v == dms3ld.Null { + if err != nil || v == ld.Null { return v, err } return v.(StructRepresentation_Map_FieldDetails).Representation(), nil } -func (_Map__FieldName__StructRepresentation_Map_FieldDetails__Repr) LookupByIndex(idx int64) (dms3ld.Node, error) { +func (_Map__FieldName__StructRepresentation_Map_FieldDetails__Repr) LookupByIndex(idx int64) (ld.Node, error) { return mixins.Map{TypeName: "schemadmt.Map__FieldName__StructRepresentation_Map_FieldDetails.Repr"}.LookupByIndex(0) } -func (n _Map__FieldName__StructRepresentation_Map_FieldDetails__Repr) LookupBySegment(seg dms3ld.PathSegment) (dms3ld.Node, error) { +func (n _Map__FieldName__StructRepresentation_Map_FieldDetails__Repr) LookupBySegment(seg ld.PathSegment) (ld.Node, error) { return n.LookupByString(seg.String()) } -func (nr *_Map__FieldName__StructRepresentation_Map_FieldDetails__Repr) MapIterator() dms3ld.MapIterator { +func (nr *_Map__FieldName__StructRepresentation_Map_FieldDetails__Repr) MapIterator() ld.MapIterator { return &_Map__FieldName__StructRepresentation_Map_FieldDetails__ReprMapItr{(Map__FieldName__StructRepresentation_Map_FieldDetails)(nr), 0} } type _Map__FieldName__StructRepresentation_Map_FieldDetails__ReprMapItr _Map__FieldName__StructRepresentation_Map_FieldDetails__MapItr -func (itr *_Map__FieldName__StructRepresentation_Map_FieldDetails__ReprMapItr) Next() (k dms3ld.Node, v dms3ld.Node, err error) { +func (itr *_Map__FieldName__StructRepresentation_Map_FieldDetails__ReprMapItr) Next() (k ld.Node, v ld.Node, err error) { k, v, err = (*_Map__FieldName__StructRepresentation_Map_FieldDetails__MapItr)(itr).Next() - if err != nil || v == dms3ld.Null { + if err != nil || v == ld.Null { return } return k, v.(StructRepresentation_Map_FieldDetails).Representation(), nil @@ -12639,7 +12639,7 @@ func (itr *_Map__FieldName__StructRepresentation_Map_FieldDetails__ReprMapItr) D return (*_Map__FieldName__StructRepresentation_Map_FieldDetails__MapItr)(itr).Done() } -func (_Map__FieldName__StructRepresentation_Map_FieldDetails__Repr) ListIterator() dms3ld.ListIterator { +func (_Map__FieldName__StructRepresentation_Map_FieldDetails__Repr) ListIterator() ld.ListIterator { return nil } func (rn *_Map__FieldName__StructRepresentation_Map_FieldDetails__Repr) Length() int64 { @@ -12666,16 +12666,16 @@ func (_Map__FieldName__StructRepresentation_Map_FieldDetails__Repr) AsString() ( func (_Map__FieldName__StructRepresentation_Map_FieldDetails__Repr) AsBytes() ([]byte, error) { return mixins.Map{TypeName: "schemadmt.Map__FieldName__StructRepresentation_Map_FieldDetails.Repr"}.AsBytes() } -func (_Map__FieldName__StructRepresentation_Map_FieldDetails__Repr) AsLink() (dms3ld.Link, error) { +func (_Map__FieldName__StructRepresentation_Map_FieldDetails__Repr) AsLink() (ld.Link, error) { return mixins.Map{TypeName: "schemadmt.Map__FieldName__StructRepresentation_Map_FieldDetails.Repr"}.AsLink() } -func (_Map__FieldName__StructRepresentation_Map_FieldDetails__Repr) Prototype() dms3ld.NodePrototype { +func (_Map__FieldName__StructRepresentation_Map_FieldDetails__Repr) Prototype() ld.NodePrototype { return _Map__FieldName__StructRepresentation_Map_FieldDetails__ReprPrototype{} } type _Map__FieldName__StructRepresentation_Map_FieldDetails__ReprPrototype struct{} -func (_Map__FieldName__StructRepresentation_Map_FieldDetails__ReprPrototype) NewBuilder() dms3ld.NodeBuilder { +func (_Map__FieldName__StructRepresentation_Map_FieldDetails__ReprPrototype) NewBuilder() ld.NodeBuilder { var nb _Map__FieldName__StructRepresentation_Map_FieldDetails__ReprBuilder nb.Reset() return &nb @@ -12685,7 +12685,7 @@ type _Map__FieldName__StructRepresentation_Map_FieldDetails__ReprBuilder struct _Map__FieldName__StructRepresentation_Map_FieldDetails__ReprAssembler } -func (nb *_Map__FieldName__StructRepresentation_Map_FieldDetails__ReprBuilder) Build() dms3ld.Node { +func (nb *_Map__FieldName__StructRepresentation_Map_FieldDetails__ReprBuilder) Build() ld.Node { if *nb.m != schema.Maybe_Value { panic("invalid state: cannot call Build on an assembler that's not finished") } @@ -12712,7 +12712,7 @@ func (na *_Map__FieldName__StructRepresentation_Map_FieldDetails__ReprAssembler) na.ka.reset() na.va.reset() } -func (na *_Map__FieldName__StructRepresentation_Map_FieldDetails__ReprAssembler) BeginMap(sizeHint int64) (dms3ld.MapAssembler, error) { +func (na *_Map__FieldName__StructRepresentation_Map_FieldDetails__ReprAssembler) BeginMap(sizeHint int64) (ld.MapAssembler, error) { switch *na.m { case schema.Maybe_Value, schema.Maybe_Null: panic("invalid state: cannot assign into assembler that's already finished") @@ -12727,7 +12727,7 @@ func (na *_Map__FieldName__StructRepresentation_Map_FieldDetails__ReprAssembler) na.w.t = make([]_Map__FieldName__StructRepresentation_Map_FieldDetails__entry, 0, sizeHint) return na, nil } -func (_Map__FieldName__StructRepresentation_Map_FieldDetails__ReprAssembler) BeginList(sizeHint int64) (dms3ld.ListAssembler, error) { +func (_Map__FieldName__StructRepresentation_Map_FieldDetails__ReprAssembler) BeginList(sizeHint int64) (ld.ListAssembler, error) { return mixins.MapAssembler{TypeName: "schemadmt.Map__FieldName__StructRepresentation_Map_FieldDetails.Repr"}.BeginList(0) } func (na *_Map__FieldName__StructRepresentation_Map_FieldDetails__ReprAssembler) AssignNull() error { @@ -12759,10 +12759,10 @@ func (_Map__FieldName__StructRepresentation_Map_FieldDetails__ReprAssembler) Ass func (_Map__FieldName__StructRepresentation_Map_FieldDetails__ReprAssembler) AssignBytes([]byte) error { return mixins.MapAssembler{TypeName: "schemadmt.Map__FieldName__StructRepresentation_Map_FieldDetails.Repr"}.AssignBytes(nil) } -func (_Map__FieldName__StructRepresentation_Map_FieldDetails__ReprAssembler) AssignLink(dms3ld.Link) error { +func (_Map__FieldName__StructRepresentation_Map_FieldDetails__ReprAssembler) AssignLink(ld.Link) error { return mixins.MapAssembler{TypeName: "schemadmt.Map__FieldName__StructRepresentation_Map_FieldDetails.Repr"}.AssignLink(nil) } -func (na *_Map__FieldName__StructRepresentation_Map_FieldDetails__ReprAssembler) AssignNode(v dms3ld.Node) error { +func (na *_Map__FieldName__StructRepresentation_Map_FieldDetails__ReprAssembler) AssignNode(v ld.Node) error { if v.IsNull() { return na.AssignNull() } @@ -12777,8 +12777,8 @@ func (na *_Map__FieldName__StructRepresentation_Map_FieldDetails__ReprAssembler) *na.m = schema.Maybe_Value return nil } - if v.Kind() != dms3ld.Kind_Map { - return dms3ld.ErrWrongKind{TypeName: "schemadmt.Map__FieldName__StructRepresentation_Map_FieldDetails.Repr", MethodName: "AssignNode", AppropriateKind: dms3ld.KindSet_JustMap, ActualKind: v.Kind()} + if v.Kind() != ld.Kind_Map { + return ld.ErrWrongKind{TypeName: "schemadmt.Map__FieldName__StructRepresentation_Map_FieldDetails.Repr", MethodName: "AssignNode", AppropriateKind: ld.KindSet_JustMap, ActualKind: v.Kind()} } itr := v.MapIterator() for !itr.Done() { @@ -12795,7 +12795,7 @@ func (na *_Map__FieldName__StructRepresentation_Map_FieldDetails__ReprAssembler) } return na.Finish() } -func (_Map__FieldName__StructRepresentation_Map_FieldDetails__ReprAssembler) Prototype() dms3ld.NodePrototype { +func (_Map__FieldName__StructRepresentation_Map_FieldDetails__ReprAssembler) Prototype() ld.NodePrototype { return _Map__FieldName__StructRepresentation_Map_FieldDetails__ReprPrototype{} } func (ma *_Map__FieldName__StructRepresentation_Map_FieldDetails__ReprAssembler) keyFinishTidy() bool { @@ -12826,7 +12826,7 @@ func (ma *_Map__FieldName__StructRepresentation_Map_FieldDetails__ReprAssembler) return false } } -func (ma *_Map__FieldName__StructRepresentation_Map_FieldDetails__ReprAssembler) AssembleEntry(k string) (dms3ld.NodeAssembler, error) { +func (ma *_Map__FieldName__StructRepresentation_Map_FieldDetails__ReprAssembler) AssembleEntry(k string) (ld.NodeAssembler, error) { switch ma.state { case maState_initial: // carry on @@ -12847,7 +12847,7 @@ func (ma *_Map__FieldName__StructRepresentation_Map_FieldDetails__ReprAssembler) return nil, err // TODO wrap in some kind of ErrInvalidKey } if _, exists := ma.w.m[k2]; exists { - return nil, dms3ld.ErrRepeatedMapKey{Key: &k2} + return nil, ld.ErrRepeatedMapKey{Key: &k2} } ma.w.t = append(ma.w.t, _Map__FieldName__StructRepresentation_Map_FieldDetails__entry{k: k2}) tz := &ma.w.t[len(ma.w.t)-1] @@ -12858,7 +12858,7 @@ func (ma *_Map__FieldName__StructRepresentation_Map_FieldDetails__ReprAssembler) ma.va.m = &ma.cm return &ma.va, nil } -func (ma *_Map__FieldName__StructRepresentation_Map_FieldDetails__ReprAssembler) AssembleKey() dms3ld.NodeAssembler { +func (ma *_Map__FieldName__StructRepresentation_Map_FieldDetails__ReprAssembler) AssembleKey() ld.NodeAssembler { switch ma.state { case maState_initial: // carry on @@ -12879,7 +12879,7 @@ func (ma *_Map__FieldName__StructRepresentation_Map_FieldDetails__ReprAssembler) ma.ka.w = &ma.w.t[len(ma.w.t)-1].k return &ma.ka } -func (ma *_Map__FieldName__StructRepresentation_Map_FieldDetails__ReprAssembler) AssembleValue() dms3ld.NodeAssembler { +func (ma *_Map__FieldName__StructRepresentation_Map_FieldDetails__ReprAssembler) AssembleValue() ld.NodeAssembler { switch ma.state { case maState_initial: panic("invalid state: AssembleValue cannot be called when no key is primed") @@ -12916,10 +12916,10 @@ func (ma *_Map__FieldName__StructRepresentation_Map_FieldDetails__ReprAssembler) *ma.m = schema.Maybe_Value return nil } -func (ma *_Map__FieldName__StructRepresentation_Map_FieldDetails__ReprAssembler) KeyPrototype() dms3ld.NodePrototype { +func (ma *_Map__FieldName__StructRepresentation_Map_FieldDetails__ReprAssembler) KeyPrototype() ld.NodePrototype { return _FieldName__ReprPrototype{} } -func (ma *_Map__FieldName__StructRepresentation_Map_FieldDetails__ReprAssembler) ValuePrototype(_ string) dms3ld.NodePrototype { +func (ma *_Map__FieldName__StructRepresentation_Map_FieldDetails__ReprAssembler) ValuePrototype(_ string) ld.NodePrototype { return _StructRepresentation_Map_FieldDetails__ReprPrototype{} } @@ -12981,12 +12981,12 @@ func (m MaybeMap__String__TypeName) IsAbsent() bool { func (m MaybeMap__String__TypeName) Exists() bool { return m.m == schema.Maybe_Value } -func (m MaybeMap__String__TypeName) AsNode() dms3ld.Node { +func (m MaybeMap__String__TypeName) AsNode() ld.Node { switch m.m { case schema.Maybe_Absent: - return dms3ld.Absent + return ld.Absent case schema.Maybe_Null: - return dms3ld.Null + return ld.Null case schema.Maybe_Value: return &m.v default: @@ -13000,42 +13000,42 @@ func (m MaybeMap__String__TypeName) Must() Map__String__TypeName { return &m.v } -var _ dms3ld.Node = (Map__String__TypeName)(&_Map__String__TypeName{}) +var _ ld.Node = (Map__String__TypeName)(&_Map__String__TypeName{}) var _ schema.TypedNode = (Map__String__TypeName)(&_Map__String__TypeName{}) -func (Map__String__TypeName) Kind() dms3ld.Kind { - return dms3ld.Kind_Map +func (Map__String__TypeName) Kind() ld.Kind { + return ld.Kind_Map } -func (n Map__String__TypeName) LookupByString(k string) (dms3ld.Node, error) { +func (n Map__String__TypeName) LookupByString(k string) (ld.Node, error) { var k2 _String if err := (_String__Prototype{}).fromString(&k2, k); err != nil { return nil, err // TODO wrap in some kind of ErrInvalidKey } v, exists := n.m[k2] if !exists { - return nil, dms3ld.ErrNotExists{Segment: dms3ld.PathSegmentOfString(k)} + return nil, ld.ErrNotExists{Segment: ld.PathSegmentOfString(k)} } return v, nil } -func (n Map__String__TypeName) LookupByNode(k dms3ld.Node) (dms3ld.Node, error) { +func (n Map__String__TypeName) LookupByNode(k ld.Node) (ld.Node, error) { k2, ok := k.(String) if !ok { panic("todo invalid key type error") - // 'dms3ld.ErrInvalidKey{TypeName:"schemadmt.Map__String__TypeName", Key:&_String{k}}' doesn't quite cut it: need room to explain the type, and it's not guaranteed k can be turned into a string at all + // 'ld.ErrInvalidKey{TypeName:"schemadmt.Map__String__TypeName", Key:&_String{k}}' doesn't quite cut it: need room to explain the type, and it's not guaranteed k can be turned into a string at all } v, exists := n.m[*k2] if !exists { - return nil, dms3ld.ErrNotExists{Segment: dms3ld.PathSegmentOfString(k2.String())} + return nil, ld.ErrNotExists{Segment: ld.PathSegmentOfString(k2.String())} } return v, nil } -func (Map__String__TypeName) LookupByIndex(idx int64) (dms3ld.Node, error) { +func (Map__String__TypeName) LookupByIndex(idx int64) (ld.Node, error) { return mixins.Map{TypeName: "schemadmt.Map__String__TypeName"}.LookupByIndex(0) } -func (n Map__String__TypeName) LookupBySegment(seg dms3ld.PathSegment) (dms3ld.Node, error) { +func (n Map__String__TypeName) LookupBySegment(seg ld.PathSegment) (ld.Node, error) { return n.LookupByString(seg.String()) } -func (n Map__String__TypeName) MapIterator() dms3ld.MapIterator { +func (n Map__String__TypeName) MapIterator() ld.MapIterator { return &_Map__String__TypeName__MapItr{n, 0} } @@ -13044,9 +13044,9 @@ type _Map__String__TypeName__MapItr struct { idx int } -func (itr *_Map__String__TypeName__MapItr) Next() (k dms3ld.Node, v dms3ld.Node, _ error) { +func (itr *_Map__String__TypeName__MapItr) Next() (k ld.Node, v ld.Node, _ error) { if itr.idx >= len(itr.n.t) { - return nil, nil, dms3ld.ErrIteratorOverread{} + return nil, nil, ld.ErrIteratorOverread{} } x := &itr.n.t[itr.idx] k = &x.k @@ -13058,7 +13058,7 @@ func (itr *_Map__String__TypeName__MapItr) Done() bool { return itr.idx >= len(itr.n.t) } -func (Map__String__TypeName) ListIterator() dms3ld.ListIterator { +func (Map__String__TypeName) ListIterator() ld.ListIterator { return nil } func (n Map__String__TypeName) Length() int64 { @@ -13085,16 +13085,16 @@ func (Map__String__TypeName) AsString() (string, error) { func (Map__String__TypeName) AsBytes() ([]byte, error) { return mixins.Map{TypeName: "schemadmt.Map__String__TypeName"}.AsBytes() } -func (Map__String__TypeName) AsLink() (dms3ld.Link, error) { +func (Map__String__TypeName) AsLink() (ld.Link, error) { return mixins.Map{TypeName: "schemadmt.Map__String__TypeName"}.AsLink() } -func (Map__String__TypeName) Prototype() dms3ld.NodePrototype { +func (Map__String__TypeName) Prototype() ld.NodePrototype { return _Map__String__TypeName__Prototype{} } type _Map__String__TypeName__Prototype struct{} -func (_Map__String__TypeName__Prototype) NewBuilder() dms3ld.NodeBuilder { +func (_Map__String__TypeName__Prototype) NewBuilder() ld.NodeBuilder { var nb _Map__String__TypeName__Builder nb.Reset() return &nb @@ -13104,7 +13104,7 @@ type _Map__String__TypeName__Builder struct { _Map__String__TypeName__Assembler } -func (nb *_Map__String__TypeName__Builder) Build() dms3ld.Node { +func (nb *_Map__String__TypeName__Builder) Build() ld.Node { if *nb.m != schema.Maybe_Value { panic("invalid state: cannot call Build on an assembler that's not finished") } @@ -13131,7 +13131,7 @@ func (na *_Map__String__TypeName__Assembler) reset() { na.ka.reset() na.va.reset() } -func (na *_Map__String__TypeName__Assembler) BeginMap(sizeHint int64) (dms3ld.MapAssembler, error) { +func (na *_Map__String__TypeName__Assembler) BeginMap(sizeHint int64) (ld.MapAssembler, error) { switch *na.m { case schema.Maybe_Value, schema.Maybe_Null: panic("invalid state: cannot assign into assembler that's already finished") @@ -13146,7 +13146,7 @@ func (na *_Map__String__TypeName__Assembler) BeginMap(sizeHint int64) (dms3ld.Ma na.w.t = make([]_Map__String__TypeName__entry, 0, sizeHint) return na, nil } -func (_Map__String__TypeName__Assembler) BeginList(sizeHint int64) (dms3ld.ListAssembler, error) { +func (_Map__String__TypeName__Assembler) BeginList(sizeHint int64) (ld.ListAssembler, error) { return mixins.MapAssembler{TypeName: "schemadmt.Map__String__TypeName"}.BeginList(0) } func (na *_Map__String__TypeName__Assembler) AssignNull() error { @@ -13178,10 +13178,10 @@ func (_Map__String__TypeName__Assembler) AssignString(string) error { func (_Map__String__TypeName__Assembler) AssignBytes([]byte) error { return mixins.MapAssembler{TypeName: "schemadmt.Map__String__TypeName"}.AssignBytes(nil) } -func (_Map__String__TypeName__Assembler) AssignLink(dms3ld.Link) error { +func (_Map__String__TypeName__Assembler) AssignLink(ld.Link) error { return mixins.MapAssembler{TypeName: "schemadmt.Map__String__TypeName"}.AssignLink(nil) } -func (na *_Map__String__TypeName__Assembler) AssignNode(v dms3ld.Node) error { +func (na *_Map__String__TypeName__Assembler) AssignNode(v ld.Node) error { if v.IsNull() { return na.AssignNull() } @@ -13196,8 +13196,8 @@ func (na *_Map__String__TypeName__Assembler) AssignNode(v dms3ld.Node) error { *na.m = schema.Maybe_Value return nil } - if v.Kind() != dms3ld.Kind_Map { - return dms3ld.ErrWrongKind{TypeName: "schemadmt.Map__String__TypeName", MethodName: "AssignNode", AppropriateKind: dms3ld.KindSet_JustMap, ActualKind: v.Kind()} + if v.Kind() != ld.Kind_Map { + return ld.ErrWrongKind{TypeName: "schemadmt.Map__String__TypeName", MethodName: "AssignNode", AppropriateKind: ld.KindSet_JustMap, ActualKind: v.Kind()} } itr := v.MapIterator() for !itr.Done() { @@ -13214,7 +13214,7 @@ func (na *_Map__String__TypeName__Assembler) AssignNode(v dms3ld.Node) error { } return na.Finish() } -func (_Map__String__TypeName__Assembler) Prototype() dms3ld.NodePrototype { +func (_Map__String__TypeName__Assembler) Prototype() ld.NodePrototype { return _Map__String__TypeName__Prototype{} } func (ma *_Map__String__TypeName__Assembler) keyFinishTidy() bool { @@ -13245,7 +13245,7 @@ func (ma *_Map__String__TypeName__Assembler) valueFinishTidy() bool { return false } } -func (ma *_Map__String__TypeName__Assembler) AssembleEntry(k string) (dms3ld.NodeAssembler, error) { +func (ma *_Map__String__TypeName__Assembler) AssembleEntry(k string) (ld.NodeAssembler, error) { switch ma.state { case maState_initial: // carry on @@ -13266,7 +13266,7 @@ func (ma *_Map__String__TypeName__Assembler) AssembleEntry(k string) (dms3ld.Nod return nil, err // TODO wrap in some kind of ErrInvalidKey } if _, exists := ma.w.m[k2]; exists { - return nil, dms3ld.ErrRepeatedMapKey{Key: &k2} + return nil, ld.ErrRepeatedMapKey{Key: &k2} } ma.w.t = append(ma.w.t, _Map__String__TypeName__entry{k: k2}) tz := &ma.w.t[len(ma.w.t)-1] @@ -13277,7 +13277,7 @@ func (ma *_Map__String__TypeName__Assembler) AssembleEntry(k string) (dms3ld.Nod ma.va.m = &ma.cm return &ma.va, nil } -func (ma *_Map__String__TypeName__Assembler) AssembleKey() dms3ld.NodeAssembler { +func (ma *_Map__String__TypeName__Assembler) AssembleKey() ld.NodeAssembler { switch ma.state { case maState_initial: // carry on @@ -13298,7 +13298,7 @@ func (ma *_Map__String__TypeName__Assembler) AssembleKey() dms3ld.NodeAssembler ma.ka.w = &ma.w.t[len(ma.w.t)-1].k return &ma.ka } -func (ma *_Map__String__TypeName__Assembler) AssembleValue() dms3ld.NodeAssembler { +func (ma *_Map__String__TypeName__Assembler) AssembleValue() ld.NodeAssembler { switch ma.state { case maState_initial: panic("invalid state: AssembleValue cannot be called when no key is primed") @@ -13335,55 +13335,55 @@ func (ma *_Map__String__TypeName__Assembler) Finish() error { *ma.m = schema.Maybe_Value return nil } -func (ma *_Map__String__TypeName__Assembler) KeyPrototype() dms3ld.NodePrototype { +func (ma *_Map__String__TypeName__Assembler) KeyPrototype() ld.NodePrototype { return _String__Prototype{} } -func (ma *_Map__String__TypeName__Assembler) ValuePrototype(_ string) dms3ld.NodePrototype { +func (ma *_Map__String__TypeName__Assembler) ValuePrototype(_ string) ld.NodePrototype { return _TypeName__Prototype{} } func (Map__String__TypeName) Type() schema.Type { return nil /*TODO:typelit*/ } -func (n Map__String__TypeName) Representation() dms3ld.Node { +func (n Map__String__TypeName) Representation() ld.Node { return (*_Map__String__TypeName__Repr)(n) } type _Map__String__TypeName__Repr _Map__String__TypeName -var _ dms3ld.Node = &_Map__String__TypeName__Repr{} +var _ ld.Node = &_Map__String__TypeName__Repr{} -func (_Map__String__TypeName__Repr) Kind() dms3ld.Kind { - return dms3ld.Kind_Map +func (_Map__String__TypeName__Repr) Kind() ld.Kind { + return ld.Kind_Map } -func (nr *_Map__String__TypeName__Repr) LookupByString(k string) (dms3ld.Node, error) { +func (nr *_Map__String__TypeName__Repr) LookupByString(k string) (ld.Node, error) { v, err := (Map__String__TypeName)(nr).LookupByString(k) - if err != nil || v == dms3ld.Null { + if err != nil || v == ld.Null { return v, err } return v.(TypeName).Representation(), nil } -func (nr *_Map__String__TypeName__Repr) LookupByNode(k dms3ld.Node) (dms3ld.Node, error) { +func (nr *_Map__String__TypeName__Repr) LookupByNode(k ld.Node) (ld.Node, error) { v, err := (Map__String__TypeName)(nr).LookupByNode(k) - if err != nil || v == dms3ld.Null { + if err != nil || v == ld.Null { return v, err } return v.(TypeName).Representation(), nil } -func (_Map__String__TypeName__Repr) LookupByIndex(idx int64) (dms3ld.Node, error) { +func (_Map__String__TypeName__Repr) LookupByIndex(idx int64) (ld.Node, error) { return mixins.Map{TypeName: "schemadmt.Map__String__TypeName.Repr"}.LookupByIndex(0) } -func (n _Map__String__TypeName__Repr) LookupBySegment(seg dms3ld.PathSegment) (dms3ld.Node, error) { +func (n _Map__String__TypeName__Repr) LookupBySegment(seg ld.PathSegment) (ld.Node, error) { return n.LookupByString(seg.String()) } -func (nr *_Map__String__TypeName__Repr) MapIterator() dms3ld.MapIterator { +func (nr *_Map__String__TypeName__Repr) MapIterator() ld.MapIterator { return &_Map__String__TypeName__ReprMapItr{(Map__String__TypeName)(nr), 0} } type _Map__String__TypeName__ReprMapItr _Map__String__TypeName__MapItr -func (itr *_Map__String__TypeName__ReprMapItr) Next() (k dms3ld.Node, v dms3ld.Node, err error) { +func (itr *_Map__String__TypeName__ReprMapItr) Next() (k ld.Node, v ld.Node, err error) { k, v, err = (*_Map__String__TypeName__MapItr)(itr).Next() - if err != nil || v == dms3ld.Null { + if err != nil || v == ld.Null { return } return k, v.(TypeName).Representation(), nil @@ -13392,7 +13392,7 @@ func (itr *_Map__String__TypeName__ReprMapItr) Done() bool { return (*_Map__String__TypeName__MapItr)(itr).Done() } -func (_Map__String__TypeName__Repr) ListIterator() dms3ld.ListIterator { +func (_Map__String__TypeName__Repr) ListIterator() ld.ListIterator { return nil } func (rn *_Map__String__TypeName__Repr) Length() int64 { @@ -13419,16 +13419,16 @@ func (_Map__String__TypeName__Repr) AsString() (string, error) { func (_Map__String__TypeName__Repr) AsBytes() ([]byte, error) { return mixins.Map{TypeName: "schemadmt.Map__String__TypeName.Repr"}.AsBytes() } -func (_Map__String__TypeName__Repr) AsLink() (dms3ld.Link, error) { +func (_Map__String__TypeName__Repr) AsLink() (ld.Link, error) { return mixins.Map{TypeName: "schemadmt.Map__String__TypeName.Repr"}.AsLink() } -func (_Map__String__TypeName__Repr) Prototype() dms3ld.NodePrototype { +func (_Map__String__TypeName__Repr) Prototype() ld.NodePrototype { return _Map__String__TypeName__ReprPrototype{} } type _Map__String__TypeName__ReprPrototype struct{} -func (_Map__String__TypeName__ReprPrototype) NewBuilder() dms3ld.NodeBuilder { +func (_Map__String__TypeName__ReprPrototype) NewBuilder() ld.NodeBuilder { var nb _Map__String__TypeName__ReprBuilder nb.Reset() return &nb @@ -13438,7 +13438,7 @@ type _Map__String__TypeName__ReprBuilder struct { _Map__String__TypeName__ReprAssembler } -func (nb *_Map__String__TypeName__ReprBuilder) Build() dms3ld.Node { +func (nb *_Map__String__TypeName__ReprBuilder) Build() ld.Node { if *nb.m != schema.Maybe_Value { panic("invalid state: cannot call Build on an assembler that's not finished") } @@ -13465,7 +13465,7 @@ func (na *_Map__String__TypeName__ReprAssembler) reset() { na.ka.reset() na.va.reset() } -func (na *_Map__String__TypeName__ReprAssembler) BeginMap(sizeHint int64) (dms3ld.MapAssembler, error) { +func (na *_Map__String__TypeName__ReprAssembler) BeginMap(sizeHint int64) (ld.MapAssembler, error) { switch *na.m { case schema.Maybe_Value, schema.Maybe_Null: panic("invalid state: cannot assign into assembler that's already finished") @@ -13480,7 +13480,7 @@ func (na *_Map__String__TypeName__ReprAssembler) BeginMap(sizeHint int64) (dms3l na.w.t = make([]_Map__String__TypeName__entry, 0, sizeHint) return na, nil } -func (_Map__String__TypeName__ReprAssembler) BeginList(sizeHint int64) (dms3ld.ListAssembler, error) { +func (_Map__String__TypeName__ReprAssembler) BeginList(sizeHint int64) (ld.ListAssembler, error) { return mixins.MapAssembler{TypeName: "schemadmt.Map__String__TypeName.Repr"}.BeginList(0) } func (na *_Map__String__TypeName__ReprAssembler) AssignNull() error { @@ -13512,10 +13512,10 @@ func (_Map__String__TypeName__ReprAssembler) AssignString(string) error { func (_Map__String__TypeName__ReprAssembler) AssignBytes([]byte) error { return mixins.MapAssembler{TypeName: "schemadmt.Map__String__TypeName.Repr"}.AssignBytes(nil) } -func (_Map__String__TypeName__ReprAssembler) AssignLink(dms3ld.Link) error { +func (_Map__String__TypeName__ReprAssembler) AssignLink(ld.Link) error { return mixins.MapAssembler{TypeName: "schemadmt.Map__String__TypeName.Repr"}.AssignLink(nil) } -func (na *_Map__String__TypeName__ReprAssembler) AssignNode(v dms3ld.Node) error { +func (na *_Map__String__TypeName__ReprAssembler) AssignNode(v ld.Node) error { if v.IsNull() { return na.AssignNull() } @@ -13530,8 +13530,8 @@ func (na *_Map__String__TypeName__ReprAssembler) AssignNode(v dms3ld.Node) error *na.m = schema.Maybe_Value return nil } - if v.Kind() != dms3ld.Kind_Map { - return dms3ld.ErrWrongKind{TypeName: "schemadmt.Map__String__TypeName.Repr", MethodName: "AssignNode", AppropriateKind: dms3ld.KindSet_JustMap, ActualKind: v.Kind()} + if v.Kind() != ld.Kind_Map { + return ld.ErrWrongKind{TypeName: "schemadmt.Map__String__TypeName.Repr", MethodName: "AssignNode", AppropriateKind: ld.KindSet_JustMap, ActualKind: v.Kind()} } itr := v.MapIterator() for !itr.Done() { @@ -13548,7 +13548,7 @@ func (na *_Map__String__TypeName__ReprAssembler) AssignNode(v dms3ld.Node) error } return na.Finish() } -func (_Map__String__TypeName__ReprAssembler) Prototype() dms3ld.NodePrototype { +func (_Map__String__TypeName__ReprAssembler) Prototype() ld.NodePrototype { return _Map__String__TypeName__ReprPrototype{} } func (ma *_Map__String__TypeName__ReprAssembler) keyFinishTidy() bool { @@ -13579,7 +13579,7 @@ func (ma *_Map__String__TypeName__ReprAssembler) valueFinishTidy() bool { return false } } -func (ma *_Map__String__TypeName__ReprAssembler) AssembleEntry(k string) (dms3ld.NodeAssembler, error) { +func (ma *_Map__String__TypeName__ReprAssembler) AssembleEntry(k string) (ld.NodeAssembler, error) { switch ma.state { case maState_initial: // carry on @@ -13600,7 +13600,7 @@ func (ma *_Map__String__TypeName__ReprAssembler) AssembleEntry(k string) (dms3ld return nil, err // TODO wrap in some kind of ErrInvalidKey } if _, exists := ma.w.m[k2]; exists { - return nil, dms3ld.ErrRepeatedMapKey{Key: &k2} + return nil, ld.ErrRepeatedMapKey{Key: &k2} } ma.w.t = append(ma.w.t, _Map__String__TypeName__entry{k: k2}) tz := &ma.w.t[len(ma.w.t)-1] @@ -13611,7 +13611,7 @@ func (ma *_Map__String__TypeName__ReprAssembler) AssembleEntry(k string) (dms3ld ma.va.m = &ma.cm return &ma.va, nil } -func (ma *_Map__String__TypeName__ReprAssembler) AssembleKey() dms3ld.NodeAssembler { +func (ma *_Map__String__TypeName__ReprAssembler) AssembleKey() ld.NodeAssembler { switch ma.state { case maState_initial: // carry on @@ -13632,7 +13632,7 @@ func (ma *_Map__String__TypeName__ReprAssembler) AssembleKey() dms3ld.NodeAssemb ma.ka.w = &ma.w.t[len(ma.w.t)-1].k return &ma.ka } -func (ma *_Map__String__TypeName__ReprAssembler) AssembleValue() dms3ld.NodeAssembler { +func (ma *_Map__String__TypeName__ReprAssembler) AssembleValue() ld.NodeAssembler { switch ma.state { case maState_initial: panic("invalid state: AssembleValue cannot be called when no key is primed") @@ -13669,10 +13669,10 @@ func (ma *_Map__String__TypeName__ReprAssembler) Finish() error { *ma.m = schema.Maybe_Value return nil } -func (ma *_Map__String__TypeName__ReprAssembler) KeyPrototype() dms3ld.NodePrototype { +func (ma *_Map__String__TypeName__ReprAssembler) KeyPrototype() ld.NodePrototype { return _String__ReprPrototype{} } -func (ma *_Map__String__TypeName__ReprAssembler) ValuePrototype(_ string) dms3ld.NodePrototype { +func (ma *_Map__String__TypeName__ReprAssembler) ValuePrototype(_ string) ld.NodePrototype { return _TypeName__ReprPrototype{} } @@ -13734,12 +13734,12 @@ func (m MaybeMap__TypeName__Int) IsAbsent() bool { func (m MaybeMap__TypeName__Int) Exists() bool { return m.m == schema.Maybe_Value } -func (m MaybeMap__TypeName__Int) AsNode() dms3ld.Node { +func (m MaybeMap__TypeName__Int) AsNode() ld.Node { switch m.m { case schema.Maybe_Absent: - return dms3ld.Absent + return ld.Absent case schema.Maybe_Null: - return dms3ld.Null + return ld.Null case schema.Maybe_Value: return &m.v default: @@ -13753,42 +13753,42 @@ func (m MaybeMap__TypeName__Int) Must() Map__TypeName__Int { return &m.v } -var _ dms3ld.Node = (Map__TypeName__Int)(&_Map__TypeName__Int{}) +var _ ld.Node = (Map__TypeName__Int)(&_Map__TypeName__Int{}) var _ schema.TypedNode = (Map__TypeName__Int)(&_Map__TypeName__Int{}) -func (Map__TypeName__Int) Kind() dms3ld.Kind { - return dms3ld.Kind_Map +func (Map__TypeName__Int) Kind() ld.Kind { + return ld.Kind_Map } -func (n Map__TypeName__Int) LookupByString(k string) (dms3ld.Node, error) { +func (n Map__TypeName__Int) LookupByString(k string) (ld.Node, error) { var k2 _String if err := (_String__Prototype{}).fromString(&k2, k); err != nil { return nil, err // TODO wrap in some kind of ErrInvalidKey } v, exists := n.m[k2] if !exists { - return nil, dms3ld.ErrNotExists{Segment: dms3ld.PathSegmentOfString(k)} + return nil, ld.ErrNotExists{Segment: ld.PathSegmentOfString(k)} } return v, nil } -func (n Map__TypeName__Int) LookupByNode(k dms3ld.Node) (dms3ld.Node, error) { +func (n Map__TypeName__Int) LookupByNode(k ld.Node) (ld.Node, error) { k2, ok := k.(String) if !ok { panic("todo invalid key type error") - // 'dms3ld.ErrInvalidKey{TypeName:"schemadmt.Map__TypeName__Int", Key:&_String{k}}' doesn't quite cut it: need room to explain the type, and it's not guaranteed k can be turned into a string at all + // 'ld.ErrInvalidKey{TypeName:"schemadmt.Map__TypeName__Int", Key:&_String{k}}' doesn't quite cut it: need room to explain the type, and it's not guaranteed k can be turned into a string at all } v, exists := n.m[*k2] if !exists { - return nil, dms3ld.ErrNotExists{Segment: dms3ld.PathSegmentOfString(k2.String())} + return nil, ld.ErrNotExists{Segment: ld.PathSegmentOfString(k2.String())} } return v, nil } -func (Map__TypeName__Int) LookupByIndex(idx int64) (dms3ld.Node, error) { +func (Map__TypeName__Int) LookupByIndex(idx int64) (ld.Node, error) { return mixins.Map{TypeName: "schemadmt.Map__TypeName__Int"}.LookupByIndex(0) } -func (n Map__TypeName__Int) LookupBySegment(seg dms3ld.PathSegment) (dms3ld.Node, error) { +func (n Map__TypeName__Int) LookupBySegment(seg ld.PathSegment) (ld.Node, error) { return n.LookupByString(seg.String()) } -func (n Map__TypeName__Int) MapIterator() dms3ld.MapIterator { +func (n Map__TypeName__Int) MapIterator() ld.MapIterator { return &_Map__TypeName__Int__MapItr{n, 0} } @@ -13797,9 +13797,9 @@ type _Map__TypeName__Int__MapItr struct { idx int } -func (itr *_Map__TypeName__Int__MapItr) Next() (k dms3ld.Node, v dms3ld.Node, _ error) { +func (itr *_Map__TypeName__Int__MapItr) Next() (k ld.Node, v ld.Node, _ error) { if itr.idx >= len(itr.n.t) { - return nil, nil, dms3ld.ErrIteratorOverread{} + return nil, nil, ld.ErrIteratorOverread{} } x := &itr.n.t[itr.idx] k = &x.k @@ -13811,7 +13811,7 @@ func (itr *_Map__TypeName__Int__MapItr) Done() bool { return itr.idx >= len(itr.n.t) } -func (Map__TypeName__Int) ListIterator() dms3ld.ListIterator { +func (Map__TypeName__Int) ListIterator() ld.ListIterator { return nil } func (n Map__TypeName__Int) Length() int64 { @@ -13838,16 +13838,16 @@ func (Map__TypeName__Int) AsString() (string, error) { func (Map__TypeName__Int) AsBytes() ([]byte, error) { return mixins.Map{TypeName: "schemadmt.Map__TypeName__Int"}.AsBytes() } -func (Map__TypeName__Int) AsLink() (dms3ld.Link, error) { +func (Map__TypeName__Int) AsLink() (ld.Link, error) { return mixins.Map{TypeName: "schemadmt.Map__TypeName__Int"}.AsLink() } -func (Map__TypeName__Int) Prototype() dms3ld.NodePrototype { +func (Map__TypeName__Int) Prototype() ld.NodePrototype { return _Map__TypeName__Int__Prototype{} } type _Map__TypeName__Int__Prototype struct{} -func (_Map__TypeName__Int__Prototype) NewBuilder() dms3ld.NodeBuilder { +func (_Map__TypeName__Int__Prototype) NewBuilder() ld.NodeBuilder { var nb _Map__TypeName__Int__Builder nb.Reset() return &nb @@ -13857,7 +13857,7 @@ type _Map__TypeName__Int__Builder struct { _Map__TypeName__Int__Assembler } -func (nb *_Map__TypeName__Int__Builder) Build() dms3ld.Node { +func (nb *_Map__TypeName__Int__Builder) Build() ld.Node { if *nb.m != schema.Maybe_Value { panic("invalid state: cannot call Build on an assembler that's not finished") } @@ -13884,7 +13884,7 @@ func (na *_Map__TypeName__Int__Assembler) reset() { na.ka.reset() na.va.reset() } -func (na *_Map__TypeName__Int__Assembler) BeginMap(sizeHint int64) (dms3ld.MapAssembler, error) { +func (na *_Map__TypeName__Int__Assembler) BeginMap(sizeHint int64) (ld.MapAssembler, error) { switch *na.m { case schema.Maybe_Value, schema.Maybe_Null: panic("invalid state: cannot assign into assembler that's already finished") @@ -13899,7 +13899,7 @@ func (na *_Map__TypeName__Int__Assembler) BeginMap(sizeHint int64) (dms3ld.MapAs na.w.t = make([]_Map__TypeName__Int__entry, 0, sizeHint) return na, nil } -func (_Map__TypeName__Int__Assembler) BeginList(sizeHint int64) (dms3ld.ListAssembler, error) { +func (_Map__TypeName__Int__Assembler) BeginList(sizeHint int64) (ld.ListAssembler, error) { return mixins.MapAssembler{TypeName: "schemadmt.Map__TypeName__Int"}.BeginList(0) } func (na *_Map__TypeName__Int__Assembler) AssignNull() error { @@ -13931,10 +13931,10 @@ func (_Map__TypeName__Int__Assembler) AssignString(string) error { func (_Map__TypeName__Int__Assembler) AssignBytes([]byte) error { return mixins.MapAssembler{TypeName: "schemadmt.Map__TypeName__Int"}.AssignBytes(nil) } -func (_Map__TypeName__Int__Assembler) AssignLink(dms3ld.Link) error { +func (_Map__TypeName__Int__Assembler) AssignLink(ld.Link) error { return mixins.MapAssembler{TypeName: "schemadmt.Map__TypeName__Int"}.AssignLink(nil) } -func (na *_Map__TypeName__Int__Assembler) AssignNode(v dms3ld.Node) error { +func (na *_Map__TypeName__Int__Assembler) AssignNode(v ld.Node) error { if v.IsNull() { return na.AssignNull() } @@ -13949,8 +13949,8 @@ func (na *_Map__TypeName__Int__Assembler) AssignNode(v dms3ld.Node) error { *na.m = schema.Maybe_Value return nil } - if v.Kind() != dms3ld.Kind_Map { - return dms3ld.ErrWrongKind{TypeName: "schemadmt.Map__TypeName__Int", MethodName: "AssignNode", AppropriateKind: dms3ld.KindSet_JustMap, ActualKind: v.Kind()} + if v.Kind() != ld.Kind_Map { + return ld.ErrWrongKind{TypeName: "schemadmt.Map__TypeName__Int", MethodName: "AssignNode", AppropriateKind: ld.KindSet_JustMap, ActualKind: v.Kind()} } itr := v.MapIterator() for !itr.Done() { @@ -13967,7 +13967,7 @@ func (na *_Map__TypeName__Int__Assembler) AssignNode(v dms3ld.Node) error { } return na.Finish() } -func (_Map__TypeName__Int__Assembler) Prototype() dms3ld.NodePrototype { +func (_Map__TypeName__Int__Assembler) Prototype() ld.NodePrototype { return _Map__TypeName__Int__Prototype{} } func (ma *_Map__TypeName__Int__Assembler) keyFinishTidy() bool { @@ -13998,7 +13998,7 @@ func (ma *_Map__TypeName__Int__Assembler) valueFinishTidy() bool { return false } } -func (ma *_Map__TypeName__Int__Assembler) AssembleEntry(k string) (dms3ld.NodeAssembler, error) { +func (ma *_Map__TypeName__Int__Assembler) AssembleEntry(k string) (ld.NodeAssembler, error) { switch ma.state { case maState_initial: // carry on @@ -14019,7 +14019,7 @@ func (ma *_Map__TypeName__Int__Assembler) AssembleEntry(k string) (dms3ld.NodeAs return nil, err // TODO wrap in some kind of ErrInvalidKey } if _, exists := ma.w.m[k2]; exists { - return nil, dms3ld.ErrRepeatedMapKey{Key: &k2} + return nil, ld.ErrRepeatedMapKey{Key: &k2} } ma.w.t = append(ma.w.t, _Map__TypeName__Int__entry{k: k2}) tz := &ma.w.t[len(ma.w.t)-1] @@ -14030,7 +14030,7 @@ func (ma *_Map__TypeName__Int__Assembler) AssembleEntry(k string) (dms3ld.NodeAs ma.va.m = &ma.cm return &ma.va, nil } -func (ma *_Map__TypeName__Int__Assembler) AssembleKey() dms3ld.NodeAssembler { +func (ma *_Map__TypeName__Int__Assembler) AssembleKey() ld.NodeAssembler { switch ma.state { case maState_initial: // carry on @@ -14051,7 +14051,7 @@ func (ma *_Map__TypeName__Int__Assembler) AssembleKey() dms3ld.NodeAssembler { ma.ka.w = &ma.w.t[len(ma.w.t)-1].k return &ma.ka } -func (ma *_Map__TypeName__Int__Assembler) AssembleValue() dms3ld.NodeAssembler { +func (ma *_Map__TypeName__Int__Assembler) AssembleValue() ld.NodeAssembler { switch ma.state { case maState_initial: panic("invalid state: AssembleValue cannot be called when no key is primed") @@ -14088,55 +14088,55 @@ func (ma *_Map__TypeName__Int__Assembler) Finish() error { *ma.m = schema.Maybe_Value return nil } -func (ma *_Map__TypeName__Int__Assembler) KeyPrototype() dms3ld.NodePrototype { +func (ma *_Map__TypeName__Int__Assembler) KeyPrototype() ld.NodePrototype { return _String__Prototype{} } -func (ma *_Map__TypeName__Int__Assembler) ValuePrototype(_ string) dms3ld.NodePrototype { +func (ma *_Map__TypeName__Int__Assembler) ValuePrototype(_ string) ld.NodePrototype { return _Int__Prototype{} } func (Map__TypeName__Int) Type() schema.Type { return nil /*TODO:typelit*/ } -func (n Map__TypeName__Int) Representation() dms3ld.Node { +func (n Map__TypeName__Int) Representation() ld.Node { return (*_Map__TypeName__Int__Repr)(n) } type _Map__TypeName__Int__Repr _Map__TypeName__Int -var _ dms3ld.Node = &_Map__TypeName__Int__Repr{} +var _ ld.Node = &_Map__TypeName__Int__Repr{} -func (_Map__TypeName__Int__Repr) Kind() dms3ld.Kind { - return dms3ld.Kind_Map +func (_Map__TypeName__Int__Repr) Kind() ld.Kind { + return ld.Kind_Map } -func (nr *_Map__TypeName__Int__Repr) LookupByString(k string) (dms3ld.Node, error) { +func (nr *_Map__TypeName__Int__Repr) LookupByString(k string) (ld.Node, error) { v, err := (Map__TypeName__Int)(nr).LookupByString(k) - if err != nil || v == dms3ld.Null { + if err != nil || v == ld.Null { return v, err } return v.(Int).Representation(), nil } -func (nr *_Map__TypeName__Int__Repr) LookupByNode(k dms3ld.Node) (dms3ld.Node, error) { +func (nr *_Map__TypeName__Int__Repr) LookupByNode(k ld.Node) (ld.Node, error) { v, err := (Map__TypeName__Int)(nr).LookupByNode(k) - if err != nil || v == dms3ld.Null { + if err != nil || v == ld.Null { return v, err } return v.(Int).Representation(), nil } -func (_Map__TypeName__Int__Repr) LookupByIndex(idx int64) (dms3ld.Node, error) { +func (_Map__TypeName__Int__Repr) LookupByIndex(idx int64) (ld.Node, error) { return mixins.Map{TypeName: "schemadmt.Map__TypeName__Int.Repr"}.LookupByIndex(0) } -func (n _Map__TypeName__Int__Repr) LookupBySegment(seg dms3ld.PathSegment) (dms3ld.Node, error) { +func (n _Map__TypeName__Int__Repr) LookupBySegment(seg ld.PathSegment) (ld.Node, error) { return n.LookupByString(seg.String()) } -func (nr *_Map__TypeName__Int__Repr) MapIterator() dms3ld.MapIterator { +func (nr *_Map__TypeName__Int__Repr) MapIterator() ld.MapIterator { return &_Map__TypeName__Int__ReprMapItr{(Map__TypeName__Int)(nr), 0} } type _Map__TypeName__Int__ReprMapItr _Map__TypeName__Int__MapItr -func (itr *_Map__TypeName__Int__ReprMapItr) Next() (k dms3ld.Node, v dms3ld.Node, err error) { +func (itr *_Map__TypeName__Int__ReprMapItr) Next() (k ld.Node, v ld.Node, err error) { k, v, err = (*_Map__TypeName__Int__MapItr)(itr).Next() - if err != nil || v == dms3ld.Null { + if err != nil || v == ld.Null { return } return k, v.(Int).Representation(), nil @@ -14145,7 +14145,7 @@ func (itr *_Map__TypeName__Int__ReprMapItr) Done() bool { return (*_Map__TypeName__Int__MapItr)(itr).Done() } -func (_Map__TypeName__Int__Repr) ListIterator() dms3ld.ListIterator { +func (_Map__TypeName__Int__Repr) ListIterator() ld.ListIterator { return nil } func (rn *_Map__TypeName__Int__Repr) Length() int64 { @@ -14172,16 +14172,16 @@ func (_Map__TypeName__Int__Repr) AsString() (string, error) { func (_Map__TypeName__Int__Repr) AsBytes() ([]byte, error) { return mixins.Map{TypeName: "schemadmt.Map__TypeName__Int.Repr"}.AsBytes() } -func (_Map__TypeName__Int__Repr) AsLink() (dms3ld.Link, error) { +func (_Map__TypeName__Int__Repr) AsLink() (ld.Link, error) { return mixins.Map{TypeName: "schemadmt.Map__TypeName__Int.Repr"}.AsLink() } -func (_Map__TypeName__Int__Repr) Prototype() dms3ld.NodePrototype { +func (_Map__TypeName__Int__Repr) Prototype() ld.NodePrototype { return _Map__TypeName__Int__ReprPrototype{} } type _Map__TypeName__Int__ReprPrototype struct{} -func (_Map__TypeName__Int__ReprPrototype) NewBuilder() dms3ld.NodeBuilder { +func (_Map__TypeName__Int__ReprPrototype) NewBuilder() ld.NodeBuilder { var nb _Map__TypeName__Int__ReprBuilder nb.Reset() return &nb @@ -14191,7 +14191,7 @@ type _Map__TypeName__Int__ReprBuilder struct { _Map__TypeName__Int__ReprAssembler } -func (nb *_Map__TypeName__Int__ReprBuilder) Build() dms3ld.Node { +func (nb *_Map__TypeName__Int__ReprBuilder) Build() ld.Node { if *nb.m != schema.Maybe_Value { panic("invalid state: cannot call Build on an assembler that's not finished") } @@ -14218,7 +14218,7 @@ func (na *_Map__TypeName__Int__ReprAssembler) reset() { na.ka.reset() na.va.reset() } -func (na *_Map__TypeName__Int__ReprAssembler) BeginMap(sizeHint int64) (dms3ld.MapAssembler, error) { +func (na *_Map__TypeName__Int__ReprAssembler) BeginMap(sizeHint int64) (ld.MapAssembler, error) { switch *na.m { case schema.Maybe_Value, schema.Maybe_Null: panic("invalid state: cannot assign into assembler that's already finished") @@ -14233,7 +14233,7 @@ func (na *_Map__TypeName__Int__ReprAssembler) BeginMap(sizeHint int64) (dms3ld.M na.w.t = make([]_Map__TypeName__Int__entry, 0, sizeHint) return na, nil } -func (_Map__TypeName__Int__ReprAssembler) BeginList(sizeHint int64) (dms3ld.ListAssembler, error) { +func (_Map__TypeName__Int__ReprAssembler) BeginList(sizeHint int64) (ld.ListAssembler, error) { return mixins.MapAssembler{TypeName: "schemadmt.Map__TypeName__Int.Repr"}.BeginList(0) } func (na *_Map__TypeName__Int__ReprAssembler) AssignNull() error { @@ -14265,10 +14265,10 @@ func (_Map__TypeName__Int__ReprAssembler) AssignString(string) error { func (_Map__TypeName__Int__ReprAssembler) AssignBytes([]byte) error { return mixins.MapAssembler{TypeName: "schemadmt.Map__TypeName__Int.Repr"}.AssignBytes(nil) } -func (_Map__TypeName__Int__ReprAssembler) AssignLink(dms3ld.Link) error { +func (_Map__TypeName__Int__ReprAssembler) AssignLink(ld.Link) error { return mixins.MapAssembler{TypeName: "schemadmt.Map__TypeName__Int.Repr"}.AssignLink(nil) } -func (na *_Map__TypeName__Int__ReprAssembler) AssignNode(v dms3ld.Node) error { +func (na *_Map__TypeName__Int__ReprAssembler) AssignNode(v ld.Node) error { if v.IsNull() { return na.AssignNull() } @@ -14283,8 +14283,8 @@ func (na *_Map__TypeName__Int__ReprAssembler) AssignNode(v dms3ld.Node) error { *na.m = schema.Maybe_Value return nil } - if v.Kind() != dms3ld.Kind_Map { - return dms3ld.ErrWrongKind{TypeName: "schemadmt.Map__TypeName__Int.Repr", MethodName: "AssignNode", AppropriateKind: dms3ld.KindSet_JustMap, ActualKind: v.Kind()} + if v.Kind() != ld.Kind_Map { + return ld.ErrWrongKind{TypeName: "schemadmt.Map__TypeName__Int.Repr", MethodName: "AssignNode", AppropriateKind: ld.KindSet_JustMap, ActualKind: v.Kind()} } itr := v.MapIterator() for !itr.Done() { @@ -14301,7 +14301,7 @@ func (na *_Map__TypeName__Int__ReprAssembler) AssignNode(v dms3ld.Node) error { } return na.Finish() } -func (_Map__TypeName__Int__ReprAssembler) Prototype() dms3ld.NodePrototype { +func (_Map__TypeName__Int__ReprAssembler) Prototype() ld.NodePrototype { return _Map__TypeName__Int__ReprPrototype{} } func (ma *_Map__TypeName__Int__ReprAssembler) keyFinishTidy() bool { @@ -14332,7 +14332,7 @@ func (ma *_Map__TypeName__Int__ReprAssembler) valueFinishTidy() bool { return false } } -func (ma *_Map__TypeName__Int__ReprAssembler) AssembleEntry(k string) (dms3ld.NodeAssembler, error) { +func (ma *_Map__TypeName__Int__ReprAssembler) AssembleEntry(k string) (ld.NodeAssembler, error) { switch ma.state { case maState_initial: // carry on @@ -14353,7 +14353,7 @@ func (ma *_Map__TypeName__Int__ReprAssembler) AssembleEntry(k string) (dms3ld.No return nil, err // TODO wrap in some kind of ErrInvalidKey } if _, exists := ma.w.m[k2]; exists { - return nil, dms3ld.ErrRepeatedMapKey{Key: &k2} + return nil, ld.ErrRepeatedMapKey{Key: &k2} } ma.w.t = append(ma.w.t, _Map__TypeName__Int__entry{k: k2}) tz := &ma.w.t[len(ma.w.t)-1] @@ -14364,7 +14364,7 @@ func (ma *_Map__TypeName__Int__ReprAssembler) AssembleEntry(k string) (dms3ld.No ma.va.m = &ma.cm return &ma.va, nil } -func (ma *_Map__TypeName__Int__ReprAssembler) AssembleKey() dms3ld.NodeAssembler { +func (ma *_Map__TypeName__Int__ReprAssembler) AssembleKey() ld.NodeAssembler { switch ma.state { case maState_initial: // carry on @@ -14385,7 +14385,7 @@ func (ma *_Map__TypeName__Int__ReprAssembler) AssembleKey() dms3ld.NodeAssembler ma.ka.w = &ma.w.t[len(ma.w.t)-1].k return &ma.ka } -func (ma *_Map__TypeName__Int__ReprAssembler) AssembleValue() dms3ld.NodeAssembler { +func (ma *_Map__TypeName__Int__ReprAssembler) AssembleValue() ld.NodeAssembler { switch ma.state { case maState_initial: panic("invalid state: AssembleValue cannot be called when no key is primed") @@ -14422,10 +14422,10 @@ func (ma *_Map__TypeName__Int__ReprAssembler) Finish() error { *ma.m = schema.Maybe_Value return nil } -func (ma *_Map__TypeName__Int__ReprAssembler) KeyPrototype() dms3ld.NodePrototype { +func (ma *_Map__TypeName__Int__ReprAssembler) KeyPrototype() ld.NodePrototype { return _String__ReprPrototype{} } -func (ma *_Map__TypeName__Int__ReprAssembler) ValuePrototype(_ string) dms3ld.NodePrototype { +func (ma *_Map__TypeName__Int__ReprAssembler) ValuePrototype(_ string) ld.NodePrototype { return _Int__ReprPrototype{} } @@ -14456,12 +14456,12 @@ func (m MaybeRepresentationKind) IsAbsent() bool { func (m MaybeRepresentationKind) Exists() bool { return m.m == schema.Maybe_Value } -func (m MaybeRepresentationKind) AsNode() dms3ld.Node { +func (m MaybeRepresentationKind) AsNode() ld.Node { switch m.m { case schema.Maybe_Absent: - return dms3ld.Absent + return ld.Absent case schema.Maybe_Null: - return dms3ld.Null + return ld.Null case schema.Maybe_Value: return &m.v default: @@ -14475,28 +14475,28 @@ func (m MaybeRepresentationKind) Must() RepresentationKind { return &m.v } -var _ dms3ld.Node = (RepresentationKind)(&_RepresentationKind{}) +var _ ld.Node = (RepresentationKind)(&_RepresentationKind{}) var _ schema.TypedNode = (RepresentationKind)(&_RepresentationKind{}) -func (RepresentationKind) Kind() dms3ld.Kind { - return dms3ld.Kind_String +func (RepresentationKind) Kind() ld.Kind { + return ld.Kind_String } -func (RepresentationKind) LookupByString(string) (dms3ld.Node, error) { +func (RepresentationKind) LookupByString(string) (ld.Node, error) { return mixins.String{TypeName: "schemadmt.RepresentationKind"}.LookupByString("") } -func (RepresentationKind) LookupByNode(dms3ld.Node) (dms3ld.Node, error) { +func (RepresentationKind) LookupByNode(ld.Node) (ld.Node, error) { return mixins.String{TypeName: "schemadmt.RepresentationKind"}.LookupByNode(nil) } -func (RepresentationKind) LookupByIndex(idx int64) (dms3ld.Node, error) { +func (RepresentationKind) LookupByIndex(idx int64) (ld.Node, error) { return mixins.String{TypeName: "schemadmt.RepresentationKind"}.LookupByIndex(0) } -func (RepresentationKind) LookupBySegment(seg dms3ld.PathSegment) (dms3ld.Node, error) { +func (RepresentationKind) LookupBySegment(seg ld.PathSegment) (ld.Node, error) { return mixins.String{TypeName: "schemadmt.RepresentationKind"}.LookupBySegment(seg) } -func (RepresentationKind) MapIterator() dms3ld.MapIterator { +func (RepresentationKind) MapIterator() ld.MapIterator { return nil } -func (RepresentationKind) ListIterator() dms3ld.ListIterator { +func (RepresentationKind) ListIterator() ld.ListIterator { return nil } func (RepresentationKind) Length() int64 { @@ -14523,16 +14523,16 @@ func (n RepresentationKind) AsString() (string, error) { func (RepresentationKind) AsBytes() ([]byte, error) { return mixins.String{TypeName: "schemadmt.RepresentationKind"}.AsBytes() } -func (RepresentationKind) AsLink() (dms3ld.Link, error) { +func (RepresentationKind) AsLink() (ld.Link, error) { return mixins.String{TypeName: "schemadmt.RepresentationKind"}.AsLink() } -func (RepresentationKind) Prototype() dms3ld.NodePrototype { +func (RepresentationKind) Prototype() ld.NodePrototype { return _RepresentationKind__Prototype{} } type _RepresentationKind__Prototype struct{} -func (_RepresentationKind__Prototype) NewBuilder() dms3ld.NodeBuilder { +func (_RepresentationKind__Prototype) NewBuilder() ld.NodeBuilder { var nb _RepresentationKind__Builder nb.Reset() return &nb @@ -14542,7 +14542,7 @@ type _RepresentationKind__Builder struct { _RepresentationKind__Assembler } -func (nb *_RepresentationKind__Builder) Build() dms3ld.Node { +func (nb *_RepresentationKind__Builder) Build() ld.Node { if *nb.m != schema.Maybe_Value { panic("invalid state: cannot call Build on an assembler that's not finished") } @@ -14560,10 +14560,10 @@ type _RepresentationKind__Assembler struct { } func (na *_RepresentationKind__Assembler) reset() {} -func (_RepresentationKind__Assembler) BeginMap(sizeHint int64) (dms3ld.MapAssembler, error) { +func (_RepresentationKind__Assembler) BeginMap(sizeHint int64) (ld.MapAssembler, error) { return mixins.StringAssembler{TypeName: "schemadmt.RepresentationKind"}.BeginMap(0) } -func (_RepresentationKind__Assembler) BeginList(sizeHint int64) (dms3ld.ListAssembler, error) { +func (_RepresentationKind__Assembler) BeginList(sizeHint int64) (ld.ListAssembler, error) { return mixins.StringAssembler{TypeName: "schemadmt.RepresentationKind"}.BeginList(0) } func (na *_RepresentationKind__Assembler) AssignNull() error { @@ -14599,10 +14599,10 @@ func (na *_RepresentationKind__Assembler) AssignString(v string) error { func (_RepresentationKind__Assembler) AssignBytes([]byte) error { return mixins.StringAssembler{TypeName: "schemadmt.RepresentationKind"}.AssignBytes(nil) } -func (_RepresentationKind__Assembler) AssignLink(dms3ld.Link) error { +func (_RepresentationKind__Assembler) AssignLink(ld.Link) error { return mixins.StringAssembler{TypeName: "schemadmt.RepresentationKind"}.AssignLink(nil) } -func (na *_RepresentationKind__Assembler) AssignNode(v dms3ld.Node) error { +func (na *_RepresentationKind__Assembler) AssignNode(v ld.Node) error { if v.IsNull() { return na.AssignNull() } @@ -14621,19 +14621,19 @@ func (na *_RepresentationKind__Assembler) AssignNode(v dms3ld.Node) error { return na.AssignString(v2) } } -func (_RepresentationKind__Assembler) Prototype() dms3ld.NodePrototype { +func (_RepresentationKind__Assembler) Prototype() ld.NodePrototype { return _RepresentationKind__Prototype{} } func (RepresentationKind) Type() schema.Type { return nil /*TODO:typelit*/ } -func (n RepresentationKind) Representation() dms3ld.Node { +func (n RepresentationKind) Representation() ld.Node { return (*_RepresentationKind__Repr)(n) } type _RepresentationKind__Repr = _RepresentationKind -var _ dms3ld.Node = &_RepresentationKind__Repr{} +var _ ld.Node = &_RepresentationKind__Repr{} type _RepresentationKind__ReprPrototype = _RepresentationKind__Prototype type _RepresentationKind__ReprAssembler = _RepresentationKind__Assembler @@ -14657,12 +14657,12 @@ func (m MaybeSchema) IsAbsent() bool { func (m MaybeSchema) Exists() bool { return m.m == schema.Maybe_Value } -func (m MaybeSchema) AsNode() dms3ld.Node { +func (m MaybeSchema) AsNode() ld.Node { switch m.m { case schema.Maybe_Absent: - return dms3ld.Absent + return ld.Absent case schema.Maybe_Null: - return dms3ld.Null + return ld.Null case schema.Maybe_Value: return m.v default: @@ -14679,34 +14679,34 @@ func (m MaybeSchema) Must() Schema { var ( fieldName__Schema_Types = _String{"types"} ) -var _ dms3ld.Node = (Schema)(&_Schema{}) +var _ ld.Node = (Schema)(&_Schema{}) var _ schema.TypedNode = (Schema)(&_Schema{}) -func (Schema) Kind() dms3ld.Kind { - return dms3ld.Kind_Map +func (Schema) Kind() ld.Kind { + return ld.Kind_Map } -func (n Schema) LookupByString(key string) (dms3ld.Node, error) { +func (n Schema) LookupByString(key string) (ld.Node, error) { switch key { case "types": return &n.types, nil default: - return nil, schema.ErrNoSuchField{Type: nil /*TODO*/, Field: dms3ld.PathSegmentOfString(key)} + return nil, schema.ErrNoSuchField{Type: nil /*TODO*/, Field: ld.PathSegmentOfString(key)} } } -func (n Schema) LookupByNode(key dms3ld.Node) (dms3ld.Node, error) { +func (n Schema) LookupByNode(key ld.Node) (ld.Node, error) { ks, err := key.AsString() if err != nil { return nil, err } return n.LookupByString(ks) } -func (Schema) LookupByIndex(idx int64) (dms3ld.Node, error) { +func (Schema) LookupByIndex(idx int64) (ld.Node, error) { return mixins.Map{TypeName: "schemadmt.Schema"}.LookupByIndex(0) } -func (n Schema) LookupBySegment(seg dms3ld.PathSegment) (dms3ld.Node, error) { +func (n Schema) LookupBySegment(seg ld.PathSegment) (ld.Node, error) { return n.LookupByString(seg.String()) } -func (n Schema) MapIterator() dms3ld.MapIterator { +func (n Schema) MapIterator() ld.MapIterator { return &_Schema__MapItr{n, 0} } @@ -14715,9 +14715,9 @@ type _Schema__MapItr struct { idx int } -func (itr *_Schema__MapItr) Next() (k dms3ld.Node, v dms3ld.Node, _ error) { +func (itr *_Schema__MapItr) Next() (k ld.Node, v ld.Node, _ error) { if itr.idx >= 1 { - return nil, nil, dms3ld.ErrIteratorOverread{} + return nil, nil, ld.ErrIteratorOverread{} } switch itr.idx { case 0: @@ -14733,7 +14733,7 @@ func (itr *_Schema__MapItr) Done() bool { return itr.idx >= 1 } -func (Schema) ListIterator() dms3ld.ListIterator { +func (Schema) ListIterator() ld.ListIterator { return nil } func (Schema) Length() int64 { @@ -14760,16 +14760,16 @@ func (Schema) AsString() (string, error) { func (Schema) AsBytes() ([]byte, error) { return mixins.Map{TypeName: "schemadmt.Schema"}.AsBytes() } -func (Schema) AsLink() (dms3ld.Link, error) { +func (Schema) AsLink() (ld.Link, error) { return mixins.Map{TypeName: "schemadmt.Schema"}.AsLink() } -func (Schema) Prototype() dms3ld.NodePrototype { +func (Schema) Prototype() ld.NodePrototype { return _Schema__Prototype{} } type _Schema__Prototype struct{} -func (_Schema__Prototype) NewBuilder() dms3ld.NodeBuilder { +func (_Schema__Prototype) NewBuilder() ld.NodeBuilder { var nb _Schema__Builder nb.Reset() return &nb @@ -14779,7 +14779,7 @@ type _Schema__Builder struct { _Schema__Assembler } -func (nb *_Schema__Builder) Build() dms3ld.Node { +func (nb *_Schema__Builder) Build() ld.Node { if *nb.m != schema.Maybe_Value { panic("invalid state: cannot call Build on an assembler that's not finished") } @@ -14813,7 +14813,7 @@ var ( fieldBits__Schema_sufficient = 0 + 1<<0 ) -func (na *_Schema__Assembler) BeginMap(int64) (dms3ld.MapAssembler, error) { +func (na *_Schema__Assembler) BeginMap(int64) (ld.MapAssembler, error) { switch *na.m { case schema.Maybe_Value, schema.Maybe_Null: panic("invalid state: cannot assign into assembler that's already finished") @@ -14826,7 +14826,7 @@ func (na *_Schema__Assembler) BeginMap(int64) (dms3ld.MapAssembler, error) { } return na, nil } -func (_Schema__Assembler) BeginList(sizeHint int64) (dms3ld.ListAssembler, error) { +func (_Schema__Assembler) BeginList(sizeHint int64) (ld.ListAssembler, error) { return mixins.MapAssembler{TypeName: "schemadmt.Schema"}.BeginList(0) } func (na *_Schema__Assembler) AssignNull() error { @@ -14858,10 +14858,10 @@ func (_Schema__Assembler) AssignString(string) error { func (_Schema__Assembler) AssignBytes([]byte) error { return mixins.MapAssembler{TypeName: "schemadmt.Schema"}.AssignBytes(nil) } -func (_Schema__Assembler) AssignLink(dms3ld.Link) error { +func (_Schema__Assembler) AssignLink(ld.Link) error { return mixins.MapAssembler{TypeName: "schemadmt.Schema"}.AssignLink(nil) } -func (na *_Schema__Assembler) AssignNode(v dms3ld.Node) error { +func (na *_Schema__Assembler) AssignNode(v ld.Node) error { if v.IsNull() { return na.AssignNull() } @@ -14881,8 +14881,8 @@ func (na *_Schema__Assembler) AssignNode(v dms3ld.Node) error { *na.m = schema.Maybe_Value return nil } - if v.Kind() != dms3ld.Kind_Map { - return dms3ld.ErrWrongKind{TypeName: "schemadmt.Schema", MethodName: "AssignNode", AppropriateKind: dms3ld.KindSet_JustMap, ActualKind: v.Kind()} + if v.Kind() != ld.Kind_Map { + return ld.ErrWrongKind{TypeName: "schemadmt.Schema", MethodName: "AssignNode", AppropriateKind: ld.KindSet_JustMap, ActualKind: v.Kind()} } itr := v.MapIterator() for !itr.Done() { @@ -14899,7 +14899,7 @@ func (na *_Schema__Assembler) AssignNode(v dms3ld.Node) error { } return na.Finish() } -func (_Schema__Assembler) Prototype() dms3ld.NodePrototype { +func (_Schema__Assembler) Prototype() ld.NodePrototype { return _Schema__Prototype{} } func (ma *_Schema__Assembler) valueFinishTidy() bool { @@ -14918,7 +14918,7 @@ func (ma *_Schema__Assembler) valueFinishTidy() bool { panic("unreachable") } } -func (ma *_Schema__Assembler) AssembleEntry(k string) (dms3ld.NodeAssembler, error) { +func (ma *_Schema__Assembler) AssembleEntry(k string) (ld.NodeAssembler, error) { switch ma.state { case maState_initial: // carry on @@ -14936,7 +14936,7 @@ func (ma *_Schema__Assembler) AssembleEntry(k string) (dms3ld.NodeAssembler, err switch k { case "types": if ma.s&fieldBit__Schema_Types != 0 { - return nil, dms3ld.ErrRepeatedMapKey{Key: &fieldName__Schema_Types} + return nil, ld.ErrRepeatedMapKey{Key: &fieldName__Schema_Types} } ma.s += fieldBit__Schema_Types ma.state = maState_midValue @@ -14945,9 +14945,9 @@ func (ma *_Schema__Assembler) AssembleEntry(k string) (dms3ld.NodeAssembler, err ma.ca_types.m = &ma.cm return &ma.ca_types, nil } - return nil, dms3ld.ErrInvalidKey{TypeName: "schemadmt.Schema", Key: &_String{k}} + return nil, ld.ErrInvalidKey{TypeName: "schemadmt.Schema", Key: &_String{k}} } -func (ma *_Schema__Assembler) AssembleKey() dms3ld.NodeAssembler { +func (ma *_Schema__Assembler) AssembleKey() ld.NodeAssembler { switch ma.state { case maState_initial: // carry on @@ -14965,7 +14965,7 @@ func (ma *_Schema__Assembler) AssembleKey() dms3ld.NodeAssembler { ma.state = maState_midKey return (*_Schema__KeyAssembler)(ma) } -func (ma *_Schema__Assembler) AssembleValue() dms3ld.NodeAssembler { +func (ma *_Schema__Assembler) AssembleValue() ld.NodeAssembler { switch ma.state { case maState_initial: panic("invalid state: AssembleValue cannot be called when no key is primed") @@ -15004,7 +15004,7 @@ func (ma *_Schema__Assembler) Finish() error { panic("invalid state: Finish cannot be called on an assembler that's already finished") } if ma.s&fieldBits__Schema_sufficient != fieldBits__Schema_sufficient { - err := dms3ld.ErrMissingRequiredField{Missing: make([]string, 0)} + err := ld.ErrMissingRequiredField{Missing: make([]string, 0)} if ma.s&fieldBit__Schema_Types == 0 { err.Missing = append(err.Missing, "types") } @@ -15014,19 +15014,19 @@ func (ma *_Schema__Assembler) Finish() error { *ma.m = schema.Maybe_Value return nil } -func (ma *_Schema__Assembler) KeyPrototype() dms3ld.NodePrototype { +func (ma *_Schema__Assembler) KeyPrototype() ld.NodePrototype { return _String__Prototype{} } -func (ma *_Schema__Assembler) ValuePrototype(k string) dms3ld.NodePrototype { +func (ma *_Schema__Assembler) ValuePrototype(k string) ld.NodePrototype { panic("todo structbuilder mapassembler valueprototype") } type _Schema__KeyAssembler _Schema__Assembler -func (_Schema__KeyAssembler) BeginMap(sizeHint int64) (dms3ld.MapAssembler, error) { +func (_Schema__KeyAssembler) BeginMap(sizeHint int64) (ld.MapAssembler, error) { return mixins.StringAssembler{TypeName: "schemadmt.Schema.KeyAssembler"}.BeginMap(0) } -func (_Schema__KeyAssembler) BeginList(sizeHint int64) (dms3ld.ListAssembler, error) { +func (_Schema__KeyAssembler) BeginList(sizeHint int64) (ld.ListAssembler, error) { return mixins.StringAssembler{TypeName: "schemadmt.Schema.KeyAssembler"}.BeginList(0) } func (na *_Schema__KeyAssembler) AssignNull() error { @@ -15048,36 +15048,36 @@ func (ka *_Schema__KeyAssembler) AssignString(k string) error { switch k { case "types": if ka.s&fieldBit__Schema_Types != 0 { - return dms3ld.ErrRepeatedMapKey{Key: &fieldName__Schema_Types} + return ld.ErrRepeatedMapKey{Key: &fieldName__Schema_Types} } ka.s += fieldBit__Schema_Types ka.state = maState_expectValue ka.f = 0 default: - return dms3ld.ErrInvalidKey{TypeName: "schemadmt.Schema", Key: &_String{k}} + return ld.ErrInvalidKey{TypeName: "schemadmt.Schema", Key: &_String{k}} } return nil } func (_Schema__KeyAssembler) AssignBytes([]byte) error { return mixins.StringAssembler{TypeName: "schemadmt.Schema.KeyAssembler"}.AssignBytes(nil) } -func (_Schema__KeyAssembler) AssignLink(dms3ld.Link) error { +func (_Schema__KeyAssembler) AssignLink(ld.Link) error { return mixins.StringAssembler{TypeName: "schemadmt.Schema.KeyAssembler"}.AssignLink(nil) } -func (ka *_Schema__KeyAssembler) AssignNode(v dms3ld.Node) error { +func (ka *_Schema__KeyAssembler) AssignNode(v ld.Node) error { if v2, err := v.AsString(); err != nil { return err } else { return ka.AssignString(v2) } } -func (_Schema__KeyAssembler) Prototype() dms3ld.NodePrototype { +func (_Schema__KeyAssembler) Prototype() ld.NodePrototype { return _String__Prototype{} } func (Schema) Type() schema.Type { return nil /*TODO:typelit*/ } -func (n Schema) Representation() dms3ld.Node { +func (n Schema) Representation() ld.Node { return (*_Schema__Repr)(n) } @@ -15086,33 +15086,33 @@ type _Schema__Repr _Schema var ( fieldName__Schema_Types_serial = _String{"types"} ) -var _ dms3ld.Node = &_Schema__Repr{} +var _ ld.Node = &_Schema__Repr{} -func (_Schema__Repr) Kind() dms3ld.Kind { - return dms3ld.Kind_Map +func (_Schema__Repr) Kind() ld.Kind { + return ld.Kind_Map } -func (n *_Schema__Repr) LookupByString(key string) (dms3ld.Node, error) { +func (n *_Schema__Repr) LookupByString(key string) (ld.Node, error) { switch key { case "types": return n.types.Representation(), nil default: - return nil, schema.ErrNoSuchField{Type: nil /*TODO*/, Field: dms3ld.PathSegmentOfString(key)} + return nil, schema.ErrNoSuchField{Type: nil /*TODO*/, Field: ld.PathSegmentOfString(key)} } } -func (n *_Schema__Repr) LookupByNode(key dms3ld.Node) (dms3ld.Node, error) { +func (n *_Schema__Repr) LookupByNode(key ld.Node) (ld.Node, error) { ks, err := key.AsString() if err != nil { return nil, err } return n.LookupByString(ks) } -func (_Schema__Repr) LookupByIndex(idx int64) (dms3ld.Node, error) { +func (_Schema__Repr) LookupByIndex(idx int64) (ld.Node, error) { return mixins.Map{TypeName: "schemadmt.Schema.Repr"}.LookupByIndex(0) } -func (n _Schema__Repr) LookupBySegment(seg dms3ld.PathSegment) (dms3ld.Node, error) { +func (n _Schema__Repr) LookupBySegment(seg ld.PathSegment) (ld.Node, error) { return n.LookupByString(seg.String()) } -func (n *_Schema__Repr) MapIterator() dms3ld.MapIterator { +func (n *_Schema__Repr) MapIterator() ld.MapIterator { return &_Schema__ReprMapItr{n, 0} } @@ -15121,9 +15121,9 @@ type _Schema__ReprMapItr struct { idx int } -func (itr *_Schema__ReprMapItr) Next() (k dms3ld.Node, v dms3ld.Node, _ error) { +func (itr *_Schema__ReprMapItr) Next() (k ld.Node, v ld.Node, _ error) { if itr.idx >= 1 { - return nil, nil, dms3ld.ErrIteratorOverread{} + return nil, nil, ld.ErrIteratorOverread{} } switch itr.idx { case 0: @@ -15138,7 +15138,7 @@ func (itr *_Schema__ReprMapItr) Next() (k dms3ld.Node, v dms3ld.Node, _ error) { func (itr *_Schema__ReprMapItr) Done() bool { return itr.idx >= 1 } -func (_Schema__Repr) ListIterator() dms3ld.ListIterator { +func (_Schema__Repr) ListIterator() ld.ListIterator { return nil } func (rn *_Schema__Repr) Length() int64 { @@ -15166,16 +15166,16 @@ func (_Schema__Repr) AsString() (string, error) { func (_Schema__Repr) AsBytes() ([]byte, error) { return mixins.Map{TypeName: "schemadmt.Schema.Repr"}.AsBytes() } -func (_Schema__Repr) AsLink() (dms3ld.Link, error) { +func (_Schema__Repr) AsLink() (ld.Link, error) { return mixins.Map{TypeName: "schemadmt.Schema.Repr"}.AsLink() } -func (_Schema__Repr) Prototype() dms3ld.NodePrototype { +func (_Schema__Repr) Prototype() ld.NodePrototype { return _Schema__ReprPrototype{} } type _Schema__ReprPrototype struct{} -func (_Schema__ReprPrototype) NewBuilder() dms3ld.NodeBuilder { +func (_Schema__ReprPrototype) NewBuilder() ld.NodeBuilder { var nb _Schema__ReprBuilder nb.Reset() return &nb @@ -15185,7 +15185,7 @@ type _Schema__ReprBuilder struct { _Schema__ReprAssembler } -func (nb *_Schema__ReprBuilder) Build() dms3ld.Node { +func (nb *_Schema__ReprBuilder) Build() ld.Node { if *nb.m != schema.Maybe_Value { panic("invalid state: cannot call Build on an assembler that's not finished") } @@ -15213,7 +15213,7 @@ func (na *_Schema__ReprAssembler) reset() { na.s = 0 na.ca_types.reset() } -func (na *_Schema__ReprAssembler) BeginMap(int64) (dms3ld.MapAssembler, error) { +func (na *_Schema__ReprAssembler) BeginMap(int64) (ld.MapAssembler, error) { switch *na.m { case schema.Maybe_Value, schema.Maybe_Null: panic("invalid state: cannot assign into assembler that's already finished") @@ -15226,7 +15226,7 @@ func (na *_Schema__ReprAssembler) BeginMap(int64) (dms3ld.MapAssembler, error) { } return na, nil } -func (_Schema__ReprAssembler) BeginList(sizeHint int64) (dms3ld.ListAssembler, error) { +func (_Schema__ReprAssembler) BeginList(sizeHint int64) (ld.ListAssembler, error) { return mixins.MapAssembler{TypeName: "schemadmt.Schema.Repr"}.BeginList(0) } func (na *_Schema__ReprAssembler) AssignNull() error { @@ -15258,10 +15258,10 @@ func (_Schema__ReprAssembler) AssignString(string) error { func (_Schema__ReprAssembler) AssignBytes([]byte) error { return mixins.MapAssembler{TypeName: "schemadmt.Schema.Repr"}.AssignBytes(nil) } -func (_Schema__ReprAssembler) AssignLink(dms3ld.Link) error { +func (_Schema__ReprAssembler) AssignLink(ld.Link) error { return mixins.MapAssembler{TypeName: "schemadmt.Schema.Repr"}.AssignLink(nil) } -func (na *_Schema__ReprAssembler) AssignNode(v dms3ld.Node) error { +func (na *_Schema__ReprAssembler) AssignNode(v ld.Node) error { if v.IsNull() { return na.AssignNull() } @@ -15281,8 +15281,8 @@ func (na *_Schema__ReprAssembler) AssignNode(v dms3ld.Node) error { *na.m = schema.Maybe_Value return nil } - if v.Kind() != dms3ld.Kind_Map { - return dms3ld.ErrWrongKind{TypeName: "schemadmt.Schema.Repr", MethodName: "AssignNode", AppropriateKind: dms3ld.KindSet_JustMap, ActualKind: v.Kind()} + if v.Kind() != ld.Kind_Map { + return ld.ErrWrongKind{TypeName: "schemadmt.Schema.Repr", MethodName: "AssignNode", AppropriateKind: ld.KindSet_JustMap, ActualKind: v.Kind()} } itr := v.MapIterator() for !itr.Done() { @@ -15299,7 +15299,7 @@ func (na *_Schema__ReprAssembler) AssignNode(v dms3ld.Node) error { } return na.Finish() } -func (_Schema__ReprAssembler) Prototype() dms3ld.NodePrototype { +func (_Schema__ReprAssembler) Prototype() ld.NodePrototype { return _Schema__ReprPrototype{} } func (ma *_Schema__ReprAssembler) valueFinishTidy() bool { @@ -15317,7 +15317,7 @@ func (ma *_Schema__ReprAssembler) valueFinishTidy() bool { panic("unreachable") } } -func (ma *_Schema__ReprAssembler) AssembleEntry(k string) (dms3ld.NodeAssembler, error) { +func (ma *_Schema__ReprAssembler) AssembleEntry(k string) (ld.NodeAssembler, error) { switch ma.state { case maState_initial: // carry on @@ -15335,7 +15335,7 @@ func (ma *_Schema__ReprAssembler) AssembleEntry(k string) (dms3ld.NodeAssembler, switch k { case "types": if ma.s&fieldBit__Schema_Types != 0 { - return nil, dms3ld.ErrRepeatedMapKey{Key: &fieldName__Schema_Types_serial} + return nil, ld.ErrRepeatedMapKey{Key: &fieldName__Schema_Types_serial} } ma.s += fieldBit__Schema_Types ma.state = maState_midValue @@ -15345,9 +15345,9 @@ func (ma *_Schema__ReprAssembler) AssembleEntry(k string) (dms3ld.NodeAssembler, return &ma.ca_types, nil default: } - return nil, dms3ld.ErrInvalidKey{TypeName: "schemadmt.Schema.Repr", Key: &_String{k}} + return nil, ld.ErrInvalidKey{TypeName: "schemadmt.Schema.Repr", Key: &_String{k}} } -func (ma *_Schema__ReprAssembler) AssembleKey() dms3ld.NodeAssembler { +func (ma *_Schema__ReprAssembler) AssembleKey() ld.NodeAssembler { switch ma.state { case maState_initial: // carry on @@ -15365,7 +15365,7 @@ func (ma *_Schema__ReprAssembler) AssembleKey() dms3ld.NodeAssembler { ma.state = maState_midKey return (*_Schema__ReprKeyAssembler)(ma) } -func (ma *_Schema__ReprAssembler) AssembleValue() dms3ld.NodeAssembler { +func (ma *_Schema__ReprAssembler) AssembleValue() ld.NodeAssembler { switch ma.state { case maState_initial: panic("invalid state: AssembleValue cannot be called when no key is primed") @@ -15404,7 +15404,7 @@ func (ma *_Schema__ReprAssembler) Finish() error { panic("invalid state: Finish cannot be called on an assembler that's already finished") } if ma.s&fieldBits__Schema_sufficient != fieldBits__Schema_sufficient { - err := dms3ld.ErrMissingRequiredField{Missing: make([]string, 0)} + err := ld.ErrMissingRequiredField{Missing: make([]string, 0)} if ma.s&fieldBit__Schema_Types == 0 { err.Missing = append(err.Missing, "types") } @@ -15414,19 +15414,19 @@ func (ma *_Schema__ReprAssembler) Finish() error { *ma.m = schema.Maybe_Value return nil } -func (ma *_Schema__ReprAssembler) KeyPrototype() dms3ld.NodePrototype { +func (ma *_Schema__ReprAssembler) KeyPrototype() ld.NodePrototype { return _String__Prototype{} } -func (ma *_Schema__ReprAssembler) ValuePrototype(k string) dms3ld.NodePrototype { +func (ma *_Schema__ReprAssembler) ValuePrototype(k string) ld.NodePrototype { panic("todo structbuilder mapassembler repr valueprototype") } type _Schema__ReprKeyAssembler _Schema__ReprAssembler -func (_Schema__ReprKeyAssembler) BeginMap(sizeHint int64) (dms3ld.MapAssembler, error) { +func (_Schema__ReprKeyAssembler) BeginMap(sizeHint int64) (ld.MapAssembler, error) { return mixins.StringAssembler{TypeName: "schemadmt.Schema.Repr.KeyAssembler"}.BeginMap(0) } -func (_Schema__ReprKeyAssembler) BeginList(sizeHint int64) (dms3ld.ListAssembler, error) { +func (_Schema__ReprKeyAssembler) BeginList(sizeHint int64) (ld.ListAssembler, error) { return mixins.StringAssembler{TypeName: "schemadmt.Schema.Repr.KeyAssembler"}.BeginList(0) } func (na *_Schema__ReprKeyAssembler) AssignNull() error { @@ -15448,29 +15448,29 @@ func (ka *_Schema__ReprKeyAssembler) AssignString(k string) error { switch k { case "types": if ka.s&fieldBit__Schema_Types != 0 { - return dms3ld.ErrRepeatedMapKey{Key: &fieldName__Schema_Types_serial} + return ld.ErrRepeatedMapKey{Key: &fieldName__Schema_Types_serial} } ka.s += fieldBit__Schema_Types ka.state = maState_expectValue ka.f = 0 return nil } - return dms3ld.ErrInvalidKey{TypeName: "schemadmt.Schema.Repr", Key: &_String{k}} + return ld.ErrInvalidKey{TypeName: "schemadmt.Schema.Repr", Key: &_String{k}} } func (_Schema__ReprKeyAssembler) AssignBytes([]byte) error { return mixins.StringAssembler{TypeName: "schemadmt.Schema.Repr.KeyAssembler"}.AssignBytes(nil) } -func (_Schema__ReprKeyAssembler) AssignLink(dms3ld.Link) error { +func (_Schema__ReprKeyAssembler) AssignLink(ld.Link) error { return mixins.StringAssembler{TypeName: "schemadmt.Schema.Repr.KeyAssembler"}.AssignLink(nil) } -func (ka *_Schema__ReprKeyAssembler) AssignNode(v dms3ld.Node) error { +func (ka *_Schema__ReprKeyAssembler) AssignNode(v ld.Node) error { if v2, err := v.AsString(); err != nil { return err } else { return ka.AssignString(v2) } } -func (_Schema__ReprKeyAssembler) Prototype() dms3ld.NodePrototype { +func (_Schema__ReprKeyAssembler) Prototype() ld.NodePrototype { return _String__Prototype{} } @@ -15532,12 +15532,12 @@ func (m MaybeSchemaMap) IsAbsent() bool { func (m MaybeSchemaMap) Exists() bool { return m.m == schema.Maybe_Value } -func (m MaybeSchemaMap) AsNode() dms3ld.Node { +func (m MaybeSchemaMap) AsNode() ld.Node { switch m.m { case schema.Maybe_Absent: - return dms3ld.Absent + return ld.Absent case schema.Maybe_Null: - return dms3ld.Null + return ld.Null case schema.Maybe_Value: return &m.v default: @@ -15551,42 +15551,42 @@ func (m MaybeSchemaMap) Must() SchemaMap { return &m.v } -var _ dms3ld.Node = (SchemaMap)(&_SchemaMap{}) +var _ ld.Node = (SchemaMap)(&_SchemaMap{}) var _ schema.TypedNode = (SchemaMap)(&_SchemaMap{}) -func (SchemaMap) Kind() dms3ld.Kind { - return dms3ld.Kind_Map +func (SchemaMap) Kind() ld.Kind { + return ld.Kind_Map } -func (n SchemaMap) LookupByString(k string) (dms3ld.Node, error) { +func (n SchemaMap) LookupByString(k string) (ld.Node, error) { var k2 _TypeName if err := (_TypeName__Prototype{}).fromString(&k2, k); err != nil { return nil, err // TODO wrap in some kind of ErrInvalidKey } v, exists := n.m[k2] if !exists { - return nil, dms3ld.ErrNotExists{Segment: dms3ld.PathSegmentOfString(k)} + return nil, ld.ErrNotExists{Segment: ld.PathSegmentOfString(k)} } return v, nil } -func (n SchemaMap) LookupByNode(k dms3ld.Node) (dms3ld.Node, error) { +func (n SchemaMap) LookupByNode(k ld.Node) (ld.Node, error) { k2, ok := k.(TypeName) if !ok { panic("todo invalid key type error") - // 'dms3ld.ErrInvalidKey{TypeName:"schemadmt.SchemaMap", Key:&_String{k}}' doesn't quite cut it: need room to explain the type, and it's not guaranteed k can be turned into a string at all + // 'ld.ErrInvalidKey{TypeName:"schemadmt.SchemaMap", Key:&_String{k}}' doesn't quite cut it: need room to explain the type, and it's not guaranteed k can be turned into a string at all } v, exists := n.m[*k2] if !exists { - return nil, dms3ld.ErrNotExists{Segment: dms3ld.PathSegmentOfString(k2.String())} + return nil, ld.ErrNotExists{Segment: ld.PathSegmentOfString(k2.String())} } return v, nil } -func (SchemaMap) LookupByIndex(idx int64) (dms3ld.Node, error) { +func (SchemaMap) LookupByIndex(idx int64) (ld.Node, error) { return mixins.Map{TypeName: "schemadmt.SchemaMap"}.LookupByIndex(0) } -func (n SchemaMap) LookupBySegment(seg dms3ld.PathSegment) (dms3ld.Node, error) { +func (n SchemaMap) LookupBySegment(seg ld.PathSegment) (ld.Node, error) { return n.LookupByString(seg.String()) } -func (n SchemaMap) MapIterator() dms3ld.MapIterator { +func (n SchemaMap) MapIterator() ld.MapIterator { return &_SchemaMap__MapItr{n, 0} } @@ -15595,9 +15595,9 @@ type _SchemaMap__MapItr struct { idx int } -func (itr *_SchemaMap__MapItr) Next() (k dms3ld.Node, v dms3ld.Node, _ error) { +func (itr *_SchemaMap__MapItr) Next() (k ld.Node, v ld.Node, _ error) { if itr.idx >= len(itr.n.t) { - return nil, nil, dms3ld.ErrIteratorOverread{} + return nil, nil, ld.ErrIteratorOverread{} } x := &itr.n.t[itr.idx] k = &x.k @@ -15609,7 +15609,7 @@ func (itr *_SchemaMap__MapItr) Done() bool { return itr.idx >= len(itr.n.t) } -func (SchemaMap) ListIterator() dms3ld.ListIterator { +func (SchemaMap) ListIterator() ld.ListIterator { return nil } func (n SchemaMap) Length() int64 { @@ -15636,16 +15636,16 @@ func (SchemaMap) AsString() (string, error) { func (SchemaMap) AsBytes() ([]byte, error) { return mixins.Map{TypeName: "schemadmt.SchemaMap"}.AsBytes() } -func (SchemaMap) AsLink() (dms3ld.Link, error) { +func (SchemaMap) AsLink() (ld.Link, error) { return mixins.Map{TypeName: "schemadmt.SchemaMap"}.AsLink() } -func (SchemaMap) Prototype() dms3ld.NodePrototype { +func (SchemaMap) Prototype() ld.NodePrototype { return _SchemaMap__Prototype{} } type _SchemaMap__Prototype struct{} -func (_SchemaMap__Prototype) NewBuilder() dms3ld.NodeBuilder { +func (_SchemaMap__Prototype) NewBuilder() ld.NodeBuilder { var nb _SchemaMap__Builder nb.Reset() return &nb @@ -15655,7 +15655,7 @@ type _SchemaMap__Builder struct { _SchemaMap__Assembler } -func (nb *_SchemaMap__Builder) Build() dms3ld.Node { +func (nb *_SchemaMap__Builder) Build() ld.Node { if *nb.m != schema.Maybe_Value { panic("invalid state: cannot call Build on an assembler that's not finished") } @@ -15682,7 +15682,7 @@ func (na *_SchemaMap__Assembler) reset() { na.ka.reset() na.va.reset() } -func (na *_SchemaMap__Assembler) BeginMap(sizeHint int64) (dms3ld.MapAssembler, error) { +func (na *_SchemaMap__Assembler) BeginMap(sizeHint int64) (ld.MapAssembler, error) { switch *na.m { case schema.Maybe_Value, schema.Maybe_Null: panic("invalid state: cannot assign into assembler that's already finished") @@ -15697,7 +15697,7 @@ func (na *_SchemaMap__Assembler) BeginMap(sizeHint int64) (dms3ld.MapAssembler, na.w.t = make([]_SchemaMap__entry, 0, sizeHint) return na, nil } -func (_SchemaMap__Assembler) BeginList(sizeHint int64) (dms3ld.ListAssembler, error) { +func (_SchemaMap__Assembler) BeginList(sizeHint int64) (ld.ListAssembler, error) { return mixins.MapAssembler{TypeName: "schemadmt.SchemaMap"}.BeginList(0) } func (na *_SchemaMap__Assembler) AssignNull() error { @@ -15729,10 +15729,10 @@ func (_SchemaMap__Assembler) AssignString(string) error { func (_SchemaMap__Assembler) AssignBytes([]byte) error { return mixins.MapAssembler{TypeName: "schemadmt.SchemaMap"}.AssignBytes(nil) } -func (_SchemaMap__Assembler) AssignLink(dms3ld.Link) error { +func (_SchemaMap__Assembler) AssignLink(ld.Link) error { return mixins.MapAssembler{TypeName: "schemadmt.SchemaMap"}.AssignLink(nil) } -func (na *_SchemaMap__Assembler) AssignNode(v dms3ld.Node) error { +func (na *_SchemaMap__Assembler) AssignNode(v ld.Node) error { if v.IsNull() { return na.AssignNull() } @@ -15747,8 +15747,8 @@ func (na *_SchemaMap__Assembler) AssignNode(v dms3ld.Node) error { *na.m = schema.Maybe_Value return nil } - if v.Kind() != dms3ld.Kind_Map { - return dms3ld.ErrWrongKind{TypeName: "schemadmt.SchemaMap", MethodName: "AssignNode", AppropriateKind: dms3ld.KindSet_JustMap, ActualKind: v.Kind()} + if v.Kind() != ld.Kind_Map { + return ld.ErrWrongKind{TypeName: "schemadmt.SchemaMap", MethodName: "AssignNode", AppropriateKind: ld.KindSet_JustMap, ActualKind: v.Kind()} } itr := v.MapIterator() for !itr.Done() { @@ -15765,7 +15765,7 @@ func (na *_SchemaMap__Assembler) AssignNode(v dms3ld.Node) error { } return na.Finish() } -func (_SchemaMap__Assembler) Prototype() dms3ld.NodePrototype { +func (_SchemaMap__Assembler) Prototype() ld.NodePrototype { return _SchemaMap__Prototype{} } func (ma *_SchemaMap__Assembler) keyFinishTidy() bool { @@ -15796,7 +15796,7 @@ func (ma *_SchemaMap__Assembler) valueFinishTidy() bool { return false } } -func (ma *_SchemaMap__Assembler) AssembleEntry(k string) (dms3ld.NodeAssembler, error) { +func (ma *_SchemaMap__Assembler) AssembleEntry(k string) (ld.NodeAssembler, error) { switch ma.state { case maState_initial: // carry on @@ -15817,7 +15817,7 @@ func (ma *_SchemaMap__Assembler) AssembleEntry(k string) (dms3ld.NodeAssembler, return nil, err // TODO wrap in some kind of ErrInvalidKey } if _, exists := ma.w.m[k2]; exists { - return nil, dms3ld.ErrRepeatedMapKey{Key: &k2} + return nil, ld.ErrRepeatedMapKey{Key: &k2} } ma.w.t = append(ma.w.t, _SchemaMap__entry{k: k2}) tz := &ma.w.t[len(ma.w.t)-1] @@ -15828,7 +15828,7 @@ func (ma *_SchemaMap__Assembler) AssembleEntry(k string) (dms3ld.NodeAssembler, ma.va.m = &ma.cm return &ma.va, nil } -func (ma *_SchemaMap__Assembler) AssembleKey() dms3ld.NodeAssembler { +func (ma *_SchemaMap__Assembler) AssembleKey() ld.NodeAssembler { switch ma.state { case maState_initial: // carry on @@ -15849,7 +15849,7 @@ func (ma *_SchemaMap__Assembler) AssembleKey() dms3ld.NodeAssembler { ma.ka.w = &ma.w.t[len(ma.w.t)-1].k return &ma.ka } -func (ma *_SchemaMap__Assembler) AssembleValue() dms3ld.NodeAssembler { +func (ma *_SchemaMap__Assembler) AssembleValue() ld.NodeAssembler { switch ma.state { case maState_initial: panic("invalid state: AssembleValue cannot be called when no key is primed") @@ -15886,55 +15886,55 @@ func (ma *_SchemaMap__Assembler) Finish() error { *ma.m = schema.Maybe_Value return nil } -func (ma *_SchemaMap__Assembler) KeyPrototype() dms3ld.NodePrototype { +func (ma *_SchemaMap__Assembler) KeyPrototype() ld.NodePrototype { return _TypeName__Prototype{} } -func (ma *_SchemaMap__Assembler) ValuePrototype(_ string) dms3ld.NodePrototype { +func (ma *_SchemaMap__Assembler) ValuePrototype(_ string) ld.NodePrototype { return _TypeDefn__Prototype{} } func (SchemaMap) Type() schema.Type { return nil /*TODO:typelit*/ } -func (n SchemaMap) Representation() dms3ld.Node { +func (n SchemaMap) Representation() ld.Node { return (*_SchemaMap__Repr)(n) } type _SchemaMap__Repr _SchemaMap -var _ dms3ld.Node = &_SchemaMap__Repr{} +var _ ld.Node = &_SchemaMap__Repr{} -func (_SchemaMap__Repr) Kind() dms3ld.Kind { - return dms3ld.Kind_Map +func (_SchemaMap__Repr) Kind() ld.Kind { + return ld.Kind_Map } -func (nr *_SchemaMap__Repr) LookupByString(k string) (dms3ld.Node, error) { +func (nr *_SchemaMap__Repr) LookupByString(k string) (ld.Node, error) { v, err := (SchemaMap)(nr).LookupByString(k) - if err != nil || v == dms3ld.Null { + if err != nil || v == ld.Null { return v, err } return v.(TypeDefn).Representation(), nil } -func (nr *_SchemaMap__Repr) LookupByNode(k dms3ld.Node) (dms3ld.Node, error) { +func (nr *_SchemaMap__Repr) LookupByNode(k ld.Node) (ld.Node, error) { v, err := (SchemaMap)(nr).LookupByNode(k) - if err != nil || v == dms3ld.Null { + if err != nil || v == ld.Null { return v, err } return v.(TypeDefn).Representation(), nil } -func (_SchemaMap__Repr) LookupByIndex(idx int64) (dms3ld.Node, error) { +func (_SchemaMap__Repr) LookupByIndex(idx int64) (ld.Node, error) { return mixins.Map{TypeName: "schemadmt.SchemaMap.Repr"}.LookupByIndex(0) } -func (n _SchemaMap__Repr) LookupBySegment(seg dms3ld.PathSegment) (dms3ld.Node, error) { +func (n _SchemaMap__Repr) LookupBySegment(seg ld.PathSegment) (ld.Node, error) { return n.LookupByString(seg.String()) } -func (nr *_SchemaMap__Repr) MapIterator() dms3ld.MapIterator { +func (nr *_SchemaMap__Repr) MapIterator() ld.MapIterator { return &_SchemaMap__ReprMapItr{(SchemaMap)(nr), 0} } type _SchemaMap__ReprMapItr _SchemaMap__MapItr -func (itr *_SchemaMap__ReprMapItr) Next() (k dms3ld.Node, v dms3ld.Node, err error) { +func (itr *_SchemaMap__ReprMapItr) Next() (k ld.Node, v ld.Node, err error) { k, v, err = (*_SchemaMap__MapItr)(itr).Next() - if err != nil || v == dms3ld.Null { + if err != nil || v == ld.Null { return } return k, v.(TypeDefn).Representation(), nil @@ -15943,7 +15943,7 @@ func (itr *_SchemaMap__ReprMapItr) Done() bool { return (*_SchemaMap__MapItr)(itr).Done() } -func (_SchemaMap__Repr) ListIterator() dms3ld.ListIterator { +func (_SchemaMap__Repr) ListIterator() ld.ListIterator { return nil } func (rn *_SchemaMap__Repr) Length() int64 { @@ -15970,16 +15970,16 @@ func (_SchemaMap__Repr) AsString() (string, error) { func (_SchemaMap__Repr) AsBytes() ([]byte, error) { return mixins.Map{TypeName: "schemadmt.SchemaMap.Repr"}.AsBytes() } -func (_SchemaMap__Repr) AsLink() (dms3ld.Link, error) { +func (_SchemaMap__Repr) AsLink() (ld.Link, error) { return mixins.Map{TypeName: "schemadmt.SchemaMap.Repr"}.AsLink() } -func (_SchemaMap__Repr) Prototype() dms3ld.NodePrototype { +func (_SchemaMap__Repr) Prototype() ld.NodePrototype { return _SchemaMap__ReprPrototype{} } type _SchemaMap__ReprPrototype struct{} -func (_SchemaMap__ReprPrototype) NewBuilder() dms3ld.NodeBuilder { +func (_SchemaMap__ReprPrototype) NewBuilder() ld.NodeBuilder { var nb _SchemaMap__ReprBuilder nb.Reset() return &nb @@ -15989,7 +15989,7 @@ type _SchemaMap__ReprBuilder struct { _SchemaMap__ReprAssembler } -func (nb *_SchemaMap__ReprBuilder) Build() dms3ld.Node { +func (nb *_SchemaMap__ReprBuilder) Build() ld.Node { if *nb.m != schema.Maybe_Value { panic("invalid state: cannot call Build on an assembler that's not finished") } @@ -16016,7 +16016,7 @@ func (na *_SchemaMap__ReprAssembler) reset() { na.ka.reset() na.va.reset() } -func (na *_SchemaMap__ReprAssembler) BeginMap(sizeHint int64) (dms3ld.MapAssembler, error) { +func (na *_SchemaMap__ReprAssembler) BeginMap(sizeHint int64) (ld.MapAssembler, error) { switch *na.m { case schema.Maybe_Value, schema.Maybe_Null: panic("invalid state: cannot assign into assembler that's already finished") @@ -16031,7 +16031,7 @@ func (na *_SchemaMap__ReprAssembler) BeginMap(sizeHint int64) (dms3ld.MapAssembl na.w.t = make([]_SchemaMap__entry, 0, sizeHint) return na, nil } -func (_SchemaMap__ReprAssembler) BeginList(sizeHint int64) (dms3ld.ListAssembler, error) { +func (_SchemaMap__ReprAssembler) BeginList(sizeHint int64) (ld.ListAssembler, error) { return mixins.MapAssembler{TypeName: "schemadmt.SchemaMap.Repr"}.BeginList(0) } func (na *_SchemaMap__ReprAssembler) AssignNull() error { @@ -16063,10 +16063,10 @@ func (_SchemaMap__ReprAssembler) AssignString(string) error { func (_SchemaMap__ReprAssembler) AssignBytes([]byte) error { return mixins.MapAssembler{TypeName: "schemadmt.SchemaMap.Repr"}.AssignBytes(nil) } -func (_SchemaMap__ReprAssembler) AssignLink(dms3ld.Link) error { +func (_SchemaMap__ReprAssembler) AssignLink(ld.Link) error { return mixins.MapAssembler{TypeName: "schemadmt.SchemaMap.Repr"}.AssignLink(nil) } -func (na *_SchemaMap__ReprAssembler) AssignNode(v dms3ld.Node) error { +func (na *_SchemaMap__ReprAssembler) AssignNode(v ld.Node) error { if v.IsNull() { return na.AssignNull() } @@ -16081,8 +16081,8 @@ func (na *_SchemaMap__ReprAssembler) AssignNode(v dms3ld.Node) error { *na.m = schema.Maybe_Value return nil } - if v.Kind() != dms3ld.Kind_Map { - return dms3ld.ErrWrongKind{TypeName: "schemadmt.SchemaMap.Repr", MethodName: "AssignNode", AppropriateKind: dms3ld.KindSet_JustMap, ActualKind: v.Kind()} + if v.Kind() != ld.Kind_Map { + return ld.ErrWrongKind{TypeName: "schemadmt.SchemaMap.Repr", MethodName: "AssignNode", AppropriateKind: ld.KindSet_JustMap, ActualKind: v.Kind()} } itr := v.MapIterator() for !itr.Done() { @@ -16099,7 +16099,7 @@ func (na *_SchemaMap__ReprAssembler) AssignNode(v dms3ld.Node) error { } return na.Finish() } -func (_SchemaMap__ReprAssembler) Prototype() dms3ld.NodePrototype { +func (_SchemaMap__ReprAssembler) Prototype() ld.NodePrototype { return _SchemaMap__ReprPrototype{} } func (ma *_SchemaMap__ReprAssembler) keyFinishTidy() bool { @@ -16130,7 +16130,7 @@ func (ma *_SchemaMap__ReprAssembler) valueFinishTidy() bool { return false } } -func (ma *_SchemaMap__ReprAssembler) AssembleEntry(k string) (dms3ld.NodeAssembler, error) { +func (ma *_SchemaMap__ReprAssembler) AssembleEntry(k string) (ld.NodeAssembler, error) { switch ma.state { case maState_initial: // carry on @@ -16151,7 +16151,7 @@ func (ma *_SchemaMap__ReprAssembler) AssembleEntry(k string) (dms3ld.NodeAssembl return nil, err // TODO wrap in some kind of ErrInvalidKey } if _, exists := ma.w.m[k2]; exists { - return nil, dms3ld.ErrRepeatedMapKey{Key: &k2} + return nil, ld.ErrRepeatedMapKey{Key: &k2} } ma.w.t = append(ma.w.t, _SchemaMap__entry{k: k2}) tz := &ma.w.t[len(ma.w.t)-1] @@ -16162,7 +16162,7 @@ func (ma *_SchemaMap__ReprAssembler) AssembleEntry(k string) (dms3ld.NodeAssembl ma.va.m = &ma.cm return &ma.va, nil } -func (ma *_SchemaMap__ReprAssembler) AssembleKey() dms3ld.NodeAssembler { +func (ma *_SchemaMap__ReprAssembler) AssembleKey() ld.NodeAssembler { switch ma.state { case maState_initial: // carry on @@ -16183,7 +16183,7 @@ func (ma *_SchemaMap__ReprAssembler) AssembleKey() dms3ld.NodeAssembler { ma.ka.w = &ma.w.t[len(ma.w.t)-1].k return &ma.ka } -func (ma *_SchemaMap__ReprAssembler) AssembleValue() dms3ld.NodeAssembler { +func (ma *_SchemaMap__ReprAssembler) AssembleValue() ld.NodeAssembler { switch ma.state { case maState_initial: panic("invalid state: AssembleValue cannot be called when no key is primed") @@ -16220,10 +16220,10 @@ func (ma *_SchemaMap__ReprAssembler) Finish() error { *ma.m = schema.Maybe_Value return nil } -func (ma *_SchemaMap__ReprAssembler) KeyPrototype() dms3ld.NodePrototype { +func (ma *_SchemaMap__ReprAssembler) KeyPrototype() ld.NodePrototype { return _TypeName__ReprPrototype{} } -func (ma *_SchemaMap__ReprAssembler) ValuePrototype(_ string) dms3ld.NodePrototype { +func (ma *_SchemaMap__ReprAssembler) ValuePrototype(_ string) ld.NodePrototype { return _TypeDefn__ReprPrototype{} } @@ -16254,12 +16254,12 @@ func (m MaybeString) IsAbsent() bool { func (m MaybeString) Exists() bool { return m.m == schema.Maybe_Value } -func (m MaybeString) AsNode() dms3ld.Node { +func (m MaybeString) AsNode() ld.Node { switch m.m { case schema.Maybe_Absent: - return dms3ld.Absent + return ld.Absent case schema.Maybe_Null: - return dms3ld.Null + return ld.Null case schema.Maybe_Value: return &m.v default: @@ -16273,28 +16273,28 @@ func (m MaybeString) Must() String { return &m.v } -var _ dms3ld.Node = (String)(&_String{}) +var _ ld.Node = (String)(&_String{}) var _ schema.TypedNode = (String)(&_String{}) -func (String) Kind() dms3ld.Kind { - return dms3ld.Kind_String +func (String) Kind() ld.Kind { + return ld.Kind_String } -func (String) LookupByString(string) (dms3ld.Node, error) { +func (String) LookupByString(string) (ld.Node, error) { return mixins.String{TypeName: "schemadmt.String"}.LookupByString("") } -func (String) LookupByNode(dms3ld.Node) (dms3ld.Node, error) { +func (String) LookupByNode(ld.Node) (ld.Node, error) { return mixins.String{TypeName: "schemadmt.String"}.LookupByNode(nil) } -func (String) LookupByIndex(idx int64) (dms3ld.Node, error) { +func (String) LookupByIndex(idx int64) (ld.Node, error) { return mixins.String{TypeName: "schemadmt.String"}.LookupByIndex(0) } -func (String) LookupBySegment(seg dms3ld.PathSegment) (dms3ld.Node, error) { +func (String) LookupBySegment(seg ld.PathSegment) (ld.Node, error) { return mixins.String{TypeName: "schemadmt.String"}.LookupBySegment(seg) } -func (String) MapIterator() dms3ld.MapIterator { +func (String) MapIterator() ld.MapIterator { return nil } -func (String) ListIterator() dms3ld.ListIterator { +func (String) ListIterator() ld.ListIterator { return nil } func (String) Length() int64 { @@ -16321,16 +16321,16 @@ func (n String) AsString() (string, error) { func (String) AsBytes() ([]byte, error) { return mixins.String{TypeName: "schemadmt.String"}.AsBytes() } -func (String) AsLink() (dms3ld.Link, error) { +func (String) AsLink() (ld.Link, error) { return mixins.String{TypeName: "schemadmt.String"}.AsLink() } -func (String) Prototype() dms3ld.NodePrototype { +func (String) Prototype() ld.NodePrototype { return _String__Prototype{} } type _String__Prototype struct{} -func (_String__Prototype) NewBuilder() dms3ld.NodeBuilder { +func (_String__Prototype) NewBuilder() ld.NodeBuilder { var nb _String__Builder nb.Reset() return &nb @@ -16340,7 +16340,7 @@ type _String__Builder struct { _String__Assembler } -func (nb *_String__Builder) Build() dms3ld.Node { +func (nb *_String__Builder) Build() ld.Node { if *nb.m != schema.Maybe_Value { panic("invalid state: cannot call Build on an assembler that's not finished") } @@ -16358,10 +16358,10 @@ type _String__Assembler struct { } func (na *_String__Assembler) reset() {} -func (_String__Assembler) BeginMap(sizeHint int64) (dms3ld.MapAssembler, error) { +func (_String__Assembler) BeginMap(sizeHint int64) (ld.MapAssembler, error) { return mixins.StringAssembler{TypeName: "schemadmt.String"}.BeginMap(0) } -func (_String__Assembler) BeginList(sizeHint int64) (dms3ld.ListAssembler, error) { +func (_String__Assembler) BeginList(sizeHint int64) (ld.ListAssembler, error) { return mixins.StringAssembler{TypeName: "schemadmt.String"}.BeginList(0) } func (na *_String__Assembler) AssignNull() error { @@ -16397,10 +16397,10 @@ func (na *_String__Assembler) AssignString(v string) error { func (_String__Assembler) AssignBytes([]byte) error { return mixins.StringAssembler{TypeName: "schemadmt.String"}.AssignBytes(nil) } -func (_String__Assembler) AssignLink(dms3ld.Link) error { +func (_String__Assembler) AssignLink(ld.Link) error { return mixins.StringAssembler{TypeName: "schemadmt.String"}.AssignLink(nil) } -func (na *_String__Assembler) AssignNode(v dms3ld.Node) error { +func (na *_String__Assembler) AssignNode(v ld.Node) error { if v.IsNull() { return na.AssignNull() } @@ -16419,19 +16419,19 @@ func (na *_String__Assembler) AssignNode(v dms3ld.Node) error { return na.AssignString(v2) } } -func (_String__Assembler) Prototype() dms3ld.NodePrototype { +func (_String__Assembler) Prototype() ld.NodePrototype { return _String__Prototype{} } func (String) Type() schema.Type { return nil /*TODO:typelit*/ } -func (n String) Representation() dms3ld.Node { +func (n String) Representation() ld.Node { return (*_String__Repr)(n) } type _String__Repr = _String -var _ dms3ld.Node = &_String__Repr{} +var _ ld.Node = &_String__Repr{} type _String__ReprPrototype = _String__Prototype type _String__ReprAssembler = _String__Assembler @@ -16461,12 +16461,12 @@ func (m MaybeStructField) IsAbsent() bool { func (m MaybeStructField) Exists() bool { return m.m == schema.Maybe_Value } -func (m MaybeStructField) AsNode() dms3ld.Node { +func (m MaybeStructField) AsNode() ld.Node { switch m.m { case schema.Maybe_Absent: - return dms3ld.Absent + return ld.Absent case schema.Maybe_Null: - return dms3ld.Null + return ld.Null case schema.Maybe_Value: return m.v default: @@ -16485,13 +16485,13 @@ var ( fieldName__StructField_Optional = _String{"optional"} fieldName__StructField_Nullable = _String{"nullable"} ) -var _ dms3ld.Node = (StructField)(&_StructField{}) +var _ ld.Node = (StructField)(&_StructField{}) var _ schema.TypedNode = (StructField)(&_StructField{}) -func (StructField) Kind() dms3ld.Kind { - return dms3ld.Kind_Map +func (StructField) Kind() ld.Kind { + return ld.Kind_Map } -func (n StructField) LookupByString(key string) (dms3ld.Node, error) { +func (n StructField) LookupByString(key string) (ld.Node, error) { switch key { case "type": return &n.typ, nil @@ -16500,23 +16500,23 @@ func (n StructField) LookupByString(key string) (dms3ld.Node, error) { case "nullable": return &n.nullable, nil default: - return nil, schema.ErrNoSuchField{Type: nil /*TODO*/, Field: dms3ld.PathSegmentOfString(key)} + return nil, schema.ErrNoSuchField{Type: nil /*TODO*/, Field: ld.PathSegmentOfString(key)} } } -func (n StructField) LookupByNode(key dms3ld.Node) (dms3ld.Node, error) { +func (n StructField) LookupByNode(key ld.Node) (ld.Node, error) { ks, err := key.AsString() if err != nil { return nil, err } return n.LookupByString(ks) } -func (StructField) LookupByIndex(idx int64) (dms3ld.Node, error) { +func (StructField) LookupByIndex(idx int64) (ld.Node, error) { return mixins.Map{TypeName: "schemadmt.StructField"}.LookupByIndex(0) } -func (n StructField) LookupBySegment(seg dms3ld.PathSegment) (dms3ld.Node, error) { +func (n StructField) LookupBySegment(seg ld.PathSegment) (ld.Node, error) { return n.LookupByString(seg.String()) } -func (n StructField) MapIterator() dms3ld.MapIterator { +func (n StructField) MapIterator() ld.MapIterator { return &_StructField__MapItr{n, 0} } @@ -16525,9 +16525,9 @@ type _StructField__MapItr struct { idx int } -func (itr *_StructField__MapItr) Next() (k dms3ld.Node, v dms3ld.Node, _ error) { +func (itr *_StructField__MapItr) Next() (k ld.Node, v ld.Node, _ error) { if itr.idx >= 3 { - return nil, nil, dms3ld.ErrIteratorOverread{} + return nil, nil, ld.ErrIteratorOverread{} } switch itr.idx { case 0: @@ -16549,7 +16549,7 @@ func (itr *_StructField__MapItr) Done() bool { return itr.idx >= 3 } -func (StructField) ListIterator() dms3ld.ListIterator { +func (StructField) ListIterator() ld.ListIterator { return nil } func (StructField) Length() int64 { @@ -16576,16 +16576,16 @@ func (StructField) AsString() (string, error) { func (StructField) AsBytes() ([]byte, error) { return mixins.Map{TypeName: "schemadmt.StructField"}.AsBytes() } -func (StructField) AsLink() (dms3ld.Link, error) { +func (StructField) AsLink() (ld.Link, error) { return mixins.Map{TypeName: "schemadmt.StructField"}.AsLink() } -func (StructField) Prototype() dms3ld.NodePrototype { +func (StructField) Prototype() ld.NodePrototype { return _StructField__Prototype{} } type _StructField__Prototype struct{} -func (_StructField__Prototype) NewBuilder() dms3ld.NodeBuilder { +func (_StructField__Prototype) NewBuilder() ld.NodeBuilder { var nb _StructField__Builder nb.Reset() return &nb @@ -16595,7 +16595,7 @@ type _StructField__Builder struct { _StructField__Assembler } -func (nb *_StructField__Builder) Build() dms3ld.Node { +func (nb *_StructField__Builder) Build() ld.Node { if *nb.m != schema.Maybe_Value { panic("invalid state: cannot call Build on an assembler that's not finished") } @@ -16635,7 +16635,7 @@ var ( fieldBits__StructField_sufficient = 0 + 1<<0 + 1<<1 + 1<<2 ) -func (na *_StructField__Assembler) BeginMap(int64) (dms3ld.MapAssembler, error) { +func (na *_StructField__Assembler) BeginMap(int64) (ld.MapAssembler, error) { switch *na.m { case schema.Maybe_Value, schema.Maybe_Null: panic("invalid state: cannot assign into assembler that's already finished") @@ -16648,7 +16648,7 @@ func (na *_StructField__Assembler) BeginMap(int64) (dms3ld.MapAssembler, error) } return na, nil } -func (_StructField__Assembler) BeginList(sizeHint int64) (dms3ld.ListAssembler, error) { +func (_StructField__Assembler) BeginList(sizeHint int64) (ld.ListAssembler, error) { return mixins.MapAssembler{TypeName: "schemadmt.StructField"}.BeginList(0) } func (na *_StructField__Assembler) AssignNull() error { @@ -16680,10 +16680,10 @@ func (_StructField__Assembler) AssignString(string) error { func (_StructField__Assembler) AssignBytes([]byte) error { return mixins.MapAssembler{TypeName: "schemadmt.StructField"}.AssignBytes(nil) } -func (_StructField__Assembler) AssignLink(dms3ld.Link) error { +func (_StructField__Assembler) AssignLink(ld.Link) error { return mixins.MapAssembler{TypeName: "schemadmt.StructField"}.AssignLink(nil) } -func (na *_StructField__Assembler) AssignNode(v dms3ld.Node) error { +func (na *_StructField__Assembler) AssignNode(v ld.Node) error { if v.IsNull() { return na.AssignNull() } @@ -16703,8 +16703,8 @@ func (na *_StructField__Assembler) AssignNode(v dms3ld.Node) error { *na.m = schema.Maybe_Value return nil } - if v.Kind() != dms3ld.Kind_Map { - return dms3ld.ErrWrongKind{TypeName: "schemadmt.StructField", MethodName: "AssignNode", AppropriateKind: dms3ld.KindSet_JustMap, ActualKind: v.Kind()} + if v.Kind() != ld.Kind_Map { + return ld.ErrWrongKind{TypeName: "schemadmt.StructField", MethodName: "AssignNode", AppropriateKind: ld.KindSet_JustMap, ActualKind: v.Kind()} } itr := v.MapIterator() for !itr.Done() { @@ -16721,7 +16721,7 @@ func (na *_StructField__Assembler) AssignNode(v dms3ld.Node) error { } return na.Finish() } -func (_StructField__Assembler) Prototype() dms3ld.NodePrototype { +func (_StructField__Assembler) Prototype() ld.NodePrototype { return _StructField__Prototype{} } func (ma *_StructField__Assembler) valueFinishTidy() bool { @@ -16760,7 +16760,7 @@ func (ma *_StructField__Assembler) valueFinishTidy() bool { panic("unreachable") } } -func (ma *_StructField__Assembler) AssembleEntry(k string) (dms3ld.NodeAssembler, error) { +func (ma *_StructField__Assembler) AssembleEntry(k string) (ld.NodeAssembler, error) { switch ma.state { case maState_initial: // carry on @@ -16778,7 +16778,7 @@ func (ma *_StructField__Assembler) AssembleEntry(k string) (dms3ld.NodeAssembler switch k { case "type": if ma.s&fieldBit__StructField_Type != 0 { - return nil, dms3ld.ErrRepeatedMapKey{Key: &fieldName__StructField_Type} + return nil, ld.ErrRepeatedMapKey{Key: &fieldName__StructField_Type} } ma.s += fieldBit__StructField_Type ma.state = maState_midValue @@ -16788,7 +16788,7 @@ func (ma *_StructField__Assembler) AssembleEntry(k string) (dms3ld.NodeAssembler return &ma.ca_typ, nil case "optional": if ma.s&fieldBit__StructField_Optional != 0 { - return nil, dms3ld.ErrRepeatedMapKey{Key: &fieldName__StructField_Optional} + return nil, ld.ErrRepeatedMapKey{Key: &fieldName__StructField_Optional} } ma.s += fieldBit__StructField_Optional ma.state = maState_midValue @@ -16798,7 +16798,7 @@ func (ma *_StructField__Assembler) AssembleEntry(k string) (dms3ld.NodeAssembler return &ma.ca_optional, nil case "nullable": if ma.s&fieldBit__StructField_Nullable != 0 { - return nil, dms3ld.ErrRepeatedMapKey{Key: &fieldName__StructField_Nullable} + return nil, ld.ErrRepeatedMapKey{Key: &fieldName__StructField_Nullable} } ma.s += fieldBit__StructField_Nullable ma.state = maState_midValue @@ -16807,9 +16807,9 @@ func (ma *_StructField__Assembler) AssembleEntry(k string) (dms3ld.NodeAssembler ma.ca_nullable.m = &ma.cm return &ma.ca_nullable, nil } - return nil, dms3ld.ErrInvalidKey{TypeName: "schemadmt.StructField", Key: &_String{k}} + return nil, ld.ErrInvalidKey{TypeName: "schemadmt.StructField", Key: &_String{k}} } -func (ma *_StructField__Assembler) AssembleKey() dms3ld.NodeAssembler { +func (ma *_StructField__Assembler) AssembleKey() ld.NodeAssembler { switch ma.state { case maState_initial: // carry on @@ -16827,7 +16827,7 @@ func (ma *_StructField__Assembler) AssembleKey() dms3ld.NodeAssembler { ma.state = maState_midKey return (*_StructField__KeyAssembler)(ma) } -func (ma *_StructField__Assembler) AssembleValue() dms3ld.NodeAssembler { +func (ma *_StructField__Assembler) AssembleValue() ld.NodeAssembler { switch ma.state { case maState_initial: panic("invalid state: AssembleValue cannot be called when no key is primed") @@ -16874,7 +16874,7 @@ func (ma *_StructField__Assembler) Finish() error { panic("invalid state: Finish cannot be called on an assembler that's already finished") } if ma.s&fieldBits__StructField_sufficient != fieldBits__StructField_sufficient { - err := dms3ld.ErrMissingRequiredField{Missing: make([]string, 0)} + err := ld.ErrMissingRequiredField{Missing: make([]string, 0)} if ma.s&fieldBit__StructField_Type == 0 { err.Missing = append(err.Missing, "type") } @@ -16890,19 +16890,19 @@ func (ma *_StructField__Assembler) Finish() error { *ma.m = schema.Maybe_Value return nil } -func (ma *_StructField__Assembler) KeyPrototype() dms3ld.NodePrototype { +func (ma *_StructField__Assembler) KeyPrototype() ld.NodePrototype { return _String__Prototype{} } -func (ma *_StructField__Assembler) ValuePrototype(k string) dms3ld.NodePrototype { +func (ma *_StructField__Assembler) ValuePrototype(k string) ld.NodePrototype { panic("todo structbuilder mapassembler valueprototype") } type _StructField__KeyAssembler _StructField__Assembler -func (_StructField__KeyAssembler) BeginMap(sizeHint int64) (dms3ld.MapAssembler, error) { +func (_StructField__KeyAssembler) BeginMap(sizeHint int64) (ld.MapAssembler, error) { return mixins.StringAssembler{TypeName: "schemadmt.StructField.KeyAssembler"}.BeginMap(0) } -func (_StructField__KeyAssembler) BeginList(sizeHint int64) (dms3ld.ListAssembler, error) { +func (_StructField__KeyAssembler) BeginList(sizeHint int64) (ld.ListAssembler, error) { return mixins.StringAssembler{TypeName: "schemadmt.StructField.KeyAssembler"}.BeginList(0) } func (na *_StructField__KeyAssembler) AssignNull() error { @@ -16924,50 +16924,50 @@ func (ka *_StructField__KeyAssembler) AssignString(k string) error { switch k { case "type": if ka.s&fieldBit__StructField_Type != 0 { - return dms3ld.ErrRepeatedMapKey{Key: &fieldName__StructField_Type} + return ld.ErrRepeatedMapKey{Key: &fieldName__StructField_Type} } ka.s += fieldBit__StructField_Type ka.state = maState_expectValue ka.f = 0 case "optional": if ka.s&fieldBit__StructField_Optional != 0 { - return dms3ld.ErrRepeatedMapKey{Key: &fieldName__StructField_Optional} + return ld.ErrRepeatedMapKey{Key: &fieldName__StructField_Optional} } ka.s += fieldBit__StructField_Optional ka.state = maState_expectValue ka.f = 1 case "nullable": if ka.s&fieldBit__StructField_Nullable != 0 { - return dms3ld.ErrRepeatedMapKey{Key: &fieldName__StructField_Nullable} + return ld.ErrRepeatedMapKey{Key: &fieldName__StructField_Nullable} } ka.s += fieldBit__StructField_Nullable ka.state = maState_expectValue ka.f = 2 default: - return dms3ld.ErrInvalidKey{TypeName: "schemadmt.StructField", Key: &_String{k}} + return ld.ErrInvalidKey{TypeName: "schemadmt.StructField", Key: &_String{k}} } return nil } func (_StructField__KeyAssembler) AssignBytes([]byte) error { return mixins.StringAssembler{TypeName: "schemadmt.StructField.KeyAssembler"}.AssignBytes(nil) } -func (_StructField__KeyAssembler) AssignLink(dms3ld.Link) error { +func (_StructField__KeyAssembler) AssignLink(ld.Link) error { return mixins.StringAssembler{TypeName: "schemadmt.StructField.KeyAssembler"}.AssignLink(nil) } -func (ka *_StructField__KeyAssembler) AssignNode(v dms3ld.Node) error { +func (ka *_StructField__KeyAssembler) AssignNode(v ld.Node) error { if v2, err := v.AsString(); err != nil { return err } else { return ka.AssignString(v2) } } -func (_StructField__KeyAssembler) Prototype() dms3ld.NodePrototype { +func (_StructField__KeyAssembler) Prototype() ld.NodePrototype { return _String__Prototype{} } func (StructField) Type() schema.Type { return nil /*TODO:typelit*/ } -func (n StructField) Representation() dms3ld.Node { +func (n StructField) Representation() ld.Node { return (*_StructField__Repr)(n) } @@ -16978,12 +16978,12 @@ var ( fieldName__StructField_Optional_serial = _String{"optional"} fieldName__StructField_Nullable_serial = _String{"nullable"} ) -var _ dms3ld.Node = &_StructField__Repr{} +var _ ld.Node = &_StructField__Repr{} -func (_StructField__Repr) Kind() dms3ld.Kind { - return dms3ld.Kind_Map +func (_StructField__Repr) Kind() ld.Kind { + return ld.Kind_Map } -func (n *_StructField__Repr) LookupByString(key string) (dms3ld.Node, error) { +func (n *_StructField__Repr) LookupByString(key string) (ld.Node, error) { switch key { case "type": return n.typ.Representation(), nil @@ -16992,23 +16992,23 @@ func (n *_StructField__Repr) LookupByString(key string) (dms3ld.Node, error) { case "nullable": return n.nullable.Representation(), nil default: - return nil, schema.ErrNoSuchField{Type: nil /*TODO*/, Field: dms3ld.PathSegmentOfString(key)} + return nil, schema.ErrNoSuchField{Type: nil /*TODO*/, Field: ld.PathSegmentOfString(key)} } } -func (n *_StructField__Repr) LookupByNode(key dms3ld.Node) (dms3ld.Node, error) { +func (n *_StructField__Repr) LookupByNode(key ld.Node) (ld.Node, error) { ks, err := key.AsString() if err != nil { return nil, err } return n.LookupByString(ks) } -func (_StructField__Repr) LookupByIndex(idx int64) (dms3ld.Node, error) { +func (_StructField__Repr) LookupByIndex(idx int64) (ld.Node, error) { return mixins.Map{TypeName: "schemadmt.StructField.Repr"}.LookupByIndex(0) } -func (n _StructField__Repr) LookupBySegment(seg dms3ld.PathSegment) (dms3ld.Node, error) { +func (n _StructField__Repr) LookupBySegment(seg ld.PathSegment) (ld.Node, error) { return n.LookupByString(seg.String()) } -func (n *_StructField__Repr) MapIterator() dms3ld.MapIterator { +func (n *_StructField__Repr) MapIterator() ld.MapIterator { return &_StructField__ReprMapItr{n, 0} } @@ -17017,9 +17017,9 @@ type _StructField__ReprMapItr struct { idx int } -func (itr *_StructField__ReprMapItr) Next() (k dms3ld.Node, v dms3ld.Node, _ error) { +func (itr *_StructField__ReprMapItr) Next() (k ld.Node, v ld.Node, _ error) { if itr.idx >= 3 { - return nil, nil, dms3ld.ErrIteratorOverread{} + return nil, nil, ld.ErrIteratorOverread{} } switch itr.idx { case 0: @@ -17040,7 +17040,7 @@ func (itr *_StructField__ReprMapItr) Next() (k dms3ld.Node, v dms3ld.Node, _ err func (itr *_StructField__ReprMapItr) Done() bool { return itr.idx >= 3 } -func (_StructField__Repr) ListIterator() dms3ld.ListIterator { +func (_StructField__Repr) ListIterator() ld.ListIterator { return nil } func (rn *_StructField__Repr) Length() int64 { @@ -17068,16 +17068,16 @@ func (_StructField__Repr) AsString() (string, error) { func (_StructField__Repr) AsBytes() ([]byte, error) { return mixins.Map{TypeName: "schemadmt.StructField.Repr"}.AsBytes() } -func (_StructField__Repr) AsLink() (dms3ld.Link, error) { +func (_StructField__Repr) AsLink() (ld.Link, error) { return mixins.Map{TypeName: "schemadmt.StructField.Repr"}.AsLink() } -func (_StructField__Repr) Prototype() dms3ld.NodePrototype { +func (_StructField__Repr) Prototype() ld.NodePrototype { return _StructField__ReprPrototype{} } type _StructField__ReprPrototype struct{} -func (_StructField__ReprPrototype) NewBuilder() dms3ld.NodeBuilder { +func (_StructField__ReprPrototype) NewBuilder() ld.NodeBuilder { var nb _StructField__ReprBuilder nb.Reset() return &nb @@ -17087,7 +17087,7 @@ type _StructField__ReprBuilder struct { _StructField__ReprAssembler } -func (nb *_StructField__ReprBuilder) Build() dms3ld.Node { +func (nb *_StructField__ReprBuilder) Build() ld.Node { if *nb.m != schema.Maybe_Value { panic("invalid state: cannot call Build on an assembler that's not finished") } @@ -17119,7 +17119,7 @@ func (na *_StructField__ReprAssembler) reset() { na.ca_optional.reset() na.ca_nullable.reset() } -func (na *_StructField__ReprAssembler) BeginMap(int64) (dms3ld.MapAssembler, error) { +func (na *_StructField__ReprAssembler) BeginMap(int64) (ld.MapAssembler, error) { switch *na.m { case schema.Maybe_Value, schema.Maybe_Null: panic("invalid state: cannot assign into assembler that's already finished") @@ -17132,7 +17132,7 @@ func (na *_StructField__ReprAssembler) BeginMap(int64) (dms3ld.MapAssembler, err } return na, nil } -func (_StructField__ReprAssembler) BeginList(sizeHint int64) (dms3ld.ListAssembler, error) { +func (_StructField__ReprAssembler) BeginList(sizeHint int64) (ld.ListAssembler, error) { return mixins.MapAssembler{TypeName: "schemadmt.StructField.Repr"}.BeginList(0) } func (na *_StructField__ReprAssembler) AssignNull() error { @@ -17164,10 +17164,10 @@ func (_StructField__ReprAssembler) AssignString(string) error { func (_StructField__ReprAssembler) AssignBytes([]byte) error { return mixins.MapAssembler{TypeName: "schemadmt.StructField.Repr"}.AssignBytes(nil) } -func (_StructField__ReprAssembler) AssignLink(dms3ld.Link) error { +func (_StructField__ReprAssembler) AssignLink(ld.Link) error { return mixins.MapAssembler{TypeName: "schemadmt.StructField.Repr"}.AssignLink(nil) } -func (na *_StructField__ReprAssembler) AssignNode(v dms3ld.Node) error { +func (na *_StructField__ReprAssembler) AssignNode(v ld.Node) error { if v.IsNull() { return na.AssignNull() } @@ -17187,8 +17187,8 @@ func (na *_StructField__ReprAssembler) AssignNode(v dms3ld.Node) error { *na.m = schema.Maybe_Value return nil } - if v.Kind() != dms3ld.Kind_Map { - return dms3ld.ErrWrongKind{TypeName: "schemadmt.StructField.Repr", MethodName: "AssignNode", AppropriateKind: dms3ld.KindSet_JustMap, ActualKind: v.Kind()} + if v.Kind() != ld.Kind_Map { + return ld.ErrWrongKind{TypeName: "schemadmt.StructField.Repr", MethodName: "AssignNode", AppropriateKind: ld.KindSet_JustMap, ActualKind: v.Kind()} } itr := v.MapIterator() for !itr.Done() { @@ -17205,7 +17205,7 @@ func (na *_StructField__ReprAssembler) AssignNode(v dms3ld.Node) error { } return na.Finish() } -func (_StructField__ReprAssembler) Prototype() dms3ld.NodePrototype { +func (_StructField__ReprAssembler) Prototype() ld.NodePrototype { return _StructField__ReprPrototype{} } func (ma *_StructField__ReprAssembler) valueFinishTidy() bool { @@ -17241,7 +17241,7 @@ func (ma *_StructField__ReprAssembler) valueFinishTidy() bool { panic("unreachable") } } -func (ma *_StructField__ReprAssembler) AssembleEntry(k string) (dms3ld.NodeAssembler, error) { +func (ma *_StructField__ReprAssembler) AssembleEntry(k string) (ld.NodeAssembler, error) { switch ma.state { case maState_initial: // carry on @@ -17259,7 +17259,7 @@ func (ma *_StructField__ReprAssembler) AssembleEntry(k string) (dms3ld.NodeAssem switch k { case "type": if ma.s&fieldBit__StructField_Type != 0 { - return nil, dms3ld.ErrRepeatedMapKey{Key: &fieldName__StructField_Type_serial} + return nil, ld.ErrRepeatedMapKey{Key: &fieldName__StructField_Type_serial} } ma.s += fieldBit__StructField_Type ma.state = maState_midValue @@ -17269,7 +17269,7 @@ func (ma *_StructField__ReprAssembler) AssembleEntry(k string) (dms3ld.NodeAssem return &ma.ca_typ, nil case "optional": if ma.s&fieldBit__StructField_Optional != 0 { - return nil, dms3ld.ErrRepeatedMapKey{Key: &fieldName__StructField_Optional_serial} + return nil, ld.ErrRepeatedMapKey{Key: &fieldName__StructField_Optional_serial} } ma.s += fieldBit__StructField_Optional ma.state = maState_midValue @@ -17279,7 +17279,7 @@ func (ma *_StructField__ReprAssembler) AssembleEntry(k string) (dms3ld.NodeAssem return &ma.ca_optional, nil case "nullable": if ma.s&fieldBit__StructField_Nullable != 0 { - return nil, dms3ld.ErrRepeatedMapKey{Key: &fieldName__StructField_Nullable_serial} + return nil, ld.ErrRepeatedMapKey{Key: &fieldName__StructField_Nullable_serial} } ma.s += fieldBit__StructField_Nullable ma.state = maState_midValue @@ -17289,9 +17289,9 @@ func (ma *_StructField__ReprAssembler) AssembleEntry(k string) (dms3ld.NodeAssem return &ma.ca_nullable, nil default: } - return nil, dms3ld.ErrInvalidKey{TypeName: "schemadmt.StructField.Repr", Key: &_String{k}} + return nil, ld.ErrInvalidKey{TypeName: "schemadmt.StructField.Repr", Key: &_String{k}} } -func (ma *_StructField__ReprAssembler) AssembleKey() dms3ld.NodeAssembler { +func (ma *_StructField__ReprAssembler) AssembleKey() ld.NodeAssembler { switch ma.state { case maState_initial: // carry on @@ -17309,7 +17309,7 @@ func (ma *_StructField__ReprAssembler) AssembleKey() dms3ld.NodeAssembler { ma.state = maState_midKey return (*_StructField__ReprKeyAssembler)(ma) } -func (ma *_StructField__ReprAssembler) AssembleValue() dms3ld.NodeAssembler { +func (ma *_StructField__ReprAssembler) AssembleValue() ld.NodeAssembler { switch ma.state { case maState_initial: panic("invalid state: AssembleValue cannot be called when no key is primed") @@ -17356,7 +17356,7 @@ func (ma *_StructField__ReprAssembler) Finish() error { panic("invalid state: Finish cannot be called on an assembler that's already finished") } if ma.s&fieldBits__StructField_sufficient != fieldBits__StructField_sufficient { - err := dms3ld.ErrMissingRequiredField{Missing: make([]string, 0)} + err := ld.ErrMissingRequiredField{Missing: make([]string, 0)} if ma.s&fieldBit__StructField_Type == 0 { err.Missing = append(err.Missing, "type") } @@ -17372,19 +17372,19 @@ func (ma *_StructField__ReprAssembler) Finish() error { *ma.m = schema.Maybe_Value return nil } -func (ma *_StructField__ReprAssembler) KeyPrototype() dms3ld.NodePrototype { +func (ma *_StructField__ReprAssembler) KeyPrototype() ld.NodePrototype { return _String__Prototype{} } -func (ma *_StructField__ReprAssembler) ValuePrototype(k string) dms3ld.NodePrototype { +func (ma *_StructField__ReprAssembler) ValuePrototype(k string) ld.NodePrototype { panic("todo structbuilder mapassembler repr valueprototype") } type _StructField__ReprKeyAssembler _StructField__ReprAssembler -func (_StructField__ReprKeyAssembler) BeginMap(sizeHint int64) (dms3ld.MapAssembler, error) { +func (_StructField__ReprKeyAssembler) BeginMap(sizeHint int64) (ld.MapAssembler, error) { return mixins.StringAssembler{TypeName: "schemadmt.StructField.Repr.KeyAssembler"}.BeginMap(0) } -func (_StructField__ReprKeyAssembler) BeginList(sizeHint int64) (dms3ld.ListAssembler, error) { +func (_StructField__ReprKeyAssembler) BeginList(sizeHint int64) (ld.ListAssembler, error) { return mixins.StringAssembler{TypeName: "schemadmt.StructField.Repr.KeyAssembler"}.BeginList(0) } func (na *_StructField__ReprKeyAssembler) AssignNull() error { @@ -17406,7 +17406,7 @@ func (ka *_StructField__ReprKeyAssembler) AssignString(k string) error { switch k { case "type": if ka.s&fieldBit__StructField_Type != 0 { - return dms3ld.ErrRepeatedMapKey{Key: &fieldName__StructField_Type_serial} + return ld.ErrRepeatedMapKey{Key: &fieldName__StructField_Type_serial} } ka.s += fieldBit__StructField_Type ka.state = maState_expectValue @@ -17414,7 +17414,7 @@ func (ka *_StructField__ReprKeyAssembler) AssignString(k string) error { return nil case "optional": if ka.s&fieldBit__StructField_Optional != 0 { - return dms3ld.ErrRepeatedMapKey{Key: &fieldName__StructField_Optional_serial} + return ld.ErrRepeatedMapKey{Key: &fieldName__StructField_Optional_serial} } ka.s += fieldBit__StructField_Optional ka.state = maState_expectValue @@ -17422,29 +17422,29 @@ func (ka *_StructField__ReprKeyAssembler) AssignString(k string) error { return nil case "nullable": if ka.s&fieldBit__StructField_Nullable != 0 { - return dms3ld.ErrRepeatedMapKey{Key: &fieldName__StructField_Nullable_serial} + return ld.ErrRepeatedMapKey{Key: &fieldName__StructField_Nullable_serial} } ka.s += fieldBit__StructField_Nullable ka.state = maState_expectValue ka.f = 2 return nil } - return dms3ld.ErrInvalidKey{TypeName: "schemadmt.StructField.Repr", Key: &_String{k}} + return ld.ErrInvalidKey{TypeName: "schemadmt.StructField.Repr", Key: &_String{k}} } func (_StructField__ReprKeyAssembler) AssignBytes([]byte) error { return mixins.StringAssembler{TypeName: "schemadmt.StructField.Repr.KeyAssembler"}.AssignBytes(nil) } -func (_StructField__ReprKeyAssembler) AssignLink(dms3ld.Link) error { +func (_StructField__ReprKeyAssembler) AssignLink(ld.Link) error { return mixins.StringAssembler{TypeName: "schemadmt.StructField.Repr.KeyAssembler"}.AssignLink(nil) } -func (ka *_StructField__ReprKeyAssembler) AssignNode(v dms3ld.Node) error { +func (ka *_StructField__ReprKeyAssembler) AssignNode(v ld.Node) error { if v2, err := v.AsString(); err != nil { return err } else { return ka.AssignString(v2) } } -func (_StructField__ReprKeyAssembler) Prototype() dms3ld.NodePrototype { +func (_StructField__ReprKeyAssembler) Prototype() ld.NodePrototype { return _String__Prototype{} } @@ -17480,12 +17480,12 @@ func (m MaybeStructRepresentation) IsAbsent() bool { func (m MaybeStructRepresentation) Exists() bool { return m.m == schema.Maybe_Value } -func (m MaybeStructRepresentation) AsNode() dms3ld.Node { +func (m MaybeStructRepresentation) AsNode() ld.Node { switch m.m { case schema.Maybe_Absent: - return dms3ld.Absent + return ld.Absent case schema.Maybe_Null: - return dms3ld.Null + return ld.Null case schema.Maybe_Value: return m.v default: @@ -17506,57 +17506,57 @@ var ( memberName__StructRepresentation_StructRepresentation_Stringjoin = _String{"StructRepresentation_Stringjoin"} memberName__StructRepresentation_StructRepresentation_Listpairs = _String{"StructRepresentation_Listpairs"} ) -var _ dms3ld.Node = (StructRepresentation)(&_StructRepresentation{}) +var _ ld.Node = (StructRepresentation)(&_StructRepresentation{}) var _ schema.TypedNode = (StructRepresentation)(&_StructRepresentation{}) -func (StructRepresentation) Kind() dms3ld.Kind { - return dms3ld.Kind_Map +func (StructRepresentation) Kind() ld.Kind { + return ld.Kind_Map } -func (n StructRepresentation) LookupByString(key string) (dms3ld.Node, error) { +func (n StructRepresentation) LookupByString(key string) (ld.Node, error) { switch key { case "StructRepresentation_Map": if n.tag != 1 { - return nil, dms3ld.ErrNotExists{Segment: dms3ld.PathSegmentOfString(key)} + return nil, ld.ErrNotExists{Segment: ld.PathSegmentOfString(key)} } return &n.x1, nil case "StructRepresentation_Tuple": if n.tag != 2 { - return nil, dms3ld.ErrNotExists{Segment: dms3ld.PathSegmentOfString(key)} + return nil, ld.ErrNotExists{Segment: ld.PathSegmentOfString(key)} } return &n.x2, nil case "StructRepresentation_Stringpairs": if n.tag != 3 { - return nil, dms3ld.ErrNotExists{Segment: dms3ld.PathSegmentOfString(key)} + return nil, ld.ErrNotExists{Segment: ld.PathSegmentOfString(key)} } return &n.x3, nil case "StructRepresentation_Stringjoin": if n.tag != 4 { - return nil, dms3ld.ErrNotExists{Segment: dms3ld.PathSegmentOfString(key)} + return nil, ld.ErrNotExists{Segment: ld.PathSegmentOfString(key)} } return &n.x4, nil case "StructRepresentation_Listpairs": if n.tag != 5 { - return nil, dms3ld.ErrNotExists{Segment: dms3ld.PathSegmentOfString(key)} + return nil, ld.ErrNotExists{Segment: ld.PathSegmentOfString(key)} } return &n.x5, nil default: - return nil, schema.ErrNoSuchField{Type: nil /*TODO*/, Field: dms3ld.PathSegmentOfString(key)} + return nil, schema.ErrNoSuchField{Type: nil /*TODO*/, Field: ld.PathSegmentOfString(key)} } } -func (n StructRepresentation) LookupByNode(key dms3ld.Node) (dms3ld.Node, error) { +func (n StructRepresentation) LookupByNode(key ld.Node) (ld.Node, error) { ks, err := key.AsString() if err != nil { return nil, err } return n.LookupByString(ks) } -func (StructRepresentation) LookupByIndex(idx int64) (dms3ld.Node, error) { +func (StructRepresentation) LookupByIndex(idx int64) (ld.Node, error) { return mixins.Map{TypeName: "schemadmt.StructRepresentation"}.LookupByIndex(0) } -func (n StructRepresentation) LookupBySegment(seg dms3ld.PathSegment) (dms3ld.Node, error) { +func (n StructRepresentation) LookupBySegment(seg ld.PathSegment) (ld.Node, error) { return n.LookupByString(seg.String()) } -func (n StructRepresentation) MapIterator() dms3ld.MapIterator { +func (n StructRepresentation) MapIterator() ld.MapIterator { return &_StructRepresentation__MapItr{n, false} } @@ -17565,9 +17565,9 @@ type _StructRepresentation__MapItr struct { done bool } -func (itr *_StructRepresentation__MapItr) Next() (k dms3ld.Node, v dms3ld.Node, _ error) { +func (itr *_StructRepresentation__MapItr) Next() (k ld.Node, v ld.Node, _ error) { if itr.done { - return nil, nil, dms3ld.ErrIteratorOverread{} + return nil, nil, ld.ErrIteratorOverread{} } switch itr.n.tag { case 1: @@ -17590,7 +17590,7 @@ func (itr *_StructRepresentation__MapItr) Done() bool { return itr.done } -func (StructRepresentation) ListIterator() dms3ld.ListIterator { +func (StructRepresentation) ListIterator() ld.ListIterator { return nil } func (StructRepresentation) Length() int64 { @@ -17617,16 +17617,16 @@ func (StructRepresentation) AsString() (string, error) { func (StructRepresentation) AsBytes() ([]byte, error) { return mixins.Map{TypeName: "schemadmt.StructRepresentation"}.AsBytes() } -func (StructRepresentation) AsLink() (dms3ld.Link, error) { +func (StructRepresentation) AsLink() (ld.Link, error) { return mixins.Map{TypeName: "schemadmt.StructRepresentation"}.AsLink() } -func (StructRepresentation) Prototype() dms3ld.NodePrototype { +func (StructRepresentation) Prototype() ld.NodePrototype { return _StructRepresentation__Prototype{} } type _StructRepresentation__Prototype struct{} -func (_StructRepresentation__Prototype) NewBuilder() dms3ld.NodeBuilder { +func (_StructRepresentation__Prototype) NewBuilder() ld.NodeBuilder { var nb _StructRepresentation__Builder nb.Reset() return &nb @@ -17636,7 +17636,7 @@ type _StructRepresentation__Builder struct { _StructRepresentation__Assembler } -func (nb *_StructRepresentation__Builder) Build() dms3ld.Node { +func (nb *_StructRepresentation__Builder) Build() ld.Node { if *nb.m != schema.Maybe_Value { panic("invalid state: cannot call Build on an assembler that's not finished") } @@ -17691,7 +17691,7 @@ func (na *_StructRepresentation__Assembler) reset() { na.ca = 0 na.cm = schema.Maybe_Absent } -func (na *_StructRepresentation__Assembler) BeginMap(int64) (dms3ld.MapAssembler, error) { +func (na *_StructRepresentation__Assembler) BeginMap(int64) (ld.MapAssembler, error) { switch *na.m { case schema.Maybe_Value, schema.Maybe_Null: panic("invalid state: cannot assign into assembler that's already finished") @@ -17704,7 +17704,7 @@ func (na *_StructRepresentation__Assembler) BeginMap(int64) (dms3ld.MapAssembler } return na, nil } -func (_StructRepresentation__Assembler) BeginList(sizeHint int64) (dms3ld.ListAssembler, error) { +func (_StructRepresentation__Assembler) BeginList(sizeHint int64) (ld.ListAssembler, error) { return mixins.MapAssembler{TypeName: "schemadmt.StructRepresentation"}.BeginList(0) } func (na *_StructRepresentation__Assembler) AssignNull() error { @@ -17736,10 +17736,10 @@ func (_StructRepresentation__Assembler) AssignString(string) error { func (_StructRepresentation__Assembler) AssignBytes([]byte) error { return mixins.MapAssembler{TypeName: "schemadmt.StructRepresentation"}.AssignBytes(nil) } -func (_StructRepresentation__Assembler) AssignLink(dms3ld.Link) error { +func (_StructRepresentation__Assembler) AssignLink(ld.Link) error { return mixins.MapAssembler{TypeName: "schemadmt.StructRepresentation"}.AssignLink(nil) } -func (na *_StructRepresentation__Assembler) AssignNode(v dms3ld.Node) error { +func (na *_StructRepresentation__Assembler) AssignNode(v ld.Node) error { if v.IsNull() { return na.AssignNull() } @@ -17759,8 +17759,8 @@ func (na *_StructRepresentation__Assembler) AssignNode(v dms3ld.Node) error { *na.m = schema.Maybe_Value return nil } - if v.Kind() != dms3ld.Kind_Map { - return dms3ld.ErrWrongKind{TypeName: "schemadmt.StructRepresentation", MethodName: "AssignNode", AppropriateKind: dms3ld.KindSet_JustMap, ActualKind: v.Kind()} + if v.Kind() != ld.Kind_Map { + return ld.ErrWrongKind{TypeName: "schemadmt.StructRepresentation", MethodName: "AssignNode", AppropriateKind: ld.KindSet_JustMap, ActualKind: v.Kind()} } itr := v.MapIterator() for !itr.Done() { @@ -17777,7 +17777,7 @@ func (na *_StructRepresentation__Assembler) AssignNode(v dms3ld.Node) error { } return na.Finish() } -func (_StructRepresentation__Assembler) Prototype() dms3ld.NodePrototype { +func (_StructRepresentation__Assembler) Prototype() ld.NodePrototype { return _StructRepresentation__Prototype{} } func (ma *_StructRepresentation__Assembler) valueFinishTidy() bool { @@ -17789,7 +17789,7 @@ func (ma *_StructRepresentation__Assembler) valueFinishTidy() bool { return false } } -func (ma *_StructRepresentation__Assembler) AssembleEntry(k string) (dms3ld.NodeAssembler, error) { +func (ma *_StructRepresentation__Assembler) AssembleEntry(k string) (ld.NodeAssembler, error) { switch ma.state { case maState_initial: // carry on @@ -17844,9 +17844,9 @@ func (ma *_StructRepresentation__Assembler) AssembleEntry(k string) (dms3ld.Node ma.ca5.m = &ma.cm return &ma.ca5, nil } - return nil, dms3ld.ErrInvalidKey{TypeName: "schemadmt.StructRepresentation", Key: &_String{k}} + return nil, ld.ErrInvalidKey{TypeName: "schemadmt.StructRepresentation", Key: &_String{k}} } -func (ma *_StructRepresentation__Assembler) AssembleKey() dms3ld.NodeAssembler { +func (ma *_StructRepresentation__Assembler) AssembleKey() ld.NodeAssembler { switch ma.state { case maState_initial: // carry on @@ -17864,7 +17864,7 @@ func (ma *_StructRepresentation__Assembler) AssembleKey() dms3ld.NodeAssembler { ma.state = maState_midKey return (*_StructRepresentation__KeyAssembler)(ma) } -func (ma *_StructRepresentation__Assembler) AssembleValue() dms3ld.NodeAssembler { +func (ma *_StructRepresentation__Assembler) AssembleValue() ld.NodeAssembler { switch ma.state { case maState_initial: panic("invalid state: AssembleValue cannot be called when no key is primed") @@ -17925,10 +17925,10 @@ func (ma *_StructRepresentation__Assembler) Finish() error { *ma.m = schema.Maybe_Value return nil } -func (ma *_StructRepresentation__Assembler) KeyPrototype() dms3ld.NodePrototype { +func (ma *_StructRepresentation__Assembler) KeyPrototype() ld.NodePrototype { return _String__Prototype{} } -func (ma *_StructRepresentation__Assembler) ValuePrototype(k string) dms3ld.NodePrototype { +func (ma *_StructRepresentation__Assembler) ValuePrototype(k string) ld.NodePrototype { switch k { case "StructRepresentation_Map": return _StructRepresentation_Map__Prototype{} @@ -17947,10 +17947,10 @@ func (ma *_StructRepresentation__Assembler) ValuePrototype(k string) dms3ld.Node type _StructRepresentation__KeyAssembler _StructRepresentation__Assembler -func (_StructRepresentation__KeyAssembler) BeginMap(sizeHint int64) (dms3ld.MapAssembler, error) { +func (_StructRepresentation__KeyAssembler) BeginMap(sizeHint int64) (ld.MapAssembler, error) { return mixins.StringAssembler{TypeName: "schemadmt.StructRepresentation.KeyAssembler"}.BeginMap(0) } -func (_StructRepresentation__KeyAssembler) BeginList(sizeHint int64) (dms3ld.ListAssembler, error) { +func (_StructRepresentation__KeyAssembler) BeginList(sizeHint int64) (ld.ListAssembler, error) { return mixins.StringAssembler{TypeName: "schemadmt.StructRepresentation.KeyAssembler"}.BeginList(0) } func (na *_StructRepresentation__KeyAssembler) AssignNull() error { @@ -17999,28 +17999,28 @@ func (ka *_StructRepresentation__KeyAssembler) AssignString(k string) error { ka.state = maState_expectValue return nil } - return dms3ld.ErrInvalidKey{TypeName: "schemadmt.StructRepresentation", Key: &_String{k}} // TODO: error quality: ErrInvalidUnionDiscriminant ? + return ld.ErrInvalidKey{TypeName: "schemadmt.StructRepresentation", Key: &_String{k}} // TODO: error quality: ErrInvalidUnionDiscriminant ? } func (_StructRepresentation__KeyAssembler) AssignBytes([]byte) error { return mixins.StringAssembler{TypeName: "schemadmt.StructRepresentation.KeyAssembler"}.AssignBytes(nil) } -func (_StructRepresentation__KeyAssembler) AssignLink(dms3ld.Link) error { +func (_StructRepresentation__KeyAssembler) AssignLink(ld.Link) error { return mixins.StringAssembler{TypeName: "schemadmt.StructRepresentation.KeyAssembler"}.AssignLink(nil) } -func (ka *_StructRepresentation__KeyAssembler) AssignNode(v dms3ld.Node) error { +func (ka *_StructRepresentation__KeyAssembler) AssignNode(v ld.Node) error { if v2, err := v.AsString(); err != nil { return err } else { return ka.AssignString(v2) } } -func (_StructRepresentation__KeyAssembler) Prototype() dms3ld.NodePrototype { +func (_StructRepresentation__KeyAssembler) Prototype() ld.NodePrototype { return _String__Prototype{} } func (StructRepresentation) Type() schema.Type { return nil /*TODO:typelit*/ } -func (n StructRepresentation) Representation() dms3ld.Node { +func (n StructRepresentation) Representation() ld.Node { return (*_StructRepresentation__Repr)(n) } @@ -18033,56 +18033,56 @@ var ( memberName__StructRepresentation_StructRepresentation_Stringjoin_serial = _String{"stringjoin"} memberName__StructRepresentation_StructRepresentation_Listpairs_serial = _String{"listpairs"} ) -var _ dms3ld.Node = &_StructRepresentation__Repr{} +var _ ld.Node = &_StructRepresentation__Repr{} -func (_StructRepresentation__Repr) Kind() dms3ld.Kind { - return dms3ld.Kind_Map +func (_StructRepresentation__Repr) Kind() ld.Kind { + return ld.Kind_Map } -func (n *_StructRepresentation__Repr) LookupByString(key string) (dms3ld.Node, error) { +func (n *_StructRepresentation__Repr) LookupByString(key string) (ld.Node, error) { switch key { case "map": if n.tag != 1 { - return nil, dms3ld.ErrNotExists{Segment: dms3ld.PathSegmentOfString(key)} + return nil, ld.ErrNotExists{Segment: ld.PathSegmentOfString(key)} } return n.x1.Representation(), nil case "tuple": if n.tag != 2 { - return nil, dms3ld.ErrNotExists{Segment: dms3ld.PathSegmentOfString(key)} + return nil, ld.ErrNotExists{Segment: ld.PathSegmentOfString(key)} } return n.x2.Representation(), nil case "stringpairs": if n.tag != 3 { - return nil, dms3ld.ErrNotExists{Segment: dms3ld.PathSegmentOfString(key)} + return nil, ld.ErrNotExists{Segment: ld.PathSegmentOfString(key)} } return n.x3.Representation(), nil case "stringjoin": if n.tag != 4 { - return nil, dms3ld.ErrNotExists{Segment: dms3ld.PathSegmentOfString(key)} + return nil, ld.ErrNotExists{Segment: ld.PathSegmentOfString(key)} } return n.x4.Representation(), nil case "listpairs": if n.tag != 5 { - return nil, dms3ld.ErrNotExists{Segment: dms3ld.PathSegmentOfString(key)} + return nil, ld.ErrNotExists{Segment: ld.PathSegmentOfString(key)} } return n.x5.Representation(), nil default: - return nil, schema.ErrNoSuchField{Type: nil /*TODO*/, Field: dms3ld.PathSegmentOfString(key)} + return nil, schema.ErrNoSuchField{Type: nil /*TODO*/, Field: ld.PathSegmentOfString(key)} } } -func (n *_StructRepresentation__Repr) LookupByNode(key dms3ld.Node) (dms3ld.Node, error) { +func (n *_StructRepresentation__Repr) LookupByNode(key ld.Node) (ld.Node, error) { ks, err := key.AsString() if err != nil { return nil, err } return n.LookupByString(ks) } -func (_StructRepresentation__Repr) LookupByIndex(idx int64) (dms3ld.Node, error) { +func (_StructRepresentation__Repr) LookupByIndex(idx int64) (ld.Node, error) { return mixins.Map{TypeName: "schemadmt.StructRepresentation.Repr"}.LookupByIndex(0) } -func (n _StructRepresentation__Repr) LookupBySegment(seg dms3ld.PathSegment) (dms3ld.Node, error) { +func (n _StructRepresentation__Repr) LookupBySegment(seg ld.PathSegment) (ld.Node, error) { return n.LookupByString(seg.String()) } -func (n *_StructRepresentation__Repr) MapIterator() dms3ld.MapIterator { +func (n *_StructRepresentation__Repr) MapIterator() ld.MapIterator { return &_StructRepresentation__ReprMapItr{n, false} } @@ -18091,9 +18091,9 @@ type _StructRepresentation__ReprMapItr struct { done bool } -func (itr *_StructRepresentation__ReprMapItr) Next() (k dms3ld.Node, v dms3ld.Node, _ error) { +func (itr *_StructRepresentation__ReprMapItr) Next() (k ld.Node, v ld.Node, _ error) { if itr.done { - return nil, nil, dms3ld.ErrIteratorOverread{} + return nil, nil, ld.ErrIteratorOverread{} } switch itr.n.tag { case 1: @@ -18116,7 +18116,7 @@ func (itr *_StructRepresentation__ReprMapItr) Done() bool { return itr.done } -func (_StructRepresentation__Repr) ListIterator() dms3ld.ListIterator { +func (_StructRepresentation__Repr) ListIterator() ld.ListIterator { return nil } func (_StructRepresentation__Repr) Length() int64 { @@ -18143,16 +18143,16 @@ func (_StructRepresentation__Repr) AsString() (string, error) { func (_StructRepresentation__Repr) AsBytes() ([]byte, error) { return mixins.Map{TypeName: "schemadmt.StructRepresentation.Repr"}.AsBytes() } -func (_StructRepresentation__Repr) AsLink() (dms3ld.Link, error) { +func (_StructRepresentation__Repr) AsLink() (ld.Link, error) { return mixins.Map{TypeName: "schemadmt.StructRepresentation.Repr"}.AsLink() } -func (_StructRepresentation__Repr) Prototype() dms3ld.NodePrototype { +func (_StructRepresentation__Repr) Prototype() ld.NodePrototype { return _StructRepresentation__ReprPrototype{} } type _StructRepresentation__ReprPrototype struct{} -func (_StructRepresentation__ReprPrototype) NewBuilder() dms3ld.NodeBuilder { +func (_StructRepresentation__ReprPrototype) NewBuilder() ld.NodeBuilder { var nb _StructRepresentation__ReprBuilder nb.Reset() return &nb @@ -18162,7 +18162,7 @@ type _StructRepresentation__ReprBuilder struct { _StructRepresentation__ReprAssembler } -func (nb *_StructRepresentation__ReprBuilder) Build() dms3ld.Node { +func (nb *_StructRepresentation__ReprBuilder) Build() ld.Node { if *nb.m != schema.Maybe_Value { panic("invalid state: cannot call Build on an assembler that's not finished") } @@ -18217,7 +18217,7 @@ func (na *_StructRepresentation__ReprAssembler) reset() { na.ca = 0 na.cm = schema.Maybe_Absent } -func (na *_StructRepresentation__ReprAssembler) BeginMap(int64) (dms3ld.MapAssembler, error) { +func (na *_StructRepresentation__ReprAssembler) BeginMap(int64) (ld.MapAssembler, error) { switch *na.m { case schema.Maybe_Value, schema.Maybe_Null: panic("invalid state: cannot assign into assembler that's already finished") @@ -18230,7 +18230,7 @@ func (na *_StructRepresentation__ReprAssembler) BeginMap(int64) (dms3ld.MapAssem } return na, nil } -func (_StructRepresentation__ReprAssembler) BeginList(sizeHint int64) (dms3ld.ListAssembler, error) { +func (_StructRepresentation__ReprAssembler) BeginList(sizeHint int64) (ld.ListAssembler, error) { return mixins.MapAssembler{TypeName: "schemadmt.StructRepresentation.Repr"}.BeginList(0) } func (na *_StructRepresentation__ReprAssembler) AssignNull() error { @@ -18262,10 +18262,10 @@ func (_StructRepresentation__ReprAssembler) AssignString(string) error { func (_StructRepresentation__ReprAssembler) AssignBytes([]byte) error { return mixins.MapAssembler{TypeName: "schemadmt.StructRepresentation.Repr"}.AssignBytes(nil) } -func (_StructRepresentation__ReprAssembler) AssignLink(dms3ld.Link) error { +func (_StructRepresentation__ReprAssembler) AssignLink(ld.Link) error { return mixins.MapAssembler{TypeName: "schemadmt.StructRepresentation.Repr"}.AssignLink(nil) } -func (na *_StructRepresentation__ReprAssembler) AssignNode(v dms3ld.Node) error { +func (na *_StructRepresentation__ReprAssembler) AssignNode(v ld.Node) error { if v.IsNull() { return na.AssignNull() } @@ -18285,8 +18285,8 @@ func (na *_StructRepresentation__ReprAssembler) AssignNode(v dms3ld.Node) error *na.m = schema.Maybe_Value return nil } - if v.Kind() != dms3ld.Kind_Map { - return dms3ld.ErrWrongKind{TypeName: "schemadmt.StructRepresentation.Repr", MethodName: "AssignNode", AppropriateKind: dms3ld.KindSet_JustMap, ActualKind: v.Kind()} + if v.Kind() != ld.Kind_Map { + return ld.ErrWrongKind{TypeName: "schemadmt.StructRepresentation.Repr", MethodName: "AssignNode", AppropriateKind: ld.KindSet_JustMap, ActualKind: v.Kind()} } itr := v.MapIterator() for !itr.Done() { @@ -18303,7 +18303,7 @@ func (na *_StructRepresentation__ReprAssembler) AssignNode(v dms3ld.Node) error } return na.Finish() } -func (_StructRepresentation__ReprAssembler) Prototype() dms3ld.NodePrototype { +func (_StructRepresentation__ReprAssembler) Prototype() ld.NodePrototype { return _StructRepresentation__ReprPrototype{} } func (ma *_StructRepresentation__ReprAssembler) valueFinishTidy() bool { @@ -18315,7 +18315,7 @@ func (ma *_StructRepresentation__ReprAssembler) valueFinishTidy() bool { return false } } -func (ma *_StructRepresentation__ReprAssembler) AssembleEntry(k string) (dms3ld.NodeAssembler, error) { +func (ma *_StructRepresentation__ReprAssembler) AssembleEntry(k string) (ld.NodeAssembler, error) { switch ma.state { case maState_initial: // carry on @@ -18370,9 +18370,9 @@ func (ma *_StructRepresentation__ReprAssembler) AssembleEntry(k string) (dms3ld. ma.ca5.m = &ma.cm return &ma.ca5, nil } - return nil, dms3ld.ErrInvalidKey{TypeName: "schemadmt.StructRepresentation.Repr", Key: &_String{k}} + return nil, ld.ErrInvalidKey{TypeName: "schemadmt.StructRepresentation.Repr", Key: &_String{k}} } -func (ma *_StructRepresentation__ReprAssembler) AssembleKey() dms3ld.NodeAssembler { +func (ma *_StructRepresentation__ReprAssembler) AssembleKey() ld.NodeAssembler { switch ma.state { case maState_initial: // carry on @@ -18390,7 +18390,7 @@ func (ma *_StructRepresentation__ReprAssembler) AssembleKey() dms3ld.NodeAssembl ma.state = maState_midKey return (*_StructRepresentation__ReprKeyAssembler)(ma) } -func (ma *_StructRepresentation__ReprAssembler) AssembleValue() dms3ld.NodeAssembler { +func (ma *_StructRepresentation__ReprAssembler) AssembleValue() ld.NodeAssembler { switch ma.state { case maState_initial: panic("invalid state: AssembleValue cannot be called when no key is primed") @@ -18451,10 +18451,10 @@ func (ma *_StructRepresentation__ReprAssembler) Finish() error { *ma.m = schema.Maybe_Value return nil } -func (ma *_StructRepresentation__ReprAssembler) KeyPrototype() dms3ld.NodePrototype { +func (ma *_StructRepresentation__ReprAssembler) KeyPrototype() ld.NodePrototype { return _String__Prototype{} } -func (ma *_StructRepresentation__ReprAssembler) ValuePrototype(k string) dms3ld.NodePrototype { +func (ma *_StructRepresentation__ReprAssembler) ValuePrototype(k string) ld.NodePrototype { switch k { case "StructRepresentation_Map": return _StructRepresentation_Map__ReprPrototype{} @@ -18473,10 +18473,10 @@ func (ma *_StructRepresentation__ReprAssembler) ValuePrototype(k string) dms3ld. type _StructRepresentation__ReprKeyAssembler _StructRepresentation__ReprAssembler -func (_StructRepresentation__ReprKeyAssembler) BeginMap(sizeHint int64) (dms3ld.MapAssembler, error) { +func (_StructRepresentation__ReprKeyAssembler) BeginMap(sizeHint int64) (ld.MapAssembler, error) { return mixins.StringAssembler{TypeName: "schemadmt.StructRepresentation.Repr.KeyAssembler"}.BeginMap(0) } -func (_StructRepresentation__ReprKeyAssembler) BeginList(sizeHint int64) (dms3ld.ListAssembler, error) { +func (_StructRepresentation__ReprKeyAssembler) BeginList(sizeHint int64) (ld.ListAssembler, error) { return mixins.StringAssembler{TypeName: "schemadmt.StructRepresentation.Repr.KeyAssembler"}.BeginList(0) } func (na *_StructRepresentation__ReprKeyAssembler) AssignNull() error { @@ -18525,22 +18525,22 @@ func (ka *_StructRepresentation__ReprKeyAssembler) AssignString(k string) error ka.state = maState_expectValue return nil } - return dms3ld.ErrInvalidKey{TypeName: "schemadmt.StructRepresentation.Repr", Key: &_String{k}} // TODO: error quality: ErrInvalidUnionDiscriminant ? + return ld.ErrInvalidKey{TypeName: "schemadmt.StructRepresentation.Repr", Key: &_String{k}} // TODO: error quality: ErrInvalidUnionDiscriminant ? } func (_StructRepresentation__ReprKeyAssembler) AssignBytes([]byte) error { return mixins.StringAssembler{TypeName: "schemadmt.StructRepresentation.Repr.KeyAssembler"}.AssignBytes(nil) } -func (_StructRepresentation__ReprKeyAssembler) AssignLink(dms3ld.Link) error { +func (_StructRepresentation__ReprKeyAssembler) AssignLink(ld.Link) error { return mixins.StringAssembler{TypeName: "schemadmt.StructRepresentation.Repr.KeyAssembler"}.AssignLink(nil) } -func (ka *_StructRepresentation__ReprKeyAssembler) AssignNode(v dms3ld.Node) error { +func (ka *_StructRepresentation__ReprKeyAssembler) AssignNode(v ld.Node) error { if v2, err := v.AsString(); err != nil { return err } else { return ka.AssignString(v2) } } -func (_StructRepresentation__ReprKeyAssembler) Prototype() dms3ld.NodePrototype { +func (_StructRepresentation__ReprKeyAssembler) Prototype() ld.NodePrototype { return _String__Prototype{} } @@ -18559,12 +18559,12 @@ func (m MaybeStructRepresentation_Listpairs) IsAbsent() bool { func (m MaybeStructRepresentation_Listpairs) Exists() bool { return m.m == schema.Maybe_Value } -func (m MaybeStructRepresentation_Listpairs) AsNode() dms3ld.Node { +func (m MaybeStructRepresentation_Listpairs) AsNode() ld.Node { switch m.m { case schema.Maybe_Absent: - return dms3ld.Absent + return ld.Absent case schema.Maybe_Null: - return dms3ld.Null + return ld.Null case schema.Maybe_Value: return m.v default: @@ -18579,32 +18579,32 @@ func (m MaybeStructRepresentation_Listpairs) Must() StructRepresentation_Listpai } var () -var _ dms3ld.Node = (StructRepresentation_Listpairs)(&_StructRepresentation_Listpairs{}) +var _ ld.Node = (StructRepresentation_Listpairs)(&_StructRepresentation_Listpairs{}) var _ schema.TypedNode = (StructRepresentation_Listpairs)(&_StructRepresentation_Listpairs{}) -func (StructRepresentation_Listpairs) Kind() dms3ld.Kind { - return dms3ld.Kind_Map +func (StructRepresentation_Listpairs) Kind() ld.Kind { + return ld.Kind_Map } -func (n StructRepresentation_Listpairs) LookupByString(key string) (dms3ld.Node, error) { +func (n StructRepresentation_Listpairs) LookupByString(key string) (ld.Node, error) { switch key { default: - return nil, schema.ErrNoSuchField{Type: nil /*TODO*/, Field: dms3ld.PathSegmentOfString(key)} + return nil, schema.ErrNoSuchField{Type: nil /*TODO*/, Field: ld.PathSegmentOfString(key)} } } -func (n StructRepresentation_Listpairs) LookupByNode(key dms3ld.Node) (dms3ld.Node, error) { +func (n StructRepresentation_Listpairs) LookupByNode(key ld.Node) (ld.Node, error) { ks, err := key.AsString() if err != nil { return nil, err } return n.LookupByString(ks) } -func (StructRepresentation_Listpairs) LookupByIndex(idx int64) (dms3ld.Node, error) { +func (StructRepresentation_Listpairs) LookupByIndex(idx int64) (ld.Node, error) { return mixins.Map{TypeName: "schemadmt.StructRepresentation_Listpairs"}.LookupByIndex(0) } -func (n StructRepresentation_Listpairs) LookupBySegment(seg dms3ld.PathSegment) (dms3ld.Node, error) { +func (n StructRepresentation_Listpairs) LookupBySegment(seg ld.PathSegment) (ld.Node, error) { return n.LookupByString(seg.String()) } -func (n StructRepresentation_Listpairs) MapIterator() dms3ld.MapIterator { +func (n StructRepresentation_Listpairs) MapIterator() ld.MapIterator { return &_StructRepresentation_Listpairs__MapItr{n, 0} } @@ -18613,15 +18613,15 @@ type _StructRepresentation_Listpairs__MapItr struct { idx int } -func (itr *_StructRepresentation_Listpairs__MapItr) Next() (k dms3ld.Node, v dms3ld.Node, _ error) { - return nil, nil, dms3ld.ErrIteratorOverread{} +func (itr *_StructRepresentation_Listpairs__MapItr) Next() (k ld.Node, v ld.Node, _ error) { + return nil, nil, ld.ErrIteratorOverread{} } func (itr *_StructRepresentation_Listpairs__MapItr) Done() bool { return itr.idx >= 0 } -func (StructRepresentation_Listpairs) ListIterator() dms3ld.ListIterator { +func (StructRepresentation_Listpairs) ListIterator() ld.ListIterator { return nil } func (StructRepresentation_Listpairs) Length() int64 { @@ -18648,16 +18648,16 @@ func (StructRepresentation_Listpairs) AsString() (string, error) { func (StructRepresentation_Listpairs) AsBytes() ([]byte, error) { return mixins.Map{TypeName: "schemadmt.StructRepresentation_Listpairs"}.AsBytes() } -func (StructRepresentation_Listpairs) AsLink() (dms3ld.Link, error) { +func (StructRepresentation_Listpairs) AsLink() (ld.Link, error) { return mixins.Map{TypeName: "schemadmt.StructRepresentation_Listpairs"}.AsLink() } -func (StructRepresentation_Listpairs) Prototype() dms3ld.NodePrototype { +func (StructRepresentation_Listpairs) Prototype() ld.NodePrototype { return _StructRepresentation_Listpairs__Prototype{} } type _StructRepresentation_Listpairs__Prototype struct{} -func (_StructRepresentation_Listpairs__Prototype) NewBuilder() dms3ld.NodeBuilder { +func (_StructRepresentation_Listpairs__Prototype) NewBuilder() ld.NodeBuilder { var nb _StructRepresentation_Listpairs__Builder nb.Reset() return &nb @@ -18667,7 +18667,7 @@ type _StructRepresentation_Listpairs__Builder struct { _StructRepresentation_Listpairs__Assembler } -func (nb *_StructRepresentation_Listpairs__Builder) Build() dms3ld.Node { +func (nb *_StructRepresentation_Listpairs__Builder) Build() ld.Node { if *nb.m != schema.Maybe_Value { panic("invalid state: cannot call Build on an assembler that's not finished") } @@ -18698,7 +18698,7 @@ var ( fieldBits__StructRepresentation_Listpairs_sufficient = 0 ) -func (na *_StructRepresentation_Listpairs__Assembler) BeginMap(int64) (dms3ld.MapAssembler, error) { +func (na *_StructRepresentation_Listpairs__Assembler) BeginMap(int64) (ld.MapAssembler, error) { switch *na.m { case schema.Maybe_Value, schema.Maybe_Null: panic("invalid state: cannot assign into assembler that's already finished") @@ -18711,7 +18711,7 @@ func (na *_StructRepresentation_Listpairs__Assembler) BeginMap(int64) (dms3ld.Ma } return na, nil } -func (_StructRepresentation_Listpairs__Assembler) BeginList(sizeHint int64) (dms3ld.ListAssembler, error) { +func (_StructRepresentation_Listpairs__Assembler) BeginList(sizeHint int64) (ld.ListAssembler, error) { return mixins.MapAssembler{TypeName: "schemadmt.StructRepresentation_Listpairs"}.BeginList(0) } func (na *_StructRepresentation_Listpairs__Assembler) AssignNull() error { @@ -18743,10 +18743,10 @@ func (_StructRepresentation_Listpairs__Assembler) AssignString(string) error { func (_StructRepresentation_Listpairs__Assembler) AssignBytes([]byte) error { return mixins.MapAssembler{TypeName: "schemadmt.StructRepresentation_Listpairs"}.AssignBytes(nil) } -func (_StructRepresentation_Listpairs__Assembler) AssignLink(dms3ld.Link) error { +func (_StructRepresentation_Listpairs__Assembler) AssignLink(ld.Link) error { return mixins.MapAssembler{TypeName: "schemadmt.StructRepresentation_Listpairs"}.AssignLink(nil) } -func (na *_StructRepresentation_Listpairs__Assembler) AssignNode(v dms3ld.Node) error { +func (na *_StructRepresentation_Listpairs__Assembler) AssignNode(v ld.Node) error { if v.IsNull() { return na.AssignNull() } @@ -18766,8 +18766,8 @@ func (na *_StructRepresentation_Listpairs__Assembler) AssignNode(v dms3ld.Node) *na.m = schema.Maybe_Value return nil } - if v.Kind() != dms3ld.Kind_Map { - return dms3ld.ErrWrongKind{TypeName: "schemadmt.StructRepresentation_Listpairs", MethodName: "AssignNode", AppropriateKind: dms3ld.KindSet_JustMap, ActualKind: v.Kind()} + if v.Kind() != ld.Kind_Map { + return ld.ErrWrongKind{TypeName: "schemadmt.StructRepresentation_Listpairs", MethodName: "AssignNode", AppropriateKind: ld.KindSet_JustMap, ActualKind: v.Kind()} } itr := v.MapIterator() for !itr.Done() { @@ -18784,7 +18784,7 @@ func (na *_StructRepresentation_Listpairs__Assembler) AssignNode(v dms3ld.Node) } return na.Finish() } -func (_StructRepresentation_Listpairs__Assembler) Prototype() dms3ld.NodePrototype { +func (_StructRepresentation_Listpairs__Assembler) Prototype() ld.NodePrototype { return _StructRepresentation_Listpairs__Prototype{} } func (ma *_StructRepresentation_Listpairs__Assembler) valueFinishTidy() bool { @@ -18793,7 +18793,7 @@ func (ma *_StructRepresentation_Listpairs__Assembler) valueFinishTidy() bool { panic("unreachable") } } -func (ma *_StructRepresentation_Listpairs__Assembler) AssembleEntry(k string) (dms3ld.NodeAssembler, error) { +func (ma *_StructRepresentation_Listpairs__Assembler) AssembleEntry(k string) (ld.NodeAssembler, error) { switch ma.state { case maState_initial: // carry on @@ -18808,9 +18808,9 @@ func (ma *_StructRepresentation_Listpairs__Assembler) AssembleEntry(k string) (d case maState_finished: panic("invalid state: AssembleEntry cannot be called on an assembler that's already finished") } - return nil, dms3ld.ErrInvalidKey{TypeName: "schemadmt.StructRepresentation_Listpairs", Key: &_String{k}} + return nil, ld.ErrInvalidKey{TypeName: "schemadmt.StructRepresentation_Listpairs", Key: &_String{k}} } -func (ma *_StructRepresentation_Listpairs__Assembler) AssembleKey() dms3ld.NodeAssembler { +func (ma *_StructRepresentation_Listpairs__Assembler) AssembleKey() ld.NodeAssembler { switch ma.state { case maState_initial: // carry on @@ -18828,7 +18828,7 @@ func (ma *_StructRepresentation_Listpairs__Assembler) AssembleKey() dms3ld.NodeA ma.state = maState_midKey return (*_StructRepresentation_Listpairs__KeyAssembler)(ma) } -func (ma *_StructRepresentation_Listpairs__Assembler) AssembleValue() dms3ld.NodeAssembler { +func (ma *_StructRepresentation_Listpairs__Assembler) AssembleValue() ld.NodeAssembler { switch ma.state { case maState_initial: panic("invalid state: AssembleValue cannot be called when no key is primed") @@ -18863,26 +18863,26 @@ func (ma *_StructRepresentation_Listpairs__Assembler) Finish() error { panic("invalid state: Finish cannot be called on an assembler that's already finished") } if ma.s&fieldBits__StructRepresentation_Listpairs_sufficient != fieldBits__StructRepresentation_Listpairs_sufficient { - err := dms3ld.ErrMissingRequiredField{Missing: make([]string, 0)} + err := ld.ErrMissingRequiredField{Missing: make([]string, 0)} return err } ma.state = maState_finished *ma.m = schema.Maybe_Value return nil } -func (ma *_StructRepresentation_Listpairs__Assembler) KeyPrototype() dms3ld.NodePrototype { +func (ma *_StructRepresentation_Listpairs__Assembler) KeyPrototype() ld.NodePrototype { return _String__Prototype{} } -func (ma *_StructRepresentation_Listpairs__Assembler) ValuePrototype(k string) dms3ld.NodePrototype { +func (ma *_StructRepresentation_Listpairs__Assembler) ValuePrototype(k string) ld.NodePrototype { panic("todo structbuilder mapassembler valueprototype") } type _StructRepresentation_Listpairs__KeyAssembler _StructRepresentation_Listpairs__Assembler -func (_StructRepresentation_Listpairs__KeyAssembler) BeginMap(sizeHint int64) (dms3ld.MapAssembler, error) { +func (_StructRepresentation_Listpairs__KeyAssembler) BeginMap(sizeHint int64) (ld.MapAssembler, error) { return mixins.StringAssembler{TypeName: "schemadmt.StructRepresentation_Listpairs.KeyAssembler"}.BeginMap(0) } -func (_StructRepresentation_Listpairs__KeyAssembler) BeginList(sizeHint int64) (dms3ld.ListAssembler, error) { +func (_StructRepresentation_Listpairs__KeyAssembler) BeginList(sizeHint int64) (ld.ListAssembler, error) { return mixins.StringAssembler{TypeName: "schemadmt.StructRepresentation_Listpairs.KeyAssembler"}.BeginList(0) } func (na *_StructRepresentation_Listpairs__KeyAssembler) AssignNull() error { @@ -18903,61 +18903,61 @@ func (ka *_StructRepresentation_Listpairs__KeyAssembler) AssignString(k string) } switch k { default: - return dms3ld.ErrInvalidKey{TypeName: "schemadmt.StructRepresentation_Listpairs", Key: &_String{k}} + return ld.ErrInvalidKey{TypeName: "schemadmt.StructRepresentation_Listpairs", Key: &_String{k}} } return nil } func (_StructRepresentation_Listpairs__KeyAssembler) AssignBytes([]byte) error { return mixins.StringAssembler{TypeName: "schemadmt.StructRepresentation_Listpairs.KeyAssembler"}.AssignBytes(nil) } -func (_StructRepresentation_Listpairs__KeyAssembler) AssignLink(dms3ld.Link) error { +func (_StructRepresentation_Listpairs__KeyAssembler) AssignLink(ld.Link) error { return mixins.StringAssembler{TypeName: "schemadmt.StructRepresentation_Listpairs.KeyAssembler"}.AssignLink(nil) } -func (ka *_StructRepresentation_Listpairs__KeyAssembler) AssignNode(v dms3ld.Node) error { +func (ka *_StructRepresentation_Listpairs__KeyAssembler) AssignNode(v ld.Node) error { if v2, err := v.AsString(); err != nil { return err } else { return ka.AssignString(v2) } } -func (_StructRepresentation_Listpairs__KeyAssembler) Prototype() dms3ld.NodePrototype { +func (_StructRepresentation_Listpairs__KeyAssembler) Prototype() ld.NodePrototype { return _String__Prototype{} } func (StructRepresentation_Listpairs) Type() schema.Type { return nil /*TODO:typelit*/ } -func (n StructRepresentation_Listpairs) Representation() dms3ld.Node { +func (n StructRepresentation_Listpairs) Representation() ld.Node { return (*_StructRepresentation_Listpairs__Repr)(n) } type _StructRepresentation_Listpairs__Repr _StructRepresentation_Listpairs var () -var _ dms3ld.Node = &_StructRepresentation_Listpairs__Repr{} +var _ ld.Node = &_StructRepresentation_Listpairs__Repr{} -func (_StructRepresentation_Listpairs__Repr) Kind() dms3ld.Kind { - return dms3ld.Kind_Map +func (_StructRepresentation_Listpairs__Repr) Kind() ld.Kind { + return ld.Kind_Map } -func (n *_StructRepresentation_Listpairs__Repr) LookupByString(key string) (dms3ld.Node, error) { +func (n *_StructRepresentation_Listpairs__Repr) LookupByString(key string) (ld.Node, error) { switch key { default: - return nil, schema.ErrNoSuchField{Type: nil /*TODO*/, Field: dms3ld.PathSegmentOfString(key)} + return nil, schema.ErrNoSuchField{Type: nil /*TODO*/, Field: ld.PathSegmentOfString(key)} } } -func (n *_StructRepresentation_Listpairs__Repr) LookupByNode(key dms3ld.Node) (dms3ld.Node, error) { +func (n *_StructRepresentation_Listpairs__Repr) LookupByNode(key ld.Node) (ld.Node, error) { ks, err := key.AsString() if err != nil { return nil, err } return n.LookupByString(ks) } -func (_StructRepresentation_Listpairs__Repr) LookupByIndex(idx int64) (dms3ld.Node, error) { +func (_StructRepresentation_Listpairs__Repr) LookupByIndex(idx int64) (ld.Node, error) { return mixins.Map{TypeName: "schemadmt.StructRepresentation_Listpairs.Repr"}.LookupByIndex(0) } -func (n _StructRepresentation_Listpairs__Repr) LookupBySegment(seg dms3ld.PathSegment) (dms3ld.Node, error) { +func (n _StructRepresentation_Listpairs__Repr) LookupBySegment(seg ld.PathSegment) (ld.Node, error) { return n.LookupByString(seg.String()) } -func (n *_StructRepresentation_Listpairs__Repr) MapIterator() dms3ld.MapIterator { +func (n *_StructRepresentation_Listpairs__Repr) MapIterator() ld.MapIterator { return &_StructRepresentation_Listpairs__ReprMapItr{n, 0} } @@ -18966,14 +18966,14 @@ type _StructRepresentation_Listpairs__ReprMapItr struct { idx int } -func (itr *_StructRepresentation_Listpairs__ReprMapItr) Next() (k dms3ld.Node, v dms3ld.Node, _ error) { - return nil, nil, dms3ld.ErrIteratorOverread{} +func (itr *_StructRepresentation_Listpairs__ReprMapItr) Next() (k ld.Node, v ld.Node, _ error) { + return nil, nil, ld.ErrIteratorOverread{} } func (itr *_StructRepresentation_Listpairs__ReprMapItr) Done() bool { return itr.idx >= 0 } -func (_StructRepresentation_Listpairs__Repr) ListIterator() dms3ld.ListIterator { +func (_StructRepresentation_Listpairs__Repr) ListIterator() ld.ListIterator { return nil } func (rn *_StructRepresentation_Listpairs__Repr) Length() int64 { @@ -19001,16 +19001,16 @@ func (_StructRepresentation_Listpairs__Repr) AsString() (string, error) { func (_StructRepresentation_Listpairs__Repr) AsBytes() ([]byte, error) { return mixins.Map{TypeName: "schemadmt.StructRepresentation_Listpairs.Repr"}.AsBytes() } -func (_StructRepresentation_Listpairs__Repr) AsLink() (dms3ld.Link, error) { +func (_StructRepresentation_Listpairs__Repr) AsLink() (ld.Link, error) { return mixins.Map{TypeName: "schemadmt.StructRepresentation_Listpairs.Repr"}.AsLink() } -func (_StructRepresentation_Listpairs__Repr) Prototype() dms3ld.NodePrototype { +func (_StructRepresentation_Listpairs__Repr) Prototype() ld.NodePrototype { return _StructRepresentation_Listpairs__ReprPrototype{} } type _StructRepresentation_Listpairs__ReprPrototype struct{} -func (_StructRepresentation_Listpairs__ReprPrototype) NewBuilder() dms3ld.NodeBuilder { +func (_StructRepresentation_Listpairs__ReprPrototype) NewBuilder() ld.NodeBuilder { var nb _StructRepresentation_Listpairs__ReprBuilder nb.Reset() return &nb @@ -19020,7 +19020,7 @@ type _StructRepresentation_Listpairs__ReprBuilder struct { _StructRepresentation_Listpairs__ReprAssembler } -func (nb *_StructRepresentation_Listpairs__ReprBuilder) Build() dms3ld.Node { +func (nb *_StructRepresentation_Listpairs__ReprBuilder) Build() ld.Node { if *nb.m != schema.Maybe_Value { panic("invalid state: cannot call Build on an assembler that's not finished") } @@ -19046,7 +19046,7 @@ func (na *_StructRepresentation_Listpairs__ReprAssembler) reset() { na.state = maState_initial na.s = 0 } -func (na *_StructRepresentation_Listpairs__ReprAssembler) BeginMap(int64) (dms3ld.MapAssembler, error) { +func (na *_StructRepresentation_Listpairs__ReprAssembler) BeginMap(int64) (ld.MapAssembler, error) { switch *na.m { case schema.Maybe_Value, schema.Maybe_Null: panic("invalid state: cannot assign into assembler that's already finished") @@ -19059,7 +19059,7 @@ func (na *_StructRepresentation_Listpairs__ReprAssembler) BeginMap(int64) (dms3l } return na, nil } -func (_StructRepresentation_Listpairs__ReprAssembler) BeginList(sizeHint int64) (dms3ld.ListAssembler, error) { +func (_StructRepresentation_Listpairs__ReprAssembler) BeginList(sizeHint int64) (ld.ListAssembler, error) { return mixins.MapAssembler{TypeName: "schemadmt.StructRepresentation_Listpairs.Repr"}.BeginList(0) } func (na *_StructRepresentation_Listpairs__ReprAssembler) AssignNull() error { @@ -19091,10 +19091,10 @@ func (_StructRepresentation_Listpairs__ReprAssembler) AssignString(string) error func (_StructRepresentation_Listpairs__ReprAssembler) AssignBytes([]byte) error { return mixins.MapAssembler{TypeName: "schemadmt.StructRepresentation_Listpairs.Repr"}.AssignBytes(nil) } -func (_StructRepresentation_Listpairs__ReprAssembler) AssignLink(dms3ld.Link) error { +func (_StructRepresentation_Listpairs__ReprAssembler) AssignLink(ld.Link) error { return mixins.MapAssembler{TypeName: "schemadmt.StructRepresentation_Listpairs.Repr"}.AssignLink(nil) } -func (na *_StructRepresentation_Listpairs__ReprAssembler) AssignNode(v dms3ld.Node) error { +func (na *_StructRepresentation_Listpairs__ReprAssembler) AssignNode(v ld.Node) error { if v.IsNull() { return na.AssignNull() } @@ -19114,8 +19114,8 @@ func (na *_StructRepresentation_Listpairs__ReprAssembler) AssignNode(v dms3ld.No *na.m = schema.Maybe_Value return nil } - if v.Kind() != dms3ld.Kind_Map { - return dms3ld.ErrWrongKind{TypeName: "schemadmt.StructRepresentation_Listpairs.Repr", MethodName: "AssignNode", AppropriateKind: dms3ld.KindSet_JustMap, ActualKind: v.Kind()} + if v.Kind() != ld.Kind_Map { + return ld.ErrWrongKind{TypeName: "schemadmt.StructRepresentation_Listpairs.Repr", MethodName: "AssignNode", AppropriateKind: ld.KindSet_JustMap, ActualKind: v.Kind()} } itr := v.MapIterator() for !itr.Done() { @@ -19132,7 +19132,7 @@ func (na *_StructRepresentation_Listpairs__ReprAssembler) AssignNode(v dms3ld.No } return na.Finish() } -func (_StructRepresentation_Listpairs__ReprAssembler) Prototype() dms3ld.NodePrototype { +func (_StructRepresentation_Listpairs__ReprAssembler) Prototype() ld.NodePrototype { return _StructRepresentation_Listpairs__ReprPrototype{} } func (ma *_StructRepresentation_Listpairs__ReprAssembler) valueFinishTidy() bool { @@ -19141,7 +19141,7 @@ func (ma *_StructRepresentation_Listpairs__ReprAssembler) valueFinishTidy() bool panic("unreachable") } } -func (ma *_StructRepresentation_Listpairs__ReprAssembler) AssembleEntry(k string) (dms3ld.NodeAssembler, error) { +func (ma *_StructRepresentation_Listpairs__ReprAssembler) AssembleEntry(k string) (ld.NodeAssembler, error) { switch ma.state { case maState_initial: // carry on @@ -19156,9 +19156,9 @@ func (ma *_StructRepresentation_Listpairs__ReprAssembler) AssembleEntry(k string case maState_finished: panic("invalid state: AssembleEntry cannot be called on an assembler that's already finished") } - return nil, dms3ld.ErrInvalidKey{TypeName: "schemadmt.StructRepresentation_Listpairs.Repr", Key: &_String{k}} + return nil, ld.ErrInvalidKey{TypeName: "schemadmt.StructRepresentation_Listpairs.Repr", Key: &_String{k}} } -func (ma *_StructRepresentation_Listpairs__ReprAssembler) AssembleKey() dms3ld.NodeAssembler { +func (ma *_StructRepresentation_Listpairs__ReprAssembler) AssembleKey() ld.NodeAssembler { switch ma.state { case maState_initial: // carry on @@ -19176,7 +19176,7 @@ func (ma *_StructRepresentation_Listpairs__ReprAssembler) AssembleKey() dms3ld.N ma.state = maState_midKey return (*_StructRepresentation_Listpairs__ReprKeyAssembler)(ma) } -func (ma *_StructRepresentation_Listpairs__ReprAssembler) AssembleValue() dms3ld.NodeAssembler { +func (ma *_StructRepresentation_Listpairs__ReprAssembler) AssembleValue() ld.NodeAssembler { switch ma.state { case maState_initial: panic("invalid state: AssembleValue cannot be called when no key is primed") @@ -19211,26 +19211,26 @@ func (ma *_StructRepresentation_Listpairs__ReprAssembler) Finish() error { panic("invalid state: Finish cannot be called on an assembler that's already finished") } if ma.s&fieldBits__StructRepresentation_Listpairs_sufficient != fieldBits__StructRepresentation_Listpairs_sufficient { - err := dms3ld.ErrMissingRequiredField{Missing: make([]string, 0)} + err := ld.ErrMissingRequiredField{Missing: make([]string, 0)} return err } ma.state = maState_finished *ma.m = schema.Maybe_Value return nil } -func (ma *_StructRepresentation_Listpairs__ReprAssembler) KeyPrototype() dms3ld.NodePrototype { +func (ma *_StructRepresentation_Listpairs__ReprAssembler) KeyPrototype() ld.NodePrototype { return _String__Prototype{} } -func (ma *_StructRepresentation_Listpairs__ReprAssembler) ValuePrototype(k string) dms3ld.NodePrototype { +func (ma *_StructRepresentation_Listpairs__ReprAssembler) ValuePrototype(k string) ld.NodePrototype { panic("todo structbuilder mapassembler repr valueprototype") } type _StructRepresentation_Listpairs__ReprKeyAssembler _StructRepresentation_Listpairs__ReprAssembler -func (_StructRepresentation_Listpairs__ReprKeyAssembler) BeginMap(sizeHint int64) (dms3ld.MapAssembler, error) { +func (_StructRepresentation_Listpairs__ReprKeyAssembler) BeginMap(sizeHint int64) (ld.MapAssembler, error) { return mixins.StringAssembler{TypeName: "schemadmt.StructRepresentation_Listpairs.Repr.KeyAssembler"}.BeginMap(0) } -func (_StructRepresentation_Listpairs__ReprKeyAssembler) BeginList(sizeHint int64) (dms3ld.ListAssembler, error) { +func (_StructRepresentation_Listpairs__ReprKeyAssembler) BeginList(sizeHint int64) (ld.ListAssembler, error) { return mixins.StringAssembler{TypeName: "schemadmt.StructRepresentation_Listpairs.Repr.KeyAssembler"}.BeginList(0) } func (na *_StructRepresentation_Listpairs__ReprKeyAssembler) AssignNull() error { @@ -19249,22 +19249,22 @@ func (ka *_StructRepresentation_Listpairs__ReprKeyAssembler) AssignString(k stri if ka.state != maState_midKey { panic("misuse: KeyAssembler held beyond its valid lifetime") } - return dms3ld.ErrInvalidKey{TypeName: "schemadmt.StructRepresentation_Listpairs.Repr", Key: &_String{k}} + return ld.ErrInvalidKey{TypeName: "schemadmt.StructRepresentation_Listpairs.Repr", Key: &_String{k}} } func (_StructRepresentation_Listpairs__ReprKeyAssembler) AssignBytes([]byte) error { return mixins.StringAssembler{TypeName: "schemadmt.StructRepresentation_Listpairs.Repr.KeyAssembler"}.AssignBytes(nil) } -func (_StructRepresentation_Listpairs__ReprKeyAssembler) AssignLink(dms3ld.Link) error { +func (_StructRepresentation_Listpairs__ReprKeyAssembler) AssignLink(ld.Link) error { return mixins.StringAssembler{TypeName: "schemadmt.StructRepresentation_Listpairs.Repr.KeyAssembler"}.AssignLink(nil) } -func (ka *_StructRepresentation_Listpairs__ReprKeyAssembler) AssignNode(v dms3ld.Node) error { +func (ka *_StructRepresentation_Listpairs__ReprKeyAssembler) AssignNode(v ld.Node) error { if v2, err := v.AsString(); err != nil { return err } else { return ka.AssignString(v2) } } -func (_StructRepresentation_Listpairs__ReprKeyAssembler) Prototype() dms3ld.NodePrototype { +func (_StructRepresentation_Listpairs__ReprKeyAssembler) Prototype() ld.NodePrototype { return _String__Prototype{} } @@ -19287,12 +19287,12 @@ func (m MaybeStructRepresentation_Map) IsAbsent() bool { func (m MaybeStructRepresentation_Map) Exists() bool { return m.m == schema.Maybe_Value } -func (m MaybeStructRepresentation_Map) AsNode() dms3ld.Node { +func (m MaybeStructRepresentation_Map) AsNode() ld.Node { switch m.m { case schema.Maybe_Absent: - return dms3ld.Absent + return ld.Absent case schema.Maybe_Null: - return dms3ld.Null + return ld.Null case schema.Maybe_Value: return m.v default: @@ -19309,37 +19309,37 @@ func (m MaybeStructRepresentation_Map) Must() StructRepresentation_Map { var ( fieldName__StructRepresentation_Map_Fields = _String{"fields"} ) -var _ dms3ld.Node = (StructRepresentation_Map)(&_StructRepresentation_Map{}) +var _ ld.Node = (StructRepresentation_Map)(&_StructRepresentation_Map{}) var _ schema.TypedNode = (StructRepresentation_Map)(&_StructRepresentation_Map{}) -func (StructRepresentation_Map) Kind() dms3ld.Kind { - return dms3ld.Kind_Map +func (StructRepresentation_Map) Kind() ld.Kind { + return ld.Kind_Map } -func (n StructRepresentation_Map) LookupByString(key string) (dms3ld.Node, error) { +func (n StructRepresentation_Map) LookupByString(key string) (ld.Node, error) { switch key { case "fields": if n.fields.m == schema.Maybe_Absent { - return dms3ld.Absent, nil + return ld.Absent, nil } return &n.fields.v, nil default: - return nil, schema.ErrNoSuchField{Type: nil /*TODO*/, Field: dms3ld.PathSegmentOfString(key)} + return nil, schema.ErrNoSuchField{Type: nil /*TODO*/, Field: ld.PathSegmentOfString(key)} } } -func (n StructRepresentation_Map) LookupByNode(key dms3ld.Node) (dms3ld.Node, error) { +func (n StructRepresentation_Map) LookupByNode(key ld.Node) (ld.Node, error) { ks, err := key.AsString() if err != nil { return nil, err } return n.LookupByString(ks) } -func (StructRepresentation_Map) LookupByIndex(idx int64) (dms3ld.Node, error) { +func (StructRepresentation_Map) LookupByIndex(idx int64) (ld.Node, error) { return mixins.Map{TypeName: "schemadmt.StructRepresentation_Map"}.LookupByIndex(0) } -func (n StructRepresentation_Map) LookupBySegment(seg dms3ld.PathSegment) (dms3ld.Node, error) { +func (n StructRepresentation_Map) LookupBySegment(seg ld.PathSegment) (ld.Node, error) { return n.LookupByString(seg.String()) } -func (n StructRepresentation_Map) MapIterator() dms3ld.MapIterator { +func (n StructRepresentation_Map) MapIterator() ld.MapIterator { return &_StructRepresentation_Map__MapItr{n, 0} } @@ -19348,15 +19348,15 @@ type _StructRepresentation_Map__MapItr struct { idx int } -func (itr *_StructRepresentation_Map__MapItr) Next() (k dms3ld.Node, v dms3ld.Node, _ error) { +func (itr *_StructRepresentation_Map__MapItr) Next() (k ld.Node, v ld.Node, _ error) { if itr.idx >= 1 { - return nil, nil, dms3ld.ErrIteratorOverread{} + return nil, nil, ld.ErrIteratorOverread{} } switch itr.idx { case 0: k = &fieldName__StructRepresentation_Map_Fields if itr.n.fields.m == schema.Maybe_Absent { - v = dms3ld.Absent + v = ld.Absent break } v = &itr.n.fields.v @@ -19370,7 +19370,7 @@ func (itr *_StructRepresentation_Map__MapItr) Done() bool { return itr.idx >= 1 } -func (StructRepresentation_Map) ListIterator() dms3ld.ListIterator { +func (StructRepresentation_Map) ListIterator() ld.ListIterator { return nil } func (StructRepresentation_Map) Length() int64 { @@ -19397,16 +19397,16 @@ func (StructRepresentation_Map) AsString() (string, error) { func (StructRepresentation_Map) AsBytes() ([]byte, error) { return mixins.Map{TypeName: "schemadmt.StructRepresentation_Map"}.AsBytes() } -func (StructRepresentation_Map) AsLink() (dms3ld.Link, error) { +func (StructRepresentation_Map) AsLink() (ld.Link, error) { return mixins.Map{TypeName: "schemadmt.StructRepresentation_Map"}.AsLink() } -func (StructRepresentation_Map) Prototype() dms3ld.NodePrototype { +func (StructRepresentation_Map) Prototype() ld.NodePrototype { return _StructRepresentation_Map__Prototype{} } type _StructRepresentation_Map__Prototype struct{} -func (_StructRepresentation_Map__Prototype) NewBuilder() dms3ld.NodeBuilder { +func (_StructRepresentation_Map__Prototype) NewBuilder() ld.NodeBuilder { var nb _StructRepresentation_Map__Builder nb.Reset() return &nb @@ -19416,7 +19416,7 @@ type _StructRepresentation_Map__Builder struct { _StructRepresentation_Map__Assembler } -func (nb *_StructRepresentation_Map__Builder) Build() dms3ld.Node { +func (nb *_StructRepresentation_Map__Builder) Build() ld.Node { if *nb.m != schema.Maybe_Value { panic("invalid state: cannot call Build on an assembler that's not finished") } @@ -19450,7 +19450,7 @@ var ( fieldBits__StructRepresentation_Map_sufficient = 0 ) -func (na *_StructRepresentation_Map__Assembler) BeginMap(int64) (dms3ld.MapAssembler, error) { +func (na *_StructRepresentation_Map__Assembler) BeginMap(int64) (ld.MapAssembler, error) { switch *na.m { case schema.Maybe_Value, schema.Maybe_Null: panic("invalid state: cannot assign into assembler that's already finished") @@ -19463,7 +19463,7 @@ func (na *_StructRepresentation_Map__Assembler) BeginMap(int64) (dms3ld.MapAssem } return na, nil } -func (_StructRepresentation_Map__Assembler) BeginList(sizeHint int64) (dms3ld.ListAssembler, error) { +func (_StructRepresentation_Map__Assembler) BeginList(sizeHint int64) (ld.ListAssembler, error) { return mixins.MapAssembler{TypeName: "schemadmt.StructRepresentation_Map"}.BeginList(0) } func (na *_StructRepresentation_Map__Assembler) AssignNull() error { @@ -19495,10 +19495,10 @@ func (_StructRepresentation_Map__Assembler) AssignString(string) error { func (_StructRepresentation_Map__Assembler) AssignBytes([]byte) error { return mixins.MapAssembler{TypeName: "schemadmt.StructRepresentation_Map"}.AssignBytes(nil) } -func (_StructRepresentation_Map__Assembler) AssignLink(dms3ld.Link) error { +func (_StructRepresentation_Map__Assembler) AssignLink(ld.Link) error { return mixins.MapAssembler{TypeName: "schemadmt.StructRepresentation_Map"}.AssignLink(nil) } -func (na *_StructRepresentation_Map__Assembler) AssignNode(v dms3ld.Node) error { +func (na *_StructRepresentation_Map__Assembler) AssignNode(v ld.Node) error { if v.IsNull() { return na.AssignNull() } @@ -19518,8 +19518,8 @@ func (na *_StructRepresentation_Map__Assembler) AssignNode(v dms3ld.Node) error *na.m = schema.Maybe_Value return nil } - if v.Kind() != dms3ld.Kind_Map { - return dms3ld.ErrWrongKind{TypeName: "schemadmt.StructRepresentation_Map", MethodName: "AssignNode", AppropriateKind: dms3ld.KindSet_JustMap, ActualKind: v.Kind()} + if v.Kind() != ld.Kind_Map { + return ld.ErrWrongKind{TypeName: "schemadmt.StructRepresentation_Map", MethodName: "AssignNode", AppropriateKind: ld.KindSet_JustMap, ActualKind: v.Kind()} } itr := v.MapIterator() for !itr.Done() { @@ -19536,7 +19536,7 @@ func (na *_StructRepresentation_Map__Assembler) AssignNode(v dms3ld.Node) error } return na.Finish() } -func (_StructRepresentation_Map__Assembler) Prototype() dms3ld.NodePrototype { +func (_StructRepresentation_Map__Assembler) Prototype() ld.NodePrototype { return _StructRepresentation_Map__Prototype{} } func (ma *_StructRepresentation_Map__Assembler) valueFinishTidy() bool { @@ -19553,7 +19553,7 @@ func (ma *_StructRepresentation_Map__Assembler) valueFinishTidy() bool { panic("unreachable") } } -func (ma *_StructRepresentation_Map__Assembler) AssembleEntry(k string) (dms3ld.NodeAssembler, error) { +func (ma *_StructRepresentation_Map__Assembler) AssembleEntry(k string) (ld.NodeAssembler, error) { switch ma.state { case maState_initial: // carry on @@ -19571,7 +19571,7 @@ func (ma *_StructRepresentation_Map__Assembler) AssembleEntry(k string) (dms3ld. switch k { case "fields": if ma.s&fieldBit__StructRepresentation_Map_Fields != 0 { - return nil, dms3ld.ErrRepeatedMapKey{Key: &fieldName__StructRepresentation_Map_Fields} + return nil, ld.ErrRepeatedMapKey{Key: &fieldName__StructRepresentation_Map_Fields} } ma.s += fieldBit__StructRepresentation_Map_Fields ma.state = maState_midValue @@ -19580,9 +19580,9 @@ func (ma *_StructRepresentation_Map__Assembler) AssembleEntry(k string) (dms3ld. ma.ca_fields.m = &ma.w.fields.m return &ma.ca_fields, nil } - return nil, dms3ld.ErrInvalidKey{TypeName: "schemadmt.StructRepresentation_Map", Key: &_String{k}} + return nil, ld.ErrInvalidKey{TypeName: "schemadmt.StructRepresentation_Map", Key: &_String{k}} } -func (ma *_StructRepresentation_Map__Assembler) AssembleKey() dms3ld.NodeAssembler { +func (ma *_StructRepresentation_Map__Assembler) AssembleKey() ld.NodeAssembler { switch ma.state { case maState_initial: // carry on @@ -19600,7 +19600,7 @@ func (ma *_StructRepresentation_Map__Assembler) AssembleKey() dms3ld.NodeAssembl ma.state = maState_midKey return (*_StructRepresentation_Map__KeyAssembler)(ma) } -func (ma *_StructRepresentation_Map__Assembler) AssembleValue() dms3ld.NodeAssembler { +func (ma *_StructRepresentation_Map__Assembler) AssembleValue() ld.NodeAssembler { switch ma.state { case maState_initial: panic("invalid state: AssembleValue cannot be called when no key is primed") @@ -19639,26 +19639,26 @@ func (ma *_StructRepresentation_Map__Assembler) Finish() error { panic("invalid state: Finish cannot be called on an assembler that's already finished") } if ma.s&fieldBits__StructRepresentation_Map_sufficient != fieldBits__StructRepresentation_Map_sufficient { - err := dms3ld.ErrMissingRequiredField{Missing: make([]string, 0)} + err := ld.ErrMissingRequiredField{Missing: make([]string, 0)} return err } ma.state = maState_finished *ma.m = schema.Maybe_Value return nil } -func (ma *_StructRepresentation_Map__Assembler) KeyPrototype() dms3ld.NodePrototype { +func (ma *_StructRepresentation_Map__Assembler) KeyPrototype() ld.NodePrototype { return _String__Prototype{} } -func (ma *_StructRepresentation_Map__Assembler) ValuePrototype(k string) dms3ld.NodePrototype { +func (ma *_StructRepresentation_Map__Assembler) ValuePrototype(k string) ld.NodePrototype { panic("todo structbuilder mapassembler valueprototype") } type _StructRepresentation_Map__KeyAssembler _StructRepresentation_Map__Assembler -func (_StructRepresentation_Map__KeyAssembler) BeginMap(sizeHint int64) (dms3ld.MapAssembler, error) { +func (_StructRepresentation_Map__KeyAssembler) BeginMap(sizeHint int64) (ld.MapAssembler, error) { return mixins.StringAssembler{TypeName: "schemadmt.StructRepresentation_Map.KeyAssembler"}.BeginMap(0) } -func (_StructRepresentation_Map__KeyAssembler) BeginList(sizeHint int64) (dms3ld.ListAssembler, error) { +func (_StructRepresentation_Map__KeyAssembler) BeginList(sizeHint int64) (ld.ListAssembler, error) { return mixins.StringAssembler{TypeName: "schemadmt.StructRepresentation_Map.KeyAssembler"}.BeginList(0) } func (na *_StructRepresentation_Map__KeyAssembler) AssignNull() error { @@ -19680,36 +19680,36 @@ func (ka *_StructRepresentation_Map__KeyAssembler) AssignString(k string) error switch k { case "fields": if ka.s&fieldBit__StructRepresentation_Map_Fields != 0 { - return dms3ld.ErrRepeatedMapKey{Key: &fieldName__StructRepresentation_Map_Fields} + return ld.ErrRepeatedMapKey{Key: &fieldName__StructRepresentation_Map_Fields} } ka.s += fieldBit__StructRepresentation_Map_Fields ka.state = maState_expectValue ka.f = 0 default: - return dms3ld.ErrInvalidKey{TypeName: "schemadmt.StructRepresentation_Map", Key: &_String{k}} + return ld.ErrInvalidKey{TypeName: "schemadmt.StructRepresentation_Map", Key: &_String{k}} } return nil } func (_StructRepresentation_Map__KeyAssembler) AssignBytes([]byte) error { return mixins.StringAssembler{TypeName: "schemadmt.StructRepresentation_Map.KeyAssembler"}.AssignBytes(nil) } -func (_StructRepresentation_Map__KeyAssembler) AssignLink(dms3ld.Link) error { +func (_StructRepresentation_Map__KeyAssembler) AssignLink(ld.Link) error { return mixins.StringAssembler{TypeName: "schemadmt.StructRepresentation_Map.KeyAssembler"}.AssignLink(nil) } -func (ka *_StructRepresentation_Map__KeyAssembler) AssignNode(v dms3ld.Node) error { +func (ka *_StructRepresentation_Map__KeyAssembler) AssignNode(v ld.Node) error { if v2, err := v.AsString(); err != nil { return err } else { return ka.AssignString(v2) } } -func (_StructRepresentation_Map__KeyAssembler) Prototype() dms3ld.NodePrototype { +func (_StructRepresentation_Map__KeyAssembler) Prototype() ld.NodePrototype { return _String__Prototype{} } func (StructRepresentation_Map) Type() schema.Type { return nil /*TODO:typelit*/ } -func (n StructRepresentation_Map) Representation() dms3ld.Node { +func (n StructRepresentation_Map) Representation() ld.Node { return (*_StructRepresentation_Map__Repr)(n) } @@ -19718,36 +19718,36 @@ type _StructRepresentation_Map__Repr _StructRepresentation_Map var ( fieldName__StructRepresentation_Map_Fields_serial = _String{"fields"} ) -var _ dms3ld.Node = &_StructRepresentation_Map__Repr{} +var _ ld.Node = &_StructRepresentation_Map__Repr{} -func (_StructRepresentation_Map__Repr) Kind() dms3ld.Kind { - return dms3ld.Kind_Map +func (_StructRepresentation_Map__Repr) Kind() ld.Kind { + return ld.Kind_Map } -func (n *_StructRepresentation_Map__Repr) LookupByString(key string) (dms3ld.Node, error) { +func (n *_StructRepresentation_Map__Repr) LookupByString(key string) (ld.Node, error) { switch key { case "fields": if n.fields.m == schema.Maybe_Absent { - return dms3ld.Absent, dms3ld.ErrNotExists{Segment: dms3ld.PathSegmentOfString(key)} + return ld.Absent, ld.ErrNotExists{Segment: ld.PathSegmentOfString(key)} } return n.fields.v.Representation(), nil default: - return nil, schema.ErrNoSuchField{Type: nil /*TODO*/, Field: dms3ld.PathSegmentOfString(key)} + return nil, schema.ErrNoSuchField{Type: nil /*TODO*/, Field: ld.PathSegmentOfString(key)} } } -func (n *_StructRepresentation_Map__Repr) LookupByNode(key dms3ld.Node) (dms3ld.Node, error) { +func (n *_StructRepresentation_Map__Repr) LookupByNode(key ld.Node) (ld.Node, error) { ks, err := key.AsString() if err != nil { return nil, err } return n.LookupByString(ks) } -func (_StructRepresentation_Map__Repr) LookupByIndex(idx int64) (dms3ld.Node, error) { +func (_StructRepresentation_Map__Repr) LookupByIndex(idx int64) (ld.Node, error) { return mixins.Map{TypeName: "schemadmt.StructRepresentation_Map.Repr"}.LookupByIndex(0) } -func (n _StructRepresentation_Map__Repr) LookupBySegment(seg dms3ld.PathSegment) (dms3ld.Node, error) { +func (n _StructRepresentation_Map__Repr) LookupBySegment(seg ld.PathSegment) (ld.Node, error) { return n.LookupByString(seg.String()) } -func (n *_StructRepresentation_Map__Repr) MapIterator() dms3ld.MapIterator { +func (n *_StructRepresentation_Map__Repr) MapIterator() ld.MapIterator { end := 1 if n.fields.m == schema.Maybe_Absent { end = 0 @@ -19764,10 +19764,10 @@ type _StructRepresentation_Map__ReprMapItr struct { end int } -func (itr *_StructRepresentation_Map__ReprMapItr) Next() (k dms3ld.Node, v dms3ld.Node, _ error) { +func (itr *_StructRepresentation_Map__ReprMapItr) Next() (k ld.Node, v ld.Node, _ error) { advance: if itr.idx >= 1 { - return nil, nil, dms3ld.ErrIteratorOverread{} + return nil, nil, ld.ErrIteratorOverread{} } switch itr.idx { case 0: @@ -19786,7 +19786,7 @@ advance: func (itr *_StructRepresentation_Map__ReprMapItr) Done() bool { return itr.idx >= itr.end } -func (_StructRepresentation_Map__Repr) ListIterator() dms3ld.ListIterator { +func (_StructRepresentation_Map__Repr) ListIterator() ld.ListIterator { return nil } func (rn *_StructRepresentation_Map__Repr) Length() int64 { @@ -19817,16 +19817,16 @@ func (_StructRepresentation_Map__Repr) AsString() (string, error) { func (_StructRepresentation_Map__Repr) AsBytes() ([]byte, error) { return mixins.Map{TypeName: "schemadmt.StructRepresentation_Map.Repr"}.AsBytes() } -func (_StructRepresentation_Map__Repr) AsLink() (dms3ld.Link, error) { +func (_StructRepresentation_Map__Repr) AsLink() (ld.Link, error) { return mixins.Map{TypeName: "schemadmt.StructRepresentation_Map.Repr"}.AsLink() } -func (_StructRepresentation_Map__Repr) Prototype() dms3ld.NodePrototype { +func (_StructRepresentation_Map__Repr) Prototype() ld.NodePrototype { return _StructRepresentation_Map__ReprPrototype{} } type _StructRepresentation_Map__ReprPrototype struct{} -func (_StructRepresentation_Map__ReprPrototype) NewBuilder() dms3ld.NodeBuilder { +func (_StructRepresentation_Map__ReprPrototype) NewBuilder() ld.NodeBuilder { var nb _StructRepresentation_Map__ReprBuilder nb.Reset() return &nb @@ -19836,7 +19836,7 @@ type _StructRepresentation_Map__ReprBuilder struct { _StructRepresentation_Map__ReprAssembler } -func (nb *_StructRepresentation_Map__ReprBuilder) Build() dms3ld.Node { +func (nb *_StructRepresentation_Map__ReprBuilder) Build() ld.Node { if *nb.m != schema.Maybe_Value { panic("invalid state: cannot call Build on an assembler that's not finished") } @@ -19864,7 +19864,7 @@ func (na *_StructRepresentation_Map__ReprAssembler) reset() { na.s = 0 na.ca_fields.reset() } -func (na *_StructRepresentation_Map__ReprAssembler) BeginMap(int64) (dms3ld.MapAssembler, error) { +func (na *_StructRepresentation_Map__ReprAssembler) BeginMap(int64) (ld.MapAssembler, error) { switch *na.m { case schema.Maybe_Value, schema.Maybe_Null: panic("invalid state: cannot assign into assembler that's already finished") @@ -19877,7 +19877,7 @@ func (na *_StructRepresentation_Map__ReprAssembler) BeginMap(int64) (dms3ld.MapA } return na, nil } -func (_StructRepresentation_Map__ReprAssembler) BeginList(sizeHint int64) (dms3ld.ListAssembler, error) { +func (_StructRepresentation_Map__ReprAssembler) BeginList(sizeHint int64) (ld.ListAssembler, error) { return mixins.MapAssembler{TypeName: "schemadmt.StructRepresentation_Map.Repr"}.BeginList(0) } func (na *_StructRepresentation_Map__ReprAssembler) AssignNull() error { @@ -19909,10 +19909,10 @@ func (_StructRepresentation_Map__ReprAssembler) AssignString(string) error { func (_StructRepresentation_Map__ReprAssembler) AssignBytes([]byte) error { return mixins.MapAssembler{TypeName: "schemadmt.StructRepresentation_Map.Repr"}.AssignBytes(nil) } -func (_StructRepresentation_Map__ReprAssembler) AssignLink(dms3ld.Link) error { +func (_StructRepresentation_Map__ReprAssembler) AssignLink(ld.Link) error { return mixins.MapAssembler{TypeName: "schemadmt.StructRepresentation_Map.Repr"}.AssignLink(nil) } -func (na *_StructRepresentation_Map__ReprAssembler) AssignNode(v dms3ld.Node) error { +func (na *_StructRepresentation_Map__ReprAssembler) AssignNode(v ld.Node) error { if v.IsNull() { return na.AssignNull() } @@ -19932,8 +19932,8 @@ func (na *_StructRepresentation_Map__ReprAssembler) AssignNode(v dms3ld.Node) er *na.m = schema.Maybe_Value return nil } - if v.Kind() != dms3ld.Kind_Map { - return dms3ld.ErrWrongKind{TypeName: "schemadmt.StructRepresentation_Map.Repr", MethodName: "AssignNode", AppropriateKind: dms3ld.KindSet_JustMap, ActualKind: v.Kind()} + if v.Kind() != ld.Kind_Map { + return ld.ErrWrongKind{TypeName: "schemadmt.StructRepresentation_Map.Repr", MethodName: "AssignNode", AppropriateKind: ld.KindSet_JustMap, ActualKind: v.Kind()} } itr := v.MapIterator() for !itr.Done() { @@ -19950,7 +19950,7 @@ func (na *_StructRepresentation_Map__ReprAssembler) AssignNode(v dms3ld.Node) er } return na.Finish() } -func (_StructRepresentation_Map__ReprAssembler) Prototype() dms3ld.NodePrototype { +func (_StructRepresentation_Map__ReprAssembler) Prototype() ld.NodePrototype { return _StructRepresentation_Map__ReprPrototype{} } func (ma *_StructRepresentation_Map__ReprAssembler) valueFinishTidy() bool { @@ -19967,7 +19967,7 @@ func (ma *_StructRepresentation_Map__ReprAssembler) valueFinishTidy() bool { panic("unreachable") } } -func (ma *_StructRepresentation_Map__ReprAssembler) AssembleEntry(k string) (dms3ld.NodeAssembler, error) { +func (ma *_StructRepresentation_Map__ReprAssembler) AssembleEntry(k string) (ld.NodeAssembler, error) { switch ma.state { case maState_initial: // carry on @@ -19985,7 +19985,7 @@ func (ma *_StructRepresentation_Map__ReprAssembler) AssembleEntry(k string) (dms switch k { case "fields": if ma.s&fieldBit__StructRepresentation_Map_Fields != 0 { - return nil, dms3ld.ErrRepeatedMapKey{Key: &fieldName__StructRepresentation_Map_Fields_serial} + return nil, ld.ErrRepeatedMapKey{Key: &fieldName__StructRepresentation_Map_Fields_serial} } ma.s += fieldBit__StructRepresentation_Map_Fields ma.state = maState_midValue @@ -19996,9 +19996,9 @@ func (ma *_StructRepresentation_Map__ReprAssembler) AssembleEntry(k string) (dms return &ma.ca_fields, nil default: } - return nil, dms3ld.ErrInvalidKey{TypeName: "schemadmt.StructRepresentation_Map.Repr", Key: &_String{k}} + return nil, ld.ErrInvalidKey{TypeName: "schemadmt.StructRepresentation_Map.Repr", Key: &_String{k}} } -func (ma *_StructRepresentation_Map__ReprAssembler) AssembleKey() dms3ld.NodeAssembler { +func (ma *_StructRepresentation_Map__ReprAssembler) AssembleKey() ld.NodeAssembler { switch ma.state { case maState_initial: // carry on @@ -20016,7 +20016,7 @@ func (ma *_StructRepresentation_Map__ReprAssembler) AssembleKey() dms3ld.NodeAss ma.state = maState_midKey return (*_StructRepresentation_Map__ReprKeyAssembler)(ma) } -func (ma *_StructRepresentation_Map__ReprAssembler) AssembleValue() dms3ld.NodeAssembler { +func (ma *_StructRepresentation_Map__ReprAssembler) AssembleValue() ld.NodeAssembler { switch ma.state { case maState_initial: panic("invalid state: AssembleValue cannot be called when no key is primed") @@ -20056,26 +20056,26 @@ func (ma *_StructRepresentation_Map__ReprAssembler) Finish() error { panic("invalid state: Finish cannot be called on an assembler that's already finished") } if ma.s&fieldBits__StructRepresentation_Map_sufficient != fieldBits__StructRepresentation_Map_sufficient { - err := dms3ld.ErrMissingRequiredField{Missing: make([]string, 0)} + err := ld.ErrMissingRequiredField{Missing: make([]string, 0)} return err } ma.state = maState_finished *ma.m = schema.Maybe_Value return nil } -func (ma *_StructRepresentation_Map__ReprAssembler) KeyPrototype() dms3ld.NodePrototype { +func (ma *_StructRepresentation_Map__ReprAssembler) KeyPrototype() ld.NodePrototype { return _String__Prototype{} } -func (ma *_StructRepresentation_Map__ReprAssembler) ValuePrototype(k string) dms3ld.NodePrototype { +func (ma *_StructRepresentation_Map__ReprAssembler) ValuePrototype(k string) ld.NodePrototype { panic("todo structbuilder mapassembler repr valueprototype") } type _StructRepresentation_Map__ReprKeyAssembler _StructRepresentation_Map__ReprAssembler -func (_StructRepresentation_Map__ReprKeyAssembler) BeginMap(sizeHint int64) (dms3ld.MapAssembler, error) { +func (_StructRepresentation_Map__ReprKeyAssembler) BeginMap(sizeHint int64) (ld.MapAssembler, error) { return mixins.StringAssembler{TypeName: "schemadmt.StructRepresentation_Map.Repr.KeyAssembler"}.BeginMap(0) } -func (_StructRepresentation_Map__ReprKeyAssembler) BeginList(sizeHint int64) (dms3ld.ListAssembler, error) { +func (_StructRepresentation_Map__ReprKeyAssembler) BeginList(sizeHint int64) (ld.ListAssembler, error) { return mixins.StringAssembler{TypeName: "schemadmt.StructRepresentation_Map.Repr.KeyAssembler"}.BeginList(0) } func (na *_StructRepresentation_Map__ReprKeyAssembler) AssignNull() error { @@ -20097,29 +20097,29 @@ func (ka *_StructRepresentation_Map__ReprKeyAssembler) AssignString(k string) er switch k { case "fields": if ka.s&fieldBit__StructRepresentation_Map_Fields != 0 { - return dms3ld.ErrRepeatedMapKey{Key: &fieldName__StructRepresentation_Map_Fields_serial} + return ld.ErrRepeatedMapKey{Key: &fieldName__StructRepresentation_Map_Fields_serial} } ka.s += fieldBit__StructRepresentation_Map_Fields ka.state = maState_expectValue ka.f = 0 return nil } - return dms3ld.ErrInvalidKey{TypeName: "schemadmt.StructRepresentation_Map.Repr", Key: &_String{k}} + return ld.ErrInvalidKey{TypeName: "schemadmt.StructRepresentation_Map.Repr", Key: &_String{k}} } func (_StructRepresentation_Map__ReprKeyAssembler) AssignBytes([]byte) error { return mixins.StringAssembler{TypeName: "schemadmt.StructRepresentation_Map.Repr.KeyAssembler"}.AssignBytes(nil) } -func (_StructRepresentation_Map__ReprKeyAssembler) AssignLink(dms3ld.Link) error { +func (_StructRepresentation_Map__ReprKeyAssembler) AssignLink(ld.Link) error { return mixins.StringAssembler{TypeName: "schemadmt.StructRepresentation_Map.Repr.KeyAssembler"}.AssignLink(nil) } -func (ka *_StructRepresentation_Map__ReprKeyAssembler) AssignNode(v dms3ld.Node) error { +func (ka *_StructRepresentation_Map__ReprKeyAssembler) AssignNode(v ld.Node) error { if v2, err := v.AsString(); err != nil { return err } else { return ka.AssignString(v2) } } -func (_StructRepresentation_Map__ReprKeyAssembler) Prototype() dms3ld.NodePrototype { +func (_StructRepresentation_Map__ReprKeyAssembler) Prototype() ld.NodePrototype { return _String__Prototype{} } @@ -20145,12 +20145,12 @@ func (m MaybeStructRepresentation_Map_FieldDetails) IsAbsent() bool { func (m MaybeStructRepresentation_Map_FieldDetails) Exists() bool { return m.m == schema.Maybe_Value } -func (m MaybeStructRepresentation_Map_FieldDetails) AsNode() dms3ld.Node { +func (m MaybeStructRepresentation_Map_FieldDetails) AsNode() ld.Node { switch m.m { case schema.Maybe_Absent: - return dms3ld.Absent + return ld.Absent case schema.Maybe_Null: - return dms3ld.Null + return ld.Null case schema.Maybe_Value: return m.v default: @@ -20168,42 +20168,42 @@ var ( fieldName__StructRepresentation_Map_FieldDetails_Rename = _String{"rename"} fieldName__StructRepresentation_Map_FieldDetails_Implicit = _String{"implicit"} ) -var _ dms3ld.Node = (StructRepresentation_Map_FieldDetails)(&_StructRepresentation_Map_FieldDetails{}) +var _ ld.Node = (StructRepresentation_Map_FieldDetails)(&_StructRepresentation_Map_FieldDetails{}) var _ schema.TypedNode = (StructRepresentation_Map_FieldDetails)(&_StructRepresentation_Map_FieldDetails{}) -func (StructRepresentation_Map_FieldDetails) Kind() dms3ld.Kind { - return dms3ld.Kind_Map +func (StructRepresentation_Map_FieldDetails) Kind() ld.Kind { + return ld.Kind_Map } -func (n StructRepresentation_Map_FieldDetails) LookupByString(key string) (dms3ld.Node, error) { +func (n StructRepresentation_Map_FieldDetails) LookupByString(key string) (ld.Node, error) { switch key { case "rename": if n.rename.m == schema.Maybe_Absent { - return dms3ld.Absent, nil + return ld.Absent, nil } return &n.rename.v, nil case "implicit": if n.implicit.m == schema.Maybe_Absent { - return dms3ld.Absent, nil + return ld.Absent, nil } return n.implicit.v, nil default: - return nil, schema.ErrNoSuchField{Type: nil /*TODO*/, Field: dms3ld.PathSegmentOfString(key)} + return nil, schema.ErrNoSuchField{Type: nil /*TODO*/, Field: ld.PathSegmentOfString(key)} } } -func (n StructRepresentation_Map_FieldDetails) LookupByNode(key dms3ld.Node) (dms3ld.Node, error) { +func (n StructRepresentation_Map_FieldDetails) LookupByNode(key ld.Node) (ld.Node, error) { ks, err := key.AsString() if err != nil { return nil, err } return n.LookupByString(ks) } -func (StructRepresentation_Map_FieldDetails) LookupByIndex(idx int64) (dms3ld.Node, error) { +func (StructRepresentation_Map_FieldDetails) LookupByIndex(idx int64) (ld.Node, error) { return mixins.Map{TypeName: "schemadmt.StructRepresentation_Map_FieldDetails"}.LookupByIndex(0) } -func (n StructRepresentation_Map_FieldDetails) LookupBySegment(seg dms3ld.PathSegment) (dms3ld.Node, error) { +func (n StructRepresentation_Map_FieldDetails) LookupBySegment(seg ld.PathSegment) (ld.Node, error) { return n.LookupByString(seg.String()) } -func (n StructRepresentation_Map_FieldDetails) MapIterator() dms3ld.MapIterator { +func (n StructRepresentation_Map_FieldDetails) MapIterator() ld.MapIterator { return &_StructRepresentation_Map_FieldDetails__MapItr{n, 0} } @@ -20212,22 +20212,22 @@ type _StructRepresentation_Map_FieldDetails__MapItr struct { idx int } -func (itr *_StructRepresentation_Map_FieldDetails__MapItr) Next() (k dms3ld.Node, v dms3ld.Node, _ error) { +func (itr *_StructRepresentation_Map_FieldDetails__MapItr) Next() (k ld.Node, v ld.Node, _ error) { if itr.idx >= 2 { - return nil, nil, dms3ld.ErrIteratorOverread{} + return nil, nil, ld.ErrIteratorOverread{} } switch itr.idx { case 0: k = &fieldName__StructRepresentation_Map_FieldDetails_Rename if itr.n.rename.m == schema.Maybe_Absent { - v = dms3ld.Absent + v = ld.Absent break } v = &itr.n.rename.v case 1: k = &fieldName__StructRepresentation_Map_FieldDetails_Implicit if itr.n.implicit.m == schema.Maybe_Absent { - v = dms3ld.Absent + v = ld.Absent break } v = itr.n.implicit.v @@ -20241,7 +20241,7 @@ func (itr *_StructRepresentation_Map_FieldDetails__MapItr) Done() bool { return itr.idx >= 2 } -func (StructRepresentation_Map_FieldDetails) ListIterator() dms3ld.ListIterator { +func (StructRepresentation_Map_FieldDetails) ListIterator() ld.ListIterator { return nil } func (StructRepresentation_Map_FieldDetails) Length() int64 { @@ -20268,16 +20268,16 @@ func (StructRepresentation_Map_FieldDetails) AsString() (string, error) { func (StructRepresentation_Map_FieldDetails) AsBytes() ([]byte, error) { return mixins.Map{TypeName: "schemadmt.StructRepresentation_Map_FieldDetails"}.AsBytes() } -func (StructRepresentation_Map_FieldDetails) AsLink() (dms3ld.Link, error) { +func (StructRepresentation_Map_FieldDetails) AsLink() (ld.Link, error) { return mixins.Map{TypeName: "schemadmt.StructRepresentation_Map_FieldDetails"}.AsLink() } -func (StructRepresentation_Map_FieldDetails) Prototype() dms3ld.NodePrototype { +func (StructRepresentation_Map_FieldDetails) Prototype() ld.NodePrototype { return _StructRepresentation_Map_FieldDetails__Prototype{} } type _StructRepresentation_Map_FieldDetails__Prototype struct{} -func (_StructRepresentation_Map_FieldDetails__Prototype) NewBuilder() dms3ld.NodeBuilder { +func (_StructRepresentation_Map_FieldDetails__Prototype) NewBuilder() ld.NodeBuilder { var nb _StructRepresentation_Map_FieldDetails__Builder nb.Reset() return &nb @@ -20287,7 +20287,7 @@ type _StructRepresentation_Map_FieldDetails__Builder struct { _StructRepresentation_Map_FieldDetails__Assembler } -func (nb *_StructRepresentation_Map_FieldDetails__Builder) Build() dms3ld.Node { +func (nb *_StructRepresentation_Map_FieldDetails__Builder) Build() ld.Node { if *nb.m != schema.Maybe_Value { panic("invalid state: cannot call Build on an assembler that's not finished") } @@ -20324,7 +20324,7 @@ var ( fieldBits__StructRepresentation_Map_FieldDetails_sufficient = 0 ) -func (na *_StructRepresentation_Map_FieldDetails__Assembler) BeginMap(int64) (dms3ld.MapAssembler, error) { +func (na *_StructRepresentation_Map_FieldDetails__Assembler) BeginMap(int64) (ld.MapAssembler, error) { switch *na.m { case schema.Maybe_Value, schema.Maybe_Null: panic("invalid state: cannot assign into assembler that's already finished") @@ -20337,7 +20337,7 @@ func (na *_StructRepresentation_Map_FieldDetails__Assembler) BeginMap(int64) (dm } return na, nil } -func (_StructRepresentation_Map_FieldDetails__Assembler) BeginList(sizeHint int64) (dms3ld.ListAssembler, error) { +func (_StructRepresentation_Map_FieldDetails__Assembler) BeginList(sizeHint int64) (ld.ListAssembler, error) { return mixins.MapAssembler{TypeName: "schemadmt.StructRepresentation_Map_FieldDetails"}.BeginList(0) } func (na *_StructRepresentation_Map_FieldDetails__Assembler) AssignNull() error { @@ -20369,10 +20369,10 @@ func (_StructRepresentation_Map_FieldDetails__Assembler) AssignString(string) er func (_StructRepresentation_Map_FieldDetails__Assembler) AssignBytes([]byte) error { return mixins.MapAssembler{TypeName: "schemadmt.StructRepresentation_Map_FieldDetails"}.AssignBytes(nil) } -func (_StructRepresentation_Map_FieldDetails__Assembler) AssignLink(dms3ld.Link) error { +func (_StructRepresentation_Map_FieldDetails__Assembler) AssignLink(ld.Link) error { return mixins.MapAssembler{TypeName: "schemadmt.StructRepresentation_Map_FieldDetails"}.AssignLink(nil) } -func (na *_StructRepresentation_Map_FieldDetails__Assembler) AssignNode(v dms3ld.Node) error { +func (na *_StructRepresentation_Map_FieldDetails__Assembler) AssignNode(v ld.Node) error { if v.IsNull() { return na.AssignNull() } @@ -20392,8 +20392,8 @@ func (na *_StructRepresentation_Map_FieldDetails__Assembler) AssignNode(v dms3ld *na.m = schema.Maybe_Value return nil } - if v.Kind() != dms3ld.Kind_Map { - return dms3ld.ErrWrongKind{TypeName: "schemadmt.StructRepresentation_Map_FieldDetails", MethodName: "AssignNode", AppropriateKind: dms3ld.KindSet_JustMap, ActualKind: v.Kind()} + if v.Kind() != ld.Kind_Map { + return ld.ErrWrongKind{TypeName: "schemadmt.StructRepresentation_Map_FieldDetails", MethodName: "AssignNode", AppropriateKind: ld.KindSet_JustMap, ActualKind: v.Kind()} } itr := v.MapIterator() for !itr.Done() { @@ -20410,7 +20410,7 @@ func (na *_StructRepresentation_Map_FieldDetails__Assembler) AssignNode(v dms3ld } return na.Finish() } -func (_StructRepresentation_Map_FieldDetails__Assembler) Prototype() dms3ld.NodePrototype { +func (_StructRepresentation_Map_FieldDetails__Assembler) Prototype() ld.NodePrototype { return _StructRepresentation_Map_FieldDetails__Prototype{} } func (ma *_StructRepresentation_Map_FieldDetails__Assembler) valueFinishTidy() bool { @@ -20436,7 +20436,7 @@ func (ma *_StructRepresentation_Map_FieldDetails__Assembler) valueFinishTidy() b panic("unreachable") } } -func (ma *_StructRepresentation_Map_FieldDetails__Assembler) AssembleEntry(k string) (dms3ld.NodeAssembler, error) { +func (ma *_StructRepresentation_Map_FieldDetails__Assembler) AssembleEntry(k string) (ld.NodeAssembler, error) { switch ma.state { case maState_initial: // carry on @@ -20454,7 +20454,7 @@ func (ma *_StructRepresentation_Map_FieldDetails__Assembler) AssembleEntry(k str switch k { case "rename": if ma.s&fieldBit__StructRepresentation_Map_FieldDetails_Rename != 0 { - return nil, dms3ld.ErrRepeatedMapKey{Key: &fieldName__StructRepresentation_Map_FieldDetails_Rename} + return nil, ld.ErrRepeatedMapKey{Key: &fieldName__StructRepresentation_Map_FieldDetails_Rename} } ma.s += fieldBit__StructRepresentation_Map_FieldDetails_Rename ma.state = maState_midValue @@ -20464,7 +20464,7 @@ func (ma *_StructRepresentation_Map_FieldDetails__Assembler) AssembleEntry(k str return &ma.ca_rename, nil case "implicit": if ma.s&fieldBit__StructRepresentation_Map_FieldDetails_Implicit != 0 { - return nil, dms3ld.ErrRepeatedMapKey{Key: &fieldName__StructRepresentation_Map_FieldDetails_Implicit} + return nil, ld.ErrRepeatedMapKey{Key: &fieldName__StructRepresentation_Map_FieldDetails_Implicit} } ma.s += fieldBit__StructRepresentation_Map_FieldDetails_Implicit ma.state = maState_midValue @@ -20473,9 +20473,9 @@ func (ma *_StructRepresentation_Map_FieldDetails__Assembler) AssembleEntry(k str ma.ca_implicit.m = &ma.w.implicit.m return &ma.ca_implicit, nil } - return nil, dms3ld.ErrInvalidKey{TypeName: "schemadmt.StructRepresentation_Map_FieldDetails", Key: &_String{k}} + return nil, ld.ErrInvalidKey{TypeName: "schemadmt.StructRepresentation_Map_FieldDetails", Key: &_String{k}} } -func (ma *_StructRepresentation_Map_FieldDetails__Assembler) AssembleKey() dms3ld.NodeAssembler { +func (ma *_StructRepresentation_Map_FieldDetails__Assembler) AssembleKey() ld.NodeAssembler { switch ma.state { case maState_initial: // carry on @@ -20493,7 +20493,7 @@ func (ma *_StructRepresentation_Map_FieldDetails__Assembler) AssembleKey() dms3l ma.state = maState_midKey return (*_StructRepresentation_Map_FieldDetails__KeyAssembler)(ma) } -func (ma *_StructRepresentation_Map_FieldDetails__Assembler) AssembleValue() dms3ld.NodeAssembler { +func (ma *_StructRepresentation_Map_FieldDetails__Assembler) AssembleValue() ld.NodeAssembler { switch ma.state { case maState_initial: panic("invalid state: AssembleValue cannot be called when no key is primed") @@ -20536,26 +20536,26 @@ func (ma *_StructRepresentation_Map_FieldDetails__Assembler) Finish() error { panic("invalid state: Finish cannot be called on an assembler that's already finished") } if ma.s&fieldBits__StructRepresentation_Map_FieldDetails_sufficient != fieldBits__StructRepresentation_Map_FieldDetails_sufficient { - err := dms3ld.ErrMissingRequiredField{Missing: make([]string, 0)} + err := ld.ErrMissingRequiredField{Missing: make([]string, 0)} return err } ma.state = maState_finished *ma.m = schema.Maybe_Value return nil } -func (ma *_StructRepresentation_Map_FieldDetails__Assembler) KeyPrototype() dms3ld.NodePrototype { +func (ma *_StructRepresentation_Map_FieldDetails__Assembler) KeyPrototype() ld.NodePrototype { return _String__Prototype{} } -func (ma *_StructRepresentation_Map_FieldDetails__Assembler) ValuePrototype(k string) dms3ld.NodePrototype { +func (ma *_StructRepresentation_Map_FieldDetails__Assembler) ValuePrototype(k string) ld.NodePrototype { panic("todo structbuilder mapassembler valueprototype") } type _StructRepresentation_Map_FieldDetails__KeyAssembler _StructRepresentation_Map_FieldDetails__Assembler -func (_StructRepresentation_Map_FieldDetails__KeyAssembler) BeginMap(sizeHint int64) (dms3ld.MapAssembler, error) { +func (_StructRepresentation_Map_FieldDetails__KeyAssembler) BeginMap(sizeHint int64) (ld.MapAssembler, error) { return mixins.StringAssembler{TypeName: "schemadmt.StructRepresentation_Map_FieldDetails.KeyAssembler"}.BeginMap(0) } -func (_StructRepresentation_Map_FieldDetails__KeyAssembler) BeginList(sizeHint int64) (dms3ld.ListAssembler, error) { +func (_StructRepresentation_Map_FieldDetails__KeyAssembler) BeginList(sizeHint int64) (ld.ListAssembler, error) { return mixins.StringAssembler{TypeName: "schemadmt.StructRepresentation_Map_FieldDetails.KeyAssembler"}.BeginList(0) } func (na *_StructRepresentation_Map_FieldDetails__KeyAssembler) AssignNull() error { @@ -20577,43 +20577,43 @@ func (ka *_StructRepresentation_Map_FieldDetails__KeyAssembler) AssignString(k s switch k { case "rename": if ka.s&fieldBit__StructRepresentation_Map_FieldDetails_Rename != 0 { - return dms3ld.ErrRepeatedMapKey{Key: &fieldName__StructRepresentation_Map_FieldDetails_Rename} + return ld.ErrRepeatedMapKey{Key: &fieldName__StructRepresentation_Map_FieldDetails_Rename} } ka.s += fieldBit__StructRepresentation_Map_FieldDetails_Rename ka.state = maState_expectValue ka.f = 0 case "implicit": if ka.s&fieldBit__StructRepresentation_Map_FieldDetails_Implicit != 0 { - return dms3ld.ErrRepeatedMapKey{Key: &fieldName__StructRepresentation_Map_FieldDetails_Implicit} + return ld.ErrRepeatedMapKey{Key: &fieldName__StructRepresentation_Map_FieldDetails_Implicit} } ka.s += fieldBit__StructRepresentation_Map_FieldDetails_Implicit ka.state = maState_expectValue ka.f = 1 default: - return dms3ld.ErrInvalidKey{TypeName: "schemadmt.StructRepresentation_Map_FieldDetails", Key: &_String{k}} + return ld.ErrInvalidKey{TypeName: "schemadmt.StructRepresentation_Map_FieldDetails", Key: &_String{k}} } return nil } func (_StructRepresentation_Map_FieldDetails__KeyAssembler) AssignBytes([]byte) error { return mixins.StringAssembler{TypeName: "schemadmt.StructRepresentation_Map_FieldDetails.KeyAssembler"}.AssignBytes(nil) } -func (_StructRepresentation_Map_FieldDetails__KeyAssembler) AssignLink(dms3ld.Link) error { +func (_StructRepresentation_Map_FieldDetails__KeyAssembler) AssignLink(ld.Link) error { return mixins.StringAssembler{TypeName: "schemadmt.StructRepresentation_Map_FieldDetails.KeyAssembler"}.AssignLink(nil) } -func (ka *_StructRepresentation_Map_FieldDetails__KeyAssembler) AssignNode(v dms3ld.Node) error { +func (ka *_StructRepresentation_Map_FieldDetails__KeyAssembler) AssignNode(v ld.Node) error { if v2, err := v.AsString(); err != nil { return err } else { return ka.AssignString(v2) } } -func (_StructRepresentation_Map_FieldDetails__KeyAssembler) Prototype() dms3ld.NodePrototype { +func (_StructRepresentation_Map_FieldDetails__KeyAssembler) Prototype() ld.NodePrototype { return _String__Prototype{} } func (StructRepresentation_Map_FieldDetails) Type() schema.Type { return nil /*TODO:typelit*/ } -func (n StructRepresentation_Map_FieldDetails) Representation() dms3ld.Node { +func (n StructRepresentation_Map_FieldDetails) Representation() ld.Node { return (*_StructRepresentation_Map_FieldDetails__Repr)(n) } @@ -20623,41 +20623,41 @@ var ( fieldName__StructRepresentation_Map_FieldDetails_Rename_serial = _String{"rename"} fieldName__StructRepresentation_Map_FieldDetails_Implicit_serial = _String{"implicit"} ) -var _ dms3ld.Node = &_StructRepresentation_Map_FieldDetails__Repr{} +var _ ld.Node = &_StructRepresentation_Map_FieldDetails__Repr{} -func (_StructRepresentation_Map_FieldDetails__Repr) Kind() dms3ld.Kind { - return dms3ld.Kind_Map +func (_StructRepresentation_Map_FieldDetails__Repr) Kind() ld.Kind { + return ld.Kind_Map } -func (n *_StructRepresentation_Map_FieldDetails__Repr) LookupByString(key string) (dms3ld.Node, error) { +func (n *_StructRepresentation_Map_FieldDetails__Repr) LookupByString(key string) (ld.Node, error) { switch key { case "rename": if n.rename.m == schema.Maybe_Absent { - return dms3ld.Absent, dms3ld.ErrNotExists{Segment: dms3ld.PathSegmentOfString(key)} + return ld.Absent, ld.ErrNotExists{Segment: ld.PathSegmentOfString(key)} } return n.rename.v.Representation(), nil case "implicit": if n.implicit.m == schema.Maybe_Absent { - return dms3ld.Absent, dms3ld.ErrNotExists{Segment: dms3ld.PathSegmentOfString(key)} + return ld.Absent, ld.ErrNotExists{Segment: ld.PathSegmentOfString(key)} } return n.implicit.v.Representation(), nil default: - return nil, schema.ErrNoSuchField{Type: nil /*TODO*/, Field: dms3ld.PathSegmentOfString(key)} + return nil, schema.ErrNoSuchField{Type: nil /*TODO*/, Field: ld.PathSegmentOfString(key)} } } -func (n *_StructRepresentation_Map_FieldDetails__Repr) LookupByNode(key dms3ld.Node) (dms3ld.Node, error) { +func (n *_StructRepresentation_Map_FieldDetails__Repr) LookupByNode(key ld.Node) (ld.Node, error) { ks, err := key.AsString() if err != nil { return nil, err } return n.LookupByString(ks) } -func (_StructRepresentation_Map_FieldDetails__Repr) LookupByIndex(idx int64) (dms3ld.Node, error) { +func (_StructRepresentation_Map_FieldDetails__Repr) LookupByIndex(idx int64) (ld.Node, error) { return mixins.Map{TypeName: "schemadmt.StructRepresentation_Map_FieldDetails.Repr"}.LookupByIndex(0) } -func (n _StructRepresentation_Map_FieldDetails__Repr) LookupBySegment(seg dms3ld.PathSegment) (dms3ld.Node, error) { +func (n _StructRepresentation_Map_FieldDetails__Repr) LookupBySegment(seg ld.PathSegment) (ld.Node, error) { return n.LookupByString(seg.String()) } -func (n *_StructRepresentation_Map_FieldDetails__Repr) MapIterator() dms3ld.MapIterator { +func (n *_StructRepresentation_Map_FieldDetails__Repr) MapIterator() ld.MapIterator { end := 2 if n.implicit.m == schema.Maybe_Absent { end = 1 @@ -20679,10 +20679,10 @@ type _StructRepresentation_Map_FieldDetails__ReprMapItr struct { end int } -func (itr *_StructRepresentation_Map_FieldDetails__ReprMapItr) Next() (k dms3ld.Node, v dms3ld.Node, _ error) { +func (itr *_StructRepresentation_Map_FieldDetails__ReprMapItr) Next() (k ld.Node, v ld.Node, _ error) { advance: if itr.idx >= 2 { - return nil, nil, dms3ld.ErrIteratorOverread{} + return nil, nil, ld.ErrIteratorOverread{} } switch itr.idx { case 0: @@ -20708,7 +20708,7 @@ advance: func (itr *_StructRepresentation_Map_FieldDetails__ReprMapItr) Done() bool { return itr.idx >= itr.end } -func (_StructRepresentation_Map_FieldDetails__Repr) ListIterator() dms3ld.ListIterator { +func (_StructRepresentation_Map_FieldDetails__Repr) ListIterator() ld.ListIterator { return nil } func (rn *_StructRepresentation_Map_FieldDetails__Repr) Length() int64 { @@ -20742,16 +20742,16 @@ func (_StructRepresentation_Map_FieldDetails__Repr) AsString() (string, error) { func (_StructRepresentation_Map_FieldDetails__Repr) AsBytes() ([]byte, error) { return mixins.Map{TypeName: "schemadmt.StructRepresentation_Map_FieldDetails.Repr"}.AsBytes() } -func (_StructRepresentation_Map_FieldDetails__Repr) AsLink() (dms3ld.Link, error) { +func (_StructRepresentation_Map_FieldDetails__Repr) AsLink() (ld.Link, error) { return mixins.Map{TypeName: "schemadmt.StructRepresentation_Map_FieldDetails.Repr"}.AsLink() } -func (_StructRepresentation_Map_FieldDetails__Repr) Prototype() dms3ld.NodePrototype { +func (_StructRepresentation_Map_FieldDetails__Repr) Prototype() ld.NodePrototype { return _StructRepresentation_Map_FieldDetails__ReprPrototype{} } type _StructRepresentation_Map_FieldDetails__ReprPrototype struct{} -func (_StructRepresentation_Map_FieldDetails__ReprPrototype) NewBuilder() dms3ld.NodeBuilder { +func (_StructRepresentation_Map_FieldDetails__ReprPrototype) NewBuilder() ld.NodeBuilder { var nb _StructRepresentation_Map_FieldDetails__ReprBuilder nb.Reset() return &nb @@ -20761,7 +20761,7 @@ type _StructRepresentation_Map_FieldDetails__ReprBuilder struct { _StructRepresentation_Map_FieldDetails__ReprAssembler } -func (nb *_StructRepresentation_Map_FieldDetails__ReprBuilder) Build() dms3ld.Node { +func (nb *_StructRepresentation_Map_FieldDetails__ReprBuilder) Build() ld.Node { if *nb.m != schema.Maybe_Value { panic("invalid state: cannot call Build on an assembler that's not finished") } @@ -20791,7 +20791,7 @@ func (na *_StructRepresentation_Map_FieldDetails__ReprAssembler) reset() { na.ca_rename.reset() na.ca_implicit.reset() } -func (na *_StructRepresentation_Map_FieldDetails__ReprAssembler) BeginMap(int64) (dms3ld.MapAssembler, error) { +func (na *_StructRepresentation_Map_FieldDetails__ReprAssembler) BeginMap(int64) (ld.MapAssembler, error) { switch *na.m { case schema.Maybe_Value, schema.Maybe_Null: panic("invalid state: cannot assign into assembler that's already finished") @@ -20804,7 +20804,7 @@ func (na *_StructRepresentation_Map_FieldDetails__ReprAssembler) BeginMap(int64) } return na, nil } -func (_StructRepresentation_Map_FieldDetails__ReprAssembler) BeginList(sizeHint int64) (dms3ld.ListAssembler, error) { +func (_StructRepresentation_Map_FieldDetails__ReprAssembler) BeginList(sizeHint int64) (ld.ListAssembler, error) { return mixins.MapAssembler{TypeName: "schemadmt.StructRepresentation_Map_FieldDetails.Repr"}.BeginList(0) } func (na *_StructRepresentation_Map_FieldDetails__ReprAssembler) AssignNull() error { @@ -20836,10 +20836,10 @@ func (_StructRepresentation_Map_FieldDetails__ReprAssembler) AssignString(string func (_StructRepresentation_Map_FieldDetails__ReprAssembler) AssignBytes([]byte) error { return mixins.MapAssembler{TypeName: "schemadmt.StructRepresentation_Map_FieldDetails.Repr"}.AssignBytes(nil) } -func (_StructRepresentation_Map_FieldDetails__ReprAssembler) AssignLink(dms3ld.Link) error { +func (_StructRepresentation_Map_FieldDetails__ReprAssembler) AssignLink(ld.Link) error { return mixins.MapAssembler{TypeName: "schemadmt.StructRepresentation_Map_FieldDetails.Repr"}.AssignLink(nil) } -func (na *_StructRepresentation_Map_FieldDetails__ReprAssembler) AssignNode(v dms3ld.Node) error { +func (na *_StructRepresentation_Map_FieldDetails__ReprAssembler) AssignNode(v ld.Node) error { if v.IsNull() { return na.AssignNull() } @@ -20859,8 +20859,8 @@ func (na *_StructRepresentation_Map_FieldDetails__ReprAssembler) AssignNode(v dm *na.m = schema.Maybe_Value return nil } - if v.Kind() != dms3ld.Kind_Map { - return dms3ld.ErrWrongKind{TypeName: "schemadmt.StructRepresentation_Map_FieldDetails.Repr", MethodName: "AssignNode", AppropriateKind: dms3ld.KindSet_JustMap, ActualKind: v.Kind()} + if v.Kind() != ld.Kind_Map { + return ld.ErrWrongKind{TypeName: "schemadmt.StructRepresentation_Map_FieldDetails.Repr", MethodName: "AssignNode", AppropriateKind: ld.KindSet_JustMap, ActualKind: v.Kind()} } itr := v.MapIterator() for !itr.Done() { @@ -20877,7 +20877,7 @@ func (na *_StructRepresentation_Map_FieldDetails__ReprAssembler) AssignNode(v dm } return na.Finish() } -func (_StructRepresentation_Map_FieldDetails__ReprAssembler) Prototype() dms3ld.NodePrototype { +func (_StructRepresentation_Map_FieldDetails__ReprAssembler) Prototype() ld.NodePrototype { return _StructRepresentation_Map_FieldDetails__ReprPrototype{} } func (ma *_StructRepresentation_Map_FieldDetails__ReprAssembler) valueFinishTidy() bool { @@ -20903,7 +20903,7 @@ func (ma *_StructRepresentation_Map_FieldDetails__ReprAssembler) valueFinishTidy panic("unreachable") } } -func (ma *_StructRepresentation_Map_FieldDetails__ReprAssembler) AssembleEntry(k string) (dms3ld.NodeAssembler, error) { +func (ma *_StructRepresentation_Map_FieldDetails__ReprAssembler) AssembleEntry(k string) (ld.NodeAssembler, error) { switch ma.state { case maState_initial: // carry on @@ -20921,7 +20921,7 @@ func (ma *_StructRepresentation_Map_FieldDetails__ReprAssembler) AssembleEntry(k switch k { case "rename": if ma.s&fieldBit__StructRepresentation_Map_FieldDetails_Rename != 0 { - return nil, dms3ld.ErrRepeatedMapKey{Key: &fieldName__StructRepresentation_Map_FieldDetails_Rename_serial} + return nil, ld.ErrRepeatedMapKey{Key: &fieldName__StructRepresentation_Map_FieldDetails_Rename_serial} } ma.s += fieldBit__StructRepresentation_Map_FieldDetails_Rename ma.state = maState_midValue @@ -20932,7 +20932,7 @@ func (ma *_StructRepresentation_Map_FieldDetails__ReprAssembler) AssembleEntry(k return &ma.ca_rename, nil case "implicit": if ma.s&fieldBit__StructRepresentation_Map_FieldDetails_Implicit != 0 { - return nil, dms3ld.ErrRepeatedMapKey{Key: &fieldName__StructRepresentation_Map_FieldDetails_Implicit_serial} + return nil, ld.ErrRepeatedMapKey{Key: &fieldName__StructRepresentation_Map_FieldDetails_Implicit_serial} } ma.s += fieldBit__StructRepresentation_Map_FieldDetails_Implicit ma.state = maState_midValue @@ -20943,9 +20943,9 @@ func (ma *_StructRepresentation_Map_FieldDetails__ReprAssembler) AssembleEntry(k return &ma.ca_implicit, nil default: } - return nil, dms3ld.ErrInvalidKey{TypeName: "schemadmt.StructRepresentation_Map_FieldDetails.Repr", Key: &_String{k}} + return nil, ld.ErrInvalidKey{TypeName: "schemadmt.StructRepresentation_Map_FieldDetails.Repr", Key: &_String{k}} } -func (ma *_StructRepresentation_Map_FieldDetails__ReprAssembler) AssembleKey() dms3ld.NodeAssembler { +func (ma *_StructRepresentation_Map_FieldDetails__ReprAssembler) AssembleKey() ld.NodeAssembler { switch ma.state { case maState_initial: // carry on @@ -20963,7 +20963,7 @@ func (ma *_StructRepresentation_Map_FieldDetails__ReprAssembler) AssembleKey() d ma.state = maState_midKey return (*_StructRepresentation_Map_FieldDetails__ReprKeyAssembler)(ma) } -func (ma *_StructRepresentation_Map_FieldDetails__ReprAssembler) AssembleValue() dms3ld.NodeAssembler { +func (ma *_StructRepresentation_Map_FieldDetails__ReprAssembler) AssembleValue() ld.NodeAssembler { switch ma.state { case maState_initial: panic("invalid state: AssembleValue cannot be called when no key is primed") @@ -21008,26 +21008,26 @@ func (ma *_StructRepresentation_Map_FieldDetails__ReprAssembler) Finish() error panic("invalid state: Finish cannot be called on an assembler that's already finished") } if ma.s&fieldBits__StructRepresentation_Map_FieldDetails_sufficient != fieldBits__StructRepresentation_Map_FieldDetails_sufficient { - err := dms3ld.ErrMissingRequiredField{Missing: make([]string, 0)} + err := ld.ErrMissingRequiredField{Missing: make([]string, 0)} return err } ma.state = maState_finished *ma.m = schema.Maybe_Value return nil } -func (ma *_StructRepresentation_Map_FieldDetails__ReprAssembler) KeyPrototype() dms3ld.NodePrototype { +func (ma *_StructRepresentation_Map_FieldDetails__ReprAssembler) KeyPrototype() ld.NodePrototype { return _String__Prototype{} } -func (ma *_StructRepresentation_Map_FieldDetails__ReprAssembler) ValuePrototype(k string) dms3ld.NodePrototype { +func (ma *_StructRepresentation_Map_FieldDetails__ReprAssembler) ValuePrototype(k string) ld.NodePrototype { panic("todo structbuilder mapassembler repr valueprototype") } type _StructRepresentation_Map_FieldDetails__ReprKeyAssembler _StructRepresentation_Map_FieldDetails__ReprAssembler -func (_StructRepresentation_Map_FieldDetails__ReprKeyAssembler) BeginMap(sizeHint int64) (dms3ld.MapAssembler, error) { +func (_StructRepresentation_Map_FieldDetails__ReprKeyAssembler) BeginMap(sizeHint int64) (ld.MapAssembler, error) { return mixins.StringAssembler{TypeName: "schemadmt.StructRepresentation_Map_FieldDetails.Repr.KeyAssembler"}.BeginMap(0) } -func (_StructRepresentation_Map_FieldDetails__ReprKeyAssembler) BeginList(sizeHint int64) (dms3ld.ListAssembler, error) { +func (_StructRepresentation_Map_FieldDetails__ReprKeyAssembler) BeginList(sizeHint int64) (ld.ListAssembler, error) { return mixins.StringAssembler{TypeName: "schemadmt.StructRepresentation_Map_FieldDetails.Repr.KeyAssembler"}.BeginList(0) } func (na *_StructRepresentation_Map_FieldDetails__ReprKeyAssembler) AssignNull() error { @@ -21049,7 +21049,7 @@ func (ka *_StructRepresentation_Map_FieldDetails__ReprKeyAssembler) AssignString switch k { case "rename": if ka.s&fieldBit__StructRepresentation_Map_FieldDetails_Rename != 0 { - return dms3ld.ErrRepeatedMapKey{Key: &fieldName__StructRepresentation_Map_FieldDetails_Rename_serial} + return ld.ErrRepeatedMapKey{Key: &fieldName__StructRepresentation_Map_FieldDetails_Rename_serial} } ka.s += fieldBit__StructRepresentation_Map_FieldDetails_Rename ka.state = maState_expectValue @@ -21057,29 +21057,29 @@ func (ka *_StructRepresentation_Map_FieldDetails__ReprKeyAssembler) AssignString return nil case "implicit": if ka.s&fieldBit__StructRepresentation_Map_FieldDetails_Implicit != 0 { - return dms3ld.ErrRepeatedMapKey{Key: &fieldName__StructRepresentation_Map_FieldDetails_Implicit_serial} + return ld.ErrRepeatedMapKey{Key: &fieldName__StructRepresentation_Map_FieldDetails_Implicit_serial} } ka.s += fieldBit__StructRepresentation_Map_FieldDetails_Implicit ka.state = maState_expectValue ka.f = 1 return nil } - return dms3ld.ErrInvalidKey{TypeName: "schemadmt.StructRepresentation_Map_FieldDetails.Repr", Key: &_String{k}} + return ld.ErrInvalidKey{TypeName: "schemadmt.StructRepresentation_Map_FieldDetails.Repr", Key: &_String{k}} } func (_StructRepresentation_Map_FieldDetails__ReprKeyAssembler) AssignBytes([]byte) error { return mixins.StringAssembler{TypeName: "schemadmt.StructRepresentation_Map_FieldDetails.Repr.KeyAssembler"}.AssignBytes(nil) } -func (_StructRepresentation_Map_FieldDetails__ReprKeyAssembler) AssignLink(dms3ld.Link) error { +func (_StructRepresentation_Map_FieldDetails__ReprKeyAssembler) AssignLink(ld.Link) error { return mixins.StringAssembler{TypeName: "schemadmt.StructRepresentation_Map_FieldDetails.Repr.KeyAssembler"}.AssignLink(nil) } -func (ka *_StructRepresentation_Map_FieldDetails__ReprKeyAssembler) AssignNode(v dms3ld.Node) error { +func (ka *_StructRepresentation_Map_FieldDetails__ReprKeyAssembler) AssignNode(v ld.Node) error { if v2, err := v.AsString(); err != nil { return err } else { return ka.AssignString(v2) } } -func (_StructRepresentation_Map_FieldDetails__ReprKeyAssembler) Prototype() dms3ld.NodePrototype { +func (_StructRepresentation_Map_FieldDetails__ReprKeyAssembler) Prototype() ld.NodePrototype { return _String__Prototype{} } @@ -21105,12 +21105,12 @@ func (m MaybeStructRepresentation_Stringjoin) IsAbsent() bool { func (m MaybeStructRepresentation_Stringjoin) Exists() bool { return m.m == schema.Maybe_Value } -func (m MaybeStructRepresentation_Stringjoin) AsNode() dms3ld.Node { +func (m MaybeStructRepresentation_Stringjoin) AsNode() ld.Node { switch m.m { case schema.Maybe_Absent: - return dms3ld.Absent + return ld.Absent case schema.Maybe_Null: - return dms3ld.Null + return ld.Null case schema.Maybe_Value: return m.v default: @@ -21128,39 +21128,39 @@ var ( fieldName__StructRepresentation_Stringjoin_Join = _String{"join"} fieldName__StructRepresentation_Stringjoin_FieldOrder = _String{"fieldOrder"} ) -var _ dms3ld.Node = (StructRepresentation_Stringjoin)(&_StructRepresentation_Stringjoin{}) +var _ ld.Node = (StructRepresentation_Stringjoin)(&_StructRepresentation_Stringjoin{}) var _ schema.TypedNode = (StructRepresentation_Stringjoin)(&_StructRepresentation_Stringjoin{}) -func (StructRepresentation_Stringjoin) Kind() dms3ld.Kind { - return dms3ld.Kind_Map +func (StructRepresentation_Stringjoin) Kind() ld.Kind { + return ld.Kind_Map } -func (n StructRepresentation_Stringjoin) LookupByString(key string) (dms3ld.Node, error) { +func (n StructRepresentation_Stringjoin) LookupByString(key string) (ld.Node, error) { switch key { case "join": return &n.join, nil case "fieldOrder": if n.fieldOrder.m == schema.Maybe_Absent { - return dms3ld.Absent, nil + return ld.Absent, nil } return &n.fieldOrder.v, nil default: - return nil, schema.ErrNoSuchField{Type: nil /*TODO*/, Field: dms3ld.PathSegmentOfString(key)} + return nil, schema.ErrNoSuchField{Type: nil /*TODO*/, Field: ld.PathSegmentOfString(key)} } } -func (n StructRepresentation_Stringjoin) LookupByNode(key dms3ld.Node) (dms3ld.Node, error) { +func (n StructRepresentation_Stringjoin) LookupByNode(key ld.Node) (ld.Node, error) { ks, err := key.AsString() if err != nil { return nil, err } return n.LookupByString(ks) } -func (StructRepresentation_Stringjoin) LookupByIndex(idx int64) (dms3ld.Node, error) { +func (StructRepresentation_Stringjoin) LookupByIndex(idx int64) (ld.Node, error) { return mixins.Map{TypeName: "schemadmt.StructRepresentation_Stringjoin"}.LookupByIndex(0) } -func (n StructRepresentation_Stringjoin) LookupBySegment(seg dms3ld.PathSegment) (dms3ld.Node, error) { +func (n StructRepresentation_Stringjoin) LookupBySegment(seg ld.PathSegment) (ld.Node, error) { return n.LookupByString(seg.String()) } -func (n StructRepresentation_Stringjoin) MapIterator() dms3ld.MapIterator { +func (n StructRepresentation_Stringjoin) MapIterator() ld.MapIterator { return &_StructRepresentation_Stringjoin__MapItr{n, 0} } @@ -21169,9 +21169,9 @@ type _StructRepresentation_Stringjoin__MapItr struct { idx int } -func (itr *_StructRepresentation_Stringjoin__MapItr) Next() (k dms3ld.Node, v dms3ld.Node, _ error) { +func (itr *_StructRepresentation_Stringjoin__MapItr) Next() (k ld.Node, v ld.Node, _ error) { if itr.idx >= 2 { - return nil, nil, dms3ld.ErrIteratorOverread{} + return nil, nil, ld.ErrIteratorOverread{} } switch itr.idx { case 0: @@ -21180,7 +21180,7 @@ func (itr *_StructRepresentation_Stringjoin__MapItr) Next() (k dms3ld.Node, v dm case 1: k = &fieldName__StructRepresentation_Stringjoin_FieldOrder if itr.n.fieldOrder.m == schema.Maybe_Absent { - v = dms3ld.Absent + v = ld.Absent break } v = &itr.n.fieldOrder.v @@ -21194,7 +21194,7 @@ func (itr *_StructRepresentation_Stringjoin__MapItr) Done() bool { return itr.idx >= 2 } -func (StructRepresentation_Stringjoin) ListIterator() dms3ld.ListIterator { +func (StructRepresentation_Stringjoin) ListIterator() ld.ListIterator { return nil } func (StructRepresentation_Stringjoin) Length() int64 { @@ -21221,16 +21221,16 @@ func (StructRepresentation_Stringjoin) AsString() (string, error) { func (StructRepresentation_Stringjoin) AsBytes() ([]byte, error) { return mixins.Map{TypeName: "schemadmt.StructRepresentation_Stringjoin"}.AsBytes() } -func (StructRepresentation_Stringjoin) AsLink() (dms3ld.Link, error) { +func (StructRepresentation_Stringjoin) AsLink() (ld.Link, error) { return mixins.Map{TypeName: "schemadmt.StructRepresentation_Stringjoin"}.AsLink() } -func (StructRepresentation_Stringjoin) Prototype() dms3ld.NodePrototype { +func (StructRepresentation_Stringjoin) Prototype() ld.NodePrototype { return _StructRepresentation_Stringjoin__Prototype{} } type _StructRepresentation_Stringjoin__Prototype struct{} -func (_StructRepresentation_Stringjoin__Prototype) NewBuilder() dms3ld.NodeBuilder { +func (_StructRepresentation_Stringjoin__Prototype) NewBuilder() ld.NodeBuilder { var nb _StructRepresentation_Stringjoin__Builder nb.Reset() return &nb @@ -21240,7 +21240,7 @@ type _StructRepresentation_Stringjoin__Builder struct { _StructRepresentation_Stringjoin__Assembler } -func (nb *_StructRepresentation_Stringjoin__Builder) Build() dms3ld.Node { +func (nb *_StructRepresentation_Stringjoin__Builder) Build() ld.Node { if *nb.m != schema.Maybe_Value { panic("invalid state: cannot call Build on an assembler that's not finished") } @@ -21277,7 +21277,7 @@ var ( fieldBits__StructRepresentation_Stringjoin_sufficient = 0 + 1<<0 ) -func (na *_StructRepresentation_Stringjoin__Assembler) BeginMap(int64) (dms3ld.MapAssembler, error) { +func (na *_StructRepresentation_Stringjoin__Assembler) BeginMap(int64) (ld.MapAssembler, error) { switch *na.m { case schema.Maybe_Value, schema.Maybe_Null: panic("invalid state: cannot assign into assembler that's already finished") @@ -21290,7 +21290,7 @@ func (na *_StructRepresentation_Stringjoin__Assembler) BeginMap(int64) (dms3ld.M } return na, nil } -func (_StructRepresentation_Stringjoin__Assembler) BeginList(sizeHint int64) (dms3ld.ListAssembler, error) { +func (_StructRepresentation_Stringjoin__Assembler) BeginList(sizeHint int64) (ld.ListAssembler, error) { return mixins.MapAssembler{TypeName: "schemadmt.StructRepresentation_Stringjoin"}.BeginList(0) } func (na *_StructRepresentation_Stringjoin__Assembler) AssignNull() error { @@ -21322,10 +21322,10 @@ func (_StructRepresentation_Stringjoin__Assembler) AssignString(string) error { func (_StructRepresentation_Stringjoin__Assembler) AssignBytes([]byte) error { return mixins.MapAssembler{TypeName: "schemadmt.StructRepresentation_Stringjoin"}.AssignBytes(nil) } -func (_StructRepresentation_Stringjoin__Assembler) AssignLink(dms3ld.Link) error { +func (_StructRepresentation_Stringjoin__Assembler) AssignLink(ld.Link) error { return mixins.MapAssembler{TypeName: "schemadmt.StructRepresentation_Stringjoin"}.AssignLink(nil) } -func (na *_StructRepresentation_Stringjoin__Assembler) AssignNode(v dms3ld.Node) error { +func (na *_StructRepresentation_Stringjoin__Assembler) AssignNode(v ld.Node) error { if v.IsNull() { return na.AssignNull() } @@ -21345,8 +21345,8 @@ func (na *_StructRepresentation_Stringjoin__Assembler) AssignNode(v dms3ld.Node) *na.m = schema.Maybe_Value return nil } - if v.Kind() != dms3ld.Kind_Map { - return dms3ld.ErrWrongKind{TypeName: "schemadmt.StructRepresentation_Stringjoin", MethodName: "AssignNode", AppropriateKind: dms3ld.KindSet_JustMap, ActualKind: v.Kind()} + if v.Kind() != ld.Kind_Map { + return ld.ErrWrongKind{TypeName: "schemadmt.StructRepresentation_Stringjoin", MethodName: "AssignNode", AppropriateKind: ld.KindSet_JustMap, ActualKind: v.Kind()} } itr := v.MapIterator() for !itr.Done() { @@ -21363,7 +21363,7 @@ func (na *_StructRepresentation_Stringjoin__Assembler) AssignNode(v dms3ld.Node) } return na.Finish() } -func (_StructRepresentation_Stringjoin__Assembler) Prototype() dms3ld.NodePrototype { +func (_StructRepresentation_Stringjoin__Assembler) Prototype() ld.NodePrototype { return _StructRepresentation_Stringjoin__Prototype{} } func (ma *_StructRepresentation_Stringjoin__Assembler) valueFinishTidy() bool { @@ -21390,7 +21390,7 @@ func (ma *_StructRepresentation_Stringjoin__Assembler) valueFinishTidy() bool { panic("unreachable") } } -func (ma *_StructRepresentation_Stringjoin__Assembler) AssembleEntry(k string) (dms3ld.NodeAssembler, error) { +func (ma *_StructRepresentation_Stringjoin__Assembler) AssembleEntry(k string) (ld.NodeAssembler, error) { switch ma.state { case maState_initial: // carry on @@ -21408,7 +21408,7 @@ func (ma *_StructRepresentation_Stringjoin__Assembler) AssembleEntry(k string) ( switch k { case "join": if ma.s&fieldBit__StructRepresentation_Stringjoin_Join != 0 { - return nil, dms3ld.ErrRepeatedMapKey{Key: &fieldName__StructRepresentation_Stringjoin_Join} + return nil, ld.ErrRepeatedMapKey{Key: &fieldName__StructRepresentation_Stringjoin_Join} } ma.s += fieldBit__StructRepresentation_Stringjoin_Join ma.state = maState_midValue @@ -21418,7 +21418,7 @@ func (ma *_StructRepresentation_Stringjoin__Assembler) AssembleEntry(k string) ( return &ma.ca_join, nil case "fieldOrder": if ma.s&fieldBit__StructRepresentation_Stringjoin_FieldOrder != 0 { - return nil, dms3ld.ErrRepeatedMapKey{Key: &fieldName__StructRepresentation_Stringjoin_FieldOrder} + return nil, ld.ErrRepeatedMapKey{Key: &fieldName__StructRepresentation_Stringjoin_FieldOrder} } ma.s += fieldBit__StructRepresentation_Stringjoin_FieldOrder ma.state = maState_midValue @@ -21427,9 +21427,9 @@ func (ma *_StructRepresentation_Stringjoin__Assembler) AssembleEntry(k string) ( ma.ca_fieldOrder.m = &ma.w.fieldOrder.m return &ma.ca_fieldOrder, nil } - return nil, dms3ld.ErrInvalidKey{TypeName: "schemadmt.StructRepresentation_Stringjoin", Key: &_String{k}} + return nil, ld.ErrInvalidKey{TypeName: "schemadmt.StructRepresentation_Stringjoin", Key: &_String{k}} } -func (ma *_StructRepresentation_Stringjoin__Assembler) AssembleKey() dms3ld.NodeAssembler { +func (ma *_StructRepresentation_Stringjoin__Assembler) AssembleKey() ld.NodeAssembler { switch ma.state { case maState_initial: // carry on @@ -21447,7 +21447,7 @@ func (ma *_StructRepresentation_Stringjoin__Assembler) AssembleKey() dms3ld.Node ma.state = maState_midKey return (*_StructRepresentation_Stringjoin__KeyAssembler)(ma) } -func (ma *_StructRepresentation_Stringjoin__Assembler) AssembleValue() dms3ld.NodeAssembler { +func (ma *_StructRepresentation_Stringjoin__Assembler) AssembleValue() ld.NodeAssembler { switch ma.state { case maState_initial: panic("invalid state: AssembleValue cannot be called when no key is primed") @@ -21490,7 +21490,7 @@ func (ma *_StructRepresentation_Stringjoin__Assembler) Finish() error { panic("invalid state: Finish cannot be called on an assembler that's already finished") } if ma.s&fieldBits__StructRepresentation_Stringjoin_sufficient != fieldBits__StructRepresentation_Stringjoin_sufficient { - err := dms3ld.ErrMissingRequiredField{Missing: make([]string, 0)} + err := ld.ErrMissingRequiredField{Missing: make([]string, 0)} if ma.s&fieldBit__StructRepresentation_Stringjoin_Join == 0 { err.Missing = append(err.Missing, "join") } @@ -21500,19 +21500,19 @@ func (ma *_StructRepresentation_Stringjoin__Assembler) Finish() error { *ma.m = schema.Maybe_Value return nil } -func (ma *_StructRepresentation_Stringjoin__Assembler) KeyPrototype() dms3ld.NodePrototype { +func (ma *_StructRepresentation_Stringjoin__Assembler) KeyPrototype() ld.NodePrototype { return _String__Prototype{} } -func (ma *_StructRepresentation_Stringjoin__Assembler) ValuePrototype(k string) dms3ld.NodePrototype { +func (ma *_StructRepresentation_Stringjoin__Assembler) ValuePrototype(k string) ld.NodePrototype { panic("todo structbuilder mapassembler valueprototype") } type _StructRepresentation_Stringjoin__KeyAssembler _StructRepresentation_Stringjoin__Assembler -func (_StructRepresentation_Stringjoin__KeyAssembler) BeginMap(sizeHint int64) (dms3ld.MapAssembler, error) { +func (_StructRepresentation_Stringjoin__KeyAssembler) BeginMap(sizeHint int64) (ld.MapAssembler, error) { return mixins.StringAssembler{TypeName: "schemadmt.StructRepresentation_Stringjoin.KeyAssembler"}.BeginMap(0) } -func (_StructRepresentation_Stringjoin__KeyAssembler) BeginList(sizeHint int64) (dms3ld.ListAssembler, error) { +func (_StructRepresentation_Stringjoin__KeyAssembler) BeginList(sizeHint int64) (ld.ListAssembler, error) { return mixins.StringAssembler{TypeName: "schemadmt.StructRepresentation_Stringjoin.KeyAssembler"}.BeginList(0) } func (na *_StructRepresentation_Stringjoin__KeyAssembler) AssignNull() error { @@ -21534,43 +21534,43 @@ func (ka *_StructRepresentation_Stringjoin__KeyAssembler) AssignString(k string) switch k { case "join": if ka.s&fieldBit__StructRepresentation_Stringjoin_Join != 0 { - return dms3ld.ErrRepeatedMapKey{Key: &fieldName__StructRepresentation_Stringjoin_Join} + return ld.ErrRepeatedMapKey{Key: &fieldName__StructRepresentation_Stringjoin_Join} } ka.s += fieldBit__StructRepresentation_Stringjoin_Join ka.state = maState_expectValue ka.f = 0 case "fieldOrder": if ka.s&fieldBit__StructRepresentation_Stringjoin_FieldOrder != 0 { - return dms3ld.ErrRepeatedMapKey{Key: &fieldName__StructRepresentation_Stringjoin_FieldOrder} + return ld.ErrRepeatedMapKey{Key: &fieldName__StructRepresentation_Stringjoin_FieldOrder} } ka.s += fieldBit__StructRepresentation_Stringjoin_FieldOrder ka.state = maState_expectValue ka.f = 1 default: - return dms3ld.ErrInvalidKey{TypeName: "schemadmt.StructRepresentation_Stringjoin", Key: &_String{k}} + return ld.ErrInvalidKey{TypeName: "schemadmt.StructRepresentation_Stringjoin", Key: &_String{k}} } return nil } func (_StructRepresentation_Stringjoin__KeyAssembler) AssignBytes([]byte) error { return mixins.StringAssembler{TypeName: "schemadmt.StructRepresentation_Stringjoin.KeyAssembler"}.AssignBytes(nil) } -func (_StructRepresentation_Stringjoin__KeyAssembler) AssignLink(dms3ld.Link) error { +func (_StructRepresentation_Stringjoin__KeyAssembler) AssignLink(ld.Link) error { return mixins.StringAssembler{TypeName: "schemadmt.StructRepresentation_Stringjoin.KeyAssembler"}.AssignLink(nil) } -func (ka *_StructRepresentation_Stringjoin__KeyAssembler) AssignNode(v dms3ld.Node) error { +func (ka *_StructRepresentation_Stringjoin__KeyAssembler) AssignNode(v ld.Node) error { if v2, err := v.AsString(); err != nil { return err } else { return ka.AssignString(v2) } } -func (_StructRepresentation_Stringjoin__KeyAssembler) Prototype() dms3ld.NodePrototype { +func (_StructRepresentation_Stringjoin__KeyAssembler) Prototype() ld.NodePrototype { return _String__Prototype{} } func (StructRepresentation_Stringjoin) Type() schema.Type { return nil /*TODO:typelit*/ } -func (n StructRepresentation_Stringjoin) Representation() dms3ld.Node { +func (n StructRepresentation_Stringjoin) Representation() ld.Node { return (*_StructRepresentation_Stringjoin__Repr)(n) } @@ -21580,38 +21580,38 @@ var ( fieldName__StructRepresentation_Stringjoin_Join_serial = _String{"join"} fieldName__StructRepresentation_Stringjoin_FieldOrder_serial = _String{"fieldOrder"} ) -var _ dms3ld.Node = &_StructRepresentation_Stringjoin__Repr{} +var _ ld.Node = &_StructRepresentation_Stringjoin__Repr{} -func (_StructRepresentation_Stringjoin__Repr) Kind() dms3ld.Kind { - return dms3ld.Kind_Map +func (_StructRepresentation_Stringjoin__Repr) Kind() ld.Kind { + return ld.Kind_Map } -func (n *_StructRepresentation_Stringjoin__Repr) LookupByString(key string) (dms3ld.Node, error) { +func (n *_StructRepresentation_Stringjoin__Repr) LookupByString(key string) (ld.Node, error) { switch key { case "join": return n.join.Representation(), nil case "fieldOrder": if n.fieldOrder.m == schema.Maybe_Absent { - return dms3ld.Absent, dms3ld.ErrNotExists{Segment: dms3ld.PathSegmentOfString(key)} + return ld.Absent, ld.ErrNotExists{Segment: ld.PathSegmentOfString(key)} } return n.fieldOrder.v.Representation(), nil default: - return nil, schema.ErrNoSuchField{Type: nil /*TODO*/, Field: dms3ld.PathSegmentOfString(key)} + return nil, schema.ErrNoSuchField{Type: nil /*TODO*/, Field: ld.PathSegmentOfString(key)} } } -func (n *_StructRepresentation_Stringjoin__Repr) LookupByNode(key dms3ld.Node) (dms3ld.Node, error) { +func (n *_StructRepresentation_Stringjoin__Repr) LookupByNode(key ld.Node) (ld.Node, error) { ks, err := key.AsString() if err != nil { return nil, err } return n.LookupByString(ks) } -func (_StructRepresentation_Stringjoin__Repr) LookupByIndex(idx int64) (dms3ld.Node, error) { +func (_StructRepresentation_Stringjoin__Repr) LookupByIndex(idx int64) (ld.Node, error) { return mixins.Map{TypeName: "schemadmt.StructRepresentation_Stringjoin.Repr"}.LookupByIndex(0) } -func (n _StructRepresentation_Stringjoin__Repr) LookupBySegment(seg dms3ld.PathSegment) (dms3ld.Node, error) { +func (n _StructRepresentation_Stringjoin__Repr) LookupBySegment(seg ld.PathSegment) (ld.Node, error) { return n.LookupByString(seg.String()) } -func (n *_StructRepresentation_Stringjoin__Repr) MapIterator() dms3ld.MapIterator { +func (n *_StructRepresentation_Stringjoin__Repr) MapIterator() ld.MapIterator { end := 2 if n.fieldOrder.m == schema.Maybe_Absent { end = 1 @@ -21628,10 +21628,10 @@ type _StructRepresentation_Stringjoin__ReprMapItr struct { end int } -func (itr *_StructRepresentation_Stringjoin__ReprMapItr) Next() (k dms3ld.Node, v dms3ld.Node, _ error) { +func (itr *_StructRepresentation_Stringjoin__ReprMapItr) Next() (k ld.Node, v ld.Node, _ error) { advance: if itr.idx >= 2 { - return nil, nil, dms3ld.ErrIteratorOverread{} + return nil, nil, ld.ErrIteratorOverread{} } switch itr.idx { case 0: @@ -21653,7 +21653,7 @@ advance: func (itr *_StructRepresentation_Stringjoin__ReprMapItr) Done() bool { return itr.idx >= itr.end } -func (_StructRepresentation_Stringjoin__Repr) ListIterator() dms3ld.ListIterator { +func (_StructRepresentation_Stringjoin__Repr) ListIterator() ld.ListIterator { return nil } func (rn *_StructRepresentation_Stringjoin__Repr) Length() int64 { @@ -21684,16 +21684,16 @@ func (_StructRepresentation_Stringjoin__Repr) AsString() (string, error) { func (_StructRepresentation_Stringjoin__Repr) AsBytes() ([]byte, error) { return mixins.Map{TypeName: "schemadmt.StructRepresentation_Stringjoin.Repr"}.AsBytes() } -func (_StructRepresentation_Stringjoin__Repr) AsLink() (dms3ld.Link, error) { +func (_StructRepresentation_Stringjoin__Repr) AsLink() (ld.Link, error) { return mixins.Map{TypeName: "schemadmt.StructRepresentation_Stringjoin.Repr"}.AsLink() } -func (_StructRepresentation_Stringjoin__Repr) Prototype() dms3ld.NodePrototype { +func (_StructRepresentation_Stringjoin__Repr) Prototype() ld.NodePrototype { return _StructRepresentation_Stringjoin__ReprPrototype{} } type _StructRepresentation_Stringjoin__ReprPrototype struct{} -func (_StructRepresentation_Stringjoin__ReprPrototype) NewBuilder() dms3ld.NodeBuilder { +func (_StructRepresentation_Stringjoin__ReprPrototype) NewBuilder() ld.NodeBuilder { var nb _StructRepresentation_Stringjoin__ReprBuilder nb.Reset() return &nb @@ -21703,7 +21703,7 @@ type _StructRepresentation_Stringjoin__ReprBuilder struct { _StructRepresentation_Stringjoin__ReprAssembler } -func (nb *_StructRepresentation_Stringjoin__ReprBuilder) Build() dms3ld.Node { +func (nb *_StructRepresentation_Stringjoin__ReprBuilder) Build() ld.Node { if *nb.m != schema.Maybe_Value { panic("invalid state: cannot call Build on an assembler that's not finished") } @@ -21733,7 +21733,7 @@ func (na *_StructRepresentation_Stringjoin__ReprAssembler) reset() { na.ca_join.reset() na.ca_fieldOrder.reset() } -func (na *_StructRepresentation_Stringjoin__ReprAssembler) BeginMap(int64) (dms3ld.MapAssembler, error) { +func (na *_StructRepresentation_Stringjoin__ReprAssembler) BeginMap(int64) (ld.MapAssembler, error) { switch *na.m { case schema.Maybe_Value, schema.Maybe_Null: panic("invalid state: cannot assign into assembler that's already finished") @@ -21746,7 +21746,7 @@ func (na *_StructRepresentation_Stringjoin__ReprAssembler) BeginMap(int64) (dms3 } return na, nil } -func (_StructRepresentation_Stringjoin__ReprAssembler) BeginList(sizeHint int64) (dms3ld.ListAssembler, error) { +func (_StructRepresentation_Stringjoin__ReprAssembler) BeginList(sizeHint int64) (ld.ListAssembler, error) { return mixins.MapAssembler{TypeName: "schemadmt.StructRepresentation_Stringjoin.Repr"}.BeginList(0) } func (na *_StructRepresentation_Stringjoin__ReprAssembler) AssignNull() error { @@ -21778,10 +21778,10 @@ func (_StructRepresentation_Stringjoin__ReprAssembler) AssignString(string) erro func (_StructRepresentation_Stringjoin__ReprAssembler) AssignBytes([]byte) error { return mixins.MapAssembler{TypeName: "schemadmt.StructRepresentation_Stringjoin.Repr"}.AssignBytes(nil) } -func (_StructRepresentation_Stringjoin__ReprAssembler) AssignLink(dms3ld.Link) error { +func (_StructRepresentation_Stringjoin__ReprAssembler) AssignLink(ld.Link) error { return mixins.MapAssembler{TypeName: "schemadmt.StructRepresentation_Stringjoin.Repr"}.AssignLink(nil) } -func (na *_StructRepresentation_Stringjoin__ReprAssembler) AssignNode(v dms3ld.Node) error { +func (na *_StructRepresentation_Stringjoin__ReprAssembler) AssignNode(v ld.Node) error { if v.IsNull() { return na.AssignNull() } @@ -21801,8 +21801,8 @@ func (na *_StructRepresentation_Stringjoin__ReprAssembler) AssignNode(v dms3ld.N *na.m = schema.Maybe_Value return nil } - if v.Kind() != dms3ld.Kind_Map { - return dms3ld.ErrWrongKind{TypeName: "schemadmt.StructRepresentation_Stringjoin.Repr", MethodName: "AssignNode", AppropriateKind: dms3ld.KindSet_JustMap, ActualKind: v.Kind()} + if v.Kind() != ld.Kind_Map { + return ld.ErrWrongKind{TypeName: "schemadmt.StructRepresentation_Stringjoin.Repr", MethodName: "AssignNode", AppropriateKind: ld.KindSet_JustMap, ActualKind: v.Kind()} } itr := v.MapIterator() for !itr.Done() { @@ -21819,7 +21819,7 @@ func (na *_StructRepresentation_Stringjoin__ReprAssembler) AssignNode(v dms3ld.N } return na.Finish() } -func (_StructRepresentation_Stringjoin__ReprAssembler) Prototype() dms3ld.NodePrototype { +func (_StructRepresentation_Stringjoin__ReprAssembler) Prototype() ld.NodePrototype { return _StructRepresentation_Stringjoin__ReprPrototype{} } func (ma *_StructRepresentation_Stringjoin__ReprAssembler) valueFinishTidy() bool { @@ -21845,7 +21845,7 @@ func (ma *_StructRepresentation_Stringjoin__ReprAssembler) valueFinishTidy() boo panic("unreachable") } } -func (ma *_StructRepresentation_Stringjoin__ReprAssembler) AssembleEntry(k string) (dms3ld.NodeAssembler, error) { +func (ma *_StructRepresentation_Stringjoin__ReprAssembler) AssembleEntry(k string) (ld.NodeAssembler, error) { switch ma.state { case maState_initial: // carry on @@ -21863,7 +21863,7 @@ func (ma *_StructRepresentation_Stringjoin__ReprAssembler) AssembleEntry(k strin switch k { case "join": if ma.s&fieldBit__StructRepresentation_Stringjoin_Join != 0 { - return nil, dms3ld.ErrRepeatedMapKey{Key: &fieldName__StructRepresentation_Stringjoin_Join_serial} + return nil, ld.ErrRepeatedMapKey{Key: &fieldName__StructRepresentation_Stringjoin_Join_serial} } ma.s += fieldBit__StructRepresentation_Stringjoin_Join ma.state = maState_midValue @@ -21873,7 +21873,7 @@ func (ma *_StructRepresentation_Stringjoin__ReprAssembler) AssembleEntry(k strin return &ma.ca_join, nil case "fieldOrder": if ma.s&fieldBit__StructRepresentation_Stringjoin_FieldOrder != 0 { - return nil, dms3ld.ErrRepeatedMapKey{Key: &fieldName__StructRepresentation_Stringjoin_FieldOrder_serial} + return nil, ld.ErrRepeatedMapKey{Key: &fieldName__StructRepresentation_Stringjoin_FieldOrder_serial} } ma.s += fieldBit__StructRepresentation_Stringjoin_FieldOrder ma.state = maState_midValue @@ -21884,9 +21884,9 @@ func (ma *_StructRepresentation_Stringjoin__ReprAssembler) AssembleEntry(k strin return &ma.ca_fieldOrder, nil default: } - return nil, dms3ld.ErrInvalidKey{TypeName: "schemadmt.StructRepresentation_Stringjoin.Repr", Key: &_String{k}} + return nil, ld.ErrInvalidKey{TypeName: "schemadmt.StructRepresentation_Stringjoin.Repr", Key: &_String{k}} } -func (ma *_StructRepresentation_Stringjoin__ReprAssembler) AssembleKey() dms3ld.NodeAssembler { +func (ma *_StructRepresentation_Stringjoin__ReprAssembler) AssembleKey() ld.NodeAssembler { switch ma.state { case maState_initial: // carry on @@ -21904,7 +21904,7 @@ func (ma *_StructRepresentation_Stringjoin__ReprAssembler) AssembleKey() dms3ld. ma.state = maState_midKey return (*_StructRepresentation_Stringjoin__ReprKeyAssembler)(ma) } -func (ma *_StructRepresentation_Stringjoin__ReprAssembler) AssembleValue() dms3ld.NodeAssembler { +func (ma *_StructRepresentation_Stringjoin__ReprAssembler) AssembleValue() ld.NodeAssembler { switch ma.state { case maState_initial: panic("invalid state: AssembleValue cannot be called when no key is primed") @@ -21948,7 +21948,7 @@ func (ma *_StructRepresentation_Stringjoin__ReprAssembler) Finish() error { panic("invalid state: Finish cannot be called on an assembler that's already finished") } if ma.s&fieldBits__StructRepresentation_Stringjoin_sufficient != fieldBits__StructRepresentation_Stringjoin_sufficient { - err := dms3ld.ErrMissingRequiredField{Missing: make([]string, 0)} + err := ld.ErrMissingRequiredField{Missing: make([]string, 0)} if ma.s&fieldBit__StructRepresentation_Stringjoin_Join == 0 { err.Missing = append(err.Missing, "join") } @@ -21958,19 +21958,19 @@ func (ma *_StructRepresentation_Stringjoin__ReprAssembler) Finish() error { *ma.m = schema.Maybe_Value return nil } -func (ma *_StructRepresentation_Stringjoin__ReprAssembler) KeyPrototype() dms3ld.NodePrototype { +func (ma *_StructRepresentation_Stringjoin__ReprAssembler) KeyPrototype() ld.NodePrototype { return _String__Prototype{} } -func (ma *_StructRepresentation_Stringjoin__ReprAssembler) ValuePrototype(k string) dms3ld.NodePrototype { +func (ma *_StructRepresentation_Stringjoin__ReprAssembler) ValuePrototype(k string) ld.NodePrototype { panic("todo structbuilder mapassembler repr valueprototype") } type _StructRepresentation_Stringjoin__ReprKeyAssembler _StructRepresentation_Stringjoin__ReprAssembler -func (_StructRepresentation_Stringjoin__ReprKeyAssembler) BeginMap(sizeHint int64) (dms3ld.MapAssembler, error) { +func (_StructRepresentation_Stringjoin__ReprKeyAssembler) BeginMap(sizeHint int64) (ld.MapAssembler, error) { return mixins.StringAssembler{TypeName: "schemadmt.StructRepresentation_Stringjoin.Repr.KeyAssembler"}.BeginMap(0) } -func (_StructRepresentation_Stringjoin__ReprKeyAssembler) BeginList(sizeHint int64) (dms3ld.ListAssembler, error) { +func (_StructRepresentation_Stringjoin__ReprKeyAssembler) BeginList(sizeHint int64) (ld.ListAssembler, error) { return mixins.StringAssembler{TypeName: "schemadmt.StructRepresentation_Stringjoin.Repr.KeyAssembler"}.BeginList(0) } func (na *_StructRepresentation_Stringjoin__ReprKeyAssembler) AssignNull() error { @@ -21992,7 +21992,7 @@ func (ka *_StructRepresentation_Stringjoin__ReprKeyAssembler) AssignString(k str switch k { case "join": if ka.s&fieldBit__StructRepresentation_Stringjoin_Join != 0 { - return dms3ld.ErrRepeatedMapKey{Key: &fieldName__StructRepresentation_Stringjoin_Join_serial} + return ld.ErrRepeatedMapKey{Key: &fieldName__StructRepresentation_Stringjoin_Join_serial} } ka.s += fieldBit__StructRepresentation_Stringjoin_Join ka.state = maState_expectValue @@ -22000,29 +22000,29 @@ func (ka *_StructRepresentation_Stringjoin__ReprKeyAssembler) AssignString(k str return nil case "fieldOrder": if ka.s&fieldBit__StructRepresentation_Stringjoin_FieldOrder != 0 { - return dms3ld.ErrRepeatedMapKey{Key: &fieldName__StructRepresentation_Stringjoin_FieldOrder_serial} + return ld.ErrRepeatedMapKey{Key: &fieldName__StructRepresentation_Stringjoin_FieldOrder_serial} } ka.s += fieldBit__StructRepresentation_Stringjoin_FieldOrder ka.state = maState_expectValue ka.f = 1 return nil } - return dms3ld.ErrInvalidKey{TypeName: "schemadmt.StructRepresentation_Stringjoin.Repr", Key: &_String{k}} + return ld.ErrInvalidKey{TypeName: "schemadmt.StructRepresentation_Stringjoin.Repr", Key: &_String{k}} } func (_StructRepresentation_Stringjoin__ReprKeyAssembler) AssignBytes([]byte) error { return mixins.StringAssembler{TypeName: "schemadmt.StructRepresentation_Stringjoin.Repr.KeyAssembler"}.AssignBytes(nil) } -func (_StructRepresentation_Stringjoin__ReprKeyAssembler) AssignLink(dms3ld.Link) error { +func (_StructRepresentation_Stringjoin__ReprKeyAssembler) AssignLink(ld.Link) error { return mixins.StringAssembler{TypeName: "schemadmt.StructRepresentation_Stringjoin.Repr.KeyAssembler"}.AssignLink(nil) } -func (ka *_StructRepresentation_Stringjoin__ReprKeyAssembler) AssignNode(v dms3ld.Node) error { +func (ka *_StructRepresentation_Stringjoin__ReprKeyAssembler) AssignNode(v ld.Node) error { if v2, err := v.AsString(); err != nil { return err } else { return ka.AssignString(v2) } } -func (_StructRepresentation_Stringjoin__ReprKeyAssembler) Prototype() dms3ld.NodePrototype { +func (_StructRepresentation_Stringjoin__ReprKeyAssembler) Prototype() ld.NodePrototype { return _String__Prototype{} } @@ -22048,12 +22048,12 @@ func (m MaybeStructRepresentation_Stringpairs) IsAbsent() bool { func (m MaybeStructRepresentation_Stringpairs) Exists() bool { return m.m == schema.Maybe_Value } -func (m MaybeStructRepresentation_Stringpairs) AsNode() dms3ld.Node { +func (m MaybeStructRepresentation_Stringpairs) AsNode() ld.Node { switch m.m { case schema.Maybe_Absent: - return dms3ld.Absent + return ld.Absent case schema.Maybe_Null: - return dms3ld.Null + return ld.Null case schema.Maybe_Value: return m.v default: @@ -22071,36 +22071,36 @@ var ( fieldName__StructRepresentation_Stringpairs_InnerDelim = _String{"innerDelim"} fieldName__StructRepresentation_Stringpairs_EntryDelim = _String{"entryDelim"} ) -var _ dms3ld.Node = (StructRepresentation_Stringpairs)(&_StructRepresentation_Stringpairs{}) +var _ ld.Node = (StructRepresentation_Stringpairs)(&_StructRepresentation_Stringpairs{}) var _ schema.TypedNode = (StructRepresentation_Stringpairs)(&_StructRepresentation_Stringpairs{}) -func (StructRepresentation_Stringpairs) Kind() dms3ld.Kind { - return dms3ld.Kind_Map +func (StructRepresentation_Stringpairs) Kind() ld.Kind { + return ld.Kind_Map } -func (n StructRepresentation_Stringpairs) LookupByString(key string) (dms3ld.Node, error) { +func (n StructRepresentation_Stringpairs) LookupByString(key string) (ld.Node, error) { switch key { case "innerDelim": return &n.innerDelim, nil case "entryDelim": return &n.entryDelim, nil default: - return nil, schema.ErrNoSuchField{Type: nil /*TODO*/, Field: dms3ld.PathSegmentOfString(key)} + return nil, schema.ErrNoSuchField{Type: nil /*TODO*/, Field: ld.PathSegmentOfString(key)} } } -func (n StructRepresentation_Stringpairs) LookupByNode(key dms3ld.Node) (dms3ld.Node, error) { +func (n StructRepresentation_Stringpairs) LookupByNode(key ld.Node) (ld.Node, error) { ks, err := key.AsString() if err != nil { return nil, err } return n.LookupByString(ks) } -func (StructRepresentation_Stringpairs) LookupByIndex(idx int64) (dms3ld.Node, error) { +func (StructRepresentation_Stringpairs) LookupByIndex(idx int64) (ld.Node, error) { return mixins.Map{TypeName: "schemadmt.StructRepresentation_Stringpairs"}.LookupByIndex(0) } -func (n StructRepresentation_Stringpairs) LookupBySegment(seg dms3ld.PathSegment) (dms3ld.Node, error) { +func (n StructRepresentation_Stringpairs) LookupBySegment(seg ld.PathSegment) (ld.Node, error) { return n.LookupByString(seg.String()) } -func (n StructRepresentation_Stringpairs) MapIterator() dms3ld.MapIterator { +func (n StructRepresentation_Stringpairs) MapIterator() ld.MapIterator { return &_StructRepresentation_Stringpairs__MapItr{n, 0} } @@ -22109,9 +22109,9 @@ type _StructRepresentation_Stringpairs__MapItr struct { idx int } -func (itr *_StructRepresentation_Stringpairs__MapItr) Next() (k dms3ld.Node, v dms3ld.Node, _ error) { +func (itr *_StructRepresentation_Stringpairs__MapItr) Next() (k ld.Node, v ld.Node, _ error) { if itr.idx >= 2 { - return nil, nil, dms3ld.ErrIteratorOverread{} + return nil, nil, ld.ErrIteratorOverread{} } switch itr.idx { case 0: @@ -22130,7 +22130,7 @@ func (itr *_StructRepresentation_Stringpairs__MapItr) Done() bool { return itr.idx >= 2 } -func (StructRepresentation_Stringpairs) ListIterator() dms3ld.ListIterator { +func (StructRepresentation_Stringpairs) ListIterator() ld.ListIterator { return nil } func (StructRepresentation_Stringpairs) Length() int64 { @@ -22157,16 +22157,16 @@ func (StructRepresentation_Stringpairs) AsString() (string, error) { func (StructRepresentation_Stringpairs) AsBytes() ([]byte, error) { return mixins.Map{TypeName: "schemadmt.StructRepresentation_Stringpairs"}.AsBytes() } -func (StructRepresentation_Stringpairs) AsLink() (dms3ld.Link, error) { +func (StructRepresentation_Stringpairs) AsLink() (ld.Link, error) { return mixins.Map{TypeName: "schemadmt.StructRepresentation_Stringpairs"}.AsLink() } -func (StructRepresentation_Stringpairs) Prototype() dms3ld.NodePrototype { +func (StructRepresentation_Stringpairs) Prototype() ld.NodePrototype { return _StructRepresentation_Stringpairs__Prototype{} } type _StructRepresentation_Stringpairs__Prototype struct{} -func (_StructRepresentation_Stringpairs__Prototype) NewBuilder() dms3ld.NodeBuilder { +func (_StructRepresentation_Stringpairs__Prototype) NewBuilder() ld.NodeBuilder { var nb _StructRepresentation_Stringpairs__Builder nb.Reset() return &nb @@ -22176,7 +22176,7 @@ type _StructRepresentation_Stringpairs__Builder struct { _StructRepresentation_Stringpairs__Assembler } -func (nb *_StructRepresentation_Stringpairs__Builder) Build() dms3ld.Node { +func (nb *_StructRepresentation_Stringpairs__Builder) Build() ld.Node { if *nb.m != schema.Maybe_Value { panic("invalid state: cannot call Build on an assembler that's not finished") } @@ -22213,7 +22213,7 @@ var ( fieldBits__StructRepresentation_Stringpairs_sufficient = 0 + 1<<0 + 1<<1 ) -func (na *_StructRepresentation_Stringpairs__Assembler) BeginMap(int64) (dms3ld.MapAssembler, error) { +func (na *_StructRepresentation_Stringpairs__Assembler) BeginMap(int64) (ld.MapAssembler, error) { switch *na.m { case schema.Maybe_Value, schema.Maybe_Null: panic("invalid state: cannot assign into assembler that's already finished") @@ -22226,7 +22226,7 @@ func (na *_StructRepresentation_Stringpairs__Assembler) BeginMap(int64) (dms3ld. } return na, nil } -func (_StructRepresentation_Stringpairs__Assembler) BeginList(sizeHint int64) (dms3ld.ListAssembler, error) { +func (_StructRepresentation_Stringpairs__Assembler) BeginList(sizeHint int64) (ld.ListAssembler, error) { return mixins.MapAssembler{TypeName: "schemadmt.StructRepresentation_Stringpairs"}.BeginList(0) } func (na *_StructRepresentation_Stringpairs__Assembler) AssignNull() error { @@ -22258,10 +22258,10 @@ func (_StructRepresentation_Stringpairs__Assembler) AssignString(string) error { func (_StructRepresentation_Stringpairs__Assembler) AssignBytes([]byte) error { return mixins.MapAssembler{TypeName: "schemadmt.StructRepresentation_Stringpairs"}.AssignBytes(nil) } -func (_StructRepresentation_Stringpairs__Assembler) AssignLink(dms3ld.Link) error { +func (_StructRepresentation_Stringpairs__Assembler) AssignLink(ld.Link) error { return mixins.MapAssembler{TypeName: "schemadmt.StructRepresentation_Stringpairs"}.AssignLink(nil) } -func (na *_StructRepresentation_Stringpairs__Assembler) AssignNode(v dms3ld.Node) error { +func (na *_StructRepresentation_Stringpairs__Assembler) AssignNode(v ld.Node) error { if v.IsNull() { return na.AssignNull() } @@ -22281,8 +22281,8 @@ func (na *_StructRepresentation_Stringpairs__Assembler) AssignNode(v dms3ld.Node *na.m = schema.Maybe_Value return nil } - if v.Kind() != dms3ld.Kind_Map { - return dms3ld.ErrWrongKind{TypeName: "schemadmt.StructRepresentation_Stringpairs", MethodName: "AssignNode", AppropriateKind: dms3ld.KindSet_JustMap, ActualKind: v.Kind()} + if v.Kind() != ld.Kind_Map { + return ld.ErrWrongKind{TypeName: "schemadmt.StructRepresentation_Stringpairs", MethodName: "AssignNode", AppropriateKind: ld.KindSet_JustMap, ActualKind: v.Kind()} } itr := v.MapIterator() for !itr.Done() { @@ -22299,7 +22299,7 @@ func (na *_StructRepresentation_Stringpairs__Assembler) AssignNode(v dms3ld.Node } return na.Finish() } -func (_StructRepresentation_Stringpairs__Assembler) Prototype() dms3ld.NodePrototype { +func (_StructRepresentation_Stringpairs__Assembler) Prototype() ld.NodePrototype { return _StructRepresentation_Stringpairs__Prototype{} } func (ma *_StructRepresentation_Stringpairs__Assembler) valueFinishTidy() bool { @@ -22328,7 +22328,7 @@ func (ma *_StructRepresentation_Stringpairs__Assembler) valueFinishTidy() bool { panic("unreachable") } } -func (ma *_StructRepresentation_Stringpairs__Assembler) AssembleEntry(k string) (dms3ld.NodeAssembler, error) { +func (ma *_StructRepresentation_Stringpairs__Assembler) AssembleEntry(k string) (ld.NodeAssembler, error) { switch ma.state { case maState_initial: // carry on @@ -22346,7 +22346,7 @@ func (ma *_StructRepresentation_Stringpairs__Assembler) AssembleEntry(k string) switch k { case "innerDelim": if ma.s&fieldBit__StructRepresentation_Stringpairs_InnerDelim != 0 { - return nil, dms3ld.ErrRepeatedMapKey{Key: &fieldName__StructRepresentation_Stringpairs_InnerDelim} + return nil, ld.ErrRepeatedMapKey{Key: &fieldName__StructRepresentation_Stringpairs_InnerDelim} } ma.s += fieldBit__StructRepresentation_Stringpairs_InnerDelim ma.state = maState_midValue @@ -22356,7 +22356,7 @@ func (ma *_StructRepresentation_Stringpairs__Assembler) AssembleEntry(k string) return &ma.ca_innerDelim, nil case "entryDelim": if ma.s&fieldBit__StructRepresentation_Stringpairs_EntryDelim != 0 { - return nil, dms3ld.ErrRepeatedMapKey{Key: &fieldName__StructRepresentation_Stringpairs_EntryDelim} + return nil, ld.ErrRepeatedMapKey{Key: &fieldName__StructRepresentation_Stringpairs_EntryDelim} } ma.s += fieldBit__StructRepresentation_Stringpairs_EntryDelim ma.state = maState_midValue @@ -22365,9 +22365,9 @@ func (ma *_StructRepresentation_Stringpairs__Assembler) AssembleEntry(k string) ma.ca_entryDelim.m = &ma.cm return &ma.ca_entryDelim, nil } - return nil, dms3ld.ErrInvalidKey{TypeName: "schemadmt.StructRepresentation_Stringpairs", Key: &_String{k}} + return nil, ld.ErrInvalidKey{TypeName: "schemadmt.StructRepresentation_Stringpairs", Key: &_String{k}} } -func (ma *_StructRepresentation_Stringpairs__Assembler) AssembleKey() dms3ld.NodeAssembler { +func (ma *_StructRepresentation_Stringpairs__Assembler) AssembleKey() ld.NodeAssembler { switch ma.state { case maState_initial: // carry on @@ -22385,7 +22385,7 @@ func (ma *_StructRepresentation_Stringpairs__Assembler) AssembleKey() dms3ld.Nod ma.state = maState_midKey return (*_StructRepresentation_Stringpairs__KeyAssembler)(ma) } -func (ma *_StructRepresentation_Stringpairs__Assembler) AssembleValue() dms3ld.NodeAssembler { +func (ma *_StructRepresentation_Stringpairs__Assembler) AssembleValue() ld.NodeAssembler { switch ma.state { case maState_initial: panic("invalid state: AssembleValue cannot be called when no key is primed") @@ -22428,7 +22428,7 @@ func (ma *_StructRepresentation_Stringpairs__Assembler) Finish() error { panic("invalid state: Finish cannot be called on an assembler that's already finished") } if ma.s&fieldBits__StructRepresentation_Stringpairs_sufficient != fieldBits__StructRepresentation_Stringpairs_sufficient { - err := dms3ld.ErrMissingRequiredField{Missing: make([]string, 0)} + err := ld.ErrMissingRequiredField{Missing: make([]string, 0)} if ma.s&fieldBit__StructRepresentation_Stringpairs_InnerDelim == 0 { err.Missing = append(err.Missing, "innerDelim") } @@ -22441,19 +22441,19 @@ func (ma *_StructRepresentation_Stringpairs__Assembler) Finish() error { *ma.m = schema.Maybe_Value return nil } -func (ma *_StructRepresentation_Stringpairs__Assembler) KeyPrototype() dms3ld.NodePrototype { +func (ma *_StructRepresentation_Stringpairs__Assembler) KeyPrototype() ld.NodePrototype { return _String__Prototype{} } -func (ma *_StructRepresentation_Stringpairs__Assembler) ValuePrototype(k string) dms3ld.NodePrototype { +func (ma *_StructRepresentation_Stringpairs__Assembler) ValuePrototype(k string) ld.NodePrototype { panic("todo structbuilder mapassembler valueprototype") } type _StructRepresentation_Stringpairs__KeyAssembler _StructRepresentation_Stringpairs__Assembler -func (_StructRepresentation_Stringpairs__KeyAssembler) BeginMap(sizeHint int64) (dms3ld.MapAssembler, error) { +func (_StructRepresentation_Stringpairs__KeyAssembler) BeginMap(sizeHint int64) (ld.MapAssembler, error) { return mixins.StringAssembler{TypeName: "schemadmt.StructRepresentation_Stringpairs.KeyAssembler"}.BeginMap(0) } -func (_StructRepresentation_Stringpairs__KeyAssembler) BeginList(sizeHint int64) (dms3ld.ListAssembler, error) { +func (_StructRepresentation_Stringpairs__KeyAssembler) BeginList(sizeHint int64) (ld.ListAssembler, error) { return mixins.StringAssembler{TypeName: "schemadmt.StructRepresentation_Stringpairs.KeyAssembler"}.BeginList(0) } func (na *_StructRepresentation_Stringpairs__KeyAssembler) AssignNull() error { @@ -22475,43 +22475,43 @@ func (ka *_StructRepresentation_Stringpairs__KeyAssembler) AssignString(k string switch k { case "innerDelim": if ka.s&fieldBit__StructRepresentation_Stringpairs_InnerDelim != 0 { - return dms3ld.ErrRepeatedMapKey{Key: &fieldName__StructRepresentation_Stringpairs_InnerDelim} + return ld.ErrRepeatedMapKey{Key: &fieldName__StructRepresentation_Stringpairs_InnerDelim} } ka.s += fieldBit__StructRepresentation_Stringpairs_InnerDelim ka.state = maState_expectValue ka.f = 0 case "entryDelim": if ka.s&fieldBit__StructRepresentation_Stringpairs_EntryDelim != 0 { - return dms3ld.ErrRepeatedMapKey{Key: &fieldName__StructRepresentation_Stringpairs_EntryDelim} + return ld.ErrRepeatedMapKey{Key: &fieldName__StructRepresentation_Stringpairs_EntryDelim} } ka.s += fieldBit__StructRepresentation_Stringpairs_EntryDelim ka.state = maState_expectValue ka.f = 1 default: - return dms3ld.ErrInvalidKey{TypeName: "schemadmt.StructRepresentation_Stringpairs", Key: &_String{k}} + return ld.ErrInvalidKey{TypeName: "schemadmt.StructRepresentation_Stringpairs", Key: &_String{k}} } return nil } func (_StructRepresentation_Stringpairs__KeyAssembler) AssignBytes([]byte) error { return mixins.StringAssembler{TypeName: "schemadmt.StructRepresentation_Stringpairs.KeyAssembler"}.AssignBytes(nil) } -func (_StructRepresentation_Stringpairs__KeyAssembler) AssignLink(dms3ld.Link) error { +func (_StructRepresentation_Stringpairs__KeyAssembler) AssignLink(ld.Link) error { return mixins.StringAssembler{TypeName: "schemadmt.StructRepresentation_Stringpairs.KeyAssembler"}.AssignLink(nil) } -func (ka *_StructRepresentation_Stringpairs__KeyAssembler) AssignNode(v dms3ld.Node) error { +func (ka *_StructRepresentation_Stringpairs__KeyAssembler) AssignNode(v ld.Node) error { if v2, err := v.AsString(); err != nil { return err } else { return ka.AssignString(v2) } } -func (_StructRepresentation_Stringpairs__KeyAssembler) Prototype() dms3ld.NodePrototype { +func (_StructRepresentation_Stringpairs__KeyAssembler) Prototype() ld.NodePrototype { return _String__Prototype{} } func (StructRepresentation_Stringpairs) Type() schema.Type { return nil /*TODO:typelit*/ } -func (n StructRepresentation_Stringpairs) Representation() dms3ld.Node { +func (n StructRepresentation_Stringpairs) Representation() ld.Node { return (*_StructRepresentation_Stringpairs__Repr)(n) } @@ -22521,35 +22521,35 @@ var ( fieldName__StructRepresentation_Stringpairs_InnerDelim_serial = _String{"innerDelim"} fieldName__StructRepresentation_Stringpairs_EntryDelim_serial = _String{"entryDelim"} ) -var _ dms3ld.Node = &_StructRepresentation_Stringpairs__Repr{} +var _ ld.Node = &_StructRepresentation_Stringpairs__Repr{} -func (_StructRepresentation_Stringpairs__Repr) Kind() dms3ld.Kind { - return dms3ld.Kind_Map +func (_StructRepresentation_Stringpairs__Repr) Kind() ld.Kind { + return ld.Kind_Map } -func (n *_StructRepresentation_Stringpairs__Repr) LookupByString(key string) (dms3ld.Node, error) { +func (n *_StructRepresentation_Stringpairs__Repr) LookupByString(key string) (ld.Node, error) { switch key { case "innerDelim": return n.innerDelim.Representation(), nil case "entryDelim": return n.entryDelim.Representation(), nil default: - return nil, schema.ErrNoSuchField{Type: nil /*TODO*/, Field: dms3ld.PathSegmentOfString(key)} + return nil, schema.ErrNoSuchField{Type: nil /*TODO*/, Field: ld.PathSegmentOfString(key)} } } -func (n *_StructRepresentation_Stringpairs__Repr) LookupByNode(key dms3ld.Node) (dms3ld.Node, error) { +func (n *_StructRepresentation_Stringpairs__Repr) LookupByNode(key ld.Node) (ld.Node, error) { ks, err := key.AsString() if err != nil { return nil, err } return n.LookupByString(ks) } -func (_StructRepresentation_Stringpairs__Repr) LookupByIndex(idx int64) (dms3ld.Node, error) { +func (_StructRepresentation_Stringpairs__Repr) LookupByIndex(idx int64) (ld.Node, error) { return mixins.Map{TypeName: "schemadmt.StructRepresentation_Stringpairs.Repr"}.LookupByIndex(0) } -func (n _StructRepresentation_Stringpairs__Repr) LookupBySegment(seg dms3ld.PathSegment) (dms3ld.Node, error) { +func (n _StructRepresentation_Stringpairs__Repr) LookupBySegment(seg ld.PathSegment) (ld.Node, error) { return n.LookupByString(seg.String()) } -func (n *_StructRepresentation_Stringpairs__Repr) MapIterator() dms3ld.MapIterator { +func (n *_StructRepresentation_Stringpairs__Repr) MapIterator() ld.MapIterator { return &_StructRepresentation_Stringpairs__ReprMapItr{n, 0} } @@ -22558,9 +22558,9 @@ type _StructRepresentation_Stringpairs__ReprMapItr struct { idx int } -func (itr *_StructRepresentation_Stringpairs__ReprMapItr) Next() (k dms3ld.Node, v dms3ld.Node, _ error) { +func (itr *_StructRepresentation_Stringpairs__ReprMapItr) Next() (k ld.Node, v ld.Node, _ error) { if itr.idx >= 2 { - return nil, nil, dms3ld.ErrIteratorOverread{} + return nil, nil, ld.ErrIteratorOverread{} } switch itr.idx { case 0: @@ -22578,7 +22578,7 @@ func (itr *_StructRepresentation_Stringpairs__ReprMapItr) Next() (k dms3ld.Node, func (itr *_StructRepresentation_Stringpairs__ReprMapItr) Done() bool { return itr.idx >= 2 } -func (_StructRepresentation_Stringpairs__Repr) ListIterator() dms3ld.ListIterator { +func (_StructRepresentation_Stringpairs__Repr) ListIterator() ld.ListIterator { return nil } func (rn *_StructRepresentation_Stringpairs__Repr) Length() int64 { @@ -22606,16 +22606,16 @@ func (_StructRepresentation_Stringpairs__Repr) AsString() (string, error) { func (_StructRepresentation_Stringpairs__Repr) AsBytes() ([]byte, error) { return mixins.Map{TypeName: "schemadmt.StructRepresentation_Stringpairs.Repr"}.AsBytes() } -func (_StructRepresentation_Stringpairs__Repr) AsLink() (dms3ld.Link, error) { +func (_StructRepresentation_Stringpairs__Repr) AsLink() (ld.Link, error) { return mixins.Map{TypeName: "schemadmt.StructRepresentation_Stringpairs.Repr"}.AsLink() } -func (_StructRepresentation_Stringpairs__Repr) Prototype() dms3ld.NodePrototype { +func (_StructRepresentation_Stringpairs__Repr) Prototype() ld.NodePrototype { return _StructRepresentation_Stringpairs__ReprPrototype{} } type _StructRepresentation_Stringpairs__ReprPrototype struct{} -func (_StructRepresentation_Stringpairs__ReprPrototype) NewBuilder() dms3ld.NodeBuilder { +func (_StructRepresentation_Stringpairs__ReprPrototype) NewBuilder() ld.NodeBuilder { var nb _StructRepresentation_Stringpairs__ReprBuilder nb.Reset() return &nb @@ -22625,7 +22625,7 @@ type _StructRepresentation_Stringpairs__ReprBuilder struct { _StructRepresentation_Stringpairs__ReprAssembler } -func (nb *_StructRepresentation_Stringpairs__ReprBuilder) Build() dms3ld.Node { +func (nb *_StructRepresentation_Stringpairs__ReprBuilder) Build() ld.Node { if *nb.m != schema.Maybe_Value { panic("invalid state: cannot call Build on an assembler that's not finished") } @@ -22655,7 +22655,7 @@ func (na *_StructRepresentation_Stringpairs__ReprAssembler) reset() { na.ca_innerDelim.reset() na.ca_entryDelim.reset() } -func (na *_StructRepresentation_Stringpairs__ReprAssembler) BeginMap(int64) (dms3ld.MapAssembler, error) { +func (na *_StructRepresentation_Stringpairs__ReprAssembler) BeginMap(int64) (ld.MapAssembler, error) { switch *na.m { case schema.Maybe_Value, schema.Maybe_Null: panic("invalid state: cannot assign into assembler that's already finished") @@ -22668,7 +22668,7 @@ func (na *_StructRepresentation_Stringpairs__ReprAssembler) BeginMap(int64) (dms } return na, nil } -func (_StructRepresentation_Stringpairs__ReprAssembler) BeginList(sizeHint int64) (dms3ld.ListAssembler, error) { +func (_StructRepresentation_Stringpairs__ReprAssembler) BeginList(sizeHint int64) (ld.ListAssembler, error) { return mixins.MapAssembler{TypeName: "schemadmt.StructRepresentation_Stringpairs.Repr"}.BeginList(0) } func (na *_StructRepresentation_Stringpairs__ReprAssembler) AssignNull() error { @@ -22700,10 +22700,10 @@ func (_StructRepresentation_Stringpairs__ReprAssembler) AssignString(string) err func (_StructRepresentation_Stringpairs__ReprAssembler) AssignBytes([]byte) error { return mixins.MapAssembler{TypeName: "schemadmt.StructRepresentation_Stringpairs.Repr"}.AssignBytes(nil) } -func (_StructRepresentation_Stringpairs__ReprAssembler) AssignLink(dms3ld.Link) error { +func (_StructRepresentation_Stringpairs__ReprAssembler) AssignLink(ld.Link) error { return mixins.MapAssembler{TypeName: "schemadmt.StructRepresentation_Stringpairs.Repr"}.AssignLink(nil) } -func (na *_StructRepresentation_Stringpairs__ReprAssembler) AssignNode(v dms3ld.Node) error { +func (na *_StructRepresentation_Stringpairs__ReprAssembler) AssignNode(v ld.Node) error { if v.IsNull() { return na.AssignNull() } @@ -22723,8 +22723,8 @@ func (na *_StructRepresentation_Stringpairs__ReprAssembler) AssignNode(v dms3ld. *na.m = schema.Maybe_Value return nil } - if v.Kind() != dms3ld.Kind_Map { - return dms3ld.ErrWrongKind{TypeName: "schemadmt.StructRepresentation_Stringpairs.Repr", MethodName: "AssignNode", AppropriateKind: dms3ld.KindSet_JustMap, ActualKind: v.Kind()} + if v.Kind() != ld.Kind_Map { + return ld.ErrWrongKind{TypeName: "schemadmt.StructRepresentation_Stringpairs.Repr", MethodName: "AssignNode", AppropriateKind: ld.KindSet_JustMap, ActualKind: v.Kind()} } itr := v.MapIterator() for !itr.Done() { @@ -22741,7 +22741,7 @@ func (na *_StructRepresentation_Stringpairs__ReprAssembler) AssignNode(v dms3ld. } return na.Finish() } -func (_StructRepresentation_Stringpairs__ReprAssembler) Prototype() dms3ld.NodePrototype { +func (_StructRepresentation_Stringpairs__ReprAssembler) Prototype() ld.NodePrototype { return _StructRepresentation_Stringpairs__ReprPrototype{} } func (ma *_StructRepresentation_Stringpairs__ReprAssembler) valueFinishTidy() bool { @@ -22768,7 +22768,7 @@ func (ma *_StructRepresentation_Stringpairs__ReprAssembler) valueFinishTidy() bo panic("unreachable") } } -func (ma *_StructRepresentation_Stringpairs__ReprAssembler) AssembleEntry(k string) (dms3ld.NodeAssembler, error) { +func (ma *_StructRepresentation_Stringpairs__ReprAssembler) AssembleEntry(k string) (ld.NodeAssembler, error) { switch ma.state { case maState_initial: // carry on @@ -22786,7 +22786,7 @@ func (ma *_StructRepresentation_Stringpairs__ReprAssembler) AssembleEntry(k stri switch k { case "innerDelim": if ma.s&fieldBit__StructRepresentation_Stringpairs_InnerDelim != 0 { - return nil, dms3ld.ErrRepeatedMapKey{Key: &fieldName__StructRepresentation_Stringpairs_InnerDelim_serial} + return nil, ld.ErrRepeatedMapKey{Key: &fieldName__StructRepresentation_Stringpairs_InnerDelim_serial} } ma.s += fieldBit__StructRepresentation_Stringpairs_InnerDelim ma.state = maState_midValue @@ -22796,7 +22796,7 @@ func (ma *_StructRepresentation_Stringpairs__ReprAssembler) AssembleEntry(k stri return &ma.ca_innerDelim, nil case "entryDelim": if ma.s&fieldBit__StructRepresentation_Stringpairs_EntryDelim != 0 { - return nil, dms3ld.ErrRepeatedMapKey{Key: &fieldName__StructRepresentation_Stringpairs_EntryDelim_serial} + return nil, ld.ErrRepeatedMapKey{Key: &fieldName__StructRepresentation_Stringpairs_EntryDelim_serial} } ma.s += fieldBit__StructRepresentation_Stringpairs_EntryDelim ma.state = maState_midValue @@ -22806,9 +22806,9 @@ func (ma *_StructRepresentation_Stringpairs__ReprAssembler) AssembleEntry(k stri return &ma.ca_entryDelim, nil default: } - return nil, dms3ld.ErrInvalidKey{TypeName: "schemadmt.StructRepresentation_Stringpairs.Repr", Key: &_String{k}} + return nil, ld.ErrInvalidKey{TypeName: "schemadmt.StructRepresentation_Stringpairs.Repr", Key: &_String{k}} } -func (ma *_StructRepresentation_Stringpairs__ReprAssembler) AssembleKey() dms3ld.NodeAssembler { +func (ma *_StructRepresentation_Stringpairs__ReprAssembler) AssembleKey() ld.NodeAssembler { switch ma.state { case maState_initial: // carry on @@ -22826,7 +22826,7 @@ func (ma *_StructRepresentation_Stringpairs__ReprAssembler) AssembleKey() dms3ld ma.state = maState_midKey return (*_StructRepresentation_Stringpairs__ReprKeyAssembler)(ma) } -func (ma *_StructRepresentation_Stringpairs__ReprAssembler) AssembleValue() dms3ld.NodeAssembler { +func (ma *_StructRepresentation_Stringpairs__ReprAssembler) AssembleValue() ld.NodeAssembler { switch ma.state { case maState_initial: panic("invalid state: AssembleValue cannot be called when no key is primed") @@ -22869,7 +22869,7 @@ func (ma *_StructRepresentation_Stringpairs__ReprAssembler) Finish() error { panic("invalid state: Finish cannot be called on an assembler that's already finished") } if ma.s&fieldBits__StructRepresentation_Stringpairs_sufficient != fieldBits__StructRepresentation_Stringpairs_sufficient { - err := dms3ld.ErrMissingRequiredField{Missing: make([]string, 0)} + err := ld.ErrMissingRequiredField{Missing: make([]string, 0)} if ma.s&fieldBit__StructRepresentation_Stringpairs_InnerDelim == 0 { err.Missing = append(err.Missing, "innerDelim") } @@ -22882,19 +22882,19 @@ func (ma *_StructRepresentation_Stringpairs__ReprAssembler) Finish() error { *ma.m = schema.Maybe_Value return nil } -func (ma *_StructRepresentation_Stringpairs__ReprAssembler) KeyPrototype() dms3ld.NodePrototype { +func (ma *_StructRepresentation_Stringpairs__ReprAssembler) KeyPrototype() ld.NodePrototype { return _String__Prototype{} } -func (ma *_StructRepresentation_Stringpairs__ReprAssembler) ValuePrototype(k string) dms3ld.NodePrototype { +func (ma *_StructRepresentation_Stringpairs__ReprAssembler) ValuePrototype(k string) ld.NodePrototype { panic("todo structbuilder mapassembler repr valueprototype") } type _StructRepresentation_Stringpairs__ReprKeyAssembler _StructRepresentation_Stringpairs__ReprAssembler -func (_StructRepresentation_Stringpairs__ReprKeyAssembler) BeginMap(sizeHint int64) (dms3ld.MapAssembler, error) { +func (_StructRepresentation_Stringpairs__ReprKeyAssembler) BeginMap(sizeHint int64) (ld.MapAssembler, error) { return mixins.StringAssembler{TypeName: "schemadmt.StructRepresentation_Stringpairs.Repr.KeyAssembler"}.BeginMap(0) } -func (_StructRepresentation_Stringpairs__ReprKeyAssembler) BeginList(sizeHint int64) (dms3ld.ListAssembler, error) { +func (_StructRepresentation_Stringpairs__ReprKeyAssembler) BeginList(sizeHint int64) (ld.ListAssembler, error) { return mixins.StringAssembler{TypeName: "schemadmt.StructRepresentation_Stringpairs.Repr.KeyAssembler"}.BeginList(0) } func (na *_StructRepresentation_Stringpairs__ReprKeyAssembler) AssignNull() error { @@ -22916,7 +22916,7 @@ func (ka *_StructRepresentation_Stringpairs__ReprKeyAssembler) AssignString(k st switch k { case "innerDelim": if ka.s&fieldBit__StructRepresentation_Stringpairs_InnerDelim != 0 { - return dms3ld.ErrRepeatedMapKey{Key: &fieldName__StructRepresentation_Stringpairs_InnerDelim_serial} + return ld.ErrRepeatedMapKey{Key: &fieldName__StructRepresentation_Stringpairs_InnerDelim_serial} } ka.s += fieldBit__StructRepresentation_Stringpairs_InnerDelim ka.state = maState_expectValue @@ -22924,29 +22924,29 @@ func (ka *_StructRepresentation_Stringpairs__ReprKeyAssembler) AssignString(k st return nil case "entryDelim": if ka.s&fieldBit__StructRepresentation_Stringpairs_EntryDelim != 0 { - return dms3ld.ErrRepeatedMapKey{Key: &fieldName__StructRepresentation_Stringpairs_EntryDelim_serial} + return ld.ErrRepeatedMapKey{Key: &fieldName__StructRepresentation_Stringpairs_EntryDelim_serial} } ka.s += fieldBit__StructRepresentation_Stringpairs_EntryDelim ka.state = maState_expectValue ka.f = 1 return nil } - return dms3ld.ErrInvalidKey{TypeName: "schemadmt.StructRepresentation_Stringpairs.Repr", Key: &_String{k}} + return ld.ErrInvalidKey{TypeName: "schemadmt.StructRepresentation_Stringpairs.Repr", Key: &_String{k}} } func (_StructRepresentation_Stringpairs__ReprKeyAssembler) AssignBytes([]byte) error { return mixins.StringAssembler{TypeName: "schemadmt.StructRepresentation_Stringpairs.Repr.KeyAssembler"}.AssignBytes(nil) } -func (_StructRepresentation_Stringpairs__ReprKeyAssembler) AssignLink(dms3ld.Link) error { +func (_StructRepresentation_Stringpairs__ReprKeyAssembler) AssignLink(ld.Link) error { return mixins.StringAssembler{TypeName: "schemadmt.StructRepresentation_Stringpairs.Repr.KeyAssembler"}.AssignLink(nil) } -func (ka *_StructRepresentation_Stringpairs__ReprKeyAssembler) AssignNode(v dms3ld.Node) error { +func (ka *_StructRepresentation_Stringpairs__ReprKeyAssembler) AssignNode(v ld.Node) error { if v2, err := v.AsString(); err != nil { return err } else { return ka.AssignString(v2) } } -func (_StructRepresentation_Stringpairs__ReprKeyAssembler) Prototype() dms3ld.NodePrototype { +func (_StructRepresentation_Stringpairs__ReprKeyAssembler) Prototype() ld.NodePrototype { return _String__Prototype{} } @@ -22969,12 +22969,12 @@ func (m MaybeStructRepresentation_Tuple) IsAbsent() bool { func (m MaybeStructRepresentation_Tuple) Exists() bool { return m.m == schema.Maybe_Value } -func (m MaybeStructRepresentation_Tuple) AsNode() dms3ld.Node { +func (m MaybeStructRepresentation_Tuple) AsNode() ld.Node { switch m.m { case schema.Maybe_Absent: - return dms3ld.Absent + return ld.Absent case schema.Maybe_Null: - return dms3ld.Null + return ld.Null case schema.Maybe_Value: return m.v default: @@ -22991,37 +22991,37 @@ func (m MaybeStructRepresentation_Tuple) Must() StructRepresentation_Tuple { var ( fieldName__StructRepresentation_Tuple_FieldOrder = _String{"fieldOrder"} ) -var _ dms3ld.Node = (StructRepresentation_Tuple)(&_StructRepresentation_Tuple{}) +var _ ld.Node = (StructRepresentation_Tuple)(&_StructRepresentation_Tuple{}) var _ schema.TypedNode = (StructRepresentation_Tuple)(&_StructRepresentation_Tuple{}) -func (StructRepresentation_Tuple) Kind() dms3ld.Kind { - return dms3ld.Kind_Map +func (StructRepresentation_Tuple) Kind() ld.Kind { + return ld.Kind_Map } -func (n StructRepresentation_Tuple) LookupByString(key string) (dms3ld.Node, error) { +func (n StructRepresentation_Tuple) LookupByString(key string) (ld.Node, error) { switch key { case "fieldOrder": if n.fieldOrder.m == schema.Maybe_Absent { - return dms3ld.Absent, nil + return ld.Absent, nil } return &n.fieldOrder.v, nil default: - return nil, schema.ErrNoSuchField{Type: nil /*TODO*/, Field: dms3ld.PathSegmentOfString(key)} + return nil, schema.ErrNoSuchField{Type: nil /*TODO*/, Field: ld.PathSegmentOfString(key)} } } -func (n StructRepresentation_Tuple) LookupByNode(key dms3ld.Node) (dms3ld.Node, error) { +func (n StructRepresentation_Tuple) LookupByNode(key ld.Node) (ld.Node, error) { ks, err := key.AsString() if err != nil { return nil, err } return n.LookupByString(ks) } -func (StructRepresentation_Tuple) LookupByIndex(idx int64) (dms3ld.Node, error) { +func (StructRepresentation_Tuple) LookupByIndex(idx int64) (ld.Node, error) { return mixins.Map{TypeName: "schemadmt.StructRepresentation_Tuple"}.LookupByIndex(0) } -func (n StructRepresentation_Tuple) LookupBySegment(seg dms3ld.PathSegment) (dms3ld.Node, error) { +func (n StructRepresentation_Tuple) LookupBySegment(seg ld.PathSegment) (ld.Node, error) { return n.LookupByString(seg.String()) } -func (n StructRepresentation_Tuple) MapIterator() dms3ld.MapIterator { +func (n StructRepresentation_Tuple) MapIterator() ld.MapIterator { return &_StructRepresentation_Tuple__MapItr{n, 0} } @@ -23030,15 +23030,15 @@ type _StructRepresentation_Tuple__MapItr struct { idx int } -func (itr *_StructRepresentation_Tuple__MapItr) Next() (k dms3ld.Node, v dms3ld.Node, _ error) { +func (itr *_StructRepresentation_Tuple__MapItr) Next() (k ld.Node, v ld.Node, _ error) { if itr.idx >= 1 { - return nil, nil, dms3ld.ErrIteratorOverread{} + return nil, nil, ld.ErrIteratorOverread{} } switch itr.idx { case 0: k = &fieldName__StructRepresentation_Tuple_FieldOrder if itr.n.fieldOrder.m == schema.Maybe_Absent { - v = dms3ld.Absent + v = ld.Absent break } v = &itr.n.fieldOrder.v @@ -23052,7 +23052,7 @@ func (itr *_StructRepresentation_Tuple__MapItr) Done() bool { return itr.idx >= 1 } -func (StructRepresentation_Tuple) ListIterator() dms3ld.ListIterator { +func (StructRepresentation_Tuple) ListIterator() ld.ListIterator { return nil } func (StructRepresentation_Tuple) Length() int64 { @@ -23079,16 +23079,16 @@ func (StructRepresentation_Tuple) AsString() (string, error) { func (StructRepresentation_Tuple) AsBytes() ([]byte, error) { return mixins.Map{TypeName: "schemadmt.StructRepresentation_Tuple"}.AsBytes() } -func (StructRepresentation_Tuple) AsLink() (dms3ld.Link, error) { +func (StructRepresentation_Tuple) AsLink() (ld.Link, error) { return mixins.Map{TypeName: "schemadmt.StructRepresentation_Tuple"}.AsLink() } -func (StructRepresentation_Tuple) Prototype() dms3ld.NodePrototype { +func (StructRepresentation_Tuple) Prototype() ld.NodePrototype { return _StructRepresentation_Tuple__Prototype{} } type _StructRepresentation_Tuple__Prototype struct{} -func (_StructRepresentation_Tuple__Prototype) NewBuilder() dms3ld.NodeBuilder { +func (_StructRepresentation_Tuple__Prototype) NewBuilder() ld.NodeBuilder { var nb _StructRepresentation_Tuple__Builder nb.Reset() return &nb @@ -23098,7 +23098,7 @@ type _StructRepresentation_Tuple__Builder struct { _StructRepresentation_Tuple__Assembler } -func (nb *_StructRepresentation_Tuple__Builder) Build() dms3ld.Node { +func (nb *_StructRepresentation_Tuple__Builder) Build() ld.Node { if *nb.m != schema.Maybe_Value { panic("invalid state: cannot call Build on an assembler that's not finished") } @@ -23132,7 +23132,7 @@ var ( fieldBits__StructRepresentation_Tuple_sufficient = 0 ) -func (na *_StructRepresentation_Tuple__Assembler) BeginMap(int64) (dms3ld.MapAssembler, error) { +func (na *_StructRepresentation_Tuple__Assembler) BeginMap(int64) (ld.MapAssembler, error) { switch *na.m { case schema.Maybe_Value, schema.Maybe_Null: panic("invalid state: cannot assign into assembler that's already finished") @@ -23145,7 +23145,7 @@ func (na *_StructRepresentation_Tuple__Assembler) BeginMap(int64) (dms3ld.MapAss } return na, nil } -func (_StructRepresentation_Tuple__Assembler) BeginList(sizeHint int64) (dms3ld.ListAssembler, error) { +func (_StructRepresentation_Tuple__Assembler) BeginList(sizeHint int64) (ld.ListAssembler, error) { return mixins.MapAssembler{TypeName: "schemadmt.StructRepresentation_Tuple"}.BeginList(0) } func (na *_StructRepresentation_Tuple__Assembler) AssignNull() error { @@ -23177,10 +23177,10 @@ func (_StructRepresentation_Tuple__Assembler) AssignString(string) error { func (_StructRepresentation_Tuple__Assembler) AssignBytes([]byte) error { return mixins.MapAssembler{TypeName: "schemadmt.StructRepresentation_Tuple"}.AssignBytes(nil) } -func (_StructRepresentation_Tuple__Assembler) AssignLink(dms3ld.Link) error { +func (_StructRepresentation_Tuple__Assembler) AssignLink(ld.Link) error { return mixins.MapAssembler{TypeName: "schemadmt.StructRepresentation_Tuple"}.AssignLink(nil) } -func (na *_StructRepresentation_Tuple__Assembler) AssignNode(v dms3ld.Node) error { +func (na *_StructRepresentation_Tuple__Assembler) AssignNode(v ld.Node) error { if v.IsNull() { return na.AssignNull() } @@ -23200,8 +23200,8 @@ func (na *_StructRepresentation_Tuple__Assembler) AssignNode(v dms3ld.Node) erro *na.m = schema.Maybe_Value return nil } - if v.Kind() != dms3ld.Kind_Map { - return dms3ld.ErrWrongKind{TypeName: "schemadmt.StructRepresentation_Tuple", MethodName: "AssignNode", AppropriateKind: dms3ld.KindSet_JustMap, ActualKind: v.Kind()} + if v.Kind() != ld.Kind_Map { + return ld.ErrWrongKind{TypeName: "schemadmt.StructRepresentation_Tuple", MethodName: "AssignNode", AppropriateKind: ld.KindSet_JustMap, ActualKind: v.Kind()} } itr := v.MapIterator() for !itr.Done() { @@ -23218,7 +23218,7 @@ func (na *_StructRepresentation_Tuple__Assembler) AssignNode(v dms3ld.Node) erro } return na.Finish() } -func (_StructRepresentation_Tuple__Assembler) Prototype() dms3ld.NodePrototype { +func (_StructRepresentation_Tuple__Assembler) Prototype() ld.NodePrototype { return _StructRepresentation_Tuple__Prototype{} } func (ma *_StructRepresentation_Tuple__Assembler) valueFinishTidy() bool { @@ -23235,7 +23235,7 @@ func (ma *_StructRepresentation_Tuple__Assembler) valueFinishTidy() bool { panic("unreachable") } } -func (ma *_StructRepresentation_Tuple__Assembler) AssembleEntry(k string) (dms3ld.NodeAssembler, error) { +func (ma *_StructRepresentation_Tuple__Assembler) AssembleEntry(k string) (ld.NodeAssembler, error) { switch ma.state { case maState_initial: // carry on @@ -23253,7 +23253,7 @@ func (ma *_StructRepresentation_Tuple__Assembler) AssembleEntry(k string) (dms3l switch k { case "fieldOrder": if ma.s&fieldBit__StructRepresentation_Tuple_FieldOrder != 0 { - return nil, dms3ld.ErrRepeatedMapKey{Key: &fieldName__StructRepresentation_Tuple_FieldOrder} + return nil, ld.ErrRepeatedMapKey{Key: &fieldName__StructRepresentation_Tuple_FieldOrder} } ma.s += fieldBit__StructRepresentation_Tuple_FieldOrder ma.state = maState_midValue @@ -23262,9 +23262,9 @@ func (ma *_StructRepresentation_Tuple__Assembler) AssembleEntry(k string) (dms3l ma.ca_fieldOrder.m = &ma.w.fieldOrder.m return &ma.ca_fieldOrder, nil } - return nil, dms3ld.ErrInvalidKey{TypeName: "schemadmt.StructRepresentation_Tuple", Key: &_String{k}} + return nil, ld.ErrInvalidKey{TypeName: "schemadmt.StructRepresentation_Tuple", Key: &_String{k}} } -func (ma *_StructRepresentation_Tuple__Assembler) AssembleKey() dms3ld.NodeAssembler { +func (ma *_StructRepresentation_Tuple__Assembler) AssembleKey() ld.NodeAssembler { switch ma.state { case maState_initial: // carry on @@ -23282,7 +23282,7 @@ func (ma *_StructRepresentation_Tuple__Assembler) AssembleKey() dms3ld.NodeAssem ma.state = maState_midKey return (*_StructRepresentation_Tuple__KeyAssembler)(ma) } -func (ma *_StructRepresentation_Tuple__Assembler) AssembleValue() dms3ld.NodeAssembler { +func (ma *_StructRepresentation_Tuple__Assembler) AssembleValue() ld.NodeAssembler { switch ma.state { case maState_initial: panic("invalid state: AssembleValue cannot be called when no key is primed") @@ -23321,26 +23321,26 @@ func (ma *_StructRepresentation_Tuple__Assembler) Finish() error { panic("invalid state: Finish cannot be called on an assembler that's already finished") } if ma.s&fieldBits__StructRepresentation_Tuple_sufficient != fieldBits__StructRepresentation_Tuple_sufficient { - err := dms3ld.ErrMissingRequiredField{Missing: make([]string, 0)} + err := ld.ErrMissingRequiredField{Missing: make([]string, 0)} return err } ma.state = maState_finished *ma.m = schema.Maybe_Value return nil } -func (ma *_StructRepresentation_Tuple__Assembler) KeyPrototype() dms3ld.NodePrototype { +func (ma *_StructRepresentation_Tuple__Assembler) KeyPrototype() ld.NodePrototype { return _String__Prototype{} } -func (ma *_StructRepresentation_Tuple__Assembler) ValuePrototype(k string) dms3ld.NodePrototype { +func (ma *_StructRepresentation_Tuple__Assembler) ValuePrototype(k string) ld.NodePrototype { panic("todo structbuilder mapassembler valueprototype") } type _StructRepresentation_Tuple__KeyAssembler _StructRepresentation_Tuple__Assembler -func (_StructRepresentation_Tuple__KeyAssembler) BeginMap(sizeHint int64) (dms3ld.MapAssembler, error) { +func (_StructRepresentation_Tuple__KeyAssembler) BeginMap(sizeHint int64) (ld.MapAssembler, error) { return mixins.StringAssembler{TypeName: "schemadmt.StructRepresentation_Tuple.KeyAssembler"}.BeginMap(0) } -func (_StructRepresentation_Tuple__KeyAssembler) BeginList(sizeHint int64) (dms3ld.ListAssembler, error) { +func (_StructRepresentation_Tuple__KeyAssembler) BeginList(sizeHint int64) (ld.ListAssembler, error) { return mixins.StringAssembler{TypeName: "schemadmt.StructRepresentation_Tuple.KeyAssembler"}.BeginList(0) } func (na *_StructRepresentation_Tuple__KeyAssembler) AssignNull() error { @@ -23362,36 +23362,36 @@ func (ka *_StructRepresentation_Tuple__KeyAssembler) AssignString(k string) erro switch k { case "fieldOrder": if ka.s&fieldBit__StructRepresentation_Tuple_FieldOrder != 0 { - return dms3ld.ErrRepeatedMapKey{Key: &fieldName__StructRepresentation_Tuple_FieldOrder} + return ld.ErrRepeatedMapKey{Key: &fieldName__StructRepresentation_Tuple_FieldOrder} } ka.s += fieldBit__StructRepresentation_Tuple_FieldOrder ka.state = maState_expectValue ka.f = 0 default: - return dms3ld.ErrInvalidKey{TypeName: "schemadmt.StructRepresentation_Tuple", Key: &_String{k}} + return ld.ErrInvalidKey{TypeName: "schemadmt.StructRepresentation_Tuple", Key: &_String{k}} } return nil } func (_StructRepresentation_Tuple__KeyAssembler) AssignBytes([]byte) error { return mixins.StringAssembler{TypeName: "schemadmt.StructRepresentation_Tuple.KeyAssembler"}.AssignBytes(nil) } -func (_StructRepresentation_Tuple__KeyAssembler) AssignLink(dms3ld.Link) error { +func (_StructRepresentation_Tuple__KeyAssembler) AssignLink(ld.Link) error { return mixins.StringAssembler{TypeName: "schemadmt.StructRepresentation_Tuple.KeyAssembler"}.AssignLink(nil) } -func (ka *_StructRepresentation_Tuple__KeyAssembler) AssignNode(v dms3ld.Node) error { +func (ka *_StructRepresentation_Tuple__KeyAssembler) AssignNode(v ld.Node) error { if v2, err := v.AsString(); err != nil { return err } else { return ka.AssignString(v2) } } -func (_StructRepresentation_Tuple__KeyAssembler) Prototype() dms3ld.NodePrototype { +func (_StructRepresentation_Tuple__KeyAssembler) Prototype() ld.NodePrototype { return _String__Prototype{} } func (StructRepresentation_Tuple) Type() schema.Type { return nil /*TODO:typelit*/ } -func (n StructRepresentation_Tuple) Representation() dms3ld.Node { +func (n StructRepresentation_Tuple) Representation() ld.Node { return (*_StructRepresentation_Tuple__Repr)(n) } @@ -23400,36 +23400,36 @@ type _StructRepresentation_Tuple__Repr _StructRepresentation_Tuple var ( fieldName__StructRepresentation_Tuple_FieldOrder_serial = _String{"fieldOrder"} ) -var _ dms3ld.Node = &_StructRepresentation_Tuple__Repr{} +var _ ld.Node = &_StructRepresentation_Tuple__Repr{} -func (_StructRepresentation_Tuple__Repr) Kind() dms3ld.Kind { - return dms3ld.Kind_Map +func (_StructRepresentation_Tuple__Repr) Kind() ld.Kind { + return ld.Kind_Map } -func (n *_StructRepresentation_Tuple__Repr) LookupByString(key string) (dms3ld.Node, error) { +func (n *_StructRepresentation_Tuple__Repr) LookupByString(key string) (ld.Node, error) { switch key { case "fieldOrder": if n.fieldOrder.m == schema.Maybe_Absent { - return dms3ld.Absent, dms3ld.ErrNotExists{Segment: dms3ld.PathSegmentOfString(key)} + return ld.Absent, ld.ErrNotExists{Segment: ld.PathSegmentOfString(key)} } return n.fieldOrder.v.Representation(), nil default: - return nil, schema.ErrNoSuchField{Type: nil /*TODO*/, Field: dms3ld.PathSegmentOfString(key)} + return nil, schema.ErrNoSuchField{Type: nil /*TODO*/, Field: ld.PathSegmentOfString(key)} } } -func (n *_StructRepresentation_Tuple__Repr) LookupByNode(key dms3ld.Node) (dms3ld.Node, error) { +func (n *_StructRepresentation_Tuple__Repr) LookupByNode(key ld.Node) (ld.Node, error) { ks, err := key.AsString() if err != nil { return nil, err } return n.LookupByString(ks) } -func (_StructRepresentation_Tuple__Repr) LookupByIndex(idx int64) (dms3ld.Node, error) { +func (_StructRepresentation_Tuple__Repr) LookupByIndex(idx int64) (ld.Node, error) { return mixins.Map{TypeName: "schemadmt.StructRepresentation_Tuple.Repr"}.LookupByIndex(0) } -func (n _StructRepresentation_Tuple__Repr) LookupBySegment(seg dms3ld.PathSegment) (dms3ld.Node, error) { +func (n _StructRepresentation_Tuple__Repr) LookupBySegment(seg ld.PathSegment) (ld.Node, error) { return n.LookupByString(seg.String()) } -func (n *_StructRepresentation_Tuple__Repr) MapIterator() dms3ld.MapIterator { +func (n *_StructRepresentation_Tuple__Repr) MapIterator() ld.MapIterator { end := 1 if n.fieldOrder.m == schema.Maybe_Absent { end = 0 @@ -23446,10 +23446,10 @@ type _StructRepresentation_Tuple__ReprMapItr struct { end int } -func (itr *_StructRepresentation_Tuple__ReprMapItr) Next() (k dms3ld.Node, v dms3ld.Node, _ error) { +func (itr *_StructRepresentation_Tuple__ReprMapItr) Next() (k ld.Node, v ld.Node, _ error) { advance: if itr.idx >= 1 { - return nil, nil, dms3ld.ErrIteratorOverread{} + return nil, nil, ld.ErrIteratorOverread{} } switch itr.idx { case 0: @@ -23468,7 +23468,7 @@ advance: func (itr *_StructRepresentation_Tuple__ReprMapItr) Done() bool { return itr.idx >= itr.end } -func (_StructRepresentation_Tuple__Repr) ListIterator() dms3ld.ListIterator { +func (_StructRepresentation_Tuple__Repr) ListIterator() ld.ListIterator { return nil } func (rn *_StructRepresentation_Tuple__Repr) Length() int64 { @@ -23499,16 +23499,16 @@ func (_StructRepresentation_Tuple__Repr) AsString() (string, error) { func (_StructRepresentation_Tuple__Repr) AsBytes() ([]byte, error) { return mixins.Map{TypeName: "schemadmt.StructRepresentation_Tuple.Repr"}.AsBytes() } -func (_StructRepresentation_Tuple__Repr) AsLink() (dms3ld.Link, error) { +func (_StructRepresentation_Tuple__Repr) AsLink() (ld.Link, error) { return mixins.Map{TypeName: "schemadmt.StructRepresentation_Tuple.Repr"}.AsLink() } -func (_StructRepresentation_Tuple__Repr) Prototype() dms3ld.NodePrototype { +func (_StructRepresentation_Tuple__Repr) Prototype() ld.NodePrototype { return _StructRepresentation_Tuple__ReprPrototype{} } type _StructRepresentation_Tuple__ReprPrototype struct{} -func (_StructRepresentation_Tuple__ReprPrototype) NewBuilder() dms3ld.NodeBuilder { +func (_StructRepresentation_Tuple__ReprPrototype) NewBuilder() ld.NodeBuilder { var nb _StructRepresentation_Tuple__ReprBuilder nb.Reset() return &nb @@ -23518,7 +23518,7 @@ type _StructRepresentation_Tuple__ReprBuilder struct { _StructRepresentation_Tuple__ReprAssembler } -func (nb *_StructRepresentation_Tuple__ReprBuilder) Build() dms3ld.Node { +func (nb *_StructRepresentation_Tuple__ReprBuilder) Build() ld.Node { if *nb.m != schema.Maybe_Value { panic("invalid state: cannot call Build on an assembler that's not finished") } @@ -23546,7 +23546,7 @@ func (na *_StructRepresentation_Tuple__ReprAssembler) reset() { na.s = 0 na.ca_fieldOrder.reset() } -func (na *_StructRepresentation_Tuple__ReprAssembler) BeginMap(int64) (dms3ld.MapAssembler, error) { +func (na *_StructRepresentation_Tuple__ReprAssembler) BeginMap(int64) (ld.MapAssembler, error) { switch *na.m { case schema.Maybe_Value, schema.Maybe_Null: panic("invalid state: cannot assign into assembler that's already finished") @@ -23559,7 +23559,7 @@ func (na *_StructRepresentation_Tuple__ReprAssembler) BeginMap(int64) (dms3ld.Ma } return na, nil } -func (_StructRepresentation_Tuple__ReprAssembler) BeginList(sizeHint int64) (dms3ld.ListAssembler, error) { +func (_StructRepresentation_Tuple__ReprAssembler) BeginList(sizeHint int64) (ld.ListAssembler, error) { return mixins.MapAssembler{TypeName: "schemadmt.StructRepresentation_Tuple.Repr"}.BeginList(0) } func (na *_StructRepresentation_Tuple__ReprAssembler) AssignNull() error { @@ -23591,10 +23591,10 @@ func (_StructRepresentation_Tuple__ReprAssembler) AssignString(string) error { func (_StructRepresentation_Tuple__ReprAssembler) AssignBytes([]byte) error { return mixins.MapAssembler{TypeName: "schemadmt.StructRepresentation_Tuple.Repr"}.AssignBytes(nil) } -func (_StructRepresentation_Tuple__ReprAssembler) AssignLink(dms3ld.Link) error { +func (_StructRepresentation_Tuple__ReprAssembler) AssignLink(ld.Link) error { return mixins.MapAssembler{TypeName: "schemadmt.StructRepresentation_Tuple.Repr"}.AssignLink(nil) } -func (na *_StructRepresentation_Tuple__ReprAssembler) AssignNode(v dms3ld.Node) error { +func (na *_StructRepresentation_Tuple__ReprAssembler) AssignNode(v ld.Node) error { if v.IsNull() { return na.AssignNull() } @@ -23614,8 +23614,8 @@ func (na *_StructRepresentation_Tuple__ReprAssembler) AssignNode(v dms3ld.Node) *na.m = schema.Maybe_Value return nil } - if v.Kind() != dms3ld.Kind_Map { - return dms3ld.ErrWrongKind{TypeName: "schemadmt.StructRepresentation_Tuple.Repr", MethodName: "AssignNode", AppropriateKind: dms3ld.KindSet_JustMap, ActualKind: v.Kind()} + if v.Kind() != ld.Kind_Map { + return ld.ErrWrongKind{TypeName: "schemadmt.StructRepresentation_Tuple.Repr", MethodName: "AssignNode", AppropriateKind: ld.KindSet_JustMap, ActualKind: v.Kind()} } itr := v.MapIterator() for !itr.Done() { @@ -23632,7 +23632,7 @@ func (na *_StructRepresentation_Tuple__ReprAssembler) AssignNode(v dms3ld.Node) } return na.Finish() } -func (_StructRepresentation_Tuple__ReprAssembler) Prototype() dms3ld.NodePrototype { +func (_StructRepresentation_Tuple__ReprAssembler) Prototype() ld.NodePrototype { return _StructRepresentation_Tuple__ReprPrototype{} } func (ma *_StructRepresentation_Tuple__ReprAssembler) valueFinishTidy() bool { @@ -23649,7 +23649,7 @@ func (ma *_StructRepresentation_Tuple__ReprAssembler) valueFinishTidy() bool { panic("unreachable") } } -func (ma *_StructRepresentation_Tuple__ReprAssembler) AssembleEntry(k string) (dms3ld.NodeAssembler, error) { +func (ma *_StructRepresentation_Tuple__ReprAssembler) AssembleEntry(k string) (ld.NodeAssembler, error) { switch ma.state { case maState_initial: // carry on @@ -23667,7 +23667,7 @@ func (ma *_StructRepresentation_Tuple__ReprAssembler) AssembleEntry(k string) (d switch k { case "fieldOrder": if ma.s&fieldBit__StructRepresentation_Tuple_FieldOrder != 0 { - return nil, dms3ld.ErrRepeatedMapKey{Key: &fieldName__StructRepresentation_Tuple_FieldOrder_serial} + return nil, ld.ErrRepeatedMapKey{Key: &fieldName__StructRepresentation_Tuple_FieldOrder_serial} } ma.s += fieldBit__StructRepresentation_Tuple_FieldOrder ma.state = maState_midValue @@ -23678,9 +23678,9 @@ func (ma *_StructRepresentation_Tuple__ReprAssembler) AssembleEntry(k string) (d return &ma.ca_fieldOrder, nil default: } - return nil, dms3ld.ErrInvalidKey{TypeName: "schemadmt.StructRepresentation_Tuple.Repr", Key: &_String{k}} + return nil, ld.ErrInvalidKey{TypeName: "schemadmt.StructRepresentation_Tuple.Repr", Key: &_String{k}} } -func (ma *_StructRepresentation_Tuple__ReprAssembler) AssembleKey() dms3ld.NodeAssembler { +func (ma *_StructRepresentation_Tuple__ReprAssembler) AssembleKey() ld.NodeAssembler { switch ma.state { case maState_initial: // carry on @@ -23698,7 +23698,7 @@ func (ma *_StructRepresentation_Tuple__ReprAssembler) AssembleKey() dms3ld.NodeA ma.state = maState_midKey return (*_StructRepresentation_Tuple__ReprKeyAssembler)(ma) } -func (ma *_StructRepresentation_Tuple__ReprAssembler) AssembleValue() dms3ld.NodeAssembler { +func (ma *_StructRepresentation_Tuple__ReprAssembler) AssembleValue() ld.NodeAssembler { switch ma.state { case maState_initial: panic("invalid state: AssembleValue cannot be called when no key is primed") @@ -23738,26 +23738,26 @@ func (ma *_StructRepresentation_Tuple__ReprAssembler) Finish() error { panic("invalid state: Finish cannot be called on an assembler that's already finished") } if ma.s&fieldBits__StructRepresentation_Tuple_sufficient != fieldBits__StructRepresentation_Tuple_sufficient { - err := dms3ld.ErrMissingRequiredField{Missing: make([]string, 0)} + err := ld.ErrMissingRequiredField{Missing: make([]string, 0)} return err } ma.state = maState_finished *ma.m = schema.Maybe_Value return nil } -func (ma *_StructRepresentation_Tuple__ReprAssembler) KeyPrototype() dms3ld.NodePrototype { +func (ma *_StructRepresentation_Tuple__ReprAssembler) KeyPrototype() ld.NodePrototype { return _String__Prototype{} } -func (ma *_StructRepresentation_Tuple__ReprAssembler) ValuePrototype(k string) dms3ld.NodePrototype { +func (ma *_StructRepresentation_Tuple__ReprAssembler) ValuePrototype(k string) ld.NodePrototype { panic("todo structbuilder mapassembler repr valueprototype") } type _StructRepresentation_Tuple__ReprKeyAssembler _StructRepresentation_Tuple__ReprAssembler -func (_StructRepresentation_Tuple__ReprKeyAssembler) BeginMap(sizeHint int64) (dms3ld.MapAssembler, error) { +func (_StructRepresentation_Tuple__ReprKeyAssembler) BeginMap(sizeHint int64) (ld.MapAssembler, error) { return mixins.StringAssembler{TypeName: "schemadmt.StructRepresentation_Tuple.Repr.KeyAssembler"}.BeginMap(0) } -func (_StructRepresentation_Tuple__ReprKeyAssembler) BeginList(sizeHint int64) (dms3ld.ListAssembler, error) { +func (_StructRepresentation_Tuple__ReprKeyAssembler) BeginList(sizeHint int64) (ld.ListAssembler, error) { return mixins.StringAssembler{TypeName: "schemadmt.StructRepresentation_Tuple.Repr.KeyAssembler"}.BeginList(0) } func (na *_StructRepresentation_Tuple__ReprKeyAssembler) AssignNull() error { @@ -23779,29 +23779,29 @@ func (ka *_StructRepresentation_Tuple__ReprKeyAssembler) AssignString(k string) switch k { case "fieldOrder": if ka.s&fieldBit__StructRepresentation_Tuple_FieldOrder != 0 { - return dms3ld.ErrRepeatedMapKey{Key: &fieldName__StructRepresentation_Tuple_FieldOrder_serial} + return ld.ErrRepeatedMapKey{Key: &fieldName__StructRepresentation_Tuple_FieldOrder_serial} } ka.s += fieldBit__StructRepresentation_Tuple_FieldOrder ka.state = maState_expectValue ka.f = 0 return nil } - return dms3ld.ErrInvalidKey{TypeName: "schemadmt.StructRepresentation_Tuple.Repr", Key: &_String{k}} + return ld.ErrInvalidKey{TypeName: "schemadmt.StructRepresentation_Tuple.Repr", Key: &_String{k}} } func (_StructRepresentation_Tuple__ReprKeyAssembler) AssignBytes([]byte) error { return mixins.StringAssembler{TypeName: "schemadmt.StructRepresentation_Tuple.Repr.KeyAssembler"}.AssignBytes(nil) } -func (_StructRepresentation_Tuple__ReprKeyAssembler) AssignLink(dms3ld.Link) error { +func (_StructRepresentation_Tuple__ReprKeyAssembler) AssignLink(ld.Link) error { return mixins.StringAssembler{TypeName: "schemadmt.StructRepresentation_Tuple.Repr.KeyAssembler"}.AssignLink(nil) } -func (ka *_StructRepresentation_Tuple__ReprKeyAssembler) AssignNode(v dms3ld.Node) error { +func (ka *_StructRepresentation_Tuple__ReprKeyAssembler) AssignNode(v ld.Node) error { if v2, err := v.AsString(); err != nil { return err } else { return ka.AssignString(v2) } } -func (_StructRepresentation_Tuple__ReprKeyAssembler) Prototype() dms3ld.NodePrototype { +func (_StructRepresentation_Tuple__ReprKeyAssembler) Prototype() ld.NodePrototype { return _String__Prototype{} } @@ -23820,12 +23820,12 @@ func (m MaybeTypeBool) IsAbsent() bool { func (m MaybeTypeBool) Exists() bool { return m.m == schema.Maybe_Value } -func (m MaybeTypeBool) AsNode() dms3ld.Node { +func (m MaybeTypeBool) AsNode() ld.Node { switch m.m { case schema.Maybe_Absent: - return dms3ld.Absent + return ld.Absent case schema.Maybe_Null: - return dms3ld.Null + return ld.Null case schema.Maybe_Value: return m.v default: @@ -23840,32 +23840,32 @@ func (m MaybeTypeBool) Must() TypeBool { } var () -var _ dms3ld.Node = (TypeBool)(&_TypeBool{}) +var _ ld.Node = (TypeBool)(&_TypeBool{}) var _ schema.TypedNode = (TypeBool)(&_TypeBool{}) -func (TypeBool) Kind() dms3ld.Kind { - return dms3ld.Kind_Map +func (TypeBool) Kind() ld.Kind { + return ld.Kind_Map } -func (n TypeBool) LookupByString(key string) (dms3ld.Node, error) { +func (n TypeBool) LookupByString(key string) (ld.Node, error) { switch key { default: - return nil, schema.ErrNoSuchField{Type: nil /*TODO*/, Field: dms3ld.PathSegmentOfString(key)} + return nil, schema.ErrNoSuchField{Type: nil /*TODO*/, Field: ld.PathSegmentOfString(key)} } } -func (n TypeBool) LookupByNode(key dms3ld.Node) (dms3ld.Node, error) { +func (n TypeBool) LookupByNode(key ld.Node) (ld.Node, error) { ks, err := key.AsString() if err != nil { return nil, err } return n.LookupByString(ks) } -func (TypeBool) LookupByIndex(idx int64) (dms3ld.Node, error) { +func (TypeBool) LookupByIndex(idx int64) (ld.Node, error) { return mixins.Map{TypeName: "schemadmt.TypeBool"}.LookupByIndex(0) } -func (n TypeBool) LookupBySegment(seg dms3ld.PathSegment) (dms3ld.Node, error) { +func (n TypeBool) LookupBySegment(seg ld.PathSegment) (ld.Node, error) { return n.LookupByString(seg.String()) } -func (n TypeBool) MapIterator() dms3ld.MapIterator { +func (n TypeBool) MapIterator() ld.MapIterator { return &_TypeBool__MapItr{n, 0} } @@ -23874,15 +23874,15 @@ type _TypeBool__MapItr struct { idx int } -func (itr *_TypeBool__MapItr) Next() (k dms3ld.Node, v dms3ld.Node, _ error) { - return nil, nil, dms3ld.ErrIteratorOverread{} +func (itr *_TypeBool__MapItr) Next() (k ld.Node, v ld.Node, _ error) { + return nil, nil, ld.ErrIteratorOverread{} } func (itr *_TypeBool__MapItr) Done() bool { return itr.idx >= 0 } -func (TypeBool) ListIterator() dms3ld.ListIterator { +func (TypeBool) ListIterator() ld.ListIterator { return nil } func (TypeBool) Length() int64 { @@ -23909,16 +23909,16 @@ func (TypeBool) AsString() (string, error) { func (TypeBool) AsBytes() ([]byte, error) { return mixins.Map{TypeName: "schemadmt.TypeBool"}.AsBytes() } -func (TypeBool) AsLink() (dms3ld.Link, error) { +func (TypeBool) AsLink() (ld.Link, error) { return mixins.Map{TypeName: "schemadmt.TypeBool"}.AsLink() } -func (TypeBool) Prototype() dms3ld.NodePrototype { +func (TypeBool) Prototype() ld.NodePrototype { return _TypeBool__Prototype{} } type _TypeBool__Prototype struct{} -func (_TypeBool__Prototype) NewBuilder() dms3ld.NodeBuilder { +func (_TypeBool__Prototype) NewBuilder() ld.NodeBuilder { var nb _TypeBool__Builder nb.Reset() return &nb @@ -23928,7 +23928,7 @@ type _TypeBool__Builder struct { _TypeBool__Assembler } -func (nb *_TypeBool__Builder) Build() dms3ld.Node { +func (nb *_TypeBool__Builder) Build() ld.Node { if *nb.m != schema.Maybe_Value { panic("invalid state: cannot call Build on an assembler that's not finished") } @@ -23959,7 +23959,7 @@ var ( fieldBits__TypeBool_sufficient = 0 ) -func (na *_TypeBool__Assembler) BeginMap(int64) (dms3ld.MapAssembler, error) { +func (na *_TypeBool__Assembler) BeginMap(int64) (ld.MapAssembler, error) { switch *na.m { case schema.Maybe_Value, schema.Maybe_Null: panic("invalid state: cannot assign into assembler that's already finished") @@ -23972,7 +23972,7 @@ func (na *_TypeBool__Assembler) BeginMap(int64) (dms3ld.MapAssembler, error) { } return na, nil } -func (_TypeBool__Assembler) BeginList(sizeHint int64) (dms3ld.ListAssembler, error) { +func (_TypeBool__Assembler) BeginList(sizeHint int64) (ld.ListAssembler, error) { return mixins.MapAssembler{TypeName: "schemadmt.TypeBool"}.BeginList(0) } func (na *_TypeBool__Assembler) AssignNull() error { @@ -24004,10 +24004,10 @@ func (_TypeBool__Assembler) AssignString(string) error { func (_TypeBool__Assembler) AssignBytes([]byte) error { return mixins.MapAssembler{TypeName: "schemadmt.TypeBool"}.AssignBytes(nil) } -func (_TypeBool__Assembler) AssignLink(dms3ld.Link) error { +func (_TypeBool__Assembler) AssignLink(ld.Link) error { return mixins.MapAssembler{TypeName: "schemadmt.TypeBool"}.AssignLink(nil) } -func (na *_TypeBool__Assembler) AssignNode(v dms3ld.Node) error { +func (na *_TypeBool__Assembler) AssignNode(v ld.Node) error { if v.IsNull() { return na.AssignNull() } @@ -24027,8 +24027,8 @@ func (na *_TypeBool__Assembler) AssignNode(v dms3ld.Node) error { *na.m = schema.Maybe_Value return nil } - if v.Kind() != dms3ld.Kind_Map { - return dms3ld.ErrWrongKind{TypeName: "schemadmt.TypeBool", MethodName: "AssignNode", AppropriateKind: dms3ld.KindSet_JustMap, ActualKind: v.Kind()} + if v.Kind() != ld.Kind_Map { + return ld.ErrWrongKind{TypeName: "schemadmt.TypeBool", MethodName: "AssignNode", AppropriateKind: ld.KindSet_JustMap, ActualKind: v.Kind()} } itr := v.MapIterator() for !itr.Done() { @@ -24045,7 +24045,7 @@ func (na *_TypeBool__Assembler) AssignNode(v dms3ld.Node) error { } return na.Finish() } -func (_TypeBool__Assembler) Prototype() dms3ld.NodePrototype { +func (_TypeBool__Assembler) Prototype() ld.NodePrototype { return _TypeBool__Prototype{} } func (ma *_TypeBool__Assembler) valueFinishTidy() bool { @@ -24054,7 +24054,7 @@ func (ma *_TypeBool__Assembler) valueFinishTidy() bool { panic("unreachable") } } -func (ma *_TypeBool__Assembler) AssembleEntry(k string) (dms3ld.NodeAssembler, error) { +func (ma *_TypeBool__Assembler) AssembleEntry(k string) (ld.NodeAssembler, error) { switch ma.state { case maState_initial: // carry on @@ -24069,9 +24069,9 @@ func (ma *_TypeBool__Assembler) AssembleEntry(k string) (dms3ld.NodeAssembler, e case maState_finished: panic("invalid state: AssembleEntry cannot be called on an assembler that's already finished") } - return nil, dms3ld.ErrInvalidKey{TypeName: "schemadmt.TypeBool", Key: &_String{k}} + return nil, ld.ErrInvalidKey{TypeName: "schemadmt.TypeBool", Key: &_String{k}} } -func (ma *_TypeBool__Assembler) AssembleKey() dms3ld.NodeAssembler { +func (ma *_TypeBool__Assembler) AssembleKey() ld.NodeAssembler { switch ma.state { case maState_initial: // carry on @@ -24089,7 +24089,7 @@ func (ma *_TypeBool__Assembler) AssembleKey() dms3ld.NodeAssembler { ma.state = maState_midKey return (*_TypeBool__KeyAssembler)(ma) } -func (ma *_TypeBool__Assembler) AssembleValue() dms3ld.NodeAssembler { +func (ma *_TypeBool__Assembler) AssembleValue() ld.NodeAssembler { switch ma.state { case maState_initial: panic("invalid state: AssembleValue cannot be called when no key is primed") @@ -24124,26 +24124,26 @@ func (ma *_TypeBool__Assembler) Finish() error { panic("invalid state: Finish cannot be called on an assembler that's already finished") } if ma.s&fieldBits__TypeBool_sufficient != fieldBits__TypeBool_sufficient { - err := dms3ld.ErrMissingRequiredField{Missing: make([]string, 0)} + err := ld.ErrMissingRequiredField{Missing: make([]string, 0)} return err } ma.state = maState_finished *ma.m = schema.Maybe_Value return nil } -func (ma *_TypeBool__Assembler) KeyPrototype() dms3ld.NodePrototype { +func (ma *_TypeBool__Assembler) KeyPrototype() ld.NodePrototype { return _String__Prototype{} } -func (ma *_TypeBool__Assembler) ValuePrototype(k string) dms3ld.NodePrototype { +func (ma *_TypeBool__Assembler) ValuePrototype(k string) ld.NodePrototype { panic("todo structbuilder mapassembler valueprototype") } type _TypeBool__KeyAssembler _TypeBool__Assembler -func (_TypeBool__KeyAssembler) BeginMap(sizeHint int64) (dms3ld.MapAssembler, error) { +func (_TypeBool__KeyAssembler) BeginMap(sizeHint int64) (ld.MapAssembler, error) { return mixins.StringAssembler{TypeName: "schemadmt.TypeBool.KeyAssembler"}.BeginMap(0) } -func (_TypeBool__KeyAssembler) BeginList(sizeHint int64) (dms3ld.ListAssembler, error) { +func (_TypeBool__KeyAssembler) BeginList(sizeHint int64) (ld.ListAssembler, error) { return mixins.StringAssembler{TypeName: "schemadmt.TypeBool.KeyAssembler"}.BeginList(0) } func (na *_TypeBool__KeyAssembler) AssignNull() error { @@ -24164,61 +24164,61 @@ func (ka *_TypeBool__KeyAssembler) AssignString(k string) error { } switch k { default: - return dms3ld.ErrInvalidKey{TypeName: "schemadmt.TypeBool", Key: &_String{k}} + return ld.ErrInvalidKey{TypeName: "schemadmt.TypeBool", Key: &_String{k}} } return nil } func (_TypeBool__KeyAssembler) AssignBytes([]byte) error { return mixins.StringAssembler{TypeName: "schemadmt.TypeBool.KeyAssembler"}.AssignBytes(nil) } -func (_TypeBool__KeyAssembler) AssignLink(dms3ld.Link) error { +func (_TypeBool__KeyAssembler) AssignLink(ld.Link) error { return mixins.StringAssembler{TypeName: "schemadmt.TypeBool.KeyAssembler"}.AssignLink(nil) } -func (ka *_TypeBool__KeyAssembler) AssignNode(v dms3ld.Node) error { +func (ka *_TypeBool__KeyAssembler) AssignNode(v ld.Node) error { if v2, err := v.AsString(); err != nil { return err } else { return ka.AssignString(v2) } } -func (_TypeBool__KeyAssembler) Prototype() dms3ld.NodePrototype { +func (_TypeBool__KeyAssembler) Prototype() ld.NodePrototype { return _String__Prototype{} } func (TypeBool) Type() schema.Type { return nil /*TODO:typelit*/ } -func (n TypeBool) Representation() dms3ld.Node { +func (n TypeBool) Representation() ld.Node { return (*_TypeBool__Repr)(n) } type _TypeBool__Repr _TypeBool var () -var _ dms3ld.Node = &_TypeBool__Repr{} +var _ ld.Node = &_TypeBool__Repr{} -func (_TypeBool__Repr) Kind() dms3ld.Kind { - return dms3ld.Kind_Map +func (_TypeBool__Repr) Kind() ld.Kind { + return ld.Kind_Map } -func (n *_TypeBool__Repr) LookupByString(key string) (dms3ld.Node, error) { +func (n *_TypeBool__Repr) LookupByString(key string) (ld.Node, error) { switch key { default: - return nil, schema.ErrNoSuchField{Type: nil /*TODO*/, Field: dms3ld.PathSegmentOfString(key)} + return nil, schema.ErrNoSuchField{Type: nil /*TODO*/, Field: ld.PathSegmentOfString(key)} } } -func (n *_TypeBool__Repr) LookupByNode(key dms3ld.Node) (dms3ld.Node, error) { +func (n *_TypeBool__Repr) LookupByNode(key ld.Node) (ld.Node, error) { ks, err := key.AsString() if err != nil { return nil, err } return n.LookupByString(ks) } -func (_TypeBool__Repr) LookupByIndex(idx int64) (dms3ld.Node, error) { +func (_TypeBool__Repr) LookupByIndex(idx int64) (ld.Node, error) { return mixins.Map{TypeName: "schemadmt.TypeBool.Repr"}.LookupByIndex(0) } -func (n _TypeBool__Repr) LookupBySegment(seg dms3ld.PathSegment) (dms3ld.Node, error) { +func (n _TypeBool__Repr) LookupBySegment(seg ld.PathSegment) (ld.Node, error) { return n.LookupByString(seg.String()) } -func (n *_TypeBool__Repr) MapIterator() dms3ld.MapIterator { +func (n *_TypeBool__Repr) MapIterator() ld.MapIterator { return &_TypeBool__ReprMapItr{n, 0} } @@ -24227,14 +24227,14 @@ type _TypeBool__ReprMapItr struct { idx int } -func (itr *_TypeBool__ReprMapItr) Next() (k dms3ld.Node, v dms3ld.Node, _ error) { - return nil, nil, dms3ld.ErrIteratorOverread{} +func (itr *_TypeBool__ReprMapItr) Next() (k ld.Node, v ld.Node, _ error) { + return nil, nil, ld.ErrIteratorOverread{} } func (itr *_TypeBool__ReprMapItr) Done() bool { return itr.idx >= 0 } -func (_TypeBool__Repr) ListIterator() dms3ld.ListIterator { +func (_TypeBool__Repr) ListIterator() ld.ListIterator { return nil } func (rn *_TypeBool__Repr) Length() int64 { @@ -24262,16 +24262,16 @@ func (_TypeBool__Repr) AsString() (string, error) { func (_TypeBool__Repr) AsBytes() ([]byte, error) { return mixins.Map{TypeName: "schemadmt.TypeBool.Repr"}.AsBytes() } -func (_TypeBool__Repr) AsLink() (dms3ld.Link, error) { +func (_TypeBool__Repr) AsLink() (ld.Link, error) { return mixins.Map{TypeName: "schemadmt.TypeBool.Repr"}.AsLink() } -func (_TypeBool__Repr) Prototype() dms3ld.NodePrototype { +func (_TypeBool__Repr) Prototype() ld.NodePrototype { return _TypeBool__ReprPrototype{} } type _TypeBool__ReprPrototype struct{} -func (_TypeBool__ReprPrototype) NewBuilder() dms3ld.NodeBuilder { +func (_TypeBool__ReprPrototype) NewBuilder() ld.NodeBuilder { var nb _TypeBool__ReprBuilder nb.Reset() return &nb @@ -24281,7 +24281,7 @@ type _TypeBool__ReprBuilder struct { _TypeBool__ReprAssembler } -func (nb *_TypeBool__ReprBuilder) Build() dms3ld.Node { +func (nb *_TypeBool__ReprBuilder) Build() ld.Node { if *nb.m != schema.Maybe_Value { panic("invalid state: cannot call Build on an assembler that's not finished") } @@ -24307,7 +24307,7 @@ func (na *_TypeBool__ReprAssembler) reset() { na.state = maState_initial na.s = 0 } -func (na *_TypeBool__ReprAssembler) BeginMap(int64) (dms3ld.MapAssembler, error) { +func (na *_TypeBool__ReprAssembler) BeginMap(int64) (ld.MapAssembler, error) { switch *na.m { case schema.Maybe_Value, schema.Maybe_Null: panic("invalid state: cannot assign into assembler that's already finished") @@ -24320,7 +24320,7 @@ func (na *_TypeBool__ReprAssembler) BeginMap(int64) (dms3ld.MapAssembler, error) } return na, nil } -func (_TypeBool__ReprAssembler) BeginList(sizeHint int64) (dms3ld.ListAssembler, error) { +func (_TypeBool__ReprAssembler) BeginList(sizeHint int64) (ld.ListAssembler, error) { return mixins.MapAssembler{TypeName: "schemadmt.TypeBool.Repr"}.BeginList(0) } func (na *_TypeBool__ReprAssembler) AssignNull() error { @@ -24352,10 +24352,10 @@ func (_TypeBool__ReprAssembler) AssignString(string) error { func (_TypeBool__ReprAssembler) AssignBytes([]byte) error { return mixins.MapAssembler{TypeName: "schemadmt.TypeBool.Repr"}.AssignBytes(nil) } -func (_TypeBool__ReprAssembler) AssignLink(dms3ld.Link) error { +func (_TypeBool__ReprAssembler) AssignLink(ld.Link) error { return mixins.MapAssembler{TypeName: "schemadmt.TypeBool.Repr"}.AssignLink(nil) } -func (na *_TypeBool__ReprAssembler) AssignNode(v dms3ld.Node) error { +func (na *_TypeBool__ReprAssembler) AssignNode(v ld.Node) error { if v.IsNull() { return na.AssignNull() } @@ -24375,8 +24375,8 @@ func (na *_TypeBool__ReprAssembler) AssignNode(v dms3ld.Node) error { *na.m = schema.Maybe_Value return nil } - if v.Kind() != dms3ld.Kind_Map { - return dms3ld.ErrWrongKind{TypeName: "schemadmt.TypeBool.Repr", MethodName: "AssignNode", AppropriateKind: dms3ld.KindSet_JustMap, ActualKind: v.Kind()} + if v.Kind() != ld.Kind_Map { + return ld.ErrWrongKind{TypeName: "schemadmt.TypeBool.Repr", MethodName: "AssignNode", AppropriateKind: ld.KindSet_JustMap, ActualKind: v.Kind()} } itr := v.MapIterator() for !itr.Done() { @@ -24393,7 +24393,7 @@ func (na *_TypeBool__ReprAssembler) AssignNode(v dms3ld.Node) error { } return na.Finish() } -func (_TypeBool__ReprAssembler) Prototype() dms3ld.NodePrototype { +func (_TypeBool__ReprAssembler) Prototype() ld.NodePrototype { return _TypeBool__ReprPrototype{} } func (ma *_TypeBool__ReprAssembler) valueFinishTidy() bool { @@ -24402,7 +24402,7 @@ func (ma *_TypeBool__ReprAssembler) valueFinishTidy() bool { panic("unreachable") } } -func (ma *_TypeBool__ReprAssembler) AssembleEntry(k string) (dms3ld.NodeAssembler, error) { +func (ma *_TypeBool__ReprAssembler) AssembleEntry(k string) (ld.NodeAssembler, error) { switch ma.state { case maState_initial: // carry on @@ -24417,9 +24417,9 @@ func (ma *_TypeBool__ReprAssembler) AssembleEntry(k string) (dms3ld.NodeAssemble case maState_finished: panic("invalid state: AssembleEntry cannot be called on an assembler that's already finished") } - return nil, dms3ld.ErrInvalidKey{TypeName: "schemadmt.TypeBool.Repr", Key: &_String{k}} + return nil, ld.ErrInvalidKey{TypeName: "schemadmt.TypeBool.Repr", Key: &_String{k}} } -func (ma *_TypeBool__ReprAssembler) AssembleKey() dms3ld.NodeAssembler { +func (ma *_TypeBool__ReprAssembler) AssembleKey() ld.NodeAssembler { switch ma.state { case maState_initial: // carry on @@ -24437,7 +24437,7 @@ func (ma *_TypeBool__ReprAssembler) AssembleKey() dms3ld.NodeAssembler { ma.state = maState_midKey return (*_TypeBool__ReprKeyAssembler)(ma) } -func (ma *_TypeBool__ReprAssembler) AssembleValue() dms3ld.NodeAssembler { +func (ma *_TypeBool__ReprAssembler) AssembleValue() ld.NodeAssembler { switch ma.state { case maState_initial: panic("invalid state: AssembleValue cannot be called when no key is primed") @@ -24472,26 +24472,26 @@ func (ma *_TypeBool__ReprAssembler) Finish() error { panic("invalid state: Finish cannot be called on an assembler that's already finished") } if ma.s&fieldBits__TypeBool_sufficient != fieldBits__TypeBool_sufficient { - err := dms3ld.ErrMissingRequiredField{Missing: make([]string, 0)} + err := ld.ErrMissingRequiredField{Missing: make([]string, 0)} return err } ma.state = maState_finished *ma.m = schema.Maybe_Value return nil } -func (ma *_TypeBool__ReprAssembler) KeyPrototype() dms3ld.NodePrototype { +func (ma *_TypeBool__ReprAssembler) KeyPrototype() ld.NodePrototype { return _String__Prototype{} } -func (ma *_TypeBool__ReprAssembler) ValuePrototype(k string) dms3ld.NodePrototype { +func (ma *_TypeBool__ReprAssembler) ValuePrototype(k string) ld.NodePrototype { panic("todo structbuilder mapassembler repr valueprototype") } type _TypeBool__ReprKeyAssembler _TypeBool__ReprAssembler -func (_TypeBool__ReprKeyAssembler) BeginMap(sizeHint int64) (dms3ld.MapAssembler, error) { +func (_TypeBool__ReprKeyAssembler) BeginMap(sizeHint int64) (ld.MapAssembler, error) { return mixins.StringAssembler{TypeName: "schemadmt.TypeBool.Repr.KeyAssembler"}.BeginMap(0) } -func (_TypeBool__ReprKeyAssembler) BeginList(sizeHint int64) (dms3ld.ListAssembler, error) { +func (_TypeBool__ReprKeyAssembler) BeginList(sizeHint int64) (ld.ListAssembler, error) { return mixins.StringAssembler{TypeName: "schemadmt.TypeBool.Repr.KeyAssembler"}.BeginList(0) } func (na *_TypeBool__ReprKeyAssembler) AssignNull() error { @@ -24510,22 +24510,22 @@ func (ka *_TypeBool__ReprKeyAssembler) AssignString(k string) error { if ka.state != maState_midKey { panic("misuse: KeyAssembler held beyond its valid lifetime") } - return dms3ld.ErrInvalidKey{TypeName: "schemadmt.TypeBool.Repr", Key: &_String{k}} + return ld.ErrInvalidKey{TypeName: "schemadmt.TypeBool.Repr", Key: &_String{k}} } func (_TypeBool__ReprKeyAssembler) AssignBytes([]byte) error { return mixins.StringAssembler{TypeName: "schemadmt.TypeBool.Repr.KeyAssembler"}.AssignBytes(nil) } -func (_TypeBool__ReprKeyAssembler) AssignLink(dms3ld.Link) error { +func (_TypeBool__ReprKeyAssembler) AssignLink(ld.Link) error { return mixins.StringAssembler{TypeName: "schemadmt.TypeBool.Repr.KeyAssembler"}.AssignLink(nil) } -func (ka *_TypeBool__ReprKeyAssembler) AssignNode(v dms3ld.Node) error { +func (ka *_TypeBool__ReprKeyAssembler) AssignNode(v ld.Node) error { if v2, err := v.AsString(); err != nil { return err } else { return ka.AssignString(v2) } } -func (_TypeBool__ReprKeyAssembler) Prototype() dms3ld.NodePrototype { +func (_TypeBool__ReprKeyAssembler) Prototype() ld.NodePrototype { return _String__Prototype{} } @@ -24544,12 +24544,12 @@ func (m MaybeTypeBytes) IsAbsent() bool { func (m MaybeTypeBytes) Exists() bool { return m.m == schema.Maybe_Value } -func (m MaybeTypeBytes) AsNode() dms3ld.Node { +func (m MaybeTypeBytes) AsNode() ld.Node { switch m.m { case schema.Maybe_Absent: - return dms3ld.Absent + return ld.Absent case schema.Maybe_Null: - return dms3ld.Null + return ld.Null case schema.Maybe_Value: return m.v default: @@ -24564,32 +24564,32 @@ func (m MaybeTypeBytes) Must() TypeBytes { } var () -var _ dms3ld.Node = (TypeBytes)(&_TypeBytes{}) +var _ ld.Node = (TypeBytes)(&_TypeBytes{}) var _ schema.TypedNode = (TypeBytes)(&_TypeBytes{}) -func (TypeBytes) Kind() dms3ld.Kind { - return dms3ld.Kind_Map +func (TypeBytes) Kind() ld.Kind { + return ld.Kind_Map } -func (n TypeBytes) LookupByString(key string) (dms3ld.Node, error) { +func (n TypeBytes) LookupByString(key string) (ld.Node, error) { switch key { default: - return nil, schema.ErrNoSuchField{Type: nil /*TODO*/, Field: dms3ld.PathSegmentOfString(key)} + return nil, schema.ErrNoSuchField{Type: nil /*TODO*/, Field: ld.PathSegmentOfString(key)} } } -func (n TypeBytes) LookupByNode(key dms3ld.Node) (dms3ld.Node, error) { +func (n TypeBytes) LookupByNode(key ld.Node) (ld.Node, error) { ks, err := key.AsString() if err != nil { return nil, err } return n.LookupByString(ks) } -func (TypeBytes) LookupByIndex(idx int64) (dms3ld.Node, error) { +func (TypeBytes) LookupByIndex(idx int64) (ld.Node, error) { return mixins.Map{TypeName: "schemadmt.TypeBytes"}.LookupByIndex(0) } -func (n TypeBytes) LookupBySegment(seg dms3ld.PathSegment) (dms3ld.Node, error) { +func (n TypeBytes) LookupBySegment(seg ld.PathSegment) (ld.Node, error) { return n.LookupByString(seg.String()) } -func (n TypeBytes) MapIterator() dms3ld.MapIterator { +func (n TypeBytes) MapIterator() ld.MapIterator { return &_TypeBytes__MapItr{n, 0} } @@ -24598,15 +24598,15 @@ type _TypeBytes__MapItr struct { idx int } -func (itr *_TypeBytes__MapItr) Next() (k dms3ld.Node, v dms3ld.Node, _ error) { - return nil, nil, dms3ld.ErrIteratorOverread{} +func (itr *_TypeBytes__MapItr) Next() (k ld.Node, v ld.Node, _ error) { + return nil, nil, ld.ErrIteratorOverread{} } func (itr *_TypeBytes__MapItr) Done() bool { return itr.idx >= 0 } -func (TypeBytes) ListIterator() dms3ld.ListIterator { +func (TypeBytes) ListIterator() ld.ListIterator { return nil } func (TypeBytes) Length() int64 { @@ -24633,16 +24633,16 @@ func (TypeBytes) AsString() (string, error) { func (TypeBytes) AsBytes() ([]byte, error) { return mixins.Map{TypeName: "schemadmt.TypeBytes"}.AsBytes() } -func (TypeBytes) AsLink() (dms3ld.Link, error) { +func (TypeBytes) AsLink() (ld.Link, error) { return mixins.Map{TypeName: "schemadmt.TypeBytes"}.AsLink() } -func (TypeBytes) Prototype() dms3ld.NodePrototype { +func (TypeBytes) Prototype() ld.NodePrototype { return _TypeBytes__Prototype{} } type _TypeBytes__Prototype struct{} -func (_TypeBytes__Prototype) NewBuilder() dms3ld.NodeBuilder { +func (_TypeBytes__Prototype) NewBuilder() ld.NodeBuilder { var nb _TypeBytes__Builder nb.Reset() return &nb @@ -24652,7 +24652,7 @@ type _TypeBytes__Builder struct { _TypeBytes__Assembler } -func (nb *_TypeBytes__Builder) Build() dms3ld.Node { +func (nb *_TypeBytes__Builder) Build() ld.Node { if *nb.m != schema.Maybe_Value { panic("invalid state: cannot call Build on an assembler that's not finished") } @@ -24683,7 +24683,7 @@ var ( fieldBits__TypeBytes_sufficient = 0 ) -func (na *_TypeBytes__Assembler) BeginMap(int64) (dms3ld.MapAssembler, error) { +func (na *_TypeBytes__Assembler) BeginMap(int64) (ld.MapAssembler, error) { switch *na.m { case schema.Maybe_Value, schema.Maybe_Null: panic("invalid state: cannot assign into assembler that's already finished") @@ -24696,7 +24696,7 @@ func (na *_TypeBytes__Assembler) BeginMap(int64) (dms3ld.MapAssembler, error) { } return na, nil } -func (_TypeBytes__Assembler) BeginList(sizeHint int64) (dms3ld.ListAssembler, error) { +func (_TypeBytes__Assembler) BeginList(sizeHint int64) (ld.ListAssembler, error) { return mixins.MapAssembler{TypeName: "schemadmt.TypeBytes"}.BeginList(0) } func (na *_TypeBytes__Assembler) AssignNull() error { @@ -24728,10 +24728,10 @@ func (_TypeBytes__Assembler) AssignString(string) error { func (_TypeBytes__Assembler) AssignBytes([]byte) error { return mixins.MapAssembler{TypeName: "schemadmt.TypeBytes"}.AssignBytes(nil) } -func (_TypeBytes__Assembler) AssignLink(dms3ld.Link) error { +func (_TypeBytes__Assembler) AssignLink(ld.Link) error { return mixins.MapAssembler{TypeName: "schemadmt.TypeBytes"}.AssignLink(nil) } -func (na *_TypeBytes__Assembler) AssignNode(v dms3ld.Node) error { +func (na *_TypeBytes__Assembler) AssignNode(v ld.Node) error { if v.IsNull() { return na.AssignNull() } @@ -24751,8 +24751,8 @@ func (na *_TypeBytes__Assembler) AssignNode(v dms3ld.Node) error { *na.m = schema.Maybe_Value return nil } - if v.Kind() != dms3ld.Kind_Map { - return dms3ld.ErrWrongKind{TypeName: "schemadmt.TypeBytes", MethodName: "AssignNode", AppropriateKind: dms3ld.KindSet_JustMap, ActualKind: v.Kind()} + if v.Kind() != ld.Kind_Map { + return ld.ErrWrongKind{TypeName: "schemadmt.TypeBytes", MethodName: "AssignNode", AppropriateKind: ld.KindSet_JustMap, ActualKind: v.Kind()} } itr := v.MapIterator() for !itr.Done() { @@ -24769,7 +24769,7 @@ func (na *_TypeBytes__Assembler) AssignNode(v dms3ld.Node) error { } return na.Finish() } -func (_TypeBytes__Assembler) Prototype() dms3ld.NodePrototype { +func (_TypeBytes__Assembler) Prototype() ld.NodePrototype { return _TypeBytes__Prototype{} } func (ma *_TypeBytes__Assembler) valueFinishTidy() bool { @@ -24778,7 +24778,7 @@ func (ma *_TypeBytes__Assembler) valueFinishTidy() bool { panic("unreachable") } } -func (ma *_TypeBytes__Assembler) AssembleEntry(k string) (dms3ld.NodeAssembler, error) { +func (ma *_TypeBytes__Assembler) AssembleEntry(k string) (ld.NodeAssembler, error) { switch ma.state { case maState_initial: // carry on @@ -24793,9 +24793,9 @@ func (ma *_TypeBytes__Assembler) AssembleEntry(k string) (dms3ld.NodeAssembler, case maState_finished: panic("invalid state: AssembleEntry cannot be called on an assembler that's already finished") } - return nil, dms3ld.ErrInvalidKey{TypeName: "schemadmt.TypeBytes", Key: &_String{k}} + return nil, ld.ErrInvalidKey{TypeName: "schemadmt.TypeBytes", Key: &_String{k}} } -func (ma *_TypeBytes__Assembler) AssembleKey() dms3ld.NodeAssembler { +func (ma *_TypeBytes__Assembler) AssembleKey() ld.NodeAssembler { switch ma.state { case maState_initial: // carry on @@ -24813,7 +24813,7 @@ func (ma *_TypeBytes__Assembler) AssembleKey() dms3ld.NodeAssembler { ma.state = maState_midKey return (*_TypeBytes__KeyAssembler)(ma) } -func (ma *_TypeBytes__Assembler) AssembleValue() dms3ld.NodeAssembler { +func (ma *_TypeBytes__Assembler) AssembleValue() ld.NodeAssembler { switch ma.state { case maState_initial: panic("invalid state: AssembleValue cannot be called when no key is primed") @@ -24848,26 +24848,26 @@ func (ma *_TypeBytes__Assembler) Finish() error { panic("invalid state: Finish cannot be called on an assembler that's already finished") } if ma.s&fieldBits__TypeBytes_sufficient != fieldBits__TypeBytes_sufficient { - err := dms3ld.ErrMissingRequiredField{Missing: make([]string, 0)} + err := ld.ErrMissingRequiredField{Missing: make([]string, 0)} return err } ma.state = maState_finished *ma.m = schema.Maybe_Value return nil } -func (ma *_TypeBytes__Assembler) KeyPrototype() dms3ld.NodePrototype { +func (ma *_TypeBytes__Assembler) KeyPrototype() ld.NodePrototype { return _String__Prototype{} } -func (ma *_TypeBytes__Assembler) ValuePrototype(k string) dms3ld.NodePrototype { +func (ma *_TypeBytes__Assembler) ValuePrototype(k string) ld.NodePrototype { panic("todo structbuilder mapassembler valueprototype") } type _TypeBytes__KeyAssembler _TypeBytes__Assembler -func (_TypeBytes__KeyAssembler) BeginMap(sizeHint int64) (dms3ld.MapAssembler, error) { +func (_TypeBytes__KeyAssembler) BeginMap(sizeHint int64) (ld.MapAssembler, error) { return mixins.StringAssembler{TypeName: "schemadmt.TypeBytes.KeyAssembler"}.BeginMap(0) } -func (_TypeBytes__KeyAssembler) BeginList(sizeHint int64) (dms3ld.ListAssembler, error) { +func (_TypeBytes__KeyAssembler) BeginList(sizeHint int64) (ld.ListAssembler, error) { return mixins.StringAssembler{TypeName: "schemadmt.TypeBytes.KeyAssembler"}.BeginList(0) } func (na *_TypeBytes__KeyAssembler) AssignNull() error { @@ -24888,61 +24888,61 @@ func (ka *_TypeBytes__KeyAssembler) AssignString(k string) error { } switch k { default: - return dms3ld.ErrInvalidKey{TypeName: "schemadmt.TypeBytes", Key: &_String{k}} + return ld.ErrInvalidKey{TypeName: "schemadmt.TypeBytes", Key: &_String{k}} } return nil } func (_TypeBytes__KeyAssembler) AssignBytes([]byte) error { return mixins.StringAssembler{TypeName: "schemadmt.TypeBytes.KeyAssembler"}.AssignBytes(nil) } -func (_TypeBytes__KeyAssembler) AssignLink(dms3ld.Link) error { +func (_TypeBytes__KeyAssembler) AssignLink(ld.Link) error { return mixins.StringAssembler{TypeName: "schemadmt.TypeBytes.KeyAssembler"}.AssignLink(nil) } -func (ka *_TypeBytes__KeyAssembler) AssignNode(v dms3ld.Node) error { +func (ka *_TypeBytes__KeyAssembler) AssignNode(v ld.Node) error { if v2, err := v.AsString(); err != nil { return err } else { return ka.AssignString(v2) } } -func (_TypeBytes__KeyAssembler) Prototype() dms3ld.NodePrototype { +func (_TypeBytes__KeyAssembler) Prototype() ld.NodePrototype { return _String__Prototype{} } func (TypeBytes) Type() schema.Type { return nil /*TODO:typelit*/ } -func (n TypeBytes) Representation() dms3ld.Node { +func (n TypeBytes) Representation() ld.Node { return (*_TypeBytes__Repr)(n) } type _TypeBytes__Repr _TypeBytes var () -var _ dms3ld.Node = &_TypeBytes__Repr{} +var _ ld.Node = &_TypeBytes__Repr{} -func (_TypeBytes__Repr) Kind() dms3ld.Kind { - return dms3ld.Kind_Map +func (_TypeBytes__Repr) Kind() ld.Kind { + return ld.Kind_Map } -func (n *_TypeBytes__Repr) LookupByString(key string) (dms3ld.Node, error) { +func (n *_TypeBytes__Repr) LookupByString(key string) (ld.Node, error) { switch key { default: - return nil, schema.ErrNoSuchField{Type: nil /*TODO*/, Field: dms3ld.PathSegmentOfString(key)} + return nil, schema.ErrNoSuchField{Type: nil /*TODO*/, Field: ld.PathSegmentOfString(key)} } } -func (n *_TypeBytes__Repr) LookupByNode(key dms3ld.Node) (dms3ld.Node, error) { +func (n *_TypeBytes__Repr) LookupByNode(key ld.Node) (ld.Node, error) { ks, err := key.AsString() if err != nil { return nil, err } return n.LookupByString(ks) } -func (_TypeBytes__Repr) LookupByIndex(idx int64) (dms3ld.Node, error) { +func (_TypeBytes__Repr) LookupByIndex(idx int64) (ld.Node, error) { return mixins.Map{TypeName: "schemadmt.TypeBytes.Repr"}.LookupByIndex(0) } -func (n _TypeBytes__Repr) LookupBySegment(seg dms3ld.PathSegment) (dms3ld.Node, error) { +func (n _TypeBytes__Repr) LookupBySegment(seg ld.PathSegment) (ld.Node, error) { return n.LookupByString(seg.String()) } -func (n *_TypeBytes__Repr) MapIterator() dms3ld.MapIterator { +func (n *_TypeBytes__Repr) MapIterator() ld.MapIterator { return &_TypeBytes__ReprMapItr{n, 0} } @@ -24951,14 +24951,14 @@ type _TypeBytes__ReprMapItr struct { idx int } -func (itr *_TypeBytes__ReprMapItr) Next() (k dms3ld.Node, v dms3ld.Node, _ error) { - return nil, nil, dms3ld.ErrIteratorOverread{} +func (itr *_TypeBytes__ReprMapItr) Next() (k ld.Node, v ld.Node, _ error) { + return nil, nil, ld.ErrIteratorOverread{} } func (itr *_TypeBytes__ReprMapItr) Done() bool { return itr.idx >= 0 } -func (_TypeBytes__Repr) ListIterator() dms3ld.ListIterator { +func (_TypeBytes__Repr) ListIterator() ld.ListIterator { return nil } func (rn *_TypeBytes__Repr) Length() int64 { @@ -24986,16 +24986,16 @@ func (_TypeBytes__Repr) AsString() (string, error) { func (_TypeBytes__Repr) AsBytes() ([]byte, error) { return mixins.Map{TypeName: "schemadmt.TypeBytes.Repr"}.AsBytes() } -func (_TypeBytes__Repr) AsLink() (dms3ld.Link, error) { +func (_TypeBytes__Repr) AsLink() (ld.Link, error) { return mixins.Map{TypeName: "schemadmt.TypeBytes.Repr"}.AsLink() } -func (_TypeBytes__Repr) Prototype() dms3ld.NodePrototype { +func (_TypeBytes__Repr) Prototype() ld.NodePrototype { return _TypeBytes__ReprPrototype{} } type _TypeBytes__ReprPrototype struct{} -func (_TypeBytes__ReprPrototype) NewBuilder() dms3ld.NodeBuilder { +func (_TypeBytes__ReprPrototype) NewBuilder() ld.NodeBuilder { var nb _TypeBytes__ReprBuilder nb.Reset() return &nb @@ -25005,7 +25005,7 @@ type _TypeBytes__ReprBuilder struct { _TypeBytes__ReprAssembler } -func (nb *_TypeBytes__ReprBuilder) Build() dms3ld.Node { +func (nb *_TypeBytes__ReprBuilder) Build() ld.Node { if *nb.m != schema.Maybe_Value { panic("invalid state: cannot call Build on an assembler that's not finished") } @@ -25031,7 +25031,7 @@ func (na *_TypeBytes__ReprAssembler) reset() { na.state = maState_initial na.s = 0 } -func (na *_TypeBytes__ReprAssembler) BeginMap(int64) (dms3ld.MapAssembler, error) { +func (na *_TypeBytes__ReprAssembler) BeginMap(int64) (ld.MapAssembler, error) { switch *na.m { case schema.Maybe_Value, schema.Maybe_Null: panic("invalid state: cannot assign into assembler that's already finished") @@ -25044,7 +25044,7 @@ func (na *_TypeBytes__ReprAssembler) BeginMap(int64) (dms3ld.MapAssembler, error } return na, nil } -func (_TypeBytes__ReprAssembler) BeginList(sizeHint int64) (dms3ld.ListAssembler, error) { +func (_TypeBytes__ReprAssembler) BeginList(sizeHint int64) (ld.ListAssembler, error) { return mixins.MapAssembler{TypeName: "schemadmt.TypeBytes.Repr"}.BeginList(0) } func (na *_TypeBytes__ReprAssembler) AssignNull() error { @@ -25076,10 +25076,10 @@ func (_TypeBytes__ReprAssembler) AssignString(string) error { func (_TypeBytes__ReprAssembler) AssignBytes([]byte) error { return mixins.MapAssembler{TypeName: "schemadmt.TypeBytes.Repr"}.AssignBytes(nil) } -func (_TypeBytes__ReprAssembler) AssignLink(dms3ld.Link) error { +func (_TypeBytes__ReprAssembler) AssignLink(ld.Link) error { return mixins.MapAssembler{TypeName: "schemadmt.TypeBytes.Repr"}.AssignLink(nil) } -func (na *_TypeBytes__ReprAssembler) AssignNode(v dms3ld.Node) error { +func (na *_TypeBytes__ReprAssembler) AssignNode(v ld.Node) error { if v.IsNull() { return na.AssignNull() } @@ -25099,8 +25099,8 @@ func (na *_TypeBytes__ReprAssembler) AssignNode(v dms3ld.Node) error { *na.m = schema.Maybe_Value return nil } - if v.Kind() != dms3ld.Kind_Map { - return dms3ld.ErrWrongKind{TypeName: "schemadmt.TypeBytes.Repr", MethodName: "AssignNode", AppropriateKind: dms3ld.KindSet_JustMap, ActualKind: v.Kind()} + if v.Kind() != ld.Kind_Map { + return ld.ErrWrongKind{TypeName: "schemadmt.TypeBytes.Repr", MethodName: "AssignNode", AppropriateKind: ld.KindSet_JustMap, ActualKind: v.Kind()} } itr := v.MapIterator() for !itr.Done() { @@ -25117,7 +25117,7 @@ func (na *_TypeBytes__ReprAssembler) AssignNode(v dms3ld.Node) error { } return na.Finish() } -func (_TypeBytes__ReprAssembler) Prototype() dms3ld.NodePrototype { +func (_TypeBytes__ReprAssembler) Prototype() ld.NodePrototype { return _TypeBytes__ReprPrototype{} } func (ma *_TypeBytes__ReprAssembler) valueFinishTidy() bool { @@ -25126,7 +25126,7 @@ func (ma *_TypeBytes__ReprAssembler) valueFinishTidy() bool { panic("unreachable") } } -func (ma *_TypeBytes__ReprAssembler) AssembleEntry(k string) (dms3ld.NodeAssembler, error) { +func (ma *_TypeBytes__ReprAssembler) AssembleEntry(k string) (ld.NodeAssembler, error) { switch ma.state { case maState_initial: // carry on @@ -25141,9 +25141,9 @@ func (ma *_TypeBytes__ReprAssembler) AssembleEntry(k string) (dms3ld.NodeAssembl case maState_finished: panic("invalid state: AssembleEntry cannot be called on an assembler that's already finished") } - return nil, dms3ld.ErrInvalidKey{TypeName: "schemadmt.TypeBytes.Repr", Key: &_String{k}} + return nil, ld.ErrInvalidKey{TypeName: "schemadmt.TypeBytes.Repr", Key: &_String{k}} } -func (ma *_TypeBytes__ReprAssembler) AssembleKey() dms3ld.NodeAssembler { +func (ma *_TypeBytes__ReprAssembler) AssembleKey() ld.NodeAssembler { switch ma.state { case maState_initial: // carry on @@ -25161,7 +25161,7 @@ func (ma *_TypeBytes__ReprAssembler) AssembleKey() dms3ld.NodeAssembler { ma.state = maState_midKey return (*_TypeBytes__ReprKeyAssembler)(ma) } -func (ma *_TypeBytes__ReprAssembler) AssembleValue() dms3ld.NodeAssembler { +func (ma *_TypeBytes__ReprAssembler) AssembleValue() ld.NodeAssembler { switch ma.state { case maState_initial: panic("invalid state: AssembleValue cannot be called when no key is primed") @@ -25196,26 +25196,26 @@ func (ma *_TypeBytes__ReprAssembler) Finish() error { panic("invalid state: Finish cannot be called on an assembler that's already finished") } if ma.s&fieldBits__TypeBytes_sufficient != fieldBits__TypeBytes_sufficient { - err := dms3ld.ErrMissingRequiredField{Missing: make([]string, 0)} + err := ld.ErrMissingRequiredField{Missing: make([]string, 0)} return err } ma.state = maState_finished *ma.m = schema.Maybe_Value return nil } -func (ma *_TypeBytes__ReprAssembler) KeyPrototype() dms3ld.NodePrototype { +func (ma *_TypeBytes__ReprAssembler) KeyPrototype() ld.NodePrototype { return _String__Prototype{} } -func (ma *_TypeBytes__ReprAssembler) ValuePrototype(k string) dms3ld.NodePrototype { +func (ma *_TypeBytes__ReprAssembler) ValuePrototype(k string) ld.NodePrototype { panic("todo structbuilder mapassembler repr valueprototype") } type _TypeBytes__ReprKeyAssembler _TypeBytes__ReprAssembler -func (_TypeBytes__ReprKeyAssembler) BeginMap(sizeHint int64) (dms3ld.MapAssembler, error) { +func (_TypeBytes__ReprKeyAssembler) BeginMap(sizeHint int64) (ld.MapAssembler, error) { return mixins.StringAssembler{TypeName: "schemadmt.TypeBytes.Repr.KeyAssembler"}.BeginMap(0) } -func (_TypeBytes__ReprKeyAssembler) BeginList(sizeHint int64) (dms3ld.ListAssembler, error) { +func (_TypeBytes__ReprKeyAssembler) BeginList(sizeHint int64) (ld.ListAssembler, error) { return mixins.StringAssembler{TypeName: "schemadmt.TypeBytes.Repr.KeyAssembler"}.BeginList(0) } func (na *_TypeBytes__ReprKeyAssembler) AssignNull() error { @@ -25234,22 +25234,22 @@ func (ka *_TypeBytes__ReprKeyAssembler) AssignString(k string) error { if ka.state != maState_midKey { panic("misuse: KeyAssembler held beyond its valid lifetime") } - return dms3ld.ErrInvalidKey{TypeName: "schemadmt.TypeBytes.Repr", Key: &_String{k}} + return ld.ErrInvalidKey{TypeName: "schemadmt.TypeBytes.Repr", Key: &_String{k}} } func (_TypeBytes__ReprKeyAssembler) AssignBytes([]byte) error { return mixins.StringAssembler{TypeName: "schemadmt.TypeBytes.Repr.KeyAssembler"}.AssignBytes(nil) } -func (_TypeBytes__ReprKeyAssembler) AssignLink(dms3ld.Link) error { +func (_TypeBytes__ReprKeyAssembler) AssignLink(ld.Link) error { return mixins.StringAssembler{TypeName: "schemadmt.TypeBytes.Repr.KeyAssembler"}.AssignLink(nil) } -func (ka *_TypeBytes__ReprKeyAssembler) AssignNode(v dms3ld.Node) error { +func (ka *_TypeBytes__ReprKeyAssembler) AssignNode(v ld.Node) error { if v2, err := v.AsString(); err != nil { return err } else { return ka.AssignString(v2) } } -func (_TypeBytes__ReprKeyAssembler) Prototype() dms3ld.NodePrototype { +func (_TypeBytes__ReprKeyAssembler) Prototype() ld.NodePrototype { return _String__Prototype{} } @@ -25272,12 +25272,12 @@ func (m MaybeTypeCopy) IsAbsent() bool { func (m MaybeTypeCopy) Exists() bool { return m.m == schema.Maybe_Value } -func (m MaybeTypeCopy) AsNode() dms3ld.Node { +func (m MaybeTypeCopy) AsNode() ld.Node { switch m.m { case schema.Maybe_Absent: - return dms3ld.Absent + return ld.Absent case schema.Maybe_Null: - return dms3ld.Null + return ld.Null case schema.Maybe_Value: return m.v default: @@ -25294,34 +25294,34 @@ func (m MaybeTypeCopy) Must() TypeCopy { var ( fieldName__TypeCopy_FromType = _String{"fromType"} ) -var _ dms3ld.Node = (TypeCopy)(&_TypeCopy{}) +var _ ld.Node = (TypeCopy)(&_TypeCopy{}) var _ schema.TypedNode = (TypeCopy)(&_TypeCopy{}) -func (TypeCopy) Kind() dms3ld.Kind { - return dms3ld.Kind_Map +func (TypeCopy) Kind() ld.Kind { + return ld.Kind_Map } -func (n TypeCopy) LookupByString(key string) (dms3ld.Node, error) { +func (n TypeCopy) LookupByString(key string) (ld.Node, error) { switch key { case "fromType": return &n.fromType, nil default: - return nil, schema.ErrNoSuchField{Type: nil /*TODO*/, Field: dms3ld.PathSegmentOfString(key)} + return nil, schema.ErrNoSuchField{Type: nil /*TODO*/, Field: ld.PathSegmentOfString(key)} } } -func (n TypeCopy) LookupByNode(key dms3ld.Node) (dms3ld.Node, error) { +func (n TypeCopy) LookupByNode(key ld.Node) (ld.Node, error) { ks, err := key.AsString() if err != nil { return nil, err } return n.LookupByString(ks) } -func (TypeCopy) LookupByIndex(idx int64) (dms3ld.Node, error) { +func (TypeCopy) LookupByIndex(idx int64) (ld.Node, error) { return mixins.Map{TypeName: "schemadmt.TypeCopy"}.LookupByIndex(0) } -func (n TypeCopy) LookupBySegment(seg dms3ld.PathSegment) (dms3ld.Node, error) { +func (n TypeCopy) LookupBySegment(seg ld.PathSegment) (ld.Node, error) { return n.LookupByString(seg.String()) } -func (n TypeCopy) MapIterator() dms3ld.MapIterator { +func (n TypeCopy) MapIterator() ld.MapIterator { return &_TypeCopy__MapItr{n, 0} } @@ -25330,9 +25330,9 @@ type _TypeCopy__MapItr struct { idx int } -func (itr *_TypeCopy__MapItr) Next() (k dms3ld.Node, v dms3ld.Node, _ error) { +func (itr *_TypeCopy__MapItr) Next() (k ld.Node, v ld.Node, _ error) { if itr.idx >= 1 { - return nil, nil, dms3ld.ErrIteratorOverread{} + return nil, nil, ld.ErrIteratorOverread{} } switch itr.idx { case 0: @@ -25348,7 +25348,7 @@ func (itr *_TypeCopy__MapItr) Done() bool { return itr.idx >= 1 } -func (TypeCopy) ListIterator() dms3ld.ListIterator { +func (TypeCopy) ListIterator() ld.ListIterator { return nil } func (TypeCopy) Length() int64 { @@ -25375,16 +25375,16 @@ func (TypeCopy) AsString() (string, error) { func (TypeCopy) AsBytes() ([]byte, error) { return mixins.Map{TypeName: "schemadmt.TypeCopy"}.AsBytes() } -func (TypeCopy) AsLink() (dms3ld.Link, error) { +func (TypeCopy) AsLink() (ld.Link, error) { return mixins.Map{TypeName: "schemadmt.TypeCopy"}.AsLink() } -func (TypeCopy) Prototype() dms3ld.NodePrototype { +func (TypeCopy) Prototype() ld.NodePrototype { return _TypeCopy__Prototype{} } type _TypeCopy__Prototype struct{} -func (_TypeCopy__Prototype) NewBuilder() dms3ld.NodeBuilder { +func (_TypeCopy__Prototype) NewBuilder() ld.NodeBuilder { var nb _TypeCopy__Builder nb.Reset() return &nb @@ -25394,7 +25394,7 @@ type _TypeCopy__Builder struct { _TypeCopy__Assembler } -func (nb *_TypeCopy__Builder) Build() dms3ld.Node { +func (nb *_TypeCopy__Builder) Build() ld.Node { if *nb.m != schema.Maybe_Value { panic("invalid state: cannot call Build on an assembler that's not finished") } @@ -25428,7 +25428,7 @@ var ( fieldBits__TypeCopy_sufficient = 0 + 1<<0 ) -func (na *_TypeCopy__Assembler) BeginMap(int64) (dms3ld.MapAssembler, error) { +func (na *_TypeCopy__Assembler) BeginMap(int64) (ld.MapAssembler, error) { switch *na.m { case schema.Maybe_Value, schema.Maybe_Null: panic("invalid state: cannot assign into assembler that's already finished") @@ -25441,7 +25441,7 @@ func (na *_TypeCopy__Assembler) BeginMap(int64) (dms3ld.MapAssembler, error) { } return na, nil } -func (_TypeCopy__Assembler) BeginList(sizeHint int64) (dms3ld.ListAssembler, error) { +func (_TypeCopy__Assembler) BeginList(sizeHint int64) (ld.ListAssembler, error) { return mixins.MapAssembler{TypeName: "schemadmt.TypeCopy"}.BeginList(0) } func (na *_TypeCopy__Assembler) AssignNull() error { @@ -25473,10 +25473,10 @@ func (_TypeCopy__Assembler) AssignString(string) error { func (_TypeCopy__Assembler) AssignBytes([]byte) error { return mixins.MapAssembler{TypeName: "schemadmt.TypeCopy"}.AssignBytes(nil) } -func (_TypeCopy__Assembler) AssignLink(dms3ld.Link) error { +func (_TypeCopy__Assembler) AssignLink(ld.Link) error { return mixins.MapAssembler{TypeName: "schemadmt.TypeCopy"}.AssignLink(nil) } -func (na *_TypeCopy__Assembler) AssignNode(v dms3ld.Node) error { +func (na *_TypeCopy__Assembler) AssignNode(v ld.Node) error { if v.IsNull() { return na.AssignNull() } @@ -25496,8 +25496,8 @@ func (na *_TypeCopy__Assembler) AssignNode(v dms3ld.Node) error { *na.m = schema.Maybe_Value return nil } - if v.Kind() != dms3ld.Kind_Map { - return dms3ld.ErrWrongKind{TypeName: "schemadmt.TypeCopy", MethodName: "AssignNode", AppropriateKind: dms3ld.KindSet_JustMap, ActualKind: v.Kind()} + if v.Kind() != ld.Kind_Map { + return ld.ErrWrongKind{TypeName: "schemadmt.TypeCopy", MethodName: "AssignNode", AppropriateKind: ld.KindSet_JustMap, ActualKind: v.Kind()} } itr := v.MapIterator() for !itr.Done() { @@ -25514,7 +25514,7 @@ func (na *_TypeCopy__Assembler) AssignNode(v dms3ld.Node) error { } return na.Finish() } -func (_TypeCopy__Assembler) Prototype() dms3ld.NodePrototype { +func (_TypeCopy__Assembler) Prototype() ld.NodePrototype { return _TypeCopy__Prototype{} } func (ma *_TypeCopy__Assembler) valueFinishTidy() bool { @@ -25533,7 +25533,7 @@ func (ma *_TypeCopy__Assembler) valueFinishTidy() bool { panic("unreachable") } } -func (ma *_TypeCopy__Assembler) AssembleEntry(k string) (dms3ld.NodeAssembler, error) { +func (ma *_TypeCopy__Assembler) AssembleEntry(k string) (ld.NodeAssembler, error) { switch ma.state { case maState_initial: // carry on @@ -25551,7 +25551,7 @@ func (ma *_TypeCopy__Assembler) AssembleEntry(k string) (dms3ld.NodeAssembler, e switch k { case "fromType": if ma.s&fieldBit__TypeCopy_FromType != 0 { - return nil, dms3ld.ErrRepeatedMapKey{Key: &fieldName__TypeCopy_FromType} + return nil, ld.ErrRepeatedMapKey{Key: &fieldName__TypeCopy_FromType} } ma.s += fieldBit__TypeCopy_FromType ma.state = maState_midValue @@ -25560,9 +25560,9 @@ func (ma *_TypeCopy__Assembler) AssembleEntry(k string) (dms3ld.NodeAssembler, e ma.ca_fromType.m = &ma.cm return &ma.ca_fromType, nil } - return nil, dms3ld.ErrInvalidKey{TypeName: "schemadmt.TypeCopy", Key: &_String{k}} + return nil, ld.ErrInvalidKey{TypeName: "schemadmt.TypeCopy", Key: &_String{k}} } -func (ma *_TypeCopy__Assembler) AssembleKey() dms3ld.NodeAssembler { +func (ma *_TypeCopy__Assembler) AssembleKey() ld.NodeAssembler { switch ma.state { case maState_initial: // carry on @@ -25580,7 +25580,7 @@ func (ma *_TypeCopy__Assembler) AssembleKey() dms3ld.NodeAssembler { ma.state = maState_midKey return (*_TypeCopy__KeyAssembler)(ma) } -func (ma *_TypeCopy__Assembler) AssembleValue() dms3ld.NodeAssembler { +func (ma *_TypeCopy__Assembler) AssembleValue() ld.NodeAssembler { switch ma.state { case maState_initial: panic("invalid state: AssembleValue cannot be called when no key is primed") @@ -25619,7 +25619,7 @@ func (ma *_TypeCopy__Assembler) Finish() error { panic("invalid state: Finish cannot be called on an assembler that's already finished") } if ma.s&fieldBits__TypeCopy_sufficient != fieldBits__TypeCopy_sufficient { - err := dms3ld.ErrMissingRequiredField{Missing: make([]string, 0)} + err := ld.ErrMissingRequiredField{Missing: make([]string, 0)} if ma.s&fieldBit__TypeCopy_FromType == 0 { err.Missing = append(err.Missing, "fromType") } @@ -25629,19 +25629,19 @@ func (ma *_TypeCopy__Assembler) Finish() error { *ma.m = schema.Maybe_Value return nil } -func (ma *_TypeCopy__Assembler) KeyPrototype() dms3ld.NodePrototype { +func (ma *_TypeCopy__Assembler) KeyPrototype() ld.NodePrototype { return _String__Prototype{} } -func (ma *_TypeCopy__Assembler) ValuePrototype(k string) dms3ld.NodePrototype { +func (ma *_TypeCopy__Assembler) ValuePrototype(k string) ld.NodePrototype { panic("todo structbuilder mapassembler valueprototype") } type _TypeCopy__KeyAssembler _TypeCopy__Assembler -func (_TypeCopy__KeyAssembler) BeginMap(sizeHint int64) (dms3ld.MapAssembler, error) { +func (_TypeCopy__KeyAssembler) BeginMap(sizeHint int64) (ld.MapAssembler, error) { return mixins.StringAssembler{TypeName: "schemadmt.TypeCopy.KeyAssembler"}.BeginMap(0) } -func (_TypeCopy__KeyAssembler) BeginList(sizeHint int64) (dms3ld.ListAssembler, error) { +func (_TypeCopy__KeyAssembler) BeginList(sizeHint int64) (ld.ListAssembler, error) { return mixins.StringAssembler{TypeName: "schemadmt.TypeCopy.KeyAssembler"}.BeginList(0) } func (na *_TypeCopy__KeyAssembler) AssignNull() error { @@ -25663,36 +25663,36 @@ func (ka *_TypeCopy__KeyAssembler) AssignString(k string) error { switch k { case "fromType": if ka.s&fieldBit__TypeCopy_FromType != 0 { - return dms3ld.ErrRepeatedMapKey{Key: &fieldName__TypeCopy_FromType} + return ld.ErrRepeatedMapKey{Key: &fieldName__TypeCopy_FromType} } ka.s += fieldBit__TypeCopy_FromType ka.state = maState_expectValue ka.f = 0 default: - return dms3ld.ErrInvalidKey{TypeName: "schemadmt.TypeCopy", Key: &_String{k}} + return ld.ErrInvalidKey{TypeName: "schemadmt.TypeCopy", Key: &_String{k}} } return nil } func (_TypeCopy__KeyAssembler) AssignBytes([]byte) error { return mixins.StringAssembler{TypeName: "schemadmt.TypeCopy.KeyAssembler"}.AssignBytes(nil) } -func (_TypeCopy__KeyAssembler) AssignLink(dms3ld.Link) error { +func (_TypeCopy__KeyAssembler) AssignLink(ld.Link) error { return mixins.StringAssembler{TypeName: "schemadmt.TypeCopy.KeyAssembler"}.AssignLink(nil) } -func (ka *_TypeCopy__KeyAssembler) AssignNode(v dms3ld.Node) error { +func (ka *_TypeCopy__KeyAssembler) AssignNode(v ld.Node) error { if v2, err := v.AsString(); err != nil { return err } else { return ka.AssignString(v2) } } -func (_TypeCopy__KeyAssembler) Prototype() dms3ld.NodePrototype { +func (_TypeCopy__KeyAssembler) Prototype() ld.NodePrototype { return _String__Prototype{} } func (TypeCopy) Type() schema.Type { return nil /*TODO:typelit*/ } -func (n TypeCopy) Representation() dms3ld.Node { +func (n TypeCopy) Representation() ld.Node { return (*_TypeCopy__Repr)(n) } @@ -25701,33 +25701,33 @@ type _TypeCopy__Repr _TypeCopy var ( fieldName__TypeCopy_FromType_serial = _String{"fromType"} ) -var _ dms3ld.Node = &_TypeCopy__Repr{} +var _ ld.Node = &_TypeCopy__Repr{} -func (_TypeCopy__Repr) Kind() dms3ld.Kind { - return dms3ld.Kind_Map +func (_TypeCopy__Repr) Kind() ld.Kind { + return ld.Kind_Map } -func (n *_TypeCopy__Repr) LookupByString(key string) (dms3ld.Node, error) { +func (n *_TypeCopy__Repr) LookupByString(key string) (ld.Node, error) { switch key { case "fromType": return n.fromType.Representation(), nil default: - return nil, schema.ErrNoSuchField{Type: nil /*TODO*/, Field: dms3ld.PathSegmentOfString(key)} + return nil, schema.ErrNoSuchField{Type: nil /*TODO*/, Field: ld.PathSegmentOfString(key)} } } -func (n *_TypeCopy__Repr) LookupByNode(key dms3ld.Node) (dms3ld.Node, error) { +func (n *_TypeCopy__Repr) LookupByNode(key ld.Node) (ld.Node, error) { ks, err := key.AsString() if err != nil { return nil, err } return n.LookupByString(ks) } -func (_TypeCopy__Repr) LookupByIndex(idx int64) (dms3ld.Node, error) { +func (_TypeCopy__Repr) LookupByIndex(idx int64) (ld.Node, error) { return mixins.Map{TypeName: "schemadmt.TypeCopy.Repr"}.LookupByIndex(0) } -func (n _TypeCopy__Repr) LookupBySegment(seg dms3ld.PathSegment) (dms3ld.Node, error) { +func (n _TypeCopy__Repr) LookupBySegment(seg ld.PathSegment) (ld.Node, error) { return n.LookupByString(seg.String()) } -func (n *_TypeCopy__Repr) MapIterator() dms3ld.MapIterator { +func (n *_TypeCopy__Repr) MapIterator() ld.MapIterator { return &_TypeCopy__ReprMapItr{n, 0} } @@ -25736,9 +25736,9 @@ type _TypeCopy__ReprMapItr struct { idx int } -func (itr *_TypeCopy__ReprMapItr) Next() (k dms3ld.Node, v dms3ld.Node, _ error) { +func (itr *_TypeCopy__ReprMapItr) Next() (k ld.Node, v ld.Node, _ error) { if itr.idx >= 1 { - return nil, nil, dms3ld.ErrIteratorOverread{} + return nil, nil, ld.ErrIteratorOverread{} } switch itr.idx { case 0: @@ -25753,7 +25753,7 @@ func (itr *_TypeCopy__ReprMapItr) Next() (k dms3ld.Node, v dms3ld.Node, _ error) func (itr *_TypeCopy__ReprMapItr) Done() bool { return itr.idx >= 1 } -func (_TypeCopy__Repr) ListIterator() dms3ld.ListIterator { +func (_TypeCopy__Repr) ListIterator() ld.ListIterator { return nil } func (rn *_TypeCopy__Repr) Length() int64 { @@ -25781,16 +25781,16 @@ func (_TypeCopy__Repr) AsString() (string, error) { func (_TypeCopy__Repr) AsBytes() ([]byte, error) { return mixins.Map{TypeName: "schemadmt.TypeCopy.Repr"}.AsBytes() } -func (_TypeCopy__Repr) AsLink() (dms3ld.Link, error) { +func (_TypeCopy__Repr) AsLink() (ld.Link, error) { return mixins.Map{TypeName: "schemadmt.TypeCopy.Repr"}.AsLink() } -func (_TypeCopy__Repr) Prototype() dms3ld.NodePrototype { +func (_TypeCopy__Repr) Prototype() ld.NodePrototype { return _TypeCopy__ReprPrototype{} } type _TypeCopy__ReprPrototype struct{} -func (_TypeCopy__ReprPrototype) NewBuilder() dms3ld.NodeBuilder { +func (_TypeCopy__ReprPrototype) NewBuilder() ld.NodeBuilder { var nb _TypeCopy__ReprBuilder nb.Reset() return &nb @@ -25800,7 +25800,7 @@ type _TypeCopy__ReprBuilder struct { _TypeCopy__ReprAssembler } -func (nb *_TypeCopy__ReprBuilder) Build() dms3ld.Node { +func (nb *_TypeCopy__ReprBuilder) Build() ld.Node { if *nb.m != schema.Maybe_Value { panic("invalid state: cannot call Build on an assembler that's not finished") } @@ -25828,7 +25828,7 @@ func (na *_TypeCopy__ReprAssembler) reset() { na.s = 0 na.ca_fromType.reset() } -func (na *_TypeCopy__ReprAssembler) BeginMap(int64) (dms3ld.MapAssembler, error) { +func (na *_TypeCopy__ReprAssembler) BeginMap(int64) (ld.MapAssembler, error) { switch *na.m { case schema.Maybe_Value, schema.Maybe_Null: panic("invalid state: cannot assign into assembler that's already finished") @@ -25841,7 +25841,7 @@ func (na *_TypeCopy__ReprAssembler) BeginMap(int64) (dms3ld.MapAssembler, error) } return na, nil } -func (_TypeCopy__ReprAssembler) BeginList(sizeHint int64) (dms3ld.ListAssembler, error) { +func (_TypeCopy__ReprAssembler) BeginList(sizeHint int64) (ld.ListAssembler, error) { return mixins.MapAssembler{TypeName: "schemadmt.TypeCopy.Repr"}.BeginList(0) } func (na *_TypeCopy__ReprAssembler) AssignNull() error { @@ -25873,10 +25873,10 @@ func (_TypeCopy__ReprAssembler) AssignString(string) error { func (_TypeCopy__ReprAssembler) AssignBytes([]byte) error { return mixins.MapAssembler{TypeName: "schemadmt.TypeCopy.Repr"}.AssignBytes(nil) } -func (_TypeCopy__ReprAssembler) AssignLink(dms3ld.Link) error { +func (_TypeCopy__ReprAssembler) AssignLink(ld.Link) error { return mixins.MapAssembler{TypeName: "schemadmt.TypeCopy.Repr"}.AssignLink(nil) } -func (na *_TypeCopy__ReprAssembler) AssignNode(v dms3ld.Node) error { +func (na *_TypeCopy__ReprAssembler) AssignNode(v ld.Node) error { if v.IsNull() { return na.AssignNull() } @@ -25896,8 +25896,8 @@ func (na *_TypeCopy__ReprAssembler) AssignNode(v dms3ld.Node) error { *na.m = schema.Maybe_Value return nil } - if v.Kind() != dms3ld.Kind_Map { - return dms3ld.ErrWrongKind{TypeName: "schemadmt.TypeCopy.Repr", MethodName: "AssignNode", AppropriateKind: dms3ld.KindSet_JustMap, ActualKind: v.Kind()} + if v.Kind() != ld.Kind_Map { + return ld.ErrWrongKind{TypeName: "schemadmt.TypeCopy.Repr", MethodName: "AssignNode", AppropriateKind: ld.KindSet_JustMap, ActualKind: v.Kind()} } itr := v.MapIterator() for !itr.Done() { @@ -25914,7 +25914,7 @@ func (na *_TypeCopy__ReprAssembler) AssignNode(v dms3ld.Node) error { } return na.Finish() } -func (_TypeCopy__ReprAssembler) Prototype() dms3ld.NodePrototype { +func (_TypeCopy__ReprAssembler) Prototype() ld.NodePrototype { return _TypeCopy__ReprPrototype{} } func (ma *_TypeCopy__ReprAssembler) valueFinishTidy() bool { @@ -25932,7 +25932,7 @@ func (ma *_TypeCopy__ReprAssembler) valueFinishTidy() bool { panic("unreachable") } } -func (ma *_TypeCopy__ReprAssembler) AssembleEntry(k string) (dms3ld.NodeAssembler, error) { +func (ma *_TypeCopy__ReprAssembler) AssembleEntry(k string) (ld.NodeAssembler, error) { switch ma.state { case maState_initial: // carry on @@ -25950,7 +25950,7 @@ func (ma *_TypeCopy__ReprAssembler) AssembleEntry(k string) (dms3ld.NodeAssemble switch k { case "fromType": if ma.s&fieldBit__TypeCopy_FromType != 0 { - return nil, dms3ld.ErrRepeatedMapKey{Key: &fieldName__TypeCopy_FromType_serial} + return nil, ld.ErrRepeatedMapKey{Key: &fieldName__TypeCopy_FromType_serial} } ma.s += fieldBit__TypeCopy_FromType ma.state = maState_midValue @@ -25960,9 +25960,9 @@ func (ma *_TypeCopy__ReprAssembler) AssembleEntry(k string) (dms3ld.NodeAssemble return &ma.ca_fromType, nil default: } - return nil, dms3ld.ErrInvalidKey{TypeName: "schemadmt.TypeCopy.Repr", Key: &_String{k}} + return nil, ld.ErrInvalidKey{TypeName: "schemadmt.TypeCopy.Repr", Key: &_String{k}} } -func (ma *_TypeCopy__ReprAssembler) AssembleKey() dms3ld.NodeAssembler { +func (ma *_TypeCopy__ReprAssembler) AssembleKey() ld.NodeAssembler { switch ma.state { case maState_initial: // carry on @@ -25980,7 +25980,7 @@ func (ma *_TypeCopy__ReprAssembler) AssembleKey() dms3ld.NodeAssembler { ma.state = maState_midKey return (*_TypeCopy__ReprKeyAssembler)(ma) } -func (ma *_TypeCopy__ReprAssembler) AssembleValue() dms3ld.NodeAssembler { +func (ma *_TypeCopy__ReprAssembler) AssembleValue() ld.NodeAssembler { switch ma.state { case maState_initial: panic("invalid state: AssembleValue cannot be called when no key is primed") @@ -26019,7 +26019,7 @@ func (ma *_TypeCopy__ReprAssembler) Finish() error { panic("invalid state: Finish cannot be called on an assembler that's already finished") } if ma.s&fieldBits__TypeCopy_sufficient != fieldBits__TypeCopy_sufficient { - err := dms3ld.ErrMissingRequiredField{Missing: make([]string, 0)} + err := ld.ErrMissingRequiredField{Missing: make([]string, 0)} if ma.s&fieldBit__TypeCopy_FromType == 0 { err.Missing = append(err.Missing, "fromType") } @@ -26029,19 +26029,19 @@ func (ma *_TypeCopy__ReprAssembler) Finish() error { *ma.m = schema.Maybe_Value return nil } -func (ma *_TypeCopy__ReprAssembler) KeyPrototype() dms3ld.NodePrototype { +func (ma *_TypeCopy__ReprAssembler) KeyPrototype() ld.NodePrototype { return _String__Prototype{} } -func (ma *_TypeCopy__ReprAssembler) ValuePrototype(k string) dms3ld.NodePrototype { +func (ma *_TypeCopy__ReprAssembler) ValuePrototype(k string) ld.NodePrototype { panic("todo structbuilder mapassembler repr valueprototype") } type _TypeCopy__ReprKeyAssembler _TypeCopy__ReprAssembler -func (_TypeCopy__ReprKeyAssembler) BeginMap(sizeHint int64) (dms3ld.MapAssembler, error) { +func (_TypeCopy__ReprKeyAssembler) BeginMap(sizeHint int64) (ld.MapAssembler, error) { return mixins.StringAssembler{TypeName: "schemadmt.TypeCopy.Repr.KeyAssembler"}.BeginMap(0) } -func (_TypeCopy__ReprKeyAssembler) BeginList(sizeHint int64) (dms3ld.ListAssembler, error) { +func (_TypeCopy__ReprKeyAssembler) BeginList(sizeHint int64) (ld.ListAssembler, error) { return mixins.StringAssembler{TypeName: "schemadmt.TypeCopy.Repr.KeyAssembler"}.BeginList(0) } func (na *_TypeCopy__ReprKeyAssembler) AssignNull() error { @@ -26063,29 +26063,29 @@ func (ka *_TypeCopy__ReprKeyAssembler) AssignString(k string) error { switch k { case "fromType": if ka.s&fieldBit__TypeCopy_FromType != 0 { - return dms3ld.ErrRepeatedMapKey{Key: &fieldName__TypeCopy_FromType_serial} + return ld.ErrRepeatedMapKey{Key: &fieldName__TypeCopy_FromType_serial} } ka.s += fieldBit__TypeCopy_FromType ka.state = maState_expectValue ka.f = 0 return nil } - return dms3ld.ErrInvalidKey{TypeName: "schemadmt.TypeCopy.Repr", Key: &_String{k}} + return ld.ErrInvalidKey{TypeName: "schemadmt.TypeCopy.Repr", Key: &_String{k}} } func (_TypeCopy__ReprKeyAssembler) AssignBytes([]byte) error { return mixins.StringAssembler{TypeName: "schemadmt.TypeCopy.Repr.KeyAssembler"}.AssignBytes(nil) } -func (_TypeCopy__ReprKeyAssembler) AssignLink(dms3ld.Link) error { +func (_TypeCopy__ReprKeyAssembler) AssignLink(ld.Link) error { return mixins.StringAssembler{TypeName: "schemadmt.TypeCopy.Repr.KeyAssembler"}.AssignLink(nil) } -func (ka *_TypeCopy__ReprKeyAssembler) AssignNode(v dms3ld.Node) error { +func (ka *_TypeCopy__ReprKeyAssembler) AssignNode(v ld.Node) error { if v2, err := v.AsString(); err != nil { return err } else { return ka.AssignString(v2) } } -func (_TypeCopy__ReprKeyAssembler) Prototype() dms3ld.NodePrototype { +func (_TypeCopy__ReprKeyAssembler) Prototype() ld.NodePrototype { return _String__Prototype{} } @@ -26135,12 +26135,12 @@ func (m MaybeTypeDefn) IsAbsent() bool { func (m MaybeTypeDefn) Exists() bool { return m.m == schema.Maybe_Value } -func (m MaybeTypeDefn) AsNode() dms3ld.Node { +func (m MaybeTypeDefn) AsNode() ld.Node { switch m.m { case schema.Maybe_Absent: - return dms3ld.Absent + return ld.Absent case schema.Maybe_Null: - return dms3ld.Null + return ld.Null case schema.Maybe_Value: return m.v default: @@ -26168,92 +26168,92 @@ var ( memberName__TypeDefn_TypeEnum = _String{"TypeEnum"} memberName__TypeDefn_TypeCopy = _String{"TypeCopy"} ) -var _ dms3ld.Node = (TypeDefn)(&_TypeDefn{}) +var _ ld.Node = (TypeDefn)(&_TypeDefn{}) var _ schema.TypedNode = (TypeDefn)(&_TypeDefn{}) -func (TypeDefn) Kind() dms3ld.Kind { - return dms3ld.Kind_Map +func (TypeDefn) Kind() ld.Kind { + return ld.Kind_Map } -func (n TypeDefn) LookupByString(key string) (dms3ld.Node, error) { +func (n TypeDefn) LookupByString(key string) (ld.Node, error) { switch key { case "TypeBool": if n.tag != 1 { - return nil, dms3ld.ErrNotExists{Segment: dms3ld.PathSegmentOfString(key)} + return nil, ld.ErrNotExists{Segment: ld.PathSegmentOfString(key)} } return &n.x1, nil case "TypeString": if n.tag != 2 { - return nil, dms3ld.ErrNotExists{Segment: dms3ld.PathSegmentOfString(key)} + return nil, ld.ErrNotExists{Segment: ld.PathSegmentOfString(key)} } return &n.x2, nil case "TypeBytes": if n.tag != 3 { - return nil, dms3ld.ErrNotExists{Segment: dms3ld.PathSegmentOfString(key)} + return nil, ld.ErrNotExists{Segment: ld.PathSegmentOfString(key)} } return &n.x3, nil case "TypeInt": if n.tag != 4 { - return nil, dms3ld.ErrNotExists{Segment: dms3ld.PathSegmentOfString(key)} + return nil, ld.ErrNotExists{Segment: ld.PathSegmentOfString(key)} } return &n.x4, nil case "TypeFloat": if n.tag != 5 { - return nil, dms3ld.ErrNotExists{Segment: dms3ld.PathSegmentOfString(key)} + return nil, ld.ErrNotExists{Segment: ld.PathSegmentOfString(key)} } return &n.x5, nil case "TypeMap": if n.tag != 6 { - return nil, dms3ld.ErrNotExists{Segment: dms3ld.PathSegmentOfString(key)} + return nil, ld.ErrNotExists{Segment: ld.PathSegmentOfString(key)} } return &n.x6, nil case "TypeList": if n.tag != 7 { - return nil, dms3ld.ErrNotExists{Segment: dms3ld.PathSegmentOfString(key)} + return nil, ld.ErrNotExists{Segment: ld.PathSegmentOfString(key)} } return &n.x7, nil case "TypeLink": if n.tag != 8 { - return nil, dms3ld.ErrNotExists{Segment: dms3ld.PathSegmentOfString(key)} + return nil, ld.ErrNotExists{Segment: ld.PathSegmentOfString(key)} } return &n.x8, nil case "TypeUnion": if n.tag != 9 { - return nil, dms3ld.ErrNotExists{Segment: dms3ld.PathSegmentOfString(key)} + return nil, ld.ErrNotExists{Segment: ld.PathSegmentOfString(key)} } return &n.x9, nil case "TypeStruct": if n.tag != 10 { - return nil, dms3ld.ErrNotExists{Segment: dms3ld.PathSegmentOfString(key)} + return nil, ld.ErrNotExists{Segment: ld.PathSegmentOfString(key)} } return &n.x10, nil case "TypeEnum": if n.tag != 11 { - return nil, dms3ld.ErrNotExists{Segment: dms3ld.PathSegmentOfString(key)} + return nil, ld.ErrNotExists{Segment: ld.PathSegmentOfString(key)} } return &n.x11, nil case "TypeCopy": if n.tag != 12 { - return nil, dms3ld.ErrNotExists{Segment: dms3ld.PathSegmentOfString(key)} + return nil, ld.ErrNotExists{Segment: ld.PathSegmentOfString(key)} } return &n.x12, nil default: - return nil, schema.ErrNoSuchField{Type: nil /*TODO*/, Field: dms3ld.PathSegmentOfString(key)} + return nil, schema.ErrNoSuchField{Type: nil /*TODO*/, Field: ld.PathSegmentOfString(key)} } } -func (n TypeDefn) LookupByNode(key dms3ld.Node) (dms3ld.Node, error) { +func (n TypeDefn) LookupByNode(key ld.Node) (ld.Node, error) { ks, err := key.AsString() if err != nil { return nil, err } return n.LookupByString(ks) } -func (TypeDefn) LookupByIndex(idx int64) (dms3ld.Node, error) { +func (TypeDefn) LookupByIndex(idx int64) (ld.Node, error) { return mixins.Map{TypeName: "schemadmt.TypeDefn"}.LookupByIndex(0) } -func (n TypeDefn) LookupBySegment(seg dms3ld.PathSegment) (dms3ld.Node, error) { +func (n TypeDefn) LookupBySegment(seg ld.PathSegment) (ld.Node, error) { return n.LookupByString(seg.String()) } -func (n TypeDefn) MapIterator() dms3ld.MapIterator { +func (n TypeDefn) MapIterator() ld.MapIterator { return &_TypeDefn__MapItr{n, false} } @@ -26262,9 +26262,9 @@ type _TypeDefn__MapItr struct { done bool } -func (itr *_TypeDefn__MapItr) Next() (k dms3ld.Node, v dms3ld.Node, _ error) { +func (itr *_TypeDefn__MapItr) Next() (k ld.Node, v ld.Node, _ error) { if itr.done { - return nil, nil, dms3ld.ErrIteratorOverread{} + return nil, nil, ld.ErrIteratorOverread{} } switch itr.n.tag { case 1: @@ -26301,7 +26301,7 @@ func (itr *_TypeDefn__MapItr) Done() bool { return itr.done } -func (TypeDefn) ListIterator() dms3ld.ListIterator { +func (TypeDefn) ListIterator() ld.ListIterator { return nil } func (TypeDefn) Length() int64 { @@ -26328,16 +26328,16 @@ func (TypeDefn) AsString() (string, error) { func (TypeDefn) AsBytes() ([]byte, error) { return mixins.Map{TypeName: "schemadmt.TypeDefn"}.AsBytes() } -func (TypeDefn) AsLink() (dms3ld.Link, error) { +func (TypeDefn) AsLink() (ld.Link, error) { return mixins.Map{TypeName: "schemadmt.TypeDefn"}.AsLink() } -func (TypeDefn) Prototype() dms3ld.NodePrototype { +func (TypeDefn) Prototype() ld.NodePrototype { return _TypeDefn__Prototype{} } type _TypeDefn__Prototype struct{} -func (_TypeDefn__Prototype) NewBuilder() dms3ld.NodeBuilder { +func (_TypeDefn__Prototype) NewBuilder() ld.NodeBuilder { var nb _TypeDefn__Builder nb.Reset() return &nb @@ -26347,7 +26347,7 @@ type _TypeDefn__Builder struct { _TypeDefn__Assembler } -func (nb *_TypeDefn__Builder) Build() dms3ld.Node { +func (nb *_TypeDefn__Builder) Build() ld.Node { if *nb.m != schema.Maybe_Value { panic("invalid state: cannot call Build on an assembler that's not finished") } @@ -26437,7 +26437,7 @@ func (na *_TypeDefn__Assembler) reset() { na.ca = 0 na.cm = schema.Maybe_Absent } -func (na *_TypeDefn__Assembler) BeginMap(int64) (dms3ld.MapAssembler, error) { +func (na *_TypeDefn__Assembler) BeginMap(int64) (ld.MapAssembler, error) { switch *na.m { case schema.Maybe_Value, schema.Maybe_Null: panic("invalid state: cannot assign into assembler that's already finished") @@ -26450,7 +26450,7 @@ func (na *_TypeDefn__Assembler) BeginMap(int64) (dms3ld.MapAssembler, error) { } return na, nil } -func (_TypeDefn__Assembler) BeginList(sizeHint int64) (dms3ld.ListAssembler, error) { +func (_TypeDefn__Assembler) BeginList(sizeHint int64) (ld.ListAssembler, error) { return mixins.MapAssembler{TypeName: "schemadmt.TypeDefn"}.BeginList(0) } func (na *_TypeDefn__Assembler) AssignNull() error { @@ -26482,10 +26482,10 @@ func (_TypeDefn__Assembler) AssignString(string) error { func (_TypeDefn__Assembler) AssignBytes([]byte) error { return mixins.MapAssembler{TypeName: "schemadmt.TypeDefn"}.AssignBytes(nil) } -func (_TypeDefn__Assembler) AssignLink(dms3ld.Link) error { +func (_TypeDefn__Assembler) AssignLink(ld.Link) error { return mixins.MapAssembler{TypeName: "schemadmt.TypeDefn"}.AssignLink(nil) } -func (na *_TypeDefn__Assembler) AssignNode(v dms3ld.Node) error { +func (na *_TypeDefn__Assembler) AssignNode(v ld.Node) error { if v.IsNull() { return na.AssignNull() } @@ -26505,8 +26505,8 @@ func (na *_TypeDefn__Assembler) AssignNode(v dms3ld.Node) error { *na.m = schema.Maybe_Value return nil } - if v.Kind() != dms3ld.Kind_Map { - return dms3ld.ErrWrongKind{TypeName: "schemadmt.TypeDefn", MethodName: "AssignNode", AppropriateKind: dms3ld.KindSet_JustMap, ActualKind: v.Kind()} + if v.Kind() != ld.Kind_Map { + return ld.ErrWrongKind{TypeName: "schemadmt.TypeDefn", MethodName: "AssignNode", AppropriateKind: ld.KindSet_JustMap, ActualKind: v.Kind()} } itr := v.MapIterator() for !itr.Done() { @@ -26523,7 +26523,7 @@ func (na *_TypeDefn__Assembler) AssignNode(v dms3ld.Node) error { } return na.Finish() } -func (_TypeDefn__Assembler) Prototype() dms3ld.NodePrototype { +func (_TypeDefn__Assembler) Prototype() ld.NodePrototype { return _TypeDefn__Prototype{} } func (ma *_TypeDefn__Assembler) valueFinishTidy() bool { @@ -26535,7 +26535,7 @@ func (ma *_TypeDefn__Assembler) valueFinishTidy() bool { return false } } -func (ma *_TypeDefn__Assembler) AssembleEntry(k string) (dms3ld.NodeAssembler, error) { +func (ma *_TypeDefn__Assembler) AssembleEntry(k string) (ld.NodeAssembler, error) { switch ma.state { case maState_initial: // carry on @@ -26639,9 +26639,9 @@ func (ma *_TypeDefn__Assembler) AssembleEntry(k string) (dms3ld.NodeAssembler, e ma.ca12.m = &ma.cm return &ma.ca12, nil } - return nil, dms3ld.ErrInvalidKey{TypeName: "schemadmt.TypeDefn", Key: &_String{k}} + return nil, ld.ErrInvalidKey{TypeName: "schemadmt.TypeDefn", Key: &_String{k}} } -func (ma *_TypeDefn__Assembler) AssembleKey() dms3ld.NodeAssembler { +func (ma *_TypeDefn__Assembler) AssembleKey() ld.NodeAssembler { switch ma.state { case maState_initial: // carry on @@ -26659,7 +26659,7 @@ func (ma *_TypeDefn__Assembler) AssembleKey() dms3ld.NodeAssembler { ma.state = maState_midKey return (*_TypeDefn__KeyAssembler)(ma) } -func (ma *_TypeDefn__Assembler) AssembleValue() dms3ld.NodeAssembler { +func (ma *_TypeDefn__Assembler) AssembleValue() ld.NodeAssembler { switch ma.state { case maState_initial: panic("invalid state: AssembleValue cannot be called when no key is primed") @@ -26748,10 +26748,10 @@ func (ma *_TypeDefn__Assembler) Finish() error { *ma.m = schema.Maybe_Value return nil } -func (ma *_TypeDefn__Assembler) KeyPrototype() dms3ld.NodePrototype { +func (ma *_TypeDefn__Assembler) KeyPrototype() ld.NodePrototype { return _String__Prototype{} } -func (ma *_TypeDefn__Assembler) ValuePrototype(k string) dms3ld.NodePrototype { +func (ma *_TypeDefn__Assembler) ValuePrototype(k string) ld.NodePrototype { switch k { case "TypeBool": return _TypeBool__Prototype{} @@ -26784,10 +26784,10 @@ func (ma *_TypeDefn__Assembler) ValuePrototype(k string) dms3ld.NodePrototype { type _TypeDefn__KeyAssembler _TypeDefn__Assembler -func (_TypeDefn__KeyAssembler) BeginMap(sizeHint int64) (dms3ld.MapAssembler, error) { +func (_TypeDefn__KeyAssembler) BeginMap(sizeHint int64) (ld.MapAssembler, error) { return mixins.StringAssembler{TypeName: "schemadmt.TypeDefn.KeyAssembler"}.BeginMap(0) } -func (_TypeDefn__KeyAssembler) BeginList(sizeHint int64) (dms3ld.ListAssembler, error) { +func (_TypeDefn__KeyAssembler) BeginList(sizeHint int64) (ld.ListAssembler, error) { return mixins.StringAssembler{TypeName: "schemadmt.TypeDefn.KeyAssembler"}.BeginList(0) } func (na *_TypeDefn__KeyAssembler) AssignNull() error { @@ -26871,28 +26871,28 @@ func (ka *_TypeDefn__KeyAssembler) AssignString(k string) error { ka.state = maState_expectValue return nil } - return dms3ld.ErrInvalidKey{TypeName: "schemadmt.TypeDefn", Key: &_String{k}} // TODO: error quality: ErrInvalidUnionDiscriminant ? + return ld.ErrInvalidKey{TypeName: "schemadmt.TypeDefn", Key: &_String{k}} // TODO: error quality: ErrInvalidUnionDiscriminant ? } func (_TypeDefn__KeyAssembler) AssignBytes([]byte) error { return mixins.StringAssembler{TypeName: "schemadmt.TypeDefn.KeyAssembler"}.AssignBytes(nil) } -func (_TypeDefn__KeyAssembler) AssignLink(dms3ld.Link) error { +func (_TypeDefn__KeyAssembler) AssignLink(ld.Link) error { return mixins.StringAssembler{TypeName: "schemadmt.TypeDefn.KeyAssembler"}.AssignLink(nil) } -func (ka *_TypeDefn__KeyAssembler) AssignNode(v dms3ld.Node) error { +func (ka *_TypeDefn__KeyAssembler) AssignNode(v ld.Node) error { if v2, err := v.AsString(); err != nil { return err } else { return ka.AssignString(v2) } } -func (_TypeDefn__KeyAssembler) Prototype() dms3ld.NodePrototype { +func (_TypeDefn__KeyAssembler) Prototype() ld.NodePrototype { return _String__Prototype{} } func (TypeDefn) Type() schema.Type { return nil /*TODO:typelit*/ } -func (n TypeDefn) Representation() dms3ld.Node { +func (n TypeDefn) Representation() ld.Node { return (*_TypeDefn__Repr)(n) } @@ -26912,91 +26912,91 @@ var ( memberName__TypeDefn_TypeEnum_serial = _String{"enum"} memberName__TypeDefn_TypeCopy_serial = _String{"copy"} ) -var _ dms3ld.Node = &_TypeDefn__Repr{} +var _ ld.Node = &_TypeDefn__Repr{} -func (_TypeDefn__Repr) Kind() dms3ld.Kind { - return dms3ld.Kind_Map +func (_TypeDefn__Repr) Kind() ld.Kind { + return ld.Kind_Map } -func (n *_TypeDefn__Repr) LookupByString(key string) (dms3ld.Node, error) { +func (n *_TypeDefn__Repr) LookupByString(key string) (ld.Node, error) { switch key { case "bool": if n.tag != 1 { - return nil, dms3ld.ErrNotExists{Segment: dms3ld.PathSegmentOfString(key)} + return nil, ld.ErrNotExists{Segment: ld.PathSegmentOfString(key)} } return n.x1.Representation(), nil case "string": if n.tag != 2 { - return nil, dms3ld.ErrNotExists{Segment: dms3ld.PathSegmentOfString(key)} + return nil, ld.ErrNotExists{Segment: ld.PathSegmentOfString(key)} } return n.x2.Representation(), nil case "bytes": if n.tag != 3 { - return nil, dms3ld.ErrNotExists{Segment: dms3ld.PathSegmentOfString(key)} + return nil, ld.ErrNotExists{Segment: ld.PathSegmentOfString(key)} } return n.x3.Representation(), nil case "int": if n.tag != 4 { - return nil, dms3ld.ErrNotExists{Segment: dms3ld.PathSegmentOfString(key)} + return nil, ld.ErrNotExists{Segment: ld.PathSegmentOfString(key)} } return n.x4.Representation(), nil case "float": if n.tag != 5 { - return nil, dms3ld.ErrNotExists{Segment: dms3ld.PathSegmentOfString(key)} + return nil, ld.ErrNotExists{Segment: ld.PathSegmentOfString(key)} } return n.x5.Representation(), nil case "map": if n.tag != 6 { - return nil, dms3ld.ErrNotExists{Segment: dms3ld.PathSegmentOfString(key)} + return nil, ld.ErrNotExists{Segment: ld.PathSegmentOfString(key)} } return n.x6.Representation(), nil case "list": if n.tag != 7 { - return nil, dms3ld.ErrNotExists{Segment: dms3ld.PathSegmentOfString(key)} + return nil, ld.ErrNotExists{Segment: ld.PathSegmentOfString(key)} } return n.x7.Representation(), nil case "link": if n.tag != 8 { - return nil, dms3ld.ErrNotExists{Segment: dms3ld.PathSegmentOfString(key)} + return nil, ld.ErrNotExists{Segment: ld.PathSegmentOfString(key)} } return n.x8.Representation(), nil case "union": if n.tag != 9 { - return nil, dms3ld.ErrNotExists{Segment: dms3ld.PathSegmentOfString(key)} + return nil, ld.ErrNotExists{Segment: ld.PathSegmentOfString(key)} } return n.x9.Representation(), nil case "struct": if n.tag != 10 { - return nil, dms3ld.ErrNotExists{Segment: dms3ld.PathSegmentOfString(key)} + return nil, ld.ErrNotExists{Segment: ld.PathSegmentOfString(key)} } return n.x10.Representation(), nil case "enum": if n.tag != 11 { - return nil, dms3ld.ErrNotExists{Segment: dms3ld.PathSegmentOfString(key)} + return nil, ld.ErrNotExists{Segment: ld.PathSegmentOfString(key)} } return n.x11.Representation(), nil case "copy": if n.tag != 12 { - return nil, dms3ld.ErrNotExists{Segment: dms3ld.PathSegmentOfString(key)} + return nil, ld.ErrNotExists{Segment: ld.PathSegmentOfString(key)} } return n.x12.Representation(), nil default: - return nil, schema.ErrNoSuchField{Type: nil /*TODO*/, Field: dms3ld.PathSegmentOfString(key)} + return nil, schema.ErrNoSuchField{Type: nil /*TODO*/, Field: ld.PathSegmentOfString(key)} } } -func (n *_TypeDefn__Repr) LookupByNode(key dms3ld.Node) (dms3ld.Node, error) { +func (n *_TypeDefn__Repr) LookupByNode(key ld.Node) (ld.Node, error) { ks, err := key.AsString() if err != nil { return nil, err } return n.LookupByString(ks) } -func (_TypeDefn__Repr) LookupByIndex(idx int64) (dms3ld.Node, error) { +func (_TypeDefn__Repr) LookupByIndex(idx int64) (ld.Node, error) { return mixins.Map{TypeName: "schemadmt.TypeDefn.Repr"}.LookupByIndex(0) } -func (n _TypeDefn__Repr) LookupBySegment(seg dms3ld.PathSegment) (dms3ld.Node, error) { +func (n _TypeDefn__Repr) LookupBySegment(seg ld.PathSegment) (ld.Node, error) { return n.LookupByString(seg.String()) } -func (n *_TypeDefn__Repr) MapIterator() dms3ld.MapIterator { +func (n *_TypeDefn__Repr) MapIterator() ld.MapIterator { return &_TypeDefn__ReprMapItr{n, false} } @@ -27005,9 +27005,9 @@ type _TypeDefn__ReprMapItr struct { done bool } -func (itr *_TypeDefn__ReprMapItr) Next() (k dms3ld.Node, v dms3ld.Node, _ error) { +func (itr *_TypeDefn__ReprMapItr) Next() (k ld.Node, v ld.Node, _ error) { if itr.done { - return nil, nil, dms3ld.ErrIteratorOverread{} + return nil, nil, ld.ErrIteratorOverread{} } switch itr.n.tag { case 1: @@ -27044,7 +27044,7 @@ func (itr *_TypeDefn__ReprMapItr) Done() bool { return itr.done } -func (_TypeDefn__Repr) ListIterator() dms3ld.ListIterator { +func (_TypeDefn__Repr) ListIterator() ld.ListIterator { return nil } func (_TypeDefn__Repr) Length() int64 { @@ -27071,16 +27071,16 @@ func (_TypeDefn__Repr) AsString() (string, error) { func (_TypeDefn__Repr) AsBytes() ([]byte, error) { return mixins.Map{TypeName: "schemadmt.TypeDefn.Repr"}.AsBytes() } -func (_TypeDefn__Repr) AsLink() (dms3ld.Link, error) { +func (_TypeDefn__Repr) AsLink() (ld.Link, error) { return mixins.Map{TypeName: "schemadmt.TypeDefn.Repr"}.AsLink() } -func (_TypeDefn__Repr) Prototype() dms3ld.NodePrototype { +func (_TypeDefn__Repr) Prototype() ld.NodePrototype { return _TypeDefn__ReprPrototype{} } type _TypeDefn__ReprPrototype struct{} -func (_TypeDefn__ReprPrototype) NewBuilder() dms3ld.NodeBuilder { +func (_TypeDefn__ReprPrototype) NewBuilder() ld.NodeBuilder { var nb _TypeDefn__ReprBuilder nb.Reset() return &nb @@ -27090,7 +27090,7 @@ type _TypeDefn__ReprBuilder struct { _TypeDefn__ReprAssembler } -func (nb *_TypeDefn__ReprBuilder) Build() dms3ld.Node { +func (nb *_TypeDefn__ReprBuilder) Build() ld.Node { if *nb.m != schema.Maybe_Value { panic("invalid state: cannot call Build on an assembler that's not finished") } @@ -27180,7 +27180,7 @@ func (na *_TypeDefn__ReprAssembler) reset() { na.ca = 0 na.cm = schema.Maybe_Absent } -func (na *_TypeDefn__ReprAssembler) BeginMap(int64) (dms3ld.MapAssembler, error) { +func (na *_TypeDefn__ReprAssembler) BeginMap(int64) (ld.MapAssembler, error) { switch *na.m { case schema.Maybe_Value, schema.Maybe_Null: panic("invalid state: cannot assign into assembler that's already finished") @@ -27193,7 +27193,7 @@ func (na *_TypeDefn__ReprAssembler) BeginMap(int64) (dms3ld.MapAssembler, error) } return na, nil } -func (_TypeDefn__ReprAssembler) BeginList(sizeHint int64) (dms3ld.ListAssembler, error) { +func (_TypeDefn__ReprAssembler) BeginList(sizeHint int64) (ld.ListAssembler, error) { return mixins.MapAssembler{TypeName: "schemadmt.TypeDefn.Repr"}.BeginList(0) } func (na *_TypeDefn__ReprAssembler) AssignNull() error { @@ -27225,10 +27225,10 @@ func (_TypeDefn__ReprAssembler) AssignString(string) error { func (_TypeDefn__ReprAssembler) AssignBytes([]byte) error { return mixins.MapAssembler{TypeName: "schemadmt.TypeDefn.Repr"}.AssignBytes(nil) } -func (_TypeDefn__ReprAssembler) AssignLink(dms3ld.Link) error { +func (_TypeDefn__ReprAssembler) AssignLink(ld.Link) error { return mixins.MapAssembler{TypeName: "schemadmt.TypeDefn.Repr"}.AssignLink(nil) } -func (na *_TypeDefn__ReprAssembler) AssignNode(v dms3ld.Node) error { +func (na *_TypeDefn__ReprAssembler) AssignNode(v ld.Node) error { if v.IsNull() { return na.AssignNull() } @@ -27248,8 +27248,8 @@ func (na *_TypeDefn__ReprAssembler) AssignNode(v dms3ld.Node) error { *na.m = schema.Maybe_Value return nil } - if v.Kind() != dms3ld.Kind_Map { - return dms3ld.ErrWrongKind{TypeName: "schemadmt.TypeDefn.Repr", MethodName: "AssignNode", AppropriateKind: dms3ld.KindSet_JustMap, ActualKind: v.Kind()} + if v.Kind() != ld.Kind_Map { + return ld.ErrWrongKind{TypeName: "schemadmt.TypeDefn.Repr", MethodName: "AssignNode", AppropriateKind: ld.KindSet_JustMap, ActualKind: v.Kind()} } itr := v.MapIterator() for !itr.Done() { @@ -27266,7 +27266,7 @@ func (na *_TypeDefn__ReprAssembler) AssignNode(v dms3ld.Node) error { } return na.Finish() } -func (_TypeDefn__ReprAssembler) Prototype() dms3ld.NodePrototype { +func (_TypeDefn__ReprAssembler) Prototype() ld.NodePrototype { return _TypeDefn__ReprPrototype{} } func (ma *_TypeDefn__ReprAssembler) valueFinishTidy() bool { @@ -27278,7 +27278,7 @@ func (ma *_TypeDefn__ReprAssembler) valueFinishTidy() bool { return false } } -func (ma *_TypeDefn__ReprAssembler) AssembleEntry(k string) (dms3ld.NodeAssembler, error) { +func (ma *_TypeDefn__ReprAssembler) AssembleEntry(k string) (ld.NodeAssembler, error) { switch ma.state { case maState_initial: // carry on @@ -27382,9 +27382,9 @@ func (ma *_TypeDefn__ReprAssembler) AssembleEntry(k string) (dms3ld.NodeAssemble ma.ca12.m = &ma.cm return &ma.ca12, nil } - return nil, dms3ld.ErrInvalidKey{TypeName: "schemadmt.TypeDefn.Repr", Key: &_String{k}} + return nil, ld.ErrInvalidKey{TypeName: "schemadmt.TypeDefn.Repr", Key: &_String{k}} } -func (ma *_TypeDefn__ReprAssembler) AssembleKey() dms3ld.NodeAssembler { +func (ma *_TypeDefn__ReprAssembler) AssembleKey() ld.NodeAssembler { switch ma.state { case maState_initial: // carry on @@ -27402,7 +27402,7 @@ func (ma *_TypeDefn__ReprAssembler) AssembleKey() dms3ld.NodeAssembler { ma.state = maState_midKey return (*_TypeDefn__ReprKeyAssembler)(ma) } -func (ma *_TypeDefn__ReprAssembler) AssembleValue() dms3ld.NodeAssembler { +func (ma *_TypeDefn__ReprAssembler) AssembleValue() ld.NodeAssembler { switch ma.state { case maState_initial: panic("invalid state: AssembleValue cannot be called when no key is primed") @@ -27491,10 +27491,10 @@ func (ma *_TypeDefn__ReprAssembler) Finish() error { *ma.m = schema.Maybe_Value return nil } -func (ma *_TypeDefn__ReprAssembler) KeyPrototype() dms3ld.NodePrototype { +func (ma *_TypeDefn__ReprAssembler) KeyPrototype() ld.NodePrototype { return _String__Prototype{} } -func (ma *_TypeDefn__ReprAssembler) ValuePrototype(k string) dms3ld.NodePrototype { +func (ma *_TypeDefn__ReprAssembler) ValuePrototype(k string) ld.NodePrototype { switch k { case "TypeBool": return _TypeBool__ReprPrototype{} @@ -27527,10 +27527,10 @@ func (ma *_TypeDefn__ReprAssembler) ValuePrototype(k string) dms3ld.NodePrototyp type _TypeDefn__ReprKeyAssembler _TypeDefn__ReprAssembler -func (_TypeDefn__ReprKeyAssembler) BeginMap(sizeHint int64) (dms3ld.MapAssembler, error) { +func (_TypeDefn__ReprKeyAssembler) BeginMap(sizeHint int64) (ld.MapAssembler, error) { return mixins.StringAssembler{TypeName: "schemadmt.TypeDefn.Repr.KeyAssembler"}.BeginMap(0) } -func (_TypeDefn__ReprKeyAssembler) BeginList(sizeHint int64) (dms3ld.ListAssembler, error) { +func (_TypeDefn__ReprKeyAssembler) BeginList(sizeHint int64) (ld.ListAssembler, error) { return mixins.StringAssembler{TypeName: "schemadmt.TypeDefn.Repr.KeyAssembler"}.BeginList(0) } func (na *_TypeDefn__ReprKeyAssembler) AssignNull() error { @@ -27614,22 +27614,22 @@ func (ka *_TypeDefn__ReprKeyAssembler) AssignString(k string) error { ka.state = maState_expectValue return nil } - return dms3ld.ErrInvalidKey{TypeName: "schemadmt.TypeDefn.Repr", Key: &_String{k}} // TODO: error quality: ErrInvalidUnionDiscriminant ? + return ld.ErrInvalidKey{TypeName: "schemadmt.TypeDefn.Repr", Key: &_String{k}} // TODO: error quality: ErrInvalidUnionDiscriminant ? } func (_TypeDefn__ReprKeyAssembler) AssignBytes([]byte) error { return mixins.StringAssembler{TypeName: "schemadmt.TypeDefn.Repr.KeyAssembler"}.AssignBytes(nil) } -func (_TypeDefn__ReprKeyAssembler) AssignLink(dms3ld.Link) error { +func (_TypeDefn__ReprKeyAssembler) AssignLink(ld.Link) error { return mixins.StringAssembler{TypeName: "schemadmt.TypeDefn.Repr.KeyAssembler"}.AssignLink(nil) } -func (ka *_TypeDefn__ReprKeyAssembler) AssignNode(v dms3ld.Node) error { +func (ka *_TypeDefn__ReprKeyAssembler) AssignNode(v ld.Node) error { if v2, err := v.AsString(); err != nil { return err } else { return ka.AssignString(v2) } } -func (_TypeDefn__ReprKeyAssembler) Prototype() dms3ld.NodePrototype { +func (_TypeDefn__ReprKeyAssembler) Prototype() ld.NodePrototype { return _String__Prototype{} } @@ -27652,12 +27652,12 @@ func (m MaybeTypeDefnInline) IsAbsent() bool { func (m MaybeTypeDefnInline) Exists() bool { return m.m == schema.Maybe_Value } -func (m MaybeTypeDefnInline) AsNode() dms3ld.Node { +func (m MaybeTypeDefnInline) AsNode() ld.Node { switch m.m { case schema.Maybe_Absent: - return dms3ld.Absent + return ld.Absent case schema.Maybe_Null: - return dms3ld.Null + return ld.Null case schema.Maybe_Value: return m.v default: @@ -27675,44 +27675,44 @@ var ( memberName__TypeDefnInline_TypeMap = _String{"TypeMap"} memberName__TypeDefnInline_TypeList = _String{"TypeList"} ) -var _ dms3ld.Node = (TypeDefnInline)(&_TypeDefnInline{}) +var _ ld.Node = (TypeDefnInline)(&_TypeDefnInline{}) var _ schema.TypedNode = (TypeDefnInline)(&_TypeDefnInline{}) -func (TypeDefnInline) Kind() dms3ld.Kind { - return dms3ld.Kind_Map +func (TypeDefnInline) Kind() ld.Kind { + return ld.Kind_Map } -func (n TypeDefnInline) LookupByString(key string) (dms3ld.Node, error) { +func (n TypeDefnInline) LookupByString(key string) (ld.Node, error) { switch key { case "TypeMap": if n2, ok := n.x.(TypeMap); ok { return n2, nil } else { - return nil, dms3ld.ErrNotExists{Segment: dms3ld.PathSegmentOfString(key)} + return nil, ld.ErrNotExists{Segment: ld.PathSegmentOfString(key)} } case "TypeList": if n2, ok := n.x.(TypeList); ok { return n2, nil } else { - return nil, dms3ld.ErrNotExists{Segment: dms3ld.PathSegmentOfString(key)} + return nil, ld.ErrNotExists{Segment: ld.PathSegmentOfString(key)} } default: - return nil, schema.ErrNoSuchField{Type: nil /*TODO*/, Field: dms3ld.PathSegmentOfString(key)} + return nil, schema.ErrNoSuchField{Type: nil /*TODO*/, Field: ld.PathSegmentOfString(key)} } } -func (n TypeDefnInline) LookupByNode(key dms3ld.Node) (dms3ld.Node, error) { +func (n TypeDefnInline) LookupByNode(key ld.Node) (ld.Node, error) { ks, err := key.AsString() if err != nil { return nil, err } return n.LookupByString(ks) } -func (TypeDefnInline) LookupByIndex(idx int64) (dms3ld.Node, error) { +func (TypeDefnInline) LookupByIndex(idx int64) (ld.Node, error) { return mixins.Map{TypeName: "schemadmt.TypeDefnInline"}.LookupByIndex(0) } -func (n TypeDefnInline) LookupBySegment(seg dms3ld.PathSegment) (dms3ld.Node, error) { +func (n TypeDefnInline) LookupBySegment(seg ld.PathSegment) (ld.Node, error) { return n.LookupByString(seg.String()) } -func (n TypeDefnInline) MapIterator() dms3ld.MapIterator { +func (n TypeDefnInline) MapIterator() ld.MapIterator { return &_TypeDefnInline__MapItr{n, false} } @@ -27721,9 +27721,9 @@ type _TypeDefnInline__MapItr struct { done bool } -func (itr *_TypeDefnInline__MapItr) Next() (k dms3ld.Node, v dms3ld.Node, _ error) { +func (itr *_TypeDefnInline__MapItr) Next() (k ld.Node, v ld.Node, _ error) { if itr.done { - return nil, nil, dms3ld.ErrIteratorOverread{} + return nil, nil, ld.ErrIteratorOverread{} } switch n2 := itr.n.x.(type) { case TypeMap: @@ -27740,7 +27740,7 @@ func (itr *_TypeDefnInline__MapItr) Done() bool { return itr.done } -func (TypeDefnInline) ListIterator() dms3ld.ListIterator { +func (TypeDefnInline) ListIterator() ld.ListIterator { return nil } func (TypeDefnInline) Length() int64 { @@ -27767,16 +27767,16 @@ func (TypeDefnInline) AsString() (string, error) { func (TypeDefnInline) AsBytes() ([]byte, error) { return mixins.Map{TypeName: "schemadmt.TypeDefnInline"}.AsBytes() } -func (TypeDefnInline) AsLink() (dms3ld.Link, error) { +func (TypeDefnInline) AsLink() (ld.Link, error) { return mixins.Map{TypeName: "schemadmt.TypeDefnInline"}.AsLink() } -func (TypeDefnInline) Prototype() dms3ld.NodePrototype { +func (TypeDefnInline) Prototype() ld.NodePrototype { return _TypeDefnInline__Prototype{} } type _TypeDefnInline__Prototype struct{} -func (_TypeDefnInline__Prototype) NewBuilder() dms3ld.NodeBuilder { +func (_TypeDefnInline__Prototype) NewBuilder() ld.NodeBuilder { var nb _TypeDefnInline__Builder nb.Reset() return &nb @@ -27786,7 +27786,7 @@ type _TypeDefnInline__Builder struct { _TypeDefnInline__Assembler } -func (nb *_TypeDefnInline__Builder) Build() dms3ld.Node { +func (nb *_TypeDefnInline__Builder) Build() ld.Node { if *nb.m != schema.Maybe_Value { panic("invalid state: cannot call Build on an assembler that's not finished") } @@ -27826,7 +27826,7 @@ func (na *_TypeDefnInline__Assembler) reset() { na.ca = 0 na.cm = schema.Maybe_Absent } -func (na *_TypeDefnInline__Assembler) BeginMap(int64) (dms3ld.MapAssembler, error) { +func (na *_TypeDefnInline__Assembler) BeginMap(int64) (ld.MapAssembler, error) { switch *na.m { case schema.Maybe_Value, schema.Maybe_Null: panic("invalid state: cannot assign into assembler that's already finished") @@ -27839,7 +27839,7 @@ func (na *_TypeDefnInline__Assembler) BeginMap(int64) (dms3ld.MapAssembler, erro } return na, nil } -func (_TypeDefnInline__Assembler) BeginList(sizeHint int64) (dms3ld.ListAssembler, error) { +func (_TypeDefnInline__Assembler) BeginList(sizeHint int64) (ld.ListAssembler, error) { return mixins.MapAssembler{TypeName: "schemadmt.TypeDefnInline"}.BeginList(0) } func (na *_TypeDefnInline__Assembler) AssignNull() error { @@ -27871,10 +27871,10 @@ func (_TypeDefnInline__Assembler) AssignString(string) error { func (_TypeDefnInline__Assembler) AssignBytes([]byte) error { return mixins.MapAssembler{TypeName: "schemadmt.TypeDefnInline"}.AssignBytes(nil) } -func (_TypeDefnInline__Assembler) AssignLink(dms3ld.Link) error { +func (_TypeDefnInline__Assembler) AssignLink(ld.Link) error { return mixins.MapAssembler{TypeName: "schemadmt.TypeDefnInline"}.AssignLink(nil) } -func (na *_TypeDefnInline__Assembler) AssignNode(v dms3ld.Node) error { +func (na *_TypeDefnInline__Assembler) AssignNode(v ld.Node) error { if v.IsNull() { return na.AssignNull() } @@ -27894,8 +27894,8 @@ func (na *_TypeDefnInline__Assembler) AssignNode(v dms3ld.Node) error { *na.m = schema.Maybe_Value return nil } - if v.Kind() != dms3ld.Kind_Map { - return dms3ld.ErrWrongKind{TypeName: "schemadmt.TypeDefnInline", MethodName: "AssignNode", AppropriateKind: dms3ld.KindSet_JustMap, ActualKind: v.Kind()} + if v.Kind() != ld.Kind_Map { + return ld.ErrWrongKind{TypeName: "schemadmt.TypeDefnInline", MethodName: "AssignNode", AppropriateKind: ld.KindSet_JustMap, ActualKind: v.Kind()} } itr := v.MapIterator() for !itr.Done() { @@ -27912,7 +27912,7 @@ func (na *_TypeDefnInline__Assembler) AssignNode(v dms3ld.Node) error { } return na.Finish() } -func (_TypeDefnInline__Assembler) Prototype() dms3ld.NodePrototype { +func (_TypeDefnInline__Assembler) Prototype() ld.NodePrototype { return _TypeDefnInline__Prototype{} } func (ma *_TypeDefnInline__Assembler) valueFinishTidy() bool { @@ -27924,7 +27924,7 @@ func (ma *_TypeDefnInline__Assembler) valueFinishTidy() bool { return false } } -func (ma *_TypeDefnInline__Assembler) AssembleEntry(k string) (dms3ld.NodeAssembler, error) { +func (ma *_TypeDefnInline__Assembler) AssembleEntry(k string) (ld.NodeAssembler, error) { switch ma.state { case maState_initial: // carry on @@ -27966,9 +27966,9 @@ func (ma *_TypeDefnInline__Assembler) AssembleEntry(k string) (dms3ld.NodeAssemb ma.ca2.m = &ma.cm return ma.ca2, nil } - return nil, dms3ld.ErrInvalidKey{TypeName: "schemadmt.TypeDefnInline", Key: &_String{k}} + return nil, ld.ErrInvalidKey{TypeName: "schemadmt.TypeDefnInline", Key: &_String{k}} } -func (ma *_TypeDefnInline__Assembler) AssembleKey() dms3ld.NodeAssembler { +func (ma *_TypeDefnInline__Assembler) AssembleKey() ld.NodeAssembler { switch ma.state { case maState_initial: // carry on @@ -27986,7 +27986,7 @@ func (ma *_TypeDefnInline__Assembler) AssembleKey() dms3ld.NodeAssembler { ma.state = maState_midKey return (*_TypeDefnInline__KeyAssembler)(ma) } -func (ma *_TypeDefnInline__Assembler) AssembleValue() dms3ld.NodeAssembler { +func (ma *_TypeDefnInline__Assembler) AssembleValue() ld.NodeAssembler { switch ma.state { case maState_initial: panic("invalid state: AssembleValue cannot be called when no key is primed") @@ -28045,10 +28045,10 @@ func (ma *_TypeDefnInline__Assembler) Finish() error { *ma.m = schema.Maybe_Value return nil } -func (ma *_TypeDefnInline__Assembler) KeyPrototype() dms3ld.NodePrototype { +func (ma *_TypeDefnInline__Assembler) KeyPrototype() ld.NodePrototype { return _String__Prototype{} } -func (ma *_TypeDefnInline__Assembler) ValuePrototype(k string) dms3ld.NodePrototype { +func (ma *_TypeDefnInline__Assembler) ValuePrototype(k string) ld.NodePrototype { switch k { case "TypeMap": return _TypeMap__Prototype{} @@ -28061,10 +28061,10 @@ func (ma *_TypeDefnInline__Assembler) ValuePrototype(k string) dms3ld.NodeProtot type _TypeDefnInline__KeyAssembler _TypeDefnInline__Assembler -func (_TypeDefnInline__KeyAssembler) BeginMap(sizeHint int64) (dms3ld.MapAssembler, error) { +func (_TypeDefnInline__KeyAssembler) BeginMap(sizeHint int64) (ld.MapAssembler, error) { return mixins.StringAssembler{TypeName: "schemadmt.TypeDefnInline.KeyAssembler"}.BeginMap(0) } -func (_TypeDefnInline__KeyAssembler) BeginList(sizeHint int64) (dms3ld.ListAssembler, error) { +func (_TypeDefnInline__KeyAssembler) BeginList(sizeHint int64) (ld.ListAssembler, error) { return mixins.StringAssembler{TypeName: "schemadmt.TypeDefnInline.KeyAssembler"}.BeginList(0) } func (na *_TypeDefnInline__KeyAssembler) AssignNull() error { @@ -28096,28 +28096,28 @@ func (ka *_TypeDefnInline__KeyAssembler) AssignString(k string) error { ka.state = maState_expectValue return nil } - return dms3ld.ErrInvalidKey{TypeName: "schemadmt.TypeDefnInline", Key: &_String{k}} // TODO: error quality: ErrInvalidUnionDiscriminant ? + return ld.ErrInvalidKey{TypeName: "schemadmt.TypeDefnInline", Key: &_String{k}} // TODO: error quality: ErrInvalidUnionDiscriminant ? } func (_TypeDefnInline__KeyAssembler) AssignBytes([]byte) error { return mixins.StringAssembler{TypeName: "schemadmt.TypeDefnInline.KeyAssembler"}.AssignBytes(nil) } -func (_TypeDefnInline__KeyAssembler) AssignLink(dms3ld.Link) error { +func (_TypeDefnInline__KeyAssembler) AssignLink(ld.Link) error { return mixins.StringAssembler{TypeName: "schemadmt.TypeDefnInline.KeyAssembler"}.AssignLink(nil) } -func (ka *_TypeDefnInline__KeyAssembler) AssignNode(v dms3ld.Node) error { +func (ka *_TypeDefnInline__KeyAssembler) AssignNode(v ld.Node) error { if v2, err := v.AsString(); err != nil { return err } else { return ka.AssignString(v2) } } -func (_TypeDefnInline__KeyAssembler) Prototype() dms3ld.NodePrototype { +func (_TypeDefnInline__KeyAssembler) Prototype() ld.NodePrototype { return _String__Prototype{} } func (TypeDefnInline) Type() schema.Type { return nil /*TODO:typelit*/ } -func (n TypeDefnInline) Representation() dms3ld.Node { +func (n TypeDefnInline) Representation() ld.Node { return (*_TypeDefnInline__Repr)(n) } @@ -28127,43 +28127,43 @@ var ( memberName__TypeDefnInline_TypeMap_serial = _String{"map"} memberName__TypeDefnInline_TypeList_serial = _String{"list"} ) -var _ dms3ld.Node = &_TypeDefnInline__Repr{} +var _ ld.Node = &_TypeDefnInline__Repr{} -func (_TypeDefnInline__Repr) Kind() dms3ld.Kind { - return dms3ld.Kind_Map +func (_TypeDefnInline__Repr) Kind() ld.Kind { + return ld.Kind_Map } -func (n *_TypeDefnInline__Repr) LookupByString(key string) (dms3ld.Node, error) { +func (n *_TypeDefnInline__Repr) LookupByString(key string) (ld.Node, error) { switch key { case "map": if n2, ok := n.x.(TypeMap); ok { return n2.Representation(), nil } else { - return nil, dms3ld.ErrNotExists{Segment: dms3ld.PathSegmentOfString(key)} + return nil, ld.ErrNotExists{Segment: ld.PathSegmentOfString(key)} } case "list": if n2, ok := n.x.(TypeList); ok { return n2.Representation(), nil } else { - return nil, dms3ld.ErrNotExists{Segment: dms3ld.PathSegmentOfString(key)} + return nil, ld.ErrNotExists{Segment: ld.PathSegmentOfString(key)} } default: - return nil, schema.ErrNoSuchField{Type: nil /*TODO*/, Field: dms3ld.PathSegmentOfString(key)} + return nil, schema.ErrNoSuchField{Type: nil /*TODO*/, Field: ld.PathSegmentOfString(key)} } } -func (n *_TypeDefnInline__Repr) LookupByNode(key dms3ld.Node) (dms3ld.Node, error) { +func (n *_TypeDefnInline__Repr) LookupByNode(key ld.Node) (ld.Node, error) { ks, err := key.AsString() if err != nil { return nil, err } return n.LookupByString(ks) } -func (_TypeDefnInline__Repr) LookupByIndex(idx int64) (dms3ld.Node, error) { +func (_TypeDefnInline__Repr) LookupByIndex(idx int64) (ld.Node, error) { return mixins.Map{TypeName: "schemadmt.TypeDefnInline.Repr"}.LookupByIndex(0) } -func (n _TypeDefnInline__Repr) LookupBySegment(seg dms3ld.PathSegment) (dms3ld.Node, error) { +func (n _TypeDefnInline__Repr) LookupBySegment(seg ld.PathSegment) (ld.Node, error) { return n.LookupByString(seg.String()) } -func (n *_TypeDefnInline__Repr) MapIterator() dms3ld.MapIterator { +func (n *_TypeDefnInline__Repr) MapIterator() ld.MapIterator { return &_TypeDefnInline__ReprMapItr{n, false} } @@ -28172,9 +28172,9 @@ type _TypeDefnInline__ReprMapItr struct { done bool } -func (itr *_TypeDefnInline__ReprMapItr) Next() (k dms3ld.Node, v dms3ld.Node, _ error) { +func (itr *_TypeDefnInline__ReprMapItr) Next() (k ld.Node, v ld.Node, _ error) { if itr.done { - return nil, nil, dms3ld.ErrIteratorOverread{} + return nil, nil, ld.ErrIteratorOverread{} } switch n2 := itr.n.x.(type) { case TypeMap: @@ -28191,7 +28191,7 @@ func (itr *_TypeDefnInline__ReprMapItr) Done() bool { return itr.done } -func (_TypeDefnInline__Repr) ListIterator() dms3ld.ListIterator { +func (_TypeDefnInline__Repr) ListIterator() ld.ListIterator { return nil } func (_TypeDefnInline__Repr) Length() int64 { @@ -28218,16 +28218,16 @@ func (_TypeDefnInline__Repr) AsString() (string, error) { func (_TypeDefnInline__Repr) AsBytes() ([]byte, error) { return mixins.Map{TypeName: "schemadmt.TypeDefnInline.Repr"}.AsBytes() } -func (_TypeDefnInline__Repr) AsLink() (dms3ld.Link, error) { +func (_TypeDefnInline__Repr) AsLink() (ld.Link, error) { return mixins.Map{TypeName: "schemadmt.TypeDefnInline.Repr"}.AsLink() } -func (_TypeDefnInline__Repr) Prototype() dms3ld.NodePrototype { +func (_TypeDefnInline__Repr) Prototype() ld.NodePrototype { return _TypeDefnInline__ReprPrototype{} } type _TypeDefnInline__ReprPrototype struct{} -func (_TypeDefnInline__ReprPrototype) NewBuilder() dms3ld.NodeBuilder { +func (_TypeDefnInline__ReprPrototype) NewBuilder() ld.NodeBuilder { var nb _TypeDefnInline__ReprBuilder nb.Reset() return &nb @@ -28237,7 +28237,7 @@ type _TypeDefnInline__ReprBuilder struct { _TypeDefnInline__ReprAssembler } -func (nb *_TypeDefnInline__ReprBuilder) Build() dms3ld.Node { +func (nb *_TypeDefnInline__ReprBuilder) Build() ld.Node { if *nb.m != schema.Maybe_Value { panic("invalid state: cannot call Build on an assembler that's not finished") } @@ -28277,7 +28277,7 @@ func (na *_TypeDefnInline__ReprAssembler) reset() { na.ca = 0 na.cm = schema.Maybe_Absent } -func (na *_TypeDefnInline__ReprAssembler) BeginMap(int64) (dms3ld.MapAssembler, error) { +func (na *_TypeDefnInline__ReprAssembler) BeginMap(int64) (ld.MapAssembler, error) { switch *na.m { case schema.Maybe_Value, schema.Maybe_Null: panic("invalid state: cannot assign into assembler that's already finished") @@ -28290,7 +28290,7 @@ func (na *_TypeDefnInline__ReprAssembler) BeginMap(int64) (dms3ld.MapAssembler, } return na, nil } -func (_TypeDefnInline__ReprAssembler) BeginList(sizeHint int64) (dms3ld.ListAssembler, error) { +func (_TypeDefnInline__ReprAssembler) BeginList(sizeHint int64) (ld.ListAssembler, error) { return mixins.MapAssembler{TypeName: "schemadmt.TypeDefnInline.Repr"}.BeginList(0) } func (na *_TypeDefnInline__ReprAssembler) AssignNull() error { @@ -28322,10 +28322,10 @@ func (_TypeDefnInline__ReprAssembler) AssignString(string) error { func (_TypeDefnInline__ReprAssembler) AssignBytes([]byte) error { return mixins.MapAssembler{TypeName: "schemadmt.TypeDefnInline.Repr"}.AssignBytes(nil) } -func (_TypeDefnInline__ReprAssembler) AssignLink(dms3ld.Link) error { +func (_TypeDefnInline__ReprAssembler) AssignLink(ld.Link) error { return mixins.MapAssembler{TypeName: "schemadmt.TypeDefnInline.Repr"}.AssignLink(nil) } -func (na *_TypeDefnInline__ReprAssembler) AssignNode(v dms3ld.Node) error { +func (na *_TypeDefnInline__ReprAssembler) AssignNode(v ld.Node) error { if v.IsNull() { return na.AssignNull() } @@ -28345,8 +28345,8 @@ func (na *_TypeDefnInline__ReprAssembler) AssignNode(v dms3ld.Node) error { *na.m = schema.Maybe_Value return nil } - if v.Kind() != dms3ld.Kind_Map { - return dms3ld.ErrWrongKind{TypeName: "schemadmt.TypeDefnInline.Repr", MethodName: "AssignNode", AppropriateKind: dms3ld.KindSet_JustMap, ActualKind: v.Kind()} + if v.Kind() != ld.Kind_Map { + return ld.ErrWrongKind{TypeName: "schemadmt.TypeDefnInline.Repr", MethodName: "AssignNode", AppropriateKind: ld.KindSet_JustMap, ActualKind: v.Kind()} } itr := v.MapIterator() for !itr.Done() { @@ -28363,7 +28363,7 @@ func (na *_TypeDefnInline__ReprAssembler) AssignNode(v dms3ld.Node) error { } return na.Finish() } -func (_TypeDefnInline__ReprAssembler) Prototype() dms3ld.NodePrototype { +func (_TypeDefnInline__ReprAssembler) Prototype() ld.NodePrototype { return _TypeDefnInline__ReprPrototype{} } func (ma *_TypeDefnInline__ReprAssembler) valueFinishTidy() bool { @@ -28375,7 +28375,7 @@ func (ma *_TypeDefnInline__ReprAssembler) valueFinishTidy() bool { return false } } -func (ma *_TypeDefnInline__ReprAssembler) AssembleEntry(k string) (dms3ld.NodeAssembler, error) { +func (ma *_TypeDefnInline__ReprAssembler) AssembleEntry(k string) (ld.NodeAssembler, error) { switch ma.state { case maState_initial: // carry on @@ -28417,9 +28417,9 @@ func (ma *_TypeDefnInline__ReprAssembler) AssembleEntry(k string) (dms3ld.NodeAs ma.ca2.m = &ma.cm return ma.ca2, nil } - return nil, dms3ld.ErrInvalidKey{TypeName: "schemadmt.TypeDefnInline.Repr", Key: &_String{k}} + return nil, ld.ErrInvalidKey{TypeName: "schemadmt.TypeDefnInline.Repr", Key: &_String{k}} } -func (ma *_TypeDefnInline__ReprAssembler) AssembleKey() dms3ld.NodeAssembler { +func (ma *_TypeDefnInline__ReprAssembler) AssembleKey() ld.NodeAssembler { switch ma.state { case maState_initial: // carry on @@ -28437,7 +28437,7 @@ func (ma *_TypeDefnInline__ReprAssembler) AssembleKey() dms3ld.NodeAssembler { ma.state = maState_midKey return (*_TypeDefnInline__ReprKeyAssembler)(ma) } -func (ma *_TypeDefnInline__ReprAssembler) AssembleValue() dms3ld.NodeAssembler { +func (ma *_TypeDefnInline__ReprAssembler) AssembleValue() ld.NodeAssembler { switch ma.state { case maState_initial: panic("invalid state: AssembleValue cannot be called when no key is primed") @@ -28496,10 +28496,10 @@ func (ma *_TypeDefnInline__ReprAssembler) Finish() error { *ma.m = schema.Maybe_Value return nil } -func (ma *_TypeDefnInline__ReprAssembler) KeyPrototype() dms3ld.NodePrototype { +func (ma *_TypeDefnInline__ReprAssembler) KeyPrototype() ld.NodePrototype { return _String__Prototype{} } -func (ma *_TypeDefnInline__ReprAssembler) ValuePrototype(k string) dms3ld.NodePrototype { +func (ma *_TypeDefnInline__ReprAssembler) ValuePrototype(k string) ld.NodePrototype { switch k { case "TypeMap": return _TypeMap__ReprPrototype{} @@ -28512,10 +28512,10 @@ func (ma *_TypeDefnInline__ReprAssembler) ValuePrototype(k string) dms3ld.NodePr type _TypeDefnInline__ReprKeyAssembler _TypeDefnInline__ReprAssembler -func (_TypeDefnInline__ReprKeyAssembler) BeginMap(sizeHint int64) (dms3ld.MapAssembler, error) { +func (_TypeDefnInline__ReprKeyAssembler) BeginMap(sizeHint int64) (ld.MapAssembler, error) { return mixins.StringAssembler{TypeName: "schemadmt.TypeDefnInline.Repr.KeyAssembler"}.BeginMap(0) } -func (_TypeDefnInline__ReprKeyAssembler) BeginList(sizeHint int64) (dms3ld.ListAssembler, error) { +func (_TypeDefnInline__ReprKeyAssembler) BeginList(sizeHint int64) (ld.ListAssembler, error) { return mixins.StringAssembler{TypeName: "schemadmt.TypeDefnInline.Repr.KeyAssembler"}.BeginList(0) } func (na *_TypeDefnInline__ReprKeyAssembler) AssignNull() error { @@ -28547,22 +28547,22 @@ func (ka *_TypeDefnInline__ReprKeyAssembler) AssignString(k string) error { ka.state = maState_expectValue return nil } - return dms3ld.ErrInvalidKey{TypeName: "schemadmt.TypeDefnInline.Repr", Key: &_String{k}} // TODO: error quality: ErrInvalidUnionDiscriminant ? + return ld.ErrInvalidKey{TypeName: "schemadmt.TypeDefnInline.Repr", Key: &_String{k}} // TODO: error quality: ErrInvalidUnionDiscriminant ? } func (_TypeDefnInline__ReprKeyAssembler) AssignBytes([]byte) error { return mixins.StringAssembler{TypeName: "schemadmt.TypeDefnInline.Repr.KeyAssembler"}.AssignBytes(nil) } -func (_TypeDefnInline__ReprKeyAssembler) AssignLink(dms3ld.Link) error { +func (_TypeDefnInline__ReprKeyAssembler) AssignLink(ld.Link) error { return mixins.StringAssembler{TypeName: "schemadmt.TypeDefnInline.Repr.KeyAssembler"}.AssignLink(nil) } -func (ka *_TypeDefnInline__ReprKeyAssembler) AssignNode(v dms3ld.Node) error { +func (ka *_TypeDefnInline__ReprKeyAssembler) AssignNode(v ld.Node) error { if v2, err := v.AsString(); err != nil { return err } else { return ka.AssignString(v2) } } -func (_TypeDefnInline__ReprKeyAssembler) Prototype() dms3ld.NodePrototype { +func (_TypeDefnInline__ReprKeyAssembler) Prototype() ld.NodePrototype { return _String__Prototype{} } @@ -28588,12 +28588,12 @@ func (m MaybeTypeEnum) IsAbsent() bool { func (m MaybeTypeEnum) Exists() bool { return m.m == schema.Maybe_Value } -func (m MaybeTypeEnum) AsNode() dms3ld.Node { +func (m MaybeTypeEnum) AsNode() ld.Node { switch m.m { case schema.Maybe_Absent: - return dms3ld.Absent + return ld.Absent case schema.Maybe_Null: - return dms3ld.Null + return ld.Null case schema.Maybe_Value: return m.v default: @@ -28611,36 +28611,36 @@ var ( fieldName__TypeEnum_Members = _String{"members"} fieldName__TypeEnum_Representation = _String{"representation"} ) -var _ dms3ld.Node = (TypeEnum)(&_TypeEnum{}) +var _ ld.Node = (TypeEnum)(&_TypeEnum{}) var _ schema.TypedNode = (TypeEnum)(&_TypeEnum{}) -func (TypeEnum) Kind() dms3ld.Kind { - return dms3ld.Kind_Map +func (TypeEnum) Kind() ld.Kind { + return ld.Kind_Map } -func (n TypeEnum) LookupByString(key string) (dms3ld.Node, error) { +func (n TypeEnum) LookupByString(key string) (ld.Node, error) { switch key { case "members": return &n.members, nil case "representation": return &n.representation, nil default: - return nil, schema.ErrNoSuchField{Type: nil /*TODO*/, Field: dms3ld.PathSegmentOfString(key)} + return nil, schema.ErrNoSuchField{Type: nil /*TODO*/, Field: ld.PathSegmentOfString(key)} } } -func (n TypeEnum) LookupByNode(key dms3ld.Node) (dms3ld.Node, error) { +func (n TypeEnum) LookupByNode(key ld.Node) (ld.Node, error) { ks, err := key.AsString() if err != nil { return nil, err } return n.LookupByString(ks) } -func (TypeEnum) LookupByIndex(idx int64) (dms3ld.Node, error) { +func (TypeEnum) LookupByIndex(idx int64) (ld.Node, error) { return mixins.Map{TypeName: "schemadmt.TypeEnum"}.LookupByIndex(0) } -func (n TypeEnum) LookupBySegment(seg dms3ld.PathSegment) (dms3ld.Node, error) { +func (n TypeEnum) LookupBySegment(seg ld.PathSegment) (ld.Node, error) { return n.LookupByString(seg.String()) } -func (n TypeEnum) MapIterator() dms3ld.MapIterator { +func (n TypeEnum) MapIterator() ld.MapIterator { return &_TypeEnum__MapItr{n, 0} } @@ -28649,9 +28649,9 @@ type _TypeEnum__MapItr struct { idx int } -func (itr *_TypeEnum__MapItr) Next() (k dms3ld.Node, v dms3ld.Node, _ error) { +func (itr *_TypeEnum__MapItr) Next() (k ld.Node, v ld.Node, _ error) { if itr.idx >= 2 { - return nil, nil, dms3ld.ErrIteratorOverread{} + return nil, nil, ld.ErrIteratorOverread{} } switch itr.idx { case 0: @@ -28670,7 +28670,7 @@ func (itr *_TypeEnum__MapItr) Done() bool { return itr.idx >= 2 } -func (TypeEnum) ListIterator() dms3ld.ListIterator { +func (TypeEnum) ListIterator() ld.ListIterator { return nil } func (TypeEnum) Length() int64 { @@ -28697,16 +28697,16 @@ func (TypeEnum) AsString() (string, error) { func (TypeEnum) AsBytes() ([]byte, error) { return mixins.Map{TypeName: "schemadmt.TypeEnum"}.AsBytes() } -func (TypeEnum) AsLink() (dms3ld.Link, error) { +func (TypeEnum) AsLink() (ld.Link, error) { return mixins.Map{TypeName: "schemadmt.TypeEnum"}.AsLink() } -func (TypeEnum) Prototype() dms3ld.NodePrototype { +func (TypeEnum) Prototype() ld.NodePrototype { return _TypeEnum__Prototype{} } type _TypeEnum__Prototype struct{} -func (_TypeEnum__Prototype) NewBuilder() dms3ld.NodeBuilder { +func (_TypeEnum__Prototype) NewBuilder() ld.NodeBuilder { var nb _TypeEnum__Builder nb.Reset() return &nb @@ -28716,7 +28716,7 @@ type _TypeEnum__Builder struct { _TypeEnum__Assembler } -func (nb *_TypeEnum__Builder) Build() dms3ld.Node { +func (nb *_TypeEnum__Builder) Build() ld.Node { if *nb.m != schema.Maybe_Value { panic("invalid state: cannot call Build on an assembler that's not finished") } @@ -28753,7 +28753,7 @@ var ( fieldBits__TypeEnum_sufficient = 0 + 1<<0 + 1<<1 ) -func (na *_TypeEnum__Assembler) BeginMap(int64) (dms3ld.MapAssembler, error) { +func (na *_TypeEnum__Assembler) BeginMap(int64) (ld.MapAssembler, error) { switch *na.m { case schema.Maybe_Value, schema.Maybe_Null: panic("invalid state: cannot assign into assembler that's already finished") @@ -28766,7 +28766,7 @@ func (na *_TypeEnum__Assembler) BeginMap(int64) (dms3ld.MapAssembler, error) { } return na, nil } -func (_TypeEnum__Assembler) BeginList(sizeHint int64) (dms3ld.ListAssembler, error) { +func (_TypeEnum__Assembler) BeginList(sizeHint int64) (ld.ListAssembler, error) { return mixins.MapAssembler{TypeName: "schemadmt.TypeEnum"}.BeginList(0) } func (na *_TypeEnum__Assembler) AssignNull() error { @@ -28798,10 +28798,10 @@ func (_TypeEnum__Assembler) AssignString(string) error { func (_TypeEnum__Assembler) AssignBytes([]byte) error { return mixins.MapAssembler{TypeName: "schemadmt.TypeEnum"}.AssignBytes(nil) } -func (_TypeEnum__Assembler) AssignLink(dms3ld.Link) error { +func (_TypeEnum__Assembler) AssignLink(ld.Link) error { return mixins.MapAssembler{TypeName: "schemadmt.TypeEnum"}.AssignLink(nil) } -func (na *_TypeEnum__Assembler) AssignNode(v dms3ld.Node) error { +func (na *_TypeEnum__Assembler) AssignNode(v ld.Node) error { if v.IsNull() { return na.AssignNull() } @@ -28821,8 +28821,8 @@ func (na *_TypeEnum__Assembler) AssignNode(v dms3ld.Node) error { *na.m = schema.Maybe_Value return nil } - if v.Kind() != dms3ld.Kind_Map { - return dms3ld.ErrWrongKind{TypeName: "schemadmt.TypeEnum", MethodName: "AssignNode", AppropriateKind: dms3ld.KindSet_JustMap, ActualKind: v.Kind()} + if v.Kind() != ld.Kind_Map { + return ld.ErrWrongKind{TypeName: "schemadmt.TypeEnum", MethodName: "AssignNode", AppropriateKind: ld.KindSet_JustMap, ActualKind: v.Kind()} } itr := v.MapIterator() for !itr.Done() { @@ -28839,7 +28839,7 @@ func (na *_TypeEnum__Assembler) AssignNode(v dms3ld.Node) error { } return na.Finish() } -func (_TypeEnum__Assembler) Prototype() dms3ld.NodePrototype { +func (_TypeEnum__Assembler) Prototype() ld.NodePrototype { return _TypeEnum__Prototype{} } func (ma *_TypeEnum__Assembler) valueFinishTidy() bool { @@ -28868,7 +28868,7 @@ func (ma *_TypeEnum__Assembler) valueFinishTidy() bool { panic("unreachable") } } -func (ma *_TypeEnum__Assembler) AssembleEntry(k string) (dms3ld.NodeAssembler, error) { +func (ma *_TypeEnum__Assembler) AssembleEntry(k string) (ld.NodeAssembler, error) { switch ma.state { case maState_initial: // carry on @@ -28886,7 +28886,7 @@ func (ma *_TypeEnum__Assembler) AssembleEntry(k string) (dms3ld.NodeAssembler, e switch k { case "members": if ma.s&fieldBit__TypeEnum_Members != 0 { - return nil, dms3ld.ErrRepeatedMapKey{Key: &fieldName__TypeEnum_Members} + return nil, ld.ErrRepeatedMapKey{Key: &fieldName__TypeEnum_Members} } ma.s += fieldBit__TypeEnum_Members ma.state = maState_midValue @@ -28896,7 +28896,7 @@ func (ma *_TypeEnum__Assembler) AssembleEntry(k string) (dms3ld.NodeAssembler, e return &ma.ca_members, nil case "representation": if ma.s&fieldBit__TypeEnum_Representation != 0 { - return nil, dms3ld.ErrRepeatedMapKey{Key: &fieldName__TypeEnum_Representation} + return nil, ld.ErrRepeatedMapKey{Key: &fieldName__TypeEnum_Representation} } ma.s += fieldBit__TypeEnum_Representation ma.state = maState_midValue @@ -28905,9 +28905,9 @@ func (ma *_TypeEnum__Assembler) AssembleEntry(k string) (dms3ld.NodeAssembler, e ma.ca_representation.m = &ma.cm return &ma.ca_representation, nil } - return nil, dms3ld.ErrInvalidKey{TypeName: "schemadmt.TypeEnum", Key: &_String{k}} + return nil, ld.ErrInvalidKey{TypeName: "schemadmt.TypeEnum", Key: &_String{k}} } -func (ma *_TypeEnum__Assembler) AssembleKey() dms3ld.NodeAssembler { +func (ma *_TypeEnum__Assembler) AssembleKey() ld.NodeAssembler { switch ma.state { case maState_initial: // carry on @@ -28925,7 +28925,7 @@ func (ma *_TypeEnum__Assembler) AssembleKey() dms3ld.NodeAssembler { ma.state = maState_midKey return (*_TypeEnum__KeyAssembler)(ma) } -func (ma *_TypeEnum__Assembler) AssembleValue() dms3ld.NodeAssembler { +func (ma *_TypeEnum__Assembler) AssembleValue() ld.NodeAssembler { switch ma.state { case maState_initial: panic("invalid state: AssembleValue cannot be called when no key is primed") @@ -28968,7 +28968,7 @@ func (ma *_TypeEnum__Assembler) Finish() error { panic("invalid state: Finish cannot be called on an assembler that's already finished") } if ma.s&fieldBits__TypeEnum_sufficient != fieldBits__TypeEnum_sufficient { - err := dms3ld.ErrMissingRequiredField{Missing: make([]string, 0)} + err := ld.ErrMissingRequiredField{Missing: make([]string, 0)} if ma.s&fieldBit__TypeEnum_Members == 0 { err.Missing = append(err.Missing, "members") } @@ -28981,19 +28981,19 @@ func (ma *_TypeEnum__Assembler) Finish() error { *ma.m = schema.Maybe_Value return nil } -func (ma *_TypeEnum__Assembler) KeyPrototype() dms3ld.NodePrototype { +func (ma *_TypeEnum__Assembler) KeyPrototype() ld.NodePrototype { return _String__Prototype{} } -func (ma *_TypeEnum__Assembler) ValuePrototype(k string) dms3ld.NodePrototype { +func (ma *_TypeEnum__Assembler) ValuePrototype(k string) ld.NodePrototype { panic("todo structbuilder mapassembler valueprototype") } type _TypeEnum__KeyAssembler _TypeEnum__Assembler -func (_TypeEnum__KeyAssembler) BeginMap(sizeHint int64) (dms3ld.MapAssembler, error) { +func (_TypeEnum__KeyAssembler) BeginMap(sizeHint int64) (ld.MapAssembler, error) { return mixins.StringAssembler{TypeName: "schemadmt.TypeEnum.KeyAssembler"}.BeginMap(0) } -func (_TypeEnum__KeyAssembler) BeginList(sizeHint int64) (dms3ld.ListAssembler, error) { +func (_TypeEnum__KeyAssembler) BeginList(sizeHint int64) (ld.ListAssembler, error) { return mixins.StringAssembler{TypeName: "schemadmt.TypeEnum.KeyAssembler"}.BeginList(0) } func (na *_TypeEnum__KeyAssembler) AssignNull() error { @@ -29015,43 +29015,43 @@ func (ka *_TypeEnum__KeyAssembler) AssignString(k string) error { switch k { case "members": if ka.s&fieldBit__TypeEnum_Members != 0 { - return dms3ld.ErrRepeatedMapKey{Key: &fieldName__TypeEnum_Members} + return ld.ErrRepeatedMapKey{Key: &fieldName__TypeEnum_Members} } ka.s += fieldBit__TypeEnum_Members ka.state = maState_expectValue ka.f = 0 case "representation": if ka.s&fieldBit__TypeEnum_Representation != 0 { - return dms3ld.ErrRepeatedMapKey{Key: &fieldName__TypeEnum_Representation} + return ld.ErrRepeatedMapKey{Key: &fieldName__TypeEnum_Representation} } ka.s += fieldBit__TypeEnum_Representation ka.state = maState_expectValue ka.f = 1 default: - return dms3ld.ErrInvalidKey{TypeName: "schemadmt.TypeEnum", Key: &_String{k}} + return ld.ErrInvalidKey{TypeName: "schemadmt.TypeEnum", Key: &_String{k}} } return nil } func (_TypeEnum__KeyAssembler) AssignBytes([]byte) error { return mixins.StringAssembler{TypeName: "schemadmt.TypeEnum.KeyAssembler"}.AssignBytes(nil) } -func (_TypeEnum__KeyAssembler) AssignLink(dms3ld.Link) error { +func (_TypeEnum__KeyAssembler) AssignLink(ld.Link) error { return mixins.StringAssembler{TypeName: "schemadmt.TypeEnum.KeyAssembler"}.AssignLink(nil) } -func (ka *_TypeEnum__KeyAssembler) AssignNode(v dms3ld.Node) error { +func (ka *_TypeEnum__KeyAssembler) AssignNode(v ld.Node) error { if v2, err := v.AsString(); err != nil { return err } else { return ka.AssignString(v2) } } -func (_TypeEnum__KeyAssembler) Prototype() dms3ld.NodePrototype { +func (_TypeEnum__KeyAssembler) Prototype() ld.NodePrototype { return _String__Prototype{} } func (TypeEnum) Type() schema.Type { return nil /*TODO:typelit*/ } -func (n TypeEnum) Representation() dms3ld.Node { +func (n TypeEnum) Representation() ld.Node { return (*_TypeEnum__Repr)(n) } @@ -29061,35 +29061,35 @@ var ( fieldName__TypeEnum_Members_serial = _String{"members"} fieldName__TypeEnum_Representation_serial = _String{"representation"} ) -var _ dms3ld.Node = &_TypeEnum__Repr{} +var _ ld.Node = &_TypeEnum__Repr{} -func (_TypeEnum__Repr) Kind() dms3ld.Kind { - return dms3ld.Kind_Map +func (_TypeEnum__Repr) Kind() ld.Kind { + return ld.Kind_Map } -func (n *_TypeEnum__Repr) LookupByString(key string) (dms3ld.Node, error) { +func (n *_TypeEnum__Repr) LookupByString(key string) (ld.Node, error) { switch key { case "members": return n.members.Representation(), nil case "representation": return n.representation.Representation(), nil default: - return nil, schema.ErrNoSuchField{Type: nil /*TODO*/, Field: dms3ld.PathSegmentOfString(key)} + return nil, schema.ErrNoSuchField{Type: nil /*TODO*/, Field: ld.PathSegmentOfString(key)} } } -func (n *_TypeEnum__Repr) LookupByNode(key dms3ld.Node) (dms3ld.Node, error) { +func (n *_TypeEnum__Repr) LookupByNode(key ld.Node) (ld.Node, error) { ks, err := key.AsString() if err != nil { return nil, err } return n.LookupByString(ks) } -func (_TypeEnum__Repr) LookupByIndex(idx int64) (dms3ld.Node, error) { +func (_TypeEnum__Repr) LookupByIndex(idx int64) (ld.Node, error) { return mixins.Map{TypeName: "schemadmt.TypeEnum.Repr"}.LookupByIndex(0) } -func (n _TypeEnum__Repr) LookupBySegment(seg dms3ld.PathSegment) (dms3ld.Node, error) { +func (n _TypeEnum__Repr) LookupBySegment(seg ld.PathSegment) (ld.Node, error) { return n.LookupByString(seg.String()) } -func (n *_TypeEnum__Repr) MapIterator() dms3ld.MapIterator { +func (n *_TypeEnum__Repr) MapIterator() ld.MapIterator { return &_TypeEnum__ReprMapItr{n, 0} } @@ -29098,9 +29098,9 @@ type _TypeEnum__ReprMapItr struct { idx int } -func (itr *_TypeEnum__ReprMapItr) Next() (k dms3ld.Node, v dms3ld.Node, _ error) { +func (itr *_TypeEnum__ReprMapItr) Next() (k ld.Node, v ld.Node, _ error) { if itr.idx >= 2 { - return nil, nil, dms3ld.ErrIteratorOverread{} + return nil, nil, ld.ErrIteratorOverread{} } switch itr.idx { case 0: @@ -29118,7 +29118,7 @@ func (itr *_TypeEnum__ReprMapItr) Next() (k dms3ld.Node, v dms3ld.Node, _ error) func (itr *_TypeEnum__ReprMapItr) Done() bool { return itr.idx >= 2 } -func (_TypeEnum__Repr) ListIterator() dms3ld.ListIterator { +func (_TypeEnum__Repr) ListIterator() ld.ListIterator { return nil } func (rn *_TypeEnum__Repr) Length() int64 { @@ -29146,16 +29146,16 @@ func (_TypeEnum__Repr) AsString() (string, error) { func (_TypeEnum__Repr) AsBytes() ([]byte, error) { return mixins.Map{TypeName: "schemadmt.TypeEnum.Repr"}.AsBytes() } -func (_TypeEnum__Repr) AsLink() (dms3ld.Link, error) { +func (_TypeEnum__Repr) AsLink() (ld.Link, error) { return mixins.Map{TypeName: "schemadmt.TypeEnum.Repr"}.AsLink() } -func (_TypeEnum__Repr) Prototype() dms3ld.NodePrototype { +func (_TypeEnum__Repr) Prototype() ld.NodePrototype { return _TypeEnum__ReprPrototype{} } type _TypeEnum__ReprPrototype struct{} -func (_TypeEnum__ReprPrototype) NewBuilder() dms3ld.NodeBuilder { +func (_TypeEnum__ReprPrototype) NewBuilder() ld.NodeBuilder { var nb _TypeEnum__ReprBuilder nb.Reset() return &nb @@ -29165,7 +29165,7 @@ type _TypeEnum__ReprBuilder struct { _TypeEnum__ReprAssembler } -func (nb *_TypeEnum__ReprBuilder) Build() dms3ld.Node { +func (nb *_TypeEnum__ReprBuilder) Build() ld.Node { if *nb.m != schema.Maybe_Value { panic("invalid state: cannot call Build on an assembler that's not finished") } @@ -29195,7 +29195,7 @@ func (na *_TypeEnum__ReprAssembler) reset() { na.ca_members.reset() na.ca_representation.reset() } -func (na *_TypeEnum__ReprAssembler) BeginMap(int64) (dms3ld.MapAssembler, error) { +func (na *_TypeEnum__ReprAssembler) BeginMap(int64) (ld.MapAssembler, error) { switch *na.m { case schema.Maybe_Value, schema.Maybe_Null: panic("invalid state: cannot assign into assembler that's already finished") @@ -29208,7 +29208,7 @@ func (na *_TypeEnum__ReprAssembler) BeginMap(int64) (dms3ld.MapAssembler, error) } return na, nil } -func (_TypeEnum__ReprAssembler) BeginList(sizeHint int64) (dms3ld.ListAssembler, error) { +func (_TypeEnum__ReprAssembler) BeginList(sizeHint int64) (ld.ListAssembler, error) { return mixins.MapAssembler{TypeName: "schemadmt.TypeEnum.Repr"}.BeginList(0) } func (na *_TypeEnum__ReprAssembler) AssignNull() error { @@ -29240,10 +29240,10 @@ func (_TypeEnum__ReprAssembler) AssignString(string) error { func (_TypeEnum__ReprAssembler) AssignBytes([]byte) error { return mixins.MapAssembler{TypeName: "schemadmt.TypeEnum.Repr"}.AssignBytes(nil) } -func (_TypeEnum__ReprAssembler) AssignLink(dms3ld.Link) error { +func (_TypeEnum__ReprAssembler) AssignLink(ld.Link) error { return mixins.MapAssembler{TypeName: "schemadmt.TypeEnum.Repr"}.AssignLink(nil) } -func (na *_TypeEnum__ReprAssembler) AssignNode(v dms3ld.Node) error { +func (na *_TypeEnum__ReprAssembler) AssignNode(v ld.Node) error { if v.IsNull() { return na.AssignNull() } @@ -29263,8 +29263,8 @@ func (na *_TypeEnum__ReprAssembler) AssignNode(v dms3ld.Node) error { *na.m = schema.Maybe_Value return nil } - if v.Kind() != dms3ld.Kind_Map { - return dms3ld.ErrWrongKind{TypeName: "schemadmt.TypeEnum.Repr", MethodName: "AssignNode", AppropriateKind: dms3ld.KindSet_JustMap, ActualKind: v.Kind()} + if v.Kind() != ld.Kind_Map { + return ld.ErrWrongKind{TypeName: "schemadmt.TypeEnum.Repr", MethodName: "AssignNode", AppropriateKind: ld.KindSet_JustMap, ActualKind: v.Kind()} } itr := v.MapIterator() for !itr.Done() { @@ -29281,7 +29281,7 @@ func (na *_TypeEnum__ReprAssembler) AssignNode(v dms3ld.Node) error { } return na.Finish() } -func (_TypeEnum__ReprAssembler) Prototype() dms3ld.NodePrototype { +func (_TypeEnum__ReprAssembler) Prototype() ld.NodePrototype { return _TypeEnum__ReprPrototype{} } func (ma *_TypeEnum__ReprAssembler) valueFinishTidy() bool { @@ -29308,7 +29308,7 @@ func (ma *_TypeEnum__ReprAssembler) valueFinishTidy() bool { panic("unreachable") } } -func (ma *_TypeEnum__ReprAssembler) AssembleEntry(k string) (dms3ld.NodeAssembler, error) { +func (ma *_TypeEnum__ReprAssembler) AssembleEntry(k string) (ld.NodeAssembler, error) { switch ma.state { case maState_initial: // carry on @@ -29326,7 +29326,7 @@ func (ma *_TypeEnum__ReprAssembler) AssembleEntry(k string) (dms3ld.NodeAssemble switch k { case "members": if ma.s&fieldBit__TypeEnum_Members != 0 { - return nil, dms3ld.ErrRepeatedMapKey{Key: &fieldName__TypeEnum_Members_serial} + return nil, ld.ErrRepeatedMapKey{Key: &fieldName__TypeEnum_Members_serial} } ma.s += fieldBit__TypeEnum_Members ma.state = maState_midValue @@ -29336,7 +29336,7 @@ func (ma *_TypeEnum__ReprAssembler) AssembleEntry(k string) (dms3ld.NodeAssemble return &ma.ca_members, nil case "representation": if ma.s&fieldBit__TypeEnum_Representation != 0 { - return nil, dms3ld.ErrRepeatedMapKey{Key: &fieldName__TypeEnum_Representation_serial} + return nil, ld.ErrRepeatedMapKey{Key: &fieldName__TypeEnum_Representation_serial} } ma.s += fieldBit__TypeEnum_Representation ma.state = maState_midValue @@ -29346,9 +29346,9 @@ func (ma *_TypeEnum__ReprAssembler) AssembleEntry(k string) (dms3ld.NodeAssemble return &ma.ca_representation, nil default: } - return nil, dms3ld.ErrInvalidKey{TypeName: "schemadmt.TypeEnum.Repr", Key: &_String{k}} + return nil, ld.ErrInvalidKey{TypeName: "schemadmt.TypeEnum.Repr", Key: &_String{k}} } -func (ma *_TypeEnum__ReprAssembler) AssembleKey() dms3ld.NodeAssembler { +func (ma *_TypeEnum__ReprAssembler) AssembleKey() ld.NodeAssembler { switch ma.state { case maState_initial: // carry on @@ -29366,7 +29366,7 @@ func (ma *_TypeEnum__ReprAssembler) AssembleKey() dms3ld.NodeAssembler { ma.state = maState_midKey return (*_TypeEnum__ReprKeyAssembler)(ma) } -func (ma *_TypeEnum__ReprAssembler) AssembleValue() dms3ld.NodeAssembler { +func (ma *_TypeEnum__ReprAssembler) AssembleValue() ld.NodeAssembler { switch ma.state { case maState_initial: panic("invalid state: AssembleValue cannot be called when no key is primed") @@ -29409,7 +29409,7 @@ func (ma *_TypeEnum__ReprAssembler) Finish() error { panic("invalid state: Finish cannot be called on an assembler that's already finished") } if ma.s&fieldBits__TypeEnum_sufficient != fieldBits__TypeEnum_sufficient { - err := dms3ld.ErrMissingRequiredField{Missing: make([]string, 0)} + err := ld.ErrMissingRequiredField{Missing: make([]string, 0)} if ma.s&fieldBit__TypeEnum_Members == 0 { err.Missing = append(err.Missing, "members") } @@ -29422,19 +29422,19 @@ func (ma *_TypeEnum__ReprAssembler) Finish() error { *ma.m = schema.Maybe_Value return nil } -func (ma *_TypeEnum__ReprAssembler) KeyPrototype() dms3ld.NodePrototype { +func (ma *_TypeEnum__ReprAssembler) KeyPrototype() ld.NodePrototype { return _String__Prototype{} } -func (ma *_TypeEnum__ReprAssembler) ValuePrototype(k string) dms3ld.NodePrototype { +func (ma *_TypeEnum__ReprAssembler) ValuePrototype(k string) ld.NodePrototype { panic("todo structbuilder mapassembler repr valueprototype") } type _TypeEnum__ReprKeyAssembler _TypeEnum__ReprAssembler -func (_TypeEnum__ReprKeyAssembler) BeginMap(sizeHint int64) (dms3ld.MapAssembler, error) { +func (_TypeEnum__ReprKeyAssembler) BeginMap(sizeHint int64) (ld.MapAssembler, error) { return mixins.StringAssembler{TypeName: "schemadmt.TypeEnum.Repr.KeyAssembler"}.BeginMap(0) } -func (_TypeEnum__ReprKeyAssembler) BeginList(sizeHint int64) (dms3ld.ListAssembler, error) { +func (_TypeEnum__ReprKeyAssembler) BeginList(sizeHint int64) (ld.ListAssembler, error) { return mixins.StringAssembler{TypeName: "schemadmt.TypeEnum.Repr.KeyAssembler"}.BeginList(0) } func (na *_TypeEnum__ReprKeyAssembler) AssignNull() error { @@ -29456,7 +29456,7 @@ func (ka *_TypeEnum__ReprKeyAssembler) AssignString(k string) error { switch k { case "members": if ka.s&fieldBit__TypeEnum_Members != 0 { - return dms3ld.ErrRepeatedMapKey{Key: &fieldName__TypeEnum_Members_serial} + return ld.ErrRepeatedMapKey{Key: &fieldName__TypeEnum_Members_serial} } ka.s += fieldBit__TypeEnum_Members ka.state = maState_expectValue @@ -29464,29 +29464,29 @@ func (ka *_TypeEnum__ReprKeyAssembler) AssignString(k string) error { return nil case "representation": if ka.s&fieldBit__TypeEnum_Representation != 0 { - return dms3ld.ErrRepeatedMapKey{Key: &fieldName__TypeEnum_Representation_serial} + return ld.ErrRepeatedMapKey{Key: &fieldName__TypeEnum_Representation_serial} } ka.s += fieldBit__TypeEnum_Representation ka.state = maState_expectValue ka.f = 1 return nil } - return dms3ld.ErrInvalidKey{TypeName: "schemadmt.TypeEnum.Repr", Key: &_String{k}} + return ld.ErrInvalidKey{TypeName: "schemadmt.TypeEnum.Repr", Key: &_String{k}} } func (_TypeEnum__ReprKeyAssembler) AssignBytes([]byte) error { return mixins.StringAssembler{TypeName: "schemadmt.TypeEnum.Repr.KeyAssembler"}.AssignBytes(nil) } -func (_TypeEnum__ReprKeyAssembler) AssignLink(dms3ld.Link) error { +func (_TypeEnum__ReprKeyAssembler) AssignLink(ld.Link) error { return mixins.StringAssembler{TypeName: "schemadmt.TypeEnum.Repr.KeyAssembler"}.AssignLink(nil) } -func (ka *_TypeEnum__ReprKeyAssembler) AssignNode(v dms3ld.Node) error { +func (ka *_TypeEnum__ReprKeyAssembler) AssignNode(v ld.Node) error { if v2, err := v.AsString(); err != nil { return err } else { return ka.AssignString(v2) } } -func (_TypeEnum__ReprKeyAssembler) Prototype() dms3ld.NodePrototype { +func (_TypeEnum__ReprKeyAssembler) Prototype() ld.NodePrototype { return _String__Prototype{} } @@ -29505,12 +29505,12 @@ func (m MaybeTypeFloat) IsAbsent() bool { func (m MaybeTypeFloat) Exists() bool { return m.m == schema.Maybe_Value } -func (m MaybeTypeFloat) AsNode() dms3ld.Node { +func (m MaybeTypeFloat) AsNode() ld.Node { switch m.m { case schema.Maybe_Absent: - return dms3ld.Absent + return ld.Absent case schema.Maybe_Null: - return dms3ld.Null + return ld.Null case schema.Maybe_Value: return m.v default: @@ -29525,32 +29525,32 @@ func (m MaybeTypeFloat) Must() TypeFloat { } var () -var _ dms3ld.Node = (TypeFloat)(&_TypeFloat{}) +var _ ld.Node = (TypeFloat)(&_TypeFloat{}) var _ schema.TypedNode = (TypeFloat)(&_TypeFloat{}) -func (TypeFloat) Kind() dms3ld.Kind { - return dms3ld.Kind_Map +func (TypeFloat) Kind() ld.Kind { + return ld.Kind_Map } -func (n TypeFloat) LookupByString(key string) (dms3ld.Node, error) { +func (n TypeFloat) LookupByString(key string) (ld.Node, error) { switch key { default: - return nil, schema.ErrNoSuchField{Type: nil /*TODO*/, Field: dms3ld.PathSegmentOfString(key)} + return nil, schema.ErrNoSuchField{Type: nil /*TODO*/, Field: ld.PathSegmentOfString(key)} } } -func (n TypeFloat) LookupByNode(key dms3ld.Node) (dms3ld.Node, error) { +func (n TypeFloat) LookupByNode(key ld.Node) (ld.Node, error) { ks, err := key.AsString() if err != nil { return nil, err } return n.LookupByString(ks) } -func (TypeFloat) LookupByIndex(idx int64) (dms3ld.Node, error) { +func (TypeFloat) LookupByIndex(idx int64) (ld.Node, error) { return mixins.Map{TypeName: "schemadmt.TypeFloat"}.LookupByIndex(0) } -func (n TypeFloat) LookupBySegment(seg dms3ld.PathSegment) (dms3ld.Node, error) { +func (n TypeFloat) LookupBySegment(seg ld.PathSegment) (ld.Node, error) { return n.LookupByString(seg.String()) } -func (n TypeFloat) MapIterator() dms3ld.MapIterator { +func (n TypeFloat) MapIterator() ld.MapIterator { return &_TypeFloat__MapItr{n, 0} } @@ -29559,15 +29559,15 @@ type _TypeFloat__MapItr struct { idx int } -func (itr *_TypeFloat__MapItr) Next() (k dms3ld.Node, v dms3ld.Node, _ error) { - return nil, nil, dms3ld.ErrIteratorOverread{} +func (itr *_TypeFloat__MapItr) Next() (k ld.Node, v ld.Node, _ error) { + return nil, nil, ld.ErrIteratorOverread{} } func (itr *_TypeFloat__MapItr) Done() bool { return itr.idx >= 0 } -func (TypeFloat) ListIterator() dms3ld.ListIterator { +func (TypeFloat) ListIterator() ld.ListIterator { return nil } func (TypeFloat) Length() int64 { @@ -29594,16 +29594,16 @@ func (TypeFloat) AsString() (string, error) { func (TypeFloat) AsBytes() ([]byte, error) { return mixins.Map{TypeName: "schemadmt.TypeFloat"}.AsBytes() } -func (TypeFloat) AsLink() (dms3ld.Link, error) { +func (TypeFloat) AsLink() (ld.Link, error) { return mixins.Map{TypeName: "schemadmt.TypeFloat"}.AsLink() } -func (TypeFloat) Prototype() dms3ld.NodePrototype { +func (TypeFloat) Prototype() ld.NodePrototype { return _TypeFloat__Prototype{} } type _TypeFloat__Prototype struct{} -func (_TypeFloat__Prototype) NewBuilder() dms3ld.NodeBuilder { +func (_TypeFloat__Prototype) NewBuilder() ld.NodeBuilder { var nb _TypeFloat__Builder nb.Reset() return &nb @@ -29613,7 +29613,7 @@ type _TypeFloat__Builder struct { _TypeFloat__Assembler } -func (nb *_TypeFloat__Builder) Build() dms3ld.Node { +func (nb *_TypeFloat__Builder) Build() ld.Node { if *nb.m != schema.Maybe_Value { panic("invalid state: cannot call Build on an assembler that's not finished") } @@ -29644,7 +29644,7 @@ var ( fieldBits__TypeFloat_sufficient = 0 ) -func (na *_TypeFloat__Assembler) BeginMap(int64) (dms3ld.MapAssembler, error) { +func (na *_TypeFloat__Assembler) BeginMap(int64) (ld.MapAssembler, error) { switch *na.m { case schema.Maybe_Value, schema.Maybe_Null: panic("invalid state: cannot assign into assembler that's already finished") @@ -29657,7 +29657,7 @@ func (na *_TypeFloat__Assembler) BeginMap(int64) (dms3ld.MapAssembler, error) { } return na, nil } -func (_TypeFloat__Assembler) BeginList(sizeHint int64) (dms3ld.ListAssembler, error) { +func (_TypeFloat__Assembler) BeginList(sizeHint int64) (ld.ListAssembler, error) { return mixins.MapAssembler{TypeName: "schemadmt.TypeFloat"}.BeginList(0) } func (na *_TypeFloat__Assembler) AssignNull() error { @@ -29689,10 +29689,10 @@ func (_TypeFloat__Assembler) AssignString(string) error { func (_TypeFloat__Assembler) AssignBytes([]byte) error { return mixins.MapAssembler{TypeName: "schemadmt.TypeFloat"}.AssignBytes(nil) } -func (_TypeFloat__Assembler) AssignLink(dms3ld.Link) error { +func (_TypeFloat__Assembler) AssignLink(ld.Link) error { return mixins.MapAssembler{TypeName: "schemadmt.TypeFloat"}.AssignLink(nil) } -func (na *_TypeFloat__Assembler) AssignNode(v dms3ld.Node) error { +func (na *_TypeFloat__Assembler) AssignNode(v ld.Node) error { if v.IsNull() { return na.AssignNull() } @@ -29712,8 +29712,8 @@ func (na *_TypeFloat__Assembler) AssignNode(v dms3ld.Node) error { *na.m = schema.Maybe_Value return nil } - if v.Kind() != dms3ld.Kind_Map { - return dms3ld.ErrWrongKind{TypeName: "schemadmt.TypeFloat", MethodName: "AssignNode", AppropriateKind: dms3ld.KindSet_JustMap, ActualKind: v.Kind()} + if v.Kind() != ld.Kind_Map { + return ld.ErrWrongKind{TypeName: "schemadmt.TypeFloat", MethodName: "AssignNode", AppropriateKind: ld.KindSet_JustMap, ActualKind: v.Kind()} } itr := v.MapIterator() for !itr.Done() { @@ -29730,7 +29730,7 @@ func (na *_TypeFloat__Assembler) AssignNode(v dms3ld.Node) error { } return na.Finish() } -func (_TypeFloat__Assembler) Prototype() dms3ld.NodePrototype { +func (_TypeFloat__Assembler) Prototype() ld.NodePrototype { return _TypeFloat__Prototype{} } func (ma *_TypeFloat__Assembler) valueFinishTidy() bool { @@ -29739,7 +29739,7 @@ func (ma *_TypeFloat__Assembler) valueFinishTidy() bool { panic("unreachable") } } -func (ma *_TypeFloat__Assembler) AssembleEntry(k string) (dms3ld.NodeAssembler, error) { +func (ma *_TypeFloat__Assembler) AssembleEntry(k string) (ld.NodeAssembler, error) { switch ma.state { case maState_initial: // carry on @@ -29754,9 +29754,9 @@ func (ma *_TypeFloat__Assembler) AssembleEntry(k string) (dms3ld.NodeAssembler, case maState_finished: panic("invalid state: AssembleEntry cannot be called on an assembler that's already finished") } - return nil, dms3ld.ErrInvalidKey{TypeName: "schemadmt.TypeFloat", Key: &_String{k}} + return nil, ld.ErrInvalidKey{TypeName: "schemadmt.TypeFloat", Key: &_String{k}} } -func (ma *_TypeFloat__Assembler) AssembleKey() dms3ld.NodeAssembler { +func (ma *_TypeFloat__Assembler) AssembleKey() ld.NodeAssembler { switch ma.state { case maState_initial: // carry on @@ -29774,7 +29774,7 @@ func (ma *_TypeFloat__Assembler) AssembleKey() dms3ld.NodeAssembler { ma.state = maState_midKey return (*_TypeFloat__KeyAssembler)(ma) } -func (ma *_TypeFloat__Assembler) AssembleValue() dms3ld.NodeAssembler { +func (ma *_TypeFloat__Assembler) AssembleValue() ld.NodeAssembler { switch ma.state { case maState_initial: panic("invalid state: AssembleValue cannot be called when no key is primed") @@ -29809,26 +29809,26 @@ func (ma *_TypeFloat__Assembler) Finish() error { panic("invalid state: Finish cannot be called on an assembler that's already finished") } if ma.s&fieldBits__TypeFloat_sufficient != fieldBits__TypeFloat_sufficient { - err := dms3ld.ErrMissingRequiredField{Missing: make([]string, 0)} + err := ld.ErrMissingRequiredField{Missing: make([]string, 0)} return err } ma.state = maState_finished *ma.m = schema.Maybe_Value return nil } -func (ma *_TypeFloat__Assembler) KeyPrototype() dms3ld.NodePrototype { +func (ma *_TypeFloat__Assembler) KeyPrototype() ld.NodePrototype { return _String__Prototype{} } -func (ma *_TypeFloat__Assembler) ValuePrototype(k string) dms3ld.NodePrototype { +func (ma *_TypeFloat__Assembler) ValuePrototype(k string) ld.NodePrototype { panic("todo structbuilder mapassembler valueprototype") } type _TypeFloat__KeyAssembler _TypeFloat__Assembler -func (_TypeFloat__KeyAssembler) BeginMap(sizeHint int64) (dms3ld.MapAssembler, error) { +func (_TypeFloat__KeyAssembler) BeginMap(sizeHint int64) (ld.MapAssembler, error) { return mixins.StringAssembler{TypeName: "schemadmt.TypeFloat.KeyAssembler"}.BeginMap(0) } -func (_TypeFloat__KeyAssembler) BeginList(sizeHint int64) (dms3ld.ListAssembler, error) { +func (_TypeFloat__KeyAssembler) BeginList(sizeHint int64) (ld.ListAssembler, error) { return mixins.StringAssembler{TypeName: "schemadmt.TypeFloat.KeyAssembler"}.BeginList(0) } func (na *_TypeFloat__KeyAssembler) AssignNull() error { @@ -29849,61 +29849,61 @@ func (ka *_TypeFloat__KeyAssembler) AssignString(k string) error { } switch k { default: - return dms3ld.ErrInvalidKey{TypeName: "schemadmt.TypeFloat", Key: &_String{k}} + return ld.ErrInvalidKey{TypeName: "schemadmt.TypeFloat", Key: &_String{k}} } return nil } func (_TypeFloat__KeyAssembler) AssignBytes([]byte) error { return mixins.StringAssembler{TypeName: "schemadmt.TypeFloat.KeyAssembler"}.AssignBytes(nil) } -func (_TypeFloat__KeyAssembler) AssignLink(dms3ld.Link) error { +func (_TypeFloat__KeyAssembler) AssignLink(ld.Link) error { return mixins.StringAssembler{TypeName: "schemadmt.TypeFloat.KeyAssembler"}.AssignLink(nil) } -func (ka *_TypeFloat__KeyAssembler) AssignNode(v dms3ld.Node) error { +func (ka *_TypeFloat__KeyAssembler) AssignNode(v ld.Node) error { if v2, err := v.AsString(); err != nil { return err } else { return ka.AssignString(v2) } } -func (_TypeFloat__KeyAssembler) Prototype() dms3ld.NodePrototype { +func (_TypeFloat__KeyAssembler) Prototype() ld.NodePrototype { return _String__Prototype{} } func (TypeFloat) Type() schema.Type { return nil /*TODO:typelit*/ } -func (n TypeFloat) Representation() dms3ld.Node { +func (n TypeFloat) Representation() ld.Node { return (*_TypeFloat__Repr)(n) } type _TypeFloat__Repr _TypeFloat var () -var _ dms3ld.Node = &_TypeFloat__Repr{} +var _ ld.Node = &_TypeFloat__Repr{} -func (_TypeFloat__Repr) Kind() dms3ld.Kind { - return dms3ld.Kind_Map +func (_TypeFloat__Repr) Kind() ld.Kind { + return ld.Kind_Map } -func (n *_TypeFloat__Repr) LookupByString(key string) (dms3ld.Node, error) { +func (n *_TypeFloat__Repr) LookupByString(key string) (ld.Node, error) { switch key { default: - return nil, schema.ErrNoSuchField{Type: nil /*TODO*/, Field: dms3ld.PathSegmentOfString(key)} + return nil, schema.ErrNoSuchField{Type: nil /*TODO*/, Field: ld.PathSegmentOfString(key)} } } -func (n *_TypeFloat__Repr) LookupByNode(key dms3ld.Node) (dms3ld.Node, error) { +func (n *_TypeFloat__Repr) LookupByNode(key ld.Node) (ld.Node, error) { ks, err := key.AsString() if err != nil { return nil, err } return n.LookupByString(ks) } -func (_TypeFloat__Repr) LookupByIndex(idx int64) (dms3ld.Node, error) { +func (_TypeFloat__Repr) LookupByIndex(idx int64) (ld.Node, error) { return mixins.Map{TypeName: "schemadmt.TypeFloat.Repr"}.LookupByIndex(0) } -func (n _TypeFloat__Repr) LookupBySegment(seg dms3ld.PathSegment) (dms3ld.Node, error) { +func (n _TypeFloat__Repr) LookupBySegment(seg ld.PathSegment) (ld.Node, error) { return n.LookupByString(seg.String()) } -func (n *_TypeFloat__Repr) MapIterator() dms3ld.MapIterator { +func (n *_TypeFloat__Repr) MapIterator() ld.MapIterator { return &_TypeFloat__ReprMapItr{n, 0} } @@ -29912,14 +29912,14 @@ type _TypeFloat__ReprMapItr struct { idx int } -func (itr *_TypeFloat__ReprMapItr) Next() (k dms3ld.Node, v dms3ld.Node, _ error) { - return nil, nil, dms3ld.ErrIteratorOverread{} +func (itr *_TypeFloat__ReprMapItr) Next() (k ld.Node, v ld.Node, _ error) { + return nil, nil, ld.ErrIteratorOverread{} } func (itr *_TypeFloat__ReprMapItr) Done() bool { return itr.idx >= 0 } -func (_TypeFloat__Repr) ListIterator() dms3ld.ListIterator { +func (_TypeFloat__Repr) ListIterator() ld.ListIterator { return nil } func (rn *_TypeFloat__Repr) Length() int64 { @@ -29947,16 +29947,16 @@ func (_TypeFloat__Repr) AsString() (string, error) { func (_TypeFloat__Repr) AsBytes() ([]byte, error) { return mixins.Map{TypeName: "schemadmt.TypeFloat.Repr"}.AsBytes() } -func (_TypeFloat__Repr) AsLink() (dms3ld.Link, error) { +func (_TypeFloat__Repr) AsLink() (ld.Link, error) { return mixins.Map{TypeName: "schemadmt.TypeFloat.Repr"}.AsLink() } -func (_TypeFloat__Repr) Prototype() dms3ld.NodePrototype { +func (_TypeFloat__Repr) Prototype() ld.NodePrototype { return _TypeFloat__ReprPrototype{} } type _TypeFloat__ReprPrototype struct{} -func (_TypeFloat__ReprPrototype) NewBuilder() dms3ld.NodeBuilder { +func (_TypeFloat__ReprPrototype) NewBuilder() ld.NodeBuilder { var nb _TypeFloat__ReprBuilder nb.Reset() return &nb @@ -29966,7 +29966,7 @@ type _TypeFloat__ReprBuilder struct { _TypeFloat__ReprAssembler } -func (nb *_TypeFloat__ReprBuilder) Build() dms3ld.Node { +func (nb *_TypeFloat__ReprBuilder) Build() ld.Node { if *nb.m != schema.Maybe_Value { panic("invalid state: cannot call Build on an assembler that's not finished") } @@ -29992,7 +29992,7 @@ func (na *_TypeFloat__ReprAssembler) reset() { na.state = maState_initial na.s = 0 } -func (na *_TypeFloat__ReprAssembler) BeginMap(int64) (dms3ld.MapAssembler, error) { +func (na *_TypeFloat__ReprAssembler) BeginMap(int64) (ld.MapAssembler, error) { switch *na.m { case schema.Maybe_Value, schema.Maybe_Null: panic("invalid state: cannot assign into assembler that's already finished") @@ -30005,7 +30005,7 @@ func (na *_TypeFloat__ReprAssembler) BeginMap(int64) (dms3ld.MapAssembler, error } return na, nil } -func (_TypeFloat__ReprAssembler) BeginList(sizeHint int64) (dms3ld.ListAssembler, error) { +func (_TypeFloat__ReprAssembler) BeginList(sizeHint int64) (ld.ListAssembler, error) { return mixins.MapAssembler{TypeName: "schemadmt.TypeFloat.Repr"}.BeginList(0) } func (na *_TypeFloat__ReprAssembler) AssignNull() error { @@ -30037,10 +30037,10 @@ func (_TypeFloat__ReprAssembler) AssignString(string) error { func (_TypeFloat__ReprAssembler) AssignBytes([]byte) error { return mixins.MapAssembler{TypeName: "schemadmt.TypeFloat.Repr"}.AssignBytes(nil) } -func (_TypeFloat__ReprAssembler) AssignLink(dms3ld.Link) error { +func (_TypeFloat__ReprAssembler) AssignLink(ld.Link) error { return mixins.MapAssembler{TypeName: "schemadmt.TypeFloat.Repr"}.AssignLink(nil) } -func (na *_TypeFloat__ReprAssembler) AssignNode(v dms3ld.Node) error { +func (na *_TypeFloat__ReprAssembler) AssignNode(v ld.Node) error { if v.IsNull() { return na.AssignNull() } @@ -30060,8 +30060,8 @@ func (na *_TypeFloat__ReprAssembler) AssignNode(v dms3ld.Node) error { *na.m = schema.Maybe_Value return nil } - if v.Kind() != dms3ld.Kind_Map { - return dms3ld.ErrWrongKind{TypeName: "schemadmt.TypeFloat.Repr", MethodName: "AssignNode", AppropriateKind: dms3ld.KindSet_JustMap, ActualKind: v.Kind()} + if v.Kind() != ld.Kind_Map { + return ld.ErrWrongKind{TypeName: "schemadmt.TypeFloat.Repr", MethodName: "AssignNode", AppropriateKind: ld.KindSet_JustMap, ActualKind: v.Kind()} } itr := v.MapIterator() for !itr.Done() { @@ -30078,7 +30078,7 @@ func (na *_TypeFloat__ReprAssembler) AssignNode(v dms3ld.Node) error { } return na.Finish() } -func (_TypeFloat__ReprAssembler) Prototype() dms3ld.NodePrototype { +func (_TypeFloat__ReprAssembler) Prototype() ld.NodePrototype { return _TypeFloat__ReprPrototype{} } func (ma *_TypeFloat__ReprAssembler) valueFinishTidy() bool { @@ -30087,7 +30087,7 @@ func (ma *_TypeFloat__ReprAssembler) valueFinishTidy() bool { panic("unreachable") } } -func (ma *_TypeFloat__ReprAssembler) AssembleEntry(k string) (dms3ld.NodeAssembler, error) { +func (ma *_TypeFloat__ReprAssembler) AssembleEntry(k string) (ld.NodeAssembler, error) { switch ma.state { case maState_initial: // carry on @@ -30102,9 +30102,9 @@ func (ma *_TypeFloat__ReprAssembler) AssembleEntry(k string) (dms3ld.NodeAssembl case maState_finished: panic("invalid state: AssembleEntry cannot be called on an assembler that's already finished") } - return nil, dms3ld.ErrInvalidKey{TypeName: "schemadmt.TypeFloat.Repr", Key: &_String{k}} + return nil, ld.ErrInvalidKey{TypeName: "schemadmt.TypeFloat.Repr", Key: &_String{k}} } -func (ma *_TypeFloat__ReprAssembler) AssembleKey() dms3ld.NodeAssembler { +func (ma *_TypeFloat__ReprAssembler) AssembleKey() ld.NodeAssembler { switch ma.state { case maState_initial: // carry on @@ -30122,7 +30122,7 @@ func (ma *_TypeFloat__ReprAssembler) AssembleKey() dms3ld.NodeAssembler { ma.state = maState_midKey return (*_TypeFloat__ReprKeyAssembler)(ma) } -func (ma *_TypeFloat__ReprAssembler) AssembleValue() dms3ld.NodeAssembler { +func (ma *_TypeFloat__ReprAssembler) AssembleValue() ld.NodeAssembler { switch ma.state { case maState_initial: panic("invalid state: AssembleValue cannot be called when no key is primed") @@ -30157,26 +30157,26 @@ func (ma *_TypeFloat__ReprAssembler) Finish() error { panic("invalid state: Finish cannot be called on an assembler that's already finished") } if ma.s&fieldBits__TypeFloat_sufficient != fieldBits__TypeFloat_sufficient { - err := dms3ld.ErrMissingRequiredField{Missing: make([]string, 0)} + err := ld.ErrMissingRequiredField{Missing: make([]string, 0)} return err } ma.state = maState_finished *ma.m = schema.Maybe_Value return nil } -func (ma *_TypeFloat__ReprAssembler) KeyPrototype() dms3ld.NodePrototype { +func (ma *_TypeFloat__ReprAssembler) KeyPrototype() ld.NodePrototype { return _String__Prototype{} } -func (ma *_TypeFloat__ReprAssembler) ValuePrototype(k string) dms3ld.NodePrototype { +func (ma *_TypeFloat__ReprAssembler) ValuePrototype(k string) ld.NodePrototype { panic("todo structbuilder mapassembler repr valueprototype") } type _TypeFloat__ReprKeyAssembler _TypeFloat__ReprAssembler -func (_TypeFloat__ReprKeyAssembler) BeginMap(sizeHint int64) (dms3ld.MapAssembler, error) { +func (_TypeFloat__ReprKeyAssembler) BeginMap(sizeHint int64) (ld.MapAssembler, error) { return mixins.StringAssembler{TypeName: "schemadmt.TypeFloat.Repr.KeyAssembler"}.BeginMap(0) } -func (_TypeFloat__ReprKeyAssembler) BeginList(sizeHint int64) (dms3ld.ListAssembler, error) { +func (_TypeFloat__ReprKeyAssembler) BeginList(sizeHint int64) (ld.ListAssembler, error) { return mixins.StringAssembler{TypeName: "schemadmt.TypeFloat.Repr.KeyAssembler"}.BeginList(0) } func (na *_TypeFloat__ReprKeyAssembler) AssignNull() error { @@ -30195,22 +30195,22 @@ func (ka *_TypeFloat__ReprKeyAssembler) AssignString(k string) error { if ka.state != maState_midKey { panic("misuse: KeyAssembler held beyond its valid lifetime") } - return dms3ld.ErrInvalidKey{TypeName: "schemadmt.TypeFloat.Repr", Key: &_String{k}} + return ld.ErrInvalidKey{TypeName: "schemadmt.TypeFloat.Repr", Key: &_String{k}} } func (_TypeFloat__ReprKeyAssembler) AssignBytes([]byte) error { return mixins.StringAssembler{TypeName: "schemadmt.TypeFloat.Repr.KeyAssembler"}.AssignBytes(nil) } -func (_TypeFloat__ReprKeyAssembler) AssignLink(dms3ld.Link) error { +func (_TypeFloat__ReprKeyAssembler) AssignLink(ld.Link) error { return mixins.StringAssembler{TypeName: "schemadmt.TypeFloat.Repr.KeyAssembler"}.AssignLink(nil) } -func (ka *_TypeFloat__ReprKeyAssembler) AssignNode(v dms3ld.Node) error { +func (ka *_TypeFloat__ReprKeyAssembler) AssignNode(v ld.Node) error { if v2, err := v.AsString(); err != nil { return err } else { return ka.AssignString(v2) } } -func (_TypeFloat__ReprKeyAssembler) Prototype() dms3ld.NodePrototype { +func (_TypeFloat__ReprKeyAssembler) Prototype() ld.NodePrototype { return _String__Prototype{} } @@ -30229,12 +30229,12 @@ func (m MaybeTypeInt) IsAbsent() bool { func (m MaybeTypeInt) Exists() bool { return m.m == schema.Maybe_Value } -func (m MaybeTypeInt) AsNode() dms3ld.Node { +func (m MaybeTypeInt) AsNode() ld.Node { switch m.m { case schema.Maybe_Absent: - return dms3ld.Absent + return ld.Absent case schema.Maybe_Null: - return dms3ld.Null + return ld.Null case schema.Maybe_Value: return m.v default: @@ -30249,32 +30249,32 @@ func (m MaybeTypeInt) Must() TypeInt { } var () -var _ dms3ld.Node = (TypeInt)(&_TypeInt{}) +var _ ld.Node = (TypeInt)(&_TypeInt{}) var _ schema.TypedNode = (TypeInt)(&_TypeInt{}) -func (TypeInt) Kind() dms3ld.Kind { - return dms3ld.Kind_Map +func (TypeInt) Kind() ld.Kind { + return ld.Kind_Map } -func (n TypeInt) LookupByString(key string) (dms3ld.Node, error) { +func (n TypeInt) LookupByString(key string) (ld.Node, error) { switch key { default: - return nil, schema.ErrNoSuchField{Type: nil /*TODO*/, Field: dms3ld.PathSegmentOfString(key)} + return nil, schema.ErrNoSuchField{Type: nil /*TODO*/, Field: ld.PathSegmentOfString(key)} } } -func (n TypeInt) LookupByNode(key dms3ld.Node) (dms3ld.Node, error) { +func (n TypeInt) LookupByNode(key ld.Node) (ld.Node, error) { ks, err := key.AsString() if err != nil { return nil, err } return n.LookupByString(ks) } -func (TypeInt) LookupByIndex(idx int64) (dms3ld.Node, error) { +func (TypeInt) LookupByIndex(idx int64) (ld.Node, error) { return mixins.Map{TypeName: "schemadmt.TypeInt"}.LookupByIndex(0) } -func (n TypeInt) LookupBySegment(seg dms3ld.PathSegment) (dms3ld.Node, error) { +func (n TypeInt) LookupBySegment(seg ld.PathSegment) (ld.Node, error) { return n.LookupByString(seg.String()) } -func (n TypeInt) MapIterator() dms3ld.MapIterator { +func (n TypeInt) MapIterator() ld.MapIterator { return &_TypeInt__MapItr{n, 0} } @@ -30283,15 +30283,15 @@ type _TypeInt__MapItr struct { idx int } -func (itr *_TypeInt__MapItr) Next() (k dms3ld.Node, v dms3ld.Node, _ error) { - return nil, nil, dms3ld.ErrIteratorOverread{} +func (itr *_TypeInt__MapItr) Next() (k ld.Node, v ld.Node, _ error) { + return nil, nil, ld.ErrIteratorOverread{} } func (itr *_TypeInt__MapItr) Done() bool { return itr.idx >= 0 } -func (TypeInt) ListIterator() dms3ld.ListIterator { +func (TypeInt) ListIterator() ld.ListIterator { return nil } func (TypeInt) Length() int64 { @@ -30318,16 +30318,16 @@ func (TypeInt) AsString() (string, error) { func (TypeInt) AsBytes() ([]byte, error) { return mixins.Map{TypeName: "schemadmt.TypeInt"}.AsBytes() } -func (TypeInt) AsLink() (dms3ld.Link, error) { +func (TypeInt) AsLink() (ld.Link, error) { return mixins.Map{TypeName: "schemadmt.TypeInt"}.AsLink() } -func (TypeInt) Prototype() dms3ld.NodePrototype { +func (TypeInt) Prototype() ld.NodePrototype { return _TypeInt__Prototype{} } type _TypeInt__Prototype struct{} -func (_TypeInt__Prototype) NewBuilder() dms3ld.NodeBuilder { +func (_TypeInt__Prototype) NewBuilder() ld.NodeBuilder { var nb _TypeInt__Builder nb.Reset() return &nb @@ -30337,7 +30337,7 @@ type _TypeInt__Builder struct { _TypeInt__Assembler } -func (nb *_TypeInt__Builder) Build() dms3ld.Node { +func (nb *_TypeInt__Builder) Build() ld.Node { if *nb.m != schema.Maybe_Value { panic("invalid state: cannot call Build on an assembler that's not finished") } @@ -30368,7 +30368,7 @@ var ( fieldBits__TypeInt_sufficient = 0 ) -func (na *_TypeInt__Assembler) BeginMap(int64) (dms3ld.MapAssembler, error) { +func (na *_TypeInt__Assembler) BeginMap(int64) (ld.MapAssembler, error) { switch *na.m { case schema.Maybe_Value, schema.Maybe_Null: panic("invalid state: cannot assign into assembler that's already finished") @@ -30381,7 +30381,7 @@ func (na *_TypeInt__Assembler) BeginMap(int64) (dms3ld.MapAssembler, error) { } return na, nil } -func (_TypeInt__Assembler) BeginList(sizeHint int64) (dms3ld.ListAssembler, error) { +func (_TypeInt__Assembler) BeginList(sizeHint int64) (ld.ListAssembler, error) { return mixins.MapAssembler{TypeName: "schemadmt.TypeInt"}.BeginList(0) } func (na *_TypeInt__Assembler) AssignNull() error { @@ -30413,10 +30413,10 @@ func (_TypeInt__Assembler) AssignString(string) error { func (_TypeInt__Assembler) AssignBytes([]byte) error { return mixins.MapAssembler{TypeName: "schemadmt.TypeInt"}.AssignBytes(nil) } -func (_TypeInt__Assembler) AssignLink(dms3ld.Link) error { +func (_TypeInt__Assembler) AssignLink(ld.Link) error { return mixins.MapAssembler{TypeName: "schemadmt.TypeInt"}.AssignLink(nil) } -func (na *_TypeInt__Assembler) AssignNode(v dms3ld.Node) error { +func (na *_TypeInt__Assembler) AssignNode(v ld.Node) error { if v.IsNull() { return na.AssignNull() } @@ -30436,8 +30436,8 @@ func (na *_TypeInt__Assembler) AssignNode(v dms3ld.Node) error { *na.m = schema.Maybe_Value return nil } - if v.Kind() != dms3ld.Kind_Map { - return dms3ld.ErrWrongKind{TypeName: "schemadmt.TypeInt", MethodName: "AssignNode", AppropriateKind: dms3ld.KindSet_JustMap, ActualKind: v.Kind()} + if v.Kind() != ld.Kind_Map { + return ld.ErrWrongKind{TypeName: "schemadmt.TypeInt", MethodName: "AssignNode", AppropriateKind: ld.KindSet_JustMap, ActualKind: v.Kind()} } itr := v.MapIterator() for !itr.Done() { @@ -30454,7 +30454,7 @@ func (na *_TypeInt__Assembler) AssignNode(v dms3ld.Node) error { } return na.Finish() } -func (_TypeInt__Assembler) Prototype() dms3ld.NodePrototype { +func (_TypeInt__Assembler) Prototype() ld.NodePrototype { return _TypeInt__Prototype{} } func (ma *_TypeInt__Assembler) valueFinishTidy() bool { @@ -30463,7 +30463,7 @@ func (ma *_TypeInt__Assembler) valueFinishTidy() bool { panic("unreachable") } } -func (ma *_TypeInt__Assembler) AssembleEntry(k string) (dms3ld.NodeAssembler, error) { +func (ma *_TypeInt__Assembler) AssembleEntry(k string) (ld.NodeAssembler, error) { switch ma.state { case maState_initial: // carry on @@ -30478,9 +30478,9 @@ func (ma *_TypeInt__Assembler) AssembleEntry(k string) (dms3ld.NodeAssembler, er case maState_finished: panic("invalid state: AssembleEntry cannot be called on an assembler that's already finished") } - return nil, dms3ld.ErrInvalidKey{TypeName: "schemadmt.TypeInt", Key: &_String{k}} + return nil, ld.ErrInvalidKey{TypeName: "schemadmt.TypeInt", Key: &_String{k}} } -func (ma *_TypeInt__Assembler) AssembleKey() dms3ld.NodeAssembler { +func (ma *_TypeInt__Assembler) AssembleKey() ld.NodeAssembler { switch ma.state { case maState_initial: // carry on @@ -30498,7 +30498,7 @@ func (ma *_TypeInt__Assembler) AssembleKey() dms3ld.NodeAssembler { ma.state = maState_midKey return (*_TypeInt__KeyAssembler)(ma) } -func (ma *_TypeInt__Assembler) AssembleValue() dms3ld.NodeAssembler { +func (ma *_TypeInt__Assembler) AssembleValue() ld.NodeAssembler { switch ma.state { case maState_initial: panic("invalid state: AssembleValue cannot be called when no key is primed") @@ -30533,26 +30533,26 @@ func (ma *_TypeInt__Assembler) Finish() error { panic("invalid state: Finish cannot be called on an assembler that's already finished") } if ma.s&fieldBits__TypeInt_sufficient != fieldBits__TypeInt_sufficient { - err := dms3ld.ErrMissingRequiredField{Missing: make([]string, 0)} + err := ld.ErrMissingRequiredField{Missing: make([]string, 0)} return err } ma.state = maState_finished *ma.m = schema.Maybe_Value return nil } -func (ma *_TypeInt__Assembler) KeyPrototype() dms3ld.NodePrototype { +func (ma *_TypeInt__Assembler) KeyPrototype() ld.NodePrototype { return _String__Prototype{} } -func (ma *_TypeInt__Assembler) ValuePrototype(k string) dms3ld.NodePrototype { +func (ma *_TypeInt__Assembler) ValuePrototype(k string) ld.NodePrototype { panic("todo structbuilder mapassembler valueprototype") } type _TypeInt__KeyAssembler _TypeInt__Assembler -func (_TypeInt__KeyAssembler) BeginMap(sizeHint int64) (dms3ld.MapAssembler, error) { +func (_TypeInt__KeyAssembler) BeginMap(sizeHint int64) (ld.MapAssembler, error) { return mixins.StringAssembler{TypeName: "schemadmt.TypeInt.KeyAssembler"}.BeginMap(0) } -func (_TypeInt__KeyAssembler) BeginList(sizeHint int64) (dms3ld.ListAssembler, error) { +func (_TypeInt__KeyAssembler) BeginList(sizeHint int64) (ld.ListAssembler, error) { return mixins.StringAssembler{TypeName: "schemadmt.TypeInt.KeyAssembler"}.BeginList(0) } func (na *_TypeInt__KeyAssembler) AssignNull() error { @@ -30573,61 +30573,61 @@ func (ka *_TypeInt__KeyAssembler) AssignString(k string) error { } switch k { default: - return dms3ld.ErrInvalidKey{TypeName: "schemadmt.TypeInt", Key: &_String{k}} + return ld.ErrInvalidKey{TypeName: "schemadmt.TypeInt", Key: &_String{k}} } return nil } func (_TypeInt__KeyAssembler) AssignBytes([]byte) error { return mixins.StringAssembler{TypeName: "schemadmt.TypeInt.KeyAssembler"}.AssignBytes(nil) } -func (_TypeInt__KeyAssembler) AssignLink(dms3ld.Link) error { +func (_TypeInt__KeyAssembler) AssignLink(ld.Link) error { return mixins.StringAssembler{TypeName: "schemadmt.TypeInt.KeyAssembler"}.AssignLink(nil) } -func (ka *_TypeInt__KeyAssembler) AssignNode(v dms3ld.Node) error { +func (ka *_TypeInt__KeyAssembler) AssignNode(v ld.Node) error { if v2, err := v.AsString(); err != nil { return err } else { return ka.AssignString(v2) } } -func (_TypeInt__KeyAssembler) Prototype() dms3ld.NodePrototype { +func (_TypeInt__KeyAssembler) Prototype() ld.NodePrototype { return _String__Prototype{} } func (TypeInt) Type() schema.Type { return nil /*TODO:typelit*/ } -func (n TypeInt) Representation() dms3ld.Node { +func (n TypeInt) Representation() ld.Node { return (*_TypeInt__Repr)(n) } type _TypeInt__Repr _TypeInt var () -var _ dms3ld.Node = &_TypeInt__Repr{} +var _ ld.Node = &_TypeInt__Repr{} -func (_TypeInt__Repr) Kind() dms3ld.Kind { - return dms3ld.Kind_Map +func (_TypeInt__Repr) Kind() ld.Kind { + return ld.Kind_Map } -func (n *_TypeInt__Repr) LookupByString(key string) (dms3ld.Node, error) { +func (n *_TypeInt__Repr) LookupByString(key string) (ld.Node, error) { switch key { default: - return nil, schema.ErrNoSuchField{Type: nil /*TODO*/, Field: dms3ld.PathSegmentOfString(key)} + return nil, schema.ErrNoSuchField{Type: nil /*TODO*/, Field: ld.PathSegmentOfString(key)} } } -func (n *_TypeInt__Repr) LookupByNode(key dms3ld.Node) (dms3ld.Node, error) { +func (n *_TypeInt__Repr) LookupByNode(key ld.Node) (ld.Node, error) { ks, err := key.AsString() if err != nil { return nil, err } return n.LookupByString(ks) } -func (_TypeInt__Repr) LookupByIndex(idx int64) (dms3ld.Node, error) { +func (_TypeInt__Repr) LookupByIndex(idx int64) (ld.Node, error) { return mixins.Map{TypeName: "schemadmt.TypeInt.Repr"}.LookupByIndex(0) } -func (n _TypeInt__Repr) LookupBySegment(seg dms3ld.PathSegment) (dms3ld.Node, error) { +func (n _TypeInt__Repr) LookupBySegment(seg ld.PathSegment) (ld.Node, error) { return n.LookupByString(seg.String()) } -func (n *_TypeInt__Repr) MapIterator() dms3ld.MapIterator { +func (n *_TypeInt__Repr) MapIterator() ld.MapIterator { return &_TypeInt__ReprMapItr{n, 0} } @@ -30636,14 +30636,14 @@ type _TypeInt__ReprMapItr struct { idx int } -func (itr *_TypeInt__ReprMapItr) Next() (k dms3ld.Node, v dms3ld.Node, _ error) { - return nil, nil, dms3ld.ErrIteratorOverread{} +func (itr *_TypeInt__ReprMapItr) Next() (k ld.Node, v ld.Node, _ error) { + return nil, nil, ld.ErrIteratorOverread{} } func (itr *_TypeInt__ReprMapItr) Done() bool { return itr.idx >= 0 } -func (_TypeInt__Repr) ListIterator() dms3ld.ListIterator { +func (_TypeInt__Repr) ListIterator() ld.ListIterator { return nil } func (rn *_TypeInt__Repr) Length() int64 { @@ -30671,16 +30671,16 @@ func (_TypeInt__Repr) AsString() (string, error) { func (_TypeInt__Repr) AsBytes() ([]byte, error) { return mixins.Map{TypeName: "schemadmt.TypeInt.Repr"}.AsBytes() } -func (_TypeInt__Repr) AsLink() (dms3ld.Link, error) { +func (_TypeInt__Repr) AsLink() (ld.Link, error) { return mixins.Map{TypeName: "schemadmt.TypeInt.Repr"}.AsLink() } -func (_TypeInt__Repr) Prototype() dms3ld.NodePrototype { +func (_TypeInt__Repr) Prototype() ld.NodePrototype { return _TypeInt__ReprPrototype{} } type _TypeInt__ReprPrototype struct{} -func (_TypeInt__ReprPrototype) NewBuilder() dms3ld.NodeBuilder { +func (_TypeInt__ReprPrototype) NewBuilder() ld.NodeBuilder { var nb _TypeInt__ReprBuilder nb.Reset() return &nb @@ -30690,7 +30690,7 @@ type _TypeInt__ReprBuilder struct { _TypeInt__ReprAssembler } -func (nb *_TypeInt__ReprBuilder) Build() dms3ld.Node { +func (nb *_TypeInt__ReprBuilder) Build() ld.Node { if *nb.m != schema.Maybe_Value { panic("invalid state: cannot call Build on an assembler that's not finished") } @@ -30716,7 +30716,7 @@ func (na *_TypeInt__ReprAssembler) reset() { na.state = maState_initial na.s = 0 } -func (na *_TypeInt__ReprAssembler) BeginMap(int64) (dms3ld.MapAssembler, error) { +func (na *_TypeInt__ReprAssembler) BeginMap(int64) (ld.MapAssembler, error) { switch *na.m { case schema.Maybe_Value, schema.Maybe_Null: panic("invalid state: cannot assign into assembler that's already finished") @@ -30729,7 +30729,7 @@ func (na *_TypeInt__ReprAssembler) BeginMap(int64) (dms3ld.MapAssembler, error) } return na, nil } -func (_TypeInt__ReprAssembler) BeginList(sizeHint int64) (dms3ld.ListAssembler, error) { +func (_TypeInt__ReprAssembler) BeginList(sizeHint int64) (ld.ListAssembler, error) { return mixins.MapAssembler{TypeName: "schemadmt.TypeInt.Repr"}.BeginList(0) } func (na *_TypeInt__ReprAssembler) AssignNull() error { @@ -30761,10 +30761,10 @@ func (_TypeInt__ReprAssembler) AssignString(string) error { func (_TypeInt__ReprAssembler) AssignBytes([]byte) error { return mixins.MapAssembler{TypeName: "schemadmt.TypeInt.Repr"}.AssignBytes(nil) } -func (_TypeInt__ReprAssembler) AssignLink(dms3ld.Link) error { +func (_TypeInt__ReprAssembler) AssignLink(ld.Link) error { return mixins.MapAssembler{TypeName: "schemadmt.TypeInt.Repr"}.AssignLink(nil) } -func (na *_TypeInt__ReprAssembler) AssignNode(v dms3ld.Node) error { +func (na *_TypeInt__ReprAssembler) AssignNode(v ld.Node) error { if v.IsNull() { return na.AssignNull() } @@ -30784,8 +30784,8 @@ func (na *_TypeInt__ReprAssembler) AssignNode(v dms3ld.Node) error { *na.m = schema.Maybe_Value return nil } - if v.Kind() != dms3ld.Kind_Map { - return dms3ld.ErrWrongKind{TypeName: "schemadmt.TypeInt.Repr", MethodName: "AssignNode", AppropriateKind: dms3ld.KindSet_JustMap, ActualKind: v.Kind()} + if v.Kind() != ld.Kind_Map { + return ld.ErrWrongKind{TypeName: "schemadmt.TypeInt.Repr", MethodName: "AssignNode", AppropriateKind: ld.KindSet_JustMap, ActualKind: v.Kind()} } itr := v.MapIterator() for !itr.Done() { @@ -30802,7 +30802,7 @@ func (na *_TypeInt__ReprAssembler) AssignNode(v dms3ld.Node) error { } return na.Finish() } -func (_TypeInt__ReprAssembler) Prototype() dms3ld.NodePrototype { +func (_TypeInt__ReprAssembler) Prototype() ld.NodePrototype { return _TypeInt__ReprPrototype{} } func (ma *_TypeInt__ReprAssembler) valueFinishTidy() bool { @@ -30811,7 +30811,7 @@ func (ma *_TypeInt__ReprAssembler) valueFinishTidy() bool { panic("unreachable") } } -func (ma *_TypeInt__ReprAssembler) AssembleEntry(k string) (dms3ld.NodeAssembler, error) { +func (ma *_TypeInt__ReprAssembler) AssembleEntry(k string) (ld.NodeAssembler, error) { switch ma.state { case maState_initial: // carry on @@ -30826,9 +30826,9 @@ func (ma *_TypeInt__ReprAssembler) AssembleEntry(k string) (dms3ld.NodeAssembler case maState_finished: panic("invalid state: AssembleEntry cannot be called on an assembler that's already finished") } - return nil, dms3ld.ErrInvalidKey{TypeName: "schemadmt.TypeInt.Repr", Key: &_String{k}} + return nil, ld.ErrInvalidKey{TypeName: "schemadmt.TypeInt.Repr", Key: &_String{k}} } -func (ma *_TypeInt__ReprAssembler) AssembleKey() dms3ld.NodeAssembler { +func (ma *_TypeInt__ReprAssembler) AssembleKey() ld.NodeAssembler { switch ma.state { case maState_initial: // carry on @@ -30846,7 +30846,7 @@ func (ma *_TypeInt__ReprAssembler) AssembleKey() dms3ld.NodeAssembler { ma.state = maState_midKey return (*_TypeInt__ReprKeyAssembler)(ma) } -func (ma *_TypeInt__ReprAssembler) AssembleValue() dms3ld.NodeAssembler { +func (ma *_TypeInt__ReprAssembler) AssembleValue() ld.NodeAssembler { switch ma.state { case maState_initial: panic("invalid state: AssembleValue cannot be called when no key is primed") @@ -30881,26 +30881,26 @@ func (ma *_TypeInt__ReprAssembler) Finish() error { panic("invalid state: Finish cannot be called on an assembler that's already finished") } if ma.s&fieldBits__TypeInt_sufficient != fieldBits__TypeInt_sufficient { - err := dms3ld.ErrMissingRequiredField{Missing: make([]string, 0)} + err := ld.ErrMissingRequiredField{Missing: make([]string, 0)} return err } ma.state = maState_finished *ma.m = schema.Maybe_Value return nil } -func (ma *_TypeInt__ReprAssembler) KeyPrototype() dms3ld.NodePrototype { +func (ma *_TypeInt__ReprAssembler) KeyPrototype() ld.NodePrototype { return _String__Prototype{} } -func (ma *_TypeInt__ReprAssembler) ValuePrototype(k string) dms3ld.NodePrototype { +func (ma *_TypeInt__ReprAssembler) ValuePrototype(k string) ld.NodePrototype { panic("todo structbuilder mapassembler repr valueprototype") } type _TypeInt__ReprKeyAssembler _TypeInt__ReprAssembler -func (_TypeInt__ReprKeyAssembler) BeginMap(sizeHint int64) (dms3ld.MapAssembler, error) { +func (_TypeInt__ReprKeyAssembler) BeginMap(sizeHint int64) (ld.MapAssembler, error) { return mixins.StringAssembler{TypeName: "schemadmt.TypeInt.Repr.KeyAssembler"}.BeginMap(0) } -func (_TypeInt__ReprKeyAssembler) BeginList(sizeHint int64) (dms3ld.ListAssembler, error) { +func (_TypeInt__ReprKeyAssembler) BeginList(sizeHint int64) (ld.ListAssembler, error) { return mixins.StringAssembler{TypeName: "schemadmt.TypeInt.Repr.KeyAssembler"}.BeginList(0) } func (na *_TypeInt__ReprKeyAssembler) AssignNull() error { @@ -30919,22 +30919,22 @@ func (ka *_TypeInt__ReprKeyAssembler) AssignString(k string) error { if ka.state != maState_midKey { panic("misuse: KeyAssembler held beyond its valid lifetime") } - return dms3ld.ErrInvalidKey{TypeName: "schemadmt.TypeInt.Repr", Key: &_String{k}} + return ld.ErrInvalidKey{TypeName: "schemadmt.TypeInt.Repr", Key: &_String{k}} } func (_TypeInt__ReprKeyAssembler) AssignBytes([]byte) error { return mixins.StringAssembler{TypeName: "schemadmt.TypeInt.Repr.KeyAssembler"}.AssignBytes(nil) } -func (_TypeInt__ReprKeyAssembler) AssignLink(dms3ld.Link) error { +func (_TypeInt__ReprKeyAssembler) AssignLink(ld.Link) error { return mixins.StringAssembler{TypeName: "schemadmt.TypeInt.Repr.KeyAssembler"}.AssignLink(nil) } -func (ka *_TypeInt__ReprKeyAssembler) AssignNode(v dms3ld.Node) error { +func (ka *_TypeInt__ReprKeyAssembler) AssignNode(v ld.Node) error { if v2, err := v.AsString(); err != nil { return err } else { return ka.AssignString(v2) } } -func (_TypeInt__ReprKeyAssembler) Prototype() dms3ld.NodePrototype { +func (_TypeInt__ReprKeyAssembler) Prototype() ld.NodePrototype { return _String__Prototype{} } @@ -30957,12 +30957,12 @@ func (m MaybeTypeLink) IsAbsent() bool { func (m MaybeTypeLink) Exists() bool { return m.m == schema.Maybe_Value } -func (m MaybeTypeLink) AsNode() dms3ld.Node { +func (m MaybeTypeLink) AsNode() ld.Node { switch m.m { case schema.Maybe_Absent: - return dms3ld.Absent + return ld.Absent case schema.Maybe_Null: - return dms3ld.Null + return ld.Null case schema.Maybe_Value: return m.v default: @@ -30979,37 +30979,37 @@ func (m MaybeTypeLink) Must() TypeLink { var ( fieldName__TypeLink_ExpectedType = _String{"expectedType"} ) -var _ dms3ld.Node = (TypeLink)(&_TypeLink{}) +var _ ld.Node = (TypeLink)(&_TypeLink{}) var _ schema.TypedNode = (TypeLink)(&_TypeLink{}) -func (TypeLink) Kind() dms3ld.Kind { - return dms3ld.Kind_Map +func (TypeLink) Kind() ld.Kind { + return ld.Kind_Map } -func (n TypeLink) LookupByString(key string) (dms3ld.Node, error) { +func (n TypeLink) LookupByString(key string) (ld.Node, error) { switch key { case "expectedType": if n.expectedType.m == schema.Maybe_Absent { - return dms3ld.Absent, nil + return ld.Absent, nil } return &n.expectedType.v, nil default: - return nil, schema.ErrNoSuchField{Type: nil /*TODO*/, Field: dms3ld.PathSegmentOfString(key)} + return nil, schema.ErrNoSuchField{Type: nil /*TODO*/, Field: ld.PathSegmentOfString(key)} } } -func (n TypeLink) LookupByNode(key dms3ld.Node) (dms3ld.Node, error) { +func (n TypeLink) LookupByNode(key ld.Node) (ld.Node, error) { ks, err := key.AsString() if err != nil { return nil, err } return n.LookupByString(ks) } -func (TypeLink) LookupByIndex(idx int64) (dms3ld.Node, error) { +func (TypeLink) LookupByIndex(idx int64) (ld.Node, error) { return mixins.Map{TypeName: "schemadmt.TypeLink"}.LookupByIndex(0) } -func (n TypeLink) LookupBySegment(seg dms3ld.PathSegment) (dms3ld.Node, error) { +func (n TypeLink) LookupBySegment(seg ld.PathSegment) (ld.Node, error) { return n.LookupByString(seg.String()) } -func (n TypeLink) MapIterator() dms3ld.MapIterator { +func (n TypeLink) MapIterator() ld.MapIterator { return &_TypeLink__MapItr{n, 0} } @@ -31018,15 +31018,15 @@ type _TypeLink__MapItr struct { idx int } -func (itr *_TypeLink__MapItr) Next() (k dms3ld.Node, v dms3ld.Node, _ error) { +func (itr *_TypeLink__MapItr) Next() (k ld.Node, v ld.Node, _ error) { if itr.idx >= 1 { - return nil, nil, dms3ld.ErrIteratorOverread{} + return nil, nil, ld.ErrIteratorOverread{} } switch itr.idx { case 0: k = &fieldName__TypeLink_ExpectedType if itr.n.expectedType.m == schema.Maybe_Absent { - v = dms3ld.Absent + v = ld.Absent break } v = &itr.n.expectedType.v @@ -31040,7 +31040,7 @@ func (itr *_TypeLink__MapItr) Done() bool { return itr.idx >= 1 } -func (TypeLink) ListIterator() dms3ld.ListIterator { +func (TypeLink) ListIterator() ld.ListIterator { return nil } func (TypeLink) Length() int64 { @@ -31067,16 +31067,16 @@ func (TypeLink) AsString() (string, error) { func (TypeLink) AsBytes() ([]byte, error) { return mixins.Map{TypeName: "schemadmt.TypeLink"}.AsBytes() } -func (TypeLink) AsLink() (dms3ld.Link, error) { +func (TypeLink) AsLink() (ld.Link, error) { return mixins.Map{TypeName: "schemadmt.TypeLink"}.AsLink() } -func (TypeLink) Prototype() dms3ld.NodePrototype { +func (TypeLink) Prototype() ld.NodePrototype { return _TypeLink__Prototype{} } type _TypeLink__Prototype struct{} -func (_TypeLink__Prototype) NewBuilder() dms3ld.NodeBuilder { +func (_TypeLink__Prototype) NewBuilder() ld.NodeBuilder { var nb _TypeLink__Builder nb.Reset() return &nb @@ -31086,7 +31086,7 @@ type _TypeLink__Builder struct { _TypeLink__Assembler } -func (nb *_TypeLink__Builder) Build() dms3ld.Node { +func (nb *_TypeLink__Builder) Build() ld.Node { if *nb.m != schema.Maybe_Value { panic("invalid state: cannot call Build on an assembler that's not finished") } @@ -31120,7 +31120,7 @@ var ( fieldBits__TypeLink_sufficient = 0 ) -func (na *_TypeLink__Assembler) BeginMap(int64) (dms3ld.MapAssembler, error) { +func (na *_TypeLink__Assembler) BeginMap(int64) (ld.MapAssembler, error) { switch *na.m { case schema.Maybe_Value, schema.Maybe_Null: panic("invalid state: cannot assign into assembler that's already finished") @@ -31133,7 +31133,7 @@ func (na *_TypeLink__Assembler) BeginMap(int64) (dms3ld.MapAssembler, error) { } return na, nil } -func (_TypeLink__Assembler) BeginList(sizeHint int64) (dms3ld.ListAssembler, error) { +func (_TypeLink__Assembler) BeginList(sizeHint int64) (ld.ListAssembler, error) { return mixins.MapAssembler{TypeName: "schemadmt.TypeLink"}.BeginList(0) } func (na *_TypeLink__Assembler) AssignNull() error { @@ -31165,10 +31165,10 @@ func (_TypeLink__Assembler) AssignString(string) error { func (_TypeLink__Assembler) AssignBytes([]byte) error { return mixins.MapAssembler{TypeName: "schemadmt.TypeLink"}.AssignBytes(nil) } -func (_TypeLink__Assembler) AssignLink(dms3ld.Link) error { +func (_TypeLink__Assembler) AssignLink(ld.Link) error { return mixins.MapAssembler{TypeName: "schemadmt.TypeLink"}.AssignLink(nil) } -func (na *_TypeLink__Assembler) AssignNode(v dms3ld.Node) error { +func (na *_TypeLink__Assembler) AssignNode(v ld.Node) error { if v.IsNull() { return na.AssignNull() } @@ -31188,8 +31188,8 @@ func (na *_TypeLink__Assembler) AssignNode(v dms3ld.Node) error { *na.m = schema.Maybe_Value return nil } - if v.Kind() != dms3ld.Kind_Map { - return dms3ld.ErrWrongKind{TypeName: "schemadmt.TypeLink", MethodName: "AssignNode", AppropriateKind: dms3ld.KindSet_JustMap, ActualKind: v.Kind()} + if v.Kind() != ld.Kind_Map { + return ld.ErrWrongKind{TypeName: "schemadmt.TypeLink", MethodName: "AssignNode", AppropriateKind: ld.KindSet_JustMap, ActualKind: v.Kind()} } itr := v.MapIterator() for !itr.Done() { @@ -31206,7 +31206,7 @@ func (na *_TypeLink__Assembler) AssignNode(v dms3ld.Node) error { } return na.Finish() } -func (_TypeLink__Assembler) Prototype() dms3ld.NodePrototype { +func (_TypeLink__Assembler) Prototype() ld.NodePrototype { return _TypeLink__Prototype{} } func (ma *_TypeLink__Assembler) valueFinishTidy() bool { @@ -31223,7 +31223,7 @@ func (ma *_TypeLink__Assembler) valueFinishTidy() bool { panic("unreachable") } } -func (ma *_TypeLink__Assembler) AssembleEntry(k string) (dms3ld.NodeAssembler, error) { +func (ma *_TypeLink__Assembler) AssembleEntry(k string) (ld.NodeAssembler, error) { switch ma.state { case maState_initial: // carry on @@ -31241,7 +31241,7 @@ func (ma *_TypeLink__Assembler) AssembleEntry(k string) (dms3ld.NodeAssembler, e switch k { case "expectedType": if ma.s&fieldBit__TypeLink_ExpectedType != 0 { - return nil, dms3ld.ErrRepeatedMapKey{Key: &fieldName__TypeLink_ExpectedType} + return nil, ld.ErrRepeatedMapKey{Key: &fieldName__TypeLink_ExpectedType} } ma.s += fieldBit__TypeLink_ExpectedType ma.state = maState_midValue @@ -31250,9 +31250,9 @@ func (ma *_TypeLink__Assembler) AssembleEntry(k string) (dms3ld.NodeAssembler, e ma.ca_expectedType.m = &ma.w.expectedType.m return &ma.ca_expectedType, nil } - return nil, dms3ld.ErrInvalidKey{TypeName: "schemadmt.TypeLink", Key: &_String{k}} + return nil, ld.ErrInvalidKey{TypeName: "schemadmt.TypeLink", Key: &_String{k}} } -func (ma *_TypeLink__Assembler) AssembleKey() dms3ld.NodeAssembler { +func (ma *_TypeLink__Assembler) AssembleKey() ld.NodeAssembler { switch ma.state { case maState_initial: // carry on @@ -31270,7 +31270,7 @@ func (ma *_TypeLink__Assembler) AssembleKey() dms3ld.NodeAssembler { ma.state = maState_midKey return (*_TypeLink__KeyAssembler)(ma) } -func (ma *_TypeLink__Assembler) AssembleValue() dms3ld.NodeAssembler { +func (ma *_TypeLink__Assembler) AssembleValue() ld.NodeAssembler { switch ma.state { case maState_initial: panic("invalid state: AssembleValue cannot be called when no key is primed") @@ -31309,26 +31309,26 @@ func (ma *_TypeLink__Assembler) Finish() error { panic("invalid state: Finish cannot be called on an assembler that's already finished") } if ma.s&fieldBits__TypeLink_sufficient != fieldBits__TypeLink_sufficient { - err := dms3ld.ErrMissingRequiredField{Missing: make([]string, 0)} + err := ld.ErrMissingRequiredField{Missing: make([]string, 0)} return err } ma.state = maState_finished *ma.m = schema.Maybe_Value return nil } -func (ma *_TypeLink__Assembler) KeyPrototype() dms3ld.NodePrototype { +func (ma *_TypeLink__Assembler) KeyPrototype() ld.NodePrototype { return _String__Prototype{} } -func (ma *_TypeLink__Assembler) ValuePrototype(k string) dms3ld.NodePrototype { +func (ma *_TypeLink__Assembler) ValuePrototype(k string) ld.NodePrototype { panic("todo structbuilder mapassembler valueprototype") } type _TypeLink__KeyAssembler _TypeLink__Assembler -func (_TypeLink__KeyAssembler) BeginMap(sizeHint int64) (dms3ld.MapAssembler, error) { +func (_TypeLink__KeyAssembler) BeginMap(sizeHint int64) (ld.MapAssembler, error) { return mixins.StringAssembler{TypeName: "schemadmt.TypeLink.KeyAssembler"}.BeginMap(0) } -func (_TypeLink__KeyAssembler) BeginList(sizeHint int64) (dms3ld.ListAssembler, error) { +func (_TypeLink__KeyAssembler) BeginList(sizeHint int64) (ld.ListAssembler, error) { return mixins.StringAssembler{TypeName: "schemadmt.TypeLink.KeyAssembler"}.BeginList(0) } func (na *_TypeLink__KeyAssembler) AssignNull() error { @@ -31350,36 +31350,36 @@ func (ka *_TypeLink__KeyAssembler) AssignString(k string) error { switch k { case "expectedType": if ka.s&fieldBit__TypeLink_ExpectedType != 0 { - return dms3ld.ErrRepeatedMapKey{Key: &fieldName__TypeLink_ExpectedType} + return ld.ErrRepeatedMapKey{Key: &fieldName__TypeLink_ExpectedType} } ka.s += fieldBit__TypeLink_ExpectedType ka.state = maState_expectValue ka.f = 0 default: - return dms3ld.ErrInvalidKey{TypeName: "schemadmt.TypeLink", Key: &_String{k}} + return ld.ErrInvalidKey{TypeName: "schemadmt.TypeLink", Key: &_String{k}} } return nil } func (_TypeLink__KeyAssembler) AssignBytes([]byte) error { return mixins.StringAssembler{TypeName: "schemadmt.TypeLink.KeyAssembler"}.AssignBytes(nil) } -func (_TypeLink__KeyAssembler) AssignLink(dms3ld.Link) error { +func (_TypeLink__KeyAssembler) AssignLink(ld.Link) error { return mixins.StringAssembler{TypeName: "schemadmt.TypeLink.KeyAssembler"}.AssignLink(nil) } -func (ka *_TypeLink__KeyAssembler) AssignNode(v dms3ld.Node) error { +func (ka *_TypeLink__KeyAssembler) AssignNode(v ld.Node) error { if v2, err := v.AsString(); err != nil { return err } else { return ka.AssignString(v2) } } -func (_TypeLink__KeyAssembler) Prototype() dms3ld.NodePrototype { +func (_TypeLink__KeyAssembler) Prototype() ld.NodePrototype { return _String__Prototype{} } func (TypeLink) Type() schema.Type { return nil /*TODO:typelit*/ } -func (n TypeLink) Representation() dms3ld.Node { +func (n TypeLink) Representation() ld.Node { return (*_TypeLink__Repr)(n) } @@ -31388,36 +31388,36 @@ type _TypeLink__Repr _TypeLink var ( fieldName__TypeLink_ExpectedType_serial = _String{"expectedType"} ) -var _ dms3ld.Node = &_TypeLink__Repr{} +var _ ld.Node = &_TypeLink__Repr{} -func (_TypeLink__Repr) Kind() dms3ld.Kind { - return dms3ld.Kind_Map +func (_TypeLink__Repr) Kind() ld.Kind { + return ld.Kind_Map } -func (n *_TypeLink__Repr) LookupByString(key string) (dms3ld.Node, error) { +func (n *_TypeLink__Repr) LookupByString(key string) (ld.Node, error) { switch key { case "expectedType": if n.expectedType.m == schema.Maybe_Absent { - return dms3ld.Absent, dms3ld.ErrNotExists{Segment: dms3ld.PathSegmentOfString(key)} + return ld.Absent, ld.ErrNotExists{Segment: ld.PathSegmentOfString(key)} } return n.expectedType.v.Representation(), nil default: - return nil, schema.ErrNoSuchField{Type: nil /*TODO*/, Field: dms3ld.PathSegmentOfString(key)} + return nil, schema.ErrNoSuchField{Type: nil /*TODO*/, Field: ld.PathSegmentOfString(key)} } } -func (n *_TypeLink__Repr) LookupByNode(key dms3ld.Node) (dms3ld.Node, error) { +func (n *_TypeLink__Repr) LookupByNode(key ld.Node) (ld.Node, error) { ks, err := key.AsString() if err != nil { return nil, err } return n.LookupByString(ks) } -func (_TypeLink__Repr) LookupByIndex(idx int64) (dms3ld.Node, error) { +func (_TypeLink__Repr) LookupByIndex(idx int64) (ld.Node, error) { return mixins.Map{TypeName: "schemadmt.TypeLink.Repr"}.LookupByIndex(0) } -func (n _TypeLink__Repr) LookupBySegment(seg dms3ld.PathSegment) (dms3ld.Node, error) { +func (n _TypeLink__Repr) LookupBySegment(seg ld.PathSegment) (ld.Node, error) { return n.LookupByString(seg.String()) } -func (n *_TypeLink__Repr) MapIterator() dms3ld.MapIterator { +func (n *_TypeLink__Repr) MapIterator() ld.MapIterator { end := 1 if n.expectedType.m == schema.Maybe_Absent { end = 0 @@ -31434,10 +31434,10 @@ type _TypeLink__ReprMapItr struct { end int } -func (itr *_TypeLink__ReprMapItr) Next() (k dms3ld.Node, v dms3ld.Node, _ error) { +func (itr *_TypeLink__ReprMapItr) Next() (k ld.Node, v ld.Node, _ error) { advance: if itr.idx >= 1 { - return nil, nil, dms3ld.ErrIteratorOverread{} + return nil, nil, ld.ErrIteratorOverread{} } switch itr.idx { case 0: @@ -31456,7 +31456,7 @@ advance: func (itr *_TypeLink__ReprMapItr) Done() bool { return itr.idx >= itr.end } -func (_TypeLink__Repr) ListIterator() dms3ld.ListIterator { +func (_TypeLink__Repr) ListIterator() ld.ListIterator { return nil } func (rn *_TypeLink__Repr) Length() int64 { @@ -31487,16 +31487,16 @@ func (_TypeLink__Repr) AsString() (string, error) { func (_TypeLink__Repr) AsBytes() ([]byte, error) { return mixins.Map{TypeName: "schemadmt.TypeLink.Repr"}.AsBytes() } -func (_TypeLink__Repr) AsLink() (dms3ld.Link, error) { +func (_TypeLink__Repr) AsLink() (ld.Link, error) { return mixins.Map{TypeName: "schemadmt.TypeLink.Repr"}.AsLink() } -func (_TypeLink__Repr) Prototype() dms3ld.NodePrototype { +func (_TypeLink__Repr) Prototype() ld.NodePrototype { return _TypeLink__ReprPrototype{} } type _TypeLink__ReprPrototype struct{} -func (_TypeLink__ReprPrototype) NewBuilder() dms3ld.NodeBuilder { +func (_TypeLink__ReprPrototype) NewBuilder() ld.NodeBuilder { var nb _TypeLink__ReprBuilder nb.Reset() return &nb @@ -31506,7 +31506,7 @@ type _TypeLink__ReprBuilder struct { _TypeLink__ReprAssembler } -func (nb *_TypeLink__ReprBuilder) Build() dms3ld.Node { +func (nb *_TypeLink__ReprBuilder) Build() ld.Node { if *nb.m != schema.Maybe_Value { panic("invalid state: cannot call Build on an assembler that's not finished") } @@ -31534,7 +31534,7 @@ func (na *_TypeLink__ReprAssembler) reset() { na.s = 0 na.ca_expectedType.reset() } -func (na *_TypeLink__ReprAssembler) BeginMap(int64) (dms3ld.MapAssembler, error) { +func (na *_TypeLink__ReprAssembler) BeginMap(int64) (ld.MapAssembler, error) { switch *na.m { case schema.Maybe_Value, schema.Maybe_Null: panic("invalid state: cannot assign into assembler that's already finished") @@ -31547,7 +31547,7 @@ func (na *_TypeLink__ReprAssembler) BeginMap(int64) (dms3ld.MapAssembler, error) } return na, nil } -func (_TypeLink__ReprAssembler) BeginList(sizeHint int64) (dms3ld.ListAssembler, error) { +func (_TypeLink__ReprAssembler) BeginList(sizeHint int64) (ld.ListAssembler, error) { return mixins.MapAssembler{TypeName: "schemadmt.TypeLink.Repr"}.BeginList(0) } func (na *_TypeLink__ReprAssembler) AssignNull() error { @@ -31579,10 +31579,10 @@ func (_TypeLink__ReprAssembler) AssignString(string) error { func (_TypeLink__ReprAssembler) AssignBytes([]byte) error { return mixins.MapAssembler{TypeName: "schemadmt.TypeLink.Repr"}.AssignBytes(nil) } -func (_TypeLink__ReprAssembler) AssignLink(dms3ld.Link) error { +func (_TypeLink__ReprAssembler) AssignLink(ld.Link) error { return mixins.MapAssembler{TypeName: "schemadmt.TypeLink.Repr"}.AssignLink(nil) } -func (na *_TypeLink__ReprAssembler) AssignNode(v dms3ld.Node) error { +func (na *_TypeLink__ReprAssembler) AssignNode(v ld.Node) error { if v.IsNull() { return na.AssignNull() } @@ -31602,8 +31602,8 @@ func (na *_TypeLink__ReprAssembler) AssignNode(v dms3ld.Node) error { *na.m = schema.Maybe_Value return nil } - if v.Kind() != dms3ld.Kind_Map { - return dms3ld.ErrWrongKind{TypeName: "schemadmt.TypeLink.Repr", MethodName: "AssignNode", AppropriateKind: dms3ld.KindSet_JustMap, ActualKind: v.Kind()} + if v.Kind() != ld.Kind_Map { + return ld.ErrWrongKind{TypeName: "schemadmt.TypeLink.Repr", MethodName: "AssignNode", AppropriateKind: ld.KindSet_JustMap, ActualKind: v.Kind()} } itr := v.MapIterator() for !itr.Done() { @@ -31620,7 +31620,7 @@ func (na *_TypeLink__ReprAssembler) AssignNode(v dms3ld.Node) error { } return na.Finish() } -func (_TypeLink__ReprAssembler) Prototype() dms3ld.NodePrototype { +func (_TypeLink__ReprAssembler) Prototype() ld.NodePrototype { return _TypeLink__ReprPrototype{} } func (ma *_TypeLink__ReprAssembler) valueFinishTidy() bool { @@ -31637,7 +31637,7 @@ func (ma *_TypeLink__ReprAssembler) valueFinishTidy() bool { panic("unreachable") } } -func (ma *_TypeLink__ReprAssembler) AssembleEntry(k string) (dms3ld.NodeAssembler, error) { +func (ma *_TypeLink__ReprAssembler) AssembleEntry(k string) (ld.NodeAssembler, error) { switch ma.state { case maState_initial: // carry on @@ -31655,7 +31655,7 @@ func (ma *_TypeLink__ReprAssembler) AssembleEntry(k string) (dms3ld.NodeAssemble switch k { case "expectedType": if ma.s&fieldBit__TypeLink_ExpectedType != 0 { - return nil, dms3ld.ErrRepeatedMapKey{Key: &fieldName__TypeLink_ExpectedType_serial} + return nil, ld.ErrRepeatedMapKey{Key: &fieldName__TypeLink_ExpectedType_serial} } ma.s += fieldBit__TypeLink_ExpectedType ma.state = maState_midValue @@ -31666,9 +31666,9 @@ func (ma *_TypeLink__ReprAssembler) AssembleEntry(k string) (dms3ld.NodeAssemble return &ma.ca_expectedType, nil default: } - return nil, dms3ld.ErrInvalidKey{TypeName: "schemadmt.TypeLink.Repr", Key: &_String{k}} + return nil, ld.ErrInvalidKey{TypeName: "schemadmt.TypeLink.Repr", Key: &_String{k}} } -func (ma *_TypeLink__ReprAssembler) AssembleKey() dms3ld.NodeAssembler { +func (ma *_TypeLink__ReprAssembler) AssembleKey() ld.NodeAssembler { switch ma.state { case maState_initial: // carry on @@ -31686,7 +31686,7 @@ func (ma *_TypeLink__ReprAssembler) AssembleKey() dms3ld.NodeAssembler { ma.state = maState_midKey return (*_TypeLink__ReprKeyAssembler)(ma) } -func (ma *_TypeLink__ReprAssembler) AssembleValue() dms3ld.NodeAssembler { +func (ma *_TypeLink__ReprAssembler) AssembleValue() ld.NodeAssembler { switch ma.state { case maState_initial: panic("invalid state: AssembleValue cannot be called when no key is primed") @@ -31726,26 +31726,26 @@ func (ma *_TypeLink__ReprAssembler) Finish() error { panic("invalid state: Finish cannot be called on an assembler that's already finished") } if ma.s&fieldBits__TypeLink_sufficient != fieldBits__TypeLink_sufficient { - err := dms3ld.ErrMissingRequiredField{Missing: make([]string, 0)} + err := ld.ErrMissingRequiredField{Missing: make([]string, 0)} return err } ma.state = maState_finished *ma.m = schema.Maybe_Value return nil } -func (ma *_TypeLink__ReprAssembler) KeyPrototype() dms3ld.NodePrototype { +func (ma *_TypeLink__ReprAssembler) KeyPrototype() ld.NodePrototype { return _String__Prototype{} } -func (ma *_TypeLink__ReprAssembler) ValuePrototype(k string) dms3ld.NodePrototype { +func (ma *_TypeLink__ReprAssembler) ValuePrototype(k string) ld.NodePrototype { panic("todo structbuilder mapassembler repr valueprototype") } type _TypeLink__ReprKeyAssembler _TypeLink__ReprAssembler -func (_TypeLink__ReprKeyAssembler) BeginMap(sizeHint int64) (dms3ld.MapAssembler, error) { +func (_TypeLink__ReprKeyAssembler) BeginMap(sizeHint int64) (ld.MapAssembler, error) { return mixins.StringAssembler{TypeName: "schemadmt.TypeLink.Repr.KeyAssembler"}.BeginMap(0) } -func (_TypeLink__ReprKeyAssembler) BeginList(sizeHint int64) (dms3ld.ListAssembler, error) { +func (_TypeLink__ReprKeyAssembler) BeginList(sizeHint int64) (ld.ListAssembler, error) { return mixins.StringAssembler{TypeName: "schemadmt.TypeLink.Repr.KeyAssembler"}.BeginList(0) } func (na *_TypeLink__ReprKeyAssembler) AssignNull() error { @@ -31767,29 +31767,29 @@ func (ka *_TypeLink__ReprKeyAssembler) AssignString(k string) error { switch k { case "expectedType": if ka.s&fieldBit__TypeLink_ExpectedType != 0 { - return dms3ld.ErrRepeatedMapKey{Key: &fieldName__TypeLink_ExpectedType_serial} + return ld.ErrRepeatedMapKey{Key: &fieldName__TypeLink_ExpectedType_serial} } ka.s += fieldBit__TypeLink_ExpectedType ka.state = maState_expectValue ka.f = 0 return nil } - return dms3ld.ErrInvalidKey{TypeName: "schemadmt.TypeLink.Repr", Key: &_String{k}} + return ld.ErrInvalidKey{TypeName: "schemadmt.TypeLink.Repr", Key: &_String{k}} } func (_TypeLink__ReprKeyAssembler) AssignBytes([]byte) error { return mixins.StringAssembler{TypeName: "schemadmt.TypeLink.Repr.KeyAssembler"}.AssignBytes(nil) } -func (_TypeLink__ReprKeyAssembler) AssignLink(dms3ld.Link) error { +func (_TypeLink__ReprKeyAssembler) AssignLink(ld.Link) error { return mixins.StringAssembler{TypeName: "schemadmt.TypeLink.Repr.KeyAssembler"}.AssignLink(nil) } -func (ka *_TypeLink__ReprKeyAssembler) AssignNode(v dms3ld.Node) error { +func (ka *_TypeLink__ReprKeyAssembler) AssignNode(v ld.Node) error { if v2, err := v.AsString(); err != nil { return err } else { return ka.AssignString(v2) } } -func (_TypeLink__ReprKeyAssembler) Prototype() dms3ld.NodePrototype { +func (_TypeLink__ReprKeyAssembler) Prototype() ld.NodePrototype { return _String__Prototype{} } @@ -31818,12 +31818,12 @@ func (m MaybeTypeList) IsAbsent() bool { func (m MaybeTypeList) Exists() bool { return m.m == schema.Maybe_Value } -func (m MaybeTypeList) AsNode() dms3ld.Node { +func (m MaybeTypeList) AsNode() ld.Node { switch m.m { case schema.Maybe_Absent: - return dms3ld.Absent + return ld.Absent case schema.Maybe_Null: - return dms3ld.Null + return ld.Null case schema.Maybe_Value: return m.v default: @@ -31842,13 +31842,13 @@ var ( fieldName__TypeList_ValueNullable = _String{"valueNullable"} fieldName__TypeList_Representation = _String{"representation"} ) -var _ dms3ld.Node = (TypeList)(&_TypeList{}) +var _ ld.Node = (TypeList)(&_TypeList{}) var _ schema.TypedNode = (TypeList)(&_TypeList{}) -func (TypeList) Kind() dms3ld.Kind { - return dms3ld.Kind_Map +func (TypeList) Kind() ld.Kind { + return ld.Kind_Map } -func (n TypeList) LookupByString(key string) (dms3ld.Node, error) { +func (n TypeList) LookupByString(key string) (ld.Node, error) { switch key { case "valueType": return &n.valueType, nil @@ -31857,23 +31857,23 @@ func (n TypeList) LookupByString(key string) (dms3ld.Node, error) { case "representation": return &n.representation, nil default: - return nil, schema.ErrNoSuchField{Type: nil /*TODO*/, Field: dms3ld.PathSegmentOfString(key)} + return nil, schema.ErrNoSuchField{Type: nil /*TODO*/, Field: ld.PathSegmentOfString(key)} } } -func (n TypeList) LookupByNode(key dms3ld.Node) (dms3ld.Node, error) { +func (n TypeList) LookupByNode(key ld.Node) (ld.Node, error) { ks, err := key.AsString() if err != nil { return nil, err } return n.LookupByString(ks) } -func (TypeList) LookupByIndex(idx int64) (dms3ld.Node, error) { +func (TypeList) LookupByIndex(idx int64) (ld.Node, error) { return mixins.Map{TypeName: "schemadmt.TypeList"}.LookupByIndex(0) } -func (n TypeList) LookupBySegment(seg dms3ld.PathSegment) (dms3ld.Node, error) { +func (n TypeList) LookupBySegment(seg ld.PathSegment) (ld.Node, error) { return n.LookupByString(seg.String()) } -func (n TypeList) MapIterator() dms3ld.MapIterator { +func (n TypeList) MapIterator() ld.MapIterator { return &_TypeList__MapItr{n, 0} } @@ -31882,9 +31882,9 @@ type _TypeList__MapItr struct { idx int } -func (itr *_TypeList__MapItr) Next() (k dms3ld.Node, v dms3ld.Node, _ error) { +func (itr *_TypeList__MapItr) Next() (k ld.Node, v ld.Node, _ error) { if itr.idx >= 3 { - return nil, nil, dms3ld.ErrIteratorOverread{} + return nil, nil, ld.ErrIteratorOverread{} } switch itr.idx { case 0: @@ -31906,7 +31906,7 @@ func (itr *_TypeList__MapItr) Done() bool { return itr.idx >= 3 } -func (TypeList) ListIterator() dms3ld.ListIterator { +func (TypeList) ListIterator() ld.ListIterator { return nil } func (TypeList) Length() int64 { @@ -31933,16 +31933,16 @@ func (TypeList) AsString() (string, error) { func (TypeList) AsBytes() ([]byte, error) { return mixins.Map{TypeName: "schemadmt.TypeList"}.AsBytes() } -func (TypeList) AsLink() (dms3ld.Link, error) { +func (TypeList) AsLink() (ld.Link, error) { return mixins.Map{TypeName: "schemadmt.TypeList"}.AsLink() } -func (TypeList) Prototype() dms3ld.NodePrototype { +func (TypeList) Prototype() ld.NodePrototype { return _TypeList__Prototype{} } type _TypeList__Prototype struct{} -func (_TypeList__Prototype) NewBuilder() dms3ld.NodeBuilder { +func (_TypeList__Prototype) NewBuilder() ld.NodeBuilder { var nb _TypeList__Builder nb.Reset() return &nb @@ -31952,7 +31952,7 @@ type _TypeList__Builder struct { _TypeList__Assembler } -func (nb *_TypeList__Builder) Build() dms3ld.Node { +func (nb *_TypeList__Builder) Build() ld.Node { if *nb.m != schema.Maybe_Value { panic("invalid state: cannot call Build on an assembler that's not finished") } @@ -31992,7 +31992,7 @@ var ( fieldBits__TypeList_sufficient = 0 + 1<<0 + 1<<1 + 1<<2 ) -func (na *_TypeList__Assembler) BeginMap(int64) (dms3ld.MapAssembler, error) { +func (na *_TypeList__Assembler) BeginMap(int64) (ld.MapAssembler, error) { switch *na.m { case schema.Maybe_Value, schema.Maybe_Null: panic("invalid state: cannot assign into assembler that's already finished") @@ -32005,7 +32005,7 @@ func (na *_TypeList__Assembler) BeginMap(int64) (dms3ld.MapAssembler, error) { } return na, nil } -func (_TypeList__Assembler) BeginList(sizeHint int64) (dms3ld.ListAssembler, error) { +func (_TypeList__Assembler) BeginList(sizeHint int64) (ld.ListAssembler, error) { return mixins.MapAssembler{TypeName: "schemadmt.TypeList"}.BeginList(0) } func (na *_TypeList__Assembler) AssignNull() error { @@ -32037,10 +32037,10 @@ func (_TypeList__Assembler) AssignString(string) error { func (_TypeList__Assembler) AssignBytes([]byte) error { return mixins.MapAssembler{TypeName: "schemadmt.TypeList"}.AssignBytes(nil) } -func (_TypeList__Assembler) AssignLink(dms3ld.Link) error { +func (_TypeList__Assembler) AssignLink(ld.Link) error { return mixins.MapAssembler{TypeName: "schemadmt.TypeList"}.AssignLink(nil) } -func (na *_TypeList__Assembler) AssignNode(v dms3ld.Node) error { +func (na *_TypeList__Assembler) AssignNode(v ld.Node) error { if v.IsNull() { return na.AssignNull() } @@ -32060,8 +32060,8 @@ func (na *_TypeList__Assembler) AssignNode(v dms3ld.Node) error { *na.m = schema.Maybe_Value return nil } - if v.Kind() != dms3ld.Kind_Map { - return dms3ld.ErrWrongKind{TypeName: "schemadmt.TypeList", MethodName: "AssignNode", AppropriateKind: dms3ld.KindSet_JustMap, ActualKind: v.Kind()} + if v.Kind() != ld.Kind_Map { + return ld.ErrWrongKind{TypeName: "schemadmt.TypeList", MethodName: "AssignNode", AppropriateKind: ld.KindSet_JustMap, ActualKind: v.Kind()} } itr := v.MapIterator() for !itr.Done() { @@ -32078,7 +32078,7 @@ func (na *_TypeList__Assembler) AssignNode(v dms3ld.Node) error { } return na.Finish() } -func (_TypeList__Assembler) Prototype() dms3ld.NodePrototype { +func (_TypeList__Assembler) Prototype() ld.NodePrototype { return _TypeList__Prototype{} } func (ma *_TypeList__Assembler) valueFinishTidy() bool { @@ -32117,7 +32117,7 @@ func (ma *_TypeList__Assembler) valueFinishTidy() bool { panic("unreachable") } } -func (ma *_TypeList__Assembler) AssembleEntry(k string) (dms3ld.NodeAssembler, error) { +func (ma *_TypeList__Assembler) AssembleEntry(k string) (ld.NodeAssembler, error) { switch ma.state { case maState_initial: // carry on @@ -32135,7 +32135,7 @@ func (ma *_TypeList__Assembler) AssembleEntry(k string) (dms3ld.NodeAssembler, e switch k { case "valueType": if ma.s&fieldBit__TypeList_ValueType != 0 { - return nil, dms3ld.ErrRepeatedMapKey{Key: &fieldName__TypeList_ValueType} + return nil, ld.ErrRepeatedMapKey{Key: &fieldName__TypeList_ValueType} } ma.s += fieldBit__TypeList_ValueType ma.state = maState_midValue @@ -32145,7 +32145,7 @@ func (ma *_TypeList__Assembler) AssembleEntry(k string) (dms3ld.NodeAssembler, e return &ma.ca_valueType, nil case "valueNullable": if ma.s&fieldBit__TypeList_ValueNullable != 0 { - return nil, dms3ld.ErrRepeatedMapKey{Key: &fieldName__TypeList_ValueNullable} + return nil, ld.ErrRepeatedMapKey{Key: &fieldName__TypeList_ValueNullable} } ma.s += fieldBit__TypeList_ValueNullable ma.state = maState_midValue @@ -32155,7 +32155,7 @@ func (ma *_TypeList__Assembler) AssembleEntry(k string) (dms3ld.NodeAssembler, e return &ma.ca_valueNullable, nil case "representation": if ma.s&fieldBit__TypeList_Representation != 0 { - return nil, dms3ld.ErrRepeatedMapKey{Key: &fieldName__TypeList_Representation} + return nil, ld.ErrRepeatedMapKey{Key: &fieldName__TypeList_Representation} } ma.s += fieldBit__TypeList_Representation ma.state = maState_midValue @@ -32164,9 +32164,9 @@ func (ma *_TypeList__Assembler) AssembleEntry(k string) (dms3ld.NodeAssembler, e ma.ca_representation.m = &ma.cm return &ma.ca_representation, nil } - return nil, dms3ld.ErrInvalidKey{TypeName: "schemadmt.TypeList", Key: &_String{k}} + return nil, ld.ErrInvalidKey{TypeName: "schemadmt.TypeList", Key: &_String{k}} } -func (ma *_TypeList__Assembler) AssembleKey() dms3ld.NodeAssembler { +func (ma *_TypeList__Assembler) AssembleKey() ld.NodeAssembler { switch ma.state { case maState_initial: // carry on @@ -32184,7 +32184,7 @@ func (ma *_TypeList__Assembler) AssembleKey() dms3ld.NodeAssembler { ma.state = maState_midKey return (*_TypeList__KeyAssembler)(ma) } -func (ma *_TypeList__Assembler) AssembleValue() dms3ld.NodeAssembler { +func (ma *_TypeList__Assembler) AssembleValue() ld.NodeAssembler { switch ma.state { case maState_initial: panic("invalid state: AssembleValue cannot be called when no key is primed") @@ -32231,7 +32231,7 @@ func (ma *_TypeList__Assembler) Finish() error { panic("invalid state: Finish cannot be called on an assembler that's already finished") } if ma.s&fieldBits__TypeList_sufficient != fieldBits__TypeList_sufficient { - err := dms3ld.ErrMissingRequiredField{Missing: make([]string, 0)} + err := ld.ErrMissingRequiredField{Missing: make([]string, 0)} if ma.s&fieldBit__TypeList_ValueType == 0 { err.Missing = append(err.Missing, "valueType") } @@ -32247,19 +32247,19 @@ func (ma *_TypeList__Assembler) Finish() error { *ma.m = schema.Maybe_Value return nil } -func (ma *_TypeList__Assembler) KeyPrototype() dms3ld.NodePrototype { +func (ma *_TypeList__Assembler) KeyPrototype() ld.NodePrototype { return _String__Prototype{} } -func (ma *_TypeList__Assembler) ValuePrototype(k string) dms3ld.NodePrototype { +func (ma *_TypeList__Assembler) ValuePrototype(k string) ld.NodePrototype { panic("todo structbuilder mapassembler valueprototype") } type _TypeList__KeyAssembler _TypeList__Assembler -func (_TypeList__KeyAssembler) BeginMap(sizeHint int64) (dms3ld.MapAssembler, error) { +func (_TypeList__KeyAssembler) BeginMap(sizeHint int64) (ld.MapAssembler, error) { return mixins.StringAssembler{TypeName: "schemadmt.TypeList.KeyAssembler"}.BeginMap(0) } -func (_TypeList__KeyAssembler) BeginList(sizeHint int64) (dms3ld.ListAssembler, error) { +func (_TypeList__KeyAssembler) BeginList(sizeHint int64) (ld.ListAssembler, error) { return mixins.StringAssembler{TypeName: "schemadmt.TypeList.KeyAssembler"}.BeginList(0) } func (na *_TypeList__KeyAssembler) AssignNull() error { @@ -32281,50 +32281,50 @@ func (ka *_TypeList__KeyAssembler) AssignString(k string) error { switch k { case "valueType": if ka.s&fieldBit__TypeList_ValueType != 0 { - return dms3ld.ErrRepeatedMapKey{Key: &fieldName__TypeList_ValueType} + return ld.ErrRepeatedMapKey{Key: &fieldName__TypeList_ValueType} } ka.s += fieldBit__TypeList_ValueType ka.state = maState_expectValue ka.f = 0 case "valueNullable": if ka.s&fieldBit__TypeList_ValueNullable != 0 { - return dms3ld.ErrRepeatedMapKey{Key: &fieldName__TypeList_ValueNullable} + return ld.ErrRepeatedMapKey{Key: &fieldName__TypeList_ValueNullable} } ka.s += fieldBit__TypeList_ValueNullable ka.state = maState_expectValue ka.f = 1 case "representation": if ka.s&fieldBit__TypeList_Representation != 0 { - return dms3ld.ErrRepeatedMapKey{Key: &fieldName__TypeList_Representation} + return ld.ErrRepeatedMapKey{Key: &fieldName__TypeList_Representation} } ka.s += fieldBit__TypeList_Representation ka.state = maState_expectValue ka.f = 2 default: - return dms3ld.ErrInvalidKey{TypeName: "schemadmt.TypeList", Key: &_String{k}} + return ld.ErrInvalidKey{TypeName: "schemadmt.TypeList", Key: &_String{k}} } return nil } func (_TypeList__KeyAssembler) AssignBytes([]byte) error { return mixins.StringAssembler{TypeName: "schemadmt.TypeList.KeyAssembler"}.AssignBytes(nil) } -func (_TypeList__KeyAssembler) AssignLink(dms3ld.Link) error { +func (_TypeList__KeyAssembler) AssignLink(ld.Link) error { return mixins.StringAssembler{TypeName: "schemadmt.TypeList.KeyAssembler"}.AssignLink(nil) } -func (ka *_TypeList__KeyAssembler) AssignNode(v dms3ld.Node) error { +func (ka *_TypeList__KeyAssembler) AssignNode(v ld.Node) error { if v2, err := v.AsString(); err != nil { return err } else { return ka.AssignString(v2) } } -func (_TypeList__KeyAssembler) Prototype() dms3ld.NodePrototype { +func (_TypeList__KeyAssembler) Prototype() ld.NodePrototype { return _String__Prototype{} } func (TypeList) Type() schema.Type { return nil /*TODO:typelit*/ } -func (n TypeList) Representation() dms3ld.Node { +func (n TypeList) Representation() ld.Node { return (*_TypeList__Repr)(n) } @@ -32335,12 +32335,12 @@ var ( fieldName__TypeList_ValueNullable_serial = _String{"valueNullable"} fieldName__TypeList_Representation_serial = _String{"representation"} ) -var _ dms3ld.Node = &_TypeList__Repr{} +var _ ld.Node = &_TypeList__Repr{} -func (_TypeList__Repr) Kind() dms3ld.Kind { - return dms3ld.Kind_Map +func (_TypeList__Repr) Kind() ld.Kind { + return ld.Kind_Map } -func (n *_TypeList__Repr) LookupByString(key string) (dms3ld.Node, error) { +func (n *_TypeList__Repr) LookupByString(key string) (ld.Node, error) { switch key { case "valueType": return n.valueType.Representation(), nil @@ -32349,23 +32349,23 @@ func (n *_TypeList__Repr) LookupByString(key string) (dms3ld.Node, error) { case "representation": return n.representation.Representation(), nil default: - return nil, schema.ErrNoSuchField{Type: nil /*TODO*/, Field: dms3ld.PathSegmentOfString(key)} + return nil, schema.ErrNoSuchField{Type: nil /*TODO*/, Field: ld.PathSegmentOfString(key)} } } -func (n *_TypeList__Repr) LookupByNode(key dms3ld.Node) (dms3ld.Node, error) { +func (n *_TypeList__Repr) LookupByNode(key ld.Node) (ld.Node, error) { ks, err := key.AsString() if err != nil { return nil, err } return n.LookupByString(ks) } -func (_TypeList__Repr) LookupByIndex(idx int64) (dms3ld.Node, error) { +func (_TypeList__Repr) LookupByIndex(idx int64) (ld.Node, error) { return mixins.Map{TypeName: "schemadmt.TypeList.Repr"}.LookupByIndex(0) } -func (n _TypeList__Repr) LookupBySegment(seg dms3ld.PathSegment) (dms3ld.Node, error) { +func (n _TypeList__Repr) LookupBySegment(seg ld.PathSegment) (ld.Node, error) { return n.LookupByString(seg.String()) } -func (n *_TypeList__Repr) MapIterator() dms3ld.MapIterator { +func (n *_TypeList__Repr) MapIterator() ld.MapIterator { return &_TypeList__ReprMapItr{n, 0} } @@ -32374,9 +32374,9 @@ type _TypeList__ReprMapItr struct { idx int } -func (itr *_TypeList__ReprMapItr) Next() (k dms3ld.Node, v dms3ld.Node, _ error) { +func (itr *_TypeList__ReprMapItr) Next() (k ld.Node, v ld.Node, _ error) { if itr.idx >= 3 { - return nil, nil, dms3ld.ErrIteratorOverread{} + return nil, nil, ld.ErrIteratorOverread{} } switch itr.idx { case 0: @@ -32397,7 +32397,7 @@ func (itr *_TypeList__ReprMapItr) Next() (k dms3ld.Node, v dms3ld.Node, _ error) func (itr *_TypeList__ReprMapItr) Done() bool { return itr.idx >= 3 } -func (_TypeList__Repr) ListIterator() dms3ld.ListIterator { +func (_TypeList__Repr) ListIterator() ld.ListIterator { return nil } func (rn *_TypeList__Repr) Length() int64 { @@ -32425,16 +32425,16 @@ func (_TypeList__Repr) AsString() (string, error) { func (_TypeList__Repr) AsBytes() ([]byte, error) { return mixins.Map{TypeName: "schemadmt.TypeList.Repr"}.AsBytes() } -func (_TypeList__Repr) AsLink() (dms3ld.Link, error) { +func (_TypeList__Repr) AsLink() (ld.Link, error) { return mixins.Map{TypeName: "schemadmt.TypeList.Repr"}.AsLink() } -func (_TypeList__Repr) Prototype() dms3ld.NodePrototype { +func (_TypeList__Repr) Prototype() ld.NodePrototype { return _TypeList__ReprPrototype{} } type _TypeList__ReprPrototype struct{} -func (_TypeList__ReprPrototype) NewBuilder() dms3ld.NodeBuilder { +func (_TypeList__ReprPrototype) NewBuilder() ld.NodeBuilder { var nb _TypeList__ReprBuilder nb.Reset() return &nb @@ -32444,7 +32444,7 @@ type _TypeList__ReprBuilder struct { _TypeList__ReprAssembler } -func (nb *_TypeList__ReprBuilder) Build() dms3ld.Node { +func (nb *_TypeList__ReprBuilder) Build() ld.Node { if *nb.m != schema.Maybe_Value { panic("invalid state: cannot call Build on an assembler that's not finished") } @@ -32476,7 +32476,7 @@ func (na *_TypeList__ReprAssembler) reset() { na.ca_valueNullable.reset() na.ca_representation.reset() } -func (na *_TypeList__ReprAssembler) BeginMap(int64) (dms3ld.MapAssembler, error) { +func (na *_TypeList__ReprAssembler) BeginMap(int64) (ld.MapAssembler, error) { switch *na.m { case schema.Maybe_Value, schema.Maybe_Null: panic("invalid state: cannot assign into assembler that's already finished") @@ -32489,7 +32489,7 @@ func (na *_TypeList__ReprAssembler) BeginMap(int64) (dms3ld.MapAssembler, error) } return na, nil } -func (_TypeList__ReprAssembler) BeginList(sizeHint int64) (dms3ld.ListAssembler, error) { +func (_TypeList__ReprAssembler) BeginList(sizeHint int64) (ld.ListAssembler, error) { return mixins.MapAssembler{TypeName: "schemadmt.TypeList.Repr"}.BeginList(0) } func (na *_TypeList__ReprAssembler) AssignNull() error { @@ -32521,10 +32521,10 @@ func (_TypeList__ReprAssembler) AssignString(string) error { func (_TypeList__ReprAssembler) AssignBytes([]byte) error { return mixins.MapAssembler{TypeName: "schemadmt.TypeList.Repr"}.AssignBytes(nil) } -func (_TypeList__ReprAssembler) AssignLink(dms3ld.Link) error { +func (_TypeList__ReprAssembler) AssignLink(ld.Link) error { return mixins.MapAssembler{TypeName: "schemadmt.TypeList.Repr"}.AssignLink(nil) } -func (na *_TypeList__ReprAssembler) AssignNode(v dms3ld.Node) error { +func (na *_TypeList__ReprAssembler) AssignNode(v ld.Node) error { if v.IsNull() { return na.AssignNull() } @@ -32544,8 +32544,8 @@ func (na *_TypeList__ReprAssembler) AssignNode(v dms3ld.Node) error { *na.m = schema.Maybe_Value return nil } - if v.Kind() != dms3ld.Kind_Map { - return dms3ld.ErrWrongKind{TypeName: "schemadmt.TypeList.Repr", MethodName: "AssignNode", AppropriateKind: dms3ld.KindSet_JustMap, ActualKind: v.Kind()} + if v.Kind() != ld.Kind_Map { + return ld.ErrWrongKind{TypeName: "schemadmt.TypeList.Repr", MethodName: "AssignNode", AppropriateKind: ld.KindSet_JustMap, ActualKind: v.Kind()} } itr := v.MapIterator() for !itr.Done() { @@ -32562,7 +32562,7 @@ func (na *_TypeList__ReprAssembler) AssignNode(v dms3ld.Node) error { } return na.Finish() } -func (_TypeList__ReprAssembler) Prototype() dms3ld.NodePrototype { +func (_TypeList__ReprAssembler) Prototype() ld.NodePrototype { return _TypeList__ReprPrototype{} } func (ma *_TypeList__ReprAssembler) valueFinishTidy() bool { @@ -32598,7 +32598,7 @@ func (ma *_TypeList__ReprAssembler) valueFinishTidy() bool { panic("unreachable") } } -func (ma *_TypeList__ReprAssembler) AssembleEntry(k string) (dms3ld.NodeAssembler, error) { +func (ma *_TypeList__ReprAssembler) AssembleEntry(k string) (ld.NodeAssembler, error) { switch ma.state { case maState_initial: // carry on @@ -32616,7 +32616,7 @@ func (ma *_TypeList__ReprAssembler) AssembleEntry(k string) (dms3ld.NodeAssemble switch k { case "valueType": if ma.s&fieldBit__TypeList_ValueType != 0 { - return nil, dms3ld.ErrRepeatedMapKey{Key: &fieldName__TypeList_ValueType_serial} + return nil, ld.ErrRepeatedMapKey{Key: &fieldName__TypeList_ValueType_serial} } ma.s += fieldBit__TypeList_ValueType ma.state = maState_midValue @@ -32626,7 +32626,7 @@ func (ma *_TypeList__ReprAssembler) AssembleEntry(k string) (dms3ld.NodeAssemble return &ma.ca_valueType, nil case "valueNullable": if ma.s&fieldBit__TypeList_ValueNullable != 0 { - return nil, dms3ld.ErrRepeatedMapKey{Key: &fieldName__TypeList_ValueNullable_serial} + return nil, ld.ErrRepeatedMapKey{Key: &fieldName__TypeList_ValueNullable_serial} } ma.s += fieldBit__TypeList_ValueNullable ma.state = maState_midValue @@ -32636,7 +32636,7 @@ func (ma *_TypeList__ReprAssembler) AssembleEntry(k string) (dms3ld.NodeAssemble return &ma.ca_valueNullable, nil case "representation": if ma.s&fieldBit__TypeList_Representation != 0 { - return nil, dms3ld.ErrRepeatedMapKey{Key: &fieldName__TypeList_Representation_serial} + return nil, ld.ErrRepeatedMapKey{Key: &fieldName__TypeList_Representation_serial} } ma.s += fieldBit__TypeList_Representation ma.state = maState_midValue @@ -32646,9 +32646,9 @@ func (ma *_TypeList__ReprAssembler) AssembleEntry(k string) (dms3ld.NodeAssemble return &ma.ca_representation, nil default: } - return nil, dms3ld.ErrInvalidKey{TypeName: "schemadmt.TypeList.Repr", Key: &_String{k}} + return nil, ld.ErrInvalidKey{TypeName: "schemadmt.TypeList.Repr", Key: &_String{k}} } -func (ma *_TypeList__ReprAssembler) AssembleKey() dms3ld.NodeAssembler { +func (ma *_TypeList__ReprAssembler) AssembleKey() ld.NodeAssembler { switch ma.state { case maState_initial: // carry on @@ -32666,7 +32666,7 @@ func (ma *_TypeList__ReprAssembler) AssembleKey() dms3ld.NodeAssembler { ma.state = maState_midKey return (*_TypeList__ReprKeyAssembler)(ma) } -func (ma *_TypeList__ReprAssembler) AssembleValue() dms3ld.NodeAssembler { +func (ma *_TypeList__ReprAssembler) AssembleValue() ld.NodeAssembler { switch ma.state { case maState_initial: panic("invalid state: AssembleValue cannot be called when no key is primed") @@ -32713,7 +32713,7 @@ func (ma *_TypeList__ReprAssembler) Finish() error { panic("invalid state: Finish cannot be called on an assembler that's already finished") } if ma.s&fieldBits__TypeList_sufficient != fieldBits__TypeList_sufficient { - err := dms3ld.ErrMissingRequiredField{Missing: make([]string, 0)} + err := ld.ErrMissingRequiredField{Missing: make([]string, 0)} if ma.s&fieldBit__TypeList_ValueType == 0 { err.Missing = append(err.Missing, "valueType") } @@ -32729,19 +32729,19 @@ func (ma *_TypeList__ReprAssembler) Finish() error { *ma.m = schema.Maybe_Value return nil } -func (ma *_TypeList__ReprAssembler) KeyPrototype() dms3ld.NodePrototype { +func (ma *_TypeList__ReprAssembler) KeyPrototype() ld.NodePrototype { return _String__Prototype{} } -func (ma *_TypeList__ReprAssembler) ValuePrototype(k string) dms3ld.NodePrototype { +func (ma *_TypeList__ReprAssembler) ValuePrototype(k string) ld.NodePrototype { panic("todo structbuilder mapassembler repr valueprototype") } type _TypeList__ReprKeyAssembler _TypeList__ReprAssembler -func (_TypeList__ReprKeyAssembler) BeginMap(sizeHint int64) (dms3ld.MapAssembler, error) { +func (_TypeList__ReprKeyAssembler) BeginMap(sizeHint int64) (ld.MapAssembler, error) { return mixins.StringAssembler{TypeName: "schemadmt.TypeList.Repr.KeyAssembler"}.BeginMap(0) } -func (_TypeList__ReprKeyAssembler) BeginList(sizeHint int64) (dms3ld.ListAssembler, error) { +func (_TypeList__ReprKeyAssembler) BeginList(sizeHint int64) (ld.ListAssembler, error) { return mixins.StringAssembler{TypeName: "schemadmt.TypeList.Repr.KeyAssembler"}.BeginList(0) } func (na *_TypeList__ReprKeyAssembler) AssignNull() error { @@ -32763,7 +32763,7 @@ func (ka *_TypeList__ReprKeyAssembler) AssignString(k string) error { switch k { case "valueType": if ka.s&fieldBit__TypeList_ValueType != 0 { - return dms3ld.ErrRepeatedMapKey{Key: &fieldName__TypeList_ValueType_serial} + return ld.ErrRepeatedMapKey{Key: &fieldName__TypeList_ValueType_serial} } ka.s += fieldBit__TypeList_ValueType ka.state = maState_expectValue @@ -32771,7 +32771,7 @@ func (ka *_TypeList__ReprKeyAssembler) AssignString(k string) error { return nil case "valueNullable": if ka.s&fieldBit__TypeList_ValueNullable != 0 { - return dms3ld.ErrRepeatedMapKey{Key: &fieldName__TypeList_ValueNullable_serial} + return ld.ErrRepeatedMapKey{Key: &fieldName__TypeList_ValueNullable_serial} } ka.s += fieldBit__TypeList_ValueNullable ka.state = maState_expectValue @@ -32779,29 +32779,29 @@ func (ka *_TypeList__ReprKeyAssembler) AssignString(k string) error { return nil case "representation": if ka.s&fieldBit__TypeList_Representation != 0 { - return dms3ld.ErrRepeatedMapKey{Key: &fieldName__TypeList_Representation_serial} + return ld.ErrRepeatedMapKey{Key: &fieldName__TypeList_Representation_serial} } ka.s += fieldBit__TypeList_Representation ka.state = maState_expectValue ka.f = 2 return nil } - return dms3ld.ErrInvalidKey{TypeName: "schemadmt.TypeList.Repr", Key: &_String{k}} + return ld.ErrInvalidKey{TypeName: "schemadmt.TypeList.Repr", Key: &_String{k}} } func (_TypeList__ReprKeyAssembler) AssignBytes([]byte) error { return mixins.StringAssembler{TypeName: "schemadmt.TypeList.Repr.KeyAssembler"}.AssignBytes(nil) } -func (_TypeList__ReprKeyAssembler) AssignLink(dms3ld.Link) error { +func (_TypeList__ReprKeyAssembler) AssignLink(ld.Link) error { return mixins.StringAssembler{TypeName: "schemadmt.TypeList.Repr.KeyAssembler"}.AssignLink(nil) } -func (ka *_TypeList__ReprKeyAssembler) AssignNode(v dms3ld.Node) error { +func (ka *_TypeList__ReprKeyAssembler) AssignNode(v ld.Node) error { if v2, err := v.AsString(); err != nil { return err } else { return ka.AssignString(v2) } } -func (_TypeList__ReprKeyAssembler) Prototype() dms3ld.NodePrototype { +func (_TypeList__ReprKeyAssembler) Prototype() ld.NodePrototype { return _String__Prototype{} } @@ -32833,12 +32833,12 @@ func (m MaybeTypeMap) IsAbsent() bool { func (m MaybeTypeMap) Exists() bool { return m.m == schema.Maybe_Value } -func (m MaybeTypeMap) AsNode() dms3ld.Node { +func (m MaybeTypeMap) AsNode() ld.Node { switch m.m { case schema.Maybe_Absent: - return dms3ld.Absent + return ld.Absent case schema.Maybe_Null: - return dms3ld.Null + return ld.Null case schema.Maybe_Value: return m.v default: @@ -32858,13 +32858,13 @@ var ( fieldName__TypeMap_ValueNullable = _String{"valueNullable"} fieldName__TypeMap_Representation = _String{"representation"} ) -var _ dms3ld.Node = (TypeMap)(&_TypeMap{}) +var _ ld.Node = (TypeMap)(&_TypeMap{}) var _ schema.TypedNode = (TypeMap)(&_TypeMap{}) -func (TypeMap) Kind() dms3ld.Kind { - return dms3ld.Kind_Map +func (TypeMap) Kind() ld.Kind { + return ld.Kind_Map } -func (n TypeMap) LookupByString(key string) (dms3ld.Node, error) { +func (n TypeMap) LookupByString(key string) (ld.Node, error) { switch key { case "keyType": return &n.keyType, nil @@ -32875,23 +32875,23 @@ func (n TypeMap) LookupByString(key string) (dms3ld.Node, error) { case "representation": return &n.representation, nil default: - return nil, schema.ErrNoSuchField{Type: nil /*TODO*/, Field: dms3ld.PathSegmentOfString(key)} + return nil, schema.ErrNoSuchField{Type: nil /*TODO*/, Field: ld.PathSegmentOfString(key)} } } -func (n TypeMap) LookupByNode(key dms3ld.Node) (dms3ld.Node, error) { +func (n TypeMap) LookupByNode(key ld.Node) (ld.Node, error) { ks, err := key.AsString() if err != nil { return nil, err } return n.LookupByString(ks) } -func (TypeMap) LookupByIndex(idx int64) (dms3ld.Node, error) { +func (TypeMap) LookupByIndex(idx int64) (ld.Node, error) { return mixins.Map{TypeName: "schemadmt.TypeMap"}.LookupByIndex(0) } -func (n TypeMap) LookupBySegment(seg dms3ld.PathSegment) (dms3ld.Node, error) { +func (n TypeMap) LookupBySegment(seg ld.PathSegment) (ld.Node, error) { return n.LookupByString(seg.String()) } -func (n TypeMap) MapIterator() dms3ld.MapIterator { +func (n TypeMap) MapIterator() ld.MapIterator { return &_TypeMap__MapItr{n, 0} } @@ -32900,9 +32900,9 @@ type _TypeMap__MapItr struct { idx int } -func (itr *_TypeMap__MapItr) Next() (k dms3ld.Node, v dms3ld.Node, _ error) { +func (itr *_TypeMap__MapItr) Next() (k ld.Node, v ld.Node, _ error) { if itr.idx >= 4 { - return nil, nil, dms3ld.ErrIteratorOverread{} + return nil, nil, ld.ErrIteratorOverread{} } switch itr.idx { case 0: @@ -32927,7 +32927,7 @@ func (itr *_TypeMap__MapItr) Done() bool { return itr.idx >= 4 } -func (TypeMap) ListIterator() dms3ld.ListIterator { +func (TypeMap) ListIterator() ld.ListIterator { return nil } func (TypeMap) Length() int64 { @@ -32954,16 +32954,16 @@ func (TypeMap) AsString() (string, error) { func (TypeMap) AsBytes() ([]byte, error) { return mixins.Map{TypeName: "schemadmt.TypeMap"}.AsBytes() } -func (TypeMap) AsLink() (dms3ld.Link, error) { +func (TypeMap) AsLink() (ld.Link, error) { return mixins.Map{TypeName: "schemadmt.TypeMap"}.AsLink() } -func (TypeMap) Prototype() dms3ld.NodePrototype { +func (TypeMap) Prototype() ld.NodePrototype { return _TypeMap__Prototype{} } type _TypeMap__Prototype struct{} -func (_TypeMap__Prototype) NewBuilder() dms3ld.NodeBuilder { +func (_TypeMap__Prototype) NewBuilder() ld.NodeBuilder { var nb _TypeMap__Builder nb.Reset() return &nb @@ -32973,7 +32973,7 @@ type _TypeMap__Builder struct { _TypeMap__Assembler } -func (nb *_TypeMap__Builder) Build() dms3ld.Node { +func (nb *_TypeMap__Builder) Build() ld.Node { if *nb.m != schema.Maybe_Value { panic("invalid state: cannot call Build on an assembler that's not finished") } @@ -33016,7 +33016,7 @@ var ( fieldBits__TypeMap_sufficient = 0 + 1<<0 + 1<<1 + 1<<2 + 1<<3 ) -func (na *_TypeMap__Assembler) BeginMap(int64) (dms3ld.MapAssembler, error) { +func (na *_TypeMap__Assembler) BeginMap(int64) (ld.MapAssembler, error) { switch *na.m { case schema.Maybe_Value, schema.Maybe_Null: panic("invalid state: cannot assign into assembler that's already finished") @@ -33029,7 +33029,7 @@ func (na *_TypeMap__Assembler) BeginMap(int64) (dms3ld.MapAssembler, error) { } return na, nil } -func (_TypeMap__Assembler) BeginList(sizeHint int64) (dms3ld.ListAssembler, error) { +func (_TypeMap__Assembler) BeginList(sizeHint int64) (ld.ListAssembler, error) { return mixins.MapAssembler{TypeName: "schemadmt.TypeMap"}.BeginList(0) } func (na *_TypeMap__Assembler) AssignNull() error { @@ -33061,10 +33061,10 @@ func (_TypeMap__Assembler) AssignString(string) error { func (_TypeMap__Assembler) AssignBytes([]byte) error { return mixins.MapAssembler{TypeName: "schemadmt.TypeMap"}.AssignBytes(nil) } -func (_TypeMap__Assembler) AssignLink(dms3ld.Link) error { +func (_TypeMap__Assembler) AssignLink(ld.Link) error { return mixins.MapAssembler{TypeName: "schemadmt.TypeMap"}.AssignLink(nil) } -func (na *_TypeMap__Assembler) AssignNode(v dms3ld.Node) error { +func (na *_TypeMap__Assembler) AssignNode(v ld.Node) error { if v.IsNull() { return na.AssignNull() } @@ -33084,8 +33084,8 @@ func (na *_TypeMap__Assembler) AssignNode(v dms3ld.Node) error { *na.m = schema.Maybe_Value return nil } - if v.Kind() != dms3ld.Kind_Map { - return dms3ld.ErrWrongKind{TypeName: "schemadmt.TypeMap", MethodName: "AssignNode", AppropriateKind: dms3ld.KindSet_JustMap, ActualKind: v.Kind()} + if v.Kind() != ld.Kind_Map { + return ld.ErrWrongKind{TypeName: "schemadmt.TypeMap", MethodName: "AssignNode", AppropriateKind: ld.KindSet_JustMap, ActualKind: v.Kind()} } itr := v.MapIterator() for !itr.Done() { @@ -33102,7 +33102,7 @@ func (na *_TypeMap__Assembler) AssignNode(v dms3ld.Node) error { } return na.Finish() } -func (_TypeMap__Assembler) Prototype() dms3ld.NodePrototype { +func (_TypeMap__Assembler) Prototype() ld.NodePrototype { return _TypeMap__Prototype{} } func (ma *_TypeMap__Assembler) valueFinishTidy() bool { @@ -33151,7 +33151,7 @@ func (ma *_TypeMap__Assembler) valueFinishTidy() bool { panic("unreachable") } } -func (ma *_TypeMap__Assembler) AssembleEntry(k string) (dms3ld.NodeAssembler, error) { +func (ma *_TypeMap__Assembler) AssembleEntry(k string) (ld.NodeAssembler, error) { switch ma.state { case maState_initial: // carry on @@ -33169,7 +33169,7 @@ func (ma *_TypeMap__Assembler) AssembleEntry(k string) (dms3ld.NodeAssembler, er switch k { case "keyType": if ma.s&fieldBit__TypeMap_KeyType != 0 { - return nil, dms3ld.ErrRepeatedMapKey{Key: &fieldName__TypeMap_KeyType} + return nil, ld.ErrRepeatedMapKey{Key: &fieldName__TypeMap_KeyType} } ma.s += fieldBit__TypeMap_KeyType ma.state = maState_midValue @@ -33179,7 +33179,7 @@ func (ma *_TypeMap__Assembler) AssembleEntry(k string) (dms3ld.NodeAssembler, er return &ma.ca_keyType, nil case "valueType": if ma.s&fieldBit__TypeMap_ValueType != 0 { - return nil, dms3ld.ErrRepeatedMapKey{Key: &fieldName__TypeMap_ValueType} + return nil, ld.ErrRepeatedMapKey{Key: &fieldName__TypeMap_ValueType} } ma.s += fieldBit__TypeMap_ValueType ma.state = maState_midValue @@ -33189,7 +33189,7 @@ func (ma *_TypeMap__Assembler) AssembleEntry(k string) (dms3ld.NodeAssembler, er return &ma.ca_valueType, nil case "valueNullable": if ma.s&fieldBit__TypeMap_ValueNullable != 0 { - return nil, dms3ld.ErrRepeatedMapKey{Key: &fieldName__TypeMap_ValueNullable} + return nil, ld.ErrRepeatedMapKey{Key: &fieldName__TypeMap_ValueNullable} } ma.s += fieldBit__TypeMap_ValueNullable ma.state = maState_midValue @@ -33199,7 +33199,7 @@ func (ma *_TypeMap__Assembler) AssembleEntry(k string) (dms3ld.NodeAssembler, er return &ma.ca_valueNullable, nil case "representation": if ma.s&fieldBit__TypeMap_Representation != 0 { - return nil, dms3ld.ErrRepeatedMapKey{Key: &fieldName__TypeMap_Representation} + return nil, ld.ErrRepeatedMapKey{Key: &fieldName__TypeMap_Representation} } ma.s += fieldBit__TypeMap_Representation ma.state = maState_midValue @@ -33208,9 +33208,9 @@ func (ma *_TypeMap__Assembler) AssembleEntry(k string) (dms3ld.NodeAssembler, er ma.ca_representation.m = &ma.cm return &ma.ca_representation, nil } - return nil, dms3ld.ErrInvalidKey{TypeName: "schemadmt.TypeMap", Key: &_String{k}} + return nil, ld.ErrInvalidKey{TypeName: "schemadmt.TypeMap", Key: &_String{k}} } -func (ma *_TypeMap__Assembler) AssembleKey() dms3ld.NodeAssembler { +func (ma *_TypeMap__Assembler) AssembleKey() ld.NodeAssembler { switch ma.state { case maState_initial: // carry on @@ -33228,7 +33228,7 @@ func (ma *_TypeMap__Assembler) AssembleKey() dms3ld.NodeAssembler { ma.state = maState_midKey return (*_TypeMap__KeyAssembler)(ma) } -func (ma *_TypeMap__Assembler) AssembleValue() dms3ld.NodeAssembler { +func (ma *_TypeMap__Assembler) AssembleValue() ld.NodeAssembler { switch ma.state { case maState_initial: panic("invalid state: AssembleValue cannot be called when no key is primed") @@ -33279,7 +33279,7 @@ func (ma *_TypeMap__Assembler) Finish() error { panic("invalid state: Finish cannot be called on an assembler that's already finished") } if ma.s&fieldBits__TypeMap_sufficient != fieldBits__TypeMap_sufficient { - err := dms3ld.ErrMissingRequiredField{Missing: make([]string, 0)} + err := ld.ErrMissingRequiredField{Missing: make([]string, 0)} if ma.s&fieldBit__TypeMap_KeyType == 0 { err.Missing = append(err.Missing, "keyType") } @@ -33298,19 +33298,19 @@ func (ma *_TypeMap__Assembler) Finish() error { *ma.m = schema.Maybe_Value return nil } -func (ma *_TypeMap__Assembler) KeyPrototype() dms3ld.NodePrototype { +func (ma *_TypeMap__Assembler) KeyPrototype() ld.NodePrototype { return _String__Prototype{} } -func (ma *_TypeMap__Assembler) ValuePrototype(k string) dms3ld.NodePrototype { +func (ma *_TypeMap__Assembler) ValuePrototype(k string) ld.NodePrototype { panic("todo structbuilder mapassembler valueprototype") } type _TypeMap__KeyAssembler _TypeMap__Assembler -func (_TypeMap__KeyAssembler) BeginMap(sizeHint int64) (dms3ld.MapAssembler, error) { +func (_TypeMap__KeyAssembler) BeginMap(sizeHint int64) (ld.MapAssembler, error) { return mixins.StringAssembler{TypeName: "schemadmt.TypeMap.KeyAssembler"}.BeginMap(0) } -func (_TypeMap__KeyAssembler) BeginList(sizeHint int64) (dms3ld.ListAssembler, error) { +func (_TypeMap__KeyAssembler) BeginList(sizeHint int64) (ld.ListAssembler, error) { return mixins.StringAssembler{TypeName: "schemadmt.TypeMap.KeyAssembler"}.BeginList(0) } func (na *_TypeMap__KeyAssembler) AssignNull() error { @@ -33332,57 +33332,57 @@ func (ka *_TypeMap__KeyAssembler) AssignString(k string) error { switch k { case "keyType": if ka.s&fieldBit__TypeMap_KeyType != 0 { - return dms3ld.ErrRepeatedMapKey{Key: &fieldName__TypeMap_KeyType} + return ld.ErrRepeatedMapKey{Key: &fieldName__TypeMap_KeyType} } ka.s += fieldBit__TypeMap_KeyType ka.state = maState_expectValue ka.f = 0 case "valueType": if ka.s&fieldBit__TypeMap_ValueType != 0 { - return dms3ld.ErrRepeatedMapKey{Key: &fieldName__TypeMap_ValueType} + return ld.ErrRepeatedMapKey{Key: &fieldName__TypeMap_ValueType} } ka.s += fieldBit__TypeMap_ValueType ka.state = maState_expectValue ka.f = 1 case "valueNullable": if ka.s&fieldBit__TypeMap_ValueNullable != 0 { - return dms3ld.ErrRepeatedMapKey{Key: &fieldName__TypeMap_ValueNullable} + return ld.ErrRepeatedMapKey{Key: &fieldName__TypeMap_ValueNullable} } ka.s += fieldBit__TypeMap_ValueNullable ka.state = maState_expectValue ka.f = 2 case "representation": if ka.s&fieldBit__TypeMap_Representation != 0 { - return dms3ld.ErrRepeatedMapKey{Key: &fieldName__TypeMap_Representation} + return ld.ErrRepeatedMapKey{Key: &fieldName__TypeMap_Representation} } ka.s += fieldBit__TypeMap_Representation ka.state = maState_expectValue ka.f = 3 default: - return dms3ld.ErrInvalidKey{TypeName: "schemadmt.TypeMap", Key: &_String{k}} + return ld.ErrInvalidKey{TypeName: "schemadmt.TypeMap", Key: &_String{k}} } return nil } func (_TypeMap__KeyAssembler) AssignBytes([]byte) error { return mixins.StringAssembler{TypeName: "schemadmt.TypeMap.KeyAssembler"}.AssignBytes(nil) } -func (_TypeMap__KeyAssembler) AssignLink(dms3ld.Link) error { +func (_TypeMap__KeyAssembler) AssignLink(ld.Link) error { return mixins.StringAssembler{TypeName: "schemadmt.TypeMap.KeyAssembler"}.AssignLink(nil) } -func (ka *_TypeMap__KeyAssembler) AssignNode(v dms3ld.Node) error { +func (ka *_TypeMap__KeyAssembler) AssignNode(v ld.Node) error { if v2, err := v.AsString(); err != nil { return err } else { return ka.AssignString(v2) } } -func (_TypeMap__KeyAssembler) Prototype() dms3ld.NodePrototype { +func (_TypeMap__KeyAssembler) Prototype() ld.NodePrototype { return _String__Prototype{} } func (TypeMap) Type() schema.Type { return nil /*TODO:typelit*/ } -func (n TypeMap) Representation() dms3ld.Node { +func (n TypeMap) Representation() ld.Node { return (*_TypeMap__Repr)(n) } @@ -33394,12 +33394,12 @@ var ( fieldName__TypeMap_ValueNullable_serial = _String{"valueNullable"} fieldName__TypeMap_Representation_serial = _String{"representation"} ) -var _ dms3ld.Node = &_TypeMap__Repr{} +var _ ld.Node = &_TypeMap__Repr{} -func (_TypeMap__Repr) Kind() dms3ld.Kind { - return dms3ld.Kind_Map +func (_TypeMap__Repr) Kind() ld.Kind { + return ld.Kind_Map } -func (n *_TypeMap__Repr) LookupByString(key string) (dms3ld.Node, error) { +func (n *_TypeMap__Repr) LookupByString(key string) (ld.Node, error) { switch key { case "keyType": return n.keyType.Representation(), nil @@ -33410,23 +33410,23 @@ func (n *_TypeMap__Repr) LookupByString(key string) (dms3ld.Node, error) { case "representation": return n.representation.Representation(), nil default: - return nil, schema.ErrNoSuchField{Type: nil /*TODO*/, Field: dms3ld.PathSegmentOfString(key)} + return nil, schema.ErrNoSuchField{Type: nil /*TODO*/, Field: ld.PathSegmentOfString(key)} } } -func (n *_TypeMap__Repr) LookupByNode(key dms3ld.Node) (dms3ld.Node, error) { +func (n *_TypeMap__Repr) LookupByNode(key ld.Node) (ld.Node, error) { ks, err := key.AsString() if err != nil { return nil, err } return n.LookupByString(ks) } -func (_TypeMap__Repr) LookupByIndex(idx int64) (dms3ld.Node, error) { +func (_TypeMap__Repr) LookupByIndex(idx int64) (ld.Node, error) { return mixins.Map{TypeName: "schemadmt.TypeMap.Repr"}.LookupByIndex(0) } -func (n _TypeMap__Repr) LookupBySegment(seg dms3ld.PathSegment) (dms3ld.Node, error) { +func (n _TypeMap__Repr) LookupBySegment(seg ld.PathSegment) (ld.Node, error) { return n.LookupByString(seg.String()) } -func (n *_TypeMap__Repr) MapIterator() dms3ld.MapIterator { +func (n *_TypeMap__Repr) MapIterator() ld.MapIterator { return &_TypeMap__ReprMapItr{n, 0} } @@ -33435,9 +33435,9 @@ type _TypeMap__ReprMapItr struct { idx int } -func (itr *_TypeMap__ReprMapItr) Next() (k dms3ld.Node, v dms3ld.Node, _ error) { +func (itr *_TypeMap__ReprMapItr) Next() (k ld.Node, v ld.Node, _ error) { if itr.idx >= 4 { - return nil, nil, dms3ld.ErrIteratorOverread{} + return nil, nil, ld.ErrIteratorOverread{} } switch itr.idx { case 0: @@ -33461,7 +33461,7 @@ func (itr *_TypeMap__ReprMapItr) Next() (k dms3ld.Node, v dms3ld.Node, _ error) func (itr *_TypeMap__ReprMapItr) Done() bool { return itr.idx >= 4 } -func (_TypeMap__Repr) ListIterator() dms3ld.ListIterator { +func (_TypeMap__Repr) ListIterator() ld.ListIterator { return nil } func (rn *_TypeMap__Repr) Length() int64 { @@ -33489,16 +33489,16 @@ func (_TypeMap__Repr) AsString() (string, error) { func (_TypeMap__Repr) AsBytes() ([]byte, error) { return mixins.Map{TypeName: "schemadmt.TypeMap.Repr"}.AsBytes() } -func (_TypeMap__Repr) AsLink() (dms3ld.Link, error) { +func (_TypeMap__Repr) AsLink() (ld.Link, error) { return mixins.Map{TypeName: "schemadmt.TypeMap.Repr"}.AsLink() } -func (_TypeMap__Repr) Prototype() dms3ld.NodePrototype { +func (_TypeMap__Repr) Prototype() ld.NodePrototype { return _TypeMap__ReprPrototype{} } type _TypeMap__ReprPrototype struct{} -func (_TypeMap__ReprPrototype) NewBuilder() dms3ld.NodeBuilder { +func (_TypeMap__ReprPrototype) NewBuilder() ld.NodeBuilder { var nb _TypeMap__ReprBuilder nb.Reset() return &nb @@ -33508,7 +33508,7 @@ type _TypeMap__ReprBuilder struct { _TypeMap__ReprAssembler } -func (nb *_TypeMap__ReprBuilder) Build() dms3ld.Node { +func (nb *_TypeMap__ReprBuilder) Build() ld.Node { if *nb.m != schema.Maybe_Value { panic("invalid state: cannot call Build on an assembler that's not finished") } @@ -33542,7 +33542,7 @@ func (na *_TypeMap__ReprAssembler) reset() { na.ca_valueNullable.reset() na.ca_representation.reset() } -func (na *_TypeMap__ReprAssembler) BeginMap(int64) (dms3ld.MapAssembler, error) { +func (na *_TypeMap__ReprAssembler) BeginMap(int64) (ld.MapAssembler, error) { switch *na.m { case schema.Maybe_Value, schema.Maybe_Null: panic("invalid state: cannot assign into assembler that's already finished") @@ -33555,7 +33555,7 @@ func (na *_TypeMap__ReprAssembler) BeginMap(int64) (dms3ld.MapAssembler, error) } return na, nil } -func (_TypeMap__ReprAssembler) BeginList(sizeHint int64) (dms3ld.ListAssembler, error) { +func (_TypeMap__ReprAssembler) BeginList(sizeHint int64) (ld.ListAssembler, error) { return mixins.MapAssembler{TypeName: "schemadmt.TypeMap.Repr"}.BeginList(0) } func (na *_TypeMap__ReprAssembler) AssignNull() error { @@ -33587,10 +33587,10 @@ func (_TypeMap__ReprAssembler) AssignString(string) error { func (_TypeMap__ReprAssembler) AssignBytes([]byte) error { return mixins.MapAssembler{TypeName: "schemadmt.TypeMap.Repr"}.AssignBytes(nil) } -func (_TypeMap__ReprAssembler) AssignLink(dms3ld.Link) error { +func (_TypeMap__ReprAssembler) AssignLink(ld.Link) error { return mixins.MapAssembler{TypeName: "schemadmt.TypeMap.Repr"}.AssignLink(nil) } -func (na *_TypeMap__ReprAssembler) AssignNode(v dms3ld.Node) error { +func (na *_TypeMap__ReprAssembler) AssignNode(v ld.Node) error { if v.IsNull() { return na.AssignNull() } @@ -33610,8 +33610,8 @@ func (na *_TypeMap__ReprAssembler) AssignNode(v dms3ld.Node) error { *na.m = schema.Maybe_Value return nil } - if v.Kind() != dms3ld.Kind_Map { - return dms3ld.ErrWrongKind{TypeName: "schemadmt.TypeMap.Repr", MethodName: "AssignNode", AppropriateKind: dms3ld.KindSet_JustMap, ActualKind: v.Kind()} + if v.Kind() != ld.Kind_Map { + return ld.ErrWrongKind{TypeName: "schemadmt.TypeMap.Repr", MethodName: "AssignNode", AppropriateKind: ld.KindSet_JustMap, ActualKind: v.Kind()} } itr := v.MapIterator() for !itr.Done() { @@ -33628,7 +33628,7 @@ func (na *_TypeMap__ReprAssembler) AssignNode(v dms3ld.Node) error { } return na.Finish() } -func (_TypeMap__ReprAssembler) Prototype() dms3ld.NodePrototype { +func (_TypeMap__ReprAssembler) Prototype() ld.NodePrototype { return _TypeMap__ReprPrototype{} } func (ma *_TypeMap__ReprAssembler) valueFinishTidy() bool { @@ -33673,7 +33673,7 @@ func (ma *_TypeMap__ReprAssembler) valueFinishTidy() bool { panic("unreachable") } } -func (ma *_TypeMap__ReprAssembler) AssembleEntry(k string) (dms3ld.NodeAssembler, error) { +func (ma *_TypeMap__ReprAssembler) AssembleEntry(k string) (ld.NodeAssembler, error) { switch ma.state { case maState_initial: // carry on @@ -33691,7 +33691,7 @@ func (ma *_TypeMap__ReprAssembler) AssembleEntry(k string) (dms3ld.NodeAssembler switch k { case "keyType": if ma.s&fieldBit__TypeMap_KeyType != 0 { - return nil, dms3ld.ErrRepeatedMapKey{Key: &fieldName__TypeMap_KeyType_serial} + return nil, ld.ErrRepeatedMapKey{Key: &fieldName__TypeMap_KeyType_serial} } ma.s += fieldBit__TypeMap_KeyType ma.state = maState_midValue @@ -33701,7 +33701,7 @@ func (ma *_TypeMap__ReprAssembler) AssembleEntry(k string) (dms3ld.NodeAssembler return &ma.ca_keyType, nil case "valueType": if ma.s&fieldBit__TypeMap_ValueType != 0 { - return nil, dms3ld.ErrRepeatedMapKey{Key: &fieldName__TypeMap_ValueType_serial} + return nil, ld.ErrRepeatedMapKey{Key: &fieldName__TypeMap_ValueType_serial} } ma.s += fieldBit__TypeMap_ValueType ma.state = maState_midValue @@ -33711,7 +33711,7 @@ func (ma *_TypeMap__ReprAssembler) AssembleEntry(k string) (dms3ld.NodeAssembler return &ma.ca_valueType, nil case "valueNullable": if ma.s&fieldBit__TypeMap_ValueNullable != 0 { - return nil, dms3ld.ErrRepeatedMapKey{Key: &fieldName__TypeMap_ValueNullable_serial} + return nil, ld.ErrRepeatedMapKey{Key: &fieldName__TypeMap_ValueNullable_serial} } ma.s += fieldBit__TypeMap_ValueNullable ma.state = maState_midValue @@ -33721,7 +33721,7 @@ func (ma *_TypeMap__ReprAssembler) AssembleEntry(k string) (dms3ld.NodeAssembler return &ma.ca_valueNullable, nil case "representation": if ma.s&fieldBit__TypeMap_Representation != 0 { - return nil, dms3ld.ErrRepeatedMapKey{Key: &fieldName__TypeMap_Representation_serial} + return nil, ld.ErrRepeatedMapKey{Key: &fieldName__TypeMap_Representation_serial} } ma.s += fieldBit__TypeMap_Representation ma.state = maState_midValue @@ -33731,9 +33731,9 @@ func (ma *_TypeMap__ReprAssembler) AssembleEntry(k string) (dms3ld.NodeAssembler return &ma.ca_representation, nil default: } - return nil, dms3ld.ErrInvalidKey{TypeName: "schemadmt.TypeMap.Repr", Key: &_String{k}} + return nil, ld.ErrInvalidKey{TypeName: "schemadmt.TypeMap.Repr", Key: &_String{k}} } -func (ma *_TypeMap__ReprAssembler) AssembleKey() dms3ld.NodeAssembler { +func (ma *_TypeMap__ReprAssembler) AssembleKey() ld.NodeAssembler { switch ma.state { case maState_initial: // carry on @@ -33751,7 +33751,7 @@ func (ma *_TypeMap__ReprAssembler) AssembleKey() dms3ld.NodeAssembler { ma.state = maState_midKey return (*_TypeMap__ReprKeyAssembler)(ma) } -func (ma *_TypeMap__ReprAssembler) AssembleValue() dms3ld.NodeAssembler { +func (ma *_TypeMap__ReprAssembler) AssembleValue() ld.NodeAssembler { switch ma.state { case maState_initial: panic("invalid state: AssembleValue cannot be called when no key is primed") @@ -33802,7 +33802,7 @@ func (ma *_TypeMap__ReprAssembler) Finish() error { panic("invalid state: Finish cannot be called on an assembler that's already finished") } if ma.s&fieldBits__TypeMap_sufficient != fieldBits__TypeMap_sufficient { - err := dms3ld.ErrMissingRequiredField{Missing: make([]string, 0)} + err := ld.ErrMissingRequiredField{Missing: make([]string, 0)} if ma.s&fieldBit__TypeMap_KeyType == 0 { err.Missing = append(err.Missing, "keyType") } @@ -33821,19 +33821,19 @@ func (ma *_TypeMap__ReprAssembler) Finish() error { *ma.m = schema.Maybe_Value return nil } -func (ma *_TypeMap__ReprAssembler) KeyPrototype() dms3ld.NodePrototype { +func (ma *_TypeMap__ReprAssembler) KeyPrototype() ld.NodePrototype { return _String__Prototype{} } -func (ma *_TypeMap__ReprAssembler) ValuePrototype(k string) dms3ld.NodePrototype { +func (ma *_TypeMap__ReprAssembler) ValuePrototype(k string) ld.NodePrototype { panic("todo structbuilder mapassembler repr valueprototype") } type _TypeMap__ReprKeyAssembler _TypeMap__ReprAssembler -func (_TypeMap__ReprKeyAssembler) BeginMap(sizeHint int64) (dms3ld.MapAssembler, error) { +func (_TypeMap__ReprKeyAssembler) BeginMap(sizeHint int64) (ld.MapAssembler, error) { return mixins.StringAssembler{TypeName: "schemadmt.TypeMap.Repr.KeyAssembler"}.BeginMap(0) } -func (_TypeMap__ReprKeyAssembler) BeginList(sizeHint int64) (dms3ld.ListAssembler, error) { +func (_TypeMap__ReprKeyAssembler) BeginList(sizeHint int64) (ld.ListAssembler, error) { return mixins.StringAssembler{TypeName: "schemadmt.TypeMap.Repr.KeyAssembler"}.BeginList(0) } func (na *_TypeMap__ReprKeyAssembler) AssignNull() error { @@ -33855,7 +33855,7 @@ func (ka *_TypeMap__ReprKeyAssembler) AssignString(k string) error { switch k { case "keyType": if ka.s&fieldBit__TypeMap_KeyType != 0 { - return dms3ld.ErrRepeatedMapKey{Key: &fieldName__TypeMap_KeyType_serial} + return ld.ErrRepeatedMapKey{Key: &fieldName__TypeMap_KeyType_serial} } ka.s += fieldBit__TypeMap_KeyType ka.state = maState_expectValue @@ -33863,7 +33863,7 @@ func (ka *_TypeMap__ReprKeyAssembler) AssignString(k string) error { return nil case "valueType": if ka.s&fieldBit__TypeMap_ValueType != 0 { - return dms3ld.ErrRepeatedMapKey{Key: &fieldName__TypeMap_ValueType_serial} + return ld.ErrRepeatedMapKey{Key: &fieldName__TypeMap_ValueType_serial} } ka.s += fieldBit__TypeMap_ValueType ka.state = maState_expectValue @@ -33871,7 +33871,7 @@ func (ka *_TypeMap__ReprKeyAssembler) AssignString(k string) error { return nil case "valueNullable": if ka.s&fieldBit__TypeMap_ValueNullable != 0 { - return dms3ld.ErrRepeatedMapKey{Key: &fieldName__TypeMap_ValueNullable_serial} + return ld.ErrRepeatedMapKey{Key: &fieldName__TypeMap_ValueNullable_serial} } ka.s += fieldBit__TypeMap_ValueNullable ka.state = maState_expectValue @@ -33879,29 +33879,29 @@ func (ka *_TypeMap__ReprKeyAssembler) AssignString(k string) error { return nil case "representation": if ka.s&fieldBit__TypeMap_Representation != 0 { - return dms3ld.ErrRepeatedMapKey{Key: &fieldName__TypeMap_Representation_serial} + return ld.ErrRepeatedMapKey{Key: &fieldName__TypeMap_Representation_serial} } ka.s += fieldBit__TypeMap_Representation ka.state = maState_expectValue ka.f = 3 return nil } - return dms3ld.ErrInvalidKey{TypeName: "schemadmt.TypeMap.Repr", Key: &_String{k}} + return ld.ErrInvalidKey{TypeName: "schemadmt.TypeMap.Repr", Key: &_String{k}} } func (_TypeMap__ReprKeyAssembler) AssignBytes([]byte) error { return mixins.StringAssembler{TypeName: "schemadmt.TypeMap.Repr.KeyAssembler"}.AssignBytes(nil) } -func (_TypeMap__ReprKeyAssembler) AssignLink(dms3ld.Link) error { +func (_TypeMap__ReprKeyAssembler) AssignLink(ld.Link) error { return mixins.StringAssembler{TypeName: "schemadmt.TypeMap.Repr.KeyAssembler"}.AssignLink(nil) } -func (ka *_TypeMap__ReprKeyAssembler) AssignNode(v dms3ld.Node) error { +func (ka *_TypeMap__ReprKeyAssembler) AssignNode(v ld.Node) error { if v2, err := v.AsString(); err != nil { return err } else { return ka.AssignString(v2) } } -func (_TypeMap__ReprKeyAssembler) Prototype() dms3ld.NodePrototype { +func (_TypeMap__ReprKeyAssembler) Prototype() ld.NodePrototype { return _String__Prototype{} } @@ -33932,12 +33932,12 @@ func (m MaybeTypeName) IsAbsent() bool { func (m MaybeTypeName) Exists() bool { return m.m == schema.Maybe_Value } -func (m MaybeTypeName) AsNode() dms3ld.Node { +func (m MaybeTypeName) AsNode() ld.Node { switch m.m { case schema.Maybe_Absent: - return dms3ld.Absent + return ld.Absent case schema.Maybe_Null: - return dms3ld.Null + return ld.Null case schema.Maybe_Value: return &m.v default: @@ -33951,28 +33951,28 @@ func (m MaybeTypeName) Must() TypeName { return &m.v } -var _ dms3ld.Node = (TypeName)(&_TypeName{}) +var _ ld.Node = (TypeName)(&_TypeName{}) var _ schema.TypedNode = (TypeName)(&_TypeName{}) -func (TypeName) Kind() dms3ld.Kind { - return dms3ld.Kind_String +func (TypeName) Kind() ld.Kind { + return ld.Kind_String } -func (TypeName) LookupByString(string) (dms3ld.Node, error) { +func (TypeName) LookupByString(string) (ld.Node, error) { return mixins.String{TypeName: "schemadmt.TypeName"}.LookupByString("") } -func (TypeName) LookupByNode(dms3ld.Node) (dms3ld.Node, error) { +func (TypeName) LookupByNode(ld.Node) (ld.Node, error) { return mixins.String{TypeName: "schemadmt.TypeName"}.LookupByNode(nil) } -func (TypeName) LookupByIndex(idx int64) (dms3ld.Node, error) { +func (TypeName) LookupByIndex(idx int64) (ld.Node, error) { return mixins.String{TypeName: "schemadmt.TypeName"}.LookupByIndex(0) } -func (TypeName) LookupBySegment(seg dms3ld.PathSegment) (dms3ld.Node, error) { +func (TypeName) LookupBySegment(seg ld.PathSegment) (ld.Node, error) { return mixins.String{TypeName: "schemadmt.TypeName"}.LookupBySegment(seg) } -func (TypeName) MapIterator() dms3ld.MapIterator { +func (TypeName) MapIterator() ld.MapIterator { return nil } -func (TypeName) ListIterator() dms3ld.ListIterator { +func (TypeName) ListIterator() ld.ListIterator { return nil } func (TypeName) Length() int64 { @@ -33999,16 +33999,16 @@ func (n TypeName) AsString() (string, error) { func (TypeName) AsBytes() ([]byte, error) { return mixins.String{TypeName: "schemadmt.TypeName"}.AsBytes() } -func (TypeName) AsLink() (dms3ld.Link, error) { +func (TypeName) AsLink() (ld.Link, error) { return mixins.String{TypeName: "schemadmt.TypeName"}.AsLink() } -func (TypeName) Prototype() dms3ld.NodePrototype { +func (TypeName) Prototype() ld.NodePrototype { return _TypeName__Prototype{} } type _TypeName__Prototype struct{} -func (_TypeName__Prototype) NewBuilder() dms3ld.NodeBuilder { +func (_TypeName__Prototype) NewBuilder() ld.NodeBuilder { var nb _TypeName__Builder nb.Reset() return &nb @@ -34018,7 +34018,7 @@ type _TypeName__Builder struct { _TypeName__Assembler } -func (nb *_TypeName__Builder) Build() dms3ld.Node { +func (nb *_TypeName__Builder) Build() ld.Node { if *nb.m != schema.Maybe_Value { panic("invalid state: cannot call Build on an assembler that's not finished") } @@ -34036,10 +34036,10 @@ type _TypeName__Assembler struct { } func (na *_TypeName__Assembler) reset() {} -func (_TypeName__Assembler) BeginMap(sizeHint int64) (dms3ld.MapAssembler, error) { +func (_TypeName__Assembler) BeginMap(sizeHint int64) (ld.MapAssembler, error) { return mixins.StringAssembler{TypeName: "schemadmt.TypeName"}.BeginMap(0) } -func (_TypeName__Assembler) BeginList(sizeHint int64) (dms3ld.ListAssembler, error) { +func (_TypeName__Assembler) BeginList(sizeHint int64) (ld.ListAssembler, error) { return mixins.StringAssembler{TypeName: "schemadmt.TypeName"}.BeginList(0) } func (na *_TypeName__Assembler) AssignNull() error { @@ -34075,10 +34075,10 @@ func (na *_TypeName__Assembler) AssignString(v string) error { func (_TypeName__Assembler) AssignBytes([]byte) error { return mixins.StringAssembler{TypeName: "schemadmt.TypeName"}.AssignBytes(nil) } -func (_TypeName__Assembler) AssignLink(dms3ld.Link) error { +func (_TypeName__Assembler) AssignLink(ld.Link) error { return mixins.StringAssembler{TypeName: "schemadmt.TypeName"}.AssignLink(nil) } -func (na *_TypeName__Assembler) AssignNode(v dms3ld.Node) error { +func (na *_TypeName__Assembler) AssignNode(v ld.Node) error { if v.IsNull() { return na.AssignNull() } @@ -34097,19 +34097,19 @@ func (na *_TypeName__Assembler) AssignNode(v dms3ld.Node) error { return na.AssignString(v2) } } -func (_TypeName__Assembler) Prototype() dms3ld.NodePrototype { +func (_TypeName__Assembler) Prototype() ld.NodePrototype { return _TypeName__Prototype{} } func (TypeName) Type() schema.Type { return nil /*TODO:typelit*/ } -func (n TypeName) Representation() dms3ld.Node { +func (n TypeName) Representation() ld.Node { return (*_TypeName__Repr)(n) } type _TypeName__Repr = _TypeName -var _ dms3ld.Node = &_TypeName__Repr{} +var _ ld.Node = &_TypeName__Repr{} type _TypeName__ReprPrototype = _TypeName__Prototype type _TypeName__ReprAssembler = _TypeName__Assembler @@ -34140,12 +34140,12 @@ func (m MaybeTypeNameOrInlineDefn) IsAbsent() bool { func (m MaybeTypeNameOrInlineDefn) Exists() bool { return m.m == schema.Maybe_Value } -func (m MaybeTypeNameOrInlineDefn) AsNode() dms3ld.Node { +func (m MaybeTypeNameOrInlineDefn) AsNode() ld.Node { switch m.m { case schema.Maybe_Absent: - return dms3ld.Absent + return ld.Absent case schema.Maybe_Null: - return dms3ld.Null + return ld.Null case schema.Maybe_Value: return m.v default: @@ -34163,42 +34163,42 @@ var ( memberName__TypeNameOrInlineDefn_TypeName = _String{"TypeName"} memberName__TypeNameOrInlineDefn_TypeDefnInline = _String{"TypeDefnInline"} ) -var _ dms3ld.Node = (TypeNameOrInlineDefn)(&_TypeNameOrInlineDefn{}) +var _ ld.Node = (TypeNameOrInlineDefn)(&_TypeNameOrInlineDefn{}) var _ schema.TypedNode = (TypeNameOrInlineDefn)(&_TypeNameOrInlineDefn{}) -func (TypeNameOrInlineDefn) Kind() dms3ld.Kind { - return dms3ld.Kind_Map +func (TypeNameOrInlineDefn) Kind() ld.Kind { + return ld.Kind_Map } -func (n TypeNameOrInlineDefn) LookupByString(key string) (dms3ld.Node, error) { +func (n TypeNameOrInlineDefn) LookupByString(key string) (ld.Node, error) { switch key { case "TypeName": if n.tag != 1 { - return nil, dms3ld.ErrNotExists{Segment: dms3ld.PathSegmentOfString(key)} + return nil, ld.ErrNotExists{Segment: ld.PathSegmentOfString(key)} } return &n.x1, nil case "TypeDefnInline": if n.tag != 2 { - return nil, dms3ld.ErrNotExists{Segment: dms3ld.PathSegmentOfString(key)} + return nil, ld.ErrNotExists{Segment: ld.PathSegmentOfString(key)} } return &n.x2, nil default: - return nil, schema.ErrNoSuchField{Type: nil /*TODO*/, Field: dms3ld.PathSegmentOfString(key)} + return nil, schema.ErrNoSuchField{Type: nil /*TODO*/, Field: ld.PathSegmentOfString(key)} } } -func (n TypeNameOrInlineDefn) LookupByNode(key dms3ld.Node) (dms3ld.Node, error) { +func (n TypeNameOrInlineDefn) LookupByNode(key ld.Node) (ld.Node, error) { ks, err := key.AsString() if err != nil { return nil, err } return n.LookupByString(ks) } -func (TypeNameOrInlineDefn) LookupByIndex(idx int64) (dms3ld.Node, error) { +func (TypeNameOrInlineDefn) LookupByIndex(idx int64) (ld.Node, error) { return mixins.Map{TypeName: "schemadmt.TypeNameOrInlineDefn"}.LookupByIndex(0) } -func (n TypeNameOrInlineDefn) LookupBySegment(seg dms3ld.PathSegment) (dms3ld.Node, error) { +func (n TypeNameOrInlineDefn) LookupBySegment(seg ld.PathSegment) (ld.Node, error) { return n.LookupByString(seg.String()) } -func (n TypeNameOrInlineDefn) MapIterator() dms3ld.MapIterator { +func (n TypeNameOrInlineDefn) MapIterator() ld.MapIterator { return &_TypeNameOrInlineDefn__MapItr{n, false} } @@ -34207,9 +34207,9 @@ type _TypeNameOrInlineDefn__MapItr struct { done bool } -func (itr *_TypeNameOrInlineDefn__MapItr) Next() (k dms3ld.Node, v dms3ld.Node, _ error) { +func (itr *_TypeNameOrInlineDefn__MapItr) Next() (k ld.Node, v ld.Node, _ error) { if itr.done { - return nil, nil, dms3ld.ErrIteratorOverread{} + return nil, nil, ld.ErrIteratorOverread{} } switch itr.n.tag { case 1: @@ -34226,7 +34226,7 @@ func (itr *_TypeNameOrInlineDefn__MapItr) Done() bool { return itr.done } -func (TypeNameOrInlineDefn) ListIterator() dms3ld.ListIterator { +func (TypeNameOrInlineDefn) ListIterator() ld.ListIterator { return nil } func (TypeNameOrInlineDefn) Length() int64 { @@ -34253,16 +34253,16 @@ func (TypeNameOrInlineDefn) AsString() (string, error) { func (TypeNameOrInlineDefn) AsBytes() ([]byte, error) { return mixins.Map{TypeName: "schemadmt.TypeNameOrInlineDefn"}.AsBytes() } -func (TypeNameOrInlineDefn) AsLink() (dms3ld.Link, error) { +func (TypeNameOrInlineDefn) AsLink() (ld.Link, error) { return mixins.Map{TypeName: "schemadmt.TypeNameOrInlineDefn"}.AsLink() } -func (TypeNameOrInlineDefn) Prototype() dms3ld.NodePrototype { +func (TypeNameOrInlineDefn) Prototype() ld.NodePrototype { return _TypeNameOrInlineDefn__Prototype{} } type _TypeNameOrInlineDefn__Prototype struct{} -func (_TypeNameOrInlineDefn__Prototype) NewBuilder() dms3ld.NodeBuilder { +func (_TypeNameOrInlineDefn__Prototype) NewBuilder() ld.NodeBuilder { var nb _TypeNameOrInlineDefn__Builder nb.Reset() return &nb @@ -34272,7 +34272,7 @@ type _TypeNameOrInlineDefn__Builder struct { _TypeNameOrInlineDefn__Assembler } -func (nb *_TypeNameOrInlineDefn__Builder) Build() dms3ld.Node { +func (nb *_TypeNameOrInlineDefn__Builder) Build() ld.Node { if *nb.m != schema.Maybe_Value { panic("invalid state: cannot call Build on an assembler that's not finished") } @@ -34312,7 +34312,7 @@ func (na *_TypeNameOrInlineDefn__Assembler) reset() { na.ca = 0 na.cm = schema.Maybe_Absent } -func (na *_TypeNameOrInlineDefn__Assembler) BeginMap(int64) (dms3ld.MapAssembler, error) { +func (na *_TypeNameOrInlineDefn__Assembler) BeginMap(int64) (ld.MapAssembler, error) { switch *na.m { case schema.Maybe_Value, schema.Maybe_Null: panic("invalid state: cannot assign into assembler that's already finished") @@ -34325,7 +34325,7 @@ func (na *_TypeNameOrInlineDefn__Assembler) BeginMap(int64) (dms3ld.MapAssembler } return na, nil } -func (_TypeNameOrInlineDefn__Assembler) BeginList(sizeHint int64) (dms3ld.ListAssembler, error) { +func (_TypeNameOrInlineDefn__Assembler) BeginList(sizeHint int64) (ld.ListAssembler, error) { return mixins.MapAssembler{TypeName: "schemadmt.TypeNameOrInlineDefn"}.BeginList(0) } func (na *_TypeNameOrInlineDefn__Assembler) AssignNull() error { @@ -34357,10 +34357,10 @@ func (_TypeNameOrInlineDefn__Assembler) AssignString(string) error { func (_TypeNameOrInlineDefn__Assembler) AssignBytes([]byte) error { return mixins.MapAssembler{TypeName: "schemadmt.TypeNameOrInlineDefn"}.AssignBytes(nil) } -func (_TypeNameOrInlineDefn__Assembler) AssignLink(dms3ld.Link) error { +func (_TypeNameOrInlineDefn__Assembler) AssignLink(ld.Link) error { return mixins.MapAssembler{TypeName: "schemadmt.TypeNameOrInlineDefn"}.AssignLink(nil) } -func (na *_TypeNameOrInlineDefn__Assembler) AssignNode(v dms3ld.Node) error { +func (na *_TypeNameOrInlineDefn__Assembler) AssignNode(v ld.Node) error { if v.IsNull() { return na.AssignNull() } @@ -34380,8 +34380,8 @@ func (na *_TypeNameOrInlineDefn__Assembler) AssignNode(v dms3ld.Node) error { *na.m = schema.Maybe_Value return nil } - if v.Kind() != dms3ld.Kind_Map { - return dms3ld.ErrWrongKind{TypeName: "schemadmt.TypeNameOrInlineDefn", MethodName: "AssignNode", AppropriateKind: dms3ld.KindSet_JustMap, ActualKind: v.Kind()} + if v.Kind() != ld.Kind_Map { + return ld.ErrWrongKind{TypeName: "schemadmt.TypeNameOrInlineDefn", MethodName: "AssignNode", AppropriateKind: ld.KindSet_JustMap, ActualKind: v.Kind()} } itr := v.MapIterator() for !itr.Done() { @@ -34398,7 +34398,7 @@ func (na *_TypeNameOrInlineDefn__Assembler) AssignNode(v dms3ld.Node) error { } return na.Finish() } -func (_TypeNameOrInlineDefn__Assembler) Prototype() dms3ld.NodePrototype { +func (_TypeNameOrInlineDefn__Assembler) Prototype() ld.NodePrototype { return _TypeNameOrInlineDefn__Prototype{} } func (ma *_TypeNameOrInlineDefn__Assembler) valueFinishTidy() bool { @@ -34410,7 +34410,7 @@ func (ma *_TypeNameOrInlineDefn__Assembler) valueFinishTidy() bool { return false } } -func (ma *_TypeNameOrInlineDefn__Assembler) AssembleEntry(k string) (dms3ld.NodeAssembler, error) { +func (ma *_TypeNameOrInlineDefn__Assembler) AssembleEntry(k string) (ld.NodeAssembler, error) { switch ma.state { case maState_initial: // carry on @@ -34444,9 +34444,9 @@ func (ma *_TypeNameOrInlineDefn__Assembler) AssembleEntry(k string) (dms3ld.Node ma.ca2.m = &ma.cm return &ma.ca2, nil } - return nil, dms3ld.ErrInvalidKey{TypeName: "schemadmt.TypeNameOrInlineDefn", Key: &_String{k}} + return nil, ld.ErrInvalidKey{TypeName: "schemadmt.TypeNameOrInlineDefn", Key: &_String{k}} } -func (ma *_TypeNameOrInlineDefn__Assembler) AssembleKey() dms3ld.NodeAssembler { +func (ma *_TypeNameOrInlineDefn__Assembler) AssembleKey() ld.NodeAssembler { switch ma.state { case maState_initial: // carry on @@ -34464,7 +34464,7 @@ func (ma *_TypeNameOrInlineDefn__Assembler) AssembleKey() dms3ld.NodeAssembler { ma.state = maState_midKey return (*_TypeNameOrInlineDefn__KeyAssembler)(ma) } -func (ma *_TypeNameOrInlineDefn__Assembler) AssembleValue() dms3ld.NodeAssembler { +func (ma *_TypeNameOrInlineDefn__Assembler) AssembleValue() ld.NodeAssembler { switch ma.state { case maState_initial: panic("invalid state: AssembleValue cannot be called when no key is primed") @@ -34513,10 +34513,10 @@ func (ma *_TypeNameOrInlineDefn__Assembler) Finish() error { *ma.m = schema.Maybe_Value return nil } -func (ma *_TypeNameOrInlineDefn__Assembler) KeyPrototype() dms3ld.NodePrototype { +func (ma *_TypeNameOrInlineDefn__Assembler) KeyPrototype() ld.NodePrototype { return _String__Prototype{} } -func (ma *_TypeNameOrInlineDefn__Assembler) ValuePrototype(k string) dms3ld.NodePrototype { +func (ma *_TypeNameOrInlineDefn__Assembler) ValuePrototype(k string) ld.NodePrototype { switch k { case "TypeName": return _TypeName__Prototype{} @@ -34529,10 +34529,10 @@ func (ma *_TypeNameOrInlineDefn__Assembler) ValuePrototype(k string) dms3ld.Node type _TypeNameOrInlineDefn__KeyAssembler _TypeNameOrInlineDefn__Assembler -func (_TypeNameOrInlineDefn__KeyAssembler) BeginMap(sizeHint int64) (dms3ld.MapAssembler, error) { +func (_TypeNameOrInlineDefn__KeyAssembler) BeginMap(sizeHint int64) (ld.MapAssembler, error) { return mixins.StringAssembler{TypeName: "schemadmt.TypeNameOrInlineDefn.KeyAssembler"}.BeginMap(0) } -func (_TypeNameOrInlineDefn__KeyAssembler) BeginList(sizeHint int64) (dms3ld.ListAssembler, error) { +func (_TypeNameOrInlineDefn__KeyAssembler) BeginList(sizeHint int64) (ld.ListAssembler, error) { return mixins.StringAssembler{TypeName: "schemadmt.TypeNameOrInlineDefn.KeyAssembler"}.BeginList(0) } func (na *_TypeNameOrInlineDefn__KeyAssembler) AssignNull() error { @@ -34566,73 +34566,73 @@ func (ka *_TypeNameOrInlineDefn__KeyAssembler) AssignString(k string) error { ka.state = maState_expectValue return nil } - return dms3ld.ErrInvalidKey{TypeName: "schemadmt.TypeNameOrInlineDefn", Key: &_String{k}} // TODO: error quality: ErrInvalidUnionDiscriminant ? + return ld.ErrInvalidKey{TypeName: "schemadmt.TypeNameOrInlineDefn", Key: &_String{k}} // TODO: error quality: ErrInvalidUnionDiscriminant ? } func (_TypeNameOrInlineDefn__KeyAssembler) AssignBytes([]byte) error { return mixins.StringAssembler{TypeName: "schemadmt.TypeNameOrInlineDefn.KeyAssembler"}.AssignBytes(nil) } -func (_TypeNameOrInlineDefn__KeyAssembler) AssignLink(dms3ld.Link) error { +func (_TypeNameOrInlineDefn__KeyAssembler) AssignLink(ld.Link) error { return mixins.StringAssembler{TypeName: "schemadmt.TypeNameOrInlineDefn.KeyAssembler"}.AssignLink(nil) } -func (ka *_TypeNameOrInlineDefn__KeyAssembler) AssignNode(v dms3ld.Node) error { +func (ka *_TypeNameOrInlineDefn__KeyAssembler) AssignNode(v ld.Node) error { if v2, err := v.AsString(); err != nil { return err } else { return ka.AssignString(v2) } } -func (_TypeNameOrInlineDefn__KeyAssembler) Prototype() dms3ld.NodePrototype { +func (_TypeNameOrInlineDefn__KeyAssembler) Prototype() ld.NodePrototype { return _String__Prototype{} } func (TypeNameOrInlineDefn) Type() schema.Type { return nil /*TODO:typelit*/ } -func (n TypeNameOrInlineDefn) Representation() dms3ld.Node { +func (n TypeNameOrInlineDefn) Representation() ld.Node { return (*_TypeNameOrInlineDefn__Repr)(n) } type _TypeNameOrInlineDefn__Repr _TypeNameOrInlineDefn -var _ dms3ld.Node = &_TypeNameOrInlineDefn__Repr{} +var _ ld.Node = &_TypeNameOrInlineDefn__Repr{} -func (n *_TypeNameOrInlineDefn__Repr) Kind() dms3ld.Kind { +func (n *_TypeNameOrInlineDefn__Repr) Kind() ld.Kind { switch n.tag { case 1: - return dms3ld.Kind_String + return ld.Kind_String case 2: - return dms3ld.Kind_Map + return ld.Kind_Map default: panic("unreachable") } } -func (n *_TypeNameOrInlineDefn__Repr) LookupByString(key string) (dms3ld.Node, error) { +func (n *_TypeNameOrInlineDefn__Repr) LookupByString(key string) (ld.Node, error) { switch n.tag { case 2: return n.x2.Representation().LookupByString(key) default: - return nil, dms3ld.ErrWrongKind{TypeName: "schemadmt.TypeNameOrInlineDefn.Repr", MethodName: "LookupByString", AppropriateKind: dms3ld.KindSet_JustMap, ActualKind: n.Kind()} + return nil, ld.ErrWrongKind{TypeName: "schemadmt.TypeNameOrInlineDefn.Repr", MethodName: "LookupByString", AppropriateKind: ld.KindSet_JustMap, ActualKind: n.Kind()} } } -func (n *_TypeNameOrInlineDefn__Repr) LookupByNode(key dms3ld.Node) (dms3ld.Node, error) { +func (n *_TypeNameOrInlineDefn__Repr) LookupByNode(key ld.Node) (ld.Node, error) { switch n.tag { case 2: return n.x2.Representation().LookupByNode(key) default: - return nil, dms3ld.ErrWrongKind{TypeName: "schemadmt.TypeNameOrInlineDefn.Repr", MethodName: "LookupByNode", AppropriateKind: dms3ld.KindSet_Recursive, ActualKind: n.Kind()} + return nil, ld.ErrWrongKind{TypeName: "schemadmt.TypeNameOrInlineDefn.Repr", MethodName: "LookupByNode", AppropriateKind: ld.KindSet_Recursive, ActualKind: n.Kind()} } } -func (n *_TypeNameOrInlineDefn__Repr) LookupByIndex(idx int64) (dms3ld.Node, error) { - return nil, dms3ld.ErrWrongKind{TypeName: "schemadmt.TypeNameOrInlineDefn.Repr", MethodName: "LookupByIndex", AppropriateKind: dms3ld.KindSet_JustList, ActualKind: n.Kind()} +func (n *_TypeNameOrInlineDefn__Repr) LookupByIndex(idx int64) (ld.Node, error) { + return nil, ld.ErrWrongKind{TypeName: "schemadmt.TypeNameOrInlineDefn.Repr", MethodName: "LookupByIndex", AppropriateKind: ld.KindSet_JustList, ActualKind: n.Kind()} } -func (n *_TypeNameOrInlineDefn__Repr) LookupBySegment(seg dms3ld.PathSegment) (dms3ld.Node, error) { +func (n *_TypeNameOrInlineDefn__Repr) LookupBySegment(seg ld.PathSegment) (ld.Node, error) { switch n.tag { case 2: return n.x2.Representation().LookupBySegment(seg) default: - return nil, dms3ld.ErrWrongKind{TypeName: "schemadmt.TypeNameOrInlineDefn.Repr", MethodName: "LookupBySegment", AppropriateKind: dms3ld.KindSet_Recursive, ActualKind: n.Kind()} + return nil, ld.ErrWrongKind{TypeName: "schemadmt.TypeNameOrInlineDefn.Repr", MethodName: "LookupBySegment", AppropriateKind: ld.KindSet_Recursive, ActualKind: n.Kind()} } } -func (n *_TypeNameOrInlineDefn__Repr) MapIterator() dms3ld.MapIterator { +func (n *_TypeNameOrInlineDefn__Repr) MapIterator() ld.MapIterator { switch n.tag { case 2: return n.x2.Representation().MapIterator() @@ -34640,7 +34640,7 @@ func (n *_TypeNameOrInlineDefn__Repr) MapIterator() dms3ld.MapIterator { return nil } } -func (n *_TypeNameOrInlineDefn__Repr) ListIterator() dms3ld.ListIterator { +func (n *_TypeNameOrInlineDefn__Repr) ListIterator() ld.ListIterator { return nil } func (n *_TypeNameOrInlineDefn__Repr) Length() int64 { @@ -34658,35 +34658,35 @@ func (n *_TypeNameOrInlineDefn__Repr) IsNull() bool { return false } func (n *_TypeNameOrInlineDefn__Repr) AsBool() (bool, error) { - return false, dms3ld.ErrWrongKind{TypeName: "schemadmt.TypeNameOrInlineDefn.Repr", MethodName: "AsBool", AppropriateKind: dms3ld.KindSet_JustBool, ActualKind: n.Kind()} + return false, ld.ErrWrongKind{TypeName: "schemadmt.TypeNameOrInlineDefn.Repr", MethodName: "AsBool", AppropriateKind: ld.KindSet_JustBool, ActualKind: n.Kind()} } func (n *_TypeNameOrInlineDefn__Repr) AsInt() (int64, error) { - return 0, dms3ld.ErrWrongKind{TypeName: "schemadmt.TypeNameOrInlineDefn.Repr", MethodName: "AsInt", AppropriateKind: dms3ld.KindSet_JustInt, ActualKind: n.Kind()} + return 0, ld.ErrWrongKind{TypeName: "schemadmt.TypeNameOrInlineDefn.Repr", MethodName: "AsInt", AppropriateKind: ld.KindSet_JustInt, ActualKind: n.Kind()} } func (n *_TypeNameOrInlineDefn__Repr) AsFloat() (float64, error) { - return 0, dms3ld.ErrWrongKind{TypeName: "schemadmt.TypeNameOrInlineDefn.Repr", MethodName: "AsFloat", AppropriateKind: dms3ld.KindSet_JustFloat, ActualKind: n.Kind()} + return 0, ld.ErrWrongKind{TypeName: "schemadmt.TypeNameOrInlineDefn.Repr", MethodName: "AsFloat", AppropriateKind: ld.KindSet_JustFloat, ActualKind: n.Kind()} } func (n *_TypeNameOrInlineDefn__Repr) AsString() (string, error) { switch n.tag { case 1: return n.x1.Representation().AsString() default: - return "", dms3ld.ErrWrongKind{TypeName: "schemadmt.TypeNameOrInlineDefn.Repr", MethodName: "AsString", AppropriateKind: dms3ld.KindSet_JustString, ActualKind: n.Kind()} + return "", ld.ErrWrongKind{TypeName: "schemadmt.TypeNameOrInlineDefn.Repr", MethodName: "AsString", AppropriateKind: ld.KindSet_JustString, ActualKind: n.Kind()} } } func (n *_TypeNameOrInlineDefn__Repr) AsBytes() ([]byte, error) { - return nil, dms3ld.ErrWrongKind{TypeName: "schemadmt.TypeNameOrInlineDefn.Repr", MethodName: "AsBytes", AppropriateKind: dms3ld.KindSet_JustBytes, ActualKind: n.Kind()} + return nil, ld.ErrWrongKind{TypeName: "schemadmt.TypeNameOrInlineDefn.Repr", MethodName: "AsBytes", AppropriateKind: ld.KindSet_JustBytes, ActualKind: n.Kind()} } -func (n *_TypeNameOrInlineDefn__Repr) AsLink() (dms3ld.Link, error) { - return nil, dms3ld.ErrWrongKind{TypeName: "schemadmt.TypeNameOrInlineDefn.Repr", MethodName: "AsLink", AppropriateKind: dms3ld.KindSet_JustLink, ActualKind: n.Kind()} +func (n *_TypeNameOrInlineDefn__Repr) AsLink() (ld.Link, error) { + return nil, ld.ErrWrongKind{TypeName: "schemadmt.TypeNameOrInlineDefn.Repr", MethodName: "AsLink", AppropriateKind: ld.KindSet_JustLink, ActualKind: n.Kind()} } -func (_TypeNameOrInlineDefn__Repr) Prototype() dms3ld.NodePrototype { +func (_TypeNameOrInlineDefn__Repr) Prototype() ld.NodePrototype { return _TypeNameOrInlineDefn__ReprPrototype{} } type _TypeNameOrInlineDefn__ReprPrototype struct{} -func (_TypeNameOrInlineDefn__ReprPrototype) NewBuilder() dms3ld.NodeBuilder { +func (_TypeNameOrInlineDefn__ReprPrototype) NewBuilder() ld.NodeBuilder { var nb _TypeNameOrInlineDefn__ReprBuilder nb.Reset() return &nb @@ -34696,7 +34696,7 @@ type _TypeNameOrInlineDefn__ReprBuilder struct { _TypeNameOrInlineDefn__ReprAssembler } -func (nb *_TypeNameOrInlineDefn__ReprBuilder) Build() dms3ld.Node { +func (nb *_TypeNameOrInlineDefn__ReprBuilder) Build() ld.Node { if *nb.m != schema.Maybe_Value { panic("invalid state: cannot call Build on an assembler that's not finished") } @@ -34729,7 +34729,7 @@ func (na *_TypeNameOrInlineDefn__ReprAssembler) reset() { } na.ca = 0 } -func (na *_TypeNameOrInlineDefn__ReprAssembler) BeginMap(sizeHint int64) (dms3ld.MapAssembler, error) { +func (na *_TypeNameOrInlineDefn__ReprAssembler) BeginMap(sizeHint int64) (ld.MapAssembler, error) { switch *na.m { case schema.Maybe_Value, schema.Maybe_Null: panic("invalid state: cannot assign into assembler that's already finished") @@ -34745,7 +34745,7 @@ func (na *_TypeNameOrInlineDefn__ReprAssembler) BeginMap(sizeHint int64) (dms3ld na.ca2.m = na.m return na.ca2.BeginMap(sizeHint) } -func (na *_TypeNameOrInlineDefn__ReprAssembler) BeginList(sizeHint int64) (dms3ld.ListAssembler, error) { +func (na *_TypeNameOrInlineDefn__ReprAssembler) BeginList(sizeHint int64) (ld.ListAssembler, error) { switch *na.m { case schema.Maybe_Value, schema.Maybe_Null: panic("invalid state: cannot assign into assembler that's already finished") @@ -34815,7 +34815,7 @@ func (na *_TypeNameOrInlineDefn__ReprAssembler) AssignBytes(v []byte) error { } return schema.ErrNotUnionStructure{TypeName: "schemadmt.TypeNameOrInlineDefn.Repr", Detail: "AssignBytes called but is not valid for any of the kinds that are valid members of this union"} } -func (na *_TypeNameOrInlineDefn__ReprAssembler) AssignLink(v dms3ld.Link) error { +func (na *_TypeNameOrInlineDefn__ReprAssembler) AssignLink(v ld.Link) error { switch *na.m { case schema.Maybe_Value, schema.Maybe_Null: panic("invalid state: cannot assign into assembler that's already finished") @@ -34824,7 +34824,7 @@ func (na *_TypeNameOrInlineDefn__ReprAssembler) AssignLink(v dms3ld.Link) error } return schema.ErrNotUnionStructure{TypeName: "schemadmt.TypeNameOrInlineDefn.Repr", Detail: "AssignLink called but is not valid for any of the kinds that are valid members of this union"} } -func (na *_TypeNameOrInlineDefn__ReprAssembler) AssignNode(v dms3ld.Node) error { +func (na *_TypeNameOrInlineDefn__ReprAssembler) AssignNode(v ld.Node) error { if v.IsNull() { return na.AssignNull() } @@ -34845,22 +34845,22 @@ func (na *_TypeNameOrInlineDefn__ReprAssembler) AssignNode(v dms3ld.Node) error return nil } switch v.Kind() { - case dms3ld.Kind_Bool: + case ld.Kind_Bool: v2, _ := v.AsBool() return na.AssignBool(v2) - case dms3ld.Kind_Int: + case ld.Kind_Int: v2, _ := v.AsInt() return na.AssignInt(v2) - case dms3ld.Kind_Float: + case ld.Kind_Float: v2, _ := v.AsFloat() return na.AssignFloat(v2) - case dms3ld.Kind_String: + case ld.Kind_String: v2, _ := v.AsString() return na.AssignString(v2) - case dms3ld.Kind_Bytes: + case ld.Kind_Bytes: v2, _ := v.AsBytes() return na.AssignBytes(v2) - case dms3ld.Kind_Map: + case ld.Kind_Map: na, err := na.BeginMap(v.Length()) if err != nil { return err @@ -34879,7 +34879,7 @@ func (na *_TypeNameOrInlineDefn__ReprAssembler) AssignNode(v dms3ld.Node) error } } return na.Finish() - case dms3ld.Kind_List: + case ld.Kind_List: na, err := na.BeginList(v.Length()) if err != nil { return err @@ -34895,14 +34895,14 @@ func (na *_TypeNameOrInlineDefn__ReprAssembler) AssignNode(v dms3ld.Node) error } } return na.Finish() - case dms3ld.Kind_Link: + case ld.Kind_Link: v2, _ := v.AsLink() return na.AssignLink(v2) default: panic("unreachable") } } -func (na *_TypeNameOrInlineDefn__ReprAssembler) Prototype() dms3ld.NodePrototype { +func (na *_TypeNameOrInlineDefn__ReprAssembler) Prototype() ld.NodePrototype { return _TypeNameOrInlineDefn__ReprPrototype{} } @@ -34921,12 +34921,12 @@ func (m MaybeTypeString) IsAbsent() bool { func (m MaybeTypeString) Exists() bool { return m.m == schema.Maybe_Value } -func (m MaybeTypeString) AsNode() dms3ld.Node { +func (m MaybeTypeString) AsNode() ld.Node { switch m.m { case schema.Maybe_Absent: - return dms3ld.Absent + return ld.Absent case schema.Maybe_Null: - return dms3ld.Null + return ld.Null case schema.Maybe_Value: return m.v default: @@ -34941,32 +34941,32 @@ func (m MaybeTypeString) Must() TypeString { } var () -var _ dms3ld.Node = (TypeString)(&_TypeString{}) +var _ ld.Node = (TypeString)(&_TypeString{}) var _ schema.TypedNode = (TypeString)(&_TypeString{}) -func (TypeString) Kind() dms3ld.Kind { - return dms3ld.Kind_Map +func (TypeString) Kind() ld.Kind { + return ld.Kind_Map } -func (n TypeString) LookupByString(key string) (dms3ld.Node, error) { +func (n TypeString) LookupByString(key string) (ld.Node, error) { switch key { default: - return nil, schema.ErrNoSuchField{Type: nil /*TODO*/, Field: dms3ld.PathSegmentOfString(key)} + return nil, schema.ErrNoSuchField{Type: nil /*TODO*/, Field: ld.PathSegmentOfString(key)} } } -func (n TypeString) LookupByNode(key dms3ld.Node) (dms3ld.Node, error) { +func (n TypeString) LookupByNode(key ld.Node) (ld.Node, error) { ks, err := key.AsString() if err != nil { return nil, err } return n.LookupByString(ks) } -func (TypeString) LookupByIndex(idx int64) (dms3ld.Node, error) { +func (TypeString) LookupByIndex(idx int64) (ld.Node, error) { return mixins.Map{TypeName: "schemadmt.TypeString"}.LookupByIndex(0) } -func (n TypeString) LookupBySegment(seg dms3ld.PathSegment) (dms3ld.Node, error) { +func (n TypeString) LookupBySegment(seg ld.PathSegment) (ld.Node, error) { return n.LookupByString(seg.String()) } -func (n TypeString) MapIterator() dms3ld.MapIterator { +func (n TypeString) MapIterator() ld.MapIterator { return &_TypeString__MapItr{n, 0} } @@ -34975,15 +34975,15 @@ type _TypeString__MapItr struct { idx int } -func (itr *_TypeString__MapItr) Next() (k dms3ld.Node, v dms3ld.Node, _ error) { - return nil, nil, dms3ld.ErrIteratorOverread{} +func (itr *_TypeString__MapItr) Next() (k ld.Node, v ld.Node, _ error) { + return nil, nil, ld.ErrIteratorOverread{} } func (itr *_TypeString__MapItr) Done() bool { return itr.idx >= 0 } -func (TypeString) ListIterator() dms3ld.ListIterator { +func (TypeString) ListIterator() ld.ListIterator { return nil } func (TypeString) Length() int64 { @@ -35010,16 +35010,16 @@ func (TypeString) AsString() (string, error) { func (TypeString) AsBytes() ([]byte, error) { return mixins.Map{TypeName: "schemadmt.TypeString"}.AsBytes() } -func (TypeString) AsLink() (dms3ld.Link, error) { +func (TypeString) AsLink() (ld.Link, error) { return mixins.Map{TypeName: "schemadmt.TypeString"}.AsLink() } -func (TypeString) Prototype() dms3ld.NodePrototype { +func (TypeString) Prototype() ld.NodePrototype { return _TypeString__Prototype{} } type _TypeString__Prototype struct{} -func (_TypeString__Prototype) NewBuilder() dms3ld.NodeBuilder { +func (_TypeString__Prototype) NewBuilder() ld.NodeBuilder { var nb _TypeString__Builder nb.Reset() return &nb @@ -35029,7 +35029,7 @@ type _TypeString__Builder struct { _TypeString__Assembler } -func (nb *_TypeString__Builder) Build() dms3ld.Node { +func (nb *_TypeString__Builder) Build() ld.Node { if *nb.m != schema.Maybe_Value { panic("invalid state: cannot call Build on an assembler that's not finished") } @@ -35060,7 +35060,7 @@ var ( fieldBits__TypeString_sufficient = 0 ) -func (na *_TypeString__Assembler) BeginMap(int64) (dms3ld.MapAssembler, error) { +func (na *_TypeString__Assembler) BeginMap(int64) (ld.MapAssembler, error) { switch *na.m { case schema.Maybe_Value, schema.Maybe_Null: panic("invalid state: cannot assign into assembler that's already finished") @@ -35073,7 +35073,7 @@ func (na *_TypeString__Assembler) BeginMap(int64) (dms3ld.MapAssembler, error) { } return na, nil } -func (_TypeString__Assembler) BeginList(sizeHint int64) (dms3ld.ListAssembler, error) { +func (_TypeString__Assembler) BeginList(sizeHint int64) (ld.ListAssembler, error) { return mixins.MapAssembler{TypeName: "schemadmt.TypeString"}.BeginList(0) } func (na *_TypeString__Assembler) AssignNull() error { @@ -35105,10 +35105,10 @@ func (_TypeString__Assembler) AssignString(string) error { func (_TypeString__Assembler) AssignBytes([]byte) error { return mixins.MapAssembler{TypeName: "schemadmt.TypeString"}.AssignBytes(nil) } -func (_TypeString__Assembler) AssignLink(dms3ld.Link) error { +func (_TypeString__Assembler) AssignLink(ld.Link) error { return mixins.MapAssembler{TypeName: "schemadmt.TypeString"}.AssignLink(nil) } -func (na *_TypeString__Assembler) AssignNode(v dms3ld.Node) error { +func (na *_TypeString__Assembler) AssignNode(v ld.Node) error { if v.IsNull() { return na.AssignNull() } @@ -35128,8 +35128,8 @@ func (na *_TypeString__Assembler) AssignNode(v dms3ld.Node) error { *na.m = schema.Maybe_Value return nil } - if v.Kind() != dms3ld.Kind_Map { - return dms3ld.ErrWrongKind{TypeName: "schemadmt.TypeString", MethodName: "AssignNode", AppropriateKind: dms3ld.KindSet_JustMap, ActualKind: v.Kind()} + if v.Kind() != ld.Kind_Map { + return ld.ErrWrongKind{TypeName: "schemadmt.TypeString", MethodName: "AssignNode", AppropriateKind: ld.KindSet_JustMap, ActualKind: v.Kind()} } itr := v.MapIterator() for !itr.Done() { @@ -35146,7 +35146,7 @@ func (na *_TypeString__Assembler) AssignNode(v dms3ld.Node) error { } return na.Finish() } -func (_TypeString__Assembler) Prototype() dms3ld.NodePrototype { +func (_TypeString__Assembler) Prototype() ld.NodePrototype { return _TypeString__Prototype{} } func (ma *_TypeString__Assembler) valueFinishTidy() bool { @@ -35155,7 +35155,7 @@ func (ma *_TypeString__Assembler) valueFinishTidy() bool { panic("unreachable") } } -func (ma *_TypeString__Assembler) AssembleEntry(k string) (dms3ld.NodeAssembler, error) { +func (ma *_TypeString__Assembler) AssembleEntry(k string) (ld.NodeAssembler, error) { switch ma.state { case maState_initial: // carry on @@ -35170,9 +35170,9 @@ func (ma *_TypeString__Assembler) AssembleEntry(k string) (dms3ld.NodeAssembler, case maState_finished: panic("invalid state: AssembleEntry cannot be called on an assembler that's already finished") } - return nil, dms3ld.ErrInvalidKey{TypeName: "schemadmt.TypeString", Key: &_String{k}} + return nil, ld.ErrInvalidKey{TypeName: "schemadmt.TypeString", Key: &_String{k}} } -func (ma *_TypeString__Assembler) AssembleKey() dms3ld.NodeAssembler { +func (ma *_TypeString__Assembler) AssembleKey() ld.NodeAssembler { switch ma.state { case maState_initial: // carry on @@ -35190,7 +35190,7 @@ func (ma *_TypeString__Assembler) AssembleKey() dms3ld.NodeAssembler { ma.state = maState_midKey return (*_TypeString__KeyAssembler)(ma) } -func (ma *_TypeString__Assembler) AssembleValue() dms3ld.NodeAssembler { +func (ma *_TypeString__Assembler) AssembleValue() ld.NodeAssembler { switch ma.state { case maState_initial: panic("invalid state: AssembleValue cannot be called when no key is primed") @@ -35225,26 +35225,26 @@ func (ma *_TypeString__Assembler) Finish() error { panic("invalid state: Finish cannot be called on an assembler that's already finished") } if ma.s&fieldBits__TypeString_sufficient != fieldBits__TypeString_sufficient { - err := dms3ld.ErrMissingRequiredField{Missing: make([]string, 0)} + err := ld.ErrMissingRequiredField{Missing: make([]string, 0)} return err } ma.state = maState_finished *ma.m = schema.Maybe_Value return nil } -func (ma *_TypeString__Assembler) KeyPrototype() dms3ld.NodePrototype { +func (ma *_TypeString__Assembler) KeyPrototype() ld.NodePrototype { return _String__Prototype{} } -func (ma *_TypeString__Assembler) ValuePrototype(k string) dms3ld.NodePrototype { +func (ma *_TypeString__Assembler) ValuePrototype(k string) ld.NodePrototype { panic("todo structbuilder mapassembler valueprototype") } type _TypeString__KeyAssembler _TypeString__Assembler -func (_TypeString__KeyAssembler) BeginMap(sizeHint int64) (dms3ld.MapAssembler, error) { +func (_TypeString__KeyAssembler) BeginMap(sizeHint int64) (ld.MapAssembler, error) { return mixins.StringAssembler{TypeName: "schemadmt.TypeString.KeyAssembler"}.BeginMap(0) } -func (_TypeString__KeyAssembler) BeginList(sizeHint int64) (dms3ld.ListAssembler, error) { +func (_TypeString__KeyAssembler) BeginList(sizeHint int64) (ld.ListAssembler, error) { return mixins.StringAssembler{TypeName: "schemadmt.TypeString.KeyAssembler"}.BeginList(0) } func (na *_TypeString__KeyAssembler) AssignNull() error { @@ -35265,61 +35265,61 @@ func (ka *_TypeString__KeyAssembler) AssignString(k string) error { } switch k { default: - return dms3ld.ErrInvalidKey{TypeName: "schemadmt.TypeString", Key: &_String{k}} + return ld.ErrInvalidKey{TypeName: "schemadmt.TypeString", Key: &_String{k}} } return nil } func (_TypeString__KeyAssembler) AssignBytes([]byte) error { return mixins.StringAssembler{TypeName: "schemadmt.TypeString.KeyAssembler"}.AssignBytes(nil) } -func (_TypeString__KeyAssembler) AssignLink(dms3ld.Link) error { +func (_TypeString__KeyAssembler) AssignLink(ld.Link) error { return mixins.StringAssembler{TypeName: "schemadmt.TypeString.KeyAssembler"}.AssignLink(nil) } -func (ka *_TypeString__KeyAssembler) AssignNode(v dms3ld.Node) error { +func (ka *_TypeString__KeyAssembler) AssignNode(v ld.Node) error { if v2, err := v.AsString(); err != nil { return err } else { return ka.AssignString(v2) } } -func (_TypeString__KeyAssembler) Prototype() dms3ld.NodePrototype { +func (_TypeString__KeyAssembler) Prototype() ld.NodePrototype { return _String__Prototype{} } func (TypeString) Type() schema.Type { return nil /*TODO:typelit*/ } -func (n TypeString) Representation() dms3ld.Node { +func (n TypeString) Representation() ld.Node { return (*_TypeString__Repr)(n) } type _TypeString__Repr _TypeString var () -var _ dms3ld.Node = &_TypeString__Repr{} +var _ ld.Node = &_TypeString__Repr{} -func (_TypeString__Repr) Kind() dms3ld.Kind { - return dms3ld.Kind_Map +func (_TypeString__Repr) Kind() ld.Kind { + return ld.Kind_Map } -func (n *_TypeString__Repr) LookupByString(key string) (dms3ld.Node, error) { +func (n *_TypeString__Repr) LookupByString(key string) (ld.Node, error) { switch key { default: - return nil, schema.ErrNoSuchField{Type: nil /*TODO*/, Field: dms3ld.PathSegmentOfString(key)} + return nil, schema.ErrNoSuchField{Type: nil /*TODO*/, Field: ld.PathSegmentOfString(key)} } } -func (n *_TypeString__Repr) LookupByNode(key dms3ld.Node) (dms3ld.Node, error) { +func (n *_TypeString__Repr) LookupByNode(key ld.Node) (ld.Node, error) { ks, err := key.AsString() if err != nil { return nil, err } return n.LookupByString(ks) } -func (_TypeString__Repr) LookupByIndex(idx int64) (dms3ld.Node, error) { +func (_TypeString__Repr) LookupByIndex(idx int64) (ld.Node, error) { return mixins.Map{TypeName: "schemadmt.TypeString.Repr"}.LookupByIndex(0) } -func (n _TypeString__Repr) LookupBySegment(seg dms3ld.PathSegment) (dms3ld.Node, error) { +func (n _TypeString__Repr) LookupBySegment(seg ld.PathSegment) (ld.Node, error) { return n.LookupByString(seg.String()) } -func (n *_TypeString__Repr) MapIterator() dms3ld.MapIterator { +func (n *_TypeString__Repr) MapIterator() ld.MapIterator { return &_TypeString__ReprMapItr{n, 0} } @@ -35328,14 +35328,14 @@ type _TypeString__ReprMapItr struct { idx int } -func (itr *_TypeString__ReprMapItr) Next() (k dms3ld.Node, v dms3ld.Node, _ error) { - return nil, nil, dms3ld.ErrIteratorOverread{} +func (itr *_TypeString__ReprMapItr) Next() (k ld.Node, v ld.Node, _ error) { + return nil, nil, ld.ErrIteratorOverread{} } func (itr *_TypeString__ReprMapItr) Done() bool { return itr.idx >= 0 } -func (_TypeString__Repr) ListIterator() dms3ld.ListIterator { +func (_TypeString__Repr) ListIterator() ld.ListIterator { return nil } func (rn *_TypeString__Repr) Length() int64 { @@ -35363,16 +35363,16 @@ func (_TypeString__Repr) AsString() (string, error) { func (_TypeString__Repr) AsBytes() ([]byte, error) { return mixins.Map{TypeName: "schemadmt.TypeString.Repr"}.AsBytes() } -func (_TypeString__Repr) AsLink() (dms3ld.Link, error) { +func (_TypeString__Repr) AsLink() (ld.Link, error) { return mixins.Map{TypeName: "schemadmt.TypeString.Repr"}.AsLink() } -func (_TypeString__Repr) Prototype() dms3ld.NodePrototype { +func (_TypeString__Repr) Prototype() ld.NodePrototype { return _TypeString__ReprPrototype{} } type _TypeString__ReprPrototype struct{} -func (_TypeString__ReprPrototype) NewBuilder() dms3ld.NodeBuilder { +func (_TypeString__ReprPrototype) NewBuilder() ld.NodeBuilder { var nb _TypeString__ReprBuilder nb.Reset() return &nb @@ -35382,7 +35382,7 @@ type _TypeString__ReprBuilder struct { _TypeString__ReprAssembler } -func (nb *_TypeString__ReprBuilder) Build() dms3ld.Node { +func (nb *_TypeString__ReprBuilder) Build() ld.Node { if *nb.m != schema.Maybe_Value { panic("invalid state: cannot call Build on an assembler that's not finished") } @@ -35408,7 +35408,7 @@ func (na *_TypeString__ReprAssembler) reset() { na.state = maState_initial na.s = 0 } -func (na *_TypeString__ReprAssembler) BeginMap(int64) (dms3ld.MapAssembler, error) { +func (na *_TypeString__ReprAssembler) BeginMap(int64) (ld.MapAssembler, error) { switch *na.m { case schema.Maybe_Value, schema.Maybe_Null: panic("invalid state: cannot assign into assembler that's already finished") @@ -35421,7 +35421,7 @@ func (na *_TypeString__ReprAssembler) BeginMap(int64) (dms3ld.MapAssembler, erro } return na, nil } -func (_TypeString__ReprAssembler) BeginList(sizeHint int64) (dms3ld.ListAssembler, error) { +func (_TypeString__ReprAssembler) BeginList(sizeHint int64) (ld.ListAssembler, error) { return mixins.MapAssembler{TypeName: "schemadmt.TypeString.Repr"}.BeginList(0) } func (na *_TypeString__ReprAssembler) AssignNull() error { @@ -35453,10 +35453,10 @@ func (_TypeString__ReprAssembler) AssignString(string) error { func (_TypeString__ReprAssembler) AssignBytes([]byte) error { return mixins.MapAssembler{TypeName: "schemadmt.TypeString.Repr"}.AssignBytes(nil) } -func (_TypeString__ReprAssembler) AssignLink(dms3ld.Link) error { +func (_TypeString__ReprAssembler) AssignLink(ld.Link) error { return mixins.MapAssembler{TypeName: "schemadmt.TypeString.Repr"}.AssignLink(nil) } -func (na *_TypeString__ReprAssembler) AssignNode(v dms3ld.Node) error { +func (na *_TypeString__ReprAssembler) AssignNode(v ld.Node) error { if v.IsNull() { return na.AssignNull() } @@ -35476,8 +35476,8 @@ func (na *_TypeString__ReprAssembler) AssignNode(v dms3ld.Node) error { *na.m = schema.Maybe_Value return nil } - if v.Kind() != dms3ld.Kind_Map { - return dms3ld.ErrWrongKind{TypeName: "schemadmt.TypeString.Repr", MethodName: "AssignNode", AppropriateKind: dms3ld.KindSet_JustMap, ActualKind: v.Kind()} + if v.Kind() != ld.Kind_Map { + return ld.ErrWrongKind{TypeName: "schemadmt.TypeString.Repr", MethodName: "AssignNode", AppropriateKind: ld.KindSet_JustMap, ActualKind: v.Kind()} } itr := v.MapIterator() for !itr.Done() { @@ -35494,7 +35494,7 @@ func (na *_TypeString__ReprAssembler) AssignNode(v dms3ld.Node) error { } return na.Finish() } -func (_TypeString__ReprAssembler) Prototype() dms3ld.NodePrototype { +func (_TypeString__ReprAssembler) Prototype() ld.NodePrototype { return _TypeString__ReprPrototype{} } func (ma *_TypeString__ReprAssembler) valueFinishTidy() bool { @@ -35503,7 +35503,7 @@ func (ma *_TypeString__ReprAssembler) valueFinishTidy() bool { panic("unreachable") } } -func (ma *_TypeString__ReprAssembler) AssembleEntry(k string) (dms3ld.NodeAssembler, error) { +func (ma *_TypeString__ReprAssembler) AssembleEntry(k string) (ld.NodeAssembler, error) { switch ma.state { case maState_initial: // carry on @@ -35518,9 +35518,9 @@ func (ma *_TypeString__ReprAssembler) AssembleEntry(k string) (dms3ld.NodeAssemb case maState_finished: panic("invalid state: AssembleEntry cannot be called on an assembler that's already finished") } - return nil, dms3ld.ErrInvalidKey{TypeName: "schemadmt.TypeString.Repr", Key: &_String{k}} + return nil, ld.ErrInvalidKey{TypeName: "schemadmt.TypeString.Repr", Key: &_String{k}} } -func (ma *_TypeString__ReprAssembler) AssembleKey() dms3ld.NodeAssembler { +func (ma *_TypeString__ReprAssembler) AssembleKey() ld.NodeAssembler { switch ma.state { case maState_initial: // carry on @@ -35538,7 +35538,7 @@ func (ma *_TypeString__ReprAssembler) AssembleKey() dms3ld.NodeAssembler { ma.state = maState_midKey return (*_TypeString__ReprKeyAssembler)(ma) } -func (ma *_TypeString__ReprAssembler) AssembleValue() dms3ld.NodeAssembler { +func (ma *_TypeString__ReprAssembler) AssembleValue() ld.NodeAssembler { switch ma.state { case maState_initial: panic("invalid state: AssembleValue cannot be called when no key is primed") @@ -35573,26 +35573,26 @@ func (ma *_TypeString__ReprAssembler) Finish() error { panic("invalid state: Finish cannot be called on an assembler that's already finished") } if ma.s&fieldBits__TypeString_sufficient != fieldBits__TypeString_sufficient { - err := dms3ld.ErrMissingRequiredField{Missing: make([]string, 0)} + err := ld.ErrMissingRequiredField{Missing: make([]string, 0)} return err } ma.state = maState_finished *ma.m = schema.Maybe_Value return nil } -func (ma *_TypeString__ReprAssembler) KeyPrototype() dms3ld.NodePrototype { +func (ma *_TypeString__ReprAssembler) KeyPrototype() ld.NodePrototype { return _String__Prototype{} } -func (ma *_TypeString__ReprAssembler) ValuePrototype(k string) dms3ld.NodePrototype { +func (ma *_TypeString__ReprAssembler) ValuePrototype(k string) ld.NodePrototype { panic("todo structbuilder mapassembler repr valueprototype") } type _TypeString__ReprKeyAssembler _TypeString__ReprAssembler -func (_TypeString__ReprKeyAssembler) BeginMap(sizeHint int64) (dms3ld.MapAssembler, error) { +func (_TypeString__ReprKeyAssembler) BeginMap(sizeHint int64) (ld.MapAssembler, error) { return mixins.StringAssembler{TypeName: "schemadmt.TypeString.Repr.KeyAssembler"}.BeginMap(0) } -func (_TypeString__ReprKeyAssembler) BeginList(sizeHint int64) (dms3ld.ListAssembler, error) { +func (_TypeString__ReprKeyAssembler) BeginList(sizeHint int64) (ld.ListAssembler, error) { return mixins.StringAssembler{TypeName: "schemadmt.TypeString.Repr.KeyAssembler"}.BeginList(0) } func (na *_TypeString__ReprKeyAssembler) AssignNull() error { @@ -35611,22 +35611,22 @@ func (ka *_TypeString__ReprKeyAssembler) AssignString(k string) error { if ka.state != maState_midKey { panic("misuse: KeyAssembler held beyond its valid lifetime") } - return dms3ld.ErrInvalidKey{TypeName: "schemadmt.TypeString.Repr", Key: &_String{k}} + return ld.ErrInvalidKey{TypeName: "schemadmt.TypeString.Repr", Key: &_String{k}} } func (_TypeString__ReprKeyAssembler) AssignBytes([]byte) error { return mixins.StringAssembler{TypeName: "schemadmt.TypeString.Repr.KeyAssembler"}.AssignBytes(nil) } -func (_TypeString__ReprKeyAssembler) AssignLink(dms3ld.Link) error { +func (_TypeString__ReprKeyAssembler) AssignLink(ld.Link) error { return mixins.StringAssembler{TypeName: "schemadmt.TypeString.Repr.KeyAssembler"}.AssignLink(nil) } -func (ka *_TypeString__ReprKeyAssembler) AssignNode(v dms3ld.Node) error { +func (ka *_TypeString__ReprKeyAssembler) AssignNode(v ld.Node) error { if v2, err := v.AsString(); err != nil { return err } else { return ka.AssignString(v2) } } -func (_TypeString__ReprKeyAssembler) Prototype() dms3ld.NodePrototype { +func (_TypeString__ReprKeyAssembler) Prototype() ld.NodePrototype { return _String__Prototype{} } @@ -35652,12 +35652,12 @@ func (m MaybeTypeStruct) IsAbsent() bool { func (m MaybeTypeStruct) Exists() bool { return m.m == schema.Maybe_Value } -func (m MaybeTypeStruct) AsNode() dms3ld.Node { +func (m MaybeTypeStruct) AsNode() ld.Node { switch m.m { case schema.Maybe_Absent: - return dms3ld.Absent + return ld.Absent case schema.Maybe_Null: - return dms3ld.Null + return ld.Null case schema.Maybe_Value: return m.v default: @@ -35675,36 +35675,36 @@ var ( fieldName__TypeStruct_Fields = _String{"fields"} fieldName__TypeStruct_Representation = _String{"representation"} ) -var _ dms3ld.Node = (TypeStruct)(&_TypeStruct{}) +var _ ld.Node = (TypeStruct)(&_TypeStruct{}) var _ schema.TypedNode = (TypeStruct)(&_TypeStruct{}) -func (TypeStruct) Kind() dms3ld.Kind { - return dms3ld.Kind_Map +func (TypeStruct) Kind() ld.Kind { + return ld.Kind_Map } -func (n TypeStruct) LookupByString(key string) (dms3ld.Node, error) { +func (n TypeStruct) LookupByString(key string) (ld.Node, error) { switch key { case "fields": return &n.fields, nil case "representation": return &n.representation, nil default: - return nil, schema.ErrNoSuchField{Type: nil /*TODO*/, Field: dms3ld.PathSegmentOfString(key)} + return nil, schema.ErrNoSuchField{Type: nil /*TODO*/, Field: ld.PathSegmentOfString(key)} } } -func (n TypeStruct) LookupByNode(key dms3ld.Node) (dms3ld.Node, error) { +func (n TypeStruct) LookupByNode(key ld.Node) (ld.Node, error) { ks, err := key.AsString() if err != nil { return nil, err } return n.LookupByString(ks) } -func (TypeStruct) LookupByIndex(idx int64) (dms3ld.Node, error) { +func (TypeStruct) LookupByIndex(idx int64) (ld.Node, error) { return mixins.Map{TypeName: "schemadmt.TypeStruct"}.LookupByIndex(0) } -func (n TypeStruct) LookupBySegment(seg dms3ld.PathSegment) (dms3ld.Node, error) { +func (n TypeStruct) LookupBySegment(seg ld.PathSegment) (ld.Node, error) { return n.LookupByString(seg.String()) } -func (n TypeStruct) MapIterator() dms3ld.MapIterator { +func (n TypeStruct) MapIterator() ld.MapIterator { return &_TypeStruct__MapItr{n, 0} } @@ -35713,9 +35713,9 @@ type _TypeStruct__MapItr struct { idx int } -func (itr *_TypeStruct__MapItr) Next() (k dms3ld.Node, v dms3ld.Node, _ error) { +func (itr *_TypeStruct__MapItr) Next() (k ld.Node, v ld.Node, _ error) { if itr.idx >= 2 { - return nil, nil, dms3ld.ErrIteratorOverread{} + return nil, nil, ld.ErrIteratorOverread{} } switch itr.idx { case 0: @@ -35734,7 +35734,7 @@ func (itr *_TypeStruct__MapItr) Done() bool { return itr.idx >= 2 } -func (TypeStruct) ListIterator() dms3ld.ListIterator { +func (TypeStruct) ListIterator() ld.ListIterator { return nil } func (TypeStruct) Length() int64 { @@ -35761,16 +35761,16 @@ func (TypeStruct) AsString() (string, error) { func (TypeStruct) AsBytes() ([]byte, error) { return mixins.Map{TypeName: "schemadmt.TypeStruct"}.AsBytes() } -func (TypeStruct) AsLink() (dms3ld.Link, error) { +func (TypeStruct) AsLink() (ld.Link, error) { return mixins.Map{TypeName: "schemadmt.TypeStruct"}.AsLink() } -func (TypeStruct) Prototype() dms3ld.NodePrototype { +func (TypeStruct) Prototype() ld.NodePrototype { return _TypeStruct__Prototype{} } type _TypeStruct__Prototype struct{} -func (_TypeStruct__Prototype) NewBuilder() dms3ld.NodeBuilder { +func (_TypeStruct__Prototype) NewBuilder() ld.NodeBuilder { var nb _TypeStruct__Builder nb.Reset() return &nb @@ -35780,7 +35780,7 @@ type _TypeStruct__Builder struct { _TypeStruct__Assembler } -func (nb *_TypeStruct__Builder) Build() dms3ld.Node { +func (nb *_TypeStruct__Builder) Build() ld.Node { if *nb.m != schema.Maybe_Value { panic("invalid state: cannot call Build on an assembler that's not finished") } @@ -35817,7 +35817,7 @@ var ( fieldBits__TypeStruct_sufficient = 0 + 1<<0 + 1<<1 ) -func (na *_TypeStruct__Assembler) BeginMap(int64) (dms3ld.MapAssembler, error) { +func (na *_TypeStruct__Assembler) BeginMap(int64) (ld.MapAssembler, error) { switch *na.m { case schema.Maybe_Value, schema.Maybe_Null: panic("invalid state: cannot assign into assembler that's already finished") @@ -35830,7 +35830,7 @@ func (na *_TypeStruct__Assembler) BeginMap(int64) (dms3ld.MapAssembler, error) { } return na, nil } -func (_TypeStruct__Assembler) BeginList(sizeHint int64) (dms3ld.ListAssembler, error) { +func (_TypeStruct__Assembler) BeginList(sizeHint int64) (ld.ListAssembler, error) { return mixins.MapAssembler{TypeName: "schemadmt.TypeStruct"}.BeginList(0) } func (na *_TypeStruct__Assembler) AssignNull() error { @@ -35862,10 +35862,10 @@ func (_TypeStruct__Assembler) AssignString(string) error { func (_TypeStruct__Assembler) AssignBytes([]byte) error { return mixins.MapAssembler{TypeName: "schemadmt.TypeStruct"}.AssignBytes(nil) } -func (_TypeStruct__Assembler) AssignLink(dms3ld.Link) error { +func (_TypeStruct__Assembler) AssignLink(ld.Link) error { return mixins.MapAssembler{TypeName: "schemadmt.TypeStruct"}.AssignLink(nil) } -func (na *_TypeStruct__Assembler) AssignNode(v dms3ld.Node) error { +func (na *_TypeStruct__Assembler) AssignNode(v ld.Node) error { if v.IsNull() { return na.AssignNull() } @@ -35885,8 +35885,8 @@ func (na *_TypeStruct__Assembler) AssignNode(v dms3ld.Node) error { *na.m = schema.Maybe_Value return nil } - if v.Kind() != dms3ld.Kind_Map { - return dms3ld.ErrWrongKind{TypeName: "schemadmt.TypeStruct", MethodName: "AssignNode", AppropriateKind: dms3ld.KindSet_JustMap, ActualKind: v.Kind()} + if v.Kind() != ld.Kind_Map { + return ld.ErrWrongKind{TypeName: "schemadmt.TypeStruct", MethodName: "AssignNode", AppropriateKind: ld.KindSet_JustMap, ActualKind: v.Kind()} } itr := v.MapIterator() for !itr.Done() { @@ -35903,7 +35903,7 @@ func (na *_TypeStruct__Assembler) AssignNode(v dms3ld.Node) error { } return na.Finish() } -func (_TypeStruct__Assembler) Prototype() dms3ld.NodePrototype { +func (_TypeStruct__Assembler) Prototype() ld.NodePrototype { return _TypeStruct__Prototype{} } func (ma *_TypeStruct__Assembler) valueFinishTidy() bool { @@ -35932,7 +35932,7 @@ func (ma *_TypeStruct__Assembler) valueFinishTidy() bool { panic("unreachable") } } -func (ma *_TypeStruct__Assembler) AssembleEntry(k string) (dms3ld.NodeAssembler, error) { +func (ma *_TypeStruct__Assembler) AssembleEntry(k string) (ld.NodeAssembler, error) { switch ma.state { case maState_initial: // carry on @@ -35950,7 +35950,7 @@ func (ma *_TypeStruct__Assembler) AssembleEntry(k string) (dms3ld.NodeAssembler, switch k { case "fields": if ma.s&fieldBit__TypeStruct_Fields != 0 { - return nil, dms3ld.ErrRepeatedMapKey{Key: &fieldName__TypeStruct_Fields} + return nil, ld.ErrRepeatedMapKey{Key: &fieldName__TypeStruct_Fields} } ma.s += fieldBit__TypeStruct_Fields ma.state = maState_midValue @@ -35960,7 +35960,7 @@ func (ma *_TypeStruct__Assembler) AssembleEntry(k string) (dms3ld.NodeAssembler, return &ma.ca_fields, nil case "representation": if ma.s&fieldBit__TypeStruct_Representation != 0 { - return nil, dms3ld.ErrRepeatedMapKey{Key: &fieldName__TypeStruct_Representation} + return nil, ld.ErrRepeatedMapKey{Key: &fieldName__TypeStruct_Representation} } ma.s += fieldBit__TypeStruct_Representation ma.state = maState_midValue @@ -35969,9 +35969,9 @@ func (ma *_TypeStruct__Assembler) AssembleEntry(k string) (dms3ld.NodeAssembler, ma.ca_representation.m = &ma.cm return &ma.ca_representation, nil } - return nil, dms3ld.ErrInvalidKey{TypeName: "schemadmt.TypeStruct", Key: &_String{k}} + return nil, ld.ErrInvalidKey{TypeName: "schemadmt.TypeStruct", Key: &_String{k}} } -func (ma *_TypeStruct__Assembler) AssembleKey() dms3ld.NodeAssembler { +func (ma *_TypeStruct__Assembler) AssembleKey() ld.NodeAssembler { switch ma.state { case maState_initial: // carry on @@ -35989,7 +35989,7 @@ func (ma *_TypeStruct__Assembler) AssembleKey() dms3ld.NodeAssembler { ma.state = maState_midKey return (*_TypeStruct__KeyAssembler)(ma) } -func (ma *_TypeStruct__Assembler) AssembleValue() dms3ld.NodeAssembler { +func (ma *_TypeStruct__Assembler) AssembleValue() ld.NodeAssembler { switch ma.state { case maState_initial: panic("invalid state: AssembleValue cannot be called when no key is primed") @@ -36032,7 +36032,7 @@ func (ma *_TypeStruct__Assembler) Finish() error { panic("invalid state: Finish cannot be called on an assembler that's already finished") } if ma.s&fieldBits__TypeStruct_sufficient != fieldBits__TypeStruct_sufficient { - err := dms3ld.ErrMissingRequiredField{Missing: make([]string, 0)} + err := ld.ErrMissingRequiredField{Missing: make([]string, 0)} if ma.s&fieldBit__TypeStruct_Fields == 0 { err.Missing = append(err.Missing, "fields") } @@ -36045,19 +36045,19 @@ func (ma *_TypeStruct__Assembler) Finish() error { *ma.m = schema.Maybe_Value return nil } -func (ma *_TypeStruct__Assembler) KeyPrototype() dms3ld.NodePrototype { +func (ma *_TypeStruct__Assembler) KeyPrototype() ld.NodePrototype { return _String__Prototype{} } -func (ma *_TypeStruct__Assembler) ValuePrototype(k string) dms3ld.NodePrototype { +func (ma *_TypeStruct__Assembler) ValuePrototype(k string) ld.NodePrototype { panic("todo structbuilder mapassembler valueprototype") } type _TypeStruct__KeyAssembler _TypeStruct__Assembler -func (_TypeStruct__KeyAssembler) BeginMap(sizeHint int64) (dms3ld.MapAssembler, error) { +func (_TypeStruct__KeyAssembler) BeginMap(sizeHint int64) (ld.MapAssembler, error) { return mixins.StringAssembler{TypeName: "schemadmt.TypeStruct.KeyAssembler"}.BeginMap(0) } -func (_TypeStruct__KeyAssembler) BeginList(sizeHint int64) (dms3ld.ListAssembler, error) { +func (_TypeStruct__KeyAssembler) BeginList(sizeHint int64) (ld.ListAssembler, error) { return mixins.StringAssembler{TypeName: "schemadmt.TypeStruct.KeyAssembler"}.BeginList(0) } func (na *_TypeStruct__KeyAssembler) AssignNull() error { @@ -36079,43 +36079,43 @@ func (ka *_TypeStruct__KeyAssembler) AssignString(k string) error { switch k { case "fields": if ka.s&fieldBit__TypeStruct_Fields != 0 { - return dms3ld.ErrRepeatedMapKey{Key: &fieldName__TypeStruct_Fields} + return ld.ErrRepeatedMapKey{Key: &fieldName__TypeStruct_Fields} } ka.s += fieldBit__TypeStruct_Fields ka.state = maState_expectValue ka.f = 0 case "representation": if ka.s&fieldBit__TypeStruct_Representation != 0 { - return dms3ld.ErrRepeatedMapKey{Key: &fieldName__TypeStruct_Representation} + return ld.ErrRepeatedMapKey{Key: &fieldName__TypeStruct_Representation} } ka.s += fieldBit__TypeStruct_Representation ka.state = maState_expectValue ka.f = 1 default: - return dms3ld.ErrInvalidKey{TypeName: "schemadmt.TypeStruct", Key: &_String{k}} + return ld.ErrInvalidKey{TypeName: "schemadmt.TypeStruct", Key: &_String{k}} } return nil } func (_TypeStruct__KeyAssembler) AssignBytes([]byte) error { return mixins.StringAssembler{TypeName: "schemadmt.TypeStruct.KeyAssembler"}.AssignBytes(nil) } -func (_TypeStruct__KeyAssembler) AssignLink(dms3ld.Link) error { +func (_TypeStruct__KeyAssembler) AssignLink(ld.Link) error { return mixins.StringAssembler{TypeName: "schemadmt.TypeStruct.KeyAssembler"}.AssignLink(nil) } -func (ka *_TypeStruct__KeyAssembler) AssignNode(v dms3ld.Node) error { +func (ka *_TypeStruct__KeyAssembler) AssignNode(v ld.Node) error { if v2, err := v.AsString(); err != nil { return err } else { return ka.AssignString(v2) } } -func (_TypeStruct__KeyAssembler) Prototype() dms3ld.NodePrototype { +func (_TypeStruct__KeyAssembler) Prototype() ld.NodePrototype { return _String__Prototype{} } func (TypeStruct) Type() schema.Type { return nil /*TODO:typelit*/ } -func (n TypeStruct) Representation() dms3ld.Node { +func (n TypeStruct) Representation() ld.Node { return (*_TypeStruct__Repr)(n) } @@ -36125,35 +36125,35 @@ var ( fieldName__TypeStruct_Fields_serial = _String{"fields"} fieldName__TypeStruct_Representation_serial = _String{"representation"} ) -var _ dms3ld.Node = &_TypeStruct__Repr{} +var _ ld.Node = &_TypeStruct__Repr{} -func (_TypeStruct__Repr) Kind() dms3ld.Kind { - return dms3ld.Kind_Map +func (_TypeStruct__Repr) Kind() ld.Kind { + return ld.Kind_Map } -func (n *_TypeStruct__Repr) LookupByString(key string) (dms3ld.Node, error) { +func (n *_TypeStruct__Repr) LookupByString(key string) (ld.Node, error) { switch key { case "fields": return n.fields.Representation(), nil case "representation": return n.representation.Representation(), nil default: - return nil, schema.ErrNoSuchField{Type: nil /*TODO*/, Field: dms3ld.PathSegmentOfString(key)} + return nil, schema.ErrNoSuchField{Type: nil /*TODO*/, Field: ld.PathSegmentOfString(key)} } } -func (n *_TypeStruct__Repr) LookupByNode(key dms3ld.Node) (dms3ld.Node, error) { +func (n *_TypeStruct__Repr) LookupByNode(key ld.Node) (ld.Node, error) { ks, err := key.AsString() if err != nil { return nil, err } return n.LookupByString(ks) } -func (_TypeStruct__Repr) LookupByIndex(idx int64) (dms3ld.Node, error) { +func (_TypeStruct__Repr) LookupByIndex(idx int64) (ld.Node, error) { return mixins.Map{TypeName: "schemadmt.TypeStruct.Repr"}.LookupByIndex(0) } -func (n _TypeStruct__Repr) LookupBySegment(seg dms3ld.PathSegment) (dms3ld.Node, error) { +func (n _TypeStruct__Repr) LookupBySegment(seg ld.PathSegment) (ld.Node, error) { return n.LookupByString(seg.String()) } -func (n *_TypeStruct__Repr) MapIterator() dms3ld.MapIterator { +func (n *_TypeStruct__Repr) MapIterator() ld.MapIterator { return &_TypeStruct__ReprMapItr{n, 0} } @@ -36162,9 +36162,9 @@ type _TypeStruct__ReprMapItr struct { idx int } -func (itr *_TypeStruct__ReprMapItr) Next() (k dms3ld.Node, v dms3ld.Node, _ error) { +func (itr *_TypeStruct__ReprMapItr) Next() (k ld.Node, v ld.Node, _ error) { if itr.idx >= 2 { - return nil, nil, dms3ld.ErrIteratorOverread{} + return nil, nil, ld.ErrIteratorOverread{} } switch itr.idx { case 0: @@ -36182,7 +36182,7 @@ func (itr *_TypeStruct__ReprMapItr) Next() (k dms3ld.Node, v dms3ld.Node, _ erro func (itr *_TypeStruct__ReprMapItr) Done() bool { return itr.idx >= 2 } -func (_TypeStruct__Repr) ListIterator() dms3ld.ListIterator { +func (_TypeStruct__Repr) ListIterator() ld.ListIterator { return nil } func (rn *_TypeStruct__Repr) Length() int64 { @@ -36210,16 +36210,16 @@ func (_TypeStruct__Repr) AsString() (string, error) { func (_TypeStruct__Repr) AsBytes() ([]byte, error) { return mixins.Map{TypeName: "schemadmt.TypeStruct.Repr"}.AsBytes() } -func (_TypeStruct__Repr) AsLink() (dms3ld.Link, error) { +func (_TypeStruct__Repr) AsLink() (ld.Link, error) { return mixins.Map{TypeName: "schemadmt.TypeStruct.Repr"}.AsLink() } -func (_TypeStruct__Repr) Prototype() dms3ld.NodePrototype { +func (_TypeStruct__Repr) Prototype() ld.NodePrototype { return _TypeStruct__ReprPrototype{} } type _TypeStruct__ReprPrototype struct{} -func (_TypeStruct__ReprPrototype) NewBuilder() dms3ld.NodeBuilder { +func (_TypeStruct__ReprPrototype) NewBuilder() ld.NodeBuilder { var nb _TypeStruct__ReprBuilder nb.Reset() return &nb @@ -36229,7 +36229,7 @@ type _TypeStruct__ReprBuilder struct { _TypeStruct__ReprAssembler } -func (nb *_TypeStruct__ReprBuilder) Build() dms3ld.Node { +func (nb *_TypeStruct__ReprBuilder) Build() ld.Node { if *nb.m != schema.Maybe_Value { panic("invalid state: cannot call Build on an assembler that's not finished") } @@ -36259,7 +36259,7 @@ func (na *_TypeStruct__ReprAssembler) reset() { na.ca_fields.reset() na.ca_representation.reset() } -func (na *_TypeStruct__ReprAssembler) BeginMap(int64) (dms3ld.MapAssembler, error) { +func (na *_TypeStruct__ReprAssembler) BeginMap(int64) (ld.MapAssembler, error) { switch *na.m { case schema.Maybe_Value, schema.Maybe_Null: panic("invalid state: cannot assign into assembler that's already finished") @@ -36272,7 +36272,7 @@ func (na *_TypeStruct__ReprAssembler) BeginMap(int64) (dms3ld.MapAssembler, erro } return na, nil } -func (_TypeStruct__ReprAssembler) BeginList(sizeHint int64) (dms3ld.ListAssembler, error) { +func (_TypeStruct__ReprAssembler) BeginList(sizeHint int64) (ld.ListAssembler, error) { return mixins.MapAssembler{TypeName: "schemadmt.TypeStruct.Repr"}.BeginList(0) } func (na *_TypeStruct__ReprAssembler) AssignNull() error { @@ -36304,10 +36304,10 @@ func (_TypeStruct__ReprAssembler) AssignString(string) error { func (_TypeStruct__ReprAssembler) AssignBytes([]byte) error { return mixins.MapAssembler{TypeName: "schemadmt.TypeStruct.Repr"}.AssignBytes(nil) } -func (_TypeStruct__ReprAssembler) AssignLink(dms3ld.Link) error { +func (_TypeStruct__ReprAssembler) AssignLink(ld.Link) error { return mixins.MapAssembler{TypeName: "schemadmt.TypeStruct.Repr"}.AssignLink(nil) } -func (na *_TypeStruct__ReprAssembler) AssignNode(v dms3ld.Node) error { +func (na *_TypeStruct__ReprAssembler) AssignNode(v ld.Node) error { if v.IsNull() { return na.AssignNull() } @@ -36327,8 +36327,8 @@ func (na *_TypeStruct__ReprAssembler) AssignNode(v dms3ld.Node) error { *na.m = schema.Maybe_Value return nil } - if v.Kind() != dms3ld.Kind_Map { - return dms3ld.ErrWrongKind{TypeName: "schemadmt.TypeStruct.Repr", MethodName: "AssignNode", AppropriateKind: dms3ld.KindSet_JustMap, ActualKind: v.Kind()} + if v.Kind() != ld.Kind_Map { + return ld.ErrWrongKind{TypeName: "schemadmt.TypeStruct.Repr", MethodName: "AssignNode", AppropriateKind: ld.KindSet_JustMap, ActualKind: v.Kind()} } itr := v.MapIterator() for !itr.Done() { @@ -36345,7 +36345,7 @@ func (na *_TypeStruct__ReprAssembler) AssignNode(v dms3ld.Node) error { } return na.Finish() } -func (_TypeStruct__ReprAssembler) Prototype() dms3ld.NodePrototype { +func (_TypeStruct__ReprAssembler) Prototype() ld.NodePrototype { return _TypeStruct__ReprPrototype{} } func (ma *_TypeStruct__ReprAssembler) valueFinishTidy() bool { @@ -36372,7 +36372,7 @@ func (ma *_TypeStruct__ReprAssembler) valueFinishTidy() bool { panic("unreachable") } } -func (ma *_TypeStruct__ReprAssembler) AssembleEntry(k string) (dms3ld.NodeAssembler, error) { +func (ma *_TypeStruct__ReprAssembler) AssembleEntry(k string) (ld.NodeAssembler, error) { switch ma.state { case maState_initial: // carry on @@ -36390,7 +36390,7 @@ func (ma *_TypeStruct__ReprAssembler) AssembleEntry(k string) (dms3ld.NodeAssemb switch k { case "fields": if ma.s&fieldBit__TypeStruct_Fields != 0 { - return nil, dms3ld.ErrRepeatedMapKey{Key: &fieldName__TypeStruct_Fields_serial} + return nil, ld.ErrRepeatedMapKey{Key: &fieldName__TypeStruct_Fields_serial} } ma.s += fieldBit__TypeStruct_Fields ma.state = maState_midValue @@ -36400,7 +36400,7 @@ func (ma *_TypeStruct__ReprAssembler) AssembleEntry(k string) (dms3ld.NodeAssemb return &ma.ca_fields, nil case "representation": if ma.s&fieldBit__TypeStruct_Representation != 0 { - return nil, dms3ld.ErrRepeatedMapKey{Key: &fieldName__TypeStruct_Representation_serial} + return nil, ld.ErrRepeatedMapKey{Key: &fieldName__TypeStruct_Representation_serial} } ma.s += fieldBit__TypeStruct_Representation ma.state = maState_midValue @@ -36410,9 +36410,9 @@ func (ma *_TypeStruct__ReprAssembler) AssembleEntry(k string) (dms3ld.NodeAssemb return &ma.ca_representation, nil default: } - return nil, dms3ld.ErrInvalidKey{TypeName: "schemadmt.TypeStruct.Repr", Key: &_String{k}} + return nil, ld.ErrInvalidKey{TypeName: "schemadmt.TypeStruct.Repr", Key: &_String{k}} } -func (ma *_TypeStruct__ReprAssembler) AssembleKey() dms3ld.NodeAssembler { +func (ma *_TypeStruct__ReprAssembler) AssembleKey() ld.NodeAssembler { switch ma.state { case maState_initial: // carry on @@ -36430,7 +36430,7 @@ func (ma *_TypeStruct__ReprAssembler) AssembleKey() dms3ld.NodeAssembler { ma.state = maState_midKey return (*_TypeStruct__ReprKeyAssembler)(ma) } -func (ma *_TypeStruct__ReprAssembler) AssembleValue() dms3ld.NodeAssembler { +func (ma *_TypeStruct__ReprAssembler) AssembleValue() ld.NodeAssembler { switch ma.state { case maState_initial: panic("invalid state: AssembleValue cannot be called when no key is primed") @@ -36473,7 +36473,7 @@ func (ma *_TypeStruct__ReprAssembler) Finish() error { panic("invalid state: Finish cannot be called on an assembler that's already finished") } if ma.s&fieldBits__TypeStruct_sufficient != fieldBits__TypeStruct_sufficient { - err := dms3ld.ErrMissingRequiredField{Missing: make([]string, 0)} + err := ld.ErrMissingRequiredField{Missing: make([]string, 0)} if ma.s&fieldBit__TypeStruct_Fields == 0 { err.Missing = append(err.Missing, "fields") } @@ -36486,19 +36486,19 @@ func (ma *_TypeStruct__ReprAssembler) Finish() error { *ma.m = schema.Maybe_Value return nil } -func (ma *_TypeStruct__ReprAssembler) KeyPrototype() dms3ld.NodePrototype { +func (ma *_TypeStruct__ReprAssembler) KeyPrototype() ld.NodePrototype { return _String__Prototype{} } -func (ma *_TypeStruct__ReprAssembler) ValuePrototype(k string) dms3ld.NodePrototype { +func (ma *_TypeStruct__ReprAssembler) ValuePrototype(k string) ld.NodePrototype { panic("todo structbuilder mapassembler repr valueprototype") } type _TypeStruct__ReprKeyAssembler _TypeStruct__ReprAssembler -func (_TypeStruct__ReprKeyAssembler) BeginMap(sizeHint int64) (dms3ld.MapAssembler, error) { +func (_TypeStruct__ReprKeyAssembler) BeginMap(sizeHint int64) (ld.MapAssembler, error) { return mixins.StringAssembler{TypeName: "schemadmt.TypeStruct.Repr.KeyAssembler"}.BeginMap(0) } -func (_TypeStruct__ReprKeyAssembler) BeginList(sizeHint int64) (dms3ld.ListAssembler, error) { +func (_TypeStruct__ReprKeyAssembler) BeginList(sizeHint int64) (ld.ListAssembler, error) { return mixins.StringAssembler{TypeName: "schemadmt.TypeStruct.Repr.KeyAssembler"}.BeginList(0) } func (na *_TypeStruct__ReprKeyAssembler) AssignNull() error { @@ -36520,7 +36520,7 @@ func (ka *_TypeStruct__ReprKeyAssembler) AssignString(k string) error { switch k { case "fields": if ka.s&fieldBit__TypeStruct_Fields != 0 { - return dms3ld.ErrRepeatedMapKey{Key: &fieldName__TypeStruct_Fields_serial} + return ld.ErrRepeatedMapKey{Key: &fieldName__TypeStruct_Fields_serial} } ka.s += fieldBit__TypeStruct_Fields ka.state = maState_expectValue @@ -36528,29 +36528,29 @@ func (ka *_TypeStruct__ReprKeyAssembler) AssignString(k string) error { return nil case "representation": if ka.s&fieldBit__TypeStruct_Representation != 0 { - return dms3ld.ErrRepeatedMapKey{Key: &fieldName__TypeStruct_Representation_serial} + return ld.ErrRepeatedMapKey{Key: &fieldName__TypeStruct_Representation_serial} } ka.s += fieldBit__TypeStruct_Representation ka.state = maState_expectValue ka.f = 1 return nil } - return dms3ld.ErrInvalidKey{TypeName: "schemadmt.TypeStruct.Repr", Key: &_String{k}} + return ld.ErrInvalidKey{TypeName: "schemadmt.TypeStruct.Repr", Key: &_String{k}} } func (_TypeStruct__ReprKeyAssembler) AssignBytes([]byte) error { return mixins.StringAssembler{TypeName: "schemadmt.TypeStruct.Repr.KeyAssembler"}.AssignBytes(nil) } -func (_TypeStruct__ReprKeyAssembler) AssignLink(dms3ld.Link) error { +func (_TypeStruct__ReprKeyAssembler) AssignLink(ld.Link) error { return mixins.StringAssembler{TypeName: "schemadmt.TypeStruct.Repr.KeyAssembler"}.AssignLink(nil) } -func (ka *_TypeStruct__ReprKeyAssembler) AssignNode(v dms3ld.Node) error { +func (ka *_TypeStruct__ReprKeyAssembler) AssignNode(v ld.Node) error { if v2, err := v.AsString(); err != nil { return err } else { return ka.AssignString(v2) } } -func (_TypeStruct__ReprKeyAssembler) Prototype() dms3ld.NodePrototype { +func (_TypeStruct__ReprKeyAssembler) Prototype() ld.NodePrototype { return _String__Prototype{} } @@ -36576,12 +36576,12 @@ func (m MaybeTypeUnion) IsAbsent() bool { func (m MaybeTypeUnion) Exists() bool { return m.m == schema.Maybe_Value } -func (m MaybeTypeUnion) AsNode() dms3ld.Node { +func (m MaybeTypeUnion) AsNode() ld.Node { switch m.m { case schema.Maybe_Absent: - return dms3ld.Absent + return ld.Absent case schema.Maybe_Null: - return dms3ld.Null + return ld.Null case schema.Maybe_Value: return m.v default: @@ -36599,36 +36599,36 @@ var ( fieldName__TypeUnion_Members = _String{"members"} fieldName__TypeUnion_Representation = _String{"representation"} ) -var _ dms3ld.Node = (TypeUnion)(&_TypeUnion{}) +var _ ld.Node = (TypeUnion)(&_TypeUnion{}) var _ schema.TypedNode = (TypeUnion)(&_TypeUnion{}) -func (TypeUnion) Kind() dms3ld.Kind { - return dms3ld.Kind_Map +func (TypeUnion) Kind() ld.Kind { + return ld.Kind_Map } -func (n TypeUnion) LookupByString(key string) (dms3ld.Node, error) { +func (n TypeUnion) LookupByString(key string) (ld.Node, error) { switch key { case "members": return &n.members, nil case "representation": return &n.representation, nil default: - return nil, schema.ErrNoSuchField{Type: nil /*TODO*/, Field: dms3ld.PathSegmentOfString(key)} + return nil, schema.ErrNoSuchField{Type: nil /*TODO*/, Field: ld.PathSegmentOfString(key)} } } -func (n TypeUnion) LookupByNode(key dms3ld.Node) (dms3ld.Node, error) { +func (n TypeUnion) LookupByNode(key ld.Node) (ld.Node, error) { ks, err := key.AsString() if err != nil { return nil, err } return n.LookupByString(ks) } -func (TypeUnion) LookupByIndex(idx int64) (dms3ld.Node, error) { +func (TypeUnion) LookupByIndex(idx int64) (ld.Node, error) { return mixins.Map{TypeName: "schemadmt.TypeUnion"}.LookupByIndex(0) } -func (n TypeUnion) LookupBySegment(seg dms3ld.PathSegment) (dms3ld.Node, error) { +func (n TypeUnion) LookupBySegment(seg ld.PathSegment) (ld.Node, error) { return n.LookupByString(seg.String()) } -func (n TypeUnion) MapIterator() dms3ld.MapIterator { +func (n TypeUnion) MapIterator() ld.MapIterator { return &_TypeUnion__MapItr{n, 0} } @@ -36637,9 +36637,9 @@ type _TypeUnion__MapItr struct { idx int } -func (itr *_TypeUnion__MapItr) Next() (k dms3ld.Node, v dms3ld.Node, _ error) { +func (itr *_TypeUnion__MapItr) Next() (k ld.Node, v ld.Node, _ error) { if itr.idx >= 2 { - return nil, nil, dms3ld.ErrIteratorOverread{} + return nil, nil, ld.ErrIteratorOverread{} } switch itr.idx { case 0: @@ -36658,7 +36658,7 @@ func (itr *_TypeUnion__MapItr) Done() bool { return itr.idx >= 2 } -func (TypeUnion) ListIterator() dms3ld.ListIterator { +func (TypeUnion) ListIterator() ld.ListIterator { return nil } func (TypeUnion) Length() int64 { @@ -36685,16 +36685,16 @@ func (TypeUnion) AsString() (string, error) { func (TypeUnion) AsBytes() ([]byte, error) { return mixins.Map{TypeName: "schemadmt.TypeUnion"}.AsBytes() } -func (TypeUnion) AsLink() (dms3ld.Link, error) { +func (TypeUnion) AsLink() (ld.Link, error) { return mixins.Map{TypeName: "schemadmt.TypeUnion"}.AsLink() } -func (TypeUnion) Prototype() dms3ld.NodePrototype { +func (TypeUnion) Prototype() ld.NodePrototype { return _TypeUnion__Prototype{} } type _TypeUnion__Prototype struct{} -func (_TypeUnion__Prototype) NewBuilder() dms3ld.NodeBuilder { +func (_TypeUnion__Prototype) NewBuilder() ld.NodeBuilder { var nb _TypeUnion__Builder nb.Reset() return &nb @@ -36704,7 +36704,7 @@ type _TypeUnion__Builder struct { _TypeUnion__Assembler } -func (nb *_TypeUnion__Builder) Build() dms3ld.Node { +func (nb *_TypeUnion__Builder) Build() ld.Node { if *nb.m != schema.Maybe_Value { panic("invalid state: cannot call Build on an assembler that's not finished") } @@ -36741,7 +36741,7 @@ var ( fieldBits__TypeUnion_sufficient = 0 + 1<<0 + 1<<1 ) -func (na *_TypeUnion__Assembler) BeginMap(int64) (dms3ld.MapAssembler, error) { +func (na *_TypeUnion__Assembler) BeginMap(int64) (ld.MapAssembler, error) { switch *na.m { case schema.Maybe_Value, schema.Maybe_Null: panic("invalid state: cannot assign into assembler that's already finished") @@ -36754,7 +36754,7 @@ func (na *_TypeUnion__Assembler) BeginMap(int64) (dms3ld.MapAssembler, error) { } return na, nil } -func (_TypeUnion__Assembler) BeginList(sizeHint int64) (dms3ld.ListAssembler, error) { +func (_TypeUnion__Assembler) BeginList(sizeHint int64) (ld.ListAssembler, error) { return mixins.MapAssembler{TypeName: "schemadmt.TypeUnion"}.BeginList(0) } func (na *_TypeUnion__Assembler) AssignNull() error { @@ -36786,10 +36786,10 @@ func (_TypeUnion__Assembler) AssignString(string) error { func (_TypeUnion__Assembler) AssignBytes([]byte) error { return mixins.MapAssembler{TypeName: "schemadmt.TypeUnion"}.AssignBytes(nil) } -func (_TypeUnion__Assembler) AssignLink(dms3ld.Link) error { +func (_TypeUnion__Assembler) AssignLink(ld.Link) error { return mixins.MapAssembler{TypeName: "schemadmt.TypeUnion"}.AssignLink(nil) } -func (na *_TypeUnion__Assembler) AssignNode(v dms3ld.Node) error { +func (na *_TypeUnion__Assembler) AssignNode(v ld.Node) error { if v.IsNull() { return na.AssignNull() } @@ -36809,8 +36809,8 @@ func (na *_TypeUnion__Assembler) AssignNode(v dms3ld.Node) error { *na.m = schema.Maybe_Value return nil } - if v.Kind() != dms3ld.Kind_Map { - return dms3ld.ErrWrongKind{TypeName: "schemadmt.TypeUnion", MethodName: "AssignNode", AppropriateKind: dms3ld.KindSet_JustMap, ActualKind: v.Kind()} + if v.Kind() != ld.Kind_Map { + return ld.ErrWrongKind{TypeName: "schemadmt.TypeUnion", MethodName: "AssignNode", AppropriateKind: ld.KindSet_JustMap, ActualKind: v.Kind()} } itr := v.MapIterator() for !itr.Done() { @@ -36827,7 +36827,7 @@ func (na *_TypeUnion__Assembler) AssignNode(v dms3ld.Node) error { } return na.Finish() } -func (_TypeUnion__Assembler) Prototype() dms3ld.NodePrototype { +func (_TypeUnion__Assembler) Prototype() ld.NodePrototype { return _TypeUnion__Prototype{} } func (ma *_TypeUnion__Assembler) valueFinishTidy() bool { @@ -36856,7 +36856,7 @@ func (ma *_TypeUnion__Assembler) valueFinishTidy() bool { panic("unreachable") } } -func (ma *_TypeUnion__Assembler) AssembleEntry(k string) (dms3ld.NodeAssembler, error) { +func (ma *_TypeUnion__Assembler) AssembleEntry(k string) (ld.NodeAssembler, error) { switch ma.state { case maState_initial: // carry on @@ -36874,7 +36874,7 @@ func (ma *_TypeUnion__Assembler) AssembleEntry(k string) (dms3ld.NodeAssembler, switch k { case "members": if ma.s&fieldBit__TypeUnion_Members != 0 { - return nil, dms3ld.ErrRepeatedMapKey{Key: &fieldName__TypeUnion_Members} + return nil, ld.ErrRepeatedMapKey{Key: &fieldName__TypeUnion_Members} } ma.s += fieldBit__TypeUnion_Members ma.state = maState_midValue @@ -36884,7 +36884,7 @@ func (ma *_TypeUnion__Assembler) AssembleEntry(k string) (dms3ld.NodeAssembler, return &ma.ca_members, nil case "representation": if ma.s&fieldBit__TypeUnion_Representation != 0 { - return nil, dms3ld.ErrRepeatedMapKey{Key: &fieldName__TypeUnion_Representation} + return nil, ld.ErrRepeatedMapKey{Key: &fieldName__TypeUnion_Representation} } ma.s += fieldBit__TypeUnion_Representation ma.state = maState_midValue @@ -36893,9 +36893,9 @@ func (ma *_TypeUnion__Assembler) AssembleEntry(k string) (dms3ld.NodeAssembler, ma.ca_representation.m = &ma.cm return &ma.ca_representation, nil } - return nil, dms3ld.ErrInvalidKey{TypeName: "schemadmt.TypeUnion", Key: &_String{k}} + return nil, ld.ErrInvalidKey{TypeName: "schemadmt.TypeUnion", Key: &_String{k}} } -func (ma *_TypeUnion__Assembler) AssembleKey() dms3ld.NodeAssembler { +func (ma *_TypeUnion__Assembler) AssembleKey() ld.NodeAssembler { switch ma.state { case maState_initial: // carry on @@ -36913,7 +36913,7 @@ func (ma *_TypeUnion__Assembler) AssembleKey() dms3ld.NodeAssembler { ma.state = maState_midKey return (*_TypeUnion__KeyAssembler)(ma) } -func (ma *_TypeUnion__Assembler) AssembleValue() dms3ld.NodeAssembler { +func (ma *_TypeUnion__Assembler) AssembleValue() ld.NodeAssembler { switch ma.state { case maState_initial: panic("invalid state: AssembleValue cannot be called when no key is primed") @@ -36956,7 +36956,7 @@ func (ma *_TypeUnion__Assembler) Finish() error { panic("invalid state: Finish cannot be called on an assembler that's already finished") } if ma.s&fieldBits__TypeUnion_sufficient != fieldBits__TypeUnion_sufficient { - err := dms3ld.ErrMissingRequiredField{Missing: make([]string, 0)} + err := ld.ErrMissingRequiredField{Missing: make([]string, 0)} if ma.s&fieldBit__TypeUnion_Members == 0 { err.Missing = append(err.Missing, "members") } @@ -36969,19 +36969,19 @@ func (ma *_TypeUnion__Assembler) Finish() error { *ma.m = schema.Maybe_Value return nil } -func (ma *_TypeUnion__Assembler) KeyPrototype() dms3ld.NodePrototype { +func (ma *_TypeUnion__Assembler) KeyPrototype() ld.NodePrototype { return _String__Prototype{} } -func (ma *_TypeUnion__Assembler) ValuePrototype(k string) dms3ld.NodePrototype { +func (ma *_TypeUnion__Assembler) ValuePrototype(k string) ld.NodePrototype { panic("todo structbuilder mapassembler valueprototype") } type _TypeUnion__KeyAssembler _TypeUnion__Assembler -func (_TypeUnion__KeyAssembler) BeginMap(sizeHint int64) (dms3ld.MapAssembler, error) { +func (_TypeUnion__KeyAssembler) BeginMap(sizeHint int64) (ld.MapAssembler, error) { return mixins.StringAssembler{TypeName: "schemadmt.TypeUnion.KeyAssembler"}.BeginMap(0) } -func (_TypeUnion__KeyAssembler) BeginList(sizeHint int64) (dms3ld.ListAssembler, error) { +func (_TypeUnion__KeyAssembler) BeginList(sizeHint int64) (ld.ListAssembler, error) { return mixins.StringAssembler{TypeName: "schemadmt.TypeUnion.KeyAssembler"}.BeginList(0) } func (na *_TypeUnion__KeyAssembler) AssignNull() error { @@ -37003,43 +37003,43 @@ func (ka *_TypeUnion__KeyAssembler) AssignString(k string) error { switch k { case "members": if ka.s&fieldBit__TypeUnion_Members != 0 { - return dms3ld.ErrRepeatedMapKey{Key: &fieldName__TypeUnion_Members} + return ld.ErrRepeatedMapKey{Key: &fieldName__TypeUnion_Members} } ka.s += fieldBit__TypeUnion_Members ka.state = maState_expectValue ka.f = 0 case "representation": if ka.s&fieldBit__TypeUnion_Representation != 0 { - return dms3ld.ErrRepeatedMapKey{Key: &fieldName__TypeUnion_Representation} + return ld.ErrRepeatedMapKey{Key: &fieldName__TypeUnion_Representation} } ka.s += fieldBit__TypeUnion_Representation ka.state = maState_expectValue ka.f = 1 default: - return dms3ld.ErrInvalidKey{TypeName: "schemadmt.TypeUnion", Key: &_String{k}} + return ld.ErrInvalidKey{TypeName: "schemadmt.TypeUnion", Key: &_String{k}} } return nil } func (_TypeUnion__KeyAssembler) AssignBytes([]byte) error { return mixins.StringAssembler{TypeName: "schemadmt.TypeUnion.KeyAssembler"}.AssignBytes(nil) } -func (_TypeUnion__KeyAssembler) AssignLink(dms3ld.Link) error { +func (_TypeUnion__KeyAssembler) AssignLink(ld.Link) error { return mixins.StringAssembler{TypeName: "schemadmt.TypeUnion.KeyAssembler"}.AssignLink(nil) } -func (ka *_TypeUnion__KeyAssembler) AssignNode(v dms3ld.Node) error { +func (ka *_TypeUnion__KeyAssembler) AssignNode(v ld.Node) error { if v2, err := v.AsString(); err != nil { return err } else { return ka.AssignString(v2) } } -func (_TypeUnion__KeyAssembler) Prototype() dms3ld.NodePrototype { +func (_TypeUnion__KeyAssembler) Prototype() ld.NodePrototype { return _String__Prototype{} } func (TypeUnion) Type() schema.Type { return nil /*TODO:typelit*/ } -func (n TypeUnion) Representation() dms3ld.Node { +func (n TypeUnion) Representation() ld.Node { return (*_TypeUnion__Repr)(n) } @@ -37049,35 +37049,35 @@ var ( fieldName__TypeUnion_Members_serial = _String{"members"} fieldName__TypeUnion_Representation_serial = _String{"representation"} ) -var _ dms3ld.Node = &_TypeUnion__Repr{} +var _ ld.Node = &_TypeUnion__Repr{} -func (_TypeUnion__Repr) Kind() dms3ld.Kind { - return dms3ld.Kind_Map +func (_TypeUnion__Repr) Kind() ld.Kind { + return ld.Kind_Map } -func (n *_TypeUnion__Repr) LookupByString(key string) (dms3ld.Node, error) { +func (n *_TypeUnion__Repr) LookupByString(key string) (ld.Node, error) { switch key { case "members": return n.members.Representation(), nil case "representation": return n.representation.Representation(), nil default: - return nil, schema.ErrNoSuchField{Type: nil /*TODO*/, Field: dms3ld.PathSegmentOfString(key)} + return nil, schema.ErrNoSuchField{Type: nil /*TODO*/, Field: ld.PathSegmentOfString(key)} } } -func (n *_TypeUnion__Repr) LookupByNode(key dms3ld.Node) (dms3ld.Node, error) { +func (n *_TypeUnion__Repr) LookupByNode(key ld.Node) (ld.Node, error) { ks, err := key.AsString() if err != nil { return nil, err } return n.LookupByString(ks) } -func (_TypeUnion__Repr) LookupByIndex(idx int64) (dms3ld.Node, error) { +func (_TypeUnion__Repr) LookupByIndex(idx int64) (ld.Node, error) { return mixins.Map{TypeName: "schemadmt.TypeUnion.Repr"}.LookupByIndex(0) } -func (n _TypeUnion__Repr) LookupBySegment(seg dms3ld.PathSegment) (dms3ld.Node, error) { +func (n _TypeUnion__Repr) LookupBySegment(seg ld.PathSegment) (ld.Node, error) { return n.LookupByString(seg.String()) } -func (n *_TypeUnion__Repr) MapIterator() dms3ld.MapIterator { +func (n *_TypeUnion__Repr) MapIterator() ld.MapIterator { return &_TypeUnion__ReprMapItr{n, 0} } @@ -37086,9 +37086,9 @@ type _TypeUnion__ReprMapItr struct { idx int } -func (itr *_TypeUnion__ReprMapItr) Next() (k dms3ld.Node, v dms3ld.Node, _ error) { +func (itr *_TypeUnion__ReprMapItr) Next() (k ld.Node, v ld.Node, _ error) { if itr.idx >= 2 { - return nil, nil, dms3ld.ErrIteratorOverread{} + return nil, nil, ld.ErrIteratorOverread{} } switch itr.idx { case 0: @@ -37106,7 +37106,7 @@ func (itr *_TypeUnion__ReprMapItr) Next() (k dms3ld.Node, v dms3ld.Node, _ error func (itr *_TypeUnion__ReprMapItr) Done() bool { return itr.idx >= 2 } -func (_TypeUnion__Repr) ListIterator() dms3ld.ListIterator { +func (_TypeUnion__Repr) ListIterator() ld.ListIterator { return nil } func (rn *_TypeUnion__Repr) Length() int64 { @@ -37134,16 +37134,16 @@ func (_TypeUnion__Repr) AsString() (string, error) { func (_TypeUnion__Repr) AsBytes() ([]byte, error) { return mixins.Map{TypeName: "schemadmt.TypeUnion.Repr"}.AsBytes() } -func (_TypeUnion__Repr) AsLink() (dms3ld.Link, error) { +func (_TypeUnion__Repr) AsLink() (ld.Link, error) { return mixins.Map{TypeName: "schemadmt.TypeUnion.Repr"}.AsLink() } -func (_TypeUnion__Repr) Prototype() dms3ld.NodePrototype { +func (_TypeUnion__Repr) Prototype() ld.NodePrototype { return _TypeUnion__ReprPrototype{} } type _TypeUnion__ReprPrototype struct{} -func (_TypeUnion__ReprPrototype) NewBuilder() dms3ld.NodeBuilder { +func (_TypeUnion__ReprPrototype) NewBuilder() ld.NodeBuilder { var nb _TypeUnion__ReprBuilder nb.Reset() return &nb @@ -37153,7 +37153,7 @@ type _TypeUnion__ReprBuilder struct { _TypeUnion__ReprAssembler } -func (nb *_TypeUnion__ReprBuilder) Build() dms3ld.Node { +func (nb *_TypeUnion__ReprBuilder) Build() ld.Node { if *nb.m != schema.Maybe_Value { panic("invalid state: cannot call Build on an assembler that's not finished") } @@ -37183,7 +37183,7 @@ func (na *_TypeUnion__ReprAssembler) reset() { na.ca_members.reset() na.ca_representation.reset() } -func (na *_TypeUnion__ReprAssembler) BeginMap(int64) (dms3ld.MapAssembler, error) { +func (na *_TypeUnion__ReprAssembler) BeginMap(int64) (ld.MapAssembler, error) { switch *na.m { case schema.Maybe_Value, schema.Maybe_Null: panic("invalid state: cannot assign into assembler that's already finished") @@ -37196,7 +37196,7 @@ func (na *_TypeUnion__ReprAssembler) BeginMap(int64) (dms3ld.MapAssembler, error } return na, nil } -func (_TypeUnion__ReprAssembler) BeginList(sizeHint int64) (dms3ld.ListAssembler, error) { +func (_TypeUnion__ReprAssembler) BeginList(sizeHint int64) (ld.ListAssembler, error) { return mixins.MapAssembler{TypeName: "schemadmt.TypeUnion.Repr"}.BeginList(0) } func (na *_TypeUnion__ReprAssembler) AssignNull() error { @@ -37228,10 +37228,10 @@ func (_TypeUnion__ReprAssembler) AssignString(string) error { func (_TypeUnion__ReprAssembler) AssignBytes([]byte) error { return mixins.MapAssembler{TypeName: "schemadmt.TypeUnion.Repr"}.AssignBytes(nil) } -func (_TypeUnion__ReprAssembler) AssignLink(dms3ld.Link) error { +func (_TypeUnion__ReprAssembler) AssignLink(ld.Link) error { return mixins.MapAssembler{TypeName: "schemadmt.TypeUnion.Repr"}.AssignLink(nil) } -func (na *_TypeUnion__ReprAssembler) AssignNode(v dms3ld.Node) error { +func (na *_TypeUnion__ReprAssembler) AssignNode(v ld.Node) error { if v.IsNull() { return na.AssignNull() } @@ -37251,8 +37251,8 @@ func (na *_TypeUnion__ReprAssembler) AssignNode(v dms3ld.Node) error { *na.m = schema.Maybe_Value return nil } - if v.Kind() != dms3ld.Kind_Map { - return dms3ld.ErrWrongKind{TypeName: "schemadmt.TypeUnion.Repr", MethodName: "AssignNode", AppropriateKind: dms3ld.KindSet_JustMap, ActualKind: v.Kind()} + if v.Kind() != ld.Kind_Map { + return ld.ErrWrongKind{TypeName: "schemadmt.TypeUnion.Repr", MethodName: "AssignNode", AppropriateKind: ld.KindSet_JustMap, ActualKind: v.Kind()} } itr := v.MapIterator() for !itr.Done() { @@ -37269,7 +37269,7 @@ func (na *_TypeUnion__ReprAssembler) AssignNode(v dms3ld.Node) error { } return na.Finish() } -func (_TypeUnion__ReprAssembler) Prototype() dms3ld.NodePrototype { +func (_TypeUnion__ReprAssembler) Prototype() ld.NodePrototype { return _TypeUnion__ReprPrototype{} } func (ma *_TypeUnion__ReprAssembler) valueFinishTidy() bool { @@ -37296,7 +37296,7 @@ func (ma *_TypeUnion__ReprAssembler) valueFinishTidy() bool { panic("unreachable") } } -func (ma *_TypeUnion__ReprAssembler) AssembleEntry(k string) (dms3ld.NodeAssembler, error) { +func (ma *_TypeUnion__ReprAssembler) AssembleEntry(k string) (ld.NodeAssembler, error) { switch ma.state { case maState_initial: // carry on @@ -37314,7 +37314,7 @@ func (ma *_TypeUnion__ReprAssembler) AssembleEntry(k string) (dms3ld.NodeAssembl switch k { case "members": if ma.s&fieldBit__TypeUnion_Members != 0 { - return nil, dms3ld.ErrRepeatedMapKey{Key: &fieldName__TypeUnion_Members_serial} + return nil, ld.ErrRepeatedMapKey{Key: &fieldName__TypeUnion_Members_serial} } ma.s += fieldBit__TypeUnion_Members ma.state = maState_midValue @@ -37324,7 +37324,7 @@ func (ma *_TypeUnion__ReprAssembler) AssembleEntry(k string) (dms3ld.NodeAssembl return &ma.ca_members, nil case "representation": if ma.s&fieldBit__TypeUnion_Representation != 0 { - return nil, dms3ld.ErrRepeatedMapKey{Key: &fieldName__TypeUnion_Representation_serial} + return nil, ld.ErrRepeatedMapKey{Key: &fieldName__TypeUnion_Representation_serial} } ma.s += fieldBit__TypeUnion_Representation ma.state = maState_midValue @@ -37334,9 +37334,9 @@ func (ma *_TypeUnion__ReprAssembler) AssembleEntry(k string) (dms3ld.NodeAssembl return &ma.ca_representation, nil default: } - return nil, dms3ld.ErrInvalidKey{TypeName: "schemadmt.TypeUnion.Repr", Key: &_String{k}} + return nil, ld.ErrInvalidKey{TypeName: "schemadmt.TypeUnion.Repr", Key: &_String{k}} } -func (ma *_TypeUnion__ReprAssembler) AssembleKey() dms3ld.NodeAssembler { +func (ma *_TypeUnion__ReprAssembler) AssembleKey() ld.NodeAssembler { switch ma.state { case maState_initial: // carry on @@ -37354,7 +37354,7 @@ func (ma *_TypeUnion__ReprAssembler) AssembleKey() dms3ld.NodeAssembler { ma.state = maState_midKey return (*_TypeUnion__ReprKeyAssembler)(ma) } -func (ma *_TypeUnion__ReprAssembler) AssembleValue() dms3ld.NodeAssembler { +func (ma *_TypeUnion__ReprAssembler) AssembleValue() ld.NodeAssembler { switch ma.state { case maState_initial: panic("invalid state: AssembleValue cannot be called when no key is primed") @@ -37397,7 +37397,7 @@ func (ma *_TypeUnion__ReprAssembler) Finish() error { panic("invalid state: Finish cannot be called on an assembler that's already finished") } if ma.s&fieldBits__TypeUnion_sufficient != fieldBits__TypeUnion_sufficient { - err := dms3ld.ErrMissingRequiredField{Missing: make([]string, 0)} + err := ld.ErrMissingRequiredField{Missing: make([]string, 0)} if ma.s&fieldBit__TypeUnion_Members == 0 { err.Missing = append(err.Missing, "members") } @@ -37410,19 +37410,19 @@ func (ma *_TypeUnion__ReprAssembler) Finish() error { *ma.m = schema.Maybe_Value return nil } -func (ma *_TypeUnion__ReprAssembler) KeyPrototype() dms3ld.NodePrototype { +func (ma *_TypeUnion__ReprAssembler) KeyPrototype() ld.NodePrototype { return _String__Prototype{} } -func (ma *_TypeUnion__ReprAssembler) ValuePrototype(k string) dms3ld.NodePrototype { +func (ma *_TypeUnion__ReprAssembler) ValuePrototype(k string) ld.NodePrototype { panic("todo structbuilder mapassembler repr valueprototype") } type _TypeUnion__ReprKeyAssembler _TypeUnion__ReprAssembler -func (_TypeUnion__ReprKeyAssembler) BeginMap(sizeHint int64) (dms3ld.MapAssembler, error) { +func (_TypeUnion__ReprKeyAssembler) BeginMap(sizeHint int64) (ld.MapAssembler, error) { return mixins.StringAssembler{TypeName: "schemadmt.TypeUnion.Repr.KeyAssembler"}.BeginMap(0) } -func (_TypeUnion__ReprKeyAssembler) BeginList(sizeHint int64) (dms3ld.ListAssembler, error) { +func (_TypeUnion__ReprKeyAssembler) BeginList(sizeHint int64) (ld.ListAssembler, error) { return mixins.StringAssembler{TypeName: "schemadmt.TypeUnion.Repr.KeyAssembler"}.BeginList(0) } func (na *_TypeUnion__ReprKeyAssembler) AssignNull() error { @@ -37444,7 +37444,7 @@ func (ka *_TypeUnion__ReprKeyAssembler) AssignString(k string) error { switch k { case "members": if ka.s&fieldBit__TypeUnion_Members != 0 { - return dms3ld.ErrRepeatedMapKey{Key: &fieldName__TypeUnion_Members_serial} + return ld.ErrRepeatedMapKey{Key: &fieldName__TypeUnion_Members_serial} } ka.s += fieldBit__TypeUnion_Members ka.state = maState_expectValue @@ -37452,29 +37452,29 @@ func (ka *_TypeUnion__ReprKeyAssembler) AssignString(k string) error { return nil case "representation": if ka.s&fieldBit__TypeUnion_Representation != 0 { - return dms3ld.ErrRepeatedMapKey{Key: &fieldName__TypeUnion_Representation_serial} + return ld.ErrRepeatedMapKey{Key: &fieldName__TypeUnion_Representation_serial} } ka.s += fieldBit__TypeUnion_Representation ka.state = maState_expectValue ka.f = 1 return nil } - return dms3ld.ErrInvalidKey{TypeName: "schemadmt.TypeUnion.Repr", Key: &_String{k}} + return ld.ErrInvalidKey{TypeName: "schemadmt.TypeUnion.Repr", Key: &_String{k}} } func (_TypeUnion__ReprKeyAssembler) AssignBytes([]byte) error { return mixins.StringAssembler{TypeName: "schemadmt.TypeUnion.Repr.KeyAssembler"}.AssignBytes(nil) } -func (_TypeUnion__ReprKeyAssembler) AssignLink(dms3ld.Link) error { +func (_TypeUnion__ReprKeyAssembler) AssignLink(ld.Link) error { return mixins.StringAssembler{TypeName: "schemadmt.TypeUnion.Repr.KeyAssembler"}.AssignLink(nil) } -func (ka *_TypeUnion__ReprKeyAssembler) AssignNode(v dms3ld.Node) error { +func (ka *_TypeUnion__ReprKeyAssembler) AssignNode(v ld.Node) error { if v2, err := v.AsString(); err != nil { return err } else { return ka.AssignString(v2) } } -func (_TypeUnion__ReprKeyAssembler) Prototype() dms3ld.NodePrototype { +func (_TypeUnion__ReprKeyAssembler) Prototype() ld.NodePrototype { return _String__Prototype{} } @@ -37512,12 +37512,12 @@ func (m MaybeUnionRepresentation) IsAbsent() bool { func (m MaybeUnionRepresentation) Exists() bool { return m.m == schema.Maybe_Value } -func (m MaybeUnionRepresentation) AsNode() dms3ld.Node { +func (m MaybeUnionRepresentation) AsNode() ld.Node { switch m.m { case schema.Maybe_Absent: - return dms3ld.Absent + return ld.Absent case schema.Maybe_Null: - return dms3ld.Null + return ld.Null case schema.Maybe_Value: return m.v default: @@ -37539,62 +37539,62 @@ var ( memberName__UnionRepresentation_UnionRepresentation_StringPrefix = _String{"UnionRepresentation_StringPrefix"} memberName__UnionRepresentation_UnionRepresentation_BytePrefix = _String{"UnionRepresentation_BytePrefix"} ) -var _ dms3ld.Node = (UnionRepresentation)(&_UnionRepresentation{}) +var _ ld.Node = (UnionRepresentation)(&_UnionRepresentation{}) var _ schema.TypedNode = (UnionRepresentation)(&_UnionRepresentation{}) -func (UnionRepresentation) Kind() dms3ld.Kind { - return dms3ld.Kind_Map +func (UnionRepresentation) Kind() ld.Kind { + return ld.Kind_Map } -func (n UnionRepresentation) LookupByString(key string) (dms3ld.Node, error) { +func (n UnionRepresentation) LookupByString(key string) (ld.Node, error) { switch key { case "UnionRepresentation_Kinded": if n.tag != 1 { - return nil, dms3ld.ErrNotExists{Segment: dms3ld.PathSegmentOfString(key)} + return nil, ld.ErrNotExists{Segment: ld.PathSegmentOfString(key)} } return &n.x1, nil case "UnionRepresentation_Keyed": if n.tag != 2 { - return nil, dms3ld.ErrNotExists{Segment: dms3ld.PathSegmentOfString(key)} + return nil, ld.ErrNotExists{Segment: ld.PathSegmentOfString(key)} } return &n.x2, nil case "UnionRepresentation_Envelope": if n.tag != 3 { - return nil, dms3ld.ErrNotExists{Segment: dms3ld.PathSegmentOfString(key)} + return nil, ld.ErrNotExists{Segment: ld.PathSegmentOfString(key)} } return &n.x3, nil case "UnionRepresentation_Inline": if n.tag != 4 { - return nil, dms3ld.ErrNotExists{Segment: dms3ld.PathSegmentOfString(key)} + return nil, ld.ErrNotExists{Segment: ld.PathSegmentOfString(key)} } return &n.x4, nil case "UnionRepresentation_StringPrefix": if n.tag != 5 { - return nil, dms3ld.ErrNotExists{Segment: dms3ld.PathSegmentOfString(key)} + return nil, ld.ErrNotExists{Segment: ld.PathSegmentOfString(key)} } return &n.x5, nil case "UnionRepresentation_BytePrefix": if n.tag != 6 { - return nil, dms3ld.ErrNotExists{Segment: dms3ld.PathSegmentOfString(key)} + return nil, ld.ErrNotExists{Segment: ld.PathSegmentOfString(key)} } return &n.x6, nil default: - return nil, schema.ErrNoSuchField{Type: nil /*TODO*/, Field: dms3ld.PathSegmentOfString(key)} + return nil, schema.ErrNoSuchField{Type: nil /*TODO*/, Field: ld.PathSegmentOfString(key)} } } -func (n UnionRepresentation) LookupByNode(key dms3ld.Node) (dms3ld.Node, error) { +func (n UnionRepresentation) LookupByNode(key ld.Node) (ld.Node, error) { ks, err := key.AsString() if err != nil { return nil, err } return n.LookupByString(ks) } -func (UnionRepresentation) LookupByIndex(idx int64) (dms3ld.Node, error) { +func (UnionRepresentation) LookupByIndex(idx int64) (ld.Node, error) { return mixins.Map{TypeName: "schemadmt.UnionRepresentation"}.LookupByIndex(0) } -func (n UnionRepresentation) LookupBySegment(seg dms3ld.PathSegment) (dms3ld.Node, error) { +func (n UnionRepresentation) LookupBySegment(seg ld.PathSegment) (ld.Node, error) { return n.LookupByString(seg.String()) } -func (n UnionRepresentation) MapIterator() dms3ld.MapIterator { +func (n UnionRepresentation) MapIterator() ld.MapIterator { return &_UnionRepresentation__MapItr{n, false} } @@ -37603,9 +37603,9 @@ type _UnionRepresentation__MapItr struct { done bool } -func (itr *_UnionRepresentation__MapItr) Next() (k dms3ld.Node, v dms3ld.Node, _ error) { +func (itr *_UnionRepresentation__MapItr) Next() (k ld.Node, v ld.Node, _ error) { if itr.done { - return nil, nil, dms3ld.ErrIteratorOverread{} + return nil, nil, ld.ErrIteratorOverread{} } switch itr.n.tag { case 1: @@ -37630,7 +37630,7 @@ func (itr *_UnionRepresentation__MapItr) Done() bool { return itr.done } -func (UnionRepresentation) ListIterator() dms3ld.ListIterator { +func (UnionRepresentation) ListIterator() ld.ListIterator { return nil } func (UnionRepresentation) Length() int64 { @@ -37657,16 +37657,16 @@ func (UnionRepresentation) AsString() (string, error) { func (UnionRepresentation) AsBytes() ([]byte, error) { return mixins.Map{TypeName: "schemadmt.UnionRepresentation"}.AsBytes() } -func (UnionRepresentation) AsLink() (dms3ld.Link, error) { +func (UnionRepresentation) AsLink() (ld.Link, error) { return mixins.Map{TypeName: "schemadmt.UnionRepresentation"}.AsLink() } -func (UnionRepresentation) Prototype() dms3ld.NodePrototype { +func (UnionRepresentation) Prototype() ld.NodePrototype { return _UnionRepresentation__Prototype{} } type _UnionRepresentation__Prototype struct{} -func (_UnionRepresentation__Prototype) NewBuilder() dms3ld.NodeBuilder { +func (_UnionRepresentation__Prototype) NewBuilder() ld.NodeBuilder { var nb _UnionRepresentation__Builder nb.Reset() return &nb @@ -37676,7 +37676,7 @@ type _UnionRepresentation__Builder struct { _UnionRepresentation__Assembler } -func (nb *_UnionRepresentation__Builder) Build() dms3ld.Node { +func (nb *_UnionRepresentation__Builder) Build() ld.Node { if *nb.m != schema.Maybe_Value { panic("invalid state: cannot call Build on an assembler that's not finished") } @@ -37736,7 +37736,7 @@ func (na *_UnionRepresentation__Assembler) reset() { na.ca = 0 na.cm = schema.Maybe_Absent } -func (na *_UnionRepresentation__Assembler) BeginMap(int64) (dms3ld.MapAssembler, error) { +func (na *_UnionRepresentation__Assembler) BeginMap(int64) (ld.MapAssembler, error) { switch *na.m { case schema.Maybe_Value, schema.Maybe_Null: panic("invalid state: cannot assign into assembler that's already finished") @@ -37749,7 +37749,7 @@ func (na *_UnionRepresentation__Assembler) BeginMap(int64) (dms3ld.MapAssembler, } return na, nil } -func (_UnionRepresentation__Assembler) BeginList(sizeHint int64) (dms3ld.ListAssembler, error) { +func (_UnionRepresentation__Assembler) BeginList(sizeHint int64) (ld.ListAssembler, error) { return mixins.MapAssembler{TypeName: "schemadmt.UnionRepresentation"}.BeginList(0) } func (na *_UnionRepresentation__Assembler) AssignNull() error { @@ -37781,10 +37781,10 @@ func (_UnionRepresentation__Assembler) AssignString(string) error { func (_UnionRepresentation__Assembler) AssignBytes([]byte) error { return mixins.MapAssembler{TypeName: "schemadmt.UnionRepresentation"}.AssignBytes(nil) } -func (_UnionRepresentation__Assembler) AssignLink(dms3ld.Link) error { +func (_UnionRepresentation__Assembler) AssignLink(ld.Link) error { return mixins.MapAssembler{TypeName: "schemadmt.UnionRepresentation"}.AssignLink(nil) } -func (na *_UnionRepresentation__Assembler) AssignNode(v dms3ld.Node) error { +func (na *_UnionRepresentation__Assembler) AssignNode(v ld.Node) error { if v.IsNull() { return na.AssignNull() } @@ -37804,8 +37804,8 @@ func (na *_UnionRepresentation__Assembler) AssignNode(v dms3ld.Node) error { *na.m = schema.Maybe_Value return nil } - if v.Kind() != dms3ld.Kind_Map { - return dms3ld.ErrWrongKind{TypeName: "schemadmt.UnionRepresentation", MethodName: "AssignNode", AppropriateKind: dms3ld.KindSet_JustMap, ActualKind: v.Kind()} + if v.Kind() != ld.Kind_Map { + return ld.ErrWrongKind{TypeName: "schemadmt.UnionRepresentation", MethodName: "AssignNode", AppropriateKind: ld.KindSet_JustMap, ActualKind: v.Kind()} } itr := v.MapIterator() for !itr.Done() { @@ -37822,7 +37822,7 @@ func (na *_UnionRepresentation__Assembler) AssignNode(v dms3ld.Node) error { } return na.Finish() } -func (_UnionRepresentation__Assembler) Prototype() dms3ld.NodePrototype { +func (_UnionRepresentation__Assembler) Prototype() ld.NodePrototype { return _UnionRepresentation__Prototype{} } func (ma *_UnionRepresentation__Assembler) valueFinishTidy() bool { @@ -37834,7 +37834,7 @@ func (ma *_UnionRepresentation__Assembler) valueFinishTidy() bool { return false } } -func (ma *_UnionRepresentation__Assembler) AssembleEntry(k string) (dms3ld.NodeAssembler, error) { +func (ma *_UnionRepresentation__Assembler) AssembleEntry(k string) (ld.NodeAssembler, error) { switch ma.state { case maState_initial: // carry on @@ -37896,9 +37896,9 @@ func (ma *_UnionRepresentation__Assembler) AssembleEntry(k string) (dms3ld.NodeA ma.ca6.m = &ma.cm return &ma.ca6, nil } - return nil, dms3ld.ErrInvalidKey{TypeName: "schemadmt.UnionRepresentation", Key: &_String{k}} + return nil, ld.ErrInvalidKey{TypeName: "schemadmt.UnionRepresentation", Key: &_String{k}} } -func (ma *_UnionRepresentation__Assembler) AssembleKey() dms3ld.NodeAssembler { +func (ma *_UnionRepresentation__Assembler) AssembleKey() ld.NodeAssembler { switch ma.state { case maState_initial: // carry on @@ -37916,7 +37916,7 @@ func (ma *_UnionRepresentation__Assembler) AssembleKey() dms3ld.NodeAssembler { ma.state = maState_midKey return (*_UnionRepresentation__KeyAssembler)(ma) } -func (ma *_UnionRepresentation__Assembler) AssembleValue() dms3ld.NodeAssembler { +func (ma *_UnionRepresentation__Assembler) AssembleValue() ld.NodeAssembler { switch ma.state { case maState_initial: panic("invalid state: AssembleValue cannot be called when no key is primed") @@ -37981,10 +37981,10 @@ func (ma *_UnionRepresentation__Assembler) Finish() error { *ma.m = schema.Maybe_Value return nil } -func (ma *_UnionRepresentation__Assembler) KeyPrototype() dms3ld.NodePrototype { +func (ma *_UnionRepresentation__Assembler) KeyPrototype() ld.NodePrototype { return _String__Prototype{} } -func (ma *_UnionRepresentation__Assembler) ValuePrototype(k string) dms3ld.NodePrototype { +func (ma *_UnionRepresentation__Assembler) ValuePrototype(k string) ld.NodePrototype { switch k { case "UnionRepresentation_Kinded": return _UnionRepresentation_Kinded__Prototype{} @@ -38005,10 +38005,10 @@ func (ma *_UnionRepresentation__Assembler) ValuePrototype(k string) dms3ld.NodeP type _UnionRepresentation__KeyAssembler _UnionRepresentation__Assembler -func (_UnionRepresentation__KeyAssembler) BeginMap(sizeHint int64) (dms3ld.MapAssembler, error) { +func (_UnionRepresentation__KeyAssembler) BeginMap(sizeHint int64) (ld.MapAssembler, error) { return mixins.StringAssembler{TypeName: "schemadmt.UnionRepresentation.KeyAssembler"}.BeginMap(0) } -func (_UnionRepresentation__KeyAssembler) BeginList(sizeHint int64) (dms3ld.ListAssembler, error) { +func (_UnionRepresentation__KeyAssembler) BeginList(sizeHint int64) (ld.ListAssembler, error) { return mixins.StringAssembler{TypeName: "schemadmt.UnionRepresentation.KeyAssembler"}.BeginList(0) } func (na *_UnionRepresentation__KeyAssembler) AssignNull() error { @@ -38062,28 +38062,28 @@ func (ka *_UnionRepresentation__KeyAssembler) AssignString(k string) error { ka.state = maState_expectValue return nil } - return dms3ld.ErrInvalidKey{TypeName: "schemadmt.UnionRepresentation", Key: &_String{k}} // TODO: error quality: ErrInvalidUnionDiscriminant ? + return ld.ErrInvalidKey{TypeName: "schemadmt.UnionRepresentation", Key: &_String{k}} // TODO: error quality: ErrInvalidUnionDiscriminant ? } func (_UnionRepresentation__KeyAssembler) AssignBytes([]byte) error { return mixins.StringAssembler{TypeName: "schemadmt.UnionRepresentation.KeyAssembler"}.AssignBytes(nil) } -func (_UnionRepresentation__KeyAssembler) AssignLink(dms3ld.Link) error { +func (_UnionRepresentation__KeyAssembler) AssignLink(ld.Link) error { return mixins.StringAssembler{TypeName: "schemadmt.UnionRepresentation.KeyAssembler"}.AssignLink(nil) } -func (ka *_UnionRepresentation__KeyAssembler) AssignNode(v dms3ld.Node) error { +func (ka *_UnionRepresentation__KeyAssembler) AssignNode(v ld.Node) error { if v2, err := v.AsString(); err != nil { return err } else { return ka.AssignString(v2) } } -func (_UnionRepresentation__KeyAssembler) Prototype() dms3ld.NodePrototype { +func (_UnionRepresentation__KeyAssembler) Prototype() ld.NodePrototype { return _String__Prototype{} } func (UnionRepresentation) Type() schema.Type { return nil /*TODO:typelit*/ } -func (n UnionRepresentation) Representation() dms3ld.Node { +func (n UnionRepresentation) Representation() ld.Node { return (*_UnionRepresentation__Repr)(n) } @@ -38097,61 +38097,61 @@ var ( memberName__UnionRepresentation_UnionRepresentation_StringPrefix_serial = _String{"stringprefix"} memberName__UnionRepresentation_UnionRepresentation_BytePrefix_serial = _String{"byteprefix"} ) -var _ dms3ld.Node = &_UnionRepresentation__Repr{} +var _ ld.Node = &_UnionRepresentation__Repr{} -func (_UnionRepresentation__Repr) Kind() dms3ld.Kind { - return dms3ld.Kind_Map +func (_UnionRepresentation__Repr) Kind() ld.Kind { + return ld.Kind_Map } -func (n *_UnionRepresentation__Repr) LookupByString(key string) (dms3ld.Node, error) { +func (n *_UnionRepresentation__Repr) LookupByString(key string) (ld.Node, error) { switch key { case "kinded": if n.tag != 1 { - return nil, dms3ld.ErrNotExists{Segment: dms3ld.PathSegmentOfString(key)} + return nil, ld.ErrNotExists{Segment: ld.PathSegmentOfString(key)} } return n.x1.Representation(), nil case "keyed": if n.tag != 2 { - return nil, dms3ld.ErrNotExists{Segment: dms3ld.PathSegmentOfString(key)} + return nil, ld.ErrNotExists{Segment: ld.PathSegmentOfString(key)} } return n.x2.Representation(), nil case "envelope": if n.tag != 3 { - return nil, dms3ld.ErrNotExists{Segment: dms3ld.PathSegmentOfString(key)} + return nil, ld.ErrNotExists{Segment: ld.PathSegmentOfString(key)} } return n.x3.Representation(), nil case "inline": if n.tag != 4 { - return nil, dms3ld.ErrNotExists{Segment: dms3ld.PathSegmentOfString(key)} + return nil, ld.ErrNotExists{Segment: ld.PathSegmentOfString(key)} } return n.x4.Representation(), nil case "stringprefix": if n.tag != 5 { - return nil, dms3ld.ErrNotExists{Segment: dms3ld.PathSegmentOfString(key)} + return nil, ld.ErrNotExists{Segment: ld.PathSegmentOfString(key)} } return n.x5.Representation(), nil case "byteprefix": if n.tag != 6 { - return nil, dms3ld.ErrNotExists{Segment: dms3ld.PathSegmentOfString(key)} + return nil, ld.ErrNotExists{Segment: ld.PathSegmentOfString(key)} } return n.x6.Representation(), nil default: - return nil, schema.ErrNoSuchField{Type: nil /*TODO*/, Field: dms3ld.PathSegmentOfString(key)} + return nil, schema.ErrNoSuchField{Type: nil /*TODO*/, Field: ld.PathSegmentOfString(key)} } } -func (n *_UnionRepresentation__Repr) LookupByNode(key dms3ld.Node) (dms3ld.Node, error) { +func (n *_UnionRepresentation__Repr) LookupByNode(key ld.Node) (ld.Node, error) { ks, err := key.AsString() if err != nil { return nil, err } return n.LookupByString(ks) } -func (_UnionRepresentation__Repr) LookupByIndex(idx int64) (dms3ld.Node, error) { +func (_UnionRepresentation__Repr) LookupByIndex(idx int64) (ld.Node, error) { return mixins.Map{TypeName: "schemadmt.UnionRepresentation.Repr"}.LookupByIndex(0) } -func (n _UnionRepresentation__Repr) LookupBySegment(seg dms3ld.PathSegment) (dms3ld.Node, error) { +func (n _UnionRepresentation__Repr) LookupBySegment(seg ld.PathSegment) (ld.Node, error) { return n.LookupByString(seg.String()) } -func (n *_UnionRepresentation__Repr) MapIterator() dms3ld.MapIterator { +func (n *_UnionRepresentation__Repr) MapIterator() ld.MapIterator { return &_UnionRepresentation__ReprMapItr{n, false} } @@ -38160,9 +38160,9 @@ type _UnionRepresentation__ReprMapItr struct { done bool } -func (itr *_UnionRepresentation__ReprMapItr) Next() (k dms3ld.Node, v dms3ld.Node, _ error) { +func (itr *_UnionRepresentation__ReprMapItr) Next() (k ld.Node, v ld.Node, _ error) { if itr.done { - return nil, nil, dms3ld.ErrIteratorOverread{} + return nil, nil, ld.ErrIteratorOverread{} } switch itr.n.tag { case 1: @@ -38187,7 +38187,7 @@ func (itr *_UnionRepresentation__ReprMapItr) Done() bool { return itr.done } -func (_UnionRepresentation__Repr) ListIterator() dms3ld.ListIterator { +func (_UnionRepresentation__Repr) ListIterator() ld.ListIterator { return nil } func (_UnionRepresentation__Repr) Length() int64 { @@ -38214,16 +38214,16 @@ func (_UnionRepresentation__Repr) AsString() (string, error) { func (_UnionRepresentation__Repr) AsBytes() ([]byte, error) { return mixins.Map{TypeName: "schemadmt.UnionRepresentation.Repr"}.AsBytes() } -func (_UnionRepresentation__Repr) AsLink() (dms3ld.Link, error) { +func (_UnionRepresentation__Repr) AsLink() (ld.Link, error) { return mixins.Map{TypeName: "schemadmt.UnionRepresentation.Repr"}.AsLink() } -func (_UnionRepresentation__Repr) Prototype() dms3ld.NodePrototype { +func (_UnionRepresentation__Repr) Prototype() ld.NodePrototype { return _UnionRepresentation__ReprPrototype{} } type _UnionRepresentation__ReprPrototype struct{} -func (_UnionRepresentation__ReprPrototype) NewBuilder() dms3ld.NodeBuilder { +func (_UnionRepresentation__ReprPrototype) NewBuilder() ld.NodeBuilder { var nb _UnionRepresentation__ReprBuilder nb.Reset() return &nb @@ -38233,7 +38233,7 @@ type _UnionRepresentation__ReprBuilder struct { _UnionRepresentation__ReprAssembler } -func (nb *_UnionRepresentation__ReprBuilder) Build() dms3ld.Node { +func (nb *_UnionRepresentation__ReprBuilder) Build() ld.Node { if *nb.m != schema.Maybe_Value { panic("invalid state: cannot call Build on an assembler that's not finished") } @@ -38293,7 +38293,7 @@ func (na *_UnionRepresentation__ReprAssembler) reset() { na.ca = 0 na.cm = schema.Maybe_Absent } -func (na *_UnionRepresentation__ReprAssembler) BeginMap(int64) (dms3ld.MapAssembler, error) { +func (na *_UnionRepresentation__ReprAssembler) BeginMap(int64) (ld.MapAssembler, error) { switch *na.m { case schema.Maybe_Value, schema.Maybe_Null: panic("invalid state: cannot assign into assembler that's already finished") @@ -38306,7 +38306,7 @@ func (na *_UnionRepresentation__ReprAssembler) BeginMap(int64) (dms3ld.MapAssemb } return na, nil } -func (_UnionRepresentation__ReprAssembler) BeginList(sizeHint int64) (dms3ld.ListAssembler, error) { +func (_UnionRepresentation__ReprAssembler) BeginList(sizeHint int64) (ld.ListAssembler, error) { return mixins.MapAssembler{TypeName: "schemadmt.UnionRepresentation.Repr"}.BeginList(0) } func (na *_UnionRepresentation__ReprAssembler) AssignNull() error { @@ -38338,10 +38338,10 @@ func (_UnionRepresentation__ReprAssembler) AssignString(string) error { func (_UnionRepresentation__ReprAssembler) AssignBytes([]byte) error { return mixins.MapAssembler{TypeName: "schemadmt.UnionRepresentation.Repr"}.AssignBytes(nil) } -func (_UnionRepresentation__ReprAssembler) AssignLink(dms3ld.Link) error { +func (_UnionRepresentation__ReprAssembler) AssignLink(ld.Link) error { return mixins.MapAssembler{TypeName: "schemadmt.UnionRepresentation.Repr"}.AssignLink(nil) } -func (na *_UnionRepresentation__ReprAssembler) AssignNode(v dms3ld.Node) error { +func (na *_UnionRepresentation__ReprAssembler) AssignNode(v ld.Node) error { if v.IsNull() { return na.AssignNull() } @@ -38361,8 +38361,8 @@ func (na *_UnionRepresentation__ReprAssembler) AssignNode(v dms3ld.Node) error { *na.m = schema.Maybe_Value return nil } - if v.Kind() != dms3ld.Kind_Map { - return dms3ld.ErrWrongKind{TypeName: "schemadmt.UnionRepresentation.Repr", MethodName: "AssignNode", AppropriateKind: dms3ld.KindSet_JustMap, ActualKind: v.Kind()} + if v.Kind() != ld.Kind_Map { + return ld.ErrWrongKind{TypeName: "schemadmt.UnionRepresentation.Repr", MethodName: "AssignNode", AppropriateKind: ld.KindSet_JustMap, ActualKind: v.Kind()} } itr := v.MapIterator() for !itr.Done() { @@ -38379,7 +38379,7 @@ func (na *_UnionRepresentation__ReprAssembler) AssignNode(v dms3ld.Node) error { } return na.Finish() } -func (_UnionRepresentation__ReprAssembler) Prototype() dms3ld.NodePrototype { +func (_UnionRepresentation__ReprAssembler) Prototype() ld.NodePrototype { return _UnionRepresentation__ReprPrototype{} } func (ma *_UnionRepresentation__ReprAssembler) valueFinishTidy() bool { @@ -38391,7 +38391,7 @@ func (ma *_UnionRepresentation__ReprAssembler) valueFinishTidy() bool { return false } } -func (ma *_UnionRepresentation__ReprAssembler) AssembleEntry(k string) (dms3ld.NodeAssembler, error) { +func (ma *_UnionRepresentation__ReprAssembler) AssembleEntry(k string) (ld.NodeAssembler, error) { switch ma.state { case maState_initial: // carry on @@ -38453,9 +38453,9 @@ func (ma *_UnionRepresentation__ReprAssembler) AssembleEntry(k string) (dms3ld.N ma.ca6.m = &ma.cm return &ma.ca6, nil } - return nil, dms3ld.ErrInvalidKey{TypeName: "schemadmt.UnionRepresentation.Repr", Key: &_String{k}} + return nil, ld.ErrInvalidKey{TypeName: "schemadmt.UnionRepresentation.Repr", Key: &_String{k}} } -func (ma *_UnionRepresentation__ReprAssembler) AssembleKey() dms3ld.NodeAssembler { +func (ma *_UnionRepresentation__ReprAssembler) AssembleKey() ld.NodeAssembler { switch ma.state { case maState_initial: // carry on @@ -38473,7 +38473,7 @@ func (ma *_UnionRepresentation__ReprAssembler) AssembleKey() dms3ld.NodeAssemble ma.state = maState_midKey return (*_UnionRepresentation__ReprKeyAssembler)(ma) } -func (ma *_UnionRepresentation__ReprAssembler) AssembleValue() dms3ld.NodeAssembler { +func (ma *_UnionRepresentation__ReprAssembler) AssembleValue() ld.NodeAssembler { switch ma.state { case maState_initial: panic("invalid state: AssembleValue cannot be called when no key is primed") @@ -38538,10 +38538,10 @@ func (ma *_UnionRepresentation__ReprAssembler) Finish() error { *ma.m = schema.Maybe_Value return nil } -func (ma *_UnionRepresentation__ReprAssembler) KeyPrototype() dms3ld.NodePrototype { +func (ma *_UnionRepresentation__ReprAssembler) KeyPrototype() ld.NodePrototype { return _String__Prototype{} } -func (ma *_UnionRepresentation__ReprAssembler) ValuePrototype(k string) dms3ld.NodePrototype { +func (ma *_UnionRepresentation__ReprAssembler) ValuePrototype(k string) ld.NodePrototype { switch k { case "UnionRepresentation_Kinded": return _UnionRepresentation_Kinded__ReprPrototype{} @@ -38562,10 +38562,10 @@ func (ma *_UnionRepresentation__ReprAssembler) ValuePrototype(k string) dms3ld.N type _UnionRepresentation__ReprKeyAssembler _UnionRepresentation__ReprAssembler -func (_UnionRepresentation__ReprKeyAssembler) BeginMap(sizeHint int64) (dms3ld.MapAssembler, error) { +func (_UnionRepresentation__ReprKeyAssembler) BeginMap(sizeHint int64) (ld.MapAssembler, error) { return mixins.StringAssembler{TypeName: "schemadmt.UnionRepresentation.Repr.KeyAssembler"}.BeginMap(0) } -func (_UnionRepresentation__ReprKeyAssembler) BeginList(sizeHint int64) (dms3ld.ListAssembler, error) { +func (_UnionRepresentation__ReprKeyAssembler) BeginList(sizeHint int64) (ld.ListAssembler, error) { return mixins.StringAssembler{TypeName: "schemadmt.UnionRepresentation.Repr.KeyAssembler"}.BeginList(0) } func (na *_UnionRepresentation__ReprKeyAssembler) AssignNull() error { @@ -38619,22 +38619,22 @@ func (ka *_UnionRepresentation__ReprKeyAssembler) AssignString(k string) error { ka.state = maState_expectValue return nil } - return dms3ld.ErrInvalidKey{TypeName: "schemadmt.UnionRepresentation.Repr", Key: &_String{k}} // TODO: error quality: ErrInvalidUnionDiscriminant ? + return ld.ErrInvalidKey{TypeName: "schemadmt.UnionRepresentation.Repr", Key: &_String{k}} // TODO: error quality: ErrInvalidUnionDiscriminant ? } func (_UnionRepresentation__ReprKeyAssembler) AssignBytes([]byte) error { return mixins.StringAssembler{TypeName: "schemadmt.UnionRepresentation.Repr.KeyAssembler"}.AssignBytes(nil) } -func (_UnionRepresentation__ReprKeyAssembler) AssignLink(dms3ld.Link) error { +func (_UnionRepresentation__ReprKeyAssembler) AssignLink(ld.Link) error { return mixins.StringAssembler{TypeName: "schemadmt.UnionRepresentation.Repr.KeyAssembler"}.AssignLink(nil) } -func (ka *_UnionRepresentation__ReprKeyAssembler) AssignNode(v dms3ld.Node) error { +func (ka *_UnionRepresentation__ReprKeyAssembler) AssignNode(v ld.Node) error { if v2, err := v.AsString(); err != nil { return err } else { return ka.AssignString(v2) } } -func (_UnionRepresentation__ReprKeyAssembler) Prototype() dms3ld.NodePrototype { +func (_UnionRepresentation__ReprKeyAssembler) Prototype() ld.NodePrototype { return _String__Prototype{} } @@ -38657,12 +38657,12 @@ func (m MaybeUnionRepresentation_BytePrefix) IsAbsent() bool { func (m MaybeUnionRepresentation_BytePrefix) Exists() bool { return m.m == schema.Maybe_Value } -func (m MaybeUnionRepresentation_BytePrefix) AsNode() dms3ld.Node { +func (m MaybeUnionRepresentation_BytePrefix) AsNode() ld.Node { switch m.m { case schema.Maybe_Absent: - return dms3ld.Absent + return ld.Absent case schema.Maybe_Null: - return dms3ld.Null + return ld.Null case schema.Maybe_Value: return m.v default: @@ -38679,34 +38679,34 @@ func (m MaybeUnionRepresentation_BytePrefix) Must() UnionRepresentation_BytePref var ( fieldName__UnionRepresentation_BytePrefix_DiscriminantTable = _String{"discriminantTable"} ) -var _ dms3ld.Node = (UnionRepresentation_BytePrefix)(&_UnionRepresentation_BytePrefix{}) +var _ ld.Node = (UnionRepresentation_BytePrefix)(&_UnionRepresentation_BytePrefix{}) var _ schema.TypedNode = (UnionRepresentation_BytePrefix)(&_UnionRepresentation_BytePrefix{}) -func (UnionRepresentation_BytePrefix) Kind() dms3ld.Kind { - return dms3ld.Kind_Map +func (UnionRepresentation_BytePrefix) Kind() ld.Kind { + return ld.Kind_Map } -func (n UnionRepresentation_BytePrefix) LookupByString(key string) (dms3ld.Node, error) { +func (n UnionRepresentation_BytePrefix) LookupByString(key string) (ld.Node, error) { switch key { case "discriminantTable": return &n.discriminantTable, nil default: - return nil, schema.ErrNoSuchField{Type: nil /*TODO*/, Field: dms3ld.PathSegmentOfString(key)} + return nil, schema.ErrNoSuchField{Type: nil /*TODO*/, Field: ld.PathSegmentOfString(key)} } } -func (n UnionRepresentation_BytePrefix) LookupByNode(key dms3ld.Node) (dms3ld.Node, error) { +func (n UnionRepresentation_BytePrefix) LookupByNode(key ld.Node) (ld.Node, error) { ks, err := key.AsString() if err != nil { return nil, err } return n.LookupByString(ks) } -func (UnionRepresentation_BytePrefix) LookupByIndex(idx int64) (dms3ld.Node, error) { +func (UnionRepresentation_BytePrefix) LookupByIndex(idx int64) (ld.Node, error) { return mixins.Map{TypeName: "schemadmt.UnionRepresentation_BytePrefix"}.LookupByIndex(0) } -func (n UnionRepresentation_BytePrefix) LookupBySegment(seg dms3ld.PathSegment) (dms3ld.Node, error) { +func (n UnionRepresentation_BytePrefix) LookupBySegment(seg ld.PathSegment) (ld.Node, error) { return n.LookupByString(seg.String()) } -func (n UnionRepresentation_BytePrefix) MapIterator() dms3ld.MapIterator { +func (n UnionRepresentation_BytePrefix) MapIterator() ld.MapIterator { return &_UnionRepresentation_BytePrefix__MapItr{n, 0} } @@ -38715,9 +38715,9 @@ type _UnionRepresentation_BytePrefix__MapItr struct { idx int } -func (itr *_UnionRepresentation_BytePrefix__MapItr) Next() (k dms3ld.Node, v dms3ld.Node, _ error) { +func (itr *_UnionRepresentation_BytePrefix__MapItr) Next() (k ld.Node, v ld.Node, _ error) { if itr.idx >= 1 { - return nil, nil, dms3ld.ErrIteratorOverread{} + return nil, nil, ld.ErrIteratorOverread{} } switch itr.idx { case 0: @@ -38733,7 +38733,7 @@ func (itr *_UnionRepresentation_BytePrefix__MapItr) Done() bool { return itr.idx >= 1 } -func (UnionRepresentation_BytePrefix) ListIterator() dms3ld.ListIterator { +func (UnionRepresentation_BytePrefix) ListIterator() ld.ListIterator { return nil } func (UnionRepresentation_BytePrefix) Length() int64 { @@ -38760,16 +38760,16 @@ func (UnionRepresentation_BytePrefix) AsString() (string, error) { func (UnionRepresentation_BytePrefix) AsBytes() ([]byte, error) { return mixins.Map{TypeName: "schemadmt.UnionRepresentation_BytePrefix"}.AsBytes() } -func (UnionRepresentation_BytePrefix) AsLink() (dms3ld.Link, error) { +func (UnionRepresentation_BytePrefix) AsLink() (ld.Link, error) { return mixins.Map{TypeName: "schemadmt.UnionRepresentation_BytePrefix"}.AsLink() } -func (UnionRepresentation_BytePrefix) Prototype() dms3ld.NodePrototype { +func (UnionRepresentation_BytePrefix) Prototype() ld.NodePrototype { return _UnionRepresentation_BytePrefix__Prototype{} } type _UnionRepresentation_BytePrefix__Prototype struct{} -func (_UnionRepresentation_BytePrefix__Prototype) NewBuilder() dms3ld.NodeBuilder { +func (_UnionRepresentation_BytePrefix__Prototype) NewBuilder() ld.NodeBuilder { var nb _UnionRepresentation_BytePrefix__Builder nb.Reset() return &nb @@ -38779,7 +38779,7 @@ type _UnionRepresentation_BytePrefix__Builder struct { _UnionRepresentation_BytePrefix__Assembler } -func (nb *_UnionRepresentation_BytePrefix__Builder) Build() dms3ld.Node { +func (nb *_UnionRepresentation_BytePrefix__Builder) Build() ld.Node { if *nb.m != schema.Maybe_Value { panic("invalid state: cannot call Build on an assembler that's not finished") } @@ -38813,7 +38813,7 @@ var ( fieldBits__UnionRepresentation_BytePrefix_sufficient = 0 + 1<<0 ) -func (na *_UnionRepresentation_BytePrefix__Assembler) BeginMap(int64) (dms3ld.MapAssembler, error) { +func (na *_UnionRepresentation_BytePrefix__Assembler) BeginMap(int64) (ld.MapAssembler, error) { switch *na.m { case schema.Maybe_Value, schema.Maybe_Null: panic("invalid state: cannot assign into assembler that's already finished") @@ -38826,7 +38826,7 @@ func (na *_UnionRepresentation_BytePrefix__Assembler) BeginMap(int64) (dms3ld.Ma } return na, nil } -func (_UnionRepresentation_BytePrefix__Assembler) BeginList(sizeHint int64) (dms3ld.ListAssembler, error) { +func (_UnionRepresentation_BytePrefix__Assembler) BeginList(sizeHint int64) (ld.ListAssembler, error) { return mixins.MapAssembler{TypeName: "schemadmt.UnionRepresentation_BytePrefix"}.BeginList(0) } func (na *_UnionRepresentation_BytePrefix__Assembler) AssignNull() error { @@ -38858,10 +38858,10 @@ func (_UnionRepresentation_BytePrefix__Assembler) AssignString(string) error { func (_UnionRepresentation_BytePrefix__Assembler) AssignBytes([]byte) error { return mixins.MapAssembler{TypeName: "schemadmt.UnionRepresentation_BytePrefix"}.AssignBytes(nil) } -func (_UnionRepresentation_BytePrefix__Assembler) AssignLink(dms3ld.Link) error { +func (_UnionRepresentation_BytePrefix__Assembler) AssignLink(ld.Link) error { return mixins.MapAssembler{TypeName: "schemadmt.UnionRepresentation_BytePrefix"}.AssignLink(nil) } -func (na *_UnionRepresentation_BytePrefix__Assembler) AssignNode(v dms3ld.Node) error { +func (na *_UnionRepresentation_BytePrefix__Assembler) AssignNode(v ld.Node) error { if v.IsNull() { return na.AssignNull() } @@ -38881,8 +38881,8 @@ func (na *_UnionRepresentation_BytePrefix__Assembler) AssignNode(v dms3ld.Node) *na.m = schema.Maybe_Value return nil } - if v.Kind() != dms3ld.Kind_Map { - return dms3ld.ErrWrongKind{TypeName: "schemadmt.UnionRepresentation_BytePrefix", MethodName: "AssignNode", AppropriateKind: dms3ld.KindSet_JustMap, ActualKind: v.Kind()} + if v.Kind() != ld.Kind_Map { + return ld.ErrWrongKind{TypeName: "schemadmt.UnionRepresentation_BytePrefix", MethodName: "AssignNode", AppropriateKind: ld.KindSet_JustMap, ActualKind: v.Kind()} } itr := v.MapIterator() for !itr.Done() { @@ -38899,7 +38899,7 @@ func (na *_UnionRepresentation_BytePrefix__Assembler) AssignNode(v dms3ld.Node) } return na.Finish() } -func (_UnionRepresentation_BytePrefix__Assembler) Prototype() dms3ld.NodePrototype { +func (_UnionRepresentation_BytePrefix__Assembler) Prototype() ld.NodePrototype { return _UnionRepresentation_BytePrefix__Prototype{} } func (ma *_UnionRepresentation_BytePrefix__Assembler) valueFinishTidy() bool { @@ -38918,7 +38918,7 @@ func (ma *_UnionRepresentation_BytePrefix__Assembler) valueFinishTidy() bool { panic("unreachable") } } -func (ma *_UnionRepresentation_BytePrefix__Assembler) AssembleEntry(k string) (dms3ld.NodeAssembler, error) { +func (ma *_UnionRepresentation_BytePrefix__Assembler) AssembleEntry(k string) (ld.NodeAssembler, error) { switch ma.state { case maState_initial: // carry on @@ -38936,7 +38936,7 @@ func (ma *_UnionRepresentation_BytePrefix__Assembler) AssembleEntry(k string) (d switch k { case "discriminantTable": if ma.s&fieldBit__UnionRepresentation_BytePrefix_DiscriminantTable != 0 { - return nil, dms3ld.ErrRepeatedMapKey{Key: &fieldName__UnionRepresentation_BytePrefix_DiscriminantTable} + return nil, ld.ErrRepeatedMapKey{Key: &fieldName__UnionRepresentation_BytePrefix_DiscriminantTable} } ma.s += fieldBit__UnionRepresentation_BytePrefix_DiscriminantTable ma.state = maState_midValue @@ -38945,9 +38945,9 @@ func (ma *_UnionRepresentation_BytePrefix__Assembler) AssembleEntry(k string) (d ma.ca_discriminantTable.m = &ma.cm return &ma.ca_discriminantTable, nil } - return nil, dms3ld.ErrInvalidKey{TypeName: "schemadmt.UnionRepresentation_BytePrefix", Key: &_String{k}} + return nil, ld.ErrInvalidKey{TypeName: "schemadmt.UnionRepresentation_BytePrefix", Key: &_String{k}} } -func (ma *_UnionRepresentation_BytePrefix__Assembler) AssembleKey() dms3ld.NodeAssembler { +func (ma *_UnionRepresentation_BytePrefix__Assembler) AssembleKey() ld.NodeAssembler { switch ma.state { case maState_initial: // carry on @@ -38965,7 +38965,7 @@ func (ma *_UnionRepresentation_BytePrefix__Assembler) AssembleKey() dms3ld.NodeA ma.state = maState_midKey return (*_UnionRepresentation_BytePrefix__KeyAssembler)(ma) } -func (ma *_UnionRepresentation_BytePrefix__Assembler) AssembleValue() dms3ld.NodeAssembler { +func (ma *_UnionRepresentation_BytePrefix__Assembler) AssembleValue() ld.NodeAssembler { switch ma.state { case maState_initial: panic("invalid state: AssembleValue cannot be called when no key is primed") @@ -39004,7 +39004,7 @@ func (ma *_UnionRepresentation_BytePrefix__Assembler) Finish() error { panic("invalid state: Finish cannot be called on an assembler that's already finished") } if ma.s&fieldBits__UnionRepresentation_BytePrefix_sufficient != fieldBits__UnionRepresentation_BytePrefix_sufficient { - err := dms3ld.ErrMissingRequiredField{Missing: make([]string, 0)} + err := ld.ErrMissingRequiredField{Missing: make([]string, 0)} if ma.s&fieldBit__UnionRepresentation_BytePrefix_DiscriminantTable == 0 { err.Missing = append(err.Missing, "discriminantTable") } @@ -39014,19 +39014,19 @@ func (ma *_UnionRepresentation_BytePrefix__Assembler) Finish() error { *ma.m = schema.Maybe_Value return nil } -func (ma *_UnionRepresentation_BytePrefix__Assembler) KeyPrototype() dms3ld.NodePrototype { +func (ma *_UnionRepresentation_BytePrefix__Assembler) KeyPrototype() ld.NodePrototype { return _String__Prototype{} } -func (ma *_UnionRepresentation_BytePrefix__Assembler) ValuePrototype(k string) dms3ld.NodePrototype { +func (ma *_UnionRepresentation_BytePrefix__Assembler) ValuePrototype(k string) ld.NodePrototype { panic("todo structbuilder mapassembler valueprototype") } type _UnionRepresentation_BytePrefix__KeyAssembler _UnionRepresentation_BytePrefix__Assembler -func (_UnionRepresentation_BytePrefix__KeyAssembler) BeginMap(sizeHint int64) (dms3ld.MapAssembler, error) { +func (_UnionRepresentation_BytePrefix__KeyAssembler) BeginMap(sizeHint int64) (ld.MapAssembler, error) { return mixins.StringAssembler{TypeName: "schemadmt.UnionRepresentation_BytePrefix.KeyAssembler"}.BeginMap(0) } -func (_UnionRepresentation_BytePrefix__KeyAssembler) BeginList(sizeHint int64) (dms3ld.ListAssembler, error) { +func (_UnionRepresentation_BytePrefix__KeyAssembler) BeginList(sizeHint int64) (ld.ListAssembler, error) { return mixins.StringAssembler{TypeName: "schemadmt.UnionRepresentation_BytePrefix.KeyAssembler"}.BeginList(0) } func (na *_UnionRepresentation_BytePrefix__KeyAssembler) AssignNull() error { @@ -39048,36 +39048,36 @@ func (ka *_UnionRepresentation_BytePrefix__KeyAssembler) AssignString(k string) switch k { case "discriminantTable": if ka.s&fieldBit__UnionRepresentation_BytePrefix_DiscriminantTable != 0 { - return dms3ld.ErrRepeatedMapKey{Key: &fieldName__UnionRepresentation_BytePrefix_DiscriminantTable} + return ld.ErrRepeatedMapKey{Key: &fieldName__UnionRepresentation_BytePrefix_DiscriminantTable} } ka.s += fieldBit__UnionRepresentation_BytePrefix_DiscriminantTable ka.state = maState_expectValue ka.f = 0 default: - return dms3ld.ErrInvalidKey{TypeName: "schemadmt.UnionRepresentation_BytePrefix", Key: &_String{k}} + return ld.ErrInvalidKey{TypeName: "schemadmt.UnionRepresentation_BytePrefix", Key: &_String{k}} } return nil } func (_UnionRepresentation_BytePrefix__KeyAssembler) AssignBytes([]byte) error { return mixins.StringAssembler{TypeName: "schemadmt.UnionRepresentation_BytePrefix.KeyAssembler"}.AssignBytes(nil) } -func (_UnionRepresentation_BytePrefix__KeyAssembler) AssignLink(dms3ld.Link) error { +func (_UnionRepresentation_BytePrefix__KeyAssembler) AssignLink(ld.Link) error { return mixins.StringAssembler{TypeName: "schemadmt.UnionRepresentation_BytePrefix.KeyAssembler"}.AssignLink(nil) } -func (ka *_UnionRepresentation_BytePrefix__KeyAssembler) AssignNode(v dms3ld.Node) error { +func (ka *_UnionRepresentation_BytePrefix__KeyAssembler) AssignNode(v ld.Node) error { if v2, err := v.AsString(); err != nil { return err } else { return ka.AssignString(v2) } } -func (_UnionRepresentation_BytePrefix__KeyAssembler) Prototype() dms3ld.NodePrototype { +func (_UnionRepresentation_BytePrefix__KeyAssembler) Prototype() ld.NodePrototype { return _String__Prototype{} } func (UnionRepresentation_BytePrefix) Type() schema.Type { return nil /*TODO:typelit*/ } -func (n UnionRepresentation_BytePrefix) Representation() dms3ld.Node { +func (n UnionRepresentation_BytePrefix) Representation() ld.Node { return (*_UnionRepresentation_BytePrefix__Repr)(n) } @@ -39086,33 +39086,33 @@ type _UnionRepresentation_BytePrefix__Repr _UnionRepresentation_BytePrefix var ( fieldName__UnionRepresentation_BytePrefix_DiscriminantTable_serial = _String{"discriminantTable"} ) -var _ dms3ld.Node = &_UnionRepresentation_BytePrefix__Repr{} +var _ ld.Node = &_UnionRepresentation_BytePrefix__Repr{} -func (_UnionRepresentation_BytePrefix__Repr) Kind() dms3ld.Kind { - return dms3ld.Kind_Map +func (_UnionRepresentation_BytePrefix__Repr) Kind() ld.Kind { + return ld.Kind_Map } -func (n *_UnionRepresentation_BytePrefix__Repr) LookupByString(key string) (dms3ld.Node, error) { +func (n *_UnionRepresentation_BytePrefix__Repr) LookupByString(key string) (ld.Node, error) { switch key { case "discriminantTable": return n.discriminantTable.Representation(), nil default: - return nil, schema.ErrNoSuchField{Type: nil /*TODO*/, Field: dms3ld.PathSegmentOfString(key)} + return nil, schema.ErrNoSuchField{Type: nil /*TODO*/, Field: ld.PathSegmentOfString(key)} } } -func (n *_UnionRepresentation_BytePrefix__Repr) LookupByNode(key dms3ld.Node) (dms3ld.Node, error) { +func (n *_UnionRepresentation_BytePrefix__Repr) LookupByNode(key ld.Node) (ld.Node, error) { ks, err := key.AsString() if err != nil { return nil, err } return n.LookupByString(ks) } -func (_UnionRepresentation_BytePrefix__Repr) LookupByIndex(idx int64) (dms3ld.Node, error) { +func (_UnionRepresentation_BytePrefix__Repr) LookupByIndex(idx int64) (ld.Node, error) { return mixins.Map{TypeName: "schemadmt.UnionRepresentation_BytePrefix.Repr"}.LookupByIndex(0) } -func (n _UnionRepresentation_BytePrefix__Repr) LookupBySegment(seg dms3ld.PathSegment) (dms3ld.Node, error) { +func (n _UnionRepresentation_BytePrefix__Repr) LookupBySegment(seg ld.PathSegment) (ld.Node, error) { return n.LookupByString(seg.String()) } -func (n *_UnionRepresentation_BytePrefix__Repr) MapIterator() dms3ld.MapIterator { +func (n *_UnionRepresentation_BytePrefix__Repr) MapIterator() ld.MapIterator { return &_UnionRepresentation_BytePrefix__ReprMapItr{n, 0} } @@ -39121,9 +39121,9 @@ type _UnionRepresentation_BytePrefix__ReprMapItr struct { idx int } -func (itr *_UnionRepresentation_BytePrefix__ReprMapItr) Next() (k dms3ld.Node, v dms3ld.Node, _ error) { +func (itr *_UnionRepresentation_BytePrefix__ReprMapItr) Next() (k ld.Node, v ld.Node, _ error) { if itr.idx >= 1 { - return nil, nil, dms3ld.ErrIteratorOverread{} + return nil, nil, ld.ErrIteratorOverread{} } switch itr.idx { case 0: @@ -39138,7 +39138,7 @@ func (itr *_UnionRepresentation_BytePrefix__ReprMapItr) Next() (k dms3ld.Node, v func (itr *_UnionRepresentation_BytePrefix__ReprMapItr) Done() bool { return itr.idx >= 1 } -func (_UnionRepresentation_BytePrefix__Repr) ListIterator() dms3ld.ListIterator { +func (_UnionRepresentation_BytePrefix__Repr) ListIterator() ld.ListIterator { return nil } func (rn *_UnionRepresentation_BytePrefix__Repr) Length() int64 { @@ -39166,16 +39166,16 @@ func (_UnionRepresentation_BytePrefix__Repr) AsString() (string, error) { func (_UnionRepresentation_BytePrefix__Repr) AsBytes() ([]byte, error) { return mixins.Map{TypeName: "schemadmt.UnionRepresentation_BytePrefix.Repr"}.AsBytes() } -func (_UnionRepresentation_BytePrefix__Repr) AsLink() (dms3ld.Link, error) { +func (_UnionRepresentation_BytePrefix__Repr) AsLink() (ld.Link, error) { return mixins.Map{TypeName: "schemadmt.UnionRepresentation_BytePrefix.Repr"}.AsLink() } -func (_UnionRepresentation_BytePrefix__Repr) Prototype() dms3ld.NodePrototype { +func (_UnionRepresentation_BytePrefix__Repr) Prototype() ld.NodePrototype { return _UnionRepresentation_BytePrefix__ReprPrototype{} } type _UnionRepresentation_BytePrefix__ReprPrototype struct{} -func (_UnionRepresentation_BytePrefix__ReprPrototype) NewBuilder() dms3ld.NodeBuilder { +func (_UnionRepresentation_BytePrefix__ReprPrototype) NewBuilder() ld.NodeBuilder { var nb _UnionRepresentation_BytePrefix__ReprBuilder nb.Reset() return &nb @@ -39185,7 +39185,7 @@ type _UnionRepresentation_BytePrefix__ReprBuilder struct { _UnionRepresentation_BytePrefix__ReprAssembler } -func (nb *_UnionRepresentation_BytePrefix__ReprBuilder) Build() dms3ld.Node { +func (nb *_UnionRepresentation_BytePrefix__ReprBuilder) Build() ld.Node { if *nb.m != schema.Maybe_Value { panic("invalid state: cannot call Build on an assembler that's not finished") } @@ -39213,7 +39213,7 @@ func (na *_UnionRepresentation_BytePrefix__ReprAssembler) reset() { na.s = 0 na.ca_discriminantTable.reset() } -func (na *_UnionRepresentation_BytePrefix__ReprAssembler) BeginMap(int64) (dms3ld.MapAssembler, error) { +func (na *_UnionRepresentation_BytePrefix__ReprAssembler) BeginMap(int64) (ld.MapAssembler, error) { switch *na.m { case schema.Maybe_Value, schema.Maybe_Null: panic("invalid state: cannot assign into assembler that's already finished") @@ -39226,7 +39226,7 @@ func (na *_UnionRepresentation_BytePrefix__ReprAssembler) BeginMap(int64) (dms3l } return na, nil } -func (_UnionRepresentation_BytePrefix__ReprAssembler) BeginList(sizeHint int64) (dms3ld.ListAssembler, error) { +func (_UnionRepresentation_BytePrefix__ReprAssembler) BeginList(sizeHint int64) (ld.ListAssembler, error) { return mixins.MapAssembler{TypeName: "schemadmt.UnionRepresentation_BytePrefix.Repr"}.BeginList(0) } func (na *_UnionRepresentation_BytePrefix__ReprAssembler) AssignNull() error { @@ -39258,10 +39258,10 @@ func (_UnionRepresentation_BytePrefix__ReprAssembler) AssignString(string) error func (_UnionRepresentation_BytePrefix__ReprAssembler) AssignBytes([]byte) error { return mixins.MapAssembler{TypeName: "schemadmt.UnionRepresentation_BytePrefix.Repr"}.AssignBytes(nil) } -func (_UnionRepresentation_BytePrefix__ReprAssembler) AssignLink(dms3ld.Link) error { +func (_UnionRepresentation_BytePrefix__ReprAssembler) AssignLink(ld.Link) error { return mixins.MapAssembler{TypeName: "schemadmt.UnionRepresentation_BytePrefix.Repr"}.AssignLink(nil) } -func (na *_UnionRepresentation_BytePrefix__ReprAssembler) AssignNode(v dms3ld.Node) error { +func (na *_UnionRepresentation_BytePrefix__ReprAssembler) AssignNode(v ld.Node) error { if v.IsNull() { return na.AssignNull() } @@ -39281,8 +39281,8 @@ func (na *_UnionRepresentation_BytePrefix__ReprAssembler) AssignNode(v dms3ld.No *na.m = schema.Maybe_Value return nil } - if v.Kind() != dms3ld.Kind_Map { - return dms3ld.ErrWrongKind{TypeName: "schemadmt.UnionRepresentation_BytePrefix.Repr", MethodName: "AssignNode", AppropriateKind: dms3ld.KindSet_JustMap, ActualKind: v.Kind()} + if v.Kind() != ld.Kind_Map { + return ld.ErrWrongKind{TypeName: "schemadmt.UnionRepresentation_BytePrefix.Repr", MethodName: "AssignNode", AppropriateKind: ld.KindSet_JustMap, ActualKind: v.Kind()} } itr := v.MapIterator() for !itr.Done() { @@ -39299,7 +39299,7 @@ func (na *_UnionRepresentation_BytePrefix__ReprAssembler) AssignNode(v dms3ld.No } return na.Finish() } -func (_UnionRepresentation_BytePrefix__ReprAssembler) Prototype() dms3ld.NodePrototype { +func (_UnionRepresentation_BytePrefix__ReprAssembler) Prototype() ld.NodePrototype { return _UnionRepresentation_BytePrefix__ReprPrototype{} } func (ma *_UnionRepresentation_BytePrefix__ReprAssembler) valueFinishTidy() bool { @@ -39317,7 +39317,7 @@ func (ma *_UnionRepresentation_BytePrefix__ReprAssembler) valueFinishTidy() bool panic("unreachable") } } -func (ma *_UnionRepresentation_BytePrefix__ReprAssembler) AssembleEntry(k string) (dms3ld.NodeAssembler, error) { +func (ma *_UnionRepresentation_BytePrefix__ReprAssembler) AssembleEntry(k string) (ld.NodeAssembler, error) { switch ma.state { case maState_initial: // carry on @@ -39335,7 +39335,7 @@ func (ma *_UnionRepresentation_BytePrefix__ReprAssembler) AssembleEntry(k string switch k { case "discriminantTable": if ma.s&fieldBit__UnionRepresentation_BytePrefix_DiscriminantTable != 0 { - return nil, dms3ld.ErrRepeatedMapKey{Key: &fieldName__UnionRepresentation_BytePrefix_DiscriminantTable_serial} + return nil, ld.ErrRepeatedMapKey{Key: &fieldName__UnionRepresentation_BytePrefix_DiscriminantTable_serial} } ma.s += fieldBit__UnionRepresentation_BytePrefix_DiscriminantTable ma.state = maState_midValue @@ -39345,9 +39345,9 @@ func (ma *_UnionRepresentation_BytePrefix__ReprAssembler) AssembleEntry(k string return &ma.ca_discriminantTable, nil default: } - return nil, dms3ld.ErrInvalidKey{TypeName: "schemadmt.UnionRepresentation_BytePrefix.Repr", Key: &_String{k}} + return nil, ld.ErrInvalidKey{TypeName: "schemadmt.UnionRepresentation_BytePrefix.Repr", Key: &_String{k}} } -func (ma *_UnionRepresentation_BytePrefix__ReprAssembler) AssembleKey() dms3ld.NodeAssembler { +func (ma *_UnionRepresentation_BytePrefix__ReprAssembler) AssembleKey() ld.NodeAssembler { switch ma.state { case maState_initial: // carry on @@ -39365,7 +39365,7 @@ func (ma *_UnionRepresentation_BytePrefix__ReprAssembler) AssembleKey() dms3ld.N ma.state = maState_midKey return (*_UnionRepresentation_BytePrefix__ReprKeyAssembler)(ma) } -func (ma *_UnionRepresentation_BytePrefix__ReprAssembler) AssembleValue() dms3ld.NodeAssembler { +func (ma *_UnionRepresentation_BytePrefix__ReprAssembler) AssembleValue() ld.NodeAssembler { switch ma.state { case maState_initial: panic("invalid state: AssembleValue cannot be called when no key is primed") @@ -39404,7 +39404,7 @@ func (ma *_UnionRepresentation_BytePrefix__ReprAssembler) Finish() error { panic("invalid state: Finish cannot be called on an assembler that's already finished") } if ma.s&fieldBits__UnionRepresentation_BytePrefix_sufficient != fieldBits__UnionRepresentation_BytePrefix_sufficient { - err := dms3ld.ErrMissingRequiredField{Missing: make([]string, 0)} + err := ld.ErrMissingRequiredField{Missing: make([]string, 0)} if ma.s&fieldBit__UnionRepresentation_BytePrefix_DiscriminantTable == 0 { err.Missing = append(err.Missing, "discriminantTable") } @@ -39414,19 +39414,19 @@ func (ma *_UnionRepresentation_BytePrefix__ReprAssembler) Finish() error { *ma.m = schema.Maybe_Value return nil } -func (ma *_UnionRepresentation_BytePrefix__ReprAssembler) KeyPrototype() dms3ld.NodePrototype { +func (ma *_UnionRepresentation_BytePrefix__ReprAssembler) KeyPrototype() ld.NodePrototype { return _String__Prototype{} } -func (ma *_UnionRepresentation_BytePrefix__ReprAssembler) ValuePrototype(k string) dms3ld.NodePrototype { +func (ma *_UnionRepresentation_BytePrefix__ReprAssembler) ValuePrototype(k string) ld.NodePrototype { panic("todo structbuilder mapassembler repr valueprototype") } type _UnionRepresentation_BytePrefix__ReprKeyAssembler _UnionRepresentation_BytePrefix__ReprAssembler -func (_UnionRepresentation_BytePrefix__ReprKeyAssembler) BeginMap(sizeHint int64) (dms3ld.MapAssembler, error) { +func (_UnionRepresentation_BytePrefix__ReprKeyAssembler) BeginMap(sizeHint int64) (ld.MapAssembler, error) { return mixins.StringAssembler{TypeName: "schemadmt.UnionRepresentation_BytePrefix.Repr.KeyAssembler"}.BeginMap(0) } -func (_UnionRepresentation_BytePrefix__ReprKeyAssembler) BeginList(sizeHint int64) (dms3ld.ListAssembler, error) { +func (_UnionRepresentation_BytePrefix__ReprKeyAssembler) BeginList(sizeHint int64) (ld.ListAssembler, error) { return mixins.StringAssembler{TypeName: "schemadmt.UnionRepresentation_BytePrefix.Repr.KeyAssembler"}.BeginList(0) } func (na *_UnionRepresentation_BytePrefix__ReprKeyAssembler) AssignNull() error { @@ -39448,29 +39448,29 @@ func (ka *_UnionRepresentation_BytePrefix__ReprKeyAssembler) AssignString(k stri switch k { case "discriminantTable": if ka.s&fieldBit__UnionRepresentation_BytePrefix_DiscriminantTable != 0 { - return dms3ld.ErrRepeatedMapKey{Key: &fieldName__UnionRepresentation_BytePrefix_DiscriminantTable_serial} + return ld.ErrRepeatedMapKey{Key: &fieldName__UnionRepresentation_BytePrefix_DiscriminantTable_serial} } ka.s += fieldBit__UnionRepresentation_BytePrefix_DiscriminantTable ka.state = maState_expectValue ka.f = 0 return nil } - return dms3ld.ErrInvalidKey{TypeName: "schemadmt.UnionRepresentation_BytePrefix.Repr", Key: &_String{k}} + return ld.ErrInvalidKey{TypeName: "schemadmt.UnionRepresentation_BytePrefix.Repr", Key: &_String{k}} } func (_UnionRepresentation_BytePrefix__ReprKeyAssembler) AssignBytes([]byte) error { return mixins.StringAssembler{TypeName: "schemadmt.UnionRepresentation_BytePrefix.Repr.KeyAssembler"}.AssignBytes(nil) } -func (_UnionRepresentation_BytePrefix__ReprKeyAssembler) AssignLink(dms3ld.Link) error { +func (_UnionRepresentation_BytePrefix__ReprKeyAssembler) AssignLink(ld.Link) error { return mixins.StringAssembler{TypeName: "schemadmt.UnionRepresentation_BytePrefix.Repr.KeyAssembler"}.AssignLink(nil) } -func (ka *_UnionRepresentation_BytePrefix__ReprKeyAssembler) AssignNode(v dms3ld.Node) error { +func (ka *_UnionRepresentation_BytePrefix__ReprKeyAssembler) AssignNode(v ld.Node) error { if v2, err := v.AsString(); err != nil { return err } else { return ka.AssignString(v2) } } -func (_UnionRepresentation_BytePrefix__ReprKeyAssembler) Prototype() dms3ld.NodePrototype { +func (_UnionRepresentation_BytePrefix__ReprKeyAssembler) Prototype() ld.NodePrototype { return _String__Prototype{} } @@ -39499,12 +39499,12 @@ func (m MaybeUnionRepresentation_Envelope) IsAbsent() bool { func (m MaybeUnionRepresentation_Envelope) Exists() bool { return m.m == schema.Maybe_Value } -func (m MaybeUnionRepresentation_Envelope) AsNode() dms3ld.Node { +func (m MaybeUnionRepresentation_Envelope) AsNode() ld.Node { switch m.m { case schema.Maybe_Absent: - return dms3ld.Absent + return ld.Absent case schema.Maybe_Null: - return dms3ld.Null + return ld.Null case schema.Maybe_Value: return m.v default: @@ -39523,13 +39523,13 @@ var ( fieldName__UnionRepresentation_Envelope_ContentKey = _String{"contentKey"} fieldName__UnionRepresentation_Envelope_DiscriminantTable = _String{"discriminantTable"} ) -var _ dms3ld.Node = (UnionRepresentation_Envelope)(&_UnionRepresentation_Envelope{}) +var _ ld.Node = (UnionRepresentation_Envelope)(&_UnionRepresentation_Envelope{}) var _ schema.TypedNode = (UnionRepresentation_Envelope)(&_UnionRepresentation_Envelope{}) -func (UnionRepresentation_Envelope) Kind() dms3ld.Kind { - return dms3ld.Kind_Map +func (UnionRepresentation_Envelope) Kind() ld.Kind { + return ld.Kind_Map } -func (n UnionRepresentation_Envelope) LookupByString(key string) (dms3ld.Node, error) { +func (n UnionRepresentation_Envelope) LookupByString(key string) (ld.Node, error) { switch key { case "discriminantKey": return &n.discriminantKey, nil @@ -39538,23 +39538,23 @@ func (n UnionRepresentation_Envelope) LookupByString(key string) (dms3ld.Node, e case "discriminantTable": return &n.discriminantTable, nil default: - return nil, schema.ErrNoSuchField{Type: nil /*TODO*/, Field: dms3ld.PathSegmentOfString(key)} + return nil, schema.ErrNoSuchField{Type: nil /*TODO*/, Field: ld.PathSegmentOfString(key)} } } -func (n UnionRepresentation_Envelope) LookupByNode(key dms3ld.Node) (dms3ld.Node, error) { +func (n UnionRepresentation_Envelope) LookupByNode(key ld.Node) (ld.Node, error) { ks, err := key.AsString() if err != nil { return nil, err } return n.LookupByString(ks) } -func (UnionRepresentation_Envelope) LookupByIndex(idx int64) (dms3ld.Node, error) { +func (UnionRepresentation_Envelope) LookupByIndex(idx int64) (ld.Node, error) { return mixins.Map{TypeName: "schemadmt.UnionRepresentation_Envelope"}.LookupByIndex(0) } -func (n UnionRepresentation_Envelope) LookupBySegment(seg dms3ld.PathSegment) (dms3ld.Node, error) { +func (n UnionRepresentation_Envelope) LookupBySegment(seg ld.PathSegment) (ld.Node, error) { return n.LookupByString(seg.String()) } -func (n UnionRepresentation_Envelope) MapIterator() dms3ld.MapIterator { +func (n UnionRepresentation_Envelope) MapIterator() ld.MapIterator { return &_UnionRepresentation_Envelope__MapItr{n, 0} } @@ -39563,9 +39563,9 @@ type _UnionRepresentation_Envelope__MapItr struct { idx int } -func (itr *_UnionRepresentation_Envelope__MapItr) Next() (k dms3ld.Node, v dms3ld.Node, _ error) { +func (itr *_UnionRepresentation_Envelope__MapItr) Next() (k ld.Node, v ld.Node, _ error) { if itr.idx >= 3 { - return nil, nil, dms3ld.ErrIteratorOverread{} + return nil, nil, ld.ErrIteratorOverread{} } switch itr.idx { case 0: @@ -39587,7 +39587,7 @@ func (itr *_UnionRepresentation_Envelope__MapItr) Done() bool { return itr.idx >= 3 } -func (UnionRepresentation_Envelope) ListIterator() dms3ld.ListIterator { +func (UnionRepresentation_Envelope) ListIterator() ld.ListIterator { return nil } func (UnionRepresentation_Envelope) Length() int64 { @@ -39614,16 +39614,16 @@ func (UnionRepresentation_Envelope) AsString() (string, error) { func (UnionRepresentation_Envelope) AsBytes() ([]byte, error) { return mixins.Map{TypeName: "schemadmt.UnionRepresentation_Envelope"}.AsBytes() } -func (UnionRepresentation_Envelope) AsLink() (dms3ld.Link, error) { +func (UnionRepresentation_Envelope) AsLink() (ld.Link, error) { return mixins.Map{TypeName: "schemadmt.UnionRepresentation_Envelope"}.AsLink() } -func (UnionRepresentation_Envelope) Prototype() dms3ld.NodePrototype { +func (UnionRepresentation_Envelope) Prototype() ld.NodePrototype { return _UnionRepresentation_Envelope__Prototype{} } type _UnionRepresentation_Envelope__Prototype struct{} -func (_UnionRepresentation_Envelope__Prototype) NewBuilder() dms3ld.NodeBuilder { +func (_UnionRepresentation_Envelope__Prototype) NewBuilder() ld.NodeBuilder { var nb _UnionRepresentation_Envelope__Builder nb.Reset() return &nb @@ -39633,7 +39633,7 @@ type _UnionRepresentation_Envelope__Builder struct { _UnionRepresentation_Envelope__Assembler } -func (nb *_UnionRepresentation_Envelope__Builder) Build() dms3ld.Node { +func (nb *_UnionRepresentation_Envelope__Builder) Build() ld.Node { if *nb.m != schema.Maybe_Value { panic("invalid state: cannot call Build on an assembler that's not finished") } @@ -39673,7 +39673,7 @@ var ( fieldBits__UnionRepresentation_Envelope_sufficient = 0 + 1<<0 + 1<<1 + 1<<2 ) -func (na *_UnionRepresentation_Envelope__Assembler) BeginMap(int64) (dms3ld.MapAssembler, error) { +func (na *_UnionRepresentation_Envelope__Assembler) BeginMap(int64) (ld.MapAssembler, error) { switch *na.m { case schema.Maybe_Value, schema.Maybe_Null: panic("invalid state: cannot assign into assembler that's already finished") @@ -39686,7 +39686,7 @@ func (na *_UnionRepresentation_Envelope__Assembler) BeginMap(int64) (dms3ld.MapA } return na, nil } -func (_UnionRepresentation_Envelope__Assembler) BeginList(sizeHint int64) (dms3ld.ListAssembler, error) { +func (_UnionRepresentation_Envelope__Assembler) BeginList(sizeHint int64) (ld.ListAssembler, error) { return mixins.MapAssembler{TypeName: "schemadmt.UnionRepresentation_Envelope"}.BeginList(0) } func (na *_UnionRepresentation_Envelope__Assembler) AssignNull() error { @@ -39718,10 +39718,10 @@ func (_UnionRepresentation_Envelope__Assembler) AssignString(string) error { func (_UnionRepresentation_Envelope__Assembler) AssignBytes([]byte) error { return mixins.MapAssembler{TypeName: "schemadmt.UnionRepresentation_Envelope"}.AssignBytes(nil) } -func (_UnionRepresentation_Envelope__Assembler) AssignLink(dms3ld.Link) error { +func (_UnionRepresentation_Envelope__Assembler) AssignLink(ld.Link) error { return mixins.MapAssembler{TypeName: "schemadmt.UnionRepresentation_Envelope"}.AssignLink(nil) } -func (na *_UnionRepresentation_Envelope__Assembler) AssignNode(v dms3ld.Node) error { +func (na *_UnionRepresentation_Envelope__Assembler) AssignNode(v ld.Node) error { if v.IsNull() { return na.AssignNull() } @@ -39741,8 +39741,8 @@ func (na *_UnionRepresentation_Envelope__Assembler) AssignNode(v dms3ld.Node) er *na.m = schema.Maybe_Value return nil } - if v.Kind() != dms3ld.Kind_Map { - return dms3ld.ErrWrongKind{TypeName: "schemadmt.UnionRepresentation_Envelope", MethodName: "AssignNode", AppropriateKind: dms3ld.KindSet_JustMap, ActualKind: v.Kind()} + if v.Kind() != ld.Kind_Map { + return ld.ErrWrongKind{TypeName: "schemadmt.UnionRepresentation_Envelope", MethodName: "AssignNode", AppropriateKind: ld.KindSet_JustMap, ActualKind: v.Kind()} } itr := v.MapIterator() for !itr.Done() { @@ -39759,7 +39759,7 @@ func (na *_UnionRepresentation_Envelope__Assembler) AssignNode(v dms3ld.Node) er } return na.Finish() } -func (_UnionRepresentation_Envelope__Assembler) Prototype() dms3ld.NodePrototype { +func (_UnionRepresentation_Envelope__Assembler) Prototype() ld.NodePrototype { return _UnionRepresentation_Envelope__Prototype{} } func (ma *_UnionRepresentation_Envelope__Assembler) valueFinishTidy() bool { @@ -39798,7 +39798,7 @@ func (ma *_UnionRepresentation_Envelope__Assembler) valueFinishTidy() bool { panic("unreachable") } } -func (ma *_UnionRepresentation_Envelope__Assembler) AssembleEntry(k string) (dms3ld.NodeAssembler, error) { +func (ma *_UnionRepresentation_Envelope__Assembler) AssembleEntry(k string) (ld.NodeAssembler, error) { switch ma.state { case maState_initial: // carry on @@ -39816,7 +39816,7 @@ func (ma *_UnionRepresentation_Envelope__Assembler) AssembleEntry(k string) (dms switch k { case "discriminantKey": if ma.s&fieldBit__UnionRepresentation_Envelope_DiscriminantKey != 0 { - return nil, dms3ld.ErrRepeatedMapKey{Key: &fieldName__UnionRepresentation_Envelope_DiscriminantKey} + return nil, ld.ErrRepeatedMapKey{Key: &fieldName__UnionRepresentation_Envelope_DiscriminantKey} } ma.s += fieldBit__UnionRepresentation_Envelope_DiscriminantKey ma.state = maState_midValue @@ -39826,7 +39826,7 @@ func (ma *_UnionRepresentation_Envelope__Assembler) AssembleEntry(k string) (dms return &ma.ca_discriminantKey, nil case "contentKey": if ma.s&fieldBit__UnionRepresentation_Envelope_ContentKey != 0 { - return nil, dms3ld.ErrRepeatedMapKey{Key: &fieldName__UnionRepresentation_Envelope_ContentKey} + return nil, ld.ErrRepeatedMapKey{Key: &fieldName__UnionRepresentation_Envelope_ContentKey} } ma.s += fieldBit__UnionRepresentation_Envelope_ContentKey ma.state = maState_midValue @@ -39836,7 +39836,7 @@ func (ma *_UnionRepresentation_Envelope__Assembler) AssembleEntry(k string) (dms return &ma.ca_contentKey, nil case "discriminantTable": if ma.s&fieldBit__UnionRepresentation_Envelope_DiscriminantTable != 0 { - return nil, dms3ld.ErrRepeatedMapKey{Key: &fieldName__UnionRepresentation_Envelope_DiscriminantTable} + return nil, ld.ErrRepeatedMapKey{Key: &fieldName__UnionRepresentation_Envelope_DiscriminantTable} } ma.s += fieldBit__UnionRepresentation_Envelope_DiscriminantTable ma.state = maState_midValue @@ -39845,9 +39845,9 @@ func (ma *_UnionRepresentation_Envelope__Assembler) AssembleEntry(k string) (dms ma.ca_discriminantTable.m = &ma.cm return &ma.ca_discriminantTable, nil } - return nil, dms3ld.ErrInvalidKey{TypeName: "schemadmt.UnionRepresentation_Envelope", Key: &_String{k}} + return nil, ld.ErrInvalidKey{TypeName: "schemadmt.UnionRepresentation_Envelope", Key: &_String{k}} } -func (ma *_UnionRepresentation_Envelope__Assembler) AssembleKey() dms3ld.NodeAssembler { +func (ma *_UnionRepresentation_Envelope__Assembler) AssembleKey() ld.NodeAssembler { switch ma.state { case maState_initial: // carry on @@ -39865,7 +39865,7 @@ func (ma *_UnionRepresentation_Envelope__Assembler) AssembleKey() dms3ld.NodeAss ma.state = maState_midKey return (*_UnionRepresentation_Envelope__KeyAssembler)(ma) } -func (ma *_UnionRepresentation_Envelope__Assembler) AssembleValue() dms3ld.NodeAssembler { +func (ma *_UnionRepresentation_Envelope__Assembler) AssembleValue() ld.NodeAssembler { switch ma.state { case maState_initial: panic("invalid state: AssembleValue cannot be called when no key is primed") @@ -39912,7 +39912,7 @@ func (ma *_UnionRepresentation_Envelope__Assembler) Finish() error { panic("invalid state: Finish cannot be called on an assembler that's already finished") } if ma.s&fieldBits__UnionRepresentation_Envelope_sufficient != fieldBits__UnionRepresentation_Envelope_sufficient { - err := dms3ld.ErrMissingRequiredField{Missing: make([]string, 0)} + err := ld.ErrMissingRequiredField{Missing: make([]string, 0)} if ma.s&fieldBit__UnionRepresentation_Envelope_DiscriminantKey == 0 { err.Missing = append(err.Missing, "discriminantKey") } @@ -39928,19 +39928,19 @@ func (ma *_UnionRepresentation_Envelope__Assembler) Finish() error { *ma.m = schema.Maybe_Value return nil } -func (ma *_UnionRepresentation_Envelope__Assembler) KeyPrototype() dms3ld.NodePrototype { +func (ma *_UnionRepresentation_Envelope__Assembler) KeyPrototype() ld.NodePrototype { return _String__Prototype{} } -func (ma *_UnionRepresentation_Envelope__Assembler) ValuePrototype(k string) dms3ld.NodePrototype { +func (ma *_UnionRepresentation_Envelope__Assembler) ValuePrototype(k string) ld.NodePrototype { panic("todo structbuilder mapassembler valueprototype") } type _UnionRepresentation_Envelope__KeyAssembler _UnionRepresentation_Envelope__Assembler -func (_UnionRepresentation_Envelope__KeyAssembler) BeginMap(sizeHint int64) (dms3ld.MapAssembler, error) { +func (_UnionRepresentation_Envelope__KeyAssembler) BeginMap(sizeHint int64) (ld.MapAssembler, error) { return mixins.StringAssembler{TypeName: "schemadmt.UnionRepresentation_Envelope.KeyAssembler"}.BeginMap(0) } -func (_UnionRepresentation_Envelope__KeyAssembler) BeginList(sizeHint int64) (dms3ld.ListAssembler, error) { +func (_UnionRepresentation_Envelope__KeyAssembler) BeginList(sizeHint int64) (ld.ListAssembler, error) { return mixins.StringAssembler{TypeName: "schemadmt.UnionRepresentation_Envelope.KeyAssembler"}.BeginList(0) } func (na *_UnionRepresentation_Envelope__KeyAssembler) AssignNull() error { @@ -39962,50 +39962,50 @@ func (ka *_UnionRepresentation_Envelope__KeyAssembler) AssignString(k string) er switch k { case "discriminantKey": if ka.s&fieldBit__UnionRepresentation_Envelope_DiscriminantKey != 0 { - return dms3ld.ErrRepeatedMapKey{Key: &fieldName__UnionRepresentation_Envelope_DiscriminantKey} + return ld.ErrRepeatedMapKey{Key: &fieldName__UnionRepresentation_Envelope_DiscriminantKey} } ka.s += fieldBit__UnionRepresentation_Envelope_DiscriminantKey ka.state = maState_expectValue ka.f = 0 case "contentKey": if ka.s&fieldBit__UnionRepresentation_Envelope_ContentKey != 0 { - return dms3ld.ErrRepeatedMapKey{Key: &fieldName__UnionRepresentation_Envelope_ContentKey} + return ld.ErrRepeatedMapKey{Key: &fieldName__UnionRepresentation_Envelope_ContentKey} } ka.s += fieldBit__UnionRepresentation_Envelope_ContentKey ka.state = maState_expectValue ka.f = 1 case "discriminantTable": if ka.s&fieldBit__UnionRepresentation_Envelope_DiscriminantTable != 0 { - return dms3ld.ErrRepeatedMapKey{Key: &fieldName__UnionRepresentation_Envelope_DiscriminantTable} + return ld.ErrRepeatedMapKey{Key: &fieldName__UnionRepresentation_Envelope_DiscriminantTable} } ka.s += fieldBit__UnionRepresentation_Envelope_DiscriminantTable ka.state = maState_expectValue ka.f = 2 default: - return dms3ld.ErrInvalidKey{TypeName: "schemadmt.UnionRepresentation_Envelope", Key: &_String{k}} + return ld.ErrInvalidKey{TypeName: "schemadmt.UnionRepresentation_Envelope", Key: &_String{k}} } return nil } func (_UnionRepresentation_Envelope__KeyAssembler) AssignBytes([]byte) error { return mixins.StringAssembler{TypeName: "schemadmt.UnionRepresentation_Envelope.KeyAssembler"}.AssignBytes(nil) } -func (_UnionRepresentation_Envelope__KeyAssembler) AssignLink(dms3ld.Link) error { +func (_UnionRepresentation_Envelope__KeyAssembler) AssignLink(ld.Link) error { return mixins.StringAssembler{TypeName: "schemadmt.UnionRepresentation_Envelope.KeyAssembler"}.AssignLink(nil) } -func (ka *_UnionRepresentation_Envelope__KeyAssembler) AssignNode(v dms3ld.Node) error { +func (ka *_UnionRepresentation_Envelope__KeyAssembler) AssignNode(v ld.Node) error { if v2, err := v.AsString(); err != nil { return err } else { return ka.AssignString(v2) } } -func (_UnionRepresentation_Envelope__KeyAssembler) Prototype() dms3ld.NodePrototype { +func (_UnionRepresentation_Envelope__KeyAssembler) Prototype() ld.NodePrototype { return _String__Prototype{} } func (UnionRepresentation_Envelope) Type() schema.Type { return nil /*TODO:typelit*/ } -func (n UnionRepresentation_Envelope) Representation() dms3ld.Node { +func (n UnionRepresentation_Envelope) Representation() ld.Node { return (*_UnionRepresentation_Envelope__Repr)(n) } @@ -40016,12 +40016,12 @@ var ( fieldName__UnionRepresentation_Envelope_ContentKey_serial = _String{"contentKey"} fieldName__UnionRepresentation_Envelope_DiscriminantTable_serial = _String{"discriminantTable"} ) -var _ dms3ld.Node = &_UnionRepresentation_Envelope__Repr{} +var _ ld.Node = &_UnionRepresentation_Envelope__Repr{} -func (_UnionRepresentation_Envelope__Repr) Kind() dms3ld.Kind { - return dms3ld.Kind_Map +func (_UnionRepresentation_Envelope__Repr) Kind() ld.Kind { + return ld.Kind_Map } -func (n *_UnionRepresentation_Envelope__Repr) LookupByString(key string) (dms3ld.Node, error) { +func (n *_UnionRepresentation_Envelope__Repr) LookupByString(key string) (ld.Node, error) { switch key { case "discriminantKey": return n.discriminantKey.Representation(), nil @@ -40030,23 +40030,23 @@ func (n *_UnionRepresentation_Envelope__Repr) LookupByString(key string) (dms3ld case "discriminantTable": return n.discriminantTable.Representation(), nil default: - return nil, schema.ErrNoSuchField{Type: nil /*TODO*/, Field: dms3ld.PathSegmentOfString(key)} + return nil, schema.ErrNoSuchField{Type: nil /*TODO*/, Field: ld.PathSegmentOfString(key)} } } -func (n *_UnionRepresentation_Envelope__Repr) LookupByNode(key dms3ld.Node) (dms3ld.Node, error) { +func (n *_UnionRepresentation_Envelope__Repr) LookupByNode(key ld.Node) (ld.Node, error) { ks, err := key.AsString() if err != nil { return nil, err } return n.LookupByString(ks) } -func (_UnionRepresentation_Envelope__Repr) LookupByIndex(idx int64) (dms3ld.Node, error) { +func (_UnionRepresentation_Envelope__Repr) LookupByIndex(idx int64) (ld.Node, error) { return mixins.Map{TypeName: "schemadmt.UnionRepresentation_Envelope.Repr"}.LookupByIndex(0) } -func (n _UnionRepresentation_Envelope__Repr) LookupBySegment(seg dms3ld.PathSegment) (dms3ld.Node, error) { +func (n _UnionRepresentation_Envelope__Repr) LookupBySegment(seg ld.PathSegment) (ld.Node, error) { return n.LookupByString(seg.String()) } -func (n *_UnionRepresentation_Envelope__Repr) MapIterator() dms3ld.MapIterator { +func (n *_UnionRepresentation_Envelope__Repr) MapIterator() ld.MapIterator { return &_UnionRepresentation_Envelope__ReprMapItr{n, 0} } @@ -40055,9 +40055,9 @@ type _UnionRepresentation_Envelope__ReprMapItr struct { idx int } -func (itr *_UnionRepresentation_Envelope__ReprMapItr) Next() (k dms3ld.Node, v dms3ld.Node, _ error) { +func (itr *_UnionRepresentation_Envelope__ReprMapItr) Next() (k ld.Node, v ld.Node, _ error) { if itr.idx >= 3 { - return nil, nil, dms3ld.ErrIteratorOverread{} + return nil, nil, ld.ErrIteratorOverread{} } switch itr.idx { case 0: @@ -40078,7 +40078,7 @@ func (itr *_UnionRepresentation_Envelope__ReprMapItr) Next() (k dms3ld.Node, v d func (itr *_UnionRepresentation_Envelope__ReprMapItr) Done() bool { return itr.idx >= 3 } -func (_UnionRepresentation_Envelope__Repr) ListIterator() dms3ld.ListIterator { +func (_UnionRepresentation_Envelope__Repr) ListIterator() ld.ListIterator { return nil } func (rn *_UnionRepresentation_Envelope__Repr) Length() int64 { @@ -40106,16 +40106,16 @@ func (_UnionRepresentation_Envelope__Repr) AsString() (string, error) { func (_UnionRepresentation_Envelope__Repr) AsBytes() ([]byte, error) { return mixins.Map{TypeName: "schemadmt.UnionRepresentation_Envelope.Repr"}.AsBytes() } -func (_UnionRepresentation_Envelope__Repr) AsLink() (dms3ld.Link, error) { +func (_UnionRepresentation_Envelope__Repr) AsLink() (ld.Link, error) { return mixins.Map{TypeName: "schemadmt.UnionRepresentation_Envelope.Repr"}.AsLink() } -func (_UnionRepresentation_Envelope__Repr) Prototype() dms3ld.NodePrototype { +func (_UnionRepresentation_Envelope__Repr) Prototype() ld.NodePrototype { return _UnionRepresentation_Envelope__ReprPrototype{} } type _UnionRepresentation_Envelope__ReprPrototype struct{} -func (_UnionRepresentation_Envelope__ReprPrototype) NewBuilder() dms3ld.NodeBuilder { +func (_UnionRepresentation_Envelope__ReprPrototype) NewBuilder() ld.NodeBuilder { var nb _UnionRepresentation_Envelope__ReprBuilder nb.Reset() return &nb @@ -40125,7 +40125,7 @@ type _UnionRepresentation_Envelope__ReprBuilder struct { _UnionRepresentation_Envelope__ReprAssembler } -func (nb *_UnionRepresentation_Envelope__ReprBuilder) Build() dms3ld.Node { +func (nb *_UnionRepresentation_Envelope__ReprBuilder) Build() ld.Node { if *nb.m != schema.Maybe_Value { panic("invalid state: cannot call Build on an assembler that's not finished") } @@ -40157,7 +40157,7 @@ func (na *_UnionRepresentation_Envelope__ReprAssembler) reset() { na.ca_contentKey.reset() na.ca_discriminantTable.reset() } -func (na *_UnionRepresentation_Envelope__ReprAssembler) BeginMap(int64) (dms3ld.MapAssembler, error) { +func (na *_UnionRepresentation_Envelope__ReprAssembler) BeginMap(int64) (ld.MapAssembler, error) { switch *na.m { case schema.Maybe_Value, schema.Maybe_Null: panic("invalid state: cannot assign into assembler that's already finished") @@ -40170,7 +40170,7 @@ func (na *_UnionRepresentation_Envelope__ReprAssembler) BeginMap(int64) (dms3ld. } return na, nil } -func (_UnionRepresentation_Envelope__ReprAssembler) BeginList(sizeHint int64) (dms3ld.ListAssembler, error) { +func (_UnionRepresentation_Envelope__ReprAssembler) BeginList(sizeHint int64) (ld.ListAssembler, error) { return mixins.MapAssembler{TypeName: "schemadmt.UnionRepresentation_Envelope.Repr"}.BeginList(0) } func (na *_UnionRepresentation_Envelope__ReprAssembler) AssignNull() error { @@ -40202,10 +40202,10 @@ func (_UnionRepresentation_Envelope__ReprAssembler) AssignString(string) error { func (_UnionRepresentation_Envelope__ReprAssembler) AssignBytes([]byte) error { return mixins.MapAssembler{TypeName: "schemadmt.UnionRepresentation_Envelope.Repr"}.AssignBytes(nil) } -func (_UnionRepresentation_Envelope__ReprAssembler) AssignLink(dms3ld.Link) error { +func (_UnionRepresentation_Envelope__ReprAssembler) AssignLink(ld.Link) error { return mixins.MapAssembler{TypeName: "schemadmt.UnionRepresentation_Envelope.Repr"}.AssignLink(nil) } -func (na *_UnionRepresentation_Envelope__ReprAssembler) AssignNode(v dms3ld.Node) error { +func (na *_UnionRepresentation_Envelope__ReprAssembler) AssignNode(v ld.Node) error { if v.IsNull() { return na.AssignNull() } @@ -40225,8 +40225,8 @@ func (na *_UnionRepresentation_Envelope__ReprAssembler) AssignNode(v dms3ld.Node *na.m = schema.Maybe_Value return nil } - if v.Kind() != dms3ld.Kind_Map { - return dms3ld.ErrWrongKind{TypeName: "schemadmt.UnionRepresentation_Envelope.Repr", MethodName: "AssignNode", AppropriateKind: dms3ld.KindSet_JustMap, ActualKind: v.Kind()} + if v.Kind() != ld.Kind_Map { + return ld.ErrWrongKind{TypeName: "schemadmt.UnionRepresentation_Envelope.Repr", MethodName: "AssignNode", AppropriateKind: ld.KindSet_JustMap, ActualKind: v.Kind()} } itr := v.MapIterator() for !itr.Done() { @@ -40243,7 +40243,7 @@ func (na *_UnionRepresentation_Envelope__ReprAssembler) AssignNode(v dms3ld.Node } return na.Finish() } -func (_UnionRepresentation_Envelope__ReprAssembler) Prototype() dms3ld.NodePrototype { +func (_UnionRepresentation_Envelope__ReprAssembler) Prototype() ld.NodePrototype { return _UnionRepresentation_Envelope__ReprPrototype{} } func (ma *_UnionRepresentation_Envelope__ReprAssembler) valueFinishTidy() bool { @@ -40279,7 +40279,7 @@ func (ma *_UnionRepresentation_Envelope__ReprAssembler) valueFinishTidy() bool { panic("unreachable") } } -func (ma *_UnionRepresentation_Envelope__ReprAssembler) AssembleEntry(k string) (dms3ld.NodeAssembler, error) { +func (ma *_UnionRepresentation_Envelope__ReprAssembler) AssembleEntry(k string) (ld.NodeAssembler, error) { switch ma.state { case maState_initial: // carry on @@ -40297,7 +40297,7 @@ func (ma *_UnionRepresentation_Envelope__ReprAssembler) AssembleEntry(k string) switch k { case "discriminantKey": if ma.s&fieldBit__UnionRepresentation_Envelope_DiscriminantKey != 0 { - return nil, dms3ld.ErrRepeatedMapKey{Key: &fieldName__UnionRepresentation_Envelope_DiscriminantKey_serial} + return nil, ld.ErrRepeatedMapKey{Key: &fieldName__UnionRepresentation_Envelope_DiscriminantKey_serial} } ma.s += fieldBit__UnionRepresentation_Envelope_DiscriminantKey ma.state = maState_midValue @@ -40307,7 +40307,7 @@ func (ma *_UnionRepresentation_Envelope__ReprAssembler) AssembleEntry(k string) return &ma.ca_discriminantKey, nil case "contentKey": if ma.s&fieldBit__UnionRepresentation_Envelope_ContentKey != 0 { - return nil, dms3ld.ErrRepeatedMapKey{Key: &fieldName__UnionRepresentation_Envelope_ContentKey_serial} + return nil, ld.ErrRepeatedMapKey{Key: &fieldName__UnionRepresentation_Envelope_ContentKey_serial} } ma.s += fieldBit__UnionRepresentation_Envelope_ContentKey ma.state = maState_midValue @@ -40317,7 +40317,7 @@ func (ma *_UnionRepresentation_Envelope__ReprAssembler) AssembleEntry(k string) return &ma.ca_contentKey, nil case "discriminantTable": if ma.s&fieldBit__UnionRepresentation_Envelope_DiscriminantTable != 0 { - return nil, dms3ld.ErrRepeatedMapKey{Key: &fieldName__UnionRepresentation_Envelope_DiscriminantTable_serial} + return nil, ld.ErrRepeatedMapKey{Key: &fieldName__UnionRepresentation_Envelope_DiscriminantTable_serial} } ma.s += fieldBit__UnionRepresentation_Envelope_DiscriminantTable ma.state = maState_midValue @@ -40327,9 +40327,9 @@ func (ma *_UnionRepresentation_Envelope__ReprAssembler) AssembleEntry(k string) return &ma.ca_discriminantTable, nil default: } - return nil, dms3ld.ErrInvalidKey{TypeName: "schemadmt.UnionRepresentation_Envelope.Repr", Key: &_String{k}} + return nil, ld.ErrInvalidKey{TypeName: "schemadmt.UnionRepresentation_Envelope.Repr", Key: &_String{k}} } -func (ma *_UnionRepresentation_Envelope__ReprAssembler) AssembleKey() dms3ld.NodeAssembler { +func (ma *_UnionRepresentation_Envelope__ReprAssembler) AssembleKey() ld.NodeAssembler { switch ma.state { case maState_initial: // carry on @@ -40347,7 +40347,7 @@ func (ma *_UnionRepresentation_Envelope__ReprAssembler) AssembleKey() dms3ld.Nod ma.state = maState_midKey return (*_UnionRepresentation_Envelope__ReprKeyAssembler)(ma) } -func (ma *_UnionRepresentation_Envelope__ReprAssembler) AssembleValue() dms3ld.NodeAssembler { +func (ma *_UnionRepresentation_Envelope__ReprAssembler) AssembleValue() ld.NodeAssembler { switch ma.state { case maState_initial: panic("invalid state: AssembleValue cannot be called when no key is primed") @@ -40394,7 +40394,7 @@ func (ma *_UnionRepresentation_Envelope__ReprAssembler) Finish() error { panic("invalid state: Finish cannot be called on an assembler that's already finished") } if ma.s&fieldBits__UnionRepresentation_Envelope_sufficient != fieldBits__UnionRepresentation_Envelope_sufficient { - err := dms3ld.ErrMissingRequiredField{Missing: make([]string, 0)} + err := ld.ErrMissingRequiredField{Missing: make([]string, 0)} if ma.s&fieldBit__UnionRepresentation_Envelope_DiscriminantKey == 0 { err.Missing = append(err.Missing, "discriminantKey") } @@ -40410,19 +40410,19 @@ func (ma *_UnionRepresentation_Envelope__ReprAssembler) Finish() error { *ma.m = schema.Maybe_Value return nil } -func (ma *_UnionRepresentation_Envelope__ReprAssembler) KeyPrototype() dms3ld.NodePrototype { +func (ma *_UnionRepresentation_Envelope__ReprAssembler) KeyPrototype() ld.NodePrototype { return _String__Prototype{} } -func (ma *_UnionRepresentation_Envelope__ReprAssembler) ValuePrototype(k string) dms3ld.NodePrototype { +func (ma *_UnionRepresentation_Envelope__ReprAssembler) ValuePrototype(k string) ld.NodePrototype { panic("todo structbuilder mapassembler repr valueprototype") } type _UnionRepresentation_Envelope__ReprKeyAssembler _UnionRepresentation_Envelope__ReprAssembler -func (_UnionRepresentation_Envelope__ReprKeyAssembler) BeginMap(sizeHint int64) (dms3ld.MapAssembler, error) { +func (_UnionRepresentation_Envelope__ReprKeyAssembler) BeginMap(sizeHint int64) (ld.MapAssembler, error) { return mixins.StringAssembler{TypeName: "schemadmt.UnionRepresentation_Envelope.Repr.KeyAssembler"}.BeginMap(0) } -func (_UnionRepresentation_Envelope__ReprKeyAssembler) BeginList(sizeHint int64) (dms3ld.ListAssembler, error) { +func (_UnionRepresentation_Envelope__ReprKeyAssembler) BeginList(sizeHint int64) (ld.ListAssembler, error) { return mixins.StringAssembler{TypeName: "schemadmt.UnionRepresentation_Envelope.Repr.KeyAssembler"}.BeginList(0) } func (na *_UnionRepresentation_Envelope__ReprKeyAssembler) AssignNull() error { @@ -40444,7 +40444,7 @@ func (ka *_UnionRepresentation_Envelope__ReprKeyAssembler) AssignString(k string switch k { case "discriminantKey": if ka.s&fieldBit__UnionRepresentation_Envelope_DiscriminantKey != 0 { - return dms3ld.ErrRepeatedMapKey{Key: &fieldName__UnionRepresentation_Envelope_DiscriminantKey_serial} + return ld.ErrRepeatedMapKey{Key: &fieldName__UnionRepresentation_Envelope_DiscriminantKey_serial} } ka.s += fieldBit__UnionRepresentation_Envelope_DiscriminantKey ka.state = maState_expectValue @@ -40452,7 +40452,7 @@ func (ka *_UnionRepresentation_Envelope__ReprKeyAssembler) AssignString(k string return nil case "contentKey": if ka.s&fieldBit__UnionRepresentation_Envelope_ContentKey != 0 { - return dms3ld.ErrRepeatedMapKey{Key: &fieldName__UnionRepresentation_Envelope_ContentKey_serial} + return ld.ErrRepeatedMapKey{Key: &fieldName__UnionRepresentation_Envelope_ContentKey_serial} } ka.s += fieldBit__UnionRepresentation_Envelope_ContentKey ka.state = maState_expectValue @@ -40460,29 +40460,29 @@ func (ka *_UnionRepresentation_Envelope__ReprKeyAssembler) AssignString(k string return nil case "discriminantTable": if ka.s&fieldBit__UnionRepresentation_Envelope_DiscriminantTable != 0 { - return dms3ld.ErrRepeatedMapKey{Key: &fieldName__UnionRepresentation_Envelope_DiscriminantTable_serial} + return ld.ErrRepeatedMapKey{Key: &fieldName__UnionRepresentation_Envelope_DiscriminantTable_serial} } ka.s += fieldBit__UnionRepresentation_Envelope_DiscriminantTable ka.state = maState_expectValue ka.f = 2 return nil } - return dms3ld.ErrInvalidKey{TypeName: "schemadmt.UnionRepresentation_Envelope.Repr", Key: &_String{k}} + return ld.ErrInvalidKey{TypeName: "schemadmt.UnionRepresentation_Envelope.Repr", Key: &_String{k}} } func (_UnionRepresentation_Envelope__ReprKeyAssembler) AssignBytes([]byte) error { return mixins.StringAssembler{TypeName: "schemadmt.UnionRepresentation_Envelope.Repr.KeyAssembler"}.AssignBytes(nil) } -func (_UnionRepresentation_Envelope__ReprKeyAssembler) AssignLink(dms3ld.Link) error { +func (_UnionRepresentation_Envelope__ReprKeyAssembler) AssignLink(ld.Link) error { return mixins.StringAssembler{TypeName: "schemadmt.UnionRepresentation_Envelope.Repr.KeyAssembler"}.AssignLink(nil) } -func (ka *_UnionRepresentation_Envelope__ReprKeyAssembler) AssignNode(v dms3ld.Node) error { +func (ka *_UnionRepresentation_Envelope__ReprKeyAssembler) AssignNode(v ld.Node) error { if v2, err := v.AsString(); err != nil { return err } else { return ka.AssignString(v2) } } -func (_UnionRepresentation_Envelope__ReprKeyAssembler) Prototype() dms3ld.NodePrototype { +func (_UnionRepresentation_Envelope__ReprKeyAssembler) Prototype() ld.NodePrototype { return _String__Prototype{} } @@ -40508,12 +40508,12 @@ func (m MaybeUnionRepresentation_Inline) IsAbsent() bool { func (m MaybeUnionRepresentation_Inline) Exists() bool { return m.m == schema.Maybe_Value } -func (m MaybeUnionRepresentation_Inline) AsNode() dms3ld.Node { +func (m MaybeUnionRepresentation_Inline) AsNode() ld.Node { switch m.m { case schema.Maybe_Absent: - return dms3ld.Absent + return ld.Absent case schema.Maybe_Null: - return dms3ld.Null + return ld.Null case schema.Maybe_Value: return m.v default: @@ -40531,36 +40531,36 @@ var ( fieldName__UnionRepresentation_Inline_DiscriminantKey = _String{"discriminantKey"} fieldName__UnionRepresentation_Inline_DiscriminantTable = _String{"discriminantTable"} ) -var _ dms3ld.Node = (UnionRepresentation_Inline)(&_UnionRepresentation_Inline{}) +var _ ld.Node = (UnionRepresentation_Inline)(&_UnionRepresentation_Inline{}) var _ schema.TypedNode = (UnionRepresentation_Inline)(&_UnionRepresentation_Inline{}) -func (UnionRepresentation_Inline) Kind() dms3ld.Kind { - return dms3ld.Kind_Map +func (UnionRepresentation_Inline) Kind() ld.Kind { + return ld.Kind_Map } -func (n UnionRepresentation_Inline) LookupByString(key string) (dms3ld.Node, error) { +func (n UnionRepresentation_Inline) LookupByString(key string) (ld.Node, error) { switch key { case "discriminantKey": return &n.discriminantKey, nil case "discriminantTable": return &n.discriminantTable, nil default: - return nil, schema.ErrNoSuchField{Type: nil /*TODO*/, Field: dms3ld.PathSegmentOfString(key)} + return nil, schema.ErrNoSuchField{Type: nil /*TODO*/, Field: ld.PathSegmentOfString(key)} } } -func (n UnionRepresentation_Inline) LookupByNode(key dms3ld.Node) (dms3ld.Node, error) { +func (n UnionRepresentation_Inline) LookupByNode(key ld.Node) (ld.Node, error) { ks, err := key.AsString() if err != nil { return nil, err } return n.LookupByString(ks) } -func (UnionRepresentation_Inline) LookupByIndex(idx int64) (dms3ld.Node, error) { +func (UnionRepresentation_Inline) LookupByIndex(idx int64) (ld.Node, error) { return mixins.Map{TypeName: "schemadmt.UnionRepresentation_Inline"}.LookupByIndex(0) } -func (n UnionRepresentation_Inline) LookupBySegment(seg dms3ld.PathSegment) (dms3ld.Node, error) { +func (n UnionRepresentation_Inline) LookupBySegment(seg ld.PathSegment) (ld.Node, error) { return n.LookupByString(seg.String()) } -func (n UnionRepresentation_Inline) MapIterator() dms3ld.MapIterator { +func (n UnionRepresentation_Inline) MapIterator() ld.MapIterator { return &_UnionRepresentation_Inline__MapItr{n, 0} } @@ -40569,9 +40569,9 @@ type _UnionRepresentation_Inline__MapItr struct { idx int } -func (itr *_UnionRepresentation_Inline__MapItr) Next() (k dms3ld.Node, v dms3ld.Node, _ error) { +func (itr *_UnionRepresentation_Inline__MapItr) Next() (k ld.Node, v ld.Node, _ error) { if itr.idx >= 2 { - return nil, nil, dms3ld.ErrIteratorOverread{} + return nil, nil, ld.ErrIteratorOverread{} } switch itr.idx { case 0: @@ -40590,7 +40590,7 @@ func (itr *_UnionRepresentation_Inline__MapItr) Done() bool { return itr.idx >= 2 } -func (UnionRepresentation_Inline) ListIterator() dms3ld.ListIterator { +func (UnionRepresentation_Inline) ListIterator() ld.ListIterator { return nil } func (UnionRepresentation_Inline) Length() int64 { @@ -40617,16 +40617,16 @@ func (UnionRepresentation_Inline) AsString() (string, error) { func (UnionRepresentation_Inline) AsBytes() ([]byte, error) { return mixins.Map{TypeName: "schemadmt.UnionRepresentation_Inline"}.AsBytes() } -func (UnionRepresentation_Inline) AsLink() (dms3ld.Link, error) { +func (UnionRepresentation_Inline) AsLink() (ld.Link, error) { return mixins.Map{TypeName: "schemadmt.UnionRepresentation_Inline"}.AsLink() } -func (UnionRepresentation_Inline) Prototype() dms3ld.NodePrototype { +func (UnionRepresentation_Inline) Prototype() ld.NodePrototype { return _UnionRepresentation_Inline__Prototype{} } type _UnionRepresentation_Inline__Prototype struct{} -func (_UnionRepresentation_Inline__Prototype) NewBuilder() dms3ld.NodeBuilder { +func (_UnionRepresentation_Inline__Prototype) NewBuilder() ld.NodeBuilder { var nb _UnionRepresentation_Inline__Builder nb.Reset() return &nb @@ -40636,7 +40636,7 @@ type _UnionRepresentation_Inline__Builder struct { _UnionRepresentation_Inline__Assembler } -func (nb *_UnionRepresentation_Inline__Builder) Build() dms3ld.Node { +func (nb *_UnionRepresentation_Inline__Builder) Build() ld.Node { if *nb.m != schema.Maybe_Value { panic("invalid state: cannot call Build on an assembler that's not finished") } @@ -40673,7 +40673,7 @@ var ( fieldBits__UnionRepresentation_Inline_sufficient = 0 + 1<<0 + 1<<1 ) -func (na *_UnionRepresentation_Inline__Assembler) BeginMap(int64) (dms3ld.MapAssembler, error) { +func (na *_UnionRepresentation_Inline__Assembler) BeginMap(int64) (ld.MapAssembler, error) { switch *na.m { case schema.Maybe_Value, schema.Maybe_Null: panic("invalid state: cannot assign into assembler that's already finished") @@ -40686,7 +40686,7 @@ func (na *_UnionRepresentation_Inline__Assembler) BeginMap(int64) (dms3ld.MapAss } return na, nil } -func (_UnionRepresentation_Inline__Assembler) BeginList(sizeHint int64) (dms3ld.ListAssembler, error) { +func (_UnionRepresentation_Inline__Assembler) BeginList(sizeHint int64) (ld.ListAssembler, error) { return mixins.MapAssembler{TypeName: "schemadmt.UnionRepresentation_Inline"}.BeginList(0) } func (na *_UnionRepresentation_Inline__Assembler) AssignNull() error { @@ -40718,10 +40718,10 @@ func (_UnionRepresentation_Inline__Assembler) AssignString(string) error { func (_UnionRepresentation_Inline__Assembler) AssignBytes([]byte) error { return mixins.MapAssembler{TypeName: "schemadmt.UnionRepresentation_Inline"}.AssignBytes(nil) } -func (_UnionRepresentation_Inline__Assembler) AssignLink(dms3ld.Link) error { +func (_UnionRepresentation_Inline__Assembler) AssignLink(ld.Link) error { return mixins.MapAssembler{TypeName: "schemadmt.UnionRepresentation_Inline"}.AssignLink(nil) } -func (na *_UnionRepresentation_Inline__Assembler) AssignNode(v dms3ld.Node) error { +func (na *_UnionRepresentation_Inline__Assembler) AssignNode(v ld.Node) error { if v.IsNull() { return na.AssignNull() } @@ -40741,8 +40741,8 @@ func (na *_UnionRepresentation_Inline__Assembler) AssignNode(v dms3ld.Node) erro *na.m = schema.Maybe_Value return nil } - if v.Kind() != dms3ld.Kind_Map { - return dms3ld.ErrWrongKind{TypeName: "schemadmt.UnionRepresentation_Inline", MethodName: "AssignNode", AppropriateKind: dms3ld.KindSet_JustMap, ActualKind: v.Kind()} + if v.Kind() != ld.Kind_Map { + return ld.ErrWrongKind{TypeName: "schemadmt.UnionRepresentation_Inline", MethodName: "AssignNode", AppropriateKind: ld.KindSet_JustMap, ActualKind: v.Kind()} } itr := v.MapIterator() for !itr.Done() { @@ -40759,7 +40759,7 @@ func (na *_UnionRepresentation_Inline__Assembler) AssignNode(v dms3ld.Node) erro } return na.Finish() } -func (_UnionRepresentation_Inline__Assembler) Prototype() dms3ld.NodePrototype { +func (_UnionRepresentation_Inline__Assembler) Prototype() ld.NodePrototype { return _UnionRepresentation_Inline__Prototype{} } func (ma *_UnionRepresentation_Inline__Assembler) valueFinishTidy() bool { @@ -40788,7 +40788,7 @@ func (ma *_UnionRepresentation_Inline__Assembler) valueFinishTidy() bool { panic("unreachable") } } -func (ma *_UnionRepresentation_Inline__Assembler) AssembleEntry(k string) (dms3ld.NodeAssembler, error) { +func (ma *_UnionRepresentation_Inline__Assembler) AssembleEntry(k string) (ld.NodeAssembler, error) { switch ma.state { case maState_initial: // carry on @@ -40806,7 +40806,7 @@ func (ma *_UnionRepresentation_Inline__Assembler) AssembleEntry(k string) (dms3l switch k { case "discriminantKey": if ma.s&fieldBit__UnionRepresentation_Inline_DiscriminantKey != 0 { - return nil, dms3ld.ErrRepeatedMapKey{Key: &fieldName__UnionRepresentation_Inline_DiscriminantKey} + return nil, ld.ErrRepeatedMapKey{Key: &fieldName__UnionRepresentation_Inline_DiscriminantKey} } ma.s += fieldBit__UnionRepresentation_Inline_DiscriminantKey ma.state = maState_midValue @@ -40816,7 +40816,7 @@ func (ma *_UnionRepresentation_Inline__Assembler) AssembleEntry(k string) (dms3l return &ma.ca_discriminantKey, nil case "discriminantTable": if ma.s&fieldBit__UnionRepresentation_Inline_DiscriminantTable != 0 { - return nil, dms3ld.ErrRepeatedMapKey{Key: &fieldName__UnionRepresentation_Inline_DiscriminantTable} + return nil, ld.ErrRepeatedMapKey{Key: &fieldName__UnionRepresentation_Inline_DiscriminantTable} } ma.s += fieldBit__UnionRepresentation_Inline_DiscriminantTable ma.state = maState_midValue @@ -40825,9 +40825,9 @@ func (ma *_UnionRepresentation_Inline__Assembler) AssembleEntry(k string) (dms3l ma.ca_discriminantTable.m = &ma.cm return &ma.ca_discriminantTable, nil } - return nil, dms3ld.ErrInvalidKey{TypeName: "schemadmt.UnionRepresentation_Inline", Key: &_String{k}} + return nil, ld.ErrInvalidKey{TypeName: "schemadmt.UnionRepresentation_Inline", Key: &_String{k}} } -func (ma *_UnionRepresentation_Inline__Assembler) AssembleKey() dms3ld.NodeAssembler { +func (ma *_UnionRepresentation_Inline__Assembler) AssembleKey() ld.NodeAssembler { switch ma.state { case maState_initial: // carry on @@ -40845,7 +40845,7 @@ func (ma *_UnionRepresentation_Inline__Assembler) AssembleKey() dms3ld.NodeAssem ma.state = maState_midKey return (*_UnionRepresentation_Inline__KeyAssembler)(ma) } -func (ma *_UnionRepresentation_Inline__Assembler) AssembleValue() dms3ld.NodeAssembler { +func (ma *_UnionRepresentation_Inline__Assembler) AssembleValue() ld.NodeAssembler { switch ma.state { case maState_initial: panic("invalid state: AssembleValue cannot be called when no key is primed") @@ -40888,7 +40888,7 @@ func (ma *_UnionRepresentation_Inline__Assembler) Finish() error { panic("invalid state: Finish cannot be called on an assembler that's already finished") } if ma.s&fieldBits__UnionRepresentation_Inline_sufficient != fieldBits__UnionRepresentation_Inline_sufficient { - err := dms3ld.ErrMissingRequiredField{Missing: make([]string, 0)} + err := ld.ErrMissingRequiredField{Missing: make([]string, 0)} if ma.s&fieldBit__UnionRepresentation_Inline_DiscriminantKey == 0 { err.Missing = append(err.Missing, "discriminantKey") } @@ -40901,19 +40901,19 @@ func (ma *_UnionRepresentation_Inline__Assembler) Finish() error { *ma.m = schema.Maybe_Value return nil } -func (ma *_UnionRepresentation_Inline__Assembler) KeyPrototype() dms3ld.NodePrototype { +func (ma *_UnionRepresentation_Inline__Assembler) KeyPrototype() ld.NodePrototype { return _String__Prototype{} } -func (ma *_UnionRepresentation_Inline__Assembler) ValuePrototype(k string) dms3ld.NodePrototype { +func (ma *_UnionRepresentation_Inline__Assembler) ValuePrototype(k string) ld.NodePrototype { panic("todo structbuilder mapassembler valueprototype") } type _UnionRepresentation_Inline__KeyAssembler _UnionRepresentation_Inline__Assembler -func (_UnionRepresentation_Inline__KeyAssembler) BeginMap(sizeHint int64) (dms3ld.MapAssembler, error) { +func (_UnionRepresentation_Inline__KeyAssembler) BeginMap(sizeHint int64) (ld.MapAssembler, error) { return mixins.StringAssembler{TypeName: "schemadmt.UnionRepresentation_Inline.KeyAssembler"}.BeginMap(0) } -func (_UnionRepresentation_Inline__KeyAssembler) BeginList(sizeHint int64) (dms3ld.ListAssembler, error) { +func (_UnionRepresentation_Inline__KeyAssembler) BeginList(sizeHint int64) (ld.ListAssembler, error) { return mixins.StringAssembler{TypeName: "schemadmt.UnionRepresentation_Inline.KeyAssembler"}.BeginList(0) } func (na *_UnionRepresentation_Inline__KeyAssembler) AssignNull() error { @@ -40935,43 +40935,43 @@ func (ka *_UnionRepresentation_Inline__KeyAssembler) AssignString(k string) erro switch k { case "discriminantKey": if ka.s&fieldBit__UnionRepresentation_Inline_DiscriminantKey != 0 { - return dms3ld.ErrRepeatedMapKey{Key: &fieldName__UnionRepresentation_Inline_DiscriminantKey} + return ld.ErrRepeatedMapKey{Key: &fieldName__UnionRepresentation_Inline_DiscriminantKey} } ka.s += fieldBit__UnionRepresentation_Inline_DiscriminantKey ka.state = maState_expectValue ka.f = 0 case "discriminantTable": if ka.s&fieldBit__UnionRepresentation_Inline_DiscriminantTable != 0 { - return dms3ld.ErrRepeatedMapKey{Key: &fieldName__UnionRepresentation_Inline_DiscriminantTable} + return ld.ErrRepeatedMapKey{Key: &fieldName__UnionRepresentation_Inline_DiscriminantTable} } ka.s += fieldBit__UnionRepresentation_Inline_DiscriminantTable ka.state = maState_expectValue ka.f = 1 default: - return dms3ld.ErrInvalidKey{TypeName: "schemadmt.UnionRepresentation_Inline", Key: &_String{k}} + return ld.ErrInvalidKey{TypeName: "schemadmt.UnionRepresentation_Inline", Key: &_String{k}} } return nil } func (_UnionRepresentation_Inline__KeyAssembler) AssignBytes([]byte) error { return mixins.StringAssembler{TypeName: "schemadmt.UnionRepresentation_Inline.KeyAssembler"}.AssignBytes(nil) } -func (_UnionRepresentation_Inline__KeyAssembler) AssignLink(dms3ld.Link) error { +func (_UnionRepresentation_Inline__KeyAssembler) AssignLink(ld.Link) error { return mixins.StringAssembler{TypeName: "schemadmt.UnionRepresentation_Inline.KeyAssembler"}.AssignLink(nil) } -func (ka *_UnionRepresentation_Inline__KeyAssembler) AssignNode(v dms3ld.Node) error { +func (ka *_UnionRepresentation_Inline__KeyAssembler) AssignNode(v ld.Node) error { if v2, err := v.AsString(); err != nil { return err } else { return ka.AssignString(v2) } } -func (_UnionRepresentation_Inline__KeyAssembler) Prototype() dms3ld.NodePrototype { +func (_UnionRepresentation_Inline__KeyAssembler) Prototype() ld.NodePrototype { return _String__Prototype{} } func (UnionRepresentation_Inline) Type() schema.Type { return nil /*TODO:typelit*/ } -func (n UnionRepresentation_Inline) Representation() dms3ld.Node { +func (n UnionRepresentation_Inline) Representation() ld.Node { return (*_UnionRepresentation_Inline__Repr)(n) } @@ -40981,35 +40981,35 @@ var ( fieldName__UnionRepresentation_Inline_DiscriminantKey_serial = _String{"discriminantKey"} fieldName__UnionRepresentation_Inline_DiscriminantTable_serial = _String{"discriminantTable"} ) -var _ dms3ld.Node = &_UnionRepresentation_Inline__Repr{} +var _ ld.Node = &_UnionRepresentation_Inline__Repr{} -func (_UnionRepresentation_Inline__Repr) Kind() dms3ld.Kind { - return dms3ld.Kind_Map +func (_UnionRepresentation_Inline__Repr) Kind() ld.Kind { + return ld.Kind_Map } -func (n *_UnionRepresentation_Inline__Repr) LookupByString(key string) (dms3ld.Node, error) { +func (n *_UnionRepresentation_Inline__Repr) LookupByString(key string) (ld.Node, error) { switch key { case "discriminantKey": return n.discriminantKey.Representation(), nil case "discriminantTable": return n.discriminantTable.Representation(), nil default: - return nil, schema.ErrNoSuchField{Type: nil /*TODO*/, Field: dms3ld.PathSegmentOfString(key)} + return nil, schema.ErrNoSuchField{Type: nil /*TODO*/, Field: ld.PathSegmentOfString(key)} } } -func (n *_UnionRepresentation_Inline__Repr) LookupByNode(key dms3ld.Node) (dms3ld.Node, error) { +func (n *_UnionRepresentation_Inline__Repr) LookupByNode(key ld.Node) (ld.Node, error) { ks, err := key.AsString() if err != nil { return nil, err } return n.LookupByString(ks) } -func (_UnionRepresentation_Inline__Repr) LookupByIndex(idx int64) (dms3ld.Node, error) { +func (_UnionRepresentation_Inline__Repr) LookupByIndex(idx int64) (ld.Node, error) { return mixins.Map{TypeName: "schemadmt.UnionRepresentation_Inline.Repr"}.LookupByIndex(0) } -func (n _UnionRepresentation_Inline__Repr) LookupBySegment(seg dms3ld.PathSegment) (dms3ld.Node, error) { +func (n _UnionRepresentation_Inline__Repr) LookupBySegment(seg ld.PathSegment) (ld.Node, error) { return n.LookupByString(seg.String()) } -func (n *_UnionRepresentation_Inline__Repr) MapIterator() dms3ld.MapIterator { +func (n *_UnionRepresentation_Inline__Repr) MapIterator() ld.MapIterator { return &_UnionRepresentation_Inline__ReprMapItr{n, 0} } @@ -41018,9 +41018,9 @@ type _UnionRepresentation_Inline__ReprMapItr struct { idx int } -func (itr *_UnionRepresentation_Inline__ReprMapItr) Next() (k dms3ld.Node, v dms3ld.Node, _ error) { +func (itr *_UnionRepresentation_Inline__ReprMapItr) Next() (k ld.Node, v ld.Node, _ error) { if itr.idx >= 2 { - return nil, nil, dms3ld.ErrIteratorOverread{} + return nil, nil, ld.ErrIteratorOverread{} } switch itr.idx { case 0: @@ -41038,7 +41038,7 @@ func (itr *_UnionRepresentation_Inline__ReprMapItr) Next() (k dms3ld.Node, v dms func (itr *_UnionRepresentation_Inline__ReprMapItr) Done() bool { return itr.idx >= 2 } -func (_UnionRepresentation_Inline__Repr) ListIterator() dms3ld.ListIterator { +func (_UnionRepresentation_Inline__Repr) ListIterator() ld.ListIterator { return nil } func (rn *_UnionRepresentation_Inline__Repr) Length() int64 { @@ -41066,16 +41066,16 @@ func (_UnionRepresentation_Inline__Repr) AsString() (string, error) { func (_UnionRepresentation_Inline__Repr) AsBytes() ([]byte, error) { return mixins.Map{TypeName: "schemadmt.UnionRepresentation_Inline.Repr"}.AsBytes() } -func (_UnionRepresentation_Inline__Repr) AsLink() (dms3ld.Link, error) { +func (_UnionRepresentation_Inline__Repr) AsLink() (ld.Link, error) { return mixins.Map{TypeName: "schemadmt.UnionRepresentation_Inline.Repr"}.AsLink() } -func (_UnionRepresentation_Inline__Repr) Prototype() dms3ld.NodePrototype { +func (_UnionRepresentation_Inline__Repr) Prototype() ld.NodePrototype { return _UnionRepresentation_Inline__ReprPrototype{} } type _UnionRepresentation_Inline__ReprPrototype struct{} -func (_UnionRepresentation_Inline__ReprPrototype) NewBuilder() dms3ld.NodeBuilder { +func (_UnionRepresentation_Inline__ReprPrototype) NewBuilder() ld.NodeBuilder { var nb _UnionRepresentation_Inline__ReprBuilder nb.Reset() return &nb @@ -41085,7 +41085,7 @@ type _UnionRepresentation_Inline__ReprBuilder struct { _UnionRepresentation_Inline__ReprAssembler } -func (nb *_UnionRepresentation_Inline__ReprBuilder) Build() dms3ld.Node { +func (nb *_UnionRepresentation_Inline__ReprBuilder) Build() ld.Node { if *nb.m != schema.Maybe_Value { panic("invalid state: cannot call Build on an assembler that's not finished") } @@ -41115,7 +41115,7 @@ func (na *_UnionRepresentation_Inline__ReprAssembler) reset() { na.ca_discriminantKey.reset() na.ca_discriminantTable.reset() } -func (na *_UnionRepresentation_Inline__ReprAssembler) BeginMap(int64) (dms3ld.MapAssembler, error) { +func (na *_UnionRepresentation_Inline__ReprAssembler) BeginMap(int64) (ld.MapAssembler, error) { switch *na.m { case schema.Maybe_Value, schema.Maybe_Null: panic("invalid state: cannot assign into assembler that's already finished") @@ -41128,7 +41128,7 @@ func (na *_UnionRepresentation_Inline__ReprAssembler) BeginMap(int64) (dms3ld.Ma } return na, nil } -func (_UnionRepresentation_Inline__ReprAssembler) BeginList(sizeHint int64) (dms3ld.ListAssembler, error) { +func (_UnionRepresentation_Inline__ReprAssembler) BeginList(sizeHint int64) (ld.ListAssembler, error) { return mixins.MapAssembler{TypeName: "schemadmt.UnionRepresentation_Inline.Repr"}.BeginList(0) } func (na *_UnionRepresentation_Inline__ReprAssembler) AssignNull() error { @@ -41160,10 +41160,10 @@ func (_UnionRepresentation_Inline__ReprAssembler) AssignString(string) error { func (_UnionRepresentation_Inline__ReprAssembler) AssignBytes([]byte) error { return mixins.MapAssembler{TypeName: "schemadmt.UnionRepresentation_Inline.Repr"}.AssignBytes(nil) } -func (_UnionRepresentation_Inline__ReprAssembler) AssignLink(dms3ld.Link) error { +func (_UnionRepresentation_Inline__ReprAssembler) AssignLink(ld.Link) error { return mixins.MapAssembler{TypeName: "schemadmt.UnionRepresentation_Inline.Repr"}.AssignLink(nil) } -func (na *_UnionRepresentation_Inline__ReprAssembler) AssignNode(v dms3ld.Node) error { +func (na *_UnionRepresentation_Inline__ReprAssembler) AssignNode(v ld.Node) error { if v.IsNull() { return na.AssignNull() } @@ -41183,8 +41183,8 @@ func (na *_UnionRepresentation_Inline__ReprAssembler) AssignNode(v dms3ld.Node) *na.m = schema.Maybe_Value return nil } - if v.Kind() != dms3ld.Kind_Map { - return dms3ld.ErrWrongKind{TypeName: "schemadmt.UnionRepresentation_Inline.Repr", MethodName: "AssignNode", AppropriateKind: dms3ld.KindSet_JustMap, ActualKind: v.Kind()} + if v.Kind() != ld.Kind_Map { + return ld.ErrWrongKind{TypeName: "schemadmt.UnionRepresentation_Inline.Repr", MethodName: "AssignNode", AppropriateKind: ld.KindSet_JustMap, ActualKind: v.Kind()} } itr := v.MapIterator() for !itr.Done() { @@ -41201,7 +41201,7 @@ func (na *_UnionRepresentation_Inline__ReprAssembler) AssignNode(v dms3ld.Node) } return na.Finish() } -func (_UnionRepresentation_Inline__ReprAssembler) Prototype() dms3ld.NodePrototype { +func (_UnionRepresentation_Inline__ReprAssembler) Prototype() ld.NodePrototype { return _UnionRepresentation_Inline__ReprPrototype{} } func (ma *_UnionRepresentation_Inline__ReprAssembler) valueFinishTidy() bool { @@ -41228,7 +41228,7 @@ func (ma *_UnionRepresentation_Inline__ReprAssembler) valueFinishTidy() bool { panic("unreachable") } } -func (ma *_UnionRepresentation_Inline__ReprAssembler) AssembleEntry(k string) (dms3ld.NodeAssembler, error) { +func (ma *_UnionRepresentation_Inline__ReprAssembler) AssembleEntry(k string) (ld.NodeAssembler, error) { switch ma.state { case maState_initial: // carry on @@ -41246,7 +41246,7 @@ func (ma *_UnionRepresentation_Inline__ReprAssembler) AssembleEntry(k string) (d switch k { case "discriminantKey": if ma.s&fieldBit__UnionRepresentation_Inline_DiscriminantKey != 0 { - return nil, dms3ld.ErrRepeatedMapKey{Key: &fieldName__UnionRepresentation_Inline_DiscriminantKey_serial} + return nil, ld.ErrRepeatedMapKey{Key: &fieldName__UnionRepresentation_Inline_DiscriminantKey_serial} } ma.s += fieldBit__UnionRepresentation_Inline_DiscriminantKey ma.state = maState_midValue @@ -41256,7 +41256,7 @@ func (ma *_UnionRepresentation_Inline__ReprAssembler) AssembleEntry(k string) (d return &ma.ca_discriminantKey, nil case "discriminantTable": if ma.s&fieldBit__UnionRepresentation_Inline_DiscriminantTable != 0 { - return nil, dms3ld.ErrRepeatedMapKey{Key: &fieldName__UnionRepresentation_Inline_DiscriminantTable_serial} + return nil, ld.ErrRepeatedMapKey{Key: &fieldName__UnionRepresentation_Inline_DiscriminantTable_serial} } ma.s += fieldBit__UnionRepresentation_Inline_DiscriminantTable ma.state = maState_midValue @@ -41266,9 +41266,9 @@ func (ma *_UnionRepresentation_Inline__ReprAssembler) AssembleEntry(k string) (d return &ma.ca_discriminantTable, nil default: } - return nil, dms3ld.ErrInvalidKey{TypeName: "schemadmt.UnionRepresentation_Inline.Repr", Key: &_String{k}} + return nil, ld.ErrInvalidKey{TypeName: "schemadmt.UnionRepresentation_Inline.Repr", Key: &_String{k}} } -func (ma *_UnionRepresentation_Inline__ReprAssembler) AssembleKey() dms3ld.NodeAssembler { +func (ma *_UnionRepresentation_Inline__ReprAssembler) AssembleKey() ld.NodeAssembler { switch ma.state { case maState_initial: // carry on @@ -41286,7 +41286,7 @@ func (ma *_UnionRepresentation_Inline__ReprAssembler) AssembleKey() dms3ld.NodeA ma.state = maState_midKey return (*_UnionRepresentation_Inline__ReprKeyAssembler)(ma) } -func (ma *_UnionRepresentation_Inline__ReprAssembler) AssembleValue() dms3ld.NodeAssembler { +func (ma *_UnionRepresentation_Inline__ReprAssembler) AssembleValue() ld.NodeAssembler { switch ma.state { case maState_initial: panic("invalid state: AssembleValue cannot be called when no key is primed") @@ -41329,7 +41329,7 @@ func (ma *_UnionRepresentation_Inline__ReprAssembler) Finish() error { panic("invalid state: Finish cannot be called on an assembler that's already finished") } if ma.s&fieldBits__UnionRepresentation_Inline_sufficient != fieldBits__UnionRepresentation_Inline_sufficient { - err := dms3ld.ErrMissingRequiredField{Missing: make([]string, 0)} + err := ld.ErrMissingRequiredField{Missing: make([]string, 0)} if ma.s&fieldBit__UnionRepresentation_Inline_DiscriminantKey == 0 { err.Missing = append(err.Missing, "discriminantKey") } @@ -41342,19 +41342,19 @@ func (ma *_UnionRepresentation_Inline__ReprAssembler) Finish() error { *ma.m = schema.Maybe_Value return nil } -func (ma *_UnionRepresentation_Inline__ReprAssembler) KeyPrototype() dms3ld.NodePrototype { +func (ma *_UnionRepresentation_Inline__ReprAssembler) KeyPrototype() ld.NodePrototype { return _String__Prototype{} } -func (ma *_UnionRepresentation_Inline__ReprAssembler) ValuePrototype(k string) dms3ld.NodePrototype { +func (ma *_UnionRepresentation_Inline__ReprAssembler) ValuePrototype(k string) ld.NodePrototype { panic("todo structbuilder mapassembler repr valueprototype") } type _UnionRepresentation_Inline__ReprKeyAssembler _UnionRepresentation_Inline__ReprAssembler -func (_UnionRepresentation_Inline__ReprKeyAssembler) BeginMap(sizeHint int64) (dms3ld.MapAssembler, error) { +func (_UnionRepresentation_Inline__ReprKeyAssembler) BeginMap(sizeHint int64) (ld.MapAssembler, error) { return mixins.StringAssembler{TypeName: "schemadmt.UnionRepresentation_Inline.Repr.KeyAssembler"}.BeginMap(0) } -func (_UnionRepresentation_Inline__ReprKeyAssembler) BeginList(sizeHint int64) (dms3ld.ListAssembler, error) { +func (_UnionRepresentation_Inline__ReprKeyAssembler) BeginList(sizeHint int64) (ld.ListAssembler, error) { return mixins.StringAssembler{TypeName: "schemadmt.UnionRepresentation_Inline.Repr.KeyAssembler"}.BeginList(0) } func (na *_UnionRepresentation_Inline__ReprKeyAssembler) AssignNull() error { @@ -41376,7 +41376,7 @@ func (ka *_UnionRepresentation_Inline__ReprKeyAssembler) AssignString(k string) switch k { case "discriminantKey": if ka.s&fieldBit__UnionRepresentation_Inline_DiscriminantKey != 0 { - return dms3ld.ErrRepeatedMapKey{Key: &fieldName__UnionRepresentation_Inline_DiscriminantKey_serial} + return ld.ErrRepeatedMapKey{Key: &fieldName__UnionRepresentation_Inline_DiscriminantKey_serial} } ka.s += fieldBit__UnionRepresentation_Inline_DiscriminantKey ka.state = maState_expectValue @@ -41384,29 +41384,29 @@ func (ka *_UnionRepresentation_Inline__ReprKeyAssembler) AssignString(k string) return nil case "discriminantTable": if ka.s&fieldBit__UnionRepresentation_Inline_DiscriminantTable != 0 { - return dms3ld.ErrRepeatedMapKey{Key: &fieldName__UnionRepresentation_Inline_DiscriminantTable_serial} + return ld.ErrRepeatedMapKey{Key: &fieldName__UnionRepresentation_Inline_DiscriminantTable_serial} } ka.s += fieldBit__UnionRepresentation_Inline_DiscriminantTable ka.state = maState_expectValue ka.f = 1 return nil } - return dms3ld.ErrInvalidKey{TypeName: "schemadmt.UnionRepresentation_Inline.Repr", Key: &_String{k}} + return ld.ErrInvalidKey{TypeName: "schemadmt.UnionRepresentation_Inline.Repr", Key: &_String{k}} } func (_UnionRepresentation_Inline__ReprKeyAssembler) AssignBytes([]byte) error { return mixins.StringAssembler{TypeName: "schemadmt.UnionRepresentation_Inline.Repr.KeyAssembler"}.AssignBytes(nil) } -func (_UnionRepresentation_Inline__ReprKeyAssembler) AssignLink(dms3ld.Link) error { +func (_UnionRepresentation_Inline__ReprKeyAssembler) AssignLink(ld.Link) error { return mixins.StringAssembler{TypeName: "schemadmt.UnionRepresentation_Inline.Repr.KeyAssembler"}.AssignLink(nil) } -func (ka *_UnionRepresentation_Inline__ReprKeyAssembler) AssignNode(v dms3ld.Node) error { +func (ka *_UnionRepresentation_Inline__ReprKeyAssembler) AssignNode(v ld.Node) error { if v2, err := v.AsString(); err != nil { return err } else { return ka.AssignString(v2) } } -func (_UnionRepresentation_Inline__ReprKeyAssembler) Prototype() dms3ld.NodePrototype { +func (_UnionRepresentation_Inline__ReprKeyAssembler) Prototype() ld.NodePrototype { return _String__Prototype{} } @@ -41468,12 +41468,12 @@ func (m MaybeUnionRepresentation_Keyed) IsAbsent() bool { func (m MaybeUnionRepresentation_Keyed) Exists() bool { return m.m == schema.Maybe_Value } -func (m MaybeUnionRepresentation_Keyed) AsNode() dms3ld.Node { +func (m MaybeUnionRepresentation_Keyed) AsNode() ld.Node { switch m.m { case schema.Maybe_Absent: - return dms3ld.Absent + return ld.Absent case schema.Maybe_Null: - return dms3ld.Null + return ld.Null case schema.Maybe_Value: return &m.v default: @@ -41487,42 +41487,42 @@ func (m MaybeUnionRepresentation_Keyed) Must() UnionRepresentation_Keyed { return &m.v } -var _ dms3ld.Node = (UnionRepresentation_Keyed)(&_UnionRepresentation_Keyed{}) +var _ ld.Node = (UnionRepresentation_Keyed)(&_UnionRepresentation_Keyed{}) var _ schema.TypedNode = (UnionRepresentation_Keyed)(&_UnionRepresentation_Keyed{}) -func (UnionRepresentation_Keyed) Kind() dms3ld.Kind { - return dms3ld.Kind_Map +func (UnionRepresentation_Keyed) Kind() ld.Kind { + return ld.Kind_Map } -func (n UnionRepresentation_Keyed) LookupByString(k string) (dms3ld.Node, error) { +func (n UnionRepresentation_Keyed) LookupByString(k string) (ld.Node, error) { var k2 _String if err := (_String__Prototype{}).fromString(&k2, k); err != nil { return nil, err // TODO wrap in some kind of ErrInvalidKey } v, exists := n.m[k2] if !exists { - return nil, dms3ld.ErrNotExists{Segment: dms3ld.PathSegmentOfString(k)} + return nil, ld.ErrNotExists{Segment: ld.PathSegmentOfString(k)} } return v, nil } -func (n UnionRepresentation_Keyed) LookupByNode(k dms3ld.Node) (dms3ld.Node, error) { +func (n UnionRepresentation_Keyed) LookupByNode(k ld.Node) (ld.Node, error) { k2, ok := k.(String) if !ok { panic("todo invalid key type error") - // 'dms3ld.ErrInvalidKey{TypeName:"schemadmt.UnionRepresentation_Keyed", Key:&_String{k}}' doesn't quite cut it: need room to explain the type, and it's not guaranteed k can be turned into a string at all + // 'ld.ErrInvalidKey{TypeName:"schemadmt.UnionRepresentation_Keyed", Key:&_String{k}}' doesn't quite cut it: need room to explain the type, and it's not guaranteed k can be turned into a string at all } v, exists := n.m[*k2] if !exists { - return nil, dms3ld.ErrNotExists{Segment: dms3ld.PathSegmentOfString(k2.String())} + return nil, ld.ErrNotExists{Segment: ld.PathSegmentOfString(k2.String())} } return v, nil } -func (UnionRepresentation_Keyed) LookupByIndex(idx int64) (dms3ld.Node, error) { +func (UnionRepresentation_Keyed) LookupByIndex(idx int64) (ld.Node, error) { return mixins.Map{TypeName: "schemadmt.UnionRepresentation_Keyed"}.LookupByIndex(0) } -func (n UnionRepresentation_Keyed) LookupBySegment(seg dms3ld.PathSegment) (dms3ld.Node, error) { +func (n UnionRepresentation_Keyed) LookupBySegment(seg ld.PathSegment) (ld.Node, error) { return n.LookupByString(seg.String()) } -func (n UnionRepresentation_Keyed) MapIterator() dms3ld.MapIterator { +func (n UnionRepresentation_Keyed) MapIterator() ld.MapIterator { return &_UnionRepresentation_Keyed__MapItr{n, 0} } @@ -41531,9 +41531,9 @@ type _UnionRepresentation_Keyed__MapItr struct { idx int } -func (itr *_UnionRepresentation_Keyed__MapItr) Next() (k dms3ld.Node, v dms3ld.Node, _ error) { +func (itr *_UnionRepresentation_Keyed__MapItr) Next() (k ld.Node, v ld.Node, _ error) { if itr.idx >= len(itr.n.t) { - return nil, nil, dms3ld.ErrIteratorOverread{} + return nil, nil, ld.ErrIteratorOverread{} } x := &itr.n.t[itr.idx] k = &x.k @@ -41545,7 +41545,7 @@ func (itr *_UnionRepresentation_Keyed__MapItr) Done() bool { return itr.idx >= len(itr.n.t) } -func (UnionRepresentation_Keyed) ListIterator() dms3ld.ListIterator { +func (UnionRepresentation_Keyed) ListIterator() ld.ListIterator { return nil } func (n UnionRepresentation_Keyed) Length() int64 { @@ -41572,16 +41572,16 @@ func (UnionRepresentation_Keyed) AsString() (string, error) { func (UnionRepresentation_Keyed) AsBytes() ([]byte, error) { return mixins.Map{TypeName: "schemadmt.UnionRepresentation_Keyed"}.AsBytes() } -func (UnionRepresentation_Keyed) AsLink() (dms3ld.Link, error) { +func (UnionRepresentation_Keyed) AsLink() (ld.Link, error) { return mixins.Map{TypeName: "schemadmt.UnionRepresentation_Keyed"}.AsLink() } -func (UnionRepresentation_Keyed) Prototype() dms3ld.NodePrototype { +func (UnionRepresentation_Keyed) Prototype() ld.NodePrototype { return _UnionRepresentation_Keyed__Prototype{} } type _UnionRepresentation_Keyed__Prototype struct{} -func (_UnionRepresentation_Keyed__Prototype) NewBuilder() dms3ld.NodeBuilder { +func (_UnionRepresentation_Keyed__Prototype) NewBuilder() ld.NodeBuilder { var nb _UnionRepresentation_Keyed__Builder nb.Reset() return &nb @@ -41591,7 +41591,7 @@ type _UnionRepresentation_Keyed__Builder struct { _UnionRepresentation_Keyed__Assembler } -func (nb *_UnionRepresentation_Keyed__Builder) Build() dms3ld.Node { +func (nb *_UnionRepresentation_Keyed__Builder) Build() ld.Node { if *nb.m != schema.Maybe_Value { panic("invalid state: cannot call Build on an assembler that's not finished") } @@ -41618,7 +41618,7 @@ func (na *_UnionRepresentation_Keyed__Assembler) reset() { na.ka.reset() na.va.reset() } -func (na *_UnionRepresentation_Keyed__Assembler) BeginMap(sizeHint int64) (dms3ld.MapAssembler, error) { +func (na *_UnionRepresentation_Keyed__Assembler) BeginMap(sizeHint int64) (ld.MapAssembler, error) { switch *na.m { case schema.Maybe_Value, schema.Maybe_Null: panic("invalid state: cannot assign into assembler that's already finished") @@ -41633,7 +41633,7 @@ func (na *_UnionRepresentation_Keyed__Assembler) BeginMap(sizeHint int64) (dms3l na.w.t = make([]_UnionRepresentation_Keyed__entry, 0, sizeHint) return na, nil } -func (_UnionRepresentation_Keyed__Assembler) BeginList(sizeHint int64) (dms3ld.ListAssembler, error) { +func (_UnionRepresentation_Keyed__Assembler) BeginList(sizeHint int64) (ld.ListAssembler, error) { return mixins.MapAssembler{TypeName: "schemadmt.UnionRepresentation_Keyed"}.BeginList(0) } func (na *_UnionRepresentation_Keyed__Assembler) AssignNull() error { @@ -41665,10 +41665,10 @@ func (_UnionRepresentation_Keyed__Assembler) AssignString(string) error { func (_UnionRepresentation_Keyed__Assembler) AssignBytes([]byte) error { return mixins.MapAssembler{TypeName: "schemadmt.UnionRepresentation_Keyed"}.AssignBytes(nil) } -func (_UnionRepresentation_Keyed__Assembler) AssignLink(dms3ld.Link) error { +func (_UnionRepresentation_Keyed__Assembler) AssignLink(ld.Link) error { return mixins.MapAssembler{TypeName: "schemadmt.UnionRepresentation_Keyed"}.AssignLink(nil) } -func (na *_UnionRepresentation_Keyed__Assembler) AssignNode(v dms3ld.Node) error { +func (na *_UnionRepresentation_Keyed__Assembler) AssignNode(v ld.Node) error { if v.IsNull() { return na.AssignNull() } @@ -41683,8 +41683,8 @@ func (na *_UnionRepresentation_Keyed__Assembler) AssignNode(v dms3ld.Node) error *na.m = schema.Maybe_Value return nil } - if v.Kind() != dms3ld.Kind_Map { - return dms3ld.ErrWrongKind{TypeName: "schemadmt.UnionRepresentation_Keyed", MethodName: "AssignNode", AppropriateKind: dms3ld.KindSet_JustMap, ActualKind: v.Kind()} + if v.Kind() != ld.Kind_Map { + return ld.ErrWrongKind{TypeName: "schemadmt.UnionRepresentation_Keyed", MethodName: "AssignNode", AppropriateKind: ld.KindSet_JustMap, ActualKind: v.Kind()} } itr := v.MapIterator() for !itr.Done() { @@ -41701,7 +41701,7 @@ func (na *_UnionRepresentation_Keyed__Assembler) AssignNode(v dms3ld.Node) error } return na.Finish() } -func (_UnionRepresentation_Keyed__Assembler) Prototype() dms3ld.NodePrototype { +func (_UnionRepresentation_Keyed__Assembler) Prototype() ld.NodePrototype { return _UnionRepresentation_Keyed__Prototype{} } func (ma *_UnionRepresentation_Keyed__Assembler) keyFinishTidy() bool { @@ -41732,7 +41732,7 @@ func (ma *_UnionRepresentation_Keyed__Assembler) valueFinishTidy() bool { return false } } -func (ma *_UnionRepresentation_Keyed__Assembler) AssembleEntry(k string) (dms3ld.NodeAssembler, error) { +func (ma *_UnionRepresentation_Keyed__Assembler) AssembleEntry(k string) (ld.NodeAssembler, error) { switch ma.state { case maState_initial: // carry on @@ -41753,7 +41753,7 @@ func (ma *_UnionRepresentation_Keyed__Assembler) AssembleEntry(k string) (dms3ld return nil, err // TODO wrap in some kind of ErrInvalidKey } if _, exists := ma.w.m[k2]; exists { - return nil, dms3ld.ErrRepeatedMapKey{Key: &k2} + return nil, ld.ErrRepeatedMapKey{Key: &k2} } ma.w.t = append(ma.w.t, _UnionRepresentation_Keyed__entry{k: k2}) tz := &ma.w.t[len(ma.w.t)-1] @@ -41764,7 +41764,7 @@ func (ma *_UnionRepresentation_Keyed__Assembler) AssembleEntry(k string) (dms3ld ma.va.m = &ma.cm return &ma.va, nil } -func (ma *_UnionRepresentation_Keyed__Assembler) AssembleKey() dms3ld.NodeAssembler { +func (ma *_UnionRepresentation_Keyed__Assembler) AssembleKey() ld.NodeAssembler { switch ma.state { case maState_initial: // carry on @@ -41785,7 +41785,7 @@ func (ma *_UnionRepresentation_Keyed__Assembler) AssembleKey() dms3ld.NodeAssemb ma.ka.w = &ma.w.t[len(ma.w.t)-1].k return &ma.ka } -func (ma *_UnionRepresentation_Keyed__Assembler) AssembleValue() dms3ld.NodeAssembler { +func (ma *_UnionRepresentation_Keyed__Assembler) AssembleValue() ld.NodeAssembler { switch ma.state { case maState_initial: panic("invalid state: AssembleValue cannot be called when no key is primed") @@ -41822,55 +41822,55 @@ func (ma *_UnionRepresentation_Keyed__Assembler) Finish() error { *ma.m = schema.Maybe_Value return nil } -func (ma *_UnionRepresentation_Keyed__Assembler) KeyPrototype() dms3ld.NodePrototype { +func (ma *_UnionRepresentation_Keyed__Assembler) KeyPrototype() ld.NodePrototype { return _String__Prototype{} } -func (ma *_UnionRepresentation_Keyed__Assembler) ValuePrototype(_ string) dms3ld.NodePrototype { +func (ma *_UnionRepresentation_Keyed__Assembler) ValuePrototype(_ string) ld.NodePrototype { return _TypeName__Prototype{} } func (UnionRepresentation_Keyed) Type() schema.Type { return nil /*TODO:typelit*/ } -func (n UnionRepresentation_Keyed) Representation() dms3ld.Node { +func (n UnionRepresentation_Keyed) Representation() ld.Node { return (*_UnionRepresentation_Keyed__Repr)(n) } type _UnionRepresentation_Keyed__Repr _UnionRepresentation_Keyed -var _ dms3ld.Node = &_UnionRepresentation_Keyed__Repr{} +var _ ld.Node = &_UnionRepresentation_Keyed__Repr{} -func (_UnionRepresentation_Keyed__Repr) Kind() dms3ld.Kind { - return dms3ld.Kind_Map +func (_UnionRepresentation_Keyed__Repr) Kind() ld.Kind { + return ld.Kind_Map } -func (nr *_UnionRepresentation_Keyed__Repr) LookupByString(k string) (dms3ld.Node, error) { +func (nr *_UnionRepresentation_Keyed__Repr) LookupByString(k string) (ld.Node, error) { v, err := (UnionRepresentation_Keyed)(nr).LookupByString(k) - if err != nil || v == dms3ld.Null { + if err != nil || v == ld.Null { return v, err } return v.(TypeName).Representation(), nil } -func (nr *_UnionRepresentation_Keyed__Repr) LookupByNode(k dms3ld.Node) (dms3ld.Node, error) { +func (nr *_UnionRepresentation_Keyed__Repr) LookupByNode(k ld.Node) (ld.Node, error) { v, err := (UnionRepresentation_Keyed)(nr).LookupByNode(k) - if err != nil || v == dms3ld.Null { + if err != nil || v == ld.Null { return v, err } return v.(TypeName).Representation(), nil } -func (_UnionRepresentation_Keyed__Repr) LookupByIndex(idx int64) (dms3ld.Node, error) { +func (_UnionRepresentation_Keyed__Repr) LookupByIndex(idx int64) (ld.Node, error) { return mixins.Map{TypeName: "schemadmt.UnionRepresentation_Keyed.Repr"}.LookupByIndex(0) } -func (n _UnionRepresentation_Keyed__Repr) LookupBySegment(seg dms3ld.PathSegment) (dms3ld.Node, error) { +func (n _UnionRepresentation_Keyed__Repr) LookupBySegment(seg ld.PathSegment) (ld.Node, error) { return n.LookupByString(seg.String()) } -func (nr *_UnionRepresentation_Keyed__Repr) MapIterator() dms3ld.MapIterator { +func (nr *_UnionRepresentation_Keyed__Repr) MapIterator() ld.MapIterator { return &_UnionRepresentation_Keyed__ReprMapItr{(UnionRepresentation_Keyed)(nr), 0} } type _UnionRepresentation_Keyed__ReprMapItr _UnionRepresentation_Keyed__MapItr -func (itr *_UnionRepresentation_Keyed__ReprMapItr) Next() (k dms3ld.Node, v dms3ld.Node, err error) { +func (itr *_UnionRepresentation_Keyed__ReprMapItr) Next() (k ld.Node, v ld.Node, err error) { k, v, err = (*_UnionRepresentation_Keyed__MapItr)(itr).Next() - if err != nil || v == dms3ld.Null { + if err != nil || v == ld.Null { return } return k, v.(TypeName).Representation(), nil @@ -41879,7 +41879,7 @@ func (itr *_UnionRepresentation_Keyed__ReprMapItr) Done() bool { return (*_UnionRepresentation_Keyed__MapItr)(itr).Done() } -func (_UnionRepresentation_Keyed__Repr) ListIterator() dms3ld.ListIterator { +func (_UnionRepresentation_Keyed__Repr) ListIterator() ld.ListIterator { return nil } func (rn *_UnionRepresentation_Keyed__Repr) Length() int64 { @@ -41906,16 +41906,16 @@ func (_UnionRepresentation_Keyed__Repr) AsString() (string, error) { func (_UnionRepresentation_Keyed__Repr) AsBytes() ([]byte, error) { return mixins.Map{TypeName: "schemadmt.UnionRepresentation_Keyed.Repr"}.AsBytes() } -func (_UnionRepresentation_Keyed__Repr) AsLink() (dms3ld.Link, error) { +func (_UnionRepresentation_Keyed__Repr) AsLink() (ld.Link, error) { return mixins.Map{TypeName: "schemadmt.UnionRepresentation_Keyed.Repr"}.AsLink() } -func (_UnionRepresentation_Keyed__Repr) Prototype() dms3ld.NodePrototype { +func (_UnionRepresentation_Keyed__Repr) Prototype() ld.NodePrototype { return _UnionRepresentation_Keyed__ReprPrototype{} } type _UnionRepresentation_Keyed__ReprPrototype struct{} -func (_UnionRepresentation_Keyed__ReprPrototype) NewBuilder() dms3ld.NodeBuilder { +func (_UnionRepresentation_Keyed__ReprPrototype) NewBuilder() ld.NodeBuilder { var nb _UnionRepresentation_Keyed__ReprBuilder nb.Reset() return &nb @@ -41925,7 +41925,7 @@ type _UnionRepresentation_Keyed__ReprBuilder struct { _UnionRepresentation_Keyed__ReprAssembler } -func (nb *_UnionRepresentation_Keyed__ReprBuilder) Build() dms3ld.Node { +func (nb *_UnionRepresentation_Keyed__ReprBuilder) Build() ld.Node { if *nb.m != schema.Maybe_Value { panic("invalid state: cannot call Build on an assembler that's not finished") } @@ -41952,7 +41952,7 @@ func (na *_UnionRepresentation_Keyed__ReprAssembler) reset() { na.ka.reset() na.va.reset() } -func (na *_UnionRepresentation_Keyed__ReprAssembler) BeginMap(sizeHint int64) (dms3ld.MapAssembler, error) { +func (na *_UnionRepresentation_Keyed__ReprAssembler) BeginMap(sizeHint int64) (ld.MapAssembler, error) { switch *na.m { case schema.Maybe_Value, schema.Maybe_Null: panic("invalid state: cannot assign into assembler that's already finished") @@ -41967,7 +41967,7 @@ func (na *_UnionRepresentation_Keyed__ReprAssembler) BeginMap(sizeHint int64) (d na.w.t = make([]_UnionRepresentation_Keyed__entry, 0, sizeHint) return na, nil } -func (_UnionRepresentation_Keyed__ReprAssembler) BeginList(sizeHint int64) (dms3ld.ListAssembler, error) { +func (_UnionRepresentation_Keyed__ReprAssembler) BeginList(sizeHint int64) (ld.ListAssembler, error) { return mixins.MapAssembler{TypeName: "schemadmt.UnionRepresentation_Keyed.Repr"}.BeginList(0) } func (na *_UnionRepresentation_Keyed__ReprAssembler) AssignNull() error { @@ -41999,10 +41999,10 @@ func (_UnionRepresentation_Keyed__ReprAssembler) AssignString(string) error { func (_UnionRepresentation_Keyed__ReprAssembler) AssignBytes([]byte) error { return mixins.MapAssembler{TypeName: "schemadmt.UnionRepresentation_Keyed.Repr"}.AssignBytes(nil) } -func (_UnionRepresentation_Keyed__ReprAssembler) AssignLink(dms3ld.Link) error { +func (_UnionRepresentation_Keyed__ReprAssembler) AssignLink(ld.Link) error { return mixins.MapAssembler{TypeName: "schemadmt.UnionRepresentation_Keyed.Repr"}.AssignLink(nil) } -func (na *_UnionRepresentation_Keyed__ReprAssembler) AssignNode(v dms3ld.Node) error { +func (na *_UnionRepresentation_Keyed__ReprAssembler) AssignNode(v ld.Node) error { if v.IsNull() { return na.AssignNull() } @@ -42017,8 +42017,8 @@ func (na *_UnionRepresentation_Keyed__ReprAssembler) AssignNode(v dms3ld.Node) e *na.m = schema.Maybe_Value return nil } - if v.Kind() != dms3ld.Kind_Map { - return dms3ld.ErrWrongKind{TypeName: "schemadmt.UnionRepresentation_Keyed.Repr", MethodName: "AssignNode", AppropriateKind: dms3ld.KindSet_JustMap, ActualKind: v.Kind()} + if v.Kind() != ld.Kind_Map { + return ld.ErrWrongKind{TypeName: "schemadmt.UnionRepresentation_Keyed.Repr", MethodName: "AssignNode", AppropriateKind: ld.KindSet_JustMap, ActualKind: v.Kind()} } itr := v.MapIterator() for !itr.Done() { @@ -42035,7 +42035,7 @@ func (na *_UnionRepresentation_Keyed__ReprAssembler) AssignNode(v dms3ld.Node) e } return na.Finish() } -func (_UnionRepresentation_Keyed__ReprAssembler) Prototype() dms3ld.NodePrototype { +func (_UnionRepresentation_Keyed__ReprAssembler) Prototype() ld.NodePrototype { return _UnionRepresentation_Keyed__ReprPrototype{} } func (ma *_UnionRepresentation_Keyed__ReprAssembler) keyFinishTidy() bool { @@ -42066,7 +42066,7 @@ func (ma *_UnionRepresentation_Keyed__ReprAssembler) valueFinishTidy() bool { return false } } -func (ma *_UnionRepresentation_Keyed__ReprAssembler) AssembleEntry(k string) (dms3ld.NodeAssembler, error) { +func (ma *_UnionRepresentation_Keyed__ReprAssembler) AssembleEntry(k string) (ld.NodeAssembler, error) { switch ma.state { case maState_initial: // carry on @@ -42087,7 +42087,7 @@ func (ma *_UnionRepresentation_Keyed__ReprAssembler) AssembleEntry(k string) (dm return nil, err // TODO wrap in some kind of ErrInvalidKey } if _, exists := ma.w.m[k2]; exists { - return nil, dms3ld.ErrRepeatedMapKey{Key: &k2} + return nil, ld.ErrRepeatedMapKey{Key: &k2} } ma.w.t = append(ma.w.t, _UnionRepresentation_Keyed__entry{k: k2}) tz := &ma.w.t[len(ma.w.t)-1] @@ -42098,7 +42098,7 @@ func (ma *_UnionRepresentation_Keyed__ReprAssembler) AssembleEntry(k string) (dm ma.va.m = &ma.cm return &ma.va, nil } -func (ma *_UnionRepresentation_Keyed__ReprAssembler) AssembleKey() dms3ld.NodeAssembler { +func (ma *_UnionRepresentation_Keyed__ReprAssembler) AssembleKey() ld.NodeAssembler { switch ma.state { case maState_initial: // carry on @@ -42119,7 +42119,7 @@ func (ma *_UnionRepresentation_Keyed__ReprAssembler) AssembleKey() dms3ld.NodeAs ma.ka.w = &ma.w.t[len(ma.w.t)-1].k return &ma.ka } -func (ma *_UnionRepresentation_Keyed__ReprAssembler) AssembleValue() dms3ld.NodeAssembler { +func (ma *_UnionRepresentation_Keyed__ReprAssembler) AssembleValue() ld.NodeAssembler { switch ma.state { case maState_initial: panic("invalid state: AssembleValue cannot be called when no key is primed") @@ -42156,10 +42156,10 @@ func (ma *_UnionRepresentation_Keyed__ReprAssembler) Finish() error { *ma.m = schema.Maybe_Value return nil } -func (ma *_UnionRepresentation_Keyed__ReprAssembler) KeyPrototype() dms3ld.NodePrototype { +func (ma *_UnionRepresentation_Keyed__ReprAssembler) KeyPrototype() ld.NodePrototype { return _String__ReprPrototype{} } -func (ma *_UnionRepresentation_Keyed__ReprAssembler) ValuePrototype(_ string) dms3ld.NodePrototype { +func (ma *_UnionRepresentation_Keyed__ReprAssembler) ValuePrototype(_ string) ld.NodePrototype { return _TypeName__ReprPrototype{} } @@ -42221,12 +42221,12 @@ func (m MaybeUnionRepresentation_Kinded) IsAbsent() bool { func (m MaybeUnionRepresentation_Kinded) Exists() bool { return m.m == schema.Maybe_Value } -func (m MaybeUnionRepresentation_Kinded) AsNode() dms3ld.Node { +func (m MaybeUnionRepresentation_Kinded) AsNode() ld.Node { switch m.m { case schema.Maybe_Absent: - return dms3ld.Absent + return ld.Absent case schema.Maybe_Null: - return dms3ld.Null + return ld.Null case schema.Maybe_Value: return &m.v default: @@ -42240,42 +42240,42 @@ func (m MaybeUnionRepresentation_Kinded) Must() UnionRepresentation_Kinded { return &m.v } -var _ dms3ld.Node = (UnionRepresentation_Kinded)(&_UnionRepresentation_Kinded{}) +var _ ld.Node = (UnionRepresentation_Kinded)(&_UnionRepresentation_Kinded{}) var _ schema.TypedNode = (UnionRepresentation_Kinded)(&_UnionRepresentation_Kinded{}) -func (UnionRepresentation_Kinded) Kind() dms3ld.Kind { - return dms3ld.Kind_Map +func (UnionRepresentation_Kinded) Kind() ld.Kind { + return ld.Kind_Map } -func (n UnionRepresentation_Kinded) LookupByString(k string) (dms3ld.Node, error) { +func (n UnionRepresentation_Kinded) LookupByString(k string) (ld.Node, error) { var k2 _RepresentationKind if err := (_RepresentationKind__Prototype{}).fromString(&k2, k); err != nil { return nil, err // TODO wrap in some kind of ErrInvalidKey } v, exists := n.m[k2] if !exists { - return nil, dms3ld.ErrNotExists{Segment: dms3ld.PathSegmentOfString(k)} + return nil, ld.ErrNotExists{Segment: ld.PathSegmentOfString(k)} } return v, nil } -func (n UnionRepresentation_Kinded) LookupByNode(k dms3ld.Node) (dms3ld.Node, error) { +func (n UnionRepresentation_Kinded) LookupByNode(k ld.Node) (ld.Node, error) { k2, ok := k.(RepresentationKind) if !ok { panic("todo invalid key type error") - // 'dms3ld.ErrInvalidKey{TypeName:"schemadmt.UnionRepresentation_Kinded", Key:&_String{k}}' doesn't quite cut it: need room to explain the type, and it's not guaranteed k can be turned into a string at all + // 'ld.ErrInvalidKey{TypeName:"schemadmt.UnionRepresentation_Kinded", Key:&_String{k}}' doesn't quite cut it: need room to explain the type, and it's not guaranteed k can be turned into a string at all } v, exists := n.m[*k2] if !exists { - return nil, dms3ld.ErrNotExists{Segment: dms3ld.PathSegmentOfString(k2.String())} + return nil, ld.ErrNotExists{Segment: ld.PathSegmentOfString(k2.String())} } return v, nil } -func (UnionRepresentation_Kinded) LookupByIndex(idx int64) (dms3ld.Node, error) { +func (UnionRepresentation_Kinded) LookupByIndex(idx int64) (ld.Node, error) { return mixins.Map{TypeName: "schemadmt.UnionRepresentation_Kinded"}.LookupByIndex(0) } -func (n UnionRepresentation_Kinded) LookupBySegment(seg dms3ld.PathSegment) (dms3ld.Node, error) { +func (n UnionRepresentation_Kinded) LookupBySegment(seg ld.PathSegment) (ld.Node, error) { return n.LookupByString(seg.String()) } -func (n UnionRepresentation_Kinded) MapIterator() dms3ld.MapIterator { +func (n UnionRepresentation_Kinded) MapIterator() ld.MapIterator { return &_UnionRepresentation_Kinded__MapItr{n, 0} } @@ -42284,9 +42284,9 @@ type _UnionRepresentation_Kinded__MapItr struct { idx int } -func (itr *_UnionRepresentation_Kinded__MapItr) Next() (k dms3ld.Node, v dms3ld.Node, _ error) { +func (itr *_UnionRepresentation_Kinded__MapItr) Next() (k ld.Node, v ld.Node, _ error) { if itr.idx >= len(itr.n.t) { - return nil, nil, dms3ld.ErrIteratorOverread{} + return nil, nil, ld.ErrIteratorOverread{} } x := &itr.n.t[itr.idx] k = &x.k @@ -42298,7 +42298,7 @@ func (itr *_UnionRepresentation_Kinded__MapItr) Done() bool { return itr.idx >= len(itr.n.t) } -func (UnionRepresentation_Kinded) ListIterator() dms3ld.ListIterator { +func (UnionRepresentation_Kinded) ListIterator() ld.ListIterator { return nil } func (n UnionRepresentation_Kinded) Length() int64 { @@ -42325,16 +42325,16 @@ func (UnionRepresentation_Kinded) AsString() (string, error) { func (UnionRepresentation_Kinded) AsBytes() ([]byte, error) { return mixins.Map{TypeName: "schemadmt.UnionRepresentation_Kinded"}.AsBytes() } -func (UnionRepresentation_Kinded) AsLink() (dms3ld.Link, error) { +func (UnionRepresentation_Kinded) AsLink() (ld.Link, error) { return mixins.Map{TypeName: "schemadmt.UnionRepresentation_Kinded"}.AsLink() } -func (UnionRepresentation_Kinded) Prototype() dms3ld.NodePrototype { +func (UnionRepresentation_Kinded) Prototype() ld.NodePrototype { return _UnionRepresentation_Kinded__Prototype{} } type _UnionRepresentation_Kinded__Prototype struct{} -func (_UnionRepresentation_Kinded__Prototype) NewBuilder() dms3ld.NodeBuilder { +func (_UnionRepresentation_Kinded__Prototype) NewBuilder() ld.NodeBuilder { var nb _UnionRepresentation_Kinded__Builder nb.Reset() return &nb @@ -42344,7 +42344,7 @@ type _UnionRepresentation_Kinded__Builder struct { _UnionRepresentation_Kinded__Assembler } -func (nb *_UnionRepresentation_Kinded__Builder) Build() dms3ld.Node { +func (nb *_UnionRepresentation_Kinded__Builder) Build() ld.Node { if *nb.m != schema.Maybe_Value { panic("invalid state: cannot call Build on an assembler that's not finished") } @@ -42371,7 +42371,7 @@ func (na *_UnionRepresentation_Kinded__Assembler) reset() { na.ka.reset() na.va.reset() } -func (na *_UnionRepresentation_Kinded__Assembler) BeginMap(sizeHint int64) (dms3ld.MapAssembler, error) { +func (na *_UnionRepresentation_Kinded__Assembler) BeginMap(sizeHint int64) (ld.MapAssembler, error) { switch *na.m { case schema.Maybe_Value, schema.Maybe_Null: panic("invalid state: cannot assign into assembler that's already finished") @@ -42386,7 +42386,7 @@ func (na *_UnionRepresentation_Kinded__Assembler) BeginMap(sizeHint int64) (dms3 na.w.t = make([]_UnionRepresentation_Kinded__entry, 0, sizeHint) return na, nil } -func (_UnionRepresentation_Kinded__Assembler) BeginList(sizeHint int64) (dms3ld.ListAssembler, error) { +func (_UnionRepresentation_Kinded__Assembler) BeginList(sizeHint int64) (ld.ListAssembler, error) { return mixins.MapAssembler{TypeName: "schemadmt.UnionRepresentation_Kinded"}.BeginList(0) } func (na *_UnionRepresentation_Kinded__Assembler) AssignNull() error { @@ -42418,10 +42418,10 @@ func (_UnionRepresentation_Kinded__Assembler) AssignString(string) error { func (_UnionRepresentation_Kinded__Assembler) AssignBytes([]byte) error { return mixins.MapAssembler{TypeName: "schemadmt.UnionRepresentation_Kinded"}.AssignBytes(nil) } -func (_UnionRepresentation_Kinded__Assembler) AssignLink(dms3ld.Link) error { +func (_UnionRepresentation_Kinded__Assembler) AssignLink(ld.Link) error { return mixins.MapAssembler{TypeName: "schemadmt.UnionRepresentation_Kinded"}.AssignLink(nil) } -func (na *_UnionRepresentation_Kinded__Assembler) AssignNode(v dms3ld.Node) error { +func (na *_UnionRepresentation_Kinded__Assembler) AssignNode(v ld.Node) error { if v.IsNull() { return na.AssignNull() } @@ -42436,8 +42436,8 @@ func (na *_UnionRepresentation_Kinded__Assembler) AssignNode(v dms3ld.Node) erro *na.m = schema.Maybe_Value return nil } - if v.Kind() != dms3ld.Kind_Map { - return dms3ld.ErrWrongKind{TypeName: "schemadmt.UnionRepresentation_Kinded", MethodName: "AssignNode", AppropriateKind: dms3ld.KindSet_JustMap, ActualKind: v.Kind()} + if v.Kind() != ld.Kind_Map { + return ld.ErrWrongKind{TypeName: "schemadmt.UnionRepresentation_Kinded", MethodName: "AssignNode", AppropriateKind: ld.KindSet_JustMap, ActualKind: v.Kind()} } itr := v.MapIterator() for !itr.Done() { @@ -42454,7 +42454,7 @@ func (na *_UnionRepresentation_Kinded__Assembler) AssignNode(v dms3ld.Node) erro } return na.Finish() } -func (_UnionRepresentation_Kinded__Assembler) Prototype() dms3ld.NodePrototype { +func (_UnionRepresentation_Kinded__Assembler) Prototype() ld.NodePrototype { return _UnionRepresentation_Kinded__Prototype{} } func (ma *_UnionRepresentation_Kinded__Assembler) keyFinishTidy() bool { @@ -42485,7 +42485,7 @@ func (ma *_UnionRepresentation_Kinded__Assembler) valueFinishTidy() bool { return false } } -func (ma *_UnionRepresentation_Kinded__Assembler) AssembleEntry(k string) (dms3ld.NodeAssembler, error) { +func (ma *_UnionRepresentation_Kinded__Assembler) AssembleEntry(k string) (ld.NodeAssembler, error) { switch ma.state { case maState_initial: // carry on @@ -42506,7 +42506,7 @@ func (ma *_UnionRepresentation_Kinded__Assembler) AssembleEntry(k string) (dms3l return nil, err // TODO wrap in some kind of ErrInvalidKey } if _, exists := ma.w.m[k2]; exists { - return nil, dms3ld.ErrRepeatedMapKey{Key: &k2} + return nil, ld.ErrRepeatedMapKey{Key: &k2} } ma.w.t = append(ma.w.t, _UnionRepresentation_Kinded__entry{k: k2}) tz := &ma.w.t[len(ma.w.t)-1] @@ -42517,7 +42517,7 @@ func (ma *_UnionRepresentation_Kinded__Assembler) AssembleEntry(k string) (dms3l ma.va.m = &ma.cm return &ma.va, nil } -func (ma *_UnionRepresentation_Kinded__Assembler) AssembleKey() dms3ld.NodeAssembler { +func (ma *_UnionRepresentation_Kinded__Assembler) AssembleKey() ld.NodeAssembler { switch ma.state { case maState_initial: // carry on @@ -42538,7 +42538,7 @@ func (ma *_UnionRepresentation_Kinded__Assembler) AssembleKey() dms3ld.NodeAssem ma.ka.w = &ma.w.t[len(ma.w.t)-1].k return &ma.ka } -func (ma *_UnionRepresentation_Kinded__Assembler) AssembleValue() dms3ld.NodeAssembler { +func (ma *_UnionRepresentation_Kinded__Assembler) AssembleValue() ld.NodeAssembler { switch ma.state { case maState_initial: panic("invalid state: AssembleValue cannot be called when no key is primed") @@ -42575,55 +42575,55 @@ func (ma *_UnionRepresentation_Kinded__Assembler) Finish() error { *ma.m = schema.Maybe_Value return nil } -func (ma *_UnionRepresentation_Kinded__Assembler) KeyPrototype() dms3ld.NodePrototype { +func (ma *_UnionRepresentation_Kinded__Assembler) KeyPrototype() ld.NodePrototype { return _RepresentationKind__Prototype{} } -func (ma *_UnionRepresentation_Kinded__Assembler) ValuePrototype(_ string) dms3ld.NodePrototype { +func (ma *_UnionRepresentation_Kinded__Assembler) ValuePrototype(_ string) ld.NodePrototype { return _TypeName__Prototype{} } func (UnionRepresentation_Kinded) Type() schema.Type { return nil /*TODO:typelit*/ } -func (n UnionRepresentation_Kinded) Representation() dms3ld.Node { +func (n UnionRepresentation_Kinded) Representation() ld.Node { return (*_UnionRepresentation_Kinded__Repr)(n) } type _UnionRepresentation_Kinded__Repr _UnionRepresentation_Kinded -var _ dms3ld.Node = &_UnionRepresentation_Kinded__Repr{} +var _ ld.Node = &_UnionRepresentation_Kinded__Repr{} -func (_UnionRepresentation_Kinded__Repr) Kind() dms3ld.Kind { - return dms3ld.Kind_Map +func (_UnionRepresentation_Kinded__Repr) Kind() ld.Kind { + return ld.Kind_Map } -func (nr *_UnionRepresentation_Kinded__Repr) LookupByString(k string) (dms3ld.Node, error) { +func (nr *_UnionRepresentation_Kinded__Repr) LookupByString(k string) (ld.Node, error) { v, err := (UnionRepresentation_Kinded)(nr).LookupByString(k) - if err != nil || v == dms3ld.Null { + if err != nil || v == ld.Null { return v, err } return v.(TypeName).Representation(), nil } -func (nr *_UnionRepresentation_Kinded__Repr) LookupByNode(k dms3ld.Node) (dms3ld.Node, error) { +func (nr *_UnionRepresentation_Kinded__Repr) LookupByNode(k ld.Node) (ld.Node, error) { v, err := (UnionRepresentation_Kinded)(nr).LookupByNode(k) - if err != nil || v == dms3ld.Null { + if err != nil || v == ld.Null { return v, err } return v.(TypeName).Representation(), nil } -func (_UnionRepresentation_Kinded__Repr) LookupByIndex(idx int64) (dms3ld.Node, error) { +func (_UnionRepresentation_Kinded__Repr) LookupByIndex(idx int64) (ld.Node, error) { return mixins.Map{TypeName: "schemadmt.UnionRepresentation_Kinded.Repr"}.LookupByIndex(0) } -func (n _UnionRepresentation_Kinded__Repr) LookupBySegment(seg dms3ld.PathSegment) (dms3ld.Node, error) { +func (n _UnionRepresentation_Kinded__Repr) LookupBySegment(seg ld.PathSegment) (ld.Node, error) { return n.LookupByString(seg.String()) } -func (nr *_UnionRepresentation_Kinded__Repr) MapIterator() dms3ld.MapIterator { +func (nr *_UnionRepresentation_Kinded__Repr) MapIterator() ld.MapIterator { return &_UnionRepresentation_Kinded__ReprMapItr{(UnionRepresentation_Kinded)(nr), 0} } type _UnionRepresentation_Kinded__ReprMapItr _UnionRepresentation_Kinded__MapItr -func (itr *_UnionRepresentation_Kinded__ReprMapItr) Next() (k dms3ld.Node, v dms3ld.Node, err error) { +func (itr *_UnionRepresentation_Kinded__ReprMapItr) Next() (k ld.Node, v ld.Node, err error) { k, v, err = (*_UnionRepresentation_Kinded__MapItr)(itr).Next() - if err != nil || v == dms3ld.Null { + if err != nil || v == ld.Null { return } return k, v.(TypeName).Representation(), nil @@ -42632,7 +42632,7 @@ func (itr *_UnionRepresentation_Kinded__ReprMapItr) Done() bool { return (*_UnionRepresentation_Kinded__MapItr)(itr).Done() } -func (_UnionRepresentation_Kinded__Repr) ListIterator() dms3ld.ListIterator { +func (_UnionRepresentation_Kinded__Repr) ListIterator() ld.ListIterator { return nil } func (rn *_UnionRepresentation_Kinded__Repr) Length() int64 { @@ -42659,16 +42659,16 @@ func (_UnionRepresentation_Kinded__Repr) AsString() (string, error) { func (_UnionRepresentation_Kinded__Repr) AsBytes() ([]byte, error) { return mixins.Map{TypeName: "schemadmt.UnionRepresentation_Kinded.Repr"}.AsBytes() } -func (_UnionRepresentation_Kinded__Repr) AsLink() (dms3ld.Link, error) { +func (_UnionRepresentation_Kinded__Repr) AsLink() (ld.Link, error) { return mixins.Map{TypeName: "schemadmt.UnionRepresentation_Kinded.Repr"}.AsLink() } -func (_UnionRepresentation_Kinded__Repr) Prototype() dms3ld.NodePrototype { +func (_UnionRepresentation_Kinded__Repr) Prototype() ld.NodePrototype { return _UnionRepresentation_Kinded__ReprPrototype{} } type _UnionRepresentation_Kinded__ReprPrototype struct{} -func (_UnionRepresentation_Kinded__ReprPrototype) NewBuilder() dms3ld.NodeBuilder { +func (_UnionRepresentation_Kinded__ReprPrototype) NewBuilder() ld.NodeBuilder { var nb _UnionRepresentation_Kinded__ReprBuilder nb.Reset() return &nb @@ -42678,7 +42678,7 @@ type _UnionRepresentation_Kinded__ReprBuilder struct { _UnionRepresentation_Kinded__ReprAssembler } -func (nb *_UnionRepresentation_Kinded__ReprBuilder) Build() dms3ld.Node { +func (nb *_UnionRepresentation_Kinded__ReprBuilder) Build() ld.Node { if *nb.m != schema.Maybe_Value { panic("invalid state: cannot call Build on an assembler that's not finished") } @@ -42705,7 +42705,7 @@ func (na *_UnionRepresentation_Kinded__ReprAssembler) reset() { na.ka.reset() na.va.reset() } -func (na *_UnionRepresentation_Kinded__ReprAssembler) BeginMap(sizeHint int64) (dms3ld.MapAssembler, error) { +func (na *_UnionRepresentation_Kinded__ReprAssembler) BeginMap(sizeHint int64) (ld.MapAssembler, error) { switch *na.m { case schema.Maybe_Value, schema.Maybe_Null: panic("invalid state: cannot assign into assembler that's already finished") @@ -42720,7 +42720,7 @@ func (na *_UnionRepresentation_Kinded__ReprAssembler) BeginMap(sizeHint int64) ( na.w.t = make([]_UnionRepresentation_Kinded__entry, 0, sizeHint) return na, nil } -func (_UnionRepresentation_Kinded__ReprAssembler) BeginList(sizeHint int64) (dms3ld.ListAssembler, error) { +func (_UnionRepresentation_Kinded__ReprAssembler) BeginList(sizeHint int64) (ld.ListAssembler, error) { return mixins.MapAssembler{TypeName: "schemadmt.UnionRepresentation_Kinded.Repr"}.BeginList(0) } func (na *_UnionRepresentation_Kinded__ReprAssembler) AssignNull() error { @@ -42752,10 +42752,10 @@ func (_UnionRepresentation_Kinded__ReprAssembler) AssignString(string) error { func (_UnionRepresentation_Kinded__ReprAssembler) AssignBytes([]byte) error { return mixins.MapAssembler{TypeName: "schemadmt.UnionRepresentation_Kinded.Repr"}.AssignBytes(nil) } -func (_UnionRepresentation_Kinded__ReprAssembler) AssignLink(dms3ld.Link) error { +func (_UnionRepresentation_Kinded__ReprAssembler) AssignLink(ld.Link) error { return mixins.MapAssembler{TypeName: "schemadmt.UnionRepresentation_Kinded.Repr"}.AssignLink(nil) } -func (na *_UnionRepresentation_Kinded__ReprAssembler) AssignNode(v dms3ld.Node) error { +func (na *_UnionRepresentation_Kinded__ReprAssembler) AssignNode(v ld.Node) error { if v.IsNull() { return na.AssignNull() } @@ -42770,8 +42770,8 @@ func (na *_UnionRepresentation_Kinded__ReprAssembler) AssignNode(v dms3ld.Node) *na.m = schema.Maybe_Value return nil } - if v.Kind() != dms3ld.Kind_Map { - return dms3ld.ErrWrongKind{TypeName: "schemadmt.UnionRepresentation_Kinded.Repr", MethodName: "AssignNode", AppropriateKind: dms3ld.KindSet_JustMap, ActualKind: v.Kind()} + if v.Kind() != ld.Kind_Map { + return ld.ErrWrongKind{TypeName: "schemadmt.UnionRepresentation_Kinded.Repr", MethodName: "AssignNode", AppropriateKind: ld.KindSet_JustMap, ActualKind: v.Kind()} } itr := v.MapIterator() for !itr.Done() { @@ -42788,7 +42788,7 @@ func (na *_UnionRepresentation_Kinded__ReprAssembler) AssignNode(v dms3ld.Node) } return na.Finish() } -func (_UnionRepresentation_Kinded__ReprAssembler) Prototype() dms3ld.NodePrototype { +func (_UnionRepresentation_Kinded__ReprAssembler) Prototype() ld.NodePrototype { return _UnionRepresentation_Kinded__ReprPrototype{} } func (ma *_UnionRepresentation_Kinded__ReprAssembler) keyFinishTidy() bool { @@ -42819,7 +42819,7 @@ func (ma *_UnionRepresentation_Kinded__ReprAssembler) valueFinishTidy() bool { return false } } -func (ma *_UnionRepresentation_Kinded__ReprAssembler) AssembleEntry(k string) (dms3ld.NodeAssembler, error) { +func (ma *_UnionRepresentation_Kinded__ReprAssembler) AssembleEntry(k string) (ld.NodeAssembler, error) { switch ma.state { case maState_initial: // carry on @@ -42840,7 +42840,7 @@ func (ma *_UnionRepresentation_Kinded__ReprAssembler) AssembleEntry(k string) (d return nil, err // TODO wrap in some kind of ErrInvalidKey } if _, exists := ma.w.m[k2]; exists { - return nil, dms3ld.ErrRepeatedMapKey{Key: &k2} + return nil, ld.ErrRepeatedMapKey{Key: &k2} } ma.w.t = append(ma.w.t, _UnionRepresentation_Kinded__entry{k: k2}) tz := &ma.w.t[len(ma.w.t)-1] @@ -42851,7 +42851,7 @@ func (ma *_UnionRepresentation_Kinded__ReprAssembler) AssembleEntry(k string) (d ma.va.m = &ma.cm return &ma.va, nil } -func (ma *_UnionRepresentation_Kinded__ReprAssembler) AssembleKey() dms3ld.NodeAssembler { +func (ma *_UnionRepresentation_Kinded__ReprAssembler) AssembleKey() ld.NodeAssembler { switch ma.state { case maState_initial: // carry on @@ -42872,7 +42872,7 @@ func (ma *_UnionRepresentation_Kinded__ReprAssembler) AssembleKey() dms3ld.NodeA ma.ka.w = &ma.w.t[len(ma.w.t)-1].k return &ma.ka } -func (ma *_UnionRepresentation_Kinded__ReprAssembler) AssembleValue() dms3ld.NodeAssembler { +func (ma *_UnionRepresentation_Kinded__ReprAssembler) AssembleValue() ld.NodeAssembler { switch ma.state { case maState_initial: panic("invalid state: AssembleValue cannot be called when no key is primed") @@ -42909,10 +42909,10 @@ func (ma *_UnionRepresentation_Kinded__ReprAssembler) Finish() error { *ma.m = schema.Maybe_Value return nil } -func (ma *_UnionRepresentation_Kinded__ReprAssembler) KeyPrototype() dms3ld.NodePrototype { +func (ma *_UnionRepresentation_Kinded__ReprAssembler) KeyPrototype() ld.NodePrototype { return _RepresentationKind__ReprPrototype{} } -func (ma *_UnionRepresentation_Kinded__ReprAssembler) ValuePrototype(_ string) dms3ld.NodePrototype { +func (ma *_UnionRepresentation_Kinded__ReprAssembler) ValuePrototype(_ string) ld.NodePrototype { return _TypeName__ReprPrototype{} } @@ -42935,12 +42935,12 @@ func (m MaybeUnionRepresentation_StringPrefix) IsAbsent() bool { func (m MaybeUnionRepresentation_StringPrefix) Exists() bool { return m.m == schema.Maybe_Value } -func (m MaybeUnionRepresentation_StringPrefix) AsNode() dms3ld.Node { +func (m MaybeUnionRepresentation_StringPrefix) AsNode() ld.Node { switch m.m { case schema.Maybe_Absent: - return dms3ld.Absent + return ld.Absent case schema.Maybe_Null: - return dms3ld.Null + return ld.Null case schema.Maybe_Value: return m.v default: @@ -42957,34 +42957,34 @@ func (m MaybeUnionRepresentation_StringPrefix) Must() UnionRepresentation_String var ( fieldName__UnionRepresentation_StringPrefix_DiscriminantTable = _String{"discriminantTable"} ) -var _ dms3ld.Node = (UnionRepresentation_StringPrefix)(&_UnionRepresentation_StringPrefix{}) +var _ ld.Node = (UnionRepresentation_StringPrefix)(&_UnionRepresentation_StringPrefix{}) var _ schema.TypedNode = (UnionRepresentation_StringPrefix)(&_UnionRepresentation_StringPrefix{}) -func (UnionRepresentation_StringPrefix) Kind() dms3ld.Kind { - return dms3ld.Kind_Map +func (UnionRepresentation_StringPrefix) Kind() ld.Kind { + return ld.Kind_Map } -func (n UnionRepresentation_StringPrefix) LookupByString(key string) (dms3ld.Node, error) { +func (n UnionRepresentation_StringPrefix) LookupByString(key string) (ld.Node, error) { switch key { case "discriminantTable": return &n.discriminantTable, nil default: - return nil, schema.ErrNoSuchField{Type: nil /*TODO*/, Field: dms3ld.PathSegmentOfString(key)} + return nil, schema.ErrNoSuchField{Type: nil /*TODO*/, Field: ld.PathSegmentOfString(key)} } } -func (n UnionRepresentation_StringPrefix) LookupByNode(key dms3ld.Node) (dms3ld.Node, error) { +func (n UnionRepresentation_StringPrefix) LookupByNode(key ld.Node) (ld.Node, error) { ks, err := key.AsString() if err != nil { return nil, err } return n.LookupByString(ks) } -func (UnionRepresentation_StringPrefix) LookupByIndex(idx int64) (dms3ld.Node, error) { +func (UnionRepresentation_StringPrefix) LookupByIndex(idx int64) (ld.Node, error) { return mixins.Map{TypeName: "schemadmt.UnionRepresentation_StringPrefix"}.LookupByIndex(0) } -func (n UnionRepresentation_StringPrefix) LookupBySegment(seg dms3ld.PathSegment) (dms3ld.Node, error) { +func (n UnionRepresentation_StringPrefix) LookupBySegment(seg ld.PathSegment) (ld.Node, error) { return n.LookupByString(seg.String()) } -func (n UnionRepresentation_StringPrefix) MapIterator() dms3ld.MapIterator { +func (n UnionRepresentation_StringPrefix) MapIterator() ld.MapIterator { return &_UnionRepresentation_StringPrefix__MapItr{n, 0} } @@ -42993,9 +42993,9 @@ type _UnionRepresentation_StringPrefix__MapItr struct { idx int } -func (itr *_UnionRepresentation_StringPrefix__MapItr) Next() (k dms3ld.Node, v dms3ld.Node, _ error) { +func (itr *_UnionRepresentation_StringPrefix__MapItr) Next() (k ld.Node, v ld.Node, _ error) { if itr.idx >= 1 { - return nil, nil, dms3ld.ErrIteratorOverread{} + return nil, nil, ld.ErrIteratorOverread{} } switch itr.idx { case 0: @@ -43011,7 +43011,7 @@ func (itr *_UnionRepresentation_StringPrefix__MapItr) Done() bool { return itr.idx >= 1 } -func (UnionRepresentation_StringPrefix) ListIterator() dms3ld.ListIterator { +func (UnionRepresentation_StringPrefix) ListIterator() ld.ListIterator { return nil } func (UnionRepresentation_StringPrefix) Length() int64 { @@ -43038,16 +43038,16 @@ func (UnionRepresentation_StringPrefix) AsString() (string, error) { func (UnionRepresentation_StringPrefix) AsBytes() ([]byte, error) { return mixins.Map{TypeName: "schemadmt.UnionRepresentation_StringPrefix"}.AsBytes() } -func (UnionRepresentation_StringPrefix) AsLink() (dms3ld.Link, error) { +func (UnionRepresentation_StringPrefix) AsLink() (ld.Link, error) { return mixins.Map{TypeName: "schemadmt.UnionRepresentation_StringPrefix"}.AsLink() } -func (UnionRepresentation_StringPrefix) Prototype() dms3ld.NodePrototype { +func (UnionRepresentation_StringPrefix) Prototype() ld.NodePrototype { return _UnionRepresentation_StringPrefix__Prototype{} } type _UnionRepresentation_StringPrefix__Prototype struct{} -func (_UnionRepresentation_StringPrefix__Prototype) NewBuilder() dms3ld.NodeBuilder { +func (_UnionRepresentation_StringPrefix__Prototype) NewBuilder() ld.NodeBuilder { var nb _UnionRepresentation_StringPrefix__Builder nb.Reset() return &nb @@ -43057,7 +43057,7 @@ type _UnionRepresentation_StringPrefix__Builder struct { _UnionRepresentation_StringPrefix__Assembler } -func (nb *_UnionRepresentation_StringPrefix__Builder) Build() dms3ld.Node { +func (nb *_UnionRepresentation_StringPrefix__Builder) Build() ld.Node { if *nb.m != schema.Maybe_Value { panic("invalid state: cannot call Build on an assembler that's not finished") } @@ -43091,7 +43091,7 @@ var ( fieldBits__UnionRepresentation_StringPrefix_sufficient = 0 + 1<<0 ) -func (na *_UnionRepresentation_StringPrefix__Assembler) BeginMap(int64) (dms3ld.MapAssembler, error) { +func (na *_UnionRepresentation_StringPrefix__Assembler) BeginMap(int64) (ld.MapAssembler, error) { switch *na.m { case schema.Maybe_Value, schema.Maybe_Null: panic("invalid state: cannot assign into assembler that's already finished") @@ -43104,7 +43104,7 @@ func (na *_UnionRepresentation_StringPrefix__Assembler) BeginMap(int64) (dms3ld. } return na, nil } -func (_UnionRepresentation_StringPrefix__Assembler) BeginList(sizeHint int64) (dms3ld.ListAssembler, error) { +func (_UnionRepresentation_StringPrefix__Assembler) BeginList(sizeHint int64) (ld.ListAssembler, error) { return mixins.MapAssembler{TypeName: "schemadmt.UnionRepresentation_StringPrefix"}.BeginList(0) } func (na *_UnionRepresentation_StringPrefix__Assembler) AssignNull() error { @@ -43136,10 +43136,10 @@ func (_UnionRepresentation_StringPrefix__Assembler) AssignString(string) error { func (_UnionRepresentation_StringPrefix__Assembler) AssignBytes([]byte) error { return mixins.MapAssembler{TypeName: "schemadmt.UnionRepresentation_StringPrefix"}.AssignBytes(nil) } -func (_UnionRepresentation_StringPrefix__Assembler) AssignLink(dms3ld.Link) error { +func (_UnionRepresentation_StringPrefix__Assembler) AssignLink(ld.Link) error { return mixins.MapAssembler{TypeName: "schemadmt.UnionRepresentation_StringPrefix"}.AssignLink(nil) } -func (na *_UnionRepresentation_StringPrefix__Assembler) AssignNode(v dms3ld.Node) error { +func (na *_UnionRepresentation_StringPrefix__Assembler) AssignNode(v ld.Node) error { if v.IsNull() { return na.AssignNull() } @@ -43159,8 +43159,8 @@ func (na *_UnionRepresentation_StringPrefix__Assembler) AssignNode(v dms3ld.Node *na.m = schema.Maybe_Value return nil } - if v.Kind() != dms3ld.Kind_Map { - return dms3ld.ErrWrongKind{TypeName: "schemadmt.UnionRepresentation_StringPrefix", MethodName: "AssignNode", AppropriateKind: dms3ld.KindSet_JustMap, ActualKind: v.Kind()} + if v.Kind() != ld.Kind_Map { + return ld.ErrWrongKind{TypeName: "schemadmt.UnionRepresentation_StringPrefix", MethodName: "AssignNode", AppropriateKind: ld.KindSet_JustMap, ActualKind: v.Kind()} } itr := v.MapIterator() for !itr.Done() { @@ -43177,7 +43177,7 @@ func (na *_UnionRepresentation_StringPrefix__Assembler) AssignNode(v dms3ld.Node } return na.Finish() } -func (_UnionRepresentation_StringPrefix__Assembler) Prototype() dms3ld.NodePrototype { +func (_UnionRepresentation_StringPrefix__Assembler) Prototype() ld.NodePrototype { return _UnionRepresentation_StringPrefix__Prototype{} } func (ma *_UnionRepresentation_StringPrefix__Assembler) valueFinishTidy() bool { @@ -43196,7 +43196,7 @@ func (ma *_UnionRepresentation_StringPrefix__Assembler) valueFinishTidy() bool { panic("unreachable") } } -func (ma *_UnionRepresentation_StringPrefix__Assembler) AssembleEntry(k string) (dms3ld.NodeAssembler, error) { +func (ma *_UnionRepresentation_StringPrefix__Assembler) AssembleEntry(k string) (ld.NodeAssembler, error) { switch ma.state { case maState_initial: // carry on @@ -43214,7 +43214,7 @@ func (ma *_UnionRepresentation_StringPrefix__Assembler) AssembleEntry(k string) switch k { case "discriminantTable": if ma.s&fieldBit__UnionRepresentation_StringPrefix_DiscriminantTable != 0 { - return nil, dms3ld.ErrRepeatedMapKey{Key: &fieldName__UnionRepresentation_StringPrefix_DiscriminantTable} + return nil, ld.ErrRepeatedMapKey{Key: &fieldName__UnionRepresentation_StringPrefix_DiscriminantTable} } ma.s += fieldBit__UnionRepresentation_StringPrefix_DiscriminantTable ma.state = maState_midValue @@ -43223,9 +43223,9 @@ func (ma *_UnionRepresentation_StringPrefix__Assembler) AssembleEntry(k string) ma.ca_discriminantTable.m = &ma.cm return &ma.ca_discriminantTable, nil } - return nil, dms3ld.ErrInvalidKey{TypeName: "schemadmt.UnionRepresentation_StringPrefix", Key: &_String{k}} + return nil, ld.ErrInvalidKey{TypeName: "schemadmt.UnionRepresentation_StringPrefix", Key: &_String{k}} } -func (ma *_UnionRepresentation_StringPrefix__Assembler) AssembleKey() dms3ld.NodeAssembler { +func (ma *_UnionRepresentation_StringPrefix__Assembler) AssembleKey() ld.NodeAssembler { switch ma.state { case maState_initial: // carry on @@ -43243,7 +43243,7 @@ func (ma *_UnionRepresentation_StringPrefix__Assembler) AssembleKey() dms3ld.Nod ma.state = maState_midKey return (*_UnionRepresentation_StringPrefix__KeyAssembler)(ma) } -func (ma *_UnionRepresentation_StringPrefix__Assembler) AssembleValue() dms3ld.NodeAssembler { +func (ma *_UnionRepresentation_StringPrefix__Assembler) AssembleValue() ld.NodeAssembler { switch ma.state { case maState_initial: panic("invalid state: AssembleValue cannot be called when no key is primed") @@ -43282,7 +43282,7 @@ func (ma *_UnionRepresentation_StringPrefix__Assembler) Finish() error { panic("invalid state: Finish cannot be called on an assembler that's already finished") } if ma.s&fieldBits__UnionRepresentation_StringPrefix_sufficient != fieldBits__UnionRepresentation_StringPrefix_sufficient { - err := dms3ld.ErrMissingRequiredField{Missing: make([]string, 0)} + err := ld.ErrMissingRequiredField{Missing: make([]string, 0)} if ma.s&fieldBit__UnionRepresentation_StringPrefix_DiscriminantTable == 0 { err.Missing = append(err.Missing, "discriminantTable") } @@ -43292,19 +43292,19 @@ func (ma *_UnionRepresentation_StringPrefix__Assembler) Finish() error { *ma.m = schema.Maybe_Value return nil } -func (ma *_UnionRepresentation_StringPrefix__Assembler) KeyPrototype() dms3ld.NodePrototype { +func (ma *_UnionRepresentation_StringPrefix__Assembler) KeyPrototype() ld.NodePrototype { return _String__Prototype{} } -func (ma *_UnionRepresentation_StringPrefix__Assembler) ValuePrototype(k string) dms3ld.NodePrototype { +func (ma *_UnionRepresentation_StringPrefix__Assembler) ValuePrototype(k string) ld.NodePrototype { panic("todo structbuilder mapassembler valueprototype") } type _UnionRepresentation_StringPrefix__KeyAssembler _UnionRepresentation_StringPrefix__Assembler -func (_UnionRepresentation_StringPrefix__KeyAssembler) BeginMap(sizeHint int64) (dms3ld.MapAssembler, error) { +func (_UnionRepresentation_StringPrefix__KeyAssembler) BeginMap(sizeHint int64) (ld.MapAssembler, error) { return mixins.StringAssembler{TypeName: "schemadmt.UnionRepresentation_StringPrefix.KeyAssembler"}.BeginMap(0) } -func (_UnionRepresentation_StringPrefix__KeyAssembler) BeginList(sizeHint int64) (dms3ld.ListAssembler, error) { +func (_UnionRepresentation_StringPrefix__KeyAssembler) BeginList(sizeHint int64) (ld.ListAssembler, error) { return mixins.StringAssembler{TypeName: "schemadmt.UnionRepresentation_StringPrefix.KeyAssembler"}.BeginList(0) } func (na *_UnionRepresentation_StringPrefix__KeyAssembler) AssignNull() error { @@ -43326,36 +43326,36 @@ func (ka *_UnionRepresentation_StringPrefix__KeyAssembler) AssignString(k string switch k { case "discriminantTable": if ka.s&fieldBit__UnionRepresentation_StringPrefix_DiscriminantTable != 0 { - return dms3ld.ErrRepeatedMapKey{Key: &fieldName__UnionRepresentation_StringPrefix_DiscriminantTable} + return ld.ErrRepeatedMapKey{Key: &fieldName__UnionRepresentation_StringPrefix_DiscriminantTable} } ka.s += fieldBit__UnionRepresentation_StringPrefix_DiscriminantTable ka.state = maState_expectValue ka.f = 0 default: - return dms3ld.ErrInvalidKey{TypeName: "schemadmt.UnionRepresentation_StringPrefix", Key: &_String{k}} + return ld.ErrInvalidKey{TypeName: "schemadmt.UnionRepresentation_StringPrefix", Key: &_String{k}} } return nil } func (_UnionRepresentation_StringPrefix__KeyAssembler) AssignBytes([]byte) error { return mixins.StringAssembler{TypeName: "schemadmt.UnionRepresentation_StringPrefix.KeyAssembler"}.AssignBytes(nil) } -func (_UnionRepresentation_StringPrefix__KeyAssembler) AssignLink(dms3ld.Link) error { +func (_UnionRepresentation_StringPrefix__KeyAssembler) AssignLink(ld.Link) error { return mixins.StringAssembler{TypeName: "schemadmt.UnionRepresentation_StringPrefix.KeyAssembler"}.AssignLink(nil) } -func (ka *_UnionRepresentation_StringPrefix__KeyAssembler) AssignNode(v dms3ld.Node) error { +func (ka *_UnionRepresentation_StringPrefix__KeyAssembler) AssignNode(v ld.Node) error { if v2, err := v.AsString(); err != nil { return err } else { return ka.AssignString(v2) } } -func (_UnionRepresentation_StringPrefix__KeyAssembler) Prototype() dms3ld.NodePrototype { +func (_UnionRepresentation_StringPrefix__KeyAssembler) Prototype() ld.NodePrototype { return _String__Prototype{} } func (UnionRepresentation_StringPrefix) Type() schema.Type { return nil /*TODO:typelit*/ } -func (n UnionRepresentation_StringPrefix) Representation() dms3ld.Node { +func (n UnionRepresentation_StringPrefix) Representation() ld.Node { return (*_UnionRepresentation_StringPrefix__Repr)(n) } @@ -43364,33 +43364,33 @@ type _UnionRepresentation_StringPrefix__Repr _UnionRepresentation_StringPrefix var ( fieldName__UnionRepresentation_StringPrefix_DiscriminantTable_serial = _String{"discriminantTable"} ) -var _ dms3ld.Node = &_UnionRepresentation_StringPrefix__Repr{} +var _ ld.Node = &_UnionRepresentation_StringPrefix__Repr{} -func (_UnionRepresentation_StringPrefix__Repr) Kind() dms3ld.Kind { - return dms3ld.Kind_Map +func (_UnionRepresentation_StringPrefix__Repr) Kind() ld.Kind { + return ld.Kind_Map } -func (n *_UnionRepresentation_StringPrefix__Repr) LookupByString(key string) (dms3ld.Node, error) { +func (n *_UnionRepresentation_StringPrefix__Repr) LookupByString(key string) (ld.Node, error) { switch key { case "discriminantTable": return n.discriminantTable.Representation(), nil default: - return nil, schema.ErrNoSuchField{Type: nil /*TODO*/, Field: dms3ld.PathSegmentOfString(key)} + return nil, schema.ErrNoSuchField{Type: nil /*TODO*/, Field: ld.PathSegmentOfString(key)} } } -func (n *_UnionRepresentation_StringPrefix__Repr) LookupByNode(key dms3ld.Node) (dms3ld.Node, error) { +func (n *_UnionRepresentation_StringPrefix__Repr) LookupByNode(key ld.Node) (ld.Node, error) { ks, err := key.AsString() if err != nil { return nil, err } return n.LookupByString(ks) } -func (_UnionRepresentation_StringPrefix__Repr) LookupByIndex(idx int64) (dms3ld.Node, error) { +func (_UnionRepresentation_StringPrefix__Repr) LookupByIndex(idx int64) (ld.Node, error) { return mixins.Map{TypeName: "schemadmt.UnionRepresentation_StringPrefix.Repr"}.LookupByIndex(0) } -func (n _UnionRepresentation_StringPrefix__Repr) LookupBySegment(seg dms3ld.PathSegment) (dms3ld.Node, error) { +func (n _UnionRepresentation_StringPrefix__Repr) LookupBySegment(seg ld.PathSegment) (ld.Node, error) { return n.LookupByString(seg.String()) } -func (n *_UnionRepresentation_StringPrefix__Repr) MapIterator() dms3ld.MapIterator { +func (n *_UnionRepresentation_StringPrefix__Repr) MapIterator() ld.MapIterator { return &_UnionRepresentation_StringPrefix__ReprMapItr{n, 0} } @@ -43399,9 +43399,9 @@ type _UnionRepresentation_StringPrefix__ReprMapItr struct { idx int } -func (itr *_UnionRepresentation_StringPrefix__ReprMapItr) Next() (k dms3ld.Node, v dms3ld.Node, _ error) { +func (itr *_UnionRepresentation_StringPrefix__ReprMapItr) Next() (k ld.Node, v ld.Node, _ error) { if itr.idx >= 1 { - return nil, nil, dms3ld.ErrIteratorOverread{} + return nil, nil, ld.ErrIteratorOverread{} } switch itr.idx { case 0: @@ -43416,7 +43416,7 @@ func (itr *_UnionRepresentation_StringPrefix__ReprMapItr) Next() (k dms3ld.Node, func (itr *_UnionRepresentation_StringPrefix__ReprMapItr) Done() bool { return itr.idx >= 1 } -func (_UnionRepresentation_StringPrefix__Repr) ListIterator() dms3ld.ListIterator { +func (_UnionRepresentation_StringPrefix__Repr) ListIterator() ld.ListIterator { return nil } func (rn *_UnionRepresentation_StringPrefix__Repr) Length() int64 { @@ -43444,16 +43444,16 @@ func (_UnionRepresentation_StringPrefix__Repr) AsString() (string, error) { func (_UnionRepresentation_StringPrefix__Repr) AsBytes() ([]byte, error) { return mixins.Map{TypeName: "schemadmt.UnionRepresentation_StringPrefix.Repr"}.AsBytes() } -func (_UnionRepresentation_StringPrefix__Repr) AsLink() (dms3ld.Link, error) { +func (_UnionRepresentation_StringPrefix__Repr) AsLink() (ld.Link, error) { return mixins.Map{TypeName: "schemadmt.UnionRepresentation_StringPrefix.Repr"}.AsLink() } -func (_UnionRepresentation_StringPrefix__Repr) Prototype() dms3ld.NodePrototype { +func (_UnionRepresentation_StringPrefix__Repr) Prototype() ld.NodePrototype { return _UnionRepresentation_StringPrefix__ReprPrototype{} } type _UnionRepresentation_StringPrefix__ReprPrototype struct{} -func (_UnionRepresentation_StringPrefix__ReprPrototype) NewBuilder() dms3ld.NodeBuilder { +func (_UnionRepresentation_StringPrefix__ReprPrototype) NewBuilder() ld.NodeBuilder { var nb _UnionRepresentation_StringPrefix__ReprBuilder nb.Reset() return &nb @@ -43463,7 +43463,7 @@ type _UnionRepresentation_StringPrefix__ReprBuilder struct { _UnionRepresentation_StringPrefix__ReprAssembler } -func (nb *_UnionRepresentation_StringPrefix__ReprBuilder) Build() dms3ld.Node { +func (nb *_UnionRepresentation_StringPrefix__ReprBuilder) Build() ld.Node { if *nb.m != schema.Maybe_Value { panic("invalid state: cannot call Build on an assembler that's not finished") } @@ -43491,7 +43491,7 @@ func (na *_UnionRepresentation_StringPrefix__ReprAssembler) reset() { na.s = 0 na.ca_discriminantTable.reset() } -func (na *_UnionRepresentation_StringPrefix__ReprAssembler) BeginMap(int64) (dms3ld.MapAssembler, error) { +func (na *_UnionRepresentation_StringPrefix__ReprAssembler) BeginMap(int64) (ld.MapAssembler, error) { switch *na.m { case schema.Maybe_Value, schema.Maybe_Null: panic("invalid state: cannot assign into assembler that's already finished") @@ -43504,7 +43504,7 @@ func (na *_UnionRepresentation_StringPrefix__ReprAssembler) BeginMap(int64) (dms } return na, nil } -func (_UnionRepresentation_StringPrefix__ReprAssembler) BeginList(sizeHint int64) (dms3ld.ListAssembler, error) { +func (_UnionRepresentation_StringPrefix__ReprAssembler) BeginList(sizeHint int64) (ld.ListAssembler, error) { return mixins.MapAssembler{TypeName: "schemadmt.UnionRepresentation_StringPrefix.Repr"}.BeginList(0) } func (na *_UnionRepresentation_StringPrefix__ReprAssembler) AssignNull() error { @@ -43536,10 +43536,10 @@ func (_UnionRepresentation_StringPrefix__ReprAssembler) AssignString(string) err func (_UnionRepresentation_StringPrefix__ReprAssembler) AssignBytes([]byte) error { return mixins.MapAssembler{TypeName: "schemadmt.UnionRepresentation_StringPrefix.Repr"}.AssignBytes(nil) } -func (_UnionRepresentation_StringPrefix__ReprAssembler) AssignLink(dms3ld.Link) error { +func (_UnionRepresentation_StringPrefix__ReprAssembler) AssignLink(ld.Link) error { return mixins.MapAssembler{TypeName: "schemadmt.UnionRepresentation_StringPrefix.Repr"}.AssignLink(nil) } -func (na *_UnionRepresentation_StringPrefix__ReprAssembler) AssignNode(v dms3ld.Node) error { +func (na *_UnionRepresentation_StringPrefix__ReprAssembler) AssignNode(v ld.Node) error { if v.IsNull() { return na.AssignNull() } @@ -43559,8 +43559,8 @@ func (na *_UnionRepresentation_StringPrefix__ReprAssembler) AssignNode(v dms3ld. *na.m = schema.Maybe_Value return nil } - if v.Kind() != dms3ld.Kind_Map { - return dms3ld.ErrWrongKind{TypeName: "schemadmt.UnionRepresentation_StringPrefix.Repr", MethodName: "AssignNode", AppropriateKind: dms3ld.KindSet_JustMap, ActualKind: v.Kind()} + if v.Kind() != ld.Kind_Map { + return ld.ErrWrongKind{TypeName: "schemadmt.UnionRepresentation_StringPrefix.Repr", MethodName: "AssignNode", AppropriateKind: ld.KindSet_JustMap, ActualKind: v.Kind()} } itr := v.MapIterator() for !itr.Done() { @@ -43577,7 +43577,7 @@ func (na *_UnionRepresentation_StringPrefix__ReprAssembler) AssignNode(v dms3ld. } return na.Finish() } -func (_UnionRepresentation_StringPrefix__ReprAssembler) Prototype() dms3ld.NodePrototype { +func (_UnionRepresentation_StringPrefix__ReprAssembler) Prototype() ld.NodePrototype { return _UnionRepresentation_StringPrefix__ReprPrototype{} } func (ma *_UnionRepresentation_StringPrefix__ReprAssembler) valueFinishTidy() bool { @@ -43595,7 +43595,7 @@ func (ma *_UnionRepresentation_StringPrefix__ReprAssembler) valueFinishTidy() bo panic("unreachable") } } -func (ma *_UnionRepresentation_StringPrefix__ReprAssembler) AssembleEntry(k string) (dms3ld.NodeAssembler, error) { +func (ma *_UnionRepresentation_StringPrefix__ReprAssembler) AssembleEntry(k string) (ld.NodeAssembler, error) { switch ma.state { case maState_initial: // carry on @@ -43613,7 +43613,7 @@ func (ma *_UnionRepresentation_StringPrefix__ReprAssembler) AssembleEntry(k stri switch k { case "discriminantTable": if ma.s&fieldBit__UnionRepresentation_StringPrefix_DiscriminantTable != 0 { - return nil, dms3ld.ErrRepeatedMapKey{Key: &fieldName__UnionRepresentation_StringPrefix_DiscriminantTable_serial} + return nil, ld.ErrRepeatedMapKey{Key: &fieldName__UnionRepresentation_StringPrefix_DiscriminantTable_serial} } ma.s += fieldBit__UnionRepresentation_StringPrefix_DiscriminantTable ma.state = maState_midValue @@ -43623,9 +43623,9 @@ func (ma *_UnionRepresentation_StringPrefix__ReprAssembler) AssembleEntry(k stri return &ma.ca_discriminantTable, nil default: } - return nil, dms3ld.ErrInvalidKey{TypeName: "schemadmt.UnionRepresentation_StringPrefix.Repr", Key: &_String{k}} + return nil, ld.ErrInvalidKey{TypeName: "schemadmt.UnionRepresentation_StringPrefix.Repr", Key: &_String{k}} } -func (ma *_UnionRepresentation_StringPrefix__ReprAssembler) AssembleKey() dms3ld.NodeAssembler { +func (ma *_UnionRepresentation_StringPrefix__ReprAssembler) AssembleKey() ld.NodeAssembler { switch ma.state { case maState_initial: // carry on @@ -43643,7 +43643,7 @@ func (ma *_UnionRepresentation_StringPrefix__ReprAssembler) AssembleKey() dms3ld ma.state = maState_midKey return (*_UnionRepresentation_StringPrefix__ReprKeyAssembler)(ma) } -func (ma *_UnionRepresentation_StringPrefix__ReprAssembler) AssembleValue() dms3ld.NodeAssembler { +func (ma *_UnionRepresentation_StringPrefix__ReprAssembler) AssembleValue() ld.NodeAssembler { switch ma.state { case maState_initial: panic("invalid state: AssembleValue cannot be called when no key is primed") @@ -43682,7 +43682,7 @@ func (ma *_UnionRepresentation_StringPrefix__ReprAssembler) Finish() error { panic("invalid state: Finish cannot be called on an assembler that's already finished") } if ma.s&fieldBits__UnionRepresentation_StringPrefix_sufficient != fieldBits__UnionRepresentation_StringPrefix_sufficient { - err := dms3ld.ErrMissingRequiredField{Missing: make([]string, 0)} + err := ld.ErrMissingRequiredField{Missing: make([]string, 0)} if ma.s&fieldBit__UnionRepresentation_StringPrefix_DiscriminantTable == 0 { err.Missing = append(err.Missing, "discriminantTable") } @@ -43692,19 +43692,19 @@ func (ma *_UnionRepresentation_StringPrefix__ReprAssembler) Finish() error { *ma.m = schema.Maybe_Value return nil } -func (ma *_UnionRepresentation_StringPrefix__ReprAssembler) KeyPrototype() dms3ld.NodePrototype { +func (ma *_UnionRepresentation_StringPrefix__ReprAssembler) KeyPrototype() ld.NodePrototype { return _String__Prototype{} } -func (ma *_UnionRepresentation_StringPrefix__ReprAssembler) ValuePrototype(k string) dms3ld.NodePrototype { +func (ma *_UnionRepresentation_StringPrefix__ReprAssembler) ValuePrototype(k string) ld.NodePrototype { panic("todo structbuilder mapassembler repr valueprototype") } type _UnionRepresentation_StringPrefix__ReprKeyAssembler _UnionRepresentation_StringPrefix__ReprAssembler -func (_UnionRepresentation_StringPrefix__ReprKeyAssembler) BeginMap(sizeHint int64) (dms3ld.MapAssembler, error) { +func (_UnionRepresentation_StringPrefix__ReprKeyAssembler) BeginMap(sizeHint int64) (ld.MapAssembler, error) { return mixins.StringAssembler{TypeName: "schemadmt.UnionRepresentation_StringPrefix.Repr.KeyAssembler"}.BeginMap(0) } -func (_UnionRepresentation_StringPrefix__ReprKeyAssembler) BeginList(sizeHint int64) (dms3ld.ListAssembler, error) { +func (_UnionRepresentation_StringPrefix__ReprKeyAssembler) BeginList(sizeHint int64) (ld.ListAssembler, error) { return mixins.StringAssembler{TypeName: "schemadmt.UnionRepresentation_StringPrefix.Repr.KeyAssembler"}.BeginList(0) } func (na *_UnionRepresentation_StringPrefix__ReprKeyAssembler) AssignNull() error { @@ -43726,29 +43726,29 @@ func (ka *_UnionRepresentation_StringPrefix__ReprKeyAssembler) AssignString(k st switch k { case "discriminantTable": if ka.s&fieldBit__UnionRepresentation_StringPrefix_DiscriminantTable != 0 { - return dms3ld.ErrRepeatedMapKey{Key: &fieldName__UnionRepresentation_StringPrefix_DiscriminantTable_serial} + return ld.ErrRepeatedMapKey{Key: &fieldName__UnionRepresentation_StringPrefix_DiscriminantTable_serial} } ka.s += fieldBit__UnionRepresentation_StringPrefix_DiscriminantTable ka.state = maState_expectValue ka.f = 0 return nil } - return dms3ld.ErrInvalidKey{TypeName: "schemadmt.UnionRepresentation_StringPrefix.Repr", Key: &_String{k}} + return ld.ErrInvalidKey{TypeName: "schemadmt.UnionRepresentation_StringPrefix.Repr", Key: &_String{k}} } func (_UnionRepresentation_StringPrefix__ReprKeyAssembler) AssignBytes([]byte) error { return mixins.StringAssembler{TypeName: "schemadmt.UnionRepresentation_StringPrefix.Repr.KeyAssembler"}.AssignBytes(nil) } -func (_UnionRepresentation_StringPrefix__ReprKeyAssembler) AssignLink(dms3ld.Link) error { +func (_UnionRepresentation_StringPrefix__ReprKeyAssembler) AssignLink(ld.Link) error { return mixins.StringAssembler{TypeName: "schemadmt.UnionRepresentation_StringPrefix.Repr.KeyAssembler"}.AssignLink(nil) } -func (ka *_UnionRepresentation_StringPrefix__ReprKeyAssembler) AssignNode(v dms3ld.Node) error { +func (ka *_UnionRepresentation_StringPrefix__ReprKeyAssembler) AssignNode(v ld.Node) error { if v2, err := v.AsString(); err != nil { return err } else { return ka.AssignString(v2) } } -func (_UnionRepresentation_StringPrefix__ReprKeyAssembler) Prototype() dms3ld.NodePrototype { +func (_UnionRepresentation_StringPrefix__ReprKeyAssembler) Prototype() ld.NodePrototype { return _String__Prototype{} } @@ -43767,12 +43767,12 @@ func (m MaybeUnit) IsAbsent() bool { func (m MaybeUnit) Exists() bool { return m.m == schema.Maybe_Value } -func (m MaybeUnit) AsNode() dms3ld.Node { +func (m MaybeUnit) AsNode() ld.Node { switch m.m { case schema.Maybe_Absent: - return dms3ld.Absent + return ld.Absent case schema.Maybe_Null: - return dms3ld.Null + return ld.Null case schema.Maybe_Value: return m.v default: @@ -43787,32 +43787,32 @@ func (m MaybeUnit) Must() Unit { } var () -var _ dms3ld.Node = (Unit)(&_Unit{}) +var _ ld.Node = (Unit)(&_Unit{}) var _ schema.TypedNode = (Unit)(&_Unit{}) -func (Unit) Kind() dms3ld.Kind { - return dms3ld.Kind_Map +func (Unit) Kind() ld.Kind { + return ld.Kind_Map } -func (n Unit) LookupByString(key string) (dms3ld.Node, error) { +func (n Unit) LookupByString(key string) (ld.Node, error) { switch key { default: - return nil, schema.ErrNoSuchField{Type: nil /*TODO*/, Field: dms3ld.PathSegmentOfString(key)} + return nil, schema.ErrNoSuchField{Type: nil /*TODO*/, Field: ld.PathSegmentOfString(key)} } } -func (n Unit) LookupByNode(key dms3ld.Node) (dms3ld.Node, error) { +func (n Unit) LookupByNode(key ld.Node) (ld.Node, error) { ks, err := key.AsString() if err != nil { return nil, err } return n.LookupByString(ks) } -func (Unit) LookupByIndex(idx int64) (dms3ld.Node, error) { +func (Unit) LookupByIndex(idx int64) (ld.Node, error) { return mixins.Map{TypeName: "schemadmt.Unit"}.LookupByIndex(0) } -func (n Unit) LookupBySegment(seg dms3ld.PathSegment) (dms3ld.Node, error) { +func (n Unit) LookupBySegment(seg ld.PathSegment) (ld.Node, error) { return n.LookupByString(seg.String()) } -func (n Unit) MapIterator() dms3ld.MapIterator { +func (n Unit) MapIterator() ld.MapIterator { return &_Unit__MapItr{n, 0} } @@ -43821,15 +43821,15 @@ type _Unit__MapItr struct { idx int } -func (itr *_Unit__MapItr) Next() (k dms3ld.Node, v dms3ld.Node, _ error) { - return nil, nil, dms3ld.ErrIteratorOverread{} +func (itr *_Unit__MapItr) Next() (k ld.Node, v ld.Node, _ error) { + return nil, nil, ld.ErrIteratorOverread{} } func (itr *_Unit__MapItr) Done() bool { return itr.idx >= 0 } -func (Unit) ListIterator() dms3ld.ListIterator { +func (Unit) ListIterator() ld.ListIterator { return nil } func (Unit) Length() int64 { @@ -43856,16 +43856,16 @@ func (Unit) AsString() (string, error) { func (Unit) AsBytes() ([]byte, error) { return mixins.Map{TypeName: "schemadmt.Unit"}.AsBytes() } -func (Unit) AsLink() (dms3ld.Link, error) { +func (Unit) AsLink() (ld.Link, error) { return mixins.Map{TypeName: "schemadmt.Unit"}.AsLink() } -func (Unit) Prototype() dms3ld.NodePrototype { +func (Unit) Prototype() ld.NodePrototype { return _Unit__Prototype{} } type _Unit__Prototype struct{} -func (_Unit__Prototype) NewBuilder() dms3ld.NodeBuilder { +func (_Unit__Prototype) NewBuilder() ld.NodeBuilder { var nb _Unit__Builder nb.Reset() return &nb @@ -43875,7 +43875,7 @@ type _Unit__Builder struct { _Unit__Assembler } -func (nb *_Unit__Builder) Build() dms3ld.Node { +func (nb *_Unit__Builder) Build() ld.Node { if *nb.m != schema.Maybe_Value { panic("invalid state: cannot call Build on an assembler that's not finished") } @@ -43906,7 +43906,7 @@ var ( fieldBits__Unit_sufficient = 0 ) -func (na *_Unit__Assembler) BeginMap(int64) (dms3ld.MapAssembler, error) { +func (na *_Unit__Assembler) BeginMap(int64) (ld.MapAssembler, error) { switch *na.m { case schema.Maybe_Value, schema.Maybe_Null: panic("invalid state: cannot assign into assembler that's already finished") @@ -43919,7 +43919,7 @@ func (na *_Unit__Assembler) BeginMap(int64) (dms3ld.MapAssembler, error) { } return na, nil } -func (_Unit__Assembler) BeginList(sizeHint int64) (dms3ld.ListAssembler, error) { +func (_Unit__Assembler) BeginList(sizeHint int64) (ld.ListAssembler, error) { return mixins.MapAssembler{TypeName: "schemadmt.Unit"}.BeginList(0) } func (na *_Unit__Assembler) AssignNull() error { @@ -43951,10 +43951,10 @@ func (_Unit__Assembler) AssignString(string) error { func (_Unit__Assembler) AssignBytes([]byte) error { return mixins.MapAssembler{TypeName: "schemadmt.Unit"}.AssignBytes(nil) } -func (_Unit__Assembler) AssignLink(dms3ld.Link) error { +func (_Unit__Assembler) AssignLink(ld.Link) error { return mixins.MapAssembler{TypeName: "schemadmt.Unit"}.AssignLink(nil) } -func (na *_Unit__Assembler) AssignNode(v dms3ld.Node) error { +func (na *_Unit__Assembler) AssignNode(v ld.Node) error { if v.IsNull() { return na.AssignNull() } @@ -43974,8 +43974,8 @@ func (na *_Unit__Assembler) AssignNode(v dms3ld.Node) error { *na.m = schema.Maybe_Value return nil } - if v.Kind() != dms3ld.Kind_Map { - return dms3ld.ErrWrongKind{TypeName: "schemadmt.Unit", MethodName: "AssignNode", AppropriateKind: dms3ld.KindSet_JustMap, ActualKind: v.Kind()} + if v.Kind() != ld.Kind_Map { + return ld.ErrWrongKind{TypeName: "schemadmt.Unit", MethodName: "AssignNode", AppropriateKind: ld.KindSet_JustMap, ActualKind: v.Kind()} } itr := v.MapIterator() for !itr.Done() { @@ -43992,7 +43992,7 @@ func (na *_Unit__Assembler) AssignNode(v dms3ld.Node) error { } return na.Finish() } -func (_Unit__Assembler) Prototype() dms3ld.NodePrototype { +func (_Unit__Assembler) Prototype() ld.NodePrototype { return _Unit__Prototype{} } func (ma *_Unit__Assembler) valueFinishTidy() bool { @@ -44001,7 +44001,7 @@ func (ma *_Unit__Assembler) valueFinishTidy() bool { panic("unreachable") } } -func (ma *_Unit__Assembler) AssembleEntry(k string) (dms3ld.NodeAssembler, error) { +func (ma *_Unit__Assembler) AssembleEntry(k string) (ld.NodeAssembler, error) { switch ma.state { case maState_initial: // carry on @@ -44016,9 +44016,9 @@ func (ma *_Unit__Assembler) AssembleEntry(k string) (dms3ld.NodeAssembler, error case maState_finished: panic("invalid state: AssembleEntry cannot be called on an assembler that's already finished") } - return nil, dms3ld.ErrInvalidKey{TypeName: "schemadmt.Unit", Key: &_String{k}} + return nil, ld.ErrInvalidKey{TypeName: "schemadmt.Unit", Key: &_String{k}} } -func (ma *_Unit__Assembler) AssembleKey() dms3ld.NodeAssembler { +func (ma *_Unit__Assembler) AssembleKey() ld.NodeAssembler { switch ma.state { case maState_initial: // carry on @@ -44036,7 +44036,7 @@ func (ma *_Unit__Assembler) AssembleKey() dms3ld.NodeAssembler { ma.state = maState_midKey return (*_Unit__KeyAssembler)(ma) } -func (ma *_Unit__Assembler) AssembleValue() dms3ld.NodeAssembler { +func (ma *_Unit__Assembler) AssembleValue() ld.NodeAssembler { switch ma.state { case maState_initial: panic("invalid state: AssembleValue cannot be called when no key is primed") @@ -44071,26 +44071,26 @@ func (ma *_Unit__Assembler) Finish() error { panic("invalid state: Finish cannot be called on an assembler that's already finished") } if ma.s&fieldBits__Unit_sufficient != fieldBits__Unit_sufficient { - err := dms3ld.ErrMissingRequiredField{Missing: make([]string, 0)} + err := ld.ErrMissingRequiredField{Missing: make([]string, 0)} return err } ma.state = maState_finished *ma.m = schema.Maybe_Value return nil } -func (ma *_Unit__Assembler) KeyPrototype() dms3ld.NodePrototype { +func (ma *_Unit__Assembler) KeyPrototype() ld.NodePrototype { return _String__Prototype{} } -func (ma *_Unit__Assembler) ValuePrototype(k string) dms3ld.NodePrototype { +func (ma *_Unit__Assembler) ValuePrototype(k string) ld.NodePrototype { panic("todo structbuilder mapassembler valueprototype") } type _Unit__KeyAssembler _Unit__Assembler -func (_Unit__KeyAssembler) BeginMap(sizeHint int64) (dms3ld.MapAssembler, error) { +func (_Unit__KeyAssembler) BeginMap(sizeHint int64) (ld.MapAssembler, error) { return mixins.StringAssembler{TypeName: "schemadmt.Unit.KeyAssembler"}.BeginMap(0) } -func (_Unit__KeyAssembler) BeginList(sizeHint int64) (dms3ld.ListAssembler, error) { +func (_Unit__KeyAssembler) BeginList(sizeHint int64) (ld.ListAssembler, error) { return mixins.StringAssembler{TypeName: "schemadmt.Unit.KeyAssembler"}.BeginList(0) } func (na *_Unit__KeyAssembler) AssignNull() error { @@ -44111,61 +44111,61 @@ func (ka *_Unit__KeyAssembler) AssignString(k string) error { } switch k { default: - return dms3ld.ErrInvalidKey{TypeName: "schemadmt.Unit", Key: &_String{k}} + return ld.ErrInvalidKey{TypeName: "schemadmt.Unit", Key: &_String{k}} } return nil } func (_Unit__KeyAssembler) AssignBytes([]byte) error { return mixins.StringAssembler{TypeName: "schemadmt.Unit.KeyAssembler"}.AssignBytes(nil) } -func (_Unit__KeyAssembler) AssignLink(dms3ld.Link) error { +func (_Unit__KeyAssembler) AssignLink(ld.Link) error { return mixins.StringAssembler{TypeName: "schemadmt.Unit.KeyAssembler"}.AssignLink(nil) } -func (ka *_Unit__KeyAssembler) AssignNode(v dms3ld.Node) error { +func (ka *_Unit__KeyAssembler) AssignNode(v ld.Node) error { if v2, err := v.AsString(); err != nil { return err } else { return ka.AssignString(v2) } } -func (_Unit__KeyAssembler) Prototype() dms3ld.NodePrototype { +func (_Unit__KeyAssembler) Prototype() ld.NodePrototype { return _String__Prototype{} } func (Unit) Type() schema.Type { return nil /*TODO:typelit*/ } -func (n Unit) Representation() dms3ld.Node { +func (n Unit) Representation() ld.Node { return (*_Unit__Repr)(n) } type _Unit__Repr _Unit var () -var _ dms3ld.Node = &_Unit__Repr{} +var _ ld.Node = &_Unit__Repr{} -func (_Unit__Repr) Kind() dms3ld.Kind { - return dms3ld.Kind_Map +func (_Unit__Repr) Kind() ld.Kind { + return ld.Kind_Map } -func (n *_Unit__Repr) LookupByString(key string) (dms3ld.Node, error) { +func (n *_Unit__Repr) LookupByString(key string) (ld.Node, error) { switch key { default: - return nil, schema.ErrNoSuchField{Type: nil /*TODO*/, Field: dms3ld.PathSegmentOfString(key)} + return nil, schema.ErrNoSuchField{Type: nil /*TODO*/, Field: ld.PathSegmentOfString(key)} } } -func (n *_Unit__Repr) LookupByNode(key dms3ld.Node) (dms3ld.Node, error) { +func (n *_Unit__Repr) LookupByNode(key ld.Node) (ld.Node, error) { ks, err := key.AsString() if err != nil { return nil, err } return n.LookupByString(ks) } -func (_Unit__Repr) LookupByIndex(idx int64) (dms3ld.Node, error) { +func (_Unit__Repr) LookupByIndex(idx int64) (ld.Node, error) { return mixins.Map{TypeName: "schemadmt.Unit.Repr"}.LookupByIndex(0) } -func (n _Unit__Repr) LookupBySegment(seg dms3ld.PathSegment) (dms3ld.Node, error) { +func (n _Unit__Repr) LookupBySegment(seg ld.PathSegment) (ld.Node, error) { return n.LookupByString(seg.String()) } -func (n *_Unit__Repr) MapIterator() dms3ld.MapIterator { +func (n *_Unit__Repr) MapIterator() ld.MapIterator { return &_Unit__ReprMapItr{n, 0} } @@ -44174,14 +44174,14 @@ type _Unit__ReprMapItr struct { idx int } -func (itr *_Unit__ReprMapItr) Next() (k dms3ld.Node, v dms3ld.Node, _ error) { - return nil, nil, dms3ld.ErrIteratorOverread{} +func (itr *_Unit__ReprMapItr) Next() (k ld.Node, v ld.Node, _ error) { + return nil, nil, ld.ErrIteratorOverread{} } func (itr *_Unit__ReprMapItr) Done() bool { return itr.idx >= 0 } -func (_Unit__Repr) ListIterator() dms3ld.ListIterator { +func (_Unit__Repr) ListIterator() ld.ListIterator { return nil } func (rn *_Unit__Repr) Length() int64 { @@ -44209,16 +44209,16 @@ func (_Unit__Repr) AsString() (string, error) { func (_Unit__Repr) AsBytes() ([]byte, error) { return mixins.Map{TypeName: "schemadmt.Unit.Repr"}.AsBytes() } -func (_Unit__Repr) AsLink() (dms3ld.Link, error) { +func (_Unit__Repr) AsLink() (ld.Link, error) { return mixins.Map{TypeName: "schemadmt.Unit.Repr"}.AsLink() } -func (_Unit__Repr) Prototype() dms3ld.NodePrototype { +func (_Unit__Repr) Prototype() ld.NodePrototype { return _Unit__ReprPrototype{} } type _Unit__ReprPrototype struct{} -func (_Unit__ReprPrototype) NewBuilder() dms3ld.NodeBuilder { +func (_Unit__ReprPrototype) NewBuilder() ld.NodeBuilder { var nb _Unit__ReprBuilder nb.Reset() return &nb @@ -44228,7 +44228,7 @@ type _Unit__ReprBuilder struct { _Unit__ReprAssembler } -func (nb *_Unit__ReprBuilder) Build() dms3ld.Node { +func (nb *_Unit__ReprBuilder) Build() ld.Node { if *nb.m != schema.Maybe_Value { panic("invalid state: cannot call Build on an assembler that's not finished") } @@ -44254,7 +44254,7 @@ func (na *_Unit__ReprAssembler) reset() { na.state = maState_initial na.s = 0 } -func (na *_Unit__ReprAssembler) BeginMap(int64) (dms3ld.MapAssembler, error) { +func (na *_Unit__ReprAssembler) BeginMap(int64) (ld.MapAssembler, error) { switch *na.m { case schema.Maybe_Value, schema.Maybe_Null: panic("invalid state: cannot assign into assembler that's already finished") @@ -44267,7 +44267,7 @@ func (na *_Unit__ReprAssembler) BeginMap(int64) (dms3ld.MapAssembler, error) { } return na, nil } -func (_Unit__ReprAssembler) BeginList(sizeHint int64) (dms3ld.ListAssembler, error) { +func (_Unit__ReprAssembler) BeginList(sizeHint int64) (ld.ListAssembler, error) { return mixins.MapAssembler{TypeName: "schemadmt.Unit.Repr"}.BeginList(0) } func (na *_Unit__ReprAssembler) AssignNull() error { @@ -44299,10 +44299,10 @@ func (_Unit__ReprAssembler) AssignString(string) error { func (_Unit__ReprAssembler) AssignBytes([]byte) error { return mixins.MapAssembler{TypeName: "schemadmt.Unit.Repr"}.AssignBytes(nil) } -func (_Unit__ReprAssembler) AssignLink(dms3ld.Link) error { +func (_Unit__ReprAssembler) AssignLink(ld.Link) error { return mixins.MapAssembler{TypeName: "schemadmt.Unit.Repr"}.AssignLink(nil) } -func (na *_Unit__ReprAssembler) AssignNode(v dms3ld.Node) error { +func (na *_Unit__ReprAssembler) AssignNode(v ld.Node) error { if v.IsNull() { return na.AssignNull() } @@ -44322,8 +44322,8 @@ func (na *_Unit__ReprAssembler) AssignNode(v dms3ld.Node) error { *na.m = schema.Maybe_Value return nil } - if v.Kind() != dms3ld.Kind_Map { - return dms3ld.ErrWrongKind{TypeName: "schemadmt.Unit.Repr", MethodName: "AssignNode", AppropriateKind: dms3ld.KindSet_JustMap, ActualKind: v.Kind()} + if v.Kind() != ld.Kind_Map { + return ld.ErrWrongKind{TypeName: "schemadmt.Unit.Repr", MethodName: "AssignNode", AppropriateKind: ld.KindSet_JustMap, ActualKind: v.Kind()} } itr := v.MapIterator() for !itr.Done() { @@ -44340,7 +44340,7 @@ func (na *_Unit__ReprAssembler) AssignNode(v dms3ld.Node) error { } return na.Finish() } -func (_Unit__ReprAssembler) Prototype() dms3ld.NodePrototype { +func (_Unit__ReprAssembler) Prototype() ld.NodePrototype { return _Unit__ReprPrototype{} } func (ma *_Unit__ReprAssembler) valueFinishTidy() bool { @@ -44349,7 +44349,7 @@ func (ma *_Unit__ReprAssembler) valueFinishTidy() bool { panic("unreachable") } } -func (ma *_Unit__ReprAssembler) AssembleEntry(k string) (dms3ld.NodeAssembler, error) { +func (ma *_Unit__ReprAssembler) AssembleEntry(k string) (ld.NodeAssembler, error) { switch ma.state { case maState_initial: // carry on @@ -44364,9 +44364,9 @@ func (ma *_Unit__ReprAssembler) AssembleEntry(k string) (dms3ld.NodeAssembler, e case maState_finished: panic("invalid state: AssembleEntry cannot be called on an assembler that's already finished") } - return nil, dms3ld.ErrInvalidKey{TypeName: "schemadmt.Unit.Repr", Key: &_String{k}} + return nil, ld.ErrInvalidKey{TypeName: "schemadmt.Unit.Repr", Key: &_String{k}} } -func (ma *_Unit__ReprAssembler) AssembleKey() dms3ld.NodeAssembler { +func (ma *_Unit__ReprAssembler) AssembleKey() ld.NodeAssembler { switch ma.state { case maState_initial: // carry on @@ -44384,7 +44384,7 @@ func (ma *_Unit__ReprAssembler) AssembleKey() dms3ld.NodeAssembler { ma.state = maState_midKey return (*_Unit__ReprKeyAssembler)(ma) } -func (ma *_Unit__ReprAssembler) AssembleValue() dms3ld.NodeAssembler { +func (ma *_Unit__ReprAssembler) AssembleValue() ld.NodeAssembler { switch ma.state { case maState_initial: panic("invalid state: AssembleValue cannot be called when no key is primed") @@ -44419,26 +44419,26 @@ func (ma *_Unit__ReprAssembler) Finish() error { panic("invalid state: Finish cannot be called on an assembler that's already finished") } if ma.s&fieldBits__Unit_sufficient != fieldBits__Unit_sufficient { - err := dms3ld.ErrMissingRequiredField{Missing: make([]string, 0)} + err := ld.ErrMissingRequiredField{Missing: make([]string, 0)} return err } ma.state = maState_finished *ma.m = schema.Maybe_Value return nil } -func (ma *_Unit__ReprAssembler) KeyPrototype() dms3ld.NodePrototype { +func (ma *_Unit__ReprAssembler) KeyPrototype() ld.NodePrototype { return _String__Prototype{} } -func (ma *_Unit__ReprAssembler) ValuePrototype(k string) dms3ld.NodePrototype { +func (ma *_Unit__ReprAssembler) ValuePrototype(k string) ld.NodePrototype { panic("todo structbuilder mapassembler repr valueprototype") } type _Unit__ReprKeyAssembler _Unit__ReprAssembler -func (_Unit__ReprKeyAssembler) BeginMap(sizeHint int64) (dms3ld.MapAssembler, error) { +func (_Unit__ReprKeyAssembler) BeginMap(sizeHint int64) (ld.MapAssembler, error) { return mixins.StringAssembler{TypeName: "schemadmt.Unit.Repr.KeyAssembler"}.BeginMap(0) } -func (_Unit__ReprKeyAssembler) BeginList(sizeHint int64) (dms3ld.ListAssembler, error) { +func (_Unit__ReprKeyAssembler) BeginList(sizeHint int64) (ld.ListAssembler, error) { return mixins.StringAssembler{TypeName: "schemadmt.Unit.Repr.KeyAssembler"}.BeginList(0) } func (na *_Unit__ReprKeyAssembler) AssignNull() error { @@ -44457,21 +44457,21 @@ func (ka *_Unit__ReprKeyAssembler) AssignString(k string) error { if ka.state != maState_midKey { panic("misuse: KeyAssembler held beyond its valid lifetime") } - return dms3ld.ErrInvalidKey{TypeName: "schemadmt.Unit.Repr", Key: &_String{k}} + return ld.ErrInvalidKey{TypeName: "schemadmt.Unit.Repr", Key: &_String{k}} } func (_Unit__ReprKeyAssembler) AssignBytes([]byte) error { return mixins.StringAssembler{TypeName: "schemadmt.Unit.Repr.KeyAssembler"}.AssignBytes(nil) } -func (_Unit__ReprKeyAssembler) AssignLink(dms3ld.Link) error { +func (_Unit__ReprKeyAssembler) AssignLink(ld.Link) error { return mixins.StringAssembler{TypeName: "schemadmt.Unit.Repr.KeyAssembler"}.AssignLink(nil) } -func (ka *_Unit__ReprKeyAssembler) AssignNode(v dms3ld.Node) error { +func (ka *_Unit__ReprKeyAssembler) AssignNode(v ld.Node) error { if v2, err := v.AsString(); err != nil { return err } else { return ka.AssignString(v2) } } -func (_Unit__ReprKeyAssembler) Prototype() dms3ld.NodePrototype { +func (_Unit__ReprKeyAssembler) Prototype() ld.NodePrototype { return _String__Prototype{} } diff --git a/schema/dmt/dms3ldsch_types.go b/schema/dmt/ldsch_types.go similarity index 99% rename from schema/dmt/dms3ldsch_types.go rename to schema/dmt/ldsch_types.go index c00f99647e4fccfc8c2892da9bd5a1bb621ecf96..a3d08d4b3dc52bf874434c76ca5b188eb0f9cbc0 100644 --- a/schema/dmt/dms3ldsch_types.go +++ b/schema/dmt/ldsch_types.go @@ -1,12 +1,12 @@ package schemadmt -// Code generated by go-dms3ld-prime gengo. DO NOT EDIT. +// Code generated by go-ld-prime gengo. DO NOT EDIT. import ( - dms3ld "gitlab.dms3.io/ld/go-ld-prime" + ld "gitlab.dms3.io/ld/go-ld-prime" ) -var _ dms3ld.Node = nil // suppress errors when this dependency is not referenced +var _ ld.Node = nil // suppress errors when this dependency is not referenced // Type is a struct embeding a NodePrototype/Type for every Node implementation in this package. // One of its major uses is to start the construction of a value. // You can use it like this: diff --git a/schema/errors.go b/schema/errors.go index 2933fe5e19cd7a7d3aab871682ffa11a0e538928..20bd5112dacddd13ee5d22e42aa1ed0da7498a35 100644 --- a/schema/errors.go +++ b/schema/errors.go @@ -6,18 +6,18 @@ import ( // TODO: errors in this package remain somewhat slapdash. // -// - dms3ld.ErrUnmatchable is used as a catch-all in some places, and contains who-knows-what values wrapped in the Reason field. +// - ld.ErrUnmatchable is used as a catch-all in some places, and contains who-knows-what values wrapped in the Reason field. // - sometimes this wraps things like strconv errors... and on the one hand, i'm kinda okay with that; on the other, maybe saying a bit more with types before getting to that kind of shrug would be nice. // - we probably want to use `Type` values, right? // - or do we: because then we probably need a `Repr bool` next to it, or lots of messages would be nonsensical. // - this is *currently* problematic because we don't actually generate type info consts yet. Hopefully soon; but the pain, meanwhile, is... substantial. // - "substantial" is an understatement. it makes incremental development almost impossible because stringifying error reports turn into nil pointer crashes! -// - other dms3ld-wide errors like `dms3ld.ErrWrongKind` *sometimes* refer to a TypeName... but don't *have* to, because they also arise at the merely-datamodel level; what would we do with these? +// - other ld-wide errors like `ld.ErrWrongKind` *sometimes* refer to a TypeName... but don't *have* to, because they also arise at the merely-datamodel level; what would we do with these? // - it's undesirable (not to mention intensely forbidden for import cycle reasons) for those error types to refer to schema.Type. // - if we must have TypeName treated stringily in some cases, is it really useful to use full type info in other cases -- inconsistently? // - regardless of where we end up with this, some sort of an embed for helping deal with munging and printing this would probably be wise. -// - generally, whether you should expect an "dms3ld.Err*" or a "schema.Err*" from various methods is quite unclear. -// - it's possible that we should wrap *all* schema-level errors in a single "dms3ld.ErrSchemaNoMatch" error of some kind, to fix the above. as yet undecided. +// - generally, whether you should expect an "ld.Err*" or a "schema.Err*" from various methods is quite unclear. +// - it's possible that we should wrap *all* schema-level errors in a single "ld.ErrSchemaNoMatch" error of some kind, to fix the above. as yet undecided. // ErrNoSuchField may be returned from lookup functions on the Node // interface when a field is requested which doesn't exist, @@ -28,7 +28,7 @@ import ( type ErrNoSuchField struct { Type Type - Field dms3ld.PathSegment + Field ld.PathSegment } func (e ErrNoSuchField) Error() string { diff --git a/schema/gen/go/testutil_test.go b/schema/gen/go/testutil_test.go index 32cadc8aa5a1f97312a88472f469f63ede3c7737..095460f45258efb0f609cd1bc06a416210027eeb 100644 --- a/schema/gen/go/testutil_test.go +++ b/schema/gen/go/testutil_test.go @@ -1,7 +1,7 @@ package gengo import ( - dms3ld "gitlab.dms3.io/ld/go-ld-prime" + ld "gitlab.dms3.io/ld/go-ld-prime" ) // This file is full of helper functions. Most are moderately embarassing. @@ -10,13 +10,13 @@ import ( // they'd probably be much less fragile and give better error messages that way. // On the other hand, the functions for condensing two-arg returns wouldn't go away anyway. -func plz(n dms3ld.Node, e error) dms3ld.Node { +func plz(n ld.Node, e error) ld.Node { if e != nil { panic(e) } return n } -func plzStr(n dms3ld.Node, e error) string { +func plzStr(n ld.Node, e error) string { if e != nil { panic(e) } @@ -26,14 +26,14 @@ func plzStr(n dms3ld.Node, e error) string { panic(ok) } } -func str(n dms3ld.Node) string { +func str(n ld.Node) string { if s, ok := n.AsString(); ok == nil { return s } else { panic(ok) } } -func erp(n dms3ld.Node, e error) interface{} { +func erp(n ld.Node, e error) interface{} { if e != nil { return e } @@ -41,6 +41,6 @@ func erp(n dms3ld.Node, e error) interface{} { } // purely to syntactically flip large inline closures so we can see the argument at the top rather than the bottom of the block. -func withNode(n dms3ld.Node, cb func(n dms3ld.Node)) { +func withNode(n ld.Node, cb func(n ld.Node)) { cb(n) } diff --git a/schema/kind.go b/schema/kind.go index 2b8d513180af2d1de3e681756972b5c5a0135ae8..b2210a6184d0611fff24e8a7b6375c5d3f98cee2 100644 --- a/schema/kind.go +++ b/schema/kind.go @@ -1,12 +1,12 @@ package schema import ( - dms3ld "gitlab.dms3.io/ld/go-ld-prime" + ld "gitlab.dms3.io/ld/go-ld-prime" ) // TypeKind is an enum of kind in the DMS3LD Schema system. // -// Note that schema.TypeKind is distinct from dms3ld.Kind! +// Note that schema.TypeKind is distinct from ld.Kind! // Schema kinds include concepts such as "struct" and "enum", which are // concepts only introduced by the Schema layer, and not present in the // Data Model layer. @@ -62,7 +62,7 @@ func (k TypeKind) String() string { } } -// ActsLike returns a constant from the dms3ld.Kind enum describing what +// ActsLike returns a constant from the ld.Kind enum describing what // this schema.TypeKind acts like at the Data Model layer. // // Things with similar names are generally conserved @@ -74,34 +74,34 @@ func (k TypeKind) String() string { // it does not necessarily describe how it will be *serialized* // (for example, a struct will always act like a map, even if it has a tuple // representation strategy and thus becomes a list when serialized). -func (k TypeKind) ActsLike() dms3ld.Kind { +func (k TypeKind) ActsLike() ld.Kind { switch k { case TypeKind_Invalid: - return dms3ld.Kind_Invalid + return ld.Kind_Invalid case TypeKind_Map: - return dms3ld.Kind_Map + return ld.Kind_Map case TypeKind_List: - return dms3ld.Kind_List + return ld.Kind_List case TypeKind_Unit: - return dms3ld.Kind_Bool // maps to 'true'. + return ld.Kind_Bool // maps to 'true'. case TypeKind_Bool: - return dms3ld.Kind_Bool + return ld.Kind_Bool case TypeKind_Int: - return dms3ld.Kind_Int + return ld.Kind_Int case TypeKind_Float: - return dms3ld.Kind_Float + return ld.Kind_Float case TypeKind_String: - return dms3ld.Kind_String + return ld.Kind_String case TypeKind_Bytes: - return dms3ld.Kind_Bytes + return ld.Kind_Bytes case TypeKind_Link: - return dms3ld.Kind_Link + return ld.Kind_Link case TypeKind_Struct: - return dms3ld.Kind_Map // clear enough: fields are keys. + return ld.Kind_Map // clear enough: fields are keys. case TypeKind_Union: - return dms3ld.Kind_Map // REVIEW: unions are tricky. + return ld.Kind_Map // REVIEW: unions are tricky. case TypeKind_Enum: - return dms3ld.Kind_String // 'AsString' is the one clear thing to define. + return ld.Kind_String // 'AsString' is the one clear thing to define. default: panic("invalid enumeration value!") } diff --git a/schema/schema2/kind.go b/schema/schema2/kind.go index 2b8d513180af2d1de3e681756972b5c5a0135ae8..b2210a6184d0611fff24e8a7b6375c5d3f98cee2 100644 --- a/schema/schema2/kind.go +++ b/schema/schema2/kind.go @@ -1,12 +1,12 @@ package schema import ( - dms3ld "gitlab.dms3.io/ld/go-ld-prime" + ld "gitlab.dms3.io/ld/go-ld-prime" ) // TypeKind is an enum of kind in the DMS3LD Schema system. // -// Note that schema.TypeKind is distinct from dms3ld.Kind! +// Note that schema.TypeKind is distinct from ld.Kind! // Schema kinds include concepts such as "struct" and "enum", which are // concepts only introduced by the Schema layer, and not present in the // Data Model layer. @@ -62,7 +62,7 @@ func (k TypeKind) String() string { } } -// ActsLike returns a constant from the dms3ld.Kind enum describing what +// ActsLike returns a constant from the ld.Kind enum describing what // this schema.TypeKind acts like at the Data Model layer. // // Things with similar names are generally conserved @@ -74,34 +74,34 @@ func (k TypeKind) String() string { // it does not necessarily describe how it will be *serialized* // (for example, a struct will always act like a map, even if it has a tuple // representation strategy and thus becomes a list when serialized). -func (k TypeKind) ActsLike() dms3ld.Kind { +func (k TypeKind) ActsLike() ld.Kind { switch k { case TypeKind_Invalid: - return dms3ld.Kind_Invalid + return ld.Kind_Invalid case TypeKind_Map: - return dms3ld.Kind_Map + return ld.Kind_Map case TypeKind_List: - return dms3ld.Kind_List + return ld.Kind_List case TypeKind_Unit: - return dms3ld.Kind_Bool // maps to 'true'. + return ld.Kind_Bool // maps to 'true'. case TypeKind_Bool: - return dms3ld.Kind_Bool + return ld.Kind_Bool case TypeKind_Int: - return dms3ld.Kind_Int + return ld.Kind_Int case TypeKind_Float: - return dms3ld.Kind_Float + return ld.Kind_Float case TypeKind_String: - return dms3ld.Kind_String + return ld.Kind_String case TypeKind_Bytes: - return dms3ld.Kind_Bytes + return ld.Kind_Bytes case TypeKind_Link: - return dms3ld.Kind_Link + return ld.Kind_Link case TypeKind_Struct: - return dms3ld.Kind_Map // clear enough: fields are keys. + return ld.Kind_Map // clear enough: fields are keys. case TypeKind_Union: - return dms3ld.Kind_Map // REVIEW: unions are tricky. + return ld.Kind_Map // REVIEW: unions are tricky. case TypeKind_Enum: - return dms3ld.Kind_String // 'AsString' is the one clear thing to define. + return ld.Kind_String // 'AsString' is the one clear thing to define. default: panic("invalid enumeration value!") } diff --git a/schema/schema2/type.go b/schema/schema2/type.go index 971ccc479778a2d46fc1d3ab63cfdeeb3e6746e9..c72164aed1617dc0c22408e8b0475352e8f7c438 100644 --- a/schema/schema2/type.go +++ b/schema/schema2/type.go @@ -1,7 +1,7 @@ package schema import ( - dms3ld "gitlab.dms3.io/ld/go-ld-prime" + ld "gitlab.dms3.io/ld/go-ld-prime" ) // typesystem.Type is an union interface; each of the `Type*` concrete types @@ -55,7 +55,7 @@ type Type interface { // The returned value is a 1:1 association with which of the concrete // "schema.Type*" structs this interface can be cast to. // - // Note that a schema.TypeKind is a different enum than dms3ld.Kind; + // Note that a schema.TypeKind is a different enum than ld.Kind; // and furthermore, there's no strict relationship between them. // schema.TypedNode values can be described by *two* distinct Kinds: // one which describes how the Node itself will act, @@ -83,5 +83,5 @@ type Type interface { // You may also be interested in a related property that might have been called "TypeBehavior". // However, this method doesn't exist, because it's a deterministic property of `TypeKind()`! // You can use `TypeKind.ActsLike()` to get type-level behavioral information. - RepresentationBehavior() dms3ld.Kind + RepresentationBehavior() ld.Kind } diff --git a/schema/schema2/type_bool.go b/schema/schema2/type_bool.go index 20e815b997f462fb67743306798b81fde56f459d..03cd9c4152430c9b90ee5e3798730ff1467d9686 100644 --- a/schema/schema2/type_bool.go +++ b/schema/schema2/type_bool.go @@ -29,6 +29,6 @@ func (t *TypeBool) Name() TypeName { return t.name } -func (t TypeBool) RepresentationBehavior() dms3ld.Kind { - return dms3ld.Kind_Bool +func (t TypeBool) RepresentationBehavior() ld.Kind { + return ld.Kind_Bool } diff --git a/schema/schema2/type_bytes.go b/schema/schema2/type_bytes.go index b193d003747f6ccb65affb31b9bb3ad7c871a8ee..c76dbc9381348e6dd08bd62b326aeb8b283e8668 100644 --- a/schema/schema2/type_bytes.go +++ b/schema/schema2/type_bytes.go @@ -1,6 +1,7 @@ package schema import ( + ld "gitlab.dms3.io/ld/go-ld-prime" schemadmt "gitlab.dms3.io/ld/go-ld-prime/schema/dmt" ) @@ -28,6 +29,6 @@ func (t *TypeBytes) Name() TypeName { return t.name } -func (t TypeBytes) RepresentationBehavior() dms3ld.Kind { - return dms3ld.Kind_Bytes +func (t TypeBytes) RepresentationBehavior() ld.Kind { + return ld.Kind_Bytes } diff --git a/schema/schema2/type_enum.go b/schema/schema2/type_enum.go index 7dab4c6cf759c29c04de376906d607468f428942..0c0c0cec9f7230ba91eac273d702ccd0be6598e0 100644 --- a/schema/schema2/type_enum.go +++ b/schema/schema2/type_enum.go @@ -41,12 +41,12 @@ func (t *TypeEnum) Name() TypeName { return t.name } -func (t TypeEnum) RepresentationBehavior() dms3ld.Kind { +func (t TypeEnum) RepresentationBehavior() ld.Kind { switch t.dmt.FieldRepresentation().AsInterface().(type) { case schemadmt.EnumRepresentation_String: - return dms3ld.Kind_String + return ld.Kind_String case schemadmt.EnumRepresentation_Int: - return dms3ld.Kind_Int + return ld.Kind_Int default: panic("unreachable") } diff --git a/schema/schema2/type_float.go b/schema/schema2/type_float.go index 8a453cf094f6cab994354cecfe548fab83ec215a..3775fd198875e241a6e749dda9fb9db10349be59 100644 --- a/schema/schema2/type_float.go +++ b/schema/schema2/type_float.go @@ -29,6 +29,6 @@ func (t *TypeFloat) Name() TypeName { return t.name } -func (t TypeFloat) RepresentationBehavior() dms3ld.Kind { - return dms3ld.Kind_Float +func (t TypeFloat) RepresentationBehavior() ld.Kind { + return ld.Kind_Float } diff --git a/schema/schema2/type_int.go b/schema/schema2/type_int.go index fc205a72a6f9603f5ce6ebc2ed8591250aae4c73..5bd069c421478748b5de8a59c13021780881a36a 100644 --- a/schema/schema2/type_int.go +++ b/schema/schema2/type_int.go @@ -29,6 +29,6 @@ func (t *TypeInt) Name() TypeName { return t.name } -func (t TypeInt) RepresentationBehavior() dms3ld.Kind { - return dms3ld.Kind_Int +func (t TypeInt) RepresentationBehavior() ld.Kind { + return ld.Kind_Int } diff --git a/schema/schema2/type_link.go b/schema/schema2/type_link.go index 82c67d652df0e4e9d61609d04df6182bf46b9408..8ece4be9eaed3ee87800c003d542affd07e029d3 100644 --- a/schema/schema2/type_link.go +++ b/schema/schema2/type_link.go @@ -1,7 +1,7 @@ package schema import ( - dms3ld "gitlab.dms3.io/ld/go-ld-prime" + ld "gitlab.dms3.io/ld/go-ld-prime" schemadmt "gitlab.dms3.io/ld/go-ld-prime/schema/dmt" ) @@ -29,8 +29,8 @@ func (t *TypeLink) Name() TypeName { return t.name } -func (t TypeLink) RepresentationBehavior() dms3ld.Kind { - return dms3ld.Kind_Link +func (t TypeLink) RepresentationBehavior() ld.Kind { + return ld.Kind_Link } // -- specific to TypeLink --> diff --git a/schema/schema2/type_list.go b/schema/schema2/type_list.go index 1b13d468e42ceb5645bf1bb76b17e8d48a0ea6a4..34c108dac5e8aa2997de02f55d0f76c2ddb0362b 100644 --- a/schema/schema2/type_list.go +++ b/schema/schema2/type_list.go @@ -1,6 +1,7 @@ package schema import ( + ld "gitlab.dms3.io/ld/go-ld-prime" schemadmt "gitlab.dms3.io/ld/go-ld-prime/schema/dmt" ) @@ -28,8 +29,8 @@ func (t *TypeList) Name() TypeName { return t.name } -func (t TypeList) RepresentationBehavior() dms3ld.Kind { - return dms3ld.Kind_Map +func (t TypeList) RepresentationBehavior() ld.Kind { + return ld.Kind_Map } // -- specific to TypeList --> diff --git a/schema/schema2/type_map.go b/schema/schema2/type_map.go index 1e4a8b0143cefade6b2c229552ade4bcbc4f51c3..547d87b95001de70943b793fac5819232cea034d 100644 --- a/schema/schema2/type_map.go +++ b/schema/schema2/type_map.go @@ -1,6 +1,7 @@ package schema import ( + ld "gitlab.dms3.io/ld/go-ld-prime" schemadmt "gitlab.dms3.io/ld/go-ld-prime/schema/dmt" ) @@ -28,8 +29,8 @@ func (t *TypeMap) Name() TypeName { return t.name } -func (t TypeMap) RepresentationBehavior() dms3ld.Kind { - return dms3ld.Kind_Map +func (t TypeMap) RepresentationBehavior() ld.Kind { + return ld.Kind_Map } // -- specific to TypeMap --> diff --git a/schema/schema2/type_string.go b/schema/schema2/type_string.go index d043a002d62a67f50df7529923d68deea2515f84..ce2725a13e73e84924680763bd9d2bf5ed362581 100644 --- a/schema/schema2/type_string.go +++ b/schema/schema2/type_string.go @@ -1,6 +1,7 @@ package schema import ( + ld "gitlab.dms3.io/ld/go-ld-prime" schemadmt "gitlab.dms3.io/ld/go-ld-prime/schema/dmt" ) @@ -28,6 +29,6 @@ func (t *TypeString) Name() TypeName { return t.name } -func (t TypeString) RepresentationBehavior() dms3ld.Kind { - return dms3ld.Kind_String +func (t TypeString) RepresentationBehavior() ld.Kind { + return ld.Kind_String } diff --git a/schema/schema2/type_struct.go b/schema/schema2/type_struct.go index 6ed6e309fd4063bce3d742372d3392bb79236dfc..95261f4035d78dc6912382bb0d01caff1e2618a0 100644 --- a/schema/schema2/type_struct.go +++ b/schema/schema2/type_struct.go @@ -3,6 +3,7 @@ package schema import ( "fmt" + ld "gitlab.dms3.io/ld/go-ld-prime" schemadmt "gitlab.dms3.io/ld/go-ld-prime/schema/dmt" ) @@ -61,18 +62,18 @@ func (t *TypeStruct) Name() TypeName { return t.name } -func (t TypeStruct) RepresentationBehavior() dms3ld.Kind { +func (t TypeStruct) RepresentationBehavior() ld.Kind { switch t.dmt.FieldRepresentation().AsInterface().(type) { case schemadmt.StructRepresentation_Map: - return dms3ld.Kind_Map + return ld.Kind_Map case schemadmt.StructRepresentation_Tuple: - return dms3ld.Kind_List + return ld.Kind_List case schemadmt.StructRepresentation_Stringpairs: - return dms3ld.Kind_String + return ld.Kind_String case schemadmt.StructRepresentation_Stringjoin: - return dms3ld.Kind_String + return ld.Kind_String case schemadmt.StructRepresentation_Listpairs: - return dms3ld.Kind_List + return ld.Kind_List default: panic("unreachable") } diff --git a/schema/schema2/type_union.go b/schema/schema2/type_union.go index 33ff6343be2e15b3b15b786c60e36cc3f6b36e55..dd0bffc2b8d38b81cb34b17e4628a125b60aad1c 100644 --- a/schema/schema2/type_union.go +++ b/schema/schema2/type_union.go @@ -1,6 +1,7 @@ package schema import ( + ld "gitlab.dms3.io/ld/go-ld-prime" schemadmt "gitlab.dms3.io/ld/go-ld-prime/schema/dmt" ) @@ -62,20 +63,20 @@ func (t *TypeUnion) Name() TypeName { return t.name } -func (t TypeUnion) RepresentationBehavior() dms3ld.Kind { +func (t TypeUnion) RepresentationBehavior() ld.Kind { switch t.dmt.FieldRepresentation().AsInterface().(type) { case schemadmt.UnionRepresentation_Keyed: - return dms3ld.Kind_Map + return ld.Kind_Map case schemadmt.UnionRepresentation_Kinded: - return dms3ld.Kind_Invalid // you can't know with this one, until you see the value (and thus can see its inhabitant's behavior)! + return ld.Kind_Invalid // you can't know with this one, until you see the value (and thus can see its inhabitant's behavior)! case schemadmt.UnionRepresentation_Envelope: - return dms3ld.Kind_Map + return ld.Kind_Map case schemadmt.UnionRepresentation_Inline: - return dms3ld.Kind_Map + return ld.Kind_Map case schemadmt.UnionRepresentation_StringPrefix: - return dms3ld.Kind_String + return ld.Kind_String case schemadmt.UnionRepresentation_BytePrefix: - return dms3ld.Kind_Bytes + return ld.Kind_Bytes default: panic("unreachable") } @@ -119,7 +120,7 @@ func (r UnionRepresentation_Keyed) GetDiscriminantForType(t Type) string { // GetMember returns type info for the member matching the kind argument, // or may return nil if that kind is not mapped to a member of this union. -func (r UnionRepresentation_Kinded) GetMember(k dms3ld.Kind) Type { +func (r UnionRepresentation_Kinded) GetMember(k ld.Kind) Type { rkdmt, _ := schemadmt.Type.RepresentationKind.FromString(k.String()) // FUTURE: this is currently awkward because we used a string where we should use an enum; this can be fixed when codegen for enums is implemented. tn := r.dmt.Lookup(rkdmt) if tn == nil { diff --git a/schema/schema2/typesystem.go b/schema/schema2/typesystem.go index 4b58f01938d0cb3db3363dda1a28e856f696c6eb..bb3fe3ca8a48d08cc96ef1a0fef7760049c60431 100644 --- a/schema/schema2/typesystem.go +++ b/schema/schema2/typesystem.go @@ -159,7 +159,7 @@ func BuildTypeSystem(schdmt schemadmt.Schema) (*TypeSystem, []error) { // We create these temporary things rather than looking in the typesystem map we're accumulating because it makes the process work correctly regardless of order. // For some of the kinds, this is fairly overkill (we know that the representation behavior of a bool type is bool because it doesn't have any other representation strategies!) // but I've ground the whole thing out in a consistent way anyway. - var mkind dms3ld.Kind + var mkind ld.Kind switch t3 := typesdmt.Lookup(v).AsInterface().(type) { case schemadmt.TypeBool: mkind = TypeBool{dmt: t3}.RepresentationBehavior() @@ -189,7 +189,7 @@ func BuildTypeSystem(schdmt schemadmt.Schema) (*TypeSystem, []error) { panic("unreachable") } // TODO RepresentationKind is supposed to be an enum, but is not presently generated as such. This block's use of `k` as a string should turn into something cleaner when enum gen is implemented and used for RepresentationKind. - if mkind == dms3ld.Kind_Invalid { + if mkind == ld.Kind_Invalid { ee = append(ee, fmt.Errorf("kinded union %s declares a %s kind should be received as type %s, which is not sensible because that type is also a kinded union", tn, k, v)) } else if k.String() != mkind.String() { ee = append(ee, fmt.Errorf("kinded union %s declares a %s kind should be received as type %s, but that type's representation kind is %s", tn, k, v, mkind)) @@ -206,7 +206,7 @@ func BuildTypeSystem(schdmt schemadmt.Schema) (*TypeSystem, []error) { _, v := itr.Next() // As with the switch above which handles kinded union members, we go for the full destructuring here. // It's slightly overkill considering that most of the type kinds will flatly error in practice, but consistency is nice. - var mkind dms3ld.Kind + var mkind ld.Kind switch t3 := typesdmt.Lookup(v).AsInterface().(type) { case schemadmt.TypeBool: mkind = TypeBool{dmt: t3}.RepresentationBehavior() @@ -239,7 +239,7 @@ func BuildTypeSystem(schdmt schemadmt.Schema) (*TypeSystem, []error) { case schemadmt.TypeStruct: // Check representation strategy first. Still has to be mappy. t4 := TypeStruct{dmt: t3} - if t4.RepresentationBehavior() != dms3ld.Kind_Map { + if t4.RepresentationBehavior() != ld.Kind_Map { goto kindcheck // it'll fail, of course, but this goto DRY's the error message. } @@ -266,7 +266,7 @@ func BuildTypeSystem(schdmt schemadmt.Schema) (*TypeSystem, []error) { panic("unreachable") } kindcheck: - if mkind != dms3ld.Kind_Map { + if mkind != ld.Kind_Map { ee = append(ee, fmt.Errorf("union %s has representation strategy inline, which requires all members have map representations, so %s (which has representation kind %s) is not a valid member", tn, v, mkind)) } } @@ -415,7 +415,7 @@ func hasStringRepresentation(t schemadmt.TypeDefn) bool { // The discriminantsMap is an untyped Node because it turns out convenient to do that way: // we happen to know all the different union representations have a map *somewhere* for this, // but its position and key types vary. Untyped access lets us write more reusable code in this case. -func checkUnionDiscriminantInfo(tn TypeName, members []schemadmt.TypeName, discriminantsMap dms3ld.Node, ee *[]error) { +func checkUnionDiscriminantInfo(tn TypeName, members []schemadmt.TypeName, discriminantsMap ld.Node, ee *[]error) { for itr := discriminantsMap.MapIterator(); !itr.Done(); { _, v, _ := itr.Next() found := false diff --git a/schema/tmpBuilders.go b/schema/tmpBuilders.go index ce6fb33fe54b69deb50272eecd968e445c0a5a39..a39fabed7c0e51f3f86abf4c73c605e9cd90fe43 100644 --- a/schema/tmpBuilders.go +++ b/schema/tmpBuilders.go @@ -3,7 +3,7 @@ package schema import ( "fmt" - dms3ld "gitlab.dms3.io/ld/go-ld-prime" + ld "gitlab.dms3.io/ld/go-ld-prime" ) // Everything in this file is __a temporary hack__ and will be __removed__. @@ -104,7 +104,7 @@ func SpawnUnion(name TypeName, members []TypeName, repr UnionRepresentation) *Ty func SpawnUnionRepresentationKeyed(table map[string]TypeName) UnionRepresentation_Keyed { return UnionRepresentation_Keyed{table} } -func SpawnUnionRepresentationKinded(table map[dms3ld.Kind]TypeName) UnionRepresentation_Kinded { +func SpawnUnionRepresentationKinded(table map[ld.Kind]TypeName) UnionRepresentation_Kinded { return UnionRepresentation_Kinded{table} } func SpawnUnionRepresentationStringprefix(delim string, table map[string]TypeName) UnionRepresentation_Stringprefix { diff --git a/schema/type.go b/schema/type.go index abbc4531566673a6c8a6333df087f7b49ded89d2..0e9bbd2ed5b19f63966337ae6dc1d04dba77e453 100644 --- a/schema/type.go +++ b/schema/type.go @@ -1,7 +1,7 @@ package schema import ( - dms3ld "gitlab.dms3.io/ld/go-ld-prime" + ld "gitlab.dms3.io/ld/go-ld-prime" ) type TypeName string // = ast.TypeName @@ -60,7 +60,7 @@ type Type interface { // The returned value is a 1:1 association with which of the concrete // "schema.Type*" structs this interface can be cast to. // - // Note that a schema.TypeKind is a different enum than dms3ld.Kind; + // Note that a schema.TypeKind is a different enum than ld.Kind; // and furthermore, there's no strict relationship between them. // schema.TypedNode values can be described by *two* distinct Kinds: // one which describes how the Node itself will act, @@ -88,7 +88,7 @@ type Type interface { // You may also be interested in a related property that might have been called "TypeBehavior". // However, this method doesn't exist, because it's a deterministic property of `TypeKind()`! // You can use `TypeKind.ActsLike()` to get type-level behavioral information. - RepresentationBehavior() dms3ld.Kind + RepresentationBehavior() ld.Kind } var ( @@ -180,7 +180,7 @@ type UnionRepresentation_Keyed struct { table map[string]TypeName // key is user-defined freetext } type UnionRepresentation_Kinded struct { - table map[dms3ld.Kind]TypeName + table map[ld.Kind]TypeName } type UnionRepresentation_Envelope struct { discriminantKey string diff --git a/schema/typeMethods.go b/schema/typeMethods.go index 5d520761bb73b1d3a54058a6f746308ea0442f8a..621fd1188965d624f9575aef24439f44842cfb18 100644 --- a/schema/typeMethods.go +++ b/schema/typeMethods.go @@ -1,7 +1,7 @@ package schema import ( - dms3ld "gitlab.dms3.io/ld/go-ld-prime" + ld "gitlab.dms3.io/ld/go-ld-prime" ) /* cookie-cutter standard interface stuff */ @@ -24,45 +24,45 @@ func (TypeUnion) TypeKind() TypeKind { return TypeKind_Union } func (TypeStruct) TypeKind() TypeKind { return TypeKind_Struct } func (TypeEnum) TypeKind() TypeKind { return TypeKind_Enum } -func (TypeBool) RepresentationBehavior() dms3ld.Kind { return dms3ld.Kind_Bool } -func (TypeString) RepresentationBehavior() dms3ld.Kind { return dms3ld.Kind_String } -func (TypeBytes) RepresentationBehavior() dms3ld.Kind { return dms3ld.Kind_Bytes } -func (TypeInt) RepresentationBehavior() dms3ld.Kind { return dms3ld.Kind_Int } -func (TypeFloat) RepresentationBehavior() dms3ld.Kind { return dms3ld.Kind_Float } -func (TypeMap) RepresentationBehavior() dms3ld.Kind { return dms3ld.Kind_Map } -func (TypeList) RepresentationBehavior() dms3ld.Kind { return dms3ld.Kind_List } -func (TypeLink) RepresentationBehavior() dms3ld.Kind { return dms3ld.Kind_Link } -func (t TypeUnion) RepresentationBehavior() dms3ld.Kind { +func (TypeBool) RepresentationBehavior() ld.Kind { return ld.Kind_Bool } +func (TypeString) RepresentationBehavior() ld.Kind { return ld.Kind_String } +func (TypeBytes) RepresentationBehavior() ld.Kind { return ld.Kind_Bytes } +func (TypeInt) RepresentationBehavior() ld.Kind { return ld.Kind_Int } +func (TypeFloat) RepresentationBehavior() ld.Kind { return ld.Kind_Float } +func (TypeMap) RepresentationBehavior() ld.Kind { return ld.Kind_Map } +func (TypeList) RepresentationBehavior() ld.Kind { return ld.Kind_List } +func (TypeLink) RepresentationBehavior() ld.Kind { return ld.Kind_Link } +func (t TypeUnion) RepresentationBehavior() ld.Kind { switch t.representation.(type) { case UnionRepresentation_Keyed: - return dms3ld.Kind_Map + return ld.Kind_Map case UnionRepresentation_Kinded: - return dms3ld.Kind_Invalid // you can't know with this one, until you see the value (and thus can its inhabitant's behavior)! + return ld.Kind_Invalid // you can't know with this one, until you see the value (and thus can its inhabitant's behavior)! case UnionRepresentation_Envelope: - return dms3ld.Kind_Map + return ld.Kind_Map case UnionRepresentation_Inline: - return dms3ld.Kind_Map + return ld.Kind_Map default: panic("unreachable") } } -func (t TypeStruct) RepresentationBehavior() dms3ld.Kind { +func (t TypeStruct) RepresentationBehavior() ld.Kind { switch t.representation.(type) { case StructRepresentation_Map: - return dms3ld.Kind_Map + return ld.Kind_Map case StructRepresentation_Tuple: - return dms3ld.Kind_List + return ld.Kind_List case StructRepresentation_StringPairs: - return dms3ld.Kind_String + return ld.Kind_String case StructRepresentation_Stringjoin: - return dms3ld.Kind_String + return ld.Kind_String default: panic("unreachable") } } -func (t TypeEnum) RepresentationBehavior() dms3ld.Kind { +func (t TypeEnum) RepresentationBehavior() ld.Kind { // TODO: this should have a representation strategy switch too; sometimes that will indicate int representation behavior. - return dms3ld.Kind_String + return ld.Kind_String } /* interesting methods per Type type */ @@ -163,7 +163,7 @@ func (r UnionRepresentation_Stringprefix) GetDiscriminant(t Type) string { // GetMember returns type info for the member matching the kind argument, // or may return nil if that kind is not mapped to a member of this union. -func (r UnionRepresentation_Kinded) GetMember(k dms3ld.Kind) TypeName { +func (r UnionRepresentation_Kinded) GetMember(k ld.Kind) TypeName { return r.table[k] } diff --git a/schema/typedNode.go b/schema/typedNode.go index ea7390ce8cf555d5652ccb82fab4bac2af761e0c..eb5e2447757e34c0401334c47c0677766b420621 100644 --- a/schema/typedNode.go +++ b/schema/typedNode.go @@ -1,15 +1,15 @@ package schema -// schema.TypedNode is a superset of the dms3ld.Node interface, and has additional behaviors. +// schema.TypedNode is a superset of the ld.Node interface, and has additional behaviors. // // A schema.TypedNode can be inspected for its schema.Type and schema.TypeKind, // which conveys much more and richer information than the Data Model layer -// dms3ld.Kind. +// ld.Kind. // // There are many different implementations of schema.TypedNode. -// One implementation can wrap any other existing dms3ld.Node (i.e., it's zero-copy) +// One implementation can wrap any other existing ld.Node (i.e., it's zero-copy) // and promises that it has *already* been validated to match the typesystem.Type; -// another implementation similarly wraps any other existing dms3ld.Node, but +// another implementation similarly wraps any other existing ld.Node, but // defers to the typesystem validation checking to fields that are accessed; // and when using code generation tools, all of the generated native Golang // types produced by the codegen will each individually implement schema.TypedNode. @@ -24,7 +24,7 @@ package schema // return ErrNotExists, because the representation isn't a schema.TypedNode! type TypedNode interface { // schema.TypedNode acts just like a regular Node for almost all purposes; - // which dms3ld.Kind it acts as is determined by the TypeKind. + // which ld.Kind it acts as is determined by the TypeKind. // (Note that the representation strategy of the type does *not* affect // the Kind of schema.TypedNode -- rather, the representation strategy // affects the `.Representation().Kind()`.) @@ -32,19 +32,19 @@ type TypedNode interface { // For example: if the `.Type().TypeKind()` of this node is "struct", // it will act like Kind() == "map" // (even if Type().(Struct).ReprStrategy() is "tuple"). - dms3ld.Node + ld.Node // Type returns a reference to the reified schema.Type value. Type() Type - // Representation returns an dms3ld.Node which sees the data in this node + // Representation returns an ld.Node which sees the data in this node // in its representation form. // // For example: if the `.Type().TypeKind()` of this node is "struct", // `.Representation().TypeKind()` may vary based on its representation strategy: // if the representation strategy is "map", then it will be Kind=="map"; // if the streatgy is "tuple", then it will be Kind=="list". - Representation() dms3ld.Node + Representation() ld.Node } // schema.TypedLinkNode is a superset of the schema.TypedNode interface, and has one additional behavior. @@ -57,7 +57,7 @@ type TypedNode interface { // with a code-gen'd node builder while utilizing the automatic loading facilities // of the traversal package, you could write a LinkNodeBuilderChooser as follows: // -// func LinkNodeBuilderChooser(lnk dms3ld.Link, lnkCtx dms3ld.LinkContext) dms3ld.NodePrototype { +// func LinkNodeBuilderChooser(lnk ld.Link, lnkCtx ld.LinkContext) ld.NodePrototype { // if tlnkNd, ok := lnkCtx.LinkNode.(schema.TypedLinkNode); ok { // return tlnkNd.LinkTargetNodePrototype() // } @@ -65,18 +65,18 @@ type TypedNode interface { // } // type TypedLinkNode interface { - LinkTargetNodePrototype() dms3ld.NodePrototype + LinkTargetNodePrototype() ld.NodePrototype } -// TypedPrototype is a superset of the dms3ld.Nodeprototype interface, and has -// additional behaviors, much like TypedNode for dms3ld.Node. +// TypedPrototype is a superset of the ld.Nodeprototype interface, and has +// additional behaviors, much like TypedNode for ld.Node. type TypedPrototype interface { - dms3ld.NodePrototype + ld.NodePrototype // Type returns a reference to the reified schema.Type value. Type() Type - // Representation returns an dms3ld.NodePrototype for the representation + // Representation returns an ld.NodePrototype for the representation // form of the prototype. - Representation() dms3ld.NodePrototype + Representation() ld.NodePrototype } diff --git a/schema/validate.go b/schema/validate.go index 95566d2b5c6dcd0f6a803d1561da00857c2d5d8f..b9aaf5799ab4070bc41c8dac9a5daf0b3c0af2ad 100644 --- a/schema/validate.go +++ b/schema/validate.go @@ -12,7 +12,7 @@ package schema - Option 2: Use the schema.Type{}.RepresentationNodeBuilder() to feed data into it -- recursing on what the nodebuilder already expresses. - (Option 2 also need to take a `memStorage dms3ld.NodeBuilder` param, btw, + (Option 2 also need to take a `memStorage ld.NodeBuilder` param, btw, for handling all the cases where we *aren't* doing codegen.) Option 1 provides a little more opportunity for returning multiple errors. diff --git a/storage/doc.go b/storage/doc.go index b4a9afb6fa2b030e1a0a965d5ac3e24168912844..7ffb055187c5d94101d210e80bb5ffb4d6696d54 100644 --- a/storage/doc.go +++ b/storage/doc.go @@ -1,7 +1,7 @@ package storage // Storage contains some simple implementations for the -// dms3ld.BlockReadOpener and dms3ld.BlockWriteOpener interfaces, +// ld.BlockReadOpener and ld.BlockWriteOpener interfaces, // which are typically used by composition in a LinkSystem. // // These are provided as simple "batteries included" storage systems. diff --git a/storage/memory.go b/storage/memory.go index 941b81ba7ff808a0a119177c60873c0a861d76a5..5924dfaff798b37135ac0685b6e3ed1a6f73f96a 100644 --- a/storage/memory.go +++ b/storage/memory.go @@ -5,15 +5,15 @@ import ( "fmt" "io" - dms3ld "gitlab.dms3.io/ld/go-ld-prime" + ld "gitlab.dms3.io/ld/go-ld-prime" ) -// Memory is a simple in-memory storage for data indexed by dms3ld.Link. +// Memory is a simple in-memory storage for data indexed by ld.Link. // (It's little more than a map -- in fact, the map is exported, // and you can poke it directly.) // -// The OpenRead method conforms to dms3ld.BlockReadOpener, -// and the OpenWrite method conforms to dms3ld.BlockWriteOpener. +// The OpenRead method conforms to ld.BlockReadOpener, +// and the OpenWrite method conforms to ld.BlockWriteOpener. // Therefore it's easy to use in a LinkSystem like this: // // store := storage.Memory{} @@ -23,17 +23,17 @@ import ( // This storage is mostly expected to be used for testing and demos, // and as an example of how you can implement and integrate your own storage systems. type Memory struct { - Bag map[dms3ld.Link][]byte + Bag map[ld.Link][]byte } func (store *Memory) beInitialized() { if store.Bag != nil { return } - store.Bag = make(map[dms3ld.Link][]byte) + store.Bag = make(map[ld.Link][]byte) } -func (store *Memory) OpenRead(lnkCtx dms3ld.LinkContext, lnk dms3ld.Link) (io.Reader, error) { +func (store *Memory) OpenRead(lnkCtx ld.LinkContext, lnk ld.Link) (io.Reader, error) { store.beInitialized() data, exists := store.Bag[lnk] if !exists { @@ -42,10 +42,10 @@ func (store *Memory) OpenRead(lnkCtx dms3ld.LinkContext, lnk dms3ld.Link) (io.Re return bytes.NewReader(data), nil } -func (store *Memory) OpenWrite(lnkCtx dms3ld.LinkContext) (io.Writer, dms3ld.BlockWriteCommitter, error) { +func (store *Memory) OpenWrite(lnkCtx ld.LinkContext) (io.Writer, ld.BlockWriteCommitter, error) { store.beInitialized() buf := bytes.Buffer{} - return &buf, func(lnk dms3ld.Link) error { + return &buf, func(lnk ld.Link) error { store.Bag[lnk] = buf.Bytes() return nil }, nil diff --git a/traversal/common.go b/traversal/common.go index d30956f95d15007c548949f984c08aa58374b3b8..9f51f3d6c06d3d5db0fc28a65a385ce01ac1f317 100644 --- a/traversal/common.go +++ b/traversal/common.go @@ -4,7 +4,7 @@ import ( "context" "fmt" - dms3ld "gitlab.dms3.io/ld/go-ld-prime" + ld "gitlab.dms3.io/ld/go-ld-prime" "gitlab.dms3.io/ld/go-ld-prime/schema" ) @@ -19,7 +19,7 @@ func (tc *Config) init() { tc.Ctx = context.Background() } if tc.LinkTargetNodePrototypeChooser == nil { - tc.LinkTargetNodePrototypeChooser = func(lnk dms3ld.Link, lnkCtx dms3ld.LinkContext) (dms3ld.NodePrototype, error) { + tc.LinkTargetNodePrototypeChooser = func(lnk ld.Link, lnkCtx ld.LinkContext) (ld.NodePrototype, error) { if tlnkNd, ok := lnkCtx.LinkNode.(schema.TypedLinkNode); ok { return tlnkNd.LinkTargetNodePrototype(), nil } @@ -40,17 +40,17 @@ func (prog *Progress) init() { // If it's a string or an int, that's it. // Any other case will panic. (If you're using this one keys returned by a MapIterator, though, you can ignore this possibility; // any compliant map implementation should've already rejected that data long ago, and should not be able to yield it to you from an iterator.) -func asPathSegment(n dms3ld.Node) dms3ld.PathSegment { +func asPathSegment(n ld.Node) ld.PathSegment { if n2, ok := n.(schema.TypedNode); ok { n = n2.Representation() } switch n.Kind() { - case dms3ld.Kind_String: + case ld.Kind_String: s, _ := n.AsString() - return dms3ld.PathSegmentOfString(s) - case dms3ld.Kind_Int: + return ld.PathSegmentOfString(s) + case ld.Kind_Int: i, _ := n.AsInt() - return dms3ld.PathSegmentOfInt(i) + return ld.PathSegmentOfInt(i) default: panic(fmt.Errorf("cannot get pathsegment from a %s", n.Kind())) } diff --git a/traversal/doc.go b/traversal/doc.go index 3aabdd6af6906e3bbc20787be0396dd980e811f9..43dac96f4ce4d66be51db7eb9ed8a471bfc9a6c6 100644 --- a/traversal/doc.go +++ b/traversal/doc.go @@ -1,17 +1,17 @@ // This package provides functional utilities for traversing and transforming -// DMS3LD nodes. +// LD nodes. // // The traversal.Path type provides a description of how to perform // several steps across a Node tree. These are dual purpose: // Paths can be used as instructions to do some traversal, and // Paths are accumulated during traversals as a log of progress. // -// "Focus" functions provide syntactic sugar for using dms3ld.Path to jump +// "Focus" functions provide syntactic sugar for using ld.Path to jump // to a Node deep in a tree of other Nodes. // // "FocusedTransform" functions can do the same such deep jumps, and support // mutation as well! -// (Of course, since dms3ld.Node is an immutable interface, more precisely +// (Of course, since ld.Node is an immutable interface, more precisely // speaking, "transformations" are implemented rebuilding trees of nodes to // emulate mutation in a copy-on-write way.) // @@ -31,7 +31,7 @@ // // All of these functions -- the "Focus*" and "Walk*" family alike -- // include support for automatic resolution and loading of new Node trees -// whenever DMS3LD Links are encountered. This can be configured freely +// whenever LD Links are encountered. This can be configured freely // by providing LinkLoader interfaces to the traversal.Config. // // Some notes on the limits of usage: diff --git a/traversal/fns.go b/traversal/fns.go index 0deae9c1fc79d2d769bc4c26623d0b21a8e73877..5bbc585a2045be179b2933bfdbe6b557c7567b3f 100644 --- a/traversal/fns.go +++ b/traversal/fns.go @@ -3,7 +3,7 @@ package traversal import ( "context" - dms3ld "gitlab.dms3.io/ld/go-ld-prime" + ld "gitlab.dms3.io/ld/go-ld-prime" ) // This file defines interfaces for things users provide, @@ -11,13 +11,13 @@ import ( //-------------------------------------------------------- // VisitFn is a read-only visitor. -type VisitFn func(Progress, dms3ld.Node) error +type VisitFn func(Progress, ld.Node) error // TransformFn is like a visitor that can also return a new Node to replace the visited one. -type TransformFn func(Progress, dms3ld.Node) (dms3ld.Node, error) +type TransformFn func(Progress, ld.Node) (ld.Node, error) // AdvVisitFn is like VisitFn, but for use with AdvTraversal: it gets additional arguments describing *why* this node is visited. -type AdvVisitFn func(Progress, dms3ld.Node, VisitReason) error +type AdvVisitFn func(Progress, ld.Node, VisitReason) error // VisitReason provides additional information to traversals using AdvVisitFn. type VisitReason byte @@ -30,16 +30,16 @@ const ( type Progress struct { Cfg *Config - Path dms3ld.Path // Path is how we reached the current point in the traversal. - LastBlock struct { // LastBlock stores the Path and Link of the last block edge we had to load. (It will always be zero in traversals with no linkloader.) - Path dms3ld.Path - Link dms3ld.Link + Path ld.Path // Path is how we reached the current point in the traversal. + LastBlock struct { // LastBlock stores the Path and Link of the last block edge we had to load. (It will always be zero in traversals with no linkloader.) + Path ld.Path + Link ld.Link } } type Config struct { Ctx context.Context // Context carried through a traversal. Optional; use it if you need cancellation. - LinkSystem dms3ld.LinkSystem // LinkSystem used for automatic link loading, and also any storing if mutation features (e.g. traversal.Transform) are used. + LinkSystem ld.LinkSystem // LinkSystem used for automatic link loading, and also any storing if mutation features (e.g. traversal.Transform) are used. LinkTargetNodePrototypeChooser LinkTargetNodePrototypeChooser // Chooser for Node implementations to produce during automatic link traversal. } @@ -52,7 +52,7 @@ type Config struct { // In a more complex example, a program using `bind` over native Go types // could decide what kind of native type is expected, and return a // `bind.NodeBuilder` for that specific concrete native type. -type LinkTargetNodePrototypeChooser func(dms3ld.Link, dms3ld.LinkContext) (dms3ld.NodePrototype, error) +type LinkTargetNodePrototypeChooser func(ld.Link, ld.LinkContext) (ld.NodePrototype, error) // SkipMe is a signalling "error" which can be used to tell traverse to skip some data. // diff --git a/traversal/focus.go b/traversal/focus.go index 9438f97f113f9b61dc1350fb7385c151f1ced914..e14e1d964b7302812e1adaa2702e5bb2fbffd712 100644 --- a/traversal/focus.go +++ b/traversal/focus.go @@ -3,7 +3,7 @@ package traversal import ( "fmt" - dms3ld "gitlab.dms3.io/ld/go-ld-prime" + ld "gitlab.dms3.io/ld/go-ld-prime" ) // Focus traverses a Node graph according to a path, reaches a single Node, @@ -13,7 +13,7 @@ import ( // It cannot cross links automatically (since this requires configuration). // Use the equivalent Focus function on the Progress structure // for more advanced and configurable walks. -func Focus(n dms3ld.Node, p dms3ld.Path, fn VisitFn) error { +func Focus(n ld.Node, p ld.Path, fn VisitFn) error { return Progress{}.Focus(n, p, fn) } @@ -24,11 +24,11 @@ func Focus(n dms3ld.Node, p dms3ld.Path, fn VisitFn) error { // It cannot cross links automatically (since this requires configuration). // Use the equivalent Get function on the Progress structure // for more advanced and configurable walks. -func Get(n dms3ld.Node, p dms3ld.Path) (dms3ld.Node, error) { +func Get(n ld.Node, p ld.Path) (ld.Node, error) { return Progress{}.Get(n, p) } -// FocusedTransform traverses an dms3ld.Node graph, reaches a single Node, +// FocusedTransform traverses an ld.Node graph, reaches a single Node, // and calls the given TransformFn to decide what new node to replace the visited node with. // A new Node tree will be returned (the original is unchanged). // @@ -36,7 +36,7 @@ func Get(n dms3ld.Node, p dms3ld.Path) (dms3ld.Node, error) { // It cannot cross links automatically (since this requires configuration). // Use the equivalent FocusedTransform function on the Progress structure // for more advanced and configurable walks. -func FocusedTransform(n dms3ld.Node, p dms3ld.Path, fn TransformFn, createParents bool) (dms3ld.Node, error) { +func FocusedTransform(n ld.Node, p ld.Path, fn TransformFn, createParents bool) (ld.Node, error) { return Progress{}.FocusedTransform(n, p, fn, createParents) } @@ -55,7 +55,7 @@ func FocusedTransform(n dms3ld.Node, p dms3ld.Path, fn TransformFn, createParent // By using the traversal.Progress handed to the VisitFn, // the Path recorded of the traversal so far will continue to be extended, // and thus continued nested uses of Walk and Focus will see the fully contextualized Path. -func (prog Progress) Focus(n dms3ld.Node, p dms3ld.Path, fn VisitFn) error { +func (prog Progress) Focus(n ld.Node, p ld.Path, fn VisitFn) error { n, err := prog.get(n, p, true) if err != nil { return err @@ -74,29 +74,29 @@ func (prog Progress) Focus(n dms3ld.Node, p dms3ld.Path, fn VisitFn) error { // If doing several traversals which are nested, consider using the Focus funcion in preference to Get; // the Focus functions provide updated Progress objects which can be used to do nested traversals while keeping consistent track of progress, // such that continued nested uses of Walk or Focus or Get will see the fully contextualized Path. -func (prog Progress) Get(n dms3ld.Node, p dms3ld.Path) (dms3ld.Node, error) { +func (prog Progress) Get(n ld.Node, p ld.Path) (ld.Node, error) { return prog.get(n, p, false) } // get is the internal implementation for Focus and Get. // It *mutates* the Progress object it's called on, and returns reached nodes. // For Get calls, trackProgress=false, which avoids some allocations for state tracking that's not needed by that call. -func (prog *Progress) get(n dms3ld.Node, p dms3ld.Path, trackProgress bool) (dms3ld.Node, error) { +func (prog *Progress) get(n ld.Node, p ld.Path, trackProgress bool) (ld.Node, error) { prog.init() segments := p.Segments() - var prev dms3ld.Node // for LinkContext + var prev ld.Node // for LinkContext for i, seg := range segments { // Traverse the segment. switch n.Kind() { - case dms3ld.Kind_Invalid: + case ld.Kind_Invalid: panic(fmt.Errorf("invalid node encountered at %q", p.Truncate(i))) - case dms3ld.Kind_Map: + case ld.Kind_Map: next, err := n.LookupByString(seg.String()) if err != nil { return nil, fmt.Errorf("error traversing segment %q on node at %q: %s", seg, p.Truncate(i), err) } prev, n = n, next - case dms3ld.Kind_List: + case ld.Kind_List: intSeg, err := seg.Index() if err != nil { return nil, fmt.Errorf("error traversing segment %q on node at %q: the segment cannot be parsed as a number and the node is a list", seg, p.Truncate(i)) @@ -110,9 +110,9 @@ func (prog *Progress) get(n dms3ld.Node, p dms3ld.Path, trackProgress bool) (dms return nil, fmt.Errorf("cannot traverse node at %q: %s", p.Truncate(i), fmt.Errorf("cannot traverse terminals")) } // Dereference any links. - for n.Kind() == dms3ld.Kind_Link { + for n.Kind() == ld.Kind_Link { lnk, _ := n.AsLink() - lnkCtx := dms3ld.LinkContext{ + lnkCtx := ld.LinkContext{ Ctx: prog.Cfg.Ctx, LinkPath: p.Truncate(i), LinkNode: n, @@ -141,7 +141,7 @@ func (prog *Progress) get(n dms3ld.Node, p dms3ld.Path, trackProgress bool) (dms return n, nil } -// FocusedTransform traverses an dms3ld.Node graph, reaches a single Node, +// FocusedTransform traverses an ld.Node graph, reaches a single Node, // and calls the given TransformFn to decide what new node to replace the visited node with. // A new Node tree will be returned (the original is unchanged). // @@ -178,7 +178,7 @@ func (prog *Progress) get(n dms3ld.Node, p dms3ld.Path, trackProgress bool) (dms // does a large amount of the intermediate bookkeeping that's useful when // creating new values which are partial updates to existing values. // -func (prog Progress) FocusedTransform(n dms3ld.Node, p dms3ld.Path, fn TransformFn, createParents bool) (dms3ld.Node, error) { +func (prog Progress) FocusedTransform(n ld.Node, p ld.Path, fn TransformFn, createParents bool) (ld.Node, error) { prog.init() nb := n.Prototype().NewBuilder() if err := prog.focusedTransform(n, nb, p, fn, createParents); err != nil { @@ -191,7 +191,7 @@ func (prog Progress) FocusedTransform(n dms3ld.Node, p dms3ld.Path, fn Transform // begins building an updated node tree. // // As implemented, this is not actually efficient if the update will be a no-op; it won't notice until it gets there. -func (prog Progress) focusedTransform(n dms3ld.Node, na dms3ld.NodeAssembler, p dms3ld.Path, fn TransformFn, createParents bool) error { +func (prog Progress) focusedTransform(n ld.Node, na ld.NodeAssembler, p ld.Path, fn TransformFn, createParents bool) error { if p.Len() == 0 { n2, err := fn(prog, n) if err != nil { @@ -224,7 +224,7 @@ func (prog Progress) focusedTransform(n dms3ld.Node, na dms3ld.NodeAssembler, p // if we're at the end, it was already handled at the top of the function, // so we only get to this case if we were expecting to go deeper. switch n.Kind() { - case dms3ld.Kind_Map: + case ld.Kind_Map: ma, err := na.BeginMap(n.Length()) if err != nil { return err @@ -269,7 +269,7 @@ func (prog Progress) focusedTransform(n dms3ld.Node, na dms3ld.NodeAssembler, p return err } return ma.Finish() - case dms3ld.Kind_List: + case ld.Kind_List: la, err := na.BeginList(n.Length()) if err != nil { return err @@ -312,13 +312,13 @@ func (prog Progress) focusedTransform(n dms3ld.Node, na dms3ld.NodeAssembler, p if ti >= 0 { return fmt.Errorf("transform: cannot navigate path segment %q at %q because it is beyond the list bounds", seg, prog.Path) } - prog.Path = prog.Path.AppendSegment(dms3ld.PathSegmentOfInt(n.Length())) + prog.Path = prog.Path.AppendSegment(ld.PathSegmentOfInt(n.Length())) if err := prog.focusedTransform(nil, la.AssembleValue(), p2, fn, createParents); err != nil { return err } return la.Finish() - case dms3ld.Kind_Link: - lnkCtx := dms3ld.LinkContext{ + case ld.Kind_Link: + lnkCtx := ld.LinkContext{ Ctx: prog.Cfg.Ctx, LinkPath: prog.Path, LinkNode: n, diff --git a/traversal/focus_test.go b/traversal/focus_test.go index e85668f9a737d78f351aed20d734138b3afe7dc6..fafa89a430a36fc9499a807c2cf52a618bec89c7 100644 --- a/traversal/focus_test.go +++ b/traversal/focus_test.go @@ -49,7 +49,7 @@ var ( // encode hardcodes some encoding choices for ease of use in fixture generation; // just gimme a link and stuff the bytes in a map. // (also return the node again for convenient assignment.) -func encode(n dms3ld.Node) (dms3ld.Node, dms3ld.Link) { +func encode(n ld.Node) (ld.Node, ld.Link) { lp := cidlink.LinkPrototype{cid.Prefix{ Version: 1, Codec: 0x0129, @@ -59,7 +59,7 @@ func encode(n dms3ld.Node) (dms3ld.Node, dms3ld.Link) { lsys := cidlink.DefaultLinkSystem() lsys.StorageWriteOpener = (&store).OpenWrite - lnk, err := lsys.Store(dms3ld.LinkContext{}, lp, n) + lnk, err := lsys.Store(ld.LinkContext{}, lp, n) if err != nil { panic(err) } @@ -69,25 +69,25 @@ func encode(n dms3ld.Node) (dms3ld.Node, dms3ld.Link) { // covers Focus used on one already-loaded Node; no link-loading exercised. func TestFocusSingleTree(t *testing.T) { t.Run("empty path on scalar node returns start node", func(t *testing.T) { - err := traversal.Focus(basicnode.NewString("x"), dms3ld.Path{}, func(prog traversal.Progress, n dms3ld.Node) error { + err := traversal.Focus(basicnode.NewString("x"), ld.Path{}, func(prog traversal.Progress, n ld.Node) error { Wish(t, n, ShouldEqual, basicnode.NewString("x")) - Wish(t, prog.Path.String(), ShouldEqual, dms3ld.Path{}.String()) + Wish(t, prog.Path.String(), ShouldEqual, ld.Path{}.String()) return nil }) Wish(t, err, ShouldEqual, nil) }) t.Run("one step path on map node works", func(t *testing.T) { - err := traversal.Focus(middleMapNode, dms3ld.ParsePath("foo"), func(prog traversal.Progress, n dms3ld.Node) error { + err := traversal.Focus(middleMapNode, ld.ParsePath("foo"), func(prog traversal.Progress, n ld.Node) error { Wish(t, n, ShouldEqual, basicnode.NewBool(true)) - Wish(t, prog.Path, ShouldEqual, dms3ld.ParsePath("foo")) + Wish(t, prog.Path, ShouldEqual, ld.ParsePath("foo")) return nil }) Wish(t, err, ShouldEqual, nil) }) t.Run("two step path on map node works", func(t *testing.T) { - err := traversal.Focus(middleMapNode, dms3ld.ParsePath("nested/nonlink"), func(prog traversal.Progress, n dms3ld.Node) error { + err := traversal.Focus(middleMapNode, ld.ParsePath("nested/nonlink"), func(prog traversal.Progress, n ld.Node) error { Wish(t, n, ShouldEqual, basicnode.NewString("zoo")) - Wish(t, prog.Path, ShouldEqual, dms3ld.ParsePath("nested/nonlink")) + Wish(t, prog.Path, ShouldEqual, ld.ParsePath("nested/nonlink")) return nil }) Wish(t, err, ShouldEqual, nil) @@ -98,17 +98,17 @@ func TestFocusSingleTree(t *testing.T) { // same fixtures as the test for Focus; just has fewer assertions, since Get does no progress tracking. func TestGetSingleTree(t *testing.T) { t.Run("empty path on scalar node returns start node", func(t *testing.T) { - n, err := traversal.Get(basicnode.NewString("x"), dms3ld.Path{}) + n, err := traversal.Get(basicnode.NewString("x"), ld.Path{}) Wish(t, err, ShouldEqual, nil) Wish(t, n, ShouldEqual, basicnode.NewString("x")) }) t.Run("one step path on map node works", func(t *testing.T) { - n, err := traversal.Get(middleMapNode, dms3ld.ParsePath("foo")) + n, err := traversal.Get(middleMapNode, ld.ParsePath("foo")) Wish(t, err, ShouldEqual, nil) Wish(t, n, ShouldEqual, basicnode.NewBool(true)) }) t.Run("two step path on map node works", func(t *testing.T) { - n, err := traversal.Get(middleMapNode, dms3ld.ParsePath("nested/nonlink")) + n, err := traversal.Get(middleMapNode, ld.ParsePath("nested/nonlink")) Wish(t, err, ShouldEqual, nil) Wish(t, n, ShouldEqual, basicnode.NewString("zoo")) }) @@ -117,14 +117,14 @@ func TestGetSingleTree(t *testing.T) { func TestFocusWithLinkLoading(t *testing.T) { t.Run("link traversal with no configured loader should fail", func(t *testing.T) { t.Run("terminal link should fail", func(t *testing.T) { - err := traversal.Focus(middleMapNode, dms3ld.ParsePath("nested/alink"), func(prog traversal.Progress, n dms3ld.Node) error { + err := traversal.Focus(middleMapNode, ld.ParsePath("nested/alink"), func(prog traversal.Progress, n ld.Node) error { t.Errorf("should not be reached; no way to load this path") return nil }) Wish(t, err.Error(), ShouldEqual, `error traversing node at "nested/alink": could not load link "`+leafAlphaLnk.String()+`": no LinkTargetNodePrototypeChooser configured`) }) t.Run("mid-path link should fail", func(t *testing.T) { - err := traversal.Focus(rootNode, dms3ld.ParsePath("linkedMap/nested/nonlink"), func(prog traversal.Progress, n dms3ld.Node) error { + err := traversal.Focus(rootNode, ld.ParsePath("linkedMap/nested/nonlink"), func(prog traversal.Progress, n ld.Node) error { t.Errorf("should not be reached; no way to load this path") return nil }) @@ -139,11 +139,11 @@ func TestFocusWithLinkLoading(t *testing.T) { LinkSystem: lsys, LinkTargetNodePrototypeChooser: basicnode.Chooser, }, - }.Focus(rootNode, dms3ld.ParsePath("linkedMap/nested/nonlink"), func(prog traversal.Progress, n dms3ld.Node) error { + }.Focus(rootNode, ld.ParsePath("linkedMap/nested/nonlink"), func(prog traversal.Progress, n ld.Node) error { Wish(t, n, ShouldEqual, basicnode.NewString("zoo")) - Wish(t, prog.Path, ShouldEqual, dms3ld.ParsePath("linkedMap/nested/nonlink")) + Wish(t, prog.Path, ShouldEqual, ld.ParsePath("linkedMap/nested/nonlink")) Wish(t, prog.LastBlock.Link, ShouldEqual, middleMapNodeLnk) - Wish(t, prog.LastBlock.Path, ShouldEqual, dms3ld.ParsePath("linkedMap")) + Wish(t, prog.LastBlock.Path, ShouldEqual, ld.ParsePath("linkedMap")) return nil }) Wish(t, err, ShouldEqual, nil) @@ -153,11 +153,11 @@ func TestFocusWithLinkLoading(t *testing.T) { func TestGetWithLinkLoading(t *testing.T) { t.Run("link traversal with no configured loader should fail", func(t *testing.T) { t.Run("terminal link should fail", func(t *testing.T) { - _, err := traversal.Get(middleMapNode, dms3ld.ParsePath("nested/alink")) + _, err := traversal.Get(middleMapNode, ld.ParsePath("nested/alink")) Wish(t, err.Error(), ShouldEqual, `error traversing node at "nested/alink": could not load link "`+leafAlphaLnk.String()+`": no LinkTargetNodePrototypeChooser configured`) }) t.Run("mid-path link should fail", func(t *testing.T) { - _, err := traversal.Get(rootNode, dms3ld.ParsePath("linkedMap/nested/nonlink")) + _, err := traversal.Get(rootNode, ld.ParsePath("linkedMap/nested/nonlink")) Wish(t, err.Error(), ShouldEqual, `error traversing node at "linkedMap": could not load link "`+middleMapNodeLnk.String()+`": no LinkTargetNodePrototypeChooser configured`) }) }) @@ -169,7 +169,7 @@ func TestGetWithLinkLoading(t *testing.T) { LinkSystem: lsys, LinkTargetNodePrototypeChooser: basicnode.Chooser, }, - }.Get(rootNode, dms3ld.ParsePath("linkedMap/nested/nonlink")) + }.Get(rootNode, ld.ParsePath("linkedMap/nested/nonlink")) Wish(t, err, ShouldEqual, nil) Wish(t, n, ShouldEqual, basicnode.NewString("zoo")) }) @@ -177,7 +177,7 @@ func TestGetWithLinkLoading(t *testing.T) { func TestFocusedTransform(t *testing.T) { t.Run("UpdateMapEntry", func(t *testing.T) { - n, err := traversal.FocusedTransform(rootNode, dms3ld.ParsePath("plain"), func(progress traversal.Progress, prev dms3ld.Node) (dms3ld.Node, error) { + n, err := traversal.FocusedTransform(rootNode, ld.ParsePath("plain"), func(progress traversal.Progress, prev ld.Node) (ld.Node, error) { Wish(t, progress.Path.String(), ShouldEqual, "plain") Wish(t, must.String(prev), ShouldEqual, "olde string") nb := prev.Prototype().NewBuilder() @@ -185,7 +185,7 @@ func TestFocusedTransform(t *testing.T) { return nb.Build(), nil }, false) Wish(t, err, ShouldEqual, nil) - Wish(t, n.Kind(), ShouldEqual, dms3ld.Kind_Map) + Wish(t, n.Kind(), ShouldEqual, ld.Kind_Map) // updated value should be there Wish(t, must.Node(n.LookupByString("plain")), ShouldEqual, basicnode.NewString("new string!")) // everything else should be there @@ -196,13 +196,13 @@ func TestFocusedTransform(t *testing.T) { Wish(t, keys(n), ShouldEqual, []string{"plain", "linkedString", "linkedMap", "linkedList"}) }) t.Run("UpdateDeeperMap", func(t *testing.T) { - n, err := traversal.FocusedTransform(middleMapNode, dms3ld.ParsePath("nested/alink"), func(progress traversal.Progress, prev dms3ld.Node) (dms3ld.Node, error) { + n, err := traversal.FocusedTransform(middleMapNode, ld.ParsePath("nested/alink"), func(progress traversal.Progress, prev ld.Node) (ld.Node, error) { Wish(t, progress.Path.String(), ShouldEqual, "nested/alink") Wish(t, prev, ShouldEqual, basicnode.NewLink(leafAlphaLnk)) return basicnode.NewString("new string!"), nil }, false) Wish(t, err, ShouldEqual, nil) - Wish(t, n.Kind(), ShouldEqual, dms3ld.Kind_Map) + Wish(t, n.Kind(), ShouldEqual, ld.Kind_Map) // updated value should be there Wish(t, must.Node(must.Node(n.LookupByString("nested")).LookupByString("alink")), ShouldEqual, basicnode.NewString("new string!")) // everything else in the parent map should should be there! @@ -212,31 +212,31 @@ func TestFocusedTransform(t *testing.T) { Wish(t, keys(n), ShouldEqual, []string{"foo", "bar", "nested"}) }) t.Run("AppendIfNotExists", func(t *testing.T) { - n, err := traversal.FocusedTransform(rootNode, dms3ld.ParsePath("newpart"), func(progress traversal.Progress, prev dms3ld.Node) (dms3ld.Node, error) { + n, err := traversal.FocusedTransform(rootNode, ld.ParsePath("newpart"), func(progress traversal.Progress, prev ld.Node) (ld.Node, error) { Wish(t, progress.Path.String(), ShouldEqual, "newpart") - Wish(t, prev, ShouldEqual, nil) // REVIEW: should dms3ld.Absent be used here? I lean towards "no" but am unsure what's least surprising here. + Wish(t, prev, ShouldEqual, nil) // REVIEW: should ld.Absent be used here? I lean towards "no" but am unsure what's least surprising here. // An interesting thing to note about inserting a value this way is that you have no `prev.Prototype().NewBuilder()` to use if you wanted to. // But if that's an issue, then what you do is a focus or walk (transforming or not) to the parent node, get its child prototypes, and go from there. return basicnode.NewString("new string!"), nil }, false) Wish(t, err, ShouldEqual, nil) - Wish(t, n.Kind(), ShouldEqual, dms3ld.Kind_Map) + Wish(t, n.Kind(), ShouldEqual, ld.Kind_Map) // updated value should be there Wish(t, must.Node(n.LookupByString("newpart")), ShouldEqual, basicnode.NewString("new string!")) // everything should still be in the same order... with the new entry at the end. Wish(t, keys(n), ShouldEqual, []string{"plain", "linkedString", "linkedMap", "linkedList", "newpart"}) }) t.Run("CreateParents", func(t *testing.T) { - n, err := traversal.FocusedTransform(rootNode, dms3ld.ParsePath("newsection/newpart"), func(progress traversal.Progress, prev dms3ld.Node) (dms3ld.Node, error) { + n, err := traversal.FocusedTransform(rootNode, ld.ParsePath("newsection/newpart"), func(progress traversal.Progress, prev ld.Node) (ld.Node, error) { Wish(t, progress.Path.String(), ShouldEqual, "newsection/newpart") - Wish(t, prev, ShouldEqual, nil) // REVIEW: should dms3ld.Absent be used here? I lean towards "no" but am unsure what's least surprising here. + Wish(t, prev, ShouldEqual, nil) // REVIEW: should ld.Absent be used here? I lean towards "no" but am unsure what's least surprising here. return basicnode.NewString("new string!"), nil }, true) Wish(t, err, ShouldEqual, nil) - Wish(t, n.Kind(), ShouldEqual, dms3ld.Kind_Map) + Wish(t, n.Kind(), ShouldEqual, ld.Kind_Map) // a new map node in the middle should've been created n2 := must.Node(n.LookupByString("newsection")) - Wish(t, n2.Kind(), ShouldEqual, dms3ld.Kind_Map) + Wish(t, n2.Kind(), ShouldEqual, ld.Kind_Map) // updated value should in there Wish(t, must.Node(n2.LookupByString("newpart")), ShouldEqual, basicnode.NewString("new string!")) // everything in the root map should still be in the same order... with the new entry at the end. @@ -245,20 +245,20 @@ func TestFocusedTransform(t *testing.T) { Wish(t, keys(n2), ShouldEqual, []string{"newpart"}) }) t.Run("CreateParentsRequiresPermission", func(t *testing.T) { - _, err := traversal.FocusedTransform(rootNode, dms3ld.ParsePath("newsection/newpart"), func(progress traversal.Progress, prev dms3ld.Node) (dms3ld.Node, error) { + _, err := traversal.FocusedTransform(rootNode, ld.ParsePath("newsection/newpart"), func(progress traversal.Progress, prev ld.Node) (ld.Node, error) { Wish(t, true, ShouldEqual, false) // ought not be reached return nil, nil }, false) Wish(t, err, ShouldEqual, fmt.Errorf("transform: parent position at \"newsection\" did not exist (and createParents was false)")) }) t.Run("UpdateListEntry", func(t *testing.T) { - n, err := traversal.FocusedTransform(middleListNode, dms3ld.ParsePath("2"), func(progress traversal.Progress, prev dms3ld.Node) (dms3ld.Node, error) { + n, err := traversal.FocusedTransform(middleListNode, ld.ParsePath("2"), func(progress traversal.Progress, prev ld.Node) (ld.Node, error) { Wish(t, progress.Path.String(), ShouldEqual, "2") Wish(t, prev, ShouldEqual, basicnode.NewLink(leafBetaLnk)) return basicnode.NewString("new string!"), nil }, false) Wish(t, err, ShouldEqual, nil) - Wish(t, n.Kind(), ShouldEqual, dms3ld.Kind_List) + Wish(t, n.Kind(), ShouldEqual, ld.Kind_List) // updated value should be there Wish(t, must.Node(n.LookupByIndex(2)), ShouldEqual, basicnode.NewString("new string!")) // everything else should be there @@ -268,27 +268,27 @@ func TestFocusedTransform(t *testing.T) { Wish(t, must.Node(n.LookupByIndex(3)), ShouldEqual, basicnode.NewLink(leafAlphaLnk)) }) t.Run("AppendToList", func(t *testing.T) { - n, err := traversal.FocusedTransform(middleListNode, dms3ld.ParsePath("-"), func(progress traversal.Progress, prev dms3ld.Node) (dms3ld.Node, error) { + n, err := traversal.FocusedTransform(middleListNode, ld.ParsePath("-"), func(progress traversal.Progress, prev ld.Node) (ld.Node, error) { Wish(t, progress.Path.String(), ShouldEqual, "4") Wish(t, prev, ShouldEqual, nil) return basicnode.NewString("new string!"), nil }, false) Wish(t, err, ShouldEqual, nil) - Wish(t, n.Kind(), ShouldEqual, dms3ld.Kind_List) + Wish(t, n.Kind(), ShouldEqual, ld.Kind_List) // updated value should be there Wish(t, must.Node(n.LookupByIndex(4)), ShouldEqual, basicnode.NewString("new string!")) // everything else should be there Wish(t, n.Length(), ShouldEqual, int64(5)) }) t.Run("ListBounds", func(t *testing.T) { - _, err := traversal.FocusedTransform(middleListNode, dms3ld.ParsePath("4"), func(progress traversal.Progress, prev dms3ld.Node) (dms3ld.Node, error) { + _, err := traversal.FocusedTransform(middleListNode, ld.ParsePath("4"), func(progress traversal.Progress, prev ld.Node) (ld.Node, error) { Wish(t, true, ShouldEqual, false) // ought not be reached return nil, nil }, false) Wish(t, err, ShouldEqual, fmt.Errorf("transform: cannot navigate path segment \"4\" at \"\" because it is beyond the list bounds")) }) t.Run("ReplaceRoot", func(t *testing.T) { // a fairly degenerate case and no reason to do this, but should work. - n, err := traversal.FocusedTransform(middleListNode, dms3ld.ParsePath(""), func(progress traversal.Progress, prev dms3ld.Node) (dms3ld.Node, error) { + n, err := traversal.FocusedTransform(middleListNode, ld.ParsePath(""), func(progress traversal.Progress, prev ld.Node) (ld.Node, error) { Wish(t, progress.Path.String(), ShouldEqual, "") Wish(t, prev, ShouldEqual, middleListNode) nb := basicnode.Prototype.Any.NewBuilder() @@ -297,7 +297,7 @@ func TestFocusedTransform(t *testing.T) { return nb.Build(), nil }, false) Wish(t, err, ShouldEqual, nil) - Wish(t, n.Kind(), ShouldEqual, dms3ld.Kind_List) + Wish(t, n.Kind(), ShouldEqual, ld.Kind_List) Wish(t, n.Length(), ShouldEqual, int64(0)) }) } @@ -314,7 +314,7 @@ func TestFocusedTransformWithLinks(t *testing.T) { t.Run("UpdateMapBeyondLink", func(t *testing.T) { n, err := traversal.Progress{ Cfg: &cfg, - }.FocusedTransform(rootNode, dms3ld.ParsePath("linkedMap/nested/nonlink"), func(progress traversal.Progress, prev dms3ld.Node) (dms3ld.Node, error) { + }.FocusedTransform(rootNode, ld.ParsePath("linkedMap/nested/nonlink"), func(progress traversal.Progress, prev ld.Node) (ld.Node, error) { Wish(t, progress.Path.String(), ShouldEqual, "linkedMap/nested/nonlink") Wish(t, must.String(prev), ShouldEqual, "zoo") Wish(t, progress.LastBlock.Path.String(), ShouldEqual, "linkedMap") @@ -324,7 +324,7 @@ func TestFocusedTransformWithLinks(t *testing.T) { return nb.Build(), nil }, false) Wish(t, err, ShouldEqual, nil) - Wish(t, n.Kind(), ShouldEqual, dms3ld.Kind_Map) + Wish(t, n.Kind(), ShouldEqual, ld.Kind_Map) // there should be a new object in our new storage! Wish(t, len(store2.Bag), ShouldEqual, 1) // cleanup for next test @@ -334,14 +334,14 @@ func TestFocusedTransformWithLinks(t *testing.T) { // This is replacing a link with a non-link. Doing so shouldn't hit storage. n, err := traversal.Progress{ Cfg: &cfg, - }.FocusedTransform(rootNode, dms3ld.ParsePath("linkedMap"), func(progress traversal.Progress, prev dms3ld.Node) (dms3ld.Node, error) { + }.FocusedTransform(rootNode, ld.ParsePath("linkedMap"), func(progress traversal.Progress, prev ld.Node) (ld.Node, error) { Wish(t, progress.Path.String(), ShouldEqual, "linkedMap") nb := prev.Prototype().NewBuilder() nb.AssignString("new string!") return nb.Build(), nil }, false) Wish(t, err, ShouldEqual, nil) - Wish(t, n.Kind(), ShouldEqual, dms3ld.Kind_Map) + Wish(t, n.Kind(), ShouldEqual, ld.Kind_Map) // there should be no new objects in our new storage! Wish(t, len(store2.Bag), ShouldEqual, 0) // cleanup for next test @@ -351,7 +351,7 @@ func TestFocusedTransformWithLinks(t *testing.T) { // link traverse to scalar // this is unspecifiable using the current path syntax! you'll just end up replacing the link with the scalar! } -func keys(n dms3ld.Node) []string { +func keys(n ld.Node) []string { v := make([]string, 0, n.Length()) for itr := n.MapIterator(); !itr.Done(); { k, _, _ := itr.Next() diff --git a/traversal/select_links.go b/traversal/select_links.go index f054301757ce773bdc948ef3ecf2a938ba63e7f8..0c0a9d21fff2a8b63199f9f120caffc1bc091123 100644 --- a/traversal/select_links.go +++ b/traversal/select_links.go @@ -22,15 +22,15 @@ import ( // If an identical link is found several times during the walk, // it is reported several times in the resulting list; // no deduplication is performed by this method. -func SelectLinks(n dms3ld.Node) ([]dms3ld.Link, error) { - var answer []dms3ld.Link +func SelectLinks(n ld.Node) ([]ld.Link, error) { + var answer []ld.Link err := accumulateLinks(&answer, n) return answer, err } -func accumulateLinks(a *[]dms3ld.Link, n dms3ld.Node) error { +func accumulateLinks(a *[]ld.Link, n ld.Node) error { switch n.Kind() { - case dms3ld.Kind_Map: + case ld.Kind_Map: for itr := n.MapIterator(); !itr.Done(); { _, v, err := itr.Next() if err != nil { @@ -38,7 +38,7 @@ func accumulateLinks(a *[]dms3ld.Link, n dms3ld.Node) error { } accumulateLinks(a, v) } - case dms3ld.Kind_List: + case ld.Kind_List: for itr := n.ListIterator(); !itr.Done(); { _, v, err := itr.Next() if err != nil { @@ -46,7 +46,7 @@ func accumulateLinks(a *[]dms3ld.Link, n dms3ld.Node) error { } accumulateLinks(a, v) } - case dms3ld.Kind_Link: + case ld.Kind_Link: lnk, _ := n.AsLink() *a = append(*a, lnk) } diff --git a/traversal/select_links_test.go b/traversal/select_links_test.go index b9857e4e3b727ad45af8b81a4de2833d7e9edc1f..faacf76e80b97d9b7ba0a427ec3a36428bb244f1 100644 --- a/traversal/select_links_test.go +++ b/traversal/select_links_test.go @@ -5,20 +5,21 @@ import ( . "github.com/warpfork/go-wish" + "gitlab.dms3.io/ld/go-ld-prime" "gitlab.dms3.io/ld/go-ld-prime/traversal" ) func TestSelectLinks(t *testing.T) { t.Run("Scalar", func(t *testing.T) { lnks, _ := traversal.SelectLinks(leafAlpha) - Wish(t, lnks, ShouldEqual, []dms3ld.Link(nil)) + Wish(t, lnks, ShouldEqual, []ld.Link(nil)) }) t.Run("DeepMap", func(t *testing.T) { lnks, _ := traversal.SelectLinks(middleMapNode) - Wish(t, lnks, ShouldEqual, []dms3ld.Link{leafAlphaLnk}) + Wish(t, lnks, ShouldEqual, []ld.Link{leafAlphaLnk}) }) t.Run("List", func(t *testing.T) { lnks, _ := traversal.SelectLinks(rootNode) - Wish(t, lnks, ShouldEqual, []dms3ld.Link{leafAlphaLnk, middleMapNodeLnk, middleListNodeLnk}) + Wish(t, lnks, ShouldEqual, []ld.Link{leafAlphaLnk, middleMapNodeLnk, middleListNodeLnk}) }) } diff --git a/traversal/selector/builder/builder.go b/traversal/selector/builder/builder.go index 148399f71277465033e4318365c8f74353d47baf..1d369047dd83997a97c4f2bfdae9aafda743eb42 100644 --- a/traversal/selector/builder/builder.go +++ b/traversal/selector/builder/builder.go @@ -1,23 +1,23 @@ package builder import ( - dms3ld "gitlab.dms3.io/ld/go-ld-prime" + ld "gitlab.dms3.io/ld/go-ld-prime" "gitlab.dms3.io/ld/go-ld-prime/fluent" selector "gitlab.dms3.io/ld/go-ld-prime/traversal/selector" ) // SelectorSpec is a specification for a selector that can build -// a selector dms3ld.Node or an actual parsed Selector +// a selector ld.Node or an actual parsed Selector type SelectorSpec interface { - Node() dms3ld.Node + Node() ld.Node Selector() (selector.Selector, error) } -// SelectorSpecBuilder is a utility interface to build selector dms3ld nodes +// SelectorSpecBuilder is a utility interface to build selector ld nodes // quickly. // // It serves two purposes: -// 1. Save the user of go-dms3ld-prime time and mental overhead with an easy +// 1. Save the user of go-ld-prime time and mental overhead with an easy // interface for making selector nodes in much less code without having to remember // the selector sigils // 2. Provide a level of protection from selector schema changes, at least in terms @@ -45,14 +45,14 @@ type ExploreFieldsSpecBuilder interface { } type selectorSpecBuilder struct { - np dms3ld.NodePrototype + np ld.NodePrototype } type selectorSpec struct { - n dms3ld.Node + n ld.Node } -func (ss selectorSpec) Node() dms3ld.Node { +func (ss selectorSpec) Node() ld.Node { return ss.n } @@ -61,8 +61,8 @@ func (ss selectorSpec) Selector() (selector.Selector, error) { } // NewSelectorSpecBuilder creates a SelectorSpecBuilder which will store -// data in the format determined by the given dms3ld.NodePrototype. -func NewSelectorSpecBuilder(np dms3ld.NodePrototype) SelectorSpecBuilder { +// data in the format determined by the given ld.NodePrototype. +func NewSelectorSpecBuilder(np ld.NodePrototype) SelectorSpecBuilder { return &selectorSpecBuilder{np} } diff --git a/traversal/selector/exploreAll.go b/traversal/selector/exploreAll.go index 39b09459d7424ae2e9690f1f9b43fc45be0023c7..5f5e7eb9fd4665d728ccea7b40e079daa78e52db 100644 --- a/traversal/selector/exploreAll.go +++ b/traversal/selector/exploreAll.go @@ -3,7 +3,7 @@ package selector import ( "fmt" - dms3ld "gitlab.dms3.io/ld/go-ld-prime" + ld "gitlab.dms3.io/ld/go-ld-prime" ) // ExploreAll is similar to a `*` -- it traverses all elements of an array, @@ -13,23 +13,23 @@ type ExploreAll struct { } // Interests for ExploreAll is nil (meaning traverse everything) -func (s ExploreAll) Interests() []dms3ld.PathSegment { +func (s ExploreAll) Interests() []ld.PathSegment { return nil } // Explore returns the node's selector for all fields -func (s ExploreAll) Explore(n dms3ld.Node, p dms3ld.PathSegment) Selector { +func (s ExploreAll) Explore(n ld.Node, p ld.PathSegment) Selector { return s.next } // Decide always returns false because this is not a matcher -func (s ExploreAll) Decide(n dms3ld.Node) bool { +func (s ExploreAll) Decide(n ld.Node) bool { return false } // ParseExploreAll assembles a Selector from a ExploreAll selector node -func (pc ParseContext) ParseExploreAll(n dms3ld.Node) (Selector, error) { - if n.Kind() != dms3ld.Kind_Map { +func (pc ParseContext) ParseExploreAll(n ld.Node) (Selector, error) { + if n.Kind() != ld.Kind_Map { return nil, fmt.Errorf("selector spec parse rejected: selector body must be a map") } next, err := n.LookupByString(SelectorKey_Next) diff --git a/traversal/selector/exploreFields.go b/traversal/selector/exploreFields.go index 5333cb367ae26583d08a48eca0349cbe9d3bc4f8..e9465d46d0fb83ecca51b355e392a67e6e29f2f2 100644 --- a/traversal/selector/exploreFields.go +++ b/traversal/selector/exploreFields.go @@ -3,7 +3,7 @@ package selector import ( "fmt" - dms3ld "gitlab.dms3.io/ld/go-ld-prime" + ld "gitlab.dms3.io/ld/go-ld-prime" ) // ExploreFields traverses named fields in a map (or equivalently, struct, if @@ -19,41 +19,41 @@ import ( // ExploreIndex or ExploreRange is more appropriate, however, and should be preferred. type ExploreFields struct { selections map[string]Selector - interests []dms3ld.PathSegment // keys of above; already boxed as that's the only way we consume them + interests []ld.PathSegment // keys of above; already boxed as that's the only way we consume them } // Interests for ExploreFields are the fields listed in the selector node -func (s ExploreFields) Interests() []dms3ld.PathSegment { +func (s ExploreFields) Interests() []ld.PathSegment { return s.interests } // Explore returns the selector for the given path if it is a field in // the selector node or nil if not -func (s ExploreFields) Explore(n dms3ld.Node, p dms3ld.PathSegment) Selector { +func (s ExploreFields) Explore(n ld.Node, p ld.PathSegment) Selector { return s.selections[p.String()] } // Decide always returns false because this is not a matcher -func (s ExploreFields) Decide(n dms3ld.Node) bool { +func (s ExploreFields) Decide(n ld.Node) bool { return false } // ParseExploreFields assembles a Selector // from a ExploreFields selector node -func (pc ParseContext) ParseExploreFields(n dms3ld.Node) (Selector, error) { - if n.Kind() != dms3ld.Kind_Map { +func (pc ParseContext) ParseExploreFields(n ld.Node) (Selector, error) { + if n.Kind() != ld.Kind_Map { return nil, fmt.Errorf("selector spec parse rejected: selector body must be a map") } fields, err := n.LookupByString(SelectorKey_Fields) if err != nil { return nil, fmt.Errorf("selector spec parse rejected: fields in ExploreFields selector must be present") } - if fields.Kind() != dms3ld.Kind_Map { + if fields.Kind() != ld.Kind_Map { return nil, fmt.Errorf("selector spec parse rejected: fields in ExploreFields selector must be a map") } x := ExploreFields{ make(map[string]Selector, fields.Length()), - make([]dms3ld.PathSegment, 0, fields.Length()), + make([]ld.PathSegment, 0, fields.Length()), } for itr := fields.MapIterator(); !itr.Done(); { kn, v, err := itr.Next() @@ -62,7 +62,7 @@ func (pc ParseContext) ParseExploreFields(n dms3ld.Node) (Selector, error) { } kstr, _ := kn.AsString() - x.interests = append(x.interests, dms3ld.PathSegmentOfString(kstr)) + x.interests = append(x.interests, ld.PathSegmentOfString(kstr)) x.selections[kstr], err = pc.ParseSelector(v) if err != nil { return nil, err diff --git a/traversal/selector/exploreFields_test.go b/traversal/selector/exploreFields_test.go index b65e5aeea6c1b69d4d1aafee2eec297b54c6c774..2df534fa30573199732d7c8cad4c6a66861e7ed4 100644 --- a/traversal/selector/exploreFields_test.go +++ b/traversal/selector/exploreFields_test.go @@ -6,7 +6,7 @@ import ( . "github.com/warpfork/go-wish" - dms3ld "gitlab.dms3.io/ld/go-ld-prime" + ld "gitlab.dms3.io/ld/go-ld-prime" "gitlab.dms3.io/ld/go-ld-prime/fluent" basicnode "gitlab.dms3.io/ld/go-ld-prime/node/basic" ) @@ -48,6 +48,6 @@ func TestParseExploreFields(t *testing.T) { }) s, err := ParseContext{}.ParseExploreFields(sn) Wish(t, err, ShouldEqual, nil) - Wish(t, s, ShouldEqual, ExploreFields{map[string]Selector{"applesauce": Matcher{}}, []dms3ld.PathSegment{dms3ld.PathSegmentOfString("applesauce")}}) + Wish(t, s, ShouldEqual, ExploreFields{map[string]Selector{"applesauce": Matcher{}}, []ld.PathSegment{ld.PathSegmentOfString("applesauce")}}) }) } diff --git a/traversal/selector/exploreIndex.go b/traversal/selector/exploreIndex.go index 65981d3557b5c70d3a87d0bcfec7d4ce8fda370f..aacabb1d77eb05da9117c19151f26e97b6d94dec 100644 --- a/traversal/selector/exploreIndex.go +++ b/traversal/selector/exploreIndex.go @@ -3,25 +3,25 @@ package selector import ( "fmt" - dms3ld "gitlab.dms3.io/ld/go-ld-prime" + ld "gitlab.dms3.io/ld/go-ld-prime" ) // ExploreIndex traverses a specific index in a list, and applies a next // selector to the reached node. type ExploreIndex struct { - next Selector // selector for element we're interested in - interest [1]dms3ld.PathSegment // index of element we're interested in + next Selector // selector for element we're interested in + interest [1]ld.PathSegment // index of element we're interested in } // Interests for ExploreIndex is just the index specified by the selector node -func (s ExploreIndex) Interests() []dms3ld.PathSegment { +func (s ExploreIndex) Interests() []ld.PathSegment { return s.interest[:] } // Explore returns the node's selector if // the path matches the index for this selector or nil if not -func (s ExploreIndex) Explore(n dms3ld.Node, p dms3ld.PathSegment) Selector { - if n.Kind() != dms3ld.Kind_List { +func (s ExploreIndex) Explore(n ld.Node, p ld.PathSegment) Selector { + if n.Kind() != ld.Kind_List { return nil } expectedIndex, expectedErr := p.Index() @@ -33,14 +33,14 @@ func (s ExploreIndex) Explore(n dms3ld.Node, p dms3ld.PathSegment) Selector { } // Decide always returns false because this is not a matcher -func (s ExploreIndex) Decide(n dms3ld.Node) bool { +func (s ExploreIndex) Decide(n ld.Node) bool { return false } // ParseExploreIndex assembles a Selector // from a ExploreIndex selector node -func (pc ParseContext) ParseExploreIndex(n dms3ld.Node) (Selector, error) { - if n.Kind() != dms3ld.Kind_Map { +func (pc ParseContext) ParseExploreIndex(n ld.Node) (Selector, error) { + if n.Kind() != ld.Kind_Map { return nil, fmt.Errorf("selector spec parse rejected: selector body must be a map") } indexNode, err := n.LookupByString(SelectorKey_Index) @@ -59,5 +59,5 @@ func (pc ParseContext) ParseExploreIndex(n dms3ld.Node) (Selector, error) { if err != nil { return nil, err } - return ExploreIndex{selector, [1]dms3ld.PathSegment{dms3ld.PathSegmentOfInt(indexValue)}}, nil + return ExploreIndex{selector, [1]ld.PathSegment{ld.PathSegmentOfInt(indexValue)}}, nil } diff --git a/traversal/selector/exploreIndex_test.go b/traversal/selector/exploreIndex_test.go index 23401217c0dc7fb38ef66d3a69a36ab571ee68f0..38aadccc4844afa4e625958fdb9de166906836ce 100644 --- a/traversal/selector/exploreIndex_test.go +++ b/traversal/selector/exploreIndex_test.go @@ -6,7 +6,7 @@ import ( . "github.com/warpfork/go-wish" - dms3ld "gitlab.dms3.io/ld/go-ld-prime" + ld "gitlab.dms3.io/ld/go-ld-prime" "gitlab.dms3.io/ld/go-ld-prime/fluent" basicnode "gitlab.dms3.io/ld/go-ld-prime/node/basic" ) @@ -60,15 +60,15 @@ func TestParseExploreIndex(t *testing.T) { }) s, err := ParseContext{}.ParseExploreIndex(sn) Wish(t, err, ShouldEqual, nil) - Wish(t, s, ShouldEqual, ExploreIndex{Matcher{}, [1]dms3ld.PathSegment{dms3ld.PathSegmentOfInt(2)}}) + Wish(t, s, ShouldEqual, ExploreIndex{Matcher{}, [1]ld.PathSegment{ld.PathSegmentOfInt(2)}}) }) } func TestExploreIndexExplore(t *testing.T) { - s := ExploreIndex{Matcher{}, [1]dms3ld.PathSegment{dms3ld.PathSegmentOfInt(3)}} + s := ExploreIndex{Matcher{}, [1]ld.PathSegment{ld.PathSegmentOfInt(3)}} t.Run("exploring should return nil unless node is a list", func(t *testing.T) { n := fluent.MustBuildMap(basicnode.Prototype__Map{}, 0, func(na fluent.MapAssembler) {}) - returnedSelector := s.Explore(n, dms3ld.PathSegmentOfInt(3)) + returnedSelector := s.Explore(n, ld.PathSegmentOfInt(3)) Wish(t, returnedSelector, ShouldEqual, nil) }) n := fluent.MustBuildList(basicnode.Prototype__List{}, 4, func(na fluent.ListAssembler) { @@ -78,15 +78,15 @@ func TestExploreIndexExplore(t *testing.T) { na.AssembleValue().AssignInt(3) }) t.Run("exploring should return nil when given a path segment with a different index", func(t *testing.T) { - returnedSelector := s.Explore(n, dms3ld.PathSegmentOfInt(2)) + returnedSelector := s.Explore(n, ld.PathSegmentOfInt(2)) Wish(t, returnedSelector, ShouldEqual, nil) }) t.Run("exploring should return nil when given a path segment that isn't an index", func(t *testing.T) { - returnedSelector := s.Explore(n, dms3ld.PathSegmentOfString("cheese")) + returnedSelector := s.Explore(n, ld.PathSegmentOfString("cheese")) Wish(t, returnedSelector, ShouldEqual, nil) }) t.Run("exploring should return the next selector when given a path segment with the right index", func(t *testing.T) { - returnedSelector := s.Explore(n, dms3ld.PathSegmentOfInt(3)) + returnedSelector := s.Explore(n, ld.PathSegmentOfInt(3)) Wish(t, returnedSelector, ShouldEqual, Matcher{}) }) } diff --git a/traversal/selector/exploreRange.go b/traversal/selector/exploreRange.go index 44ea90cede7d36bfc7b5afb34d3ef02537743225..f078efe33e7f5a69fd6d86f6299f81534b104c99 100644 --- a/traversal/selector/exploreRange.go +++ b/traversal/selector/exploreRange.go @@ -3,7 +3,7 @@ package selector import ( "fmt" - dms3ld "gitlab.dms3.io/ld/go-ld-prime" + ld "gitlab.dms3.io/ld/go-ld-prime" ) // ExploreRange traverses a list, and for each element in the range specified, @@ -12,18 +12,18 @@ type ExploreRange struct { next Selector // selector for element we're interested in start int64 end int64 - interest []dms3ld.PathSegment // index of element we're interested in + interest []ld.PathSegment // index of element we're interested in } // Interests for ExploreRange are all path segments within the iteration range -func (s ExploreRange) Interests() []dms3ld.PathSegment { +func (s ExploreRange) Interests() []ld.PathSegment { return s.interest } // Explore returns the node's selector if // the path matches an index in the range of this selector -func (s ExploreRange) Explore(n dms3ld.Node, p dms3ld.PathSegment) Selector { - if n.Kind() != dms3ld.Kind_List { +func (s ExploreRange) Explore(n ld.Node, p ld.PathSegment) Selector { + if n.Kind() != ld.Kind_List { return nil } index, err := p.Index() @@ -37,14 +37,14 @@ func (s ExploreRange) Explore(n dms3ld.Node, p dms3ld.PathSegment) Selector { } // Decide always returns false because this is not a matcher -func (s ExploreRange) Decide(n dms3ld.Node) bool { +func (s ExploreRange) Decide(n ld.Node) bool { return false } // ParseExploreRange assembles a Selector // from a ExploreRange selector node -func (pc ParseContext) ParseExploreRange(n dms3ld.Node) (Selector, error) { - if n.Kind() != dms3ld.Kind_Map { +func (pc ParseContext) ParseExploreRange(n ld.Node) (Selector, error) { + if n.Kind() != ld.Kind_Map { return nil, fmt.Errorf("selector spec parse rejected: selector body must be a map") } startNode, err := n.LookupByString(SelectorKey_Start) @@ -78,10 +78,10 @@ func (pc ParseContext) ParseExploreRange(n dms3ld.Node) (Selector, error) { selector, startValue, endValue, - make([]dms3ld.PathSegment, 0, endValue-startValue), + make([]ld.PathSegment, 0, endValue-startValue), } for i := startValue; i < endValue; i++ { - x.interest = append(x.interest, dms3ld.PathSegmentOfInt(i)) + x.interest = append(x.interest, ld.PathSegmentOfInt(i)) } return x, nil } diff --git a/traversal/selector/exploreRange_test.go b/traversal/selector/exploreRange_test.go index 8777b5cc7ce41f56c5e618a4656229c0f9857bca..5ee025924a6570cf6f53f51320c97b7b8abf927d 100644 --- a/traversal/selector/exploreRange_test.go +++ b/traversal/selector/exploreRange_test.go @@ -6,7 +6,7 @@ import ( . "github.com/warpfork/go-wish" - dms3ld "gitlab.dms3.io/ld/go-ld-prime" + ld "gitlab.dms3.io/ld/go-ld-prime" "gitlab.dms3.io/ld/go-ld-prime/fluent" basicnode "gitlab.dms3.io/ld/go-ld-prime/node/basic" ) @@ -98,15 +98,15 @@ func TestParseExploreRange(t *testing.T) { }) s, err := ParseContext{}.ParseExploreRange(sn) Wish(t, err, ShouldEqual, nil) - Wish(t, s, ShouldEqual, ExploreRange{Matcher{}, 2, 3, []dms3ld.PathSegment{dms3ld.PathSegmentOfInt(2)}}) + Wish(t, s, ShouldEqual, ExploreRange{Matcher{}, 2, 3, []ld.PathSegment{ld.PathSegmentOfInt(2)}}) }) } func TestExploreRangeExplore(t *testing.T) { - s := ExploreRange{Matcher{}, 3, 4, []dms3ld.PathSegment{dms3ld.PathSegmentOfInt(3)}} + s := ExploreRange{Matcher{}, 3, 4, []ld.PathSegment{ld.PathSegmentOfInt(3)}} t.Run("exploring should return nil unless node is a list", func(t *testing.T) { n := fluent.MustBuildMap(basicnode.Prototype__Map{}, 0, func(na fluent.MapAssembler) {}) - returnedSelector := s.Explore(n, dms3ld.PathSegmentOfInt(3)) + returnedSelector := s.Explore(n, ld.PathSegmentOfInt(3)) Wish(t, returnedSelector, ShouldEqual, nil) }) n := fluent.MustBuildList(basicnode.Prototype__List{}, 4, func(na fluent.ListAssembler) { @@ -116,15 +116,15 @@ func TestExploreRangeExplore(t *testing.T) { na.AssembleValue().AssignInt(3) }) t.Run("exploring should return nil when given a path segment out of range", func(t *testing.T) { - returnedSelector := s.Explore(n, dms3ld.PathSegmentOfInt(2)) + returnedSelector := s.Explore(n, ld.PathSegmentOfInt(2)) Wish(t, returnedSelector, ShouldEqual, nil) }) t.Run("exploring should return nil when given a path segment that isn't an index", func(t *testing.T) { - returnedSelector := s.Explore(n, dms3ld.PathSegmentOfString("cheese")) + returnedSelector := s.Explore(n, ld.PathSegmentOfString("cheese")) Wish(t, returnedSelector, ShouldEqual, nil) }) t.Run("exploring should return the next selector when given a path segment with index in range", func(t *testing.T) { - returnedSelector := s.Explore(n, dms3ld.PathSegmentOfInt(3)) + returnedSelector := s.Explore(n, ld.PathSegmentOfInt(3)) Wish(t, returnedSelector, ShouldEqual, Matcher{}) }) } diff --git a/traversal/selector/exploreRecursive.go b/traversal/selector/exploreRecursive.go index b2f56778895ac30431b7ec7e26506a780846c657..1e7bf352faa375eee685a0f6e959260fffc6aa22 100644 --- a/traversal/selector/exploreRecursive.go +++ b/traversal/selector/exploreRecursive.go @@ -3,7 +3,7 @@ package selector import ( "fmt" - dms3ld "gitlab.dms3.io/ld/go-ld-prime" + ld "gitlab.dms3.io/ld/go-ld-prime" ) // ExploreRecursive traverses some structure recursively. @@ -80,12 +80,12 @@ func RecursionLimitNone() RecursionLimit { } // Interests for ExploreRecursive is empty (meaning traverse everything) -func (s ExploreRecursive) Interests() []dms3ld.PathSegment { +func (s ExploreRecursive) Interests() []ld.PathSegment { return s.current.Interests() } // Explore returns the node's selector for all fields -func (s ExploreRecursive) Explore(n dms3ld.Node, p dms3ld.PathSegment) Selector { +func (s ExploreRecursive) Explore(n ld.Node, p ld.PathSegment) Selector { nextSelector := s.current.Explore(n, p) limit := s.limit @@ -150,7 +150,7 @@ func (s ExploreRecursive) replaceRecursiveEdge(nextSelector Selector, replacemen } // Decide always returns false because this is not a matcher -func (s ExploreRecursive) Decide(n dms3ld.Node) bool { +func (s ExploreRecursive) Decide(n ld.Node) bool { return s.current.Decide(n) } @@ -167,8 +167,8 @@ func (erc *exploreRecursiveContext) Link(s Selector) bool { } // ParseExploreRecursive assembles a Selector from a ExploreRecursive selector node -func (pc ParseContext) ParseExploreRecursive(n dms3ld.Node) (Selector, error) { - if n.Kind() != dms3ld.Kind_Map { +func (pc ParseContext) ParseExploreRecursive(n ld.Node) (Selector, error) { + if n.Kind() != ld.Kind_Map { return nil, fmt.Errorf("selector spec parse rejected: selector body must be a map") } @@ -195,8 +195,8 @@ func (pc ParseContext) ParseExploreRecursive(n dms3ld.Node) (Selector, error) { return ExploreRecursive{selector, selector, limit}, nil } -func parseLimit(n dms3ld.Node) (RecursionLimit, error) { - if n.Kind() != dms3ld.Kind_Map { +func parseLimit(n ld.Node) (RecursionLimit, error) { + if n.Kind() != ld.Kind_Map { return RecursionLimit{}, fmt.Errorf("selector spec parse rejected: limit in ExploreRecursive is a keyed union and thus must be a map") } if n.Length() != 1 { diff --git a/traversal/selector/exploreRecursiveEdge.go b/traversal/selector/exploreRecursiveEdge.go index 277d920c01ddba10d99f2041a2748665fc807044..455fa0bfd96d33ebf1c2afc124df4a26966d0f1b 100644 --- a/traversal/selector/exploreRecursiveEdge.go +++ b/traversal/selector/exploreRecursiveEdge.go @@ -3,7 +3,7 @@ package selector import ( "fmt" - dms3ld "gitlab.dms3.io/ld/go-ld-prime" + ld "gitlab.dms3.io/ld/go-ld-prime" ) // ExploreRecursiveEdge is a special sentinel value which is used to mark @@ -17,24 +17,24 @@ import ( type ExploreRecursiveEdge struct{} // Interests should ultimately never get called for an ExploreRecursiveEdge selector -func (s ExploreRecursiveEdge) Interests() []dms3ld.PathSegment { +func (s ExploreRecursiveEdge) Interests() []ld.PathSegment { panic("Traversed Explore Recursive Edge Node With No Parent") } // Explore should ultimately never get called for an ExploreRecursiveEdge selector -func (s ExploreRecursiveEdge) Explore(n dms3ld.Node, p dms3ld.PathSegment) Selector { +func (s ExploreRecursiveEdge) Explore(n ld.Node, p ld.PathSegment) Selector { panic("Traversed Explore Recursive Edge Node With No Parent") } // Decide should ultimately never get called for an ExploreRecursiveEdge selector -func (s ExploreRecursiveEdge) Decide(n dms3ld.Node) bool { +func (s ExploreRecursiveEdge) Decide(n ld.Node) bool { panic("Traversed Explore Recursive Edge Node With No Parent") } // ParseExploreRecursiveEdge assembles a Selector // from a exploreRecursiveEdge selector node -func (pc ParseContext) ParseExploreRecursiveEdge(n dms3ld.Node) (Selector, error) { - if n.Kind() != dms3ld.Kind_Map { +func (pc ParseContext) ParseExploreRecursiveEdge(n ld.Node) (Selector, error) { + if n.Kind() != ld.Kind_Map { return nil, fmt.Errorf("selector spec parse rejected: selector body must be a map") } s := ExploreRecursiveEdge{} diff --git a/traversal/selector/exploreRecursive_test.go b/traversal/selector/exploreRecursive_test.go index a5228c67a69cad407e20fe12a31e372bbe5603eb..fa942a4aaa32439e4fb6c69408ccc544fc1e790f 100644 --- a/traversal/selector/exploreRecursive_test.go +++ b/traversal/selector/exploreRecursive_test.go @@ -7,7 +7,7 @@ import ( . "github.com/warpfork/go-wish" - dms3ld "gitlab.dms3.io/ld/go-ld-prime" + ld "gitlab.dms3.io/ld/go-ld-prime" "gitlab.dms3.io/ld/go-ld-prime/codec/dagjson" "gitlab.dms3.io/ld/go-ld-prime/fluent" basicnode "gitlab.dms3.io/ld/go-ld-prime/node/basic" @@ -180,7 +180,7 @@ func TestExploreRecursiveExplore(t *testing.T) { var rs Selector t.Run("exploring should traverse until we get to maxDepth", func(t *testing.T) { parentsSelector := ExploreAll{recursiveEdge} - subTree := ExploreFields{map[string]Selector{"Parents": parentsSelector}, []dms3ld.PathSegment{dms3ld.PathSegmentOfString("Parents")}} + subTree := ExploreFields{map[string]Selector{"Parents": parentsSelector}, []ld.PathSegment{ld.PathSegmentOfString("Parents")}} rs = ExploreRecursive{subTree, subTree, RecursionLimit{RecursionLimit_Depth, maxDepth}} nodeString := `{ "Parents": [ @@ -202,28 +202,28 @@ func TestExploreRecursiveExplore(t *testing.T) { err := dagjson.Decode(nb, strings.NewReader(nodeString)) Wish(t, err, ShouldEqual, nil) rn := nb.Build() - rs = rs.Explore(rn, dms3ld.PathSegmentOfString("Parents")) + rs = rs.Explore(rn, ld.PathSegmentOfString("Parents")) rn, err = rn.LookupByString("Parents") Wish(t, rs, ShouldEqual, ExploreRecursive{subTree, parentsSelector, RecursionLimit{RecursionLimit_Depth, maxDepth}}) Wish(t, err, ShouldEqual, nil) - rs = rs.Explore(rn, dms3ld.PathSegmentOfInt(0)) + rs = rs.Explore(rn, ld.PathSegmentOfInt(0)) rn, err = rn.LookupByIndex(0) Wish(t, rs, ShouldEqual, ExploreRecursive{subTree, subTree, RecursionLimit{RecursionLimit_Depth, maxDepth - 1}}) Wish(t, err, ShouldEqual, nil) - rs = rs.Explore(rn, dms3ld.PathSegmentOfString("Parents")) + rs = rs.Explore(rn, ld.PathSegmentOfString("Parents")) rn, err = rn.LookupByString("Parents") Wish(t, rs, ShouldEqual, ExploreRecursive{subTree, parentsSelector, RecursionLimit{RecursionLimit_Depth, maxDepth - 1}}) Wish(t, err, ShouldEqual, nil) - rs = rs.Explore(rn, dms3ld.PathSegmentOfInt(0)) + rs = rs.Explore(rn, ld.PathSegmentOfInt(0)) rn, err = rn.LookupByIndex(0) Wish(t, rs, ShouldEqual, ExploreRecursive{subTree, subTree, RecursionLimit{RecursionLimit_Depth, maxDepth - 2}}) Wish(t, err, ShouldEqual, nil) - rs = rs.Explore(rn, dms3ld.PathSegmentOfString("Parents")) + rs = rs.Explore(rn, ld.PathSegmentOfString("Parents")) rn, err = rn.LookupByString("Parents") Wish(t, rs, ShouldEqual, ExploreRecursive{subTree, parentsSelector, RecursionLimit{RecursionLimit_Depth, maxDepth - 2}}) Wish(t, err, ShouldEqual, nil) - rs = rs.Explore(rn, dms3ld.PathSegmentOfInt(0)) + rs = rs.Explore(rn, ld.PathSegmentOfInt(0)) rn, err = rn.LookupByIndex(0) Wish(t, rs, ShouldEqual, nil) Wish(t, err, ShouldEqual, nil) @@ -231,7 +231,7 @@ func TestExploreRecursiveExplore(t *testing.T) { t.Run("exploring should traverse indefinitely if no depth specified", func(t *testing.T) { parentsSelector := ExploreAll{recursiveEdge} - subTree := ExploreFields{map[string]Selector{"Parents": parentsSelector}, []dms3ld.PathSegment{dms3ld.PathSegmentOfString("Parents")}} + subTree := ExploreFields{map[string]Selector{"Parents": parentsSelector}, []ld.PathSegment{ld.PathSegmentOfString("Parents")}} rs = ExploreRecursive{subTree, subTree, RecursionLimit{RecursionLimit_None, 0}} nodeString := `{ "Parents": [ @@ -253,39 +253,39 @@ func TestExploreRecursiveExplore(t *testing.T) { err := dagjson.Decode(nb, strings.NewReader(nodeString)) Wish(t, err, ShouldEqual, nil) rn := nb.Build() - rs = rs.Explore(rn, dms3ld.PathSegmentOfString("Parents")) + rs = rs.Explore(rn, ld.PathSegmentOfString("Parents")) rn, err = rn.LookupByString("Parents") Wish(t, rs, ShouldEqual, ExploreRecursive{subTree, parentsSelector, RecursionLimit{RecursionLimit_None, 0}}) Wish(t, err, ShouldEqual, nil) - rs = rs.Explore(rn, dms3ld.PathSegmentOfInt(0)) + rs = rs.Explore(rn, ld.PathSegmentOfInt(0)) rn, err = rn.LookupByIndex(0) Wish(t, rs, ShouldEqual, ExploreRecursive{subTree, subTree, RecursionLimit{RecursionLimit_None, 0}}) Wish(t, err, ShouldEqual, nil) - rs = rs.Explore(rn, dms3ld.PathSegmentOfString("Parents")) + rs = rs.Explore(rn, ld.PathSegmentOfString("Parents")) rn, err = rn.LookupByString("Parents") Wish(t, rs, ShouldEqual, ExploreRecursive{subTree, parentsSelector, RecursionLimit{RecursionLimit_None, 0}}) Wish(t, err, ShouldEqual, nil) - rs = rs.Explore(rn, dms3ld.PathSegmentOfInt(0)) + rs = rs.Explore(rn, ld.PathSegmentOfInt(0)) rn, err = rn.LookupByIndex(0) Wish(t, rs, ShouldEqual, ExploreRecursive{subTree, subTree, RecursionLimit{RecursionLimit_None, 0}}) Wish(t, err, ShouldEqual, nil) - rs = rs.Explore(rn, dms3ld.PathSegmentOfString("Parents")) + rs = rs.Explore(rn, ld.PathSegmentOfString("Parents")) rn, err = rn.LookupByString("Parents") Wish(t, rs, ShouldEqual, ExploreRecursive{subTree, parentsSelector, RecursionLimit{RecursionLimit_None, 0}}) Wish(t, err, ShouldEqual, nil) - rs = rs.Explore(rn, dms3ld.PathSegmentOfInt(0)) + rs = rs.Explore(rn, ld.PathSegmentOfInt(0)) rn, err = rn.LookupByIndex(0) Wish(t, rs, ShouldEqual, ExploreRecursive{subTree, subTree, RecursionLimit{RecursionLimit_None, 0}}) Wish(t, err, ShouldEqual, nil) - rs = rs.Explore(rn, dms3ld.PathSegmentOfString("Parents")) + rs = rs.Explore(rn, ld.PathSegmentOfString("Parents")) rn, err = rn.LookupByString("Parents") Wish(t, rs, ShouldEqual, ExploreRecursive{subTree, parentsSelector, RecursionLimit{RecursionLimit_None, 0}}) Wish(t, err, ShouldEqual, nil) }) t.Run("exploring should continue till we get to selector that returns nil on explore", func(t *testing.T) { - parentsSelector := ExploreIndex{recursiveEdge, [1]dms3ld.PathSegment{dms3ld.PathSegmentOfInt(1)}} - subTree := ExploreFields{map[string]Selector{"Parents": parentsSelector}, []dms3ld.PathSegment{dms3ld.PathSegmentOfString("Parents")}} + parentsSelector := ExploreIndex{recursiveEdge, [1]ld.PathSegment{ld.PathSegmentOfInt(1)}} + subTree := ExploreFields{map[string]Selector{"Parents": parentsSelector}, []ld.PathSegment{ld.PathSegmentOfString("Parents")}} rs = ExploreRecursive{subTree, subTree, RecursionLimit{RecursionLimit_Depth, maxDepth}} nodeString := `{ "Parents": { @@ -296,11 +296,11 @@ func TestExploreRecursiveExplore(t *testing.T) { err := dagjson.Decode(nb, strings.NewReader(nodeString)) Wish(t, err, ShouldEqual, nil) rn := nb.Build() - rs = rs.Explore(rn, dms3ld.PathSegmentOfString("Parents")) + rs = rs.Explore(rn, ld.PathSegmentOfString("Parents")) rn, err = rn.LookupByString("Parents") Wish(t, rs, ShouldEqual, ExploreRecursive{subTree, parentsSelector, RecursionLimit{RecursionLimit_Depth, maxDepth}}) Wish(t, err, ShouldEqual, nil) - rs = rs.Explore(rn, dms3ld.PathSegmentOfInt(0)) + rs = rs.Explore(rn, ld.PathSegmentOfInt(0)) Wish(t, rs, ShouldEqual, nil) }) t.Run("exploring should work when there is nested recursion", func(t *testing.T) { @@ -309,9 +309,9 @@ func TestExploreRecursiveExplore(t *testing.T) { subTree := ExploreFields{map[string]Selector{ "Parents": parentsSelector, "Side": ExploreRecursive{sideSelector, sideSelector, RecursionLimit{RecursionLimit_Depth, maxDepth}}, - }, []dms3ld.PathSegment{ - dms3ld.PathSegmentOfString("Parents"), - dms3ld.PathSegmentOfString("Side"), + }, []ld.PathSegment{ + ld.PathSegmentOfString("Parents"), + ld.PathSegmentOfString("Side"), }, } s := ExploreRecursive{subTree, subTree, RecursionLimit{RecursionLimit_Depth, maxDepth}} @@ -345,15 +345,15 @@ func TestExploreRecursiveExplore(t *testing.T) { // traverse down Parent nodes rn := n rs = s - rs = rs.Explore(rn, dms3ld.PathSegmentOfString("Parents")) + rs = rs.Explore(rn, ld.PathSegmentOfString("Parents")) rn, err = rn.LookupByString("Parents") Wish(t, rs, ShouldEqual, ExploreRecursive{subTree, parentsSelector, RecursionLimit{RecursionLimit_Depth, maxDepth}}) Wish(t, err, ShouldEqual, nil) - rs = rs.Explore(rn, dms3ld.PathSegmentOfInt(0)) + rs = rs.Explore(rn, ld.PathSegmentOfInt(0)) rn, err = rn.LookupByIndex(0) Wish(t, rs, ShouldEqual, ExploreRecursive{subTree, subTree, RecursionLimit{RecursionLimit_Depth, maxDepth - 1}}) Wish(t, err, ShouldEqual, nil) - rs = rs.Explore(rn, dms3ld.PathSegmentOfString("Parents")) + rs = rs.Explore(rn, ld.PathSegmentOfString("Parents")) rn, err = rn.LookupByString("Parents") Wish(t, rs, ShouldEqual, ExploreRecursive{subTree, parentsSelector, RecursionLimit{RecursionLimit_Depth, maxDepth - 1}}) Wish(t, err, ShouldEqual, nil) @@ -361,19 +361,19 @@ func TestExploreRecursiveExplore(t *testing.T) { // traverse down top level Side tree (nested recursion) rn = n rs = s - rs = rs.Explore(rn, dms3ld.PathSegmentOfString("Side")) + rs = rs.Explore(rn, ld.PathSegmentOfString("Side")) rn, err = rn.LookupByString("Side") Wish(t, rs, ShouldEqual, ExploreRecursive{subTree, ExploreRecursive{sideSelector, sideSelector, RecursionLimit{RecursionLimit_Depth, maxDepth}}, RecursionLimit{RecursionLimit_Depth, maxDepth}}) Wish(t, err, ShouldEqual, nil) - rs = rs.Explore(rn, dms3ld.PathSegmentOfString("real")) + rs = rs.Explore(rn, ld.PathSegmentOfString("real")) rn, err = rn.LookupByString("real") Wish(t, rs, ShouldEqual, ExploreRecursive{subTree, ExploreRecursive{sideSelector, sideSelector, RecursionLimit{RecursionLimit_Depth, maxDepth - 1}}, RecursionLimit{RecursionLimit_Depth, maxDepth}}) Wish(t, err, ShouldEqual, nil) - rs = rs.Explore(rn, dms3ld.PathSegmentOfString("apple")) + rs = rs.Explore(rn, ld.PathSegmentOfString("apple")) rn, err = rn.LookupByString("apple") Wish(t, rs, ShouldEqual, ExploreRecursive{subTree, ExploreRecursive{sideSelector, sideSelector, RecursionLimit{RecursionLimit_Depth, maxDepth - 2}}, RecursionLimit{RecursionLimit_Depth, maxDepth}}) Wish(t, err, ShouldEqual, nil) - rs = rs.Explore(rn, dms3ld.PathSegmentOfString("sauce")) + rs = rs.Explore(rn, ld.PathSegmentOfString("sauce")) rn, err = rn.LookupByString("sauce") Wish(t, rs, ShouldEqual, nil) Wish(t, err, ShouldEqual, nil) @@ -381,30 +381,30 @@ func TestExploreRecursiveExplore(t *testing.T) { // traverse once down Parent (top level recursion) then down Side tree (nested recursion) rn = n rs = s - rs = rs.Explore(rn, dms3ld.PathSegmentOfString("Parents")) + rs = rs.Explore(rn, ld.PathSegmentOfString("Parents")) rn, err = rn.LookupByString("Parents") Wish(t, rs, ShouldEqual, ExploreRecursive{subTree, parentsSelector, RecursionLimit{RecursionLimit_Depth, maxDepth}}) Wish(t, err, ShouldEqual, nil) - rs = rs.Explore(rn, dms3ld.PathSegmentOfInt(0)) + rs = rs.Explore(rn, ld.PathSegmentOfInt(0)) rn, err = rn.LookupByIndex(0) Wish(t, rs, ShouldEqual, ExploreRecursive{subTree, subTree, RecursionLimit{RecursionLimit_Depth, maxDepth - 1}}) Wish(t, err, ShouldEqual, nil) - rs = rs.Explore(rn, dms3ld.PathSegmentOfString("Side")) + rs = rs.Explore(rn, ld.PathSegmentOfString("Side")) rn, err = rn.LookupByString("Side") Wish(t, rs, ShouldEqual, ExploreRecursive{subTree, ExploreRecursive{sideSelector, sideSelector, RecursionLimit{RecursionLimit_Depth, maxDepth}}, RecursionLimit{RecursionLimit_Depth, maxDepth - 1}}) Wish(t, err, ShouldEqual, nil) - rs = rs.Explore(rn, dms3ld.PathSegmentOfString("cheese")) + rs = rs.Explore(rn, ld.PathSegmentOfString("cheese")) rn, err = rn.LookupByString("cheese") Wish(t, rs, ShouldEqual, ExploreRecursive{subTree, ExploreRecursive{sideSelector, sideSelector, RecursionLimit{RecursionLimit_Depth, maxDepth - 1}}, RecursionLimit{RecursionLimit_Depth, maxDepth - 1}}) Wish(t, err, ShouldEqual, nil) - rs = rs.Explore(rn, dms3ld.PathSegmentOfString("whiz")) + rs = rs.Explore(rn, ld.PathSegmentOfString("whiz")) rn, err = rn.LookupByString("whiz") Wish(t, rs, ShouldEqual, ExploreRecursive{subTree, ExploreRecursive{sideSelector, sideSelector, RecursionLimit{RecursionLimit_Depth, maxDepth - 2}}, RecursionLimit{RecursionLimit_Depth, maxDepth - 1}}) Wish(t, err, ShouldEqual, nil) }) t.Run("exploring should work with explore union and recursion", func(t *testing.T) { - parentsSelector := ExploreUnion{[]Selector{ExploreAll{Matcher{}}, ExploreIndex{recursiveEdge, [1]dms3ld.PathSegment{dms3ld.PathSegmentOfInt(0)}}}} - subTree := ExploreFields{map[string]Selector{"Parents": parentsSelector}, []dms3ld.PathSegment{dms3ld.PathSegmentOfString("Parents")}} + parentsSelector := ExploreUnion{[]Selector{ExploreAll{Matcher{}}, ExploreIndex{recursiveEdge, [1]ld.PathSegment{ld.PathSegmentOfInt(0)}}}} + subTree := ExploreFields{map[string]Selector{"Parents": parentsSelector}, []ld.PathSegment{ld.PathSegmentOfString("Parents")}} rs = ExploreRecursive{subTree, subTree, RecursionLimit{RecursionLimit_Depth, maxDepth}} nodeString := `{ "Parents": [ @@ -426,20 +426,20 @@ func TestExploreRecursiveExplore(t *testing.T) { err := dagjson.Decode(nb, strings.NewReader(nodeString)) Wish(t, err, ShouldEqual, nil) rn := nb.Build() - rs = rs.Explore(rn, dms3ld.PathSegmentOfString("Parents")) + rs = rs.Explore(rn, ld.PathSegmentOfString("Parents")) rn, err = rn.LookupByString("Parents") Wish(t, rs, ShouldEqual, ExploreRecursive{subTree, parentsSelector, RecursionLimit{RecursionLimit_Depth, maxDepth}}) Wish(t, err, ShouldEqual, nil) - rs = rs.Explore(rn, dms3ld.PathSegmentOfInt(0)) + rs = rs.Explore(rn, ld.PathSegmentOfInt(0)) rn, err = rn.LookupByIndex(0) Wish(t, rs, ShouldEqual, ExploreRecursive{subTree, ExploreUnion{[]Selector{Matcher{}, subTree}}, RecursionLimit{RecursionLimit_Depth, maxDepth - 1}}) Wish(t, err, ShouldEqual, nil) - rs = rs.Explore(rn, dms3ld.PathSegmentOfString("Parents")) + rs = rs.Explore(rn, ld.PathSegmentOfString("Parents")) rn, err = rn.LookupByString("Parents") Wish(t, rs, ShouldEqual, ExploreRecursive{subTree, parentsSelector, RecursionLimit{RecursionLimit_Depth, maxDepth - 1}}) Wish(t, err, ShouldEqual, nil) - rs = rs.Explore(rn, dms3ld.PathSegmentOfInt(0)) + rs = rs.Explore(rn, ld.PathSegmentOfInt(0)) rn, err = rn.LookupByIndex(0) Wish(t, rs, ShouldEqual, ExploreRecursive{subTree, ExploreUnion{[]Selector{Matcher{}, subTree}}, RecursionLimit{RecursionLimit_Depth, maxDepth - 2}}) Wish(t, err, ShouldEqual, nil) diff --git a/traversal/selector/exploreUnion.go b/traversal/selector/exploreUnion.go index 6ae76904fc0dc4f12c9ee0ff38a215e1cd665a23..cfcedcb53ca4bdc896d332843b18854f8f0e6a5b 100644 --- a/traversal/selector/exploreUnion.go +++ b/traversal/selector/exploreUnion.go @@ -3,7 +3,7 @@ package selector import ( "fmt" - dms3ld "gitlab.dms3.io/ld/go-ld-prime" + ld "gitlab.dms3.io/ld/go-ld-prime" ) // ExploreUnion allows selection to continue with two or more distinct selectors @@ -20,7 +20,7 @@ type ExploreUnion struct { // Interests for ExploreUnion is: // - nil (aka all) if any member selector has nil interests // - the union of values returned by all member selectors otherwise -func (s ExploreUnion) Interests() []dms3ld.PathSegment { +func (s ExploreUnion) Interests() []ld.PathSegment { // Check for any high-cardinality selectors first; if so, shortcircuit. // (n.b. we're assuming the 'Interests' method is cheap here.) for _, m := range s.Members { @@ -30,7 +30,7 @@ func (s ExploreUnion) Interests() []dms3ld.PathSegment { } // Accumulate the whitelist of interesting path segments. // TODO: Dedup? - v := []dms3ld.PathSegment{} + v := []ld.PathSegment{} for _, m := range s.Members { v = append(v, m.Interests()...) } @@ -42,7 +42,7 @@ func (s ExploreUnion) Interests() []dms3ld.PathSegment { // - a new union selector if more than one member returns a selector // - if exactly one member returns a selector, that selector // - nil if no members return a selector -func (s ExploreUnion) Explore(n dms3ld.Node, p dms3ld.PathSegment) Selector { +func (s ExploreUnion) Explore(n ld.Node, p ld.PathSegment) Selector { // TODO: memory efficient? nonNilResults := make([]Selector, 0, len(s.Members)) for _, member := range s.Members { @@ -62,7 +62,7 @@ func (s ExploreUnion) Explore(n dms3ld.Node, p dms3ld.PathSegment) Selector { // Decide returns true for a Union selector if any of the member selectors // return true -func (s ExploreUnion) Decide(n dms3ld.Node) bool { +func (s ExploreUnion) Decide(n ld.Node) bool { for _, m := range s.Members { if m.Decide(n) { return true @@ -73,8 +73,8 @@ func (s ExploreUnion) Decide(n dms3ld.Node) bool { // ParseExploreUnion assembles a Selector // from an ExploreUnion selector node -func (pc ParseContext) ParseExploreUnion(n dms3ld.Node) (Selector, error) { - if n.Kind() != dms3ld.Kind_List { +func (pc ParseContext) ParseExploreUnion(n ld.Node) (Selector, error) { + if n.Kind() != ld.Kind_List { return nil, fmt.Errorf("selector spec parse rejected: explore union selector must be a list") } x := ExploreUnion{ diff --git a/traversal/selector/exploreUnion_test.go b/traversal/selector/exploreUnion_test.go index bf5d526dab17e6d8cc7d58369c67c7e86b3f6b16..74e90bfc8199e9a200c5d5b8b3fcafa1e30a5b3a 100644 --- a/traversal/selector/exploreUnion_test.go +++ b/traversal/selector/exploreUnion_test.go @@ -6,7 +6,7 @@ import ( . "github.com/warpfork/go-wish" - dms3ld "gitlab.dms3.io/ld/go-ld-prime" + ld "gitlab.dms3.io/ld/go-ld-prime" "gitlab.dms3.io/ld/go-ld-prime/fluent" basicnode "gitlab.dms3.io/ld/go-ld-prime/node/basic" ) @@ -44,7 +44,7 @@ func TestParseExploreUnion(t *testing.T) { }) s, err := ParseContext{}.ParseExploreUnion(sn) Wish(t, err, ShouldEqual, nil) - Wish(t, s, ShouldEqual, ExploreUnion{[]Selector{Matcher{}, ExploreIndex{Matcher{}, [1]dms3ld.PathSegment{dms3ld.PathSegmentOfInt(2)}}}}) + Wish(t, s, ShouldEqual, ExploreUnion{[]Selector{Matcher{}, ExploreIndex{Matcher{}, [1]ld.PathSegment{ld.PathSegmentOfInt(2)}}}}) }) } @@ -56,26 +56,26 @@ func TestExploreUnionExplore(t *testing.T) { na.AssembleValue().AssignInt(3) }) t.Run("exploring should return nil if all member selectors return nil when explored", func(t *testing.T) { - s := ExploreUnion{[]Selector{Matcher{}, ExploreIndex{Matcher{}, [1]dms3ld.PathSegment{dms3ld.PathSegmentOfInt(2)}}}} - returnedSelector := s.Explore(n, dms3ld.PathSegmentOfInt(3)) + s := ExploreUnion{[]Selector{Matcher{}, ExploreIndex{Matcher{}, [1]ld.PathSegment{ld.PathSegmentOfInt(2)}}}} + returnedSelector := s.Explore(n, ld.PathSegmentOfInt(3)) Wish(t, returnedSelector, ShouldEqual, nil) }) t.Run("if exactly one member selector returns a non-nil selector when explored, exploring should return that value", func(t *testing.T) { - s := ExploreUnion{[]Selector{Matcher{}, ExploreIndex{Matcher{}, [1]dms3ld.PathSegment{dms3ld.PathSegmentOfInt(2)}}}} + s := ExploreUnion{[]Selector{Matcher{}, ExploreIndex{Matcher{}, [1]ld.PathSegment{ld.PathSegmentOfInt(2)}}}} - returnedSelector := s.Explore(n, dms3ld.PathSegmentOfInt(2)) + returnedSelector := s.Explore(n, ld.PathSegmentOfInt(2)) Wish(t, returnedSelector, ShouldEqual, Matcher{}) }) t.Run("exploring should return a new union selector if more than one member selector returns a non nil selector when explored", func(t *testing.T) { s := ExploreUnion{[]Selector{ Matcher{}, - ExploreIndex{Matcher{}, [1]dms3ld.PathSegment{dms3ld.PathSegmentOfInt(2)}}, - ExploreRange{Matcher{}, 2, 3, []dms3ld.PathSegment{dms3ld.PathSegmentOfInt(2)}}, - ExploreFields{map[string]Selector{"applesauce": Matcher{}}, []dms3ld.PathSegment{dms3ld.PathSegmentOfString("applesauce")}}, + ExploreIndex{Matcher{}, [1]ld.PathSegment{ld.PathSegmentOfInt(2)}}, + ExploreRange{Matcher{}, 2, 3, []ld.PathSegment{ld.PathSegmentOfInt(2)}}, + ExploreFields{map[string]Selector{"applesauce": Matcher{}}, []ld.PathSegment{ld.PathSegmentOfString("applesauce")}}, }} - returnedSelector := s.Explore(n, dms3ld.PathSegmentOfInt(2)) + returnedSelector := s.Explore(n, ld.PathSegmentOfInt(2)) Wish(t, returnedSelector, ShouldEqual, ExploreUnion{[]Selector{Matcher{}, Matcher{}}}) }) } @@ -85,17 +85,17 @@ func TestExploreUnionInterests(t *testing.T) { s := ExploreUnion{[]Selector{ ExploreAll{Matcher{}}, Matcher{}, - ExploreIndex{Matcher{}, [1]dms3ld.PathSegment{dms3ld.PathSegmentOfInt(2)}}, + ExploreIndex{Matcher{}, [1]ld.PathSegment{ld.PathSegmentOfInt(2)}}, }} - Wish(t, s.Interests(), ShouldEqual, []dms3ld.PathSegment(nil)) + Wish(t, s.Interests(), ShouldEqual, []ld.PathSegment(nil)) }) t.Run("if no member selector is high-cardinality, interests should be combination of member selectors interests", func(t *testing.T) { s := ExploreUnion{[]Selector{ - ExploreFields{map[string]Selector{"applesauce": Matcher{}}, []dms3ld.PathSegment{dms3ld.PathSegmentOfString("applesauce")}}, + ExploreFields{map[string]Selector{"applesauce": Matcher{}}, []ld.PathSegment{ld.PathSegmentOfString("applesauce")}}, Matcher{}, - ExploreIndex{Matcher{}, [1]dms3ld.PathSegment{dms3ld.PathSegmentOfInt(2)}}, + ExploreIndex{Matcher{}, [1]ld.PathSegment{ld.PathSegmentOfInt(2)}}, }} - Wish(t, s.Interests(), ShouldEqual, []dms3ld.PathSegment{dms3ld.PathSegmentOfString("applesauce"), dms3ld.PathSegmentOfInt(2)}) + Wish(t, s.Interests(), ShouldEqual, []ld.PathSegment{ld.PathSegmentOfString("applesauce"), ld.PathSegmentOfInt(2)}) }) } @@ -105,15 +105,15 @@ func TestExploreUnionDecide(t *testing.T) { s := ExploreUnion{[]Selector{ ExploreAll{Matcher{}}, Matcher{}, - ExploreIndex{Matcher{}, [1]dms3ld.PathSegment{dms3ld.PathSegmentOfInt(2)}}, + ExploreIndex{Matcher{}, [1]ld.PathSegment{ld.PathSegmentOfInt(2)}}, }} Wish(t, s.Decide(n), ShouldEqual, true) }) t.Run("if no member selector returns true, decide should be false", func(t *testing.T) { s := ExploreUnion{[]Selector{ - ExploreFields{map[string]Selector{"applesauce": Matcher{}}, []dms3ld.PathSegment{dms3ld.PathSegmentOfString("applesauce")}}, + ExploreFields{map[string]Selector{"applesauce": Matcher{}}, []ld.PathSegment{ld.PathSegmentOfString("applesauce")}}, ExploreAll{Matcher{}}, - ExploreIndex{Matcher{}, [1]dms3ld.PathSegment{dms3ld.PathSegmentOfInt(2)}}, + ExploreIndex{Matcher{}, [1]ld.PathSegment{ld.PathSegmentOfInt(2)}}, }} Wish(t, s.Decide(n), ShouldEqual, false) }) diff --git a/traversal/selector/matcher.go b/traversal/selector/matcher.go index 6218042aab86e6c12ecde03c5d95dda15f2fbe1a..306bfb202d859096ee97b2ab54a16d4392137dae 100644 --- a/traversal/selector/matcher.go +++ b/traversal/selector/matcher.go @@ -3,7 +3,7 @@ package selector import ( "fmt" - dms3ld "gitlab.dms3.io/ld/go-ld-prime" + ld "gitlab.dms3.io/ld/go-ld-prime" ) // Matcher marks a node to be included in the "result" set. @@ -20,26 +20,26 @@ type Matcher struct{} // Interests are empty for a matcher (for now) because // It is always just there to match, not explore further -func (s Matcher) Interests() []dms3ld.PathSegment { - return []dms3ld.PathSegment{} +func (s Matcher) Interests() []ld.PathSegment { + return []ld.PathSegment{} } // Explore will return nil because a matcher is a terminal selector -func (s Matcher) Explore(n dms3ld.Node, p dms3ld.PathSegment) Selector { +func (s Matcher) Explore(n ld.Node, p ld.PathSegment) Selector { return nil } // Decide is always true for a match cause it's in the result set // TODO: Implement boolean logic for conditionals -func (s Matcher) Decide(n dms3ld.Node) bool { +func (s Matcher) Decide(n ld.Node) bool { return true } // ParseMatcher assembles a Selector // from a matcher selector node // TODO: Parse labels and conditions -func (pc ParseContext) ParseMatcher(n dms3ld.Node) (Selector, error) { - if n.Kind() != dms3ld.Kind_Map { +func (pc ParseContext) ParseMatcher(n ld.Node) (Selector, error) { + if n.Kind() != ld.Kind_Map { return nil, fmt.Errorf("selector spec parse rejected: selector body must be a map") } return Matcher{}, nil diff --git a/traversal/selector/selector.go b/traversal/selector/selector.go index 672457ffaa4800c32fb1b9e5ba96c36a3ec2ef5f..e4d55e2d39c3467d096a20541a44844325e0a44a 100644 --- a/traversal/selector/selector.go +++ b/traversal/selector/selector.go @@ -3,15 +3,15 @@ package selector import ( "fmt" - dms3ld "gitlab.dms3.io/ld/go-ld-prime" + ld "gitlab.dms3.io/ld/go-ld-prime" ) // Selector is the programmatic representation of an DMS3LD Selector Node // and can be applied to traverse a given DMS3LD DAG type Selector interface { - Interests() []dms3ld.PathSegment // returns the segments we're likely interested in **or nil** if we're a high-cardinality or expression based matcher and need all segments proposed to us. - Explore(dms3ld.Node, dms3ld.PathSegment) Selector // explore one step -- iteration comes from outside (either whole node, or by following suggestions of Interests). returns nil if no interest. you have to traverse to the next node yourself (the selector doesn't do it for you because you might be considering multiple selection reasons at the same time). - Decide(dms3ld.Node) bool + Interests() []ld.PathSegment // returns the segments we're likely interested in **or nil** if we're a high-cardinality or expression based matcher and need all segments proposed to us. + Explore(ld.Node, ld.PathSegment) Selector // explore one step -- iteration comes from outside (either whole node, or by following suggestions of Interests). returns nil if no interest. you have to traverse to the next node yourself (the selector doesn't do it for you because you might be considering multiple selection reasons at the same time). + Decide(ld.Node) bool } // ParsedParent is created whenever you are parsing a selector node that may have @@ -26,13 +26,13 @@ type ParseContext struct { } // ParseSelector creates a Selector that can be traversed from an DMS3LD Selector node -func ParseSelector(n dms3ld.Node) (Selector, error) { +func ParseSelector(n ld.Node) (Selector, error) { return ParseContext{}.ParseSelector(n) } // ParseSelector creates a Selector from an DMS3LD Selector Node with the given context -func (pc ParseContext) ParseSelector(n dms3ld.Node) (Selector, error) { - if n.Kind() != dms3ld.Kind_Map { +func (pc ParseContext) ParseSelector(n ld.Node) (Selector, error) { + if n.Kind() != ld.Kind_Map { return nil, fmt.Errorf("selector spec parse rejected: selector is a keyed union and thus must be a map") } if n.Length() != 1 { @@ -76,25 +76,25 @@ func (pc ParseContext) PushParent(parent ParsedParent) ParseContext { // SegmentIterator iterates either a list or a map, generating PathSegments // instead of indexes or keys type SegmentIterator interface { - Next() (pathSegment dms3ld.PathSegment, value dms3ld.Node, err error) + Next() (pathSegment ld.PathSegment, value ld.Node, err error) Done() bool } // NewSegmentIterator generates a new iterator based on the node type -func NewSegmentIterator(n dms3ld.Node) SegmentIterator { - if n.Kind() == dms3ld.Kind_List { +func NewSegmentIterator(n ld.Node) SegmentIterator { + if n.Kind() == ld.Kind_List { return listSegmentIterator{n.ListIterator()} } return mapSegmentIterator{n.MapIterator()} } type listSegmentIterator struct { - dms3ld.ListIterator + ld.ListIterator } -func (lsi listSegmentIterator) Next() (pathSegment dms3ld.PathSegment, value dms3ld.Node, err error) { +func (lsi listSegmentIterator) Next() (pathSegment ld.PathSegment, value ld.Node, err error) { i, v, err := lsi.ListIterator.Next() - return dms3ld.PathSegmentOfInt(i), v, err + return ld.PathSegmentOfInt(i), v, err } func (lsi listSegmentIterator) Done() bool { @@ -102,16 +102,16 @@ func (lsi listSegmentIterator) Done() bool { } type mapSegmentIterator struct { - dms3ld.MapIterator + ld.MapIterator } -func (msi mapSegmentIterator) Next() (pathSegment dms3ld.PathSegment, value dms3ld.Node, err error) { +func (msi mapSegmentIterator) Next() (pathSegment ld.PathSegment, value ld.Node, err error) { k, v, err := msi.MapIterator.Next() if err != nil { - return dms3ld.PathSegment{}, v, err + return ld.PathSegment{}, v, err } kstr, _ := k.AsString() - return dms3ld.PathSegmentOfString(kstr), v, err + return ld.PathSegmentOfString(kstr), v, err } func (msi mapSegmentIterator) Done() bool { diff --git a/traversal/walk.go b/traversal/walk.go index 6fb16a21c39c0e3a95fea1e020c1f366a2560afc..a78fddef3c5a7dcca80f8d713802cbe7b82606f1 100644 --- a/traversal/walk.go +++ b/traversal/walk.go @@ -3,7 +3,7 @@ package traversal import ( "fmt" - dms3ld "gitlab.dms3.io/ld/go-ld-prime" + ld "gitlab.dms3.io/ld/go-ld-prime" "gitlab.dms3.io/ld/go-ld-prime/traversal/selector" ) @@ -14,7 +14,7 @@ import ( // It cannot cross links automatically (since this requires configuration). // Use the equivalent WalkMatching function on the Progress structure // for more advanced and configurable walks. -func WalkMatching(n dms3ld.Node, s selector.Selector, fn VisitFn) error { +func WalkMatching(n ld.Node, s selector.Selector, fn VisitFn) error { return Progress{}.WalkMatching(n, s, fn) } @@ -26,7 +26,7 @@ func WalkMatching(n dms3ld.Node, s selector.Selector, fn VisitFn) error { // It cannot cross links automatically (since this requires configuration). // Use the equivalent WalkAdv function on the Progress structure // for more advanced and configurable walks. -func WalkAdv(n dms3ld.Node, s selector.Selector, fn AdvVisitFn) error { +func WalkAdv(n ld.Node, s selector.Selector, fn AdvVisitFn) error { return Progress{}.WalkAdv(n, s, fn) } @@ -38,7 +38,7 @@ func WalkAdv(n dms3ld.Node, s selector.Selector, fn AdvVisitFn) error { // It cannot cross links automatically (since this requires configuration). // Use the equivalent WalkTransforming function on the Progress structure // for more advanced and configurable walks. -func WalkTransforming(n dms3ld.Node, s selector.Selector, fn TransformFn) (dms3ld.Node, error) { +func WalkTransforming(n ld.Node, s selector.Selector, fn TransformFn) (ld.Node, error) { return Progress{}.WalkTransforming(n, s, fn) } @@ -65,9 +65,9 @@ func WalkTransforming(n dms3ld.Node, s selector.Selector, fn TransformFn) (dms3l // the Path recorded of the traversal so far will continue to be extended, // and thus continued nested uses of Walk and Focus will see the fully contextualized Path. // -func (prog Progress) WalkMatching(n dms3ld.Node, s selector.Selector, fn VisitFn) error { +func (prog Progress) WalkMatching(n ld.Node, s selector.Selector, fn VisitFn) error { prog.init() - return prog.walkAdv(n, s, func(prog Progress, n dms3ld.Node, tr VisitReason) error { + return prog.walkAdv(n, s, func(prog Progress, n ld.Node, tr VisitReason) error { if tr != VisitReason_SelectionMatch { return nil } @@ -79,12 +79,12 @@ func (prog Progress) WalkMatching(n dms3ld.Node, s selector.Selector, fn VisitFn // visited (not just matching nodes), together with the reason for the visit. // An AdvVisitFn is used instead of a VisitFn, so that the reason can be provided. // -func (prog Progress) WalkAdv(n dms3ld.Node, s selector.Selector, fn AdvVisitFn) error { +func (prog Progress) WalkAdv(n ld.Node, s selector.Selector, fn AdvVisitFn) error { prog.init() return prog.walkAdv(n, s, fn) } -func (prog Progress) walkAdv(n dms3ld.Node, s selector.Selector, fn AdvVisitFn) error { +func (prog Progress) walkAdv(n ld.Node, s selector.Selector, fn AdvVisitFn) error { if s.Decide(n) { if err := fn(prog, n, VisitReason_SelectionMatch); err != nil { return err @@ -96,7 +96,7 @@ func (prog Progress) walkAdv(n dms3ld.Node, s selector.Selector, fn AdvVisitFn) } nk := n.Kind() switch nk { - case dms3ld.Kind_Map, dms3ld.Kind_List: // continue + case ld.Kind_Map, ld.Kind_List: // continue default: return nil } @@ -108,7 +108,7 @@ func (prog Progress) walkAdv(n dms3ld.Node, s selector.Selector, fn AdvVisitFn) } -func (prog Progress) walkAdv_iterateAll(n dms3ld.Node, s selector.Selector, fn AdvVisitFn) error { +func (prog Progress) walkAdv_iterateAll(n ld.Node, s selector.Selector, fn AdvVisitFn) error { for itr := selector.NewSegmentIterator(n); !itr.Done(); { ps, v, err := itr.Next() if err != nil { @@ -118,7 +118,7 @@ func (prog Progress) walkAdv_iterateAll(n dms3ld.Node, s selector.Selector, fn A if sNext != nil { progNext := prog progNext.Path = prog.Path.AppendSegment(ps) - if v.Kind() == dms3ld.Kind_Link { + if v.Kind() == ld.Kind_Link { lnk, _ := v.AsLink() progNext.LastBlock.Path = progNext.Path progNext.LastBlock.Link = lnk @@ -140,7 +140,7 @@ func (prog Progress) walkAdv_iterateAll(n dms3ld.Node, s selector.Selector, fn A return nil } -func (prog Progress) walkAdv_iterateSelective(n dms3ld.Node, attn []dms3ld.PathSegment, s selector.Selector, fn AdvVisitFn) error { +func (prog Progress) walkAdv_iterateSelective(n ld.Node, attn []ld.PathSegment, s selector.Selector, fn AdvVisitFn) error { for _, ps := range attn { v, err := n.LookupBySegment(ps) if err != nil { @@ -150,7 +150,7 @@ func (prog Progress) walkAdv_iterateSelective(n dms3ld.Node, attn []dms3ld.PathS if sNext != nil { progNext := prog progNext.Path = prog.Path.AppendSegment(ps) - if v.Kind() == dms3ld.Kind_Link { + if v.Kind() == ld.Kind_Link { lnk, _ := v.AsLink() progNext.LastBlock.Path = progNext.Path progNext.LastBlock.Link = lnk @@ -172,12 +172,12 @@ func (prog Progress) walkAdv_iterateSelective(n dms3ld.Node, attn []dms3ld.PathS return nil } -func (prog Progress) loadLink(v dms3ld.Node, parent dms3ld.Node) (dms3ld.Node, error) { +func (prog Progress) loadLink(v ld.Node, parent ld.Node) (ld.Node, error) { lnk, err := v.AsLink() if err != nil { return nil, err } - lnkCtx := dms3ld.LinkContext{ + lnkCtx := ld.LinkContext{ Ctx: prog.Cfg.Ctx, LinkPath: prog.Path, LinkNode: v, @@ -218,6 +218,6 @@ func (prog Progress) loadLink(v dms3ld.Node, parent dms3ld.Node) (dms3ld.Node, e // are chosen by asking the existing nodes about their prototype). // // This feature is not yet implemented. -func (prog Progress) WalkTransforming(n dms3ld.Node, s selector.Selector, fn TransformFn) (dms3ld.Node, error) { +func (prog Progress) WalkTransforming(n ld.Node, s selector.Selector, fn TransformFn) (ld.Node, error) { panic("TODO") } diff --git a/traversal/walk_test.go b/traversal/walk_test.go index 12e6e90c99c546e7f3fe0cbfaf9459adb41e5d1a..04c905014e6c5a926aa405b0b4550450384cf587 100644 --- a/traversal/walk_test.go +++ b/traversal/walk_test.go @@ -48,17 +48,17 @@ var ( func TestWalkMatching(t *testing.T) { ssb := builder.NewSelectorSpecBuilder(basicnode.Prototype__Any{}) t.Run("traverse selecting true should visit the root", func(t *testing.T) { - err := traversal.WalkMatching(basicnode.NewString("x"), selector.Matcher{}, func(prog traversal.Progress, n dms3ld.Node) error { + err := traversal.WalkMatching(basicnode.NewString("x"), selector.Matcher{}, func(prog traversal.Progress, n ld.Node) error { Wish(t, n, ShouldEqual, basicnode.NewString("x")) - Wish(t, prog.Path.String(), ShouldEqual, dms3ld.Path{}.String()) + Wish(t, prog.Path.String(), ShouldEqual, ld.Path{}.String()) return nil }) Wish(t, err, ShouldEqual, nil) }) t.Run("traverse selecting true should visit only the root and no deeper", func(t *testing.T) { - err := traversal.WalkMatching(middleMapNode, selector.Matcher{}, func(prog traversal.Progress, n dms3ld.Node) error { + err := traversal.WalkMatching(middleMapNode, selector.Matcher{}, func(prog traversal.Progress, n ld.Node) error { Wish(t, n, ShouldEqual, middleMapNode) - Wish(t, prog.Path.String(), ShouldEqual, dms3ld.Path{}.String()) + Wish(t, prog.Path.String(), ShouldEqual, ld.Path{}.String()) return nil }) Wish(t, err, ShouldEqual, nil) @@ -71,7 +71,7 @@ func TestWalkMatching(t *testing.T) { s, err := ss.Selector() Require(t, err, ShouldEqual, nil) var order int - err = traversal.WalkMatching(middleMapNode, s, func(prog traversal.Progress, n dms3ld.Node) error { + err = traversal.WalkMatching(middleMapNode, s, func(prog traversal.Progress, n ld.Node) error { switch order { case 0: Wish(t, n, ShouldEqual, basicnode.NewBool(true)) @@ -96,7 +96,7 @@ func TestWalkMatching(t *testing.T) { s, err := ss.Selector() Require(t, err, ShouldEqual, nil) var order int - err = traversal.WalkMatching(middleMapNode, s, func(prog traversal.Progress, n dms3ld.Node) error { + err = traversal.WalkMatching(middleMapNode, s, func(prog traversal.Progress, n ld.Node) error { switch order { case 0: Wish(t, n, ShouldEqual, basicnode.NewBool(true)) @@ -125,7 +125,7 @@ func TestWalkMatching(t *testing.T) { LinkSystem: lsys, LinkTargetNodePrototypeChooser: basicnode.Chooser, }, - }.WalkMatching(middleMapNode, s, func(prog traversal.Progress, n dms3ld.Node) error { + }.WalkMatching(middleMapNode, s, func(prog traversal.Progress, n ld.Node) error { switch order { case 0: Wish(t, n, ShouldEqual, middleMapNode) @@ -169,7 +169,7 @@ func TestWalkMatching(t *testing.T) { LinkSystem: lsys, LinkTargetNodePrototypeChooser: basicnode.Chooser, }, - }.WalkMatching(middleListNode, s, func(prog traversal.Progress, n dms3ld.Node) error { + }.WalkMatching(middleListNode, s, func(prog traversal.Progress, n ld.Node) error { switch order { case 0: Wish(t, n, ShouldEqual, basicnode.NewString("alpha")) @@ -212,7 +212,7 @@ func TestWalkMatching(t *testing.T) { LinkSystem: lsys, LinkTargetNodePrototypeChooser: basicnode.Chooser, }, - }.WalkMatching(rootNode, s, func(prog traversal.Progress, n dms3ld.Node) error { + }.WalkMatching(rootNode, s, func(prog traversal.Progress, n ld.Node) error { switch order { case 0: Wish(t, n, ShouldEqual, basicnode.NewString("alpha")) diff --git a/unit.go b/unit.go index 2286e7dafa0bf5b5e89fd2d1cc1b88139c2f5c0e..5dff22cf3668a6d7b68f6340e11eed9216da2fe2 100644 --- a/unit.go +++ b/unit.go @@ -1,4 +1,4 @@ -package dms3ld +package ld var Null Node = nullNode{}