ref: Change vdl go codegen to emit __VDLInit funcs.
Fixes a subtle init-ordering issue in vdl-generated go code. The
basic problem looks something like this; there are many variants
to this problem, this is just one simple example:
// User's file a.go
package foo
import "v.io/v23/vdl"
var myType := vdl.TypeOf(FooType{})
// Generated file foo.vdl.go
package foo
import "v.io/v23/vdl"
func init() {
vdl.RegisterNative(FooToNative, FooFromNative)
}
The problem is that the vdl.RegisterNative call must occur before
the vdl.TypeOf call, so that the vdl package knows about native
types, and can analyze the type correctly. But init funcs are
always processed after all package-level variables have been
initialized, so we get the wrong order above.
We fix that by moving all initialization into a generated
__VDLInit func, with a trick to turn it into a var
initialization. Note that we still haven't fixed the above
example, since the package-level vars in a.go are typically
processed before foo.vdl.go. In the rare case where this
happens, the user can add a call to __VDLInit in a var
initializer early in their a.go file.
Similar problems existed with vom.RawBytesOf, and the
manually-generated types we were storing in package-level vars.
The new strategy is to put all ordering-dependent init logic in
__VDLInit, and to ensure that the order that we call things
within the function is correct. We also sort types, consts and
interfaces in the compiler as best we can. Note that sorting
types isn't strictly required (or meaningful), since we allow
cyclic types. But it still might be nice for some generated
languages.
There are further cleanups possible; we can probably add
error-checking more methodically for cases like above where the
user needs to add a call to __VDLInit, and we should replace the
long hex hash for generated type names to a simple counter. But
that'll occur in a separate CL; this is the more important one.
MultiPart: 3/6
Change-Id: I669e7cfeb3ddf32c4019dcd228550e736bb9f744
diff --git a/cmd/sb/internal/demodb/demodb.vdl.go b/cmd/sb/internal/demodb/demodb.vdl.go
index 30981f0..a78a365 100644
--- a/cmd/sb/internal/demodb/demodb.vdl.go
+++ b/cmd/sb/internal/demodb/demodb.vdl.go
@@ -16,6 +16,11 @@
"v.io/v23/vom"
)
+var _ = __VDLInit() // Must be first; see __VDLInit comments for details.
+
+//////////////////////////////////////////////////
+// Type definitions
+
type AddressInfo struct {
Street string
City string
@@ -29,9 +34,6 @@
}
func (m *AddressInfo) FillVDLTarget(t vdl.Target, tt *vdl.Type) error {
- if __VDLType_v_io_x_ref_cmd_sb_internal_demodb_AddressInfo == nil || __VDLType0 == nil {
- panic("Initialization order error: types generated for FillVDLTarget not initialized. Consider moving caller to an init() block.")
- }
fieldsTarget1, err := t.StartFields(tt)
if err != nil {
return err
@@ -42,7 +44,7 @@
return err
}
if err != vdl.ErrFieldNoExist {
- if err := fieldTarget3.FromString(string(m.Street), vdl.StringType); err != nil {
+ if err := fieldTarget3.FromString(string(m.Street), tt.NonOptional().Field(0).Type); err != nil {
return err
}
if err := fieldsTarget1.FinishField(keyTarget2, fieldTarget3); err != nil {
@@ -54,7 +56,7 @@
return err
}
if err != vdl.ErrFieldNoExist {
- if err := fieldTarget5.FromString(string(m.City), vdl.StringType); err != nil {
+ if err := fieldTarget5.FromString(string(m.City), tt.NonOptional().Field(1).Type); err != nil {
return err
}
if err := fieldsTarget1.FinishField(keyTarget4, fieldTarget5); err != nil {
@@ -66,7 +68,7 @@
return err
}
if err != vdl.ErrFieldNoExist {
- if err := fieldTarget7.FromString(string(m.State), vdl.StringType); err != nil {
+ if err := fieldTarget7.FromString(string(m.State), tt.NonOptional().Field(2).Type); err != nil {
return err
}
if err := fieldsTarget1.FinishField(keyTarget6, fieldTarget7); err != nil {
@@ -78,7 +80,7 @@
return err
}
if err != vdl.ErrFieldNoExist {
- if err := fieldTarget9.FromString(string(m.Zip), vdl.StringType); err != nil {
+ if err := fieldTarget9.FromString(string(m.Zip), tt.NonOptional().Field(3).Type); err != nil {
return err
}
if err := fieldsTarget1.FinishField(keyTarget8, fieldTarget9); err != nil {
@@ -107,8 +109,8 @@
func (t *AddressInfoTarget) StartFields(tt *vdl.Type) (vdl.FieldsTarget, error) {
- if !vdl.Compatible(tt, __VDLType_v_io_x_ref_cmd_sb_internal_demodb_AddressInfo) {
- return nil, fmt.Errorf("type %v incompatible with %v", tt, __VDLType_v_io_x_ref_cmd_sb_internal_demodb_AddressInfo)
+ if ttWant := vdl.TypeOf((*AddressInfo)(nil)).Elem(); !vdl.Compatible(tt, ttWant) {
+ return nil, fmt.Errorf("type %v incompatible with %v", tt, ttWant)
}
return t, nil
}
@@ -131,7 +133,7 @@
target, err := &t.zipTarget, error(nil)
return nil, target, err
default:
- return nil, nil, fmt.Errorf("field %s not in struct %v", name, __VDLType_v_io_x_ref_cmd_sb_internal_demodb_AddressInfo)
+ return nil, nil, fmt.Errorf("field %s not in struct v.io/x/ref/cmd/sb/internal/demodb.AddressInfo", name)
}
}
func (t *AddressInfoTarget) FinishField(_, _ vdl.Target) error {
@@ -196,7 +198,7 @@
}
func (m *CreditAgency) FillVDLTarget(t vdl.Target, tt *vdl.Type) error {
- if err := t.FromEnumLabel((*m).String(), __VDLType_v_io_x_ref_cmd_sb_internal_demodb_CreditAgency); err != nil {
+ if err := t.FromEnumLabel((*m).String(), tt); err != nil {
return err
}
return nil
@@ -213,8 +215,8 @@
func (t *CreditAgencyTarget) FromEnumLabel(src string, tt *vdl.Type) error {
- if !vdl.Compatible(tt, __VDLType_v_io_x_ref_cmd_sb_internal_demodb_CreditAgency) {
- return fmt.Errorf("type %v incompatible with %v", tt, __VDLType_v_io_x_ref_cmd_sb_internal_demodb_CreditAgency)
+ if ttWant := vdl.TypeOf((*CreditAgency)(nil)); !vdl.Compatible(tt, ttWant) {
+ return fmt.Errorf("type %v incompatible with %v", tt, ttWant)
}
switch src {
case "Equifax":
@@ -224,7 +226,7 @@
case "TransUnion":
*t.Value = 2
default:
- return fmt.Errorf("label %s not in enum %v", src, __VDLType_v_io_x_ref_cmd_sb_internal_demodb_CreditAgency)
+ return fmt.Errorf("label %s not in enum v.io/x/ref/cmd/sb/internal/demodb.CreditAgency", src)
}
return nil
@@ -278,7 +280,7 @@
}
func (m *ExperianRating) FillVDLTarget(t vdl.Target, tt *vdl.Type) error {
- if err := t.FromEnumLabel((*m).String(), __VDLType_v_io_x_ref_cmd_sb_internal_demodb_ExperianRating); err != nil {
+ if err := t.FromEnumLabel((*m).String(), tt); err != nil {
return err
}
return nil
@@ -295,8 +297,8 @@
func (t *ExperianRatingTarget) FromEnumLabel(src string, tt *vdl.Type) error {
- if !vdl.Compatible(tt, __VDLType_v_io_x_ref_cmd_sb_internal_demodb_ExperianRating) {
- return fmt.Errorf("type %v incompatible with %v", tt, __VDLType_v_io_x_ref_cmd_sb_internal_demodb_ExperianRating)
+ if ttWant := vdl.TypeOf((*ExperianRating)(nil)); !vdl.Compatible(tt, ttWant) {
+ return fmt.Errorf("type %v incompatible with %v", tt, ttWant)
}
switch src {
case "Good":
@@ -304,7 +306,7 @@
case "Bad":
*t.Value = 1
default:
- return fmt.Errorf("label %s not in enum %v", src, __VDLType_v_io_x_ref_cmd_sb_internal_demodb_ExperianRating)
+ return fmt.Errorf("label %s not in enum v.io/x/ref/cmd/sb/internal/demodb.ExperianRating", src)
}
return nil
@@ -320,9 +322,6 @@
}
func (m *EquifaxCreditReport) FillVDLTarget(t vdl.Target, tt *vdl.Type) error {
- if __VDLType_v_io_x_ref_cmd_sb_internal_demodb_EquifaxCreditReport == nil || __VDLType1 == nil {
- panic("Initialization order error: types generated for FillVDLTarget not initialized. Consider moving caller to an init() block.")
- }
fieldsTarget1, err := t.StartFields(tt)
if err != nil {
return err
@@ -333,7 +332,7 @@
return err
}
if err != vdl.ErrFieldNoExist {
- if err := fieldTarget3.FromUint(uint64(m.Rating), vdl.ByteType); err != nil {
+ if err := fieldTarget3.FromUint(uint64(m.Rating), tt.NonOptional().Field(0).Type); err != nil {
return err
}
if err := fieldsTarget1.FinishField(keyTarget2, fieldTarget3); err != nil {
@@ -359,8 +358,8 @@
func (t *EquifaxCreditReportTarget) StartFields(tt *vdl.Type) (vdl.FieldsTarget, error) {
- if !vdl.Compatible(tt, __VDLType_v_io_x_ref_cmd_sb_internal_demodb_EquifaxCreditReport) {
- return nil, fmt.Errorf("type %v incompatible with %v", tt, __VDLType_v_io_x_ref_cmd_sb_internal_demodb_EquifaxCreditReport)
+ if ttWant := vdl.TypeOf((*EquifaxCreditReport)(nil)).Elem(); !vdl.Compatible(tt, ttWant) {
+ return nil, fmt.Errorf("type %v incompatible with %v", tt, ttWant)
}
return t, nil
}
@@ -371,7 +370,7 @@
target, err := &t.ratingTarget, error(nil)
return nil, target, err
default:
- return nil, nil, fmt.Errorf("field %s not in struct %v", name, __VDLType_v_io_x_ref_cmd_sb_internal_demodb_EquifaxCreditReport)
+ return nil, nil, fmt.Errorf("field %s not in struct v.io/x/ref/cmd/sb/internal/demodb.EquifaxCreditReport", name)
}
}
func (t *EquifaxCreditReportTarget) FinishField(_, _ vdl.Target) error {
@@ -392,9 +391,6 @@
}
func (m *ExperianCreditReport) FillVDLTarget(t vdl.Target, tt *vdl.Type) error {
- if __VDLType_v_io_x_ref_cmd_sb_internal_demodb_ExperianCreditReport == nil || __VDLType2 == nil {
- panic("Initialization order error: types generated for FillVDLTarget not initialized. Consider moving caller to an init() block.")
- }
fieldsTarget1, err := t.StartFields(tt)
if err != nil {
return err
@@ -406,7 +402,7 @@
}
if err != vdl.ErrFieldNoExist {
- if err := m.Rating.FillVDLTarget(fieldTarget3, __VDLType_v_io_x_ref_cmd_sb_internal_demodb_ExperianRating); err != nil {
+ if err := m.Rating.FillVDLTarget(fieldTarget3, tt.NonOptional().Field(0).Type); err != nil {
return err
}
if err := fieldsTarget1.FinishField(keyTarget2, fieldTarget3); err != nil {
@@ -432,8 +428,8 @@
func (t *ExperianCreditReportTarget) StartFields(tt *vdl.Type) (vdl.FieldsTarget, error) {
- if !vdl.Compatible(tt, __VDLType_v_io_x_ref_cmd_sb_internal_demodb_ExperianCreditReport) {
- return nil, fmt.Errorf("type %v incompatible with %v", tt, __VDLType_v_io_x_ref_cmd_sb_internal_demodb_ExperianCreditReport)
+ if ttWant := vdl.TypeOf((*ExperianCreditReport)(nil)).Elem(); !vdl.Compatible(tt, ttWant) {
+ return nil, fmt.Errorf("type %v incompatible with %v", tt, ttWant)
}
return t, nil
}
@@ -444,7 +440,7 @@
target, err := &t.ratingTarget, error(nil)
return nil, target, err
default:
- return nil, nil, fmt.Errorf("field %s not in struct %v", name, __VDLType_v_io_x_ref_cmd_sb_internal_demodb_ExperianCreditReport)
+ return nil, nil, fmt.Errorf("field %s not in struct v.io/x/ref/cmd/sb/internal/demodb.ExperianCreditReport", name)
}
}
func (t *ExperianCreditReportTarget) FinishField(_, _ vdl.Target) error {
@@ -465,9 +461,6 @@
}
func (m *TransUnionCreditReport) FillVDLTarget(t vdl.Target, tt *vdl.Type) error {
- if __VDLType_v_io_x_ref_cmd_sb_internal_demodb_TransUnionCreditReport == nil || __VDLType3 == nil {
- panic("Initialization order error: types generated for FillVDLTarget not initialized. Consider moving caller to an init() block.")
- }
fieldsTarget1, err := t.StartFields(tt)
if err != nil {
return err
@@ -478,7 +471,7 @@
return err
}
if err != vdl.ErrFieldNoExist {
- if err := fieldTarget3.FromInt(int64(m.Rating), vdl.Int16Type); err != nil {
+ if err := fieldTarget3.FromInt(int64(m.Rating), tt.NonOptional().Field(0).Type); err != nil {
return err
}
if err := fieldsTarget1.FinishField(keyTarget2, fieldTarget3); err != nil {
@@ -504,8 +497,8 @@
func (t *TransUnionCreditReportTarget) StartFields(tt *vdl.Type) (vdl.FieldsTarget, error) {
- if !vdl.Compatible(tt, __VDLType_v_io_x_ref_cmd_sb_internal_demodb_TransUnionCreditReport) {
- return nil, fmt.Errorf("type %v incompatible with %v", tt, __VDLType_v_io_x_ref_cmd_sb_internal_demodb_TransUnionCreditReport)
+ if ttWant := vdl.TypeOf((*TransUnionCreditReport)(nil)).Elem(); !vdl.Compatible(tt, ttWant) {
+ return nil, fmt.Errorf("type %v incompatible with %v", tt, ttWant)
}
return t, nil
}
@@ -516,7 +509,7 @@
target, err := &t.ratingTarget, error(nil)
return nil, target, err
default:
- return nil, nil, fmt.Errorf("field %s not in struct %v", name, __VDLType_v_io_x_ref_cmd_sb_internal_demodb_TransUnionCreditReport)
+ return nil, nil, fmt.Errorf("field %s not in struct v.io/x/ref/cmd/sb/internal/demodb.TransUnionCreditReport", name)
}
}
func (t *TransUnionCreditReportTarget) FinishField(_, _ vdl.Target) error {
@@ -564,7 +557,7 @@
func (x AgencyReportEquifaxReport) __VDLReflect(__AgencyReportReflect) {}
func (m AgencyReportEquifaxReport) FillVDLTarget(t vdl.Target, tt *vdl.Type) error {
- fieldsTarget1, err := t.StartFields(__VDLType_v_io_x_ref_cmd_sb_internal_demodb_AgencyReport)
+ fieldsTarget1, err := t.StartFields(tt)
if err != nil {
return err
}
@@ -573,7 +566,7 @@
return err
}
- if err := m.Value.FillVDLTarget(fieldTarget3, __VDLType_v_io_x_ref_cmd_sb_internal_demodb_EquifaxCreditReport); err != nil {
+ if err := m.Value.FillVDLTarget(fieldTarget3, tt.NonOptional().Field(0).Type); err != nil {
return err
}
if err := fieldsTarget1.FinishField(keyTarget2, fieldTarget3); err != nil {
@@ -596,7 +589,7 @@
func (x AgencyReportExperianReport) __VDLReflect(__AgencyReportReflect) {}
func (m AgencyReportExperianReport) FillVDLTarget(t vdl.Target, tt *vdl.Type) error {
- fieldsTarget1, err := t.StartFields(__VDLType_v_io_x_ref_cmd_sb_internal_demodb_AgencyReport)
+ fieldsTarget1, err := t.StartFields(tt)
if err != nil {
return err
}
@@ -605,7 +598,7 @@
return err
}
- if err := m.Value.FillVDLTarget(fieldTarget3, __VDLType_v_io_x_ref_cmd_sb_internal_demodb_ExperianCreditReport); err != nil {
+ if err := m.Value.FillVDLTarget(fieldTarget3, tt.NonOptional().Field(1).Type); err != nil {
return err
}
if err := fieldsTarget1.FinishField(keyTarget2, fieldTarget3); err != nil {
@@ -628,7 +621,7 @@
func (x AgencyReportTransUnionReport) __VDLReflect(__AgencyReportReflect) {}
func (m AgencyReportTransUnionReport) FillVDLTarget(t vdl.Target, tt *vdl.Type) error {
- fieldsTarget1, err := t.StartFields(__VDLType_v_io_x_ref_cmd_sb_internal_demodb_AgencyReport)
+ fieldsTarget1, err := t.StartFields(tt)
if err != nil {
return err
}
@@ -637,7 +630,7 @@
return err
}
- if err := m.Value.FillVDLTarget(fieldTarget3, __VDLType_v_io_x_ref_cmd_sb_internal_demodb_TransUnionCreditReport); err != nil {
+ if err := m.Value.FillVDLTarget(fieldTarget3, tt.NonOptional().Field(2).Type); err != nil {
return err
}
if err := fieldsTarget1.FinishField(keyTarget2, fieldTarget3); err != nil {
@@ -665,9 +658,6 @@
}
func (m *CreditReport) FillVDLTarget(t vdl.Target, tt *vdl.Type) error {
- if __VDLType_v_io_x_ref_cmd_sb_internal_demodb_CreditReport == nil || __VDLType4 == nil {
- panic("Initialization order error: types generated for FillVDLTarget not initialized. Consider moving caller to an init() block.")
- }
fieldsTarget1, err := t.StartFields(tt)
if err != nil {
return err
@@ -679,7 +669,7 @@
}
if err != vdl.ErrFieldNoExist {
- if err := m.Agency.FillVDLTarget(fieldTarget3, __VDLType_v_io_x_ref_cmd_sb_internal_demodb_CreditAgency); err != nil {
+ if err := m.Agency.FillVDLTarget(fieldTarget3, tt.NonOptional().Field(0).Type); err != nil {
return err
}
if err := fieldsTarget1.FinishField(keyTarget2, fieldTarget3); err != nil {
@@ -696,7 +686,7 @@
if unionValue6 == nil {
unionValue6 = AgencyReportEquifaxReport{}
}
- if err := unionValue6.FillVDLTarget(fieldTarget5, __VDLType_v_io_x_ref_cmd_sb_internal_demodb_AgencyReport); err != nil {
+ if err := unionValue6.FillVDLTarget(fieldTarget5, tt.NonOptional().Field(1).Type); err != nil {
return err
}
if err := fieldsTarget1.FinishField(keyTarget4, fieldTarget5); err != nil {
@@ -723,8 +713,8 @@
func (t *CreditReportTarget) StartFields(tt *vdl.Type) (vdl.FieldsTarget, error) {
- if !vdl.Compatible(tt, __VDLType_v_io_x_ref_cmd_sb_internal_demodb_CreditReport) {
- return nil, fmt.Errorf("type %v incompatible with %v", tt, __VDLType_v_io_x_ref_cmd_sb_internal_demodb_CreditReport)
+ if ttWant := vdl.TypeOf((*CreditReport)(nil)).Elem(); !vdl.Compatible(tt, ttWant) {
+ return nil, fmt.Errorf("type %v incompatible with %v", tt, ttWant)
}
return t, nil
}
@@ -738,7 +728,7 @@
target, err := vdl.ReflectTarget(reflect.ValueOf(&t.Value.Report))
return nil, target, err
default:
- return nil, nil, fmt.Errorf("field %s not in struct %v", name, __VDLType_v_io_x_ref_cmd_sb_internal_demodb_CreditReport)
+ return nil, nil, fmt.Errorf("field %s not in struct v.io/x/ref/cmd/sb/internal/demodb.CreditReport", name)
}
}
func (t *CreditReportTarget) FinishField(_, _ vdl.Target) error {
@@ -763,9 +753,6 @@
}
func (m *Customer) FillVDLTarget(t vdl.Target, tt *vdl.Type) error {
- if __VDLType_v_io_x_ref_cmd_sb_internal_demodb_Customer == nil || __VDLType5 == nil {
- panic("Initialization order error: types generated for FillVDLTarget not initialized. Consider moving caller to an init() block.")
- }
fieldsTarget1, err := t.StartFields(tt)
if err != nil {
return err
@@ -776,7 +763,7 @@
return err
}
if err != vdl.ErrFieldNoExist {
- if err := fieldTarget3.FromString(string(m.Name), vdl.StringType); err != nil {
+ if err := fieldTarget3.FromString(string(m.Name), tt.NonOptional().Field(0).Type); err != nil {
return err
}
if err := fieldsTarget1.FinishField(keyTarget2, fieldTarget3); err != nil {
@@ -788,7 +775,7 @@
return err
}
if err != vdl.ErrFieldNoExist {
- if err := fieldTarget5.FromInt(int64(m.Id), vdl.Int64Type); err != nil {
+ if err := fieldTarget5.FromInt(int64(m.Id), tt.NonOptional().Field(1).Type); err != nil {
return err
}
if err := fieldsTarget1.FinishField(keyTarget4, fieldTarget5); err != nil {
@@ -800,7 +787,7 @@
return err
}
if err != vdl.ErrFieldNoExist {
- if err := fieldTarget7.FromBool(bool(m.Active), vdl.BoolType); err != nil {
+ if err := fieldTarget7.FromBool(bool(m.Active), tt.NonOptional().Field(2).Type); err != nil {
return err
}
if err := fieldsTarget1.FinishField(keyTarget6, fieldTarget7); err != nil {
@@ -813,7 +800,7 @@
}
if err != vdl.ErrFieldNoExist {
- if err := m.Address.FillVDLTarget(fieldTarget9, __VDLType_v_io_x_ref_cmd_sb_internal_demodb_AddressInfo); err != nil {
+ if err := m.Address.FillVDLTarget(fieldTarget9, tt.NonOptional().Field(3).Type); err != nil {
return err
}
if err := fieldsTarget1.FinishField(keyTarget8, fieldTarget9); err != nil {
@@ -826,7 +813,7 @@
}
if err != vdl.ErrFieldNoExist {
- if err := m.Credit.FillVDLTarget(fieldTarget11, __VDLType_v_io_x_ref_cmd_sb_internal_demodb_CreditReport); err != nil {
+ if err := m.Credit.FillVDLTarget(fieldTarget11, tt.NonOptional().Field(4).Type); err != nil {
return err
}
if err := fieldsTarget1.FinishField(keyTarget10, fieldTarget11); err != nil {
@@ -856,8 +843,8 @@
func (t *CustomerTarget) StartFields(tt *vdl.Type) (vdl.FieldsTarget, error) {
- if !vdl.Compatible(tt, __VDLType_v_io_x_ref_cmd_sb_internal_demodb_Customer) {
- return nil, fmt.Errorf("type %v incompatible with %v", tt, __VDLType_v_io_x_ref_cmd_sb_internal_demodb_Customer)
+ if ttWant := vdl.TypeOf((*Customer)(nil)).Elem(); !vdl.Compatible(tt, ttWant) {
+ return nil, fmt.Errorf("type %v incompatible with %v", tt, ttWant)
}
return t, nil
}
@@ -884,7 +871,7 @@
target, err := &t.creditTarget, error(nil)
return nil, target, err
default:
- return nil, nil, fmt.Errorf("field %s not in struct %v", name, __VDLType_v_io_x_ref_cmd_sb_internal_demodb_Customer)
+ return nil, nil, fmt.Errorf("field %s not in struct v.io/x/ref/cmd/sb/internal/demodb.Customer", name)
}
}
func (t *CustomerTarget) FinishField(_, _ vdl.Target) error {
@@ -908,9 +895,6 @@
}
func (m *Invoice) FillVDLTarget(t vdl.Target, tt *vdl.Type) error {
- if __VDLType_v_io_x_ref_cmd_sb_internal_demodb_Invoice == nil || __VDLType6 == nil {
- panic("Initialization order error: types generated for FillVDLTarget not initialized. Consider moving caller to an init() block.")
- }
fieldsTarget1, err := t.StartFields(tt)
if err != nil {
return err
@@ -921,7 +905,7 @@
return err
}
if err != vdl.ErrFieldNoExist {
- if err := fieldTarget3.FromInt(int64(m.CustId), vdl.Int64Type); err != nil {
+ if err := fieldTarget3.FromInt(int64(m.CustId), tt.NonOptional().Field(0).Type); err != nil {
return err
}
if err := fieldsTarget1.FinishField(keyTarget2, fieldTarget3); err != nil {
@@ -933,7 +917,7 @@
return err
}
if err != vdl.ErrFieldNoExist {
- if err := fieldTarget5.FromInt(int64(m.InvoiceNum), vdl.Int64Type); err != nil {
+ if err := fieldTarget5.FromInt(int64(m.InvoiceNum), tt.NonOptional().Field(1).Type); err != nil {
return err
}
if err := fieldsTarget1.FinishField(keyTarget4, fieldTarget5); err != nil {
@@ -945,7 +929,7 @@
return err
}
if err != vdl.ErrFieldNoExist {
- if err := fieldTarget7.FromInt(int64(m.Amount), vdl.Int64Type); err != nil {
+ if err := fieldTarget7.FromInt(int64(m.Amount), tt.NonOptional().Field(2).Type); err != nil {
return err
}
if err := fieldsTarget1.FinishField(keyTarget6, fieldTarget7); err != nil {
@@ -958,7 +942,7 @@
}
if err != vdl.ErrFieldNoExist {
- if err := m.ShipTo.FillVDLTarget(fieldTarget9, __VDLType_v_io_x_ref_cmd_sb_internal_demodb_AddressInfo); err != nil {
+ if err := m.ShipTo.FillVDLTarget(fieldTarget9, tt.NonOptional().Field(3).Type); err != nil {
return err
}
if err := fieldsTarget1.FinishField(keyTarget8, fieldTarget9); err != nil {
@@ -987,8 +971,8 @@
func (t *InvoiceTarget) StartFields(tt *vdl.Type) (vdl.FieldsTarget, error) {
- if !vdl.Compatible(tt, __VDLType_v_io_x_ref_cmd_sb_internal_demodb_Invoice) {
- return nil, fmt.Errorf("type %v incompatible with %v", tt, __VDLType_v_io_x_ref_cmd_sb_internal_demodb_Invoice)
+ if ttWant := vdl.TypeOf((*Invoice)(nil)).Elem(); !vdl.Compatible(tt, ttWant) {
+ return nil, fmt.Errorf("type %v incompatible with %v", tt, ttWant)
}
return t, nil
}
@@ -1011,7 +995,7 @@
target, err := &t.shipToTarget, error(nil)
return nil, target, err
default:
- return nil, nil, fmt.Errorf("field %s not in struct %v", name, __VDLType_v_io_x_ref_cmd_sb_internal_demodb_Invoice)
+ return nil, nil, fmt.Errorf("field %s not in struct v.io/x/ref/cmd/sb/internal/demodb.Invoice", name)
}
}
func (t *InvoiceTarget) FinishField(_, _ vdl.Target) error {
@@ -1042,9 +1026,6 @@
}
func (m *Numbers) FillVDLTarget(t vdl.Target, tt *vdl.Type) error {
- if __VDLType_v_io_x_ref_cmd_sb_internal_demodb_Numbers == nil || __VDLType7 == nil {
- panic("Initialization order error: types generated for FillVDLTarget not initialized. Consider moving caller to an init() block.")
- }
fieldsTarget1, err := t.StartFields(tt)
if err != nil {
return err
@@ -1055,7 +1036,7 @@
return err
}
if err != vdl.ErrFieldNoExist {
- if err := fieldTarget3.FromUint(uint64(m.B), vdl.ByteType); err != nil {
+ if err := fieldTarget3.FromUint(uint64(m.B), tt.NonOptional().Field(0).Type); err != nil {
return err
}
if err := fieldsTarget1.FinishField(keyTarget2, fieldTarget3); err != nil {
@@ -1067,7 +1048,7 @@
return err
}
if err != vdl.ErrFieldNoExist {
- if err := fieldTarget5.FromUint(uint64(m.Ui16), vdl.Uint16Type); err != nil {
+ if err := fieldTarget5.FromUint(uint64(m.Ui16), tt.NonOptional().Field(1).Type); err != nil {
return err
}
if err := fieldsTarget1.FinishField(keyTarget4, fieldTarget5); err != nil {
@@ -1079,7 +1060,7 @@
return err
}
if err != vdl.ErrFieldNoExist {
- if err := fieldTarget7.FromUint(uint64(m.Ui32), vdl.Uint32Type); err != nil {
+ if err := fieldTarget7.FromUint(uint64(m.Ui32), tt.NonOptional().Field(2).Type); err != nil {
return err
}
if err := fieldsTarget1.FinishField(keyTarget6, fieldTarget7); err != nil {
@@ -1091,7 +1072,7 @@
return err
}
if err != vdl.ErrFieldNoExist {
- if err := fieldTarget9.FromUint(uint64(m.Ui64), vdl.Uint64Type); err != nil {
+ if err := fieldTarget9.FromUint(uint64(m.Ui64), tt.NonOptional().Field(3).Type); err != nil {
return err
}
if err := fieldsTarget1.FinishField(keyTarget8, fieldTarget9); err != nil {
@@ -1103,7 +1084,7 @@
return err
}
if err != vdl.ErrFieldNoExist {
- if err := fieldTarget11.FromInt(int64(m.I16), vdl.Int16Type); err != nil {
+ if err := fieldTarget11.FromInt(int64(m.I16), tt.NonOptional().Field(4).Type); err != nil {
return err
}
if err := fieldsTarget1.FinishField(keyTarget10, fieldTarget11); err != nil {
@@ -1115,7 +1096,7 @@
return err
}
if err != vdl.ErrFieldNoExist {
- if err := fieldTarget13.FromInt(int64(m.I32), vdl.Int32Type); err != nil {
+ if err := fieldTarget13.FromInt(int64(m.I32), tt.NonOptional().Field(5).Type); err != nil {
return err
}
if err := fieldsTarget1.FinishField(keyTarget12, fieldTarget13); err != nil {
@@ -1127,7 +1108,7 @@
return err
}
if err != vdl.ErrFieldNoExist {
- if err := fieldTarget15.FromInt(int64(m.I64), vdl.Int64Type); err != nil {
+ if err := fieldTarget15.FromInt(int64(m.I64), tt.NonOptional().Field(6).Type); err != nil {
return err
}
if err := fieldsTarget1.FinishField(keyTarget14, fieldTarget15); err != nil {
@@ -1139,7 +1120,7 @@
return err
}
if err != vdl.ErrFieldNoExist {
- if err := fieldTarget17.FromFloat(float64(m.F32), vdl.Float32Type); err != nil {
+ if err := fieldTarget17.FromFloat(float64(m.F32), tt.NonOptional().Field(7).Type); err != nil {
return err
}
if err := fieldsTarget1.FinishField(keyTarget16, fieldTarget17); err != nil {
@@ -1151,7 +1132,7 @@
return err
}
if err != vdl.ErrFieldNoExist {
- if err := fieldTarget19.FromFloat(float64(m.F64), vdl.Float64Type); err != nil {
+ if err := fieldTarget19.FromFloat(float64(m.F64), tt.NonOptional().Field(8).Type); err != nil {
return err
}
if err := fieldsTarget1.FinishField(keyTarget18, fieldTarget19); err != nil {
@@ -1163,7 +1144,7 @@
return err
}
if err != vdl.ErrFieldNoExist {
- if err := fieldTarget21.FromComplex(complex128(m.C64), vdl.Complex64Type); err != nil {
+ if err := fieldTarget21.FromComplex(complex128(m.C64), tt.NonOptional().Field(9).Type); err != nil {
return err
}
if err := fieldsTarget1.FinishField(keyTarget20, fieldTarget21); err != nil {
@@ -1175,7 +1156,7 @@
return err
}
if err != vdl.ErrFieldNoExist {
- if err := fieldTarget23.FromComplex(complex128(m.C128), vdl.Complex128Type); err != nil {
+ if err := fieldTarget23.FromComplex(complex128(m.C128), tt.NonOptional().Field(10).Type); err != nil {
return err
}
if err := fieldsTarget1.FinishField(keyTarget22, fieldTarget23); err != nil {
@@ -1211,8 +1192,8 @@
func (t *NumbersTarget) StartFields(tt *vdl.Type) (vdl.FieldsTarget, error) {
- if !vdl.Compatible(tt, __VDLType_v_io_x_ref_cmd_sb_internal_demodb_Numbers) {
- return nil, fmt.Errorf("type %v incompatible with %v", tt, __VDLType_v_io_x_ref_cmd_sb_internal_demodb_Numbers)
+ if ttWant := vdl.TypeOf((*Numbers)(nil)).Elem(); !vdl.Compatible(tt, ttWant) {
+ return nil, fmt.Errorf("type %v incompatible with %v", tt, ttWant)
}
return t, nil
}
@@ -1263,7 +1244,7 @@
target, err := &t.c128Target, error(nil)
return nil, target, err
default:
- return nil, nil, fmt.Errorf("field %s not in struct %v", name, __VDLType_v_io_x_ref_cmd_sb_internal_demodb_Numbers)
+ return nil, nil, fmt.Errorf("field %s not in struct v.io/x/ref/cmd/sb/internal/demodb.Numbers", name)
}
}
func (t *NumbersTarget) FinishField(_, _ vdl.Target) error {
@@ -1274,188 +1255,6 @@
return nil
}
-type FooType struct {
- Bar BarType
-}
-
-func (FooType) __VDLReflect(struct {
- Name string `vdl:"v.io/x/ref/cmd/sb/internal/demodb.FooType"`
-}) {
-}
-
-func (m *FooType) FillVDLTarget(t vdl.Target, tt *vdl.Type) error {
- if __VDLType_v_io_x_ref_cmd_sb_internal_demodb_FooType == nil || __VDLType8 == nil {
- panic("Initialization order error: types generated for FillVDLTarget not initialized. Consider moving caller to an init() block.")
- }
- fieldsTarget1, err := t.StartFields(tt)
- if err != nil {
- return err
- }
-
- keyTarget2, fieldTarget3, err := fieldsTarget1.StartField("Bar")
- if err != vdl.ErrFieldNoExist && err != nil {
- return err
- }
- if err != vdl.ErrFieldNoExist {
-
- if err := m.Bar.FillVDLTarget(fieldTarget3, __VDLType_v_io_x_ref_cmd_sb_internal_demodb_BarType); err != nil {
- return err
- }
- if err := fieldsTarget1.FinishField(keyTarget2, fieldTarget3); err != nil {
- return err
- }
- }
- if err := t.FinishFields(fieldsTarget1); err != nil {
- return err
- }
- return nil
-}
-
-func (m *FooType) MakeVDLTarget() vdl.Target {
- return &FooTypeTarget{Value: m}
-}
-
-type FooTypeTarget struct {
- Value *FooType
- barTarget BarTypeTarget
- vdl.TargetBase
- vdl.FieldsTargetBase
-}
-
-func (t *FooTypeTarget) StartFields(tt *vdl.Type) (vdl.FieldsTarget, error) {
-
- if !vdl.Compatible(tt, __VDLType_v_io_x_ref_cmd_sb_internal_demodb_FooType) {
- return nil, fmt.Errorf("type %v incompatible with %v", tt, __VDLType_v_io_x_ref_cmd_sb_internal_demodb_FooType)
- }
- return t, nil
-}
-func (t *FooTypeTarget) StartField(name string) (key, field vdl.Target, _ error) {
- switch name {
- case "Bar":
- t.barTarget.Value = &t.Value.Bar
- target, err := &t.barTarget, error(nil)
- return nil, target, err
- default:
- return nil, nil, fmt.Errorf("field %s not in struct %v", name, __VDLType_v_io_x_ref_cmd_sb_internal_demodb_FooType)
- }
-}
-func (t *FooTypeTarget) FinishField(_, _ vdl.Target) error {
- return nil
-}
-func (t *FooTypeTarget) FinishFields(_ vdl.FieldsTarget) error {
-
- return nil
-}
-
-type BarTypeTarget struct {
- Value *BarType
- bazTarget BazTypeTarget
- vdl.TargetBase
- vdl.FieldsTargetBase
-}
-
-func (t *BarTypeTarget) StartFields(tt *vdl.Type) (vdl.FieldsTarget, error) {
-
- if !vdl.Compatible(tt, __VDLType_v_io_x_ref_cmd_sb_internal_demodb_BarType) {
- return nil, fmt.Errorf("type %v incompatible with %v", tt, __VDLType_v_io_x_ref_cmd_sb_internal_demodb_BarType)
- }
- return t, nil
-}
-func (t *BarTypeTarget) StartField(name string) (key, field vdl.Target, _ error) {
- switch name {
- case "Baz":
- t.bazTarget.Value = &t.Value.Baz
- target, err := &t.bazTarget, error(nil)
- return nil, target, err
- default:
- return nil, nil, fmt.Errorf("field %s not in struct %v", name, __VDLType_v_io_x_ref_cmd_sb_internal_demodb_BarType)
- }
-}
-func (t *BarTypeTarget) FinishField(_, _ vdl.Target) error {
- return nil
-}
-func (t *BarTypeTarget) FinishFields(_ vdl.FieldsTarget) error {
-
- return nil
-}
-
-type BazTypeTarget struct {
- Value *BazType
- nameTarget vdl.StringTarget
-
- vdl.TargetBase
- vdl.FieldsTargetBase
-}
-
-func (t *BazTypeTarget) StartFields(tt *vdl.Type) (vdl.FieldsTarget, error) {
-
- if !vdl.Compatible(tt, __VDLType_v_io_x_ref_cmd_sb_internal_demodb_BazType) {
- return nil, fmt.Errorf("type %v incompatible with %v", tt, __VDLType_v_io_x_ref_cmd_sb_internal_demodb_BazType)
- }
- return t, nil
-}
-func (t *BazTypeTarget) StartField(name string) (key, field vdl.Target, _ error) {
- switch name {
- case "Name":
- t.nameTarget.Value = &t.Value.Name
- target, err := &t.nameTarget, error(nil)
- return nil, target, err
- case "TitleOrValue":
- target, err := vdl.ReflectTarget(reflect.ValueOf(&t.Value.TitleOrValue))
- return nil, target, err
- default:
- return nil, nil, fmt.Errorf("field %s not in struct %v", name, __VDLType_v_io_x_ref_cmd_sb_internal_demodb_BazType)
- }
-}
-func (t *BazTypeTarget) FinishField(_, _ vdl.Target) error {
- return nil
-}
-func (t *BazTypeTarget) FinishFields(_ vdl.FieldsTarget) error {
-
- return nil
-}
-
-type BarType struct {
- Baz BazType
-}
-
-func (BarType) __VDLReflect(struct {
- Name string `vdl:"v.io/x/ref/cmd/sb/internal/demodb.BarType"`
-}) {
-}
-
-func (m *BarType) FillVDLTarget(t vdl.Target, tt *vdl.Type) error {
- if __VDLType_v_io_x_ref_cmd_sb_internal_demodb_BarType == nil || __VDLType9 == nil {
- panic("Initialization order error: types generated for FillVDLTarget not initialized. Consider moving caller to an init() block.")
- }
- fieldsTarget1, err := t.StartFields(tt)
- if err != nil {
- return err
- }
-
- keyTarget2, fieldTarget3, err := fieldsTarget1.StartField("Baz")
- if err != vdl.ErrFieldNoExist && err != nil {
- return err
- }
- if err != vdl.ErrFieldNoExist {
-
- if err := m.Baz.FillVDLTarget(fieldTarget3, __VDLType_v_io_x_ref_cmd_sb_internal_demodb_BazType); err != nil {
- return err
- }
- if err := fieldsTarget1.FinishField(keyTarget2, fieldTarget3); err != nil {
- return err
- }
- }
- if err := t.FinishFields(fieldsTarget1); err != nil {
- return err
- }
- return nil
-}
-
-func (m *BarType) MakeVDLTarget() vdl.Target {
- return &BarTypeTarget{Value: m}
-}
-
type (
// TitleOrValueType represents any single field of the TitleOrValueType union type.
TitleOrValueType interface {
@@ -1490,7 +1289,7 @@
func (x TitleOrValueTypeTitle) __VDLReflect(__TitleOrValueTypeReflect) {}
func (m TitleOrValueTypeTitle) FillVDLTarget(t vdl.Target, tt *vdl.Type) error {
- fieldsTarget1, err := t.StartFields(__VDLType_v_io_x_ref_cmd_sb_internal_demodb_TitleOrValueType)
+ fieldsTarget1, err := t.StartFields(tt)
if err != nil {
return err
}
@@ -1498,7 +1297,7 @@
if err != nil {
return err
}
- if err := fieldTarget3.FromString(string(m.Value), vdl.StringType); err != nil {
+ if err := fieldTarget3.FromString(string(m.Value), tt.NonOptional().Field(0).Type); err != nil {
return err
}
if err := fieldsTarget1.FinishField(keyTarget2, fieldTarget3); err != nil {
@@ -1521,7 +1320,7 @@
func (x TitleOrValueTypeValue) __VDLReflect(__TitleOrValueTypeReflect) {}
func (m TitleOrValueTypeValue) FillVDLTarget(t vdl.Target, tt *vdl.Type) error {
- fieldsTarget1, err := t.StartFields(__VDLType_v_io_x_ref_cmd_sb_internal_demodb_TitleOrValueType)
+ fieldsTarget1, err := t.StartFields(tt)
if err != nil {
return err
}
@@ -1529,7 +1328,7 @@
if err != nil {
return err
}
- if err := fieldTarget3.FromInt(int64(m.Value), vdl.Int64Type); err != nil {
+ if err := fieldTarget3.FromInt(int64(m.Value), tt.NonOptional().Field(1).Type); err != nil {
return err
}
if err := fieldsTarget1.FinishField(keyTarget2, fieldTarget3); err != nil {
@@ -1557,9 +1356,6 @@
}
func (m *BazType) FillVDLTarget(t vdl.Target, tt *vdl.Type) error {
- if __VDLType_v_io_x_ref_cmd_sb_internal_demodb_BazType == nil || __VDLType10 == nil {
- panic("Initialization order error: types generated for FillVDLTarget not initialized. Consider moving caller to an init() block.")
- }
fieldsTarget1, err := t.StartFields(tt)
if err != nil {
return err
@@ -1570,7 +1366,7 @@
return err
}
if err != vdl.ErrFieldNoExist {
- if err := fieldTarget3.FromString(string(m.Name), vdl.StringType); err != nil {
+ if err := fieldTarget3.FromString(string(m.Name), tt.NonOptional().Field(0).Type); err != nil {
return err
}
if err := fieldsTarget1.FinishField(keyTarget2, fieldTarget3); err != nil {
@@ -1587,7 +1383,7 @@
if unionValue6 == nil {
unionValue6 = TitleOrValueTypeTitle{}
}
- if err := unionValue6.FillVDLTarget(fieldTarget5, __VDLType_v_io_x_ref_cmd_sb_internal_demodb_TitleOrValueType); err != nil {
+ if err := unionValue6.FillVDLTarget(fieldTarget5, tt.NonOptional().Field(1).Type); err != nil {
return err
}
if err := fieldsTarget1.FinishField(keyTarget4, fieldTarget5); err != nil {
@@ -1604,6 +1400,182 @@
return &BazTypeTarget{Value: m}
}
+type BazTypeTarget struct {
+ Value *BazType
+ nameTarget vdl.StringTarget
+
+ vdl.TargetBase
+ vdl.FieldsTargetBase
+}
+
+func (t *BazTypeTarget) StartFields(tt *vdl.Type) (vdl.FieldsTarget, error) {
+
+ if ttWant := vdl.TypeOf((*BazType)(nil)).Elem(); !vdl.Compatible(tt, ttWant) {
+ return nil, fmt.Errorf("type %v incompatible with %v", tt, ttWant)
+ }
+ return t, nil
+}
+func (t *BazTypeTarget) StartField(name string) (key, field vdl.Target, _ error) {
+ switch name {
+ case "Name":
+ t.nameTarget.Value = &t.Value.Name
+ target, err := &t.nameTarget, error(nil)
+ return nil, target, err
+ case "TitleOrValue":
+ target, err := vdl.ReflectTarget(reflect.ValueOf(&t.Value.TitleOrValue))
+ return nil, target, err
+ default:
+ return nil, nil, fmt.Errorf("field %s not in struct v.io/x/ref/cmd/sb/internal/demodb.BazType", name)
+ }
+}
+func (t *BazTypeTarget) FinishField(_, _ vdl.Target) error {
+ return nil
+}
+func (t *BazTypeTarget) FinishFields(_ vdl.FieldsTarget) error {
+
+ return nil
+}
+
+type BarType struct {
+ Baz BazType
+}
+
+func (BarType) __VDLReflect(struct {
+ Name string `vdl:"v.io/x/ref/cmd/sb/internal/demodb.BarType"`
+}) {
+}
+
+func (m *BarType) FillVDLTarget(t vdl.Target, tt *vdl.Type) error {
+ fieldsTarget1, err := t.StartFields(tt)
+ if err != nil {
+ return err
+ }
+
+ keyTarget2, fieldTarget3, err := fieldsTarget1.StartField("Baz")
+ if err != vdl.ErrFieldNoExist && err != nil {
+ return err
+ }
+ if err != vdl.ErrFieldNoExist {
+
+ if err := m.Baz.FillVDLTarget(fieldTarget3, tt.NonOptional().Field(0).Type); err != nil {
+ return err
+ }
+ if err := fieldsTarget1.FinishField(keyTarget2, fieldTarget3); err != nil {
+ return err
+ }
+ }
+ if err := t.FinishFields(fieldsTarget1); err != nil {
+ return err
+ }
+ return nil
+}
+
+func (m *BarType) MakeVDLTarget() vdl.Target {
+ return &BarTypeTarget{Value: m}
+}
+
+type BarTypeTarget struct {
+ Value *BarType
+ bazTarget BazTypeTarget
+ vdl.TargetBase
+ vdl.FieldsTargetBase
+}
+
+func (t *BarTypeTarget) StartFields(tt *vdl.Type) (vdl.FieldsTarget, error) {
+
+ if ttWant := vdl.TypeOf((*BarType)(nil)).Elem(); !vdl.Compatible(tt, ttWant) {
+ return nil, fmt.Errorf("type %v incompatible with %v", tt, ttWant)
+ }
+ return t, nil
+}
+func (t *BarTypeTarget) StartField(name string) (key, field vdl.Target, _ error) {
+ switch name {
+ case "Baz":
+ t.bazTarget.Value = &t.Value.Baz
+ target, err := &t.bazTarget, error(nil)
+ return nil, target, err
+ default:
+ return nil, nil, fmt.Errorf("field %s not in struct v.io/x/ref/cmd/sb/internal/demodb.BarType", name)
+ }
+}
+func (t *BarTypeTarget) FinishField(_, _ vdl.Target) error {
+ return nil
+}
+func (t *BarTypeTarget) FinishFields(_ vdl.FieldsTarget) error {
+
+ return nil
+}
+
+type FooType struct {
+ Bar BarType
+}
+
+func (FooType) __VDLReflect(struct {
+ Name string `vdl:"v.io/x/ref/cmd/sb/internal/demodb.FooType"`
+}) {
+}
+
+func (m *FooType) FillVDLTarget(t vdl.Target, tt *vdl.Type) error {
+ fieldsTarget1, err := t.StartFields(tt)
+ if err != nil {
+ return err
+ }
+
+ keyTarget2, fieldTarget3, err := fieldsTarget1.StartField("Bar")
+ if err != vdl.ErrFieldNoExist && err != nil {
+ return err
+ }
+ if err != vdl.ErrFieldNoExist {
+
+ if err := m.Bar.FillVDLTarget(fieldTarget3, tt.NonOptional().Field(0).Type); err != nil {
+ return err
+ }
+ if err := fieldsTarget1.FinishField(keyTarget2, fieldTarget3); err != nil {
+ return err
+ }
+ }
+ if err := t.FinishFields(fieldsTarget1); err != nil {
+ return err
+ }
+ return nil
+}
+
+func (m *FooType) MakeVDLTarget() vdl.Target {
+ return &FooTypeTarget{Value: m}
+}
+
+type FooTypeTarget struct {
+ Value *FooType
+ barTarget BarTypeTarget
+ vdl.TargetBase
+ vdl.FieldsTargetBase
+}
+
+func (t *FooTypeTarget) StartFields(tt *vdl.Type) (vdl.FieldsTarget, error) {
+
+ if ttWant := vdl.TypeOf((*FooType)(nil)).Elem(); !vdl.Compatible(tt, ttWant) {
+ return nil, fmt.Errorf("type %v incompatible with %v", tt, ttWant)
+ }
+ return t, nil
+}
+func (t *FooTypeTarget) StartField(name string) (key, field vdl.Target, _ error) {
+ switch name {
+ case "Bar":
+ t.barTarget.Value = &t.Value.Bar
+ target, err := &t.barTarget, error(nil)
+ return nil, target, err
+ default:
+ return nil, nil, fmt.Errorf("field %s not in struct v.io/x/ref/cmd/sb/internal/demodb.FooType", name)
+ }
+}
+func (t *FooTypeTarget) FinishField(_, _ vdl.Target) error {
+ return nil
+}
+func (t *FooTypeTarget) FinishFields(_ vdl.FieldsTarget) error {
+
+ return nil
+}
+
type Array2String [2]string
func (Array2String) __VDLReflect(struct {
@@ -1612,7 +1584,7 @@
}
func (m *Array2String) FillVDLTarget(t vdl.Target, tt *vdl.Type) error {
- listTarget1, err := t.StartList(__VDLType_v_io_x_ref_cmd_sb_internal_demodb_Array2String, 2)
+ listTarget1, err := t.StartList(tt, 2)
if err != nil {
return err
}
@@ -1621,7 +1593,7 @@
if err != nil {
return err
}
- if err := elemTarget2.FromString(string(elem3), vdl.StringType); err != nil {
+ if err := elemTarget2.FromString(string(elem3), tt.NonOptional().Elem()); err != nil {
return err
}
if err := listTarget1.FinishElem(elemTarget2); err != nil {
@@ -1648,8 +1620,8 @@
func (t *Array2StringTarget) StartList(tt *vdl.Type, len int) (vdl.ListTarget, error) {
- if !vdl.Compatible(tt, __VDLType_v_io_x_ref_cmd_sb_internal_demodb_Array2String) {
- return nil, fmt.Errorf("type %v incompatible with %v", tt, __VDLType_v_io_x_ref_cmd_sb_internal_demodb_Array2String)
+ if ttWant := vdl.TypeOf((*Array2String)(nil)); !vdl.Compatible(tt, ttWant) {
+ return nil, fmt.Errorf("type %v incompatible with %v", tt, ttWant)
}
return t, nil
}
@@ -1679,9 +1651,6 @@
}
func (m *Composite) FillVDLTarget(t vdl.Target, tt *vdl.Type) error {
- if __VDLType_v_io_x_ref_cmd_sb_internal_demodb_Composite == nil || __VDLType11 == nil {
- panic("Initialization order error: types generated for FillVDLTarget not initialized. Consider moving caller to an init() block.")
- }
fieldsTarget1, err := t.StartFields(tt)
if err != nil {
return err
@@ -1693,7 +1662,7 @@
}
if err != vdl.ErrFieldNoExist {
- if err := m.Arr.FillVDLTarget(fieldTarget3, __VDLType_v_io_x_ref_cmd_sb_internal_demodb_Array2String); err != nil {
+ if err := m.Arr.FillVDLTarget(fieldTarget3, tt.NonOptional().Field(0).Type); err != nil {
return err
}
if err := fieldsTarget1.FinishField(keyTarget2, fieldTarget3); err != nil {
@@ -1706,7 +1675,7 @@
}
if err != vdl.ErrFieldNoExist {
- listTarget6, err := fieldTarget5.StartList(__VDLType12, len(m.ListInt))
+ listTarget6, err := fieldTarget5.StartList(tt.NonOptional().Field(1).Type, len(m.ListInt))
if err != nil {
return err
}
@@ -1715,7 +1684,7 @@
if err != nil {
return err
}
- if err := elemTarget7.FromInt(int64(elem8), vdl.Int32Type); err != nil {
+ if err := elemTarget7.FromInt(int64(elem8), tt.NonOptional().Field(1).Type.Elem()); err != nil {
return err
}
if err := listTarget6.FinishElem(elemTarget7); err != nil {
@@ -1735,7 +1704,7 @@
}
if err != vdl.ErrFieldNoExist {
- setTarget11, err := fieldTarget10.StartSet(__VDLType13, len(m.MySet))
+ setTarget11, err := fieldTarget10.StartSet(tt.NonOptional().Field(2).Type, len(m.MySet))
if err != nil {
return err
}
@@ -1744,7 +1713,7 @@
if err != nil {
return err
}
- if err := keyTarget12.FromInt(int64(key13), vdl.Int32Type); err != nil {
+ if err := keyTarget12.FromInt(int64(key13), tt.NonOptional().Field(2).Type.Key()); err != nil {
return err
}
if err := setTarget11.FinishKey(keyTarget12); err != nil {
@@ -1764,7 +1733,7 @@
}
if err != vdl.ErrFieldNoExist {
- mapTarget16, err := fieldTarget15.StartMap(__VDLType14, len(m.Map))
+ mapTarget16, err := fieldTarget15.StartMap(tt.NonOptional().Field(3).Type, len(m.Map))
if err != nil {
return err
}
@@ -1773,14 +1742,14 @@
if err != nil {
return err
}
- if err := keyTarget17.FromString(string(key18), vdl.StringType); err != nil {
+ if err := keyTarget17.FromString(string(key18), tt.NonOptional().Field(3).Type.Key()); err != nil {
return err
}
valueTarget19, err := mapTarget16.FinishKeyStartField(keyTarget17)
if err != nil {
return err
}
- if err := valueTarget19.FromInt(int64(value20), vdl.Int32Type); err != nil {
+ if err := valueTarget19.FromInt(int64(value20), tt.NonOptional().Field(3).Type.Elem()); err != nil {
return err
}
if err := mapTarget16.FinishField(keyTarget17, valueTarget19); err != nil {
@@ -1816,8 +1785,8 @@
func (t *CompositeTarget) StartFields(tt *vdl.Type) (vdl.FieldsTarget, error) {
- if !vdl.Compatible(tt, __VDLType_v_io_x_ref_cmd_sb_internal_demodb_Composite) {
- return nil, fmt.Errorf("type %v incompatible with %v", tt, __VDLType_v_io_x_ref_cmd_sb_internal_demodb_Composite)
+ if ttWant := vdl.TypeOf((*Composite)(nil)).Elem(); !vdl.Compatible(tt, ttWant) {
+ return nil, fmt.Errorf("type %v incompatible with %v", tt, ttWant)
}
return t, nil
}
@@ -1840,7 +1809,7 @@
target, err := &t.mapTarget, error(nil)
return nil, target, err
default:
- return nil, nil, fmt.Errorf("field %s not in struct %v", name, __VDLType_v_io_x_ref_cmd_sb_internal_demodb_Composite)
+ return nil, nil, fmt.Errorf("field %s not in struct v.io/x/ref/cmd/sb/internal/demodb.Composite", name)
}
}
func (t *CompositeTarget) FinishField(_, _ vdl.Target) error {
@@ -1861,8 +1830,8 @@
func (t *unnamed_5b5d696e743332Target) StartList(tt *vdl.Type, len int) (vdl.ListTarget, error) {
- if !vdl.Compatible(tt, __VDLType12) {
- return nil, fmt.Errorf("type %v incompatible with %v", tt, __VDLType12)
+ if ttWant := vdl.TypeOf((*[]int32)(nil)); !vdl.Compatible(tt, ttWant) {
+ return nil, fmt.Errorf("type %v incompatible with %v", tt, ttWant)
}
if cap(*t.Value) < len {
*t.Value = make([]int32, len)
@@ -1895,8 +1864,8 @@
func (t *unnamed_7365745b696e7433325dTarget) StartSet(tt *vdl.Type, len int) (vdl.SetTarget, error) {
- if !vdl.Compatible(tt, __VDLType13) {
- return nil, fmt.Errorf("type %v incompatible with %v", tt, __VDLType13)
+ if ttWant := vdl.TypeOf((*map[int32]struct{})(nil)); !vdl.Compatible(tt, ttWant) {
+ return nil, fmt.Errorf("type %v incompatible with %v", tt, ttWant)
}
*t.Value = make(map[int32]struct{})
return t, nil
@@ -1932,8 +1901,8 @@
func (t *unnamed_6d61705b737472696e675d696e743332Target) StartMap(tt *vdl.Type, len int) (vdl.MapTarget, error) {
- if !vdl.Compatible(tt, __VDLType14) {
- return nil, fmt.Errorf("type %v incompatible with %v", tt, __VDLType14)
+ if ttWant := vdl.TypeOf((*map[string]int32)(nil)); !vdl.Compatible(tt, ttWant) {
+ return nil, fmt.Errorf("type %v incompatible with %v", tt, ttWant)
}
*t.Value = make(map[string]int32)
return t, nil
@@ -1973,7 +1942,6 @@
}
func (m *Times) FillVDLTarget(t vdl.Target, tt *vdl.Type) error {
- __VDLEnsureNativeBuilt()
fieldsTarget1, err := t.StartFields(tt)
if err != nil {
return err
@@ -1990,7 +1958,7 @@
}
if err != vdl.ErrFieldNoExist {
- if err := wireValue2.FillVDLTarget(fieldTarget4, __VDLType_time_Time); err != nil {
+ if err := wireValue2.FillVDLTarget(fieldTarget4, tt.NonOptional().Field(0).Type); err != nil {
return err
}
if err := fieldsTarget1.FinishField(keyTarget3, fieldTarget4); err != nil {
@@ -2008,7 +1976,7 @@
}
if err != vdl.ErrFieldNoExist {
- if err := wireValue5.FillVDLTarget(fieldTarget7, __VDLType_time_Duration); err != nil {
+ if err := wireValue5.FillVDLTarget(fieldTarget7, tt.NonOptional().Field(1).Type); err != nil {
return err
}
if err := fieldsTarget1.FinishField(keyTarget6, fieldTarget7); err != nil {
@@ -2035,8 +2003,8 @@
func (t *TimesTarget) StartFields(tt *vdl.Type) (vdl.FieldsTarget, error) {
- if !vdl.Compatible(tt, __VDLType_v_io_x_ref_cmd_sb_internal_demodb_Times) {
- return nil, fmt.Errorf("type %v incompatible with %v", tt, __VDLType_v_io_x_ref_cmd_sb_internal_demodb_Times)
+ if ttWant := vdl.TypeOf((*Times)(nil)).Elem(); !vdl.Compatible(tt, ttWant) {
+ return nil, fmt.Errorf("type %v incompatible with %v", tt, ttWant)
}
return t, nil
}
@@ -2051,7 +2019,7 @@
target, err := &t.intervalTarget, error(nil)
return nil, target, err
default:
- return nil, nil, fmt.Errorf("field %s not in struct %v", name, __VDLType_v_io_x_ref_cmd_sb_internal_demodb_Times)
+ return nil, nil, fmt.Errorf("field %s not in struct v.io/x/ref/cmd/sb/internal/demodb.Times", name)
}
}
func (t *TimesTarget) FinishField(_, _ vdl.Target) error {
@@ -2074,7 +2042,6 @@
}
func (m *Recursive) FillVDLTarget(t vdl.Target, tt *vdl.Type) error {
- __VDLEnsureNativeBuilt()
fieldsTarget1, err := t.StartFields(tt)
if err != nil {
return err
@@ -2087,11 +2054,11 @@
if err != vdl.ErrFieldNoExist {
if m.Any == nil {
- if err := fieldTarget3.FromNil(vdl.AnyType); err != nil {
+ if err := fieldTarget3.FromNil(tt.NonOptional().Field(0).Type); err != nil {
return err
}
} else {
- if err := m.Any.FillVDLTarget(fieldTarget3, vdl.AnyType); err != nil {
+ if err := m.Any.FillVDLTarget(fieldTarget3, tt.NonOptional().Field(0).Type); err != nil {
return err
}
}
@@ -2106,11 +2073,11 @@
if err != vdl.ErrFieldNoExist {
if m.Maybe == nil {
- if err := fieldTarget5.FromNil(__VDLType15); err != nil {
+ if err := fieldTarget5.FromNil(tt.NonOptional().Field(1).Type); err != nil {
return err
}
} else {
- if err := m.Maybe.FillVDLTarget(fieldTarget5, __VDLType_v_io_x_ref_cmd_sb_internal_demodb_Times); err != nil {
+ if err := m.Maybe.FillVDLTarget(fieldTarget5, tt.NonOptional().Field(1).Type); err != nil {
return err
}
}
@@ -2124,7 +2091,7 @@
}
if err != vdl.ErrFieldNoExist {
- mapTarget8, err := fieldTarget7.StartMap(__VDLType17, len(m.Rec))
+ mapTarget8, err := fieldTarget7.StartMap(tt.NonOptional().Field(2).Type, len(m.Rec))
if err != nil {
return err
}
@@ -2134,7 +2101,7 @@
return err
}
- if err := key10.FillVDLTarget(keyTarget9, __VDLType_v_io_x_ref_cmd_sb_internal_demodb_Array2String); err != nil {
+ if err := key10.FillVDLTarget(keyTarget9, tt.NonOptional().Field(2).Type.Key()); err != nil {
return err
}
valueTarget11, err := mapTarget8.FinishKeyStartField(keyTarget9)
@@ -2142,7 +2109,7 @@
return err
}
- if err := value12.FillVDLTarget(valueTarget11, __VDLType_v_io_x_ref_cmd_sb_internal_demodb_Recursive); err != nil {
+ if err := value12.FillVDLTarget(valueTarget11, tt.NonOptional().Field(2).Type.Elem()); err != nil {
return err
}
if err := mapTarget8.FinishField(keyTarget9, valueTarget11); err != nil {
@@ -2177,8 +2144,8 @@
func (t *RecursiveTarget) StartFields(tt *vdl.Type) (vdl.FieldsTarget, error) {
- if !vdl.Compatible(tt, __VDLType_v_io_x_ref_cmd_sb_internal_demodb_Recursive) {
- return nil, fmt.Errorf("type %v incompatible with %v", tt, __VDLType_v_io_x_ref_cmd_sb_internal_demodb_Recursive)
+ if ttWant := vdl.TypeOf((*Recursive)(nil)).Elem(); !vdl.Compatible(tt, ttWant) {
+ return nil, fmt.Errorf("type %v incompatible with %v", tt, ttWant)
}
return t, nil
}
@@ -2195,7 +2162,7 @@
target, err := &unnamed_6d61705b762e696f2f782f7265662f636d642f73622f696e7465726e616c2f64656d6f64622e417272617932537472696e67205b325d737472696e675d762e696f2f782f7265662f636d642f73622f696e7465726e616c2f64656d6f64622e526563757273697665207374727563747b416e7920616e793b4d61796265203f762e696f2f782f7265662f636d642f73622f696e7465726e616c2f64656d6f64622e54696d6573207374727563747b5374616d702074696d652e54696d65207374727563747b5365636f6e647320696e7436343b4e616e6f7320696e7433327d3b496e74657276616c2074696d652e4475726174696f6e207374727563747b5365636f6e647320696e7436343b4e616e6f7320696e7433327d7d3b526563206d61705b762e696f2f782f7265662f636d642f73622f696e7465726e616c2f64656d6f64622e417272617932537472696e675d762e696f2f782f7265662f636d642f73622f696e7465726e616c2f64656d6f64622e5265637572736976657dTarget{Value: &t.Value.Rec}, error(nil)
return nil, target, err
default:
- return nil, nil, fmt.Errorf("field %s not in struct %v", name, __VDLType_v_io_x_ref_cmd_sb_internal_demodb_Recursive)
+ return nil, nil, fmt.Errorf("field %s not in struct v.io/x/ref/cmd/sb/internal/demodb.Recursive", name)
}
}
func (t *RecursiveTarget) FinishField(_, _ vdl.Target) error {
@@ -2250,8 +2217,8 @@
func (t *unnamed_6d61705b762e696f2f782f7265662f636d642f73622f696e7465726e616c2f64656d6f64622e417272617932537472696e67205b325d737472696e675d762e696f2f782f7265662f636d642f73622f696e7465726e616c2f64656d6f64622e526563757273697665207374727563747b416e7920616e793b4d61796265203f762e696f2f782f7265662f636d642f73622f696e7465726e616c2f64656d6f64622e54696d6573207374727563747b5374616d702074696d652e54696d65207374727563747b5365636f6e647320696e7436343b4e616e6f7320696e7433327d3b496e74657276616c2074696d652e4475726174696f6e207374727563747b5365636f6e647320696e7436343b4e616e6f7320696e7433327d7d3b526563206d61705b762e696f2f782f7265662f636d642f73622f696e7465726e616c2f64656d6f64622e417272617932537472696e675d762e696f2f782f7265662f636d642f73622f696e7465726e616c2f64656d6f64622e5265637572736976657dTarget) StartMap(tt *vdl.Type, len int) (vdl.MapTarget, error) {
- if !vdl.Compatible(tt, __VDLType17) {
- return nil, fmt.Errorf("type %v incompatible with %v", tt, __VDLType17)
+ if ttWant := vdl.TypeOf((*map[Array2String]Recursive)(nil)); !vdl.Compatible(tt, ttWant) {
+ return nil, fmt.Errorf("type %v incompatible with %v", tt, ttWant)
}
*t.Value = make(map[Array2String]Recursive)
return t, nil
@@ -2313,7 +2280,7 @@
func (x ActOrSatScoreActScore) __VDLReflect(__ActOrSatScoreReflect) {}
func (m ActOrSatScoreActScore) FillVDLTarget(t vdl.Target, tt *vdl.Type) error {
- fieldsTarget1, err := t.StartFields(__VDLType_v_io_x_ref_cmd_sb_internal_demodb_ActOrSatScore)
+ fieldsTarget1, err := t.StartFields(tt)
if err != nil {
return err
}
@@ -2321,7 +2288,7 @@
if err != nil {
return err
}
- if err := fieldTarget3.FromUint(uint64(m.Value), vdl.Uint16Type); err != nil {
+ if err := fieldTarget3.FromUint(uint64(m.Value), tt.NonOptional().Field(0).Type); err != nil {
return err
}
if err := fieldsTarget1.FinishField(keyTarget2, fieldTarget3); err != nil {
@@ -2344,7 +2311,7 @@
func (x ActOrSatScoreSatScore) __VDLReflect(__ActOrSatScoreReflect) {}
func (m ActOrSatScoreSatScore) FillVDLTarget(t vdl.Target, tt *vdl.Type) error {
- fieldsTarget1, err := t.StartFields(__VDLType_v_io_x_ref_cmd_sb_internal_demodb_ActOrSatScore)
+ fieldsTarget1, err := t.StartFields(tt)
if err != nil {
return err
}
@@ -2352,7 +2319,7 @@
if err != nil {
return err
}
- if err := fieldTarget3.FromUint(uint64(m.Value), vdl.Uint16Type); err != nil {
+ if err := fieldTarget3.FromUint(uint64(m.Value), tt.NonOptional().Field(1).Type); err != nil {
return err
}
if err := fieldsTarget1.FinishField(keyTarget2, fieldTarget3); err != nil {
@@ -2381,7 +2348,6 @@
}
func (m *Student) FillVDLTarget(t vdl.Target, tt *vdl.Type) error {
- __VDLEnsureNativeBuilt()
fieldsTarget1, err := t.StartFields(tt)
if err != nil {
return err
@@ -2392,7 +2358,7 @@
return err
}
if err != vdl.ErrFieldNoExist {
- if err := fieldTarget3.FromString(string(m.Name), vdl.StringType); err != nil {
+ if err := fieldTarget3.FromString(string(m.Name), tt.NonOptional().Field(0).Type); err != nil {
return err
}
if err := fieldsTarget1.FinishField(keyTarget2, fieldTarget3); err != nil {
@@ -2410,7 +2376,7 @@
}
if err != vdl.ErrFieldNoExist {
- if err := wireValue4.FillVDLTarget(fieldTarget6, __VDLType_time_Time); err != nil {
+ if err := wireValue4.FillVDLTarget(fieldTarget6, tt.NonOptional().Field(1).Type); err != nil {
return err
}
if err := fieldsTarget1.FinishField(keyTarget5, fieldTarget6); err != nil {
@@ -2427,7 +2393,7 @@
if unionValue9 == nil {
unionValue9 = ActOrSatScoreActScore{}
}
- if err := unionValue9.FillVDLTarget(fieldTarget8, __VDLType_v_io_x_ref_cmd_sb_internal_demodb_ActOrSatScore); err != nil {
+ if err := unionValue9.FillVDLTarget(fieldTarget8, tt.NonOptional().Field(2).Type); err != nil {
return err
}
if err := fieldsTarget1.FinishField(keyTarget7, fieldTarget8); err != nil {
@@ -2455,8 +2421,8 @@
func (t *StudentTarget) StartFields(tt *vdl.Type) (vdl.FieldsTarget, error) {
- if !vdl.Compatible(tt, __VDLType_v_io_x_ref_cmd_sb_internal_demodb_Student) {
- return nil, fmt.Errorf("type %v incompatible with %v", tt, __VDLType_v_io_x_ref_cmd_sb_internal_demodb_Student)
+ if ttWant := vdl.TypeOf((*Student)(nil)).Elem(); !vdl.Compatible(tt, ttWant) {
+ return nil, fmt.Errorf("type %v incompatible with %v", tt, ttWant)
}
return t, nil
}
@@ -2474,7 +2440,7 @@
target, err := vdl.ReflectTarget(reflect.ValueOf(&t.Value.Score))
return nil, target, err
default:
- return nil, nil, fmt.Errorf("field %s not in struct %v", name, __VDLType_v_io_x_ref_cmd_sb_internal_demodb_Student)
+ return nil, nil, fmt.Errorf("field %s not in struct v.io/x/ref/cmd/sb/internal/demodb.Student", name)
}
}
func (t *StudentTarget) FinishField(_, _ vdl.Target) error {
@@ -2496,9 +2462,6 @@
}
func (m *AnythingGoes) FillVDLTarget(t vdl.Target, tt *vdl.Type) error {
- if __VDLType_v_io_x_ref_cmd_sb_internal_demodb_AnythingGoes == nil || __VDLType19 == nil {
- panic("Initialization order error: types generated for FillVDLTarget not initialized. Consider moving caller to an init() block.")
- }
fieldsTarget1, err := t.StartFields(tt)
if err != nil {
return err
@@ -2509,7 +2472,7 @@
return err
}
if err != vdl.ErrFieldNoExist {
- if err := fieldTarget3.FromString(string(m.NameOfType), vdl.StringType); err != nil {
+ if err := fieldTarget3.FromString(string(m.NameOfType), tt.NonOptional().Field(0).Type); err != nil {
return err
}
if err := fieldsTarget1.FinishField(keyTarget2, fieldTarget3); err != nil {
@@ -2523,11 +2486,11 @@
if err != vdl.ErrFieldNoExist {
if m.Anything == nil {
- if err := fieldTarget5.FromNil(vdl.AnyType); err != nil {
+ if err := fieldTarget5.FromNil(tt.NonOptional().Field(1).Type); err != nil {
return err
}
} else {
- if err := m.Anything.FillVDLTarget(fieldTarget5, vdl.AnyType); err != nil {
+ if err := m.Anything.FillVDLTarget(fieldTarget5, tt.NonOptional().Field(1).Type); err != nil {
return err
}
}
@@ -2555,8 +2518,8 @@
func (t *AnythingGoesTarget) StartFields(tt *vdl.Type) (vdl.FieldsTarget, error) {
- if !vdl.Compatible(tt, __VDLType_v_io_x_ref_cmd_sb_internal_demodb_AnythingGoes) {
- return nil, fmt.Errorf("type %v incompatible with %v", tt, __VDLType_v_io_x_ref_cmd_sb_internal_demodb_AnythingGoes)
+ if ttWant := vdl.TypeOf((*AnythingGoes)(nil)).Elem(); !vdl.Compatible(tt, ttWant) {
+ return nil, fmt.Errorf("type %v incompatible with %v", tt, ttWant)
}
return t, nil
}
@@ -2570,7 +2533,7 @@
target, err := vdl.ReflectTarget(reflect.ValueOf(&t.Value.Anything))
return nil, target, err
default:
- return nil, nil, fmt.Errorf("field %s not in struct %v", name, __VDLType_v_io_x_ref_cmd_sb_internal_demodb_AnythingGoes)
+ return nil, nil, fmt.Errorf("field %s not in struct v.io/x/ref/cmd/sb/internal/demodb.AnythingGoes", name)
}
}
func (t *AnythingGoesTarget) FinishField(_, _ vdl.Target) error {
@@ -2581,7 +2544,27 @@
return nil
}
-func init() {
+var __VDLInitCalled bool
+
+// __VDLInit performs vdl initialization. It is safe to call multiple times.
+// If you have an init ordering issue, just insert the following line verbatim
+// into your source files in this package, right after the "package foo" clause:
+//
+// var _ = __VDLInit()
+//
+// The purpose of this function is to ensure that vdl initialization occurs in
+// the right order, and very early in the init sequence. In particular, vdl
+// registration and package variable initialization needs to occur before
+// functions like vdl.TypeOf will work properly.
+//
+// This function returns a dummy value, so that it can be used to initialize the
+// first var in the file, to take advantage of Go's defined init order.
+func __VDLInit() struct{} {
+ if __VDLInitCalled {
+ return struct{}{}
+ }
+
+ // Register types.
vdl.Register((*AddressInfo)(nil))
vdl.Register((*CreditAgency)(nil))
vdl.Register((*ExperianRating)(nil))
@@ -2593,10 +2576,10 @@
vdl.Register((*Customer)(nil))
vdl.Register((*Invoice)(nil))
vdl.Register((*Numbers)(nil))
- vdl.Register((*FooType)(nil))
- vdl.Register((*BarType)(nil))
vdl.Register((*TitleOrValueType)(nil))
vdl.Register((*BazType)(nil))
+ vdl.Register((*BarType)(nil))
+ vdl.Register((*FooType)(nil))
vdl.Register((*Array2String)(nil))
vdl.Register((*Composite)(nil))
vdl.Register((*Times)(nil))
@@ -2604,402 +2587,6 @@
vdl.Register((*ActOrSatScore)(nil))
vdl.Register((*Student)(nil))
vdl.Register((*AnythingGoes)(nil))
-}
-var __VDLType0 *vdl.Type = vdl.TypeOf((*AddressInfo)(nil))
-var __VDLType19 *vdl.Type = vdl.TypeOf((*AnythingGoes)(nil))
-var __VDLType9 *vdl.Type = vdl.TypeOf((*BarType)(nil))
-var __VDLType10 *vdl.Type = vdl.TypeOf((*BazType)(nil))
-var __VDLType11 *vdl.Type = vdl.TypeOf((*Composite)(nil))
-var __VDLType4 *vdl.Type = vdl.TypeOf((*CreditReport)(nil))
-var __VDLType5 *vdl.Type = vdl.TypeOf((*Customer)(nil))
-var __VDLType1 *vdl.Type = vdl.TypeOf((*EquifaxCreditReport)(nil))
-var __VDLType2 *vdl.Type = vdl.TypeOf((*ExperianCreditReport)(nil))
-var __VDLType8 *vdl.Type = vdl.TypeOf((*FooType)(nil))
-var __VDLType6 *vdl.Type = vdl.TypeOf((*Invoice)(nil))
-var __VDLType7 *vdl.Type = vdl.TypeOf((*Numbers)(nil))
-var __VDLType16 *vdl.Type
-
-func __VDLType16_gen() *vdl.Type {
- __VDLType16Builder := vdl.TypeBuilder{}
-
- __VDLType161 := __VDLType16Builder.Optional()
- __VDLType162 := __VDLType16Builder.Struct()
- __VDLType163 := __VDLType16Builder.Named("v.io/x/ref/cmd/sb/internal/demodb.Recursive").AssignBase(__VDLType162)
- __VDLType164 := vdl.AnyType
- __VDLType162.AppendField("Any", __VDLType164)
- __VDLType165 := __VDLType16Builder.Optional()
- __VDLType166 := __VDLType16Builder.Struct()
- __VDLType167 := __VDLType16Builder.Named("v.io/x/ref/cmd/sb/internal/demodb.Times").AssignBase(__VDLType166)
- __VDLType168 := __VDLType16Builder.Struct()
- __VDLType169 := __VDLType16Builder.Named("time.Time").AssignBase(__VDLType168)
- __VDLType1610 := vdl.Int64Type
- __VDLType168.AppendField("Seconds", __VDLType1610)
- __VDLType1611 := vdl.Int32Type
- __VDLType168.AppendField("Nanos", __VDLType1611)
- __VDLType166.AppendField("Stamp", __VDLType169)
- __VDLType1612 := __VDLType16Builder.Struct()
- __VDLType1613 := __VDLType16Builder.Named("time.Duration").AssignBase(__VDLType1612)
- __VDLType1612.AppendField("Seconds", __VDLType1610)
- __VDLType1612.AppendField("Nanos", __VDLType1611)
- __VDLType166.AppendField("Interval", __VDLType1613)
- __VDLType165.AssignElem(__VDLType167)
- __VDLType162.AppendField("Maybe", __VDLType165)
- __VDLType1614 := __VDLType16Builder.Map()
- __VDLType1615 := __VDLType16Builder.Array()
- __VDLType1616 := __VDLType16Builder.Named("v.io/x/ref/cmd/sb/internal/demodb.Array2String").AssignBase(__VDLType1615)
- __VDLType1617 := vdl.StringType
- __VDLType1615.AssignElem(__VDLType1617)
- __VDLType1615.AssignLen(2)
- __VDLType1614.AssignKey(__VDLType1616)
- __VDLType1614.AssignElem(__VDLType163)
- __VDLType162.AppendField("Rec", __VDLType1614)
- __VDLType161.AssignElem(__VDLType163)
- __VDLType16Builder.Build()
- __VDLType16v, err := __VDLType161.Built()
- if err != nil {
- panic(err)
- }
- return __VDLType16v
-}
-func init() {
- __VDLType16 = __VDLType16_gen()
-}
-
-var __VDLType18 *vdl.Type
-
-func __VDLType18_gen() *vdl.Type {
- __VDLType18Builder := vdl.TypeBuilder{}
-
- __VDLType181 := __VDLType18Builder.Optional()
- __VDLType182 := __VDLType18Builder.Struct()
- __VDLType183 := __VDLType18Builder.Named("v.io/x/ref/cmd/sb/internal/demodb.Student").AssignBase(__VDLType182)
- __VDLType184 := vdl.StringType
- __VDLType182.AppendField("Name", __VDLType184)
- __VDLType185 := __VDLType18Builder.Struct()
- __VDLType186 := __VDLType18Builder.Named("time.Time").AssignBase(__VDLType185)
- __VDLType187 := vdl.Int64Type
- __VDLType185.AppendField("Seconds", __VDLType187)
- __VDLType188 := vdl.Int32Type
- __VDLType185.AppendField("Nanos", __VDLType188)
- __VDLType182.AppendField("TestTime", __VDLType186)
- __VDLType189 := __VDLType18Builder.Union()
- __VDLType1810 := __VDLType18Builder.Named("v.io/x/ref/cmd/sb/internal/demodb.ActOrSatScore").AssignBase(__VDLType189)
- __VDLType1811 := vdl.Uint16Type
- __VDLType189.AppendField("ActScore", __VDLType1811)
- __VDLType189.AppendField("SatScore", __VDLType1811)
- __VDLType182.AppendField("Score", __VDLType1810)
- __VDLType181.AssignElem(__VDLType183)
- __VDLType18Builder.Build()
- __VDLType18v, err := __VDLType181.Built()
- if err != nil {
- panic(err)
- }
- return __VDLType18v
-}
-func init() {
- __VDLType18 = __VDLType18_gen()
-}
-
-var __VDLType15 *vdl.Type
-
-func __VDLType15_gen() *vdl.Type {
- __VDLType15Builder := vdl.TypeBuilder{}
-
- __VDLType151 := __VDLType15Builder.Optional()
- __VDLType152 := __VDLType15Builder.Struct()
- __VDLType153 := __VDLType15Builder.Named("v.io/x/ref/cmd/sb/internal/demodb.Times").AssignBase(__VDLType152)
- __VDLType154 := __VDLType15Builder.Struct()
- __VDLType155 := __VDLType15Builder.Named("time.Time").AssignBase(__VDLType154)
- __VDLType156 := vdl.Int64Type
- __VDLType154.AppendField("Seconds", __VDLType156)
- __VDLType157 := vdl.Int32Type
- __VDLType154.AppendField("Nanos", __VDLType157)
- __VDLType152.AppendField("Stamp", __VDLType155)
- __VDLType158 := __VDLType15Builder.Struct()
- __VDLType159 := __VDLType15Builder.Named("time.Duration").AssignBase(__VDLType158)
- __VDLType158.AppendField("Seconds", __VDLType156)
- __VDLType158.AppendField("Nanos", __VDLType157)
- __VDLType152.AppendField("Interval", __VDLType159)
- __VDLType151.AssignElem(__VDLType153)
- __VDLType15Builder.Build()
- __VDLType15v, err := __VDLType151.Built()
- if err != nil {
- panic(err)
- }
- return __VDLType15v
-}
-func init() {
- __VDLType15 = __VDLType15_gen()
-}
-
-var __VDLType3 *vdl.Type = vdl.TypeOf((*TransUnionCreditReport)(nil))
-var __VDLType12 *vdl.Type = vdl.TypeOf([]int32(nil))
-var __VDLType14 *vdl.Type = vdl.TypeOf(map[string]int32(nil))
-var __VDLType17 *vdl.Type
-
-func __VDLType17_gen() *vdl.Type {
- __VDLType17Builder := vdl.TypeBuilder{}
-
- __VDLType171 := __VDLType17Builder.Map()
- __VDLType172 := __VDLType17Builder.Array()
- __VDLType173 := __VDLType17Builder.Named("v.io/x/ref/cmd/sb/internal/demodb.Array2String").AssignBase(__VDLType172)
- __VDLType174 := vdl.StringType
- __VDLType172.AssignElem(__VDLType174)
- __VDLType172.AssignLen(2)
- __VDLType171.AssignKey(__VDLType173)
- __VDLType175 := __VDLType17Builder.Struct()
- __VDLType176 := __VDLType17Builder.Named("v.io/x/ref/cmd/sb/internal/demodb.Recursive").AssignBase(__VDLType175)
- __VDLType177 := vdl.AnyType
- __VDLType175.AppendField("Any", __VDLType177)
- __VDLType178 := __VDLType17Builder.Optional()
- __VDLType179 := __VDLType17Builder.Struct()
- __VDLType1710 := __VDLType17Builder.Named("v.io/x/ref/cmd/sb/internal/demodb.Times").AssignBase(__VDLType179)
- __VDLType1711 := __VDLType17Builder.Struct()
- __VDLType1712 := __VDLType17Builder.Named("time.Time").AssignBase(__VDLType1711)
- __VDLType1713 := vdl.Int64Type
- __VDLType1711.AppendField("Seconds", __VDLType1713)
- __VDLType1714 := vdl.Int32Type
- __VDLType1711.AppendField("Nanos", __VDLType1714)
- __VDLType179.AppendField("Stamp", __VDLType1712)
- __VDLType1715 := __VDLType17Builder.Struct()
- __VDLType1716 := __VDLType17Builder.Named("time.Duration").AssignBase(__VDLType1715)
- __VDLType1715.AppendField("Seconds", __VDLType1713)
- __VDLType1715.AppendField("Nanos", __VDLType1714)
- __VDLType179.AppendField("Interval", __VDLType1716)
- __VDLType178.AssignElem(__VDLType1710)
- __VDLType175.AppendField("Maybe", __VDLType178)
- __VDLType175.AppendField("Rec", __VDLType171)
- __VDLType171.AssignElem(__VDLType176)
- __VDLType17Builder.Build()
- __VDLType17v, err := __VDLType171.Built()
- if err != nil {
- panic(err)
- }
- return __VDLType17v
-}
-func init() {
- __VDLType17 = __VDLType17_gen()
-}
-
-var __VDLType13 *vdl.Type = vdl.TypeOf(map[int32]struct{}(nil))
-var __VDLType_time_Duration *vdl.Type
-
-func __VDLType_time_Duration_gen() *vdl.Type {
- __VDLType_time_DurationBuilder := vdl.TypeBuilder{}
-
- __VDLType_time_Duration1 := __VDLType_time_DurationBuilder.Struct()
- __VDLType_time_Duration2 := __VDLType_time_DurationBuilder.Named("time.Duration").AssignBase(__VDLType_time_Duration1)
- __VDLType_time_Duration3 := vdl.Int64Type
- __VDLType_time_Duration1.AppendField("Seconds", __VDLType_time_Duration3)
- __VDLType_time_Duration4 := vdl.Int32Type
- __VDLType_time_Duration1.AppendField("Nanos", __VDLType_time_Duration4)
- __VDLType_time_DurationBuilder.Build()
- __VDLType_time_Durationv, err := __VDLType_time_Duration2.Built()
- if err != nil {
- panic(err)
- }
- return __VDLType_time_Durationv
-}
-func init() {
- __VDLType_time_Duration = __VDLType_time_Duration_gen()
-}
-
-var __VDLType_time_Time *vdl.Type
-
-func __VDLType_time_Time_gen() *vdl.Type {
- __VDLType_time_TimeBuilder := vdl.TypeBuilder{}
-
- __VDLType_time_Time1 := __VDLType_time_TimeBuilder.Struct()
- __VDLType_time_Time2 := __VDLType_time_TimeBuilder.Named("time.Time").AssignBase(__VDLType_time_Time1)
- __VDLType_time_Time3 := vdl.Int64Type
- __VDLType_time_Time1.AppendField("Seconds", __VDLType_time_Time3)
- __VDLType_time_Time4 := vdl.Int32Type
- __VDLType_time_Time1.AppendField("Nanos", __VDLType_time_Time4)
- __VDLType_time_TimeBuilder.Build()
- __VDLType_time_Timev, err := __VDLType_time_Time2.Built()
- if err != nil {
- panic(err)
- }
- return __VDLType_time_Timev
-}
-func init() {
- __VDLType_time_Time = __VDLType_time_Time_gen()
-}
-
-var __VDLType_v_io_x_ref_cmd_sb_internal_demodb_ActOrSatScore *vdl.Type = vdl.TypeOf(ActOrSatScore(ActOrSatScoreActScore{uint16(0)}))
-var __VDLType_v_io_x_ref_cmd_sb_internal_demodb_AddressInfo *vdl.Type = vdl.TypeOf(AddressInfo{})
-var __VDLType_v_io_x_ref_cmd_sb_internal_demodb_AgencyReport *vdl.Type = vdl.TypeOf(AgencyReport(AgencyReportEquifaxReport{EquifaxCreditReport{}}))
-var __VDLType_v_io_x_ref_cmd_sb_internal_demodb_AnythingGoes *vdl.Type = vdl.TypeOf(AnythingGoes{})
-var __VDLType_v_io_x_ref_cmd_sb_internal_demodb_Array2String *vdl.Type = vdl.TypeOf(Array2String{})
-var __VDLType_v_io_x_ref_cmd_sb_internal_demodb_BarType *vdl.Type = vdl.TypeOf(BarType{
- Baz: BazType{
- TitleOrValue: TitleOrValueTypeTitle{""},
- },
-})
-var __VDLType_v_io_x_ref_cmd_sb_internal_demodb_BazType *vdl.Type = vdl.TypeOf(BazType{
- TitleOrValue: TitleOrValueTypeTitle{""},
-})
-var __VDLType_v_io_x_ref_cmd_sb_internal_demodb_Composite *vdl.Type = vdl.TypeOf(Composite{})
-var __VDLType_v_io_x_ref_cmd_sb_internal_demodb_CreditAgency *vdl.Type = vdl.TypeOf(CreditAgencyEquifax)
-var __VDLType_v_io_x_ref_cmd_sb_internal_demodb_CreditReport *vdl.Type = vdl.TypeOf(CreditReport{
- Report: AgencyReportEquifaxReport{EquifaxCreditReport{}},
-})
-var __VDLType_v_io_x_ref_cmd_sb_internal_demodb_Customer *vdl.Type = vdl.TypeOf(Customer{
- Credit: CreditReport{
- Report: AgencyReportEquifaxReport{EquifaxCreditReport{}},
- },
-})
-var __VDLType_v_io_x_ref_cmd_sb_internal_demodb_EquifaxCreditReport *vdl.Type = vdl.TypeOf(EquifaxCreditReport{})
-var __VDLType_v_io_x_ref_cmd_sb_internal_demodb_ExperianCreditReport *vdl.Type = vdl.TypeOf(ExperianCreditReport{})
-var __VDLType_v_io_x_ref_cmd_sb_internal_demodb_ExperianRating *vdl.Type = vdl.TypeOf(ExperianRatingGood)
-var __VDLType_v_io_x_ref_cmd_sb_internal_demodb_FooType *vdl.Type = vdl.TypeOf(FooType{
- Bar: BarType{
- Baz: BazType{
- TitleOrValue: TitleOrValueTypeTitle{""},
- },
- },
-})
-var __VDLType_v_io_x_ref_cmd_sb_internal_demodb_Invoice *vdl.Type = vdl.TypeOf(Invoice{})
-var __VDLType_v_io_x_ref_cmd_sb_internal_demodb_Numbers *vdl.Type = vdl.TypeOf(Numbers{})
-var __VDLType_v_io_x_ref_cmd_sb_internal_demodb_Recursive *vdl.Type
-
-func __VDLType_v_io_x_ref_cmd_sb_internal_demodb_Recursive_gen() *vdl.Type {
- __VDLType_v_io_x_ref_cmd_sb_internal_demodb_RecursiveBuilder := vdl.TypeBuilder{}
-
- __VDLType_v_io_x_ref_cmd_sb_internal_demodb_Recursive1 := __VDLType_v_io_x_ref_cmd_sb_internal_demodb_RecursiveBuilder.Struct()
- __VDLType_v_io_x_ref_cmd_sb_internal_demodb_Recursive2 := __VDLType_v_io_x_ref_cmd_sb_internal_demodb_RecursiveBuilder.Named("v.io/x/ref/cmd/sb/internal/demodb.Recursive").AssignBase(__VDLType_v_io_x_ref_cmd_sb_internal_demodb_Recursive1)
- __VDLType_v_io_x_ref_cmd_sb_internal_demodb_Recursive3 := vdl.AnyType
- __VDLType_v_io_x_ref_cmd_sb_internal_demodb_Recursive1.AppendField("Any", __VDLType_v_io_x_ref_cmd_sb_internal_demodb_Recursive3)
- __VDLType_v_io_x_ref_cmd_sb_internal_demodb_Recursive4 := __VDLType_v_io_x_ref_cmd_sb_internal_demodb_RecursiveBuilder.Optional()
- __VDLType_v_io_x_ref_cmd_sb_internal_demodb_Recursive5 := __VDLType_v_io_x_ref_cmd_sb_internal_demodb_RecursiveBuilder.Struct()
- __VDLType_v_io_x_ref_cmd_sb_internal_demodb_Recursive6 := __VDLType_v_io_x_ref_cmd_sb_internal_demodb_RecursiveBuilder.Named("v.io/x/ref/cmd/sb/internal/demodb.Times").AssignBase(__VDLType_v_io_x_ref_cmd_sb_internal_demodb_Recursive5)
- __VDLType_v_io_x_ref_cmd_sb_internal_demodb_Recursive7 := __VDLType_v_io_x_ref_cmd_sb_internal_demodb_RecursiveBuilder.Struct()
- __VDLType_v_io_x_ref_cmd_sb_internal_demodb_Recursive8 := __VDLType_v_io_x_ref_cmd_sb_internal_demodb_RecursiveBuilder.Named("time.Time").AssignBase(__VDLType_v_io_x_ref_cmd_sb_internal_demodb_Recursive7)
- __VDLType_v_io_x_ref_cmd_sb_internal_demodb_Recursive9 := vdl.Int64Type
- __VDLType_v_io_x_ref_cmd_sb_internal_demodb_Recursive7.AppendField("Seconds", __VDLType_v_io_x_ref_cmd_sb_internal_demodb_Recursive9)
- __VDLType_v_io_x_ref_cmd_sb_internal_demodb_Recursive10 := vdl.Int32Type
- __VDLType_v_io_x_ref_cmd_sb_internal_demodb_Recursive7.AppendField("Nanos", __VDLType_v_io_x_ref_cmd_sb_internal_demodb_Recursive10)
- __VDLType_v_io_x_ref_cmd_sb_internal_demodb_Recursive5.AppendField("Stamp", __VDLType_v_io_x_ref_cmd_sb_internal_demodb_Recursive8)
- __VDLType_v_io_x_ref_cmd_sb_internal_demodb_Recursive11 := __VDLType_v_io_x_ref_cmd_sb_internal_demodb_RecursiveBuilder.Struct()
- __VDLType_v_io_x_ref_cmd_sb_internal_demodb_Recursive12 := __VDLType_v_io_x_ref_cmd_sb_internal_demodb_RecursiveBuilder.Named("time.Duration").AssignBase(__VDLType_v_io_x_ref_cmd_sb_internal_demodb_Recursive11)
- __VDLType_v_io_x_ref_cmd_sb_internal_demodb_Recursive11.AppendField("Seconds", __VDLType_v_io_x_ref_cmd_sb_internal_demodb_Recursive9)
- __VDLType_v_io_x_ref_cmd_sb_internal_demodb_Recursive11.AppendField("Nanos", __VDLType_v_io_x_ref_cmd_sb_internal_demodb_Recursive10)
- __VDLType_v_io_x_ref_cmd_sb_internal_demodb_Recursive5.AppendField("Interval", __VDLType_v_io_x_ref_cmd_sb_internal_demodb_Recursive12)
- __VDLType_v_io_x_ref_cmd_sb_internal_demodb_Recursive4.AssignElem(__VDLType_v_io_x_ref_cmd_sb_internal_demodb_Recursive6)
- __VDLType_v_io_x_ref_cmd_sb_internal_demodb_Recursive1.AppendField("Maybe", __VDLType_v_io_x_ref_cmd_sb_internal_demodb_Recursive4)
- __VDLType_v_io_x_ref_cmd_sb_internal_demodb_Recursive13 := __VDLType_v_io_x_ref_cmd_sb_internal_demodb_RecursiveBuilder.Map()
- __VDLType_v_io_x_ref_cmd_sb_internal_demodb_Recursive14 := __VDLType_v_io_x_ref_cmd_sb_internal_demodb_RecursiveBuilder.Array()
- __VDLType_v_io_x_ref_cmd_sb_internal_demodb_Recursive15 := __VDLType_v_io_x_ref_cmd_sb_internal_demodb_RecursiveBuilder.Named("v.io/x/ref/cmd/sb/internal/demodb.Array2String").AssignBase(__VDLType_v_io_x_ref_cmd_sb_internal_demodb_Recursive14)
- __VDLType_v_io_x_ref_cmd_sb_internal_demodb_Recursive16 := vdl.StringType
- __VDLType_v_io_x_ref_cmd_sb_internal_demodb_Recursive14.AssignElem(__VDLType_v_io_x_ref_cmd_sb_internal_demodb_Recursive16)
- __VDLType_v_io_x_ref_cmd_sb_internal_demodb_Recursive14.AssignLen(2)
- __VDLType_v_io_x_ref_cmd_sb_internal_demodb_Recursive13.AssignKey(__VDLType_v_io_x_ref_cmd_sb_internal_demodb_Recursive15)
- __VDLType_v_io_x_ref_cmd_sb_internal_demodb_Recursive13.AssignElem(__VDLType_v_io_x_ref_cmd_sb_internal_demodb_Recursive2)
- __VDLType_v_io_x_ref_cmd_sb_internal_demodb_Recursive1.AppendField("Rec", __VDLType_v_io_x_ref_cmd_sb_internal_demodb_Recursive13)
- __VDLType_v_io_x_ref_cmd_sb_internal_demodb_RecursiveBuilder.Build()
- __VDLType_v_io_x_ref_cmd_sb_internal_demodb_Recursivev, err := __VDLType_v_io_x_ref_cmd_sb_internal_demodb_Recursive2.Built()
- if err != nil {
- panic(err)
- }
- return __VDLType_v_io_x_ref_cmd_sb_internal_demodb_Recursivev
-}
-func init() {
- __VDLType_v_io_x_ref_cmd_sb_internal_demodb_Recursive = __VDLType_v_io_x_ref_cmd_sb_internal_demodb_Recursive_gen()
-}
-
-var __VDLType_v_io_x_ref_cmd_sb_internal_demodb_Student *vdl.Type
-
-func __VDLType_v_io_x_ref_cmd_sb_internal_demodb_Student_gen() *vdl.Type {
- __VDLType_v_io_x_ref_cmd_sb_internal_demodb_StudentBuilder := vdl.TypeBuilder{}
-
- __VDLType_v_io_x_ref_cmd_sb_internal_demodb_Student1 := __VDLType_v_io_x_ref_cmd_sb_internal_demodb_StudentBuilder.Struct()
- __VDLType_v_io_x_ref_cmd_sb_internal_demodb_Student2 := __VDLType_v_io_x_ref_cmd_sb_internal_demodb_StudentBuilder.Named("v.io/x/ref/cmd/sb/internal/demodb.Student").AssignBase(__VDLType_v_io_x_ref_cmd_sb_internal_demodb_Student1)
- __VDLType_v_io_x_ref_cmd_sb_internal_demodb_Student3 := vdl.StringType
- __VDLType_v_io_x_ref_cmd_sb_internal_demodb_Student1.AppendField("Name", __VDLType_v_io_x_ref_cmd_sb_internal_demodb_Student3)
- __VDLType_v_io_x_ref_cmd_sb_internal_demodb_Student4 := __VDLType_v_io_x_ref_cmd_sb_internal_demodb_StudentBuilder.Struct()
- __VDLType_v_io_x_ref_cmd_sb_internal_demodb_Student5 := __VDLType_v_io_x_ref_cmd_sb_internal_demodb_StudentBuilder.Named("time.Time").AssignBase(__VDLType_v_io_x_ref_cmd_sb_internal_demodb_Student4)
- __VDLType_v_io_x_ref_cmd_sb_internal_demodb_Student6 := vdl.Int64Type
- __VDLType_v_io_x_ref_cmd_sb_internal_demodb_Student4.AppendField("Seconds", __VDLType_v_io_x_ref_cmd_sb_internal_demodb_Student6)
- __VDLType_v_io_x_ref_cmd_sb_internal_demodb_Student7 := vdl.Int32Type
- __VDLType_v_io_x_ref_cmd_sb_internal_demodb_Student4.AppendField("Nanos", __VDLType_v_io_x_ref_cmd_sb_internal_demodb_Student7)
- __VDLType_v_io_x_ref_cmd_sb_internal_demodb_Student1.AppendField("TestTime", __VDLType_v_io_x_ref_cmd_sb_internal_demodb_Student5)
- __VDLType_v_io_x_ref_cmd_sb_internal_demodb_Student8 := __VDLType_v_io_x_ref_cmd_sb_internal_demodb_StudentBuilder.Union()
- __VDLType_v_io_x_ref_cmd_sb_internal_demodb_Student9 := __VDLType_v_io_x_ref_cmd_sb_internal_demodb_StudentBuilder.Named("v.io/x/ref/cmd/sb/internal/demodb.ActOrSatScore").AssignBase(__VDLType_v_io_x_ref_cmd_sb_internal_demodb_Student8)
- __VDLType_v_io_x_ref_cmd_sb_internal_demodb_Student10 := vdl.Uint16Type
- __VDLType_v_io_x_ref_cmd_sb_internal_demodb_Student8.AppendField("ActScore", __VDLType_v_io_x_ref_cmd_sb_internal_demodb_Student10)
- __VDLType_v_io_x_ref_cmd_sb_internal_demodb_Student8.AppendField("SatScore", __VDLType_v_io_x_ref_cmd_sb_internal_demodb_Student10)
- __VDLType_v_io_x_ref_cmd_sb_internal_demodb_Student1.AppendField("Score", __VDLType_v_io_x_ref_cmd_sb_internal_demodb_Student9)
- __VDLType_v_io_x_ref_cmd_sb_internal_demodb_StudentBuilder.Build()
- __VDLType_v_io_x_ref_cmd_sb_internal_demodb_Studentv, err := __VDLType_v_io_x_ref_cmd_sb_internal_demodb_Student2.Built()
- if err != nil {
- panic(err)
- }
- return __VDLType_v_io_x_ref_cmd_sb_internal_demodb_Studentv
-}
-func init() {
- __VDLType_v_io_x_ref_cmd_sb_internal_demodb_Student = __VDLType_v_io_x_ref_cmd_sb_internal_demodb_Student_gen()
-}
-
-var __VDLType_v_io_x_ref_cmd_sb_internal_demodb_Times *vdl.Type
-
-func __VDLType_v_io_x_ref_cmd_sb_internal_demodb_Times_gen() *vdl.Type {
- __VDLType_v_io_x_ref_cmd_sb_internal_demodb_TimesBuilder := vdl.TypeBuilder{}
-
- __VDLType_v_io_x_ref_cmd_sb_internal_demodb_Times1 := __VDLType_v_io_x_ref_cmd_sb_internal_demodb_TimesBuilder.Struct()
- __VDLType_v_io_x_ref_cmd_sb_internal_demodb_Times2 := __VDLType_v_io_x_ref_cmd_sb_internal_demodb_TimesBuilder.Named("v.io/x/ref/cmd/sb/internal/demodb.Times").AssignBase(__VDLType_v_io_x_ref_cmd_sb_internal_demodb_Times1)
- __VDLType_v_io_x_ref_cmd_sb_internal_demodb_Times3 := __VDLType_v_io_x_ref_cmd_sb_internal_demodb_TimesBuilder.Struct()
- __VDLType_v_io_x_ref_cmd_sb_internal_demodb_Times4 := __VDLType_v_io_x_ref_cmd_sb_internal_demodb_TimesBuilder.Named("time.Time").AssignBase(__VDLType_v_io_x_ref_cmd_sb_internal_demodb_Times3)
- __VDLType_v_io_x_ref_cmd_sb_internal_demodb_Times5 := vdl.Int64Type
- __VDLType_v_io_x_ref_cmd_sb_internal_demodb_Times3.AppendField("Seconds", __VDLType_v_io_x_ref_cmd_sb_internal_demodb_Times5)
- __VDLType_v_io_x_ref_cmd_sb_internal_demodb_Times6 := vdl.Int32Type
- __VDLType_v_io_x_ref_cmd_sb_internal_demodb_Times3.AppendField("Nanos", __VDLType_v_io_x_ref_cmd_sb_internal_demodb_Times6)
- __VDLType_v_io_x_ref_cmd_sb_internal_demodb_Times1.AppendField("Stamp", __VDLType_v_io_x_ref_cmd_sb_internal_demodb_Times4)
- __VDLType_v_io_x_ref_cmd_sb_internal_demodb_Times7 := __VDLType_v_io_x_ref_cmd_sb_internal_demodb_TimesBuilder.Struct()
- __VDLType_v_io_x_ref_cmd_sb_internal_demodb_Times8 := __VDLType_v_io_x_ref_cmd_sb_internal_demodb_TimesBuilder.Named("time.Duration").AssignBase(__VDLType_v_io_x_ref_cmd_sb_internal_demodb_Times7)
- __VDLType_v_io_x_ref_cmd_sb_internal_demodb_Times7.AppendField("Seconds", __VDLType_v_io_x_ref_cmd_sb_internal_demodb_Times5)
- __VDLType_v_io_x_ref_cmd_sb_internal_demodb_Times7.AppendField("Nanos", __VDLType_v_io_x_ref_cmd_sb_internal_demodb_Times6)
- __VDLType_v_io_x_ref_cmd_sb_internal_demodb_Times1.AppendField("Interval", __VDLType_v_io_x_ref_cmd_sb_internal_demodb_Times8)
- __VDLType_v_io_x_ref_cmd_sb_internal_demodb_TimesBuilder.Build()
- __VDLType_v_io_x_ref_cmd_sb_internal_demodb_Timesv, err := __VDLType_v_io_x_ref_cmd_sb_internal_demodb_Times2.Built()
- if err != nil {
- panic(err)
- }
- return __VDLType_v_io_x_ref_cmd_sb_internal_demodb_Timesv
-}
-func init() {
- __VDLType_v_io_x_ref_cmd_sb_internal_demodb_Times = __VDLType_v_io_x_ref_cmd_sb_internal_demodb_Times_gen()
-}
-
-var __VDLType_v_io_x_ref_cmd_sb_internal_demodb_TitleOrValueType *vdl.Type = vdl.TypeOf(TitleOrValueType(TitleOrValueTypeTitle{""}))
-var __VDLType_v_io_x_ref_cmd_sb_internal_demodb_TransUnionCreditReport *vdl.Type = vdl.TypeOf(TransUnionCreditReport{})
-
-func __VDLEnsureNativeBuilt() {
- if __VDLType16 == nil {
- __VDLType16 = __VDLType16_gen()
- }
- if __VDLType18 == nil {
- __VDLType18 = __VDLType18_gen()
- }
- if __VDLType15 == nil {
- __VDLType15 = __VDLType15_gen()
- }
- if __VDLType17 == nil {
- __VDLType17 = __VDLType17_gen()
- }
- if __VDLType_time_Duration == nil {
- __VDLType_time_Duration = __VDLType_time_Duration_gen()
- }
- if __VDLType_time_Time == nil {
- __VDLType_time_Time = __VDLType_time_Time_gen()
- }
- if __VDLType_v_io_x_ref_cmd_sb_internal_demodb_Recursive == nil {
- __VDLType_v_io_x_ref_cmd_sb_internal_demodb_Recursive = __VDLType_v_io_x_ref_cmd_sb_internal_demodb_Recursive_gen()
- }
- if __VDLType_v_io_x_ref_cmd_sb_internal_demodb_Student == nil {
- __VDLType_v_io_x_ref_cmd_sb_internal_demodb_Student = __VDLType_v_io_x_ref_cmd_sb_internal_demodb_Student_gen()
- }
- if __VDLType_v_io_x_ref_cmd_sb_internal_demodb_Times == nil {
- __VDLType_v_io_x_ref_cmd_sb_internal_demodb_Times = __VDLType_v_io_x_ref_cmd_sb_internal_demodb_Times_gen()
- }
+ return struct{}{}
}
diff --git a/cmd/vom/main.vdl.go b/cmd/vom/main.vdl.go
index b937f09..2f29d60 100644
--- a/cmd/vom/main.vdl.go
+++ b/cmd/vom/main.vdl.go
@@ -12,6 +12,11 @@
"v.io/v23/vdl"
)
+var _ = __VDLInit() // Must be first; see __VDLInit comments for details.
+
+//////////////////////////////////////////////////
+// Type definitions
+
type dataRep int
const (
@@ -60,7 +65,7 @@
}
func (m *dataRep) FillVDLTarget(t vdl.Target, tt *vdl.Type) error {
- if err := t.FromEnumLabel((*m).String(), __VDLType_v_io_x_ref_cmd_vom_dataRep); err != nil {
+ if err := t.FromEnumLabel((*m).String(), tt); err != nil {
return err
}
return nil
@@ -77,8 +82,8 @@
func (t *dataRepTarget) FromEnumLabel(src string, tt *vdl.Type) error {
- if !vdl.Compatible(tt, __VDLType_v_io_x_ref_cmd_vom_dataRep) {
- return fmt.Errorf("type %v incompatible with %v", tt, __VDLType_v_io_x_ref_cmd_vom_dataRep)
+ if ttWant := vdl.TypeOf((*dataRep)(nil)); !vdl.Compatible(tt, ttWant) {
+ return fmt.Errorf("type %v incompatible with %v", tt, ttWant)
}
switch src {
case "Hex":
@@ -86,17 +91,34 @@
case "Binary":
*t.Value = 1
default:
- return fmt.Errorf("label %s not in enum %v", src, __VDLType_v_io_x_ref_cmd_vom_dataRep)
+ return fmt.Errorf("label %s not in enum v.io/x/ref/cmd/vom.dataRep", src)
}
return nil
}
-func init() {
+var __VDLInitCalled bool
+
+// __VDLInit performs vdl initialization. It is safe to call multiple times.
+// If you have an init ordering issue, just insert the following line verbatim
+// into your source files in this package, right after the "package foo" clause:
+//
+// var _ = __VDLInit()
+//
+// The purpose of this function is to ensure that vdl initialization occurs in
+// the right order, and very early in the init sequence. In particular, vdl
+// registration and package variable initialization needs to occur before
+// functions like vdl.TypeOf will work properly.
+//
+// This function returns a dummy value, so that it can be used to initialize the
+// first var in the file, to take advantage of Go's defined init order.
+func __VDLInit() struct{} {
+ if __VDLInitCalled {
+ return struct{}{}
+ }
+
+ // Register types.
vdl.Register((*dataRep)(nil))
-}
-var __VDLType_v_io_x_ref_cmd_vom_dataRep *vdl.Type = vdl.TypeOf(dataRepHex)
-
-func __VDLEnsureNativeBuilt() {
+ return struct{}{}
}
diff --git a/cmd/vrpc/internal/internal.vdl.go b/cmd/vrpc/internal/internal.vdl.go
index aa15298..5d81f7c 100644
--- a/cmd/vrpc/internal/internal.vdl.go
+++ b/cmd/vrpc/internal/internal.vdl.go
@@ -16,6 +16,11 @@
"v.io/v23/vdl"
)
+var _ = __VDLInit() // Must be first; see __VDLInit comments for details.
+
+//////////////////////////////////////////////////
+// Type definitions
+
type Struct struct {
X int32
Y int32
@@ -27,9 +32,6 @@
}
func (m *Struct) FillVDLTarget(t vdl.Target, tt *vdl.Type) error {
- if __VDLType_v_io_x_ref_cmd_vrpc_internal_Struct == nil || __VDLType0 == nil {
- panic("Initialization order error: types generated for FillVDLTarget not initialized. Consider moving caller to an init() block.")
- }
fieldsTarget1, err := t.StartFields(tt)
if err != nil {
return err
@@ -40,7 +42,7 @@
return err
}
if err != vdl.ErrFieldNoExist {
- if err := fieldTarget3.FromInt(int64(m.X), vdl.Int32Type); err != nil {
+ if err := fieldTarget3.FromInt(int64(m.X), tt.NonOptional().Field(0).Type); err != nil {
return err
}
if err := fieldsTarget1.FinishField(keyTarget2, fieldTarget3); err != nil {
@@ -52,7 +54,7 @@
return err
}
if err != vdl.ErrFieldNoExist {
- if err := fieldTarget5.FromInt(int64(m.Y), vdl.Int32Type); err != nil {
+ if err := fieldTarget5.FromInt(int64(m.Y), tt.NonOptional().Field(1).Type); err != nil {
return err
}
if err := fieldsTarget1.FinishField(keyTarget4, fieldTarget5); err != nil {
@@ -79,8 +81,8 @@
func (t *StructTarget) StartFields(tt *vdl.Type) (vdl.FieldsTarget, error) {
- if !vdl.Compatible(tt, __VDLType_v_io_x_ref_cmd_vrpc_internal_Struct) {
- return nil, fmt.Errorf("type %v incompatible with %v", tt, __VDLType_v_io_x_ref_cmd_vrpc_internal_Struct)
+ if ttWant := vdl.TypeOf((*Struct)(nil)).Elem(); !vdl.Compatible(tt, ttWant) {
+ return nil, fmt.Errorf("type %v incompatible with %v", tt, ttWant)
}
return t, nil
}
@@ -95,7 +97,7 @@
target, err := &t.yTarget, error(nil)
return nil, target, err
default:
- return nil, nil, fmt.Errorf("field %s not in struct %v", name, __VDLType_v_io_x_ref_cmd_vrpc_internal_Struct)
+ return nil, nil, fmt.Errorf("field %s not in struct v.io/x/ref/cmd/vrpc/internal.Struct", name)
}
}
func (t *StructTarget) FinishField(_, _ vdl.Target) error {
@@ -114,7 +116,7 @@
}
func (m *Array2Int) FillVDLTarget(t vdl.Target, tt *vdl.Type) error {
- listTarget1, err := t.StartList(__VDLType_v_io_x_ref_cmd_vrpc_internal_Array2Int, 2)
+ listTarget1, err := t.StartList(tt, 2)
if err != nil {
return err
}
@@ -123,7 +125,7 @@
if err != nil {
return err
}
- if err := elemTarget2.FromInt(int64(elem3), vdl.Int32Type); err != nil {
+ if err := elemTarget2.FromInt(int64(elem3), tt.NonOptional().Elem()); err != nil {
return err
}
if err := listTarget1.FinishElem(elemTarget2); err != nil {
@@ -150,8 +152,8 @@
func (t *Array2IntTarget) StartList(tt *vdl.Type, len int) (vdl.ListTarget, error) {
- if !vdl.Compatible(tt, __VDLType_v_io_x_ref_cmd_vrpc_internal_Array2Int) {
- return nil, fmt.Errorf("type %v incompatible with %v", tt, __VDLType_v_io_x_ref_cmd_vrpc_internal_Array2Int)
+ if ttWant := vdl.TypeOf((*Array2Int)(nil)); !vdl.Compatible(tt, ttWant) {
+ return nil, fmt.Errorf("type %v incompatible with %v", tt, ttWant)
}
return t, nil
}
@@ -168,17 +170,8 @@
return nil
}
-func init() {
- vdl.Register((*Struct)(nil))
- vdl.Register((*Array2Int)(nil))
-}
-
-var __VDLType0 *vdl.Type = vdl.TypeOf((*Struct)(nil))
-var __VDLType_v_io_x_ref_cmd_vrpc_internal_Array2Int *vdl.Type = vdl.TypeOf(Array2Int{})
-var __VDLType_v_io_x_ref_cmd_vrpc_internal_Struct *vdl.Type = vdl.TypeOf(Struct{})
-
-func __VDLEnsureNativeBuilt() {
-}
+//////////////////////////////////////////////////
+// Interface definitions
// TypeTesterClientMethods is the client interface
// containing TypeTester methods.
@@ -748,3 +741,30 @@
func (s implTypeTesterZStreamServerCallSend) Send(item bool) error {
return s.s.Send(item)
}
+
+var __VDLInitCalled bool
+
+// __VDLInit performs vdl initialization. It is safe to call multiple times.
+// If you have an init ordering issue, just insert the following line verbatim
+// into your source files in this package, right after the "package foo" clause:
+//
+// var _ = __VDLInit()
+//
+// The purpose of this function is to ensure that vdl initialization occurs in
+// the right order, and very early in the init sequence. In particular, vdl
+// registration and package variable initialization needs to occur before
+// functions like vdl.TypeOf will work properly.
+//
+// This function returns a dummy value, so that it can be used to initialize the
+// first var in the file, to take advantage of Go's defined init order.
+func __VDLInit() struct{} {
+ if __VDLInitCalled {
+ return struct{}{}
+ }
+
+ // Register types.
+ vdl.Register((*Struct)(nil))
+ vdl.Register((*Array2Int)(nil))
+
+ return struct{}{}
+}
diff --git a/examples/fortune/fortune.vdl.go b/examples/fortune/fortune.vdl.go
index 71c2e34..91b1e72 100644
--- a/examples/fortune/fortune.vdl.go
+++ b/examples/fortune/fortune.vdl.go
@@ -14,8 +14,10 @@
"v.io/v23/rpc"
)
-func __VDLEnsureNativeBuilt() {
-}
+var _ = __VDLInit() // Must be first; see __VDLInit comments for details.
+
+//////////////////////////////////////////////////
+// Interface definitions
// FortuneClientMethods is the client interface
// containing Fortune methods.
@@ -163,3 +165,26 @@
},
},
}
+
+var __VDLInitCalled bool
+
+// __VDLInit performs vdl initialization. It is safe to call multiple times.
+// If you have an init ordering issue, just insert the following line verbatim
+// into your source files in this package, right after the "package foo" clause:
+//
+// var _ = __VDLInit()
+//
+// The purpose of this function is to ensure that vdl initialization occurs in
+// the right order, and very early in the init sequence. In particular, vdl
+// registration and package variable initialization needs to occur before
+// functions like vdl.TypeOf will work properly.
+//
+// This function returns a dummy value, so that it can be used to initialize the
+// first var in the file, to take advantage of Go's defined init order.
+func __VDLInit() struct{} {
+ if __VDLInitCalled {
+ return struct{}{}
+ }
+
+ return struct{}{}
+}
diff --git a/examples/rps/rps.vdl.go b/examples/rps/rps.vdl.go
index eb962e9..6e6f659 100644
--- a/examples/rps/rps.vdl.go
+++ b/examples/rps/rps.vdl.go
@@ -36,6 +36,11 @@
time_2 "v.io/v23/vdlroot/time"
)
+var _ = __VDLInit() // Must be first; see __VDLInit comments for details.
+
+//////////////////////////////////////////////////
+// Type definitions
+
// A GameId is used to uniquely identify a game within one Judge.
type GameId struct {
Id string
@@ -47,9 +52,6 @@
}
func (m *GameId) FillVDLTarget(t vdl.Target, tt *vdl.Type) error {
- if __VDLType_v_io_x_ref_examples_rps_GameId == nil || __VDLType0 == nil {
- panic("Initialization order error: types generated for FillVDLTarget not initialized. Consider moving caller to an init() block.")
- }
fieldsTarget1, err := t.StartFields(tt)
if err != nil {
return err
@@ -60,7 +62,7 @@
return err
}
if err != vdl.ErrFieldNoExist {
- if err := fieldTarget3.FromString(string(m.Id), vdl.StringType); err != nil {
+ if err := fieldTarget3.FromString(string(m.Id), tt.NonOptional().Field(0).Type); err != nil {
return err
}
if err := fieldsTarget1.FinishField(keyTarget2, fieldTarget3); err != nil {
@@ -86,8 +88,8 @@
func (t *GameIdTarget) StartFields(tt *vdl.Type) (vdl.FieldsTarget, error) {
- if !vdl.Compatible(tt, __VDLType_v_io_x_ref_examples_rps_GameId) {
- return nil, fmt.Errorf("type %v incompatible with %v", tt, __VDLType_v_io_x_ref_examples_rps_GameId)
+ if ttWant := vdl.TypeOf((*GameId)(nil)).Elem(); !vdl.Compatible(tt, ttWant) {
+ return nil, fmt.Errorf("type %v incompatible with %v", tt, ttWant)
}
return t, nil
}
@@ -98,7 +100,7 @@
target, err := &t.idTarget, error(nil)
return nil, target, err
default:
- return nil, nil, fmt.Errorf("field %s not in struct %v", name, __VDLType_v_io_x_ref_examples_rps_GameId)
+ return nil, nil, fmt.Errorf("field %s not in struct v.io/x/ref/examples/rps.GameId", name)
}
}
func (t *GameIdTarget) FinishField(_, _ vdl.Target) error {
@@ -109,96 +111,22 @@
return nil
}
-// GameOptions specifies the parameters of a game.
-type GameOptions struct {
- NumRounds int32 // The number of rounds that a player must win to win the game.
- GameType GameTypeTag // The type of game to play: Classic or LizardSpock.
-}
+type GameTypeTag byte
-func (GameOptions) __VDLReflect(struct {
- Name string `vdl:"v.io/x/ref/examples/rps.GameOptions"`
+func (GameTypeTag) __VDLReflect(struct {
+ Name string `vdl:"v.io/x/ref/examples/rps.GameTypeTag"`
}) {
}
-func (m *GameOptions) FillVDLTarget(t vdl.Target, tt *vdl.Type) error {
- if __VDLType_v_io_x_ref_examples_rps_GameOptions == nil || __VDLType1 == nil {
- panic("Initialization order error: types generated for FillVDLTarget not initialized. Consider moving caller to an init() block.")
- }
- fieldsTarget1, err := t.StartFields(tt)
- if err != nil {
- return err
- }
-
- keyTarget2, fieldTarget3, err := fieldsTarget1.StartField("NumRounds")
- if err != vdl.ErrFieldNoExist && err != nil {
- return err
- }
- if err != vdl.ErrFieldNoExist {
- if err := fieldTarget3.FromInt(int64(m.NumRounds), vdl.Int32Type); err != nil {
- return err
- }
- if err := fieldsTarget1.FinishField(keyTarget2, fieldTarget3); err != nil {
- return err
- }
- }
- keyTarget4, fieldTarget5, err := fieldsTarget1.StartField("GameType")
- if err != vdl.ErrFieldNoExist && err != nil {
- return err
- }
- if err != vdl.ErrFieldNoExist {
-
- if err := m.GameType.FillVDLTarget(fieldTarget5, __VDLType_v_io_x_ref_examples_rps_GameTypeTag); err != nil {
- return err
- }
- if err := fieldsTarget1.FinishField(keyTarget4, fieldTarget5); err != nil {
- return err
- }
- }
- if err := t.FinishFields(fieldsTarget1); err != nil {
+func (m *GameTypeTag) FillVDLTarget(t vdl.Target, tt *vdl.Type) error {
+ if err := t.FromUint(uint64((*m)), tt); err != nil {
return err
}
return nil
}
-func (m *GameOptions) MakeVDLTarget() vdl.Target {
- return &GameOptionsTarget{Value: m}
-}
-
-type GameOptionsTarget struct {
- Value *GameOptions
- numRoundsTarget vdl.Int32Target
- gameTypeTarget GameTypeTagTarget
- vdl.TargetBase
- vdl.FieldsTargetBase
-}
-
-func (t *GameOptionsTarget) StartFields(tt *vdl.Type) (vdl.FieldsTarget, error) {
-
- if !vdl.Compatible(tt, __VDLType_v_io_x_ref_examples_rps_GameOptions) {
- return nil, fmt.Errorf("type %v incompatible with %v", tt, __VDLType_v_io_x_ref_examples_rps_GameOptions)
- }
- return t, nil
-}
-func (t *GameOptionsTarget) StartField(name string) (key, field vdl.Target, _ error) {
- switch name {
- case "NumRounds":
- t.numRoundsTarget.Value = &t.Value.NumRounds
- target, err := &t.numRoundsTarget, error(nil)
- return nil, target, err
- case "GameType":
- t.gameTypeTarget.Value = &t.Value.GameType
- target, err := &t.gameTypeTarget, error(nil)
- return nil, target, err
- default:
- return nil, nil, fmt.Errorf("field %s not in struct %v", name, __VDLType_v_io_x_ref_examples_rps_GameOptions)
- }
-}
-func (t *GameOptionsTarget) FinishField(_, _ vdl.Target) error {
- return nil
-}
-func (t *GameOptionsTarget) FinishFields(_ vdl.FieldsTarget) error {
-
- return nil
+func (m *GameTypeTag) MakeVDLTarget() vdl.Target {
+ return &GameTypeTagTarget{Value: m}
}
type GameTypeTagTarget struct {
@@ -247,22 +175,144 @@
return nil
}
-type GameTypeTag byte
+// GameOptions specifies the parameters of a game.
+type GameOptions struct {
+ NumRounds int32 // The number of rounds that a player must win to win the game.
+ GameType GameTypeTag // The type of game to play: Classic or LizardSpock.
+}
-func (GameTypeTag) __VDLReflect(struct {
- Name string `vdl:"v.io/x/ref/examples/rps.GameTypeTag"`
+func (GameOptions) __VDLReflect(struct {
+ Name string `vdl:"v.io/x/ref/examples/rps.GameOptions"`
}) {
}
-func (m *GameTypeTag) FillVDLTarget(t vdl.Target, tt *vdl.Type) error {
- if err := t.FromUint(uint64((*m)), __VDLType_v_io_x_ref_examples_rps_GameTypeTag); err != nil {
+func (m *GameOptions) FillVDLTarget(t vdl.Target, tt *vdl.Type) error {
+ fieldsTarget1, err := t.StartFields(tt)
+ if err != nil {
+ return err
+ }
+
+ keyTarget2, fieldTarget3, err := fieldsTarget1.StartField("NumRounds")
+ if err != vdl.ErrFieldNoExist && err != nil {
+ return err
+ }
+ if err != vdl.ErrFieldNoExist {
+ if err := fieldTarget3.FromInt(int64(m.NumRounds), tt.NonOptional().Field(0).Type); err != nil {
+ return err
+ }
+ if err := fieldsTarget1.FinishField(keyTarget2, fieldTarget3); err != nil {
+ return err
+ }
+ }
+ keyTarget4, fieldTarget5, err := fieldsTarget1.StartField("GameType")
+ if err != vdl.ErrFieldNoExist && err != nil {
+ return err
+ }
+ if err != vdl.ErrFieldNoExist {
+
+ if err := m.GameType.FillVDLTarget(fieldTarget5, tt.NonOptional().Field(1).Type); err != nil {
+ return err
+ }
+ if err := fieldsTarget1.FinishField(keyTarget4, fieldTarget5); err != nil {
+ return err
+ }
+ }
+ if err := t.FinishFields(fieldsTarget1); err != nil {
return err
}
return nil
}
-func (m *GameTypeTag) MakeVDLTarget() vdl.Target {
- return &GameTypeTagTarget{Value: m}
+func (m *GameOptions) MakeVDLTarget() vdl.Target {
+ return &GameOptionsTarget{Value: m}
+}
+
+type GameOptionsTarget struct {
+ Value *GameOptions
+ numRoundsTarget vdl.Int32Target
+ gameTypeTarget GameTypeTagTarget
+ vdl.TargetBase
+ vdl.FieldsTargetBase
+}
+
+func (t *GameOptionsTarget) StartFields(tt *vdl.Type) (vdl.FieldsTarget, error) {
+
+ if ttWant := vdl.TypeOf((*GameOptions)(nil)).Elem(); !vdl.Compatible(tt, ttWant) {
+ return nil, fmt.Errorf("type %v incompatible with %v", tt, ttWant)
+ }
+ return t, nil
+}
+func (t *GameOptionsTarget) StartField(name string) (key, field vdl.Target, _ error) {
+ switch name {
+ case "NumRounds":
+ t.numRoundsTarget.Value = &t.Value.NumRounds
+ target, err := &t.numRoundsTarget, error(nil)
+ return nil, target, err
+ case "GameType":
+ t.gameTypeTarget.Value = &t.Value.GameType
+ target, err := &t.gameTypeTarget, error(nil)
+ return nil, target, err
+ default:
+ return nil, nil, fmt.Errorf("field %s not in struct v.io/x/ref/examples/rps.GameOptions", name)
+ }
+}
+func (t *GameOptionsTarget) FinishField(_, _ vdl.Target) error {
+ return nil
+}
+func (t *GameOptionsTarget) FinishFields(_ vdl.FieldsTarget) error {
+
+ return nil
+}
+
+type unused struct {
+}
+
+func (unused) __VDLReflect(struct {
+ Name string `vdl:"v.io/x/ref/examples/rps.unused"`
+}) {
+}
+
+func (m *unused) FillVDLTarget(t vdl.Target, tt *vdl.Type) error {
+ fieldsTarget1, err := t.StartFields(tt)
+ if err != nil {
+ return err
+ }
+
+ if err := t.FinishFields(fieldsTarget1); err != nil {
+ return err
+ }
+ return nil
+}
+
+func (m *unused) MakeVDLTarget() vdl.Target {
+ return &unusedTarget{Value: m}
+}
+
+type unusedTarget struct {
+ Value *unused
+ vdl.TargetBase
+ vdl.FieldsTargetBase
+}
+
+func (t *unusedTarget) StartFields(tt *vdl.Type) (vdl.FieldsTarget, error) {
+
+ if ttWant := vdl.TypeOf((*unused)(nil)).Elem(); !vdl.Compatible(tt, ttWant) {
+ return nil, fmt.Errorf("type %v incompatible with %v", tt, ttWant)
+ }
+ return t, nil
+}
+func (t *unusedTarget) StartField(name string) (key, field vdl.Target, _ error) {
+ switch name {
+ default:
+ return nil, nil, fmt.Errorf("field %s not in struct v.io/x/ref/examples/rps.unused", name)
+ }
+}
+func (t *unusedTarget) FinishField(_, _ vdl.Target) error {
+ return nil
+}
+func (t *unusedTarget) FinishFields(_ vdl.FieldsTarget) error {
+
+ return nil
}
type (
@@ -299,7 +349,7 @@
func (x PlayerActionMove) __VDLReflect(__PlayerActionReflect) {}
func (m PlayerActionMove) FillVDLTarget(t vdl.Target, tt *vdl.Type) error {
- fieldsTarget1, err := t.StartFields(__VDLType_v_io_x_ref_examples_rps_PlayerAction)
+ fieldsTarget1, err := t.StartFields(tt)
if err != nil {
return err
}
@@ -307,7 +357,7 @@
if err != nil {
return err
}
- if err := fieldTarget3.FromString(string(m.Value), vdl.StringType); err != nil {
+ if err := fieldTarget3.FromString(string(m.Value), tt.NonOptional().Field(0).Type); err != nil {
return err
}
if err := fieldsTarget1.FinishField(keyTarget2, fieldTarget3); err != nil {
@@ -330,7 +380,7 @@
func (x PlayerActionQuit) __VDLReflect(__PlayerActionReflect) {}
func (m PlayerActionQuit) FillVDLTarget(t vdl.Target, tt *vdl.Type) error {
- fieldsTarget1, err := t.StartFields(__VDLType_v_io_x_ref_examples_rps_PlayerAction)
+ fieldsTarget1, err := t.StartFields(tt)
if err != nil {
return err
}
@@ -339,7 +389,7 @@
return err
}
- if err := m.Value.FillVDLTarget(fieldTarget3, __VDLType_v_io_x_ref_examples_rps_unused); err != nil {
+ if err := m.Value.FillVDLTarget(fieldTarget3, tt.NonOptional().Field(1).Type); err != nil {
return err
}
if err := fieldsTarget1.FinishField(keyTarget2, fieldTarget3); err != nil {
@@ -356,271 +406,6 @@
return nil
}
-type unused struct {
-}
-
-func (unused) __VDLReflect(struct {
- Name string `vdl:"v.io/x/ref/examples/rps.unused"`
-}) {
-}
-
-func (m *unused) FillVDLTarget(t vdl.Target, tt *vdl.Type) error {
- if __VDLType_v_io_x_ref_examples_rps_unused == nil || __VDLType2 == nil {
- panic("Initialization order error: types generated for FillVDLTarget not initialized. Consider moving caller to an init() block.")
- }
- fieldsTarget1, err := t.StartFields(tt)
- if err != nil {
- return err
- }
-
- if err := t.FinishFields(fieldsTarget1); err != nil {
- return err
- }
- return nil
-}
-
-func (m *unused) MakeVDLTarget() vdl.Target {
- return &unusedTarget{Value: m}
-}
-
-type unusedTarget struct {
- Value *unused
- vdl.TargetBase
- vdl.FieldsTargetBase
-}
-
-func (t *unusedTarget) StartFields(tt *vdl.Type) (vdl.FieldsTarget, error) {
-
- if !vdl.Compatible(tt, __VDLType_v_io_x_ref_examples_rps_unused) {
- return nil, fmt.Errorf("type %v incompatible with %v", tt, __VDLType_v_io_x_ref_examples_rps_unused)
- }
- return t, nil
-}
-func (t *unusedTarget) StartField(name string) (key, field vdl.Target, _ error) {
- switch name {
- default:
- return nil, nil, fmt.Errorf("field %s not in struct %v", name, __VDLType_v_io_x_ref_examples_rps_unused)
- }
-}
-func (t *unusedTarget) FinishField(_, _ vdl.Target) error {
- return nil
-}
-func (t *unusedTarget) FinishFields(_ vdl.FieldsTarget) error {
-
- return nil
-}
-
-type (
- // JudgeAction represents any single field of the JudgeAction union type.
- JudgeAction interface {
- // Index returns the field index.
- Index() int
- // Interface returns the field value as an interface.
- Interface() interface{}
- // Name returns the field name.
- Name() string
- // __VDLReflect describes the JudgeAction union type.
- __VDLReflect(__JudgeActionReflect)
- FillVDLTarget(vdl.Target, *vdl.Type) error
- }
- // JudgeActionPlayerNum represents field PlayerNum of the JudgeAction union type.
- JudgeActionPlayerNum struct{ Value int32 } // The player's number.
- // JudgeActionOpponentName represents field OpponentName of the JudgeAction union type.
- JudgeActionOpponentName struct{ Value string } // The name of the opponent.
- // JudgeActionMoveOptions represents field MoveOptions of the JudgeAction union type.
- JudgeActionMoveOptions struct{ Value []string } // A list of allowed moves that the player must choose from.
- // JudgeActionRoundResult represents field RoundResult of the JudgeAction union type.
- JudgeActionRoundResult struct{ Value Round } // The result of the previous round.
- // JudgeActionScore represents field Score of the JudgeAction union type.
- JudgeActionScore struct{ Value ScoreCard } // The result of the game.
- // __JudgeActionReflect describes the JudgeAction union type.
- __JudgeActionReflect struct {
- Name string `vdl:"v.io/x/ref/examples/rps.JudgeAction"`
- Type JudgeAction
- Union struct {
- PlayerNum JudgeActionPlayerNum
- OpponentName JudgeActionOpponentName
- MoveOptions JudgeActionMoveOptions
- RoundResult JudgeActionRoundResult
- Score JudgeActionScore
- }
- }
-)
-
-func (x JudgeActionPlayerNum) Index() int { return 0 }
-func (x JudgeActionPlayerNum) Interface() interface{} { return x.Value }
-func (x JudgeActionPlayerNum) Name() string { return "PlayerNum" }
-func (x JudgeActionPlayerNum) __VDLReflect(__JudgeActionReflect) {}
-
-func (m JudgeActionPlayerNum) FillVDLTarget(t vdl.Target, tt *vdl.Type) error {
- fieldsTarget1, err := t.StartFields(__VDLType_v_io_x_ref_examples_rps_JudgeAction)
- if err != nil {
- return err
- }
- keyTarget2, fieldTarget3, err := fieldsTarget1.StartField("PlayerNum")
- if err != nil {
- return err
- }
- if err := fieldTarget3.FromInt(int64(m.Value), vdl.Int32Type); err != nil {
- return err
- }
- if err := fieldsTarget1.FinishField(keyTarget2, fieldTarget3); err != nil {
- return err
- }
- if err := t.FinishFields(fieldsTarget1); err != nil {
- return err
- }
-
- return nil
-}
-
-func (m JudgeActionPlayerNum) MakeVDLTarget() vdl.Target {
- return nil
-}
-
-func (x JudgeActionOpponentName) Index() int { return 1 }
-func (x JudgeActionOpponentName) Interface() interface{} { return x.Value }
-func (x JudgeActionOpponentName) Name() string { return "OpponentName" }
-func (x JudgeActionOpponentName) __VDLReflect(__JudgeActionReflect) {}
-
-func (m JudgeActionOpponentName) FillVDLTarget(t vdl.Target, tt *vdl.Type) error {
- fieldsTarget1, err := t.StartFields(__VDLType_v_io_x_ref_examples_rps_JudgeAction)
- if err != nil {
- return err
- }
- keyTarget2, fieldTarget3, err := fieldsTarget1.StartField("OpponentName")
- if err != nil {
- return err
- }
- if err := fieldTarget3.FromString(string(m.Value), vdl.StringType); err != nil {
- return err
- }
- if err := fieldsTarget1.FinishField(keyTarget2, fieldTarget3); err != nil {
- return err
- }
- if err := t.FinishFields(fieldsTarget1); err != nil {
- return err
- }
-
- return nil
-}
-
-func (m JudgeActionOpponentName) MakeVDLTarget() vdl.Target {
- return nil
-}
-
-func (x JudgeActionMoveOptions) Index() int { return 2 }
-func (x JudgeActionMoveOptions) Interface() interface{} { return x.Value }
-func (x JudgeActionMoveOptions) Name() string { return "MoveOptions" }
-func (x JudgeActionMoveOptions) __VDLReflect(__JudgeActionReflect) {}
-
-func (m JudgeActionMoveOptions) FillVDLTarget(t vdl.Target, tt *vdl.Type) error {
- fieldsTarget1, err := t.StartFields(__VDLType_v_io_x_ref_examples_rps_JudgeAction)
- if err != nil {
- return err
- }
- keyTarget2, fieldTarget3, err := fieldsTarget1.StartField("MoveOptions")
- if err != nil {
- return err
- }
-
- listTarget4, err := fieldTarget3.StartList(__VDLType3, len(m.Value))
- if err != nil {
- return err
- }
- for i, elem6 := range m.Value {
- elemTarget5, err := listTarget4.StartElem(i)
- if err != nil {
- return err
- }
- if err := elemTarget5.FromString(string(elem6), vdl.StringType); err != nil {
- return err
- }
- if err := listTarget4.FinishElem(elemTarget5); err != nil {
- return err
- }
- }
- if err := fieldTarget3.FinishList(listTarget4); err != nil {
- return err
- }
- if err := fieldsTarget1.FinishField(keyTarget2, fieldTarget3); err != nil {
- return err
- }
- if err := t.FinishFields(fieldsTarget1); err != nil {
- return err
- }
-
- return nil
-}
-
-func (m JudgeActionMoveOptions) MakeVDLTarget() vdl.Target {
- return nil
-}
-
-func (x JudgeActionRoundResult) Index() int { return 3 }
-func (x JudgeActionRoundResult) Interface() interface{} { return x.Value }
-func (x JudgeActionRoundResult) Name() string { return "RoundResult" }
-func (x JudgeActionRoundResult) __VDLReflect(__JudgeActionReflect) {}
-
-func (m JudgeActionRoundResult) FillVDLTarget(t vdl.Target, tt *vdl.Type) error {
- fieldsTarget1, err := t.StartFields(__VDLType_v_io_x_ref_examples_rps_JudgeAction)
- if err != nil {
- return err
- }
- keyTarget2, fieldTarget3, err := fieldsTarget1.StartField("RoundResult")
- if err != nil {
- return err
- }
-
- if err := m.Value.FillVDLTarget(fieldTarget3, __VDLType_v_io_x_ref_examples_rps_Round); err != nil {
- return err
- }
- if err := fieldsTarget1.FinishField(keyTarget2, fieldTarget3); err != nil {
- return err
- }
- if err := t.FinishFields(fieldsTarget1); err != nil {
- return err
- }
-
- return nil
-}
-
-func (m JudgeActionRoundResult) MakeVDLTarget() vdl.Target {
- return nil
-}
-
-func (x JudgeActionScore) Index() int { return 4 }
-func (x JudgeActionScore) Interface() interface{} { return x.Value }
-func (x JudgeActionScore) Name() string { return "Score" }
-func (x JudgeActionScore) __VDLReflect(__JudgeActionReflect) {}
-
-func (m JudgeActionScore) FillVDLTarget(t vdl.Target, tt *vdl.Type) error {
- fieldsTarget1, err := t.StartFields(__VDLType_v_io_x_ref_examples_rps_JudgeAction)
- if err != nil {
- return err
- }
- keyTarget2, fieldTarget3, err := fieldsTarget1.StartField("Score")
- if err != nil {
- return err
- }
-
- if err := m.Value.FillVDLTarget(fieldTarget3, __VDLType_v_io_x_ref_examples_rps_ScoreCard); err != nil {
- return err
- }
- if err := fieldsTarget1.FinishField(keyTarget2, fieldTarget3); err != nil {
- return err
- }
- if err := t.FinishFields(fieldsTarget1); err != nil {
- return err
- }
-
- return nil
-}
-
-func (m JudgeActionScore) MakeVDLTarget() vdl.Target {
- return nil
-}
-
type PlayersMoves [2]string
func (PlayersMoves) __VDLReflect(struct {
@@ -629,7 +414,7 @@
}
func (m *PlayersMoves) FillVDLTarget(t vdl.Target, tt *vdl.Type) error {
- listTarget1, err := t.StartList(__VDLType_v_io_x_ref_examples_rps_PlayersMoves, 2)
+ listTarget1, err := t.StartList(tt, 2)
if err != nil {
return err
}
@@ -638,7 +423,7 @@
if err != nil {
return err
}
- if err := elemTarget2.FromString(string(elem3), vdl.StringType); err != nil {
+ if err := elemTarget2.FromString(string(elem3), tt.NonOptional().Elem()); err != nil {
return err
}
if err := listTarget1.FinishElem(elemTarget2); err != nil {
@@ -665,8 +450,8 @@
func (t *PlayersMovesTarget) StartList(tt *vdl.Type, len int) (vdl.ListTarget, error) {
- if !vdl.Compatible(tt, __VDLType_v_io_x_ref_examples_rps_PlayersMoves) {
- return nil, fmt.Errorf("type %v incompatible with %v", tt, __VDLType_v_io_x_ref_examples_rps_PlayersMoves)
+ if ttWant := vdl.TypeOf((*PlayersMoves)(nil)); !vdl.Compatible(tt, ttWant) {
+ return nil, fmt.Errorf("type %v incompatible with %v", tt, ttWant)
}
return t, nil
}
@@ -683,161 +468,24 @@
return nil
}
-// Round represents the state of a round.
-type Round struct {
- Moves PlayersMoves // Each player's move.
- Comment string // A text comment from judge about the round.
- Winner WinnerTag // Who won the round.
- StartTime time.Time // The time at which the round started.
- EndTime time.Time // The time at which the round ended.
-}
+// WinnerTag is a type used to indicate whether a round or a game was a draw,
+// was won by player 1 or was won by player 2.
+type WinnerTag byte
-func (Round) __VDLReflect(struct {
- Name string `vdl:"v.io/x/ref/examples/rps.Round"`
+func (WinnerTag) __VDLReflect(struct {
+ Name string `vdl:"v.io/x/ref/examples/rps.WinnerTag"`
}) {
}
-func (m *Round) FillVDLTarget(t vdl.Target, tt *vdl.Type) error {
- __VDLEnsureNativeBuilt()
- fieldsTarget1, err := t.StartFields(tt)
- if err != nil {
- return err
- }
-
- keyTarget2, fieldTarget3, err := fieldsTarget1.StartField("Moves")
- if err != vdl.ErrFieldNoExist && err != nil {
- return err
- }
- if err != vdl.ErrFieldNoExist {
-
- if err := m.Moves.FillVDLTarget(fieldTarget3, __VDLType_v_io_x_ref_examples_rps_PlayersMoves); err != nil {
- return err
- }
- if err := fieldsTarget1.FinishField(keyTarget2, fieldTarget3); err != nil {
- return err
- }
- }
- keyTarget4, fieldTarget5, err := fieldsTarget1.StartField("Comment")
- if err != vdl.ErrFieldNoExist && err != nil {
- return err
- }
- if err != vdl.ErrFieldNoExist {
- if err := fieldTarget5.FromString(string(m.Comment), vdl.StringType); err != nil {
- return err
- }
- if err := fieldsTarget1.FinishField(keyTarget4, fieldTarget5); err != nil {
- return err
- }
- }
- keyTarget6, fieldTarget7, err := fieldsTarget1.StartField("Winner")
- if err != vdl.ErrFieldNoExist && err != nil {
- return err
- }
- if err != vdl.ErrFieldNoExist {
-
- if err := m.Winner.FillVDLTarget(fieldTarget7, __VDLType_v_io_x_ref_examples_rps_WinnerTag); err != nil {
- return err
- }
- if err := fieldsTarget1.FinishField(keyTarget6, fieldTarget7); err != nil {
- return err
- }
- }
- var wireValue8 time_2.Time
- if err := time_2.TimeFromNative(&wireValue8, m.StartTime); err != nil {
- return err
- }
-
- keyTarget9, fieldTarget10, err := fieldsTarget1.StartField("StartTime")
- if err != vdl.ErrFieldNoExist && err != nil {
- return err
- }
- if err != vdl.ErrFieldNoExist {
-
- if err := wireValue8.FillVDLTarget(fieldTarget10, __VDLType_time_Time); err != nil {
- return err
- }
- if err := fieldsTarget1.FinishField(keyTarget9, fieldTarget10); err != nil {
- return err
- }
- }
- var wireValue11 time_2.Time
- if err := time_2.TimeFromNative(&wireValue11, m.EndTime); err != nil {
- return err
- }
-
- keyTarget12, fieldTarget13, err := fieldsTarget1.StartField("EndTime")
- if err != vdl.ErrFieldNoExist && err != nil {
- return err
- }
- if err != vdl.ErrFieldNoExist {
-
- if err := wireValue11.FillVDLTarget(fieldTarget13, __VDLType_time_Time); err != nil {
- return err
- }
- if err := fieldsTarget1.FinishField(keyTarget12, fieldTarget13); err != nil {
- return err
- }
- }
- if err := t.FinishFields(fieldsTarget1); err != nil {
+func (m *WinnerTag) FillVDLTarget(t vdl.Target, tt *vdl.Type) error {
+ if err := t.FromUint(uint64((*m)), tt); err != nil {
return err
}
return nil
}
-func (m *Round) MakeVDLTarget() vdl.Target {
- return &RoundTarget{Value: m}
-}
-
-type RoundTarget struct {
- Value *Round
- movesTarget PlayersMovesTarget
- commentTarget vdl.StringTarget
- winnerTarget WinnerTagTarget
- startTimeTarget time_2.TimeTarget
- endTimeTarget time_2.TimeTarget
- vdl.TargetBase
- vdl.FieldsTargetBase
-}
-
-func (t *RoundTarget) StartFields(tt *vdl.Type) (vdl.FieldsTarget, error) {
-
- if !vdl.Compatible(tt, __VDLType_v_io_x_ref_examples_rps_Round) {
- return nil, fmt.Errorf("type %v incompatible with %v", tt, __VDLType_v_io_x_ref_examples_rps_Round)
- }
- return t, nil
-}
-func (t *RoundTarget) StartField(name string) (key, field vdl.Target, _ error) {
- switch name {
- case "Moves":
- t.movesTarget.Value = &t.Value.Moves
- target, err := &t.movesTarget, error(nil)
- return nil, target, err
- case "Comment":
- t.commentTarget.Value = &t.Value.Comment
- target, err := &t.commentTarget, error(nil)
- return nil, target, err
- case "Winner":
- t.winnerTarget.Value = &t.Value.Winner
- target, err := &t.winnerTarget, error(nil)
- return nil, target, err
- case "StartTime":
- t.startTimeTarget.Value = &t.Value.StartTime
- target, err := &t.startTimeTarget, error(nil)
- return nil, target, err
- case "EndTime":
- t.endTimeTarget.Value = &t.Value.EndTime
- target, err := &t.endTimeTarget, error(nil)
- return nil, target, err
- default:
- return nil, nil, fmt.Errorf("field %s not in struct %v", name, __VDLType_v_io_x_ref_examples_rps_Round)
- }
-}
-func (t *RoundTarget) FinishField(_, _ vdl.Target) error {
- return nil
-}
-func (t *RoundTarget) FinishFields(_ vdl.FieldsTarget) error {
-
- return nil
+func (m *WinnerTag) MakeVDLTarget() vdl.Target {
+ return &WinnerTagTarget{Value: m}
}
type WinnerTagTarget struct {
@@ -886,95 +534,158 @@
return nil
}
-// WinnerTag is a type used to indicate whether a round or a game was a draw,
-// was won by player 1 or was won by player 2.
-type WinnerTag byte
+// Round represents the state of a round.
+type Round struct {
+ Moves PlayersMoves // Each player's move.
+ Comment string // A text comment from judge about the round.
+ Winner WinnerTag // Who won the round.
+ StartTime time.Time // The time at which the round started.
+ EndTime time.Time // The time at which the round ended.
+}
-func (WinnerTag) __VDLReflect(struct {
- Name string `vdl:"v.io/x/ref/examples/rps.WinnerTag"`
+func (Round) __VDLReflect(struct {
+ Name string `vdl:"v.io/x/ref/examples/rps.Round"`
}) {
}
-func (m *WinnerTag) FillVDLTarget(t vdl.Target, tt *vdl.Type) error {
- if err := t.FromUint(uint64((*m)), __VDLType_v_io_x_ref_examples_rps_WinnerTag); err != nil {
- return err
- }
- return nil
-}
-
-func (m *WinnerTag) MakeVDLTarget() vdl.Target {
- return &WinnerTagTarget{Value: m}
-}
-
-// PlayResult is the value returned by the Play method. It indicates the outcome of the game.
-type PlayResult struct {
- YouWon bool // True if the player receiving the result won the game.
-}
-
-func (PlayResult) __VDLReflect(struct {
- Name string `vdl:"v.io/x/ref/examples/rps.PlayResult"`
-}) {
-}
-
-func (m *PlayResult) FillVDLTarget(t vdl.Target, tt *vdl.Type) error {
- if __VDLType_v_io_x_ref_examples_rps_PlayResult == nil || __VDLType5 == nil {
- panic("Initialization order error: types generated for FillVDLTarget not initialized. Consider moving caller to an init() block.")
- }
+func (m *Round) FillVDLTarget(t vdl.Target, tt *vdl.Type) error {
fieldsTarget1, err := t.StartFields(tt)
if err != nil {
return err
}
- keyTarget2, fieldTarget3, err := fieldsTarget1.StartField("YouWon")
+ keyTarget2, fieldTarget3, err := fieldsTarget1.StartField("Moves")
if err != vdl.ErrFieldNoExist && err != nil {
return err
}
if err != vdl.ErrFieldNoExist {
- if err := fieldTarget3.FromBool(bool(m.YouWon), vdl.BoolType); err != nil {
+
+ if err := m.Moves.FillVDLTarget(fieldTarget3, tt.NonOptional().Field(0).Type); err != nil {
return err
}
if err := fieldsTarget1.FinishField(keyTarget2, fieldTarget3); err != nil {
return err
}
}
+ keyTarget4, fieldTarget5, err := fieldsTarget1.StartField("Comment")
+ if err != vdl.ErrFieldNoExist && err != nil {
+ return err
+ }
+ if err != vdl.ErrFieldNoExist {
+ if err := fieldTarget5.FromString(string(m.Comment), tt.NonOptional().Field(1).Type); err != nil {
+ return err
+ }
+ if err := fieldsTarget1.FinishField(keyTarget4, fieldTarget5); err != nil {
+ return err
+ }
+ }
+ keyTarget6, fieldTarget7, err := fieldsTarget1.StartField("Winner")
+ if err != vdl.ErrFieldNoExist && err != nil {
+ return err
+ }
+ if err != vdl.ErrFieldNoExist {
+
+ if err := m.Winner.FillVDLTarget(fieldTarget7, tt.NonOptional().Field(2).Type); err != nil {
+ return err
+ }
+ if err := fieldsTarget1.FinishField(keyTarget6, fieldTarget7); err != nil {
+ return err
+ }
+ }
+ var wireValue8 time_2.Time
+ if err := time_2.TimeFromNative(&wireValue8, m.StartTime); err != nil {
+ return err
+ }
+
+ keyTarget9, fieldTarget10, err := fieldsTarget1.StartField("StartTime")
+ if err != vdl.ErrFieldNoExist && err != nil {
+ return err
+ }
+ if err != vdl.ErrFieldNoExist {
+
+ if err := wireValue8.FillVDLTarget(fieldTarget10, tt.NonOptional().Field(3).Type); err != nil {
+ return err
+ }
+ if err := fieldsTarget1.FinishField(keyTarget9, fieldTarget10); err != nil {
+ return err
+ }
+ }
+ var wireValue11 time_2.Time
+ if err := time_2.TimeFromNative(&wireValue11, m.EndTime); err != nil {
+ return err
+ }
+
+ keyTarget12, fieldTarget13, err := fieldsTarget1.StartField("EndTime")
+ if err != vdl.ErrFieldNoExist && err != nil {
+ return err
+ }
+ if err != vdl.ErrFieldNoExist {
+
+ if err := wireValue11.FillVDLTarget(fieldTarget13, tt.NonOptional().Field(4).Type); err != nil {
+ return err
+ }
+ if err := fieldsTarget1.FinishField(keyTarget12, fieldTarget13); err != nil {
+ return err
+ }
+ }
if err := t.FinishFields(fieldsTarget1); err != nil {
return err
}
return nil
}
-func (m *PlayResult) MakeVDLTarget() vdl.Target {
- return &PlayResultTarget{Value: m}
+func (m *Round) MakeVDLTarget() vdl.Target {
+ return &RoundTarget{Value: m}
}
-type PlayResultTarget struct {
- Value *PlayResult
- youWonTarget vdl.BoolTarget
+type RoundTarget struct {
+ Value *Round
+ movesTarget PlayersMovesTarget
+ commentTarget vdl.StringTarget
+ winnerTarget WinnerTagTarget
+ startTimeTarget time_2.TimeTarget
+ endTimeTarget time_2.TimeTarget
vdl.TargetBase
vdl.FieldsTargetBase
}
-func (t *PlayResultTarget) StartFields(tt *vdl.Type) (vdl.FieldsTarget, error) {
+func (t *RoundTarget) StartFields(tt *vdl.Type) (vdl.FieldsTarget, error) {
- if !vdl.Compatible(tt, __VDLType_v_io_x_ref_examples_rps_PlayResult) {
- return nil, fmt.Errorf("type %v incompatible with %v", tt, __VDLType_v_io_x_ref_examples_rps_PlayResult)
+ if ttWant := vdl.TypeOf((*Round)(nil)).Elem(); !vdl.Compatible(tt, ttWant) {
+ return nil, fmt.Errorf("type %v incompatible with %v", tt, ttWant)
}
return t, nil
}
-func (t *PlayResultTarget) StartField(name string) (key, field vdl.Target, _ error) {
+func (t *RoundTarget) StartField(name string) (key, field vdl.Target, _ error) {
switch name {
- case "YouWon":
- t.youWonTarget.Value = &t.Value.YouWon
- target, err := &t.youWonTarget, error(nil)
+ case "Moves":
+ t.movesTarget.Value = &t.Value.Moves
+ target, err := &t.movesTarget, error(nil)
+ return nil, target, err
+ case "Comment":
+ t.commentTarget.Value = &t.Value.Comment
+ target, err := &t.commentTarget, error(nil)
+ return nil, target, err
+ case "Winner":
+ t.winnerTarget.Value = &t.Value.Winner
+ target, err := &t.winnerTarget, error(nil)
+ return nil, target, err
+ case "StartTime":
+ t.startTimeTarget.Value = &t.Value.StartTime
+ target, err := &t.startTimeTarget, error(nil)
+ return nil, target, err
+ case "EndTime":
+ t.endTimeTarget.Value = &t.Value.EndTime
+ target, err := &t.endTimeTarget, error(nil)
return nil, target, err
default:
- return nil, nil, fmt.Errorf("field %s not in struct %v", name, __VDLType_v_io_x_ref_examples_rps_PlayResult)
+ return nil, nil, fmt.Errorf("field %s not in struct v.io/x/ref/examples/rps.Round", name)
}
}
-func (t *PlayResultTarget) FinishField(_, _ vdl.Target) error {
+func (t *RoundTarget) FinishField(_, _ vdl.Target) error {
return nil
}
-func (t *PlayResultTarget) FinishFields(_ vdl.FieldsTarget) error {
+func (t *RoundTarget) FinishFields(_ vdl.FieldsTarget) error {
return nil
}
@@ -995,7 +706,6 @@
}
func (m *ScoreCard) FillVDLTarget(t vdl.Target, tt *vdl.Type) error {
- __VDLEnsureNativeBuilt()
fieldsTarget1, err := t.StartFields(tt)
if err != nil {
return err
@@ -1007,7 +717,7 @@
}
if err != vdl.ErrFieldNoExist {
- if err := m.Opts.FillVDLTarget(fieldTarget3, __VDLType_v_io_x_ref_examples_rps_GameOptions); err != nil {
+ if err := m.Opts.FillVDLTarget(fieldTarget3, tt.NonOptional().Field(0).Type); err != nil {
return err
}
if err := fieldsTarget1.FinishField(keyTarget2, fieldTarget3); err != nil {
@@ -1019,7 +729,7 @@
return err
}
if err != vdl.ErrFieldNoExist {
- if err := fieldTarget5.FromString(string(m.Judge), vdl.StringType); err != nil {
+ if err := fieldTarget5.FromString(string(m.Judge), tt.NonOptional().Field(1).Type); err != nil {
return err
}
if err := fieldsTarget1.FinishField(keyTarget4, fieldTarget5); err != nil {
@@ -1032,7 +742,7 @@
}
if err != vdl.ErrFieldNoExist {
- listTarget8, err := fieldTarget7.StartList(__VDLType3, len(m.Players))
+ listTarget8, err := fieldTarget7.StartList(tt.NonOptional().Field(2).Type, len(m.Players))
if err != nil {
return err
}
@@ -1041,7 +751,7 @@
if err != nil {
return err
}
- if err := elemTarget9.FromString(string(elem10), vdl.StringType); err != nil {
+ if err := elemTarget9.FromString(string(elem10), tt.NonOptional().Field(2).Type.Elem()); err != nil {
return err
}
if err := listTarget8.FinishElem(elemTarget9); err != nil {
@@ -1061,7 +771,7 @@
}
if err != vdl.ErrFieldNoExist {
- listTarget13, err := fieldTarget12.StartList(__VDLType7, len(m.Rounds))
+ listTarget13, err := fieldTarget12.StartList(tt.NonOptional().Field(3).Type, len(m.Rounds))
if err != nil {
return err
}
@@ -1071,7 +781,7 @@
return err
}
- if err := elem15.FillVDLTarget(elemTarget14, __VDLType_v_io_x_ref_examples_rps_Round); err != nil {
+ if err := elem15.FillVDLTarget(elemTarget14, tt.NonOptional().Field(3).Type.Elem()); err != nil {
return err
}
if err := listTarget13.FinishElem(elemTarget14); err != nil {
@@ -1096,7 +806,7 @@
}
if err != vdl.ErrFieldNoExist {
- if err := wireValue16.FillVDLTarget(fieldTarget18, __VDLType_time_Time); err != nil {
+ if err := wireValue16.FillVDLTarget(fieldTarget18, tt.NonOptional().Field(4).Type); err != nil {
return err
}
if err := fieldsTarget1.FinishField(keyTarget17, fieldTarget18); err != nil {
@@ -1114,7 +824,7 @@
}
if err != vdl.ErrFieldNoExist {
- if err := wireValue19.FillVDLTarget(fieldTarget21, __VDLType_time_Time); err != nil {
+ if err := wireValue19.FillVDLTarget(fieldTarget21, tt.NonOptional().Field(5).Type); err != nil {
return err
}
if err := fieldsTarget1.FinishField(keyTarget20, fieldTarget21); err != nil {
@@ -1127,7 +837,7 @@
}
if err != vdl.ErrFieldNoExist {
- if err := m.Winner.FillVDLTarget(fieldTarget23, __VDLType_v_io_x_ref_examples_rps_WinnerTag); err != nil {
+ if err := m.Winner.FillVDLTarget(fieldTarget23, tt.NonOptional().Field(6).Type); err != nil {
return err
}
if err := fieldsTarget1.FinishField(keyTarget22, fieldTarget23); err != nil {
@@ -1159,8 +869,8 @@
func (t *ScoreCardTarget) StartFields(tt *vdl.Type) (vdl.FieldsTarget, error) {
- if !vdl.Compatible(tt, __VDLType_v_io_x_ref_examples_rps_ScoreCard) {
- return nil, fmt.Errorf("type %v incompatible with %v", tt, __VDLType_v_io_x_ref_examples_rps_ScoreCard)
+ if ttWant := vdl.TypeOf((*ScoreCard)(nil)).Elem(); !vdl.Compatible(tt, ttWant) {
+ return nil, fmt.Errorf("type %v incompatible with %v", tt, ttWant)
}
return t, nil
}
@@ -1195,7 +905,7 @@
target, err := &t.winnerTarget, error(nil)
return nil, target, err
default:
- return nil, nil, fmt.Errorf("field %s not in struct %v", name, __VDLType_v_io_x_ref_examples_rps_ScoreCard)
+ return nil, nil, fmt.Errorf("field %s not in struct v.io/x/ref/examples/rps.ScoreCard", name)
}
}
func (t *ScoreCardTarget) FinishField(_, _ vdl.Target) error {
@@ -1216,8 +926,8 @@
func (t *unnamed_5b5d762e696f2f782f7265662f6578616d706c65732f7270732e526f756e64207374727563747b4d6f76657320762e696f2f782f7265662f6578616d706c65732f7270732e506c61796572734d6f766573205b325d737472696e673b436f6d6d656e7420737472696e673b57696e6e657220762e696f2f782f7265662f6578616d706c65732f7270732e57696e6e657254616720627974653b537461727454696d652074696d652e54696d65207374727563747b5365636f6e647320696e7436343b4e616e6f7320696e7433327d3b456e6454696d652074696d652e54696d657dTarget) StartList(tt *vdl.Type, len int) (vdl.ListTarget, error) {
- if !vdl.Compatible(tt, __VDLType7) {
- return nil, fmt.Errorf("type %v incompatible with %v", tt, __VDLType7)
+ if ttWant := vdl.TypeOf((*[]Round)(nil)); !vdl.Compatible(tt, ttWant) {
+ return nil, fmt.Errorf("type %v incompatible with %v", tt, ttWant)
}
if cap(*t.Value) < len {
*t.Value = make([]Round, len)
@@ -1239,376 +949,299 @@
return nil
}
-func init() {
- vdl.Register((*GameId)(nil))
- vdl.Register((*GameOptions)(nil))
- vdl.Register((*GameTypeTag)(nil))
- vdl.Register((*PlayerAction)(nil))
- vdl.Register((*unused)(nil))
- vdl.Register((*JudgeAction)(nil))
- vdl.Register((*PlayersMoves)(nil))
- vdl.Register((*Round)(nil))
- vdl.Register((*WinnerTag)(nil))
- vdl.Register((*PlayResult)(nil))
- vdl.Register((*ScoreCard)(nil))
-}
+type (
+ // JudgeAction represents any single field of the JudgeAction union type.
+ JudgeAction interface {
+ // Index returns the field index.
+ Index() int
+ // Interface returns the field value as an interface.
+ Interface() interface{}
+ // Name returns the field name.
+ Name() string
+ // __VDLReflect describes the JudgeAction union type.
+ __VDLReflect(__JudgeActionReflect)
+ FillVDLTarget(vdl.Target, *vdl.Type) error
+ }
+ // JudgeActionPlayerNum represents field PlayerNum of the JudgeAction union type.
+ JudgeActionPlayerNum struct{ Value int32 } // The player's number.
+ // JudgeActionOpponentName represents field OpponentName of the JudgeAction union type.
+ JudgeActionOpponentName struct{ Value string } // The name of the opponent.
+ // JudgeActionMoveOptions represents field MoveOptions of the JudgeAction union type.
+ JudgeActionMoveOptions struct{ Value []string } // A list of allowed moves that the player must choose from.
+ // JudgeActionRoundResult represents field RoundResult of the JudgeAction union type.
+ JudgeActionRoundResult struct{ Value Round } // The result of the previous round.
+ // JudgeActionScore represents field Score of the JudgeAction union type.
+ JudgeActionScore struct{ Value ScoreCard } // The result of the game.
+ // __JudgeActionReflect describes the JudgeAction union type.
+ __JudgeActionReflect struct {
+ Name string `vdl:"v.io/x/ref/examples/rps.JudgeAction"`
+ Type JudgeAction
+ Union struct {
+ PlayerNum JudgeActionPlayerNum
+ OpponentName JudgeActionOpponentName
+ MoveOptions JudgeActionMoveOptions
+ RoundResult JudgeActionRoundResult
+ Score JudgeActionScore
+ }
+ }
+)
-var __VDLType0 *vdl.Type = vdl.TypeOf((*GameId)(nil))
-var __VDLType1 *vdl.Type = vdl.TypeOf((*GameOptions)(nil))
-var __VDLType5 *vdl.Type = vdl.TypeOf((*PlayResult)(nil))
-var __VDLType4 *vdl.Type
+func (x JudgeActionPlayerNum) Index() int { return 0 }
+func (x JudgeActionPlayerNum) Interface() interface{} { return x.Value }
+func (x JudgeActionPlayerNum) Name() string { return "PlayerNum" }
+func (x JudgeActionPlayerNum) __VDLReflect(__JudgeActionReflect) {}
-func __VDLType4_gen() *vdl.Type {
- __VDLType4Builder := vdl.TypeBuilder{}
-
- __VDLType41 := __VDLType4Builder.Optional()
- __VDLType42 := __VDLType4Builder.Struct()
- __VDLType43 := __VDLType4Builder.Named("v.io/x/ref/examples/rps.Round").AssignBase(__VDLType42)
- __VDLType44 := __VDLType4Builder.Array()
- __VDLType45 := __VDLType4Builder.Named("v.io/x/ref/examples/rps.PlayersMoves").AssignBase(__VDLType44)
- __VDLType46 := vdl.StringType
- __VDLType44.AssignElem(__VDLType46)
- __VDLType44.AssignLen(2)
- __VDLType42.AppendField("Moves", __VDLType45)
- __VDLType42.AppendField("Comment", __VDLType46)
- __VDLType47 := vdl.ByteType
- __VDLType48 := __VDLType4Builder.Named("v.io/x/ref/examples/rps.WinnerTag").AssignBase(__VDLType47)
- __VDLType42.AppendField("Winner", __VDLType48)
- __VDLType49 := __VDLType4Builder.Struct()
- __VDLType410 := __VDLType4Builder.Named("time.Time").AssignBase(__VDLType49)
- __VDLType411 := vdl.Int64Type
- __VDLType49.AppendField("Seconds", __VDLType411)
- __VDLType412 := vdl.Int32Type
- __VDLType49.AppendField("Nanos", __VDLType412)
- __VDLType42.AppendField("StartTime", __VDLType410)
- __VDLType42.AppendField("EndTime", __VDLType410)
- __VDLType41.AssignElem(__VDLType43)
- __VDLType4Builder.Build()
- __VDLType4v, err := __VDLType41.Built()
+func (m JudgeActionPlayerNum) FillVDLTarget(t vdl.Target, tt *vdl.Type) error {
+ fieldsTarget1, err := t.StartFields(tt)
if err != nil {
- panic(err)
+ return err
}
- return __VDLType4v
-}
-func init() {
- __VDLType4 = __VDLType4_gen()
-}
-
-var __VDLType6 *vdl.Type
-
-func __VDLType6_gen() *vdl.Type {
- __VDLType6Builder := vdl.TypeBuilder{}
-
- __VDLType61 := __VDLType6Builder.Optional()
- __VDLType62 := __VDLType6Builder.Struct()
- __VDLType63 := __VDLType6Builder.Named("v.io/x/ref/examples/rps.ScoreCard").AssignBase(__VDLType62)
- __VDLType64 := __VDLType6Builder.Struct()
- __VDLType65 := __VDLType6Builder.Named("v.io/x/ref/examples/rps.GameOptions").AssignBase(__VDLType64)
- __VDLType66 := vdl.Int32Type
- __VDLType64.AppendField("NumRounds", __VDLType66)
- __VDLType67 := vdl.ByteType
- __VDLType68 := __VDLType6Builder.Named("v.io/x/ref/examples/rps.GameTypeTag").AssignBase(__VDLType67)
- __VDLType64.AppendField("GameType", __VDLType68)
- __VDLType62.AppendField("Opts", __VDLType65)
- __VDLType69 := vdl.StringType
- __VDLType62.AppendField("Judge", __VDLType69)
- __VDLType610 := __VDLType6Builder.List()
- __VDLType610.AssignElem(__VDLType69)
- __VDLType62.AppendField("Players", __VDLType610)
- __VDLType611 := __VDLType6Builder.List()
- __VDLType612 := __VDLType6Builder.Struct()
- __VDLType613 := __VDLType6Builder.Named("v.io/x/ref/examples/rps.Round").AssignBase(__VDLType612)
- __VDLType614 := __VDLType6Builder.Array()
- __VDLType615 := __VDLType6Builder.Named("v.io/x/ref/examples/rps.PlayersMoves").AssignBase(__VDLType614)
- __VDLType614.AssignElem(__VDLType69)
- __VDLType614.AssignLen(2)
- __VDLType612.AppendField("Moves", __VDLType615)
- __VDLType612.AppendField("Comment", __VDLType69)
- __VDLType616 := vdl.ByteType
- __VDLType617 := __VDLType6Builder.Named("v.io/x/ref/examples/rps.WinnerTag").AssignBase(__VDLType616)
- __VDLType612.AppendField("Winner", __VDLType617)
- __VDLType618 := __VDLType6Builder.Struct()
- __VDLType619 := __VDLType6Builder.Named("time.Time").AssignBase(__VDLType618)
- __VDLType620 := vdl.Int64Type
- __VDLType618.AppendField("Seconds", __VDLType620)
- __VDLType618.AppendField("Nanos", __VDLType66)
- __VDLType612.AppendField("StartTime", __VDLType619)
- __VDLType612.AppendField("EndTime", __VDLType619)
- __VDLType611.AssignElem(__VDLType613)
- __VDLType62.AppendField("Rounds", __VDLType611)
- __VDLType62.AppendField("StartTime", __VDLType619)
- __VDLType62.AppendField("EndTime", __VDLType619)
- __VDLType62.AppendField("Winner", __VDLType617)
- __VDLType61.AssignElem(__VDLType63)
- __VDLType6Builder.Build()
- __VDLType6v, err := __VDLType61.Built()
+ keyTarget2, fieldTarget3, err := fieldsTarget1.StartField("PlayerNum")
if err != nil {
- panic(err)
+ return err
}
- return __VDLType6v
-}
-func init() {
- __VDLType6 = __VDLType6_gen()
+ if err := fieldTarget3.FromInt(int64(m.Value), tt.NonOptional().Field(0).Type); err != nil {
+ return err
+ }
+ if err := fieldsTarget1.FinishField(keyTarget2, fieldTarget3); err != nil {
+ return err
+ }
+ if err := t.FinishFields(fieldsTarget1); err != nil {
+ return err
+ }
+
+ return nil
}
-var __VDLType2 *vdl.Type = vdl.TypeOf((*unused)(nil))
-var __VDLType3 *vdl.Type = vdl.TypeOf([]string(nil))
-var __VDLType7 *vdl.Type
+func (m JudgeActionPlayerNum) MakeVDLTarget() vdl.Target {
+ return nil
+}
-func __VDLType7_gen() *vdl.Type {
- __VDLType7Builder := vdl.TypeBuilder{}
+func (x JudgeActionOpponentName) Index() int { return 1 }
+func (x JudgeActionOpponentName) Interface() interface{} { return x.Value }
+func (x JudgeActionOpponentName) Name() string { return "OpponentName" }
+func (x JudgeActionOpponentName) __VDLReflect(__JudgeActionReflect) {}
- __VDLType71 := __VDLType7Builder.List()
- __VDLType72 := __VDLType7Builder.Struct()
- __VDLType73 := __VDLType7Builder.Named("v.io/x/ref/examples/rps.Round").AssignBase(__VDLType72)
- __VDLType74 := __VDLType7Builder.Array()
- __VDLType75 := __VDLType7Builder.Named("v.io/x/ref/examples/rps.PlayersMoves").AssignBase(__VDLType74)
- __VDLType76 := vdl.StringType
- __VDLType74.AssignElem(__VDLType76)
- __VDLType74.AssignLen(2)
- __VDLType72.AppendField("Moves", __VDLType75)
- __VDLType72.AppendField("Comment", __VDLType76)
- __VDLType77 := vdl.ByteType
- __VDLType78 := __VDLType7Builder.Named("v.io/x/ref/examples/rps.WinnerTag").AssignBase(__VDLType77)
- __VDLType72.AppendField("Winner", __VDLType78)
- __VDLType79 := __VDLType7Builder.Struct()
- __VDLType710 := __VDLType7Builder.Named("time.Time").AssignBase(__VDLType79)
- __VDLType711 := vdl.Int64Type
- __VDLType79.AppendField("Seconds", __VDLType711)
- __VDLType712 := vdl.Int32Type
- __VDLType79.AppendField("Nanos", __VDLType712)
- __VDLType72.AppendField("StartTime", __VDLType710)
- __VDLType72.AppendField("EndTime", __VDLType710)
- __VDLType71.AssignElem(__VDLType73)
- __VDLType7Builder.Build()
- __VDLType7v, err := __VDLType71.Built()
+func (m JudgeActionOpponentName) FillVDLTarget(t vdl.Target, tt *vdl.Type) error {
+ fieldsTarget1, err := t.StartFields(tt)
if err != nil {
- panic(err)
+ return err
}
- return __VDLType7v
-}
-func init() {
- __VDLType7 = __VDLType7_gen()
-}
-
-var __VDLType_time_Time *vdl.Type
-
-func __VDLType_time_Time_gen() *vdl.Type {
- __VDLType_time_TimeBuilder := vdl.TypeBuilder{}
-
- __VDLType_time_Time1 := __VDLType_time_TimeBuilder.Struct()
- __VDLType_time_Time2 := __VDLType_time_TimeBuilder.Named("time.Time").AssignBase(__VDLType_time_Time1)
- __VDLType_time_Time3 := vdl.Int64Type
- __VDLType_time_Time1.AppendField("Seconds", __VDLType_time_Time3)
- __VDLType_time_Time4 := vdl.Int32Type
- __VDLType_time_Time1.AppendField("Nanos", __VDLType_time_Time4)
- __VDLType_time_TimeBuilder.Build()
- __VDLType_time_Timev, err := __VDLType_time_Time2.Built()
+ keyTarget2, fieldTarget3, err := fieldsTarget1.StartField("OpponentName")
if err != nil {
- panic(err)
+ return err
}
- return __VDLType_time_Timev
-}
-func init() {
- __VDLType_time_Time = __VDLType_time_Time_gen()
+ if err := fieldTarget3.FromString(string(m.Value), tt.NonOptional().Field(1).Type); err != nil {
+ return err
+ }
+ if err := fieldsTarget1.FinishField(keyTarget2, fieldTarget3); err != nil {
+ return err
+ }
+ if err := t.FinishFields(fieldsTarget1); err != nil {
+ return err
+ }
+
+ return nil
}
-var __VDLType_v_io_x_ref_examples_rps_GameId *vdl.Type = vdl.TypeOf(GameId{})
-var __VDLType_v_io_x_ref_examples_rps_GameOptions *vdl.Type = vdl.TypeOf(GameOptions{})
-var __VDLType_v_io_x_ref_examples_rps_GameTypeTag *vdl.Type = vdl.TypeOf(GameTypeTag(0))
-var __VDLType_v_io_x_ref_examples_rps_JudgeAction *vdl.Type
+func (m JudgeActionOpponentName) MakeVDLTarget() vdl.Target {
+ return nil
+}
-func __VDLType_v_io_x_ref_examples_rps_JudgeAction_gen() *vdl.Type {
- __VDLType_v_io_x_ref_examples_rps_JudgeActionBuilder := vdl.TypeBuilder{}
+func (x JudgeActionMoveOptions) Index() int { return 2 }
+func (x JudgeActionMoveOptions) Interface() interface{} { return x.Value }
+func (x JudgeActionMoveOptions) Name() string { return "MoveOptions" }
+func (x JudgeActionMoveOptions) __VDLReflect(__JudgeActionReflect) {}
- __VDLType_v_io_x_ref_examples_rps_JudgeAction1 := __VDLType_v_io_x_ref_examples_rps_JudgeActionBuilder.Union()
- __VDLType_v_io_x_ref_examples_rps_JudgeAction2 := __VDLType_v_io_x_ref_examples_rps_JudgeActionBuilder.Named("v.io/x/ref/examples/rps.JudgeAction").AssignBase(__VDLType_v_io_x_ref_examples_rps_JudgeAction1)
- __VDLType_v_io_x_ref_examples_rps_JudgeAction3 := vdl.Int32Type
- __VDLType_v_io_x_ref_examples_rps_JudgeAction1.AppendField("PlayerNum", __VDLType_v_io_x_ref_examples_rps_JudgeAction3)
- __VDLType_v_io_x_ref_examples_rps_JudgeAction4 := vdl.StringType
- __VDLType_v_io_x_ref_examples_rps_JudgeAction1.AppendField("OpponentName", __VDLType_v_io_x_ref_examples_rps_JudgeAction4)
- __VDLType_v_io_x_ref_examples_rps_JudgeAction5 := __VDLType_v_io_x_ref_examples_rps_JudgeActionBuilder.List()
- __VDLType_v_io_x_ref_examples_rps_JudgeAction5.AssignElem(__VDLType_v_io_x_ref_examples_rps_JudgeAction4)
- __VDLType_v_io_x_ref_examples_rps_JudgeAction1.AppendField("MoveOptions", __VDLType_v_io_x_ref_examples_rps_JudgeAction5)
- __VDLType_v_io_x_ref_examples_rps_JudgeAction6 := __VDLType_v_io_x_ref_examples_rps_JudgeActionBuilder.Struct()
- __VDLType_v_io_x_ref_examples_rps_JudgeAction7 := __VDLType_v_io_x_ref_examples_rps_JudgeActionBuilder.Named("v.io/x/ref/examples/rps.Round").AssignBase(__VDLType_v_io_x_ref_examples_rps_JudgeAction6)
- __VDLType_v_io_x_ref_examples_rps_JudgeAction8 := __VDLType_v_io_x_ref_examples_rps_JudgeActionBuilder.Array()
- __VDLType_v_io_x_ref_examples_rps_JudgeAction9 := __VDLType_v_io_x_ref_examples_rps_JudgeActionBuilder.Named("v.io/x/ref/examples/rps.PlayersMoves").AssignBase(__VDLType_v_io_x_ref_examples_rps_JudgeAction8)
- __VDLType_v_io_x_ref_examples_rps_JudgeAction8.AssignElem(__VDLType_v_io_x_ref_examples_rps_JudgeAction4)
- __VDLType_v_io_x_ref_examples_rps_JudgeAction8.AssignLen(2)
- __VDLType_v_io_x_ref_examples_rps_JudgeAction6.AppendField("Moves", __VDLType_v_io_x_ref_examples_rps_JudgeAction9)
- __VDLType_v_io_x_ref_examples_rps_JudgeAction6.AppendField("Comment", __VDLType_v_io_x_ref_examples_rps_JudgeAction4)
- __VDLType_v_io_x_ref_examples_rps_JudgeAction10 := vdl.ByteType
- __VDLType_v_io_x_ref_examples_rps_JudgeAction11 := __VDLType_v_io_x_ref_examples_rps_JudgeActionBuilder.Named("v.io/x/ref/examples/rps.WinnerTag").AssignBase(__VDLType_v_io_x_ref_examples_rps_JudgeAction10)
- __VDLType_v_io_x_ref_examples_rps_JudgeAction6.AppendField("Winner", __VDLType_v_io_x_ref_examples_rps_JudgeAction11)
- __VDLType_v_io_x_ref_examples_rps_JudgeAction12 := __VDLType_v_io_x_ref_examples_rps_JudgeActionBuilder.Struct()
- __VDLType_v_io_x_ref_examples_rps_JudgeAction13 := __VDLType_v_io_x_ref_examples_rps_JudgeActionBuilder.Named("time.Time").AssignBase(__VDLType_v_io_x_ref_examples_rps_JudgeAction12)
- __VDLType_v_io_x_ref_examples_rps_JudgeAction14 := vdl.Int64Type
- __VDLType_v_io_x_ref_examples_rps_JudgeAction12.AppendField("Seconds", __VDLType_v_io_x_ref_examples_rps_JudgeAction14)
- __VDLType_v_io_x_ref_examples_rps_JudgeAction12.AppendField("Nanos", __VDLType_v_io_x_ref_examples_rps_JudgeAction3)
- __VDLType_v_io_x_ref_examples_rps_JudgeAction6.AppendField("StartTime", __VDLType_v_io_x_ref_examples_rps_JudgeAction13)
- __VDLType_v_io_x_ref_examples_rps_JudgeAction6.AppendField("EndTime", __VDLType_v_io_x_ref_examples_rps_JudgeAction13)
- __VDLType_v_io_x_ref_examples_rps_JudgeAction1.AppendField("RoundResult", __VDLType_v_io_x_ref_examples_rps_JudgeAction7)
- __VDLType_v_io_x_ref_examples_rps_JudgeAction15 := __VDLType_v_io_x_ref_examples_rps_JudgeActionBuilder.Struct()
- __VDLType_v_io_x_ref_examples_rps_JudgeAction16 := __VDLType_v_io_x_ref_examples_rps_JudgeActionBuilder.Named("v.io/x/ref/examples/rps.ScoreCard").AssignBase(__VDLType_v_io_x_ref_examples_rps_JudgeAction15)
- __VDLType_v_io_x_ref_examples_rps_JudgeAction17 := __VDLType_v_io_x_ref_examples_rps_JudgeActionBuilder.Struct()
- __VDLType_v_io_x_ref_examples_rps_JudgeAction18 := __VDLType_v_io_x_ref_examples_rps_JudgeActionBuilder.Named("v.io/x/ref/examples/rps.GameOptions").AssignBase(__VDLType_v_io_x_ref_examples_rps_JudgeAction17)
- __VDLType_v_io_x_ref_examples_rps_JudgeAction17.AppendField("NumRounds", __VDLType_v_io_x_ref_examples_rps_JudgeAction3)
- __VDLType_v_io_x_ref_examples_rps_JudgeAction19 := vdl.ByteType
- __VDLType_v_io_x_ref_examples_rps_JudgeAction20 := __VDLType_v_io_x_ref_examples_rps_JudgeActionBuilder.Named("v.io/x/ref/examples/rps.GameTypeTag").AssignBase(__VDLType_v_io_x_ref_examples_rps_JudgeAction19)
- __VDLType_v_io_x_ref_examples_rps_JudgeAction17.AppendField("GameType", __VDLType_v_io_x_ref_examples_rps_JudgeAction20)
- __VDLType_v_io_x_ref_examples_rps_JudgeAction15.AppendField("Opts", __VDLType_v_io_x_ref_examples_rps_JudgeAction18)
- __VDLType_v_io_x_ref_examples_rps_JudgeAction15.AppendField("Judge", __VDLType_v_io_x_ref_examples_rps_JudgeAction4)
- __VDLType_v_io_x_ref_examples_rps_JudgeAction15.AppendField("Players", __VDLType_v_io_x_ref_examples_rps_JudgeAction5)
- __VDLType_v_io_x_ref_examples_rps_JudgeAction21 := __VDLType_v_io_x_ref_examples_rps_JudgeActionBuilder.List()
- __VDLType_v_io_x_ref_examples_rps_JudgeAction21.AssignElem(__VDLType_v_io_x_ref_examples_rps_JudgeAction7)
- __VDLType_v_io_x_ref_examples_rps_JudgeAction15.AppendField("Rounds", __VDLType_v_io_x_ref_examples_rps_JudgeAction21)
- __VDLType_v_io_x_ref_examples_rps_JudgeAction15.AppendField("StartTime", __VDLType_v_io_x_ref_examples_rps_JudgeAction13)
- __VDLType_v_io_x_ref_examples_rps_JudgeAction15.AppendField("EndTime", __VDLType_v_io_x_ref_examples_rps_JudgeAction13)
- __VDLType_v_io_x_ref_examples_rps_JudgeAction15.AppendField("Winner", __VDLType_v_io_x_ref_examples_rps_JudgeAction11)
- __VDLType_v_io_x_ref_examples_rps_JudgeAction1.AppendField("Score", __VDLType_v_io_x_ref_examples_rps_JudgeAction16)
- __VDLType_v_io_x_ref_examples_rps_JudgeActionBuilder.Build()
- __VDLType_v_io_x_ref_examples_rps_JudgeActionv, err := __VDLType_v_io_x_ref_examples_rps_JudgeAction2.Built()
+func (m JudgeActionMoveOptions) FillVDLTarget(t vdl.Target, tt *vdl.Type) error {
+ fieldsTarget1, err := t.StartFields(tt)
if err != nil {
- panic(err)
+ return err
}
- return __VDLType_v_io_x_ref_examples_rps_JudgeActionv
-}
-func init() {
- __VDLType_v_io_x_ref_examples_rps_JudgeAction = __VDLType_v_io_x_ref_examples_rps_JudgeAction_gen()
-}
-
-var __VDLType_v_io_x_ref_examples_rps_PlayResult *vdl.Type = vdl.TypeOf(PlayResult{})
-var __VDLType_v_io_x_ref_examples_rps_PlayerAction *vdl.Type = vdl.TypeOf(PlayerAction(PlayerActionMove{""}))
-var __VDLType_v_io_x_ref_examples_rps_PlayersMoves *vdl.Type = vdl.TypeOf(PlayersMoves{})
-var __VDLType_v_io_x_ref_examples_rps_Round *vdl.Type
-
-func __VDLType_v_io_x_ref_examples_rps_Round_gen() *vdl.Type {
- __VDLType_v_io_x_ref_examples_rps_RoundBuilder := vdl.TypeBuilder{}
-
- __VDLType_v_io_x_ref_examples_rps_Round1 := __VDLType_v_io_x_ref_examples_rps_RoundBuilder.Struct()
- __VDLType_v_io_x_ref_examples_rps_Round2 := __VDLType_v_io_x_ref_examples_rps_RoundBuilder.Named("v.io/x/ref/examples/rps.Round").AssignBase(__VDLType_v_io_x_ref_examples_rps_Round1)
- __VDLType_v_io_x_ref_examples_rps_Round3 := __VDLType_v_io_x_ref_examples_rps_RoundBuilder.Array()
- __VDLType_v_io_x_ref_examples_rps_Round4 := __VDLType_v_io_x_ref_examples_rps_RoundBuilder.Named("v.io/x/ref/examples/rps.PlayersMoves").AssignBase(__VDLType_v_io_x_ref_examples_rps_Round3)
- __VDLType_v_io_x_ref_examples_rps_Round5 := vdl.StringType
- __VDLType_v_io_x_ref_examples_rps_Round3.AssignElem(__VDLType_v_io_x_ref_examples_rps_Round5)
- __VDLType_v_io_x_ref_examples_rps_Round3.AssignLen(2)
- __VDLType_v_io_x_ref_examples_rps_Round1.AppendField("Moves", __VDLType_v_io_x_ref_examples_rps_Round4)
- __VDLType_v_io_x_ref_examples_rps_Round1.AppendField("Comment", __VDLType_v_io_x_ref_examples_rps_Round5)
- __VDLType_v_io_x_ref_examples_rps_Round6 := vdl.ByteType
- __VDLType_v_io_x_ref_examples_rps_Round7 := __VDLType_v_io_x_ref_examples_rps_RoundBuilder.Named("v.io/x/ref/examples/rps.WinnerTag").AssignBase(__VDLType_v_io_x_ref_examples_rps_Round6)
- __VDLType_v_io_x_ref_examples_rps_Round1.AppendField("Winner", __VDLType_v_io_x_ref_examples_rps_Round7)
- __VDLType_v_io_x_ref_examples_rps_Round8 := __VDLType_v_io_x_ref_examples_rps_RoundBuilder.Struct()
- __VDLType_v_io_x_ref_examples_rps_Round9 := __VDLType_v_io_x_ref_examples_rps_RoundBuilder.Named("time.Time").AssignBase(__VDLType_v_io_x_ref_examples_rps_Round8)
- __VDLType_v_io_x_ref_examples_rps_Round10 := vdl.Int64Type
- __VDLType_v_io_x_ref_examples_rps_Round8.AppendField("Seconds", __VDLType_v_io_x_ref_examples_rps_Round10)
- __VDLType_v_io_x_ref_examples_rps_Round11 := vdl.Int32Type
- __VDLType_v_io_x_ref_examples_rps_Round8.AppendField("Nanos", __VDLType_v_io_x_ref_examples_rps_Round11)
- __VDLType_v_io_x_ref_examples_rps_Round1.AppendField("StartTime", __VDLType_v_io_x_ref_examples_rps_Round9)
- __VDLType_v_io_x_ref_examples_rps_Round1.AppendField("EndTime", __VDLType_v_io_x_ref_examples_rps_Round9)
- __VDLType_v_io_x_ref_examples_rps_RoundBuilder.Build()
- __VDLType_v_io_x_ref_examples_rps_Roundv, err := __VDLType_v_io_x_ref_examples_rps_Round2.Built()
+ keyTarget2, fieldTarget3, err := fieldsTarget1.StartField("MoveOptions")
if err != nil {
- panic(err)
+ return err
}
- return __VDLType_v_io_x_ref_examples_rps_Roundv
-}
-func init() {
- __VDLType_v_io_x_ref_examples_rps_Round = __VDLType_v_io_x_ref_examples_rps_Round_gen()
-}
-var __VDLType_v_io_x_ref_examples_rps_ScoreCard *vdl.Type
-
-func __VDLType_v_io_x_ref_examples_rps_ScoreCard_gen() *vdl.Type {
- __VDLType_v_io_x_ref_examples_rps_ScoreCardBuilder := vdl.TypeBuilder{}
-
- __VDLType_v_io_x_ref_examples_rps_ScoreCard1 := __VDLType_v_io_x_ref_examples_rps_ScoreCardBuilder.Struct()
- __VDLType_v_io_x_ref_examples_rps_ScoreCard2 := __VDLType_v_io_x_ref_examples_rps_ScoreCardBuilder.Named("v.io/x/ref/examples/rps.ScoreCard").AssignBase(__VDLType_v_io_x_ref_examples_rps_ScoreCard1)
- __VDLType_v_io_x_ref_examples_rps_ScoreCard3 := __VDLType_v_io_x_ref_examples_rps_ScoreCardBuilder.Struct()
- __VDLType_v_io_x_ref_examples_rps_ScoreCard4 := __VDLType_v_io_x_ref_examples_rps_ScoreCardBuilder.Named("v.io/x/ref/examples/rps.GameOptions").AssignBase(__VDLType_v_io_x_ref_examples_rps_ScoreCard3)
- __VDLType_v_io_x_ref_examples_rps_ScoreCard5 := vdl.Int32Type
- __VDLType_v_io_x_ref_examples_rps_ScoreCard3.AppendField("NumRounds", __VDLType_v_io_x_ref_examples_rps_ScoreCard5)
- __VDLType_v_io_x_ref_examples_rps_ScoreCard6 := vdl.ByteType
- __VDLType_v_io_x_ref_examples_rps_ScoreCard7 := __VDLType_v_io_x_ref_examples_rps_ScoreCardBuilder.Named("v.io/x/ref/examples/rps.GameTypeTag").AssignBase(__VDLType_v_io_x_ref_examples_rps_ScoreCard6)
- __VDLType_v_io_x_ref_examples_rps_ScoreCard3.AppendField("GameType", __VDLType_v_io_x_ref_examples_rps_ScoreCard7)
- __VDLType_v_io_x_ref_examples_rps_ScoreCard1.AppendField("Opts", __VDLType_v_io_x_ref_examples_rps_ScoreCard4)
- __VDLType_v_io_x_ref_examples_rps_ScoreCard8 := vdl.StringType
- __VDLType_v_io_x_ref_examples_rps_ScoreCard1.AppendField("Judge", __VDLType_v_io_x_ref_examples_rps_ScoreCard8)
- __VDLType_v_io_x_ref_examples_rps_ScoreCard9 := __VDLType_v_io_x_ref_examples_rps_ScoreCardBuilder.List()
- __VDLType_v_io_x_ref_examples_rps_ScoreCard9.AssignElem(__VDLType_v_io_x_ref_examples_rps_ScoreCard8)
- __VDLType_v_io_x_ref_examples_rps_ScoreCard1.AppendField("Players", __VDLType_v_io_x_ref_examples_rps_ScoreCard9)
- __VDLType_v_io_x_ref_examples_rps_ScoreCard10 := __VDLType_v_io_x_ref_examples_rps_ScoreCardBuilder.List()
- __VDLType_v_io_x_ref_examples_rps_ScoreCard11 := __VDLType_v_io_x_ref_examples_rps_ScoreCardBuilder.Struct()
- __VDLType_v_io_x_ref_examples_rps_ScoreCard12 := __VDLType_v_io_x_ref_examples_rps_ScoreCardBuilder.Named("v.io/x/ref/examples/rps.Round").AssignBase(__VDLType_v_io_x_ref_examples_rps_ScoreCard11)
- __VDLType_v_io_x_ref_examples_rps_ScoreCard13 := __VDLType_v_io_x_ref_examples_rps_ScoreCardBuilder.Array()
- __VDLType_v_io_x_ref_examples_rps_ScoreCard14 := __VDLType_v_io_x_ref_examples_rps_ScoreCardBuilder.Named("v.io/x/ref/examples/rps.PlayersMoves").AssignBase(__VDLType_v_io_x_ref_examples_rps_ScoreCard13)
- __VDLType_v_io_x_ref_examples_rps_ScoreCard13.AssignElem(__VDLType_v_io_x_ref_examples_rps_ScoreCard8)
- __VDLType_v_io_x_ref_examples_rps_ScoreCard13.AssignLen(2)
- __VDLType_v_io_x_ref_examples_rps_ScoreCard11.AppendField("Moves", __VDLType_v_io_x_ref_examples_rps_ScoreCard14)
- __VDLType_v_io_x_ref_examples_rps_ScoreCard11.AppendField("Comment", __VDLType_v_io_x_ref_examples_rps_ScoreCard8)
- __VDLType_v_io_x_ref_examples_rps_ScoreCard15 := vdl.ByteType
- __VDLType_v_io_x_ref_examples_rps_ScoreCard16 := __VDLType_v_io_x_ref_examples_rps_ScoreCardBuilder.Named("v.io/x/ref/examples/rps.WinnerTag").AssignBase(__VDLType_v_io_x_ref_examples_rps_ScoreCard15)
- __VDLType_v_io_x_ref_examples_rps_ScoreCard11.AppendField("Winner", __VDLType_v_io_x_ref_examples_rps_ScoreCard16)
- __VDLType_v_io_x_ref_examples_rps_ScoreCard17 := __VDLType_v_io_x_ref_examples_rps_ScoreCardBuilder.Struct()
- __VDLType_v_io_x_ref_examples_rps_ScoreCard18 := __VDLType_v_io_x_ref_examples_rps_ScoreCardBuilder.Named("time.Time").AssignBase(__VDLType_v_io_x_ref_examples_rps_ScoreCard17)
- __VDLType_v_io_x_ref_examples_rps_ScoreCard19 := vdl.Int64Type
- __VDLType_v_io_x_ref_examples_rps_ScoreCard17.AppendField("Seconds", __VDLType_v_io_x_ref_examples_rps_ScoreCard19)
- __VDLType_v_io_x_ref_examples_rps_ScoreCard17.AppendField("Nanos", __VDLType_v_io_x_ref_examples_rps_ScoreCard5)
- __VDLType_v_io_x_ref_examples_rps_ScoreCard11.AppendField("StartTime", __VDLType_v_io_x_ref_examples_rps_ScoreCard18)
- __VDLType_v_io_x_ref_examples_rps_ScoreCard11.AppendField("EndTime", __VDLType_v_io_x_ref_examples_rps_ScoreCard18)
- __VDLType_v_io_x_ref_examples_rps_ScoreCard10.AssignElem(__VDLType_v_io_x_ref_examples_rps_ScoreCard12)
- __VDLType_v_io_x_ref_examples_rps_ScoreCard1.AppendField("Rounds", __VDLType_v_io_x_ref_examples_rps_ScoreCard10)
- __VDLType_v_io_x_ref_examples_rps_ScoreCard1.AppendField("StartTime", __VDLType_v_io_x_ref_examples_rps_ScoreCard18)
- __VDLType_v_io_x_ref_examples_rps_ScoreCard1.AppendField("EndTime", __VDLType_v_io_x_ref_examples_rps_ScoreCard18)
- __VDLType_v_io_x_ref_examples_rps_ScoreCard1.AppendField("Winner", __VDLType_v_io_x_ref_examples_rps_ScoreCard16)
- __VDLType_v_io_x_ref_examples_rps_ScoreCardBuilder.Build()
- __VDLType_v_io_x_ref_examples_rps_ScoreCardv, err := __VDLType_v_io_x_ref_examples_rps_ScoreCard2.Built()
+ listTarget4, err := fieldTarget3.StartList(tt.NonOptional().Field(2).Type, len(m.Value))
if err != nil {
- panic(err)
+ return err
}
- return __VDLType_v_io_x_ref_examples_rps_ScoreCardv
-}
-func init() {
- __VDLType_v_io_x_ref_examples_rps_ScoreCard = __VDLType_v_io_x_ref_examples_rps_ScoreCard_gen()
+ for i, elem6 := range m.Value {
+ elemTarget5, err := listTarget4.StartElem(i)
+ if err != nil {
+ return err
+ }
+ if err := elemTarget5.FromString(string(elem6), tt.NonOptional().Field(2).Type.Elem()); err != nil {
+ return err
+ }
+ if err := listTarget4.FinishElem(elemTarget5); err != nil {
+ return err
+ }
+ }
+ if err := fieldTarget3.FinishList(listTarget4); err != nil {
+ return err
+ }
+ if err := fieldsTarget1.FinishField(keyTarget2, fieldTarget3); err != nil {
+ return err
+ }
+ if err := t.FinishFields(fieldsTarget1); err != nil {
+ return err
+ }
+
+ return nil
}
-var __VDLType_v_io_x_ref_examples_rps_WinnerTag *vdl.Type = vdl.TypeOf(WinnerTag(0))
-var __VDLType_v_io_x_ref_examples_rps_unused *vdl.Type = vdl.TypeOf(unused{})
-
-func __VDLEnsureNativeBuilt() {
- if __VDLType4 == nil {
- __VDLType4 = __VDLType4_gen()
- }
- if __VDLType6 == nil {
- __VDLType6 = __VDLType6_gen()
- }
- if __VDLType7 == nil {
- __VDLType7 = __VDLType7_gen()
- }
- if __VDLType_time_Time == nil {
- __VDLType_time_Time = __VDLType_time_Time_gen()
- }
- if __VDLType_v_io_x_ref_examples_rps_JudgeAction == nil {
- __VDLType_v_io_x_ref_examples_rps_JudgeAction = __VDLType_v_io_x_ref_examples_rps_JudgeAction_gen()
- }
- if __VDLType_v_io_x_ref_examples_rps_Round == nil {
- __VDLType_v_io_x_ref_examples_rps_Round = __VDLType_v_io_x_ref_examples_rps_Round_gen()
- }
- if __VDLType_v_io_x_ref_examples_rps_ScoreCard == nil {
- __VDLType_v_io_x_ref_examples_rps_ScoreCard = __VDLType_v_io_x_ref_examples_rps_ScoreCard_gen()
- }
+func (m JudgeActionMoveOptions) MakeVDLTarget() vdl.Target {
+ return nil
}
-const Classic = GameTypeTag(0) // Rock-Paper-Scissors
+func (x JudgeActionRoundResult) Index() int { return 3 }
+func (x JudgeActionRoundResult) Interface() interface{} { return x.Value }
+func (x JudgeActionRoundResult) Name() string { return "RoundResult" }
+func (x JudgeActionRoundResult) __VDLReflect(__JudgeActionReflect) {}
+func (m JudgeActionRoundResult) FillVDLTarget(t vdl.Target, tt *vdl.Type) error {
+ fieldsTarget1, err := t.StartFields(tt)
+ if err != nil {
+ return err
+ }
+ keyTarget2, fieldTarget3, err := fieldsTarget1.StartField("RoundResult")
+ if err != nil {
+ return err
+ }
+
+ if err := m.Value.FillVDLTarget(fieldTarget3, tt.NonOptional().Field(3).Type); err != nil {
+ return err
+ }
+ if err := fieldsTarget1.FinishField(keyTarget2, fieldTarget3); err != nil {
+ return err
+ }
+ if err := t.FinishFields(fieldsTarget1); err != nil {
+ return err
+ }
+
+ return nil
+}
+
+func (m JudgeActionRoundResult) MakeVDLTarget() vdl.Target {
+ return nil
+}
+
+func (x JudgeActionScore) Index() int { return 4 }
+func (x JudgeActionScore) Interface() interface{} { return x.Value }
+func (x JudgeActionScore) Name() string { return "Score" }
+func (x JudgeActionScore) __VDLReflect(__JudgeActionReflect) {}
+
+func (m JudgeActionScore) FillVDLTarget(t vdl.Target, tt *vdl.Type) error {
+ fieldsTarget1, err := t.StartFields(tt)
+ if err != nil {
+ return err
+ }
+ keyTarget2, fieldTarget3, err := fieldsTarget1.StartField("Score")
+ if err != nil {
+ return err
+ }
+
+ if err := m.Value.FillVDLTarget(fieldTarget3, tt.NonOptional().Field(4).Type); err != nil {
+ return err
+ }
+ if err := fieldsTarget1.FinishField(keyTarget2, fieldTarget3); err != nil {
+ return err
+ }
+ if err := t.FinishFields(fieldsTarget1); err != nil {
+ return err
+ }
+
+ return nil
+}
+
+func (m JudgeActionScore) MakeVDLTarget() vdl.Target {
+ return nil
+}
+
+// PlayResult is the value returned by the Play method. It indicates the outcome of the game.
+type PlayResult struct {
+ YouWon bool // True if the player receiving the result won the game.
+}
+
+func (PlayResult) __VDLReflect(struct {
+ Name string `vdl:"v.io/x/ref/examples/rps.PlayResult"`
+}) {
+}
+
+func (m *PlayResult) FillVDLTarget(t vdl.Target, tt *vdl.Type) error {
+ fieldsTarget1, err := t.StartFields(tt)
+ if err != nil {
+ return err
+ }
+
+ keyTarget2, fieldTarget3, err := fieldsTarget1.StartField("YouWon")
+ if err != vdl.ErrFieldNoExist && err != nil {
+ return err
+ }
+ if err != vdl.ErrFieldNoExist {
+ if err := fieldTarget3.FromBool(bool(m.YouWon), tt.NonOptional().Field(0).Type); err != nil {
+ return err
+ }
+ if err := fieldsTarget1.FinishField(keyTarget2, fieldTarget3); err != nil {
+ return err
+ }
+ }
+ if err := t.FinishFields(fieldsTarget1); err != nil {
+ return err
+ }
+ return nil
+}
+
+func (m *PlayResult) MakeVDLTarget() vdl.Target {
+ return &PlayResultTarget{Value: m}
+}
+
+type PlayResultTarget struct {
+ Value *PlayResult
+ youWonTarget vdl.BoolTarget
+ vdl.TargetBase
+ vdl.FieldsTargetBase
+}
+
+func (t *PlayResultTarget) StartFields(tt *vdl.Type) (vdl.FieldsTarget, error) {
+
+ if ttWant := vdl.TypeOf((*PlayResult)(nil)).Elem(); !vdl.Compatible(tt, ttWant) {
+ return nil, fmt.Errorf("type %v incompatible with %v", tt, ttWant)
+ }
+ return t, nil
+}
+func (t *PlayResultTarget) StartField(name string) (key, field vdl.Target, _ error) {
+ switch name {
+ case "YouWon":
+ t.youWonTarget.Value = &t.Value.YouWon
+ target, err := &t.youWonTarget, error(nil)
+ return nil, target, err
+ default:
+ return nil, nil, fmt.Errorf("field %s not in struct v.io/x/ref/examples/rps.PlayResult", name)
+ }
+}
+func (t *PlayResultTarget) FinishField(_, _ vdl.Target) error {
+ return nil
+}
+func (t *PlayResultTarget) FinishFields(_ vdl.FieldsTarget) error {
+
+ return nil
+}
+
+//////////////////////////////////////////////////
+// Const definitions
+
+const Classic = GameTypeTag(0) // Rock-Paper-Scissors
const LizardSpock = GameTypeTag(1) // Rock-Paper-Scissors-Lizard-Spock
-
const Draw = WinnerTag(0)
-
const Player1 = WinnerTag(1)
-
const Player2 = WinnerTag(2)
+//////////////////////////////////////////////////
+// Interface definitions
+
// JudgeClientMethods is the client interface
// containing Judge methods.
type JudgeClientMethods interface {
@@ -2252,3 +1885,39 @@
{"ScoreKeeper", "v.io/x/ref/examples/rps", "// ScoreKeeper receives the outcome of games from Judges."},
},
}
+
+var __VDLInitCalled bool
+
+// __VDLInit performs vdl initialization. It is safe to call multiple times.
+// If you have an init ordering issue, just insert the following line verbatim
+// into your source files in this package, right after the "package foo" clause:
+//
+// var _ = __VDLInit()
+//
+// The purpose of this function is to ensure that vdl initialization occurs in
+// the right order, and very early in the init sequence. In particular, vdl
+// registration and package variable initialization needs to occur before
+// functions like vdl.TypeOf will work properly.
+//
+// This function returns a dummy value, so that it can be used to initialize the
+// first var in the file, to take advantage of Go's defined init order.
+func __VDLInit() struct{} {
+ if __VDLInitCalled {
+ return struct{}{}
+ }
+
+ // Register types.
+ vdl.Register((*GameId)(nil))
+ vdl.Register((*GameTypeTag)(nil))
+ vdl.Register((*GameOptions)(nil))
+ vdl.Register((*unused)(nil))
+ vdl.Register((*PlayerAction)(nil))
+ vdl.Register((*PlayersMoves)(nil))
+ vdl.Register((*WinnerTag)(nil))
+ vdl.Register((*Round)(nil))
+ vdl.Register((*ScoreCard)(nil))
+ vdl.Register((*JudgeAction)(nil))
+ vdl.Register((*PlayResult)(nil))
+
+ return struct{}{}
+}
diff --git a/examples/tunnel/tunnel.vdl.go b/examples/tunnel/tunnel.vdl.go
index 9484f96..f1093c6 100644
--- a/examples/tunnel/tunnel.vdl.go
+++ b/examples/tunnel/tunnel.vdl.go
@@ -19,6 +19,98 @@
"v.io/v23/vdl"
)
+var _ = __VDLInit() // Must be first; see __VDLInit comments for details.
+
+//////////////////////////////////////////////////
+// Type definitions
+
+type WindowSize struct {
+ Rows uint16
+ Cols uint16
+}
+
+func (WindowSize) __VDLReflect(struct {
+ Name string `vdl:"v.io/x/ref/examples/tunnel.WindowSize"`
+}) {
+}
+
+func (m *WindowSize) FillVDLTarget(t vdl.Target, tt *vdl.Type) error {
+ fieldsTarget1, err := t.StartFields(tt)
+ if err != nil {
+ return err
+ }
+
+ keyTarget2, fieldTarget3, err := fieldsTarget1.StartField("Rows")
+ if err != vdl.ErrFieldNoExist && err != nil {
+ return err
+ }
+ if err != vdl.ErrFieldNoExist {
+ if err := fieldTarget3.FromUint(uint64(m.Rows), tt.NonOptional().Field(0).Type); err != nil {
+ return err
+ }
+ if err := fieldsTarget1.FinishField(keyTarget2, fieldTarget3); err != nil {
+ return err
+ }
+ }
+ keyTarget4, fieldTarget5, err := fieldsTarget1.StartField("Cols")
+ if err != vdl.ErrFieldNoExist && err != nil {
+ return err
+ }
+ if err != vdl.ErrFieldNoExist {
+ if err := fieldTarget5.FromUint(uint64(m.Cols), tt.NonOptional().Field(1).Type); err != nil {
+ return err
+ }
+ if err := fieldsTarget1.FinishField(keyTarget4, fieldTarget5); err != nil {
+ return err
+ }
+ }
+ if err := t.FinishFields(fieldsTarget1); err != nil {
+ return err
+ }
+ return nil
+}
+
+func (m *WindowSize) MakeVDLTarget() vdl.Target {
+ return &WindowSizeTarget{Value: m}
+}
+
+type WindowSizeTarget struct {
+ Value *WindowSize
+ rowsTarget vdl.Uint16Target
+ colsTarget vdl.Uint16Target
+ vdl.TargetBase
+ vdl.FieldsTargetBase
+}
+
+func (t *WindowSizeTarget) StartFields(tt *vdl.Type) (vdl.FieldsTarget, error) {
+
+ if ttWant := vdl.TypeOf((*WindowSize)(nil)).Elem(); !vdl.Compatible(tt, ttWant) {
+ return nil, fmt.Errorf("type %v incompatible with %v", tt, ttWant)
+ }
+ return t, nil
+}
+func (t *WindowSizeTarget) StartField(name string) (key, field vdl.Target, _ error) {
+ switch name {
+ case "Rows":
+ t.rowsTarget.Value = &t.Value.Rows
+ target, err := &t.rowsTarget, error(nil)
+ return nil, target, err
+ case "Cols":
+ t.colsTarget.Value = &t.Value.Cols
+ target, err := &t.colsTarget, error(nil)
+ return nil, target, err
+ default:
+ return nil, nil, fmt.Errorf("field %s not in struct v.io/x/ref/examples/tunnel.WindowSize", name)
+ }
+}
+func (t *WindowSizeTarget) FinishField(_, _ vdl.Target) error {
+ return nil
+}
+func (t *WindowSizeTarget) FinishFields(_ vdl.FieldsTarget) error {
+
+ return nil
+}
+
type ShellOpts struct {
UsePty bool // Whether to open a pseudo-terminal.
Environment []string // Environment variables to pass to the remote shell.
@@ -31,9 +123,6 @@
}
func (m *ShellOpts) FillVDLTarget(t vdl.Target, tt *vdl.Type) error {
- if __VDLType_v_io_x_ref_examples_tunnel_ShellOpts == nil || __VDLType0 == nil {
- panic("Initialization order error: types generated for FillVDLTarget not initialized. Consider moving caller to an init() block.")
- }
fieldsTarget1, err := t.StartFields(tt)
if err != nil {
return err
@@ -44,7 +133,7 @@
return err
}
if err != vdl.ErrFieldNoExist {
- if err := fieldTarget3.FromBool(bool(m.UsePty), vdl.BoolType); err != nil {
+ if err := fieldTarget3.FromBool(bool(m.UsePty), tt.NonOptional().Field(0).Type); err != nil {
return err
}
if err := fieldsTarget1.FinishField(keyTarget2, fieldTarget3); err != nil {
@@ -57,7 +146,7 @@
}
if err != vdl.ErrFieldNoExist {
- listTarget6, err := fieldTarget5.StartList(__VDLType1, len(m.Environment))
+ listTarget6, err := fieldTarget5.StartList(tt.NonOptional().Field(1).Type, len(m.Environment))
if err != nil {
return err
}
@@ -66,7 +155,7 @@
if err != nil {
return err
}
- if err := elemTarget7.FromString(string(elem8), vdl.StringType); err != nil {
+ if err := elemTarget7.FromString(string(elem8), tt.NonOptional().Field(1).Type.Elem()); err != nil {
return err
}
if err := listTarget6.FinishElem(elemTarget7); err != nil {
@@ -86,7 +175,7 @@
}
if err != vdl.ErrFieldNoExist {
- if err := m.WinSize.FillVDLTarget(fieldTarget10, __VDLType_v_io_x_ref_examples_tunnel_WindowSize); err != nil {
+ if err := m.WinSize.FillVDLTarget(fieldTarget10, tt.NonOptional().Field(2).Type); err != nil {
return err
}
if err := fieldsTarget1.FinishField(keyTarget9, fieldTarget10); err != nil {
@@ -114,8 +203,8 @@
func (t *ShellOptsTarget) StartFields(tt *vdl.Type) (vdl.FieldsTarget, error) {
- if !vdl.Compatible(tt, __VDLType_v_io_x_ref_examples_tunnel_ShellOpts) {
- return nil, fmt.Errorf("type %v incompatible with %v", tt, __VDLType_v_io_x_ref_examples_tunnel_ShellOpts)
+ if ttWant := vdl.TypeOf((*ShellOpts)(nil)).Elem(); !vdl.Compatible(tt, ttWant) {
+ return nil, fmt.Errorf("type %v incompatible with %v", tt, ttWant)
}
return t, nil
}
@@ -134,7 +223,7 @@
target, err := &t.winSizeTarget, error(nil)
return nil, target, err
default:
- return nil, nil, fmt.Errorf("field %s not in struct %v", name, __VDLType_v_io_x_ref_examples_tunnel_ShellOpts)
+ return nil, nil, fmt.Errorf("field %s not in struct v.io/x/ref/examples/tunnel.ShellOpts", name)
}
}
func (t *ShellOptsTarget) FinishField(_, _ vdl.Target) error {
@@ -145,94 +234,55 @@
return nil
}
-type WindowSizeTarget struct {
- Value *WindowSize
- rowsTarget vdl.Uint16Target
- colsTarget vdl.Uint16Target
- vdl.TargetBase
- vdl.FieldsTargetBase
+type unused struct {
}
-func (t *WindowSizeTarget) StartFields(tt *vdl.Type) (vdl.FieldsTarget, error) {
-
- if !vdl.Compatible(tt, __VDLType_v_io_x_ref_examples_tunnel_WindowSize) {
- return nil, fmt.Errorf("type %v incompatible with %v", tt, __VDLType_v_io_x_ref_examples_tunnel_WindowSize)
- }
- return t, nil
-}
-func (t *WindowSizeTarget) StartField(name string) (key, field vdl.Target, _ error) {
- switch name {
- case "Rows":
- t.rowsTarget.Value = &t.Value.Rows
- target, err := &t.rowsTarget, error(nil)
- return nil, target, err
- case "Cols":
- t.colsTarget.Value = &t.Value.Cols
- target, err := &t.colsTarget, error(nil)
- return nil, target, err
- default:
- return nil, nil, fmt.Errorf("field %s not in struct %v", name, __VDLType_v_io_x_ref_examples_tunnel_WindowSize)
- }
-}
-func (t *WindowSizeTarget) FinishField(_, _ vdl.Target) error {
- return nil
-}
-func (t *WindowSizeTarget) FinishFields(_ vdl.FieldsTarget) error {
-
- return nil
-}
-
-type WindowSize struct {
- Rows uint16
- Cols uint16
-}
-
-func (WindowSize) __VDLReflect(struct {
- Name string `vdl:"v.io/x/ref/examples/tunnel.WindowSize"`
+func (unused) __VDLReflect(struct {
+ Name string `vdl:"v.io/x/ref/examples/tunnel.unused"`
}) {
}
-func (m *WindowSize) FillVDLTarget(t vdl.Target, tt *vdl.Type) error {
- if __VDLType_v_io_x_ref_examples_tunnel_WindowSize == nil || __VDLType2 == nil {
- panic("Initialization order error: types generated for FillVDLTarget not initialized. Consider moving caller to an init() block.")
- }
+func (m *unused) FillVDLTarget(t vdl.Target, tt *vdl.Type) error {
fieldsTarget1, err := t.StartFields(tt)
if err != nil {
return err
}
- keyTarget2, fieldTarget3, err := fieldsTarget1.StartField("Rows")
- if err != vdl.ErrFieldNoExist && err != nil {
- return err
- }
- if err != vdl.ErrFieldNoExist {
- if err := fieldTarget3.FromUint(uint64(m.Rows), vdl.Uint16Type); err != nil {
- return err
- }
- if err := fieldsTarget1.FinishField(keyTarget2, fieldTarget3); err != nil {
- return err
- }
- }
- keyTarget4, fieldTarget5, err := fieldsTarget1.StartField("Cols")
- if err != vdl.ErrFieldNoExist && err != nil {
- return err
- }
- if err != vdl.ErrFieldNoExist {
- if err := fieldTarget5.FromUint(uint64(m.Cols), vdl.Uint16Type); err != nil {
- return err
- }
- if err := fieldsTarget1.FinishField(keyTarget4, fieldTarget5); err != nil {
- return err
- }
- }
if err := t.FinishFields(fieldsTarget1); err != nil {
return err
}
return nil
}
-func (m *WindowSize) MakeVDLTarget() vdl.Target {
- return &WindowSizeTarget{Value: m}
+func (m *unused) MakeVDLTarget() vdl.Target {
+ return &unusedTarget{Value: m}
+}
+
+type unusedTarget struct {
+ Value *unused
+ vdl.TargetBase
+ vdl.FieldsTargetBase
+}
+
+func (t *unusedTarget) StartFields(tt *vdl.Type) (vdl.FieldsTarget, error) {
+
+ if ttWant := vdl.TypeOf((*unused)(nil)).Elem(); !vdl.Compatible(tt, ttWant) {
+ return nil, fmt.Errorf("type %v incompatible with %v", tt, ttWant)
+ }
+ return t, nil
+}
+func (t *unusedTarget) StartField(name string) (key, field vdl.Target, _ error) {
+ switch name {
+ default:
+ return nil, nil, fmt.Errorf("field %s not in struct v.io/x/ref/examples/tunnel.unused", name)
+ }
+}
+func (t *unusedTarget) FinishField(_, _ vdl.Target) error {
+ return nil
+}
+func (t *unusedTarget) FinishFields(_ vdl.FieldsTarget) error {
+
+ return nil
}
type (
@@ -279,7 +329,7 @@
func (x ClientShellPacketStdin) __VDLReflect(__ClientShellPacketReflect) {}
func (m ClientShellPacketStdin) FillVDLTarget(t vdl.Target, tt *vdl.Type) error {
- fieldsTarget1, err := t.StartFields(__VDLType_v_io_x_ref_examples_tunnel_ClientShellPacket)
+ fieldsTarget1, err := t.StartFields(tt)
if err != nil {
return err
}
@@ -288,7 +338,7 @@
return err
}
- if err := fieldTarget3.FromBytes([]byte(m.Value), __VDLType3); err != nil {
+ if err := fieldTarget3.FromBytes([]byte(m.Value), tt.NonOptional().Field(0).Type); err != nil {
return err
}
if err := fieldsTarget1.FinishField(keyTarget2, fieldTarget3); err != nil {
@@ -311,7 +361,7 @@
func (x ClientShellPacketEndOfFile) __VDLReflect(__ClientShellPacketReflect) {}
func (m ClientShellPacketEndOfFile) FillVDLTarget(t vdl.Target, tt *vdl.Type) error {
- fieldsTarget1, err := t.StartFields(__VDLType_v_io_x_ref_examples_tunnel_ClientShellPacket)
+ fieldsTarget1, err := t.StartFields(tt)
if err != nil {
return err
}
@@ -320,7 +370,7 @@
return err
}
- if err := m.Value.FillVDLTarget(fieldTarget3, __VDLType_v_io_x_ref_examples_tunnel_unused); err != nil {
+ if err := m.Value.FillVDLTarget(fieldTarget3, tt.NonOptional().Field(1).Type); err != nil {
return err
}
if err := fieldsTarget1.FinishField(keyTarget2, fieldTarget3); err != nil {
@@ -343,7 +393,7 @@
func (x ClientShellPacketWinSize) __VDLReflect(__ClientShellPacketReflect) {}
func (m ClientShellPacketWinSize) FillVDLTarget(t vdl.Target, tt *vdl.Type) error {
- fieldsTarget1, err := t.StartFields(__VDLType_v_io_x_ref_examples_tunnel_ClientShellPacket)
+ fieldsTarget1, err := t.StartFields(tt)
if err != nil {
return err
}
@@ -352,7 +402,7 @@
return err
}
- if err := m.Value.FillVDLTarget(fieldTarget3, __VDLType_v_io_x_ref_examples_tunnel_WindowSize); err != nil {
+ if err := m.Value.FillVDLTarget(fieldTarget3, tt.NonOptional().Field(2).Type); err != nil {
return err
}
if err := fieldsTarget1.FinishField(keyTarget2, fieldTarget3); err != nil {
@@ -369,60 +419,6 @@
return nil
}
-type unused struct {
-}
-
-func (unused) __VDLReflect(struct {
- Name string `vdl:"v.io/x/ref/examples/tunnel.unused"`
-}) {
-}
-
-func (m *unused) FillVDLTarget(t vdl.Target, tt *vdl.Type) error {
- if __VDLType_v_io_x_ref_examples_tunnel_unused == nil || __VDLType4 == nil {
- panic("Initialization order error: types generated for FillVDLTarget not initialized. Consider moving caller to an init() block.")
- }
- fieldsTarget1, err := t.StartFields(tt)
- if err != nil {
- return err
- }
-
- if err := t.FinishFields(fieldsTarget1); err != nil {
- return err
- }
- return nil
-}
-
-func (m *unused) MakeVDLTarget() vdl.Target {
- return &unusedTarget{Value: m}
-}
-
-type unusedTarget struct {
- Value *unused
- vdl.TargetBase
- vdl.FieldsTargetBase
-}
-
-func (t *unusedTarget) StartFields(tt *vdl.Type) (vdl.FieldsTarget, error) {
-
- if !vdl.Compatible(tt, __VDLType_v_io_x_ref_examples_tunnel_unused) {
- return nil, fmt.Errorf("type %v incompatible with %v", tt, __VDLType_v_io_x_ref_examples_tunnel_unused)
- }
- return t, nil
-}
-func (t *unusedTarget) StartField(name string) (key, field vdl.Target, _ error) {
- switch name {
- default:
- return nil, nil, fmt.Errorf("field %s not in struct %v", name, __VDLType_v_io_x_ref_examples_tunnel_unused)
- }
-}
-func (t *unusedTarget) FinishField(_, _ vdl.Target) error {
- return nil
-}
-func (t *unusedTarget) FinishFields(_ vdl.FieldsTarget) error {
-
- return nil
-}
-
type (
// ServerShellPacket represents any single field of the ServerShellPacket union type.
ServerShellPacket interface {
@@ -461,7 +457,7 @@
func (x ServerShellPacketStdout) __VDLReflect(__ServerShellPacketReflect) {}
func (m ServerShellPacketStdout) FillVDLTarget(t vdl.Target, tt *vdl.Type) error {
- fieldsTarget1, err := t.StartFields(__VDLType_v_io_x_ref_examples_tunnel_ServerShellPacket)
+ fieldsTarget1, err := t.StartFields(tt)
if err != nil {
return err
}
@@ -470,7 +466,7 @@
return err
}
- if err := fieldTarget3.FromBytes([]byte(m.Value), __VDLType3); err != nil {
+ if err := fieldTarget3.FromBytes([]byte(m.Value), tt.NonOptional().Field(0).Type); err != nil {
return err
}
if err := fieldsTarget1.FinishField(keyTarget2, fieldTarget3); err != nil {
@@ -493,7 +489,7 @@
func (x ServerShellPacketStderr) __VDLReflect(__ServerShellPacketReflect) {}
func (m ServerShellPacketStderr) FillVDLTarget(t vdl.Target, tt *vdl.Type) error {
- fieldsTarget1, err := t.StartFields(__VDLType_v_io_x_ref_examples_tunnel_ServerShellPacket)
+ fieldsTarget1, err := t.StartFields(tt)
if err != nil {
return err
}
@@ -502,7 +498,7 @@
return err
}
- if err := fieldTarget3.FromBytes([]byte(m.Value), __VDLType3); err != nil {
+ if err := fieldTarget3.FromBytes([]byte(m.Value), tt.NonOptional().Field(1).Type); err != nil {
return err
}
if err := fieldsTarget1.FinishField(keyTarget2, fieldTarget3); err != nil {
@@ -519,27 +515,8 @@
return nil
}
-func init() {
- vdl.Register((*ShellOpts)(nil))
- vdl.Register((*WindowSize)(nil))
- vdl.Register((*ClientShellPacket)(nil))
- vdl.Register((*unused)(nil))
- vdl.Register((*ServerShellPacket)(nil))
-}
-
-var __VDLType0 *vdl.Type = vdl.TypeOf((*ShellOpts)(nil))
-var __VDLType2 *vdl.Type = vdl.TypeOf((*WindowSize)(nil))
-var __VDLType4 *vdl.Type = vdl.TypeOf((*unused)(nil))
-var __VDLType3 *vdl.Type = vdl.TypeOf([]byte(nil))
-var __VDLType1 *vdl.Type = vdl.TypeOf([]string(nil))
-var __VDLType_v_io_x_ref_examples_tunnel_ClientShellPacket *vdl.Type = vdl.TypeOf(ClientShellPacket(ClientShellPacketStdin{[]byte(nil)}))
-var __VDLType_v_io_x_ref_examples_tunnel_ServerShellPacket *vdl.Type = vdl.TypeOf(ServerShellPacket(ServerShellPacketStdout{[]byte(nil)}))
-var __VDLType_v_io_x_ref_examples_tunnel_ShellOpts *vdl.Type = vdl.TypeOf(ShellOpts{})
-var __VDLType_v_io_x_ref_examples_tunnel_WindowSize *vdl.Type = vdl.TypeOf(WindowSize{})
-var __VDLType_v_io_x_ref_examples_tunnel_unused *vdl.Type = vdl.TypeOf(unused{})
-
-func __VDLEnsureNativeBuilt() {
-}
+//////////////////////////////////////////////////
+// Interface definitions
// TunnelClientMethods is the client interface
// containing Tunnel methods.
@@ -1404,3 +1381,33 @@
func (s implForwarderForwardServerCallSend) Send(item []byte) error {
return s.s.Send(item)
}
+
+var __VDLInitCalled bool
+
+// __VDLInit performs vdl initialization. It is safe to call multiple times.
+// If you have an init ordering issue, just insert the following line verbatim
+// into your source files in this package, right after the "package foo" clause:
+//
+// var _ = __VDLInit()
+//
+// The purpose of this function is to ensure that vdl initialization occurs in
+// the right order, and very early in the init sequence. In particular, vdl
+// registration and package variable initialization needs to occur before
+// functions like vdl.TypeOf will work properly.
+//
+// This function returns a dummy value, so that it can be used to initialize the
+// first var in the file, to take advantage of Go's defined init order.
+func __VDLInit() struct{} {
+ if __VDLInitCalled {
+ return struct{}{}
+ }
+
+ // Register types.
+ vdl.Register((*WindowSize)(nil))
+ vdl.Register((*ShellOpts)(nil))
+ vdl.Register((*unused)(nil))
+ vdl.Register((*ClientShellPacket)(nil))
+ vdl.Register((*ServerShellPacket)(nil))
+
+ return struct{}{}
+}
diff --git a/lib/discovery/discovery.vdl.go b/lib/discovery/discovery.vdl.go
index c5b67ee..83b3215 100644
--- a/lib/discovery/discovery.vdl.go
+++ b/lib/discovery/discovery.vdl.go
@@ -20,6 +20,11 @@
"v.io/v23/verror"
)
+var _ = __VDLInit() // Must be first; see __VDLInit comments for details.
+
+//////////////////////////////////////////////////
+// Type definitions
+
type EncryptionAlgorithm int32
func (EncryptionAlgorithm) __VDLReflect(struct {
@@ -28,7 +33,7 @@
}
func (m *EncryptionAlgorithm) FillVDLTarget(t vdl.Target, tt *vdl.Type) error {
- if err := t.FromInt(int64((*m)), __VDLType_v_io_x_ref_lib_discovery_EncryptionAlgorithm); err != nil {
+ if err := t.FromInt(int64((*m)), tt); err != nil {
return err
}
return nil
@@ -92,7 +97,7 @@
}
func (m *EncryptionKey) FillVDLTarget(t vdl.Target, tt *vdl.Type) error {
- if err := t.FromBytes([]byte((*m)), __VDLType_v_io_x_ref_lib_discovery_EncryptionKey); err != nil {
+ if err := t.FromBytes([]byte((*m)), tt); err != nil {
return err
}
return nil
@@ -109,8 +114,8 @@
func (t *EncryptionKeyTarget) FromBytes(src []byte, tt *vdl.Type) error {
- if !vdl.Compatible(tt, __VDLType_v_io_x_ref_lib_discovery_EncryptionKey) {
- return fmt.Errorf("type %v incompatible with %v", tt, __VDLType_v_io_x_ref_lib_discovery_EncryptionKey)
+ if ttWant := vdl.TypeOf((*EncryptionKey)(nil)); !vdl.Compatible(tt, ttWant) {
+ return fmt.Errorf("type %v incompatible with %v", tt, ttWant)
}
if len(src) == 0 {
*t.Value = nil
@@ -130,7 +135,7 @@
}
func (m *Uuid) FillVDLTarget(t vdl.Target, tt *vdl.Type) error {
- if err := t.FromBytes([]byte((*m)), __VDLType_v_io_x_ref_lib_discovery_Uuid); err != nil {
+ if err := t.FromBytes([]byte((*m)), tt); err != nil {
return err
}
return nil
@@ -147,8 +152,8 @@
func (t *UuidTarget) FromBytes(src []byte, tt *vdl.Type) error {
- if !vdl.Compatible(tt, __VDLType_v_io_x_ref_lib_discovery_Uuid) {
- return fmt.Errorf("type %v incompatible with %v", tt, __VDLType_v_io_x_ref_lib_discovery_Uuid)
+ if ttWant := vdl.TypeOf((*Uuid)(nil)); !vdl.Compatible(tt, ttWant) {
+ return fmt.Errorf("type %v incompatible with %v", tt, ttWant)
}
if len(src) == 0 {
*t.Value = nil
@@ -160,6 +165,40 @@
return nil
}
+// An AdHash is a hash of an advertisement.
+type AdHash [8]byte
+
+func (AdHash) __VDLReflect(struct {
+ Name string `vdl:"v.io/x/ref/lib/discovery.AdHash"`
+}) {
+}
+
+func (m *AdHash) FillVDLTarget(t vdl.Target, tt *vdl.Type) error {
+ if err := t.FromBytes([]byte((*m)[:]), tt); err != nil {
+ return err
+ }
+ return nil
+}
+
+func (m *AdHash) MakeVDLTarget() vdl.Target {
+ return &AdHashTarget{Value: m}
+}
+
+type AdHashTarget struct {
+ Value *AdHash
+ vdl.TargetBase
+}
+
+func (t *AdHashTarget) FromBytes(src []byte, tt *vdl.Type) error {
+
+ if ttWant := vdl.TypeOf((*AdHash)(nil)); !vdl.Compatible(tt, ttWant) {
+ return fmt.Errorf("type %v incompatible with %v", tt, ttWant)
+ }
+ copy((*t.Value)[:], src)
+
+ return nil
+}
+
// AdInfo represents advertisement information for discovery.
type AdInfo struct {
Ad discovery.Advertisement
@@ -185,9 +224,6 @@
}
func (m *AdInfo) FillVDLTarget(t vdl.Target, tt *vdl.Type) error {
- if __VDLType_v_io_x_ref_lib_discovery_AdInfo == nil || __VDLType0 == nil {
- panic("Initialization order error: types generated for FillVDLTarget not initialized. Consider moving caller to an init() block.")
- }
fieldsTarget1, err := t.StartFields(tt)
if err != nil {
return err
@@ -199,7 +235,7 @@
}
if err != vdl.ErrFieldNoExist {
- if err := m.Ad.FillVDLTarget(fieldTarget3, __VDLType_v_io_v23_discovery_Advertisement); err != nil {
+ if err := m.Ad.FillVDLTarget(fieldTarget3, tt.NonOptional().Field(0).Type); err != nil {
return err
}
if err := fieldsTarget1.FinishField(keyTarget2, fieldTarget3); err != nil {
@@ -212,7 +248,7 @@
}
if err != vdl.ErrFieldNoExist {
- if err := m.EncryptionAlgorithm.FillVDLTarget(fieldTarget5, __VDLType_v_io_x_ref_lib_discovery_EncryptionAlgorithm); err != nil {
+ if err := m.EncryptionAlgorithm.FillVDLTarget(fieldTarget5, tt.NonOptional().Field(1).Type); err != nil {
return err
}
if err := fieldsTarget1.FinishField(keyTarget4, fieldTarget5); err != nil {
@@ -225,7 +261,7 @@
}
if err != vdl.ErrFieldNoExist {
- listTarget8, err := fieldTarget7.StartList(__VDLType1, len(m.EncryptionKeys))
+ listTarget8, err := fieldTarget7.StartList(tt.NonOptional().Field(2).Type, len(m.EncryptionKeys))
if err != nil {
return err
}
@@ -235,7 +271,7 @@
return err
}
- if err := elem10.FillVDLTarget(elemTarget9, __VDLType_v_io_x_ref_lib_discovery_EncryptionKey); err != nil {
+ if err := elem10.FillVDLTarget(elemTarget9, tt.NonOptional().Field(2).Type.Elem()); err != nil {
return err
}
if err := listTarget8.FinishElem(elemTarget9); err != nil {
@@ -255,7 +291,7 @@
}
if err != vdl.ErrFieldNoExist {
- if err := m.Hash.FillVDLTarget(fieldTarget12, __VDLType_v_io_x_ref_lib_discovery_AdHash); err != nil {
+ if err := m.Hash.FillVDLTarget(fieldTarget12, tt.NonOptional().Field(3).Type); err != nil {
return err
}
if err := fieldsTarget1.FinishField(keyTarget11, fieldTarget12); err != nil {
@@ -268,7 +304,7 @@
}
if err != vdl.ErrFieldNoExist {
- listTarget15, err := fieldTarget14.StartList(__VDLType2, len(m.DirAddrs))
+ listTarget15, err := fieldTarget14.StartList(tt.NonOptional().Field(4).Type, len(m.DirAddrs))
if err != nil {
return err
}
@@ -277,7 +313,7 @@
if err != nil {
return err
}
- if err := elemTarget16.FromString(string(elem17), vdl.StringType); err != nil {
+ if err := elemTarget16.FromString(string(elem17), tt.NonOptional().Field(4).Type.Elem()); err != nil {
return err
}
if err := listTarget15.FinishElem(elemTarget16); err != nil {
@@ -296,7 +332,7 @@
return err
}
if err != vdl.ErrFieldNoExist {
- if err := fieldTarget19.FromBool(bool(m.Lost), vdl.BoolType); err != nil {
+ if err := fieldTarget19.FromBool(bool(m.Lost), tt.NonOptional().Field(5).Type); err != nil {
return err
}
if err := fieldsTarget1.FinishField(keyTarget18, fieldTarget19); err != nil {
@@ -327,8 +363,8 @@
func (t *AdInfoTarget) StartFields(tt *vdl.Type) (vdl.FieldsTarget, error) {
- if !vdl.Compatible(tt, __VDLType_v_io_x_ref_lib_discovery_AdInfo) {
- return nil, fmt.Errorf("type %v incompatible with %v", tt, __VDLType_v_io_x_ref_lib_discovery_AdInfo)
+ if ttWant := vdl.TypeOf((*AdInfo)(nil)).Elem(); !vdl.Compatible(tt, ttWant) {
+ return nil, fmt.Errorf("type %v incompatible with %v", tt, ttWant)
}
return t, nil
}
@@ -359,7 +395,7 @@
target, err := &t.lostTarget, error(nil)
return nil, target, err
default:
- return nil, nil, fmt.Errorf("field %s not in struct %v", name, __VDLType_v_io_x_ref_lib_discovery_AdInfo)
+ return nil, nil, fmt.Errorf("field %s not in struct v.io/x/ref/lib/discovery.AdInfo", name)
}
}
func (t *AdInfoTarget) FinishField(_, _ vdl.Target) error {
@@ -380,8 +416,8 @@
func (t *unnamed_5b5d762e696f2f782f7265662f6c69622f646973636f766572792e456e6372797074696f6e4b6579205b5d62797465Target) StartList(tt *vdl.Type, len int) (vdl.ListTarget, error) {
- if !vdl.Compatible(tt, __VDLType1) {
- return nil, fmt.Errorf("type %v incompatible with %v", tt, __VDLType1)
+ if ttWant := vdl.TypeOf((*[]EncryptionKey)(nil)); !vdl.Compatible(tt, ttWant) {
+ return nil, fmt.Errorf("type %v incompatible with %v", tt, ttWant)
}
if cap(*t.Value) < len {
*t.Value = make([]EncryptionKey, len)
@@ -403,67 +439,15 @@
return nil
}
-type AdHashTarget struct {
- Value *AdHash
- vdl.TargetBase
-}
-
-func (t *AdHashTarget) FromBytes(src []byte, tt *vdl.Type) error {
-
- if !vdl.Compatible(tt, __VDLType_v_io_x_ref_lib_discovery_AdHash) {
- return fmt.Errorf("type %v incompatible with %v", tt, __VDLType_v_io_x_ref_lib_discovery_AdHash)
- }
- copy((*t.Value)[:], src)
-
- return nil
-}
-
-// An AdHash is a hash of an advertisement.
-type AdHash [8]byte
-
-func (AdHash) __VDLReflect(struct {
- Name string `vdl:"v.io/x/ref/lib/discovery.AdHash"`
-}) {
-}
-
-func (m *AdHash) FillVDLTarget(t vdl.Target, tt *vdl.Type) error {
- if err := t.FromBytes([]byte((*m)[:]), __VDLType_v_io_x_ref_lib_discovery_AdHash); err != nil {
- return err
- }
- return nil
-}
-
-func (m *AdHash) MakeVDLTarget() vdl.Target {
- return &AdHashTarget{Value: m}
-}
-
-func init() {
- vdl.Register((*EncryptionAlgorithm)(nil))
- vdl.Register((*EncryptionKey)(nil))
- vdl.Register((*Uuid)(nil))
- vdl.Register((*AdInfo)(nil))
- vdl.Register((*AdHash)(nil))
-}
-
-var __VDLType0 *vdl.Type = vdl.TypeOf((*AdInfo)(nil))
-var __VDLType2 *vdl.Type = vdl.TypeOf([]string(nil))
-var __VDLType1 *vdl.Type = vdl.TypeOf([]EncryptionKey(nil))
-var __VDLType_v_io_v23_discovery_Advertisement *vdl.Type = vdl.TypeOf(discovery.Advertisement{})
-var __VDLType_v_io_x_ref_lib_discovery_AdHash *vdl.Type = vdl.TypeOf(AdHash{})
-var __VDLType_v_io_x_ref_lib_discovery_AdInfo *vdl.Type = vdl.TypeOf(AdInfo{})
-var __VDLType_v_io_x_ref_lib_discovery_EncryptionAlgorithm *vdl.Type = vdl.TypeOf(EncryptionAlgorithm(0))
-var __VDLType_v_io_x_ref_lib_discovery_EncryptionKey *vdl.Type = vdl.TypeOf(EncryptionKey(nil))
-var __VDLType_v_io_x_ref_lib_discovery_Uuid *vdl.Type = vdl.TypeOf(Uuid(nil))
-
-func __VDLEnsureNativeBuilt() {
-}
+//////////////////////////////////////////////////
+// Const definitions
const NoEncryption = EncryptionAlgorithm(0)
-
const TestEncryption = EncryptionAlgorithm(1)
-
const IbeEncryption = EncryptionAlgorithm(2)
+//////////////////////////////////////////////////
+// Error definitions
var (
ErrAlreadyBeingAdvertised = verror.Register("v.io/x/ref/lib/discovery.AlreadyBeingAdvertised", verror.NoRetry, "{1:}{2:} already being advertised: {3}")
ErrBadAdvertisement = verror.Register("v.io/x/ref/lib/discovery.BadAdvertisement", verror.NoRetry, "{1:}{2:} invalid advertisement: {3}")
@@ -472,14 +456,6 @@
ErrNoDiscoveryPlugin = verror.Register("v.io/x/ref/lib/discovery.NoDiscoveryPlugin", verror.NoRetry, "{1:}{2:} no discovery plugin")
)
-func init() {
- i18n.Cat().SetWithBase(i18n.LangID("en"), i18n.MsgID(ErrAlreadyBeingAdvertised.ID), "{1:}{2:} already being advertised: {3}")
- i18n.Cat().SetWithBase(i18n.LangID("en"), i18n.MsgID(ErrBadAdvertisement.ID), "{1:}{2:} invalid advertisement: {3}")
- i18n.Cat().SetWithBase(i18n.LangID("en"), i18n.MsgID(ErrBadQuery.ID), "{1:}{2:} invalid query: {3}")
- i18n.Cat().SetWithBase(i18n.LangID("en"), i18n.MsgID(ErrDiscoveryClosed.ID), "{1:}{2:} discovery closed")
- i18n.Cat().SetWithBase(i18n.LangID("en"), i18n.MsgID(ErrNoDiscoveryPlugin.ID), "{1:}{2:} no discovery plugin")
-}
-
// NewErrAlreadyBeingAdvertised returns an error with the ErrAlreadyBeingAdvertised ID.
func NewErrAlreadyBeingAdvertised(ctx *context.T, id discovery.AdId) error {
return verror.New(ErrAlreadyBeingAdvertised, ctx, id)
@@ -505,6 +481,9 @@
return verror.New(ErrNoDiscoveryPlugin, ctx)
}
+//////////////////////////////////////////////////
+// Interface definitions
+
// DirectoryClientMethods is the client interface
// containing Directory methods.
//
@@ -612,3 +591,40 @@
},
},
}
+
+var __VDLInitCalled bool
+
+// __VDLInit performs vdl initialization. It is safe to call multiple times.
+// If you have an init ordering issue, just insert the following line verbatim
+// into your source files in this package, right after the "package foo" clause:
+//
+// var _ = __VDLInit()
+//
+// The purpose of this function is to ensure that vdl initialization occurs in
+// the right order, and very early in the init sequence. In particular, vdl
+// registration and package variable initialization needs to occur before
+// functions like vdl.TypeOf will work properly.
+//
+// This function returns a dummy value, so that it can be used to initialize the
+// first var in the file, to take advantage of Go's defined init order.
+func __VDLInit() struct{} {
+ if __VDLInitCalled {
+ return struct{}{}
+ }
+
+ // Register types.
+ vdl.Register((*EncryptionAlgorithm)(nil))
+ vdl.Register((*EncryptionKey)(nil))
+ vdl.Register((*Uuid)(nil))
+ vdl.Register((*AdHash)(nil))
+ vdl.Register((*AdInfo)(nil))
+
+ // Set error format strings.
+ i18n.Cat().SetWithBase(i18n.LangID("en"), i18n.MsgID(ErrAlreadyBeingAdvertised.ID), "{1:}{2:} already being advertised: {3}")
+ i18n.Cat().SetWithBase(i18n.LangID("en"), i18n.MsgID(ErrBadAdvertisement.ID), "{1:}{2:} invalid advertisement: {3}")
+ i18n.Cat().SetWithBase(i18n.LangID("en"), i18n.MsgID(ErrBadQuery.ID), "{1:}{2:} invalid query: {3}")
+ i18n.Cat().SetWithBase(i18n.LangID("en"), i18n.MsgID(ErrDiscoveryClosed.ID), "{1:}{2:} discovery closed")
+ i18n.Cat().SetWithBase(i18n.LangID("en"), i18n.MsgID(ErrNoDiscoveryPlugin.ID), "{1:}{2:} no discovery plugin")
+
+ return struct{}{}
+}
diff --git a/lib/discovery/global/global.vdl.go b/lib/discovery/global/global.vdl.go
index 7ed1270..4ae9549 100644
--- a/lib/discovery/global/global.vdl.go
+++ b/lib/discovery/global/global.vdl.go
@@ -13,18 +13,41 @@
"v.io/v23/verror"
)
-func __VDLEnsureNativeBuilt() {
-}
+var _ = __VDLInit() // Must be first; see __VDLInit comments for details.
+//////////////////////////////////////////////////
+// Error definitions
var (
ErrNoNamespace = verror.Register("v.io/x/ref/lib/discovery/global.NoNamespace", verror.NoRetry, "{1:}{2:} namespace not found")
)
-func init() {
- i18n.Cat().SetWithBase(i18n.LangID("en"), i18n.MsgID(ErrNoNamespace.ID), "{1:}{2:} namespace not found")
-}
-
// NewErrNoNamespace returns an error with the ErrNoNamespace ID.
func NewErrNoNamespace(ctx *context.T) error {
return verror.New(ErrNoNamespace, ctx)
}
+
+var __VDLInitCalled bool
+
+// __VDLInit performs vdl initialization. It is safe to call multiple times.
+// If you have an init ordering issue, just insert the following line verbatim
+// into your source files in this package, right after the "package foo" clause:
+//
+// var _ = __VDLInit()
+//
+// The purpose of this function is to ensure that vdl initialization occurs in
+// the right order, and very early in the init sequence. In particular, vdl
+// registration and package variable initialization needs to occur before
+// functions like vdl.TypeOf will work properly.
+//
+// This function returns a dummy value, so that it can be used to initialize the
+// first var in the file, to take advantage of Go's defined init order.
+func __VDLInit() struct{} {
+ if __VDLInitCalled {
+ return struct{}{}
+ }
+
+ // Set error format strings.
+ i18n.Cat().SetWithBase(i18n.LangID("en"), i18n.MsgID(ErrNoNamespace.ID), "{1:}{2:} namespace not found")
+
+ return struct{}{}
+}
diff --git a/lib/discovery/plugins/ble/ble.vdl.go b/lib/discovery/plugins/ble/ble.vdl.go
index 08282a9..3de6fbe 100644
--- a/lib/discovery/plugins/ble/ble.vdl.go
+++ b/lib/discovery/plugins/ble/ble.vdl.go
@@ -7,22 +7,41 @@
package ble
-func __VDLEnsureNativeBuilt() {
-}
+var _ = __VDLInit() // Must be first; see __VDLInit comments for details.
+
+//////////////////////////////////////////////////
+// Const definitions
// This uuids are v5 uuid generated out of band. These constants need
// to be accessible in all the languages that have a ble implementation
-const IdUuid = "bf0a3657-37cb-5aad-8c13-00c1d69a141c" // NewAttributeUUID("_id")
-
+const IdUuid = "bf0a3657-37cb-5aad-8c13-00c1d69a141c" // NewAttributeUUID("_id")
const InterfaceNameUuid = "b2cadfd4-d003-576c-acad-58b8e3a9cbc8" // NewAttributeUUID("_interfacename")
-
-const AddressesUuid = "fe3fa941-1eda-5265-806f-d5127794a9a9" // NewAttributeUUID("_addresses")
-
-const EncryptionUuid = "6286d80a-adaa-519a-8a06-281a4645a607" // NewAttributeUUID("_encryption")
-
-const HashUuid = "9c6286f5-aab0-5009-b81b-704d57ed6035" // NewAttributeUUID("_hash")
-
-const DirAddrsUuid = "7d8b5c56-0d05-5a7a-a21e-6c0c3c31245e" // NewAttributeUUID("_diraddrs")
-
+const AddressesUuid = "fe3fa941-1eda-5265-806f-d5127794a9a9" // NewAttributeUUID("_addresses")
+const EncryptionUuid = "6286d80a-adaa-519a-8a06-281a4645a607" // NewAttributeUUID("_encryption")
+const HashUuid = "9c6286f5-aab0-5009-b81b-704d57ed6035" // NewAttributeUUID("_hash")
+const DirAddrsUuid = "7d8b5c56-0d05-5a7a-a21e-6c0c3c31245e" // NewAttributeUUID("_diraddrs")
// The prefix for encoded attachment names.
const AttachmentNamePrefix = "__"
+
+var __VDLInitCalled bool
+
+// __VDLInit performs vdl initialization. It is safe to call multiple times.
+// If you have an init ordering issue, just insert the following line verbatim
+// into your source files in this package, right after the "package foo" clause:
+//
+// var _ = __VDLInit()
+//
+// The purpose of this function is to ensure that vdl initialization occurs in
+// the right order, and very early in the init sequence. In particular, vdl
+// registration and package variable initialization needs to occur before
+// functions like vdl.TypeOf will work properly.
+//
+// This function returns a dummy value, so that it can be used to initialize the
+// first var in the file, to take advantage of Go's defined init order.
+func __VDLInit() struct{} {
+ if __VDLInitCalled {
+ return struct{}{}
+ }
+
+ return struct{}{}
+}
diff --git a/lib/discovery/plugins/ble/testdata/testdata.vdl.go b/lib/discovery/plugins/ble/testdata/testdata.vdl.go
index 58a121c..cc0d84f 100644
--- a/lib/discovery/plugins/ble/testdata/testdata.vdl.go
+++ b/lib/discovery/plugins/ble/testdata/testdata.vdl.go
@@ -14,6 +14,11 @@
discovery_2 "v.io/x/ref/lib/discovery"
)
+var _ = __VDLInit() // Must be first; see __VDLInit comments for details.
+
+//////////////////////////////////////////////////
+// Type definitions
+
// AdConversionTestCase represents a test case for converting between
// the advertisement and the Gatt characteristics.
type AdConversionTestCase struct {
@@ -28,9 +33,6 @@
}
func (m *AdConversionTestCase) FillVDLTarget(t vdl.Target, tt *vdl.Type) error {
- if __VDLType_v_io_x_ref_lib_discovery_plugins_ble_testdata_AdConversionTestCase == nil || __VDLType0 == nil {
- panic("Initialization order error: types generated for FillVDLTarget not initialized. Consider moving caller to an init() block.")
- }
fieldsTarget1, err := t.StartFields(tt)
if err != nil {
return err
@@ -42,7 +44,7 @@
}
if err != vdl.ErrFieldNoExist {
- if err := m.AdInfo.FillVDLTarget(fieldTarget3, __VDLType_v_io_x_ref_lib_discovery_AdInfo); err != nil {
+ if err := m.AdInfo.FillVDLTarget(fieldTarget3, tt.NonOptional().Field(0).Type); err != nil {
return err
}
if err := fieldsTarget1.FinishField(keyTarget2, fieldTarget3); err != nil {
@@ -55,7 +57,7 @@
}
if err != vdl.ErrFieldNoExist {
- mapTarget6, err := fieldTarget5.StartMap(__VDLType1, len(m.GattAttrs))
+ mapTarget6, err := fieldTarget5.StartMap(tt.NonOptional().Field(1).Type, len(m.GattAttrs))
if err != nil {
return err
}
@@ -64,7 +66,7 @@
if err != nil {
return err
}
- if err := keyTarget7.FromString(string(key8), vdl.StringType); err != nil {
+ if err := keyTarget7.FromString(string(key8), tt.NonOptional().Field(1).Type.Key()); err != nil {
return err
}
valueTarget9, err := mapTarget6.FinishKeyStartField(keyTarget7)
@@ -72,7 +74,7 @@
return err
}
- if err := valueTarget9.FromBytes([]byte(value10), __VDLType2); err != nil {
+ if err := valueTarget9.FromBytes([]byte(value10), tt.NonOptional().Field(1).Type.Elem()); err != nil {
return err
}
if err := mapTarget6.FinishField(keyTarget7, valueTarget9); err != nil {
@@ -106,8 +108,8 @@
func (t *AdConversionTestCaseTarget) StartFields(tt *vdl.Type) (vdl.FieldsTarget, error) {
- if !vdl.Compatible(tt, __VDLType_v_io_x_ref_lib_discovery_plugins_ble_testdata_AdConversionTestCase) {
- return nil, fmt.Errorf("type %v incompatible with %v", tt, __VDLType_v_io_x_ref_lib_discovery_plugins_ble_testdata_AdConversionTestCase)
+ if ttWant := vdl.TypeOf((*AdConversionTestCase)(nil)).Elem(); !vdl.Compatible(tt, ttWant) {
+ return nil, fmt.Errorf("type %v incompatible with %v", tt, ttWant)
}
return t, nil
}
@@ -122,7 +124,7 @@
target, err := &t.gattAttrsTarget, error(nil)
return nil, target, err
default:
- return nil, nil, fmt.Errorf("field %s not in struct %v", name, __VDLType_v_io_x_ref_lib_discovery_plugins_ble_testdata_AdConversionTestCase)
+ return nil, nil, fmt.Errorf("field %s not in struct v.io/x/ref/lib/discovery/plugins/ble/testdata.AdConversionTestCase", name)
}
}
func (t *AdConversionTestCaseTarget) FinishField(_, _ vdl.Target) error {
@@ -146,8 +148,8 @@
func (t *unnamed_6d61705b737472696e675d5b5d62797465Target) StartMap(tt *vdl.Type, len int) (vdl.MapTarget, error) {
- if !vdl.Compatible(tt, __VDLType1) {
- return nil, fmt.Errorf("type %v incompatible with %v", tt, __VDLType1)
+ if ttWant := vdl.TypeOf((*map[string][]byte)(nil)); !vdl.Compatible(tt, ttWant) {
+ return nil, fmt.Errorf("type %v incompatible with %v", tt, ttWant)
}
*t.Value = make(map[string][]byte)
return t, nil
@@ -176,18 +178,8 @@
return nil
}
-func init() {
- vdl.Register((*AdConversionTestCase)(nil))
-}
-
-var __VDLType0 *vdl.Type = vdl.TypeOf((*AdConversionTestCase)(nil))
-var __VDLType2 *vdl.Type = vdl.TypeOf([]byte(nil))
-var __VDLType1 *vdl.Type = vdl.TypeOf(map[string][]byte(nil))
-var __VDLType_v_io_x_ref_lib_discovery_AdInfo *vdl.Type = vdl.TypeOf(discovery_2.AdInfo{})
-var __VDLType_v_io_x_ref_lib_discovery_plugins_ble_testdata_AdConversionTestCase *vdl.Type = vdl.TypeOf(AdConversionTestCase{})
-
-func __VDLEnsureNativeBuilt() {
-}
+//////////////////////////////////////////////////
+// Const definitions
// ConversionTestData contains test cases for conversions between
// the advertisement and the Gatt characteristics
@@ -349,3 +341,29 @@
},
},
}
+
+var __VDLInitCalled bool
+
+// __VDLInit performs vdl initialization. It is safe to call multiple times.
+// If you have an init ordering issue, just insert the following line verbatim
+// into your source files in this package, right after the "package foo" clause:
+//
+// var _ = __VDLInit()
+//
+// The purpose of this function is to ensure that vdl initialization occurs in
+// the right order, and very early in the init sequence. In particular, vdl
+// registration and package variable initialization needs to occur before
+// functions like vdl.TypeOf will work properly.
+//
+// This function returns a dummy value, so that it can be used to initialize the
+// first var in the file, to take advantage of Go's defined init order.
+func __VDLInit() struct{} {
+ if __VDLInitCalled {
+ return struct{}{}
+ }
+
+ // Register types.
+ vdl.Register((*AdConversionTestCase)(nil))
+
+ return struct{}{}
+}
diff --git a/lib/discovery/testdata/testdata.vdl.go b/lib/discovery/testdata/testdata.vdl.go
index 868be7a..0717ed9 100644
--- a/lib/discovery/testdata/testdata.vdl.go
+++ b/lib/discovery/testdata/testdata.vdl.go
@@ -13,6 +13,11 @@
"v.io/x/ref/lib/discovery"
)
+var _ = __VDLInit() // Must be first; see __VDLInit comments for details.
+
+//////////////////////////////////////////////////
+// Type definitions
+
// PackAddressTest represents a test case for PackAddress.
type PackAddressTest struct {
// In is the addresses to pack.
@@ -27,9 +32,6 @@
}
func (m *PackAddressTest) FillVDLTarget(t vdl.Target, tt *vdl.Type) error {
- if __VDLType_v_io_x_ref_lib_discovery_testdata_PackAddressTest == nil || __VDLType0 == nil {
- panic("Initialization order error: types generated for FillVDLTarget not initialized. Consider moving caller to an init() block.")
- }
fieldsTarget1, err := t.StartFields(tt)
if err != nil {
return err
@@ -41,7 +43,7 @@
}
if err != vdl.ErrFieldNoExist {
- listTarget4, err := fieldTarget3.StartList(__VDLType1, len(m.In))
+ listTarget4, err := fieldTarget3.StartList(tt.NonOptional().Field(0).Type, len(m.In))
if err != nil {
return err
}
@@ -50,7 +52,7 @@
if err != nil {
return err
}
- if err := elemTarget5.FromString(string(elem6), vdl.StringType); err != nil {
+ if err := elemTarget5.FromString(string(elem6), tt.NonOptional().Field(0).Type.Elem()); err != nil {
return err
}
if err := listTarget4.FinishElem(elemTarget5); err != nil {
@@ -70,7 +72,7 @@
}
if err != vdl.ErrFieldNoExist {
- if err := fieldTarget8.FromBytes([]byte(m.Packed), __VDLType2); err != nil {
+ if err := fieldTarget8.FromBytes([]byte(m.Packed), tt.NonOptional().Field(1).Type); err != nil {
return err
}
if err := fieldsTarget1.FinishField(keyTarget7, fieldTarget8); err != nil {
@@ -97,8 +99,8 @@
func (t *PackAddressTestTarget) StartFields(tt *vdl.Type) (vdl.FieldsTarget, error) {
- if !vdl.Compatible(tt, __VDLType_v_io_x_ref_lib_discovery_testdata_PackAddressTest) {
- return nil, fmt.Errorf("type %v incompatible with %v", tt, __VDLType_v_io_x_ref_lib_discovery_testdata_PackAddressTest)
+ if ttWant := vdl.TypeOf((*PackAddressTest)(nil)).Elem(); !vdl.Compatible(tt, ttWant) {
+ return nil, fmt.Errorf("type %v incompatible with %v", tt, ttWant)
}
return t, nil
}
@@ -113,7 +115,7 @@
target, err := &t.packedTarget, error(nil)
return nil, target, err
default:
- return nil, nil, fmt.Errorf("field %s not in struct %v", name, __VDLType_v_io_x_ref_lib_discovery_testdata_PackAddressTest)
+ return nil, nil, fmt.Errorf("field %s not in struct v.io/x/ref/lib/discovery/testdata.PackAddressTest", name)
}
}
func (t *PackAddressTestTarget) FinishField(_, _ vdl.Target) error {
@@ -142,9 +144,6 @@
}
func (m *PackEncryptionKeysTest) FillVDLTarget(t vdl.Target, tt *vdl.Type) error {
- if __VDLType_v_io_x_ref_lib_discovery_testdata_PackEncryptionKeysTest == nil || __VDLType3 == nil {
- panic("Initialization order error: types generated for FillVDLTarget not initialized. Consider moving caller to an init() block.")
- }
fieldsTarget1, err := t.StartFields(tt)
if err != nil {
return err
@@ -156,7 +155,7 @@
}
if err != vdl.ErrFieldNoExist {
- if err := m.Algo.FillVDLTarget(fieldTarget3, __VDLType_v_io_x_ref_lib_discovery_EncryptionAlgorithm); err != nil {
+ if err := m.Algo.FillVDLTarget(fieldTarget3, tt.NonOptional().Field(0).Type); err != nil {
return err
}
if err := fieldsTarget1.FinishField(keyTarget2, fieldTarget3); err != nil {
@@ -169,7 +168,7 @@
}
if err != vdl.ErrFieldNoExist {
- listTarget6, err := fieldTarget5.StartList(__VDLType4, len(m.Keys))
+ listTarget6, err := fieldTarget5.StartList(tt.NonOptional().Field(1).Type, len(m.Keys))
if err != nil {
return err
}
@@ -179,7 +178,7 @@
return err
}
- if err := elem8.FillVDLTarget(elemTarget7, __VDLType_v_io_x_ref_lib_discovery_EncryptionKey); err != nil {
+ if err := elem8.FillVDLTarget(elemTarget7, tt.NonOptional().Field(1).Type.Elem()); err != nil {
return err
}
if err := listTarget6.FinishElem(elemTarget7); err != nil {
@@ -199,7 +198,7 @@
}
if err != vdl.ErrFieldNoExist {
- if err := fieldTarget10.FromBytes([]byte(m.Packed), __VDLType2); err != nil {
+ if err := fieldTarget10.FromBytes([]byte(m.Packed), tt.NonOptional().Field(2).Type); err != nil {
return err
}
if err := fieldsTarget1.FinishField(keyTarget9, fieldTarget10); err != nil {
@@ -227,8 +226,8 @@
func (t *PackEncryptionKeysTestTarget) StartFields(tt *vdl.Type) (vdl.FieldsTarget, error) {
- if !vdl.Compatible(tt, __VDLType_v_io_x_ref_lib_discovery_testdata_PackEncryptionKeysTest) {
- return nil, fmt.Errorf("type %v incompatible with %v", tt, __VDLType_v_io_x_ref_lib_discovery_testdata_PackEncryptionKeysTest)
+ if ttWant := vdl.TypeOf((*PackEncryptionKeysTest)(nil)).Elem(); !vdl.Compatible(tt, ttWant) {
+ return nil, fmt.Errorf("type %v incompatible with %v", tt, ttWant)
}
return t, nil
}
@@ -247,7 +246,7 @@
target, err := &t.packedTarget, error(nil)
return nil, target, err
default:
- return nil, nil, fmt.Errorf("field %s not in struct %v", name, __VDLType_v_io_x_ref_lib_discovery_testdata_PackEncryptionKeysTest)
+ return nil, nil, fmt.Errorf("field %s not in struct v.io/x/ref/lib/discovery/testdata.PackEncryptionKeysTest", name)
}
}
func (t *PackEncryptionKeysTestTarget) FinishField(_, _ vdl.Target) error {
@@ -268,8 +267,8 @@
func (t *unnamed_5b5d762e696f2f782f7265662f6c69622f646973636f766572792e456e6372797074696f6e4b6579205b5d62797465Target) StartList(tt *vdl.Type, len int) (vdl.ListTarget, error) {
- if !vdl.Compatible(tt, __VDLType4) {
- return nil, fmt.Errorf("type %v incompatible with %v", tt, __VDLType4)
+ if ttWant := vdl.TypeOf((*[]discovery.EncryptionKey)(nil)); !vdl.Compatible(tt, ttWant) {
+ return nil, fmt.Errorf("type %v incompatible with %v", tt, ttWant)
}
if cap(*t.Value) < len {
*t.Value = make([]discovery.EncryptionKey, len)
@@ -305,9 +304,6 @@
}
func (m *UuidTestData) FillVDLTarget(t vdl.Target, tt *vdl.Type) error {
- if __VDLType_v_io_x_ref_lib_discovery_testdata_UuidTestData == nil || __VDLType5 == nil {
- panic("Initialization order error: types generated for FillVDLTarget not initialized. Consider moving caller to an init() block.")
- }
fieldsTarget1, err := t.StartFields(tt)
if err != nil {
return err
@@ -318,7 +314,7 @@
return err
}
if err != vdl.ErrFieldNoExist {
- if err := fieldTarget3.FromString(string(m.In), vdl.StringType); err != nil {
+ if err := fieldTarget3.FromString(string(m.In), tt.NonOptional().Field(0).Type); err != nil {
return err
}
if err := fieldsTarget1.FinishField(keyTarget2, fieldTarget3); err != nil {
@@ -330,7 +326,7 @@
return err
}
if err != vdl.ErrFieldNoExist {
- if err := fieldTarget5.FromString(string(m.Want), vdl.StringType); err != nil {
+ if err := fieldTarget5.FromString(string(m.Want), tt.NonOptional().Field(1).Type); err != nil {
return err
}
if err := fieldsTarget1.FinishField(keyTarget4, fieldTarget5); err != nil {
@@ -357,8 +353,8 @@
func (t *UuidTestDataTarget) StartFields(tt *vdl.Type) (vdl.FieldsTarget, error) {
- if !vdl.Compatible(tt, __VDLType_v_io_x_ref_lib_discovery_testdata_UuidTestData) {
- return nil, fmt.Errorf("type %v incompatible with %v", tt, __VDLType_v_io_x_ref_lib_discovery_testdata_UuidTestData)
+ if ttWant := vdl.TypeOf((*UuidTestData)(nil)).Elem(); !vdl.Compatible(tt, ttWant) {
+ return nil, fmt.Errorf("type %v incompatible with %v", tt, ttWant)
}
return t, nil
}
@@ -373,7 +369,7 @@
target, err := &t.wantTarget, error(nil)
return nil, target, err
default:
- return nil, nil, fmt.Errorf("field %s not in struct %v", name, __VDLType_v_io_x_ref_lib_discovery_testdata_UuidTestData)
+ return nil, nil, fmt.Errorf("field %s not in struct v.io/x/ref/lib/discovery/testdata.UuidTestData", name)
}
}
func (t *UuidTestDataTarget) FinishField(_, _ vdl.Target) error {
@@ -384,26 +380,8 @@
return nil
}
-func init() {
- vdl.Register((*PackAddressTest)(nil))
- vdl.Register((*PackEncryptionKeysTest)(nil))
- vdl.Register((*UuidTestData)(nil))
-}
-
-var __VDLType0 *vdl.Type = vdl.TypeOf((*PackAddressTest)(nil))
-var __VDLType3 *vdl.Type = vdl.TypeOf((*PackEncryptionKeysTest)(nil))
-var __VDLType5 *vdl.Type = vdl.TypeOf((*UuidTestData)(nil))
-var __VDLType2 *vdl.Type = vdl.TypeOf([]byte(nil))
-var __VDLType1 *vdl.Type = vdl.TypeOf([]string(nil))
-var __VDLType4 *vdl.Type = vdl.TypeOf([]discovery.EncryptionKey(nil))
-var __VDLType_v_io_x_ref_lib_discovery_EncryptionAlgorithm *vdl.Type = vdl.TypeOf(discovery.EncryptionAlgorithm(0))
-var __VDLType_v_io_x_ref_lib_discovery_EncryptionKey *vdl.Type = vdl.TypeOf(discovery.EncryptionKey(nil))
-var __VDLType_v_io_x_ref_lib_discovery_testdata_PackAddressTest *vdl.Type = vdl.TypeOf(PackAddressTest{})
-var __VDLType_v_io_x_ref_lib_discovery_testdata_PackEncryptionKeysTest *vdl.Type = vdl.TypeOf(PackEncryptionKeysTest{})
-var __VDLType_v_io_x_ref_lib_discovery_testdata_UuidTestData *vdl.Type = vdl.TypeOf(UuidTestData{})
-
-func __VDLEnsureNativeBuilt() {
-}
+//////////////////////////////////////////////////
+// Const definitions
var PackAddressTestData = []PackAddressTest{
{
@@ -422,7 +400,6 @@
},
{},
}
-
var PackEncryptionKeysTestData = []PackEncryptionKeysTest{
{
Algo: 1,
@@ -444,7 +421,6 @@
Packed: []byte("\x00"),
},
}
-
var ServiceUuidTest = []UuidTestData{
{
In: "v.io",
@@ -459,7 +435,6 @@
Want: "be8a57d7-931d-5ee4-9243-0bebde0029a5",
},
}
-
var AttributeUuidTest = []UuidTestData{
{
In: "name",
@@ -474,3 +449,31 @@
Want: "c10b25a2-2d4d-5a19-bb7c-1ee1c4972b4c",
},
}
+
+var __VDLInitCalled bool
+
+// __VDLInit performs vdl initialization. It is safe to call multiple times.
+// If you have an init ordering issue, just insert the following line verbatim
+// into your source files in this package, right after the "package foo" clause:
+//
+// var _ = __VDLInit()
+//
+// The purpose of this function is to ensure that vdl initialization occurs in
+// the right order, and very early in the init sequence. In particular, vdl
+// registration and package variable initialization needs to occur before
+// functions like vdl.TypeOf will work properly.
+//
+// This function returns a dummy value, so that it can be used to initialize the
+// first var in the file, to take advantage of Go's defined init order.
+func __VDLInit() struct{} {
+ if __VDLInitCalled {
+ return struct{}{}
+ }
+
+ // Register types.
+ vdl.Register((*PackAddressTest)(nil))
+ vdl.Register((*PackEncryptionKeysTest)(nil))
+ vdl.Register((*UuidTestData)(nil))
+
+ return struct{}{}
+}
diff --git a/lib/raft/raft.vdl.go b/lib/raft/raft.vdl.go
index 0600786..146fb96 100644
--- a/lib/raft/raft.vdl.go
+++ b/lib/raft/raft.vdl.go
@@ -17,6 +17,11 @@
"v.io/v23/vdl/vdlconv"
)
+var _ = __VDLInit() // Must be first; see __VDLInit comments for details.
+
+//////////////////////////////////////////////////
+// Type definitions
+
// Term is a counter incremented each time a member starts an election. The log will
// show gaps in Term numbers because all elections need not be successful.
type Term uint64
@@ -27,7 +32,7 @@
}
func (m *Term) FillVDLTarget(t vdl.Target, tt *vdl.Type) error {
- if err := t.FromUint(uint64((*m)), __VDLType_v_io_x_ref_lib_raft_Term); err != nil {
+ if err := t.FromUint(uint64((*m)), tt); err != nil {
return err
}
return nil
@@ -91,7 +96,7 @@
}
func (m *Index) FillVDLTarget(t vdl.Target, tt *vdl.Type) error {
- if err := t.FromUint(uint64((*m)), __VDLType_v_io_x_ref_lib_raft_Index); err != nil {
+ if err := t.FromUint(uint64((*m)), tt); err != nil {
return err
}
return nil
@@ -159,9 +164,6 @@
}
func (m *LogEntry) FillVDLTarget(t vdl.Target, tt *vdl.Type) error {
- if __VDLType_v_io_x_ref_lib_raft_LogEntry == nil || __VDLType0 == nil {
- panic("Initialization order error: types generated for FillVDLTarget not initialized. Consider moving caller to an init() block.")
- }
fieldsTarget1, err := t.StartFields(tt)
if err != nil {
return err
@@ -173,7 +175,7 @@
}
if err != vdl.ErrFieldNoExist {
- if err := m.Term.FillVDLTarget(fieldTarget3, __VDLType_v_io_x_ref_lib_raft_Term); err != nil {
+ if err := m.Term.FillVDLTarget(fieldTarget3, tt.NonOptional().Field(0).Type); err != nil {
return err
}
if err := fieldsTarget1.FinishField(keyTarget2, fieldTarget3); err != nil {
@@ -186,7 +188,7 @@
}
if err != vdl.ErrFieldNoExist {
- if err := m.Index.FillVDLTarget(fieldTarget5, __VDLType_v_io_x_ref_lib_raft_Index); err != nil {
+ if err := m.Index.FillVDLTarget(fieldTarget5, tt.NonOptional().Field(1).Type); err != nil {
return err
}
if err := fieldsTarget1.FinishField(keyTarget4, fieldTarget5); err != nil {
@@ -199,7 +201,7 @@
}
if err != vdl.ErrFieldNoExist {
- if err := fieldTarget7.FromBytes([]byte(m.Cmd), __VDLType1); err != nil {
+ if err := fieldTarget7.FromBytes([]byte(m.Cmd), tt.NonOptional().Field(2).Type); err != nil {
return err
}
if err := fieldsTarget1.FinishField(keyTarget6, fieldTarget7); err != nil {
@@ -211,7 +213,7 @@
return err
}
if err != vdl.ErrFieldNoExist {
- if err := fieldTarget9.FromUint(uint64(m.Type), vdl.ByteType); err != nil {
+ if err := fieldTarget9.FromUint(uint64(m.Type), tt.NonOptional().Field(3).Type); err != nil {
return err
}
if err := fieldsTarget1.FinishField(keyTarget8, fieldTarget9); err != nil {
@@ -240,8 +242,8 @@
func (t *LogEntryTarget) StartFields(tt *vdl.Type) (vdl.FieldsTarget, error) {
- if !vdl.Compatible(tt, __VDLType_v_io_x_ref_lib_raft_LogEntry) {
- return nil, fmt.Errorf("type %v incompatible with %v", tt, __VDLType_v_io_x_ref_lib_raft_LogEntry)
+ if ttWant := vdl.TypeOf((*LogEntry)(nil)).Elem(); !vdl.Compatible(tt, ttWant) {
+ return nil, fmt.Errorf("type %v incompatible with %v", tt, ttWant)
}
return t, nil
}
@@ -264,7 +266,7 @@
target, err := &t.typeTarget, error(nil)
return nil, target, err
default:
- return nil, nil, fmt.Errorf("field %s not in struct %v", name, __VDLType_v_io_x_ref_lib_raft_LogEntry)
+ return nil, nil, fmt.Errorf("field %s not in struct v.io/x/ref/lib/raft.LogEntry", name)
}
}
func (t *LogEntryTarget) FinishField(_, _ vdl.Target) error {
@@ -275,25 +277,15 @@
return nil
}
-func init() {
- vdl.Register((*Term)(nil))
- vdl.Register((*Index)(nil))
- vdl.Register((*LogEntry)(nil))
-}
-
-var __VDLType0 *vdl.Type = vdl.TypeOf((*LogEntry)(nil))
-var __VDLType1 *vdl.Type = vdl.TypeOf([]byte(nil))
-var __VDLType_v_io_x_ref_lib_raft_Index *vdl.Type = vdl.TypeOf(Index(0))
-var __VDLType_v_io_x_ref_lib_raft_LogEntry *vdl.Type = vdl.TypeOf(LogEntry{})
-var __VDLType_v_io_x_ref_lib_raft_Term *vdl.Type = vdl.TypeOf(Term(0))
-
-func __VDLEnsureNativeBuilt() {
-}
+//////////////////////////////////////////////////
+// Const definitions
const ClientEntry = byte(0)
-
const RaftEntry = byte(1)
+//////////////////////////////////////////////////
+// Interface definitions
+
// raftProtoClientMethods is the client interface
// containing raftProto methods.
//
@@ -737,3 +729,31 @@
}
return s.s.errRecv
}
+
+var __VDLInitCalled bool
+
+// __VDLInit performs vdl initialization. It is safe to call multiple times.
+// If you have an init ordering issue, just insert the following line verbatim
+// into your source files in this package, right after the "package foo" clause:
+//
+// var _ = __VDLInit()
+//
+// The purpose of this function is to ensure that vdl initialization occurs in
+// the right order, and very early in the init sequence. In particular, vdl
+// registration and package variable initialization needs to occur before
+// functions like vdl.TypeOf will work properly.
+//
+// This function returns a dummy value, so that it can be used to initialize the
+// first var in the file, to take advantage of Go's defined init order.
+func __VDLInit() struct{} {
+ if __VDLInitCalled {
+ return struct{}{}
+ }
+
+ // Register types.
+ vdl.Register((*Term)(nil))
+ vdl.Register((*Index)(nil))
+ vdl.Register((*LogEntry)(nil))
+
+ return struct{}{}
+}
diff --git a/lib/security/bcrypter/bcrypter.vdl.go b/lib/security/bcrypter/bcrypter.vdl.go
index 47732c5..b514896 100644
--- a/lib/security/bcrypter/bcrypter.vdl.go
+++ b/lib/security/bcrypter/bcrypter.vdl.go
@@ -16,6 +16,11 @@
"v.io/v23/verror"
)
+var _ = __VDLInit() // Must be first; see __VDLInit comments for details.
+
+//////////////////////////////////////////////////
+// Type definitions
+
// WireCiphertext represents the wire format of the ciphertext
// generated by a Crypter.
type WireCiphertext struct {
@@ -37,9 +42,6 @@
}
func (m *WireCiphertext) FillVDLTarget(t vdl.Target, tt *vdl.Type) error {
- if __VDLType_v_io_x_ref_lib_security_bcrypter_WireCiphertext == nil || __VDLType0 == nil {
- panic("Initialization order error: types generated for FillVDLTarget not initialized. Consider moving caller to an init() block.")
- }
fieldsTarget1, err := t.StartFields(tt)
if err != nil {
return err
@@ -50,7 +52,7 @@
return err
}
if err != vdl.ErrFieldNoExist {
- if err := fieldTarget3.FromString(string(m.PatternId), vdl.StringType); err != nil {
+ if err := fieldTarget3.FromString(string(m.PatternId), tt.NonOptional().Field(0).Type); err != nil {
return err
}
if err := fieldsTarget1.FinishField(keyTarget2, fieldTarget3); err != nil {
@@ -63,7 +65,7 @@
}
if err != vdl.ErrFieldNoExist {
- mapTarget6, err := fieldTarget5.StartMap(__VDLType1, len(m.Bytes))
+ mapTarget6, err := fieldTarget5.StartMap(tt.NonOptional().Field(1).Type, len(m.Bytes))
if err != nil {
return err
}
@@ -72,7 +74,7 @@
if err != nil {
return err
}
- if err := keyTarget7.FromString(string(key8), vdl.StringType); err != nil {
+ if err := keyTarget7.FromString(string(key8), tt.NonOptional().Field(1).Type.Key()); err != nil {
return err
}
valueTarget9, err := mapTarget6.FinishKeyStartField(keyTarget7)
@@ -80,7 +82,7 @@
return err
}
- if err := valueTarget9.FromBytes([]byte(value10), __VDLType2); err != nil {
+ if err := valueTarget9.FromBytes([]byte(value10), tt.NonOptional().Field(1).Type.Elem()); err != nil {
return err
}
if err := mapTarget6.FinishField(keyTarget7, valueTarget9); err != nil {
@@ -114,8 +116,8 @@
func (t *WireCiphertextTarget) StartFields(tt *vdl.Type) (vdl.FieldsTarget, error) {
- if !vdl.Compatible(tt, __VDLType_v_io_x_ref_lib_security_bcrypter_WireCiphertext) {
- return nil, fmt.Errorf("type %v incompatible with %v", tt, __VDLType_v_io_x_ref_lib_security_bcrypter_WireCiphertext)
+ if ttWant := vdl.TypeOf((*WireCiphertext)(nil)).Elem(); !vdl.Compatible(tt, ttWant) {
+ return nil, fmt.Errorf("type %v incompatible with %v", tt, ttWant)
}
return t, nil
}
@@ -130,7 +132,7 @@
target, err := &t.bytesTarget, error(nil)
return nil, target, err
default:
- return nil, nil, fmt.Errorf("field %s not in struct %v", name, __VDLType_v_io_x_ref_lib_security_bcrypter_WireCiphertext)
+ return nil, nil, fmt.Errorf("field %s not in struct v.io/x/ref/lib/security/bcrypter.WireCiphertext", name)
}
}
func (t *WireCiphertextTarget) FinishField(_, _ vdl.Target) error {
@@ -154,8 +156,8 @@
func (t *unnamed_6d61705b737472696e675d5b5d62797465Target) StartMap(tt *vdl.Type, len int) (vdl.MapTarget, error) {
- if !vdl.Compatible(tt, __VDLType1) {
- return nil, fmt.Errorf("type %v incompatible with %v", tt, __VDLType1)
+ if ttWant := vdl.TypeOf((*map[string][]byte)(nil)); !vdl.Compatible(tt, ttWant) {
+ return nil, fmt.Errorf("type %v incompatible with %v", tt, ttWant)
}
*t.Value = make(map[string][]byte)
return t, nil
@@ -202,9 +204,6 @@
}
func (m *WireParams) FillVDLTarget(t vdl.Target, tt *vdl.Type) error {
- if __VDLType_v_io_x_ref_lib_security_bcrypter_WireParams == nil || __VDLType3 == nil {
- panic("Initialization order error: types generated for FillVDLTarget not initialized. Consider moving caller to an init() block.")
- }
fieldsTarget1, err := t.StartFields(tt)
if err != nil {
return err
@@ -215,7 +214,7 @@
return err
}
if err != vdl.ErrFieldNoExist {
- if err := fieldTarget3.FromString(string(m.Blessing), vdl.StringType); err != nil {
+ if err := fieldTarget3.FromString(string(m.Blessing), tt.NonOptional().Field(0).Type); err != nil {
return err
}
if err := fieldsTarget1.FinishField(keyTarget2, fieldTarget3); err != nil {
@@ -228,7 +227,7 @@
}
if err != vdl.ErrFieldNoExist {
- if err := fieldTarget5.FromBytes([]byte(m.Params), __VDLType2); err != nil {
+ if err := fieldTarget5.FromBytes([]byte(m.Params), tt.NonOptional().Field(1).Type); err != nil {
return err
}
if err := fieldsTarget1.FinishField(keyTarget4, fieldTarget5); err != nil {
@@ -255,8 +254,8 @@
func (t *WireParamsTarget) StartFields(tt *vdl.Type) (vdl.FieldsTarget, error) {
- if !vdl.Compatible(tt, __VDLType_v_io_x_ref_lib_security_bcrypter_WireParams) {
- return nil, fmt.Errorf("type %v incompatible with %v", tt, __VDLType_v_io_x_ref_lib_security_bcrypter_WireParams)
+ if ttWant := vdl.TypeOf((*WireParams)(nil)).Elem(); !vdl.Compatible(tt, ttWant) {
+ return nil, fmt.Errorf("type %v incompatible with %v", tt, ttWant)
}
return t, nil
}
@@ -271,7 +270,7 @@
target, err := &t.paramsTarget, error(nil)
return nil, target, err
default:
- return nil, nil, fmt.Errorf("field %s not in struct %v", name, __VDLType_v_io_x_ref_lib_security_bcrypter_WireParams)
+ return nil, nil, fmt.Errorf("field %s not in struct v.io/x/ref/lib/security/bcrypter.WireParams", name)
}
}
func (t *WireParamsTarget) FinishField(_, _ vdl.Target) error {
@@ -313,9 +312,6 @@
}
func (m *WirePrivateKey) FillVDLTarget(t vdl.Target, tt *vdl.Type) error {
- if __VDLType_v_io_x_ref_lib_security_bcrypter_WirePrivateKey == nil || __VDLType4 == nil {
- panic("Initialization order error: types generated for FillVDLTarget not initialized. Consider moving caller to an init() block.")
- }
fieldsTarget1, err := t.StartFields(tt)
if err != nil {
return err
@@ -326,7 +322,7 @@
return err
}
if err != vdl.ErrFieldNoExist {
- if err := fieldTarget3.FromString(string(m.Blessing), vdl.StringType); err != nil {
+ if err := fieldTarget3.FromString(string(m.Blessing), tt.NonOptional().Field(0).Type); err != nil {
return err
}
if err := fieldsTarget1.FinishField(keyTarget2, fieldTarget3); err != nil {
@@ -339,7 +335,7 @@
}
if err != vdl.ErrFieldNoExist {
- if err := m.Params.FillVDLTarget(fieldTarget5, __VDLType_v_io_x_ref_lib_security_bcrypter_WireParams); err != nil {
+ if err := m.Params.FillVDLTarget(fieldTarget5, tt.NonOptional().Field(1).Type); err != nil {
return err
}
if err := fieldsTarget1.FinishField(keyTarget4, fieldTarget5); err != nil {
@@ -352,7 +348,7 @@
}
if err != vdl.ErrFieldNoExist {
- listTarget8, err := fieldTarget7.StartList(__VDLType5, len(m.Keys))
+ listTarget8, err := fieldTarget7.StartList(tt.NonOptional().Field(2).Type, len(m.Keys))
if err != nil {
return err
}
@@ -362,7 +358,7 @@
return err
}
- if err := elemTarget9.FromBytes([]byte(elem10), __VDLType2); err != nil {
+ if err := elemTarget9.FromBytes([]byte(elem10), tt.NonOptional().Field(2).Type.Elem()); err != nil {
return err
}
if err := listTarget8.FinishElem(elemTarget9); err != nil {
@@ -397,8 +393,8 @@
func (t *WirePrivateKeyTarget) StartFields(tt *vdl.Type) (vdl.FieldsTarget, error) {
- if !vdl.Compatible(tt, __VDLType_v_io_x_ref_lib_security_bcrypter_WirePrivateKey) {
- return nil, fmt.Errorf("type %v incompatible with %v", tt, __VDLType_v_io_x_ref_lib_security_bcrypter_WirePrivateKey)
+ if ttWant := vdl.TypeOf((*WirePrivateKey)(nil)).Elem(); !vdl.Compatible(tt, ttWant) {
+ return nil, fmt.Errorf("type %v incompatible with %v", tt, ttWant)
}
return t, nil
}
@@ -417,7 +413,7 @@
target, err := &t.keysTarget, error(nil)
return nil, target, err
default:
- return nil, nil, fmt.Errorf("field %s not in struct %v", name, __VDLType_v_io_x_ref_lib_security_bcrypter_WirePrivateKey)
+ return nil, nil, fmt.Errorf("field %s not in struct v.io/x/ref/lib/security/bcrypter.WirePrivateKey", name)
}
}
func (t *WirePrivateKeyTarget) FinishField(_, _ vdl.Target) error {
@@ -438,8 +434,8 @@
func (t *unnamed_5b5d5b5d62797465Target) StartList(tt *vdl.Type, len int) (vdl.ListTarget, error) {
- if !vdl.Compatible(tt, __VDLType5) {
- return nil, fmt.Errorf("type %v incompatible with %v", tt, __VDLType5)
+ if ttWant := vdl.TypeOf((*[][]byte)(nil)); !vdl.Compatible(tt, ttWant) {
+ return nil, fmt.Errorf("type %v incompatible with %v", tt, ttWant)
}
if cap(*t.Value) < len {
*t.Value = make([][]byte, len)
@@ -461,25 +457,8 @@
return nil
}
-func init() {
- vdl.Register((*WireCiphertext)(nil))
- vdl.Register((*WireParams)(nil))
- vdl.Register((*WirePrivateKey)(nil))
-}
-
-var __VDLType0 *vdl.Type = vdl.TypeOf((*WireCiphertext)(nil))
-var __VDLType3 *vdl.Type = vdl.TypeOf((*WireParams)(nil))
-var __VDLType4 *vdl.Type = vdl.TypeOf((*WirePrivateKey)(nil))
-var __VDLType5 *vdl.Type = vdl.TypeOf([][]byte(nil))
-var __VDLType2 *vdl.Type = vdl.TypeOf([]byte(nil))
-var __VDLType1 *vdl.Type = vdl.TypeOf(map[string][]byte(nil))
-var __VDLType_v_io_x_ref_lib_security_bcrypter_WireCiphertext *vdl.Type = vdl.TypeOf(WireCiphertext{})
-var __VDLType_v_io_x_ref_lib_security_bcrypter_WireParams *vdl.Type = vdl.TypeOf(WireParams{})
-var __VDLType_v_io_x_ref_lib_security_bcrypter_WirePrivateKey *vdl.Type = vdl.TypeOf(WirePrivateKey{})
-
-func __VDLEnsureNativeBuilt() {
-}
-
+//////////////////////////////////////////////////
+// Error definitions
var (
ErrInternal = verror.Register("v.io/x/ref/lib/security/bcrypter.Internal", verror.NoRetry, "{1:}{2:} internal error: {3}")
ErrNoParams = verror.Register("v.io/x/ref/lib/security/bcrypter.NoParams", verror.NoRetry, "{1:}{2:} no public parameters available for encrypting for pattern: {3}")
@@ -487,13 +466,6 @@
ErrInvalidPrivateKey = verror.Register("v.io/x/ref/lib/security/bcrypter.InvalidPrivateKey", verror.NoRetry, "{1:}{2:} private key is invalid: {3}")
)
-func init() {
- i18n.Cat().SetWithBase(i18n.LangID("en"), i18n.MsgID(ErrInternal.ID), "{1:}{2:} internal error: {3}")
- i18n.Cat().SetWithBase(i18n.LangID("en"), i18n.MsgID(ErrNoParams.ID), "{1:}{2:} no public parameters available for encrypting for pattern: {3}")
- i18n.Cat().SetWithBase(i18n.LangID("en"), i18n.MsgID(ErrPrivateKeyNotFound.ID), "{1:}{2:} no private key found for decrypting ciphertext")
- i18n.Cat().SetWithBase(i18n.LangID("en"), i18n.MsgID(ErrInvalidPrivateKey.ID), "{1:}{2:} private key is invalid: {3}")
-}
-
// NewErrInternal returns an error with the ErrInternal ID.
func NewErrInternal(ctx *context.T, err error) error {
return verror.New(ErrInternal, ctx, err)
@@ -513,3 +485,37 @@
func NewErrInvalidPrivateKey(ctx *context.T, err error) error {
return verror.New(ErrInvalidPrivateKey, ctx, err)
}
+
+var __VDLInitCalled bool
+
+// __VDLInit performs vdl initialization. It is safe to call multiple times.
+// If you have an init ordering issue, just insert the following line verbatim
+// into your source files in this package, right after the "package foo" clause:
+//
+// var _ = __VDLInit()
+//
+// The purpose of this function is to ensure that vdl initialization occurs in
+// the right order, and very early in the init sequence. In particular, vdl
+// registration and package variable initialization needs to occur before
+// functions like vdl.TypeOf will work properly.
+//
+// This function returns a dummy value, so that it can be used to initialize the
+// first var in the file, to take advantage of Go's defined init order.
+func __VDLInit() struct{} {
+ if __VDLInitCalled {
+ return struct{}{}
+ }
+
+ // Register types.
+ vdl.Register((*WireCiphertext)(nil))
+ vdl.Register((*WireParams)(nil))
+ vdl.Register((*WirePrivateKey)(nil))
+
+ // Set error format strings.
+ i18n.Cat().SetWithBase(i18n.LangID("en"), i18n.MsgID(ErrInternal.ID), "{1:}{2:} internal error: {3}")
+ i18n.Cat().SetWithBase(i18n.LangID("en"), i18n.MsgID(ErrNoParams.ID), "{1:}{2:} no public parameters available for encrypting for pattern: {3}")
+ i18n.Cat().SetWithBase(i18n.LangID("en"), i18n.MsgID(ErrPrivateKeyNotFound.ID), "{1:}{2:} no private key found for decrypting ciphertext")
+ i18n.Cat().SetWithBase(i18n.LangID("en"), i18n.MsgID(ErrInvalidPrivateKey.ID), "{1:}{2:} private key is invalid: {3}")
+
+ return struct{}{}
+}
diff --git a/lib/security/security.vdl.go b/lib/security/security.vdl.go
index 9dc43d1..17a6c27 100644
--- a/lib/security/security.vdl.go
+++ b/lib/security/security.vdl.go
@@ -16,6 +16,11 @@
time_2 "v.io/v23/vdlroot/time"
)
+var _ = __VDLInit() // Must be first; see __VDLInit comments for details.
+
+//////////////////////////////////////////////////
+// Type definitions
+
type blessingRootsState map[string][]security.BlessingPattern
func (blessingRootsState) __VDLReflect(struct {
@@ -24,7 +29,7 @@
}
func (m *blessingRootsState) FillVDLTarget(t vdl.Target, tt *vdl.Type) error {
- mapTarget1, err := t.StartMap(__VDLType_v_io_x_ref_lib_security_blessingRootsState, len((*m)))
+ mapTarget1, err := t.StartMap(tt, len((*m)))
if err != nil {
return err
}
@@ -33,7 +38,7 @@
if err != nil {
return err
}
- if err := keyTarget2.FromString(string(key3), vdl.StringType); err != nil {
+ if err := keyTarget2.FromString(string(key3), tt.NonOptional().Key()); err != nil {
return err
}
valueTarget4, err := mapTarget1.FinishKeyStartField(keyTarget2)
@@ -41,7 +46,7 @@
return err
}
- listTarget6, err := valueTarget4.StartList(__VDLType0, len(value5))
+ listTarget6, err := valueTarget4.StartList(tt.NonOptional().Elem(), len(value5))
if err != nil {
return err
}
@@ -51,7 +56,7 @@
return err
}
- if err := elem8.FillVDLTarget(elemTarget7, __VDLType_v_io_v23_security_BlessingPattern); err != nil {
+ if err := elem8.FillVDLTarget(elemTarget7, tt.NonOptional().Elem().Elem()); err != nil {
return err
}
if err := listTarget6.FinishElem(elemTarget7); err != nil {
@@ -87,8 +92,8 @@
func (t *blessingRootsStateTarget) StartMap(tt *vdl.Type, len int) (vdl.MapTarget, error) {
- if !vdl.Compatible(tt, __VDLType_v_io_x_ref_lib_security_blessingRootsState) {
- return nil, fmt.Errorf("type %v incompatible with %v", tt, __VDLType_v_io_x_ref_lib_security_blessingRootsState)
+ if ttWant := vdl.TypeOf((*blessingRootsState)(nil)); !vdl.Compatible(tt, ttWant) {
+ return nil, fmt.Errorf("type %v incompatible with %v", tt, ttWant)
}
*t.Value = make(blessingRootsState)
return t, nil
@@ -127,8 +132,8 @@
func (t *unnamed_5b5d762e696f2f7632332f73656375726974792e426c657373696e675061747465726e20737472696e67Target) StartList(tt *vdl.Type, len int) (vdl.ListTarget, error) {
- if !vdl.Compatible(tt, __VDLType0) {
- return nil, fmt.Errorf("type %v incompatible with %v", tt, __VDLType0)
+ if ttWant := vdl.TypeOf((*[]security.BlessingPattern)(nil)); !vdl.Compatible(tt, ttWant) {
+ return nil, fmt.Errorf("type %v incompatible with %v", tt, ttWant)
}
if cap(*t.Value) < len {
*t.Value = make([]security.BlessingPattern, len)
@@ -150,6 +155,142 @@
return nil
}
+type dischargeCacheKey [32]byte
+
+func (dischargeCacheKey) __VDLReflect(struct {
+ Name string `vdl:"v.io/x/ref/lib/security.dischargeCacheKey"`
+}) {
+}
+
+func (m *dischargeCacheKey) FillVDLTarget(t vdl.Target, tt *vdl.Type) error {
+ if err := t.FromBytes([]byte((*m)[:]), tt); err != nil {
+ return err
+ }
+ return nil
+}
+
+func (m *dischargeCacheKey) MakeVDLTarget() vdl.Target {
+ return &dischargeCacheKeyTarget{Value: m}
+}
+
+type dischargeCacheKeyTarget struct {
+ Value *dischargeCacheKey
+ vdl.TargetBase
+}
+
+func (t *dischargeCacheKeyTarget) FromBytes(src []byte, tt *vdl.Type) error {
+
+ if ttWant := vdl.TypeOf((*dischargeCacheKey)(nil)); !vdl.Compatible(tt, ttWant) {
+ return fmt.Errorf("type %v incompatible with %v", tt, ttWant)
+ }
+ copy((*t.Value)[:], src)
+
+ return nil
+}
+
+type CachedDischarge struct {
+ Discharge security.Discharge
+ // CacheTime is the time at which the discharge was first cached.
+ CacheTime time.Time
+}
+
+func (CachedDischarge) __VDLReflect(struct {
+ Name string `vdl:"v.io/x/ref/lib/security.CachedDischarge"`
+}) {
+}
+
+func (m *CachedDischarge) FillVDLTarget(t vdl.Target, tt *vdl.Type) error {
+ fieldsTarget1, err := t.StartFields(tt)
+ if err != nil {
+ return err
+ }
+
+ var wireValue2 security.WireDischarge
+ if err := security.WireDischargeFromNative(&wireValue2, m.Discharge); err != nil {
+ return err
+ }
+
+ keyTarget3, fieldTarget4, err := fieldsTarget1.StartField("Discharge")
+ if err != vdl.ErrFieldNoExist && err != nil {
+ return err
+ }
+ if err != vdl.ErrFieldNoExist {
+
+ unionValue5 := wireValue2
+ if unionValue5 == nil {
+ unionValue5 = security.WireDischargePublicKey{}
+ }
+ if err := unionValue5.FillVDLTarget(fieldTarget4, tt.NonOptional().Field(0).Type); err != nil {
+ return err
+ }
+ if err := fieldsTarget1.FinishField(keyTarget3, fieldTarget4); err != nil {
+ return err
+ }
+ }
+ var wireValue6 time_2.Time
+ if err := time_2.TimeFromNative(&wireValue6, m.CacheTime); err != nil {
+ return err
+ }
+
+ keyTarget7, fieldTarget8, err := fieldsTarget1.StartField("CacheTime")
+ if err != vdl.ErrFieldNoExist && err != nil {
+ return err
+ }
+ if err != vdl.ErrFieldNoExist {
+
+ if err := wireValue6.FillVDLTarget(fieldTarget8, tt.NonOptional().Field(1).Type); err != nil {
+ return err
+ }
+ if err := fieldsTarget1.FinishField(keyTarget7, fieldTarget8); err != nil {
+ return err
+ }
+ }
+ if err := t.FinishFields(fieldsTarget1); err != nil {
+ return err
+ }
+ return nil
+}
+
+func (m *CachedDischarge) MakeVDLTarget() vdl.Target {
+ return &CachedDischargeTarget{Value: m}
+}
+
+type CachedDischargeTarget struct {
+ Value *CachedDischarge
+
+ cacheTimeTarget time_2.TimeTarget
+ vdl.TargetBase
+ vdl.FieldsTargetBase
+}
+
+func (t *CachedDischargeTarget) StartFields(tt *vdl.Type) (vdl.FieldsTarget, error) {
+
+ if ttWant := vdl.TypeOf((*CachedDischarge)(nil)).Elem(); !vdl.Compatible(tt, ttWant) {
+ return nil, fmt.Errorf("type %v incompatible with %v", tt, ttWant)
+ }
+ return t, nil
+}
+func (t *CachedDischargeTarget) StartField(name string) (key, field vdl.Target, _ error) {
+ switch name {
+ case "Discharge":
+ target, err := vdl.ReflectTarget(reflect.ValueOf(&t.Value.Discharge))
+ return nil, target, err
+ case "CacheTime":
+ t.cacheTimeTarget.Value = &t.Value.CacheTime
+ target, err := &t.cacheTimeTarget, error(nil)
+ return nil, target, err
+ default:
+ return nil, nil, fmt.Errorf("field %s not in struct v.io/x/ref/lib/security.CachedDischarge", name)
+ }
+}
+func (t *CachedDischargeTarget) FinishField(_, _ vdl.Target) error {
+ return nil
+}
+func (t *CachedDischargeTarget) FinishFields(_ vdl.FieldsTarget) error {
+
+ return nil
+}
+
type blessingStoreState struct {
// PeerBlessings maps BlessingPatterns to the Blessings object that is to
// be shared with peers which present blessings of their own that match the
@@ -176,7 +317,6 @@
}
func (m *blessingStoreState) FillVDLTarget(t vdl.Target, tt *vdl.Type) error {
- __VDLEnsureNativeBuilt()
fieldsTarget1, err := t.StartFields(tt)
if err != nil {
return err
@@ -188,7 +328,7 @@
}
if err != vdl.ErrFieldNoExist {
- mapTarget4, err := fieldTarget3.StartMap(__VDLType2, len(m.PeerBlessings))
+ mapTarget4, err := fieldTarget3.StartMap(tt.NonOptional().Field(0).Type, len(m.PeerBlessings))
if err != nil {
return err
}
@@ -198,7 +338,7 @@
return err
}
- if err := key6.FillVDLTarget(keyTarget5, __VDLType_v_io_v23_security_BlessingPattern); err != nil {
+ if err := key6.FillVDLTarget(keyTarget5, tt.NonOptional().Field(0).Type.Key()); err != nil {
return err
}
valueTarget7, err := mapTarget4.FinishKeyStartField(keyTarget5)
@@ -211,7 +351,7 @@
return err
}
- if err := wireValue9.FillVDLTarget(valueTarget7, __VDLType_v_io_v23_security_WireBlessings); err != nil {
+ if err := wireValue9.FillVDLTarget(valueTarget7, tt.NonOptional().Field(0).Type.Elem()); err != nil {
return err
}
if err := mapTarget4.FinishField(keyTarget5, valueTarget7); err != nil {
@@ -236,7 +376,7 @@
}
if err != vdl.ErrFieldNoExist {
- if err := wireValue10.FillVDLTarget(fieldTarget12, __VDLType_v_io_v23_security_WireBlessings); err != nil {
+ if err := wireValue10.FillVDLTarget(fieldTarget12, tt.NonOptional().Field(1).Type); err != nil {
return err
}
if err := fieldsTarget1.FinishField(keyTarget11, fieldTarget12); err != nil {
@@ -249,7 +389,7 @@
}
if err != vdl.ErrFieldNoExist {
- mapTarget15, err := fieldTarget14.StartMap(__VDLType3, len(m.DischargeCache))
+ mapTarget15, err := fieldTarget14.StartMap(tt.NonOptional().Field(2).Type, len(m.DischargeCache))
if err != nil {
return err
}
@@ -259,7 +399,7 @@
return err
}
- if err := key17.FillVDLTarget(keyTarget16, __VDLType_v_io_x_ref_lib_security_dischargeCacheKey); err != nil {
+ if err := key17.FillVDLTarget(keyTarget16, tt.NonOptional().Field(2).Type.Key()); err != nil {
return err
}
valueTarget18, err := mapTarget15.FinishKeyStartField(keyTarget16)
@@ -276,7 +416,7 @@
if unionValue21 == nil {
unionValue21 = security.WireDischargePublicKey{}
}
- if err := unionValue21.FillVDLTarget(valueTarget18, __VDLType_v_io_v23_security_WireDischarge); err != nil {
+ if err := unionValue21.FillVDLTarget(valueTarget18, tt.NonOptional().Field(2).Type.Elem()); err != nil {
return err
}
if err := mapTarget15.FinishField(keyTarget16, valueTarget18); err != nil {
@@ -296,7 +436,7 @@
}
if err != vdl.ErrFieldNoExist {
- mapTarget24, err := fieldTarget23.StartMap(__VDLType4, len(m.Discharges))
+ mapTarget24, err := fieldTarget23.StartMap(tt.NonOptional().Field(3).Type, len(m.Discharges))
if err != nil {
return err
}
@@ -306,7 +446,7 @@
return err
}
- if err := key26.FillVDLTarget(keyTarget25, __VDLType_v_io_x_ref_lib_security_dischargeCacheKey); err != nil {
+ if err := key26.FillVDLTarget(keyTarget25, tt.NonOptional().Field(3).Type.Key()); err != nil {
return err
}
valueTarget27, err := mapTarget24.FinishKeyStartField(keyTarget25)
@@ -314,7 +454,7 @@
return err
}
- if err := value28.FillVDLTarget(valueTarget27, __VDLType_v_io_x_ref_lib_security_CachedDischarge); err != nil {
+ if err := value28.FillVDLTarget(valueTarget27, tt.NonOptional().Field(3).Type.Elem()); err != nil {
return err
}
if err := mapTarget24.FinishField(keyTarget25, valueTarget27); err != nil {
@@ -333,7 +473,7 @@
return err
}
if err != vdl.ErrFieldNoExist {
- if err := fieldTarget30.FromUint(uint64(m.CacheKeyFormat), vdl.Uint32Type); err != nil {
+ if err := fieldTarget30.FromUint(uint64(m.CacheKeyFormat), tt.NonOptional().Field(4).Type); err != nil {
return err
}
if err := fieldsTarget1.FinishField(keyTarget29, fieldTarget30); err != nil {
@@ -363,8 +503,8 @@
func (t *blessingStoreStateTarget) StartFields(tt *vdl.Type) (vdl.FieldsTarget, error) {
- if !vdl.Compatible(tt, __VDLType_v_io_x_ref_lib_security_blessingStoreState) {
- return nil, fmt.Errorf("type %v incompatible with %v", tt, __VDLType_v_io_x_ref_lib_security_blessingStoreState)
+ if ttWant := vdl.TypeOf((*blessingStoreState)(nil)).Elem(); !vdl.Compatible(tt, ttWant) {
+ return nil, fmt.Errorf("type %v incompatible with %v", tt, ttWant)
}
return t, nil
}
@@ -391,7 +531,7 @@
target, err := &t.cacheKeyFormatTarget, error(nil)
return nil, target, err
default:
- return nil, nil, fmt.Errorf("field %s not in struct %v", name, __VDLType_v_io_x_ref_lib_security_blessingStoreState)
+ return nil, nil, fmt.Errorf("field %s not in struct v.io/x/ref/lib/security.blessingStoreState", name)
}
}
func (t *blessingStoreStateTarget) FinishField(_, _ vdl.Target) error {
@@ -415,8 +555,8 @@
func (t *unnamed_6d61705b762e696f2f7632332f73656375726974792e426c657373696e675061747465726e20737472696e675d762e696f2f7632332f73656375726974792e57697265426c657373696e6773207374727563747b4365727469666963617465436861696e73205b5d5b5d762e696f2f7632332f73656375726974792e4365727469666963617465207374727563747b457874656e73696f6e20737472696e673b5075626c69634b6579205b5d627974653b43617665617473205b5d762e696f2f7632332f73656375726974792e436176656174207374727563747b496420762e696f2f7632332f756e6971756569642e4964205b31365d627974653b506172616d566f6d205b5d627974657d3b5369676e617475726520762e696f2f7632332f73656375726974792e5369676e6174757265207374727563747b507572706f7365205b5d627974653b4861736820762e696f2f7632332f73656375726974792e4861736820737472696e673b52205b5d627974653b53205b5d627974657d7d7dTarget) StartMap(tt *vdl.Type, len int) (vdl.MapTarget, error) {
- if !vdl.Compatible(tt, __VDLType2) {
- return nil, fmt.Errorf("type %v incompatible with %v", tt, __VDLType2)
+ if ttWant := vdl.TypeOf((*map[security.BlessingPattern]security.WireBlessings)(nil)); !vdl.Compatible(tt, ttWant) {
+ return nil, fmt.Errorf("type %v incompatible with %v", tt, ttWant)
}
*t.Value = make(map[security.BlessingPattern]security.Blessings)
return t, nil
@@ -458,8 +598,8 @@
func (t *unnamed_6d61705b762e696f2f782f7265662f6c69622f73656375726974792e64697363686172676543616368654b6579205b33325d627974655d762e696f2f7632332f73656375726974792e5769726544697363686172676520756e696f6e7b5075626c69634b657920762e696f2f7632332f73656375726974792e7075626c69634b6579446973636861726765207374727563747b54686972645061727479436176656174496420737472696e673b43617665617473205b5d762e696f2f7632332f73656375726974792e436176656174207374727563747b496420762e696f2f7632332f756e6971756569642e4964205b31365d627974653b506172616d566f6d205b5d627974657d3b5369676e617475726520762e696f2f7632332f73656375726974792e5369676e6174757265207374727563747b507572706f7365205b5d627974653b4861736820762e696f2f7632332f73656375726974792e4861736820737472696e673b52205b5d627974653b53205b5d627974657d7d7dTarget) StartMap(tt *vdl.Type, len int) (vdl.MapTarget, error) {
- if !vdl.Compatible(tt, __VDLType3) {
- return nil, fmt.Errorf("type %v incompatible with %v", tt, __VDLType3)
+ if ttWant := vdl.TypeOf((*map[dischargeCacheKey]security.WireDischarge)(nil)); !vdl.Compatible(tt, ttWant) {
+ return nil, fmt.Errorf("type %v incompatible with %v", tt, ttWant)
}
*t.Value = make(map[dischargeCacheKey]security.Discharge)
return t, nil
@@ -487,21 +627,6 @@
return nil
}
-type dischargeCacheKeyTarget struct {
- Value *dischargeCacheKey
- vdl.TargetBase
-}
-
-func (t *dischargeCacheKeyTarget) FromBytes(src []byte, tt *vdl.Type) error {
-
- if !vdl.Compatible(tt, __VDLType_v_io_x_ref_lib_security_dischargeCacheKey) {
- return fmt.Errorf("type %v incompatible with %v", tt, __VDLType_v_io_x_ref_lib_security_dischargeCacheKey)
- }
- copy((*t.Value)[:], src)
-
- return nil
-}
-
// map[dischargeCacheKey]CachedDischarge
type unnamed_6d61705b762e696f2f782f7265662f6c69622f73656375726974792e64697363686172676543616368654b6579205b33325d627974655d762e696f2f782f7265662f6c69622f73656375726974792e436163686564446973636861726765207374727563747b44697363686172676520762e696f2f7632332f73656375726974792e5769726544697363686172676520756e696f6e7b5075626c69634b657920762e696f2f7632332f73656375726974792e7075626c69634b6579446973636861726765207374727563747b54686972645061727479436176656174496420737472696e673b43617665617473205b5d762e696f2f7632332f73656375726974792e436176656174207374727563747b496420762e696f2f7632332f756e6971756569642e4964205b31365d627974653b506172616d566f6d205b5d627974657d3b5369676e617475726520762e696f2f7632332f73656375726974792e5369676e6174757265207374727563747b507572706f7365205b5d627974653b4861736820762e696f2f7632332f73656375726974792e4861736820737472696e673b52205b5d627974653b53205b5d627974657d7d7d3b436163686554696d652074696d652e54696d65207374727563747b5365636f6e647320696e7436343b4e616e6f7320696e7433327d7dTarget struct {
Value *map[dischargeCacheKey]CachedDischarge
@@ -515,8 +640,8 @@
func (t *unnamed_6d61705b762e696f2f782f7265662f6c69622f73656375726974792e64697363686172676543616368654b6579205b33325d627974655d762e696f2f782f7265662f6c69622f73656375726974792e436163686564446973636861726765207374727563747b44697363686172676520762e696f2f7632332f73656375726974792e5769726544697363686172676520756e696f6e7b5075626c69634b657920762e696f2f7632332f73656375726974792e7075626c69634b6579446973636861726765207374727563747b54686972645061727479436176656174496420737472696e673b43617665617473205b5d762e696f2f7632332f73656375726974792e436176656174207374727563747b496420762e696f2f7632332f756e6971756569642e4964205b31365d627974653b506172616d566f6d205b5d627974657d3b5369676e617475726520762e696f2f7632332f73656375726974792e5369676e6174757265207374727563747b507572706f7365205b5d627974653b4861736820762e696f2f7632332f73656375726974792e4861736820737472696e673b52205b5d627974653b53205b5d627974657d7d7d3b436163686554696d652074696d652e54696d65207374727563747b5365636f6e647320696e7436343b4e616e6f7320696e7433327d7dTarget) StartMap(tt *vdl.Type, len int) (vdl.MapTarget, error) {
- if !vdl.Compatible(tt, __VDLType4) {
- return nil, fmt.Errorf("type %v incompatible with %v", tt, __VDLType4)
+ if ttWant := vdl.TypeOf((*map[dischargeCacheKey]CachedDischarge)(nil)); !vdl.Compatible(tt, ttWant) {
+ return nil, fmt.Errorf("type %v incompatible with %v", tt, ttWant)
}
*t.Value = make(map[dischargeCacheKey]CachedDischarge)
return t, nil
@@ -545,760 +670,31 @@
return nil
}
-type CachedDischargeTarget struct {
- Value *CachedDischarge
+var __VDLInitCalled bool
- cacheTimeTarget time_2.TimeTarget
- vdl.TargetBase
- vdl.FieldsTargetBase
-}
-
-func (t *CachedDischargeTarget) StartFields(tt *vdl.Type) (vdl.FieldsTarget, error) {
-
- if !vdl.Compatible(tt, __VDLType_v_io_x_ref_lib_security_CachedDischarge) {
- return nil, fmt.Errorf("type %v incompatible with %v", tt, __VDLType_v_io_x_ref_lib_security_CachedDischarge)
- }
- return t, nil
-}
-func (t *CachedDischargeTarget) StartField(name string) (key, field vdl.Target, _ error) {
- switch name {
- case "Discharge":
- target, err := vdl.ReflectTarget(reflect.ValueOf(&t.Value.Discharge))
- return nil, target, err
- case "CacheTime":
- t.cacheTimeTarget.Value = &t.Value.CacheTime
- target, err := &t.cacheTimeTarget, error(nil)
- return nil, target, err
- default:
- return nil, nil, fmt.Errorf("field %s not in struct %v", name, __VDLType_v_io_x_ref_lib_security_CachedDischarge)
- }
-}
-func (t *CachedDischargeTarget) FinishField(_, _ vdl.Target) error {
- return nil
-}
-func (t *CachedDischargeTarget) FinishFields(_ vdl.FieldsTarget) error {
-
- return nil
-}
-
-type CachedDischarge struct {
- Discharge security.Discharge
- // CacheTime is the time at which the discharge was first cached.
- CacheTime time.Time
-}
-
-func (CachedDischarge) __VDLReflect(struct {
- Name string `vdl:"v.io/x/ref/lib/security.CachedDischarge"`
-}) {
-}
-
-func (m *CachedDischarge) FillVDLTarget(t vdl.Target, tt *vdl.Type) error {
- __VDLEnsureNativeBuilt()
- fieldsTarget1, err := t.StartFields(tt)
- if err != nil {
- return err
+// __VDLInit performs vdl initialization. It is safe to call multiple times.
+// If you have an init ordering issue, just insert the following line verbatim
+// into your source files in this package, right after the "package foo" clause:
+//
+// var _ = __VDLInit()
+//
+// The purpose of this function is to ensure that vdl initialization occurs in
+// the right order, and very early in the init sequence. In particular, vdl
+// registration and package variable initialization needs to occur before
+// functions like vdl.TypeOf will work properly.
+//
+// This function returns a dummy value, so that it can be used to initialize the
+// first var in the file, to take advantage of Go's defined init order.
+func __VDLInit() struct{} {
+ if __VDLInitCalled {
+ return struct{}{}
}
- var wireValue2 security.WireDischarge
- if err := security.WireDischargeFromNative(&wireValue2, m.Discharge); err != nil {
- return err
- }
-
- keyTarget3, fieldTarget4, err := fieldsTarget1.StartField("Discharge")
- if err != vdl.ErrFieldNoExist && err != nil {
- return err
- }
- if err != vdl.ErrFieldNoExist {
-
- unionValue5 := wireValue2
- if unionValue5 == nil {
- unionValue5 = security.WireDischargePublicKey{}
- }
- if err := unionValue5.FillVDLTarget(fieldTarget4, __VDLType_v_io_v23_security_WireDischarge); err != nil {
- return err
- }
- if err := fieldsTarget1.FinishField(keyTarget3, fieldTarget4); err != nil {
- return err
- }
- }
- var wireValue6 time_2.Time
- if err := time_2.TimeFromNative(&wireValue6, m.CacheTime); err != nil {
- return err
- }
-
- keyTarget7, fieldTarget8, err := fieldsTarget1.StartField("CacheTime")
- if err != vdl.ErrFieldNoExist && err != nil {
- return err
- }
- if err != vdl.ErrFieldNoExist {
-
- if err := wireValue6.FillVDLTarget(fieldTarget8, __VDLType_time_Time); err != nil {
- return err
- }
- if err := fieldsTarget1.FinishField(keyTarget7, fieldTarget8); err != nil {
- return err
- }
- }
- if err := t.FinishFields(fieldsTarget1); err != nil {
- return err
- }
- return nil
-}
-
-func (m *CachedDischarge) MakeVDLTarget() vdl.Target {
- return &CachedDischargeTarget{Value: m}
-}
-
-type dischargeCacheKey [32]byte
-
-func (dischargeCacheKey) __VDLReflect(struct {
- Name string `vdl:"v.io/x/ref/lib/security.dischargeCacheKey"`
-}) {
-}
-
-func (m *dischargeCacheKey) FillVDLTarget(t vdl.Target, tt *vdl.Type) error {
- if err := t.FromBytes([]byte((*m)[:]), __VDLType_v_io_x_ref_lib_security_dischargeCacheKey); err != nil {
- return err
- }
- return nil
-}
-
-func (m *dischargeCacheKey) MakeVDLTarget() vdl.Target {
- return &dischargeCacheKeyTarget{Value: m}
-}
-
-func init() {
+ // Register types.
vdl.Register((*blessingRootsState)(nil))
- vdl.Register((*blessingStoreState)(nil))
- vdl.Register((*CachedDischarge)(nil))
vdl.Register((*dischargeCacheKey)(nil))
-}
+ vdl.Register((*CachedDischarge)(nil))
+ vdl.Register((*blessingStoreState)(nil))
-var __VDLType5 *vdl.Type
-
-func __VDLType5_gen() *vdl.Type {
- __VDLType5Builder := vdl.TypeBuilder{}
-
- __VDLType51 := __VDLType5Builder.Optional()
- __VDLType52 := __VDLType5Builder.Struct()
- __VDLType53 := __VDLType5Builder.Named("v.io/x/ref/lib/security.CachedDischarge").AssignBase(__VDLType52)
- __VDLType54 := __VDLType5Builder.Union()
- __VDLType55 := __VDLType5Builder.Named("v.io/v23/security.WireDischarge").AssignBase(__VDLType54)
- __VDLType56 := __VDLType5Builder.Struct()
- __VDLType57 := __VDLType5Builder.Named("v.io/v23/security.publicKeyDischarge").AssignBase(__VDLType56)
- __VDLType58 := vdl.StringType
- __VDLType56.AppendField("ThirdPartyCaveatId", __VDLType58)
- __VDLType59 := __VDLType5Builder.List()
- __VDLType510 := __VDLType5Builder.Struct()
- __VDLType511 := __VDLType5Builder.Named("v.io/v23/security.Caveat").AssignBase(__VDLType510)
- __VDLType512 := __VDLType5Builder.Array()
- __VDLType513 := __VDLType5Builder.Named("v.io/v23/uniqueid.Id").AssignBase(__VDLType512)
- __VDLType514 := vdl.ByteType
- __VDLType512.AssignElem(__VDLType514)
- __VDLType512.AssignLen(16)
- __VDLType510.AppendField("Id", __VDLType513)
- __VDLType515 := __VDLType5Builder.List()
- __VDLType515.AssignElem(__VDLType514)
- __VDLType510.AppendField("ParamVom", __VDLType515)
- __VDLType59.AssignElem(__VDLType511)
- __VDLType56.AppendField("Caveats", __VDLType59)
- __VDLType516 := __VDLType5Builder.Struct()
- __VDLType517 := __VDLType5Builder.Named("v.io/v23/security.Signature").AssignBase(__VDLType516)
- __VDLType516.AppendField("Purpose", __VDLType515)
- __VDLType518 := vdl.StringType
- __VDLType519 := __VDLType5Builder.Named("v.io/v23/security.Hash").AssignBase(__VDLType518)
- __VDLType516.AppendField("Hash", __VDLType519)
- __VDLType516.AppendField("R", __VDLType515)
- __VDLType516.AppendField("S", __VDLType515)
- __VDLType56.AppendField("Signature", __VDLType517)
- __VDLType54.AppendField("PublicKey", __VDLType57)
- __VDLType52.AppendField("Discharge", __VDLType55)
- __VDLType520 := __VDLType5Builder.Struct()
- __VDLType521 := __VDLType5Builder.Named("time.Time").AssignBase(__VDLType520)
- __VDLType522 := vdl.Int64Type
- __VDLType520.AppendField("Seconds", __VDLType522)
- __VDLType523 := vdl.Int32Type
- __VDLType520.AppendField("Nanos", __VDLType523)
- __VDLType52.AppendField("CacheTime", __VDLType521)
- __VDLType51.AssignElem(__VDLType53)
- __VDLType5Builder.Build()
- __VDLType5v, err := __VDLType51.Built()
- if err != nil {
- panic(err)
- }
- return __VDLType5v
-}
-func init() {
- __VDLType5 = __VDLType5_gen()
-}
-
-var __VDLType1 *vdl.Type
-
-func __VDLType1_gen() *vdl.Type {
- __VDLType1Builder := vdl.TypeBuilder{}
-
- __VDLType11 := __VDLType1Builder.Optional()
- __VDLType12 := __VDLType1Builder.Struct()
- __VDLType13 := __VDLType1Builder.Named("v.io/x/ref/lib/security.blessingStoreState").AssignBase(__VDLType12)
- __VDLType14 := __VDLType1Builder.Map()
- __VDLType15 := vdl.StringType
- __VDLType16 := __VDLType1Builder.Named("v.io/v23/security.BlessingPattern").AssignBase(__VDLType15)
- __VDLType14.AssignKey(__VDLType16)
- __VDLType17 := __VDLType1Builder.Struct()
- __VDLType18 := __VDLType1Builder.Named("v.io/v23/security.WireBlessings").AssignBase(__VDLType17)
- __VDLType19 := __VDLType1Builder.List()
- __VDLType110 := __VDLType1Builder.List()
- __VDLType111 := __VDLType1Builder.Struct()
- __VDLType112 := __VDLType1Builder.Named("v.io/v23/security.Certificate").AssignBase(__VDLType111)
- __VDLType113 := vdl.StringType
- __VDLType111.AppendField("Extension", __VDLType113)
- __VDLType114 := __VDLType1Builder.List()
- __VDLType115 := vdl.ByteType
- __VDLType114.AssignElem(__VDLType115)
- __VDLType111.AppendField("PublicKey", __VDLType114)
- __VDLType116 := __VDLType1Builder.List()
- __VDLType117 := __VDLType1Builder.Struct()
- __VDLType118 := __VDLType1Builder.Named("v.io/v23/security.Caveat").AssignBase(__VDLType117)
- __VDLType119 := __VDLType1Builder.Array()
- __VDLType120 := __VDLType1Builder.Named("v.io/v23/uniqueid.Id").AssignBase(__VDLType119)
- __VDLType119.AssignElem(__VDLType115)
- __VDLType119.AssignLen(16)
- __VDLType117.AppendField("Id", __VDLType120)
- __VDLType117.AppendField("ParamVom", __VDLType114)
- __VDLType116.AssignElem(__VDLType118)
- __VDLType111.AppendField("Caveats", __VDLType116)
- __VDLType121 := __VDLType1Builder.Struct()
- __VDLType122 := __VDLType1Builder.Named("v.io/v23/security.Signature").AssignBase(__VDLType121)
- __VDLType121.AppendField("Purpose", __VDLType114)
- __VDLType123 := vdl.StringType
- __VDLType124 := __VDLType1Builder.Named("v.io/v23/security.Hash").AssignBase(__VDLType123)
- __VDLType121.AppendField("Hash", __VDLType124)
- __VDLType121.AppendField("R", __VDLType114)
- __VDLType121.AppendField("S", __VDLType114)
- __VDLType111.AppendField("Signature", __VDLType122)
- __VDLType110.AssignElem(__VDLType112)
- __VDLType19.AssignElem(__VDLType110)
- __VDLType17.AppendField("CertificateChains", __VDLType19)
- __VDLType14.AssignElem(__VDLType18)
- __VDLType12.AppendField("PeerBlessings", __VDLType14)
- __VDLType12.AppendField("DefaultBlessings", __VDLType18)
- __VDLType125 := __VDLType1Builder.Map()
- __VDLType126 := __VDLType1Builder.Array()
- __VDLType127 := __VDLType1Builder.Named("v.io/x/ref/lib/security.dischargeCacheKey").AssignBase(__VDLType126)
- __VDLType126.AssignElem(__VDLType115)
- __VDLType126.AssignLen(32)
- __VDLType125.AssignKey(__VDLType127)
- __VDLType128 := __VDLType1Builder.Union()
- __VDLType129 := __VDLType1Builder.Named("v.io/v23/security.WireDischarge").AssignBase(__VDLType128)
- __VDLType130 := __VDLType1Builder.Struct()
- __VDLType131 := __VDLType1Builder.Named("v.io/v23/security.publicKeyDischarge").AssignBase(__VDLType130)
- __VDLType130.AppendField("ThirdPartyCaveatId", __VDLType113)
- __VDLType130.AppendField("Caveats", __VDLType116)
- __VDLType130.AppendField("Signature", __VDLType122)
- __VDLType128.AppendField("PublicKey", __VDLType131)
- __VDLType125.AssignElem(__VDLType129)
- __VDLType12.AppendField("DischargeCache", __VDLType125)
- __VDLType132 := __VDLType1Builder.Map()
- __VDLType132.AssignKey(__VDLType127)
- __VDLType133 := __VDLType1Builder.Struct()
- __VDLType134 := __VDLType1Builder.Named("v.io/x/ref/lib/security.CachedDischarge").AssignBase(__VDLType133)
- __VDLType133.AppendField("Discharge", __VDLType129)
- __VDLType135 := __VDLType1Builder.Struct()
- __VDLType136 := __VDLType1Builder.Named("time.Time").AssignBase(__VDLType135)
- __VDLType137 := vdl.Int64Type
- __VDLType135.AppendField("Seconds", __VDLType137)
- __VDLType138 := vdl.Int32Type
- __VDLType135.AppendField("Nanos", __VDLType138)
- __VDLType133.AppendField("CacheTime", __VDLType136)
- __VDLType132.AssignElem(__VDLType134)
- __VDLType12.AppendField("Discharges", __VDLType132)
- __VDLType139 := vdl.Uint32Type
- __VDLType12.AppendField("CacheKeyFormat", __VDLType139)
- __VDLType11.AssignElem(__VDLType13)
- __VDLType1Builder.Build()
- __VDLType1v, err := __VDLType11.Built()
- if err != nil {
- panic(err)
- }
- return __VDLType1v
-}
-func init() {
- __VDLType1 = __VDLType1_gen()
-}
-
-var __VDLType0 *vdl.Type = vdl.TypeOf([]security.BlessingPattern(nil))
-var __VDLType2 *vdl.Type
-
-func __VDLType2_gen() *vdl.Type {
- __VDLType2Builder := vdl.TypeBuilder{}
-
- __VDLType21 := __VDLType2Builder.Map()
- __VDLType22 := vdl.StringType
- __VDLType23 := __VDLType2Builder.Named("v.io/v23/security.BlessingPattern").AssignBase(__VDLType22)
- __VDLType21.AssignKey(__VDLType23)
- __VDLType24 := __VDLType2Builder.Struct()
- __VDLType25 := __VDLType2Builder.Named("v.io/v23/security.WireBlessings").AssignBase(__VDLType24)
- __VDLType26 := __VDLType2Builder.List()
- __VDLType27 := __VDLType2Builder.List()
- __VDLType28 := __VDLType2Builder.Struct()
- __VDLType29 := __VDLType2Builder.Named("v.io/v23/security.Certificate").AssignBase(__VDLType28)
- __VDLType210 := vdl.StringType
- __VDLType28.AppendField("Extension", __VDLType210)
- __VDLType211 := __VDLType2Builder.List()
- __VDLType212 := vdl.ByteType
- __VDLType211.AssignElem(__VDLType212)
- __VDLType28.AppendField("PublicKey", __VDLType211)
- __VDLType213 := __VDLType2Builder.List()
- __VDLType214 := __VDLType2Builder.Struct()
- __VDLType215 := __VDLType2Builder.Named("v.io/v23/security.Caveat").AssignBase(__VDLType214)
- __VDLType216 := __VDLType2Builder.Array()
- __VDLType217 := __VDLType2Builder.Named("v.io/v23/uniqueid.Id").AssignBase(__VDLType216)
- __VDLType216.AssignElem(__VDLType212)
- __VDLType216.AssignLen(16)
- __VDLType214.AppendField("Id", __VDLType217)
- __VDLType214.AppendField("ParamVom", __VDLType211)
- __VDLType213.AssignElem(__VDLType215)
- __VDLType28.AppendField("Caveats", __VDLType213)
- __VDLType218 := __VDLType2Builder.Struct()
- __VDLType219 := __VDLType2Builder.Named("v.io/v23/security.Signature").AssignBase(__VDLType218)
- __VDLType218.AppendField("Purpose", __VDLType211)
- __VDLType220 := vdl.StringType
- __VDLType221 := __VDLType2Builder.Named("v.io/v23/security.Hash").AssignBase(__VDLType220)
- __VDLType218.AppendField("Hash", __VDLType221)
- __VDLType218.AppendField("R", __VDLType211)
- __VDLType218.AppendField("S", __VDLType211)
- __VDLType28.AppendField("Signature", __VDLType219)
- __VDLType27.AssignElem(__VDLType29)
- __VDLType26.AssignElem(__VDLType27)
- __VDLType24.AppendField("CertificateChains", __VDLType26)
- __VDLType21.AssignElem(__VDLType25)
- __VDLType2Builder.Build()
- __VDLType2v, err := __VDLType21.Built()
- if err != nil {
- panic(err)
- }
- return __VDLType2v
-}
-func init() {
- __VDLType2 = __VDLType2_gen()
-}
-
-var __VDLType3 *vdl.Type
-
-func __VDLType3_gen() *vdl.Type {
- __VDLType3Builder := vdl.TypeBuilder{}
-
- __VDLType31 := __VDLType3Builder.Map()
- __VDLType32 := __VDLType3Builder.Array()
- __VDLType33 := __VDLType3Builder.Named("v.io/x/ref/lib/security.dischargeCacheKey").AssignBase(__VDLType32)
- __VDLType34 := vdl.ByteType
- __VDLType32.AssignElem(__VDLType34)
- __VDLType32.AssignLen(32)
- __VDLType31.AssignKey(__VDLType33)
- __VDLType35 := __VDLType3Builder.Union()
- __VDLType36 := __VDLType3Builder.Named("v.io/v23/security.WireDischarge").AssignBase(__VDLType35)
- __VDLType37 := __VDLType3Builder.Struct()
- __VDLType38 := __VDLType3Builder.Named("v.io/v23/security.publicKeyDischarge").AssignBase(__VDLType37)
- __VDLType39 := vdl.StringType
- __VDLType37.AppendField("ThirdPartyCaveatId", __VDLType39)
- __VDLType310 := __VDLType3Builder.List()
- __VDLType311 := __VDLType3Builder.Struct()
- __VDLType312 := __VDLType3Builder.Named("v.io/v23/security.Caveat").AssignBase(__VDLType311)
- __VDLType313 := __VDLType3Builder.Array()
- __VDLType314 := __VDLType3Builder.Named("v.io/v23/uniqueid.Id").AssignBase(__VDLType313)
- __VDLType313.AssignElem(__VDLType34)
- __VDLType313.AssignLen(16)
- __VDLType311.AppendField("Id", __VDLType314)
- __VDLType315 := __VDLType3Builder.List()
- __VDLType315.AssignElem(__VDLType34)
- __VDLType311.AppendField("ParamVom", __VDLType315)
- __VDLType310.AssignElem(__VDLType312)
- __VDLType37.AppendField("Caveats", __VDLType310)
- __VDLType316 := __VDLType3Builder.Struct()
- __VDLType317 := __VDLType3Builder.Named("v.io/v23/security.Signature").AssignBase(__VDLType316)
- __VDLType316.AppendField("Purpose", __VDLType315)
- __VDLType318 := vdl.StringType
- __VDLType319 := __VDLType3Builder.Named("v.io/v23/security.Hash").AssignBase(__VDLType318)
- __VDLType316.AppendField("Hash", __VDLType319)
- __VDLType316.AppendField("R", __VDLType315)
- __VDLType316.AppendField("S", __VDLType315)
- __VDLType37.AppendField("Signature", __VDLType317)
- __VDLType35.AppendField("PublicKey", __VDLType38)
- __VDLType31.AssignElem(__VDLType36)
- __VDLType3Builder.Build()
- __VDLType3v, err := __VDLType31.Built()
- if err != nil {
- panic(err)
- }
- return __VDLType3v
-}
-func init() {
- __VDLType3 = __VDLType3_gen()
-}
-
-var __VDLType4 *vdl.Type
-
-func __VDLType4_gen() *vdl.Type {
- __VDLType4Builder := vdl.TypeBuilder{}
-
- __VDLType41 := __VDLType4Builder.Map()
- __VDLType42 := __VDLType4Builder.Array()
- __VDLType43 := __VDLType4Builder.Named("v.io/x/ref/lib/security.dischargeCacheKey").AssignBase(__VDLType42)
- __VDLType44 := vdl.ByteType
- __VDLType42.AssignElem(__VDLType44)
- __VDLType42.AssignLen(32)
- __VDLType41.AssignKey(__VDLType43)
- __VDLType45 := __VDLType4Builder.Struct()
- __VDLType46 := __VDLType4Builder.Named("v.io/x/ref/lib/security.CachedDischarge").AssignBase(__VDLType45)
- __VDLType47 := __VDLType4Builder.Union()
- __VDLType48 := __VDLType4Builder.Named("v.io/v23/security.WireDischarge").AssignBase(__VDLType47)
- __VDLType49 := __VDLType4Builder.Struct()
- __VDLType410 := __VDLType4Builder.Named("v.io/v23/security.publicKeyDischarge").AssignBase(__VDLType49)
- __VDLType411 := vdl.StringType
- __VDLType49.AppendField("ThirdPartyCaveatId", __VDLType411)
- __VDLType412 := __VDLType4Builder.List()
- __VDLType413 := __VDLType4Builder.Struct()
- __VDLType414 := __VDLType4Builder.Named("v.io/v23/security.Caveat").AssignBase(__VDLType413)
- __VDLType415 := __VDLType4Builder.Array()
- __VDLType416 := __VDLType4Builder.Named("v.io/v23/uniqueid.Id").AssignBase(__VDLType415)
- __VDLType415.AssignElem(__VDLType44)
- __VDLType415.AssignLen(16)
- __VDLType413.AppendField("Id", __VDLType416)
- __VDLType417 := __VDLType4Builder.List()
- __VDLType417.AssignElem(__VDLType44)
- __VDLType413.AppendField("ParamVom", __VDLType417)
- __VDLType412.AssignElem(__VDLType414)
- __VDLType49.AppendField("Caveats", __VDLType412)
- __VDLType418 := __VDLType4Builder.Struct()
- __VDLType419 := __VDLType4Builder.Named("v.io/v23/security.Signature").AssignBase(__VDLType418)
- __VDLType418.AppendField("Purpose", __VDLType417)
- __VDLType420 := vdl.StringType
- __VDLType421 := __VDLType4Builder.Named("v.io/v23/security.Hash").AssignBase(__VDLType420)
- __VDLType418.AppendField("Hash", __VDLType421)
- __VDLType418.AppendField("R", __VDLType417)
- __VDLType418.AppendField("S", __VDLType417)
- __VDLType49.AppendField("Signature", __VDLType419)
- __VDLType47.AppendField("PublicKey", __VDLType410)
- __VDLType45.AppendField("Discharge", __VDLType48)
- __VDLType422 := __VDLType4Builder.Struct()
- __VDLType423 := __VDLType4Builder.Named("time.Time").AssignBase(__VDLType422)
- __VDLType424 := vdl.Int64Type
- __VDLType422.AppendField("Seconds", __VDLType424)
- __VDLType425 := vdl.Int32Type
- __VDLType422.AppendField("Nanos", __VDLType425)
- __VDLType45.AppendField("CacheTime", __VDLType423)
- __VDLType41.AssignElem(__VDLType46)
- __VDLType4Builder.Build()
- __VDLType4v, err := __VDLType41.Built()
- if err != nil {
- panic(err)
- }
- return __VDLType4v
-}
-func init() {
- __VDLType4 = __VDLType4_gen()
-}
-
-var __VDLType_time_Time *vdl.Type
-
-func __VDLType_time_Time_gen() *vdl.Type {
- __VDLType_time_TimeBuilder := vdl.TypeBuilder{}
-
- __VDLType_time_Time1 := __VDLType_time_TimeBuilder.Struct()
- __VDLType_time_Time2 := __VDLType_time_TimeBuilder.Named("time.Time").AssignBase(__VDLType_time_Time1)
- __VDLType_time_Time3 := vdl.Int64Type
- __VDLType_time_Time1.AppendField("Seconds", __VDLType_time_Time3)
- __VDLType_time_Time4 := vdl.Int32Type
- __VDLType_time_Time1.AppendField("Nanos", __VDLType_time_Time4)
- __VDLType_time_TimeBuilder.Build()
- __VDLType_time_Timev, err := __VDLType_time_Time2.Built()
- if err != nil {
- panic(err)
- }
- return __VDLType_time_Timev
-}
-func init() {
- __VDLType_time_Time = __VDLType_time_Time_gen()
-}
-
-var __VDLType_v_io_v23_security_BlessingPattern *vdl.Type = vdl.TypeOf(security.BlessingPattern(""))
-var __VDLType_v_io_v23_security_WireBlessings *vdl.Type
-
-func __VDLType_v_io_v23_security_WireBlessings_gen() *vdl.Type {
- __VDLType_v_io_v23_security_WireBlessingsBuilder := vdl.TypeBuilder{}
-
- __VDLType_v_io_v23_security_WireBlessings1 := __VDLType_v_io_v23_security_WireBlessingsBuilder.Struct()
- __VDLType_v_io_v23_security_WireBlessings2 := __VDLType_v_io_v23_security_WireBlessingsBuilder.Named("v.io/v23/security.WireBlessings").AssignBase(__VDLType_v_io_v23_security_WireBlessings1)
- __VDLType_v_io_v23_security_WireBlessings3 := __VDLType_v_io_v23_security_WireBlessingsBuilder.List()
- __VDLType_v_io_v23_security_WireBlessings4 := __VDLType_v_io_v23_security_WireBlessingsBuilder.List()
- __VDLType_v_io_v23_security_WireBlessings5 := __VDLType_v_io_v23_security_WireBlessingsBuilder.Struct()
- __VDLType_v_io_v23_security_WireBlessings6 := __VDLType_v_io_v23_security_WireBlessingsBuilder.Named("v.io/v23/security.Certificate").AssignBase(__VDLType_v_io_v23_security_WireBlessings5)
- __VDLType_v_io_v23_security_WireBlessings7 := vdl.StringType
- __VDLType_v_io_v23_security_WireBlessings5.AppendField("Extension", __VDLType_v_io_v23_security_WireBlessings7)
- __VDLType_v_io_v23_security_WireBlessings8 := __VDLType_v_io_v23_security_WireBlessingsBuilder.List()
- __VDLType_v_io_v23_security_WireBlessings9 := vdl.ByteType
- __VDLType_v_io_v23_security_WireBlessings8.AssignElem(__VDLType_v_io_v23_security_WireBlessings9)
- __VDLType_v_io_v23_security_WireBlessings5.AppendField("PublicKey", __VDLType_v_io_v23_security_WireBlessings8)
- __VDLType_v_io_v23_security_WireBlessings10 := __VDLType_v_io_v23_security_WireBlessingsBuilder.List()
- __VDLType_v_io_v23_security_WireBlessings11 := __VDLType_v_io_v23_security_WireBlessingsBuilder.Struct()
- __VDLType_v_io_v23_security_WireBlessings12 := __VDLType_v_io_v23_security_WireBlessingsBuilder.Named("v.io/v23/security.Caveat").AssignBase(__VDLType_v_io_v23_security_WireBlessings11)
- __VDLType_v_io_v23_security_WireBlessings13 := __VDLType_v_io_v23_security_WireBlessingsBuilder.Array()
- __VDLType_v_io_v23_security_WireBlessings14 := __VDLType_v_io_v23_security_WireBlessingsBuilder.Named("v.io/v23/uniqueid.Id").AssignBase(__VDLType_v_io_v23_security_WireBlessings13)
- __VDLType_v_io_v23_security_WireBlessings13.AssignElem(__VDLType_v_io_v23_security_WireBlessings9)
- __VDLType_v_io_v23_security_WireBlessings13.AssignLen(16)
- __VDLType_v_io_v23_security_WireBlessings11.AppendField("Id", __VDLType_v_io_v23_security_WireBlessings14)
- __VDLType_v_io_v23_security_WireBlessings11.AppendField("ParamVom", __VDLType_v_io_v23_security_WireBlessings8)
- __VDLType_v_io_v23_security_WireBlessings10.AssignElem(__VDLType_v_io_v23_security_WireBlessings12)
- __VDLType_v_io_v23_security_WireBlessings5.AppendField("Caveats", __VDLType_v_io_v23_security_WireBlessings10)
- __VDLType_v_io_v23_security_WireBlessings15 := __VDLType_v_io_v23_security_WireBlessingsBuilder.Struct()
- __VDLType_v_io_v23_security_WireBlessings16 := __VDLType_v_io_v23_security_WireBlessingsBuilder.Named("v.io/v23/security.Signature").AssignBase(__VDLType_v_io_v23_security_WireBlessings15)
- __VDLType_v_io_v23_security_WireBlessings15.AppendField("Purpose", __VDLType_v_io_v23_security_WireBlessings8)
- __VDLType_v_io_v23_security_WireBlessings17 := vdl.StringType
- __VDLType_v_io_v23_security_WireBlessings18 := __VDLType_v_io_v23_security_WireBlessingsBuilder.Named("v.io/v23/security.Hash").AssignBase(__VDLType_v_io_v23_security_WireBlessings17)
- __VDLType_v_io_v23_security_WireBlessings15.AppendField("Hash", __VDLType_v_io_v23_security_WireBlessings18)
- __VDLType_v_io_v23_security_WireBlessings15.AppendField("R", __VDLType_v_io_v23_security_WireBlessings8)
- __VDLType_v_io_v23_security_WireBlessings15.AppendField("S", __VDLType_v_io_v23_security_WireBlessings8)
- __VDLType_v_io_v23_security_WireBlessings5.AppendField("Signature", __VDLType_v_io_v23_security_WireBlessings16)
- __VDLType_v_io_v23_security_WireBlessings4.AssignElem(__VDLType_v_io_v23_security_WireBlessings6)
- __VDLType_v_io_v23_security_WireBlessings3.AssignElem(__VDLType_v_io_v23_security_WireBlessings4)
- __VDLType_v_io_v23_security_WireBlessings1.AppendField("CertificateChains", __VDLType_v_io_v23_security_WireBlessings3)
- __VDLType_v_io_v23_security_WireBlessingsBuilder.Build()
- __VDLType_v_io_v23_security_WireBlessingsv, err := __VDLType_v_io_v23_security_WireBlessings2.Built()
- if err != nil {
- panic(err)
- }
- return __VDLType_v_io_v23_security_WireBlessingsv
-}
-func init() {
- __VDLType_v_io_v23_security_WireBlessings = __VDLType_v_io_v23_security_WireBlessings_gen()
-}
-
-var __VDLType_v_io_v23_security_WireDischarge *vdl.Type
-
-func __VDLType_v_io_v23_security_WireDischarge_gen() *vdl.Type {
- __VDLType_v_io_v23_security_WireDischargeBuilder := vdl.TypeBuilder{}
-
- __VDLType_v_io_v23_security_WireDischarge1 := __VDLType_v_io_v23_security_WireDischargeBuilder.Union()
- __VDLType_v_io_v23_security_WireDischarge2 := __VDLType_v_io_v23_security_WireDischargeBuilder.Named("v.io/v23/security.WireDischarge").AssignBase(__VDLType_v_io_v23_security_WireDischarge1)
- __VDLType_v_io_v23_security_WireDischarge3 := __VDLType_v_io_v23_security_WireDischargeBuilder.Struct()
- __VDLType_v_io_v23_security_WireDischarge4 := __VDLType_v_io_v23_security_WireDischargeBuilder.Named("v.io/v23/security.publicKeyDischarge").AssignBase(__VDLType_v_io_v23_security_WireDischarge3)
- __VDLType_v_io_v23_security_WireDischarge5 := vdl.StringType
- __VDLType_v_io_v23_security_WireDischarge3.AppendField("ThirdPartyCaveatId", __VDLType_v_io_v23_security_WireDischarge5)
- __VDLType_v_io_v23_security_WireDischarge6 := __VDLType_v_io_v23_security_WireDischargeBuilder.List()
- __VDLType_v_io_v23_security_WireDischarge7 := __VDLType_v_io_v23_security_WireDischargeBuilder.Struct()
- __VDLType_v_io_v23_security_WireDischarge8 := __VDLType_v_io_v23_security_WireDischargeBuilder.Named("v.io/v23/security.Caveat").AssignBase(__VDLType_v_io_v23_security_WireDischarge7)
- __VDLType_v_io_v23_security_WireDischarge9 := __VDLType_v_io_v23_security_WireDischargeBuilder.Array()
- __VDLType_v_io_v23_security_WireDischarge10 := __VDLType_v_io_v23_security_WireDischargeBuilder.Named("v.io/v23/uniqueid.Id").AssignBase(__VDLType_v_io_v23_security_WireDischarge9)
- __VDLType_v_io_v23_security_WireDischarge11 := vdl.ByteType
- __VDLType_v_io_v23_security_WireDischarge9.AssignElem(__VDLType_v_io_v23_security_WireDischarge11)
- __VDLType_v_io_v23_security_WireDischarge9.AssignLen(16)
- __VDLType_v_io_v23_security_WireDischarge7.AppendField("Id", __VDLType_v_io_v23_security_WireDischarge10)
- __VDLType_v_io_v23_security_WireDischarge12 := __VDLType_v_io_v23_security_WireDischargeBuilder.List()
- __VDLType_v_io_v23_security_WireDischarge12.AssignElem(__VDLType_v_io_v23_security_WireDischarge11)
- __VDLType_v_io_v23_security_WireDischarge7.AppendField("ParamVom", __VDLType_v_io_v23_security_WireDischarge12)
- __VDLType_v_io_v23_security_WireDischarge6.AssignElem(__VDLType_v_io_v23_security_WireDischarge8)
- __VDLType_v_io_v23_security_WireDischarge3.AppendField("Caveats", __VDLType_v_io_v23_security_WireDischarge6)
- __VDLType_v_io_v23_security_WireDischarge13 := __VDLType_v_io_v23_security_WireDischargeBuilder.Struct()
- __VDLType_v_io_v23_security_WireDischarge14 := __VDLType_v_io_v23_security_WireDischargeBuilder.Named("v.io/v23/security.Signature").AssignBase(__VDLType_v_io_v23_security_WireDischarge13)
- __VDLType_v_io_v23_security_WireDischarge13.AppendField("Purpose", __VDLType_v_io_v23_security_WireDischarge12)
- __VDLType_v_io_v23_security_WireDischarge15 := vdl.StringType
- __VDLType_v_io_v23_security_WireDischarge16 := __VDLType_v_io_v23_security_WireDischargeBuilder.Named("v.io/v23/security.Hash").AssignBase(__VDLType_v_io_v23_security_WireDischarge15)
- __VDLType_v_io_v23_security_WireDischarge13.AppendField("Hash", __VDLType_v_io_v23_security_WireDischarge16)
- __VDLType_v_io_v23_security_WireDischarge13.AppendField("R", __VDLType_v_io_v23_security_WireDischarge12)
- __VDLType_v_io_v23_security_WireDischarge13.AppendField("S", __VDLType_v_io_v23_security_WireDischarge12)
- __VDLType_v_io_v23_security_WireDischarge3.AppendField("Signature", __VDLType_v_io_v23_security_WireDischarge14)
- __VDLType_v_io_v23_security_WireDischarge1.AppendField("PublicKey", __VDLType_v_io_v23_security_WireDischarge4)
- __VDLType_v_io_v23_security_WireDischargeBuilder.Build()
- __VDLType_v_io_v23_security_WireDischargev, err := __VDLType_v_io_v23_security_WireDischarge2.Built()
- if err != nil {
- panic(err)
- }
- return __VDLType_v_io_v23_security_WireDischargev
-}
-func init() {
- __VDLType_v_io_v23_security_WireDischarge = __VDLType_v_io_v23_security_WireDischarge_gen()
-}
-
-var __VDLType_v_io_x_ref_lib_security_CachedDischarge *vdl.Type
-
-func __VDLType_v_io_x_ref_lib_security_CachedDischarge_gen() *vdl.Type {
- __VDLType_v_io_x_ref_lib_security_CachedDischargeBuilder := vdl.TypeBuilder{}
-
- __VDLType_v_io_x_ref_lib_security_CachedDischarge1 := __VDLType_v_io_x_ref_lib_security_CachedDischargeBuilder.Struct()
- __VDLType_v_io_x_ref_lib_security_CachedDischarge2 := __VDLType_v_io_x_ref_lib_security_CachedDischargeBuilder.Named("v.io/x/ref/lib/security.CachedDischarge").AssignBase(__VDLType_v_io_x_ref_lib_security_CachedDischarge1)
- __VDLType_v_io_x_ref_lib_security_CachedDischarge3 := __VDLType_v_io_x_ref_lib_security_CachedDischargeBuilder.Union()
- __VDLType_v_io_x_ref_lib_security_CachedDischarge4 := __VDLType_v_io_x_ref_lib_security_CachedDischargeBuilder.Named("v.io/v23/security.WireDischarge").AssignBase(__VDLType_v_io_x_ref_lib_security_CachedDischarge3)
- __VDLType_v_io_x_ref_lib_security_CachedDischarge5 := __VDLType_v_io_x_ref_lib_security_CachedDischargeBuilder.Struct()
- __VDLType_v_io_x_ref_lib_security_CachedDischarge6 := __VDLType_v_io_x_ref_lib_security_CachedDischargeBuilder.Named("v.io/v23/security.publicKeyDischarge").AssignBase(__VDLType_v_io_x_ref_lib_security_CachedDischarge5)
- __VDLType_v_io_x_ref_lib_security_CachedDischarge7 := vdl.StringType
- __VDLType_v_io_x_ref_lib_security_CachedDischarge5.AppendField("ThirdPartyCaveatId", __VDLType_v_io_x_ref_lib_security_CachedDischarge7)
- __VDLType_v_io_x_ref_lib_security_CachedDischarge8 := __VDLType_v_io_x_ref_lib_security_CachedDischargeBuilder.List()
- __VDLType_v_io_x_ref_lib_security_CachedDischarge9 := __VDLType_v_io_x_ref_lib_security_CachedDischargeBuilder.Struct()
- __VDLType_v_io_x_ref_lib_security_CachedDischarge10 := __VDLType_v_io_x_ref_lib_security_CachedDischargeBuilder.Named("v.io/v23/security.Caveat").AssignBase(__VDLType_v_io_x_ref_lib_security_CachedDischarge9)
- __VDLType_v_io_x_ref_lib_security_CachedDischarge11 := __VDLType_v_io_x_ref_lib_security_CachedDischargeBuilder.Array()
- __VDLType_v_io_x_ref_lib_security_CachedDischarge12 := __VDLType_v_io_x_ref_lib_security_CachedDischargeBuilder.Named("v.io/v23/uniqueid.Id").AssignBase(__VDLType_v_io_x_ref_lib_security_CachedDischarge11)
- __VDLType_v_io_x_ref_lib_security_CachedDischarge13 := vdl.ByteType
- __VDLType_v_io_x_ref_lib_security_CachedDischarge11.AssignElem(__VDLType_v_io_x_ref_lib_security_CachedDischarge13)
- __VDLType_v_io_x_ref_lib_security_CachedDischarge11.AssignLen(16)
- __VDLType_v_io_x_ref_lib_security_CachedDischarge9.AppendField("Id", __VDLType_v_io_x_ref_lib_security_CachedDischarge12)
- __VDLType_v_io_x_ref_lib_security_CachedDischarge14 := __VDLType_v_io_x_ref_lib_security_CachedDischargeBuilder.List()
- __VDLType_v_io_x_ref_lib_security_CachedDischarge14.AssignElem(__VDLType_v_io_x_ref_lib_security_CachedDischarge13)
- __VDLType_v_io_x_ref_lib_security_CachedDischarge9.AppendField("ParamVom", __VDLType_v_io_x_ref_lib_security_CachedDischarge14)
- __VDLType_v_io_x_ref_lib_security_CachedDischarge8.AssignElem(__VDLType_v_io_x_ref_lib_security_CachedDischarge10)
- __VDLType_v_io_x_ref_lib_security_CachedDischarge5.AppendField("Caveats", __VDLType_v_io_x_ref_lib_security_CachedDischarge8)
- __VDLType_v_io_x_ref_lib_security_CachedDischarge15 := __VDLType_v_io_x_ref_lib_security_CachedDischargeBuilder.Struct()
- __VDLType_v_io_x_ref_lib_security_CachedDischarge16 := __VDLType_v_io_x_ref_lib_security_CachedDischargeBuilder.Named("v.io/v23/security.Signature").AssignBase(__VDLType_v_io_x_ref_lib_security_CachedDischarge15)
- __VDLType_v_io_x_ref_lib_security_CachedDischarge15.AppendField("Purpose", __VDLType_v_io_x_ref_lib_security_CachedDischarge14)
- __VDLType_v_io_x_ref_lib_security_CachedDischarge17 := vdl.StringType
- __VDLType_v_io_x_ref_lib_security_CachedDischarge18 := __VDLType_v_io_x_ref_lib_security_CachedDischargeBuilder.Named("v.io/v23/security.Hash").AssignBase(__VDLType_v_io_x_ref_lib_security_CachedDischarge17)
- __VDLType_v_io_x_ref_lib_security_CachedDischarge15.AppendField("Hash", __VDLType_v_io_x_ref_lib_security_CachedDischarge18)
- __VDLType_v_io_x_ref_lib_security_CachedDischarge15.AppendField("R", __VDLType_v_io_x_ref_lib_security_CachedDischarge14)
- __VDLType_v_io_x_ref_lib_security_CachedDischarge15.AppendField("S", __VDLType_v_io_x_ref_lib_security_CachedDischarge14)
- __VDLType_v_io_x_ref_lib_security_CachedDischarge5.AppendField("Signature", __VDLType_v_io_x_ref_lib_security_CachedDischarge16)
- __VDLType_v_io_x_ref_lib_security_CachedDischarge3.AppendField("PublicKey", __VDLType_v_io_x_ref_lib_security_CachedDischarge6)
- __VDLType_v_io_x_ref_lib_security_CachedDischarge1.AppendField("Discharge", __VDLType_v_io_x_ref_lib_security_CachedDischarge4)
- __VDLType_v_io_x_ref_lib_security_CachedDischarge19 := __VDLType_v_io_x_ref_lib_security_CachedDischargeBuilder.Struct()
- __VDLType_v_io_x_ref_lib_security_CachedDischarge20 := __VDLType_v_io_x_ref_lib_security_CachedDischargeBuilder.Named("time.Time").AssignBase(__VDLType_v_io_x_ref_lib_security_CachedDischarge19)
- __VDLType_v_io_x_ref_lib_security_CachedDischarge21 := vdl.Int64Type
- __VDLType_v_io_x_ref_lib_security_CachedDischarge19.AppendField("Seconds", __VDLType_v_io_x_ref_lib_security_CachedDischarge21)
- __VDLType_v_io_x_ref_lib_security_CachedDischarge22 := vdl.Int32Type
- __VDLType_v_io_x_ref_lib_security_CachedDischarge19.AppendField("Nanos", __VDLType_v_io_x_ref_lib_security_CachedDischarge22)
- __VDLType_v_io_x_ref_lib_security_CachedDischarge1.AppendField("CacheTime", __VDLType_v_io_x_ref_lib_security_CachedDischarge20)
- __VDLType_v_io_x_ref_lib_security_CachedDischargeBuilder.Build()
- __VDLType_v_io_x_ref_lib_security_CachedDischargev, err := __VDLType_v_io_x_ref_lib_security_CachedDischarge2.Built()
- if err != nil {
- panic(err)
- }
- return __VDLType_v_io_x_ref_lib_security_CachedDischargev
-}
-func init() {
- __VDLType_v_io_x_ref_lib_security_CachedDischarge = __VDLType_v_io_x_ref_lib_security_CachedDischarge_gen()
-}
-
-var __VDLType_v_io_x_ref_lib_security_blessingRootsState *vdl.Type = vdl.TypeOf(blessingRootsState(nil))
-var __VDLType_v_io_x_ref_lib_security_blessingStoreState *vdl.Type
-
-func __VDLType_v_io_x_ref_lib_security_blessingStoreState_gen() *vdl.Type {
- __VDLType_v_io_x_ref_lib_security_blessingStoreStateBuilder := vdl.TypeBuilder{}
-
- __VDLType_v_io_x_ref_lib_security_blessingStoreState1 := __VDLType_v_io_x_ref_lib_security_blessingStoreStateBuilder.Struct()
- __VDLType_v_io_x_ref_lib_security_blessingStoreState2 := __VDLType_v_io_x_ref_lib_security_blessingStoreStateBuilder.Named("v.io/x/ref/lib/security.blessingStoreState").AssignBase(__VDLType_v_io_x_ref_lib_security_blessingStoreState1)
- __VDLType_v_io_x_ref_lib_security_blessingStoreState3 := __VDLType_v_io_x_ref_lib_security_blessingStoreStateBuilder.Map()
- __VDLType_v_io_x_ref_lib_security_blessingStoreState4 := vdl.StringType
- __VDLType_v_io_x_ref_lib_security_blessingStoreState5 := __VDLType_v_io_x_ref_lib_security_blessingStoreStateBuilder.Named("v.io/v23/security.BlessingPattern").AssignBase(__VDLType_v_io_x_ref_lib_security_blessingStoreState4)
- __VDLType_v_io_x_ref_lib_security_blessingStoreState3.AssignKey(__VDLType_v_io_x_ref_lib_security_blessingStoreState5)
- __VDLType_v_io_x_ref_lib_security_blessingStoreState6 := __VDLType_v_io_x_ref_lib_security_blessingStoreStateBuilder.Struct()
- __VDLType_v_io_x_ref_lib_security_blessingStoreState7 := __VDLType_v_io_x_ref_lib_security_blessingStoreStateBuilder.Named("v.io/v23/security.WireBlessings").AssignBase(__VDLType_v_io_x_ref_lib_security_blessingStoreState6)
- __VDLType_v_io_x_ref_lib_security_blessingStoreState8 := __VDLType_v_io_x_ref_lib_security_blessingStoreStateBuilder.List()
- __VDLType_v_io_x_ref_lib_security_blessingStoreState9 := __VDLType_v_io_x_ref_lib_security_blessingStoreStateBuilder.List()
- __VDLType_v_io_x_ref_lib_security_blessingStoreState10 := __VDLType_v_io_x_ref_lib_security_blessingStoreStateBuilder.Struct()
- __VDLType_v_io_x_ref_lib_security_blessingStoreState11 := __VDLType_v_io_x_ref_lib_security_blessingStoreStateBuilder.Named("v.io/v23/security.Certificate").AssignBase(__VDLType_v_io_x_ref_lib_security_blessingStoreState10)
- __VDLType_v_io_x_ref_lib_security_blessingStoreState12 := vdl.StringType
- __VDLType_v_io_x_ref_lib_security_blessingStoreState10.AppendField("Extension", __VDLType_v_io_x_ref_lib_security_blessingStoreState12)
- __VDLType_v_io_x_ref_lib_security_blessingStoreState13 := __VDLType_v_io_x_ref_lib_security_blessingStoreStateBuilder.List()
- __VDLType_v_io_x_ref_lib_security_blessingStoreState14 := vdl.ByteType
- __VDLType_v_io_x_ref_lib_security_blessingStoreState13.AssignElem(__VDLType_v_io_x_ref_lib_security_blessingStoreState14)
- __VDLType_v_io_x_ref_lib_security_blessingStoreState10.AppendField("PublicKey", __VDLType_v_io_x_ref_lib_security_blessingStoreState13)
- __VDLType_v_io_x_ref_lib_security_blessingStoreState15 := __VDLType_v_io_x_ref_lib_security_blessingStoreStateBuilder.List()
- __VDLType_v_io_x_ref_lib_security_blessingStoreState16 := __VDLType_v_io_x_ref_lib_security_blessingStoreStateBuilder.Struct()
- __VDLType_v_io_x_ref_lib_security_blessingStoreState17 := __VDLType_v_io_x_ref_lib_security_blessingStoreStateBuilder.Named("v.io/v23/security.Caveat").AssignBase(__VDLType_v_io_x_ref_lib_security_blessingStoreState16)
- __VDLType_v_io_x_ref_lib_security_blessingStoreState18 := __VDLType_v_io_x_ref_lib_security_blessingStoreStateBuilder.Array()
- __VDLType_v_io_x_ref_lib_security_blessingStoreState19 := __VDLType_v_io_x_ref_lib_security_blessingStoreStateBuilder.Named("v.io/v23/uniqueid.Id").AssignBase(__VDLType_v_io_x_ref_lib_security_blessingStoreState18)
- __VDLType_v_io_x_ref_lib_security_blessingStoreState18.AssignElem(__VDLType_v_io_x_ref_lib_security_blessingStoreState14)
- __VDLType_v_io_x_ref_lib_security_blessingStoreState18.AssignLen(16)
- __VDLType_v_io_x_ref_lib_security_blessingStoreState16.AppendField("Id", __VDLType_v_io_x_ref_lib_security_blessingStoreState19)
- __VDLType_v_io_x_ref_lib_security_blessingStoreState16.AppendField("ParamVom", __VDLType_v_io_x_ref_lib_security_blessingStoreState13)
- __VDLType_v_io_x_ref_lib_security_blessingStoreState15.AssignElem(__VDLType_v_io_x_ref_lib_security_blessingStoreState17)
- __VDLType_v_io_x_ref_lib_security_blessingStoreState10.AppendField("Caveats", __VDLType_v_io_x_ref_lib_security_blessingStoreState15)
- __VDLType_v_io_x_ref_lib_security_blessingStoreState20 := __VDLType_v_io_x_ref_lib_security_blessingStoreStateBuilder.Struct()
- __VDLType_v_io_x_ref_lib_security_blessingStoreState21 := __VDLType_v_io_x_ref_lib_security_blessingStoreStateBuilder.Named("v.io/v23/security.Signature").AssignBase(__VDLType_v_io_x_ref_lib_security_blessingStoreState20)
- __VDLType_v_io_x_ref_lib_security_blessingStoreState20.AppendField("Purpose", __VDLType_v_io_x_ref_lib_security_blessingStoreState13)
- __VDLType_v_io_x_ref_lib_security_blessingStoreState22 := vdl.StringType
- __VDLType_v_io_x_ref_lib_security_blessingStoreState23 := __VDLType_v_io_x_ref_lib_security_blessingStoreStateBuilder.Named("v.io/v23/security.Hash").AssignBase(__VDLType_v_io_x_ref_lib_security_blessingStoreState22)
- __VDLType_v_io_x_ref_lib_security_blessingStoreState20.AppendField("Hash", __VDLType_v_io_x_ref_lib_security_blessingStoreState23)
- __VDLType_v_io_x_ref_lib_security_blessingStoreState20.AppendField("R", __VDLType_v_io_x_ref_lib_security_blessingStoreState13)
- __VDLType_v_io_x_ref_lib_security_blessingStoreState20.AppendField("S", __VDLType_v_io_x_ref_lib_security_blessingStoreState13)
- __VDLType_v_io_x_ref_lib_security_blessingStoreState10.AppendField("Signature", __VDLType_v_io_x_ref_lib_security_blessingStoreState21)
- __VDLType_v_io_x_ref_lib_security_blessingStoreState9.AssignElem(__VDLType_v_io_x_ref_lib_security_blessingStoreState11)
- __VDLType_v_io_x_ref_lib_security_blessingStoreState8.AssignElem(__VDLType_v_io_x_ref_lib_security_blessingStoreState9)
- __VDLType_v_io_x_ref_lib_security_blessingStoreState6.AppendField("CertificateChains", __VDLType_v_io_x_ref_lib_security_blessingStoreState8)
- __VDLType_v_io_x_ref_lib_security_blessingStoreState3.AssignElem(__VDLType_v_io_x_ref_lib_security_blessingStoreState7)
- __VDLType_v_io_x_ref_lib_security_blessingStoreState1.AppendField("PeerBlessings", __VDLType_v_io_x_ref_lib_security_blessingStoreState3)
- __VDLType_v_io_x_ref_lib_security_blessingStoreState1.AppendField("DefaultBlessings", __VDLType_v_io_x_ref_lib_security_blessingStoreState7)
- __VDLType_v_io_x_ref_lib_security_blessingStoreState24 := __VDLType_v_io_x_ref_lib_security_blessingStoreStateBuilder.Map()
- __VDLType_v_io_x_ref_lib_security_blessingStoreState25 := __VDLType_v_io_x_ref_lib_security_blessingStoreStateBuilder.Array()
- __VDLType_v_io_x_ref_lib_security_blessingStoreState26 := __VDLType_v_io_x_ref_lib_security_blessingStoreStateBuilder.Named("v.io/x/ref/lib/security.dischargeCacheKey").AssignBase(__VDLType_v_io_x_ref_lib_security_blessingStoreState25)
- __VDLType_v_io_x_ref_lib_security_blessingStoreState25.AssignElem(__VDLType_v_io_x_ref_lib_security_blessingStoreState14)
- __VDLType_v_io_x_ref_lib_security_blessingStoreState25.AssignLen(32)
- __VDLType_v_io_x_ref_lib_security_blessingStoreState24.AssignKey(__VDLType_v_io_x_ref_lib_security_blessingStoreState26)
- __VDLType_v_io_x_ref_lib_security_blessingStoreState27 := __VDLType_v_io_x_ref_lib_security_blessingStoreStateBuilder.Union()
- __VDLType_v_io_x_ref_lib_security_blessingStoreState28 := __VDLType_v_io_x_ref_lib_security_blessingStoreStateBuilder.Named("v.io/v23/security.WireDischarge").AssignBase(__VDLType_v_io_x_ref_lib_security_blessingStoreState27)
- __VDLType_v_io_x_ref_lib_security_blessingStoreState29 := __VDLType_v_io_x_ref_lib_security_blessingStoreStateBuilder.Struct()
- __VDLType_v_io_x_ref_lib_security_blessingStoreState30 := __VDLType_v_io_x_ref_lib_security_blessingStoreStateBuilder.Named("v.io/v23/security.publicKeyDischarge").AssignBase(__VDLType_v_io_x_ref_lib_security_blessingStoreState29)
- __VDLType_v_io_x_ref_lib_security_blessingStoreState29.AppendField("ThirdPartyCaveatId", __VDLType_v_io_x_ref_lib_security_blessingStoreState12)
- __VDLType_v_io_x_ref_lib_security_blessingStoreState29.AppendField("Caveats", __VDLType_v_io_x_ref_lib_security_blessingStoreState15)
- __VDLType_v_io_x_ref_lib_security_blessingStoreState29.AppendField("Signature", __VDLType_v_io_x_ref_lib_security_blessingStoreState21)
- __VDLType_v_io_x_ref_lib_security_blessingStoreState27.AppendField("PublicKey", __VDLType_v_io_x_ref_lib_security_blessingStoreState30)
- __VDLType_v_io_x_ref_lib_security_blessingStoreState24.AssignElem(__VDLType_v_io_x_ref_lib_security_blessingStoreState28)
- __VDLType_v_io_x_ref_lib_security_blessingStoreState1.AppendField("DischargeCache", __VDLType_v_io_x_ref_lib_security_blessingStoreState24)
- __VDLType_v_io_x_ref_lib_security_blessingStoreState31 := __VDLType_v_io_x_ref_lib_security_blessingStoreStateBuilder.Map()
- __VDLType_v_io_x_ref_lib_security_blessingStoreState31.AssignKey(__VDLType_v_io_x_ref_lib_security_blessingStoreState26)
- __VDLType_v_io_x_ref_lib_security_blessingStoreState32 := __VDLType_v_io_x_ref_lib_security_blessingStoreStateBuilder.Struct()
- __VDLType_v_io_x_ref_lib_security_blessingStoreState33 := __VDLType_v_io_x_ref_lib_security_blessingStoreStateBuilder.Named("v.io/x/ref/lib/security.CachedDischarge").AssignBase(__VDLType_v_io_x_ref_lib_security_blessingStoreState32)
- __VDLType_v_io_x_ref_lib_security_blessingStoreState32.AppendField("Discharge", __VDLType_v_io_x_ref_lib_security_blessingStoreState28)
- __VDLType_v_io_x_ref_lib_security_blessingStoreState34 := __VDLType_v_io_x_ref_lib_security_blessingStoreStateBuilder.Struct()
- __VDLType_v_io_x_ref_lib_security_blessingStoreState35 := __VDLType_v_io_x_ref_lib_security_blessingStoreStateBuilder.Named("time.Time").AssignBase(__VDLType_v_io_x_ref_lib_security_blessingStoreState34)
- __VDLType_v_io_x_ref_lib_security_blessingStoreState36 := vdl.Int64Type
- __VDLType_v_io_x_ref_lib_security_blessingStoreState34.AppendField("Seconds", __VDLType_v_io_x_ref_lib_security_blessingStoreState36)
- __VDLType_v_io_x_ref_lib_security_blessingStoreState37 := vdl.Int32Type
- __VDLType_v_io_x_ref_lib_security_blessingStoreState34.AppendField("Nanos", __VDLType_v_io_x_ref_lib_security_blessingStoreState37)
- __VDLType_v_io_x_ref_lib_security_blessingStoreState32.AppendField("CacheTime", __VDLType_v_io_x_ref_lib_security_blessingStoreState35)
- __VDLType_v_io_x_ref_lib_security_blessingStoreState31.AssignElem(__VDLType_v_io_x_ref_lib_security_blessingStoreState33)
- __VDLType_v_io_x_ref_lib_security_blessingStoreState1.AppendField("Discharges", __VDLType_v_io_x_ref_lib_security_blessingStoreState31)
- __VDLType_v_io_x_ref_lib_security_blessingStoreState38 := vdl.Uint32Type
- __VDLType_v_io_x_ref_lib_security_blessingStoreState1.AppendField("CacheKeyFormat", __VDLType_v_io_x_ref_lib_security_blessingStoreState38)
- __VDLType_v_io_x_ref_lib_security_blessingStoreStateBuilder.Build()
- __VDLType_v_io_x_ref_lib_security_blessingStoreStatev, err := __VDLType_v_io_x_ref_lib_security_blessingStoreState2.Built()
- if err != nil {
- panic(err)
- }
- return __VDLType_v_io_x_ref_lib_security_blessingStoreStatev
-}
-func init() {
- __VDLType_v_io_x_ref_lib_security_blessingStoreState = __VDLType_v_io_x_ref_lib_security_blessingStoreState_gen()
-}
-
-var __VDLType_v_io_x_ref_lib_security_dischargeCacheKey *vdl.Type = vdl.TypeOf(dischargeCacheKey{})
-
-func __VDLEnsureNativeBuilt() {
- if __VDLType5 == nil {
- __VDLType5 = __VDLType5_gen()
- }
- if __VDLType1 == nil {
- __VDLType1 = __VDLType1_gen()
- }
- if __VDLType2 == nil {
- __VDLType2 = __VDLType2_gen()
- }
- if __VDLType3 == nil {
- __VDLType3 = __VDLType3_gen()
- }
- if __VDLType4 == nil {
- __VDLType4 = __VDLType4_gen()
- }
- if __VDLType_time_Time == nil {
- __VDLType_time_Time = __VDLType_time_Time_gen()
- }
- if __VDLType_v_io_v23_security_WireBlessings == nil {
- __VDLType_v_io_v23_security_WireBlessings = __VDLType_v_io_v23_security_WireBlessings_gen()
- }
- if __VDLType_v_io_v23_security_WireDischarge == nil {
- __VDLType_v_io_v23_security_WireDischarge = __VDLType_v_io_v23_security_WireDischarge_gen()
- }
- if __VDLType_v_io_x_ref_lib_security_CachedDischarge == nil {
- __VDLType_v_io_x_ref_lib_security_CachedDischarge = __VDLType_v_io_x_ref_lib_security_CachedDischarge_gen()
- }
- if __VDLType_v_io_x_ref_lib_security_blessingStoreState == nil {
- __VDLType_v_io_x_ref_lib_security_blessingStoreState = __VDLType_v_io_x_ref_lib_security_blessingStoreState_gen()
- }
+ return struct{}{}
}
diff --git a/lib/security/serialization/serialization.vdl.go b/lib/security/serialization/serialization.vdl.go
index 2fcae37..f2246d2 100644
--- a/lib/security/serialization/serialization.vdl.go
+++ b/lib/security/serialization/serialization.vdl.go
@@ -13,6 +13,11 @@
"v.io/v23/vdl"
)
+var _ = __VDLInit() // Must be first; see __VDLInit comments for details.
+
+//////////////////////////////////////////////////
+// Type definitions
+
type SignedHeader struct {
ChunkSizeBytes int64
}
@@ -23,9 +28,6 @@
}
func (m *SignedHeader) FillVDLTarget(t vdl.Target, tt *vdl.Type) error {
- if __VDLType_v_io_x_ref_lib_security_serialization_SignedHeader == nil || __VDLType0 == nil {
- panic("Initialization order error: types generated for FillVDLTarget not initialized. Consider moving caller to an init() block.")
- }
fieldsTarget1, err := t.StartFields(tt)
if err != nil {
return err
@@ -36,7 +38,7 @@
return err
}
if err != vdl.ErrFieldNoExist {
- if err := fieldTarget3.FromInt(int64(m.ChunkSizeBytes), vdl.Int64Type); err != nil {
+ if err := fieldTarget3.FromInt(int64(m.ChunkSizeBytes), tt.NonOptional().Field(0).Type); err != nil {
return err
}
if err := fieldsTarget1.FinishField(keyTarget2, fieldTarget3); err != nil {
@@ -62,8 +64,8 @@
func (t *SignedHeaderTarget) StartFields(tt *vdl.Type) (vdl.FieldsTarget, error) {
- if !vdl.Compatible(tt, __VDLType_v_io_x_ref_lib_security_serialization_SignedHeader) {
- return nil, fmt.Errorf("type %v incompatible with %v", tt, __VDLType_v_io_x_ref_lib_security_serialization_SignedHeader)
+ if ttWant := vdl.TypeOf((*SignedHeader)(nil)).Elem(); !vdl.Compatible(tt, ttWant) {
+ return nil, fmt.Errorf("type %v incompatible with %v", tt, ttWant)
}
return t, nil
}
@@ -74,7 +76,7 @@
target, err := &t.chunkSizeBytesTarget, error(nil)
return nil, target, err
default:
- return nil, nil, fmt.Errorf("field %s not in struct %v", name, __VDLType_v_io_x_ref_lib_security_serialization_SignedHeader)
+ return nil, nil, fmt.Errorf("field %s not in struct v.io/x/ref/lib/security/serialization.SignedHeader", name)
}
}
func (t *SignedHeaderTarget) FinishField(_, _ vdl.Target) error {
@@ -93,7 +95,7 @@
}
func (m *HashCode) FillVDLTarget(t vdl.Target, tt *vdl.Type) error {
- if err := t.FromBytes([]byte((*m)[:]), __VDLType_v_io_x_ref_lib_security_serialization_HashCode); err != nil {
+ if err := t.FromBytes([]byte((*m)[:]), tt); err != nil {
return err
}
return nil
@@ -110,8 +112,8 @@
func (t *HashCodeTarget) FromBytes(src []byte, tt *vdl.Type) error {
- if !vdl.Compatible(tt, __VDLType_v_io_x_ref_lib_security_serialization_HashCode) {
- return fmt.Errorf("type %v incompatible with %v", tt, __VDLType_v_io_x_ref_lib_security_serialization_HashCode)
+ if ttWant := vdl.TypeOf((*HashCode)(nil)); !vdl.Compatible(tt, ttWant) {
+ return fmt.Errorf("type %v incompatible with %v", tt, ttWant)
}
copy((*t.Value)[:], src)
@@ -154,7 +156,7 @@
func (x SignedDataSignature) __VDLReflect(__SignedDataReflect) {}
func (m SignedDataSignature) FillVDLTarget(t vdl.Target, tt *vdl.Type) error {
- fieldsTarget1, err := t.StartFields(__VDLType_v_io_x_ref_lib_security_serialization_SignedData)
+ fieldsTarget1, err := t.StartFields(tt)
if err != nil {
return err
}
@@ -163,7 +165,7 @@
return err
}
- if err := m.Value.FillVDLTarget(fieldTarget3, __VDLType_v_io_v23_security_Signature); err != nil {
+ if err := m.Value.FillVDLTarget(fieldTarget3, tt.NonOptional().Field(0).Type); err != nil {
return err
}
if err := fieldsTarget1.FinishField(keyTarget2, fieldTarget3); err != nil {
@@ -186,7 +188,7 @@
func (x SignedDataHash) __VDLReflect(__SignedDataReflect) {}
func (m SignedDataHash) FillVDLTarget(t vdl.Target, tt *vdl.Type) error {
- fieldsTarget1, err := t.StartFields(__VDLType_v_io_x_ref_lib_security_serialization_SignedData)
+ fieldsTarget1, err := t.StartFields(tt)
if err != nil {
return err
}
@@ -195,7 +197,7 @@
return err
}
- if err := m.Value.FillVDLTarget(fieldTarget3, __VDLType_v_io_x_ref_lib_security_serialization_HashCode); err != nil {
+ if err := m.Value.FillVDLTarget(fieldTarget3, tt.NonOptional().Field(1).Type); err != nil {
return err
}
if err := fieldsTarget1.FinishField(keyTarget2, fieldTarget3); err != nil {
@@ -212,17 +214,30 @@
return nil
}
-func init() {
+var __VDLInitCalled bool
+
+// __VDLInit performs vdl initialization. It is safe to call multiple times.
+// If you have an init ordering issue, just insert the following line verbatim
+// into your source files in this package, right after the "package foo" clause:
+//
+// var _ = __VDLInit()
+//
+// The purpose of this function is to ensure that vdl initialization occurs in
+// the right order, and very early in the init sequence. In particular, vdl
+// registration and package variable initialization needs to occur before
+// functions like vdl.TypeOf will work properly.
+//
+// This function returns a dummy value, so that it can be used to initialize the
+// first var in the file, to take advantage of Go's defined init order.
+func __VDLInit() struct{} {
+ if __VDLInitCalled {
+ return struct{}{}
+ }
+
+ // Register types.
vdl.Register((*SignedHeader)(nil))
vdl.Register((*HashCode)(nil))
vdl.Register((*SignedData)(nil))
-}
-var __VDLType0 *vdl.Type = vdl.TypeOf((*SignedHeader)(nil))
-var __VDLType_v_io_v23_security_Signature *vdl.Type = vdl.TypeOf(security.Signature{})
-var __VDLType_v_io_x_ref_lib_security_serialization_HashCode *vdl.Type = vdl.TypeOf(HashCode{})
-var __VDLType_v_io_x_ref_lib_security_serialization_SignedData *vdl.Type = vdl.TypeOf(SignedData(SignedDataSignature{security.Signature{}}))
-var __VDLType_v_io_x_ref_lib_security_serialization_SignedHeader *vdl.Type = vdl.TypeOf(SignedHeader{})
-
-func __VDLEnsureNativeBuilt() {
+ return struct{}{}
}
diff --git a/lib/vdl/codegen/golang/const.go b/lib/vdl/codegen/golang/const.go
index ac8de46..a4b14ff 100644
--- a/lib/vdl/codegen/golang/const.go
+++ b/lib/vdl/codegen/golang/const.go
@@ -29,13 +29,27 @@
return t.Kind() == vdl.List && t.Elem().Kind() == vdl.Byte
}
-func tagValue(data goData, v *vdl.Value) string {
+func genValueOf(data goData, v *vdl.Value) string {
// Use vdl.Value here because tags aren't sent across the wire and it is
// more convenient to use vdl.Value.
// Note: this is the only case because nil elems are not allowed in tags.
return data.Pkg("v.io/v23/vdl") + "ValueOf(" + typedConst(data, v) + ")"
}
+func genTypeOf(data goData, t *vdl.Type) string {
+ // We need to generate a Go expression of type *vdl.Type that represents the
+ // type. Since the rest of our logic can already generate the Go code for any
+ // value, we just wrap it in vdl.TypeOf to produce the final result.
+ //
+ // This may seem like a strange roundtrip, but results in less generator and
+ // generated code.
+ typeOf := data.Pkg("v.io/v23/vdl") + "TypeOf((*" + typeGoInternal(data, t, false) + ")(nil))"
+ if t.CanBeOptional() && t.Kind() != vdl.Optional {
+ typeOf += ".Elem()"
+ }
+ return typeOf
+}
+
// TODO(bprosnitz): Generate the full tag name e.g. security.Read instead of
// security.Label(1)
//
@@ -117,14 +131,7 @@
case vdl.TypeObject:
return data.Pkg("v.io/v23/vdl") + "TypeObjectType"
}
- // We need to generate a Go expression of type *vdl.Type that represents the
- // type. Since the rest of our logic can already generate the Go code for
- // any value, we just wrap it in vdl.TypeOf to produce the final result.
- //
- // This may seem like a strange roundtrip, but results in less generator
- // and generated code.
- zero := vdl.ZeroValue(v.TypeObject())
- return data.Pkg("v.io/v23/vdl") + "TypeOf(" + typedConst(data, zero) + ")"
+ return genTypeOf(data, v.TypeObject())
case vdl.Bool:
return strconv.FormatBool(v.Bool())
case vdl.Byte, vdl.Uint16, vdl.Uint32, vdl.Uint64:
diff --git a/lib/vdl/codegen/golang/const_test.go b/lib/vdl/codegen/golang/const_test.go
index fd3be7d..ac7f907 100644
--- a/lib/vdl/codegen/golang/const_test.go
+++ b/lib/vdl/codegen/golang/const_test.go
@@ -68,21 +68,21 @@
{"Union123", vUnion123, `TestUnion(TestUnionB{int64(123)})`},
{"AnyABC", vAnyABC, `vom.RawBytesOf("abc")`},
{"Any123", vAny123, `vom.RawBytesOf(int64(123))`},
- {"TypeObjectBool", vdl.TypeObjectValue(vdl.BoolType), `vdl.TypeOf(false)`},
- {"TypeObjectString", vdl.TypeObjectValue(vdl.StringType), `vdl.TypeOf("")`},
- {"TypeObjectBytes", vdl.TypeObjectValue(vdl.ListType(vdl.ByteType)), `vdl.TypeOf([]byte(nil))`},
- {"TypeObjectByte", vdl.TypeObjectValue(vdl.ByteType), `vdl.TypeOf(byte(0))`},
- {"TypeObjectUint16", vdl.TypeObjectValue(vdl.Uint16Type), `vdl.TypeOf(uint16(0))`},
- {"TypeObjectInt16", vdl.TypeObjectValue(vdl.Int16Type), `vdl.TypeOf(int16(0))`},
- {"TypeObjectFloat32", vdl.TypeObjectValue(vdl.Float32Type), `vdl.TypeOf(float32(0))`},
- {"TypeObjectComplex64", vdl.TypeObjectValue(vdl.Complex64Type), `vdl.TypeOf(complex64(0))`},
- {"TypeObjectEnum", vdl.TypeObjectValue(tEnum), `vdl.TypeOf(TestEnumA)`},
- {"TypeObjectArray", vdl.TypeObjectValue(tArray), `vdl.TypeOf([3]string{})`},
- {"TypeObjectList", vdl.TypeObjectValue(tList), `vdl.TypeOf([]string(nil))`},
- {"TypeObjectSet", vdl.TypeObjectValue(tSet), `vdl.TypeOf(map[string]struct{}(nil))`},
- {"TypeObjectMap", vdl.TypeObjectValue(tMap), `vdl.TypeOf(map[string]int64(nil))`},
- {"TypeObjectStruct", vdl.TypeObjectValue(tStruct), `vdl.TypeOf(TestStruct{})`},
- {"TypeObjectUnion", vdl.TypeObjectValue(tUnion), `vdl.TypeOf(TestUnion(TestUnionA{""}))`},
+ {"TypeObjectBool", vdl.TypeObjectValue(vdl.BoolType), `vdl.TypeOf((*bool)(nil))`},
+ {"TypeObjectString", vdl.TypeObjectValue(vdl.StringType), `vdl.TypeOf((*string)(nil))`},
+ {"TypeObjectBytes", vdl.TypeObjectValue(vdl.ListType(vdl.ByteType)), `vdl.TypeOf((*[]byte)(nil))`},
+ {"TypeObjectByte", vdl.TypeObjectValue(vdl.ByteType), `vdl.TypeOf((*byte)(nil))`},
+ {"TypeObjectUint16", vdl.TypeObjectValue(vdl.Uint16Type), `vdl.TypeOf((*uint16)(nil))`},
+ {"TypeObjectInt16", vdl.TypeObjectValue(vdl.Int16Type), `vdl.TypeOf((*int16)(nil))`},
+ {"TypeObjectFloat32", vdl.TypeObjectValue(vdl.Float32Type), `vdl.TypeOf((*float32)(nil))`},
+ {"TypeObjectComplex64", vdl.TypeObjectValue(vdl.Complex64Type), `vdl.TypeOf((*complex64)(nil))`},
+ {"TypeObjectEnum", vdl.TypeObjectValue(tEnum), `vdl.TypeOf((*TestEnum)(nil))`},
+ {"TypeObjectArray", vdl.TypeObjectValue(tArray), `vdl.TypeOf((*[3]string)(nil))`},
+ {"TypeObjectList", vdl.TypeObjectValue(tList), `vdl.TypeOf((*[]string)(nil))`},
+ {"TypeObjectSet", vdl.TypeObjectValue(tSet), `vdl.TypeOf((*map[string]struct{})(nil))`},
+ {"TypeObjectMap", vdl.TypeObjectValue(tMap), `vdl.TypeOf((*map[string]int64)(nil))`},
+ {"TypeObjectStruct", vdl.TypeObjectValue(tStruct), `vdl.TypeOf((*TestStruct)(nil)).Elem()`},
+ {"TypeObjectUnion", vdl.TypeObjectValue(tUnion), `vdl.TypeOf((*TestUnion)(nil))`},
{"TypeObjectAny", vdl.TypeObjectValue(vdl.AnyType), `vdl.AnyType`},
{"TypeObjectTypeObject", vdl.TypeObjectValue(vdl.TypeObjectType), `vdl.TypeObjectType`},
// TODO(toddw): Add tests for optional types.
diff --git a/lib/vdl/codegen/golang/gen.go b/lib/vdl/codegen/golang/gen.go
index 4ad4b4a..583fee3 100644
--- a/lib/vdl/codegen/golang/gen.go
+++ b/lib/vdl/codegen/golang/gen.go
@@ -24,7 +24,6 @@
Package *compile.Package
Env *compile.Env
Imports goImports
- typeDepends *typeDependencyNames
createdTargets map[*vdl.Type]bool // set of types whose Targets have already been created
collectImports bool // is this the import collecting pass instead of normal generation
@@ -92,7 +91,6 @@
data := &goData{
Package: pkg,
Env: env,
- typeDepends: newTypeDependencyNames(),
collectImports: true,
importMap: importMap{},
createdTargets: make(map[*vdl.Type]bool),
@@ -212,9 +210,8 @@
"nativeIdent": nativeIdent,
"typeGo": typeGo,
"typeDefGo": typeDefGo,
- "genVdlTypesForEnc": genVdlTypesForEnc,
"constDefGo": constDefGo,
- "tagValue": tagValue,
+ "genValueOf": genValueOf,
"embedGo": embedGo,
"isStreamingMethod": isStreamingMethod,
"hasStreamingMethods": hasStreamingMethods,
@@ -492,47 +489,49 @@
{{if $imp.Name}}{{$imp.Name}} {{end}}"{{$imp.Path}}"{{end}}
){{end}}
-{{$typeDefs := $pkg.TypeDefs}}
-{{if $typeDefs}}
-{{range $tdef := $typeDefs}}
+var _ = __VDLInit() // Must be first; see __VDLInit comments for details.
+
+{{if $pkg.TypeDefs}}
+//////////////////////////////////////////////////
+// Type definitions
+{{range $tdef := $pkg.TypeDefs}}
{{typeDefGo $data $tdef}}
{{end}}
-func init() { {{range $wire, $native := $pkg.Config.Go.WireToNativeTypes}}
- {{$data.Pkg "v.io/v23/vdl"}}RegisterNative({{$wire}}ToNative, {{$wire}}FromNative){{end}}{{range $tdef := $typeDefs}}
- {{$data.Pkg "v.io/v23/vdl"}}Register((*{{$tdef.Name}})(nil)){{end}}
-}
{{range $wire, $native := $pkg.Config.Go.WireToNativeTypes}}{{$nat := nativeIdent $data $native $pkg}}
// Type-check {{$wire}} conversion functions.
var _ func({{$wire}}, *{{$nat}}) error = {{$wire}}ToNative
-var _ func(*{{$wire}}, {{$nat}}) error = {{$wire}}FromNative
-{{end}}
+var _ func(*{{$wire}}, {{$nat}}) error = {{$wire}}FromNative{{end}}
{{end}}
-{{genVdlTypesForEnc $data}}
-
+{{if $pkg.ConstDefs}}
+//////////////////////////////////////////////////
+// Const definitions
{{range $cdef := $pkg.ConstDefs}}
-{{constDefGo $data $cdef}}
+{{constDefGo $data $cdef}}{{end}}
{{end}}
-{{$errorDefs := $pkg.ErrorDefs}}
-{{if $errorDefs}}var ( {{range $edef := $errorDefs}}
+{{if $pkg.ErrorDefs}}
+//////////////////////////////////////////////////
+// Error definitions
+var (
+{{range $edef := $pkg.ErrorDefs}}
{{$edef.Doc}}{{errorName $edef}} = {{$data.Pkg "v.io/v23/verror"}}Register("{{$edef.ID}}", {{$data.Pkg "v.io/v23/verror"}}{{$edef.RetryCode}}, "{{$edef.English}}"){{end}}
)
-{{/* TODO(toddw): Don't set "en-US" or "en" again, since it's already set by Register */}}
-func init() { {{range $edef := $errorDefs}}{{range $lf := $edef.Formats}}
- {{$data.Pkg "v.io/v23/i18n"}}Cat().SetWithBase({{$data.Pkg "v.io/v23/i18n"}}LangID("{{$lf.Lang}}"), {{$data.Pkg "v.io/v23/i18n"}}MsgID({{errorName $edef}}.ID), "{{$lf.Fmt}}"){{end}}{{end}}
-}
-{{range $edef := $errorDefs}}
+{{range $edef := $pkg.ErrorDefs}}
{{$errName := errorName $edef}}
{{$newErr := print (firstRuneToExport "New" $edef.Exported) (firstRuneToUpper $errName)}}
// {{$newErr}} returns an error with the {{$errName}} ID.
func {{$newErr}}(ctx {{argNameTypes "" (print "*" ($data.Pkg "v.io/v23/context") "T") "" "" $data $edef.Params}}) error {
return {{$data.Pkg "v.io/v23/verror"}}New({{$errName}}, {{argNames "" "" "ctx" "" "" $edef.Params}})
}
-{{end}}{{end}}
+{{end}}
+{{end}}
+{{if $pkg.Interfaces}}
+//////////////////////////////////////////////////
+// Interface definitions
{{range $iface := $pkg.Interfaces}}
{{$ifaceStreaming := hasStreamingMethods $iface.AllMethods}}
{{$rpc_ := $data.Pkg "v.io/v23/rpc"}}
@@ -676,7 +675,8 @@
{{clientFinishImpl "c.ClientCall" $method}}
return
}
-{{end}}{{end}}
+{{end}}
+{{end}}
// {{$iface.Name}}ServerMethods is the interface a server writer
// implements for {{$iface.Name}}.
@@ -764,7 +764,7 @@
OutArgs: []{{$rpc_}}ArgDesc{ {{range $arg := $method.OutArgs}}
{ "{{$arg.Name}}", {{quoteStripDoc $arg.Doc}} }, // {{typeGo $data $arg.Type}}{{end}}
},{{end}}{{if $method.Tags}}
- Tags: []*{{$data.Pkg "v.io/v23/vdl"}}Value{ {{range $tag := $method.Tags}}{{tagValue $data $tag}} ,{{end}} },{{end}}
+ Tags: []*{{$data.Pkg "v.io/v23/vdl"}}Value{ {{range $tag := $method.Tags}}{{genValueOf $data $tag}} ,{{end}} },{{end}}
},{{end}}
},{{end}}
}
@@ -859,7 +859,39 @@
func (s {{$serverSendImpl}}) Send(item {{typeGo $data $method.OutStream}}) error {
return s.s.Send(item)
}
-{{end}}{{end}}{{end}}
+{{end}}{{end}}{{end}}{{end}}{{end}}
+var __VDLInitCalled bool
+
+// __VDLInit performs vdl initialization. It is safe to call multiple times.
+// If you have an init ordering issue, just insert the following line verbatim
+// into your source files in this package, right after the "package foo" clause:
+//
+// var _ = __VDLInit()
+//
+// The purpose of this function is to ensure that vdl initialization occurs in
+// the right order, and very early in the init sequence. In particular, vdl
+// registration and package variable initialization needs to occur before
+// functions like vdl.TypeOf will work properly.
+//
+// This function returns a dummy value, so that it can be used to initialize the
+// first var in the file, to take advantage of Go's defined init order.
+func __VDLInit() struct{} {
+ if __VDLInitCalled {
+ return struct{}{}
+ }
+{{if $pkg.Config.Go.WireToNativeTypes}}
+ // Register native type conversions first, so that vdl.TypeOf works.{{range $wire, $native := $pkg.Config.Go.WireToNativeTypes}}
+ {{$data.Pkg "v.io/v23/vdl"}}RegisterNative({{$wire}}ToNative, {{$wire}}FromNative){{end}}
{{end}}
+{{if $pkg.TypeDefs}}
+ // Register types.{{range $tdef := $pkg.TypeDefs}}
+ {{$data.Pkg "v.io/v23/vdl"}}Register((*{{$tdef.Name}})(nil)){{end}}
+{{end}}
+{{if $pkg.ErrorDefs}}
+ // Set error format strings.{{/* TODO(toddw): Don't set "en-US" or "en" again, since it's already set by the original verror.Register call. */}}{{range $edef := $pkg.ErrorDefs}}{{range $lf := $edef.Formats}}
+ {{$data.Pkg "v.io/v23/i18n"}}Cat().SetWithBase({{$data.Pkg "v.io/v23/i18n"}}LangID("{{$lf.Lang}}"), {{$data.Pkg "v.io/v23/i18n"}}MsgID({{errorName $edef}}.ID), "{{$lf.Fmt}}"){{end}}{{end}}
+{{end}}
+ return struct{}{}
+}
`
diff --git a/lib/vdl/codegen/golang/gen_dec.go b/lib/vdl/codegen/golang/gen_dec.go
index 985eea8..1e05505 100644
--- a/lib/vdl/codegen/golang/gen_dec.go
+++ b/lib/vdl/codegen/golang/gen_dec.go
@@ -115,7 +115,7 @@
%[6]s = make([]byte, len(src))
copy(%[6]s, src)
}
- %s
+ %[7]s
return nil
}`, targetTypeName(data, t), valueFieldDef, genIncompatibleTypeCheck(data, t, 0), data.Pkg("v.io/v23/vdl"), targetBaseRef(data, "Target"), valueAssn, genWireToNativeConversion(data, t), genResetWire(data, t))
} else {
@@ -128,7 +128,7 @@
%[7]s
%[3]s
copy((%[6]s)[:], src)
- %s
+ %[7]s
return nil
}`, targetTypeName(data, t), typeGo(data, t), genIncompatibleTypeCheck(data, t, 0), data.Pkg("v.io/v23/vdl"), targetBaseRef(data, "Target"), valueAssn, genWireToNativeConversion(data, t), genResetWire(data, t))
}
@@ -170,9 +170,9 @@
}
s += fmt.Sprintf(`
default:
- return nil, nil, %sErrorf("field %%s not in struct %%v", name, %s)
+ return nil, nil, %sErrorf("field %%s not in struct %s", name)
}
-}`, data.Pkg("fmt"), data.typeDepends.Add(data, t))
+}`, data.Pkg("fmt"), t.Name())
s += fmt.Sprintf(`
func (t *%[1]s) FinishField(_, _ %[2]sTarget) error {
return nil
@@ -376,11 +376,11 @@
}
s += fmt.Sprintf(`
default:
- return %sErrorf("label %%s not in enum %%v", src, %s)
+ return %sErrorf("label %%s not in enum %s", src)
}
%s
return nil
-}`, data.Pkg("fmt"), data.typeDepends.Add(data, t), genWireToNativeConversion(data, t))
+}`, data.Pkg("fmt"), t.Name(), genWireToNativeConversion(data, t))
return s
}
@@ -516,9 +516,9 @@
// genIncompatibleTypeCheck generates code that will test for compatibility with the provided type.
// numOutArgs is the number of additional out args that the generated function should return.
func genIncompatibleTypeCheck(data goData, t *vdl.Type, numOutArgs int) string {
- return fmt.Sprintf(`if !%[1]sCompatible(tt, %[2]s) {
- return %[3]s%[4]sErrorf("type %%v incompatible with %%v", tt, %[2]s)
- }`, data.Pkg("v.io/v23/vdl"), data.typeDepends.Add(data, t), strings.Repeat("nil, ", numOutArgs), data.Pkg("fmt"))
+ return fmt.Sprintf(`if ttWant := %[1]s; !%[2]sCompatible(tt, ttWant) {
+ return %[3]s%[4]sErrorf("type %%v incompatible with %%v", tt, ttWant)
+ }`, genTypeOf(data, t), data.Pkg("v.io/v23/vdl"), strings.Repeat("nil, ", numOutArgs), data.Pkg("fmt"))
}
// targetBaseRef generates a reference to a TargetBase to embed (or
diff --git a/lib/vdl/codegen/golang/gen_enc.go b/lib/vdl/codegen/golang/gen_enc.go
index e8f0978..5c5e8b0 100644
--- a/lib/vdl/codegen/golang/gen_enc.go
+++ b/lib/vdl/codegen/golang/gen_enc.go
@@ -6,8 +6,6 @@
import (
"fmt"
- "sort"
- "strings"
"v.io/v23/vdl"
"v.io/x/ref/lib/vdl/compile"
@@ -30,14 +28,21 @@
// A(&AB{})
instName = "m"
}
- return genEncDefInternal(data, t, instName, "t", unionFieldName, "tt", &varCount)
+ return genEncDefInternal(data, t, instName, "t", unionFieldName, "", &varCount)
}
-func genEncDefInternal(data goData, t *vdl.Type, instName, targetName, unionFieldName, forcedTypeName string, varCount *int) string {
- if prim := genFromPrimitive(data, t, instName, targetName, varCount); prim != "" {
+func ttVarName(ttSuffix string) string {
+ if ttSuffix == "" {
+ return "tt"
+ }
+ return "tt.NonOptional()" + ttSuffix
+}
+
+func genEncDefInternal(data goData, t *vdl.Type, instName, targetName, unionFieldName, ttSuffix string, varCount *int) string {
+ ttVar := ttVarName(ttSuffix)
+ if prim := genFromScalar(data, t, instName, targetName, ttSuffix, varCount); prim != "" {
return prim
}
-
switch t.Kind() {
case vdl.TypeObject:
typeObjectValName := createUniqueName("typeObjectVal", varCount)
@@ -60,7 +65,7 @@
if err := %[3]sFromValue(%[1]s, %[2]s); err != nil {
return err
}
- }`, targetName, instName, data.Pkg("v.io/v23/vdl"), data.typeDepends.Add(data, t))
+ }`, targetName, instName, data.Pkg("v.io/v23/vdl"), ttVar)
} else {
return fmt.Sprintf(`
if %[2]s == nil {
@@ -71,7 +76,7 @@
if err := %[2]s.FillVDLTarget(%[1]s, %[3]s); err != nil {
return err
}
- }`, targetName, instName, data.typeDepends.Add(data, t))
+ }`, targetName, instName, ttVar)
}
case vdl.Array, vdl.List:
@@ -81,18 +86,18 @@
arrayModifier = "[:]"
}
return fmt.Sprintf(`
- if err := %s.FromBytes([]byte(%s%s), %s); err != nil {
+ if err := %[1]s.FromBytes([]byte(%[2]s%[3]s), %[4]s); err != nil {
return err
- }`, targetName, instName, arrayModifier, data.typeDepends.Add(data, t))
+ }`, targetName, instName, arrayModifier, ttVar)
}
listTargetName := createUniqueName("listTarget", varCount)
var s string
if t.Kind() == vdl.Array {
s += fmt.Sprintf(`
- %s, err := %s.StartList(%s, %d)`, listTargetName, targetName, data.typeDepends.Add(data, t), t.Len())
+ %[1]s, err := %[2]s.StartList(%[3]s, %[4]d)`, listTargetName, targetName, ttVar, t.Len())
} else {
s += fmt.Sprintf(`
- %s, err := %s.StartList(%s, len(%s))`, listTargetName, targetName, data.typeDepends.Add(data, t), instName)
+ %[1]s, err := %[2]s.StartList(%[3]s, len(%[4]s))`, listTargetName, targetName, ttVar, instName)
}
elemTargetName := createUniqueName("elemTarget", varCount)
elemName := createUniqueName("elem", varCount)
@@ -100,54 +105,54 @@
if err != nil {
return err
}
- for i, %s := range %s {
- %s, err := %s.StartElem(i)
+ for i, %[1]s := range %[2]s {
+ %[3]s, err := %[4]s.StartElem(i)
if err != nil {
return err
}
- %s
- if err := %s.FinishElem(%s); err != nil {
+ %[5]s
+ if err := %[4]s.FinishElem(%[3]s); err != nil {
return err
}
}
- if err := %s.FinishList(%s); err != nil {
+ if err := %[6]s.FinishList(%[4]s); err != nil {
return err
}`, elemName, instName, elemTargetName, listTargetName,
- genEncRef(data, t.Elem(), elemName, elemTargetName, varCount),
- listTargetName, elemTargetName, targetName, listTargetName)
+ genEncRef(data, t.Elem(), elemName, elemTargetName, ttSuffix+".Elem()", varCount),
+ targetName)
return s
case vdl.Set:
setTargetName := createUniqueName("setTarget", varCount)
s := fmt.Sprintf(`
- %s, err := %s.StartSet(%s, len(%s))`, setTargetName, targetName, data.typeDepends.Add(data, t), instName)
+ %[1]s, err := %[2]s.StartSet(%[3]s, len(%[4]s))`, setTargetName, targetName, ttVar, instName)
keyTargetName := createUniqueName("keyTarget", varCount)
keyName := createUniqueName("key", varCount)
s += fmt.Sprintf(`
if err != nil {
return err
}
- for %s := range %s {
- %s, err := %s.StartKey()
+ for %[1]s := range %[2]s {
+ %[3]s, err := %[4]s.StartKey()
if err != nil {
return err
}
- %s
- if err := %s.FinishKey(%s); err != nil {
+ %[5]s
+ if err := %[4]s.FinishKey(%[3]s); err != nil {
return err
}
}
- if err := %s.FinishSet(%s); err != nil {
+ if err := %[6]s.FinishSet(%[4]s); err != nil {
return err
}`, keyName, instName, keyTargetName, setTargetName,
- genEncRef(data, t.Key(), keyName, keyTargetName, varCount),
- setTargetName, keyTargetName, targetName, setTargetName)
+ genEncRef(data, t.Key(), keyName, keyTargetName, ttSuffix+".Key()", varCount),
+ targetName)
return s
case vdl.Map:
mapTargetName := createUniqueName("mapTarget", varCount)
s := fmt.Sprintf(`
- %s, err := %s.StartMap(%s, len(%s))`, mapTargetName, targetName, data.typeDepends.Add(data, t), instName)
+ %[1]s, err := %[2]s.StartMap(%[3]s, len(%[4]s))`, mapTargetName, targetName, ttVar, instName)
keyTargetName := createUniqueName("keyTarget", varCount)
keyName := createUniqueName("key", varCount)
valueTargetName := createUniqueName("valueTarget", varCount)
@@ -156,61 +161,39 @@
if err != nil {
return err
}
- for %s, %s := range %s {
- %s, err := %s.StartKey()
+ for %[1]s, %[2]s := range %[3]s {
+ %[4]s, err := %[5]s.StartKey()
if err != nil {
return err
}
- %s
- %s, err := %s.FinishKeyStartField(%s)
+ %[6]s
+ %[7]s, err := %[5]s.FinishKeyStartField(%[4]s)
if err != nil {
return err
}
- %s
- if err := %s.FinishField(%s, %s); err != nil {
+ %[8]s
+ if err := %[5]s.FinishField(%[4]s, %[7]s); err != nil {
return err
}
}
- if err := %s.FinishMap(%s); err != nil {
+ if err := %[9]s.FinishMap(%[5]s); err != nil {
return err
}`, keyName, valueName, instName, keyTargetName, mapTargetName,
- genEncRef(data, t.Key(), keyName, keyTargetName, varCount),
- valueTargetName, mapTargetName, keyTargetName,
- genEncRef(data, t.Elem(), valueName, valueTargetName, varCount),
- mapTargetName, keyTargetName, valueTargetName, targetName, mapTargetName)
+ genEncRef(data, t.Key(), keyName, keyTargetName, ttSuffix+".Key()", varCount),
+ valueTargetName,
+ genEncRef(data, t.Elem(), valueName, valueTargetName, ttSuffix+".Elem()", varCount),
+ targetName)
return s
case vdl.Struct:
fieldsTargetName := createUniqueName("fieldsTarget", varCount)
- name := forcedTypeName
var s string
- if name == "" {
- // inline
- name = data.typeDepends.Add(data, t)
- } else {
- // not inline / top of function def - check that we have the right type
- if containsNativeType(data, t) {
- // Because native types are initialized in init() blocks, we need
- // another way to initialize their values if other init blocks
- // call FillVDLTarget().
- s += fmt.Sprintf("\n__VDLEnsureNativeBuilt()")
- } else {
- // TODO(bprosnitz) This only checks if two types are nil. Check if all used types are nil.
- s += fmt.Sprintf(`
- if %s == nil || %s == nil {
- panic("Initialization order error: types generated for FillVDLTarget not initialized. Consider moving caller to an init() block.")
- }`, data.typeDepends.Add(data, t), data.typeDepends.Add(data, vdl.OptionalType(t)))
- }
- fmt.Sprintf(`if %[1]s != %[2]s && %[1]s != %[3]s {
- panic("FillVDLTarget called with invalid type")
- }`, forcedTypeName, data.typeDepends.Add(data, t), data.typeDepends.Add(data, vdl.OptionalType(t)))
- }
s += fmt.Sprintf(`
%[1]s, err := %[2]s.StartFields(%[3]s)
if err != nil {
return err
}
- `, fieldsTargetName, targetName, name)
+ `, fieldsTargetName, targetName, ttVar)
for ix := 0; ix < t.NumField(); ix++ {
f := t.Field(ix)
fieldInstName := fmt.Sprintf("%s.%s", instName, f.Name)
@@ -219,6 +202,7 @@
// TODO(toddw): Add native IsZero check here?
keyTargetName := createUniqueName("keyTarget", varCount)
fieldTargetName := createUniqueName("fieldTarget", varCount)
+ ttSuffixF := ttSuffix + fmt.Sprintf(".Field(%d).Type", ix)
s += fmt.Sprintf(`
%[1]s, %[2]s, err := %[3]s.StartField(%[4]q)
if err != %[5]sErrFieldNoExist && err != nil {
@@ -226,15 +210,15 @@
}
if err != %[5]sErrFieldNoExist {
%[6]s
- if err := %[7]s.FinishField(%[8]s, %[9]s); err != nil {
+ if err := %[3]s.FinishField(%[1]s, %[2]s); err != nil {
return err
}
- }`, keyTargetName, fieldTargetName, fieldsTargetName, f.Name, data.Pkg("v.io/v23/vdl"),
- genEncRefForWiretype(data, f.Type, fieldInstName, fieldTargetName, varCount),
- fieldsTargetName, keyTargetName, fieldTargetName)
+ }`, keyTargetName, fieldTargetName, fieldsTargetName, f.Name,
+ data.Pkg("v.io/v23/vdl"),
+ genEncRefForWiretype(data, f.Type, fieldInstName, fieldTargetName, ttSuffixF, varCount))
}
s += fmt.Sprintf(`
- if err := %s.FinishFields(%s); err != nil {
+ if err := %[1]s.FinishFields(%[2]s); err != nil {
return err
}`, targetName, fieldsTargetName)
return s
@@ -243,29 +227,27 @@
fieldsTargetName := createUniqueName("fieldsTarget", varCount)
keyTargetName := createUniqueName("keyTarget", varCount)
fieldTargetName := createUniqueName("fieldTarget", varCount)
- unionField, _ := t.FieldByName(unionFieldName)
+ unionField, unionIndex := t.FieldByName(unionFieldName)
+ ttSuffixF := ttSuffix + fmt.Sprintf(".Field(%d).Type", unionIndex)
fieldInstName := fmt.Sprintf("%s.Value", instName)
return fmt.Sprintf(`
- %s, err := %s.StartFields(%s)
+ %[1]s, err := %[2]s.StartFields(%[3]s)
if err != nil {
return err
}
- %s, %s, err := %s.StartField(%q)
+ %[4]s, %[5]s, err := %[1]s.StartField(%[6]q)
if err != nil {
return err
}
- %s
- if err := %s.FinishField(%s, %s); err != nil {
+ %[7]s
+ if err := %[1]s.FinishField(%[4]s, %[5]s); err != nil {
return err
}
- if err := %s.FinishFields(%s); err != nil {
+ if err := %[2]s.FinishFields(%[1]s); err != nil {
return err
}
- `, fieldsTargetName, targetName, data.typeDepends.Add(data, t),
- keyTargetName, fieldTargetName, fieldsTargetName, unionFieldName,
- genEncRef(data, unionField.Type, fieldInstName, fieldTargetName, varCount),
- fieldsTargetName, keyTargetName, fieldTargetName,
- targetName, fieldsTargetName)
+ `, fieldsTargetName, targetName, ttVar, keyTargetName, fieldTargetName, unionFieldName,
+ genEncRef(data, unionField.Type, fieldInstName, fieldTargetName, ttSuffixF, varCount))
}
panic(fmt.Sprintf("encoder for kind %v unimplemented", t.Kind()))
}
@@ -274,26 +256,26 @@
// genEncRef generates either a reference to a named encoder or the body of an
// encoder that must be inlined (e.g. for a unnamed list)
-func genEncRef(data goData, t *vdl.Type, instName, targetName string, varCount *int) string {
+func genEncRef(data goData, t *vdl.Type, instName, targetName, ttSuffix string, varCount *int) string {
wireInstName, s := encWiretypeInstName(data, t, instName, varCount)
- s += genEncRefForWiretype(data, t, wireInstName, targetName, varCount)
+ s += genEncRefForWiretype(data, t, wireInstName, targetName, ttSuffix, varCount)
return s
}
// genEncRefForWiretype is the same as genRef, but it assumes that the instance name refers
// to a wiretype value.
-func genEncRefForWiretype(data goData, t *vdl.Type, wireInstName, targetName string, varCount *int) string {
- origType := t
+func genEncRefForWiretype(data goData, t *vdl.Type, wireInstName, targetName, ttSuffix string, varCount *int) string {
+ origType, ttVar := t, ttVarName(ttSuffix)
var s string
// If this is an optional, add the nil case.
if origType.Kind() == vdl.Optional {
s += fmt.Sprintf(`
- if %s == nil {
- if err := %s.FromNil(%s); err != nil {
+ if %[1]s == nil {
+ if err := %[2]s.FromNil(%[3]s); err != nil {
return err
}
- } else {`, wireInstName, targetName, data.typeDepends.Add(data, t))
+ } else {`, wireInstName, targetName, ttVar)
t = t.Elem()
}
@@ -331,12 +313,12 @@
if t.Name() != "" {
// Call the inner encoder
s += fmt.Sprintf(`
- if err := %s.FillVDLTarget(%s, %s); err != nil {
+ if err := %[1]s.FillVDLTarget(%[2]s, %[3]s); err != nil {
return err
- }`, wireInstName, targetName, data.typeDepends.Add(data, t))
+ }`, wireInstName, targetName, ttVar)
} else {
// Generate an inline encoder
- s += genEncDefInternal(data, t, wireInstName, targetName, "", "", varCount)
+ s += genEncDefInternal(data, t, wireInstName, targetName, "", ttSuffix, varCount)
}
if origType.Kind() == vdl.Optional {
@@ -374,8 +356,9 @@
return data.Pkg(data.Env.ResolvePackage(pkgPath).GenPath), name
}
-// genFromPrimitive generates a fromX() call corresponding with the appropriate primitive type.
-func genFromPrimitive(data goData, t *vdl.Type, instName, targetName string, varCount *int) string {
+// genFromScalar generates a fromX() call corresponding with the appropriate scalar type.
+func genFromScalar(data goData, t *vdl.Type, instName, targetName, ttSuffix string, varCount *int) string {
+ ttVar := ttVarName(ttSuffix)
var methodName string
var castType string
switch t.Kind() {
@@ -398,27 +381,15 @@
methodName = "FromString"
castType = "string"
case vdl.Enum:
- return fmt.Sprintf(`if err := %s.FromEnumLabel(%s.String(), %s); err != nil {
+ return fmt.Sprintf(`if err := %[1]s.FromEnumLabel(%[2]s.String(), %[3]s); err != nil {
return err
- }`, targetName, instName, data.typeDepends.Add(data, t))
- case vdl.Array, vdl.List:
- if t.IsBytes() {
- methodName = "FromBytes"
- castType = "[]byte"
- }
- return ""
+ }`, targetName, instName, ttVar)
default:
return ""
}
- var typeName string
- if t.Name() != "" {
- typeName = data.typeDepends.Add(data, t)
- } else {
- typeName = data.Pkg("v.io/v23/vdl") + kindVarName(t.Kind()) + "Type"
- }
- return fmt.Sprintf(`if err := %s.%s(%s(%s), %s); err != nil {
+ return fmt.Sprintf(`if err := %[1]s.%[2]s(%[3]s(%[4]s), %[5]s); err != nil {
return err
-}`, targetName, methodName, castType, instName, typeName)
+}`, targetName, methodName, castType, instName, ttVar)
}
// kindVarName returns the go name of the kind variable in the vdl package
@@ -431,85 +402,6 @@
return vdlutil.FirstRuneToUpper(k.String())
}
-// genVdlTypeBuilder generates code to build a type using vdl.TypeBuilder.
-//
-// It is necessary (currently) because typedConst doesn't work with native types and
-// it is not possible to call vdl.TypeOf(*X) for arbitrary X because of the rules
-// on what can be optional.
-// TODO(bprosnitz) Consider removing this
-func genVdlTypeBuilder(data goData, t *vdl.Type, varName string, varCount *int) string {
- lookupName := map[*vdl.Type]string{}
- builderBody := genVdlTypeBuilderInternal(data, t, lookupName, varName, varCount)
- return fmt.Sprintf(`
- %[1]sBuilder := %[2]sTypeBuilder{}
- %[3]s
- %[1]sBuilder.Build()
- %[1]sv, err := %[4]s.Built()
- if err != nil {
- panic(err)
- }
- return %[1]sv`, varName, data.Pkg("v.io/v23/vdl"), builderBody, lookupName[t])
-}
-
-func genVdlTypeBuilderInternal(data goData, t *vdl.Type, lookupName map[*vdl.Type]string, prefix string, varcount *int) (str string) {
- if _, ok := lookupName[t]; ok {
- return ""
- }
- unnamedName := createUniqueName(prefix, varcount)
- switch t.Kind() {
- case vdl.List, vdl.Array, vdl.Optional, vdl.Set, vdl.Map, vdl.Struct, vdl.Union, vdl.Enum:
- str += fmt.Sprintf(`
- %s := %sBuilder.%s()`, unnamedName, prefix, kindVarName(t.Kind()))
- default:
- str += fmt.Sprintf(`
- %s := %s%sType`, unnamedName, data.Pkg("v.io/v23/vdl"), kindVarName(t.Kind()))
- }
- var name string
- if t.Name() != "" {
- name = createUniqueName(prefix, varcount)
- str += fmt.Sprintf(`
- %s := %sBuilder.Named(%q).AssignBase(%s)`, name, prefix, t.Name(), unnamedName)
- } else {
- name = unnamedName
- }
- lookupName[t] = name
-
- switch t.Kind() {
- case vdl.List, vdl.Array, vdl.Optional:
- str += genVdlTypeBuilderInternal(data, t.Elem(), lookupName, prefix, varcount)
- str += fmt.Sprintf(`
- %s.AssignElem(%s)`, unnamedName, lookupName[t.Elem()])
- if t.Kind() == vdl.Array {
- str += fmt.Sprintf(`
- %s.AssignLen(%d)`, unnamedName, t.Len())
- }
- case vdl.Set:
- str += genVdlTypeBuilderInternal(data, t.Key(), lookupName, prefix, varcount)
- str += fmt.Sprintf(`
- %s.AssignKey(%s)`, unnamedName, lookupName[t.Key()])
- case vdl.Map:
- str += genVdlTypeBuilderInternal(data, t.Key(), lookupName, prefix, varcount)
- str += fmt.Sprintf(`
- %s.AssignKey(%s)`, unnamedName, lookupName[t.Key()])
- str += genVdlTypeBuilderInternal(data, t.Elem(), lookupName, prefix, varcount)
- str += fmt.Sprintf(`
- %s.AssignElem(%s)`, unnamedName, lookupName[t.Elem()])
- case vdl.Struct, vdl.Union:
- for i := 0; i < t.NumField(); i++ {
- f := t.Field(i)
- str += genVdlTypeBuilderInternal(data, f.Type, lookupName, prefix, varcount)
- str += fmt.Sprintf(`
- %s.AppendField(%q, %s)`, unnamedName, f.Name, lookupName[f.Type])
- }
- case vdl.Enum:
- for i := 0; i < t.NumEnumLabel(); i++ {
- str += fmt.Sprintf(`
- %s.AppendLabel(%q)`, unnamedName, t.EnumLabel(i))
- }
- }
- return
-}
-
func containsNativeType(data goData, t *vdl.Type) bool {
isNative := !t.Walk(vdl.WalkAll, func(wt *vdl.Type) bool {
return !isNativeType(wt, data.Package)
@@ -517,52 +409,6 @@
return isNative
}
-// genVdlTypesForEnc generates *vdl.Type constants needed by the encoder.
-// Generates strings of the form "var __a_type_name = vdl.TypeOf(X{})"
-//
-// NOTE: This code MUST be generated after RegisterNative() calls, or
-// vdl.TypeOf() will error when Registering the wire type.
-func genVdlTypesForEnc(data goData) (s string) {
- for _, t := range data.typeDepends.SortedTypes() {
- objName := data.typeDepends.types[t]
- if containsNativeType(data, t) {
- var varCount int
- s += fmt.Sprintf(`
- var %[1]s *%[2]sType
- func %[1]s_gen() *%[2]sType{`, objName, data.Pkg("v.io/v23/vdl"))
- // Generate a builder in the case that we have native types.
- // TODO This is termporary and if it must exist, it should be moved
- // to typedConst.
- // It is not possible to know how to create a zero value instance
- // of a native type directly with the currently available information,
- // so some solutions are either to use a builder or to create an instance
- // of the wire type in the init function and then convert it.
- s += genVdlTypeBuilder(data, t, objName, &varCount)
- s += fmt.Sprintf(`
- }
- func init() {
- %[1]s = %[1]s_gen()
- }`, objName)
- } else {
- s += fmt.Sprintf(`
- var %s *%sType = %s`, objName, data.Pkg("v.io/v23/vdl"), typedConst(data, vdl.TypeObjectValue(t)))
- }
- }
-
- s += fmt.Sprintf("\nfunc __VDLEnsureNativeBuilt() {")
- for _, t := range data.typeDepends.SortedTypes() {
- if containsNativeType(data, t) {
- s += fmt.Sprintf(`
- if %[1]s == nil {
- %[1]s = %[1]s_gen()
- }`, data.typeDepends.types[t])
- }
- }
- s += "\n}"
-
- return
-}
-
// isNativeType traverses the package structure to determine whether the provided type is native.
func isNativeType(t *vdl.Type, pkg *compile.Package) bool {
pkgPath, name := vdl.SplitIdent(t.Name())
@@ -594,73 +440,3 @@
*varCount++
return fmt.Sprintf("%s%d", prefix, *varCount)
}
-
-type typeDependencyNames struct {
- types map[*vdl.Type]string
- nextCount int
-}
-
-func newTypeDependencyNames() *typeDependencyNames {
- return &typeDependencyNames{
- types: map[*vdl.Type]string{},
- }
-}
-
-var basicTypes map[*vdl.Type]string = map[*vdl.Type]string{
- vdl.AnyType: "AnyType",
- vdl.BoolType: "BoolType",
- vdl.ByteType: "ByteType",
- vdl.Uint16Type: "Uint16Type",
- vdl.Uint32Type: "Uint32Type",
- vdl.Uint64Type: "Uint64Type",
- vdl.Int8Type: "Int8Type",
- vdl.Int16Type: "Int16Type",
- vdl.Int32Type: "Int32Type",
- vdl.Int64Type: "Int64Type",
- vdl.Float32Type: "Float32Type",
- vdl.Float64Type: "Float64Type",
- vdl.Complex64Type: "Complex64Type",
- vdl.Complex128Type: "Complex128Type",
- vdl.StringType: "StringType",
- vdl.TypeObjectType: "TypeObjectType",
- vdl.ErrorType: "ErrorType",
-}
-
-func (typeDepends *typeDependencyNames) Add(data goData, t *vdl.Type) string {
- if str, ok := basicTypes[t]; ok {
- return data.Pkg("v.io/v23/vdl") + str
- }
- if str, ok := typeDepends.types[t]; ok {
- return str
- }
- var str string
- if t.Name() != "" {
- str = fmt.Sprintf("__VDLType_%s", strings.Replace(strings.Replace(t.Name(), ".", "_", -1), "/", "_", -1))
- } else {
- str = fmt.Sprintf("__VDLType%d", typeDepends.nextCount)
- typeDepends.nextCount++
- }
- typeDepends.types[t] = str
- return str
-}
-
-type sortableTypes []*vdl.Type
-
-func (st sortableTypes) Len() int {
- return len(st)
-}
-func (st sortableTypes) Less(i, j int) bool {
- return st[i].String() < st[j].String()
-}
-func (st sortableTypes) Swap(i, j int) {
- st[i], st[j] = st[j], st[i]
-}
-
-func (typeDepends *typeDependencyNames) SortedTypes() []*vdl.Type {
- types := make(sortableTypes, 0, len(typeDepends.types))
- for key := range typeDepends.types {
- types = append(types, key)
- }
- sort.Sort(types)
- return []*vdl.Type(types)
-}
diff --git a/lib/vdl/codegen/golang/type.go b/lib/vdl/codegen/golang/type.go
index b61f9d6..7b0acf5 100644
--- a/lib/vdl/codegen/golang/type.go
+++ b/lib/vdl/codegen/golang/type.go
@@ -86,15 +86,15 @@
// Otherwise recurse through the type.
switch t.Kind() {
case vdl.Optional:
- return "*" + typeGo(data, t.Elem())
+ return "*" + typeGoInternal(data, t.Elem(), useNative)
case vdl.Array:
- return "[" + strconv.Itoa(t.Len()) + "]" + typeGo(data, t.Elem())
+ return "[" + strconv.Itoa(t.Len()) + "]" + typeGoInternal(data, t.Elem(), useNative)
case vdl.List:
- return "[]" + typeGo(data, t.Elem())
+ return "[]" + typeGoInternal(data, t.Elem(), useNative)
case vdl.Set:
- return "map[" + typeGo(data, t.Key()) + "]struct{}"
+ return "map[" + typeGoInternal(data, t.Key(), useNative) + "]struct{}"
case vdl.Map:
- return "map[" + typeGo(data, t.Key()) + "]" + typeGo(data, t.Elem())
+ return "map[" + typeGoInternal(data, t.Key(), useNative) + "]" + typeGoInternal(data, t.Elem(), useNative)
default:
panic(fmt.Errorf("vdl: typeGo unhandled type %v %v", t.Kind(), t))
}
diff --git a/lib/vdl/codegen/golang/type_test.go b/lib/vdl/codegen/golang/type_test.go
index c540065..f9147be 100644
--- a/lib/vdl/codegen/golang/type_test.go
+++ b/lib/vdl/codegen/golang/type_test.go
@@ -213,7 +213,6 @@
data := goData{
Package: &compile.Package{},
Env: compile.NewEnv(-1),
- typeDepends: newTypeDependencyNames(),
createdTargets: make(map[*vdl.Type]bool),
}
for _, test := range tests {
diff --git a/lib/vdl/compile/compile.go b/lib/vdl/compile/compile.go
index c4bd775..66ddef1 100644
--- a/lib/vdl/compile/compile.go
+++ b/lib/vdl/compile/compile.go
@@ -256,7 +256,7 @@
// Add immediate package deps for t and subtypes of t.
func addTypeDeps(t *vdl.Type, pkg *Package, env *Env, tdeps map[*vdl.Type]bool, pdeps map[*Package]bool) {
- if def := env.typeDefs[t]; def != nil {
+ if def := env.typeMap[t]; def != nil {
// We don't track transitive dependencies, only immediate dependencies.
tdeps[t] = true
pdeps[def.File.Package] = true
@@ -297,7 +297,7 @@
// for const or tag values.
func addValueTypeDeps(v *vdl.Value, pkg *Package, env *Env, tdeps map[*vdl.Type]bool, pdeps map[*Package]bool) {
t := v.Type()
- if def := env.typeDefs[t]; def != nil {
+ if def := env.typeMap[t]; def != nil {
tdeps[t] = true
pdeps[def.File.Package] = true
// Fall through to track transitive dependencies, based on the subvalues.
diff --git a/lib/vdl/compile/const.go b/lib/vdl/compile/const.go
index bfe5bf7..cce4e24 100644
--- a/lib/vdl/compile/const.go
+++ b/lib/vdl/compile/const.go
@@ -14,6 +14,13 @@
"v.io/x/ref/lib/vdl/parse"
)
+var (
+ // Built-in consts defined by the compiler.
+ NilConst = vdl.ZeroValue(vdl.AnyType) // nil == any(nil)
+ TrueConst = vdl.BoolValue(true)
+ FalseConst = vdl.BoolValue(false)
+)
+
// ConstDef represents a user-defined named const definition in the compiled
// results.
type ConstDef struct {
@@ -24,42 +31,41 @@
}
func (x *ConstDef) String() string {
- c := *x
- c.File = nil // avoid infinite loop
- return fmt.Sprintf("%+v", c)
+ y := *x
+ y.File = nil // avoid infinite loop
+ return fmt.Sprintf("%+v", y)
}
// compileConstDefs is the "entry point" to the rest of this file. It takes the
// consts defined in pfiles and compiles them into ConstDefs in pkg.
func compileConstDefs(pkg *Package, pfiles []*parse.File, env *Env) {
- cd := constDefiner{pkg, pfiles, env, make(map[string]*constBuilder)}
+ cd := constDefiner{pkg, pfiles, env, make(map[string]*constDefBuilder)}
if cd.Declare(); !env.Errors.IsEmpty() {
return
}
- cd.SortAndDefine()
+ cd.Define()
}
// constDefiner defines consts in a package. This is split into two phases:
// 1) Declare ensures local const references can be resolved.
-// 2) SortAndDefine sorts in dependency order, and evaluates and defines each
-// const.
+// 2) Define sorts in dependency order, and evaluates and defines each const.
//
-// It holds a builders map from const name to constBuilder, where the
-// constBuilder is responsible for compiling and defining a single const.
+// It holds a builders map from const name to constDefBuilder, where the
+// constDefBuilder is responsible for compiling and defining a single const.
type constDefiner struct {
pkg *Package
pfiles []*parse.File
env *Env
- builders map[string]*constBuilder
+ builders map[string]*constDefBuilder
}
-type constBuilder struct {
+type constDefBuilder struct {
def *ConstDef
pexpr parse.ConstExpr
}
func printConstBuilderName(ibuilder interface{}) string {
- return ibuilder.(*constBuilder).def.Name
+ return ibuilder.(*constDefBuilder).def.Name
}
// Declare creates builders for each const defined in the package.
@@ -78,19 +84,19 @@
continue
}
def := &ConstDef{NamePos: NamePos(pdef.NamePos), Exported: export, File: file}
- cd.builders[pdef.Name] = &constBuilder{def, pdef.Expr}
+ cd.builders[pdef.Name] = &constDefBuilder{def, pdef.Expr}
}
}
}
-// Sort and define consts. We sort by dependencies on other named consts in
-// this package. We don't allow cycles. The ordering is necessary to perform
-// simple single-pass evaluation.
+// Define consts. We sort by dependencies on other named consts in this
+// package. We don't allow cycles. The ordering is necessary to perform simple
+// single-pass evaluation.
//
// The dependency analysis is performed on consts, not the files they occur in;
// consts in the same package may be defined in any file, even if they cause
// cyclic file dependencies.
-func (cd constDefiner) SortAndDefine() {
+func (cd constDefiner) Define() {
// Populate sorter with dependency information. The sorting ensures that the
// list of const defs within each file is topologically sorted, and also
// deterministic; other than dependencies, const defs are listed in the same
@@ -100,7 +106,7 @@
for _, pdef := range pfile.ConstDefs {
b := cd.builders[pdef.Name]
sorter.AddNode(b)
- for dep, _ := range cd.getLocalDeps(b.pexpr) {
+ for _, dep := range cd.getLocalDeps(b.pexpr) {
sorter.AddEdge(b, dep)
}
}
@@ -109,7 +115,7 @@
sorted, cycles := sorter.Sort()
if len(cycles) > 0 {
cycleStr := toposort.DumpCycles(cycles, printConstBuilderName)
- first := cycles[0][0].(*constBuilder)
+ first := cycles[0][0].(*constDefBuilder)
cd.env.Errorf(first.def.File, first.def.Pos, "package %v has cyclic consts: %v", cd.pkg.Name, cycleStr)
return
}
@@ -117,7 +123,7 @@
// topological order, dependencies are guaranteed to be resolvable when we get
// around to evaluating the consts that depend on them.
for _, ibuilder := range sorted {
- b := ibuilder.(*constBuilder)
+ b := ibuilder.(*constDefBuilder)
def, file := b.def, b.def.File
if value := compileConst("const", nil, b.pexpr, file, cd.env); value != nil {
def.Value = value
@@ -129,59 +135,45 @@
// addConstDef updates our various structures to add a new const def.
func addConstDef(def *ConstDef, env *Env) {
def.File.ConstDefs = append(def.File.ConstDefs, def)
- def.File.Package.constDefs[def.Name] = def
+ def.File.Package.constDefs = append(def.File.Package.constDefs, def)
+ def.File.Package.constMap[def.Name] = def
if env != nil {
// env should only be nil during initialization of the built-in package;
// NewEnv ensures new environments have the built-in consts.
- env.constDefs[def.Value] = def
+ env.constMap[def.Value] = def
}
}
-// getLocalDeps returns the set of named const dependencies for pexpr that are
-// in this package.
-func (cd constDefiner) getLocalDeps(pexpr parse.ConstExpr) constBuilderSet {
+// getLocalDeps returns a list of named const dependencies for pexpr, where each
+// dependency is defined in this package.
+func (cd constDefiner) getLocalDeps(pexpr parse.ConstExpr) (deps []*constDefBuilder) {
switch pe := pexpr.(type) {
case nil, *parse.ConstLit, *parse.ConstTypeObject:
- return nil
- case *parse.ConstCompositeLit:
- var deps constBuilderSet
- for _, kv := range pe.KVList {
- deps = mergeConstBuilderSets(deps, cd.getLocalDeps(kv.Key))
- deps = mergeConstBuilderSets(deps, cd.getLocalDeps(kv.Value))
- }
- return deps
+ // These have no deps.
case *parse.ConstNamed:
// Named references to other consts in this package are all we care about.
if b := cd.builders[pe.Name]; b != nil {
- return constBuilderSet{b: true}
+ deps = append(deps, b)
}
- return nil
+ case *parse.ConstCompositeLit:
+ for _, kv := range pe.KVList {
+ deps = append(deps, cd.getLocalDeps(kv.Key)...)
+ deps = append(deps, cd.getLocalDeps(kv.Value)...)
+ }
case *parse.ConstIndexed:
- e, i := cd.getLocalDeps(pe.Expr), cd.getLocalDeps(pe.IndexExpr)
- return mergeConstBuilderSets(e, i)
+ deps = append(deps, cd.getLocalDeps(pe.Expr)...)
+ deps = append(deps, cd.getLocalDeps(pe.IndexExpr)...)
case *parse.ConstTypeConv:
- return cd.getLocalDeps(pe.Expr)
+ deps = append(deps, cd.getLocalDeps(pe.Expr)...)
case *parse.ConstUnaryOp:
- return cd.getLocalDeps(pe.Expr)
+ deps = append(deps, cd.getLocalDeps(pe.Expr)...)
case *parse.ConstBinaryOp:
- l, r := cd.getLocalDeps(pe.Lexpr), cd.getLocalDeps(pe.Rexpr)
- return mergeConstBuilderSets(l, r)
+ deps = append(deps, cd.getLocalDeps(pe.Lexpr)...)
+ deps = append(deps, cd.getLocalDeps(pe.Rexpr)...)
+ default:
+ panic(fmt.Errorf("vdl: unhandled parse.ConstExpr %T %#v", pexpr, pexpr))
}
- panic(fmt.Errorf("vdl: unhandled parse.ConstExpr %T %#v", pexpr, pexpr))
-}
-
-type constBuilderSet map[*constBuilder]bool
-
-// mergeConstBuilderSets returns the union of a and b. It may mutate either a
-// or b and return the mutated set as a result.
-func mergeConstBuilderSets(a, b constBuilderSet) constBuilderSet {
- if a != nil {
- for builder, _ := range b {
- a[builder] = true
- }
- return a
- }
- return b
+ return
}
// compileConst compiles pexpr into a *vdl.Value. All named types and consts
@@ -623,10 +615,3 @@
unionv.AssignUnionField(index, value)
return unionv
}
-
-var (
- // Built-in consts defined by the compiler.
- NilConst = vdl.ZeroValue(vdl.AnyType) // nil == any(nil)
- TrueConst = vdl.BoolValue(true)
- FalseConst = vdl.BoolValue(false)
-)
diff --git a/lib/vdl/compile/error.go b/lib/vdl/compile/error.go
index 2b53af6..9f88dc9 100644
--- a/lib/vdl/compile/error.go
+++ b/lib/vdl/compile/error.go
@@ -23,6 +23,7 @@
Params []*Field // list of positional parameter names and types
Formats []LangFmt // list of language / format pairs
English string // English format text from Formats
+ File *File // parent file that this error is defined in
}
// LangFmt represents a language / format string pair.
@@ -32,7 +33,9 @@
}
func (x *ErrorDef) String() string {
- return fmt.Sprintf("%+v", *x)
+ y := *x
+ y.File = nil
+ return fmt.Sprintf("%+v", y)
}
// compileErrorDefs fills in pkg with compiled error definitions.
@@ -50,11 +53,10 @@
env.prefixErrorf(file, ped.Pos, err, "error %s name conflict", name)
continue
}
- // NOTE(spetrovic): Java depends on error id being package path
- // followed by name, so don't change this before talking to
- // spetrovic@google.com.
+ // The error id should not be changed; the whole point of error defs is
+ // that the id is stable.
id := pkg.Path + "." + name
- ed := &ErrorDef{NamePos: NamePos(ped.NamePos), Exported: export, ID: id}
+ ed := &ErrorDef{NamePos: NamePos(ped.NamePos), Exported: export, ID: id, File: file}
defineErrorActions(ed, name, ped.Actions, file, env)
ed.Params = defineErrorParams(name, ped.Params, file, env)
ed.Formats = defineErrorFormats(name, ped.Formats, ed.Params, file, env)
@@ -74,11 +76,17 @@
env.Errorf(file, ed.Pos, "error %s invalid (must define at least one English format)", name)
continue
}
- file.ErrorDefs = append(file.ErrorDefs, ed)
+ addErrorDef(ed, env)
}
}
}
+// addErrorDef updates our various structures to add a new error def.
+func addErrorDef(def *ErrorDef, env *Env) {
+ def.File.ErrorDefs = append(def.File.ErrorDefs, def)
+ def.File.Package.errorDefs = append(def.File.Package.errorDefs, def)
+}
+
func defineErrorActions(ed *ErrorDef, name string, pactions []parse.StringPos, file *File, env *Env) {
// We allow multiple actions to be specified in the parser, so that it's easy
// to add new actions in the future.
diff --git a/lib/vdl/compile/error_test.go b/lib/vdl/compile/error_test.go
index 845c511..ffcefb6 100644
--- a/lib/vdl/compile/error_test.go
+++ b/lib/vdl/compile/error_test.go
@@ -62,6 +62,7 @@
for _, param := range ed.Params {
param.Pos = parse.Pos{}
}
+ ed.File = nil
return ed
}
diff --git a/lib/vdl/compile/interface.go b/lib/vdl/compile/interface.go
index fc3a161..089430c 100644
--- a/lib/vdl/compile/interface.go
+++ b/lib/vdl/compile/interface.go
@@ -17,13 +17,12 @@
if id.Declare(); !env.Errors.IsEmpty() {
return
}
- id.SortAndDefine()
+ id.Define()
}
// ifaceDefiner defines interfaces in a package. This is split into two phases:
// 1) Declare ensures local interface references can be resolved.
-// 2) SortAndDefine sorts in dependency order, and evaluates and defines each
-// const.
+// 2) Define sorts in dependency order, and defines each interface.
//
// It holds a builders map from interface name to ifaceBuilder, where the
// ifaceBuilder is responsible for compiling and defining a single interface.
@@ -64,9 +63,9 @@
}
}
-// Sort and define interfaces. We sort by dependencies on other interfaces in
-// this package. The sorting is to ensure there are no cycles.
-func (id ifaceDefiner) SortAndDefine() {
+// Define interfaces. We sort by dependencies on other interfaces in this
+// package. The sorting is to ensure there are no cycles.
+func (id ifaceDefiner) Define() {
// Populate sorter with dependency information. The sorting ensures that the
// list of interfaces within each file is topologically sorted, and also
// deterministic; in the absence of interface embeddings, interfaces are
@@ -102,7 +101,8 @@
// addIfaceDef updates our various structures to add a new interface.
func addIfaceDef(def *Interface) {
def.File.Interfaces = append(def.File.Interfaces, def)
- def.File.Package.ifaceDefs[def.Name] = def
+ def.File.Package.ifaceDefs = append(def.File.Package.ifaceDefs, def)
+ def.File.Package.ifaceMap[def.Name] = def
}
// getLocalDeps returns the list of interface dependencies for b that are in
diff --git a/lib/vdl/compile/result.go b/lib/vdl/compile/result.go
index 708948f..21bad9a 100644
--- a/lib/vdl/compile/result.go
+++ b/lib/vdl/compile/result.go
@@ -26,10 +26,10 @@
//
// Always create a new Env via NewEnv; the zero Env is invalid.
type Env struct {
- Errors *vdlutil.Errors
- pkgs map[string]*Package
- typeDefs map[*vdl.Type]*TypeDef
- constDefs map[*vdl.Value]*ConstDef
+ Errors *vdlutil.Errors
+ pkgs map[string]*Package
+ typeMap map[*vdl.Type]*TypeDef
+ constMap map[*vdl.Value]*ConstDef
disallowPathQualifiers bool // Disallow syntax like "a/b/c".Type
}
@@ -42,18 +42,18 @@
// NewEnvWithErrors creates a new Env, using the given errs to collect errors.
func NewEnvWithErrors(errs *vdlutil.Errors) *Env {
env := &Env{
- Errors: errs,
- pkgs: make(map[string]*Package),
- typeDefs: make(map[*vdl.Type]*TypeDef),
- constDefs: make(map[*vdl.Value]*ConstDef),
+ Errors: errs,
+ pkgs: make(map[string]*Package),
+ typeMap: make(map[*vdl.Type]*TypeDef),
+ constMap: make(map[*vdl.Value]*ConstDef),
}
// The env always starts out with the built-in package.
env.pkgs[BuiltInPackage.Name] = BuiltInPackage
for _, def := range BuiltInFile.TypeDefs {
- env.typeDefs[def.Type] = def
+ env.typeMap[def.Type] = def
}
for _, def := range BuiltInFile.ConstDefs {
- env.constDefs[def.Value] = def
+ env.constMap[def.Value] = def
}
return env
}
@@ -61,12 +61,12 @@
// FindTypeDef returns the type definition corresponding to t, or nil if t isn't
// a defined type. All built-in and user-defined named types are considered
// defined; e.g. unnamed lists don't have a corresponding type def.
-func (e *Env) FindTypeDef(t *vdl.Type) *TypeDef { return e.typeDefs[t] }
+func (e *Env) FindTypeDef(t *vdl.Type) *TypeDef { return e.typeMap[t] }
// FindConstDef returns the const definition corresponding to v, or nil if v
// isn't a defined const. All user-defined named consts are considered defined;
// e.g. method tags don't have a corresponding const def.
-func (e *Env) FindConstDef(v *vdl.Value) *ConstDef { return e.constDefs[v] }
+func (e *Env) FindConstDef(v *vdl.Value) *ConstDef { return e.constMap[v] }
// ResolvePackage resolves a package path to its previous compiled results.
func (e *Env) ResolvePackage(path string) *Package {
@@ -254,7 +254,7 @@
// Representation of the components of an vdl file. These data types represent
// the results of the compilation, used by generators for different languages.
-// Package represents an vdl package, containing a set of files.
+// Package represents a vdl package, containing a list of files.
type Package struct {
// Name is the name of the package, specified in the vdl files.
// E.g. "bar"
@@ -277,9 +277,15 @@
Config vdltool.Config
// We hold some internal maps to make local name resolution cheap and easy.
- typeDefs map[string]*TypeDef
- constDefs map[string]*ConstDef
- ifaceDefs map[string]*Interface
+ typeMap map[string]*TypeDef
+ constMap map[string]*ConstDef
+ ifaceMap map[string]*Interface
+
+ // We also hold some internal slices, to remember the dependency ordering.
+ typeDefs []*TypeDef
+ constDefs []*ConstDef
+ errorDefs []*ErrorDef
+ ifaceDefs []*Interface
// lowercaseIdents maps from lowercased identifier to a detail string; it's
// used to detect and report identifier conflicts.
@@ -292,9 +298,9 @@
Path: pkgPath,
GenPath: genPath,
Config: config,
- typeDefs: make(map[string]*TypeDef),
- constDefs: make(map[string]*ConstDef),
- ifaceDefs: make(map[string]*Interface),
+ typeMap: make(map[string]*TypeDef),
+ constMap: make(map[string]*ConstDef),
+ ifaceMap: make(map[string]*Interface),
lowercaseIdents: make(map[string]string),
}
}
@@ -309,13 +315,13 @@
}
// ResolveType resolves the type name to its definition.
-func (p *Package) ResolveType(name string) *TypeDef { return p.typeDefs[name] }
+func (p *Package) ResolveType(name string) *TypeDef { return p.typeMap[name] }
// ResolveConst resolves the const name to its definition.
-func (p *Package) ResolveConst(name string) *ConstDef { return p.constDefs[name] }
+func (p *Package) ResolveConst(name string) *ConstDef { return p.constMap[name] }
// ResolveInterface resolves the interface name to its definition.
-func (p *Package) ResolveInterface(name string) *Interface { return p.ifaceDefs[name] }
+func (p *Package) ResolveInterface(name string) *Interface { return p.ifaceMap[name] }
// resolve resolves a name against the package.
// Checks for duplicate definitions should be performed before this is called.
@@ -343,43 +349,33 @@
return ""
}
-// TODO(toddw): Add ordering as appropriate to each of these!
+// TypeDefs returns all types defined in this package, in dependency order. If
+// type B refers to type A, B depends on A, and A will appear before B. Types
+// may have cyclic dependencies; the ordering of cyclicly dependent types is
+// arbitrary.
+func (p *Package) TypeDefs() []*TypeDef { return p.typeDefs }
-func (p *Package) TypeDefs() (x []*TypeDef) {
- for _, file := range p.Files {
- x = append(x, file.TypeDefs...)
- }
- return
-}
+// ConstDefs returns all consts defined in this package, in dependency order.
+// If const B refers to const A, B depends on A, and A will appear before B.
+// Consts cannot have cyclic dependencies.
+func (p *Package) ConstDefs() (x []*ConstDef) { return p.constDefs }
-func (p *Package) ConstDefs() (x []*ConstDef) {
- for _, file := range p.Files {
- x = append(x, file.ConstDefs...)
- }
- return
-}
+// ErrorDefs returns all errors defined in this package. Errors don't have
+// dependencies.
+func (p *Package) ErrorDefs() (x []*ErrorDef) { return p.errorDefs }
-func (p *Package) ErrorDefs() (x []*ErrorDef) {
- for _, file := range p.Files {
- x = append(x, file.ErrorDefs...)
- }
- return
-}
-
-func (p *Package) Interfaces() (x []*Interface) {
- for _, file := range p.Files {
- x = append(x, file.Interfaces...)
- }
- return
-}
+// Interfaces returns all interfaces defined in this package, in dependency
+// order. If interface B embeds interface A, B depends on A, and A will appear
+// before B. Interfaces cannot have cyclic dependencies.
+func (p *Package) Interfaces() (x []*Interface) { return p.ifaceDefs }
// File represents a compiled vdl file.
type File struct {
BaseName string // Base name of the vdl file, e.g. "foo.vdl"
PackageDef NamePos // Name, position and docs of the "package" clause
- ErrorDefs []*ErrorDef // Errors defined in this file
TypeDefs []*TypeDef // Types defined in this file
ConstDefs []*ConstDef // Consts defined in this file
+ ErrorDefs []*ErrorDef // Errors defined in this file
Interfaces []*Interface // Interfaces defined in this file
Package *Package // Parent package
@@ -498,8 +494,12 @@
func (x *NamePos) String() string { return fmt.Sprintf("%+v", *x) }
func (x *Package) String() string {
c := *x
+ c.typeMap = nil
+ c.constMap = nil
+ c.ifaceMap = nil
c.typeDefs = nil
c.constDefs = nil
+ c.errorDefs = nil
c.ifaceDefs = nil
return fmt.Sprintf("%+v", c)
}
diff --git a/lib/vdl/compile/type.go b/lib/vdl/compile/type.go
index df873c9..e53bc8f 100644
--- a/lib/vdl/compile/type.go
+++ b/lib/vdl/compile/type.go
@@ -8,6 +8,7 @@
"fmt"
"v.io/v23/vdl"
+ "v.io/x/lib/toposort"
"v.io/x/ref/lib/vdl/parse"
)
@@ -37,9 +38,9 @@
}
func (x *TypeDef) String() string {
- c := *x
- c.File = nil // avoid infinite loop
- return fmt.Sprintf("%+v", c)
+ y := *x
+ y.File = nil // avoid infinite loop
+ return fmt.Sprintf("%+v", y)
}
// compileTypeDefs is the "entry point" to the rest of this file. It takes the
@@ -49,27 +50,25 @@
pkg: pkg,
pfiles: pfiles,
env: env,
- tbuilder: &vdl.TypeBuilder{},
+ vtb: &vdl.TypeBuilder{},
builders: make(map[string]*typeDefBuilder),
}
if td.Declare(); !env.Errors.IsEmpty() {
return
}
+ if td.Describe(); !env.Errors.IsEmpty() {
+ return
+ }
if td.Define(); !env.Errors.IsEmpty() {
return
}
- if td.Build(); !env.Errors.IsEmpty() {
- return
- }
td.AttachDoc()
- // TODO(toddw): should we disallow inter-file cyclic type dependencies? That
- // might be an issue for generated C++.
}
// typeDefiner defines types in a package. This is split into three phases:
// 1) Declare ensures local type references can be resolved.
-// 2) Define describes each type, resolving named references.
-// 3) Build builds all types.
+// 2) Describe describes each type, resolving named references.
+// 3) Define sorts in dependency order, and builds and defines all types.
//
// It holds a builders map from type name to typeDefBuilder, where the
// typeDefBuilder is responsible for compiling and defining a single type.
@@ -77,7 +76,7 @@
pkg *Package
pfiles []*parse.File
env *Env
- tbuilder *vdl.TypeBuilder
+ vtb *vdl.TypeBuilder
builders map[string]*typeDefBuilder
}
@@ -109,57 +108,57 @@
td.env.prefixErrorf(file, pdef.Pos, err, "type %s invalid name", pdef.Name)
return nil
}
- ret := new(typeDefBuilder)
- ret.def = &TypeDef{NamePos: NamePos(pdef.NamePos), Exported: export, File: file}
- ret.ptype = pdef.Type
+ b := new(typeDefBuilder)
+ b.def = &TypeDef{NamePos: NamePos(pdef.NamePos), Exported: export, File: file}
+ b.ptype = pdef.Type
// We use the qualified name to actually name the type, to ensure types
// defined in separate packages are hash-consed separately.
qname := file.Package.QualifiedName(pdef.Name)
- ret.pending = td.tbuilder.Named(qname)
+ b.pending = td.vtb.Named(qname)
switch pt := pdef.Type.(type) {
case *parse.TypeEnum:
- ret.def.LabelDoc = make([]string, len(pt.Labels))
- ret.def.LabelDocSuffix = make([]string, len(pt.Labels))
+ b.def.LabelDoc = make([]string, len(pt.Labels))
+ b.def.LabelDocSuffix = make([]string, len(pt.Labels))
for index, plabel := range pt.Labels {
if err := validExportedIdent(plabel.Name, reservedFirstRuneLower); err != nil {
td.env.prefixErrorf(file, plabel.Pos, err, "invalid enum label name %s", plabel.Name)
return nil
}
- ret.def.LabelDoc[index] = plabel.Doc
- ret.def.LabelDocSuffix[index] = plabel.DocSuffix
+ b.def.LabelDoc[index] = plabel.Doc
+ b.def.LabelDocSuffix[index] = plabel.DocSuffix
}
case *parse.TypeStruct:
- ret = attachFieldDoc(ret, pt.Fields, file, td.env)
+ b = attachFieldDoc(b, pt.Fields, file, td.env)
case *parse.TypeUnion:
- ret = attachFieldDoc(ret, pt.Fields, file, td.env)
+ b = attachFieldDoc(b, pt.Fields, file, td.env)
}
- return ret
+ return b
}
-func attachFieldDoc(ret *typeDefBuilder, fields []*parse.Field, file *File, env *Env) *typeDefBuilder {
- ret.def.FieldDoc = make([]string, len(fields))
- ret.def.FieldDocSuffix = make([]string, len(fields))
+func attachFieldDoc(b *typeDefBuilder, fields []*parse.Field, file *File, env *Env) *typeDefBuilder {
+ b.def.FieldDoc = make([]string, len(fields))
+ b.def.FieldDocSuffix = make([]string, len(fields))
for index, pfield := range fields {
if err := validExportedIdent(pfield.Name, reservedFirstRuneLower); err != nil {
env.prefixErrorf(file, pfield.Pos, err, "invalid field name %s", pfield.Name)
return nil
}
- ret.def.FieldDoc[index] = pfield.Doc
- ret.def.FieldDocSuffix[index] = pfield.DocSuffix
+ b.def.FieldDoc[index] = pfield.Doc
+ b.def.FieldDocSuffix[index] = pfield.DocSuffix
}
- return ret
+ return b
}
-// Define uses the builders to describe each type. Named types defined in
+// Describe uses the builders to describe each type. Named types defined in
// other packages must have already been compiled, and in env. Named types
// defined in this package are represented by the builders.
-func (td typeDefiner) Define() {
+func (td typeDefiner) Describe() {
for _, b := range td.builders {
def, file := b.def, b.def.File
- base := compileDefinedType(b.ptype, file, td.env, td.tbuilder, td.builders)
+ base := compileDefinedType(b.ptype, file, td.env, td.vtb, td.builders)
switch tbase := base.(type) {
case nil:
- continue // keep going to catch more errors
+ continue // keep going to catch more errors
case *vdl.Type:
if tbase == vdl.ErrorType {
td.env.Errorf(file, def.Pos, "error cannot be renamed")
@@ -178,9 +177,9 @@
// compileType returns the *vdl.Type corresponding to ptype. All named types
// referenced by ptype must already be defined.
func compileType(ptype parse.Type, file *File, env *Env) *vdl.Type {
- var tbuilder vdl.TypeBuilder
- typeOrPending := compileLiteralType(ptype, file, env, &tbuilder, nil)
- tbuilder.Build()
+ var vtb vdl.TypeBuilder
+ typeOrPending := compileLiteralType(ptype, file, env, &vtb, nil)
+ vtb.Build()
switch top := typeOrPending.(type) {
case nil:
return nil
@@ -200,24 +199,24 @@
// compileDefinedType compiles ptype. It can handle definitions based on array,
// enum, struct and union, as well as definitions based on any literal type.
-func compileDefinedType(ptype parse.Type, file *File, env *Env, tbuilder *vdl.TypeBuilder, builders map[string]*typeDefBuilder) vdl.TypeOrPending {
+func compileDefinedType(ptype parse.Type, file *File, env *Env, vtb *vdl.TypeBuilder, builders map[string]*typeDefBuilder) vdl.TypeOrPending {
switch pt := ptype.(type) {
case *parse.TypeArray:
- elem := compileLiteralType(pt.Elem, file, env, tbuilder, builders)
+ elem := compileLiteralType(pt.Elem, file, env, vtb, builders)
if elem == nil {
return nil
}
- return tbuilder.Array().AssignLen(pt.Len).AssignElem(elem)
+ return vtb.Array().AssignLen(pt.Len).AssignElem(elem)
case *parse.TypeEnum:
- enum := tbuilder.Enum()
+ enum := vtb.Enum()
for _, plabel := range pt.Labels {
enum.AppendLabel(plabel.Name)
}
return enum
case *parse.TypeStruct:
- st := tbuilder.Struct()
+ st := vtb.Struct()
for _, pfield := range pt.Fields {
- ftype := compileLiteralType(pfield.Type, file, env, tbuilder, builders)
+ ftype := compileLiteralType(pfield.Type, file, env, vtb, builders)
if ftype == nil {
return nil
}
@@ -225,9 +224,9 @@
}
return st
case *parse.TypeUnion:
- union := tbuilder.Union()
+ union := vtb.Union()
for _, pfield := range pt.Fields {
- ftype := compileLiteralType(pfield.Type, file, env, tbuilder, builders)
+ ftype := compileLiteralType(pfield.Type, file, env, vtb, builders)
if ftype == nil {
return nil
}
@@ -235,7 +234,7 @@
}
return union
}
- lit := compileLiteralType(ptype, file, env, tbuilder, builders)
+ lit := compileLiteralType(ptype, file, env, vtb, builders)
if _, ok := lit.(vdl.PendingOptional); ok {
// Don't allow Optional at the top-level of a type definition. The purpose
// of this rule is twofold:
@@ -258,7 +257,7 @@
// compileLiteralType compiles ptype. It can handle any literal type. Note
// that array, enum, struct and union are required to be defined and named,
// and aren't allowed as regular literal types.
-func compileLiteralType(ptype parse.Type, file *File, env *Env, tbuilder *vdl.TypeBuilder, builders map[string]*typeDefBuilder) vdl.TypeOrPending {
+func compileLiteralType(ptype parse.Type, file *File, env *Env, vtb *vdl.TypeBuilder, builders map[string]*typeDefBuilder) vdl.TypeOrPending {
switch pt := ptype.(type) {
case *parse.TypeNamed:
if def, matched := env.ResolveType(pt.Name, file); def != nil {
@@ -274,64 +273,127 @@
env.Errorf(file, pt.Pos(), "type %s undefined", pt.Name)
return nil
case *parse.TypeList:
- elem := compileLiteralType(pt.Elem, file, env, tbuilder, builders)
+ elem := compileLiteralType(pt.Elem, file, env, vtb, builders)
if elem == nil {
return nil
}
- return tbuilder.List().AssignElem(elem)
+ return vtb.List().AssignElem(elem)
case *parse.TypeSet:
- key := compileLiteralType(pt.Key, file, env, tbuilder, builders)
+ key := compileLiteralType(pt.Key, file, env, vtb, builders)
if key == nil {
return nil
}
- return tbuilder.Set().AssignKey(key)
+ return vtb.Set().AssignKey(key)
case *parse.TypeMap:
- key := compileLiteralType(pt.Key, file, env, tbuilder, builders)
- elem := compileLiteralType(pt.Elem, file, env, tbuilder, builders)
+ key := compileLiteralType(pt.Key, file, env, vtb, builders)
+ elem := compileLiteralType(pt.Elem, file, env, vtb, builders)
if key == nil || elem == nil {
return nil
}
- return tbuilder.Map().AssignKey(key).AssignElem(elem)
+ return vtb.Map().AssignKey(key).AssignElem(elem)
case *parse.TypeOptional:
- elem := compileLiteralType(pt.Base, file, env, tbuilder, builders)
+ elem := compileLiteralType(pt.Base, file, env, vtb, builders)
if elem == nil {
return nil
}
- return tbuilder.Optional().AssignElem(elem)
+ return vtb.Optional().AssignElem(elem)
default:
env.Errorf(file, pt.Pos(), "unnamed %s type invalid (type must be defined)", ptype.Kind())
return nil
}
}
-// Build actually builds each type and updates the package with the typedefs.
-// The order we call each pending type doesn't matter; the v.io/v23/vdl package
-// deals with arbitrary orders, and supports recursive types. However we want
-// the order to be deterministic, otherwise the output will constantly change.
-// So we use the same order as the parsed file.
-func (td typeDefiner) Build() {
- td.tbuilder.Build()
+// Define types. We sort by dependencies on other types in this package. If
+// there are cycles, the order is arbitrary; otherwise the types are ordered
+// topologically.
+//
+// The order that we call Built on each pending type doesn't actually matter;
+// the v.io/v23/vdl package deals with arbitrary orders, and supports recursive
+// types. However we want the order to be deterministic, otherwise the output
+// will constantly change. And it's nicer for some code generators to get types
+// in dependency order when possible.
+func (td typeDefiner) Define() {
+ td.vtb.Build()
+ // Sort all types.
+ var sorter toposort.Sorter
for _, pfile := range td.pfiles {
for _, pdef := range pfile.TypeDefs {
b := td.builders[pdef.Name]
- def, file := b.def, b.def.File
- if b.base != nil {
- base, err := b.base.Built()
- if err != nil {
- td.env.prefixErrorf(file, b.ptype.Pos(), err, "%s base type invalid", def.Name)
- return
- }
- def.BaseType = base
+ sorter.AddNode(b)
+ for _, dep := range td.getLocalDeps(b.ptype) {
+ sorter.AddEdge(b, dep)
}
- t, err := b.pending.Built()
- if err != nil {
- td.env.prefixErrorf(file, def.Pos, err, "%s invalid", def.Name)
- return
- }
- def.Type = t
- addTypeDef(def, td.env)
}
}
+ sorted, _ := sorter.Sort()
+ // Define all types.
+ for _, ibuilder := range sorted {
+ b := ibuilder.(*typeDefBuilder)
+ def, file := b.def, b.def.File
+ if b.base != nil {
+ base, err := b.base.Built()
+ if err != nil {
+ td.env.prefixErrorf(file, b.ptype.Pos(), err, "%s base type invalid", def.Name)
+ return
+ }
+ def.BaseType = base
+ }
+ t, err := b.pending.Built()
+ if err != nil {
+ td.env.prefixErrorf(file, def.Pos, err, "%s invalid", def.Name)
+ return
+ }
+ def.Type = t
+ addTypeDef(def, td.env)
+ }
+}
+
+// addTypeDef updates our various structures to add a new type def.
+func addTypeDef(def *TypeDef, env *Env) {
+ def.File.TypeDefs = append(def.File.TypeDefs, def)
+ def.File.Package.typeDefs = append(def.File.Package.typeDefs, def)
+ def.File.Package.typeMap[def.Name] = def
+ if env != nil {
+ // env should only be nil during initialization of the built-in package;
+ // NewEnv ensures new environments have the built-in types.
+ env.typeMap[def.Type] = def
+ }
+}
+
+// getLocalDeps returns a list of named type dependencies for ptype, where each
+// dependency is defined in this package.
+func (td typeDefiner) getLocalDeps(ptype parse.Type) (deps []*typeDefBuilder) {
+ switch pt := ptype.(type) {
+ case *parse.TypeNamed:
+ // Named references to other types in this package are all we care about.
+ if b := td.builders[pt.Name]; b != nil {
+ deps = append(deps, b)
+ }
+ case *parse.TypeEnum:
+ // No deps.
+ case *parse.TypeArray:
+ deps = append(deps, td.getLocalDeps(pt.Elem)...)
+ case *parse.TypeList:
+ deps = append(deps, td.getLocalDeps(pt.Elem)...)
+ case *parse.TypeSet:
+ deps = append(deps, td.getLocalDeps(pt.Key)...)
+ case *parse.TypeMap:
+ deps = append(deps, td.getLocalDeps(pt.Key)...)
+ deps = append(deps, td.getLocalDeps(pt.Elem)...)
+ case *parse.TypeStruct:
+ for _, field := range pt.Fields {
+ deps = append(deps, td.getLocalDeps(field.Type)...)
+ }
+ case *parse.TypeUnion:
+ for _, field := range pt.Fields {
+ deps = append(deps, td.getLocalDeps(field.Type)...)
+ }
+ case *parse.TypeOptional:
+ deps = append(deps, td.getLocalDeps(pt.Base)...)
+ default:
+ panic(fmt.Errorf("vdl: unhandled parse.Type %T %#v", ptype, ptype))
+ }
+ return
}
// AttachDoc makes another pass to fill in doc and doc suffix slices for enums,
@@ -364,14 +426,3 @@
}
}
}
-
-// addTypeDef updates our various structures to add a new type def.
-func addTypeDef(def *TypeDef, env *Env) {
- def.File.TypeDefs = append(def.File.TypeDefs, def)
- def.File.Package.typeDefs[def.Name] = def
- if env != nil {
- // env should only be nil during initialization of the built-in package;
- // NewEnv ensures new environments have the built-in types.
- env.typeDefs[def.Type] = def
- }
-}
diff --git a/lib/vdl/testdata/arith/arith.vdl.go b/lib/vdl/testdata/arith/arith.vdl.go
index 002e1eb..a7eefd1 100644
--- a/lib/vdl/testdata/arith/arith.vdl.go
+++ b/lib/vdl/testdata/arith/arith.vdl.go
@@ -19,15 +19,15 @@
"v.io/x/ref/lib/vdl/testdata/base"
)
-func __VDLEnsureNativeBuilt() {
-}
+var _ = __VDLInit() // Must be first; see __VDLInit comments for details.
+
+//////////////////////////////////////////////////
+// Const definitions
// Yes shows that bools may be untyped.
const Yes = true // yes trailing doc
-
// No shows explicit boolean typing.
const No = false
-
const Hello = "hello"
// Int32Const shows explicit integer typing.
@@ -43,6 +43,9 @@
// Mask shows bitwise operations.
const Mask = uint64(256)
+//////////////////////////////////////////////////
+// Interface definitions
+
// TrigonometryClientMethods is the client interface
// containing Trigonometry methods.
//
@@ -1018,3 +1021,26 @@
},
},
}
+
+var __VDLInitCalled bool
+
+// __VDLInit performs vdl initialization. It is safe to call multiple times.
+// If you have an init ordering issue, just insert the following line verbatim
+// into your source files in this package, right after the "package foo" clause:
+//
+// var _ = __VDLInit()
+//
+// The purpose of this function is to ensure that vdl initialization occurs in
+// the right order, and very early in the init sequence. In particular, vdl
+// registration and package variable initialization needs to occur before
+// functions like vdl.TypeOf will work properly.
+//
+// This function returns a dummy value, so that it can be used to initialize the
+// first var in the file, to take advantage of Go's defined init order.
+func __VDLInit() struct{} {
+ if __VDLInitCalled {
+ return struct{}{}
+ }
+
+ return struct{}{}
+}
diff --git a/lib/vdl/testdata/arith/exp/exp.vdl.go b/lib/vdl/testdata/arith/exp/exp.vdl.go
index ba8aec0..d3ca14d 100644
--- a/lib/vdl/testdata/arith/exp/exp.vdl.go
+++ b/lib/vdl/testdata/arith/exp/exp.vdl.go
@@ -15,8 +15,10 @@
"v.io/v23/rpc"
)
-func __VDLEnsureNativeBuilt() {
-}
+var _ = __VDLInit() // Must be first; see __VDLInit comments for details.
+
+//////////////////////////////////////////////////
+// Interface definitions
// ExpClientMethods is the client interface
// containing Exp methods.
@@ -116,3 +118,26 @@
},
},
}
+
+var __VDLInitCalled bool
+
+// __VDLInit performs vdl initialization. It is safe to call multiple times.
+// If you have an init ordering issue, just insert the following line verbatim
+// into your source files in this package, right after the "package foo" clause:
+//
+// var _ = __VDLInit()
+//
+// The purpose of this function is to ensure that vdl initialization occurs in
+// the right order, and very early in the init sequence. In particular, vdl
+// registration and package variable initialization needs to occur before
+// functions like vdl.TypeOf will work properly.
+//
+// This function returns a dummy value, so that it can be used to initialize the
+// first var in the file, to take advantage of Go's defined init order.
+func __VDLInit() struct{} {
+ if __VDLInitCalled {
+ return struct{}{}
+ }
+
+ return struct{}{}
+}
diff --git a/lib/vdl/testdata/base/base.vdl.go b/lib/vdl/testdata/base/base.vdl.go
index 286b6a5..32e287b 100644
--- a/lib/vdl/testdata/base/base.vdl.go
+++ b/lib/vdl/testdata/base/base.vdl.go
@@ -22,6 +22,11 @@
"v.io/v23/vom"
)
+var _ = __VDLInit() // Must be first; see __VDLInit comments for details.
+
+//////////////////////////////////////////////////
+// Type definitions
+
type NamedBool bool
func (NamedBool) __VDLReflect(struct {
@@ -30,7 +35,7 @@
}
func (m *NamedBool) FillVDLTarget(t vdl.Target, tt *vdl.Type) error {
- if err := t.FromBool(bool((*m)), __VDLType_v_io_x_ref_lib_vdl_testdata_base_NamedBool); err != nil {
+ if err := t.FromBool(bool((*m)), tt); err != nil {
return err
}
return nil
@@ -47,8 +52,8 @@
func (t *NamedBoolTarget) FromBool(src bool, tt *vdl.Type) error {
- if !vdl.Compatible(tt, __VDLType_v_io_x_ref_lib_vdl_testdata_base_NamedBool) {
- return fmt.Errorf("type %v incompatible with %v", tt, __VDLType_v_io_x_ref_lib_vdl_testdata_base_NamedBool)
+ if ttWant := vdl.TypeOf((*NamedBool)(nil)); !vdl.Compatible(tt, ttWant) {
+ return fmt.Errorf("type %v incompatible with %v", tt, ttWant)
}
*t.Value = NamedBool(src)
@@ -63,7 +68,7 @@
}
func (m *NamedByte) FillVDLTarget(t vdl.Target, tt *vdl.Type) error {
- if err := t.FromUint(uint64((*m)), __VDLType_v_io_x_ref_lib_vdl_testdata_base_NamedByte); err != nil {
+ if err := t.FromUint(uint64((*m)), tt); err != nil {
return err
}
return nil
@@ -127,7 +132,7 @@
}
func (m *NamedUint16) FillVDLTarget(t vdl.Target, tt *vdl.Type) error {
- if err := t.FromUint(uint64((*m)), __VDLType_v_io_x_ref_lib_vdl_testdata_base_NamedUint16); err != nil {
+ if err := t.FromUint(uint64((*m)), tt); err != nil {
return err
}
return nil
@@ -191,7 +196,7 @@
}
func (m *NamedUint32) FillVDLTarget(t vdl.Target, tt *vdl.Type) error {
- if err := t.FromUint(uint64((*m)), __VDLType_v_io_x_ref_lib_vdl_testdata_base_NamedUint32); err != nil {
+ if err := t.FromUint(uint64((*m)), tt); err != nil {
return err
}
return nil
@@ -255,7 +260,7 @@
}
func (m *NamedUint64) FillVDLTarget(t vdl.Target, tt *vdl.Type) error {
- if err := t.FromUint(uint64((*m)), __VDLType_v_io_x_ref_lib_vdl_testdata_base_NamedUint64); err != nil {
+ if err := t.FromUint(uint64((*m)), tt); err != nil {
return err
}
return nil
@@ -315,7 +320,7 @@
}
func (m *NamedInt8) FillVDLTarget(t vdl.Target, tt *vdl.Type) error {
- if err := t.FromInt(int64((*m)), __VDLType_v_io_x_ref_lib_vdl_testdata_base_NamedInt8); err != nil {
+ if err := t.FromInt(int64((*m)), tt); err != nil {
return err
}
return nil
@@ -379,7 +384,7 @@
}
func (m *NamedInt16) FillVDLTarget(t vdl.Target, tt *vdl.Type) error {
- if err := t.FromInt(int64((*m)), __VDLType_v_io_x_ref_lib_vdl_testdata_base_NamedInt16); err != nil {
+ if err := t.FromInt(int64((*m)), tt); err != nil {
return err
}
return nil
@@ -443,7 +448,7 @@
}
func (m *NamedInt32) FillVDLTarget(t vdl.Target, tt *vdl.Type) error {
- if err := t.FromInt(int64((*m)), __VDLType_v_io_x_ref_lib_vdl_testdata_base_NamedInt32); err != nil {
+ if err := t.FromInt(int64((*m)), tt); err != nil {
return err
}
return nil
@@ -507,7 +512,7 @@
}
func (m *NamedInt64) FillVDLTarget(t vdl.Target, tt *vdl.Type) error {
- if err := t.FromInt(int64((*m)), __VDLType_v_io_x_ref_lib_vdl_testdata_base_NamedInt64); err != nil {
+ if err := t.FromInt(int64((*m)), tt); err != nil {
return err
}
return nil
@@ -567,7 +572,7 @@
}
func (m *NamedFloat32) FillVDLTarget(t vdl.Target, tt *vdl.Type) error {
- if err := t.FromFloat(float64((*m)), __VDLType_v_io_x_ref_lib_vdl_testdata_base_NamedFloat32); err != nil {
+ if err := t.FromFloat(float64((*m)), tt); err != nil {
return err
}
return nil
@@ -631,7 +636,7 @@
}
func (m *NamedFloat64) FillVDLTarget(t vdl.Target, tt *vdl.Type) error {
- if err := t.FromFloat(float64((*m)), __VDLType_v_io_x_ref_lib_vdl_testdata_base_NamedFloat64); err != nil {
+ if err := t.FromFloat(float64((*m)), tt); err != nil {
return err
}
return nil
@@ -691,7 +696,7 @@
}
func (m *NamedComplex64) FillVDLTarget(t vdl.Target, tt *vdl.Type) error {
- if err := t.FromComplex(complex128((*m)), __VDLType_v_io_x_ref_lib_vdl_testdata_base_NamedComplex64); err != nil {
+ if err := t.FromComplex(complex128((*m)), tt); err != nil {
return err
}
return nil
@@ -755,7 +760,7 @@
}
func (m *NamedComplex128) FillVDLTarget(t vdl.Target, tt *vdl.Type) error {
- if err := t.FromComplex(complex128((*m)), __VDLType_v_io_x_ref_lib_vdl_testdata_base_NamedComplex128); err != nil {
+ if err := t.FromComplex(complex128((*m)), tt); err != nil {
return err
}
return nil
@@ -815,7 +820,7 @@
}
func (m *NamedString) FillVDLTarget(t vdl.Target, tt *vdl.Type) error {
- if err := t.FromString(string((*m)), __VDLType_v_io_x_ref_lib_vdl_testdata_base_NamedString); err != nil {
+ if err := t.FromString(string((*m)), tt); err != nil {
return err
}
return nil
@@ -832,8 +837,8 @@
func (t *NamedStringTarget) FromString(src string, tt *vdl.Type) error {
- if !vdl.Compatible(tt, __VDLType_v_io_x_ref_lib_vdl_testdata_base_NamedString) {
- return fmt.Errorf("type %v incompatible with %v", tt, __VDLType_v_io_x_ref_lib_vdl_testdata_base_NamedString)
+ if ttWant := vdl.TypeOf((*NamedString)(nil)); !vdl.Compatible(tt, ttWant) {
+ return fmt.Errorf("type %v incompatible with %v", tt, ttWant)
}
*t.Value = NamedString(src)
@@ -894,7 +899,7 @@
}
func (m *NamedEnum) FillVDLTarget(t vdl.Target, tt *vdl.Type) error {
- if err := t.FromEnumLabel((*m).String(), __VDLType_v_io_x_ref_lib_vdl_testdata_base_NamedEnum); err != nil {
+ if err := t.FromEnumLabel((*m).String(), tt); err != nil {
return err
}
return nil
@@ -911,8 +916,8 @@
func (t *NamedEnumTarget) FromEnumLabel(src string, tt *vdl.Type) error {
- if !vdl.Compatible(tt, __VDLType_v_io_x_ref_lib_vdl_testdata_base_NamedEnum) {
- return fmt.Errorf("type %v incompatible with %v", tt, __VDLType_v_io_x_ref_lib_vdl_testdata_base_NamedEnum)
+ if ttWant := vdl.TypeOf((*NamedEnum)(nil)); !vdl.Compatible(tt, ttWant) {
+ return fmt.Errorf("type %v incompatible with %v", tt, ttWant)
}
switch src {
case "A":
@@ -922,7 +927,7 @@
case "C":
*t.Value = 2
default:
- return fmt.Errorf("label %s not in enum %v", src, __VDLType_v_io_x_ref_lib_vdl_testdata_base_NamedEnum)
+ return fmt.Errorf("label %s not in enum v.io/x/ref/lib/vdl/testdata/base.NamedEnum", src)
}
return nil
@@ -936,7 +941,7 @@
}
func (m *NamedArray) FillVDLTarget(t vdl.Target, tt *vdl.Type) error {
- listTarget1, err := t.StartList(__VDLType_v_io_x_ref_lib_vdl_testdata_base_NamedArray, 2)
+ listTarget1, err := t.StartList(tt, 2)
if err != nil {
return err
}
@@ -945,7 +950,7 @@
if err != nil {
return err
}
- if err := elemTarget2.FromBool(bool(elem3), vdl.BoolType); err != nil {
+ if err := elemTarget2.FromBool(bool(elem3), tt.NonOptional().Elem()); err != nil {
return err
}
if err := listTarget1.FinishElem(elemTarget2); err != nil {
@@ -972,8 +977,8 @@
func (t *NamedArrayTarget) StartList(tt *vdl.Type, len int) (vdl.ListTarget, error) {
- if !vdl.Compatible(tt, __VDLType_v_io_x_ref_lib_vdl_testdata_base_NamedArray) {
- return nil, fmt.Errorf("type %v incompatible with %v", tt, __VDLType_v_io_x_ref_lib_vdl_testdata_base_NamedArray)
+ if ttWant := vdl.TypeOf((*NamedArray)(nil)); !vdl.Compatible(tt, ttWant) {
+ return nil, fmt.Errorf("type %v incompatible with %v", tt, ttWant)
}
return t, nil
}
@@ -998,7 +1003,7 @@
}
func (m *NamedList) FillVDLTarget(t vdl.Target, tt *vdl.Type) error {
- listTarget1, err := t.StartList(__VDLType_v_io_x_ref_lib_vdl_testdata_base_NamedList, len((*m)))
+ listTarget1, err := t.StartList(tt, len((*m)))
if err != nil {
return err
}
@@ -1007,7 +1012,7 @@
if err != nil {
return err
}
- if err := elemTarget2.FromUint(uint64(elem3), vdl.Uint32Type); err != nil {
+ if err := elemTarget2.FromUint(uint64(elem3), tt.NonOptional().Elem()); err != nil {
return err
}
if err := listTarget1.FinishElem(elemTarget2); err != nil {
@@ -1034,8 +1039,8 @@
func (t *NamedListTarget) StartList(tt *vdl.Type, len int) (vdl.ListTarget, error) {
- if !vdl.Compatible(tt, __VDLType_v_io_x_ref_lib_vdl_testdata_base_NamedList) {
- return nil, fmt.Errorf("type %v incompatible with %v", tt, __VDLType_v_io_x_ref_lib_vdl_testdata_base_NamedList)
+ if ttWant := vdl.TypeOf((*NamedList)(nil)); !vdl.Compatible(tt, ttWant) {
+ return nil, fmt.Errorf("type %v incompatible with %v", tt, ttWant)
}
if cap(*t.Value) < len {
*t.Value = make(NamedList, len)
@@ -1065,7 +1070,7 @@
}
func (m *NamedSet) FillVDLTarget(t vdl.Target, tt *vdl.Type) error {
- setTarget1, err := t.StartSet(__VDLType_v_io_x_ref_lib_vdl_testdata_base_NamedSet, len((*m)))
+ setTarget1, err := t.StartSet(tt, len((*m)))
if err != nil {
return err
}
@@ -1074,7 +1079,7 @@
if err != nil {
return err
}
- if err := keyTarget2.FromString(string(key3), vdl.StringType); err != nil {
+ if err := keyTarget2.FromString(string(key3), tt.NonOptional().Key()); err != nil {
return err
}
if err := setTarget1.FinishKey(keyTarget2); err != nil {
@@ -1101,8 +1106,8 @@
func (t *NamedSetTarget) StartSet(tt *vdl.Type, len int) (vdl.SetTarget, error) {
- if !vdl.Compatible(tt, __VDLType_v_io_x_ref_lib_vdl_testdata_base_NamedSet) {
- return nil, fmt.Errorf("type %v incompatible with %v", tt, __VDLType_v_io_x_ref_lib_vdl_testdata_base_NamedSet)
+ if ttWant := vdl.TypeOf((*NamedSet)(nil)); !vdl.Compatible(tt, ttWant) {
+ return nil, fmt.Errorf("type %v incompatible with %v", tt, ttWant)
}
*t.Value = make(NamedSet)
return t, nil
@@ -1133,7 +1138,7 @@
}
func (m *NamedMap) FillVDLTarget(t vdl.Target, tt *vdl.Type) error {
- mapTarget1, err := t.StartMap(__VDLType_v_io_x_ref_lib_vdl_testdata_base_NamedMap, len((*m)))
+ mapTarget1, err := t.StartMap(tt, len((*m)))
if err != nil {
return err
}
@@ -1142,14 +1147,14 @@
if err != nil {
return err
}
- if err := keyTarget2.FromString(string(key3), vdl.StringType); err != nil {
+ if err := keyTarget2.FromString(string(key3), tt.NonOptional().Key()); err != nil {
return err
}
valueTarget4, err := mapTarget1.FinishKeyStartField(keyTarget2)
if err != nil {
return err
}
- if err := valueTarget4.FromFloat(float64(value5), vdl.Float32Type); err != nil {
+ if err := valueTarget4.FromFloat(float64(value5), tt.NonOptional().Elem()); err != nil {
return err
}
if err := mapTarget1.FinishField(keyTarget2, valueTarget4); err != nil {
@@ -1178,8 +1183,8 @@
func (t *NamedMapTarget) StartMap(tt *vdl.Type, len int) (vdl.MapTarget, error) {
- if !vdl.Compatible(tt, __VDLType_v_io_x_ref_lib_vdl_testdata_base_NamedMap) {
- return nil, fmt.Errorf("type %v incompatible with %v", tt, __VDLType_v_io_x_ref_lib_vdl_testdata_base_NamedMap)
+ if ttWant := vdl.TypeOf((*NamedMap)(nil)); !vdl.Compatible(tt, ttWant) {
+ return nil, fmt.Errorf("type %v incompatible with %v", tt, ttWant)
}
*t.Value = make(NamedMap)
return t, nil
@@ -1220,9 +1225,6 @@
}
func (m *NamedStruct) FillVDLTarget(t vdl.Target, tt *vdl.Type) error {
- if __VDLType_v_io_x_ref_lib_vdl_testdata_base_NamedStruct == nil || __VDLType0 == nil {
- panic("Initialization order error: types generated for FillVDLTarget not initialized. Consider moving caller to an init() block.")
- }
fieldsTarget1, err := t.StartFields(tt)
if err != nil {
return err
@@ -1233,7 +1235,7 @@
return err
}
if err != vdl.ErrFieldNoExist {
- if err := fieldTarget3.FromBool(bool(m.A), vdl.BoolType); err != nil {
+ if err := fieldTarget3.FromBool(bool(m.A), tt.NonOptional().Field(0).Type); err != nil {
return err
}
if err := fieldsTarget1.FinishField(keyTarget2, fieldTarget3); err != nil {
@@ -1245,7 +1247,7 @@
return err
}
if err != vdl.ErrFieldNoExist {
- if err := fieldTarget5.FromString(string(m.B), vdl.StringType); err != nil {
+ if err := fieldTarget5.FromString(string(m.B), tt.NonOptional().Field(1).Type); err != nil {
return err
}
if err := fieldsTarget1.FinishField(keyTarget4, fieldTarget5); err != nil {
@@ -1257,7 +1259,7 @@
return err
}
if err != vdl.ErrFieldNoExist {
- if err := fieldTarget7.FromInt(int64(m.C), vdl.Int32Type); err != nil {
+ if err := fieldTarget7.FromInt(int64(m.C), tt.NonOptional().Field(2).Type); err != nil {
return err
}
if err := fieldsTarget1.FinishField(keyTarget6, fieldTarget7); err != nil {
@@ -1285,8 +1287,8 @@
func (t *NamedStructTarget) StartFields(tt *vdl.Type) (vdl.FieldsTarget, error) {
- if !vdl.Compatible(tt, __VDLType_v_io_x_ref_lib_vdl_testdata_base_NamedStruct) {
- return nil, fmt.Errorf("type %v incompatible with %v", tt, __VDLType_v_io_x_ref_lib_vdl_testdata_base_NamedStruct)
+ if ttWant := vdl.TypeOf((*NamedStruct)(nil)).Elem(); !vdl.Compatible(tt, ttWant) {
+ return nil, fmt.Errorf("type %v incompatible with %v", tt, ttWant)
}
return t, nil
}
@@ -1305,7 +1307,7 @@
target, err := &t.cTarget, error(nil)
return nil, target, err
default:
- return nil, nil, fmt.Errorf("field %s not in struct %v", name, __VDLType_v_io_x_ref_lib_vdl_testdata_base_NamedStruct)
+ return nil, nil, fmt.Errorf("field %s not in struct v.io/x/ref/lib/vdl/testdata/base.NamedStruct", name)
}
}
func (t *NamedStructTarget) FinishField(_, _ vdl.Target) error {
@@ -1353,7 +1355,7 @@
func (x NamedUnionA) __VDLReflect(__NamedUnionReflect) {}
func (m NamedUnionA) FillVDLTarget(t vdl.Target, tt *vdl.Type) error {
- fieldsTarget1, err := t.StartFields(__VDLType_v_io_x_ref_lib_vdl_testdata_base_NamedUnion)
+ fieldsTarget1, err := t.StartFields(tt)
if err != nil {
return err
}
@@ -1361,7 +1363,7 @@
if err != nil {
return err
}
- if err := fieldTarget3.FromBool(bool(m.Value), vdl.BoolType); err != nil {
+ if err := fieldTarget3.FromBool(bool(m.Value), tt.NonOptional().Field(0).Type); err != nil {
return err
}
if err := fieldsTarget1.FinishField(keyTarget2, fieldTarget3); err != nil {
@@ -1384,7 +1386,7 @@
func (x NamedUnionB) __VDLReflect(__NamedUnionReflect) {}
func (m NamedUnionB) FillVDLTarget(t vdl.Target, tt *vdl.Type) error {
- fieldsTarget1, err := t.StartFields(__VDLType_v_io_x_ref_lib_vdl_testdata_base_NamedUnion)
+ fieldsTarget1, err := t.StartFields(tt)
if err != nil {
return err
}
@@ -1392,7 +1394,7 @@
if err != nil {
return err
}
- if err := fieldTarget3.FromString(string(m.Value), vdl.StringType); err != nil {
+ if err := fieldTarget3.FromString(string(m.Value), tt.NonOptional().Field(1).Type); err != nil {
return err
}
if err := fieldsTarget1.FinishField(keyTarget2, fieldTarget3); err != nil {
@@ -1415,7 +1417,7 @@
func (x NamedUnionC) __VDLReflect(__NamedUnionReflect) {}
func (m NamedUnionC) FillVDLTarget(t vdl.Target, tt *vdl.Type) error {
- fieldsTarget1, err := t.StartFields(__VDLType_v_io_x_ref_lib_vdl_testdata_base_NamedUnion)
+ fieldsTarget1, err := t.StartFields(tt)
if err != nil {
return err
}
@@ -1423,7 +1425,7 @@
if err != nil {
return err
}
- if err := fieldTarget3.FromInt(int64(m.Value), vdl.Int32Type); err != nil {
+ if err := fieldTarget3.FromInt(int64(m.Value), tt.NonOptional().Field(2).Type); err != nil {
return err
}
if err := fieldsTarget1.FinishField(keyTarget2, fieldTarget3); err != nil {
@@ -1482,9 +1484,6 @@
}
func (m *Scalars) FillVDLTarget(t vdl.Target, tt *vdl.Type) error {
- if __VDLType_v_io_x_ref_lib_vdl_testdata_base_Scalars == nil || __VDLType1 == nil {
- panic("Initialization order error: types generated for FillVDLTarget not initialized. Consider moving caller to an init() block.")
- }
fieldsTarget1, err := t.StartFields(tt)
if err != nil {
return err
@@ -1495,7 +1494,7 @@
return err
}
if err != vdl.ErrFieldNoExist {
- if err := fieldTarget3.FromBool(bool(m.A0), vdl.BoolType); err != nil {
+ if err := fieldTarget3.FromBool(bool(m.A0), tt.NonOptional().Field(0).Type); err != nil {
return err
}
if err := fieldsTarget1.FinishField(keyTarget2, fieldTarget3); err != nil {
@@ -1507,7 +1506,7 @@
return err
}
if err != vdl.ErrFieldNoExist {
- if err := fieldTarget5.FromUint(uint64(m.A1), vdl.ByteType); err != nil {
+ if err := fieldTarget5.FromUint(uint64(m.A1), tt.NonOptional().Field(1).Type); err != nil {
return err
}
if err := fieldsTarget1.FinishField(keyTarget4, fieldTarget5); err != nil {
@@ -1519,7 +1518,7 @@
return err
}
if err != vdl.ErrFieldNoExist {
- if err := fieldTarget7.FromUint(uint64(m.A2), vdl.Uint16Type); err != nil {
+ if err := fieldTarget7.FromUint(uint64(m.A2), tt.NonOptional().Field(2).Type); err != nil {
return err
}
if err := fieldsTarget1.FinishField(keyTarget6, fieldTarget7); err != nil {
@@ -1531,7 +1530,7 @@
return err
}
if err != vdl.ErrFieldNoExist {
- if err := fieldTarget9.FromUint(uint64(m.A3), vdl.Uint32Type); err != nil {
+ if err := fieldTarget9.FromUint(uint64(m.A3), tt.NonOptional().Field(3).Type); err != nil {
return err
}
if err := fieldsTarget1.FinishField(keyTarget8, fieldTarget9); err != nil {
@@ -1543,7 +1542,7 @@
return err
}
if err != vdl.ErrFieldNoExist {
- if err := fieldTarget11.FromUint(uint64(m.A4), vdl.Uint64Type); err != nil {
+ if err := fieldTarget11.FromUint(uint64(m.A4), tt.NonOptional().Field(4).Type); err != nil {
return err
}
if err := fieldsTarget1.FinishField(keyTarget10, fieldTarget11); err != nil {
@@ -1555,7 +1554,7 @@
return err
}
if err != vdl.ErrFieldNoExist {
- if err := fieldTarget13.FromInt(int64(m.A5), vdl.Int8Type); err != nil {
+ if err := fieldTarget13.FromInt(int64(m.A5), tt.NonOptional().Field(5).Type); err != nil {
return err
}
if err := fieldsTarget1.FinishField(keyTarget12, fieldTarget13); err != nil {
@@ -1567,7 +1566,7 @@
return err
}
if err != vdl.ErrFieldNoExist {
- if err := fieldTarget15.FromInt(int64(m.A6), vdl.Int16Type); err != nil {
+ if err := fieldTarget15.FromInt(int64(m.A6), tt.NonOptional().Field(6).Type); err != nil {
return err
}
if err := fieldsTarget1.FinishField(keyTarget14, fieldTarget15); err != nil {
@@ -1579,7 +1578,7 @@
return err
}
if err != vdl.ErrFieldNoExist {
- if err := fieldTarget17.FromInt(int64(m.A7), vdl.Int32Type); err != nil {
+ if err := fieldTarget17.FromInt(int64(m.A7), tt.NonOptional().Field(7).Type); err != nil {
return err
}
if err := fieldsTarget1.FinishField(keyTarget16, fieldTarget17); err != nil {
@@ -1591,7 +1590,7 @@
return err
}
if err != vdl.ErrFieldNoExist {
- if err := fieldTarget19.FromInt(int64(m.A8), vdl.Int64Type); err != nil {
+ if err := fieldTarget19.FromInt(int64(m.A8), tt.NonOptional().Field(8).Type); err != nil {
return err
}
if err := fieldsTarget1.FinishField(keyTarget18, fieldTarget19); err != nil {
@@ -1603,7 +1602,7 @@
return err
}
if err != vdl.ErrFieldNoExist {
- if err := fieldTarget21.FromFloat(float64(m.A9), vdl.Float32Type); err != nil {
+ if err := fieldTarget21.FromFloat(float64(m.A9), tt.NonOptional().Field(9).Type); err != nil {
return err
}
if err := fieldsTarget1.FinishField(keyTarget20, fieldTarget21); err != nil {
@@ -1615,7 +1614,7 @@
return err
}
if err != vdl.ErrFieldNoExist {
- if err := fieldTarget23.FromFloat(float64(m.A10), vdl.Float64Type); err != nil {
+ if err := fieldTarget23.FromFloat(float64(m.A10), tt.NonOptional().Field(10).Type); err != nil {
return err
}
if err := fieldsTarget1.FinishField(keyTarget22, fieldTarget23); err != nil {
@@ -1627,7 +1626,7 @@
return err
}
if err != vdl.ErrFieldNoExist {
- if err := fieldTarget25.FromComplex(complex128(m.A11), vdl.Complex64Type); err != nil {
+ if err := fieldTarget25.FromComplex(complex128(m.A11), tt.NonOptional().Field(11).Type); err != nil {
return err
}
if err := fieldsTarget1.FinishField(keyTarget24, fieldTarget25); err != nil {
@@ -1639,7 +1638,7 @@
return err
}
if err != vdl.ErrFieldNoExist {
- if err := fieldTarget27.FromComplex(complex128(m.A12), vdl.Complex128Type); err != nil {
+ if err := fieldTarget27.FromComplex(complex128(m.A12), tt.NonOptional().Field(12).Type); err != nil {
return err
}
if err := fieldsTarget1.FinishField(keyTarget26, fieldTarget27); err != nil {
@@ -1651,7 +1650,7 @@
return err
}
if err != vdl.ErrFieldNoExist {
- if err := fieldTarget29.FromString(string(m.A13), vdl.StringType); err != nil {
+ if err := fieldTarget29.FromString(string(m.A13), tt.NonOptional().Field(13).Type); err != nil {
return err
}
if err := fieldsTarget1.FinishField(keyTarget28, fieldTarget29); err != nil {
@@ -1665,7 +1664,7 @@
if err != vdl.ErrFieldNoExist {
if m.A14 == nil {
- if err := fieldTarget31.FromNil(vdl.ErrorType); err != nil {
+ if err := fieldTarget31.FromNil(tt.NonOptional().Field(14).Type); err != nil {
return err
}
} else {
@@ -1689,11 +1688,11 @@
if err != vdl.ErrFieldNoExist {
if m.A15 == nil {
- if err := fieldTarget34.FromNil(vdl.AnyType); err != nil {
+ if err := fieldTarget34.FromNil(tt.NonOptional().Field(15).Type); err != nil {
return err
}
} else {
- if err := m.A15.FillVDLTarget(fieldTarget34, vdl.AnyType); err != nil {
+ if err := m.A15.FillVDLTarget(fieldTarget34, tt.NonOptional().Field(15).Type); err != nil {
return err
}
}
@@ -1723,7 +1722,7 @@
}
if err != vdl.ErrFieldNoExist {
- if err := m.B0.FillVDLTarget(fieldTarget39, __VDLType_v_io_x_ref_lib_vdl_testdata_base_NamedBool); err != nil {
+ if err := m.B0.FillVDLTarget(fieldTarget39, tt.NonOptional().Field(17).Type); err != nil {
return err
}
if err := fieldsTarget1.FinishField(keyTarget38, fieldTarget39); err != nil {
@@ -1736,7 +1735,7 @@
}
if err != vdl.ErrFieldNoExist {
- if err := m.B1.FillVDLTarget(fieldTarget41, __VDLType_v_io_x_ref_lib_vdl_testdata_base_NamedByte); err != nil {
+ if err := m.B1.FillVDLTarget(fieldTarget41, tt.NonOptional().Field(18).Type); err != nil {
return err
}
if err := fieldsTarget1.FinishField(keyTarget40, fieldTarget41); err != nil {
@@ -1749,7 +1748,7 @@
}
if err != vdl.ErrFieldNoExist {
- if err := m.B2.FillVDLTarget(fieldTarget43, __VDLType_v_io_x_ref_lib_vdl_testdata_base_NamedUint16); err != nil {
+ if err := m.B2.FillVDLTarget(fieldTarget43, tt.NonOptional().Field(19).Type); err != nil {
return err
}
if err := fieldsTarget1.FinishField(keyTarget42, fieldTarget43); err != nil {
@@ -1762,7 +1761,7 @@
}
if err != vdl.ErrFieldNoExist {
- if err := m.B3.FillVDLTarget(fieldTarget45, __VDLType_v_io_x_ref_lib_vdl_testdata_base_NamedUint32); err != nil {
+ if err := m.B3.FillVDLTarget(fieldTarget45, tt.NonOptional().Field(20).Type); err != nil {
return err
}
if err := fieldsTarget1.FinishField(keyTarget44, fieldTarget45); err != nil {
@@ -1775,7 +1774,7 @@
}
if err != vdl.ErrFieldNoExist {
- if err := m.B4.FillVDLTarget(fieldTarget47, __VDLType_v_io_x_ref_lib_vdl_testdata_base_NamedUint64); err != nil {
+ if err := m.B4.FillVDLTarget(fieldTarget47, tt.NonOptional().Field(21).Type); err != nil {
return err
}
if err := fieldsTarget1.FinishField(keyTarget46, fieldTarget47); err != nil {
@@ -1788,7 +1787,7 @@
}
if err != vdl.ErrFieldNoExist {
- if err := m.B5.FillVDLTarget(fieldTarget49, __VDLType_v_io_x_ref_lib_vdl_testdata_base_NamedInt8); err != nil {
+ if err := m.B5.FillVDLTarget(fieldTarget49, tt.NonOptional().Field(22).Type); err != nil {
return err
}
if err := fieldsTarget1.FinishField(keyTarget48, fieldTarget49); err != nil {
@@ -1801,7 +1800,7 @@
}
if err != vdl.ErrFieldNoExist {
- if err := m.B6.FillVDLTarget(fieldTarget51, __VDLType_v_io_x_ref_lib_vdl_testdata_base_NamedInt16); err != nil {
+ if err := m.B6.FillVDLTarget(fieldTarget51, tt.NonOptional().Field(23).Type); err != nil {
return err
}
if err := fieldsTarget1.FinishField(keyTarget50, fieldTarget51); err != nil {
@@ -1814,7 +1813,7 @@
}
if err != vdl.ErrFieldNoExist {
- if err := m.B7.FillVDLTarget(fieldTarget53, __VDLType_v_io_x_ref_lib_vdl_testdata_base_NamedInt32); err != nil {
+ if err := m.B7.FillVDLTarget(fieldTarget53, tt.NonOptional().Field(24).Type); err != nil {
return err
}
if err := fieldsTarget1.FinishField(keyTarget52, fieldTarget53); err != nil {
@@ -1827,7 +1826,7 @@
}
if err != vdl.ErrFieldNoExist {
- if err := m.B8.FillVDLTarget(fieldTarget55, __VDLType_v_io_x_ref_lib_vdl_testdata_base_NamedInt64); err != nil {
+ if err := m.B8.FillVDLTarget(fieldTarget55, tt.NonOptional().Field(25).Type); err != nil {
return err
}
if err := fieldsTarget1.FinishField(keyTarget54, fieldTarget55); err != nil {
@@ -1840,7 +1839,7 @@
}
if err != vdl.ErrFieldNoExist {
- if err := m.B9.FillVDLTarget(fieldTarget57, __VDLType_v_io_x_ref_lib_vdl_testdata_base_NamedFloat32); err != nil {
+ if err := m.B9.FillVDLTarget(fieldTarget57, tt.NonOptional().Field(26).Type); err != nil {
return err
}
if err := fieldsTarget1.FinishField(keyTarget56, fieldTarget57); err != nil {
@@ -1853,7 +1852,7 @@
}
if err != vdl.ErrFieldNoExist {
- if err := m.B10.FillVDLTarget(fieldTarget59, __VDLType_v_io_x_ref_lib_vdl_testdata_base_NamedFloat64); err != nil {
+ if err := m.B10.FillVDLTarget(fieldTarget59, tt.NonOptional().Field(27).Type); err != nil {
return err
}
if err := fieldsTarget1.FinishField(keyTarget58, fieldTarget59); err != nil {
@@ -1866,7 +1865,7 @@
}
if err != vdl.ErrFieldNoExist {
- if err := m.B11.FillVDLTarget(fieldTarget61, __VDLType_v_io_x_ref_lib_vdl_testdata_base_NamedComplex64); err != nil {
+ if err := m.B11.FillVDLTarget(fieldTarget61, tt.NonOptional().Field(28).Type); err != nil {
return err
}
if err := fieldsTarget1.FinishField(keyTarget60, fieldTarget61); err != nil {
@@ -1879,7 +1878,7 @@
}
if err != vdl.ErrFieldNoExist {
- if err := m.B12.FillVDLTarget(fieldTarget63, __VDLType_v_io_x_ref_lib_vdl_testdata_base_NamedComplex128); err != nil {
+ if err := m.B12.FillVDLTarget(fieldTarget63, tt.NonOptional().Field(29).Type); err != nil {
return err
}
if err := fieldsTarget1.FinishField(keyTarget62, fieldTarget63); err != nil {
@@ -1892,7 +1891,7 @@
}
if err != vdl.ErrFieldNoExist {
- if err := m.B13.FillVDLTarget(fieldTarget65, __VDLType_v_io_x_ref_lib_vdl_testdata_base_NamedString); err != nil {
+ if err := m.B13.FillVDLTarget(fieldTarget65, tt.NonOptional().Field(30).Type); err != nil {
return err
}
if err := fieldsTarget1.FinishField(keyTarget64, fieldTarget65); err != nil {
@@ -1905,7 +1904,7 @@
}
if err != vdl.ErrFieldNoExist {
- if err := m.B14.FillVDLTarget(fieldTarget67, __VDLType_v_io_x_ref_lib_vdl_testdata_base_NamedEnum); err != nil {
+ if err := m.B14.FillVDLTarget(fieldTarget67, tt.NonOptional().Field(31).Type); err != nil {
return err
}
if err := fieldsTarget1.FinishField(keyTarget66, fieldTarget67); err != nil {
@@ -1922,7 +1921,7 @@
if unionValue70 == nil {
unionValue70 = NamedUnionA{}
}
- if err := unionValue70.FillVDLTarget(fieldTarget69, __VDLType_v_io_x_ref_lib_vdl_testdata_base_NamedUnion); err != nil {
+ if err := unionValue70.FillVDLTarget(fieldTarget69, tt.NonOptional().Field(32).Type); err != nil {
return err
}
if err := fieldsTarget1.FinishField(keyTarget68, fieldTarget69); err != nil {
@@ -1980,8 +1979,8 @@
func (t *ScalarsTarget) StartFields(tt *vdl.Type) (vdl.FieldsTarget, error) {
- if !vdl.Compatible(tt, __VDLType_v_io_x_ref_lib_vdl_testdata_base_Scalars) {
- return nil, fmt.Errorf("type %v incompatible with %v", tt, __VDLType_v_io_x_ref_lib_vdl_testdata_base_Scalars)
+ if ttWant := vdl.TypeOf((*Scalars)(nil)).Elem(); !vdl.Compatible(tt, ttWant) {
+ return nil, fmt.Errorf("type %v incompatible with %v", tt, ttWant)
}
return t, nil
}
@@ -2118,7 +2117,7 @@
target, err := vdl.ReflectTarget(reflect.ValueOf(&t.Value.B15))
return nil, target, err
default:
- return nil, nil, fmt.Errorf("field %s not in struct %v", name, __VDLType_v_io_x_ref_lib_vdl_testdata_base_Scalars)
+ return nil, nil, fmt.Errorf("field %s not in struct v.io/x/ref/lib/vdl/testdata/base.Scalars", name)
}
}
func (t *ScalarsTarget) FinishField(_, _ vdl.Target) error {
@@ -2167,9 +2166,6 @@
}
func (m *KeyScalars) FillVDLTarget(t vdl.Target, tt *vdl.Type) error {
- if __VDLType_v_io_x_ref_lib_vdl_testdata_base_KeyScalars == nil || __VDLType2 == nil {
- panic("Initialization order error: types generated for FillVDLTarget not initialized. Consider moving caller to an init() block.")
- }
fieldsTarget1, err := t.StartFields(tt)
if err != nil {
return err
@@ -2180,7 +2176,7 @@
return err
}
if err != vdl.ErrFieldNoExist {
- if err := fieldTarget3.FromBool(bool(m.A0), vdl.BoolType); err != nil {
+ if err := fieldTarget3.FromBool(bool(m.A0), tt.NonOptional().Field(0).Type); err != nil {
return err
}
if err := fieldsTarget1.FinishField(keyTarget2, fieldTarget3); err != nil {
@@ -2192,7 +2188,7 @@
return err
}
if err != vdl.ErrFieldNoExist {
- if err := fieldTarget5.FromUint(uint64(m.A1), vdl.ByteType); err != nil {
+ if err := fieldTarget5.FromUint(uint64(m.A1), tt.NonOptional().Field(1).Type); err != nil {
return err
}
if err := fieldsTarget1.FinishField(keyTarget4, fieldTarget5); err != nil {
@@ -2204,7 +2200,7 @@
return err
}
if err != vdl.ErrFieldNoExist {
- if err := fieldTarget7.FromUint(uint64(m.A2), vdl.Uint16Type); err != nil {
+ if err := fieldTarget7.FromUint(uint64(m.A2), tt.NonOptional().Field(2).Type); err != nil {
return err
}
if err := fieldsTarget1.FinishField(keyTarget6, fieldTarget7); err != nil {
@@ -2216,7 +2212,7 @@
return err
}
if err != vdl.ErrFieldNoExist {
- if err := fieldTarget9.FromUint(uint64(m.A3), vdl.Uint32Type); err != nil {
+ if err := fieldTarget9.FromUint(uint64(m.A3), tt.NonOptional().Field(3).Type); err != nil {
return err
}
if err := fieldsTarget1.FinishField(keyTarget8, fieldTarget9); err != nil {
@@ -2228,7 +2224,7 @@
return err
}
if err != vdl.ErrFieldNoExist {
- if err := fieldTarget11.FromUint(uint64(m.A4), vdl.Uint64Type); err != nil {
+ if err := fieldTarget11.FromUint(uint64(m.A4), tt.NonOptional().Field(4).Type); err != nil {
return err
}
if err := fieldsTarget1.FinishField(keyTarget10, fieldTarget11); err != nil {
@@ -2240,7 +2236,7 @@
return err
}
if err != vdl.ErrFieldNoExist {
- if err := fieldTarget13.FromInt(int64(m.A5), vdl.Int8Type); err != nil {
+ if err := fieldTarget13.FromInt(int64(m.A5), tt.NonOptional().Field(5).Type); err != nil {
return err
}
if err := fieldsTarget1.FinishField(keyTarget12, fieldTarget13); err != nil {
@@ -2252,7 +2248,7 @@
return err
}
if err != vdl.ErrFieldNoExist {
- if err := fieldTarget15.FromInt(int64(m.A6), vdl.Int16Type); err != nil {
+ if err := fieldTarget15.FromInt(int64(m.A6), tt.NonOptional().Field(6).Type); err != nil {
return err
}
if err := fieldsTarget1.FinishField(keyTarget14, fieldTarget15); err != nil {
@@ -2264,7 +2260,7 @@
return err
}
if err != vdl.ErrFieldNoExist {
- if err := fieldTarget17.FromInt(int64(m.A7), vdl.Int32Type); err != nil {
+ if err := fieldTarget17.FromInt(int64(m.A7), tt.NonOptional().Field(7).Type); err != nil {
return err
}
if err := fieldsTarget1.FinishField(keyTarget16, fieldTarget17); err != nil {
@@ -2276,7 +2272,7 @@
return err
}
if err != vdl.ErrFieldNoExist {
- if err := fieldTarget19.FromInt(int64(m.A8), vdl.Int64Type); err != nil {
+ if err := fieldTarget19.FromInt(int64(m.A8), tt.NonOptional().Field(8).Type); err != nil {
return err
}
if err := fieldsTarget1.FinishField(keyTarget18, fieldTarget19); err != nil {
@@ -2288,7 +2284,7 @@
return err
}
if err != vdl.ErrFieldNoExist {
- if err := fieldTarget21.FromFloat(float64(m.A9), vdl.Float32Type); err != nil {
+ if err := fieldTarget21.FromFloat(float64(m.A9), tt.NonOptional().Field(9).Type); err != nil {
return err
}
if err := fieldsTarget1.FinishField(keyTarget20, fieldTarget21); err != nil {
@@ -2300,7 +2296,7 @@
return err
}
if err != vdl.ErrFieldNoExist {
- if err := fieldTarget23.FromFloat(float64(m.A10), vdl.Float64Type); err != nil {
+ if err := fieldTarget23.FromFloat(float64(m.A10), tt.NonOptional().Field(10).Type); err != nil {
return err
}
if err := fieldsTarget1.FinishField(keyTarget22, fieldTarget23); err != nil {
@@ -2312,7 +2308,7 @@
return err
}
if err != vdl.ErrFieldNoExist {
- if err := fieldTarget25.FromComplex(complex128(m.A11), vdl.Complex64Type); err != nil {
+ if err := fieldTarget25.FromComplex(complex128(m.A11), tt.NonOptional().Field(11).Type); err != nil {
return err
}
if err := fieldsTarget1.FinishField(keyTarget24, fieldTarget25); err != nil {
@@ -2324,7 +2320,7 @@
return err
}
if err != vdl.ErrFieldNoExist {
- if err := fieldTarget27.FromComplex(complex128(m.A12), vdl.Complex128Type); err != nil {
+ if err := fieldTarget27.FromComplex(complex128(m.A12), tt.NonOptional().Field(12).Type); err != nil {
return err
}
if err := fieldsTarget1.FinishField(keyTarget26, fieldTarget27); err != nil {
@@ -2336,7 +2332,7 @@
return err
}
if err != vdl.ErrFieldNoExist {
- if err := fieldTarget29.FromString(string(m.A13), vdl.StringType); err != nil {
+ if err := fieldTarget29.FromString(string(m.A13), tt.NonOptional().Field(13).Type); err != nil {
return err
}
if err := fieldsTarget1.FinishField(keyTarget28, fieldTarget29); err != nil {
@@ -2349,7 +2345,7 @@
}
if err != vdl.ErrFieldNoExist {
- if err := m.B0.FillVDLTarget(fieldTarget31, __VDLType_v_io_x_ref_lib_vdl_testdata_base_NamedBool); err != nil {
+ if err := m.B0.FillVDLTarget(fieldTarget31, tt.NonOptional().Field(14).Type); err != nil {
return err
}
if err := fieldsTarget1.FinishField(keyTarget30, fieldTarget31); err != nil {
@@ -2362,7 +2358,7 @@
}
if err != vdl.ErrFieldNoExist {
- if err := m.B1.FillVDLTarget(fieldTarget33, __VDLType_v_io_x_ref_lib_vdl_testdata_base_NamedByte); err != nil {
+ if err := m.B1.FillVDLTarget(fieldTarget33, tt.NonOptional().Field(15).Type); err != nil {
return err
}
if err := fieldsTarget1.FinishField(keyTarget32, fieldTarget33); err != nil {
@@ -2375,7 +2371,7 @@
}
if err != vdl.ErrFieldNoExist {
- if err := m.B2.FillVDLTarget(fieldTarget35, __VDLType_v_io_x_ref_lib_vdl_testdata_base_NamedUint16); err != nil {
+ if err := m.B2.FillVDLTarget(fieldTarget35, tt.NonOptional().Field(16).Type); err != nil {
return err
}
if err := fieldsTarget1.FinishField(keyTarget34, fieldTarget35); err != nil {
@@ -2388,7 +2384,7 @@
}
if err != vdl.ErrFieldNoExist {
- if err := m.B3.FillVDLTarget(fieldTarget37, __VDLType_v_io_x_ref_lib_vdl_testdata_base_NamedUint32); err != nil {
+ if err := m.B3.FillVDLTarget(fieldTarget37, tt.NonOptional().Field(17).Type); err != nil {
return err
}
if err := fieldsTarget1.FinishField(keyTarget36, fieldTarget37); err != nil {
@@ -2401,7 +2397,7 @@
}
if err != vdl.ErrFieldNoExist {
- if err := m.B4.FillVDLTarget(fieldTarget39, __VDLType_v_io_x_ref_lib_vdl_testdata_base_NamedUint64); err != nil {
+ if err := m.B4.FillVDLTarget(fieldTarget39, tt.NonOptional().Field(18).Type); err != nil {
return err
}
if err := fieldsTarget1.FinishField(keyTarget38, fieldTarget39); err != nil {
@@ -2414,7 +2410,7 @@
}
if err != vdl.ErrFieldNoExist {
- if err := m.B5.FillVDLTarget(fieldTarget41, __VDLType_v_io_x_ref_lib_vdl_testdata_base_NamedInt8); err != nil {
+ if err := m.B5.FillVDLTarget(fieldTarget41, tt.NonOptional().Field(19).Type); err != nil {
return err
}
if err := fieldsTarget1.FinishField(keyTarget40, fieldTarget41); err != nil {
@@ -2427,7 +2423,7 @@
}
if err != vdl.ErrFieldNoExist {
- if err := m.B6.FillVDLTarget(fieldTarget43, __VDLType_v_io_x_ref_lib_vdl_testdata_base_NamedInt16); err != nil {
+ if err := m.B6.FillVDLTarget(fieldTarget43, tt.NonOptional().Field(20).Type); err != nil {
return err
}
if err := fieldsTarget1.FinishField(keyTarget42, fieldTarget43); err != nil {
@@ -2440,7 +2436,7 @@
}
if err != vdl.ErrFieldNoExist {
- if err := m.B7.FillVDLTarget(fieldTarget45, __VDLType_v_io_x_ref_lib_vdl_testdata_base_NamedInt32); err != nil {
+ if err := m.B7.FillVDLTarget(fieldTarget45, tt.NonOptional().Field(21).Type); err != nil {
return err
}
if err := fieldsTarget1.FinishField(keyTarget44, fieldTarget45); err != nil {
@@ -2453,7 +2449,7 @@
}
if err != vdl.ErrFieldNoExist {
- if err := m.B8.FillVDLTarget(fieldTarget47, __VDLType_v_io_x_ref_lib_vdl_testdata_base_NamedInt64); err != nil {
+ if err := m.B8.FillVDLTarget(fieldTarget47, tt.NonOptional().Field(22).Type); err != nil {
return err
}
if err := fieldsTarget1.FinishField(keyTarget46, fieldTarget47); err != nil {
@@ -2466,7 +2462,7 @@
}
if err != vdl.ErrFieldNoExist {
- if err := m.B9.FillVDLTarget(fieldTarget49, __VDLType_v_io_x_ref_lib_vdl_testdata_base_NamedFloat32); err != nil {
+ if err := m.B9.FillVDLTarget(fieldTarget49, tt.NonOptional().Field(23).Type); err != nil {
return err
}
if err := fieldsTarget1.FinishField(keyTarget48, fieldTarget49); err != nil {
@@ -2479,7 +2475,7 @@
}
if err != vdl.ErrFieldNoExist {
- if err := m.B10.FillVDLTarget(fieldTarget51, __VDLType_v_io_x_ref_lib_vdl_testdata_base_NamedFloat64); err != nil {
+ if err := m.B10.FillVDLTarget(fieldTarget51, tt.NonOptional().Field(24).Type); err != nil {
return err
}
if err := fieldsTarget1.FinishField(keyTarget50, fieldTarget51); err != nil {
@@ -2492,7 +2488,7 @@
}
if err != vdl.ErrFieldNoExist {
- if err := m.B11.FillVDLTarget(fieldTarget53, __VDLType_v_io_x_ref_lib_vdl_testdata_base_NamedComplex64); err != nil {
+ if err := m.B11.FillVDLTarget(fieldTarget53, tt.NonOptional().Field(25).Type); err != nil {
return err
}
if err := fieldsTarget1.FinishField(keyTarget52, fieldTarget53); err != nil {
@@ -2505,7 +2501,7 @@
}
if err != vdl.ErrFieldNoExist {
- if err := m.B12.FillVDLTarget(fieldTarget55, __VDLType_v_io_x_ref_lib_vdl_testdata_base_NamedComplex128); err != nil {
+ if err := m.B12.FillVDLTarget(fieldTarget55, tt.NonOptional().Field(26).Type); err != nil {
return err
}
if err := fieldsTarget1.FinishField(keyTarget54, fieldTarget55); err != nil {
@@ -2518,7 +2514,7 @@
}
if err != vdl.ErrFieldNoExist {
- if err := m.B13.FillVDLTarget(fieldTarget57, __VDLType_v_io_x_ref_lib_vdl_testdata_base_NamedString); err != nil {
+ if err := m.B13.FillVDLTarget(fieldTarget57, tt.NonOptional().Field(27).Type); err != nil {
return err
}
if err := fieldsTarget1.FinishField(keyTarget56, fieldTarget57); err != nil {
@@ -2571,8 +2567,8 @@
func (t *KeyScalarsTarget) StartFields(tt *vdl.Type) (vdl.FieldsTarget, error) {
- if !vdl.Compatible(tt, __VDLType_v_io_x_ref_lib_vdl_testdata_base_KeyScalars) {
- return nil, fmt.Errorf("type %v incompatible with %v", tt, __VDLType_v_io_x_ref_lib_vdl_testdata_base_KeyScalars)
+ if ttWant := vdl.TypeOf((*KeyScalars)(nil)).Elem(); !vdl.Compatible(tt, ttWant) {
+ return nil, fmt.Errorf("type %v incompatible with %v", tt, ttWant)
}
return t, nil
}
@@ -2691,7 +2687,7 @@
target, err := &t.b13Target, error(nil)
return nil, target, err
default:
- return nil, nil, fmt.Errorf("field %s not in struct %v", name, __VDLType_v_io_x_ref_lib_vdl_testdata_base_KeyScalars)
+ return nil, nil, fmt.Errorf("field %s not in struct v.io/x/ref/lib/vdl/testdata/base.KeyScalars", name)
}
}
func (t *KeyScalarsTarget) FinishField(_, _ vdl.Target) error {
@@ -2710,7 +2706,7 @@
}
func (m *ScalarsArray) FillVDLTarget(t vdl.Target, tt *vdl.Type) error {
- listTarget1, err := t.StartList(__VDLType_v_io_x_ref_lib_vdl_testdata_base_ScalarsArray, 2)
+ listTarget1, err := t.StartList(tt, 2)
if err != nil {
return err
}
@@ -2720,7 +2716,7 @@
return err
}
- if err := elem3.FillVDLTarget(elemTarget2, __VDLType_v_io_x_ref_lib_vdl_testdata_base_Scalars); err != nil {
+ if err := elem3.FillVDLTarget(elemTarget2, tt.NonOptional().Elem()); err != nil {
return err
}
if err := listTarget1.FinishElem(elemTarget2); err != nil {
@@ -2747,8 +2743,8 @@
func (t *ScalarsArrayTarget) StartList(tt *vdl.Type, len int) (vdl.ListTarget, error) {
- if !vdl.Compatible(tt, __VDLType_v_io_x_ref_lib_vdl_testdata_base_ScalarsArray) {
- return nil, fmt.Errorf("type %v incompatible with %v", tt, __VDLType_v_io_x_ref_lib_vdl_testdata_base_ScalarsArray)
+ if ttWant := vdl.TypeOf((*ScalarsArray)(nil)); !vdl.Compatible(tt, ttWant) {
+ return nil, fmt.Errorf("type %v incompatible with %v", tt, ttWant)
}
return t, nil
}
@@ -2780,9 +2776,6 @@
}
func (m *Composites) FillVDLTarget(t vdl.Target, tt *vdl.Type) error {
- if __VDLType_v_io_x_ref_lib_vdl_testdata_base_Composites == nil || __VDLType3 == nil {
- panic("Initialization order error: types generated for FillVDLTarget not initialized. Consider moving caller to an init() block.")
- }
fieldsTarget1, err := t.StartFields(tt)
if err != nil {
return err
@@ -2794,7 +2787,7 @@
}
if err != vdl.ErrFieldNoExist {
- if err := m.A0.FillVDLTarget(fieldTarget3, __VDLType_v_io_x_ref_lib_vdl_testdata_base_Scalars); err != nil {
+ if err := m.A0.FillVDLTarget(fieldTarget3, tt.NonOptional().Field(0).Type); err != nil {
return err
}
if err := fieldsTarget1.FinishField(keyTarget2, fieldTarget3); err != nil {
@@ -2807,7 +2800,7 @@
}
if err != vdl.ErrFieldNoExist {
- if err := m.A1.FillVDLTarget(fieldTarget5, __VDLType_v_io_x_ref_lib_vdl_testdata_base_ScalarsArray); err != nil {
+ if err := m.A1.FillVDLTarget(fieldTarget5, tt.NonOptional().Field(1).Type); err != nil {
return err
}
if err := fieldsTarget1.FinishField(keyTarget4, fieldTarget5); err != nil {
@@ -2820,7 +2813,7 @@
}
if err != vdl.ErrFieldNoExist {
- listTarget8, err := fieldTarget7.StartList(__VDLType4, len(m.A2))
+ listTarget8, err := fieldTarget7.StartList(tt.NonOptional().Field(2).Type, len(m.A2))
if err != nil {
return err
}
@@ -2830,7 +2823,7 @@
return err
}
- if err := elem10.FillVDLTarget(elemTarget9, __VDLType_v_io_x_ref_lib_vdl_testdata_base_Scalars); err != nil {
+ if err := elem10.FillVDLTarget(elemTarget9, tt.NonOptional().Field(2).Type.Elem()); err != nil {
return err
}
if err := listTarget8.FinishElem(elemTarget9); err != nil {
@@ -2850,7 +2843,7 @@
}
if err != vdl.ErrFieldNoExist {
- setTarget13, err := fieldTarget12.StartSet(__VDLType5, len(m.A3))
+ setTarget13, err := fieldTarget12.StartSet(tt.NonOptional().Field(3).Type, len(m.A3))
if err != nil {
return err
}
@@ -2860,7 +2853,7 @@
return err
}
- if err := key15.FillVDLTarget(keyTarget14, __VDLType_v_io_x_ref_lib_vdl_testdata_base_KeyScalars); err != nil {
+ if err := key15.FillVDLTarget(keyTarget14, tt.NonOptional().Field(3).Type.Key()); err != nil {
return err
}
if err := setTarget13.FinishKey(keyTarget14); err != nil {
@@ -2880,7 +2873,7 @@
}
if err != vdl.ErrFieldNoExist {
- mapTarget18, err := fieldTarget17.StartMap(__VDLType6, len(m.A4))
+ mapTarget18, err := fieldTarget17.StartMap(tt.NonOptional().Field(4).Type, len(m.A4))
if err != nil {
return err
}
@@ -2889,7 +2882,7 @@
if err != nil {
return err
}
- if err := keyTarget19.FromString(string(key20), vdl.StringType); err != nil {
+ if err := keyTarget19.FromString(string(key20), tt.NonOptional().Field(4).Type.Key()); err != nil {
return err
}
valueTarget21, err := mapTarget18.FinishKeyStartField(keyTarget19)
@@ -2897,7 +2890,7 @@
return err
}
- if err := value22.FillVDLTarget(valueTarget21, __VDLType_v_io_x_ref_lib_vdl_testdata_base_Scalars); err != nil {
+ if err := value22.FillVDLTarget(valueTarget21, tt.NonOptional().Field(4).Type.Elem()); err != nil {
return err
}
if err := mapTarget18.FinishField(keyTarget19, valueTarget21); err != nil {
@@ -2917,7 +2910,7 @@
}
if err != vdl.ErrFieldNoExist {
- mapTarget25, err := fieldTarget24.StartMap(__VDLType7, len(m.A5))
+ mapTarget25, err := fieldTarget24.StartMap(tt.NonOptional().Field(5).Type, len(m.A5))
if err != nil {
return err
}
@@ -2927,7 +2920,7 @@
return err
}
- if err := key27.FillVDLTarget(keyTarget26, __VDLType_v_io_x_ref_lib_vdl_testdata_base_KeyScalars); err != nil {
+ if err := key27.FillVDLTarget(keyTarget26, tt.NonOptional().Field(5).Type.Key()); err != nil {
return err
}
valueTarget28, err := mapTarget25.FinishKeyStartField(keyTarget26)
@@ -2935,7 +2928,7 @@
return err
}
- listTarget30, err := valueTarget28.StartList(__VDLType8, len(value29))
+ listTarget30, err := valueTarget28.StartList(tt.NonOptional().Field(5).Type.Elem(), len(value29))
if err != nil {
return err
}
@@ -2945,7 +2938,7 @@
return err
}
- mapTarget33, err := elemTarget31.StartMap(__VDLType9, len(elem32))
+ mapTarget33, err := elemTarget31.StartMap(tt.NonOptional().Field(5).Type.Elem().Elem(), len(elem32))
if err != nil {
return err
}
@@ -2954,14 +2947,14 @@
if err != nil {
return err
}
- if err := keyTarget34.FromString(string(key35), vdl.StringType); err != nil {
+ if err := keyTarget34.FromString(string(key35), tt.NonOptional().Field(5).Type.Elem().Elem().Key()); err != nil {
return err
}
valueTarget36, err := mapTarget33.FinishKeyStartField(keyTarget34)
if err != nil {
return err
}
- if err := valueTarget36.FromComplex(complex128(value37), vdl.Complex128Type); err != nil {
+ if err := valueTarget36.FromComplex(complex128(value37), tt.NonOptional().Field(5).Type.Elem().Elem().Elem()); err != nil {
return err
}
if err := mapTarget33.FinishField(keyTarget34, valueTarget36); err != nil {
@@ -3013,8 +3006,8 @@
func (t *CompositesTarget) StartFields(tt *vdl.Type) (vdl.FieldsTarget, error) {
- if !vdl.Compatible(tt, __VDLType_v_io_x_ref_lib_vdl_testdata_base_Composites) {
- return nil, fmt.Errorf("type %v incompatible with %v", tt, __VDLType_v_io_x_ref_lib_vdl_testdata_base_Composites)
+ if ttWant := vdl.TypeOf((*Composites)(nil)).Elem(); !vdl.Compatible(tt, ttWant) {
+ return nil, fmt.Errorf("type %v incompatible with %v", tt, ttWant)
}
return t, nil
}
@@ -3045,7 +3038,7 @@
target, err := &t.a5Target, error(nil)
return nil, target, err
default:
- return nil, nil, fmt.Errorf("field %s not in struct %v", name, __VDLType_v_io_x_ref_lib_vdl_testdata_base_Composites)
+ return nil, nil, fmt.Errorf("field %s not in struct v.io/x/ref/lib/vdl/testdata/base.Composites", name)
}
}
func (t *CompositesTarget) FinishField(_, _ vdl.Target) error {
@@ -3066,8 +3059,8 @@
func (t *unnamed_5b5d762e696f2f782f7265662f6c69622f76646c2f74657374646174612f626173652e5363616c617273207374727563747b413020626f6f6c3b413120627974653b41322075696e7431363b41332075696e7433323b41342075696e7436343b413520696e74383b413620696e7431363b413720696e7433323b413820696e7436343b413920666c6f617433323b41313020666c6f617436343b41313120636f6d706c657836343b41313220636f6d706c65783132383b41313320737472696e673b413134203f6572726f72207374727563747b496420737472696e673b5265747279436f646520656e756d7b4e6f52657472793b5265747279436f6e6e656374696f6e3b5265747279526566657463683b52657472794261636b6f66667d3b4d736720737472696e673b506172616d4c697374205b5d616e797d3b41313520616e793b41313620747970656f626a6563743b423020762e696f2f782f7265662f6c69622f76646c2f74657374646174612f626173652e4e616d6564426f6f6c20626f6f6c3b423120762e696f2f782f7265662f6c69622f76646c2f74657374646174612f626173652e4e616d65644279746520627974653b423220762e696f2f782f7265662f6c69622f76646c2f74657374646174612f626173652e4e616d656455696e7431362075696e7431363b423320762e696f2f782f7265662f6c69622f76646c2f74657374646174612f626173652e4e616d656455696e7433322075696e7433323b423420762e696f2f782f7265662f6c69622f76646c2f74657374646174612f626173652e4e616d656455696e7436342075696e7436343b423520762e696f2f782f7265662f6c69622f76646c2f74657374646174612f626173652e4e616d6564496e743820696e74383b423620762e696f2f782f7265662f6c69622f76646c2f74657374646174612f626173652e4e616d6564496e74313620696e7431363b423720762e696f2f782f7265662f6c69622f76646c2f74657374646174612f626173652e4e616d6564496e74333220696e7433323b423820762e696f2f782f7265662f6c69622f76646c2f74657374646174612f626173652e4e616d6564496e74363420696e7436343b423920762e696f2f782f7265662f6c69622f76646c2f74657374646174612f626173652e4e616d6564466c6f6174333220666c6f617433323b42313020762e696f2f782f7265662f6c69622f76646c2f74657374646174612f626173652e4e616d6564466c6f6174363420666c6f617436343b42313120762e696f2f782f7265662f6c69622f76646c2f74657374646174612f626173652e4e616d6564436f6d706c6578363420636f6d706c657836343b42313220762e696f2f782f7265662f6c69622f76646c2f74657374646174612f626173652e4e616d6564436f6d706c657831323820636f6d706c65783132383b42313320762e696f2f782f7265662f6c69622f76646c2f74657374646174612f626173652e4e616d6564537472696e6720737472696e673b42313420762e696f2f782f7265662f6c69622f76646c2f74657374646174612f626173652e4e616d6564456e756d20656e756d7b413b423b437d3b42313520762e696f2f782f7265662f6c69622f76646c2f74657374646174612f626173652e4e616d6564556e696f6e20756e696f6e7b4120626f6f6c3b4220737472696e673b4320696e7433327d7dTarget) StartList(tt *vdl.Type, len int) (vdl.ListTarget, error) {
- if !vdl.Compatible(tt, __VDLType4) {
- return nil, fmt.Errorf("type %v incompatible with %v", tt, __VDLType4)
+ if ttWant := vdl.TypeOf((*[]Scalars)(nil)); !vdl.Compatible(tt, ttWant) {
+ return nil, fmt.Errorf("type %v incompatible with %v", tt, ttWant)
}
if cap(*t.Value) < len {
*t.Value = make([]Scalars, len)
@@ -3100,8 +3093,8 @@
func (t *unnamed_7365745b762e696f2f782f7265662f6c69622f76646c2f74657374646174612f626173652e4b65795363616c617273207374727563747b413020626f6f6c3b413120627974653b41322075696e7431363b41332075696e7433323b41342075696e7436343b413520696e74383b413620696e7431363b413720696e7433323b413820696e7436343b413920666c6f617433323b41313020666c6f617436343b41313120636f6d706c657836343b41313220636f6d706c65783132383b41313320737472696e673b423020762e696f2f782f7265662f6c69622f76646c2f74657374646174612f626173652e4e616d6564426f6f6c20626f6f6c3b423120762e696f2f782f7265662f6c69622f76646c2f74657374646174612f626173652e4e616d65644279746520627974653b423220762e696f2f782f7265662f6c69622f76646c2f74657374646174612f626173652e4e616d656455696e7431362075696e7431363b423320762e696f2f782f7265662f6c69622f76646c2f74657374646174612f626173652e4e616d656455696e7433322075696e7433323b423420762e696f2f782f7265662f6c69622f76646c2f74657374646174612f626173652e4e616d656455696e7436342075696e7436343b423520762e696f2f782f7265662f6c69622f76646c2f74657374646174612f626173652e4e616d6564496e743820696e74383b423620762e696f2f782f7265662f6c69622f76646c2f74657374646174612f626173652e4e616d6564496e74313620696e7431363b423720762e696f2f782f7265662f6c69622f76646c2f74657374646174612f626173652e4e616d6564496e74333220696e7433323b423820762e696f2f782f7265662f6c69622f76646c2f74657374646174612f626173652e4e616d6564496e74363420696e7436343b423920762e696f2f782f7265662f6c69622f76646c2f74657374646174612f626173652e4e616d6564466c6f6174333220666c6f617433323b42313020762e696f2f782f7265662f6c69622f76646c2f74657374646174612f626173652e4e616d6564466c6f6174363420666c6f617436343b42313120762e696f2f782f7265662f6c69622f76646c2f74657374646174612f626173652e4e616d6564436f6d706c6578363420636f6d706c657836343b42313220762e696f2f782f7265662f6c69622f76646c2f74657374646174612f626173652e4e616d6564436f6d706c657831323820636f6d706c65783132383b42313320762e696f2f782f7265662f6c69622f76646c2f74657374646174612f626173652e4e616d6564537472696e6720737472696e677d5dTarget) StartSet(tt *vdl.Type, len int) (vdl.SetTarget, error) {
- if !vdl.Compatible(tt, __VDLType5) {
- return nil, fmt.Errorf("type %v incompatible with %v", tt, __VDLType5)
+ if ttWant := vdl.TypeOf((*map[KeyScalars]struct{})(nil)); !vdl.Compatible(tt, ttWant) {
+ return nil, fmt.Errorf("type %v incompatible with %v", tt, ttWant)
}
*t.Value = make(map[KeyScalars]struct{})
return t, nil
@@ -3137,8 +3130,8 @@
func (t *unnamed_6d61705b737472696e675d762e696f2f782f7265662f6c69622f76646c2f74657374646174612f626173652e5363616c617273207374727563747b413020626f6f6c3b413120627974653b41322075696e7431363b41332075696e7433323b41342075696e7436343b413520696e74383b413620696e7431363b413720696e7433323b413820696e7436343b413920666c6f617433323b41313020666c6f617436343b41313120636f6d706c657836343b41313220636f6d706c65783132383b41313320737472696e673b413134203f6572726f72207374727563747b496420737472696e673b5265747279436f646520656e756d7b4e6f52657472793b5265747279436f6e6e656374696f6e3b5265747279526566657463683b52657472794261636b6f66667d3b4d736720737472696e673b506172616d4c697374205b5d616e797d3b41313520616e793b41313620747970656f626a6563743b423020762e696f2f782f7265662f6c69622f76646c2f74657374646174612f626173652e4e616d6564426f6f6c20626f6f6c3b423120762e696f2f782f7265662f6c69622f76646c2f74657374646174612f626173652e4e616d65644279746520627974653b423220762e696f2f782f7265662f6c69622f76646c2f74657374646174612f626173652e4e616d656455696e7431362075696e7431363b423320762e696f2f782f7265662f6c69622f76646c2f74657374646174612f626173652e4e616d656455696e7433322075696e7433323b423420762e696f2f782f7265662f6c69622f76646c2f74657374646174612f626173652e4e616d656455696e7436342075696e7436343b423520762e696f2f782f7265662f6c69622f76646c2f74657374646174612f626173652e4e616d6564496e743820696e74383b423620762e696f2f782f7265662f6c69622f76646c2f74657374646174612f626173652e4e616d6564496e74313620696e7431363b423720762e696f2f782f7265662f6c69622f76646c2f74657374646174612f626173652e4e616d6564496e74333220696e7433323b423820762e696f2f782f7265662f6c69622f76646c2f74657374646174612f626173652e4e616d6564496e74363420696e7436343b423920762e696f2f782f7265662f6c69622f76646c2f74657374646174612f626173652e4e616d6564466c6f6174333220666c6f617433323b42313020762e696f2f782f7265662f6c69622f76646c2f74657374646174612f626173652e4e616d6564466c6f6174363420666c6f617436343b42313120762e696f2f782f7265662f6c69622f76646c2f74657374646174612f626173652e4e616d6564436f6d706c6578363420636f6d706c657836343b42313220762e696f2f782f7265662f6c69622f76646c2f74657374646174612f626173652e4e616d6564436f6d706c657831323820636f6d706c65783132383b42313320762e696f2f782f7265662f6c69622f76646c2f74657374646174612f626173652e4e616d6564537472696e6720737472696e673b42313420762e696f2f782f7265662f6c69622f76646c2f74657374646174612f626173652e4e616d6564456e756d20656e756d7b413b423b437d3b42313520762e696f2f782f7265662f6c69622f76646c2f74657374646174612f626173652e4e616d6564556e696f6e20756e696f6e7b4120626f6f6c3b4220737472696e673b4320696e7433327d7dTarget) StartMap(tt *vdl.Type, len int) (vdl.MapTarget, error) {
- if !vdl.Compatible(tt, __VDLType6) {
- return nil, fmt.Errorf("type %v incompatible with %v", tt, __VDLType6)
+ if ttWant := vdl.TypeOf((*map[string]Scalars)(nil)); !vdl.Compatible(tt, ttWant) {
+ return nil, fmt.Errorf("type %v incompatible with %v", tt, ttWant)
}
*t.Value = make(map[string]Scalars)
return t, nil
@@ -3183,8 +3176,8 @@
func (t *unnamed_6d61705b762e696f2f782f7265662f6c69622f76646c2f74657374646174612f626173652e4b65795363616c617273207374727563747b413020626f6f6c3b413120627974653b41322075696e7431363b41332075696e7433323b41342075696e7436343b413520696e74383b413620696e7431363b413720696e7433323b413820696e7436343b413920666c6f617433323b41313020666c6f617436343b41313120636f6d706c657836343b41313220636f6d706c65783132383b41313320737472696e673b423020762e696f2f782f7265662f6c69622f76646c2f74657374646174612f626173652e4e616d6564426f6f6c20626f6f6c3b423120762e696f2f782f7265662f6c69622f76646c2f74657374646174612f626173652e4e616d65644279746520627974653b423220762e696f2f782f7265662f6c69622f76646c2f74657374646174612f626173652e4e616d656455696e7431362075696e7431363b423320762e696f2f782f7265662f6c69622f76646c2f74657374646174612f626173652e4e616d656455696e7433322075696e7433323b423420762e696f2f782f7265662f6c69622f76646c2f74657374646174612f626173652e4e616d656455696e7436342075696e7436343b423520762e696f2f782f7265662f6c69622f76646c2f74657374646174612f626173652e4e616d6564496e743820696e74383b423620762e696f2f782f7265662f6c69622f76646c2f74657374646174612f626173652e4e616d6564496e74313620696e7431363b423720762e696f2f782f7265662f6c69622f76646c2f74657374646174612f626173652e4e616d6564496e74333220696e7433323b423820762e696f2f782f7265662f6c69622f76646c2f74657374646174612f626173652e4e616d6564496e74363420696e7436343b423920762e696f2f782f7265662f6c69622f76646c2f74657374646174612f626173652e4e616d6564466c6f6174333220666c6f617433323b42313020762e696f2f782f7265662f6c69622f76646c2f74657374646174612f626173652e4e616d6564466c6f6174363420666c6f617436343b42313120762e696f2f782f7265662f6c69622f76646c2f74657374646174612f626173652e4e616d6564436f6d706c6578363420636f6d706c657836343b42313220762e696f2f782f7265662f6c69622f76646c2f74657374646174612f626173652e4e616d6564436f6d706c657831323820636f6d706c65783132383b42313320762e696f2f782f7265662f6c69622f76646c2f74657374646174612f626173652e4e616d6564537472696e6720737472696e677d5d5b5d6d61705b737472696e675d636f6d706c6578313238Target) StartMap(tt *vdl.Type, len int) (vdl.MapTarget, error) {
- if !vdl.Compatible(tt, __VDLType7) {
- return nil, fmt.Errorf("type %v incompatible with %v", tt, __VDLType7)
+ if ttWant := vdl.TypeOf((*map[KeyScalars][]map[string]complex128)(nil)); !vdl.Compatible(tt, ttWant) {
+ return nil, fmt.Errorf("type %v incompatible with %v", tt, ttWant)
}
*t.Value = make(map[KeyScalars][]map[string]complex128)
return t, nil
@@ -3223,8 +3216,8 @@
func (t *unnamed_5b5d6d61705b737472696e675d636f6d706c6578313238Target) StartList(tt *vdl.Type, len int) (vdl.ListTarget, error) {
- if !vdl.Compatible(tt, __VDLType8) {
- return nil, fmt.Errorf("type %v incompatible with %v", tt, __VDLType8)
+ if ttWant := vdl.TypeOf((*[]map[string]complex128)(nil)); !vdl.Compatible(tt, ttWant) {
+ return nil, fmt.Errorf("type %v incompatible with %v", tt, ttWant)
}
if cap(*t.Value) < len {
*t.Value = make([]map[string]complex128, len)
@@ -3259,8 +3252,8 @@
func (t *unnamed_6d61705b737472696e675d636f6d706c6578313238Target) StartMap(tt *vdl.Type, len int) (vdl.MapTarget, error) {
- if !vdl.Compatible(tt, __VDLType9) {
- return nil, fmt.Errorf("type %v incompatible with %v", tt, __VDLType9)
+ if ttWant := vdl.TypeOf((*map[string]complex128)(nil)); !vdl.Compatible(tt, ttWant) {
+ return nil, fmt.Errorf("type %v incompatible with %v", tt, ttWant)
}
*t.Value = make(map[string]complex128)
return t, nil
@@ -3297,7 +3290,7 @@
}
func (m *CompositesArray) FillVDLTarget(t vdl.Target, tt *vdl.Type) error {
- listTarget1, err := t.StartList(__VDLType_v_io_x_ref_lib_vdl_testdata_base_CompositesArray, 2)
+ listTarget1, err := t.StartList(tt, 2)
if err != nil {
return err
}
@@ -3307,7 +3300,7 @@
return err
}
- if err := elem3.FillVDLTarget(elemTarget2, __VDLType_v_io_x_ref_lib_vdl_testdata_base_Composites); err != nil {
+ if err := elem3.FillVDLTarget(elemTarget2, tt.NonOptional().Elem()); err != nil {
return err
}
if err := listTarget1.FinishElem(elemTarget2); err != nil {
@@ -3334,8 +3327,8 @@
func (t *CompositesArrayTarget) StartList(tt *vdl.Type, len int) (vdl.ListTarget, error) {
- if !vdl.Compatible(tt, __VDLType_v_io_x_ref_lib_vdl_testdata_base_CompositesArray) {
- return nil, fmt.Errorf("type %v incompatible with %v", tt, __VDLType_v_io_x_ref_lib_vdl_testdata_base_CompositesArray)
+ if ttWant := vdl.TypeOf((*CompositesArray)(nil)); !vdl.Compatible(tt, ttWant) {
+ return nil, fmt.Errorf("type %v incompatible with %v", tt, ttWant)
}
return t, nil
}
@@ -3366,9 +3359,6 @@
}
func (m *CompComp) FillVDLTarget(t vdl.Target, tt *vdl.Type) error {
- if __VDLType_v_io_x_ref_lib_vdl_testdata_base_CompComp == nil || __VDLType10 == nil {
- panic("Initialization order error: types generated for FillVDLTarget not initialized. Consider moving caller to an init() block.")
- }
fieldsTarget1, err := t.StartFields(tt)
if err != nil {
return err
@@ -3380,7 +3370,7 @@
}
if err != vdl.ErrFieldNoExist {
- if err := m.A0.FillVDLTarget(fieldTarget3, __VDLType_v_io_x_ref_lib_vdl_testdata_base_Composites); err != nil {
+ if err := m.A0.FillVDLTarget(fieldTarget3, tt.NonOptional().Field(0).Type); err != nil {
return err
}
if err := fieldsTarget1.FinishField(keyTarget2, fieldTarget3); err != nil {
@@ -3393,7 +3383,7 @@
}
if err != vdl.ErrFieldNoExist {
- if err := m.A1.FillVDLTarget(fieldTarget5, __VDLType_v_io_x_ref_lib_vdl_testdata_base_CompositesArray); err != nil {
+ if err := m.A1.FillVDLTarget(fieldTarget5, tt.NonOptional().Field(1).Type); err != nil {
return err
}
if err := fieldsTarget1.FinishField(keyTarget4, fieldTarget5); err != nil {
@@ -3406,7 +3396,7 @@
}
if err != vdl.ErrFieldNoExist {
- listTarget8, err := fieldTarget7.StartList(__VDLType11, len(m.A2))
+ listTarget8, err := fieldTarget7.StartList(tt.NonOptional().Field(2).Type, len(m.A2))
if err != nil {
return err
}
@@ -3416,7 +3406,7 @@
return err
}
- if err := elem10.FillVDLTarget(elemTarget9, __VDLType_v_io_x_ref_lib_vdl_testdata_base_Composites); err != nil {
+ if err := elem10.FillVDLTarget(elemTarget9, tt.NonOptional().Field(2).Type.Elem()); err != nil {
return err
}
if err := listTarget8.FinishElem(elemTarget9); err != nil {
@@ -3436,7 +3426,7 @@
}
if err != vdl.ErrFieldNoExist {
- mapTarget13, err := fieldTarget12.StartMap(__VDLType12, len(m.A3))
+ mapTarget13, err := fieldTarget12.StartMap(tt.NonOptional().Field(3).Type, len(m.A3))
if err != nil {
return err
}
@@ -3445,7 +3435,7 @@
if err != nil {
return err
}
- if err := keyTarget14.FromString(string(key15), vdl.StringType); err != nil {
+ if err := keyTarget14.FromString(string(key15), tt.NonOptional().Field(3).Type.Key()); err != nil {
return err
}
valueTarget16, err := mapTarget13.FinishKeyStartField(keyTarget14)
@@ -3453,7 +3443,7 @@
return err
}
- if err := value17.FillVDLTarget(valueTarget16, __VDLType_v_io_x_ref_lib_vdl_testdata_base_Composites); err != nil {
+ if err := value17.FillVDLTarget(valueTarget16, tt.NonOptional().Field(3).Type.Elem()); err != nil {
return err
}
if err := mapTarget13.FinishField(keyTarget14, valueTarget16); err != nil {
@@ -3473,7 +3463,7 @@
}
if err != vdl.ErrFieldNoExist {
- mapTarget20, err := fieldTarget19.StartMap(__VDLType13, len(m.A4))
+ mapTarget20, err := fieldTarget19.StartMap(tt.NonOptional().Field(4).Type, len(m.A4))
if err != nil {
return err
}
@@ -3483,7 +3473,7 @@
return err
}
- if err := key22.FillVDLTarget(keyTarget21, __VDLType_v_io_x_ref_lib_vdl_testdata_base_KeyScalars); err != nil {
+ if err := key22.FillVDLTarget(keyTarget21, tt.NonOptional().Field(4).Type.Key()); err != nil {
return err
}
valueTarget23, err := mapTarget20.FinishKeyStartField(keyTarget21)
@@ -3491,7 +3481,7 @@
return err
}
- listTarget25, err := valueTarget23.StartList(__VDLType14, len(value24))
+ listTarget25, err := valueTarget23.StartList(tt.NonOptional().Field(4).Type.Elem(), len(value24))
if err != nil {
return err
}
@@ -3501,7 +3491,7 @@
return err
}
- mapTarget28, err := elemTarget26.StartMap(__VDLType12, len(elem27))
+ mapTarget28, err := elemTarget26.StartMap(tt.NonOptional().Field(4).Type.Elem().Elem(), len(elem27))
if err != nil {
return err
}
@@ -3510,7 +3500,7 @@
if err != nil {
return err
}
- if err := keyTarget29.FromString(string(key30), vdl.StringType); err != nil {
+ if err := keyTarget29.FromString(string(key30), tt.NonOptional().Field(4).Type.Elem().Elem().Key()); err != nil {
return err
}
valueTarget31, err := mapTarget28.FinishKeyStartField(keyTarget29)
@@ -3518,7 +3508,7 @@
return err
}
- if err := value32.FillVDLTarget(valueTarget31, __VDLType_v_io_x_ref_lib_vdl_testdata_base_Composites); err != nil {
+ if err := value32.FillVDLTarget(valueTarget31, tt.NonOptional().Field(4).Type.Elem().Elem().Elem()); err != nil {
return err
}
if err := mapTarget28.FinishField(keyTarget29, valueTarget31); err != nil {
@@ -3569,8 +3559,8 @@
func (t *CompCompTarget) StartFields(tt *vdl.Type) (vdl.FieldsTarget, error) {
- if !vdl.Compatible(tt, __VDLType_v_io_x_ref_lib_vdl_testdata_base_CompComp) {
- return nil, fmt.Errorf("type %v incompatible with %v", tt, __VDLType_v_io_x_ref_lib_vdl_testdata_base_CompComp)
+ if ttWant := vdl.TypeOf((*CompComp)(nil)).Elem(); !vdl.Compatible(tt, ttWant) {
+ return nil, fmt.Errorf("type %v incompatible with %v", tt, ttWant)
}
return t, nil
}
@@ -3597,7 +3587,7 @@
target, err := &t.a4Target, error(nil)
return nil, target, err
default:
- return nil, nil, fmt.Errorf("field %s not in struct %v", name, __VDLType_v_io_x_ref_lib_vdl_testdata_base_CompComp)
+ return nil, nil, fmt.Errorf("field %s not in struct v.io/x/ref/lib/vdl/testdata/base.CompComp", name)
}
}
func (t *CompCompTarget) FinishField(_, _ vdl.Target) error {
@@ -3618,8 +3608,8 @@
func (t *unnamed_5b5d762e696f2f782f7265662f6c69622f76646c2f74657374646174612f626173652e436f6d706f7369746573207374727563747b413020762e696f2f782f7265662f6c69622f76646c2f74657374646174612f626173652e5363616c617273207374727563747b413020626f6f6c3b413120627974653b41322075696e7431363b41332075696e7433323b41342075696e7436343b413520696e74383b413620696e7431363b413720696e7433323b413820696e7436343b413920666c6f617433323b41313020666c6f617436343b41313120636f6d706c657836343b41313220636f6d706c65783132383b41313320737472696e673b413134203f6572726f72207374727563747b496420737472696e673b5265747279436f646520656e756d7b4e6f52657472793b5265747279436f6e6e656374696f6e3b5265747279526566657463683b52657472794261636b6f66667d3b4d736720737472696e673b506172616d4c697374205b5d616e797d3b41313520616e793b41313620747970656f626a6563743b423020762e696f2f782f7265662f6c69622f76646c2f74657374646174612f626173652e4e616d6564426f6f6c20626f6f6c3b423120762e696f2f782f7265662f6c69622f76646c2f74657374646174612f626173652e4e616d65644279746520627974653b423220762e696f2f782f7265662f6c69622f76646c2f74657374646174612f626173652e4e616d656455696e7431362075696e7431363b423320762e696f2f782f7265662f6c69622f76646c2f74657374646174612f626173652e4e616d656455696e7433322075696e7433323b423420762e696f2f782f7265662f6c69622f76646c2f74657374646174612f626173652e4e616d656455696e7436342075696e7436343b423520762e696f2f782f7265662f6c69622f76646c2f74657374646174612f626173652e4e616d6564496e743820696e74383b423620762e696f2f782f7265662f6c69622f76646c2f74657374646174612f626173652e4e616d6564496e74313620696e7431363b423720762e696f2f782f7265662f6c69622f76646c2f74657374646174612f626173652e4e616d6564496e74333220696e7433323b423820762e696f2f782f7265662f6c69622f76646c2f74657374646174612f626173652e4e616d6564496e74363420696e7436343b423920762e696f2f782f7265662f6c69622f76646c2f74657374646174612f626173652e4e616d6564466c6f6174333220666c6f617433323b42313020762e696f2f782f7265662f6c69622f76646c2f74657374646174612f626173652e4e616d6564466c6f6174363420666c6f617436343b42313120762e696f2f782f7265662f6c69622f76646c2f74657374646174612f626173652e4e616d6564436f6d706c6578363420636f6d706c657836343b42313220762e696f2f782f7265662f6c69622f76646c2f74657374646174612f626173652e4e616d6564436f6d706c657831323820636f6d706c65783132383b42313320762e696f2f782f7265662f6c69622f76646c2f74657374646174612f626173652e4e616d6564537472696e6720737472696e673b42313420762e696f2f782f7265662f6c69622f76646c2f74657374646174612f626173652e4e616d6564456e756d20656e756d7b413b423b437d3b42313520762e696f2f782f7265662f6c69622f76646c2f74657374646174612f626173652e4e616d6564556e696f6e20756e696f6e7b4120626f6f6c3b4220737472696e673b4320696e7433327d7d3b413120762e696f2f782f7265662f6c69622f76646c2f74657374646174612f626173652e5363616c6172734172726179205b325d762e696f2f782f7265662f6c69622f76646c2f74657374646174612f626173652e5363616c6172733b4132205b5d762e696f2f782f7265662f6c69622f76646c2f74657374646174612f626173652e5363616c6172733b4133207365745b762e696f2f782f7265662f6c69622f76646c2f74657374646174612f626173652e4b65795363616c617273207374727563747b413020626f6f6c3b413120627974653b41322075696e7431363b41332075696e7433323b41342075696e7436343b413520696e74383b413620696e7431363b413720696e7433323b413820696e7436343b413920666c6f617433323b41313020666c6f617436343b41313120636f6d706c657836343b41313220636f6d706c65783132383b41313320737472696e673b423020762e696f2f782f7265662f6c69622f76646c2f74657374646174612f626173652e4e616d6564426f6f6c3b423120762e696f2f782f7265662f6c69622f76646c2f74657374646174612f626173652e4e616d6564427974653b423220762e696f2f782f7265662f6c69622f76646c2f74657374646174612f626173652e4e616d656455696e7431363b423320762e696f2f782f7265662f6c69622f76646c2f74657374646174612f626173652e4e616d656455696e7433323b423420762e696f2f782f7265662f6c69622f76646c2f74657374646174612f626173652e4e616d656455696e7436343b423520762e696f2f782f7265662f6c69622f76646c2f74657374646174612f626173652e4e616d6564496e74383b423620762e696f2f782f7265662f6c69622f76646c2f74657374646174612f626173652e4e616d6564496e7431363b423720762e696f2f782f7265662f6c69622f76646c2f74657374646174612f626173652e4e616d6564496e7433323b423820762e696f2f782f7265662f6c69622f76646c2f74657374646174612f626173652e4e616d6564496e7436343b423920762e696f2f782f7265662f6c69622f76646c2f74657374646174612f626173652e4e616d6564466c6f617433323b42313020762e696f2f782f7265662f6c69622f76646c2f74657374646174612f626173652e4e616d6564466c6f617436343b42313120762e696f2f782f7265662f6c69622f76646c2f74657374646174612f626173652e4e616d6564436f6d706c657836343b42313220762e696f2f782f7265662f6c69622f76646c2f74657374646174612f626173652e4e616d6564436f6d706c65783132383b42313320762e696f2f782f7265662f6c69622f76646c2f74657374646174612f626173652e4e616d6564537472696e677d5d3b4134206d61705b737472696e675d762e696f2f782f7265662f6c69622f76646c2f74657374646174612f626173652e5363616c6172733b4135206d61705b762e696f2f782f7265662f6c69622f76646c2f74657374646174612f626173652e4b65795363616c6172735d5b5d6d61705b737472696e675d636f6d706c65783132387dTarget) StartList(tt *vdl.Type, len int) (vdl.ListTarget, error) {
- if !vdl.Compatible(tt, __VDLType11) {
- return nil, fmt.Errorf("type %v incompatible with %v", tt, __VDLType11)
+ if ttWant := vdl.TypeOf((*[]Composites)(nil)); !vdl.Compatible(tt, ttWant) {
+ return nil, fmt.Errorf("type %v incompatible with %v", tt, ttWant)
}
if cap(*t.Value) < len {
*t.Value = make([]Composites, len)
@@ -3654,8 +3644,8 @@
func (t *unnamed_6d61705b737472696e675d762e696f2f782f7265662f6c69622f76646c2f74657374646174612f626173652e436f6d706f7369746573207374727563747b413020762e696f2f782f7265662f6c69622f76646c2f74657374646174612f626173652e5363616c617273207374727563747b413020626f6f6c3b413120627974653b41322075696e7431363b41332075696e7433323b41342075696e7436343b413520696e74383b413620696e7431363b413720696e7433323b413820696e7436343b413920666c6f617433323b41313020666c6f617436343b41313120636f6d706c657836343b41313220636f6d706c65783132383b41313320737472696e673b413134203f6572726f72207374727563747b496420737472696e673b5265747279436f646520656e756d7b4e6f52657472793b5265747279436f6e6e656374696f6e3b5265747279526566657463683b52657472794261636b6f66667d3b4d736720737472696e673b506172616d4c697374205b5d616e797d3b41313520616e793b41313620747970656f626a6563743b423020762e696f2f782f7265662f6c69622f76646c2f74657374646174612f626173652e4e616d6564426f6f6c20626f6f6c3b423120762e696f2f782f7265662f6c69622f76646c2f74657374646174612f626173652e4e616d65644279746520627974653b423220762e696f2f782f7265662f6c69622f76646c2f74657374646174612f626173652e4e616d656455696e7431362075696e7431363b423320762e696f2f782f7265662f6c69622f76646c2f74657374646174612f626173652e4e616d656455696e7433322075696e7433323b423420762e696f2f782f7265662f6c69622f76646c2f74657374646174612f626173652e4e616d656455696e7436342075696e7436343b423520762e696f2f782f7265662f6c69622f76646c2f74657374646174612f626173652e4e616d6564496e743820696e74383b423620762e696f2f782f7265662f6c69622f76646c2f74657374646174612f626173652e4e616d6564496e74313620696e7431363b423720762e696f2f782f7265662f6c69622f76646c2f74657374646174612f626173652e4e616d6564496e74333220696e7433323b423820762e696f2f782f7265662f6c69622f76646c2f74657374646174612f626173652e4e616d6564496e74363420696e7436343b423920762e696f2f782f7265662f6c69622f76646c2f74657374646174612f626173652e4e616d6564466c6f6174333220666c6f617433323b42313020762e696f2f782f7265662f6c69622f76646c2f74657374646174612f626173652e4e616d6564466c6f6174363420666c6f617436343b42313120762e696f2f782f7265662f6c69622f76646c2f74657374646174612f626173652e4e616d6564436f6d706c6578363420636f6d706c657836343b42313220762e696f2f782f7265662f6c69622f76646c2f74657374646174612f626173652e4e616d6564436f6d706c657831323820636f6d706c65783132383b42313320762e696f2f782f7265662f6c69622f76646c2f74657374646174612f626173652e4e616d6564537472696e6720737472696e673b42313420762e696f2f782f7265662f6c69622f76646c2f74657374646174612f626173652e4e616d6564456e756d20656e756d7b413b423b437d3b42313520762e696f2f782f7265662f6c69622f76646c2f74657374646174612f626173652e4e616d6564556e696f6e20756e696f6e7b4120626f6f6c3b4220737472696e673b4320696e7433327d7d3b413120762e696f2f782f7265662f6c69622f76646c2f74657374646174612f626173652e5363616c6172734172726179205b325d762e696f2f782f7265662f6c69622f76646c2f74657374646174612f626173652e5363616c6172733b4132205b5d762e696f2f782f7265662f6c69622f76646c2f74657374646174612f626173652e5363616c6172733b4133207365745b762e696f2f782f7265662f6c69622f76646c2f74657374646174612f626173652e4b65795363616c617273207374727563747b413020626f6f6c3b413120627974653b41322075696e7431363b41332075696e7433323b41342075696e7436343b413520696e74383b413620696e7431363b413720696e7433323b413820696e7436343b413920666c6f617433323b41313020666c6f617436343b41313120636f6d706c657836343b41313220636f6d706c65783132383b41313320737472696e673b423020762e696f2f782f7265662f6c69622f76646c2f74657374646174612f626173652e4e616d6564426f6f6c3b423120762e696f2f782f7265662f6c69622f76646c2f74657374646174612f626173652e4e616d6564427974653b423220762e696f2f782f7265662f6c69622f76646c2f74657374646174612f626173652e4e616d656455696e7431363b423320762e696f2f782f7265662f6c69622f76646c2f74657374646174612f626173652e4e616d656455696e7433323b423420762e696f2f782f7265662f6c69622f76646c2f74657374646174612f626173652e4e616d656455696e7436343b423520762e696f2f782f7265662f6c69622f76646c2f74657374646174612f626173652e4e616d6564496e74383b423620762e696f2f782f7265662f6c69622f76646c2f74657374646174612f626173652e4e616d6564496e7431363b423720762e696f2f782f7265662f6c69622f76646c2f74657374646174612f626173652e4e616d6564496e7433323b423820762e696f2f782f7265662f6c69622f76646c2f74657374646174612f626173652e4e616d6564496e7436343b423920762e696f2f782f7265662f6c69622f76646c2f74657374646174612f626173652e4e616d6564466c6f617433323b42313020762e696f2f782f7265662f6c69622f76646c2f74657374646174612f626173652e4e616d6564466c6f617436343b42313120762e696f2f782f7265662f6c69622f76646c2f74657374646174612f626173652e4e616d6564436f6d706c657836343b42313220762e696f2f782f7265662f6c69622f76646c2f74657374646174612f626173652e4e616d6564436f6d706c65783132383b42313320762e696f2f782f7265662f6c69622f76646c2f74657374646174612f626173652e4e616d6564537472696e677d5d3b4134206d61705b737472696e675d762e696f2f782f7265662f6c69622f76646c2f74657374646174612f626173652e5363616c6172733b4135206d61705b762e696f2f782f7265662f6c69622f76646c2f74657374646174612f626173652e4b65795363616c6172735d5b5d6d61705b737472696e675d636f6d706c65783132387dTarget) StartMap(tt *vdl.Type, len int) (vdl.MapTarget, error) {
- if !vdl.Compatible(tt, __VDLType12) {
- return nil, fmt.Errorf("type %v incompatible with %v", tt, __VDLType12)
+ if ttWant := vdl.TypeOf((*map[string]Composites)(nil)); !vdl.Compatible(tt, ttWant) {
+ return nil, fmt.Errorf("type %v incompatible with %v", tt, ttWant)
}
*t.Value = make(map[string]Composites)
return t, nil
@@ -3712,8 +3702,8 @@
func (t *unnamed_6d61705b762e696f2f782f7265662f6c69622f76646c2f74657374646174612f626173652e4b65795363616c617273207374727563747b413020626f6f6c3b413120627974653b41322075696e7431363b41332075696e7433323b41342075696e7436343b413520696e74383b413620696e7431363b413720696e7433323b413820696e7436343b413920666c6f617433323b41313020666c6f617436343b41313120636f6d706c657836343b41313220636f6d706c65783132383b41313320737472696e673b423020762e696f2f782f7265662f6c69622f76646c2f74657374646174612f626173652e4e616d6564426f6f6c20626f6f6c3b423120762e696f2f782f7265662f6c69622f76646c2f74657374646174612f626173652e4e616d65644279746520627974653b423220762e696f2f782f7265662f6c69622f76646c2f74657374646174612f626173652e4e616d656455696e7431362075696e7431363b423320762e696f2f782f7265662f6c69622f76646c2f74657374646174612f626173652e4e616d656455696e7433322075696e7433323b423420762e696f2f782f7265662f6c69622f76646c2f74657374646174612f626173652e4e616d656455696e7436342075696e7436343b423520762e696f2f782f7265662f6c69622f76646c2f74657374646174612f626173652e4e616d6564496e743820696e74383b423620762e696f2f782f7265662f6c69622f76646c2f74657374646174612f626173652e4e616d6564496e74313620696e7431363b423720762e696f2f782f7265662f6c69622f76646c2f74657374646174612f626173652e4e616d6564496e74333220696e7433323b423820762e696f2f782f7265662f6c69622f76646c2f74657374646174612f626173652e4e616d6564496e74363420696e7436343b423920762e696f2f782f7265662f6c69622f76646c2f74657374646174612f626173652e4e616d6564466c6f6174333220666c6f617433323b42313020762e696f2f782f7265662f6c69622f76646c2f74657374646174612f626173652e4e616d6564466c6f6174363420666c6f617436343b42313120762e696f2f782f7265662f6c69622f76646c2f74657374646174612f626173652e4e616d6564436f6d706c6578363420636f6d706c657836343b42313220762e696f2f782f7265662f6c69622f76646c2f74657374646174612f626173652e4e616d6564436f6d706c657831323820636f6d706c65783132383b42313320762e696f2f782f7265662f6c69622f76646c2f74657374646174612f626173652e4e616d6564537472696e6720737472696e677d5d5b5d6d61705b737472696e675d762e696f2f782f7265662f6c69622f76646c2f74657374646174612f626173652e436f6d706f7369746573207374727563747b413020762e696f2f782f7265662f6c69622f76646c2f74657374646174612f626173652e5363616c617273207374727563747b413020626f6f6c3b413120627974653b41322075696e7431363b41332075696e7433323b41342075696e7436343b413520696e74383b413620696e7431363b413720696e7433323b413820696e7436343b413920666c6f617433323b41313020666c6f617436343b41313120636f6d706c657836343b41313220636f6d706c65783132383b41313320737472696e673b413134203f6572726f72207374727563747b496420737472696e673b5265747279436f646520656e756d7b4e6f52657472793b5265747279436f6e6e656374696f6e3b5265747279526566657463683b52657472794261636b6f66667d3b4d736720737472696e673b506172616d4c697374205b5d616e797d3b41313520616e793b41313620747970656f626a6563743b423020762e696f2f782f7265662f6c69622f76646c2f74657374646174612f626173652e4e616d6564426f6f6c3b423120762e696f2f782f7265662f6c69622f76646c2f74657374646174612f626173652e4e616d6564427974653b423220762e696f2f782f7265662f6c69622f76646c2f74657374646174612f626173652e4e616d656455696e7431363b423320762e696f2f782f7265662f6c69622f76646c2f74657374646174612f626173652e4e616d656455696e7433323b423420762e696f2f782f7265662f6c69622f76646c2f74657374646174612f626173652e4e616d656455696e7436343b423520762e696f2f782f7265662f6c69622f76646c2f74657374646174612f626173652e4e616d6564496e74383b423620762e696f2f782f7265662f6c69622f76646c2f74657374646174612f626173652e4e616d6564496e7431363b423720762e696f2f782f7265662f6c69622f76646c2f74657374646174612f626173652e4e616d6564496e7433323b423820762e696f2f782f7265662f6c69622f76646c2f74657374646174612f626173652e4e616d6564496e7436343b423920762e696f2f782f7265662f6c69622f76646c2f74657374646174612f626173652e4e616d6564466c6f617433323b42313020762e696f2f782f7265662f6c69622f76646c2f74657374646174612f626173652e4e616d6564466c6f617436343b42313120762e696f2f782f7265662f6c69622f76646c2f74657374646174612f626173652e4e616d6564436f6d706c657836343b42313220762e696f2f782f7265662f6c69622f76646c2f74657374646174612f626173652e4e616d6564436f6d706c65783132383b42313320762e696f2f782f7265662f6c69622f76646c2f74657374646174612f626173652e4e616d6564537472696e673b42313420762e696f2f782f7265662f6c69622f76646c2f74657374646174612f626173652e4e616d6564456e756d20656e756d7b413b423b437d3b42313520762e696f2f782f7265662f6c69622f76646c2f74657374646174612f626173652e4e616d6564556e696f6e20756e696f6e7b4120626f6f6c3b4220737472696e673b4320696e7433327d7d3b413120762e696f2f782f7265662f6c69622f76646c2f74657374646174612f626173652e5363616c6172734172726179205b325d762e696f2f782f7265662f6c69622f76646c2f74657374646174612f626173652e5363616c6172733b4132205b5d762e696f2f782f7265662f6c69622f76646c2f74657374646174612f626173652e5363616c6172733b4133207365745b762e696f2f782f7265662f6c69622f76646c2f74657374646174612f626173652e4b65795363616c6172735d3b4134206d61705b737472696e675d762e696f2f782f7265662f6c69622f76646c2f74657374646174612f626173652e5363616c6172733b4135206d61705b762e696f2f782f7265662f6c69622f76646c2f74657374646174612f626173652e4b65795363616c6172735d5b5d6d61705b737472696e675d636f6d706c65783132387dTarget) StartMap(tt *vdl.Type, len int) (vdl.MapTarget, error) {
- if !vdl.Compatible(tt, __VDLType13) {
- return nil, fmt.Errorf("type %v incompatible with %v", tt, __VDLType13)
+ if ttWant := vdl.TypeOf((*map[KeyScalars][]map[string]Composites)(nil)); !vdl.Compatible(tt, ttWant) {
+ return nil, fmt.Errorf("type %v incompatible with %v", tt, ttWant)
}
*t.Value = make(map[KeyScalars][]map[string]Composites)
return t, nil
@@ -3752,8 +3742,8 @@
func (t *unnamed_5b5d6d61705b737472696e675d762e696f2f782f7265662f6c69622f76646c2f74657374646174612f626173652e436f6d706f7369746573207374727563747b413020762e696f2f782f7265662f6c69622f76646c2f74657374646174612f626173652e5363616c617273207374727563747b413020626f6f6c3b413120627974653b41322075696e7431363b41332075696e7433323b41342075696e7436343b413520696e74383b413620696e7431363b413720696e7433323b413820696e7436343b413920666c6f617433323b41313020666c6f617436343b41313120636f6d706c657836343b41313220636f6d706c65783132383b41313320737472696e673b413134203f6572726f72207374727563747b496420737472696e673b5265747279436f646520656e756d7b4e6f52657472793b5265747279436f6e6e656374696f6e3b5265747279526566657463683b52657472794261636b6f66667d3b4d736720737472696e673b506172616d4c697374205b5d616e797d3b41313520616e793b41313620747970656f626a6563743b423020762e696f2f782f7265662f6c69622f76646c2f74657374646174612f626173652e4e616d6564426f6f6c20626f6f6c3b423120762e696f2f782f7265662f6c69622f76646c2f74657374646174612f626173652e4e616d65644279746520627974653b423220762e696f2f782f7265662f6c69622f76646c2f74657374646174612f626173652e4e616d656455696e7431362075696e7431363b423320762e696f2f782f7265662f6c69622f76646c2f74657374646174612f626173652e4e616d656455696e7433322075696e7433323b423420762e696f2f782f7265662f6c69622f76646c2f74657374646174612f626173652e4e616d656455696e7436342075696e7436343b423520762e696f2f782f7265662f6c69622f76646c2f74657374646174612f626173652e4e616d6564496e743820696e74383b423620762e696f2f782f7265662f6c69622f76646c2f74657374646174612f626173652e4e616d6564496e74313620696e7431363b423720762e696f2f782f7265662f6c69622f76646c2f74657374646174612f626173652e4e616d6564496e74333220696e7433323b423820762e696f2f782f7265662f6c69622f76646c2f74657374646174612f626173652e4e616d6564496e74363420696e7436343b423920762e696f2f782f7265662f6c69622f76646c2f74657374646174612f626173652e4e616d6564466c6f6174333220666c6f617433323b42313020762e696f2f782f7265662f6c69622f76646c2f74657374646174612f626173652e4e616d6564466c6f6174363420666c6f617436343b42313120762e696f2f782f7265662f6c69622f76646c2f74657374646174612f626173652e4e616d6564436f6d706c6578363420636f6d706c657836343b42313220762e696f2f782f7265662f6c69622f76646c2f74657374646174612f626173652e4e616d6564436f6d706c657831323820636f6d706c65783132383b42313320762e696f2f782f7265662f6c69622f76646c2f74657374646174612f626173652e4e616d6564537472696e6720737472696e673b42313420762e696f2f782f7265662f6c69622f76646c2f74657374646174612f626173652e4e616d6564456e756d20656e756d7b413b423b437d3b42313520762e696f2f782f7265662f6c69622f76646c2f74657374646174612f626173652e4e616d6564556e696f6e20756e696f6e7b4120626f6f6c3b4220737472696e673b4320696e7433327d7d3b413120762e696f2f782f7265662f6c69622f76646c2f74657374646174612f626173652e5363616c6172734172726179205b325d762e696f2f782f7265662f6c69622f76646c2f74657374646174612f626173652e5363616c6172733b4132205b5d762e696f2f782f7265662f6c69622f76646c2f74657374646174612f626173652e5363616c6172733b4133207365745b762e696f2f782f7265662f6c69622f76646c2f74657374646174612f626173652e4b65795363616c617273207374727563747b413020626f6f6c3b413120627974653b41322075696e7431363b41332075696e7433323b41342075696e7436343b413520696e74383b413620696e7431363b413720696e7433323b413820696e7436343b413920666c6f617433323b41313020666c6f617436343b41313120636f6d706c657836343b41313220636f6d706c65783132383b41313320737472696e673b423020762e696f2f782f7265662f6c69622f76646c2f74657374646174612f626173652e4e616d6564426f6f6c3b423120762e696f2f782f7265662f6c69622f76646c2f74657374646174612f626173652e4e616d6564427974653b423220762e696f2f782f7265662f6c69622f76646c2f74657374646174612f626173652e4e616d656455696e7431363b423320762e696f2f782f7265662f6c69622f76646c2f74657374646174612f626173652e4e616d656455696e7433323b423420762e696f2f782f7265662f6c69622f76646c2f74657374646174612f626173652e4e616d656455696e7436343b423520762e696f2f782f7265662f6c69622f76646c2f74657374646174612f626173652e4e616d6564496e74383b423620762e696f2f782f7265662f6c69622f76646c2f74657374646174612f626173652e4e616d6564496e7431363b423720762e696f2f782f7265662f6c69622f76646c2f74657374646174612f626173652e4e616d6564496e7433323b423820762e696f2f782f7265662f6c69622f76646c2f74657374646174612f626173652e4e616d6564496e7436343b423920762e696f2f782f7265662f6c69622f76646c2f74657374646174612f626173652e4e616d6564466c6f617433323b42313020762e696f2f782f7265662f6c69622f76646c2f74657374646174612f626173652e4e616d6564466c6f617436343b42313120762e696f2f782f7265662f6c69622f76646c2f74657374646174612f626173652e4e616d6564436f6d706c657836343b42313220762e696f2f782f7265662f6c69622f76646c2f74657374646174612f626173652e4e616d6564436f6d706c65783132383b42313320762e696f2f782f7265662f6c69622f76646c2f74657374646174612f626173652e4e616d6564537472696e677d5d3b4134206d61705b737472696e675d762e696f2f782f7265662f6c69622f76646c2f74657374646174612f626173652e5363616c6172733b4135206d61705b762e696f2f782f7265662f6c69622f76646c2f74657374646174612f626173652e4b65795363616c6172735d5b5d6d61705b737472696e675d636f6d706c65783132387dTarget) StartList(tt *vdl.Type, len int) (vdl.ListTarget, error) {
- if !vdl.Compatible(tt, __VDLType14) {
- return nil, fmt.Errorf("type %v incompatible with %v", tt, __VDLType14)
+ if ttWant := vdl.TypeOf((*[]map[string]Composites)(nil)); !vdl.Compatible(tt, ttWant) {
+ return nil, fmt.Errorf("type %v incompatible with %v", tt, ttWant)
}
if cap(*t.Value) < len {
*t.Value = make([]map[string]Composites, len)
@@ -3775,6 +3765,94 @@
return nil
}
+// Args will be reordered to show up before NestedArgs in the generated output.
+type Args struct {
+ A int32
+ B int32
+}
+
+func (Args) __VDLReflect(struct {
+ Name string `vdl:"v.io/x/ref/lib/vdl/testdata/base.Args"`
+}) {
+}
+
+func (m *Args) FillVDLTarget(t vdl.Target, tt *vdl.Type) error {
+ fieldsTarget1, err := t.StartFields(tt)
+ if err != nil {
+ return err
+ }
+
+ keyTarget2, fieldTarget3, err := fieldsTarget1.StartField("A")
+ if err != vdl.ErrFieldNoExist && err != nil {
+ return err
+ }
+ if err != vdl.ErrFieldNoExist {
+ if err := fieldTarget3.FromInt(int64(m.A), tt.NonOptional().Field(0).Type); err != nil {
+ return err
+ }
+ if err := fieldsTarget1.FinishField(keyTarget2, fieldTarget3); err != nil {
+ return err
+ }
+ }
+ keyTarget4, fieldTarget5, err := fieldsTarget1.StartField("B")
+ if err != vdl.ErrFieldNoExist && err != nil {
+ return err
+ }
+ if err != vdl.ErrFieldNoExist {
+ if err := fieldTarget5.FromInt(int64(m.B), tt.NonOptional().Field(1).Type); err != nil {
+ return err
+ }
+ if err := fieldsTarget1.FinishField(keyTarget4, fieldTarget5); err != nil {
+ return err
+ }
+ }
+ if err := t.FinishFields(fieldsTarget1); err != nil {
+ return err
+ }
+ return nil
+}
+
+func (m *Args) MakeVDLTarget() vdl.Target {
+ return &ArgsTarget{Value: m}
+}
+
+type ArgsTarget struct {
+ Value *Args
+ aTarget vdl.Int32Target
+ bTarget vdl.Int32Target
+ vdl.TargetBase
+ vdl.FieldsTargetBase
+}
+
+func (t *ArgsTarget) StartFields(tt *vdl.Type) (vdl.FieldsTarget, error) {
+
+ if ttWant := vdl.TypeOf((*Args)(nil)).Elem(); !vdl.Compatible(tt, ttWant) {
+ return nil, fmt.Errorf("type %v incompatible with %v", tt, ttWant)
+ }
+ return t, nil
+}
+func (t *ArgsTarget) StartField(name string) (key, field vdl.Target, _ error) {
+ switch name {
+ case "A":
+ t.aTarget.Value = &t.Value.A
+ target, err := &t.aTarget, error(nil)
+ return nil, target, err
+ case "B":
+ t.bTarget.Value = &t.Value.B
+ target, err := &t.bTarget, error(nil)
+ return nil, target, err
+ default:
+ return nil, nil, fmt.Errorf("field %s not in struct v.io/x/ref/lib/vdl/testdata/base.Args", name)
+ }
+}
+func (t *ArgsTarget) FinishField(_, _ vdl.Target) error {
+ return nil
+}
+func (t *ArgsTarget) FinishFields(_ vdl.FieldsTarget) error {
+
+ return nil
+}
+
// NestedArgs is defined before Args; that's allowed in regular Go, and also
// allowed in our vdl files. The compiler will re-order dependent types to ease
// code generation in other languages.
@@ -3788,9 +3866,6 @@
}
func (m *NestedArgs) FillVDLTarget(t vdl.Target, tt *vdl.Type) error {
- if __VDLType_v_io_x_ref_lib_vdl_testdata_base_NestedArgs == nil || __VDLType15 == nil {
- panic("Initialization order error: types generated for FillVDLTarget not initialized. Consider moving caller to an init() block.")
- }
fieldsTarget1, err := t.StartFields(tt)
if err != nil {
return err
@@ -3802,7 +3877,7 @@
}
if err != vdl.ErrFieldNoExist {
- if err := m.Args.FillVDLTarget(fieldTarget3, __VDLType_v_io_x_ref_lib_vdl_testdata_base_Args); err != nil {
+ if err := m.Args.FillVDLTarget(fieldTarget3, tt.NonOptional().Field(0).Type); err != nil {
return err
}
if err := fieldsTarget1.FinishField(keyTarget2, fieldTarget3); err != nil {
@@ -3828,8 +3903,8 @@
func (t *NestedArgsTarget) StartFields(tt *vdl.Type) (vdl.FieldsTarget, error) {
- if !vdl.Compatible(tt, __VDLType_v_io_x_ref_lib_vdl_testdata_base_NestedArgs) {
- return nil, fmt.Errorf("type %v incompatible with %v", tt, __VDLType_v_io_x_ref_lib_vdl_testdata_base_NestedArgs)
+ if ttWant := vdl.TypeOf((*NestedArgs)(nil)).Elem(); !vdl.Compatible(tt, ttWant) {
+ return nil, fmt.Errorf("type %v incompatible with %v", tt, ttWant)
}
return t, nil
}
@@ -3840,7 +3915,7 @@
target, err := &t.argsTarget, error(nil)
return nil, target, err
default:
- return nil, nil, fmt.Errorf("field %s not in struct %v", name, __VDLType_v_io_x_ref_lib_vdl_testdata_base_NestedArgs)
+ return nil, nil, fmt.Errorf("field %s not in struct v.io/x/ref/lib/vdl/testdata/base.NestedArgs", name)
}
}
func (t *NestedArgsTarget) FinishField(_, _ vdl.Target) error {
@@ -3851,306 +3926,17 @@
return nil
}
-type ArgsTarget struct {
- Value *Args
- aTarget vdl.Int32Target
- bTarget vdl.Int32Target
- vdl.TargetBase
- vdl.FieldsTargetBase
-}
-
-func (t *ArgsTarget) StartFields(tt *vdl.Type) (vdl.FieldsTarget, error) {
-
- if !vdl.Compatible(tt, __VDLType_v_io_x_ref_lib_vdl_testdata_base_Args) {
- return nil, fmt.Errorf("type %v incompatible with %v", tt, __VDLType_v_io_x_ref_lib_vdl_testdata_base_Args)
- }
- return t, nil
-}
-func (t *ArgsTarget) StartField(name string) (key, field vdl.Target, _ error) {
- switch name {
- case "A":
- t.aTarget.Value = &t.Value.A
- target, err := &t.aTarget, error(nil)
- return nil, target, err
- case "B":
- t.bTarget.Value = &t.Value.B
- target, err := &t.bTarget, error(nil)
- return nil, target, err
- default:
- return nil, nil, fmt.Errorf("field %s not in struct %v", name, __VDLType_v_io_x_ref_lib_vdl_testdata_base_Args)
- }
-}
-func (t *ArgsTarget) FinishField(_, _ vdl.Target) error {
- return nil
-}
-func (t *ArgsTarget) FinishFields(_ vdl.FieldsTarget) error {
-
- return nil
-}
-
-// Args will be reordered to show up before NestedArgs in the generated output.
-type Args struct {
- A int32
- B int32
-}
-
-func (Args) __VDLReflect(struct {
- Name string `vdl:"v.io/x/ref/lib/vdl/testdata/base.Args"`
-}) {
-}
-
-func (m *Args) FillVDLTarget(t vdl.Target, tt *vdl.Type) error {
- if __VDLType_v_io_x_ref_lib_vdl_testdata_base_Args == nil || __VDLType16 == nil {
- panic("Initialization order error: types generated for FillVDLTarget not initialized. Consider moving caller to an init() block.")
- }
- fieldsTarget1, err := t.StartFields(tt)
- if err != nil {
- return err
- }
-
- keyTarget2, fieldTarget3, err := fieldsTarget1.StartField("A")
- if err != vdl.ErrFieldNoExist && err != nil {
- return err
- }
- if err != vdl.ErrFieldNoExist {
- if err := fieldTarget3.FromInt(int64(m.A), vdl.Int32Type); err != nil {
- return err
- }
- if err := fieldsTarget1.FinishField(keyTarget2, fieldTarget3); err != nil {
- return err
- }
- }
- keyTarget4, fieldTarget5, err := fieldsTarget1.StartField("B")
- if err != vdl.ErrFieldNoExist && err != nil {
- return err
- }
- if err != vdl.ErrFieldNoExist {
- if err := fieldTarget5.FromInt(int64(m.B), vdl.Int32Type); err != nil {
- return err
- }
- if err := fieldsTarget1.FinishField(keyTarget4, fieldTarget5); err != nil {
- return err
- }
- }
- if err := t.FinishFields(fieldsTarget1); err != nil {
- return err
- }
- return nil
-}
-
-func (m *Args) MakeVDLTarget() vdl.Target {
- return &ArgsTarget{Value: m}
-}
-
-func init() {
- vdl.Register((*NamedBool)(nil))
- vdl.Register((*NamedByte)(nil))
- vdl.Register((*NamedUint16)(nil))
- vdl.Register((*NamedUint32)(nil))
- vdl.Register((*NamedUint64)(nil))
- vdl.Register((*NamedInt8)(nil))
- vdl.Register((*NamedInt16)(nil))
- vdl.Register((*NamedInt32)(nil))
- vdl.Register((*NamedInt64)(nil))
- vdl.Register((*NamedFloat32)(nil))
- vdl.Register((*NamedFloat64)(nil))
- vdl.Register((*NamedComplex64)(nil))
- vdl.Register((*NamedComplex128)(nil))
- vdl.Register((*NamedString)(nil))
- vdl.Register((*NamedEnum)(nil))
- vdl.Register((*NamedArray)(nil))
- vdl.Register((*NamedList)(nil))
- vdl.Register((*NamedSet)(nil))
- vdl.Register((*NamedMap)(nil))
- vdl.Register((*NamedStruct)(nil))
- vdl.Register((*NamedUnion)(nil))
- vdl.Register((*Scalars)(nil))
- vdl.Register((*KeyScalars)(nil))
- vdl.Register((*ScalarsArray)(nil))
- vdl.Register((*Composites)(nil))
- vdl.Register((*CompositesArray)(nil))
- vdl.Register((*CompComp)(nil))
- vdl.Register((*NestedArgs)(nil))
- vdl.Register((*Args)(nil))
-}
-
-var __VDLType16 *vdl.Type = vdl.TypeOf((*Args)(nil))
-var __VDLType10 *vdl.Type = vdl.TypeOf((*CompComp)(nil))
-var __VDLType3 *vdl.Type = vdl.TypeOf((*Composites)(nil))
-var __VDLType2 *vdl.Type = vdl.TypeOf((*KeyScalars)(nil))
-var __VDLType0 *vdl.Type = vdl.TypeOf((*NamedStruct)(nil))
-var __VDLType15 *vdl.Type = vdl.TypeOf((*NestedArgs)(nil))
-var __VDLType1 *vdl.Type = vdl.TypeOf((*Scalars)(nil))
-var __VDLType8 *vdl.Type = vdl.TypeOf([]map[string]complex128(nil))
-var __VDLType14 *vdl.Type = vdl.TypeOf([]map[string]Composites(nil))
-var __VDLType11 *vdl.Type = vdl.TypeOf([]Composites(nil))
-var __VDLType4 *vdl.Type = vdl.TypeOf([]Scalars(nil))
-var __VDLType9 *vdl.Type = vdl.TypeOf(map[string]complex128(nil))
-var __VDLType12 *vdl.Type = vdl.TypeOf(map[string]Composites(nil))
-var __VDLType6 *vdl.Type = vdl.TypeOf(map[string]Scalars(nil))
-var __VDLType7 *vdl.Type = vdl.TypeOf(map[KeyScalars][]map[string]complex128(nil))
-var __VDLType13 *vdl.Type = vdl.TypeOf(map[KeyScalars][]map[string]Composites(nil))
-var __VDLType5 *vdl.Type = vdl.TypeOf(map[KeyScalars]struct{}(nil))
-var __VDLType_v_io_x_ref_lib_vdl_testdata_base_Args *vdl.Type = vdl.TypeOf(Args{})
-var __VDLType_v_io_x_ref_lib_vdl_testdata_base_CompComp *vdl.Type = vdl.TypeOf(CompComp{
- A0: Composites{
- A0: Scalars{
- A16: vdl.AnyType,
- B15: NamedUnionA{false},
- },
- A1: ScalarsArray{
- {
- A16: vdl.AnyType,
- B15: NamedUnionA{false},
- },
- {
- A16: vdl.AnyType,
- B15: NamedUnionA{false},
- },
- },
- },
- A1: CompositesArray{
- {
- A0: Scalars{
- A16: vdl.AnyType,
- B15: NamedUnionA{false},
- },
- A1: ScalarsArray{
- {
- A16: vdl.AnyType,
- B15: NamedUnionA{false},
- },
- {
- A16: vdl.AnyType,
- B15: NamedUnionA{false},
- },
- },
- },
- {
- A0: Scalars{
- A16: vdl.AnyType,
- B15: NamedUnionA{false},
- },
- A1: ScalarsArray{
- {
- A16: vdl.AnyType,
- B15: NamedUnionA{false},
- },
- {
- A16: vdl.AnyType,
- B15: NamedUnionA{false},
- },
- },
- },
- },
-})
-var __VDLType_v_io_x_ref_lib_vdl_testdata_base_Composites *vdl.Type = vdl.TypeOf(Composites{
- A0: Scalars{
- A16: vdl.AnyType,
- B15: NamedUnionA{false},
- },
- A1: ScalarsArray{
- {
- A16: vdl.AnyType,
- B15: NamedUnionA{false},
- },
- {
- A16: vdl.AnyType,
- B15: NamedUnionA{false},
- },
- },
-})
-var __VDLType_v_io_x_ref_lib_vdl_testdata_base_CompositesArray *vdl.Type = vdl.TypeOf(CompositesArray{
- {
- A0: Scalars{
- A16: vdl.AnyType,
- B15: NamedUnionA{false},
- },
- A1: ScalarsArray{
- {
- A16: vdl.AnyType,
- B15: NamedUnionA{false},
- },
- {
- A16: vdl.AnyType,
- B15: NamedUnionA{false},
- },
- },
- },
- {
- A0: Scalars{
- A16: vdl.AnyType,
- B15: NamedUnionA{false},
- },
- A1: ScalarsArray{
- {
- A16: vdl.AnyType,
- B15: NamedUnionA{false},
- },
- {
- A16: vdl.AnyType,
- B15: NamedUnionA{false},
- },
- },
- },
-})
-var __VDLType_v_io_x_ref_lib_vdl_testdata_base_KeyScalars *vdl.Type = vdl.TypeOf(KeyScalars{})
-var __VDLType_v_io_x_ref_lib_vdl_testdata_base_NamedArray *vdl.Type = vdl.TypeOf(NamedArray{})
-var __VDLType_v_io_x_ref_lib_vdl_testdata_base_NamedBool *vdl.Type = vdl.TypeOf(NamedBool(false))
-var __VDLType_v_io_x_ref_lib_vdl_testdata_base_NamedByte *vdl.Type = vdl.TypeOf(NamedByte(0))
-var __VDLType_v_io_x_ref_lib_vdl_testdata_base_NamedComplex128 *vdl.Type = vdl.TypeOf(NamedComplex128(0))
-var __VDLType_v_io_x_ref_lib_vdl_testdata_base_NamedComplex64 *vdl.Type = vdl.TypeOf(NamedComplex64(0))
-var __VDLType_v_io_x_ref_lib_vdl_testdata_base_NamedEnum *vdl.Type = vdl.TypeOf(NamedEnumA)
-var __VDLType_v_io_x_ref_lib_vdl_testdata_base_NamedFloat32 *vdl.Type = vdl.TypeOf(NamedFloat32(0))
-var __VDLType_v_io_x_ref_lib_vdl_testdata_base_NamedFloat64 *vdl.Type = vdl.TypeOf(NamedFloat64(0))
-var __VDLType_v_io_x_ref_lib_vdl_testdata_base_NamedInt16 *vdl.Type = vdl.TypeOf(NamedInt16(0))
-var __VDLType_v_io_x_ref_lib_vdl_testdata_base_NamedInt32 *vdl.Type = vdl.TypeOf(NamedInt32(0))
-var __VDLType_v_io_x_ref_lib_vdl_testdata_base_NamedInt64 *vdl.Type = vdl.TypeOf(NamedInt64(0))
-var __VDLType_v_io_x_ref_lib_vdl_testdata_base_NamedInt8 *vdl.Type = vdl.TypeOf(NamedInt8(0))
-var __VDLType_v_io_x_ref_lib_vdl_testdata_base_NamedList *vdl.Type = vdl.TypeOf(NamedList(nil))
-var __VDLType_v_io_x_ref_lib_vdl_testdata_base_NamedMap *vdl.Type = vdl.TypeOf(NamedMap(nil))
-var __VDLType_v_io_x_ref_lib_vdl_testdata_base_NamedSet *vdl.Type = vdl.TypeOf(NamedSet(nil))
-var __VDLType_v_io_x_ref_lib_vdl_testdata_base_NamedString *vdl.Type = vdl.TypeOf(NamedString(""))
-var __VDLType_v_io_x_ref_lib_vdl_testdata_base_NamedStruct *vdl.Type = vdl.TypeOf(NamedStruct{})
-var __VDLType_v_io_x_ref_lib_vdl_testdata_base_NamedUint16 *vdl.Type = vdl.TypeOf(NamedUint16(0))
-var __VDLType_v_io_x_ref_lib_vdl_testdata_base_NamedUint32 *vdl.Type = vdl.TypeOf(NamedUint32(0))
-var __VDLType_v_io_x_ref_lib_vdl_testdata_base_NamedUint64 *vdl.Type = vdl.TypeOf(NamedUint64(0))
-var __VDLType_v_io_x_ref_lib_vdl_testdata_base_NamedUnion *vdl.Type = vdl.TypeOf(NamedUnion(NamedUnionA{false}))
-var __VDLType_v_io_x_ref_lib_vdl_testdata_base_NestedArgs *vdl.Type = vdl.TypeOf(NestedArgs{})
-var __VDLType_v_io_x_ref_lib_vdl_testdata_base_Scalars *vdl.Type = vdl.TypeOf(Scalars{
- A16: vdl.AnyType,
- B15: NamedUnionA{false},
-})
-var __VDLType_v_io_x_ref_lib_vdl_testdata_base_ScalarsArray *vdl.Type = vdl.TypeOf(ScalarsArray{
- {
- A16: vdl.AnyType,
- B15: NamedUnionA{false},
- },
- {
- A16: vdl.AnyType,
- B15: NamedUnionA{false},
- },
-})
-
-func __VDLEnsureNativeBuilt() {
-}
+//////////////////////////////////////////////////
+// Const definitions
const Cbool = true
-
const Cbyte = byte(1)
-
const Cint32 = int32(2)
-
const Cint64 = int64(3)
-
const Cuint32 = uint32(4)
-
const Cuint64 = uint64(5)
-
const Cfloat32 = float32(6)
-
const Cfloat64 = float64(7)
-
const CNamedBool = NamedBool(true)
var CNamedStruct = NamedStruct{
@@ -4159,43 +3945,34 @@
}
const Ccomplex64 = complex64(8 + 9i)
-
const Ccomplex128 = complex128(10 + 11i)
-
const Cstring = "foo"
-
const Cenum = NamedEnumA
var Cunion = NamedUnion(NamedUnionA{true})
-
var Carray = NamedArray{
true,
false,
}
-
var Clist = []int32{
1,
2,
3,
}
-
var Cset = map[int32]struct{}{
1: struct{}{},
2: struct{}{},
3: struct{}{},
}
-
var cmap = map[int32]string{
1: "A",
2: "B",
3: "C",
}
-
var Cargs = Args{
A: 1,
B: 2,
}
-
var CScalars = Scalars{
A0: true,
A1: 1,
@@ -4212,7 +3989,7 @@
A12: 12,
A13: "abc",
A15: vom.RawBytesOf(false),
- A16: vdl.TypeOf(false),
+ A16: vdl.TypeOf((*bool)(nil)),
B0: true,
B1: 1,
B2: 2,
@@ -4232,56 +4009,33 @@
}
const True = true
-
const Foo = "foo"
-
const Five = int32(5)
-
const Six = uint64(6)
-
const SixSquared = uint64(36)
-
const FiveSquared = int32(25)
-var CTypeObject_bool = vdl.TypeOf(false)
-
-var CTypeObject_string = vdl.TypeOf("")
-
-var CTypeObject_bytes = vdl.TypeOf([]byte(nil))
-
-var CTypeObject_byte = vdl.TypeOf(byte(0))
-
-var CTypeObject_uint16 = vdl.TypeOf(uint16(0))
-
-var CTypeObject_int8 = vdl.TypeOf(int8(0))
-
-var CTypeObject_int16 = vdl.TypeOf(int16(0))
-
-var CTypeObject_float32 = vdl.TypeOf(float32(0))
-
-var CTypeObject_complex64 = vdl.TypeOf(complex64(0))
-
-var CTypeObject_enum = vdl.TypeOf(NamedEnumA)
-
-var CTypeObject_Array = vdl.TypeOf(NamedArray{})
-
-var CTypeObject_List = vdl.TypeOf([]string(nil))
-
-var CTypeObject_Set = vdl.TypeOf(map[string]struct{}(nil))
-
-var CTypeObject_Map = vdl.TypeOf(map[string]int64(nil))
-
-var CTypeObject_Struct = vdl.TypeOf(Scalars{
- A16: vdl.AnyType,
- B15: NamedUnionA{false},
-})
-
-var CTypeObject_Union = vdl.TypeOf(NamedUnion(NamedUnionA{false}))
-
+var CTypeObject_bool = vdl.TypeOf((*bool)(nil))
+var CTypeObject_string = vdl.TypeOf((*string)(nil))
+var CTypeObject_bytes = vdl.TypeOf((*[]byte)(nil))
+var CTypeObject_byte = vdl.TypeOf((*byte)(nil))
+var CTypeObject_uint16 = vdl.TypeOf((*uint16)(nil))
+var CTypeObject_int8 = vdl.TypeOf((*int8)(nil))
+var CTypeObject_int16 = vdl.TypeOf((*int16)(nil))
+var CTypeObject_float32 = vdl.TypeOf((*float32)(nil))
+var CTypeObject_complex64 = vdl.TypeOf((*complex64)(nil))
+var CTypeObject_enum = vdl.TypeOf((*NamedEnum)(nil))
+var CTypeObject_Array = vdl.TypeOf((*NamedArray)(nil))
+var CTypeObject_List = vdl.TypeOf((*[]string)(nil))
+var CTypeObject_Set = vdl.TypeOf((*map[string]struct{})(nil))
+var CTypeObject_Map = vdl.TypeOf((*map[string]int64)(nil))
+var CTypeObject_Struct = vdl.TypeOf((*Scalars)(nil)).Elem()
+var CTypeObject_Union = vdl.TypeOf((*NamedUnion)(nil))
var CTypeObject_TypeObject = vdl.TypeObjectType
-
var CTypeObject_Any = vdl.AnyType
+//////////////////////////////////////////////////
+// Error definitions
var (
ErrNoParams1 = verror.Register("v.io/x/ref/lib/vdl/testdata/base.NoParams1", verror.NoRetry, "{1:}{2:} en msg")
ErrNoParams2 = verror.Register("v.io/x/ref/lib/vdl/testdata/base.NoParams2", verror.RetryRefetch, "{1:}{2:} en msg")
@@ -4290,16 +4044,6 @@
errNotExported = verror.Register("v.io/x/ref/lib/vdl/testdata/base.notExported", verror.NoRetry, "{1:}{2:} en x={3} y={4}")
)
-func init() {
- i18n.Cat().SetWithBase(i18n.LangID("en"), i18n.MsgID(ErrNoParams1.ID), "{1:}{2:} en msg")
- i18n.Cat().SetWithBase(i18n.LangID("en"), i18n.MsgID(ErrNoParams2.ID), "{1:}{2:} en msg")
- i18n.Cat().SetWithBase(i18n.LangID("fr"), i18n.MsgID(ErrNoParams2.ID), "{1:}{2:} fr msg")
- i18n.Cat().SetWithBase(i18n.LangID("en"), i18n.MsgID(ErrWithParams1.ID), "{1:}{2:} en x={3} y={4}")
- i18n.Cat().SetWithBase(i18n.LangID("en"), i18n.MsgID(ErrWithParams2.ID), "{1:}{2:} en x={3} y={4}")
- i18n.Cat().SetWithBase(i18n.LangID("fr"), i18n.MsgID(ErrWithParams2.ID), "{1:}{2:} fr y={4} x={3}")
- i18n.Cat().SetWithBase(i18n.LangID("en"), i18n.MsgID(errNotExported.ID), "{1:}{2:} en x={3} y={4}")
-}
-
// NewErrNoParams1 returns an error with the ErrNoParams1 ID.
func NewErrNoParams1(ctx *context.T) error {
return verror.New(ErrNoParams1, ctx)
@@ -4325,6 +4069,9 @@
return verror.New(errNotExported, ctx, x, y)
}
+//////////////////////////////////////////////////
+// Interface definitions
+
// ServiceAClientMethods is the client interface
// containing ServiceA methods.
type ServiceAClientMethods interface {
@@ -4899,3 +4646,66 @@
},
},
}
+
+var __VDLInitCalled bool
+
+// __VDLInit performs vdl initialization. It is safe to call multiple times.
+// If you have an init ordering issue, just insert the following line verbatim
+// into your source files in this package, right after the "package foo" clause:
+//
+// var _ = __VDLInit()
+//
+// The purpose of this function is to ensure that vdl initialization occurs in
+// the right order, and very early in the init sequence. In particular, vdl
+// registration and package variable initialization needs to occur before
+// functions like vdl.TypeOf will work properly.
+//
+// This function returns a dummy value, so that it can be used to initialize the
+// first var in the file, to take advantage of Go's defined init order.
+func __VDLInit() struct{} {
+ if __VDLInitCalled {
+ return struct{}{}
+ }
+
+ // Register types.
+ vdl.Register((*NamedBool)(nil))
+ vdl.Register((*NamedByte)(nil))
+ vdl.Register((*NamedUint16)(nil))
+ vdl.Register((*NamedUint32)(nil))
+ vdl.Register((*NamedUint64)(nil))
+ vdl.Register((*NamedInt8)(nil))
+ vdl.Register((*NamedInt16)(nil))
+ vdl.Register((*NamedInt32)(nil))
+ vdl.Register((*NamedInt64)(nil))
+ vdl.Register((*NamedFloat32)(nil))
+ vdl.Register((*NamedFloat64)(nil))
+ vdl.Register((*NamedComplex64)(nil))
+ vdl.Register((*NamedComplex128)(nil))
+ vdl.Register((*NamedString)(nil))
+ vdl.Register((*NamedEnum)(nil))
+ vdl.Register((*NamedArray)(nil))
+ vdl.Register((*NamedList)(nil))
+ vdl.Register((*NamedSet)(nil))
+ vdl.Register((*NamedMap)(nil))
+ vdl.Register((*NamedStruct)(nil))
+ vdl.Register((*NamedUnion)(nil))
+ vdl.Register((*Scalars)(nil))
+ vdl.Register((*KeyScalars)(nil))
+ vdl.Register((*ScalarsArray)(nil))
+ vdl.Register((*Composites)(nil))
+ vdl.Register((*CompositesArray)(nil))
+ vdl.Register((*CompComp)(nil))
+ vdl.Register((*Args)(nil))
+ vdl.Register((*NestedArgs)(nil))
+
+ // Set error format strings.
+ i18n.Cat().SetWithBase(i18n.LangID("en"), i18n.MsgID(ErrNoParams1.ID), "{1:}{2:} en msg")
+ i18n.Cat().SetWithBase(i18n.LangID("en"), i18n.MsgID(ErrNoParams2.ID), "{1:}{2:} en msg")
+ i18n.Cat().SetWithBase(i18n.LangID("fr"), i18n.MsgID(ErrNoParams2.ID), "{1:}{2:} fr msg")
+ i18n.Cat().SetWithBase(i18n.LangID("en"), i18n.MsgID(ErrWithParams1.ID), "{1:}{2:} en x={3} y={4}")
+ i18n.Cat().SetWithBase(i18n.LangID("en"), i18n.MsgID(ErrWithParams2.ID), "{1:}{2:} en x={3} y={4}")
+ i18n.Cat().SetWithBase(i18n.LangID("fr"), i18n.MsgID(ErrWithParams2.ID), "{1:}{2:} fr y={4} x={3}")
+ i18n.Cat().SetWithBase(i18n.LangID("en"), i18n.MsgID(errNotExported.ID), "{1:}{2:} en x={3} y={4}")
+
+ return struct{}{}
+}
diff --git a/lib/vdl/testdata/nativedep/nativedep.vdl.go b/lib/vdl/testdata/nativedep/nativedep.vdl.go
index fe3955f..1a8309d 100644
--- a/lib/vdl/testdata/nativedep/nativedep.vdl.go
+++ b/lib/vdl/testdata/nativedep/nativedep.vdl.go
@@ -15,6 +15,11 @@
nativetest_2 "v.io/x/ref/lib/vdl/testdata/nativetest"
)
+var _ = __VDLInit() // Must be first; see __VDLInit comments for details.
+
+//////////////////////////////////////////////////
+// Type definitions
+
type All struct {
A string
B map[string]int
@@ -29,7 +34,6 @@
}
func (m *All) FillVDLTarget(t vdl.Target, tt *vdl.Type) error {
- __VDLEnsureNativeBuilt()
fieldsTarget1, err := t.StartFields(tt)
if err != nil {
return err
@@ -46,7 +50,7 @@
}
if err != vdl.ErrFieldNoExist {
- if err := wireValue2.FillVDLTarget(fieldTarget4, __VDLType_v_io_x_ref_lib_vdl_testdata_nativetest_WireString); err != nil {
+ if err := wireValue2.FillVDLTarget(fieldTarget4, tt.NonOptional().Field(0).Type); err != nil {
return err
}
if err := fieldsTarget1.FinishField(keyTarget3, fieldTarget4); err != nil {
@@ -64,7 +68,7 @@
}
if err != vdl.ErrFieldNoExist {
- if err := wireValue5.FillVDLTarget(fieldTarget7, __VDLType_v_io_x_ref_lib_vdl_testdata_nativetest_WireMapStringInt); err != nil {
+ if err := wireValue5.FillVDLTarget(fieldTarget7, tt.NonOptional().Field(1).Type); err != nil {
return err
}
if err := fieldsTarget1.FinishField(keyTarget6, fieldTarget7); err != nil {
@@ -82,7 +86,7 @@
}
if err != vdl.ErrFieldNoExist {
- if err := wireValue8.FillVDLTarget(fieldTarget10, __VDLType_v_io_x_ref_lib_vdl_testdata_nativetest_WireTime); err != nil {
+ if err := wireValue8.FillVDLTarget(fieldTarget10, tt.NonOptional().Field(2).Type); err != nil {
return err
}
if err := fieldsTarget1.FinishField(keyTarget9, fieldTarget10); err != nil {
@@ -100,7 +104,7 @@
}
if err != vdl.ErrFieldNoExist {
- if err := wireValue11.FillVDLTarget(fieldTarget13, __VDLType_v_io_x_ref_lib_vdl_testdata_nativetest_WireSamePkg); err != nil {
+ if err := wireValue11.FillVDLTarget(fieldTarget13, tt.NonOptional().Field(3).Type); err != nil {
return err
}
if err := fieldsTarget1.FinishField(keyTarget12, fieldTarget13); err != nil {
@@ -118,7 +122,7 @@
}
if err != vdl.ErrFieldNoExist {
- if err := wireValue14.FillVDLTarget(fieldTarget16, __VDLType_v_io_x_ref_lib_vdl_testdata_nativetest_WireMultiImport); err != nil {
+ if err := wireValue14.FillVDLTarget(fieldTarget16, tt.NonOptional().Field(4).Type); err != nil {
return err
}
if err := fieldsTarget1.FinishField(keyTarget15, fieldTarget16); err != nil {
@@ -148,8 +152,8 @@
func (t *AllTarget) StartFields(tt *vdl.Type) (vdl.FieldsTarget, error) {
- if !vdl.Compatible(tt, __VDLType_v_io_x_ref_lib_vdl_testdata_nativedep_All) {
- return nil, fmt.Errorf("type %v incompatible with %v", tt, __VDLType_v_io_x_ref_lib_vdl_testdata_nativedep_All)
+ if ttWant := vdl.TypeOf((*All)(nil)).Elem(); !vdl.Compatible(tt, ttWant) {
+ return nil, fmt.Errorf("type %v incompatible with %v", tt, ttWant)
}
return t, nil
}
@@ -176,7 +180,7 @@
target, err := &t.eTarget, error(nil)
return nil, target, err
default:
- return nil, nil, fmt.Errorf("field %s not in struct %v", name, __VDLType_v_io_x_ref_lib_vdl_testdata_nativedep_All)
+ return nil, nil, fmt.Errorf("field %s not in struct v.io/x/ref/lib/vdl/testdata/nativedep.All", name)
}
}
func (t *AllTarget) FinishField(_, _ vdl.Target) error {
@@ -187,187 +191,28 @@
return nil
}
-func init() {
+var __VDLInitCalled bool
+
+// __VDLInit performs vdl initialization. It is safe to call multiple times.
+// If you have an init ordering issue, just insert the following line verbatim
+// into your source files in this package, right after the "package foo" clause:
+//
+// var _ = __VDLInit()
+//
+// The purpose of this function is to ensure that vdl initialization occurs in
+// the right order, and very early in the init sequence. In particular, vdl
+// registration and package variable initialization needs to occur before
+// functions like vdl.TypeOf will work properly.
+//
+// This function returns a dummy value, so that it can be used to initialize the
+// first var in the file, to take advantage of Go's defined init order.
+func __VDLInit() struct{} {
+ if __VDLInitCalled {
+ return struct{}{}
+ }
+
+ // Register types.
vdl.Register((*All)(nil))
-}
-var __VDLType0 *vdl.Type
-
-func __VDLType0_gen() *vdl.Type {
- __VDLType0Builder := vdl.TypeBuilder{}
-
- __VDLType01 := __VDLType0Builder.Optional()
- __VDLType02 := __VDLType0Builder.Struct()
- __VDLType03 := __VDLType0Builder.Named("v.io/x/ref/lib/vdl/testdata/nativedep.All").AssignBase(__VDLType02)
- __VDLType04 := vdl.Int32Type
- __VDLType05 := __VDLType0Builder.Named("v.io/x/ref/lib/vdl/testdata/nativetest.WireString").AssignBase(__VDLType04)
- __VDLType02.AppendField("A", __VDLType05)
- __VDLType06 := vdl.Int32Type
- __VDLType07 := __VDLType0Builder.Named("v.io/x/ref/lib/vdl/testdata/nativetest.WireMapStringInt").AssignBase(__VDLType06)
- __VDLType02.AppendField("B", __VDLType07)
- __VDLType08 := vdl.Int32Type
- __VDLType09 := __VDLType0Builder.Named("v.io/x/ref/lib/vdl/testdata/nativetest.WireTime").AssignBase(__VDLType08)
- __VDLType02.AppendField("C", __VDLType09)
- __VDLType010 := vdl.Int32Type
- __VDLType011 := __VDLType0Builder.Named("v.io/x/ref/lib/vdl/testdata/nativetest.WireSamePkg").AssignBase(__VDLType010)
- __VDLType02.AppendField("D", __VDLType011)
- __VDLType012 := vdl.Int32Type
- __VDLType013 := __VDLType0Builder.Named("v.io/x/ref/lib/vdl/testdata/nativetest.WireMultiImport").AssignBase(__VDLType012)
- __VDLType02.AppendField("E", __VDLType013)
- __VDLType01.AssignElem(__VDLType03)
- __VDLType0Builder.Build()
- __VDLType0v, err := __VDLType01.Built()
- if err != nil {
- panic(err)
- }
- return __VDLType0v
-}
-func init() {
- __VDLType0 = __VDLType0_gen()
-}
-
-var __VDLType_v_io_x_ref_lib_vdl_testdata_nativedep_All *vdl.Type
-
-func __VDLType_v_io_x_ref_lib_vdl_testdata_nativedep_All_gen() *vdl.Type {
- __VDLType_v_io_x_ref_lib_vdl_testdata_nativedep_AllBuilder := vdl.TypeBuilder{}
-
- __VDLType_v_io_x_ref_lib_vdl_testdata_nativedep_All1 := __VDLType_v_io_x_ref_lib_vdl_testdata_nativedep_AllBuilder.Struct()
- __VDLType_v_io_x_ref_lib_vdl_testdata_nativedep_All2 := __VDLType_v_io_x_ref_lib_vdl_testdata_nativedep_AllBuilder.Named("v.io/x/ref/lib/vdl/testdata/nativedep.All").AssignBase(__VDLType_v_io_x_ref_lib_vdl_testdata_nativedep_All1)
- __VDLType_v_io_x_ref_lib_vdl_testdata_nativedep_All3 := vdl.Int32Type
- __VDLType_v_io_x_ref_lib_vdl_testdata_nativedep_All4 := __VDLType_v_io_x_ref_lib_vdl_testdata_nativedep_AllBuilder.Named("v.io/x/ref/lib/vdl/testdata/nativetest.WireString").AssignBase(__VDLType_v_io_x_ref_lib_vdl_testdata_nativedep_All3)
- __VDLType_v_io_x_ref_lib_vdl_testdata_nativedep_All1.AppendField("A", __VDLType_v_io_x_ref_lib_vdl_testdata_nativedep_All4)
- __VDLType_v_io_x_ref_lib_vdl_testdata_nativedep_All5 := vdl.Int32Type
- __VDLType_v_io_x_ref_lib_vdl_testdata_nativedep_All6 := __VDLType_v_io_x_ref_lib_vdl_testdata_nativedep_AllBuilder.Named("v.io/x/ref/lib/vdl/testdata/nativetest.WireMapStringInt").AssignBase(__VDLType_v_io_x_ref_lib_vdl_testdata_nativedep_All5)
- __VDLType_v_io_x_ref_lib_vdl_testdata_nativedep_All1.AppendField("B", __VDLType_v_io_x_ref_lib_vdl_testdata_nativedep_All6)
- __VDLType_v_io_x_ref_lib_vdl_testdata_nativedep_All7 := vdl.Int32Type
- __VDLType_v_io_x_ref_lib_vdl_testdata_nativedep_All8 := __VDLType_v_io_x_ref_lib_vdl_testdata_nativedep_AllBuilder.Named("v.io/x/ref/lib/vdl/testdata/nativetest.WireTime").AssignBase(__VDLType_v_io_x_ref_lib_vdl_testdata_nativedep_All7)
- __VDLType_v_io_x_ref_lib_vdl_testdata_nativedep_All1.AppendField("C", __VDLType_v_io_x_ref_lib_vdl_testdata_nativedep_All8)
- __VDLType_v_io_x_ref_lib_vdl_testdata_nativedep_All9 := vdl.Int32Type
- __VDLType_v_io_x_ref_lib_vdl_testdata_nativedep_All10 := __VDLType_v_io_x_ref_lib_vdl_testdata_nativedep_AllBuilder.Named("v.io/x/ref/lib/vdl/testdata/nativetest.WireSamePkg").AssignBase(__VDLType_v_io_x_ref_lib_vdl_testdata_nativedep_All9)
- __VDLType_v_io_x_ref_lib_vdl_testdata_nativedep_All1.AppendField("D", __VDLType_v_io_x_ref_lib_vdl_testdata_nativedep_All10)
- __VDLType_v_io_x_ref_lib_vdl_testdata_nativedep_All11 := vdl.Int32Type
- __VDLType_v_io_x_ref_lib_vdl_testdata_nativedep_All12 := __VDLType_v_io_x_ref_lib_vdl_testdata_nativedep_AllBuilder.Named("v.io/x/ref/lib/vdl/testdata/nativetest.WireMultiImport").AssignBase(__VDLType_v_io_x_ref_lib_vdl_testdata_nativedep_All11)
- __VDLType_v_io_x_ref_lib_vdl_testdata_nativedep_All1.AppendField("E", __VDLType_v_io_x_ref_lib_vdl_testdata_nativedep_All12)
- __VDLType_v_io_x_ref_lib_vdl_testdata_nativedep_AllBuilder.Build()
- __VDLType_v_io_x_ref_lib_vdl_testdata_nativedep_Allv, err := __VDLType_v_io_x_ref_lib_vdl_testdata_nativedep_All2.Built()
- if err != nil {
- panic(err)
- }
- return __VDLType_v_io_x_ref_lib_vdl_testdata_nativedep_Allv
-}
-func init() {
- __VDLType_v_io_x_ref_lib_vdl_testdata_nativedep_All = __VDLType_v_io_x_ref_lib_vdl_testdata_nativedep_All_gen()
-}
-
-var __VDLType_v_io_x_ref_lib_vdl_testdata_nativetest_WireMapStringInt *vdl.Type
-
-func __VDLType_v_io_x_ref_lib_vdl_testdata_nativetest_WireMapStringInt_gen() *vdl.Type {
- __VDLType_v_io_x_ref_lib_vdl_testdata_nativetest_WireMapStringIntBuilder := vdl.TypeBuilder{}
-
- __VDLType_v_io_x_ref_lib_vdl_testdata_nativetest_WireMapStringInt1 := vdl.Int32Type
- __VDLType_v_io_x_ref_lib_vdl_testdata_nativetest_WireMapStringInt2 := __VDLType_v_io_x_ref_lib_vdl_testdata_nativetest_WireMapStringIntBuilder.Named("v.io/x/ref/lib/vdl/testdata/nativetest.WireMapStringInt").AssignBase(__VDLType_v_io_x_ref_lib_vdl_testdata_nativetest_WireMapStringInt1)
- __VDLType_v_io_x_ref_lib_vdl_testdata_nativetest_WireMapStringIntBuilder.Build()
- __VDLType_v_io_x_ref_lib_vdl_testdata_nativetest_WireMapStringIntv, err := __VDLType_v_io_x_ref_lib_vdl_testdata_nativetest_WireMapStringInt2.Built()
- if err != nil {
- panic(err)
- }
- return __VDLType_v_io_x_ref_lib_vdl_testdata_nativetest_WireMapStringIntv
-}
-func init() {
- __VDLType_v_io_x_ref_lib_vdl_testdata_nativetest_WireMapStringInt = __VDLType_v_io_x_ref_lib_vdl_testdata_nativetest_WireMapStringInt_gen()
-}
-
-var __VDLType_v_io_x_ref_lib_vdl_testdata_nativetest_WireMultiImport *vdl.Type
-
-func __VDLType_v_io_x_ref_lib_vdl_testdata_nativetest_WireMultiImport_gen() *vdl.Type {
- __VDLType_v_io_x_ref_lib_vdl_testdata_nativetest_WireMultiImportBuilder := vdl.TypeBuilder{}
-
- __VDLType_v_io_x_ref_lib_vdl_testdata_nativetest_WireMultiImport1 := vdl.Int32Type
- __VDLType_v_io_x_ref_lib_vdl_testdata_nativetest_WireMultiImport2 := __VDLType_v_io_x_ref_lib_vdl_testdata_nativetest_WireMultiImportBuilder.Named("v.io/x/ref/lib/vdl/testdata/nativetest.WireMultiImport").AssignBase(__VDLType_v_io_x_ref_lib_vdl_testdata_nativetest_WireMultiImport1)
- __VDLType_v_io_x_ref_lib_vdl_testdata_nativetest_WireMultiImportBuilder.Build()
- __VDLType_v_io_x_ref_lib_vdl_testdata_nativetest_WireMultiImportv, err := __VDLType_v_io_x_ref_lib_vdl_testdata_nativetest_WireMultiImport2.Built()
- if err != nil {
- panic(err)
- }
- return __VDLType_v_io_x_ref_lib_vdl_testdata_nativetest_WireMultiImportv
-}
-func init() {
- __VDLType_v_io_x_ref_lib_vdl_testdata_nativetest_WireMultiImport = __VDLType_v_io_x_ref_lib_vdl_testdata_nativetest_WireMultiImport_gen()
-}
-
-var __VDLType_v_io_x_ref_lib_vdl_testdata_nativetest_WireSamePkg *vdl.Type
-
-func __VDLType_v_io_x_ref_lib_vdl_testdata_nativetest_WireSamePkg_gen() *vdl.Type {
- __VDLType_v_io_x_ref_lib_vdl_testdata_nativetest_WireSamePkgBuilder := vdl.TypeBuilder{}
-
- __VDLType_v_io_x_ref_lib_vdl_testdata_nativetest_WireSamePkg1 := vdl.Int32Type
- __VDLType_v_io_x_ref_lib_vdl_testdata_nativetest_WireSamePkg2 := __VDLType_v_io_x_ref_lib_vdl_testdata_nativetest_WireSamePkgBuilder.Named("v.io/x/ref/lib/vdl/testdata/nativetest.WireSamePkg").AssignBase(__VDLType_v_io_x_ref_lib_vdl_testdata_nativetest_WireSamePkg1)
- __VDLType_v_io_x_ref_lib_vdl_testdata_nativetest_WireSamePkgBuilder.Build()
- __VDLType_v_io_x_ref_lib_vdl_testdata_nativetest_WireSamePkgv, err := __VDLType_v_io_x_ref_lib_vdl_testdata_nativetest_WireSamePkg2.Built()
- if err != nil {
- panic(err)
- }
- return __VDLType_v_io_x_ref_lib_vdl_testdata_nativetest_WireSamePkgv
-}
-func init() {
- __VDLType_v_io_x_ref_lib_vdl_testdata_nativetest_WireSamePkg = __VDLType_v_io_x_ref_lib_vdl_testdata_nativetest_WireSamePkg_gen()
-}
-
-var __VDLType_v_io_x_ref_lib_vdl_testdata_nativetest_WireString *vdl.Type
-
-func __VDLType_v_io_x_ref_lib_vdl_testdata_nativetest_WireString_gen() *vdl.Type {
- __VDLType_v_io_x_ref_lib_vdl_testdata_nativetest_WireStringBuilder := vdl.TypeBuilder{}
-
- __VDLType_v_io_x_ref_lib_vdl_testdata_nativetest_WireString1 := vdl.Int32Type
- __VDLType_v_io_x_ref_lib_vdl_testdata_nativetest_WireString2 := __VDLType_v_io_x_ref_lib_vdl_testdata_nativetest_WireStringBuilder.Named("v.io/x/ref/lib/vdl/testdata/nativetest.WireString").AssignBase(__VDLType_v_io_x_ref_lib_vdl_testdata_nativetest_WireString1)
- __VDLType_v_io_x_ref_lib_vdl_testdata_nativetest_WireStringBuilder.Build()
- __VDLType_v_io_x_ref_lib_vdl_testdata_nativetest_WireStringv, err := __VDLType_v_io_x_ref_lib_vdl_testdata_nativetest_WireString2.Built()
- if err != nil {
- panic(err)
- }
- return __VDLType_v_io_x_ref_lib_vdl_testdata_nativetest_WireStringv
-}
-func init() {
- __VDLType_v_io_x_ref_lib_vdl_testdata_nativetest_WireString = __VDLType_v_io_x_ref_lib_vdl_testdata_nativetest_WireString_gen()
-}
-
-var __VDLType_v_io_x_ref_lib_vdl_testdata_nativetest_WireTime *vdl.Type
-
-func __VDLType_v_io_x_ref_lib_vdl_testdata_nativetest_WireTime_gen() *vdl.Type {
- __VDLType_v_io_x_ref_lib_vdl_testdata_nativetest_WireTimeBuilder := vdl.TypeBuilder{}
-
- __VDLType_v_io_x_ref_lib_vdl_testdata_nativetest_WireTime1 := vdl.Int32Type
- __VDLType_v_io_x_ref_lib_vdl_testdata_nativetest_WireTime2 := __VDLType_v_io_x_ref_lib_vdl_testdata_nativetest_WireTimeBuilder.Named("v.io/x/ref/lib/vdl/testdata/nativetest.WireTime").AssignBase(__VDLType_v_io_x_ref_lib_vdl_testdata_nativetest_WireTime1)
- __VDLType_v_io_x_ref_lib_vdl_testdata_nativetest_WireTimeBuilder.Build()
- __VDLType_v_io_x_ref_lib_vdl_testdata_nativetest_WireTimev, err := __VDLType_v_io_x_ref_lib_vdl_testdata_nativetest_WireTime2.Built()
- if err != nil {
- panic(err)
- }
- return __VDLType_v_io_x_ref_lib_vdl_testdata_nativetest_WireTimev
-}
-func init() {
- __VDLType_v_io_x_ref_lib_vdl_testdata_nativetest_WireTime = __VDLType_v_io_x_ref_lib_vdl_testdata_nativetest_WireTime_gen()
-}
-func __VDLEnsureNativeBuilt() {
- if __VDLType0 == nil {
- __VDLType0 = __VDLType0_gen()
- }
- if __VDLType_v_io_x_ref_lib_vdl_testdata_nativedep_All == nil {
- __VDLType_v_io_x_ref_lib_vdl_testdata_nativedep_All = __VDLType_v_io_x_ref_lib_vdl_testdata_nativedep_All_gen()
- }
- if __VDLType_v_io_x_ref_lib_vdl_testdata_nativetest_WireMapStringInt == nil {
- __VDLType_v_io_x_ref_lib_vdl_testdata_nativetest_WireMapStringInt = __VDLType_v_io_x_ref_lib_vdl_testdata_nativetest_WireMapStringInt_gen()
- }
- if __VDLType_v_io_x_ref_lib_vdl_testdata_nativetest_WireMultiImport == nil {
- __VDLType_v_io_x_ref_lib_vdl_testdata_nativetest_WireMultiImport = __VDLType_v_io_x_ref_lib_vdl_testdata_nativetest_WireMultiImport_gen()
- }
- if __VDLType_v_io_x_ref_lib_vdl_testdata_nativetest_WireSamePkg == nil {
- __VDLType_v_io_x_ref_lib_vdl_testdata_nativetest_WireSamePkg = __VDLType_v_io_x_ref_lib_vdl_testdata_nativetest_WireSamePkg_gen()
- }
- if __VDLType_v_io_x_ref_lib_vdl_testdata_nativetest_WireString == nil {
- __VDLType_v_io_x_ref_lib_vdl_testdata_nativetest_WireString = __VDLType_v_io_x_ref_lib_vdl_testdata_nativetest_WireString_gen()
- }
- if __VDLType_v_io_x_ref_lib_vdl_testdata_nativetest_WireTime == nil {
- __VDLType_v_io_x_ref_lib_vdl_testdata_nativetest_WireTime = __VDLType_v_io_x_ref_lib_vdl_testdata_nativetest_WireTime_gen()
- }
+ return struct{}{}
}
diff --git a/lib/vdl/testdata/nativedep2/nativedep2.vdl.go b/lib/vdl/testdata/nativedep2/nativedep2.vdl.go
index fbf05e2..4e5911a 100644
--- a/lib/vdl/testdata/nativedep2/nativedep2.vdl.go
+++ b/lib/vdl/testdata/nativedep2/nativedep2.vdl.go
@@ -14,6 +14,11 @@
_ "v.io/x/ref/lib/vdl/testdata/nativetest"
)
+var _ = __VDLInit() // Must be first; see __VDLInit comments for details.
+
+//////////////////////////////////////////////////
+// Type definitions
+
type MyTime time.Time
func (MyTime) __VDLReflect(struct {
@@ -22,7 +27,7 @@
}
func (m *MyTime) FillVDLTarget(t vdl.Target, tt *vdl.Type) error {
- if err := t.FromInt(int64((*m)), __VDLType_v_io_x_ref_lib_vdl_testdata_nativedep2_MyTime); err != nil {
+ if err := t.FromInt(int64((*m)), tt); err != nil {
return err
}
return nil
@@ -78,11 +83,28 @@
return nil
}
-func init() {
+var __VDLInitCalled bool
+
+// __VDLInit performs vdl initialization. It is safe to call multiple times.
+// If you have an init ordering issue, just insert the following line verbatim
+// into your source files in this package, right after the "package foo" clause:
+//
+// var _ = __VDLInit()
+//
+// The purpose of this function is to ensure that vdl initialization occurs in
+// the right order, and very early in the init sequence. In particular, vdl
+// registration and package variable initialization needs to occur before
+// functions like vdl.TypeOf will work properly.
+//
+// This function returns a dummy value, so that it can be used to initialize the
+// first var in the file, to take advantage of Go's defined init order.
+func __VDLInit() struct{} {
+ if __VDLInitCalled {
+ return struct{}{}
+ }
+
+ // Register types.
vdl.Register((*MyTime)(nil))
-}
-var __VDLType_v_io_x_ref_lib_vdl_testdata_nativedep2_MyTime *vdl.Type = vdl.TypeOf(MyTime(0))
-
-func __VDLEnsureNativeBuilt() {
+ return struct{}{}
}
diff --git a/lib/vdl/testdata/nativetest/nativetest.vdl.go b/lib/vdl/testdata/nativetest/nativetest.vdl.go
index 24597cd..5390595 100644
--- a/lib/vdl/testdata/nativetest/nativetest.vdl.go
+++ b/lib/vdl/testdata/nativetest/nativetest.vdl.go
@@ -17,6 +17,11 @@
"v.io/v23/vdl/vdlconv"
)
+var _ = __VDLInit() // Must be first; see __VDLInit comments for details.
+
+//////////////////////////////////////////////////
+// Type definitions
+
type WireString int32
func (WireString) __VDLReflect(struct {
@@ -25,7 +30,7 @@
}
func (m *WireString) FillVDLTarget(t vdl.Target, tt *vdl.Type) error {
- if err := t.FromInt(int64((*m)), __VDLType_v_io_x_ref_lib_vdl_testdata_nativetest_WireString); err != nil {
+ if err := t.FromInt(int64((*m)), tt); err != nil {
return err
}
return nil
@@ -102,7 +107,7 @@
}
func (m *WireMapStringInt) FillVDLTarget(t vdl.Target, tt *vdl.Type) error {
- if err := t.FromInt(int64((*m)), __VDLType_v_io_x_ref_lib_vdl_testdata_nativetest_WireMapStringInt); err != nil {
+ if err := t.FromInt(int64((*m)), tt); err != nil {
return err
}
return nil
@@ -179,7 +184,7 @@
}
func (m *WireTime) FillVDLTarget(t vdl.Target, tt *vdl.Type) error {
- if err := t.FromInt(int64((*m)), __VDLType_v_io_x_ref_lib_vdl_testdata_nativetest_WireTime); err != nil {
+ if err := t.FromInt(int64((*m)), tt); err != nil {
return err
}
return nil
@@ -256,7 +261,7 @@
}
func (m *WireSamePkg) FillVDLTarget(t vdl.Target, tt *vdl.Type) error {
- if err := t.FromInt(int64((*m)), __VDLType_v_io_x_ref_lib_vdl_testdata_nativetest_WireSamePkg); err != nil {
+ if err := t.FromInt(int64((*m)), tt); err != nil {
return err
}
return nil
@@ -333,7 +338,7 @@
}
func (m *WireMultiImport) FillVDLTarget(t vdl.Target, tt *vdl.Type) error {
- if err := t.FromInt(int64((*m)), __VDLType_v_io_x_ref_lib_vdl_testdata_nativetest_WireMultiImport); err != nil {
+ if err := t.FromInt(int64((*m)), tt); err != nil {
return err
}
return nil
@@ -410,7 +415,7 @@
}
func (m *WireRenameMe) FillVDLTarget(t vdl.Target, tt *vdl.Type) error {
- if err := t.FromInt(int64((*m)), __VDLType_v_io_x_ref_lib_vdl_testdata_nativetest_WireRenameMe); err != nil {
+ if err := t.FromInt(int64((*m)), tt); err != nil {
return err
}
return nil
@@ -481,7 +486,6 @@
}
func (m *WireAll) FillVDLTarget(t vdl.Target, tt *vdl.Type) error {
- __VDLEnsureNativeBuilt()
fieldsTarget1, err := t.StartFields(tt)
if err != nil {
return err
@@ -498,7 +502,7 @@
}
if err != vdl.ErrFieldNoExist {
- if err := wireValue2.FillVDLTarget(fieldTarget4, __VDLType_v_io_x_ref_lib_vdl_testdata_nativetest_WireString); err != nil {
+ if err := wireValue2.FillVDLTarget(fieldTarget4, tt.NonOptional().Field(0).Type); err != nil {
return err
}
if err := fieldsTarget1.FinishField(keyTarget3, fieldTarget4); err != nil {
@@ -516,7 +520,7 @@
}
if err != vdl.ErrFieldNoExist {
- if err := wireValue5.FillVDLTarget(fieldTarget7, __VDLType_v_io_x_ref_lib_vdl_testdata_nativetest_WireMapStringInt); err != nil {
+ if err := wireValue5.FillVDLTarget(fieldTarget7, tt.NonOptional().Field(1).Type); err != nil {
return err
}
if err := fieldsTarget1.FinishField(keyTarget6, fieldTarget7); err != nil {
@@ -534,7 +538,7 @@
}
if err != vdl.ErrFieldNoExist {
- if err := wireValue8.FillVDLTarget(fieldTarget10, __VDLType_v_io_x_ref_lib_vdl_testdata_nativetest_WireTime); err != nil {
+ if err := wireValue8.FillVDLTarget(fieldTarget10, tt.NonOptional().Field(2).Type); err != nil {
return err
}
if err := fieldsTarget1.FinishField(keyTarget9, fieldTarget10); err != nil {
@@ -552,7 +556,7 @@
}
if err != vdl.ErrFieldNoExist {
- if err := wireValue11.FillVDLTarget(fieldTarget13, __VDLType_v_io_x_ref_lib_vdl_testdata_nativetest_WireSamePkg); err != nil {
+ if err := wireValue11.FillVDLTarget(fieldTarget13, tt.NonOptional().Field(3).Type); err != nil {
return err
}
if err := fieldsTarget1.FinishField(keyTarget12, fieldTarget13); err != nil {
@@ -570,7 +574,7 @@
}
if err != vdl.ErrFieldNoExist {
- if err := wireValue14.FillVDLTarget(fieldTarget16, __VDLType_v_io_x_ref_lib_vdl_testdata_nativetest_WireMultiImport); err != nil {
+ if err := wireValue14.FillVDLTarget(fieldTarget16, tt.NonOptional().Field(4).Type); err != nil {
return err
}
if err := fieldsTarget1.FinishField(keyTarget15, fieldTarget16); err != nil {
@@ -583,7 +587,7 @@
}
if err != vdl.ErrFieldNoExist {
- if err := m.F.FillVDLTarget(fieldTarget18, __VDLType_v_io_x_ref_lib_vdl_testdata_nativetest_WireRenameMe); err != nil {
+ if err := m.F.FillVDLTarget(fieldTarget18, tt.NonOptional().Field(5).Type); err != nil {
return err
}
if err := fieldsTarget1.FinishField(keyTarget17, fieldTarget18); err != nil {
@@ -614,8 +618,8 @@
func (t *WireAllTarget) StartFields(tt *vdl.Type) (vdl.FieldsTarget, error) {
- if !vdl.Compatible(tt, __VDLType_v_io_x_ref_lib_vdl_testdata_nativetest_WireAll) {
- return nil, fmt.Errorf("type %v incompatible with %v", tt, __VDLType_v_io_x_ref_lib_vdl_testdata_nativetest_WireAll)
+ if ttWant := vdl.TypeOf((*WireAll)(nil)).Elem(); !vdl.Compatible(tt, ttWant) {
+ return nil, fmt.Errorf("type %v incompatible with %v", tt, ttWant)
}
return t, nil
}
@@ -646,7 +650,7 @@
target, err := &t.fTarget, error(nil)
return nil, target, err
default:
- return nil, nil, fmt.Errorf("field %s not in struct %v", name, __VDLType_v_io_x_ref_lib_vdl_testdata_nativetest_WireAll)
+ return nil, nil, fmt.Errorf("field %s not in struct v.io/x/ref/lib/vdl/testdata/nativetest.WireAll", name)
}
}
func (t *WireAllTarget) FinishField(_, _ vdl.Target) error {
@@ -665,7 +669,7 @@
}
func (m *ignoreme) FillVDLTarget(t vdl.Target, tt *vdl.Type) error {
- if err := t.FromString(string((*m)), __VDLType_v_io_x_ref_lib_vdl_testdata_nativetest_ignoreme); err != nil {
+ if err := t.FromString(string((*m)), tt); err != nil {
return err
}
return nil
@@ -682,30 +686,14 @@
func (t *ignoremeTarget) FromString(src string, tt *vdl.Type) error {
- if !vdl.Compatible(tt, __VDLType_v_io_x_ref_lib_vdl_testdata_nativetest_ignoreme) {
- return fmt.Errorf("type %v incompatible with %v", tt, __VDLType_v_io_x_ref_lib_vdl_testdata_nativetest_ignoreme)
+ if ttWant := vdl.TypeOf((*ignoreme)(nil)); !vdl.Compatible(tt, ttWant) {
+ return fmt.Errorf("type %v incompatible with %v", tt, ttWant)
}
*t.Value = ignoreme(src)
return nil
}
-func init() {
- vdl.RegisterNative(WireMapStringIntToNative, WireMapStringIntFromNative)
- vdl.RegisterNative(WireMultiImportToNative, WireMultiImportFromNative)
- vdl.RegisterNative(WireSamePkgToNative, WireSamePkgFromNative)
- vdl.RegisterNative(WireStringToNative, WireStringFromNative)
- vdl.RegisterNative(WireTimeToNative, WireTimeFromNative)
- vdl.Register((*WireString)(nil))
- vdl.Register((*WireMapStringInt)(nil))
- vdl.Register((*WireTime)(nil))
- vdl.Register((*WireSamePkg)(nil))
- vdl.Register((*WireMultiImport)(nil))
- vdl.Register((*WireRenameMe)(nil))
- vdl.Register((*WireAll)(nil))
- vdl.Register((*ignoreme)(nil))
-}
-
// Type-check WireMapStringInt conversion functions.
var _ func(WireMapStringInt, *map[string]int) error = WireMapStringIntToNative
var _ func(*WireMapStringInt, map[string]int) error = WireMapStringIntFromNative
@@ -726,193 +714,42 @@
var _ func(WireTime, *time.Time) error = WireTimeToNative
var _ func(*WireTime, time.Time) error = WireTimeFromNative
-var __VDLType0 *vdl.Type
+var __VDLInitCalled bool
-func __VDLType0_gen() *vdl.Type {
- __VDLType0Builder := vdl.TypeBuilder{}
-
- __VDLType01 := __VDLType0Builder.Optional()
- __VDLType02 := __VDLType0Builder.Struct()
- __VDLType03 := __VDLType0Builder.Named("v.io/x/ref/lib/vdl/testdata/nativetest.WireAll").AssignBase(__VDLType02)
- __VDLType04 := vdl.Int32Type
- __VDLType05 := __VDLType0Builder.Named("v.io/x/ref/lib/vdl/testdata/nativetest.WireString").AssignBase(__VDLType04)
- __VDLType02.AppendField("A", __VDLType05)
- __VDLType06 := vdl.Int32Type
- __VDLType07 := __VDLType0Builder.Named("v.io/x/ref/lib/vdl/testdata/nativetest.WireMapStringInt").AssignBase(__VDLType06)
- __VDLType02.AppendField("B", __VDLType07)
- __VDLType08 := vdl.Int32Type
- __VDLType09 := __VDLType0Builder.Named("v.io/x/ref/lib/vdl/testdata/nativetest.WireTime").AssignBase(__VDLType08)
- __VDLType02.AppendField("C", __VDLType09)
- __VDLType010 := vdl.Int32Type
- __VDLType011 := __VDLType0Builder.Named("v.io/x/ref/lib/vdl/testdata/nativetest.WireSamePkg").AssignBase(__VDLType010)
- __VDLType02.AppendField("D", __VDLType011)
- __VDLType012 := vdl.Int32Type
- __VDLType013 := __VDLType0Builder.Named("v.io/x/ref/lib/vdl/testdata/nativetest.WireMultiImport").AssignBase(__VDLType012)
- __VDLType02.AppendField("E", __VDLType013)
- __VDLType014 := vdl.Int32Type
- __VDLType015 := __VDLType0Builder.Named("v.io/x/ref/lib/vdl/testdata/nativetest.WireRenameMe").AssignBase(__VDLType014)
- __VDLType02.AppendField("F", __VDLType015)
- __VDLType01.AssignElem(__VDLType03)
- __VDLType0Builder.Build()
- __VDLType0v, err := __VDLType01.Built()
- if err != nil {
- panic(err)
+// __VDLInit performs vdl initialization. It is safe to call multiple times.
+// If you have an init ordering issue, just insert the following line verbatim
+// into your source files in this package, right after the "package foo" clause:
+//
+// var _ = __VDLInit()
+//
+// The purpose of this function is to ensure that vdl initialization occurs in
+// the right order, and very early in the init sequence. In particular, vdl
+// registration and package variable initialization needs to occur before
+// functions like vdl.TypeOf will work properly.
+//
+// This function returns a dummy value, so that it can be used to initialize the
+// first var in the file, to take advantage of Go's defined init order.
+func __VDLInit() struct{} {
+ if __VDLInitCalled {
+ return struct{}{}
}
- return __VDLType0v
-}
-func init() {
- __VDLType0 = __VDLType0_gen()
-}
-var __VDLType_v_io_x_ref_lib_vdl_testdata_nativetest_WireAll *vdl.Type
+ // Register native type conversions first, so that vdl.TypeOf works.
+ vdl.RegisterNative(WireMapStringIntToNative, WireMapStringIntFromNative)
+ vdl.RegisterNative(WireMultiImportToNative, WireMultiImportFromNative)
+ vdl.RegisterNative(WireSamePkgToNative, WireSamePkgFromNative)
+ vdl.RegisterNative(WireStringToNative, WireStringFromNative)
+ vdl.RegisterNative(WireTimeToNative, WireTimeFromNative)
-func __VDLType_v_io_x_ref_lib_vdl_testdata_nativetest_WireAll_gen() *vdl.Type {
- __VDLType_v_io_x_ref_lib_vdl_testdata_nativetest_WireAllBuilder := vdl.TypeBuilder{}
+ // Register types.
+ vdl.Register((*WireString)(nil))
+ vdl.Register((*WireMapStringInt)(nil))
+ vdl.Register((*WireTime)(nil))
+ vdl.Register((*WireSamePkg)(nil))
+ vdl.Register((*WireMultiImport)(nil))
+ vdl.Register((*WireRenameMe)(nil))
+ vdl.Register((*WireAll)(nil))
+ vdl.Register((*ignoreme)(nil))
- __VDLType_v_io_x_ref_lib_vdl_testdata_nativetest_WireAll1 := __VDLType_v_io_x_ref_lib_vdl_testdata_nativetest_WireAllBuilder.Struct()
- __VDLType_v_io_x_ref_lib_vdl_testdata_nativetest_WireAll2 := __VDLType_v_io_x_ref_lib_vdl_testdata_nativetest_WireAllBuilder.Named("v.io/x/ref/lib/vdl/testdata/nativetest.WireAll").AssignBase(__VDLType_v_io_x_ref_lib_vdl_testdata_nativetest_WireAll1)
- __VDLType_v_io_x_ref_lib_vdl_testdata_nativetest_WireAll3 := vdl.Int32Type
- __VDLType_v_io_x_ref_lib_vdl_testdata_nativetest_WireAll4 := __VDLType_v_io_x_ref_lib_vdl_testdata_nativetest_WireAllBuilder.Named("v.io/x/ref/lib/vdl/testdata/nativetest.WireString").AssignBase(__VDLType_v_io_x_ref_lib_vdl_testdata_nativetest_WireAll3)
- __VDLType_v_io_x_ref_lib_vdl_testdata_nativetest_WireAll1.AppendField("A", __VDLType_v_io_x_ref_lib_vdl_testdata_nativetest_WireAll4)
- __VDLType_v_io_x_ref_lib_vdl_testdata_nativetest_WireAll5 := vdl.Int32Type
- __VDLType_v_io_x_ref_lib_vdl_testdata_nativetest_WireAll6 := __VDLType_v_io_x_ref_lib_vdl_testdata_nativetest_WireAllBuilder.Named("v.io/x/ref/lib/vdl/testdata/nativetest.WireMapStringInt").AssignBase(__VDLType_v_io_x_ref_lib_vdl_testdata_nativetest_WireAll5)
- __VDLType_v_io_x_ref_lib_vdl_testdata_nativetest_WireAll1.AppendField("B", __VDLType_v_io_x_ref_lib_vdl_testdata_nativetest_WireAll6)
- __VDLType_v_io_x_ref_lib_vdl_testdata_nativetest_WireAll7 := vdl.Int32Type
- __VDLType_v_io_x_ref_lib_vdl_testdata_nativetest_WireAll8 := __VDLType_v_io_x_ref_lib_vdl_testdata_nativetest_WireAllBuilder.Named("v.io/x/ref/lib/vdl/testdata/nativetest.WireTime").AssignBase(__VDLType_v_io_x_ref_lib_vdl_testdata_nativetest_WireAll7)
- __VDLType_v_io_x_ref_lib_vdl_testdata_nativetest_WireAll1.AppendField("C", __VDLType_v_io_x_ref_lib_vdl_testdata_nativetest_WireAll8)
- __VDLType_v_io_x_ref_lib_vdl_testdata_nativetest_WireAll9 := vdl.Int32Type
- __VDLType_v_io_x_ref_lib_vdl_testdata_nativetest_WireAll10 := __VDLType_v_io_x_ref_lib_vdl_testdata_nativetest_WireAllBuilder.Named("v.io/x/ref/lib/vdl/testdata/nativetest.WireSamePkg").AssignBase(__VDLType_v_io_x_ref_lib_vdl_testdata_nativetest_WireAll9)
- __VDLType_v_io_x_ref_lib_vdl_testdata_nativetest_WireAll1.AppendField("D", __VDLType_v_io_x_ref_lib_vdl_testdata_nativetest_WireAll10)
- __VDLType_v_io_x_ref_lib_vdl_testdata_nativetest_WireAll11 := vdl.Int32Type
- __VDLType_v_io_x_ref_lib_vdl_testdata_nativetest_WireAll12 := __VDLType_v_io_x_ref_lib_vdl_testdata_nativetest_WireAllBuilder.Named("v.io/x/ref/lib/vdl/testdata/nativetest.WireMultiImport").AssignBase(__VDLType_v_io_x_ref_lib_vdl_testdata_nativetest_WireAll11)
- __VDLType_v_io_x_ref_lib_vdl_testdata_nativetest_WireAll1.AppendField("E", __VDLType_v_io_x_ref_lib_vdl_testdata_nativetest_WireAll12)
- __VDLType_v_io_x_ref_lib_vdl_testdata_nativetest_WireAll13 := vdl.Int32Type
- __VDLType_v_io_x_ref_lib_vdl_testdata_nativetest_WireAll14 := __VDLType_v_io_x_ref_lib_vdl_testdata_nativetest_WireAllBuilder.Named("v.io/x/ref/lib/vdl/testdata/nativetest.WireRenameMe").AssignBase(__VDLType_v_io_x_ref_lib_vdl_testdata_nativetest_WireAll13)
- __VDLType_v_io_x_ref_lib_vdl_testdata_nativetest_WireAll1.AppendField("F", __VDLType_v_io_x_ref_lib_vdl_testdata_nativetest_WireAll14)
- __VDLType_v_io_x_ref_lib_vdl_testdata_nativetest_WireAllBuilder.Build()
- __VDLType_v_io_x_ref_lib_vdl_testdata_nativetest_WireAllv, err := __VDLType_v_io_x_ref_lib_vdl_testdata_nativetest_WireAll2.Built()
- if err != nil {
- panic(err)
- }
- return __VDLType_v_io_x_ref_lib_vdl_testdata_nativetest_WireAllv
-}
-func init() {
- __VDLType_v_io_x_ref_lib_vdl_testdata_nativetest_WireAll = __VDLType_v_io_x_ref_lib_vdl_testdata_nativetest_WireAll_gen()
-}
-
-var __VDLType_v_io_x_ref_lib_vdl_testdata_nativetest_WireMapStringInt *vdl.Type
-
-func __VDLType_v_io_x_ref_lib_vdl_testdata_nativetest_WireMapStringInt_gen() *vdl.Type {
- __VDLType_v_io_x_ref_lib_vdl_testdata_nativetest_WireMapStringIntBuilder := vdl.TypeBuilder{}
-
- __VDLType_v_io_x_ref_lib_vdl_testdata_nativetest_WireMapStringInt1 := vdl.Int32Type
- __VDLType_v_io_x_ref_lib_vdl_testdata_nativetest_WireMapStringInt2 := __VDLType_v_io_x_ref_lib_vdl_testdata_nativetest_WireMapStringIntBuilder.Named("v.io/x/ref/lib/vdl/testdata/nativetest.WireMapStringInt").AssignBase(__VDLType_v_io_x_ref_lib_vdl_testdata_nativetest_WireMapStringInt1)
- __VDLType_v_io_x_ref_lib_vdl_testdata_nativetest_WireMapStringIntBuilder.Build()
- __VDLType_v_io_x_ref_lib_vdl_testdata_nativetest_WireMapStringIntv, err := __VDLType_v_io_x_ref_lib_vdl_testdata_nativetest_WireMapStringInt2.Built()
- if err != nil {
- panic(err)
- }
- return __VDLType_v_io_x_ref_lib_vdl_testdata_nativetest_WireMapStringIntv
-}
-func init() {
- __VDLType_v_io_x_ref_lib_vdl_testdata_nativetest_WireMapStringInt = __VDLType_v_io_x_ref_lib_vdl_testdata_nativetest_WireMapStringInt_gen()
-}
-
-var __VDLType_v_io_x_ref_lib_vdl_testdata_nativetest_WireMultiImport *vdl.Type
-
-func __VDLType_v_io_x_ref_lib_vdl_testdata_nativetest_WireMultiImport_gen() *vdl.Type {
- __VDLType_v_io_x_ref_lib_vdl_testdata_nativetest_WireMultiImportBuilder := vdl.TypeBuilder{}
-
- __VDLType_v_io_x_ref_lib_vdl_testdata_nativetest_WireMultiImport1 := vdl.Int32Type
- __VDLType_v_io_x_ref_lib_vdl_testdata_nativetest_WireMultiImport2 := __VDLType_v_io_x_ref_lib_vdl_testdata_nativetest_WireMultiImportBuilder.Named("v.io/x/ref/lib/vdl/testdata/nativetest.WireMultiImport").AssignBase(__VDLType_v_io_x_ref_lib_vdl_testdata_nativetest_WireMultiImport1)
- __VDLType_v_io_x_ref_lib_vdl_testdata_nativetest_WireMultiImportBuilder.Build()
- __VDLType_v_io_x_ref_lib_vdl_testdata_nativetest_WireMultiImportv, err := __VDLType_v_io_x_ref_lib_vdl_testdata_nativetest_WireMultiImport2.Built()
- if err != nil {
- panic(err)
- }
- return __VDLType_v_io_x_ref_lib_vdl_testdata_nativetest_WireMultiImportv
-}
-func init() {
- __VDLType_v_io_x_ref_lib_vdl_testdata_nativetest_WireMultiImport = __VDLType_v_io_x_ref_lib_vdl_testdata_nativetest_WireMultiImport_gen()
-}
-
-var __VDLType_v_io_x_ref_lib_vdl_testdata_nativetest_WireRenameMe *vdl.Type = vdl.TypeOf(WireRenameMe(0))
-var __VDLType_v_io_x_ref_lib_vdl_testdata_nativetest_WireSamePkg *vdl.Type
-
-func __VDLType_v_io_x_ref_lib_vdl_testdata_nativetest_WireSamePkg_gen() *vdl.Type {
- __VDLType_v_io_x_ref_lib_vdl_testdata_nativetest_WireSamePkgBuilder := vdl.TypeBuilder{}
-
- __VDLType_v_io_x_ref_lib_vdl_testdata_nativetest_WireSamePkg1 := vdl.Int32Type
- __VDLType_v_io_x_ref_lib_vdl_testdata_nativetest_WireSamePkg2 := __VDLType_v_io_x_ref_lib_vdl_testdata_nativetest_WireSamePkgBuilder.Named("v.io/x/ref/lib/vdl/testdata/nativetest.WireSamePkg").AssignBase(__VDLType_v_io_x_ref_lib_vdl_testdata_nativetest_WireSamePkg1)
- __VDLType_v_io_x_ref_lib_vdl_testdata_nativetest_WireSamePkgBuilder.Build()
- __VDLType_v_io_x_ref_lib_vdl_testdata_nativetest_WireSamePkgv, err := __VDLType_v_io_x_ref_lib_vdl_testdata_nativetest_WireSamePkg2.Built()
- if err != nil {
- panic(err)
- }
- return __VDLType_v_io_x_ref_lib_vdl_testdata_nativetest_WireSamePkgv
-}
-func init() {
- __VDLType_v_io_x_ref_lib_vdl_testdata_nativetest_WireSamePkg = __VDLType_v_io_x_ref_lib_vdl_testdata_nativetest_WireSamePkg_gen()
-}
-
-var __VDLType_v_io_x_ref_lib_vdl_testdata_nativetest_WireString *vdl.Type
-
-func __VDLType_v_io_x_ref_lib_vdl_testdata_nativetest_WireString_gen() *vdl.Type {
- __VDLType_v_io_x_ref_lib_vdl_testdata_nativetest_WireStringBuilder := vdl.TypeBuilder{}
-
- __VDLType_v_io_x_ref_lib_vdl_testdata_nativetest_WireString1 := vdl.Int32Type
- __VDLType_v_io_x_ref_lib_vdl_testdata_nativetest_WireString2 := __VDLType_v_io_x_ref_lib_vdl_testdata_nativetest_WireStringBuilder.Named("v.io/x/ref/lib/vdl/testdata/nativetest.WireString").AssignBase(__VDLType_v_io_x_ref_lib_vdl_testdata_nativetest_WireString1)
- __VDLType_v_io_x_ref_lib_vdl_testdata_nativetest_WireStringBuilder.Build()
- __VDLType_v_io_x_ref_lib_vdl_testdata_nativetest_WireStringv, err := __VDLType_v_io_x_ref_lib_vdl_testdata_nativetest_WireString2.Built()
- if err != nil {
- panic(err)
- }
- return __VDLType_v_io_x_ref_lib_vdl_testdata_nativetest_WireStringv
-}
-func init() {
- __VDLType_v_io_x_ref_lib_vdl_testdata_nativetest_WireString = __VDLType_v_io_x_ref_lib_vdl_testdata_nativetest_WireString_gen()
-}
-
-var __VDLType_v_io_x_ref_lib_vdl_testdata_nativetest_WireTime *vdl.Type
-
-func __VDLType_v_io_x_ref_lib_vdl_testdata_nativetest_WireTime_gen() *vdl.Type {
- __VDLType_v_io_x_ref_lib_vdl_testdata_nativetest_WireTimeBuilder := vdl.TypeBuilder{}
-
- __VDLType_v_io_x_ref_lib_vdl_testdata_nativetest_WireTime1 := vdl.Int32Type
- __VDLType_v_io_x_ref_lib_vdl_testdata_nativetest_WireTime2 := __VDLType_v_io_x_ref_lib_vdl_testdata_nativetest_WireTimeBuilder.Named("v.io/x/ref/lib/vdl/testdata/nativetest.WireTime").AssignBase(__VDLType_v_io_x_ref_lib_vdl_testdata_nativetest_WireTime1)
- __VDLType_v_io_x_ref_lib_vdl_testdata_nativetest_WireTimeBuilder.Build()
- __VDLType_v_io_x_ref_lib_vdl_testdata_nativetest_WireTimev, err := __VDLType_v_io_x_ref_lib_vdl_testdata_nativetest_WireTime2.Built()
- if err != nil {
- panic(err)
- }
- return __VDLType_v_io_x_ref_lib_vdl_testdata_nativetest_WireTimev
-}
-func init() {
- __VDLType_v_io_x_ref_lib_vdl_testdata_nativetest_WireTime = __VDLType_v_io_x_ref_lib_vdl_testdata_nativetest_WireTime_gen()
-}
-
-var __VDLType_v_io_x_ref_lib_vdl_testdata_nativetest_ignoreme *vdl.Type = vdl.TypeOf(ignoreme(""))
-
-func __VDLEnsureNativeBuilt() {
- if __VDLType0 == nil {
- __VDLType0 = __VDLType0_gen()
- }
- if __VDLType_v_io_x_ref_lib_vdl_testdata_nativetest_WireAll == nil {
- __VDLType_v_io_x_ref_lib_vdl_testdata_nativetest_WireAll = __VDLType_v_io_x_ref_lib_vdl_testdata_nativetest_WireAll_gen()
- }
- if __VDLType_v_io_x_ref_lib_vdl_testdata_nativetest_WireMapStringInt == nil {
- __VDLType_v_io_x_ref_lib_vdl_testdata_nativetest_WireMapStringInt = __VDLType_v_io_x_ref_lib_vdl_testdata_nativetest_WireMapStringInt_gen()
- }
- if __VDLType_v_io_x_ref_lib_vdl_testdata_nativetest_WireMultiImport == nil {
- __VDLType_v_io_x_ref_lib_vdl_testdata_nativetest_WireMultiImport = __VDLType_v_io_x_ref_lib_vdl_testdata_nativetest_WireMultiImport_gen()
- }
- if __VDLType_v_io_x_ref_lib_vdl_testdata_nativetest_WireSamePkg == nil {
- __VDLType_v_io_x_ref_lib_vdl_testdata_nativetest_WireSamePkg = __VDLType_v_io_x_ref_lib_vdl_testdata_nativetest_WireSamePkg_gen()
- }
- if __VDLType_v_io_x_ref_lib_vdl_testdata_nativetest_WireString == nil {
- __VDLType_v_io_x_ref_lib_vdl_testdata_nativetest_WireString = __VDLType_v_io_x_ref_lib_vdl_testdata_nativetest_WireString_gen()
- }
- if __VDLType_v_io_x_ref_lib_vdl_testdata_nativetest_WireTime == nil {
- __VDLType_v_io_x_ref_lib_vdl_testdata_nativetest_WireTime = __VDLType_v_io_x_ref_lib_vdl_testdata_nativetest_WireTime_gen()
- }
+ return struct{}{}
}
diff --git a/lib/vdl/testdata/testconfig/testconfig.vdl.go b/lib/vdl/testdata/testconfig/testconfig.vdl.go
index ca72caa..26390f3 100644
--- a/lib/vdl/testdata/testconfig/testconfig.vdl.go
+++ b/lib/vdl/testdata/testconfig/testconfig.vdl.go
@@ -10,5 +10,27 @@
// vdl.config file in this package is read in successfully.
package testconfig
-func __VDLEnsureNativeBuilt() {
+var _ = __VDLInit() // Must be first; see __VDLInit comments for details.
+
+var __VDLInitCalled bool
+
+// __VDLInit performs vdl initialization. It is safe to call multiple times.
+// If you have an init ordering issue, just insert the following line verbatim
+// into your source files in this package, right after the "package foo" clause:
+//
+// var _ = __VDLInit()
+//
+// The purpose of this function is to ensure that vdl initialization occurs in
+// the right order, and very early in the init sequence. In particular, vdl
+// registration and package variable initialization needs to occur before
+// functions like vdl.TypeOf will work properly.
+//
+// This function returns a dummy value, so that it can be used to initialize the
+// first var in the file, to take advantage of Go's defined init order.
+func __VDLInit() struct{} {
+ if __VDLInitCalled {
+ return struct{}{}
+ }
+
+ return struct{}{}
}
diff --git a/runtime/internal/flow/conn/conn.vdl.go b/runtime/internal/flow/conn/conn.vdl.go
index de1e92a..e8d438d 100644
--- a/runtime/internal/flow/conn/conn.vdl.go
+++ b/runtime/internal/flow/conn/conn.vdl.go
@@ -18,6 +18,11 @@
"v.io/x/ref/lib/security/bcrypter"
)
+var _ = __VDLInit() // Must be first; see __VDLInit comments for details.
+
+//////////////////////////////////////////////////
+// Type definitions
+
// Blessings is used to transport blessings between the two ends of a Conn.
// Since blessings can be large, we try not to send them more than once by
// associating them with an integer key (BKey). Thereafter we refer to them
@@ -33,7 +38,6 @@
}
func (m *Blessings) FillVDLTarget(t vdl.Target, tt *vdl.Type) error {
- __VDLEnsureNativeBuilt()
fieldsTarget1, err := t.StartFields(tt)
if err != nil {
return err
@@ -50,7 +54,7 @@
}
if err != vdl.ErrFieldNoExist {
- if err := wireValue2.FillVDLTarget(fieldTarget4, __VDLType_v_io_v23_security_WireBlessings); err != nil {
+ if err := wireValue2.FillVDLTarget(fieldTarget4, tt.NonOptional().Field(0).Type); err != nil {
return err
}
if err := fieldsTarget1.FinishField(keyTarget3, fieldTarget4); err != nil {
@@ -62,7 +66,7 @@
return err
}
if err != vdl.ErrFieldNoExist {
- if err := fieldTarget6.FromUint(uint64(m.BKey), vdl.Uint64Type); err != nil {
+ if err := fieldTarget6.FromUint(uint64(m.BKey), tt.NonOptional().Field(1).Type); err != nil {
return err
}
if err := fieldsTarget1.FinishField(keyTarget5, fieldTarget6); err != nil {
@@ -89,8 +93,8 @@
func (t *BlessingsTarget) StartFields(tt *vdl.Type) (vdl.FieldsTarget, error) {
- if !vdl.Compatible(tt, __VDLType_v_io_x_ref_runtime_internal_flow_conn_Blessings) {
- return nil, fmt.Errorf("type %v incompatible with %v", tt, __VDLType_v_io_x_ref_runtime_internal_flow_conn_Blessings)
+ if ttWant := vdl.TypeOf((*Blessings)(nil)).Elem(); !vdl.Compatible(tt, ttWant) {
+ return nil, fmt.Errorf("type %v incompatible with %v", tt, ttWant)
}
return t, nil
}
@@ -105,7 +109,7 @@
target, err := &t.bKeyTarget, error(nil)
return nil, target, err
default:
- return nil, nil, fmt.Errorf("field %s not in struct %v", name, __VDLType_v_io_x_ref_runtime_internal_flow_conn_Blessings)
+ return nil, nil, fmt.Errorf("field %s not in struct v.io/x/ref/runtime/internal/flow/conn.Blessings", name)
}
}
func (t *BlessingsTarget) FinishField(_, _ vdl.Target) error {
@@ -133,9 +137,6 @@
}
func (m *EncryptedBlessings) FillVDLTarget(t vdl.Target, tt *vdl.Type) error {
- if __VDLType_v_io_x_ref_runtime_internal_flow_conn_EncryptedBlessings == nil || __VDLType1 == nil {
- panic("Initialization order error: types generated for FillVDLTarget not initialized. Consider moving caller to an init() block.")
- }
fieldsTarget1, err := t.StartFields(tt)
if err != nil {
return err
@@ -147,7 +148,7 @@
}
if err != vdl.ErrFieldNoExist {
- listTarget4, err := fieldTarget3.StartList(__VDLType2, len(m.Ciphertexts))
+ listTarget4, err := fieldTarget3.StartList(tt.NonOptional().Field(0).Type, len(m.Ciphertexts))
if err != nil {
return err
}
@@ -157,7 +158,7 @@
return err
}
- if err := elem6.FillVDLTarget(elemTarget5, __VDLType_v_io_x_ref_lib_security_bcrypter_WireCiphertext); err != nil {
+ if err := elem6.FillVDLTarget(elemTarget5, tt.NonOptional().Field(0).Type.Elem()); err != nil {
return err
}
if err := listTarget4.FinishElem(elemTarget5); err != nil {
@@ -176,7 +177,7 @@
return err
}
if err != vdl.ErrFieldNoExist {
- if err := fieldTarget8.FromUint(uint64(m.BKey), vdl.Uint64Type); err != nil {
+ if err := fieldTarget8.FromUint(uint64(m.BKey), tt.NonOptional().Field(1).Type); err != nil {
return err
}
if err := fieldsTarget1.FinishField(keyTarget7, fieldTarget8); err != nil {
@@ -203,8 +204,8 @@
func (t *EncryptedBlessingsTarget) StartFields(tt *vdl.Type) (vdl.FieldsTarget, error) {
- if !vdl.Compatible(tt, __VDLType_v_io_x_ref_runtime_internal_flow_conn_EncryptedBlessings) {
- return nil, fmt.Errorf("type %v incompatible with %v", tt, __VDLType_v_io_x_ref_runtime_internal_flow_conn_EncryptedBlessings)
+ if ttWant := vdl.TypeOf((*EncryptedBlessings)(nil)).Elem(); !vdl.Compatible(tt, ttWant) {
+ return nil, fmt.Errorf("type %v incompatible with %v", tt, ttWant)
}
return t, nil
}
@@ -219,7 +220,7 @@
target, err := &t.bKeyTarget, error(nil)
return nil, target, err
default:
- return nil, nil, fmt.Errorf("field %s not in struct %v", name, __VDLType_v_io_x_ref_runtime_internal_flow_conn_EncryptedBlessings)
+ return nil, nil, fmt.Errorf("field %s not in struct v.io/x/ref/runtime/internal/flow/conn.EncryptedBlessings", name)
}
}
func (t *EncryptedBlessingsTarget) FinishField(_, _ vdl.Target) error {
@@ -240,8 +241,8 @@
func (t *unnamed_5b5d762e696f2f782f7265662f6c69622f73656375726974792f62637279707465722e5769726543697068657274657874207374727563747b5061747465726e496420737472696e673b4279746573206d61705b737472696e675d5b5d627974657dTarget) StartList(tt *vdl.Type, len int) (vdl.ListTarget, error) {
- if !vdl.Compatible(tt, __VDLType2) {
- return nil, fmt.Errorf("type %v incompatible with %v", tt, __VDLType2)
+ if ttWant := vdl.TypeOf((*[]bcrypter.WireCiphertext)(nil)); !vdl.Compatible(tt, ttWant) {
+ return nil, fmt.Errorf("type %v incompatible with %v", tt, ttWant)
}
if cap(*t.Value) < len {
*t.Value = make([]bcrypter.WireCiphertext, len)
@@ -281,7 +282,6 @@
}
func (m *Discharges) FillVDLTarget(t vdl.Target, tt *vdl.Type) error {
- __VDLEnsureNativeBuilt()
fieldsTarget1, err := t.StartFields(tt)
if err != nil {
return err
@@ -293,7 +293,7 @@
}
if err != vdl.ErrFieldNoExist {
- listTarget4, err := fieldTarget3.StartList(__VDLType4, len(m.Discharges))
+ listTarget4, err := fieldTarget3.StartList(tt.NonOptional().Field(0).Type, len(m.Discharges))
if err != nil {
return err
}
@@ -312,7 +312,7 @@
if unionValue8 == nil {
unionValue8 = security.WireDischargePublicKey{}
}
- if err := unionValue8.FillVDLTarget(elemTarget5, __VDLType_v_io_v23_security_WireDischarge); err != nil {
+ if err := unionValue8.FillVDLTarget(elemTarget5, tt.NonOptional().Field(0).Type.Elem()); err != nil {
return err
}
if err := listTarget4.FinishElem(elemTarget5); err != nil {
@@ -331,7 +331,7 @@
return err
}
if err != vdl.ErrFieldNoExist {
- if err := fieldTarget10.FromUint(uint64(m.DKey), vdl.Uint64Type); err != nil {
+ if err := fieldTarget10.FromUint(uint64(m.DKey), tt.NonOptional().Field(1).Type); err != nil {
return err
}
if err := fieldsTarget1.FinishField(keyTarget9, fieldTarget10); err != nil {
@@ -343,7 +343,7 @@
return err
}
if err != vdl.ErrFieldNoExist {
- if err := fieldTarget12.FromUint(uint64(m.BKey), vdl.Uint64Type); err != nil {
+ if err := fieldTarget12.FromUint(uint64(m.BKey), tt.NonOptional().Field(2).Type); err != nil {
return err
}
if err := fieldsTarget1.FinishField(keyTarget11, fieldTarget12); err != nil {
@@ -371,8 +371,8 @@
func (t *DischargesTarget) StartFields(tt *vdl.Type) (vdl.FieldsTarget, error) {
- if !vdl.Compatible(tt, __VDLType_v_io_x_ref_runtime_internal_flow_conn_Discharges) {
- return nil, fmt.Errorf("type %v incompatible with %v", tt, __VDLType_v_io_x_ref_runtime_internal_flow_conn_Discharges)
+ if ttWant := vdl.TypeOf((*Discharges)(nil)).Elem(); !vdl.Compatible(tt, ttWant) {
+ return nil, fmt.Errorf("type %v incompatible with %v", tt, ttWant)
}
return t, nil
}
@@ -391,7 +391,7 @@
target, err := &t.bKeyTarget, error(nil)
return nil, target, err
default:
- return nil, nil, fmt.Errorf("field %s not in struct %v", name, __VDLType_v_io_x_ref_runtime_internal_flow_conn_Discharges)
+ return nil, nil, fmt.Errorf("field %s not in struct v.io/x/ref/runtime/internal/flow/conn.Discharges", name)
}
}
func (t *DischargesTarget) FinishField(_, _ vdl.Target) error {
@@ -412,8 +412,8 @@
func (t *unnamed_5b5d762e696f2f7632332f73656375726974792e5769726544697363686172676520756e696f6e7b5075626c69634b657920762e696f2f7632332f73656375726974792e7075626c69634b6579446973636861726765207374727563747b54686972645061727479436176656174496420737472696e673b43617665617473205b5d762e696f2f7632332f73656375726974792e436176656174207374727563747b496420762e696f2f7632332f756e6971756569642e4964205b31365d627974653b506172616d566f6d205b5d627974657d3b5369676e617475726520762e696f2f7632332f73656375726974792e5369676e6174757265207374727563747b507572706f7365205b5d627974653b4861736820762e696f2f7632332f73656375726974792e4861736820737472696e673b52205b5d627974653b53205b5d627974657d7d7dTarget) StartList(tt *vdl.Type, len int) (vdl.ListTarget, error) {
- if !vdl.Compatible(tt, __VDLType4) {
- return nil, fmt.Errorf("type %v incompatible with %v", tt, __VDLType4)
+ if ttWant := vdl.TypeOf((*[]security.WireDischarge)(nil)); !vdl.Compatible(tt, ttWant) {
+ return nil, fmt.Errorf("type %v incompatible with %v", tt, ttWant)
}
if cap(*t.Value) < len {
*t.Value = make([]security.Discharge, len)
@@ -454,9 +454,6 @@
}
func (m *EncryptedDischarges) FillVDLTarget(t vdl.Target, tt *vdl.Type) error {
- if __VDLType_v_io_x_ref_runtime_internal_flow_conn_EncryptedDischarges == nil || __VDLType5 == nil {
- panic("Initialization order error: types generated for FillVDLTarget not initialized. Consider moving caller to an init() block.")
- }
fieldsTarget1, err := t.StartFields(tt)
if err != nil {
return err
@@ -468,7 +465,7 @@
}
if err != vdl.ErrFieldNoExist {
- listTarget4, err := fieldTarget3.StartList(__VDLType2, len(m.Ciphertexts))
+ listTarget4, err := fieldTarget3.StartList(tt.NonOptional().Field(0).Type, len(m.Ciphertexts))
if err != nil {
return err
}
@@ -478,7 +475,7 @@
return err
}
- if err := elem6.FillVDLTarget(elemTarget5, __VDLType_v_io_x_ref_lib_security_bcrypter_WireCiphertext); err != nil {
+ if err := elem6.FillVDLTarget(elemTarget5, tt.NonOptional().Field(0).Type.Elem()); err != nil {
return err
}
if err := listTarget4.FinishElem(elemTarget5); err != nil {
@@ -497,7 +494,7 @@
return err
}
if err != vdl.ErrFieldNoExist {
- if err := fieldTarget8.FromUint(uint64(m.DKey), vdl.Uint64Type); err != nil {
+ if err := fieldTarget8.FromUint(uint64(m.DKey), tt.NonOptional().Field(1).Type); err != nil {
return err
}
if err := fieldsTarget1.FinishField(keyTarget7, fieldTarget8); err != nil {
@@ -509,7 +506,7 @@
return err
}
if err != vdl.ErrFieldNoExist {
- if err := fieldTarget10.FromUint(uint64(m.BKey), vdl.Uint64Type); err != nil {
+ if err := fieldTarget10.FromUint(uint64(m.BKey), tt.NonOptional().Field(2).Type); err != nil {
return err
}
if err := fieldsTarget1.FinishField(keyTarget9, fieldTarget10); err != nil {
@@ -537,8 +534,8 @@
func (t *EncryptedDischargesTarget) StartFields(tt *vdl.Type) (vdl.FieldsTarget, error) {
- if !vdl.Compatible(tt, __VDLType_v_io_x_ref_runtime_internal_flow_conn_EncryptedDischarges) {
- return nil, fmt.Errorf("type %v incompatible with %v", tt, __VDLType_v_io_x_ref_runtime_internal_flow_conn_EncryptedDischarges)
+ if ttWant := vdl.TypeOf((*EncryptedDischarges)(nil)).Elem(); !vdl.Compatible(tt, ttWant) {
+ return nil, fmt.Errorf("type %v incompatible with %v", tt, ttWant)
}
return t, nil
}
@@ -557,7 +554,7 @@
target, err := &t.bKeyTarget, error(nil)
return nil, target, err
default:
- return nil, nil, fmt.Errorf("field %s not in struct %v", name, __VDLType_v_io_x_ref_runtime_internal_flow_conn_EncryptedDischarges)
+ return nil, nil, fmt.Errorf("field %s not in struct v.io/x/ref/runtime/internal/flow/conn.EncryptedDischarges", name)
}
}
func (t *EncryptedDischargesTarget) FinishField(_, _ vdl.Target) error {
@@ -611,7 +608,7 @@
func (x BlessingsFlowMessageBlessings) __VDLReflect(__BlessingsFlowMessageReflect) {}
func (m BlessingsFlowMessageBlessings) FillVDLTarget(t vdl.Target, tt *vdl.Type) error {
- fieldsTarget1, err := t.StartFields(__VDLType_v_io_x_ref_runtime_internal_flow_conn_BlessingsFlowMessage)
+ fieldsTarget1, err := t.StartFields(tt)
if err != nil {
return err
}
@@ -620,7 +617,7 @@
return err
}
- if err := m.Value.FillVDLTarget(fieldTarget3, __VDLType_v_io_x_ref_runtime_internal_flow_conn_Blessings); err != nil {
+ if err := m.Value.FillVDLTarget(fieldTarget3, tt.NonOptional().Field(0).Type); err != nil {
return err
}
if err := fieldsTarget1.FinishField(keyTarget2, fieldTarget3); err != nil {
@@ -643,7 +640,7 @@
func (x BlessingsFlowMessageDischarges) __VDLReflect(__BlessingsFlowMessageReflect) {}
func (m BlessingsFlowMessageDischarges) FillVDLTarget(t vdl.Target, tt *vdl.Type) error {
- fieldsTarget1, err := t.StartFields(__VDLType_v_io_x_ref_runtime_internal_flow_conn_BlessingsFlowMessage)
+ fieldsTarget1, err := t.StartFields(tt)
if err != nil {
return err
}
@@ -652,7 +649,7 @@
return err
}
- if err := m.Value.FillVDLTarget(fieldTarget3, __VDLType_v_io_x_ref_runtime_internal_flow_conn_Discharges); err != nil {
+ if err := m.Value.FillVDLTarget(fieldTarget3, tt.NonOptional().Field(1).Type); err != nil {
return err
}
if err := fieldsTarget1.FinishField(keyTarget2, fieldTarget3); err != nil {
@@ -675,7 +672,7 @@
func (x BlessingsFlowMessageEncryptedBlessings) __VDLReflect(__BlessingsFlowMessageReflect) {}
func (m BlessingsFlowMessageEncryptedBlessings) FillVDLTarget(t vdl.Target, tt *vdl.Type) error {
- fieldsTarget1, err := t.StartFields(__VDLType_v_io_x_ref_runtime_internal_flow_conn_BlessingsFlowMessage)
+ fieldsTarget1, err := t.StartFields(tt)
if err != nil {
return err
}
@@ -684,7 +681,7 @@
return err
}
- if err := m.Value.FillVDLTarget(fieldTarget3, __VDLType_v_io_x_ref_runtime_internal_flow_conn_EncryptedBlessings); err != nil {
+ if err := m.Value.FillVDLTarget(fieldTarget3, tt.NonOptional().Field(2).Type); err != nil {
return err
}
if err := fieldsTarget1.FinishField(keyTarget2, fieldTarget3); err != nil {
@@ -707,7 +704,7 @@
func (x BlessingsFlowMessageEncryptedDischarges) __VDLReflect(__BlessingsFlowMessageReflect) {}
func (m BlessingsFlowMessageEncryptedDischarges) FillVDLTarget(t vdl.Target, tt *vdl.Type) error {
- fieldsTarget1, err := t.StartFields(__VDLType_v_io_x_ref_runtime_internal_flow_conn_BlessingsFlowMessage)
+ fieldsTarget1, err := t.StartFields(tt)
if err != nil {
return err
}
@@ -716,7 +713,7 @@
return err
}
- if err := m.Value.FillVDLTarget(fieldTarget3, __VDLType_v_io_x_ref_runtime_internal_flow_conn_EncryptedDischarges); err != nil {
+ if err := m.Value.FillVDLTarget(fieldTarget3, tt.NonOptional().Field(3).Type); err != nil {
return err
}
if err := fieldsTarget1.FinishField(keyTarget2, fieldTarget3); err != nil {
@@ -733,512 +730,8 @@
return nil
}
-func init() {
- vdl.Register((*Blessings)(nil))
- vdl.Register((*EncryptedBlessings)(nil))
- vdl.Register((*Discharges)(nil))
- vdl.Register((*EncryptedDischarges)(nil))
- vdl.Register((*BlessingsFlowMessage)(nil))
-}
-
-var __VDLType0 *vdl.Type
-
-func __VDLType0_gen() *vdl.Type {
- __VDLType0Builder := vdl.TypeBuilder{}
-
- __VDLType01 := __VDLType0Builder.Optional()
- __VDLType02 := __VDLType0Builder.Struct()
- __VDLType03 := __VDLType0Builder.Named("v.io/x/ref/runtime/internal/flow/conn.Blessings").AssignBase(__VDLType02)
- __VDLType04 := __VDLType0Builder.Struct()
- __VDLType05 := __VDLType0Builder.Named("v.io/v23/security.WireBlessings").AssignBase(__VDLType04)
- __VDLType06 := __VDLType0Builder.List()
- __VDLType07 := __VDLType0Builder.List()
- __VDLType08 := __VDLType0Builder.Struct()
- __VDLType09 := __VDLType0Builder.Named("v.io/v23/security.Certificate").AssignBase(__VDLType08)
- __VDLType010 := vdl.StringType
- __VDLType08.AppendField("Extension", __VDLType010)
- __VDLType011 := __VDLType0Builder.List()
- __VDLType012 := vdl.ByteType
- __VDLType011.AssignElem(__VDLType012)
- __VDLType08.AppendField("PublicKey", __VDLType011)
- __VDLType013 := __VDLType0Builder.List()
- __VDLType014 := __VDLType0Builder.Struct()
- __VDLType015 := __VDLType0Builder.Named("v.io/v23/security.Caveat").AssignBase(__VDLType014)
- __VDLType016 := __VDLType0Builder.Array()
- __VDLType017 := __VDLType0Builder.Named("v.io/v23/uniqueid.Id").AssignBase(__VDLType016)
- __VDLType016.AssignElem(__VDLType012)
- __VDLType016.AssignLen(16)
- __VDLType014.AppendField("Id", __VDLType017)
- __VDLType014.AppendField("ParamVom", __VDLType011)
- __VDLType013.AssignElem(__VDLType015)
- __VDLType08.AppendField("Caveats", __VDLType013)
- __VDLType018 := __VDLType0Builder.Struct()
- __VDLType019 := __VDLType0Builder.Named("v.io/v23/security.Signature").AssignBase(__VDLType018)
- __VDLType018.AppendField("Purpose", __VDLType011)
- __VDLType020 := vdl.StringType
- __VDLType021 := __VDLType0Builder.Named("v.io/v23/security.Hash").AssignBase(__VDLType020)
- __VDLType018.AppendField("Hash", __VDLType021)
- __VDLType018.AppendField("R", __VDLType011)
- __VDLType018.AppendField("S", __VDLType011)
- __VDLType08.AppendField("Signature", __VDLType019)
- __VDLType07.AssignElem(__VDLType09)
- __VDLType06.AssignElem(__VDLType07)
- __VDLType04.AppendField("CertificateChains", __VDLType06)
- __VDLType02.AppendField("Blessings", __VDLType05)
- __VDLType022 := vdl.Uint64Type
- __VDLType02.AppendField("BKey", __VDLType022)
- __VDLType01.AssignElem(__VDLType03)
- __VDLType0Builder.Build()
- __VDLType0v, err := __VDLType01.Built()
- if err != nil {
- panic(err)
- }
- return __VDLType0v
-}
-func init() {
- __VDLType0 = __VDLType0_gen()
-}
-
-var __VDLType3 *vdl.Type
-
-func __VDLType3_gen() *vdl.Type {
- __VDLType3Builder := vdl.TypeBuilder{}
-
- __VDLType31 := __VDLType3Builder.Optional()
- __VDLType32 := __VDLType3Builder.Struct()
- __VDLType33 := __VDLType3Builder.Named("v.io/x/ref/runtime/internal/flow/conn.Discharges").AssignBase(__VDLType32)
- __VDLType34 := __VDLType3Builder.List()
- __VDLType35 := __VDLType3Builder.Union()
- __VDLType36 := __VDLType3Builder.Named("v.io/v23/security.WireDischarge").AssignBase(__VDLType35)
- __VDLType37 := __VDLType3Builder.Struct()
- __VDLType38 := __VDLType3Builder.Named("v.io/v23/security.publicKeyDischarge").AssignBase(__VDLType37)
- __VDLType39 := vdl.StringType
- __VDLType37.AppendField("ThirdPartyCaveatId", __VDLType39)
- __VDLType310 := __VDLType3Builder.List()
- __VDLType311 := __VDLType3Builder.Struct()
- __VDLType312 := __VDLType3Builder.Named("v.io/v23/security.Caveat").AssignBase(__VDLType311)
- __VDLType313 := __VDLType3Builder.Array()
- __VDLType314 := __VDLType3Builder.Named("v.io/v23/uniqueid.Id").AssignBase(__VDLType313)
- __VDLType315 := vdl.ByteType
- __VDLType313.AssignElem(__VDLType315)
- __VDLType313.AssignLen(16)
- __VDLType311.AppendField("Id", __VDLType314)
- __VDLType316 := __VDLType3Builder.List()
- __VDLType316.AssignElem(__VDLType315)
- __VDLType311.AppendField("ParamVom", __VDLType316)
- __VDLType310.AssignElem(__VDLType312)
- __VDLType37.AppendField("Caveats", __VDLType310)
- __VDLType317 := __VDLType3Builder.Struct()
- __VDLType318 := __VDLType3Builder.Named("v.io/v23/security.Signature").AssignBase(__VDLType317)
- __VDLType317.AppendField("Purpose", __VDLType316)
- __VDLType319 := vdl.StringType
- __VDLType320 := __VDLType3Builder.Named("v.io/v23/security.Hash").AssignBase(__VDLType319)
- __VDLType317.AppendField("Hash", __VDLType320)
- __VDLType317.AppendField("R", __VDLType316)
- __VDLType317.AppendField("S", __VDLType316)
- __VDLType37.AppendField("Signature", __VDLType318)
- __VDLType35.AppendField("PublicKey", __VDLType38)
- __VDLType34.AssignElem(__VDLType36)
- __VDLType32.AppendField("Discharges", __VDLType34)
- __VDLType321 := vdl.Uint64Type
- __VDLType32.AppendField("DKey", __VDLType321)
- __VDLType32.AppendField("BKey", __VDLType321)
- __VDLType31.AssignElem(__VDLType33)
- __VDLType3Builder.Build()
- __VDLType3v, err := __VDLType31.Built()
- if err != nil {
- panic(err)
- }
- return __VDLType3v
-}
-func init() {
- __VDLType3 = __VDLType3_gen()
-}
-
-var __VDLType1 *vdl.Type = vdl.TypeOf((*EncryptedBlessings)(nil))
-var __VDLType5 *vdl.Type = vdl.TypeOf((*EncryptedDischarges)(nil))
-var __VDLType4 *vdl.Type
-
-func __VDLType4_gen() *vdl.Type {
- __VDLType4Builder := vdl.TypeBuilder{}
-
- __VDLType41 := __VDLType4Builder.List()
- __VDLType42 := __VDLType4Builder.Union()
- __VDLType43 := __VDLType4Builder.Named("v.io/v23/security.WireDischarge").AssignBase(__VDLType42)
- __VDLType44 := __VDLType4Builder.Struct()
- __VDLType45 := __VDLType4Builder.Named("v.io/v23/security.publicKeyDischarge").AssignBase(__VDLType44)
- __VDLType46 := vdl.StringType
- __VDLType44.AppendField("ThirdPartyCaveatId", __VDLType46)
- __VDLType47 := __VDLType4Builder.List()
- __VDLType48 := __VDLType4Builder.Struct()
- __VDLType49 := __VDLType4Builder.Named("v.io/v23/security.Caveat").AssignBase(__VDLType48)
- __VDLType410 := __VDLType4Builder.Array()
- __VDLType411 := __VDLType4Builder.Named("v.io/v23/uniqueid.Id").AssignBase(__VDLType410)
- __VDLType412 := vdl.ByteType
- __VDLType410.AssignElem(__VDLType412)
- __VDLType410.AssignLen(16)
- __VDLType48.AppendField("Id", __VDLType411)
- __VDLType413 := __VDLType4Builder.List()
- __VDLType413.AssignElem(__VDLType412)
- __VDLType48.AppendField("ParamVom", __VDLType413)
- __VDLType47.AssignElem(__VDLType49)
- __VDLType44.AppendField("Caveats", __VDLType47)
- __VDLType414 := __VDLType4Builder.Struct()
- __VDLType415 := __VDLType4Builder.Named("v.io/v23/security.Signature").AssignBase(__VDLType414)
- __VDLType414.AppendField("Purpose", __VDLType413)
- __VDLType416 := vdl.StringType
- __VDLType417 := __VDLType4Builder.Named("v.io/v23/security.Hash").AssignBase(__VDLType416)
- __VDLType414.AppendField("Hash", __VDLType417)
- __VDLType414.AppendField("R", __VDLType413)
- __VDLType414.AppendField("S", __VDLType413)
- __VDLType44.AppendField("Signature", __VDLType415)
- __VDLType42.AppendField("PublicKey", __VDLType45)
- __VDLType41.AssignElem(__VDLType43)
- __VDLType4Builder.Build()
- __VDLType4v, err := __VDLType41.Built()
- if err != nil {
- panic(err)
- }
- return __VDLType4v
-}
-func init() {
- __VDLType4 = __VDLType4_gen()
-}
-
-var __VDLType2 *vdl.Type = vdl.TypeOf([]bcrypter.WireCiphertext(nil))
-var __VDLType_v_io_v23_security_WireBlessings *vdl.Type
-
-func __VDLType_v_io_v23_security_WireBlessings_gen() *vdl.Type {
- __VDLType_v_io_v23_security_WireBlessingsBuilder := vdl.TypeBuilder{}
-
- __VDLType_v_io_v23_security_WireBlessings1 := __VDLType_v_io_v23_security_WireBlessingsBuilder.Struct()
- __VDLType_v_io_v23_security_WireBlessings2 := __VDLType_v_io_v23_security_WireBlessingsBuilder.Named("v.io/v23/security.WireBlessings").AssignBase(__VDLType_v_io_v23_security_WireBlessings1)
- __VDLType_v_io_v23_security_WireBlessings3 := __VDLType_v_io_v23_security_WireBlessingsBuilder.List()
- __VDLType_v_io_v23_security_WireBlessings4 := __VDLType_v_io_v23_security_WireBlessingsBuilder.List()
- __VDLType_v_io_v23_security_WireBlessings5 := __VDLType_v_io_v23_security_WireBlessingsBuilder.Struct()
- __VDLType_v_io_v23_security_WireBlessings6 := __VDLType_v_io_v23_security_WireBlessingsBuilder.Named("v.io/v23/security.Certificate").AssignBase(__VDLType_v_io_v23_security_WireBlessings5)
- __VDLType_v_io_v23_security_WireBlessings7 := vdl.StringType
- __VDLType_v_io_v23_security_WireBlessings5.AppendField("Extension", __VDLType_v_io_v23_security_WireBlessings7)
- __VDLType_v_io_v23_security_WireBlessings8 := __VDLType_v_io_v23_security_WireBlessingsBuilder.List()
- __VDLType_v_io_v23_security_WireBlessings9 := vdl.ByteType
- __VDLType_v_io_v23_security_WireBlessings8.AssignElem(__VDLType_v_io_v23_security_WireBlessings9)
- __VDLType_v_io_v23_security_WireBlessings5.AppendField("PublicKey", __VDLType_v_io_v23_security_WireBlessings8)
- __VDLType_v_io_v23_security_WireBlessings10 := __VDLType_v_io_v23_security_WireBlessingsBuilder.List()
- __VDLType_v_io_v23_security_WireBlessings11 := __VDLType_v_io_v23_security_WireBlessingsBuilder.Struct()
- __VDLType_v_io_v23_security_WireBlessings12 := __VDLType_v_io_v23_security_WireBlessingsBuilder.Named("v.io/v23/security.Caveat").AssignBase(__VDLType_v_io_v23_security_WireBlessings11)
- __VDLType_v_io_v23_security_WireBlessings13 := __VDLType_v_io_v23_security_WireBlessingsBuilder.Array()
- __VDLType_v_io_v23_security_WireBlessings14 := __VDLType_v_io_v23_security_WireBlessingsBuilder.Named("v.io/v23/uniqueid.Id").AssignBase(__VDLType_v_io_v23_security_WireBlessings13)
- __VDLType_v_io_v23_security_WireBlessings13.AssignElem(__VDLType_v_io_v23_security_WireBlessings9)
- __VDLType_v_io_v23_security_WireBlessings13.AssignLen(16)
- __VDLType_v_io_v23_security_WireBlessings11.AppendField("Id", __VDLType_v_io_v23_security_WireBlessings14)
- __VDLType_v_io_v23_security_WireBlessings11.AppendField("ParamVom", __VDLType_v_io_v23_security_WireBlessings8)
- __VDLType_v_io_v23_security_WireBlessings10.AssignElem(__VDLType_v_io_v23_security_WireBlessings12)
- __VDLType_v_io_v23_security_WireBlessings5.AppendField("Caveats", __VDLType_v_io_v23_security_WireBlessings10)
- __VDLType_v_io_v23_security_WireBlessings15 := __VDLType_v_io_v23_security_WireBlessingsBuilder.Struct()
- __VDLType_v_io_v23_security_WireBlessings16 := __VDLType_v_io_v23_security_WireBlessingsBuilder.Named("v.io/v23/security.Signature").AssignBase(__VDLType_v_io_v23_security_WireBlessings15)
- __VDLType_v_io_v23_security_WireBlessings15.AppendField("Purpose", __VDLType_v_io_v23_security_WireBlessings8)
- __VDLType_v_io_v23_security_WireBlessings17 := vdl.StringType
- __VDLType_v_io_v23_security_WireBlessings18 := __VDLType_v_io_v23_security_WireBlessingsBuilder.Named("v.io/v23/security.Hash").AssignBase(__VDLType_v_io_v23_security_WireBlessings17)
- __VDLType_v_io_v23_security_WireBlessings15.AppendField("Hash", __VDLType_v_io_v23_security_WireBlessings18)
- __VDLType_v_io_v23_security_WireBlessings15.AppendField("R", __VDLType_v_io_v23_security_WireBlessings8)
- __VDLType_v_io_v23_security_WireBlessings15.AppendField("S", __VDLType_v_io_v23_security_WireBlessings8)
- __VDLType_v_io_v23_security_WireBlessings5.AppendField("Signature", __VDLType_v_io_v23_security_WireBlessings16)
- __VDLType_v_io_v23_security_WireBlessings4.AssignElem(__VDLType_v_io_v23_security_WireBlessings6)
- __VDLType_v_io_v23_security_WireBlessings3.AssignElem(__VDLType_v_io_v23_security_WireBlessings4)
- __VDLType_v_io_v23_security_WireBlessings1.AppendField("CertificateChains", __VDLType_v_io_v23_security_WireBlessings3)
- __VDLType_v_io_v23_security_WireBlessingsBuilder.Build()
- __VDLType_v_io_v23_security_WireBlessingsv, err := __VDLType_v_io_v23_security_WireBlessings2.Built()
- if err != nil {
- panic(err)
- }
- return __VDLType_v_io_v23_security_WireBlessingsv
-}
-func init() {
- __VDLType_v_io_v23_security_WireBlessings = __VDLType_v_io_v23_security_WireBlessings_gen()
-}
-
-var __VDLType_v_io_v23_security_WireDischarge *vdl.Type
-
-func __VDLType_v_io_v23_security_WireDischarge_gen() *vdl.Type {
- __VDLType_v_io_v23_security_WireDischargeBuilder := vdl.TypeBuilder{}
-
- __VDLType_v_io_v23_security_WireDischarge1 := __VDLType_v_io_v23_security_WireDischargeBuilder.Union()
- __VDLType_v_io_v23_security_WireDischarge2 := __VDLType_v_io_v23_security_WireDischargeBuilder.Named("v.io/v23/security.WireDischarge").AssignBase(__VDLType_v_io_v23_security_WireDischarge1)
- __VDLType_v_io_v23_security_WireDischarge3 := __VDLType_v_io_v23_security_WireDischargeBuilder.Struct()
- __VDLType_v_io_v23_security_WireDischarge4 := __VDLType_v_io_v23_security_WireDischargeBuilder.Named("v.io/v23/security.publicKeyDischarge").AssignBase(__VDLType_v_io_v23_security_WireDischarge3)
- __VDLType_v_io_v23_security_WireDischarge5 := vdl.StringType
- __VDLType_v_io_v23_security_WireDischarge3.AppendField("ThirdPartyCaveatId", __VDLType_v_io_v23_security_WireDischarge5)
- __VDLType_v_io_v23_security_WireDischarge6 := __VDLType_v_io_v23_security_WireDischargeBuilder.List()
- __VDLType_v_io_v23_security_WireDischarge7 := __VDLType_v_io_v23_security_WireDischargeBuilder.Struct()
- __VDLType_v_io_v23_security_WireDischarge8 := __VDLType_v_io_v23_security_WireDischargeBuilder.Named("v.io/v23/security.Caveat").AssignBase(__VDLType_v_io_v23_security_WireDischarge7)
- __VDLType_v_io_v23_security_WireDischarge9 := __VDLType_v_io_v23_security_WireDischargeBuilder.Array()
- __VDLType_v_io_v23_security_WireDischarge10 := __VDLType_v_io_v23_security_WireDischargeBuilder.Named("v.io/v23/uniqueid.Id").AssignBase(__VDLType_v_io_v23_security_WireDischarge9)
- __VDLType_v_io_v23_security_WireDischarge11 := vdl.ByteType
- __VDLType_v_io_v23_security_WireDischarge9.AssignElem(__VDLType_v_io_v23_security_WireDischarge11)
- __VDLType_v_io_v23_security_WireDischarge9.AssignLen(16)
- __VDLType_v_io_v23_security_WireDischarge7.AppendField("Id", __VDLType_v_io_v23_security_WireDischarge10)
- __VDLType_v_io_v23_security_WireDischarge12 := __VDLType_v_io_v23_security_WireDischargeBuilder.List()
- __VDLType_v_io_v23_security_WireDischarge12.AssignElem(__VDLType_v_io_v23_security_WireDischarge11)
- __VDLType_v_io_v23_security_WireDischarge7.AppendField("ParamVom", __VDLType_v_io_v23_security_WireDischarge12)
- __VDLType_v_io_v23_security_WireDischarge6.AssignElem(__VDLType_v_io_v23_security_WireDischarge8)
- __VDLType_v_io_v23_security_WireDischarge3.AppendField("Caveats", __VDLType_v_io_v23_security_WireDischarge6)
- __VDLType_v_io_v23_security_WireDischarge13 := __VDLType_v_io_v23_security_WireDischargeBuilder.Struct()
- __VDLType_v_io_v23_security_WireDischarge14 := __VDLType_v_io_v23_security_WireDischargeBuilder.Named("v.io/v23/security.Signature").AssignBase(__VDLType_v_io_v23_security_WireDischarge13)
- __VDLType_v_io_v23_security_WireDischarge13.AppendField("Purpose", __VDLType_v_io_v23_security_WireDischarge12)
- __VDLType_v_io_v23_security_WireDischarge15 := vdl.StringType
- __VDLType_v_io_v23_security_WireDischarge16 := __VDLType_v_io_v23_security_WireDischargeBuilder.Named("v.io/v23/security.Hash").AssignBase(__VDLType_v_io_v23_security_WireDischarge15)
- __VDLType_v_io_v23_security_WireDischarge13.AppendField("Hash", __VDLType_v_io_v23_security_WireDischarge16)
- __VDLType_v_io_v23_security_WireDischarge13.AppendField("R", __VDLType_v_io_v23_security_WireDischarge12)
- __VDLType_v_io_v23_security_WireDischarge13.AppendField("S", __VDLType_v_io_v23_security_WireDischarge12)
- __VDLType_v_io_v23_security_WireDischarge3.AppendField("Signature", __VDLType_v_io_v23_security_WireDischarge14)
- __VDLType_v_io_v23_security_WireDischarge1.AppendField("PublicKey", __VDLType_v_io_v23_security_WireDischarge4)
- __VDLType_v_io_v23_security_WireDischargeBuilder.Build()
- __VDLType_v_io_v23_security_WireDischargev, err := __VDLType_v_io_v23_security_WireDischarge2.Built()
- if err != nil {
- panic(err)
- }
- return __VDLType_v_io_v23_security_WireDischargev
-}
-func init() {
- __VDLType_v_io_v23_security_WireDischarge = __VDLType_v_io_v23_security_WireDischarge_gen()
-}
-
-var __VDLType_v_io_x_ref_lib_security_bcrypter_WireCiphertext *vdl.Type = vdl.TypeOf(bcrypter.WireCiphertext{})
-var __VDLType_v_io_x_ref_runtime_internal_flow_conn_Blessings *vdl.Type
-
-func __VDLType_v_io_x_ref_runtime_internal_flow_conn_Blessings_gen() *vdl.Type {
- __VDLType_v_io_x_ref_runtime_internal_flow_conn_BlessingsBuilder := vdl.TypeBuilder{}
-
- __VDLType_v_io_x_ref_runtime_internal_flow_conn_Blessings1 := __VDLType_v_io_x_ref_runtime_internal_flow_conn_BlessingsBuilder.Struct()
- __VDLType_v_io_x_ref_runtime_internal_flow_conn_Blessings2 := __VDLType_v_io_x_ref_runtime_internal_flow_conn_BlessingsBuilder.Named("v.io/x/ref/runtime/internal/flow/conn.Blessings").AssignBase(__VDLType_v_io_x_ref_runtime_internal_flow_conn_Blessings1)
- __VDLType_v_io_x_ref_runtime_internal_flow_conn_Blessings3 := __VDLType_v_io_x_ref_runtime_internal_flow_conn_BlessingsBuilder.Struct()
- __VDLType_v_io_x_ref_runtime_internal_flow_conn_Blessings4 := __VDLType_v_io_x_ref_runtime_internal_flow_conn_BlessingsBuilder.Named("v.io/v23/security.WireBlessings").AssignBase(__VDLType_v_io_x_ref_runtime_internal_flow_conn_Blessings3)
- __VDLType_v_io_x_ref_runtime_internal_flow_conn_Blessings5 := __VDLType_v_io_x_ref_runtime_internal_flow_conn_BlessingsBuilder.List()
- __VDLType_v_io_x_ref_runtime_internal_flow_conn_Blessings6 := __VDLType_v_io_x_ref_runtime_internal_flow_conn_BlessingsBuilder.List()
- __VDLType_v_io_x_ref_runtime_internal_flow_conn_Blessings7 := __VDLType_v_io_x_ref_runtime_internal_flow_conn_BlessingsBuilder.Struct()
- __VDLType_v_io_x_ref_runtime_internal_flow_conn_Blessings8 := __VDLType_v_io_x_ref_runtime_internal_flow_conn_BlessingsBuilder.Named("v.io/v23/security.Certificate").AssignBase(__VDLType_v_io_x_ref_runtime_internal_flow_conn_Blessings7)
- __VDLType_v_io_x_ref_runtime_internal_flow_conn_Blessings9 := vdl.StringType
- __VDLType_v_io_x_ref_runtime_internal_flow_conn_Blessings7.AppendField("Extension", __VDLType_v_io_x_ref_runtime_internal_flow_conn_Blessings9)
- __VDLType_v_io_x_ref_runtime_internal_flow_conn_Blessings10 := __VDLType_v_io_x_ref_runtime_internal_flow_conn_BlessingsBuilder.List()
- __VDLType_v_io_x_ref_runtime_internal_flow_conn_Blessings11 := vdl.ByteType
- __VDLType_v_io_x_ref_runtime_internal_flow_conn_Blessings10.AssignElem(__VDLType_v_io_x_ref_runtime_internal_flow_conn_Blessings11)
- __VDLType_v_io_x_ref_runtime_internal_flow_conn_Blessings7.AppendField("PublicKey", __VDLType_v_io_x_ref_runtime_internal_flow_conn_Blessings10)
- __VDLType_v_io_x_ref_runtime_internal_flow_conn_Blessings12 := __VDLType_v_io_x_ref_runtime_internal_flow_conn_BlessingsBuilder.List()
- __VDLType_v_io_x_ref_runtime_internal_flow_conn_Blessings13 := __VDLType_v_io_x_ref_runtime_internal_flow_conn_BlessingsBuilder.Struct()
- __VDLType_v_io_x_ref_runtime_internal_flow_conn_Blessings14 := __VDLType_v_io_x_ref_runtime_internal_flow_conn_BlessingsBuilder.Named("v.io/v23/security.Caveat").AssignBase(__VDLType_v_io_x_ref_runtime_internal_flow_conn_Blessings13)
- __VDLType_v_io_x_ref_runtime_internal_flow_conn_Blessings15 := __VDLType_v_io_x_ref_runtime_internal_flow_conn_BlessingsBuilder.Array()
- __VDLType_v_io_x_ref_runtime_internal_flow_conn_Blessings16 := __VDLType_v_io_x_ref_runtime_internal_flow_conn_BlessingsBuilder.Named("v.io/v23/uniqueid.Id").AssignBase(__VDLType_v_io_x_ref_runtime_internal_flow_conn_Blessings15)
- __VDLType_v_io_x_ref_runtime_internal_flow_conn_Blessings15.AssignElem(__VDLType_v_io_x_ref_runtime_internal_flow_conn_Blessings11)
- __VDLType_v_io_x_ref_runtime_internal_flow_conn_Blessings15.AssignLen(16)
- __VDLType_v_io_x_ref_runtime_internal_flow_conn_Blessings13.AppendField("Id", __VDLType_v_io_x_ref_runtime_internal_flow_conn_Blessings16)
- __VDLType_v_io_x_ref_runtime_internal_flow_conn_Blessings13.AppendField("ParamVom", __VDLType_v_io_x_ref_runtime_internal_flow_conn_Blessings10)
- __VDLType_v_io_x_ref_runtime_internal_flow_conn_Blessings12.AssignElem(__VDLType_v_io_x_ref_runtime_internal_flow_conn_Blessings14)
- __VDLType_v_io_x_ref_runtime_internal_flow_conn_Blessings7.AppendField("Caveats", __VDLType_v_io_x_ref_runtime_internal_flow_conn_Blessings12)
- __VDLType_v_io_x_ref_runtime_internal_flow_conn_Blessings17 := __VDLType_v_io_x_ref_runtime_internal_flow_conn_BlessingsBuilder.Struct()
- __VDLType_v_io_x_ref_runtime_internal_flow_conn_Blessings18 := __VDLType_v_io_x_ref_runtime_internal_flow_conn_BlessingsBuilder.Named("v.io/v23/security.Signature").AssignBase(__VDLType_v_io_x_ref_runtime_internal_flow_conn_Blessings17)
- __VDLType_v_io_x_ref_runtime_internal_flow_conn_Blessings17.AppendField("Purpose", __VDLType_v_io_x_ref_runtime_internal_flow_conn_Blessings10)
- __VDLType_v_io_x_ref_runtime_internal_flow_conn_Blessings19 := vdl.StringType
- __VDLType_v_io_x_ref_runtime_internal_flow_conn_Blessings20 := __VDLType_v_io_x_ref_runtime_internal_flow_conn_BlessingsBuilder.Named("v.io/v23/security.Hash").AssignBase(__VDLType_v_io_x_ref_runtime_internal_flow_conn_Blessings19)
- __VDLType_v_io_x_ref_runtime_internal_flow_conn_Blessings17.AppendField("Hash", __VDLType_v_io_x_ref_runtime_internal_flow_conn_Blessings20)
- __VDLType_v_io_x_ref_runtime_internal_flow_conn_Blessings17.AppendField("R", __VDLType_v_io_x_ref_runtime_internal_flow_conn_Blessings10)
- __VDLType_v_io_x_ref_runtime_internal_flow_conn_Blessings17.AppendField("S", __VDLType_v_io_x_ref_runtime_internal_flow_conn_Blessings10)
- __VDLType_v_io_x_ref_runtime_internal_flow_conn_Blessings7.AppendField("Signature", __VDLType_v_io_x_ref_runtime_internal_flow_conn_Blessings18)
- __VDLType_v_io_x_ref_runtime_internal_flow_conn_Blessings6.AssignElem(__VDLType_v_io_x_ref_runtime_internal_flow_conn_Blessings8)
- __VDLType_v_io_x_ref_runtime_internal_flow_conn_Blessings5.AssignElem(__VDLType_v_io_x_ref_runtime_internal_flow_conn_Blessings6)
- __VDLType_v_io_x_ref_runtime_internal_flow_conn_Blessings3.AppendField("CertificateChains", __VDLType_v_io_x_ref_runtime_internal_flow_conn_Blessings5)
- __VDLType_v_io_x_ref_runtime_internal_flow_conn_Blessings1.AppendField("Blessings", __VDLType_v_io_x_ref_runtime_internal_flow_conn_Blessings4)
- __VDLType_v_io_x_ref_runtime_internal_flow_conn_Blessings21 := vdl.Uint64Type
- __VDLType_v_io_x_ref_runtime_internal_flow_conn_Blessings1.AppendField("BKey", __VDLType_v_io_x_ref_runtime_internal_flow_conn_Blessings21)
- __VDLType_v_io_x_ref_runtime_internal_flow_conn_BlessingsBuilder.Build()
- __VDLType_v_io_x_ref_runtime_internal_flow_conn_Blessingsv, err := __VDLType_v_io_x_ref_runtime_internal_flow_conn_Blessings2.Built()
- if err != nil {
- panic(err)
- }
- return __VDLType_v_io_x_ref_runtime_internal_flow_conn_Blessingsv
-}
-func init() {
- __VDLType_v_io_x_ref_runtime_internal_flow_conn_Blessings = __VDLType_v_io_x_ref_runtime_internal_flow_conn_Blessings_gen()
-}
-
-var __VDLType_v_io_x_ref_runtime_internal_flow_conn_BlessingsFlowMessage *vdl.Type
-
-func __VDLType_v_io_x_ref_runtime_internal_flow_conn_BlessingsFlowMessage_gen() *vdl.Type {
- __VDLType_v_io_x_ref_runtime_internal_flow_conn_BlessingsFlowMessageBuilder := vdl.TypeBuilder{}
-
- __VDLType_v_io_x_ref_runtime_internal_flow_conn_BlessingsFlowMessage1 := __VDLType_v_io_x_ref_runtime_internal_flow_conn_BlessingsFlowMessageBuilder.Union()
- __VDLType_v_io_x_ref_runtime_internal_flow_conn_BlessingsFlowMessage2 := __VDLType_v_io_x_ref_runtime_internal_flow_conn_BlessingsFlowMessageBuilder.Named("v.io/x/ref/runtime/internal/flow/conn.BlessingsFlowMessage").AssignBase(__VDLType_v_io_x_ref_runtime_internal_flow_conn_BlessingsFlowMessage1)
- __VDLType_v_io_x_ref_runtime_internal_flow_conn_BlessingsFlowMessage3 := __VDLType_v_io_x_ref_runtime_internal_flow_conn_BlessingsFlowMessageBuilder.Struct()
- __VDLType_v_io_x_ref_runtime_internal_flow_conn_BlessingsFlowMessage4 := __VDLType_v_io_x_ref_runtime_internal_flow_conn_BlessingsFlowMessageBuilder.Named("v.io/x/ref/runtime/internal/flow/conn.Blessings").AssignBase(__VDLType_v_io_x_ref_runtime_internal_flow_conn_BlessingsFlowMessage3)
- __VDLType_v_io_x_ref_runtime_internal_flow_conn_BlessingsFlowMessage5 := __VDLType_v_io_x_ref_runtime_internal_flow_conn_BlessingsFlowMessageBuilder.Struct()
- __VDLType_v_io_x_ref_runtime_internal_flow_conn_BlessingsFlowMessage6 := __VDLType_v_io_x_ref_runtime_internal_flow_conn_BlessingsFlowMessageBuilder.Named("v.io/v23/security.WireBlessings").AssignBase(__VDLType_v_io_x_ref_runtime_internal_flow_conn_BlessingsFlowMessage5)
- __VDLType_v_io_x_ref_runtime_internal_flow_conn_BlessingsFlowMessage7 := __VDLType_v_io_x_ref_runtime_internal_flow_conn_BlessingsFlowMessageBuilder.List()
- __VDLType_v_io_x_ref_runtime_internal_flow_conn_BlessingsFlowMessage8 := __VDLType_v_io_x_ref_runtime_internal_flow_conn_BlessingsFlowMessageBuilder.List()
- __VDLType_v_io_x_ref_runtime_internal_flow_conn_BlessingsFlowMessage9 := __VDLType_v_io_x_ref_runtime_internal_flow_conn_BlessingsFlowMessageBuilder.Struct()
- __VDLType_v_io_x_ref_runtime_internal_flow_conn_BlessingsFlowMessage10 := __VDLType_v_io_x_ref_runtime_internal_flow_conn_BlessingsFlowMessageBuilder.Named("v.io/v23/security.Certificate").AssignBase(__VDLType_v_io_x_ref_runtime_internal_flow_conn_BlessingsFlowMessage9)
- __VDLType_v_io_x_ref_runtime_internal_flow_conn_BlessingsFlowMessage11 := vdl.StringType
- __VDLType_v_io_x_ref_runtime_internal_flow_conn_BlessingsFlowMessage9.AppendField("Extension", __VDLType_v_io_x_ref_runtime_internal_flow_conn_BlessingsFlowMessage11)
- __VDLType_v_io_x_ref_runtime_internal_flow_conn_BlessingsFlowMessage12 := __VDLType_v_io_x_ref_runtime_internal_flow_conn_BlessingsFlowMessageBuilder.List()
- __VDLType_v_io_x_ref_runtime_internal_flow_conn_BlessingsFlowMessage13 := vdl.ByteType
- __VDLType_v_io_x_ref_runtime_internal_flow_conn_BlessingsFlowMessage12.AssignElem(__VDLType_v_io_x_ref_runtime_internal_flow_conn_BlessingsFlowMessage13)
- __VDLType_v_io_x_ref_runtime_internal_flow_conn_BlessingsFlowMessage9.AppendField("PublicKey", __VDLType_v_io_x_ref_runtime_internal_flow_conn_BlessingsFlowMessage12)
- __VDLType_v_io_x_ref_runtime_internal_flow_conn_BlessingsFlowMessage14 := __VDLType_v_io_x_ref_runtime_internal_flow_conn_BlessingsFlowMessageBuilder.List()
- __VDLType_v_io_x_ref_runtime_internal_flow_conn_BlessingsFlowMessage15 := __VDLType_v_io_x_ref_runtime_internal_flow_conn_BlessingsFlowMessageBuilder.Struct()
- __VDLType_v_io_x_ref_runtime_internal_flow_conn_BlessingsFlowMessage16 := __VDLType_v_io_x_ref_runtime_internal_flow_conn_BlessingsFlowMessageBuilder.Named("v.io/v23/security.Caveat").AssignBase(__VDLType_v_io_x_ref_runtime_internal_flow_conn_BlessingsFlowMessage15)
- __VDLType_v_io_x_ref_runtime_internal_flow_conn_BlessingsFlowMessage17 := __VDLType_v_io_x_ref_runtime_internal_flow_conn_BlessingsFlowMessageBuilder.Array()
- __VDLType_v_io_x_ref_runtime_internal_flow_conn_BlessingsFlowMessage18 := __VDLType_v_io_x_ref_runtime_internal_flow_conn_BlessingsFlowMessageBuilder.Named("v.io/v23/uniqueid.Id").AssignBase(__VDLType_v_io_x_ref_runtime_internal_flow_conn_BlessingsFlowMessage17)
- __VDLType_v_io_x_ref_runtime_internal_flow_conn_BlessingsFlowMessage17.AssignElem(__VDLType_v_io_x_ref_runtime_internal_flow_conn_BlessingsFlowMessage13)
- __VDLType_v_io_x_ref_runtime_internal_flow_conn_BlessingsFlowMessage17.AssignLen(16)
- __VDLType_v_io_x_ref_runtime_internal_flow_conn_BlessingsFlowMessage15.AppendField("Id", __VDLType_v_io_x_ref_runtime_internal_flow_conn_BlessingsFlowMessage18)
- __VDLType_v_io_x_ref_runtime_internal_flow_conn_BlessingsFlowMessage15.AppendField("ParamVom", __VDLType_v_io_x_ref_runtime_internal_flow_conn_BlessingsFlowMessage12)
- __VDLType_v_io_x_ref_runtime_internal_flow_conn_BlessingsFlowMessage14.AssignElem(__VDLType_v_io_x_ref_runtime_internal_flow_conn_BlessingsFlowMessage16)
- __VDLType_v_io_x_ref_runtime_internal_flow_conn_BlessingsFlowMessage9.AppendField("Caveats", __VDLType_v_io_x_ref_runtime_internal_flow_conn_BlessingsFlowMessage14)
- __VDLType_v_io_x_ref_runtime_internal_flow_conn_BlessingsFlowMessage19 := __VDLType_v_io_x_ref_runtime_internal_flow_conn_BlessingsFlowMessageBuilder.Struct()
- __VDLType_v_io_x_ref_runtime_internal_flow_conn_BlessingsFlowMessage20 := __VDLType_v_io_x_ref_runtime_internal_flow_conn_BlessingsFlowMessageBuilder.Named("v.io/v23/security.Signature").AssignBase(__VDLType_v_io_x_ref_runtime_internal_flow_conn_BlessingsFlowMessage19)
- __VDLType_v_io_x_ref_runtime_internal_flow_conn_BlessingsFlowMessage19.AppendField("Purpose", __VDLType_v_io_x_ref_runtime_internal_flow_conn_BlessingsFlowMessage12)
- __VDLType_v_io_x_ref_runtime_internal_flow_conn_BlessingsFlowMessage21 := vdl.StringType
- __VDLType_v_io_x_ref_runtime_internal_flow_conn_BlessingsFlowMessage22 := __VDLType_v_io_x_ref_runtime_internal_flow_conn_BlessingsFlowMessageBuilder.Named("v.io/v23/security.Hash").AssignBase(__VDLType_v_io_x_ref_runtime_internal_flow_conn_BlessingsFlowMessage21)
- __VDLType_v_io_x_ref_runtime_internal_flow_conn_BlessingsFlowMessage19.AppendField("Hash", __VDLType_v_io_x_ref_runtime_internal_flow_conn_BlessingsFlowMessage22)
- __VDLType_v_io_x_ref_runtime_internal_flow_conn_BlessingsFlowMessage19.AppendField("R", __VDLType_v_io_x_ref_runtime_internal_flow_conn_BlessingsFlowMessage12)
- __VDLType_v_io_x_ref_runtime_internal_flow_conn_BlessingsFlowMessage19.AppendField("S", __VDLType_v_io_x_ref_runtime_internal_flow_conn_BlessingsFlowMessage12)
- __VDLType_v_io_x_ref_runtime_internal_flow_conn_BlessingsFlowMessage9.AppendField("Signature", __VDLType_v_io_x_ref_runtime_internal_flow_conn_BlessingsFlowMessage20)
- __VDLType_v_io_x_ref_runtime_internal_flow_conn_BlessingsFlowMessage8.AssignElem(__VDLType_v_io_x_ref_runtime_internal_flow_conn_BlessingsFlowMessage10)
- __VDLType_v_io_x_ref_runtime_internal_flow_conn_BlessingsFlowMessage7.AssignElem(__VDLType_v_io_x_ref_runtime_internal_flow_conn_BlessingsFlowMessage8)
- __VDLType_v_io_x_ref_runtime_internal_flow_conn_BlessingsFlowMessage5.AppendField("CertificateChains", __VDLType_v_io_x_ref_runtime_internal_flow_conn_BlessingsFlowMessage7)
- __VDLType_v_io_x_ref_runtime_internal_flow_conn_BlessingsFlowMessage3.AppendField("Blessings", __VDLType_v_io_x_ref_runtime_internal_flow_conn_BlessingsFlowMessage6)
- __VDLType_v_io_x_ref_runtime_internal_flow_conn_BlessingsFlowMessage23 := vdl.Uint64Type
- __VDLType_v_io_x_ref_runtime_internal_flow_conn_BlessingsFlowMessage3.AppendField("BKey", __VDLType_v_io_x_ref_runtime_internal_flow_conn_BlessingsFlowMessage23)
- __VDLType_v_io_x_ref_runtime_internal_flow_conn_BlessingsFlowMessage1.AppendField("Blessings", __VDLType_v_io_x_ref_runtime_internal_flow_conn_BlessingsFlowMessage4)
- __VDLType_v_io_x_ref_runtime_internal_flow_conn_BlessingsFlowMessage24 := __VDLType_v_io_x_ref_runtime_internal_flow_conn_BlessingsFlowMessageBuilder.Struct()
- __VDLType_v_io_x_ref_runtime_internal_flow_conn_BlessingsFlowMessage25 := __VDLType_v_io_x_ref_runtime_internal_flow_conn_BlessingsFlowMessageBuilder.Named("v.io/x/ref/runtime/internal/flow/conn.Discharges").AssignBase(__VDLType_v_io_x_ref_runtime_internal_flow_conn_BlessingsFlowMessage24)
- __VDLType_v_io_x_ref_runtime_internal_flow_conn_BlessingsFlowMessage26 := __VDLType_v_io_x_ref_runtime_internal_flow_conn_BlessingsFlowMessageBuilder.List()
- __VDLType_v_io_x_ref_runtime_internal_flow_conn_BlessingsFlowMessage27 := __VDLType_v_io_x_ref_runtime_internal_flow_conn_BlessingsFlowMessageBuilder.Union()
- __VDLType_v_io_x_ref_runtime_internal_flow_conn_BlessingsFlowMessage28 := __VDLType_v_io_x_ref_runtime_internal_flow_conn_BlessingsFlowMessageBuilder.Named("v.io/v23/security.WireDischarge").AssignBase(__VDLType_v_io_x_ref_runtime_internal_flow_conn_BlessingsFlowMessage27)
- __VDLType_v_io_x_ref_runtime_internal_flow_conn_BlessingsFlowMessage29 := __VDLType_v_io_x_ref_runtime_internal_flow_conn_BlessingsFlowMessageBuilder.Struct()
- __VDLType_v_io_x_ref_runtime_internal_flow_conn_BlessingsFlowMessage30 := __VDLType_v_io_x_ref_runtime_internal_flow_conn_BlessingsFlowMessageBuilder.Named("v.io/v23/security.publicKeyDischarge").AssignBase(__VDLType_v_io_x_ref_runtime_internal_flow_conn_BlessingsFlowMessage29)
- __VDLType_v_io_x_ref_runtime_internal_flow_conn_BlessingsFlowMessage29.AppendField("ThirdPartyCaveatId", __VDLType_v_io_x_ref_runtime_internal_flow_conn_BlessingsFlowMessage11)
- __VDLType_v_io_x_ref_runtime_internal_flow_conn_BlessingsFlowMessage29.AppendField("Caveats", __VDLType_v_io_x_ref_runtime_internal_flow_conn_BlessingsFlowMessage14)
- __VDLType_v_io_x_ref_runtime_internal_flow_conn_BlessingsFlowMessage29.AppendField("Signature", __VDLType_v_io_x_ref_runtime_internal_flow_conn_BlessingsFlowMessage20)
- __VDLType_v_io_x_ref_runtime_internal_flow_conn_BlessingsFlowMessage27.AppendField("PublicKey", __VDLType_v_io_x_ref_runtime_internal_flow_conn_BlessingsFlowMessage30)
- __VDLType_v_io_x_ref_runtime_internal_flow_conn_BlessingsFlowMessage26.AssignElem(__VDLType_v_io_x_ref_runtime_internal_flow_conn_BlessingsFlowMessage28)
- __VDLType_v_io_x_ref_runtime_internal_flow_conn_BlessingsFlowMessage24.AppendField("Discharges", __VDLType_v_io_x_ref_runtime_internal_flow_conn_BlessingsFlowMessage26)
- __VDLType_v_io_x_ref_runtime_internal_flow_conn_BlessingsFlowMessage24.AppendField("DKey", __VDLType_v_io_x_ref_runtime_internal_flow_conn_BlessingsFlowMessage23)
- __VDLType_v_io_x_ref_runtime_internal_flow_conn_BlessingsFlowMessage24.AppendField("BKey", __VDLType_v_io_x_ref_runtime_internal_flow_conn_BlessingsFlowMessage23)
- __VDLType_v_io_x_ref_runtime_internal_flow_conn_BlessingsFlowMessage1.AppendField("Discharges", __VDLType_v_io_x_ref_runtime_internal_flow_conn_BlessingsFlowMessage25)
- __VDLType_v_io_x_ref_runtime_internal_flow_conn_BlessingsFlowMessage31 := __VDLType_v_io_x_ref_runtime_internal_flow_conn_BlessingsFlowMessageBuilder.Struct()
- __VDLType_v_io_x_ref_runtime_internal_flow_conn_BlessingsFlowMessage32 := __VDLType_v_io_x_ref_runtime_internal_flow_conn_BlessingsFlowMessageBuilder.Named("v.io/x/ref/runtime/internal/flow/conn.EncryptedBlessings").AssignBase(__VDLType_v_io_x_ref_runtime_internal_flow_conn_BlessingsFlowMessage31)
- __VDLType_v_io_x_ref_runtime_internal_flow_conn_BlessingsFlowMessage33 := __VDLType_v_io_x_ref_runtime_internal_flow_conn_BlessingsFlowMessageBuilder.List()
- __VDLType_v_io_x_ref_runtime_internal_flow_conn_BlessingsFlowMessage34 := __VDLType_v_io_x_ref_runtime_internal_flow_conn_BlessingsFlowMessageBuilder.Struct()
- __VDLType_v_io_x_ref_runtime_internal_flow_conn_BlessingsFlowMessage35 := __VDLType_v_io_x_ref_runtime_internal_flow_conn_BlessingsFlowMessageBuilder.Named("v.io/x/ref/lib/security/bcrypter.WireCiphertext").AssignBase(__VDLType_v_io_x_ref_runtime_internal_flow_conn_BlessingsFlowMessage34)
- __VDLType_v_io_x_ref_runtime_internal_flow_conn_BlessingsFlowMessage34.AppendField("PatternId", __VDLType_v_io_x_ref_runtime_internal_flow_conn_BlessingsFlowMessage11)
- __VDLType_v_io_x_ref_runtime_internal_flow_conn_BlessingsFlowMessage36 := __VDLType_v_io_x_ref_runtime_internal_flow_conn_BlessingsFlowMessageBuilder.Map()
- __VDLType_v_io_x_ref_runtime_internal_flow_conn_BlessingsFlowMessage36.AssignKey(__VDLType_v_io_x_ref_runtime_internal_flow_conn_BlessingsFlowMessage11)
- __VDLType_v_io_x_ref_runtime_internal_flow_conn_BlessingsFlowMessage36.AssignElem(__VDLType_v_io_x_ref_runtime_internal_flow_conn_BlessingsFlowMessage12)
- __VDLType_v_io_x_ref_runtime_internal_flow_conn_BlessingsFlowMessage34.AppendField("Bytes", __VDLType_v_io_x_ref_runtime_internal_flow_conn_BlessingsFlowMessage36)
- __VDLType_v_io_x_ref_runtime_internal_flow_conn_BlessingsFlowMessage33.AssignElem(__VDLType_v_io_x_ref_runtime_internal_flow_conn_BlessingsFlowMessage35)
- __VDLType_v_io_x_ref_runtime_internal_flow_conn_BlessingsFlowMessage31.AppendField("Ciphertexts", __VDLType_v_io_x_ref_runtime_internal_flow_conn_BlessingsFlowMessage33)
- __VDLType_v_io_x_ref_runtime_internal_flow_conn_BlessingsFlowMessage31.AppendField("BKey", __VDLType_v_io_x_ref_runtime_internal_flow_conn_BlessingsFlowMessage23)
- __VDLType_v_io_x_ref_runtime_internal_flow_conn_BlessingsFlowMessage1.AppendField("EncryptedBlessings", __VDLType_v_io_x_ref_runtime_internal_flow_conn_BlessingsFlowMessage32)
- __VDLType_v_io_x_ref_runtime_internal_flow_conn_BlessingsFlowMessage37 := __VDLType_v_io_x_ref_runtime_internal_flow_conn_BlessingsFlowMessageBuilder.Struct()
- __VDLType_v_io_x_ref_runtime_internal_flow_conn_BlessingsFlowMessage38 := __VDLType_v_io_x_ref_runtime_internal_flow_conn_BlessingsFlowMessageBuilder.Named("v.io/x/ref/runtime/internal/flow/conn.EncryptedDischarges").AssignBase(__VDLType_v_io_x_ref_runtime_internal_flow_conn_BlessingsFlowMessage37)
- __VDLType_v_io_x_ref_runtime_internal_flow_conn_BlessingsFlowMessage37.AppendField("Ciphertexts", __VDLType_v_io_x_ref_runtime_internal_flow_conn_BlessingsFlowMessage33)
- __VDLType_v_io_x_ref_runtime_internal_flow_conn_BlessingsFlowMessage37.AppendField("DKey", __VDLType_v_io_x_ref_runtime_internal_flow_conn_BlessingsFlowMessage23)
- __VDLType_v_io_x_ref_runtime_internal_flow_conn_BlessingsFlowMessage37.AppendField("BKey", __VDLType_v_io_x_ref_runtime_internal_flow_conn_BlessingsFlowMessage23)
- __VDLType_v_io_x_ref_runtime_internal_flow_conn_BlessingsFlowMessage1.AppendField("EncryptedDischarges", __VDLType_v_io_x_ref_runtime_internal_flow_conn_BlessingsFlowMessage38)
- __VDLType_v_io_x_ref_runtime_internal_flow_conn_BlessingsFlowMessageBuilder.Build()
- __VDLType_v_io_x_ref_runtime_internal_flow_conn_BlessingsFlowMessagev, err := __VDLType_v_io_x_ref_runtime_internal_flow_conn_BlessingsFlowMessage2.Built()
- if err != nil {
- panic(err)
- }
- return __VDLType_v_io_x_ref_runtime_internal_flow_conn_BlessingsFlowMessagev
-}
-func init() {
- __VDLType_v_io_x_ref_runtime_internal_flow_conn_BlessingsFlowMessage = __VDLType_v_io_x_ref_runtime_internal_flow_conn_BlessingsFlowMessage_gen()
-}
-
-var __VDLType_v_io_x_ref_runtime_internal_flow_conn_Discharges *vdl.Type
-
-func __VDLType_v_io_x_ref_runtime_internal_flow_conn_Discharges_gen() *vdl.Type {
- __VDLType_v_io_x_ref_runtime_internal_flow_conn_DischargesBuilder := vdl.TypeBuilder{}
-
- __VDLType_v_io_x_ref_runtime_internal_flow_conn_Discharges1 := __VDLType_v_io_x_ref_runtime_internal_flow_conn_DischargesBuilder.Struct()
- __VDLType_v_io_x_ref_runtime_internal_flow_conn_Discharges2 := __VDLType_v_io_x_ref_runtime_internal_flow_conn_DischargesBuilder.Named("v.io/x/ref/runtime/internal/flow/conn.Discharges").AssignBase(__VDLType_v_io_x_ref_runtime_internal_flow_conn_Discharges1)
- __VDLType_v_io_x_ref_runtime_internal_flow_conn_Discharges3 := __VDLType_v_io_x_ref_runtime_internal_flow_conn_DischargesBuilder.List()
- __VDLType_v_io_x_ref_runtime_internal_flow_conn_Discharges4 := __VDLType_v_io_x_ref_runtime_internal_flow_conn_DischargesBuilder.Union()
- __VDLType_v_io_x_ref_runtime_internal_flow_conn_Discharges5 := __VDLType_v_io_x_ref_runtime_internal_flow_conn_DischargesBuilder.Named("v.io/v23/security.WireDischarge").AssignBase(__VDLType_v_io_x_ref_runtime_internal_flow_conn_Discharges4)
- __VDLType_v_io_x_ref_runtime_internal_flow_conn_Discharges6 := __VDLType_v_io_x_ref_runtime_internal_flow_conn_DischargesBuilder.Struct()
- __VDLType_v_io_x_ref_runtime_internal_flow_conn_Discharges7 := __VDLType_v_io_x_ref_runtime_internal_flow_conn_DischargesBuilder.Named("v.io/v23/security.publicKeyDischarge").AssignBase(__VDLType_v_io_x_ref_runtime_internal_flow_conn_Discharges6)
- __VDLType_v_io_x_ref_runtime_internal_flow_conn_Discharges8 := vdl.StringType
- __VDLType_v_io_x_ref_runtime_internal_flow_conn_Discharges6.AppendField("ThirdPartyCaveatId", __VDLType_v_io_x_ref_runtime_internal_flow_conn_Discharges8)
- __VDLType_v_io_x_ref_runtime_internal_flow_conn_Discharges9 := __VDLType_v_io_x_ref_runtime_internal_flow_conn_DischargesBuilder.List()
- __VDLType_v_io_x_ref_runtime_internal_flow_conn_Discharges10 := __VDLType_v_io_x_ref_runtime_internal_flow_conn_DischargesBuilder.Struct()
- __VDLType_v_io_x_ref_runtime_internal_flow_conn_Discharges11 := __VDLType_v_io_x_ref_runtime_internal_flow_conn_DischargesBuilder.Named("v.io/v23/security.Caveat").AssignBase(__VDLType_v_io_x_ref_runtime_internal_flow_conn_Discharges10)
- __VDLType_v_io_x_ref_runtime_internal_flow_conn_Discharges12 := __VDLType_v_io_x_ref_runtime_internal_flow_conn_DischargesBuilder.Array()
- __VDLType_v_io_x_ref_runtime_internal_flow_conn_Discharges13 := __VDLType_v_io_x_ref_runtime_internal_flow_conn_DischargesBuilder.Named("v.io/v23/uniqueid.Id").AssignBase(__VDLType_v_io_x_ref_runtime_internal_flow_conn_Discharges12)
- __VDLType_v_io_x_ref_runtime_internal_flow_conn_Discharges14 := vdl.ByteType
- __VDLType_v_io_x_ref_runtime_internal_flow_conn_Discharges12.AssignElem(__VDLType_v_io_x_ref_runtime_internal_flow_conn_Discharges14)
- __VDLType_v_io_x_ref_runtime_internal_flow_conn_Discharges12.AssignLen(16)
- __VDLType_v_io_x_ref_runtime_internal_flow_conn_Discharges10.AppendField("Id", __VDLType_v_io_x_ref_runtime_internal_flow_conn_Discharges13)
- __VDLType_v_io_x_ref_runtime_internal_flow_conn_Discharges15 := __VDLType_v_io_x_ref_runtime_internal_flow_conn_DischargesBuilder.List()
- __VDLType_v_io_x_ref_runtime_internal_flow_conn_Discharges15.AssignElem(__VDLType_v_io_x_ref_runtime_internal_flow_conn_Discharges14)
- __VDLType_v_io_x_ref_runtime_internal_flow_conn_Discharges10.AppendField("ParamVom", __VDLType_v_io_x_ref_runtime_internal_flow_conn_Discharges15)
- __VDLType_v_io_x_ref_runtime_internal_flow_conn_Discharges9.AssignElem(__VDLType_v_io_x_ref_runtime_internal_flow_conn_Discharges11)
- __VDLType_v_io_x_ref_runtime_internal_flow_conn_Discharges6.AppendField("Caveats", __VDLType_v_io_x_ref_runtime_internal_flow_conn_Discharges9)
- __VDLType_v_io_x_ref_runtime_internal_flow_conn_Discharges16 := __VDLType_v_io_x_ref_runtime_internal_flow_conn_DischargesBuilder.Struct()
- __VDLType_v_io_x_ref_runtime_internal_flow_conn_Discharges17 := __VDLType_v_io_x_ref_runtime_internal_flow_conn_DischargesBuilder.Named("v.io/v23/security.Signature").AssignBase(__VDLType_v_io_x_ref_runtime_internal_flow_conn_Discharges16)
- __VDLType_v_io_x_ref_runtime_internal_flow_conn_Discharges16.AppendField("Purpose", __VDLType_v_io_x_ref_runtime_internal_flow_conn_Discharges15)
- __VDLType_v_io_x_ref_runtime_internal_flow_conn_Discharges18 := vdl.StringType
- __VDLType_v_io_x_ref_runtime_internal_flow_conn_Discharges19 := __VDLType_v_io_x_ref_runtime_internal_flow_conn_DischargesBuilder.Named("v.io/v23/security.Hash").AssignBase(__VDLType_v_io_x_ref_runtime_internal_flow_conn_Discharges18)
- __VDLType_v_io_x_ref_runtime_internal_flow_conn_Discharges16.AppendField("Hash", __VDLType_v_io_x_ref_runtime_internal_flow_conn_Discharges19)
- __VDLType_v_io_x_ref_runtime_internal_flow_conn_Discharges16.AppendField("R", __VDLType_v_io_x_ref_runtime_internal_flow_conn_Discharges15)
- __VDLType_v_io_x_ref_runtime_internal_flow_conn_Discharges16.AppendField("S", __VDLType_v_io_x_ref_runtime_internal_flow_conn_Discharges15)
- __VDLType_v_io_x_ref_runtime_internal_flow_conn_Discharges6.AppendField("Signature", __VDLType_v_io_x_ref_runtime_internal_flow_conn_Discharges17)
- __VDLType_v_io_x_ref_runtime_internal_flow_conn_Discharges4.AppendField("PublicKey", __VDLType_v_io_x_ref_runtime_internal_flow_conn_Discharges7)
- __VDLType_v_io_x_ref_runtime_internal_flow_conn_Discharges3.AssignElem(__VDLType_v_io_x_ref_runtime_internal_flow_conn_Discharges5)
- __VDLType_v_io_x_ref_runtime_internal_flow_conn_Discharges1.AppendField("Discharges", __VDLType_v_io_x_ref_runtime_internal_flow_conn_Discharges3)
- __VDLType_v_io_x_ref_runtime_internal_flow_conn_Discharges20 := vdl.Uint64Type
- __VDLType_v_io_x_ref_runtime_internal_flow_conn_Discharges1.AppendField("DKey", __VDLType_v_io_x_ref_runtime_internal_flow_conn_Discharges20)
- __VDLType_v_io_x_ref_runtime_internal_flow_conn_Discharges1.AppendField("BKey", __VDLType_v_io_x_ref_runtime_internal_flow_conn_Discharges20)
- __VDLType_v_io_x_ref_runtime_internal_flow_conn_DischargesBuilder.Build()
- __VDLType_v_io_x_ref_runtime_internal_flow_conn_Dischargesv, err := __VDLType_v_io_x_ref_runtime_internal_flow_conn_Discharges2.Built()
- if err != nil {
- panic(err)
- }
- return __VDLType_v_io_x_ref_runtime_internal_flow_conn_Dischargesv
-}
-func init() {
- __VDLType_v_io_x_ref_runtime_internal_flow_conn_Discharges = __VDLType_v_io_x_ref_runtime_internal_flow_conn_Discharges_gen()
-}
-
-var __VDLType_v_io_x_ref_runtime_internal_flow_conn_EncryptedBlessings *vdl.Type = vdl.TypeOf(EncryptedBlessings{})
-var __VDLType_v_io_x_ref_runtime_internal_flow_conn_EncryptedDischarges *vdl.Type = vdl.TypeOf(EncryptedDischarges{})
-
-func __VDLEnsureNativeBuilt() {
- if __VDLType0 == nil {
- __VDLType0 = __VDLType0_gen()
- }
- if __VDLType3 == nil {
- __VDLType3 = __VDLType3_gen()
- }
- if __VDLType4 == nil {
- __VDLType4 = __VDLType4_gen()
- }
- if __VDLType_v_io_v23_security_WireBlessings == nil {
- __VDLType_v_io_v23_security_WireBlessings = __VDLType_v_io_v23_security_WireBlessings_gen()
- }
- if __VDLType_v_io_v23_security_WireDischarge == nil {
- __VDLType_v_io_v23_security_WireDischarge = __VDLType_v_io_v23_security_WireDischarge_gen()
- }
- if __VDLType_v_io_x_ref_runtime_internal_flow_conn_Blessings == nil {
- __VDLType_v_io_x_ref_runtime_internal_flow_conn_Blessings = __VDLType_v_io_x_ref_runtime_internal_flow_conn_Blessings_gen()
- }
- if __VDLType_v_io_x_ref_runtime_internal_flow_conn_BlessingsFlowMessage == nil {
- __VDLType_v_io_x_ref_runtime_internal_flow_conn_BlessingsFlowMessage = __VDLType_v_io_x_ref_runtime_internal_flow_conn_BlessingsFlowMessage_gen()
- }
- if __VDLType_v_io_x_ref_runtime_internal_flow_conn_Discharges == nil {
- __VDLType_v_io_x_ref_runtime_internal_flow_conn_Discharges = __VDLType_v_io_x_ref_runtime_internal_flow_conn_Discharges_gen()
- }
-}
-
+//////////////////////////////////////////////////
+// Error definitions
var (
ErrMissingSetupOption = verror.Register("v.io/x/ref/runtime/internal/flow/conn.MissingSetupOption", verror.NoRetry, "{1:}{2:} missing required setup option{:3}.")
ErrUnexpectedMsg = verror.Register("v.io/x/ref/runtime/internal/flow/conn.UnexpectedMsg", verror.NoRetry, "{1:}{2:} unexpected message type{:3}.")
@@ -1264,31 +757,6 @@
ErrIdleConnKilled = verror.Register("v.io/x/ref/runtime/internal/flow/conn.IdleConnKilled", verror.NoRetry, "{1:}{2:} Connection killed because idle expiry was reached.")
)
-func init() {
- i18n.Cat().SetWithBase(i18n.LangID("en"), i18n.MsgID(ErrMissingSetupOption.ID), "{1:}{2:} missing required setup option{:3}.")
- i18n.Cat().SetWithBase(i18n.LangID("en"), i18n.MsgID(ErrUnexpectedMsg.ID), "{1:}{2:} unexpected message type{:3}.")
- i18n.Cat().SetWithBase(i18n.LangID("en"), i18n.MsgID(ErrConnectionClosed.ID), "{1:}{2:} connection closed.")
- i18n.Cat().SetWithBase(i18n.LangID("en"), i18n.MsgID(ErrRemoteError.ID), "{1:}{2:} remote end received err{:3}.")
- i18n.Cat().SetWithBase(i18n.LangID("en"), i18n.MsgID(ErrSend.ID), "{1:}{2:} failure sending {3} message to {4}{:5}.")
- i18n.Cat().SetWithBase(i18n.LangID("en"), i18n.MsgID(ErrRecv.ID), "{1:}{2:} error reading from {3}{:4}")
- i18n.Cat().SetWithBase(i18n.LangID("en"), i18n.MsgID(ErrCounterOverflow.ID), "{1:}{2:} A remote process has sent more data than allowed.")
- i18n.Cat().SetWithBase(i18n.LangID("en"), i18n.MsgID(ErrBlessingsFlowClosed.ID), "{1:}{2:} The blessings flow was closed with error{:3}.")
- i18n.Cat().SetWithBase(i18n.LangID("en"), i18n.MsgID(ErrInvalidChannelBinding.ID), "{1:}{2:} The channel binding was invalid.")
- i18n.Cat().SetWithBase(i18n.LangID("en"), i18n.MsgID(ErrNoPublicKey.ID), "{1:}{2:} No public key was received by the remote end.")
- i18n.Cat().SetWithBase(i18n.LangID("en"), i18n.MsgID(ErrDialingNonServer.ID), "{1:}{2:} You are attempting to dial on a connection with no remote server.")
- i18n.Cat().SetWithBase(i18n.LangID("en"), i18n.MsgID(ErrAcceptorBlessingsMissing.ID), "{1:}{2:} The acceptor did not send blessings.")
- i18n.Cat().SetWithBase(i18n.LangID("en"), i18n.MsgID(ErrBlessingsNotBound.ID), "{1:}{2:} blessings not bound to connection remote public key")
- i18n.Cat().SetWithBase(i18n.LangID("en"), i18n.MsgID(ErrInvalidPeerFlow.ID), "{1:}{2:} peer has chosen flow id from local domain.")
- i18n.Cat().SetWithBase(i18n.LangID("en"), i18n.MsgID(ErrChannelTimeout.ID), "{1:}{2:} the channel has become unresponsive.")
- i18n.Cat().SetWithBase(i18n.LangID("en"), i18n.MsgID(ErrCannotDecryptBlessings.ID), "{1:}{2:} cannot decrypt the encrypted blessings sent by peer{:3}")
- i18n.Cat().SetWithBase(i18n.LangID("en"), i18n.MsgID(ErrCannotDecryptDischarges.ID), "{1:}{2:} cannot decrypt the encrypted discharges sent by peer{:3}")
- i18n.Cat().SetWithBase(i18n.LangID("en"), i18n.MsgID(ErrCannotEncryptBlessings.ID), "{1:}{2:} cannot encyrpt blessings for peer {3}{:4}")
- i18n.Cat().SetWithBase(i18n.LangID("en"), i18n.MsgID(ErrCannotEncryptDischarges.ID), "{1:}{2:} cannot encrypt discharges for peers {3}{:4}")
- i18n.Cat().SetWithBase(i18n.LangID("en"), i18n.MsgID(ErrNoCrypter.ID), "{1:}{2:} no blessings-based crypter available")
- i18n.Cat().SetWithBase(i18n.LangID("en"), i18n.MsgID(ErrNoPrivateKey.ID), "{1:}{2:} no blessings private key available for decryption")
- i18n.Cat().SetWithBase(i18n.LangID("en"), i18n.MsgID(ErrIdleConnKilled.ID), "{1:}{2:} Connection killed because idle expiry was reached.")
-}
-
// NewErrMissingSetupOption returns an error with the ErrMissingSetupOption ID.
func NewErrMissingSetupOption(ctx *context.T, option string) error {
return verror.New(ErrMissingSetupOption, ctx, option)
@@ -1398,3 +866,57 @@
func NewErrIdleConnKilled(ctx *context.T) error {
return verror.New(ErrIdleConnKilled, ctx)
}
+
+var __VDLInitCalled bool
+
+// __VDLInit performs vdl initialization. It is safe to call multiple times.
+// If you have an init ordering issue, just insert the following line verbatim
+// into your source files in this package, right after the "package foo" clause:
+//
+// var _ = __VDLInit()
+//
+// The purpose of this function is to ensure that vdl initialization occurs in
+// the right order, and very early in the init sequence. In particular, vdl
+// registration and package variable initialization needs to occur before
+// functions like vdl.TypeOf will work properly.
+//
+// This function returns a dummy value, so that it can be used to initialize the
+// first var in the file, to take advantage of Go's defined init order.
+func __VDLInit() struct{} {
+ if __VDLInitCalled {
+ return struct{}{}
+ }
+
+ // Register types.
+ vdl.Register((*Blessings)(nil))
+ vdl.Register((*EncryptedBlessings)(nil))
+ vdl.Register((*Discharges)(nil))
+ vdl.Register((*EncryptedDischarges)(nil))
+ vdl.Register((*BlessingsFlowMessage)(nil))
+
+ // Set error format strings.
+ i18n.Cat().SetWithBase(i18n.LangID("en"), i18n.MsgID(ErrMissingSetupOption.ID), "{1:}{2:} missing required setup option{:3}.")
+ i18n.Cat().SetWithBase(i18n.LangID("en"), i18n.MsgID(ErrUnexpectedMsg.ID), "{1:}{2:} unexpected message type{:3}.")
+ i18n.Cat().SetWithBase(i18n.LangID("en"), i18n.MsgID(ErrConnectionClosed.ID), "{1:}{2:} connection closed.")
+ i18n.Cat().SetWithBase(i18n.LangID("en"), i18n.MsgID(ErrRemoteError.ID), "{1:}{2:} remote end received err{:3}.")
+ i18n.Cat().SetWithBase(i18n.LangID("en"), i18n.MsgID(ErrSend.ID), "{1:}{2:} failure sending {3} message to {4}{:5}.")
+ i18n.Cat().SetWithBase(i18n.LangID("en"), i18n.MsgID(ErrRecv.ID), "{1:}{2:} error reading from {3}{:4}")
+ i18n.Cat().SetWithBase(i18n.LangID("en"), i18n.MsgID(ErrCounterOverflow.ID), "{1:}{2:} A remote process has sent more data than allowed.")
+ i18n.Cat().SetWithBase(i18n.LangID("en"), i18n.MsgID(ErrBlessingsFlowClosed.ID), "{1:}{2:} The blessings flow was closed with error{:3}.")
+ i18n.Cat().SetWithBase(i18n.LangID("en"), i18n.MsgID(ErrInvalidChannelBinding.ID), "{1:}{2:} The channel binding was invalid.")
+ i18n.Cat().SetWithBase(i18n.LangID("en"), i18n.MsgID(ErrNoPublicKey.ID), "{1:}{2:} No public key was received by the remote end.")
+ i18n.Cat().SetWithBase(i18n.LangID("en"), i18n.MsgID(ErrDialingNonServer.ID), "{1:}{2:} You are attempting to dial on a connection with no remote server.")
+ i18n.Cat().SetWithBase(i18n.LangID("en"), i18n.MsgID(ErrAcceptorBlessingsMissing.ID), "{1:}{2:} The acceptor did not send blessings.")
+ i18n.Cat().SetWithBase(i18n.LangID("en"), i18n.MsgID(ErrBlessingsNotBound.ID), "{1:}{2:} blessings not bound to connection remote public key")
+ i18n.Cat().SetWithBase(i18n.LangID("en"), i18n.MsgID(ErrInvalidPeerFlow.ID), "{1:}{2:} peer has chosen flow id from local domain.")
+ i18n.Cat().SetWithBase(i18n.LangID("en"), i18n.MsgID(ErrChannelTimeout.ID), "{1:}{2:} the channel has become unresponsive.")
+ i18n.Cat().SetWithBase(i18n.LangID("en"), i18n.MsgID(ErrCannotDecryptBlessings.ID), "{1:}{2:} cannot decrypt the encrypted blessings sent by peer{:3}")
+ i18n.Cat().SetWithBase(i18n.LangID("en"), i18n.MsgID(ErrCannotDecryptDischarges.ID), "{1:}{2:} cannot decrypt the encrypted discharges sent by peer{:3}")
+ i18n.Cat().SetWithBase(i18n.LangID("en"), i18n.MsgID(ErrCannotEncryptBlessings.ID), "{1:}{2:} cannot encyrpt blessings for peer {3}{:4}")
+ i18n.Cat().SetWithBase(i18n.LangID("en"), i18n.MsgID(ErrCannotEncryptDischarges.ID), "{1:}{2:} cannot encrypt discharges for peers {3}{:4}")
+ i18n.Cat().SetWithBase(i18n.LangID("en"), i18n.MsgID(ErrNoCrypter.ID), "{1:}{2:} no blessings-based crypter available")
+ i18n.Cat().SetWithBase(i18n.LangID("en"), i18n.MsgID(ErrNoPrivateKey.ID), "{1:}{2:} no blessings private key available for decryption")
+ i18n.Cat().SetWithBase(i18n.LangID("en"), i18n.MsgID(ErrIdleConnKilled.ID), "{1:}{2:} Connection killed because idle expiry was reached.")
+
+ return struct{}{}
+}
diff --git a/runtime/internal/flow/manager/manager.vdl.go b/runtime/internal/flow/manager/manager.vdl.go
index 74cc2f3..1572974 100644
--- a/runtime/internal/flow/manager/manager.vdl.go
+++ b/runtime/internal/flow/manager/manager.vdl.go
@@ -14,9 +14,10 @@
"v.io/v23/verror"
)
-func __VDLEnsureNativeBuilt() {
-}
+var _ = __VDLInit() // Must be first; see __VDLInit comments for details.
+//////////////////////////////////////////////////
+// Error definitions
var (
ErrUnknownProtocol = verror.Register("v.io/x/ref/runtime/internal/flow/manager.UnknownProtocol", verror.NoRetry, "{1:}{2:} unknown protocol{:3}")
ErrManagerClosed = verror.Register("v.io/x/ref/runtime/internal/flow/manager.ManagerClosed", verror.NoRetry, "{1:}{2:} manager is already closed")
@@ -31,20 +32,6 @@
ErrConnNotInCache = verror.Register("v.io/x/ref/runtime/internal/flow/manager.ConnNotInCache", verror.NoRetry, "{1:}{2:} connection to {3} not in cache")
)
-func init() {
- i18n.Cat().SetWithBase(i18n.LangID("en"), i18n.MsgID(ErrUnknownProtocol.ID), "{1:}{2:} unknown protocol{:3}")
- i18n.Cat().SetWithBase(i18n.LangID("en"), i18n.MsgID(ErrManagerClosed.ID), "{1:}{2:} manager is already closed")
- i18n.Cat().SetWithBase(i18n.LangID("en"), i18n.MsgID(ErrAcceptFailed.ID), "{1:}{2:} accept failed{:3}")
- i18n.Cat().SetWithBase(i18n.LangID("en"), i18n.MsgID(ErrCacheClosed.ID), "{1:}{2:} cache is closed")
- i18n.Cat().SetWithBase(i18n.LangID("en"), i18n.MsgID(ErrConnKilledToFreeResources.ID), "{1:}{2:} Connection killed to free resources.")
- i18n.Cat().SetWithBase(i18n.LangID("en"), i18n.MsgID(ErrInvalidProxyResponse.ID), "{1:}{2:} Invalid proxy response{:3}")
- i18n.Cat().SetWithBase(i18n.LangID("en"), i18n.MsgID(ErrManagerDialingSelf.ID), "{1:}{2:} manager cannot be used to dial itself")
- i18n.Cat().SetWithBase(i18n.LangID("en"), i18n.MsgID(ErrListeningWithNullRid.ID), "{1:}{2:} manager cannot listen when created with NullRoutingID")
- i18n.Cat().SetWithBase(i18n.LangID("en"), i18n.MsgID(ErrProxyResponse.ID), "{1:}{2:} proxy returned{:3}")
- i18n.Cat().SetWithBase(i18n.LangID("en"), i18n.MsgID(ErrNoBlessingsForPeer.ID), "{1:}{2:} no blessings tagged for peer {3}, rejected:{4}{:5}")
- i18n.Cat().SetWithBase(i18n.LangID("en"), i18n.MsgID(ErrConnNotInCache.ID), "{1:}{2:} connection to {3} not in cache")
-}
-
// NewErrUnknownProtocol returns an error with the ErrUnknownProtocol ID.
func NewErrUnknownProtocol(ctx *context.T, protocol string) error {
return verror.New(ErrUnknownProtocol, ctx, protocol)
@@ -99,3 +86,39 @@
func NewErrConnNotInCache(ctx *context.T, remote string) error {
return verror.New(ErrConnNotInCache, ctx, remote)
}
+
+var __VDLInitCalled bool
+
+// __VDLInit performs vdl initialization. It is safe to call multiple times.
+// If you have an init ordering issue, just insert the following line verbatim
+// into your source files in this package, right after the "package foo" clause:
+//
+// var _ = __VDLInit()
+//
+// The purpose of this function is to ensure that vdl initialization occurs in
+// the right order, and very early in the init sequence. In particular, vdl
+// registration and package variable initialization needs to occur before
+// functions like vdl.TypeOf will work properly.
+//
+// This function returns a dummy value, so that it can be used to initialize the
+// first var in the file, to take advantage of Go's defined init order.
+func __VDLInit() struct{} {
+ if __VDLInitCalled {
+ return struct{}{}
+ }
+
+ // Set error format strings.
+ i18n.Cat().SetWithBase(i18n.LangID("en"), i18n.MsgID(ErrUnknownProtocol.ID), "{1:}{2:} unknown protocol{:3}")
+ i18n.Cat().SetWithBase(i18n.LangID("en"), i18n.MsgID(ErrManagerClosed.ID), "{1:}{2:} manager is already closed")
+ i18n.Cat().SetWithBase(i18n.LangID("en"), i18n.MsgID(ErrAcceptFailed.ID), "{1:}{2:} accept failed{:3}")
+ i18n.Cat().SetWithBase(i18n.LangID("en"), i18n.MsgID(ErrCacheClosed.ID), "{1:}{2:} cache is closed")
+ i18n.Cat().SetWithBase(i18n.LangID("en"), i18n.MsgID(ErrConnKilledToFreeResources.ID), "{1:}{2:} Connection killed to free resources.")
+ i18n.Cat().SetWithBase(i18n.LangID("en"), i18n.MsgID(ErrInvalidProxyResponse.ID), "{1:}{2:} Invalid proxy response{:3}")
+ i18n.Cat().SetWithBase(i18n.LangID("en"), i18n.MsgID(ErrManagerDialingSelf.ID), "{1:}{2:} manager cannot be used to dial itself")
+ i18n.Cat().SetWithBase(i18n.LangID("en"), i18n.MsgID(ErrListeningWithNullRid.ID), "{1:}{2:} manager cannot listen when created with NullRoutingID")
+ i18n.Cat().SetWithBase(i18n.LangID("en"), i18n.MsgID(ErrProxyResponse.ID), "{1:}{2:} proxy returned{:3}")
+ i18n.Cat().SetWithBase(i18n.LangID("en"), i18n.MsgID(ErrNoBlessingsForPeer.ID), "{1:}{2:} no blessings tagged for peer {3}, rejected:{4}{:5}")
+ i18n.Cat().SetWithBase(i18n.LangID("en"), i18n.MsgID(ErrConnNotInCache.ID), "{1:}{2:} connection to {3} not in cache")
+
+ return struct{}{}
+}
diff --git a/runtime/internal/lib/xwebsocket/xwebsocket.vdl.go b/runtime/internal/lib/xwebsocket/xwebsocket.vdl.go
index 4c0722f..f64630d 100644
--- a/runtime/internal/lib/xwebsocket/xwebsocket.vdl.go
+++ b/runtime/internal/lib/xwebsocket/xwebsocket.vdl.go
@@ -13,19 +13,15 @@
"v.io/v23/verror"
)
-func __VDLEnsureNativeBuilt() {
-}
+var _ = __VDLInit() // Must be first; see __VDLInit comments for details.
+//////////////////////////////////////////////////
+// Error definitions
var (
ErrListenerClosed = verror.Register("v.io/x/ref/runtime/internal/lib/xwebsocket.ListenerClosed", verror.NoRetry, "{1:}{2:} listener is already closed.")
ErrListenCalledInNaCl = verror.Register("v.io/x/ref/runtime/internal/lib/xwebsocket.ListenCalledInNaCl", verror.NoRetry, "{1:}{2:} Listen cannot be called in NaCl code.")
)
-func init() {
- i18n.Cat().SetWithBase(i18n.LangID("en"), i18n.MsgID(ErrListenerClosed.ID), "{1:}{2:} listener is already closed.")
- i18n.Cat().SetWithBase(i18n.LangID("en"), i18n.MsgID(ErrListenCalledInNaCl.ID), "{1:}{2:} Listen cannot be called in NaCl code.")
-}
-
// NewErrListenerClosed returns an error with the ErrListenerClosed ID.
func NewErrListenerClosed(ctx *context.T) error {
return verror.New(ErrListenerClosed, ctx)
@@ -35,3 +31,30 @@
func NewErrListenCalledInNaCl(ctx *context.T) error {
return verror.New(ErrListenCalledInNaCl, ctx)
}
+
+var __VDLInitCalled bool
+
+// __VDLInit performs vdl initialization. It is safe to call multiple times.
+// If you have an init ordering issue, just insert the following line verbatim
+// into your source files in this package, right after the "package foo" clause:
+//
+// var _ = __VDLInit()
+//
+// The purpose of this function is to ensure that vdl initialization occurs in
+// the right order, and very early in the init sequence. In particular, vdl
+// registration and package variable initialization needs to occur before
+// functions like vdl.TypeOf will work properly.
+//
+// This function returns a dummy value, so that it can be used to initialize the
+// first var in the file, to take advantage of Go's defined init order.
+func __VDLInit() struct{} {
+ if __VDLInitCalled {
+ return struct{}{}
+ }
+
+ // Set error format strings.
+ i18n.Cat().SetWithBase(i18n.LangID("en"), i18n.MsgID(ErrListenerClosed.ID), "{1:}{2:} listener is already closed.")
+ i18n.Cat().SetWithBase(i18n.LangID("en"), i18n.MsgID(ErrListenCalledInNaCl.ID), "{1:}{2:} Listen cannot be called in NaCl code.")
+
+ return struct{}{}
+}
diff --git a/runtime/internal/rpc/benchmark/benchmark.vdl.go b/runtime/internal/rpc/benchmark/benchmark.vdl.go
index 0b45621..0bb633f 100644
--- a/runtime/internal/rpc/benchmark/benchmark.vdl.go
+++ b/runtime/internal/rpc/benchmark/benchmark.vdl.go
@@ -18,8 +18,10 @@
"v.io/v23/vdl"
)
-func __VDLEnsureNativeBuilt() {
-}
+var _ = __VDLInit() // Must be first; see __VDLInit comments for details.
+
+//////////////////////////////////////////////////
+// Interface definitions
// BenchmarkClientMethods is the client interface
// containing Benchmark methods.
@@ -336,3 +338,26 @@
func (s implBenchmarkEchoStreamServerCallSend) Send(item []byte) error {
return s.s.Send(item)
}
+
+var __VDLInitCalled bool
+
+// __VDLInit performs vdl initialization. It is safe to call multiple times.
+// If you have an init ordering issue, just insert the following line verbatim
+// into your source files in this package, right after the "package foo" clause:
+//
+// var _ = __VDLInit()
+//
+// The purpose of this function is to ensure that vdl initialization occurs in
+// the right order, and very early in the init sequence. In particular, vdl
+// registration and package variable initialization needs to occur before
+// functions like vdl.TypeOf will work properly.
+//
+// This function returns a dummy value, so that it can be used to initialize the
+// first var in the file, to take advantage of Go's defined init order.
+func __VDLInit() struct{} {
+ if __VDLInitCalled {
+ return struct{}{}
+ }
+
+ return struct{}{}
+}
diff --git a/runtime/internal/rpc/rpc.vdl.go b/runtime/internal/rpc/rpc.vdl.go
index 7f75ba1..afb60b9 100644
--- a/runtime/internal/rpc/rpc.vdl.go
+++ b/runtime/internal/rpc/rpc.vdl.go
@@ -13,10 +13,12 @@
"v.io/v23/verror"
)
-func __VDLEnsureNativeBuilt() {
-}
+var _ = __VDLInit() // Must be first; see __VDLInit comments for details.
+//////////////////////////////////////////////////
+// Error definitions
var (
+
// Internal errors.
errBadRequest = verror.Register("v.io/x/ref/runtime/internal/rpc.badRequest", verror.NoRetry, "{1:}{2:} failed to decode request: {3}")
errBadNumInputArgs = verror.Register("v.io/x/ref/runtime/internal/rpc.badNumInputArgs", verror.NoRetry, "{1:}{2:} wrong number of input arguments for {3}.{4} (called with {5} args, want {6})")
@@ -31,20 +33,6 @@
errServerPeersWithPublishing = verror.Register("v.io/x/ref/runtime/internal/rpc.serverPeersWithPublishing", verror.NoRetry, "{1:}{2:} ServerPeers option is not supported for servers that publish their endpoint at a mounttable")
)
-func init() {
- i18n.Cat().SetWithBase(i18n.LangID("en"), i18n.MsgID(errBadRequest.ID), "{1:}{2:} failed to decode request: {3}")
- i18n.Cat().SetWithBase(i18n.LangID("en"), i18n.MsgID(errBadNumInputArgs.ID), "{1:}{2:} wrong number of input arguments for {3}.{4} (called with {5} args, want {6})")
- i18n.Cat().SetWithBase(i18n.LangID("en"), i18n.MsgID(errBadInputArg.ID), "{1:}{2:} failed to decode request {3}.{4} arg #{5}: {6}")
- i18n.Cat().SetWithBase(i18n.LangID("en"), i18n.MsgID(errBadBlessings.ID), "{1:}{2:} failed to decode blessings: {3}")
- i18n.Cat().SetWithBase(i18n.LangID("en"), i18n.MsgID(errBadBlessingsCache.ID), "{1:}{2:} failed to find blessings in cache: {3}")
- i18n.Cat().SetWithBase(i18n.LangID("en"), i18n.MsgID(errBadDischarge.ID), "{1:}{2:} failed to decode discharge #{3}: {4}")
- i18n.Cat().SetWithBase(i18n.LangID("en"), i18n.MsgID(errBadAuth.ID), "{1:}{2:} not authorized to call {3}.{4}: {5}")
- i18n.Cat().SetWithBase(i18n.LangID("en"), i18n.MsgID(errTypeFlowFailure.ID), "{1:}{2:} type flow could not be constructed{:3}")
- i18n.Cat().SetWithBase(i18n.LangID("en"), i18n.MsgID(errServerBlessingsWrongPublicKey.ID), "{1:}{2:} server blessings do not match the principals public key")
- i18n.Cat().SetWithBase(i18n.LangID("en"), i18n.MsgID(errServerPeersEmpty.ID), "{1:}{2:} no peers are authorized to communicate with the server")
- i18n.Cat().SetWithBase(i18n.LangID("en"), i18n.MsgID(errServerPeersWithPublishing.ID), "{1:}{2:} ServerPeers option is not supported for servers that publish their endpoint at a mounttable")
-}
-
// newErrBadRequest returns an error with the errBadRequest ID.
func newErrBadRequest(ctx *context.T, err error) error {
return verror.New(errBadRequest, ctx, err)
@@ -99,3 +87,39 @@
func newErrServerPeersWithPublishing(ctx *context.T) error {
return verror.New(errServerPeersWithPublishing, ctx)
}
+
+var __VDLInitCalled bool
+
+// __VDLInit performs vdl initialization. It is safe to call multiple times.
+// If you have an init ordering issue, just insert the following line verbatim
+// into your source files in this package, right after the "package foo" clause:
+//
+// var _ = __VDLInit()
+//
+// The purpose of this function is to ensure that vdl initialization occurs in
+// the right order, and very early in the init sequence. In particular, vdl
+// registration and package variable initialization needs to occur before
+// functions like vdl.TypeOf will work properly.
+//
+// This function returns a dummy value, so that it can be used to initialize the
+// first var in the file, to take advantage of Go's defined init order.
+func __VDLInit() struct{} {
+ if __VDLInitCalled {
+ return struct{}{}
+ }
+
+ // Set error format strings.
+ i18n.Cat().SetWithBase(i18n.LangID("en"), i18n.MsgID(errBadRequest.ID), "{1:}{2:} failed to decode request: {3}")
+ i18n.Cat().SetWithBase(i18n.LangID("en"), i18n.MsgID(errBadNumInputArgs.ID), "{1:}{2:} wrong number of input arguments for {3}.{4} (called with {5} args, want {6})")
+ i18n.Cat().SetWithBase(i18n.LangID("en"), i18n.MsgID(errBadInputArg.ID), "{1:}{2:} failed to decode request {3}.{4} arg #{5}: {6}")
+ i18n.Cat().SetWithBase(i18n.LangID("en"), i18n.MsgID(errBadBlessings.ID), "{1:}{2:} failed to decode blessings: {3}")
+ i18n.Cat().SetWithBase(i18n.LangID("en"), i18n.MsgID(errBadBlessingsCache.ID), "{1:}{2:} failed to find blessings in cache: {3}")
+ i18n.Cat().SetWithBase(i18n.LangID("en"), i18n.MsgID(errBadDischarge.ID), "{1:}{2:} failed to decode discharge #{3}: {4}")
+ i18n.Cat().SetWithBase(i18n.LangID("en"), i18n.MsgID(errBadAuth.ID), "{1:}{2:} not authorized to call {3}.{4}: {5}")
+ i18n.Cat().SetWithBase(i18n.LangID("en"), i18n.MsgID(errTypeFlowFailure.ID), "{1:}{2:} type flow could not be constructed{:3}")
+ i18n.Cat().SetWithBase(i18n.LangID("en"), i18n.MsgID(errServerBlessingsWrongPublicKey.ID), "{1:}{2:} server blessings do not match the principals public key")
+ i18n.Cat().SetWithBase(i18n.LangID("en"), i18n.MsgID(errServerPeersEmpty.ID), "{1:}{2:} no peers are authorized to communicate with the server")
+ i18n.Cat().SetWithBase(i18n.LangID("en"), i18n.MsgID(errServerPeersWithPublishing.ID), "{1:}{2:} ServerPeers option is not supported for servers that publish their endpoint at a mounttable")
+
+ return struct{}{}
+}
diff --git a/runtime/internal/rpc/stress/stress.vdl.go b/runtime/internal/rpc/stress/stress.vdl.go
index e53b3b3..d2bd7f4 100644
--- a/runtime/internal/rpc/stress/stress.vdl.go
+++ b/runtime/internal/rpc/stress/stress.vdl.go
@@ -17,6 +17,11 @@
"v.io/v23/vdl"
)
+var _ = __VDLInit() // Must be first; see __VDLInit comments for details.
+
+//////////////////////////////////////////////////
+// Type definitions
+
type SumArg struct {
ABool bool
AInt64 int64
@@ -29,9 +34,6 @@
}
func (m *SumArg) FillVDLTarget(t vdl.Target, tt *vdl.Type) error {
- if __VDLType_v_io_x_ref_runtime_internal_rpc_stress_SumArg == nil || __VDLType0 == nil {
- panic("Initialization order error: types generated for FillVDLTarget not initialized. Consider moving caller to an init() block.")
- }
fieldsTarget1, err := t.StartFields(tt)
if err != nil {
return err
@@ -42,7 +44,7 @@
return err
}
if err != vdl.ErrFieldNoExist {
- if err := fieldTarget3.FromBool(bool(m.ABool), vdl.BoolType); err != nil {
+ if err := fieldTarget3.FromBool(bool(m.ABool), tt.NonOptional().Field(0).Type); err != nil {
return err
}
if err := fieldsTarget1.FinishField(keyTarget2, fieldTarget3); err != nil {
@@ -54,7 +56,7 @@
return err
}
if err != vdl.ErrFieldNoExist {
- if err := fieldTarget5.FromInt(int64(m.AInt64), vdl.Int64Type); err != nil {
+ if err := fieldTarget5.FromInt(int64(m.AInt64), tt.NonOptional().Field(1).Type); err != nil {
return err
}
if err := fieldsTarget1.FinishField(keyTarget4, fieldTarget5); err != nil {
@@ -67,7 +69,7 @@
}
if err != vdl.ErrFieldNoExist {
- if err := fieldTarget7.FromBytes([]byte(m.AListOfBytes), __VDLType1); err != nil {
+ if err := fieldTarget7.FromBytes([]byte(m.AListOfBytes), tt.NonOptional().Field(2).Type); err != nil {
return err
}
if err := fieldsTarget1.FinishField(keyTarget6, fieldTarget7); err != nil {
@@ -95,8 +97,8 @@
func (t *SumArgTarget) StartFields(tt *vdl.Type) (vdl.FieldsTarget, error) {
- if !vdl.Compatible(tt, __VDLType_v_io_x_ref_runtime_internal_rpc_stress_SumArg) {
- return nil, fmt.Errorf("type %v incompatible with %v", tt, __VDLType_v_io_x_ref_runtime_internal_rpc_stress_SumArg)
+ if ttWant := vdl.TypeOf((*SumArg)(nil)).Elem(); !vdl.Compatible(tt, ttWant) {
+ return nil, fmt.Errorf("type %v incompatible with %v", tt, ttWant)
}
return t, nil
}
@@ -115,7 +117,7 @@
target, err := &t.aListOfBytesTarget, error(nil)
return nil, target, err
default:
- return nil, nil, fmt.Errorf("field %s not in struct %v", name, __VDLType_v_io_x_ref_runtime_internal_rpc_stress_SumArg)
+ return nil, nil, fmt.Errorf("field %s not in struct v.io/x/ref/runtime/internal/rpc/stress.SumArg", name)
}
}
func (t *SumArgTarget) FinishField(_, _ vdl.Target) error {
@@ -139,9 +141,6 @@
}
func (m *SumStats) FillVDLTarget(t vdl.Target, tt *vdl.Type) error {
- if __VDLType_v_io_x_ref_runtime_internal_rpc_stress_SumStats == nil || __VDLType2 == nil {
- panic("Initialization order error: types generated for FillVDLTarget not initialized. Consider moving caller to an init() block.")
- }
fieldsTarget1, err := t.StartFields(tt)
if err != nil {
return err
@@ -152,7 +151,7 @@
return err
}
if err != vdl.ErrFieldNoExist {
- if err := fieldTarget3.FromUint(uint64(m.SumCount), vdl.Uint64Type); err != nil {
+ if err := fieldTarget3.FromUint(uint64(m.SumCount), tt.NonOptional().Field(0).Type); err != nil {
return err
}
if err := fieldsTarget1.FinishField(keyTarget2, fieldTarget3); err != nil {
@@ -164,7 +163,7 @@
return err
}
if err != vdl.ErrFieldNoExist {
- if err := fieldTarget5.FromUint(uint64(m.SumStreamCount), vdl.Uint64Type); err != nil {
+ if err := fieldTarget5.FromUint(uint64(m.SumStreamCount), tt.NonOptional().Field(1).Type); err != nil {
return err
}
if err := fieldsTarget1.FinishField(keyTarget4, fieldTarget5); err != nil {
@@ -176,7 +175,7 @@
return err
}
if err != vdl.ErrFieldNoExist {
- if err := fieldTarget7.FromUint(uint64(m.BytesRecv), vdl.Uint64Type); err != nil {
+ if err := fieldTarget7.FromUint(uint64(m.BytesRecv), tt.NonOptional().Field(2).Type); err != nil {
return err
}
if err := fieldsTarget1.FinishField(keyTarget6, fieldTarget7); err != nil {
@@ -188,7 +187,7 @@
return err
}
if err != vdl.ErrFieldNoExist {
- if err := fieldTarget9.FromUint(uint64(m.BytesSent), vdl.Uint64Type); err != nil {
+ if err := fieldTarget9.FromUint(uint64(m.BytesSent), tt.NonOptional().Field(3).Type); err != nil {
return err
}
if err := fieldsTarget1.FinishField(keyTarget8, fieldTarget9); err != nil {
@@ -217,8 +216,8 @@
func (t *SumStatsTarget) StartFields(tt *vdl.Type) (vdl.FieldsTarget, error) {
- if !vdl.Compatible(tt, __VDLType_v_io_x_ref_runtime_internal_rpc_stress_SumStats) {
- return nil, fmt.Errorf("type %v incompatible with %v", tt, __VDLType_v_io_x_ref_runtime_internal_rpc_stress_SumStats)
+ if ttWant := vdl.TypeOf((*SumStats)(nil)).Elem(); !vdl.Compatible(tt, ttWant) {
+ return nil, fmt.Errorf("type %v incompatible with %v", tt, ttWant)
}
return t, nil
}
@@ -241,7 +240,7 @@
target, err := &t.bytesSentTarget, error(nil)
return nil, target, err
default:
- return nil, nil, fmt.Errorf("field %s not in struct %v", name, __VDLType_v_io_x_ref_runtime_internal_rpc_stress_SumStats)
+ return nil, nil, fmt.Errorf("field %s not in struct v.io/x/ref/runtime/internal/rpc/stress.SumStats", name)
}
}
func (t *SumStatsTarget) FinishField(_, _ vdl.Target) error {
@@ -252,19 +251,8 @@
return nil
}
-func init() {
- vdl.Register((*SumArg)(nil))
- vdl.Register((*SumStats)(nil))
-}
-
-var __VDLType0 *vdl.Type = vdl.TypeOf((*SumArg)(nil))
-var __VDLType2 *vdl.Type = vdl.TypeOf((*SumStats)(nil))
-var __VDLType1 *vdl.Type = vdl.TypeOf([]byte(nil))
-var __VDLType_v_io_x_ref_runtime_internal_rpc_stress_SumArg *vdl.Type = vdl.TypeOf(SumArg{})
-var __VDLType_v_io_x_ref_runtime_internal_rpc_stress_SumStats *vdl.Type = vdl.TypeOf(SumStats{})
-
-func __VDLEnsureNativeBuilt() {
-}
+//////////////////////////////////////////////////
+// Interface definitions
// StressClientMethods is the client interface
// containing Stress methods.
@@ -651,3 +639,30 @@
func (s implStressSumStreamServerCallSend) Send(item []byte) error {
return s.s.Send(item)
}
+
+var __VDLInitCalled bool
+
+// __VDLInit performs vdl initialization. It is safe to call multiple times.
+// If you have an init ordering issue, just insert the following line verbatim
+// into your source files in this package, right after the "package foo" clause:
+//
+// var _ = __VDLInit()
+//
+// The purpose of this function is to ensure that vdl initialization occurs in
+// the right order, and very early in the init sequence. In particular, vdl
+// registration and package variable initialization needs to occur before
+// functions like vdl.TypeOf will work properly.
+//
+// This function returns a dummy value, so that it can be used to initialize the
+// first var in the file, to take advantage of Go's defined init order.
+func __VDLInit() struct{} {
+ if __VDLInitCalled {
+ return struct{}{}
+ }
+
+ // Register types.
+ vdl.Register((*SumArg)(nil))
+ vdl.Register((*SumStats)(nil))
+
+ return struct{}{}
+}
diff --git a/runtime/protocols/bidi/bidi.vdl.go b/runtime/protocols/bidi/bidi.vdl.go
index 6247857..c2cfb79 100644
--- a/runtime/protocols/bidi/bidi.vdl.go
+++ b/runtime/protocols/bidi/bidi.vdl.go
@@ -13,19 +13,15 @@
"v.io/v23/verror"
)
-func __VDLEnsureNativeBuilt() {
-}
+var _ = __VDLInit() // Must be first; see __VDLInit comments for details.
+//////////////////////////////////////////////////
+// Error definitions
var (
ErrCannotListenOnBidi = verror.Register("v.io/x/ref/runtime/protocols/bidi.CannotListenOnBidi", verror.NoRetry, "{1:}{2:} cannot listen on bidi protocol")
ErrBidiRoutingIdNotCached = verror.Register("v.io/x/ref/runtime/protocols/bidi.BidiRoutingIdNotCached", verror.NoRetry, "{1:}{2:} bidi routing id not in cache")
)
-func init() {
- i18n.Cat().SetWithBase(i18n.LangID("en"), i18n.MsgID(ErrCannotListenOnBidi.ID), "{1:}{2:} cannot listen on bidi protocol")
- i18n.Cat().SetWithBase(i18n.LangID("en"), i18n.MsgID(ErrBidiRoutingIdNotCached.ID), "{1:}{2:} bidi routing id not in cache")
-}
-
// NewErrCannotListenOnBidi returns an error with the ErrCannotListenOnBidi ID.
func NewErrCannotListenOnBidi(ctx *context.T) error {
return verror.New(ErrCannotListenOnBidi, ctx)
@@ -35,3 +31,30 @@
func NewErrBidiRoutingIdNotCached(ctx *context.T) error {
return verror.New(ErrBidiRoutingIdNotCached, ctx)
}
+
+var __VDLInitCalled bool
+
+// __VDLInit performs vdl initialization. It is safe to call multiple times.
+// If you have an init ordering issue, just insert the following line verbatim
+// into your source files in this package, right after the "package foo" clause:
+//
+// var _ = __VDLInit()
+//
+// The purpose of this function is to ensure that vdl initialization occurs in
+// the right order, and very early in the init sequence. In particular, vdl
+// registration and package variable initialization needs to occur before
+// functions like vdl.TypeOf will work properly.
+//
+// This function returns a dummy value, so that it can be used to initialize the
+// first var in the file, to take advantage of Go's defined init order.
+func __VDLInit() struct{} {
+ if __VDLInitCalled {
+ return struct{}{}
+ }
+
+ // Set error format strings.
+ i18n.Cat().SetWithBase(i18n.LangID("en"), i18n.MsgID(ErrCannotListenOnBidi.ID), "{1:}{2:} cannot listen on bidi protocol")
+ i18n.Cat().SetWithBase(i18n.LangID("en"), i18n.MsgID(ErrBidiRoutingIdNotCached.ID), "{1:}{2:} bidi routing id not in cache")
+
+ return struct{}{}
+}
diff --git a/runtime/protocols/lib/framer/framer.vdl.go b/runtime/protocols/lib/framer/framer.vdl.go
index a81e797..af6588a 100644
--- a/runtime/protocols/lib/framer/framer.vdl.go
+++ b/runtime/protocols/lib/framer/framer.vdl.go
@@ -13,18 +13,41 @@
"v.io/v23/verror"
)
-func __VDLEnsureNativeBuilt() {
-}
+var _ = __VDLInit() // Must be first; see __VDLInit comments for details.
+//////////////////////////////////////////////////
+// Error definitions
var (
ErrLargerThan3ByteUInt = verror.Register("v.io/x/ref/runtime/protocols/lib/framer.LargerThan3ByteUInt", verror.NoRetry, "{1:}{2:} integer too large to represent in 3 bytes")
)
-func init() {
- i18n.Cat().SetWithBase(i18n.LangID("en"), i18n.MsgID(ErrLargerThan3ByteUInt.ID), "{1:}{2:} integer too large to represent in 3 bytes")
-}
-
// NewErrLargerThan3ByteUInt returns an error with the ErrLargerThan3ByteUInt ID.
func NewErrLargerThan3ByteUInt(ctx *context.T) error {
return verror.New(ErrLargerThan3ByteUInt, ctx)
}
+
+var __VDLInitCalled bool
+
+// __VDLInit performs vdl initialization. It is safe to call multiple times.
+// If you have an init ordering issue, just insert the following line verbatim
+// into your source files in this package, right after the "package foo" clause:
+//
+// var _ = __VDLInit()
+//
+// The purpose of this function is to ensure that vdl initialization occurs in
+// the right order, and very early in the init sequence. In particular, vdl
+// registration and package variable initialization needs to occur before
+// functions like vdl.TypeOf will work properly.
+//
+// This function returns a dummy value, so that it can be used to initialize the
+// first var in the file, to take advantage of Go's defined init order.
+func __VDLInit() struct{} {
+ if __VDLInitCalled {
+ return struct{}{}
+ }
+
+ // Set error format strings.
+ i18n.Cat().SetWithBase(i18n.LangID("en"), i18n.MsgID(ErrLargerThan3ByteUInt.ID), "{1:}{2:} integer too large to represent in 3 bytes")
+
+ return struct{}{}
+}
diff --git a/runtime/protocols/vine/vine.vdl.go b/runtime/protocols/vine/vine.vdl.go
index e79df75..cbee9db 100644
--- a/runtime/protocols/vine/vine.vdl.go
+++ b/runtime/protocols/vine/vine.vdl.go
@@ -17,6 +17,11 @@
"v.io/v23/verror"
)
+var _ = __VDLInit() // Must be first; see __VDLInit comments for details.
+
+//////////////////////////////////////////////////
+// Type definitions
+
// ConnBehavior specifies characteristics of a connection.
type ConnBehavior struct {
// Reachable specifies whether the outgoing or incoming connection can be
@@ -31,9 +36,6 @@
}
func (m *ConnBehavior) FillVDLTarget(t vdl.Target, tt *vdl.Type) error {
- if __VDLType_v_io_x_ref_runtime_protocols_vine_ConnBehavior == nil || __VDLType0 == nil {
- panic("Initialization order error: types generated for FillVDLTarget not initialized. Consider moving caller to an init() block.")
- }
fieldsTarget1, err := t.StartFields(tt)
if err != nil {
return err
@@ -44,7 +46,7 @@
return err
}
if err != vdl.ErrFieldNoExist {
- if err := fieldTarget3.FromBool(bool(m.Reachable), vdl.BoolType); err != nil {
+ if err := fieldTarget3.FromBool(bool(m.Reachable), tt.NonOptional().Field(0).Type); err != nil {
return err
}
if err := fieldsTarget1.FinishField(keyTarget2, fieldTarget3); err != nil {
@@ -70,8 +72,8 @@
func (t *ConnBehaviorTarget) StartFields(tt *vdl.Type) (vdl.FieldsTarget, error) {
- if !vdl.Compatible(tt, __VDLType_v_io_x_ref_runtime_protocols_vine_ConnBehavior) {
- return nil, fmt.Errorf("type %v incompatible with %v", tt, __VDLType_v_io_x_ref_runtime_protocols_vine_ConnBehavior)
+ if ttWant := vdl.TypeOf((*ConnBehavior)(nil)).Elem(); !vdl.Compatible(tt, ttWant) {
+ return nil, fmt.Errorf("type %v incompatible with %v", tt, ttWant)
}
return t, nil
}
@@ -82,7 +84,7 @@
target, err := &t.reachableTarget, error(nil)
return nil, target, err
default:
- return nil, nil, fmt.Errorf("field %s not in struct %v", name, __VDLType_v_io_x_ref_runtime_protocols_vine_ConnBehavior)
+ return nil, nil, fmt.Errorf("field %s not in struct v.io/x/ref/runtime/protocols/vine.ConnBehavior", name)
}
}
func (t *ConnBehaviorTarget) FinishField(_, _ vdl.Target) error {
@@ -93,28 +95,14 @@
return nil
}
-func init() {
- vdl.Register((*ConnBehavior)(nil))
-}
-
-var __VDLType0 *vdl.Type = vdl.TypeOf((*ConnBehavior)(nil))
-var __VDLType_v_io_x_ref_runtime_protocols_vine_ConnBehavior *vdl.Type = vdl.TypeOf(ConnBehavior{})
-
-func __VDLEnsureNativeBuilt() {
-}
-
+//////////////////////////////////////////////////
+// Error definitions
var (
ErrInvalidAddress = verror.Register("v.io/x/ref/runtime/protocols/vine.InvalidAddress", verror.NoRetry, "{1:}{2:} invalid vine address {3}, address must be of the form 'network/address/tag'")
ErrAddressNotReachable = verror.Register("v.io/x/ref/runtime/protocols/vine.AddressNotReachable", verror.NoRetry, "{1:}{2:} address {3} not reachable")
ErrNoRegisteredProtocol = verror.Register("v.io/x/ref/runtime/protocols/vine.NoRegisteredProtocol", verror.NoRetry, "{1:}{2:} no registered protocol {3}")
)
-func init() {
- i18n.Cat().SetWithBase(i18n.LangID("en"), i18n.MsgID(ErrInvalidAddress.ID), "{1:}{2:} invalid vine address {3}, address must be of the form 'network/address/tag'")
- i18n.Cat().SetWithBase(i18n.LangID("en"), i18n.MsgID(ErrAddressNotReachable.ID), "{1:}{2:} address {3} not reachable")
- i18n.Cat().SetWithBase(i18n.LangID("en"), i18n.MsgID(ErrNoRegisteredProtocol.ID), "{1:}{2:} no registered protocol {3}")
-}
-
// NewErrInvalidAddress returns an error with the ErrInvalidAddress ID.
func NewErrInvalidAddress(ctx *context.T, address string) error {
return verror.New(ErrInvalidAddress, ctx, address)
@@ -130,6 +118,9 @@
return verror.New(ErrNoRegisteredProtocol, ctx, protocol)
}
+//////////////////////////////////////////////////
+// Interface definitions
+
// VineClientMethods is the client interface
// containing Vine methods.
//
@@ -247,3 +238,34 @@
},
},
}
+
+var __VDLInitCalled bool
+
+// __VDLInit performs vdl initialization. It is safe to call multiple times.
+// If you have an init ordering issue, just insert the following line verbatim
+// into your source files in this package, right after the "package foo" clause:
+//
+// var _ = __VDLInit()
+//
+// The purpose of this function is to ensure that vdl initialization occurs in
+// the right order, and very early in the init sequence. In particular, vdl
+// registration and package variable initialization needs to occur before
+// functions like vdl.TypeOf will work properly.
+//
+// This function returns a dummy value, so that it can be used to initialize the
+// first var in the file, to take advantage of Go's defined init order.
+func __VDLInit() struct{} {
+ if __VDLInitCalled {
+ return struct{}{}
+ }
+
+ // Register types.
+ vdl.Register((*ConnBehavior)(nil))
+
+ // Set error format strings.
+ i18n.Cat().SetWithBase(i18n.LangID("en"), i18n.MsgID(ErrInvalidAddress.ID), "{1:}{2:} invalid vine address {3}, address must be of the form 'network/address/tag'")
+ i18n.Cat().SetWithBase(i18n.LangID("en"), i18n.MsgID(ErrAddressNotReachable.ID), "{1:}{2:} address {3} not reachable")
+ i18n.Cat().SetWithBase(i18n.LangID("en"), i18n.MsgID(ErrNoRegisteredProtocol.ID), "{1:}{2:} no registered protocol {3}")
+
+ return struct{}{}
+}
diff --git a/services/agent/agent.vdl.go b/services/agent/agent.vdl.go
index b0ea739..5d35297 100644
--- a/services/agent/agent.vdl.go
+++ b/services/agent/agent.vdl.go
@@ -46,6 +46,11 @@
"v.io/v23/verror"
)
+var _ = __VDLInit() // Must be first; see __VDLInit comments for details.
+
+//////////////////////////////////////////////////
+// Type definitions
+
type ConnInfo struct {
MinVersion int32
MaxVersion int32
@@ -57,9 +62,6 @@
}
func (m *ConnInfo) FillVDLTarget(t vdl.Target, tt *vdl.Type) error {
- if __VDLType_v_io_x_ref_services_agent_ConnInfo == nil || __VDLType0 == nil {
- panic("Initialization order error: types generated for FillVDLTarget not initialized. Consider moving caller to an init() block.")
- }
fieldsTarget1, err := t.StartFields(tt)
if err != nil {
return err
@@ -70,7 +72,7 @@
return err
}
if err != vdl.ErrFieldNoExist {
- if err := fieldTarget3.FromInt(int64(m.MinVersion), vdl.Int32Type); err != nil {
+ if err := fieldTarget3.FromInt(int64(m.MinVersion), tt.NonOptional().Field(0).Type); err != nil {
return err
}
if err := fieldsTarget1.FinishField(keyTarget2, fieldTarget3); err != nil {
@@ -82,7 +84,7 @@
return err
}
if err != vdl.ErrFieldNoExist {
- if err := fieldTarget5.FromInt(int64(m.MaxVersion), vdl.Int32Type); err != nil {
+ if err := fieldTarget5.FromInt(int64(m.MaxVersion), tt.NonOptional().Field(1).Type); err != nil {
return err
}
if err := fieldsTarget1.FinishField(keyTarget4, fieldTarget5); err != nil {
@@ -109,8 +111,8 @@
func (t *ConnInfoTarget) StartFields(tt *vdl.Type) (vdl.FieldsTarget, error) {
- if !vdl.Compatible(tt, __VDLType_v_io_x_ref_services_agent_ConnInfo) {
- return nil, fmt.Errorf("type %v incompatible with %v", tt, __VDLType_v_io_x_ref_services_agent_ConnInfo)
+ if ttWant := vdl.TypeOf((*ConnInfo)(nil)).Elem(); !vdl.Compatible(tt, ttWant) {
+ return nil, fmt.Errorf("type %v incompatible with %v", tt, ttWant)
}
return t, nil
}
@@ -125,7 +127,7 @@
target, err := &t.maxVersionTarget, error(nil)
return nil, target, err
default:
- return nil, nil, fmt.Errorf("field %s not in struct %v", name, __VDLType_v_io_x_ref_services_agent_ConnInfo)
+ return nil, nil, fmt.Errorf("field %s not in struct v.io/x/ref/services/agent.ConnInfo", name)
}
}
func (t *ConnInfoTarget) FinishField(_, _ vdl.Target) error {
@@ -148,9 +150,6 @@
}
func (m *RpcRequest) FillVDLTarget(t vdl.Target, tt *vdl.Type) error {
- if __VDLType_v_io_x_ref_services_agent_RpcRequest == nil || __VDLType1 == nil {
- panic("Initialization order error: types generated for FillVDLTarget not initialized. Consider moving caller to an init() block.")
- }
fieldsTarget1, err := t.StartFields(tt)
if err != nil {
return err
@@ -161,7 +160,7 @@
return err
}
if err != vdl.ErrFieldNoExist {
- if err := fieldTarget3.FromUint(uint64(m.Id), vdl.Uint64Type); err != nil {
+ if err := fieldTarget3.FromUint(uint64(m.Id), tt.NonOptional().Field(0).Type); err != nil {
return err
}
if err := fieldsTarget1.FinishField(keyTarget2, fieldTarget3); err != nil {
@@ -173,7 +172,7 @@
return err
}
if err != vdl.ErrFieldNoExist {
- if err := fieldTarget5.FromString(string(m.Method), vdl.StringType); err != nil {
+ if err := fieldTarget5.FromString(string(m.Method), tt.NonOptional().Field(1).Type); err != nil {
return err
}
if err := fieldsTarget1.FinishField(keyTarget4, fieldTarget5); err != nil {
@@ -185,7 +184,7 @@
return err
}
if err != vdl.ErrFieldNoExist {
- if err := fieldTarget7.FromUint(uint64(m.NumArgs), vdl.Uint32Type); err != nil {
+ if err := fieldTarget7.FromUint(uint64(m.NumArgs), tt.NonOptional().Field(2).Type); err != nil {
return err
}
if err := fieldsTarget1.FinishField(keyTarget6, fieldTarget7); err != nil {
@@ -213,8 +212,8 @@
func (t *RpcRequestTarget) StartFields(tt *vdl.Type) (vdl.FieldsTarget, error) {
- if !vdl.Compatible(tt, __VDLType_v_io_x_ref_services_agent_RpcRequest) {
- return nil, fmt.Errorf("type %v incompatible with %v", tt, __VDLType_v_io_x_ref_services_agent_RpcRequest)
+ if ttWant := vdl.TypeOf((*RpcRequest)(nil)).Elem(); !vdl.Compatible(tt, ttWant) {
+ return nil, fmt.Errorf("type %v incompatible with %v", tt, ttWant)
}
return t, nil
}
@@ -233,7 +232,7 @@
target, err := &t.numArgsTarget, error(nil)
return nil, target, err
default:
- return nil, nil, fmt.Errorf("field %s not in struct %v", name, __VDLType_v_io_x_ref_services_agent_RpcRequest)
+ return nil, nil, fmt.Errorf("field %s not in struct v.io/x/ref/services/agent.RpcRequest", name)
}
}
func (t *RpcRequestTarget) FinishField(_, _ vdl.Target) error {
@@ -256,9 +255,6 @@
}
func (m *RpcResponse) FillVDLTarget(t vdl.Target, tt *vdl.Type) error {
- if __VDLType_v_io_x_ref_services_agent_RpcResponse == nil || __VDLType2 == nil {
- panic("Initialization order error: types generated for FillVDLTarget not initialized. Consider moving caller to an init() block.")
- }
fieldsTarget1, err := t.StartFields(tt)
if err != nil {
return err
@@ -269,7 +265,7 @@
return err
}
if err != vdl.ErrFieldNoExist {
- if err := fieldTarget3.FromUint(uint64(m.Id), vdl.Uint64Type); err != nil {
+ if err := fieldTarget3.FromUint(uint64(m.Id), tt.NonOptional().Field(0).Type); err != nil {
return err
}
if err := fieldsTarget1.FinishField(keyTarget2, fieldTarget3); err != nil {
@@ -283,7 +279,7 @@
if err != vdl.ErrFieldNoExist {
if m.Err == nil {
- if err := fieldTarget5.FromNil(vdl.ErrorType); err != nil {
+ if err := fieldTarget5.FromNil(tt.NonOptional().Field(1).Type); err != nil {
return err
}
} else {
@@ -305,7 +301,7 @@
return err
}
if err != vdl.ErrFieldNoExist {
- if err := fieldTarget8.FromUint(uint64(m.NumArgs), vdl.Uint32Type); err != nil {
+ if err := fieldTarget8.FromUint(uint64(m.NumArgs), tt.NonOptional().Field(2).Type); err != nil {
return err
}
if err := fieldsTarget1.FinishField(keyTarget7, fieldTarget8); err != nil {
@@ -333,8 +329,8 @@
func (t *RpcResponseTarget) StartFields(tt *vdl.Type) (vdl.FieldsTarget, error) {
- if !vdl.Compatible(tt, __VDLType_v_io_x_ref_services_agent_RpcResponse) {
- return nil, fmt.Errorf("type %v incompatible with %v", tt, __VDLType_v_io_x_ref_services_agent_RpcResponse)
+ if ttWant := vdl.TypeOf((*RpcResponse)(nil)).Elem(); !vdl.Compatible(tt, ttWant) {
+ return nil, fmt.Errorf("type %v incompatible with %v", tt, ttWant)
}
return t, nil
}
@@ -353,7 +349,7 @@
target, err := &t.numArgsTarget, error(nil)
return nil, target, err
default:
- return nil, nil, fmt.Errorf("field %s not in struct %v", name, __VDLType_v_io_x_ref_services_agent_RpcResponse)
+ return nil, nil, fmt.Errorf("field %s not in struct v.io/x/ref/services/agent.RpcResponse", name)
}
}
func (t *RpcResponseTarget) FinishField(_, _ vdl.Target) error {
@@ -398,7 +394,7 @@
func (x RpcMessageReq) __VDLReflect(__RpcMessageReflect) {}
func (m RpcMessageReq) FillVDLTarget(t vdl.Target, tt *vdl.Type) error {
- fieldsTarget1, err := t.StartFields(__VDLType_v_io_x_ref_services_agent_RpcMessage)
+ fieldsTarget1, err := t.StartFields(tt)
if err != nil {
return err
}
@@ -407,7 +403,7 @@
return err
}
- if err := m.Value.FillVDLTarget(fieldTarget3, __VDLType_v_io_x_ref_services_agent_RpcRequest); err != nil {
+ if err := m.Value.FillVDLTarget(fieldTarget3, tt.NonOptional().Field(0).Type); err != nil {
return err
}
if err := fieldsTarget1.FinishField(keyTarget2, fieldTarget3); err != nil {
@@ -430,7 +426,7 @@
func (x RpcMessageResp) __VDLReflect(__RpcMessageReflect) {}
func (m RpcMessageResp) FillVDLTarget(t vdl.Target, tt *vdl.Type) error {
- fieldsTarget1, err := t.StartFields(__VDLType_v_io_x_ref_services_agent_RpcMessage)
+ fieldsTarget1, err := t.StartFields(tt)
if err != nil {
return err
}
@@ -439,7 +435,7 @@
return err
}
- if err := m.Value.FillVDLTarget(fieldTarget3, __VDLType_v_io_x_ref_services_agent_RpcResponse); err != nil {
+ if err := m.Value.FillVDLTarget(fieldTarget3, tt.NonOptional().Field(1).Type); err != nil {
return err
}
if err := fieldsTarget1.FinishField(keyTarget2, fieldTarget3); err != nil {
@@ -456,23 +452,8 @@
return nil
}
-func init() {
- vdl.Register((*ConnInfo)(nil))
- vdl.Register((*RpcRequest)(nil))
- vdl.Register((*RpcResponse)(nil))
- vdl.Register((*RpcMessage)(nil))
-}
-
-var __VDLType0 *vdl.Type = vdl.TypeOf((*ConnInfo)(nil))
-var __VDLType1 *vdl.Type = vdl.TypeOf((*RpcRequest)(nil))
-var __VDLType2 *vdl.Type = vdl.TypeOf((*RpcResponse)(nil))
-var __VDLType_v_io_x_ref_services_agent_ConnInfo *vdl.Type = vdl.TypeOf(ConnInfo{})
-var __VDLType_v_io_x_ref_services_agent_RpcMessage *vdl.Type = vdl.TypeOf(RpcMessage(RpcMessageReq{RpcRequest{}}))
-var __VDLType_v_io_x_ref_services_agent_RpcRequest *vdl.Type = vdl.TypeOf(RpcRequest{})
-var __VDLType_v_io_x_ref_services_agent_RpcResponse *vdl.Type = vdl.TypeOf(RpcResponse{})
-
-func __VDLEnsureNativeBuilt() {
-}
+//////////////////////////////////////////////////
+// Interface definitions
// AgentClientMethods is the client interface
// containing Agent methods.
@@ -1054,3 +1035,32 @@
func (s implAgentNotifyWhenChangedServerCallSend) Send(item bool) error {
return s.s.Send(item)
}
+
+var __VDLInitCalled bool
+
+// __VDLInit performs vdl initialization. It is safe to call multiple times.
+// If you have an init ordering issue, just insert the following line verbatim
+// into your source files in this package, right after the "package foo" clause:
+//
+// var _ = __VDLInit()
+//
+// The purpose of this function is to ensure that vdl initialization occurs in
+// the right order, and very early in the init sequence. In particular, vdl
+// registration and package variable initialization needs to occur before
+// functions like vdl.TypeOf will work properly.
+//
+// This function returns a dummy value, so that it can be used to initialize the
+// first var in the file, to take advantage of Go's defined init order.
+func __VDLInit() struct{} {
+ if __VDLInitCalled {
+ return struct{}{}
+ }
+
+ // Register types.
+ vdl.Register((*ConnInfo)(nil))
+ vdl.Register((*RpcRequest)(nil))
+ vdl.Register((*RpcResponse)(nil))
+ vdl.Register((*RpcMessage)(nil))
+
+ return struct{}{}
+}
diff --git a/services/agent/internal/pingpong/main.vdl.go b/services/agent/internal/pingpong/main.vdl.go
index ce35a79..4a55893 100644
--- a/services/agent/internal/pingpong/main.vdl.go
+++ b/services/agent/internal/pingpong/main.vdl.go
@@ -13,8 +13,10 @@
"v.io/v23/rpc"
)
-func __VDLEnsureNativeBuilt() {
-}
+var _ = __VDLInit() // Must be first; see __VDLInit comments for details.
+
+//////////////////////////////////////////////////
+// Interface definitions
// PingPongClientMethods is the client interface
// containing PingPong methods.
@@ -119,3 +121,26 @@
},
},
}
+
+var __VDLInitCalled bool
+
+// __VDLInit performs vdl initialization. It is safe to call multiple times.
+// If you have an init ordering issue, just insert the following line verbatim
+// into your source files in this package, right after the "package foo" clause:
+//
+// var _ = __VDLInit()
+//
+// The purpose of this function is to ensure that vdl initialization occurs in
+// the right order, and very early in the init sequence. In particular, vdl
+// registration and package variable initialization needs to occur before
+// functions like vdl.TypeOf will work properly.
+//
+// This function returns a dummy value, so that it can be used to initialize the
+// first var in the file, to take advantage of Go's defined init order.
+func __VDLInit() struct{} {
+ if __VDLInitCalled {
+ return struct{}{}
+ }
+
+ return struct{}{}
+}
diff --git a/services/ben/archive/archive.vdl.go b/services/ben/archive/archive.vdl.go
index 4965331..58997a3 100644
--- a/services/ben/archive/archive.vdl.go
+++ b/services/ben/archive/archive.vdl.go
@@ -15,8 +15,10 @@
"v.io/x/ref/services/ben"
)
-func __VDLEnsureNativeBuilt() {
-}
+var _ = __VDLInit() // Must be first; see __VDLInit comments for details.
+
+//////////////////////////////////////////////////
+// Interface definitions
// BenchmarkArchiverClientMethods is the client interface
// containing BenchmarkArchiver methods.
@@ -138,3 +140,26 @@
},
},
}
+
+var __VDLInitCalled bool
+
+// __VDLInit performs vdl initialization. It is safe to call multiple times.
+// If you have an init ordering issue, just insert the following line verbatim
+// into your source files in this package, right after the "package foo" clause:
+//
+// var _ = __VDLInit()
+//
+// The purpose of this function is to ensure that vdl initialization occurs in
+// the right order, and very early in the init sequence. In particular, vdl
+// registration and package variable initialization needs to occur before
+// functions like vdl.TypeOf will work properly.
+//
+// This function returns a dummy value, so that it can be used to initialize the
+// first var in the file, to take advantage of Go's defined init order.
+func __VDLInit() struct{} {
+ if __VDLInitCalled {
+ return struct{}{}
+ }
+
+ return struct{}{}
+}
diff --git a/services/ben/ben.vdl.go b/services/ben/ben.vdl.go
index e0b297d..258a5b1 100644
--- a/services/ben/ben.vdl.go
+++ b/services/ben/ben.vdl.go
@@ -16,6 +16,11 @@
"v.io/v23/vdl"
)
+var _ = __VDLInit() // Must be first; see __VDLInit comments for details.
+
+//////////////////////////////////////////////////
+// Type definitions
+
// Cpu describes the CPU of the machine on which the microbenchmarks were run.
type Cpu struct {
Architecture string // Architecture of the CPU, e.g. "amd64", "386" etc.
@@ -29,9 +34,6 @@
}
func (m *Cpu) FillVDLTarget(t vdl.Target, tt *vdl.Type) error {
- if __VDLType_v_io_x_ref_services_ben_Cpu == nil || __VDLType0 == nil {
- panic("Initialization order error: types generated for FillVDLTarget not initialized. Consider moving caller to an init() block.")
- }
fieldsTarget1, err := t.StartFields(tt)
if err != nil {
return err
@@ -42,7 +44,7 @@
return err
}
if err != vdl.ErrFieldNoExist {
- if err := fieldTarget3.FromString(string(m.Architecture), vdl.StringType); err != nil {
+ if err := fieldTarget3.FromString(string(m.Architecture), tt.NonOptional().Field(0).Type); err != nil {
return err
}
if err := fieldsTarget1.FinishField(keyTarget2, fieldTarget3); err != nil {
@@ -54,7 +56,7 @@
return err
}
if err != vdl.ErrFieldNoExist {
- if err := fieldTarget5.FromString(string(m.Description), vdl.StringType); err != nil {
+ if err := fieldTarget5.FromString(string(m.Description), tt.NonOptional().Field(1).Type); err != nil {
return err
}
if err := fieldsTarget1.FinishField(keyTarget4, fieldTarget5); err != nil {
@@ -66,7 +68,7 @@
return err
}
if err != vdl.ErrFieldNoExist {
- if err := fieldTarget7.FromUint(uint64(m.ClockSpeedMhz), vdl.Uint32Type); err != nil {
+ if err := fieldTarget7.FromUint(uint64(m.ClockSpeedMhz), tt.NonOptional().Field(2).Type); err != nil {
return err
}
if err := fieldsTarget1.FinishField(keyTarget6, fieldTarget7); err != nil {
@@ -94,8 +96,8 @@
func (t *CpuTarget) StartFields(tt *vdl.Type) (vdl.FieldsTarget, error) {
- if !vdl.Compatible(tt, __VDLType_v_io_x_ref_services_ben_Cpu) {
- return nil, fmt.Errorf("type %v incompatible with %v", tt, __VDLType_v_io_x_ref_services_ben_Cpu)
+ if ttWant := vdl.TypeOf((*Cpu)(nil)).Elem(); !vdl.Compatible(tt, ttWant) {
+ return nil, fmt.Errorf("type %v incompatible with %v", tt, ttWant)
}
return t, nil
}
@@ -114,7 +116,7 @@
target, err := &t.clockSpeedMhzTarget, error(nil)
return nil, target, err
default:
- return nil, nil, fmt.Errorf("field %s not in struct %v", name, __VDLType_v_io_x_ref_services_ben_Cpu)
+ return nil, nil, fmt.Errorf("field %s not in struct v.io/x/ref/services/ben.Cpu", name)
}
}
func (t *CpuTarget) FinishField(_, _ vdl.Target) error {
@@ -137,9 +139,6 @@
}
func (m *Os) FillVDLTarget(t vdl.Target, tt *vdl.Type) error {
- if __VDLType_v_io_x_ref_services_ben_Os == nil || __VDLType1 == nil {
- panic("Initialization order error: types generated for FillVDLTarget not initialized. Consider moving caller to an init() block.")
- }
fieldsTarget1, err := t.StartFields(tt)
if err != nil {
return err
@@ -150,7 +149,7 @@
return err
}
if err != vdl.ErrFieldNoExist {
- if err := fieldTarget3.FromString(string(m.Name), vdl.StringType); err != nil {
+ if err := fieldTarget3.FromString(string(m.Name), tt.NonOptional().Field(0).Type); err != nil {
return err
}
if err := fieldsTarget1.FinishField(keyTarget2, fieldTarget3); err != nil {
@@ -162,7 +161,7 @@
return err
}
if err != vdl.ErrFieldNoExist {
- if err := fieldTarget5.FromString(string(m.Version), vdl.StringType); err != nil {
+ if err := fieldTarget5.FromString(string(m.Version), tt.NonOptional().Field(1).Type); err != nil {
return err
}
if err := fieldsTarget1.FinishField(keyTarget4, fieldTarget5); err != nil {
@@ -189,8 +188,8 @@
func (t *OsTarget) StartFields(tt *vdl.Type) (vdl.FieldsTarget, error) {
- if !vdl.Compatible(tt, __VDLType_v_io_x_ref_services_ben_Os) {
- return nil, fmt.Errorf("type %v incompatible with %v", tt, __VDLType_v_io_x_ref_services_ben_Os)
+ if ttWant := vdl.TypeOf((*Os)(nil)).Elem(); !vdl.Compatible(tt, ttWant) {
+ return nil, fmt.Errorf("type %v incompatible with %v", tt, ttWant)
}
return t, nil
}
@@ -205,7 +204,7 @@
target, err := &t.versionTarget, error(nil)
return nil, target, err
default:
- return nil, nil, fmt.Errorf("field %s not in struct %v", name, __VDLType_v_io_x_ref_services_ben_Os)
+ return nil, nil, fmt.Errorf("field %s not in struct v.io/x/ref/services/ben.Os", name)
}
}
func (t *OsTarget) FinishField(_, _ vdl.Target) error {
@@ -229,9 +228,6 @@
}
func (m *Scenario) FillVDLTarget(t vdl.Target, tt *vdl.Type) error {
- if __VDLType_v_io_x_ref_services_ben_Scenario == nil || __VDLType2 == nil {
- panic("Initialization order error: types generated for FillVDLTarget not initialized. Consider moving caller to an init() block.")
- }
fieldsTarget1, err := t.StartFields(tt)
if err != nil {
return err
@@ -243,7 +239,7 @@
}
if err != vdl.ErrFieldNoExist {
- if err := m.Cpu.FillVDLTarget(fieldTarget3, __VDLType_v_io_x_ref_services_ben_Cpu); err != nil {
+ if err := m.Cpu.FillVDLTarget(fieldTarget3, tt.NonOptional().Field(0).Type); err != nil {
return err
}
if err := fieldsTarget1.FinishField(keyTarget2, fieldTarget3); err != nil {
@@ -256,7 +252,7 @@
}
if err != vdl.ErrFieldNoExist {
- if err := m.Os.FillVDLTarget(fieldTarget5, __VDLType_v_io_x_ref_services_ben_Os); err != nil {
+ if err := m.Os.FillVDLTarget(fieldTarget5, tt.NonOptional().Field(1).Type); err != nil {
return err
}
if err := fieldsTarget1.FinishField(keyTarget4, fieldTarget5); err != nil {
@@ -268,7 +264,7 @@
return err
}
if err != vdl.ErrFieldNoExist {
- if err := fieldTarget7.FromString(string(m.Label), vdl.StringType); err != nil {
+ if err := fieldTarget7.FromString(string(m.Label), tt.NonOptional().Field(2).Type); err != nil {
return err
}
if err := fieldsTarget1.FinishField(keyTarget6, fieldTarget7); err != nil {
@@ -296,8 +292,8 @@
func (t *ScenarioTarget) StartFields(tt *vdl.Type) (vdl.FieldsTarget, error) {
- if !vdl.Compatible(tt, __VDLType_v_io_x_ref_services_ben_Scenario) {
- return nil, fmt.Errorf("type %v incompatible with %v", tt, __VDLType_v_io_x_ref_services_ben_Scenario)
+ if ttWant := vdl.TypeOf((*Scenario)(nil)).Elem(); !vdl.Compatible(tt, ttWant) {
+ return nil, fmt.Errorf("type %v incompatible with %v", tt, ttWant)
}
return t, nil
}
@@ -316,7 +312,7 @@
target, err := &t.labelTarget, error(nil)
return nil, target, err
default:
- return nil, nil, fmt.Errorf("field %s not in struct %v", name, __VDLType_v_io_x_ref_services_ben_Scenario)
+ return nil, nil, fmt.Errorf("field %s not in struct v.io/x/ref/services/ben.Scenario", name)
}
}
func (t *ScenarioTarget) FinishField(_, _ vdl.Target) error {
@@ -341,7 +337,7 @@
}
func (m *SourceCode) FillVDLTarget(t vdl.Target, tt *vdl.Type) error {
- if err := t.FromString(string((*m)), __VDLType_v_io_x_ref_services_ben_SourceCode); err != nil {
+ if err := t.FromString(string((*m)), tt); err != nil {
return err
}
return nil
@@ -358,8 +354,8 @@
func (t *SourceCodeTarget) FromString(src string, tt *vdl.Type) error {
- if !vdl.Compatible(tt, __VDLType_v_io_x_ref_services_ben_SourceCode) {
- return fmt.Errorf("type %v incompatible with %v", tt, __VDLType_v_io_x_ref_services_ben_SourceCode)
+ if ttWant := vdl.TypeOf((*SourceCode)(nil)); !vdl.Compatible(tt, ttWant) {
+ return fmt.Errorf("type %v incompatible with %v", tt, ttWant)
}
*t.Value = SourceCode(src)
@@ -383,9 +379,6 @@
}
func (m *Run) FillVDLTarget(t vdl.Target, tt *vdl.Type) error {
- if __VDLType_v_io_x_ref_services_ben_Run == nil || __VDLType3 == nil {
- panic("Initialization order error: types generated for FillVDLTarget not initialized. Consider moving caller to an init() block.")
- }
fieldsTarget1, err := t.StartFields(tt)
if err != nil {
return err
@@ -396,7 +389,7 @@
return err
}
if err != vdl.ErrFieldNoExist {
- if err := fieldTarget3.FromString(string(m.Name), vdl.StringType); err != nil {
+ if err := fieldTarget3.FromString(string(m.Name), tt.NonOptional().Field(0).Type); err != nil {
return err
}
if err := fieldsTarget1.FinishField(keyTarget2, fieldTarget3); err != nil {
@@ -408,7 +401,7 @@
return err
}
if err != vdl.ErrFieldNoExist {
- if err := fieldTarget5.FromUint(uint64(m.Iterations), vdl.Uint64Type); err != nil {
+ if err := fieldTarget5.FromUint(uint64(m.Iterations), tt.NonOptional().Field(1).Type); err != nil {
return err
}
if err := fieldsTarget1.FinishField(keyTarget4, fieldTarget5); err != nil {
@@ -420,7 +413,7 @@
return err
}
if err != vdl.ErrFieldNoExist {
- if err := fieldTarget7.FromFloat(float64(m.NanoSecsPerOp), vdl.Float64Type); err != nil {
+ if err := fieldTarget7.FromFloat(float64(m.NanoSecsPerOp), tt.NonOptional().Field(2).Type); err != nil {
return err
}
if err := fieldsTarget1.FinishField(keyTarget6, fieldTarget7); err != nil {
@@ -432,7 +425,7 @@
return err
}
if err != vdl.ErrFieldNoExist {
- if err := fieldTarget9.FromUint(uint64(m.AllocsPerOp), vdl.Uint64Type); err != nil {
+ if err := fieldTarget9.FromUint(uint64(m.AllocsPerOp), tt.NonOptional().Field(3).Type); err != nil {
return err
}
if err := fieldsTarget1.FinishField(keyTarget8, fieldTarget9); err != nil {
@@ -444,7 +437,7 @@
return err
}
if err != vdl.ErrFieldNoExist {
- if err := fieldTarget11.FromUint(uint64(m.AllocedBytesPerOp), vdl.Uint64Type); err != nil {
+ if err := fieldTarget11.FromUint(uint64(m.AllocedBytesPerOp), tt.NonOptional().Field(4).Type); err != nil {
return err
}
if err := fieldsTarget1.FinishField(keyTarget10, fieldTarget11); err != nil {
@@ -456,7 +449,7 @@
return err
}
if err != vdl.ErrFieldNoExist {
- if err := fieldTarget13.FromFloat(float64(m.MegaBytesPerSec), vdl.Float64Type); err != nil {
+ if err := fieldTarget13.FromFloat(float64(m.MegaBytesPerSec), tt.NonOptional().Field(5).Type); err != nil {
return err
}
if err := fieldsTarget1.FinishField(keyTarget12, fieldTarget13); err != nil {
@@ -468,7 +461,7 @@
return err
}
if err != vdl.ErrFieldNoExist {
- if err := fieldTarget15.FromUint(uint64(m.Parallelism), vdl.Uint32Type); err != nil {
+ if err := fieldTarget15.FromUint(uint64(m.Parallelism), tt.NonOptional().Field(6).Type); err != nil {
return err
}
if err := fieldsTarget1.FinishField(keyTarget14, fieldTarget15); err != nil {
@@ -500,8 +493,8 @@
func (t *RunTarget) StartFields(tt *vdl.Type) (vdl.FieldsTarget, error) {
- if !vdl.Compatible(tt, __VDLType_v_io_x_ref_services_ben_Run) {
- return nil, fmt.Errorf("type %v incompatible with %v", tt, __VDLType_v_io_x_ref_services_ben_Run)
+ if ttWant := vdl.TypeOf((*Run)(nil)).Elem(); !vdl.Compatible(tt, ttWant) {
+ return nil, fmt.Errorf("type %v incompatible with %v", tt, ttWant)
}
return t, nil
}
@@ -536,7 +529,7 @@
target, err := &t.parallelismTarget, error(nil)
return nil, target, err
default:
- return nil, nil, fmt.Errorf("field %s not in struct %v", name, __VDLType_v_io_x_ref_services_ben_Run)
+ return nil, nil, fmt.Errorf("field %s not in struct v.io/x/ref/services/ben.Run", name)
}
}
func (t *RunTarget) FinishField(_, _ vdl.Target) error {
@@ -547,23 +540,32 @@
return nil
}
-func init() {
+var __VDLInitCalled bool
+
+// __VDLInit performs vdl initialization. It is safe to call multiple times.
+// If you have an init ordering issue, just insert the following line verbatim
+// into your source files in this package, right after the "package foo" clause:
+//
+// var _ = __VDLInit()
+//
+// The purpose of this function is to ensure that vdl initialization occurs in
+// the right order, and very early in the init sequence. In particular, vdl
+// registration and package variable initialization needs to occur before
+// functions like vdl.TypeOf will work properly.
+//
+// This function returns a dummy value, so that it can be used to initialize the
+// first var in the file, to take advantage of Go's defined init order.
+func __VDLInit() struct{} {
+ if __VDLInitCalled {
+ return struct{}{}
+ }
+
+ // Register types.
vdl.Register((*Cpu)(nil))
vdl.Register((*Os)(nil))
vdl.Register((*Scenario)(nil))
vdl.Register((*SourceCode)(nil))
vdl.Register((*Run)(nil))
-}
-var __VDLType0 *vdl.Type = vdl.TypeOf((*Cpu)(nil))
-var __VDLType1 *vdl.Type = vdl.TypeOf((*Os)(nil))
-var __VDLType3 *vdl.Type = vdl.TypeOf((*Run)(nil))
-var __VDLType2 *vdl.Type = vdl.TypeOf((*Scenario)(nil))
-var __VDLType_v_io_x_ref_services_ben_Cpu *vdl.Type = vdl.TypeOf(Cpu{})
-var __VDLType_v_io_x_ref_services_ben_Os *vdl.Type = vdl.TypeOf(Os{})
-var __VDLType_v_io_x_ref_services_ben_Run *vdl.Type = vdl.TypeOf(Run{})
-var __VDLType_v_io_x_ref_services_ben_Scenario *vdl.Type = vdl.TypeOf(Scenario{})
-var __VDLType_v_io_x_ref_services_ben_SourceCode *vdl.Type = vdl.TypeOf(SourceCode(""))
-
-func __VDLEnsureNativeBuilt() {
+ return struct{}{}
}
diff --git a/services/cluster/cluster.vdl.go b/services/cluster/cluster.vdl.go
index 30a8357..5d037db 100644
--- a/services/cluster/cluster.vdl.go
+++ b/services/cluster/cluster.vdl.go
@@ -16,8 +16,10 @@
"v.io/v23/vdl"
)
-func __VDLEnsureNativeBuilt() {
-}
+var _ = __VDLInit() // Must be first; see __VDLInit comments for details.
+
+//////////////////////////////////////////////////
+// Interface definitions
// ClusterAgentClientMethods is the client interface
// containing ClusterAgent methods.
@@ -264,3 +266,26 @@
},
},
}
+
+var __VDLInitCalled bool
+
+// __VDLInit performs vdl initialization. It is safe to call multiple times.
+// If you have an init ordering issue, just insert the following line verbatim
+// into your source files in this package, right after the "package foo" clause:
+//
+// var _ = __VDLInit()
+//
+// The purpose of this function is to ensure that vdl initialization occurs in
+// the right order, and very early in the init sequence. In particular, vdl
+// registration and package variable initialization needs to occur before
+// functions like vdl.TypeOf will work properly.
+//
+// This function returns a dummy value, so that it can be used to initialize the
+// first var in the file, to take advantage of Go's defined init order.
+func __VDLInit() struct{} {
+ if __VDLInitCalled {
+ return struct{}{}
+ }
+
+ return struct{}{}
+}
diff --git a/services/device/device.vdl.go b/services/device/device.vdl.go
index 4ace3b0..2c3f2a7 100644
--- a/services/device/device.vdl.go
+++ b/services/device/device.vdl.go
@@ -13,8 +13,10 @@
"v.io/v23/rpc"
)
-func __VDLEnsureNativeBuilt() {
-}
+var _ = __VDLInit() // Must be first; see __VDLInit comments for details.
+
+//////////////////////////////////////////////////
+// Interface definitions
// ConfigClientMethods is the client interface
// containing Config methods.
@@ -120,3 +122,26 @@
},
},
}
+
+var __VDLInitCalled bool
+
+// __VDLInit performs vdl initialization. It is safe to call multiple times.
+// If you have an init ordering issue, just insert the following line verbatim
+// into your source files in this package, right after the "package foo" clause:
+//
+// var _ = __VDLInit()
+//
+// The purpose of this function is to ensure that vdl initialization occurs in
+// the right order, and very early in the init sequence. In particular, vdl
+// registration and package variable initialization needs to occur before
+// functions like vdl.TypeOf will work properly.
+//
+// This function returns a dummy value, so that it can be used to initialize the
+// first var in the file, to take advantage of Go's defined init order.
+func __VDLInit() struct{} {
+ if __VDLInitCalled {
+ return struct{}{}
+ }
+
+ return struct{}{}
+}
diff --git a/services/discharger/discharger.vdl.go b/services/discharger/discharger.vdl.go
index f22f577..527da56 100644
--- a/services/discharger/discharger.vdl.go
+++ b/services/discharger/discharger.vdl.go
@@ -18,23 +18,24 @@
"v.io/v23/verror"
)
-func __VDLEnsureNativeBuilt() {
-}
+var _ = __VDLInit() // Must be first; see __VDLInit comments for details.
+//////////////////////////////////////////////////
+// Error definitions
var (
+
// Indicates that the Caveat does not require a discharge
ErrNotAThirdPartyCaveat = verror.Register("v.io/x/ref/services/discharger.NotAThirdPartyCaveat", verror.NoRetry, "{1:}{2:} discharges are not required for non-third-party caveats (id: {c.id})")
)
-func init() {
- i18n.Cat().SetWithBase(i18n.LangID("en"), i18n.MsgID(ErrNotAThirdPartyCaveat.ID), "{1:}{2:} discharges are not required for non-third-party caveats (id: {c.id})")
-}
-
// NewErrNotAThirdPartyCaveat returns an error with the ErrNotAThirdPartyCaveat ID.
func NewErrNotAThirdPartyCaveat(ctx *context.T, c security.Caveat) error {
return verror.New(ErrNotAThirdPartyCaveat, ctx, c)
}
+//////////////////////////////////////////////////
+// Interface definitions
+
// DischargerClientMethods is the client interface
// containing Discharger methods.
//
@@ -146,3 +147,29 @@
},
},
}
+
+var __VDLInitCalled bool
+
+// __VDLInit performs vdl initialization. It is safe to call multiple times.
+// If you have an init ordering issue, just insert the following line verbatim
+// into your source files in this package, right after the "package foo" clause:
+//
+// var _ = __VDLInit()
+//
+// The purpose of this function is to ensure that vdl initialization occurs in
+// the right order, and very early in the init sequence. In particular, vdl
+// registration and package variable initialization needs to occur before
+// functions like vdl.TypeOf will work properly.
+//
+// This function returns a dummy value, so that it can be used to initialize the
+// first var in the file, to take advantage of Go's defined init order.
+func __VDLInit() struct{} {
+ if __VDLInitCalled {
+ return struct{}{}
+ }
+
+ // Set error format strings.
+ i18n.Cat().SetWithBase(i18n.LangID("en"), i18n.MsgID(ErrNotAThirdPartyCaveat.ID), "{1:}{2:} discharges are not required for non-third-party caveats (id: {c.id})")
+
+ return struct{}{}
+}
diff --git a/services/groups/groupsd/testdata/kvstore/kvstore.vdl.go b/services/groups/groupsd/testdata/kvstore/kvstore.vdl.go
index cbf7ce8..d331d0b 100644
--- a/services/groups/groupsd/testdata/kvstore/kvstore.vdl.go
+++ b/services/groups/groupsd/testdata/kvstore/kvstore.vdl.go
@@ -17,8 +17,10 @@
"v.io/v23/vdl"
)
-func __VDLEnsureNativeBuilt() {
-}
+var _ = __VDLInit() // Must be first; see __VDLInit comments for details.
+
+//////////////////////////////////////////////////
+// Interface definitions
// StoreClientMethods is the client interface
// containing Store methods.
@@ -138,3 +140,26 @@
},
},
}
+
+var __VDLInitCalled bool
+
+// __VDLInit performs vdl initialization. It is safe to call multiple times.
+// If you have an init ordering issue, just insert the following line verbatim
+// into your source files in this package, right after the "package foo" clause:
+//
+// var _ = __VDLInit()
+//
+// The purpose of this function is to ensure that vdl initialization occurs in
+// the right order, and very early in the init sequence. In particular, vdl
+// registration and package variable initialization needs to occur before
+// functions like vdl.TypeOf will work properly.
+//
+// This function returns a dummy value, so that it can be used to initialize the
+// first var in the file, to take advantage of Go's defined init order.
+func __VDLInit() struct{} {
+ if __VDLInitCalled {
+ return struct{}{}
+ }
+
+ return struct{}{}
+}
diff --git a/services/groups/internal/server/server.vdl.go b/services/groups/internal/server/server.vdl.go
index b73e71c..9a2ea5d 100644
--- a/services/groups/internal/server/server.vdl.go
+++ b/services/groups/internal/server/server.vdl.go
@@ -14,6 +14,11 @@
"v.io/v23/vdl"
)
+var _ = __VDLInit() // Must be first; see __VDLInit comments for details.
+
+//////////////////////////////////////////////////
+// Type definitions
+
// groupData represents the persistent state of a group. (The group name is
// persisted as the store entry key.)
type groupData struct {
@@ -27,9 +32,6 @@
}
func (m *groupData) FillVDLTarget(t vdl.Target, tt *vdl.Type) error {
- if __VDLType_v_io_x_ref_services_groups_internal_server_groupData == nil || __VDLType0 == nil {
- panic("Initialization order error: types generated for FillVDLTarget not initialized. Consider moving caller to an init() block.")
- }
fieldsTarget1, err := t.StartFields(tt)
if err != nil {
return err
@@ -41,7 +43,7 @@
}
if err != vdl.ErrFieldNoExist {
- if err := m.Perms.FillVDLTarget(fieldTarget3, __VDLType_v_io_v23_security_access_Permissions); err != nil {
+ if err := m.Perms.FillVDLTarget(fieldTarget3, tt.NonOptional().Field(0).Type); err != nil {
return err
}
if err := fieldsTarget1.FinishField(keyTarget2, fieldTarget3); err != nil {
@@ -54,7 +56,7 @@
}
if err != vdl.ErrFieldNoExist {
- setTarget6, err := fieldTarget5.StartSet(__VDLType1, len(m.Entries))
+ setTarget6, err := fieldTarget5.StartSet(tt.NonOptional().Field(1).Type, len(m.Entries))
if err != nil {
return err
}
@@ -64,7 +66,7 @@
return err
}
- if err := key8.FillVDLTarget(keyTarget7, __VDLType_v_io_v23_services_groups_BlessingPatternChunk); err != nil {
+ if err := key8.FillVDLTarget(keyTarget7, tt.NonOptional().Field(1).Type.Key()); err != nil {
return err
}
if err := setTarget6.FinishKey(keyTarget7); err != nil {
@@ -98,8 +100,8 @@
func (t *groupDataTarget) StartFields(tt *vdl.Type) (vdl.FieldsTarget, error) {
- if !vdl.Compatible(tt, __VDLType_v_io_x_ref_services_groups_internal_server_groupData) {
- return nil, fmt.Errorf("type %v incompatible with %v", tt, __VDLType_v_io_x_ref_services_groups_internal_server_groupData)
+ if ttWant := vdl.TypeOf((*groupData)(nil)).Elem(); !vdl.Compatible(tt, ttWant) {
+ return nil, fmt.Errorf("type %v incompatible with %v", tt, ttWant)
}
return t, nil
}
@@ -114,7 +116,7 @@
target, err := &t.entriesTarget, error(nil)
return nil, target, err
default:
- return nil, nil, fmt.Errorf("field %s not in struct %v", name, __VDLType_v_io_x_ref_services_groups_internal_server_groupData)
+ return nil, nil, fmt.Errorf("field %s not in struct v.io/x/ref/services/groups/internal/server.groupData", name)
}
}
func (t *groupDataTarget) FinishField(_, _ vdl.Target) error {
@@ -136,8 +138,8 @@
func (t *unnamed_7365745b762e696f2f7632332f73657276696365732f67726f7570732e426c657373696e675061747465726e4368756e6b20737472696e675dTarget) StartSet(tt *vdl.Type, len int) (vdl.SetTarget, error) {
- if !vdl.Compatible(tt, __VDLType1) {
- return nil, fmt.Errorf("type %v incompatible with %v", tt, __VDLType1)
+ if ttWant := vdl.TypeOf((*map[groups.BlessingPatternChunk]struct{})(nil)); !vdl.Compatible(tt, ttWant) {
+ return nil, fmt.Errorf("type %v incompatible with %v", tt, ttWant)
}
*t.Value = make(map[groups.BlessingPatternChunk]struct{})
return t, nil
@@ -160,15 +162,28 @@
return nil
}
-func init() {
+var __VDLInitCalled bool
+
+// __VDLInit performs vdl initialization. It is safe to call multiple times.
+// If you have an init ordering issue, just insert the following line verbatim
+// into your source files in this package, right after the "package foo" clause:
+//
+// var _ = __VDLInit()
+//
+// The purpose of this function is to ensure that vdl initialization occurs in
+// the right order, and very early in the init sequence. In particular, vdl
+// registration and package variable initialization needs to occur before
+// functions like vdl.TypeOf will work properly.
+//
+// This function returns a dummy value, so that it can be used to initialize the
+// first var in the file, to take advantage of Go's defined init order.
+func __VDLInit() struct{} {
+ if __VDLInitCalled {
+ return struct{}{}
+ }
+
+ // Register types.
vdl.Register((*groupData)(nil))
-}
-var __VDLType0 *vdl.Type = vdl.TypeOf((*groupData)(nil))
-var __VDLType1 *vdl.Type = vdl.TypeOf(map[groups.BlessingPatternChunk]struct{}(nil))
-var __VDLType_v_io_v23_security_access_Permissions *vdl.Type = vdl.TypeOf(access.Permissions(nil))
-var __VDLType_v_io_v23_services_groups_BlessingPatternChunk *vdl.Type = vdl.TypeOf(groups.BlessingPatternChunk(""))
-var __VDLType_v_io_x_ref_services_groups_internal_server_groupData *vdl.Type = vdl.TypeOf(groupData{})
-
-func __VDLEnsureNativeBuilt() {
+ return struct{}{}
}
diff --git a/services/groups/internal/store/store.vdl.go b/services/groups/internal/store/store.vdl.go
index 66bdda7..54c02a4 100644
--- a/services/groups/internal/store/store.vdl.go
+++ b/services/groups/internal/store/store.vdl.go
@@ -13,21 +13,18 @@
"v.io/v23/verror"
)
-func __VDLEnsureNativeBuilt() {
-}
+var _ = __VDLInit() // Must be first; see __VDLInit comments for details.
+//////////////////////////////////////////////////
+// Error definitions
var (
+
// KeyExists means the given key already exists in the store.
ErrKeyExists = verror.Register("v.io/x/ref/services/groups/internal/store.KeyExists", verror.NoRetry, "{1:}{2:} Key exists{:_}")
// UnknownKey means the given key does not exist in the store.
ErrUnknownKey = verror.Register("v.io/x/ref/services/groups/internal/store.UnknownKey", verror.NoRetry, "{1:}{2:} Unknown key{:_}")
)
-func init() {
- i18n.Cat().SetWithBase(i18n.LangID("en"), i18n.MsgID(ErrKeyExists.ID), "{1:}{2:} Key exists{:_}")
- i18n.Cat().SetWithBase(i18n.LangID("en"), i18n.MsgID(ErrUnknownKey.ID), "{1:}{2:} Unknown key{:_}")
-}
-
// NewErrKeyExists returns an error with the ErrKeyExists ID.
func NewErrKeyExists(ctx *context.T) error {
return verror.New(ErrKeyExists, ctx)
@@ -37,3 +34,30 @@
func NewErrUnknownKey(ctx *context.T) error {
return verror.New(ErrUnknownKey, ctx)
}
+
+var __VDLInitCalled bool
+
+// __VDLInit performs vdl initialization. It is safe to call multiple times.
+// If you have an init ordering issue, just insert the following line verbatim
+// into your source files in this package, right after the "package foo" clause:
+//
+// var _ = __VDLInit()
+//
+// The purpose of this function is to ensure that vdl initialization occurs in
+// the right order, and very early in the init sequence. In particular, vdl
+// registration and package variable initialization needs to occur before
+// functions like vdl.TypeOf will work properly.
+//
+// This function returns a dummy value, so that it can be used to initialize the
+// first var in the file, to take advantage of Go's defined init order.
+func __VDLInit() struct{} {
+ if __VDLInitCalled {
+ return struct{}{}
+ }
+
+ // Set error format strings.
+ i18n.Cat().SetWithBase(i18n.LangID("en"), i18n.MsgID(ErrKeyExists.ID), "{1:}{2:} Key exists{:_}")
+ i18n.Cat().SetWithBase(i18n.LangID("en"), i18n.MsgID(ErrUnknownKey.ID), "{1:}{2:} Unknown key{:_}")
+
+ return struct{}{}
+}
diff --git a/services/iberoot/iberoot.vdl.go b/services/iberoot/iberoot.vdl.go
index 7b32db4..faece30 100644
--- a/services/iberoot/iberoot.vdl.go
+++ b/services/iberoot/iberoot.vdl.go
@@ -16,8 +16,10 @@
"v.io/x/ref/lib/security/bcrypter"
)
-func __VDLEnsureNativeBuilt() {
-}
+var _ = __VDLInit() // Must be first; see __VDLInit comments for details.
+
+//////////////////////////////////////////////////
+// Interface definitions
// RootClientMethods is the client interface
// containing Root methods.
@@ -160,3 +162,26 @@
},
},
}
+
+var __VDLInitCalled bool
+
+// __VDLInit performs vdl initialization. It is safe to call multiple times.
+// If you have an init ordering issue, just insert the following line verbatim
+// into your source files in this package, right after the "package foo" clause:
+//
+// var _ = __VDLInit()
+//
+// The purpose of this function is to ensure that vdl initialization occurs in
+// the right order, and very early in the init sequence. In particular, vdl
+// registration and package variable initialization needs to occur before
+// functions like vdl.TypeOf will work properly.
+//
+// This function returns a dummy value, so that it can be used to initialize the
+// first var in the file, to take advantage of Go's defined init order.
+func __VDLInit() struct{} {
+ if __VDLInitCalled {
+ return struct{}{}
+ }
+
+ return struct{}{}
+}
diff --git a/services/iberoot/rootd/internal/internal.vdl.go b/services/iberoot/rootd/internal/internal.vdl.go
index 0936a20..1b047eb 100644
--- a/services/iberoot/rootd/internal/internal.vdl.go
+++ b/services/iberoot/rootd/internal/internal.vdl.go
@@ -14,19 +14,15 @@
"v.io/v23/verror"
)
-func __VDLEnsureNativeBuilt() {
-}
+var _ = __VDLInit() // Must be first; see __VDLInit comments for details.
+//////////////////////////////////////////////////
+// Error definitions
var (
ErrUnrecognizedRemoteBlessings = verror.Register("v.io/x/ref/services/iberoot/rootd/internal.UnrecognizedRemoteBlessings", verror.NoRetry, "{1:}{2:} blessing provided by the remote end: {3} [rejected: {4}] are not recognized by this identity provider: {5}")
ErrInternal = verror.Register("v.io/x/ref/services/iberoot/rootd/internal.Internal", verror.NoRetry, "{1:}{2:} internal error: {3}")
)
-func init() {
- i18n.Cat().SetWithBase(i18n.LangID("en"), i18n.MsgID(ErrUnrecognizedRemoteBlessings.ID), "{1:}{2:} blessing provided by the remote end: {3} [rejected: {4}] are not recognized by this identity provider: {5}")
- i18n.Cat().SetWithBase(i18n.LangID("en"), i18n.MsgID(ErrInternal.ID), "{1:}{2:} internal error: {3}")
-}
-
// NewErrUnrecognizedRemoteBlessings returns an error with the ErrUnrecognizedRemoteBlessings ID.
func NewErrUnrecognizedRemoteBlessings(ctx *context.T, blessings []string, rejected []security.RejectedBlessing, name string) error {
return verror.New(ErrUnrecognizedRemoteBlessings, ctx, blessings, rejected, name)
@@ -36,3 +32,30 @@
func NewErrInternal(ctx *context.T, err error) error {
return verror.New(ErrInternal, ctx, err)
}
+
+var __VDLInitCalled bool
+
+// __VDLInit performs vdl initialization. It is safe to call multiple times.
+// If you have an init ordering issue, just insert the following line verbatim
+// into your source files in this package, right after the "package foo" clause:
+//
+// var _ = __VDLInit()
+//
+// The purpose of this function is to ensure that vdl initialization occurs in
+// the right order, and very early in the init sequence. In particular, vdl
+// registration and package variable initialization needs to occur before
+// functions like vdl.TypeOf will work properly.
+//
+// This function returns a dummy value, so that it can be used to initialize the
+// first var in the file, to take advantage of Go's defined init order.
+func __VDLInit() struct{} {
+ if __VDLInitCalled {
+ return struct{}{}
+ }
+
+ // Set error format strings.
+ i18n.Cat().SetWithBase(i18n.LangID("en"), i18n.MsgID(ErrUnrecognizedRemoteBlessings.ID), "{1:}{2:} blessing provided by the remote end: {3} [rejected: {4}] are not recognized by this identity provider: {5}")
+ i18n.Cat().SetWithBase(i18n.LangID("en"), i18n.MsgID(ErrInternal.ID), "{1:}{2:} internal error: {3}")
+
+ return struct{}{}
+}
diff --git a/services/identity/identity.vdl.go b/services/identity/identity.vdl.go
index 11f6ee0..7627555 100644
--- a/services/identity/identity.vdl.go
+++ b/services/identity/identity.vdl.go
@@ -17,6 +17,11 @@
"v.io/v23/vdl"
)
+var _ = __VDLInit() // Must be first; see __VDLInit comments for details.
+
+//////////////////////////////////////////////////
+// Type definitions
+
// BlessingRootResponse is the struct representing the JSON response provided
// by the "blessing-root" route of the identity service.
type BlessingRootResponse struct {
@@ -32,9 +37,6 @@
}
func (m *BlessingRootResponse) FillVDLTarget(t vdl.Target, tt *vdl.Type) error {
- if __VDLType_v_io_x_ref_services_identity_BlessingRootResponse == nil || __VDLType0 == nil {
- panic("Initialization order error: types generated for FillVDLTarget not initialized. Consider moving caller to an init() block.")
- }
fieldsTarget1, err := t.StartFields(tt)
if err != nil {
return err
@@ -46,7 +48,7 @@
}
if err != vdl.ErrFieldNoExist {
- listTarget4, err := fieldTarget3.StartList(__VDLType1, len(m.Names))
+ listTarget4, err := fieldTarget3.StartList(tt.NonOptional().Field(0).Type, len(m.Names))
if err != nil {
return err
}
@@ -55,7 +57,7 @@
if err != nil {
return err
}
- if err := elemTarget5.FromString(string(elem6), vdl.StringType); err != nil {
+ if err := elemTarget5.FromString(string(elem6), tt.NonOptional().Field(0).Type.Elem()); err != nil {
return err
}
if err := listTarget4.FinishElem(elemTarget5); err != nil {
@@ -74,7 +76,7 @@
return err
}
if err != vdl.ErrFieldNoExist {
- if err := fieldTarget8.FromString(string(m.PublicKey), vdl.StringType); err != nil {
+ if err := fieldTarget8.FromString(string(m.PublicKey), tt.NonOptional().Field(1).Type); err != nil {
return err
}
if err := fieldsTarget1.FinishField(keyTarget7, fieldTarget8); err != nil {
@@ -101,8 +103,8 @@
func (t *BlessingRootResponseTarget) StartFields(tt *vdl.Type) (vdl.FieldsTarget, error) {
- if !vdl.Compatible(tt, __VDLType_v_io_x_ref_services_identity_BlessingRootResponse) {
- return nil, fmt.Errorf("type %v incompatible with %v", tt, __VDLType_v_io_x_ref_services_identity_BlessingRootResponse)
+ if ttWant := vdl.TypeOf((*BlessingRootResponse)(nil)).Elem(); !vdl.Compatible(tt, ttWant) {
+ return nil, fmt.Errorf("type %v incompatible with %v", tt, ttWant)
}
return t, nil
}
@@ -117,7 +119,7 @@
target, err := &t.publicKeyTarget, error(nil)
return nil, target, err
default:
- return nil, nil, fmt.Errorf("field %s not in struct %v", name, __VDLType_v_io_x_ref_services_identity_BlessingRootResponse)
+ return nil, nil, fmt.Errorf("field %s not in struct v.io/x/ref/services/identity.BlessingRootResponse", name)
}
}
func (t *BlessingRootResponseTarget) FinishField(_, _ vdl.Target) error {
@@ -128,16 +130,8 @@
return nil
}
-func init() {
- vdl.Register((*BlessingRootResponse)(nil))
-}
-
-var __VDLType0 *vdl.Type = vdl.TypeOf((*BlessingRootResponse)(nil))
-var __VDLType1 *vdl.Type = vdl.TypeOf([]string(nil))
-var __VDLType_v_io_x_ref_services_identity_BlessingRootResponse *vdl.Type = vdl.TypeOf(BlessingRootResponse{})
-
-func __VDLEnsureNativeBuilt() {
-}
+//////////////////////////////////////////////////
+// Interface definitions
// OAuthBlesserClientMethods is the client interface
// containing OAuthBlesser methods.
@@ -409,3 +403,29 @@
},
},
}
+
+var __VDLInitCalled bool
+
+// __VDLInit performs vdl initialization. It is safe to call multiple times.
+// If you have an init ordering issue, just insert the following line verbatim
+// into your source files in this package, right after the "package foo" clause:
+//
+// var _ = __VDLInit()
+//
+// The purpose of this function is to ensure that vdl initialization occurs in
+// the right order, and very early in the init sequence. In particular, vdl
+// registration and package variable initialization needs to occur before
+// functions like vdl.TypeOf will work properly.
+//
+// This function returns a dummy value, so that it can be used to initialize the
+// first var in the file, to take advantage of Go's defined init order.
+func __VDLInit() struct{} {
+ if __VDLInitCalled {
+ return struct{}{}
+ }
+
+ // Register types.
+ vdl.Register((*BlessingRootResponse)(nil))
+
+ return struct{}{}
+}
diff --git a/services/identity/internal/revocation/revocation.vdl.go b/services/identity/internal/revocation/revocation.vdl.go
index e02caea..afedc73 100644
--- a/services/identity/internal/revocation/revocation.vdl.go
+++ b/services/identity/internal/revocation/revocation.vdl.go
@@ -13,8 +13,10 @@
"v.io/v23/vdl"
)
-func __VDLEnsureNativeBuilt() {
-}
+var _ = __VDLInit() // Must be first; see __VDLInit comments for details.
+
+//////////////////////////////////////////////////
+// Const definitions
// NotRevokedCaveat is used to implement revocation.
// It validates iff the parameter is not included in a list of blacklisted
@@ -41,5 +43,28 @@
128,
0,
},
- ParamType: vdl.TypeOf([]byte(nil)),
+ ParamType: vdl.TypeOf((*[]byte)(nil)),
+}
+
+var __VDLInitCalled bool
+
+// __VDLInit performs vdl initialization. It is safe to call multiple times.
+// If you have an init ordering issue, just insert the following line verbatim
+// into your source files in this package, right after the "package foo" clause:
+//
+// var _ = __VDLInit()
+//
+// The purpose of this function is to ensure that vdl initialization occurs in
+// the right order, and very early in the init sequence. In particular, vdl
+// registration and package variable initialization needs to occur before
+// functions like vdl.TypeOf will work properly.
+//
+// This function returns a dummy value, so that it can be used to initialize the
+// first var in the file, to take advantage of Go's defined init order.
+func __VDLInit() struct{} {
+ if __VDLInitCalled {
+ return struct{}{}
+ }
+
+ return struct{}{}
}
diff --git a/services/mounttable/mounttablelib/mounttablelib.vdl.go b/services/mounttable/mounttablelib/mounttablelib.vdl.go
index 9283819..1023864 100644
--- a/services/mounttable/mounttablelib/mounttablelib.vdl.go
+++ b/services/mounttable/mounttablelib/mounttablelib.vdl.go
@@ -13,8 +13,10 @@
"v.io/v23/rpc"
)
-func __VDLEnsureNativeBuilt() {
-}
+var _ = __VDLInit() // Must be first; see __VDLInit comments for details.
+
+//////////////////////////////////////////////////
+// Interface definitions
// CollectionClientMethods is the client interface
// containing Collection methods.
@@ -143,3 +145,26 @@
},
},
}
+
+var __VDLInitCalled bool
+
+// __VDLInit performs vdl initialization. It is safe to call multiple times.
+// If you have an init ordering issue, just insert the following line verbatim
+// into your source files in this package, right after the "package foo" clause:
+//
+// var _ = __VDLInit()
+//
+// The purpose of this function is to ensure that vdl initialization occurs in
+// the right order, and very early in the init sequence. In particular, vdl
+// registration and package variable initialization needs to occur before
+// functions like vdl.TypeOf will work properly.
+//
+// This function returns a dummy value, so that it can be used to initialize the
+// first var in the file, to take advantage of Go's defined init order.
+func __VDLInit() struct{} {
+ if __VDLInitCalled {
+ return struct{}{}
+ }
+
+ return struct{}{}
+}
diff --git a/services/profile/profile.vdl.go b/services/profile/profile.vdl.go
index 9b1ed5c..5858dde 100644
--- a/services/profile/profile.vdl.go
+++ b/services/profile/profile.vdl.go
@@ -14,6 +14,11 @@
"v.io/v23/vdl"
)
+var _ = __VDLInit() // Must be first; see __VDLInit comments for details.
+
+//////////////////////////////////////////////////
+// Type definitions
+
// Library describes a shared library that applications may use.
type Library struct {
// Name is the name of the library.
@@ -30,9 +35,6 @@
}
func (m *Library) FillVDLTarget(t vdl.Target, tt *vdl.Type) error {
- if __VDLType_v_io_x_ref_services_profile_Library == nil || __VDLType0 == nil {
- panic("Initialization order error: types generated for FillVDLTarget not initialized. Consider moving caller to an init() block.")
- }
fieldsTarget1, err := t.StartFields(tt)
if err != nil {
return err
@@ -43,7 +45,7 @@
return err
}
if err != vdl.ErrFieldNoExist {
- if err := fieldTarget3.FromString(string(m.Name), vdl.StringType); err != nil {
+ if err := fieldTarget3.FromString(string(m.Name), tt.NonOptional().Field(0).Type); err != nil {
return err
}
if err := fieldsTarget1.FinishField(keyTarget2, fieldTarget3); err != nil {
@@ -55,7 +57,7 @@
return err
}
if err != vdl.ErrFieldNoExist {
- if err := fieldTarget5.FromString(string(m.MajorVersion), vdl.StringType); err != nil {
+ if err := fieldTarget5.FromString(string(m.MajorVersion), tt.NonOptional().Field(1).Type); err != nil {
return err
}
if err := fieldsTarget1.FinishField(keyTarget4, fieldTarget5); err != nil {
@@ -67,7 +69,7 @@
return err
}
if err != vdl.ErrFieldNoExist {
- if err := fieldTarget7.FromString(string(m.MinorVersion), vdl.StringType); err != nil {
+ if err := fieldTarget7.FromString(string(m.MinorVersion), tt.NonOptional().Field(2).Type); err != nil {
return err
}
if err := fieldsTarget1.FinishField(keyTarget6, fieldTarget7); err != nil {
@@ -95,8 +97,8 @@
func (t *LibraryTarget) StartFields(tt *vdl.Type) (vdl.FieldsTarget, error) {
- if !vdl.Compatible(tt, __VDLType_v_io_x_ref_services_profile_Library) {
- return nil, fmt.Errorf("type %v incompatible with %v", tt, __VDLType_v_io_x_ref_services_profile_Library)
+ if ttWant := vdl.TypeOf((*Library)(nil)).Elem(); !vdl.Compatible(tt, ttWant) {
+ return nil, fmt.Errorf("type %v incompatible with %v", tt, ttWant)
}
return t, nil
}
@@ -115,7 +117,7 @@
target, err := &t.minorVersionTarget, error(nil)
return nil, target, err
default:
- return nil, nil, fmt.Errorf("field %s not in struct %v", name, __VDLType_v_io_x_ref_services_profile_Library)
+ return nil, nil, fmt.Errorf("field %s not in struct v.io/x/ref/services/profile.Library", name)
}
}
func (t *LibraryTarget) FinishField(_, _ vdl.Target) error {
@@ -150,9 +152,6 @@
}
func (m *Specification) FillVDLTarget(t vdl.Target, tt *vdl.Type) error {
- if __VDLType_v_io_x_ref_services_profile_Specification == nil || __VDLType1 == nil {
- panic("Initialization order error: types generated for FillVDLTarget not initialized. Consider moving caller to an init() block.")
- }
fieldsTarget1, err := t.StartFields(tt)
if err != nil {
return err
@@ -163,7 +162,7 @@
return err
}
if err != vdl.ErrFieldNoExist {
- if err := fieldTarget3.FromString(string(m.Label), vdl.StringType); err != nil {
+ if err := fieldTarget3.FromString(string(m.Label), tt.NonOptional().Field(0).Type); err != nil {
return err
}
if err := fieldsTarget1.FinishField(keyTarget2, fieldTarget3); err != nil {
@@ -175,7 +174,7 @@
return err
}
if err != vdl.ErrFieldNoExist {
- if err := fieldTarget5.FromString(string(m.Description), vdl.StringType); err != nil {
+ if err := fieldTarget5.FromString(string(m.Description), tt.NonOptional().Field(1).Type); err != nil {
return err
}
if err := fieldsTarget1.FinishField(keyTarget4, fieldTarget5); err != nil {
@@ -188,7 +187,7 @@
}
if err != vdl.ErrFieldNoExist {
- if err := m.Arch.FillVDLTarget(fieldTarget7, __VDLType_v_io_v23_services_build_Architecture); err != nil {
+ if err := m.Arch.FillVDLTarget(fieldTarget7, tt.NonOptional().Field(2).Type); err != nil {
return err
}
if err := fieldsTarget1.FinishField(keyTarget6, fieldTarget7); err != nil {
@@ -201,7 +200,7 @@
}
if err != vdl.ErrFieldNoExist {
- if err := m.Os.FillVDLTarget(fieldTarget9, __VDLType_v_io_v23_services_build_OperatingSystem); err != nil {
+ if err := m.Os.FillVDLTarget(fieldTarget9, tt.NonOptional().Field(3).Type); err != nil {
return err
}
if err := fieldsTarget1.FinishField(keyTarget8, fieldTarget9); err != nil {
@@ -214,7 +213,7 @@
}
if err != vdl.ErrFieldNoExist {
- if err := m.Format.FillVDLTarget(fieldTarget11, __VDLType_v_io_v23_services_build_Format); err != nil {
+ if err := m.Format.FillVDLTarget(fieldTarget11, tt.NonOptional().Field(4).Type); err != nil {
return err
}
if err := fieldsTarget1.FinishField(keyTarget10, fieldTarget11); err != nil {
@@ -227,7 +226,7 @@
}
if err != vdl.ErrFieldNoExist {
- setTarget14, err := fieldTarget13.StartSet(__VDLType2, len(m.Libraries))
+ setTarget14, err := fieldTarget13.StartSet(tt.NonOptional().Field(5).Type, len(m.Libraries))
if err != nil {
return err
}
@@ -237,7 +236,7 @@
return err
}
- if err := key16.FillVDLTarget(keyTarget15, __VDLType_v_io_x_ref_services_profile_Library); err != nil {
+ if err := key16.FillVDLTarget(keyTarget15, tt.NonOptional().Field(5).Type.Key()); err != nil {
return err
}
if err := setTarget14.FinishKey(keyTarget15); err != nil {
@@ -275,8 +274,8 @@
func (t *SpecificationTarget) StartFields(tt *vdl.Type) (vdl.FieldsTarget, error) {
- if !vdl.Compatible(tt, __VDLType_v_io_x_ref_services_profile_Specification) {
- return nil, fmt.Errorf("type %v incompatible with %v", tt, __VDLType_v_io_x_ref_services_profile_Specification)
+ if ttWant := vdl.TypeOf((*Specification)(nil)).Elem(); !vdl.Compatible(tt, ttWant) {
+ return nil, fmt.Errorf("type %v incompatible with %v", tt, ttWant)
}
return t, nil
}
@@ -307,7 +306,7 @@
target, err := &t.librariesTarget, error(nil)
return nil, target, err
default:
- return nil, nil, fmt.Errorf("field %s not in struct %v", name, __VDLType_v_io_x_ref_services_profile_Specification)
+ return nil, nil, fmt.Errorf("field %s not in struct v.io/x/ref/services/profile.Specification", name)
}
}
func (t *SpecificationTarget) FinishField(_, _ vdl.Target) error {
@@ -329,8 +328,8 @@
func (t *unnamed_7365745b762e696f2f782f7265662f73657276696365732f70726f66696c652e4c696272617279207374727563747b4e616d6520737472696e673b4d616a6f7256657273696f6e20737472696e673b4d696e6f7256657273696f6e20737472696e677d5dTarget) StartSet(tt *vdl.Type, len int) (vdl.SetTarget, error) {
- if !vdl.Compatible(tt, __VDLType2) {
- return nil, fmt.Errorf("type %v incompatible with %v", tt, __VDLType2)
+ if ttWant := vdl.TypeOf((*map[Library]struct{})(nil)); !vdl.Compatible(tt, ttWant) {
+ return nil, fmt.Errorf("type %v incompatible with %v", tt, ttWant)
}
*t.Value = make(map[Library]struct{})
return t, nil
@@ -353,19 +352,29 @@
return nil
}
-func init() {
+var __VDLInitCalled bool
+
+// __VDLInit performs vdl initialization. It is safe to call multiple times.
+// If you have an init ordering issue, just insert the following line verbatim
+// into your source files in this package, right after the "package foo" clause:
+//
+// var _ = __VDLInit()
+//
+// The purpose of this function is to ensure that vdl initialization occurs in
+// the right order, and very early in the init sequence. In particular, vdl
+// registration and package variable initialization needs to occur before
+// functions like vdl.TypeOf will work properly.
+//
+// This function returns a dummy value, so that it can be used to initialize the
+// first var in the file, to take advantage of Go's defined init order.
+func __VDLInit() struct{} {
+ if __VDLInitCalled {
+ return struct{}{}
+ }
+
+ // Register types.
vdl.Register((*Library)(nil))
vdl.Register((*Specification)(nil))
-}
-var __VDLType0 *vdl.Type = vdl.TypeOf((*Library)(nil))
-var __VDLType1 *vdl.Type = vdl.TypeOf((*Specification)(nil))
-var __VDLType2 *vdl.Type = vdl.TypeOf(map[Library]struct{}(nil))
-var __VDLType_v_io_v23_services_build_Architecture *vdl.Type = vdl.TypeOf(build.ArchitectureAmd64)
-var __VDLType_v_io_v23_services_build_Format *vdl.Type = vdl.TypeOf(build.FormatElf)
-var __VDLType_v_io_v23_services_build_OperatingSystem *vdl.Type = vdl.TypeOf(build.OperatingSystemDarwin)
-var __VDLType_v_io_x_ref_services_profile_Library *vdl.Type = vdl.TypeOf(Library{})
-var __VDLType_v_io_x_ref_services_profile_Specification *vdl.Type = vdl.TypeOf(Specification{})
-
-func __VDLEnsureNativeBuilt() {
+ return struct{}{}
}
diff --git a/services/repository/repository.vdl.go b/services/repository/repository.vdl.go
index e2923df..4ee1ba4 100644
--- a/services/repository/repository.vdl.go
+++ b/services/repository/repository.vdl.go
@@ -22,8 +22,10 @@
"v.io/x/ref/services/profile"
)
-func __VDLEnsureNativeBuilt() {
-}
+var _ = __VDLInit() // Must be first; see __VDLInit comments for details.
+
+//////////////////////////////////////////////////
+// Interface definitions
// ApplicationClientMethods is the client interface
// containing Application methods.
@@ -407,3 +409,26 @@
},
},
}
+
+var __VDLInitCalled bool
+
+// __VDLInit performs vdl initialization. It is safe to call multiple times.
+// If you have an init ordering issue, just insert the following line verbatim
+// into your source files in this package, right after the "package foo" clause:
+//
+// var _ = __VDLInit()
+//
+// The purpose of this function is to ensure that vdl initialization occurs in
+// the right order, and very early in the init sequence. In particular, vdl
+// registration and package variable initialization needs to occur before
+// functions like vdl.TypeOf will work properly.
+//
+// This function returns a dummy value, so that it can be used to initialize the
+// first var in the file, to take advantage of Go's defined init order.
+func __VDLInit() struct{} {
+ if __VDLInitCalled {
+ return struct{}{}
+ }
+
+ return struct{}{}
+}
diff --git a/services/role/role.vdl.go b/services/role/role.vdl.go
index 2717d27..f8f4ce0 100644
--- a/services/role/role.vdl.go
+++ b/services/role/role.vdl.go
@@ -16,13 +16,18 @@
"v.io/v23/security"
)
-func __VDLEnsureNativeBuilt() {
-}
+var _ = __VDLInit() // Must be first; see __VDLInit comments for details.
+
+//////////////////////////////////////////////////
+// Const definitions
// Role.SeekBlessings will return an error if the requestor does not present
// blessings that end in this suffix.
const RoleSuffix = "_role"
+//////////////////////////////////////////////////
+// Interface definitions
+
// RoleClientMethods is the client interface
// containing Role methods.
//
@@ -139,3 +144,26 @@
},
},
}
+
+var __VDLInitCalled bool
+
+// __VDLInit performs vdl initialization. It is safe to call multiple times.
+// If you have an init ordering issue, just insert the following line verbatim
+// into your source files in this package, right after the "package foo" clause:
+//
+// var _ = __VDLInit()
+//
+// The purpose of this function is to ensure that vdl initialization occurs in
+// the right order, and very early in the init sequence. In particular, vdl
+// registration and package variable initialization needs to occur before
+// functions like vdl.TypeOf will work properly.
+//
+// This function returns a dummy value, so that it can be used to initialize the
+// first var in the file, to take advantage of Go's defined init order.
+func __VDLInit() struct{} {
+ if __VDLInitCalled {
+ return struct{}{}
+ }
+
+ return struct{}{}
+}
diff --git a/services/role/roled/internal/internal.vdl.go b/services/role/roled/internal/internal.vdl.go
index 90330a7..584d7a7 100644
--- a/services/role/roled/internal/internal.vdl.go
+++ b/services/role/roled/internal/internal.vdl.go
@@ -14,6 +14,11 @@
"v.io/v23/vdl"
)
+var _ = __VDLInit() // Must be first; see __VDLInit comments for details.
+
+//////////////////////////////////////////////////
+// Type definitions
+
// Config contains the attributes of the role, and the list of members who have
// access to it.
type Config struct {
@@ -48,9 +53,6 @@
}
func (m *Config) FillVDLTarget(t vdl.Target, tt *vdl.Type) error {
- if __VDLType_v_io_x_ref_services_role_roled_internal_Config == nil || __VDLType0 == nil {
- panic("Initialization order error: types generated for FillVDLTarget not initialized. Consider moving caller to an init() block.")
- }
fieldsTarget1, err := t.StartFields(tt)
if err != nil {
return err
@@ -62,7 +64,7 @@
}
if err != vdl.ErrFieldNoExist {
- listTarget4, err := fieldTarget3.StartList(__VDLType1, len(m.ImportMembers))
+ listTarget4, err := fieldTarget3.StartList(tt.NonOptional().Field(0).Type, len(m.ImportMembers))
if err != nil {
return err
}
@@ -71,7 +73,7 @@
if err != nil {
return err
}
- if err := elemTarget5.FromString(string(elem6), vdl.StringType); err != nil {
+ if err := elemTarget5.FromString(string(elem6), tt.NonOptional().Field(0).Type.Elem()); err != nil {
return err
}
if err := listTarget4.FinishElem(elemTarget5); err != nil {
@@ -91,7 +93,7 @@
}
if err != vdl.ErrFieldNoExist {
- listTarget9, err := fieldTarget8.StartList(__VDLType2, len(m.Members))
+ listTarget9, err := fieldTarget8.StartList(tt.NonOptional().Field(1).Type, len(m.Members))
if err != nil {
return err
}
@@ -101,7 +103,7 @@
return err
}
- if err := elem11.FillVDLTarget(elemTarget10, __VDLType_v_io_v23_security_BlessingPattern); err != nil {
+ if err := elem11.FillVDLTarget(elemTarget10, tt.NonOptional().Field(1).Type.Elem()); err != nil {
return err
}
if err := listTarget9.FinishElem(elemTarget10); err != nil {
@@ -120,7 +122,7 @@
return err
}
if err != vdl.ErrFieldNoExist {
- if err := fieldTarget13.FromBool(bool(m.Extend), vdl.BoolType); err != nil {
+ if err := fieldTarget13.FromBool(bool(m.Extend), tt.NonOptional().Field(2).Type); err != nil {
return err
}
if err := fieldsTarget1.FinishField(keyTarget12, fieldTarget13); err != nil {
@@ -132,7 +134,7 @@
return err
}
if err != vdl.ErrFieldNoExist {
- if err := fieldTarget15.FromBool(bool(m.Audit), vdl.BoolType); err != nil {
+ if err := fieldTarget15.FromBool(bool(m.Audit), tt.NonOptional().Field(3).Type); err != nil {
return err
}
if err := fieldsTarget1.FinishField(keyTarget14, fieldTarget15); err != nil {
@@ -144,7 +146,7 @@
return err
}
if err != vdl.ErrFieldNoExist {
- if err := fieldTarget17.FromString(string(m.Expiry), vdl.StringType); err != nil {
+ if err := fieldTarget17.FromString(string(m.Expiry), tt.NonOptional().Field(4).Type); err != nil {
return err
}
if err := fieldsTarget1.FinishField(keyTarget16, fieldTarget17); err != nil {
@@ -157,7 +159,7 @@
}
if err != vdl.ErrFieldNoExist {
- listTarget20, err := fieldTarget19.StartList(__VDLType2, len(m.Peers))
+ listTarget20, err := fieldTarget19.StartList(tt.NonOptional().Field(5).Type, len(m.Peers))
if err != nil {
return err
}
@@ -167,7 +169,7 @@
return err
}
- if err := elem22.FillVDLTarget(elemTarget21, __VDLType_v_io_v23_security_BlessingPattern); err != nil {
+ if err := elem22.FillVDLTarget(elemTarget21, tt.NonOptional().Field(5).Type.Elem()); err != nil {
return err
}
if err := listTarget20.FinishElem(elemTarget21); err != nil {
@@ -205,8 +207,8 @@
func (t *ConfigTarget) StartFields(tt *vdl.Type) (vdl.FieldsTarget, error) {
- if !vdl.Compatible(tt, __VDLType_v_io_x_ref_services_role_roled_internal_Config) {
- return nil, fmt.Errorf("type %v incompatible with %v", tt, __VDLType_v_io_x_ref_services_role_roled_internal_Config)
+ if ttWant := vdl.TypeOf((*Config)(nil)).Elem(); !vdl.Compatible(tt, ttWant) {
+ return nil, fmt.Errorf("type %v incompatible with %v", tt, ttWant)
}
return t, nil
}
@@ -237,7 +239,7 @@
target, err := &t.peersTarget, error(nil)
return nil, target, err
default:
- return nil, nil, fmt.Errorf("field %s not in struct %v", name, __VDLType_v_io_x_ref_services_role_roled_internal_Config)
+ return nil, nil, fmt.Errorf("field %s not in struct v.io/x/ref/services/role/roled/internal.Config", name)
}
}
func (t *ConfigTarget) FinishField(_, _ vdl.Target) error {
@@ -258,8 +260,8 @@
func (t *unnamed_5b5d762e696f2f7632332f73656375726974792e426c657373696e675061747465726e20737472696e67Target) StartList(tt *vdl.Type, len int) (vdl.ListTarget, error) {
- if !vdl.Compatible(tt, __VDLType2) {
- return nil, fmt.Errorf("type %v incompatible with %v", tt, __VDLType2)
+ if ttWant := vdl.TypeOf((*[]security.BlessingPattern)(nil)); !vdl.Compatible(tt, ttWant) {
+ return nil, fmt.Errorf("type %v incompatible with %v", tt, ttWant)
}
if cap(*t.Value) < len {
*t.Value = make([]security.BlessingPattern, len)
@@ -281,18 +283,8 @@
return nil
}
-func init() {
- vdl.Register((*Config)(nil))
-}
-
-var __VDLType0 *vdl.Type = vdl.TypeOf((*Config)(nil))
-var __VDLType1 *vdl.Type = vdl.TypeOf([]string(nil))
-var __VDLType2 *vdl.Type = vdl.TypeOf([]security.BlessingPattern(nil))
-var __VDLType_v_io_v23_security_BlessingPattern *vdl.Type = vdl.TypeOf(security.BlessingPattern(""))
-var __VDLType_v_io_x_ref_services_role_roled_internal_Config *vdl.Type = vdl.TypeOf(Config{})
-
-func __VDLEnsureNativeBuilt() {
-}
+//////////////////////////////////////////////////
+// Const definitions
// LoggingCaveat is a caveat that will always validate but it logs the parameter on every attempt to validate it.
var LoggingCaveat = security.CaveatDescriptor{
@@ -314,5 +306,31 @@
128,
0,
},
- ParamType: vdl.TypeOf([]string(nil)),
+ ParamType: vdl.TypeOf((*[]string)(nil)),
+}
+
+var __VDLInitCalled bool
+
+// __VDLInit performs vdl initialization. It is safe to call multiple times.
+// If you have an init ordering issue, just insert the following line verbatim
+// into your source files in this package, right after the "package foo" clause:
+//
+// var _ = __VDLInit()
+//
+// The purpose of this function is to ensure that vdl initialization occurs in
+// the right order, and very early in the init sequence. In particular, vdl
+// registration and package variable initialization needs to occur before
+// functions like vdl.TypeOf will work properly.
+//
+// This function returns a dummy value, so that it can be used to initialize the
+// first var in the file, to take advantage of Go's defined init order.
+func __VDLInit() struct{} {
+ if __VDLInitCalled {
+ return struct{}{}
+ }
+
+ // Register types.
+ vdl.Register((*Config)(nil))
+
+ return struct{}{}
}
diff --git a/services/stats/stats.vdl.go b/services/stats/stats.vdl.go
index 377d555..a61a2f2 100644
--- a/services/stats/stats.vdl.go
+++ b/services/stats/stats.vdl.go
@@ -13,6 +13,101 @@
"v.io/v23/vdl"
)
+var _ = __VDLInit() // Must be first; see __VDLInit comments for details.
+
+//////////////////////////////////////////////////
+// Type definitions
+
+// HistogramBucket is one histogram bucket.
+type HistogramBucket struct {
+ // LowBound is the lower bound of the bucket.
+ LowBound int64
+ // Count is the number of values in the bucket.
+ Count int64
+}
+
+func (HistogramBucket) __VDLReflect(struct {
+ Name string `vdl:"v.io/x/ref/services/stats.HistogramBucket"`
+}) {
+}
+
+func (m *HistogramBucket) FillVDLTarget(t vdl.Target, tt *vdl.Type) error {
+ fieldsTarget1, err := t.StartFields(tt)
+ if err != nil {
+ return err
+ }
+
+ keyTarget2, fieldTarget3, err := fieldsTarget1.StartField("LowBound")
+ if err != vdl.ErrFieldNoExist && err != nil {
+ return err
+ }
+ if err != vdl.ErrFieldNoExist {
+ if err := fieldTarget3.FromInt(int64(m.LowBound), tt.NonOptional().Field(0).Type); err != nil {
+ return err
+ }
+ if err := fieldsTarget1.FinishField(keyTarget2, fieldTarget3); err != nil {
+ return err
+ }
+ }
+ keyTarget4, fieldTarget5, err := fieldsTarget1.StartField("Count")
+ if err != vdl.ErrFieldNoExist && err != nil {
+ return err
+ }
+ if err != vdl.ErrFieldNoExist {
+ if err := fieldTarget5.FromInt(int64(m.Count), tt.NonOptional().Field(1).Type); err != nil {
+ return err
+ }
+ if err := fieldsTarget1.FinishField(keyTarget4, fieldTarget5); err != nil {
+ return err
+ }
+ }
+ if err := t.FinishFields(fieldsTarget1); err != nil {
+ return err
+ }
+ return nil
+}
+
+func (m *HistogramBucket) MakeVDLTarget() vdl.Target {
+ return &HistogramBucketTarget{Value: m}
+}
+
+type HistogramBucketTarget struct {
+ Value *HistogramBucket
+ lowBoundTarget vdl.Int64Target
+ countTarget vdl.Int64Target
+ vdl.TargetBase
+ vdl.FieldsTargetBase
+}
+
+func (t *HistogramBucketTarget) StartFields(tt *vdl.Type) (vdl.FieldsTarget, error) {
+
+ if ttWant := vdl.TypeOf((*HistogramBucket)(nil)).Elem(); !vdl.Compatible(tt, ttWant) {
+ return nil, fmt.Errorf("type %v incompatible with %v", tt, ttWant)
+ }
+ return t, nil
+}
+func (t *HistogramBucketTarget) StartField(name string) (key, field vdl.Target, _ error) {
+ switch name {
+ case "LowBound":
+ t.lowBoundTarget.Value = &t.Value.LowBound
+ target, err := &t.lowBoundTarget, error(nil)
+ return nil, target, err
+ case "Count":
+ t.countTarget.Value = &t.Value.Count
+ target, err := &t.countTarget, error(nil)
+ return nil, target, err
+ default:
+ return nil, nil, fmt.Errorf("field %s not in struct v.io/x/ref/services/stats.HistogramBucket", name)
+ }
+}
+func (t *HistogramBucketTarget) FinishField(_, _ vdl.Target) error {
+ return nil
+}
+func (t *HistogramBucketTarget) FinishFields(_ vdl.FieldsTarget) error {
+
+ return nil
+}
+
// HistogramValue is the value of Histogram objects.
type HistogramValue struct {
// Count is the total number of values added to the histogram.
@@ -33,9 +128,6 @@
}
func (m *HistogramValue) FillVDLTarget(t vdl.Target, tt *vdl.Type) error {
- if __VDLType_v_io_x_ref_services_stats_HistogramValue == nil || __VDLType0 == nil {
- panic("Initialization order error: types generated for FillVDLTarget not initialized. Consider moving caller to an init() block.")
- }
fieldsTarget1, err := t.StartFields(tt)
if err != nil {
return err
@@ -46,7 +138,7 @@
return err
}
if err != vdl.ErrFieldNoExist {
- if err := fieldTarget3.FromInt(int64(m.Count), vdl.Int64Type); err != nil {
+ if err := fieldTarget3.FromInt(int64(m.Count), tt.NonOptional().Field(0).Type); err != nil {
return err
}
if err := fieldsTarget1.FinishField(keyTarget2, fieldTarget3); err != nil {
@@ -58,7 +150,7 @@
return err
}
if err != vdl.ErrFieldNoExist {
- if err := fieldTarget5.FromInt(int64(m.Sum), vdl.Int64Type); err != nil {
+ if err := fieldTarget5.FromInt(int64(m.Sum), tt.NonOptional().Field(1).Type); err != nil {
return err
}
if err := fieldsTarget1.FinishField(keyTarget4, fieldTarget5); err != nil {
@@ -70,7 +162,7 @@
return err
}
if err != vdl.ErrFieldNoExist {
- if err := fieldTarget7.FromInt(int64(m.Min), vdl.Int64Type); err != nil {
+ if err := fieldTarget7.FromInt(int64(m.Min), tt.NonOptional().Field(2).Type); err != nil {
return err
}
if err := fieldsTarget1.FinishField(keyTarget6, fieldTarget7); err != nil {
@@ -82,7 +174,7 @@
return err
}
if err != vdl.ErrFieldNoExist {
- if err := fieldTarget9.FromInt(int64(m.Max), vdl.Int64Type); err != nil {
+ if err := fieldTarget9.FromInt(int64(m.Max), tt.NonOptional().Field(3).Type); err != nil {
return err
}
if err := fieldsTarget1.FinishField(keyTarget8, fieldTarget9); err != nil {
@@ -95,7 +187,7 @@
}
if err != vdl.ErrFieldNoExist {
- listTarget12, err := fieldTarget11.StartList(__VDLType1, len(m.Buckets))
+ listTarget12, err := fieldTarget11.StartList(tt.NonOptional().Field(4).Type, len(m.Buckets))
if err != nil {
return err
}
@@ -105,7 +197,7 @@
return err
}
- if err := elem14.FillVDLTarget(elemTarget13, __VDLType_v_io_x_ref_services_stats_HistogramBucket); err != nil {
+ if err := elem14.FillVDLTarget(elemTarget13, tt.NonOptional().Field(4).Type.Elem()); err != nil {
return err
}
if err := listTarget12.FinishElem(elemTarget13); err != nil {
@@ -142,8 +234,8 @@
func (t *HistogramValueTarget) StartFields(tt *vdl.Type) (vdl.FieldsTarget, error) {
- if !vdl.Compatible(tt, __VDLType_v_io_x_ref_services_stats_HistogramValue) {
- return nil, fmt.Errorf("type %v incompatible with %v", tt, __VDLType_v_io_x_ref_services_stats_HistogramValue)
+ if ttWant := vdl.TypeOf((*HistogramValue)(nil)).Elem(); !vdl.Compatible(tt, ttWant) {
+ return nil, fmt.Errorf("type %v incompatible with %v", tt, ttWant)
}
return t, nil
}
@@ -170,7 +262,7 @@
target, err := &t.bucketsTarget, error(nil)
return nil, target, err
default:
- return nil, nil, fmt.Errorf("field %s not in struct %v", name, __VDLType_v_io_x_ref_services_stats_HistogramValue)
+ return nil, nil, fmt.Errorf("field %s not in struct v.io/x/ref/services/stats.HistogramValue", name)
}
}
func (t *HistogramValueTarget) FinishField(_, _ vdl.Target) error {
@@ -191,8 +283,8 @@
func (t *unnamed_5b5d762e696f2f782f7265662f73657276696365732f73746174732e486973746f6772616d4275636b6574207374727563747b4c6f77426f756e6420696e7436343b436f756e7420696e7436347dTarget) StartList(tt *vdl.Type, len int) (vdl.ListTarget, error) {
- if !vdl.Compatible(tt, __VDLType1) {
- return nil, fmt.Errorf("type %v incompatible with %v", tt, __VDLType1)
+ if ttWant := vdl.TypeOf((*[]HistogramBucket)(nil)); !vdl.Compatible(tt, ttWant) {
+ return nil, fmt.Errorf("type %v incompatible with %v", tt, ttWant)
}
if cap(*t.Value) < len {
*t.Value = make([]HistogramBucket, len)
@@ -214,109 +306,29 @@
return nil
}
-type HistogramBucketTarget struct {
- Value *HistogramBucket
- lowBoundTarget vdl.Int64Target
- countTarget vdl.Int64Target
- vdl.TargetBase
- vdl.FieldsTargetBase
-}
+var __VDLInitCalled bool
-func (t *HistogramBucketTarget) StartFields(tt *vdl.Type) (vdl.FieldsTarget, error) {
-
- if !vdl.Compatible(tt, __VDLType_v_io_x_ref_services_stats_HistogramBucket) {
- return nil, fmt.Errorf("type %v incompatible with %v", tt, __VDLType_v_io_x_ref_services_stats_HistogramBucket)
- }
- return t, nil
-}
-func (t *HistogramBucketTarget) StartField(name string) (key, field vdl.Target, _ error) {
- switch name {
- case "LowBound":
- t.lowBoundTarget.Value = &t.Value.LowBound
- target, err := &t.lowBoundTarget, error(nil)
- return nil, target, err
- case "Count":
- t.countTarget.Value = &t.Value.Count
- target, err := &t.countTarget, error(nil)
- return nil, target, err
- default:
- return nil, nil, fmt.Errorf("field %s not in struct %v", name, __VDLType_v_io_x_ref_services_stats_HistogramBucket)
- }
-}
-func (t *HistogramBucketTarget) FinishField(_, _ vdl.Target) error {
- return nil
-}
-func (t *HistogramBucketTarget) FinishFields(_ vdl.FieldsTarget) error {
-
- return nil
-}
-
-// HistogramBucket is one histogram bucket.
-type HistogramBucket struct {
- // LowBound is the lower bound of the bucket.
- LowBound int64
- // Count is the number of values in the bucket.
- Count int64
-}
-
-func (HistogramBucket) __VDLReflect(struct {
- Name string `vdl:"v.io/x/ref/services/stats.HistogramBucket"`
-}) {
-}
-
-func (m *HistogramBucket) FillVDLTarget(t vdl.Target, tt *vdl.Type) error {
- if __VDLType_v_io_x_ref_services_stats_HistogramBucket == nil || __VDLType2 == nil {
- panic("Initialization order error: types generated for FillVDLTarget not initialized. Consider moving caller to an init() block.")
- }
- fieldsTarget1, err := t.StartFields(tt)
- if err != nil {
- return err
+// __VDLInit performs vdl initialization. It is safe to call multiple times.
+// If you have an init ordering issue, just insert the following line verbatim
+// into your source files in this package, right after the "package foo" clause:
+//
+// var _ = __VDLInit()
+//
+// The purpose of this function is to ensure that vdl initialization occurs in
+// the right order, and very early in the init sequence. In particular, vdl
+// registration and package variable initialization needs to occur before
+// functions like vdl.TypeOf will work properly.
+//
+// This function returns a dummy value, so that it can be used to initialize the
+// first var in the file, to take advantage of Go's defined init order.
+func __VDLInit() struct{} {
+ if __VDLInitCalled {
+ return struct{}{}
}
- keyTarget2, fieldTarget3, err := fieldsTarget1.StartField("LowBound")
- if err != vdl.ErrFieldNoExist && err != nil {
- return err
- }
- if err != vdl.ErrFieldNoExist {
- if err := fieldTarget3.FromInt(int64(m.LowBound), vdl.Int64Type); err != nil {
- return err
- }
- if err := fieldsTarget1.FinishField(keyTarget2, fieldTarget3); err != nil {
- return err
- }
- }
- keyTarget4, fieldTarget5, err := fieldsTarget1.StartField("Count")
- if err != vdl.ErrFieldNoExist && err != nil {
- return err
- }
- if err != vdl.ErrFieldNoExist {
- if err := fieldTarget5.FromInt(int64(m.Count), vdl.Int64Type); err != nil {
- return err
- }
- if err := fieldsTarget1.FinishField(keyTarget4, fieldTarget5); err != nil {
- return err
- }
- }
- if err := t.FinishFields(fieldsTarget1); err != nil {
- return err
- }
- return nil
-}
-
-func (m *HistogramBucket) MakeVDLTarget() vdl.Target {
- return &HistogramBucketTarget{Value: m}
-}
-
-func init() {
- vdl.Register((*HistogramValue)(nil))
+ // Register types.
vdl.Register((*HistogramBucket)(nil))
-}
+ vdl.Register((*HistogramValue)(nil))
-var __VDLType2 *vdl.Type = vdl.TypeOf((*HistogramBucket)(nil))
-var __VDLType0 *vdl.Type = vdl.TypeOf((*HistogramValue)(nil))
-var __VDLType1 *vdl.Type = vdl.TypeOf([]HistogramBucket(nil))
-var __VDLType_v_io_x_ref_services_stats_HistogramBucket *vdl.Type = vdl.TypeOf(HistogramBucket{})
-var __VDLType_v_io_x_ref_services_stats_HistogramValue *vdl.Type = vdl.TypeOf(HistogramValue{})
-
-func __VDLEnsureNativeBuilt() {
+ return struct{}{}
}
diff --git a/services/syncbase/localblobstore/localblobstore.vdl.go b/services/syncbase/localblobstore/localblobstore.vdl.go
index 9916b80..f8db42c 100644
--- a/services/syncbase/localblobstore/localblobstore.vdl.go
+++ b/services/syncbase/localblobstore/localblobstore.vdl.go
@@ -15,6 +15,11 @@
"v.io/x/ref/services/syncbase/server/interfaces"
)
+var _ = __VDLInit() // Must be first; see __VDLInit comments for details.
+
+//////////////////////////////////////////////////
+// Type definitions
+
// A BlobMetadata describes information that syncbase stores for a blob it
// holds, independent of the actual content. Compare with a Signpost, which
// may be stored for a blob that the current device does not hold (and
@@ -33,7 +38,6 @@
}
func (m *BlobMetadata) FillVDLTarget(t vdl.Target, tt *vdl.Type) error {
- __VDLEnsureNativeBuilt()
fieldsTarget1, err := t.StartFields(tt)
if err != nil {
return err
@@ -45,7 +49,7 @@
}
if err != vdl.ErrFieldNoExist {
- if err := m.OwnerShares.FillVDLTarget(fieldTarget3, __VDLType_v_io_x_ref_services_syncbase_server_interfaces_BlobSharesBySyncgroup); err != nil {
+ if err := m.OwnerShares.FillVDLTarget(fieldTarget3, tt.NonOptional().Field(0).Type); err != nil {
return err
}
if err := fieldsTarget1.FinishField(keyTarget2, fieldTarget3); err != nil {
@@ -63,7 +67,7 @@
}
if err != vdl.ErrFieldNoExist {
- if err := wireValue4.FillVDLTarget(fieldTarget6, __VDLType_time_Time); err != nil {
+ if err := wireValue4.FillVDLTarget(fieldTarget6, tt.NonOptional().Field(1).Type); err != nil {
return err
}
if err := fieldsTarget1.FinishField(keyTarget5, fieldTarget6); err != nil {
@@ -81,7 +85,7 @@
}
if err != vdl.ErrFieldNoExist {
- if err := wireValue7.FillVDLTarget(fieldTarget9, __VDLType_time_Time); err != nil {
+ if err := wireValue7.FillVDLTarget(fieldTarget9, tt.NonOptional().Field(2).Type); err != nil {
return err
}
if err := fieldsTarget1.FinishField(keyTarget8, fieldTarget9); err != nil {
@@ -109,8 +113,8 @@
func (t *BlobMetadataTarget) StartFields(tt *vdl.Type) (vdl.FieldsTarget, error) {
- if !vdl.Compatible(tt, __VDLType_v_io_x_ref_services_syncbase_localblobstore_BlobMetadata) {
- return nil, fmt.Errorf("type %v incompatible with %v", tt, __VDLType_v_io_x_ref_services_syncbase_localblobstore_BlobMetadata)
+ if ttWant := vdl.TypeOf((*BlobMetadata)(nil)).Elem(); !vdl.Compatible(tt, ttWant) {
+ return nil, fmt.Errorf("type %v incompatible with %v", tt, ttWant)
}
return t, nil
}
@@ -129,7 +133,7 @@
target, err := &t.accessedTarget, error(nil)
return nil, target, err
default:
- return nil, nil, fmt.Errorf("field %s not in struct %v", name, __VDLType_v_io_x_ref_services_syncbase_localblobstore_BlobMetadata)
+ return nil, nil, fmt.Errorf("field %s not in struct v.io/x/ref/services/syncbase/localblobstore.BlobMetadata", name)
}
}
func (t *BlobMetadataTarget) FinishField(_, _ vdl.Target) error {
@@ -153,7 +157,6 @@
}
func (m *PerSyncgroup) FillVDLTarget(t vdl.Target, tt *vdl.Type) error {
- __VDLEnsureNativeBuilt()
fieldsTarget1, err := t.StartFields(tt)
if err != nil {
return err
@@ -165,7 +168,7 @@
}
if err != vdl.ErrFieldNoExist {
- if err := m.Priority.FillVDLTarget(fieldTarget3, __VDLType_v_io_x_ref_services_syncbase_server_interfaces_SgPriority); err != nil {
+ if err := m.Priority.FillVDLTarget(fieldTarget3, tt.NonOptional().Field(0).Type); err != nil {
return err
}
if err := fieldsTarget1.FinishField(keyTarget2, fieldTarget3); err != nil {
@@ -191,8 +194,8 @@
func (t *PerSyncgroupTarget) StartFields(tt *vdl.Type) (vdl.FieldsTarget, error) {
- if !vdl.Compatible(tt, __VDLType_v_io_x_ref_services_syncbase_localblobstore_PerSyncgroup) {
- return nil, fmt.Errorf("type %v incompatible with %v", tt, __VDLType_v_io_x_ref_services_syncbase_localblobstore_PerSyncgroup)
+ if ttWant := vdl.TypeOf((*PerSyncgroup)(nil)).Elem(); !vdl.Compatible(tt, ttWant) {
+ return nil, fmt.Errorf("type %v incompatible with %v", tt, ttWant)
}
return t, nil
}
@@ -203,7 +206,7 @@
target, err := &t.priorityTarget, error(nil)
return nil, target, err
default:
- return nil, nil, fmt.Errorf("field %s not in struct %v", name, __VDLType_v_io_x_ref_services_syncbase_localblobstore_PerSyncgroup)
+ return nil, nil, fmt.Errorf("field %s not in struct v.io/x/ref/services/syncbase/localblobstore.PerSyncgroup", name)
}
}
func (t *PerSyncgroupTarget) FinishField(_, _ vdl.Target) error {
@@ -214,204 +217,29 @@
return nil
}
-func init() {
+var __VDLInitCalled bool
+
+// __VDLInit performs vdl initialization. It is safe to call multiple times.
+// If you have an init ordering issue, just insert the following line verbatim
+// into your source files in this package, right after the "package foo" clause:
+//
+// var _ = __VDLInit()
+//
+// The purpose of this function is to ensure that vdl initialization occurs in
+// the right order, and very early in the init sequence. In particular, vdl
+// registration and package variable initialization needs to occur before
+// functions like vdl.TypeOf will work properly.
+//
+// This function returns a dummy value, so that it can be used to initialize the
+// first var in the file, to take advantage of Go's defined init order.
+func __VDLInit() struct{} {
+ if __VDLInitCalled {
+ return struct{}{}
+ }
+
+ // Register types.
vdl.Register((*BlobMetadata)(nil))
vdl.Register((*PerSyncgroup)(nil))
-}
-var __VDLType0 *vdl.Type
-
-func __VDLType0_gen() *vdl.Type {
- __VDLType0Builder := vdl.TypeBuilder{}
-
- __VDLType01 := __VDLType0Builder.Optional()
- __VDLType02 := __VDLType0Builder.Struct()
- __VDLType03 := __VDLType0Builder.Named("v.io/x/ref/services/syncbase/localblobstore.BlobMetadata").AssignBase(__VDLType02)
- __VDLType04 := __VDLType0Builder.Map()
- __VDLType05 := __VDLType0Builder.Named("v.io/x/ref/services/syncbase/server/interfaces.BlobSharesBySyncgroup").AssignBase(__VDLType04)
- __VDLType06 := vdl.Uint64Type
- __VDLType07 := __VDLType0Builder.Named("v.io/x/ref/services/syncbase/server/interfaces.GroupId").AssignBase(__VDLType06)
- __VDLType04.AssignKey(__VDLType07)
- __VDLType08 := vdl.Int32Type
- __VDLType04.AssignElem(__VDLType08)
- __VDLType02.AppendField("OwnerShares", __VDLType05)
- __VDLType09 := __VDLType0Builder.Struct()
- __VDLType010 := __VDLType0Builder.Named("time.Time").AssignBase(__VDLType09)
- __VDLType011 := vdl.Int64Type
- __VDLType09.AppendField("Seconds", __VDLType011)
- __VDLType09.AppendField("Nanos", __VDLType08)
- __VDLType02.AppendField("Referenced", __VDLType010)
- __VDLType02.AppendField("Accessed", __VDLType010)
- __VDLType01.AssignElem(__VDLType03)
- __VDLType0Builder.Build()
- __VDLType0v, err := __VDLType01.Built()
- if err != nil {
- panic(err)
- }
- return __VDLType0v
-}
-func init() {
- __VDLType0 = __VDLType0_gen()
-}
-
-var __VDLType1 *vdl.Type
-
-func __VDLType1_gen() *vdl.Type {
- __VDLType1Builder := vdl.TypeBuilder{}
-
- __VDLType11 := __VDLType1Builder.Optional()
- __VDLType12 := __VDLType1Builder.Struct()
- __VDLType13 := __VDLType1Builder.Named("v.io/x/ref/services/syncbase/localblobstore.PerSyncgroup").AssignBase(__VDLType12)
- __VDLType14 := __VDLType1Builder.Struct()
- __VDLType15 := __VDLType1Builder.Named("v.io/x/ref/services/syncbase/server/interfaces.SgPriority").AssignBase(__VDLType14)
- __VDLType16 := vdl.Int32Type
- __VDLType14.AppendField("Distance", __VDLType16)
- __VDLType17 := __VDLType1Builder.Struct()
- __VDLType18 := __VDLType1Builder.Named("time.Time").AssignBase(__VDLType17)
- __VDLType19 := vdl.Int64Type
- __VDLType17.AppendField("Seconds", __VDLType19)
- __VDLType17.AppendField("Nanos", __VDLType16)
- __VDLType14.AppendField("ServerTime", __VDLType18)
- __VDLType12.AppendField("Priority", __VDLType15)
- __VDLType11.AssignElem(__VDLType13)
- __VDLType1Builder.Build()
- __VDLType1v, err := __VDLType11.Built()
- if err != nil {
- panic(err)
- }
- return __VDLType1v
-}
-func init() {
- __VDLType1 = __VDLType1_gen()
-}
-
-var __VDLType_time_Time *vdl.Type
-
-func __VDLType_time_Time_gen() *vdl.Type {
- __VDLType_time_TimeBuilder := vdl.TypeBuilder{}
-
- __VDLType_time_Time1 := __VDLType_time_TimeBuilder.Struct()
- __VDLType_time_Time2 := __VDLType_time_TimeBuilder.Named("time.Time").AssignBase(__VDLType_time_Time1)
- __VDLType_time_Time3 := vdl.Int64Type
- __VDLType_time_Time1.AppendField("Seconds", __VDLType_time_Time3)
- __VDLType_time_Time4 := vdl.Int32Type
- __VDLType_time_Time1.AppendField("Nanos", __VDLType_time_Time4)
- __VDLType_time_TimeBuilder.Build()
- __VDLType_time_Timev, err := __VDLType_time_Time2.Built()
- if err != nil {
- panic(err)
- }
- return __VDLType_time_Timev
-}
-func init() {
- __VDLType_time_Time = __VDLType_time_Time_gen()
-}
-
-var __VDLType_v_io_x_ref_services_syncbase_localblobstore_BlobMetadata *vdl.Type
-
-func __VDLType_v_io_x_ref_services_syncbase_localblobstore_BlobMetadata_gen() *vdl.Type {
- __VDLType_v_io_x_ref_services_syncbase_localblobstore_BlobMetadataBuilder := vdl.TypeBuilder{}
-
- __VDLType_v_io_x_ref_services_syncbase_localblobstore_BlobMetadata1 := __VDLType_v_io_x_ref_services_syncbase_localblobstore_BlobMetadataBuilder.Struct()
- __VDLType_v_io_x_ref_services_syncbase_localblobstore_BlobMetadata2 := __VDLType_v_io_x_ref_services_syncbase_localblobstore_BlobMetadataBuilder.Named("v.io/x/ref/services/syncbase/localblobstore.BlobMetadata").AssignBase(__VDLType_v_io_x_ref_services_syncbase_localblobstore_BlobMetadata1)
- __VDLType_v_io_x_ref_services_syncbase_localblobstore_BlobMetadata3 := __VDLType_v_io_x_ref_services_syncbase_localblobstore_BlobMetadataBuilder.Map()
- __VDLType_v_io_x_ref_services_syncbase_localblobstore_BlobMetadata4 := __VDLType_v_io_x_ref_services_syncbase_localblobstore_BlobMetadataBuilder.Named("v.io/x/ref/services/syncbase/server/interfaces.BlobSharesBySyncgroup").AssignBase(__VDLType_v_io_x_ref_services_syncbase_localblobstore_BlobMetadata3)
- __VDLType_v_io_x_ref_services_syncbase_localblobstore_BlobMetadata5 := vdl.Uint64Type
- __VDLType_v_io_x_ref_services_syncbase_localblobstore_BlobMetadata6 := __VDLType_v_io_x_ref_services_syncbase_localblobstore_BlobMetadataBuilder.Named("v.io/x/ref/services/syncbase/server/interfaces.GroupId").AssignBase(__VDLType_v_io_x_ref_services_syncbase_localblobstore_BlobMetadata5)
- __VDLType_v_io_x_ref_services_syncbase_localblobstore_BlobMetadata3.AssignKey(__VDLType_v_io_x_ref_services_syncbase_localblobstore_BlobMetadata6)
- __VDLType_v_io_x_ref_services_syncbase_localblobstore_BlobMetadata7 := vdl.Int32Type
- __VDLType_v_io_x_ref_services_syncbase_localblobstore_BlobMetadata3.AssignElem(__VDLType_v_io_x_ref_services_syncbase_localblobstore_BlobMetadata7)
- __VDLType_v_io_x_ref_services_syncbase_localblobstore_BlobMetadata1.AppendField("OwnerShares", __VDLType_v_io_x_ref_services_syncbase_localblobstore_BlobMetadata4)
- __VDLType_v_io_x_ref_services_syncbase_localblobstore_BlobMetadata8 := __VDLType_v_io_x_ref_services_syncbase_localblobstore_BlobMetadataBuilder.Struct()
- __VDLType_v_io_x_ref_services_syncbase_localblobstore_BlobMetadata9 := __VDLType_v_io_x_ref_services_syncbase_localblobstore_BlobMetadataBuilder.Named("time.Time").AssignBase(__VDLType_v_io_x_ref_services_syncbase_localblobstore_BlobMetadata8)
- __VDLType_v_io_x_ref_services_syncbase_localblobstore_BlobMetadata10 := vdl.Int64Type
- __VDLType_v_io_x_ref_services_syncbase_localblobstore_BlobMetadata8.AppendField("Seconds", __VDLType_v_io_x_ref_services_syncbase_localblobstore_BlobMetadata10)
- __VDLType_v_io_x_ref_services_syncbase_localblobstore_BlobMetadata8.AppendField("Nanos", __VDLType_v_io_x_ref_services_syncbase_localblobstore_BlobMetadata7)
- __VDLType_v_io_x_ref_services_syncbase_localblobstore_BlobMetadata1.AppendField("Referenced", __VDLType_v_io_x_ref_services_syncbase_localblobstore_BlobMetadata9)
- __VDLType_v_io_x_ref_services_syncbase_localblobstore_BlobMetadata1.AppendField("Accessed", __VDLType_v_io_x_ref_services_syncbase_localblobstore_BlobMetadata9)
- __VDLType_v_io_x_ref_services_syncbase_localblobstore_BlobMetadataBuilder.Build()
- __VDLType_v_io_x_ref_services_syncbase_localblobstore_BlobMetadatav, err := __VDLType_v_io_x_ref_services_syncbase_localblobstore_BlobMetadata2.Built()
- if err != nil {
- panic(err)
- }
- return __VDLType_v_io_x_ref_services_syncbase_localblobstore_BlobMetadatav
-}
-func init() {
- __VDLType_v_io_x_ref_services_syncbase_localblobstore_BlobMetadata = __VDLType_v_io_x_ref_services_syncbase_localblobstore_BlobMetadata_gen()
-}
-
-var __VDLType_v_io_x_ref_services_syncbase_localblobstore_PerSyncgroup *vdl.Type
-
-func __VDLType_v_io_x_ref_services_syncbase_localblobstore_PerSyncgroup_gen() *vdl.Type {
- __VDLType_v_io_x_ref_services_syncbase_localblobstore_PerSyncgroupBuilder := vdl.TypeBuilder{}
-
- __VDLType_v_io_x_ref_services_syncbase_localblobstore_PerSyncgroup1 := __VDLType_v_io_x_ref_services_syncbase_localblobstore_PerSyncgroupBuilder.Struct()
- __VDLType_v_io_x_ref_services_syncbase_localblobstore_PerSyncgroup2 := __VDLType_v_io_x_ref_services_syncbase_localblobstore_PerSyncgroupBuilder.Named("v.io/x/ref/services/syncbase/localblobstore.PerSyncgroup").AssignBase(__VDLType_v_io_x_ref_services_syncbase_localblobstore_PerSyncgroup1)
- __VDLType_v_io_x_ref_services_syncbase_localblobstore_PerSyncgroup3 := __VDLType_v_io_x_ref_services_syncbase_localblobstore_PerSyncgroupBuilder.Struct()
- __VDLType_v_io_x_ref_services_syncbase_localblobstore_PerSyncgroup4 := __VDLType_v_io_x_ref_services_syncbase_localblobstore_PerSyncgroupBuilder.Named("v.io/x/ref/services/syncbase/server/interfaces.SgPriority").AssignBase(__VDLType_v_io_x_ref_services_syncbase_localblobstore_PerSyncgroup3)
- __VDLType_v_io_x_ref_services_syncbase_localblobstore_PerSyncgroup5 := vdl.Int32Type
- __VDLType_v_io_x_ref_services_syncbase_localblobstore_PerSyncgroup3.AppendField("Distance", __VDLType_v_io_x_ref_services_syncbase_localblobstore_PerSyncgroup5)
- __VDLType_v_io_x_ref_services_syncbase_localblobstore_PerSyncgroup6 := __VDLType_v_io_x_ref_services_syncbase_localblobstore_PerSyncgroupBuilder.Struct()
- __VDLType_v_io_x_ref_services_syncbase_localblobstore_PerSyncgroup7 := __VDLType_v_io_x_ref_services_syncbase_localblobstore_PerSyncgroupBuilder.Named("time.Time").AssignBase(__VDLType_v_io_x_ref_services_syncbase_localblobstore_PerSyncgroup6)
- __VDLType_v_io_x_ref_services_syncbase_localblobstore_PerSyncgroup8 := vdl.Int64Type
- __VDLType_v_io_x_ref_services_syncbase_localblobstore_PerSyncgroup6.AppendField("Seconds", __VDLType_v_io_x_ref_services_syncbase_localblobstore_PerSyncgroup8)
- __VDLType_v_io_x_ref_services_syncbase_localblobstore_PerSyncgroup6.AppendField("Nanos", __VDLType_v_io_x_ref_services_syncbase_localblobstore_PerSyncgroup5)
- __VDLType_v_io_x_ref_services_syncbase_localblobstore_PerSyncgroup3.AppendField("ServerTime", __VDLType_v_io_x_ref_services_syncbase_localblobstore_PerSyncgroup7)
- __VDLType_v_io_x_ref_services_syncbase_localblobstore_PerSyncgroup1.AppendField("Priority", __VDLType_v_io_x_ref_services_syncbase_localblobstore_PerSyncgroup4)
- __VDLType_v_io_x_ref_services_syncbase_localblobstore_PerSyncgroupBuilder.Build()
- __VDLType_v_io_x_ref_services_syncbase_localblobstore_PerSyncgroupv, err := __VDLType_v_io_x_ref_services_syncbase_localblobstore_PerSyncgroup2.Built()
- if err != nil {
- panic(err)
- }
- return __VDLType_v_io_x_ref_services_syncbase_localblobstore_PerSyncgroupv
-}
-func init() {
- __VDLType_v_io_x_ref_services_syncbase_localblobstore_PerSyncgroup = __VDLType_v_io_x_ref_services_syncbase_localblobstore_PerSyncgroup_gen()
-}
-
-var __VDLType_v_io_x_ref_services_syncbase_server_interfaces_BlobSharesBySyncgroup *vdl.Type = vdl.TypeOf(interfaces.BlobSharesBySyncgroup(nil))
-var __VDLType_v_io_x_ref_services_syncbase_server_interfaces_SgPriority *vdl.Type
-
-func __VDLType_v_io_x_ref_services_syncbase_server_interfaces_SgPriority_gen() *vdl.Type {
- __VDLType_v_io_x_ref_services_syncbase_server_interfaces_SgPriorityBuilder := vdl.TypeBuilder{}
-
- __VDLType_v_io_x_ref_services_syncbase_server_interfaces_SgPriority1 := __VDLType_v_io_x_ref_services_syncbase_server_interfaces_SgPriorityBuilder.Struct()
- __VDLType_v_io_x_ref_services_syncbase_server_interfaces_SgPriority2 := __VDLType_v_io_x_ref_services_syncbase_server_interfaces_SgPriorityBuilder.Named("v.io/x/ref/services/syncbase/server/interfaces.SgPriority").AssignBase(__VDLType_v_io_x_ref_services_syncbase_server_interfaces_SgPriority1)
- __VDLType_v_io_x_ref_services_syncbase_server_interfaces_SgPriority3 := vdl.Int32Type
- __VDLType_v_io_x_ref_services_syncbase_server_interfaces_SgPriority1.AppendField("Distance", __VDLType_v_io_x_ref_services_syncbase_server_interfaces_SgPriority3)
- __VDLType_v_io_x_ref_services_syncbase_server_interfaces_SgPriority4 := __VDLType_v_io_x_ref_services_syncbase_server_interfaces_SgPriorityBuilder.Struct()
- __VDLType_v_io_x_ref_services_syncbase_server_interfaces_SgPriority5 := __VDLType_v_io_x_ref_services_syncbase_server_interfaces_SgPriorityBuilder.Named("time.Time").AssignBase(__VDLType_v_io_x_ref_services_syncbase_server_interfaces_SgPriority4)
- __VDLType_v_io_x_ref_services_syncbase_server_interfaces_SgPriority6 := vdl.Int64Type
- __VDLType_v_io_x_ref_services_syncbase_server_interfaces_SgPriority4.AppendField("Seconds", __VDLType_v_io_x_ref_services_syncbase_server_interfaces_SgPriority6)
- __VDLType_v_io_x_ref_services_syncbase_server_interfaces_SgPriority4.AppendField("Nanos", __VDLType_v_io_x_ref_services_syncbase_server_interfaces_SgPriority3)
- __VDLType_v_io_x_ref_services_syncbase_server_interfaces_SgPriority1.AppendField("ServerTime", __VDLType_v_io_x_ref_services_syncbase_server_interfaces_SgPriority5)
- __VDLType_v_io_x_ref_services_syncbase_server_interfaces_SgPriorityBuilder.Build()
- __VDLType_v_io_x_ref_services_syncbase_server_interfaces_SgPriorityv, err := __VDLType_v_io_x_ref_services_syncbase_server_interfaces_SgPriority2.Built()
- if err != nil {
- panic(err)
- }
- return __VDLType_v_io_x_ref_services_syncbase_server_interfaces_SgPriorityv
-}
-func init() {
- __VDLType_v_io_x_ref_services_syncbase_server_interfaces_SgPriority = __VDLType_v_io_x_ref_services_syncbase_server_interfaces_SgPriority_gen()
-}
-func __VDLEnsureNativeBuilt() {
- if __VDLType0 == nil {
- __VDLType0 = __VDLType0_gen()
- }
- if __VDLType1 == nil {
- __VDLType1 = __VDLType1_gen()
- }
- if __VDLType_time_Time == nil {
- __VDLType_time_Time = __VDLType_time_Time_gen()
- }
- if __VDLType_v_io_x_ref_services_syncbase_localblobstore_BlobMetadata == nil {
- __VDLType_v_io_x_ref_services_syncbase_localblobstore_BlobMetadata = __VDLType_v_io_x_ref_services_syncbase_localblobstore_BlobMetadata_gen()
- }
- if __VDLType_v_io_x_ref_services_syncbase_localblobstore_PerSyncgroup == nil {
- __VDLType_v_io_x_ref_services_syncbase_localblobstore_PerSyncgroup = __VDLType_v_io_x_ref_services_syncbase_localblobstore_PerSyncgroup_gen()
- }
- if __VDLType_v_io_x_ref_services_syncbase_server_interfaces_SgPriority == nil {
- __VDLType_v_io_x_ref_services_syncbase_server_interfaces_SgPriority = __VDLType_v_io_x_ref_services_syncbase_server_interfaces_SgPriority_gen()
- }
+ return struct{}{}
}
diff --git a/services/syncbase/server/interfaces/interfaces.vdl.go b/services/syncbase/server/interfaces/interfaces.vdl.go
index d0c27c5..5a12d47 100644
--- a/services/syncbase/server/interfaces/interfaces.vdl.go
+++ b/services/syncbase/server/interfaces/interfaces.vdl.go
@@ -24,6 +24,11 @@
"v.io/v23/verror"
)
+var _ = __VDLInit() // Must be first; see __VDLInit comments for details.
+
+//////////////////////////////////////////////////
+// Type definitions
+
// GenVector is the generation vector for any syncable entity, which maps each
// device id to its last locally known generation in the scope of that entity.
type GenVector map[uint64]uint64
@@ -34,7 +39,7 @@
}
func (m *GenVector) FillVDLTarget(t vdl.Target, tt *vdl.Type) error {
- mapTarget1, err := t.StartMap(__VDLType_v_io_x_ref_services_syncbase_server_interfaces_GenVector, len((*m)))
+ mapTarget1, err := t.StartMap(tt, len((*m)))
if err != nil {
return err
}
@@ -43,14 +48,14 @@
if err != nil {
return err
}
- if err := keyTarget2.FromUint(uint64(key3), vdl.Uint64Type); err != nil {
+ if err := keyTarget2.FromUint(uint64(key3), tt.NonOptional().Key()); err != nil {
return err
}
valueTarget4, err := mapTarget1.FinishKeyStartField(keyTarget2)
if err != nil {
return err
}
- if err := valueTarget4.FromUint(uint64(value5), vdl.Uint64Type); err != nil {
+ if err := valueTarget4.FromUint(uint64(value5), tt.NonOptional().Elem()); err != nil {
return err
}
if err := mapTarget1.FinishField(keyTarget2, valueTarget4); err != nil {
@@ -79,8 +84,8 @@
func (t *GenVectorTarget) StartMap(tt *vdl.Type, len int) (vdl.MapTarget, error) {
- if !vdl.Compatible(tt, __VDLType_v_io_x_ref_services_syncbase_server_interfaces_GenVector) {
- return nil, fmt.Errorf("type %v incompatible with %v", tt, __VDLType_v_io_x_ref_services_syncbase_server_interfaces_GenVector)
+ if ttWant := vdl.TypeOf((*GenVector)(nil)); !vdl.Compatible(tt, ttWant) {
+ return nil, fmt.Errorf("type %v incompatible with %v", tt, ttWant)
}
*t.Value = make(GenVector)
return t, nil
@@ -120,7 +125,7 @@
}
func (m *Knowledge) FillVDLTarget(t vdl.Target, tt *vdl.Type) error {
- mapTarget1, err := t.StartMap(__VDLType_v_io_x_ref_services_syncbase_server_interfaces_Knowledge, len((*m)))
+ mapTarget1, err := t.StartMap(tt, len((*m)))
if err != nil {
return err
}
@@ -129,7 +134,7 @@
if err != nil {
return err
}
- if err := keyTarget2.FromString(string(key3), vdl.StringType); err != nil {
+ if err := keyTarget2.FromString(string(key3), tt.NonOptional().Key()); err != nil {
return err
}
valueTarget4, err := mapTarget1.FinishKeyStartField(keyTarget2)
@@ -137,7 +142,7 @@
return err
}
- if err := value5.FillVDLTarget(valueTarget4, __VDLType_v_io_x_ref_services_syncbase_server_interfaces_GenVector); err != nil {
+ if err := value5.FillVDLTarget(valueTarget4, tt.NonOptional().Elem()); err != nil {
return err
}
if err := mapTarget1.FinishField(keyTarget2, valueTarget4); err != nil {
@@ -166,8 +171,8 @@
func (t *KnowledgeTarget) StartMap(tt *vdl.Type, len int) (vdl.MapTarget, error) {
- if !vdl.Compatible(tt, __VDLType_v_io_x_ref_services_syncbase_server_interfaces_Knowledge) {
- return nil, fmt.Errorf("type %v incompatible with %v", tt, __VDLType_v_io_x_ref_services_syncbase_server_interfaces_Knowledge)
+ if ttWant := vdl.TypeOf((*Knowledge)(nil)); !vdl.Compatible(tt, ttWant) {
+ return nil, fmt.Errorf("type %v incompatible with %v", tt, ttWant)
}
*t.Value = make(Knowledge)
return t, nil
@@ -227,7 +232,6 @@
}
func (m *LogRecMetadata) FillVDLTarget(t vdl.Target, tt *vdl.Type) error {
- __VDLEnsureNativeBuilt()
fieldsTarget1, err := t.StartFields(tt)
if err != nil {
return err
@@ -238,7 +242,7 @@
return err
}
if err != vdl.ErrFieldNoExist {
- if err := fieldTarget3.FromUint(uint64(m.Id), vdl.Uint64Type); err != nil {
+ if err := fieldTarget3.FromUint(uint64(m.Id), tt.NonOptional().Field(0).Type); err != nil {
return err
}
if err := fieldsTarget1.FinishField(keyTarget2, fieldTarget3); err != nil {
@@ -250,7 +254,7 @@
return err
}
if err != vdl.ErrFieldNoExist {
- if err := fieldTarget5.FromUint(uint64(m.Gen), vdl.Uint64Type); err != nil {
+ if err := fieldTarget5.FromUint(uint64(m.Gen), tt.NonOptional().Field(1).Type); err != nil {
return err
}
if err := fieldsTarget1.FinishField(keyTarget4, fieldTarget5); err != nil {
@@ -262,7 +266,7 @@
return err
}
if err != vdl.ErrFieldNoExist {
- if err := fieldTarget7.FromUint(uint64(m.RecType), vdl.ByteType); err != nil {
+ if err := fieldTarget7.FromUint(uint64(m.RecType), tt.NonOptional().Field(2).Type); err != nil {
return err
}
if err := fieldsTarget1.FinishField(keyTarget6, fieldTarget7); err != nil {
@@ -274,7 +278,7 @@
return err
}
if err != vdl.ErrFieldNoExist {
- if err := fieldTarget9.FromString(string(m.ObjId), vdl.StringType); err != nil {
+ if err := fieldTarget9.FromString(string(m.ObjId), tt.NonOptional().Field(3).Type); err != nil {
return err
}
if err := fieldsTarget1.FinishField(keyTarget8, fieldTarget9); err != nil {
@@ -286,7 +290,7 @@
return err
}
if err != vdl.ErrFieldNoExist {
- if err := fieldTarget11.FromString(string(m.CurVers), vdl.StringType); err != nil {
+ if err := fieldTarget11.FromString(string(m.CurVers), tt.NonOptional().Field(4).Type); err != nil {
return err
}
if err := fieldsTarget1.FinishField(keyTarget10, fieldTarget11); err != nil {
@@ -299,7 +303,7 @@
}
if err != vdl.ErrFieldNoExist {
- listTarget14, err := fieldTarget13.StartList(__VDLType1, len(m.Parents))
+ listTarget14, err := fieldTarget13.StartList(tt.NonOptional().Field(5).Type, len(m.Parents))
if err != nil {
return err
}
@@ -308,7 +312,7 @@
if err != nil {
return err
}
- if err := elemTarget15.FromString(string(elem16), vdl.StringType); err != nil {
+ if err := elemTarget15.FromString(string(elem16), tt.NonOptional().Field(5).Type.Elem()); err != nil {
return err
}
if err := listTarget14.FinishElem(elemTarget15); err != nil {
@@ -333,7 +337,7 @@
}
if err != vdl.ErrFieldNoExist {
- if err := wireValue17.FillVDLTarget(fieldTarget19, __VDLType_time_Time); err != nil {
+ if err := wireValue17.FillVDLTarget(fieldTarget19, tt.NonOptional().Field(6).Type); err != nil {
return err
}
if err := fieldsTarget1.FinishField(keyTarget18, fieldTarget19); err != nil {
@@ -345,7 +349,7 @@
return err
}
if err != vdl.ErrFieldNoExist {
- if err := fieldTarget21.FromString(string(m.PermId), vdl.StringType); err != nil {
+ if err := fieldTarget21.FromString(string(m.PermId), tt.NonOptional().Field(7).Type); err != nil {
return err
}
if err := fieldsTarget1.FinishField(keyTarget20, fieldTarget21); err != nil {
@@ -357,7 +361,7 @@
return err
}
if err != vdl.ErrFieldNoExist {
- if err := fieldTarget23.FromString(string(m.PermVers), vdl.StringType); err != nil {
+ if err := fieldTarget23.FromString(string(m.PermVers), tt.NonOptional().Field(8).Type); err != nil {
return err
}
if err := fieldsTarget1.FinishField(keyTarget22, fieldTarget23); err != nil {
@@ -369,7 +373,7 @@
return err
}
if err != vdl.ErrFieldNoExist {
- if err := fieldTarget25.FromBool(bool(m.Delete), vdl.BoolType); err != nil {
+ if err := fieldTarget25.FromBool(bool(m.Delete), tt.NonOptional().Field(9).Type); err != nil {
return err
}
if err := fieldsTarget1.FinishField(keyTarget24, fieldTarget25); err != nil {
@@ -381,7 +385,7 @@
return err
}
if err != vdl.ErrFieldNoExist {
- if err := fieldTarget27.FromUint(uint64(m.BatchId), vdl.Uint64Type); err != nil {
+ if err := fieldTarget27.FromUint(uint64(m.BatchId), tt.NonOptional().Field(10).Type); err != nil {
return err
}
if err := fieldsTarget1.FinishField(keyTarget26, fieldTarget27); err != nil {
@@ -393,7 +397,7 @@
return err
}
if err != vdl.ErrFieldNoExist {
- if err := fieldTarget29.FromUint(uint64(m.BatchCount), vdl.Uint64Type); err != nil {
+ if err := fieldTarget29.FromUint(uint64(m.BatchCount), tt.NonOptional().Field(11).Type); err != nil {
return err
}
if err := fieldsTarget1.FinishField(keyTarget28, fieldTarget29); err != nil {
@@ -430,8 +434,8 @@
func (t *LogRecMetadataTarget) StartFields(tt *vdl.Type) (vdl.FieldsTarget, error) {
- if !vdl.Compatible(tt, __VDLType_v_io_x_ref_services_syncbase_server_interfaces_LogRecMetadata) {
- return nil, fmt.Errorf("type %v incompatible with %v", tt, __VDLType_v_io_x_ref_services_syncbase_server_interfaces_LogRecMetadata)
+ if ttWant := vdl.TypeOf((*LogRecMetadata)(nil)).Elem(); !vdl.Compatible(tt, ttWant) {
+ return nil, fmt.Errorf("type %v incompatible with %v", tt, ttWant)
}
return t, nil
}
@@ -486,7 +490,7 @@
target, err := &t.batchCountTarget, error(nil)
return nil, target, err
default:
- return nil, nil, fmt.Errorf("field %s not in struct %v", name, __VDLType_v_io_x_ref_services_syncbase_server_interfaces_LogRecMetadata)
+ return nil, nil, fmt.Errorf("field %s not in struct v.io/x/ref/services/syncbase/server/interfaces.LogRecMetadata", name)
}
}
func (t *LogRecMetadataTarget) FinishField(_, _ vdl.Target) error {
@@ -511,7 +515,6 @@
}
func (m *LogRec) FillVDLTarget(t vdl.Target, tt *vdl.Type) error {
- __VDLEnsureNativeBuilt()
fieldsTarget1, err := t.StartFields(tt)
if err != nil {
return err
@@ -523,7 +526,7 @@
}
if err != vdl.ErrFieldNoExist {
- if err := m.Metadata.FillVDLTarget(fieldTarget3, __VDLType_v_io_x_ref_services_syncbase_server_interfaces_LogRecMetadata); err != nil {
+ if err := m.Metadata.FillVDLTarget(fieldTarget3, tt.NonOptional().Field(0).Type); err != nil {
return err
}
if err := fieldsTarget1.FinishField(keyTarget2, fieldTarget3); err != nil {
@@ -536,7 +539,7 @@
}
if err != vdl.ErrFieldNoExist {
- if err := fieldTarget5.FromBytes([]byte(m.Value), __VDLType3); err != nil {
+ if err := fieldTarget5.FromBytes([]byte(m.Value), tt.NonOptional().Field(1).Type); err != nil {
return err
}
if err := fieldsTarget1.FinishField(keyTarget4, fieldTarget5); err != nil {
@@ -548,7 +551,7 @@
return err
}
if err != vdl.ErrFieldNoExist {
- if err := fieldTarget7.FromBool(bool(m.Shell), vdl.BoolType); err != nil {
+ if err := fieldTarget7.FromBool(bool(m.Shell), tt.NonOptional().Field(2).Type); err != nil {
return err
}
if err := fieldsTarget1.FinishField(keyTarget6, fieldTarget7); err != nil {
@@ -576,8 +579,8 @@
func (t *LogRecTarget) StartFields(tt *vdl.Type) (vdl.FieldsTarget, error) {
- if !vdl.Compatible(tt, __VDLType_v_io_x_ref_services_syncbase_server_interfaces_LogRec) {
- return nil, fmt.Errorf("type %v incompatible with %v", tt, __VDLType_v_io_x_ref_services_syncbase_server_interfaces_LogRec)
+ if ttWant := vdl.TypeOf((*LogRec)(nil)).Elem(); !vdl.Compatible(tt, ttWant) {
+ return nil, fmt.Errorf("type %v incompatible with %v", tt, ttWant)
}
return t, nil
}
@@ -596,7 +599,7 @@
target, err := &t.shellTarget, error(nil)
return nil, target, err
default:
- return nil, nil, fmt.Errorf("field %s not in struct %v", name, __VDLType_v_io_x_ref_services_syncbase_server_interfaces_LogRec)
+ return nil, nil, fmt.Errorf("field %s not in struct v.io/x/ref/services/syncbase/server/interfaces.LogRec", name)
}
}
func (t *LogRecTarget) FinishField(_, _ vdl.Target) error {
@@ -617,7 +620,7 @@
}
func (m *GroupId) FillVDLTarget(t vdl.Target, tt *vdl.Type) error {
- if err := t.FromUint(uint64((*m)), __VDLType_v_io_x_ref_services_syncbase_server_interfaces_GroupId); err != nil {
+ if err := t.FromUint(uint64((*m)), tt); err != nil {
return err
}
return nil
@@ -724,7 +727,7 @@
}
func (m *SyncgroupStatus) FillVDLTarget(t vdl.Target, tt *vdl.Type) error {
- if err := t.FromEnumLabel((*m).String(), __VDLType_v_io_x_ref_services_syncbase_server_interfaces_SyncgroupStatus); err != nil {
+ if err := t.FromEnumLabel((*m).String(), tt); err != nil {
return err
}
return nil
@@ -741,8 +744,8 @@
func (t *SyncgroupStatusTarget) FromEnumLabel(src string, tt *vdl.Type) error {
- if !vdl.Compatible(tt, __VDLType_v_io_x_ref_services_syncbase_server_interfaces_SyncgroupStatus) {
- return fmt.Errorf("type %v incompatible with %v", tt, __VDLType_v_io_x_ref_services_syncbase_server_interfaces_SyncgroupStatus)
+ if ttWant := vdl.TypeOf((*SyncgroupStatus)(nil)); !vdl.Compatible(tt, ttWant) {
+ return fmt.Errorf("type %v incompatible with %v", tt, ttWant)
}
switch src {
case "PublishPending":
@@ -752,7 +755,7 @@
case "Running":
*t.Value = 2
default:
- return fmt.Errorf("label %s not in enum %v", src, __VDLType_v_io_x_ref_services_syncbase_server_interfaces_SyncgroupStatus)
+ return fmt.Errorf("label %s not in enum v.io/x/ref/services/syncbase/server/interfaces.SyncgroupStatus", src)
}
return nil
@@ -777,9 +780,6 @@
}
func (m *Syncgroup) FillVDLTarget(t vdl.Target, tt *vdl.Type) error {
- if __VDLType_v_io_x_ref_services_syncbase_server_interfaces_Syncgroup == nil || __VDLType4 == nil {
- panic("Initialization order error: types generated for FillVDLTarget not initialized. Consider moving caller to an init() block.")
- }
fieldsTarget1, err := t.StartFields(tt)
if err != nil {
return err
@@ -791,7 +791,7 @@
}
if err != vdl.ErrFieldNoExist {
- if err := m.Id.FillVDLTarget(fieldTarget3, __VDLType_v_io_x_ref_services_syncbase_server_interfaces_GroupId); err != nil {
+ if err := m.Id.FillVDLTarget(fieldTarget3, tt.NonOptional().Field(0).Type); err != nil {
return err
}
if err := fieldsTarget1.FinishField(keyTarget2, fieldTarget3); err != nil {
@@ -803,7 +803,7 @@
return err
}
if err != vdl.ErrFieldNoExist {
- if err := fieldTarget5.FromString(string(m.Name), vdl.StringType); err != nil {
+ if err := fieldTarget5.FromString(string(m.Name), tt.NonOptional().Field(1).Type); err != nil {
return err
}
if err := fieldsTarget1.FinishField(keyTarget4, fieldTarget5); err != nil {
@@ -815,7 +815,7 @@
return err
}
if err != vdl.ErrFieldNoExist {
- if err := fieldTarget7.FromString(string(m.SpecVersion), vdl.StringType); err != nil {
+ if err := fieldTarget7.FromString(string(m.SpecVersion), tt.NonOptional().Field(2).Type); err != nil {
return err
}
if err := fieldsTarget1.FinishField(keyTarget6, fieldTarget7); err != nil {
@@ -828,7 +828,7 @@
}
if err != vdl.ErrFieldNoExist {
- if err := m.Spec.FillVDLTarget(fieldTarget9, __VDLType_v_io_v23_services_syncbase_nosql_SyncgroupSpec); err != nil {
+ if err := m.Spec.FillVDLTarget(fieldTarget9, tt.NonOptional().Field(3).Type); err != nil {
return err
}
if err := fieldsTarget1.FinishField(keyTarget8, fieldTarget9); err != nil {
@@ -840,7 +840,7 @@
return err
}
if err != vdl.ErrFieldNoExist {
- if err := fieldTarget11.FromString(string(m.Creator), vdl.StringType); err != nil {
+ if err := fieldTarget11.FromString(string(m.Creator), tt.NonOptional().Field(4).Type); err != nil {
return err
}
if err := fieldsTarget1.FinishField(keyTarget10, fieldTarget11); err != nil {
@@ -852,7 +852,7 @@
return err
}
if err != vdl.ErrFieldNoExist {
- if err := fieldTarget13.FromString(string(m.AppName), vdl.StringType); err != nil {
+ if err := fieldTarget13.FromString(string(m.AppName), tt.NonOptional().Field(5).Type); err != nil {
return err
}
if err := fieldsTarget1.FinishField(keyTarget12, fieldTarget13); err != nil {
@@ -864,7 +864,7 @@
return err
}
if err != vdl.ErrFieldNoExist {
- if err := fieldTarget15.FromString(string(m.DbName), vdl.StringType); err != nil {
+ if err := fieldTarget15.FromString(string(m.DbName), tt.NonOptional().Field(6).Type); err != nil {
return err
}
if err := fieldsTarget1.FinishField(keyTarget14, fieldTarget15); err != nil {
@@ -877,7 +877,7 @@
}
if err != vdl.ErrFieldNoExist {
- if err := m.Status.FillVDLTarget(fieldTarget17, __VDLType_v_io_x_ref_services_syncbase_server_interfaces_SyncgroupStatus); err != nil {
+ if err := m.Status.FillVDLTarget(fieldTarget17, tt.NonOptional().Field(7).Type); err != nil {
return err
}
if err := fieldsTarget1.FinishField(keyTarget16, fieldTarget17); err != nil {
@@ -890,7 +890,7 @@
}
if err != vdl.ErrFieldNoExist {
- mapTarget20, err := fieldTarget19.StartMap(__VDLType5, len(m.Joiners))
+ mapTarget20, err := fieldTarget19.StartMap(tt.NonOptional().Field(8).Type, len(m.Joiners))
if err != nil {
return err
}
@@ -899,7 +899,7 @@
if err != nil {
return err
}
- if err := keyTarget21.FromString(string(key22), vdl.StringType); err != nil {
+ if err := keyTarget21.FromString(string(key22), tt.NonOptional().Field(8).Type.Key()); err != nil {
return err
}
valueTarget23, err := mapTarget20.FinishKeyStartField(keyTarget21)
@@ -907,7 +907,7 @@
return err
}
- if err := value24.FillVDLTarget(valueTarget23, __VDLType_v_io_v23_services_syncbase_nosql_SyncgroupMemberInfo); err != nil {
+ if err := value24.FillVDLTarget(valueTarget23, tt.NonOptional().Field(8).Type.Elem()); err != nil {
return err
}
if err := mapTarget20.FinishField(keyTarget21, valueTarget23); err != nil {
@@ -948,8 +948,8 @@
func (t *SyncgroupTarget) StartFields(tt *vdl.Type) (vdl.FieldsTarget, error) {
- if !vdl.Compatible(tt, __VDLType_v_io_x_ref_services_syncbase_server_interfaces_Syncgroup) {
- return nil, fmt.Errorf("type %v incompatible with %v", tt, __VDLType_v_io_x_ref_services_syncbase_server_interfaces_Syncgroup)
+ if ttWant := vdl.TypeOf((*Syncgroup)(nil)).Elem(); !vdl.Compatible(tt, ttWant) {
+ return nil, fmt.Errorf("type %v incompatible with %v", tt, ttWant)
}
return t, nil
}
@@ -992,7 +992,7 @@
target, err := &t.joinersTarget, error(nil)
return nil, target, err
default:
- return nil, nil, fmt.Errorf("field %s not in struct %v", name, __VDLType_v_io_x_ref_services_syncbase_server_interfaces_Syncgroup)
+ return nil, nil, fmt.Errorf("field %s not in struct v.io/x/ref/services/syncbase/server/interfaces.Syncgroup", name)
}
}
func (t *SyncgroupTarget) FinishField(_, _ vdl.Target) error {
@@ -1016,8 +1016,8 @@
func (t *unnamed_6d61705b737472696e675d762e696f2f7632332f73657276696365732f73796e63626173652f6e6f73716c2e53796e6367726f75704d656d626572496e666f207374727563747b53796e635072696f7269747920627974653b497353657276657220626f6f6c7dTarget) StartMap(tt *vdl.Type, len int) (vdl.MapTarget, error) {
- if !vdl.Compatible(tt, __VDLType5) {
- return nil, fmt.Errorf("type %v incompatible with %v", tt, __VDLType5)
+ if ttWant := vdl.TypeOf((*map[string]nosql.SyncgroupMemberInfo)(nil)); !vdl.Compatible(tt, ttWant) {
+ return nil, fmt.Errorf("type %v incompatible with %v", tt, ttWant)
}
*t.Value = make(map[string]nosql.SyncgroupMemberInfo)
return t, nil
@@ -1046,6 +1046,295 @@
return nil
}
+// SgDeltaReq contains the initiator's genvectors for the syncgroups it is
+// interested in within a Database (specified by the AppName/DbName) when
+// requesting deltas for those syncgroups.
+type SgDeltaReq struct {
+ AppName string
+ DbName string
+ Gvs Knowledge // Contains a genvector per syncgroup.
+}
+
+func (SgDeltaReq) __VDLReflect(struct {
+ Name string `vdl:"v.io/x/ref/services/syncbase/server/interfaces.SgDeltaReq"`
+}) {
+}
+
+func (m *SgDeltaReq) FillVDLTarget(t vdl.Target, tt *vdl.Type) error {
+ fieldsTarget1, err := t.StartFields(tt)
+ if err != nil {
+ return err
+ }
+
+ keyTarget2, fieldTarget3, err := fieldsTarget1.StartField("AppName")
+ if err != vdl.ErrFieldNoExist && err != nil {
+ return err
+ }
+ if err != vdl.ErrFieldNoExist {
+ if err := fieldTarget3.FromString(string(m.AppName), tt.NonOptional().Field(0).Type); err != nil {
+ return err
+ }
+ if err := fieldsTarget1.FinishField(keyTarget2, fieldTarget3); err != nil {
+ return err
+ }
+ }
+ keyTarget4, fieldTarget5, err := fieldsTarget1.StartField("DbName")
+ if err != vdl.ErrFieldNoExist && err != nil {
+ return err
+ }
+ if err != vdl.ErrFieldNoExist {
+ if err := fieldTarget5.FromString(string(m.DbName), tt.NonOptional().Field(1).Type); err != nil {
+ return err
+ }
+ if err := fieldsTarget1.FinishField(keyTarget4, fieldTarget5); err != nil {
+ return err
+ }
+ }
+ keyTarget6, fieldTarget7, err := fieldsTarget1.StartField("Gvs")
+ if err != vdl.ErrFieldNoExist && err != nil {
+ return err
+ }
+ if err != vdl.ErrFieldNoExist {
+
+ if err := m.Gvs.FillVDLTarget(fieldTarget7, tt.NonOptional().Field(2).Type); err != nil {
+ return err
+ }
+ if err := fieldsTarget1.FinishField(keyTarget6, fieldTarget7); err != nil {
+ return err
+ }
+ }
+ if err := t.FinishFields(fieldsTarget1); err != nil {
+ return err
+ }
+ return nil
+}
+
+func (m *SgDeltaReq) MakeVDLTarget() vdl.Target {
+ return &SgDeltaReqTarget{Value: m}
+}
+
+type SgDeltaReqTarget struct {
+ Value *SgDeltaReq
+ appNameTarget vdl.StringTarget
+ dbNameTarget vdl.StringTarget
+ gvsTarget KnowledgeTarget
+ vdl.TargetBase
+ vdl.FieldsTargetBase
+}
+
+func (t *SgDeltaReqTarget) StartFields(tt *vdl.Type) (vdl.FieldsTarget, error) {
+
+ if ttWant := vdl.TypeOf((*SgDeltaReq)(nil)).Elem(); !vdl.Compatible(tt, ttWant) {
+ return nil, fmt.Errorf("type %v incompatible with %v", tt, ttWant)
+ }
+ return t, nil
+}
+func (t *SgDeltaReqTarget) StartField(name string) (key, field vdl.Target, _ error) {
+ switch name {
+ case "AppName":
+ t.appNameTarget.Value = &t.Value.AppName
+ target, err := &t.appNameTarget, error(nil)
+ return nil, target, err
+ case "DbName":
+ t.dbNameTarget.Value = &t.Value.DbName
+ target, err := &t.dbNameTarget, error(nil)
+ return nil, target, err
+ case "Gvs":
+ t.gvsTarget.Value = &t.Value.Gvs
+ target, err := &t.gvsTarget, error(nil)
+ return nil, target, err
+ default:
+ return nil, nil, fmt.Errorf("field %s not in struct v.io/x/ref/services/syncbase/server/interfaces.SgDeltaReq", name)
+ }
+}
+func (t *SgDeltaReqTarget) FinishField(_, _ vdl.Target) error {
+ return nil
+}
+func (t *SgDeltaReqTarget) FinishFields(_ vdl.FieldsTarget) error {
+
+ return nil
+}
+
+// DataDeltaReq contains the initiator's genvectors and the set of syncgroups it
+// is interested in within a Database (specified by the AppName/DbName) when
+// requesting deltas for that Database.
+type DataDeltaReq struct {
+ AppName string
+ DbName string
+ SgIds map[GroupId]struct{}
+ Gvs Knowledge
+}
+
+func (DataDeltaReq) __VDLReflect(struct {
+ Name string `vdl:"v.io/x/ref/services/syncbase/server/interfaces.DataDeltaReq"`
+}) {
+}
+
+func (m *DataDeltaReq) FillVDLTarget(t vdl.Target, tt *vdl.Type) error {
+ fieldsTarget1, err := t.StartFields(tt)
+ if err != nil {
+ return err
+ }
+
+ keyTarget2, fieldTarget3, err := fieldsTarget1.StartField("AppName")
+ if err != vdl.ErrFieldNoExist && err != nil {
+ return err
+ }
+ if err != vdl.ErrFieldNoExist {
+ if err := fieldTarget3.FromString(string(m.AppName), tt.NonOptional().Field(0).Type); err != nil {
+ return err
+ }
+ if err := fieldsTarget1.FinishField(keyTarget2, fieldTarget3); err != nil {
+ return err
+ }
+ }
+ keyTarget4, fieldTarget5, err := fieldsTarget1.StartField("DbName")
+ if err != vdl.ErrFieldNoExist && err != nil {
+ return err
+ }
+ if err != vdl.ErrFieldNoExist {
+ if err := fieldTarget5.FromString(string(m.DbName), tt.NonOptional().Field(1).Type); err != nil {
+ return err
+ }
+ if err := fieldsTarget1.FinishField(keyTarget4, fieldTarget5); err != nil {
+ return err
+ }
+ }
+ keyTarget6, fieldTarget7, err := fieldsTarget1.StartField("SgIds")
+ if err != vdl.ErrFieldNoExist && err != nil {
+ return err
+ }
+ if err != vdl.ErrFieldNoExist {
+
+ setTarget8, err := fieldTarget7.StartSet(tt.NonOptional().Field(2).Type, len(m.SgIds))
+ if err != nil {
+ return err
+ }
+ for key10 := range m.SgIds {
+ keyTarget9, err := setTarget8.StartKey()
+ if err != nil {
+ return err
+ }
+
+ if err := key10.FillVDLTarget(keyTarget9, tt.NonOptional().Field(2).Type.Key()); err != nil {
+ return err
+ }
+ if err := setTarget8.FinishKey(keyTarget9); err != nil {
+ return err
+ }
+ }
+ if err := fieldTarget7.FinishSet(setTarget8); err != nil {
+ return err
+ }
+ if err := fieldsTarget1.FinishField(keyTarget6, fieldTarget7); err != nil {
+ return err
+ }
+ }
+ keyTarget11, fieldTarget12, err := fieldsTarget1.StartField("Gvs")
+ if err != vdl.ErrFieldNoExist && err != nil {
+ return err
+ }
+ if err != vdl.ErrFieldNoExist {
+
+ if err := m.Gvs.FillVDLTarget(fieldTarget12, tt.NonOptional().Field(3).Type); err != nil {
+ return err
+ }
+ if err := fieldsTarget1.FinishField(keyTarget11, fieldTarget12); err != nil {
+ return err
+ }
+ }
+ if err := t.FinishFields(fieldsTarget1); err != nil {
+ return err
+ }
+ return nil
+}
+
+func (m *DataDeltaReq) MakeVDLTarget() vdl.Target {
+ return &DataDeltaReqTarget{Value: m}
+}
+
+type DataDeltaReqTarget struct {
+ Value *DataDeltaReq
+ appNameTarget vdl.StringTarget
+ dbNameTarget vdl.StringTarget
+ sgIdsTarget unnamed_7365745b762e696f2f782f7265662f73657276696365732f73796e63626173652f7365727665722f696e74657266616365732e47726f757049642075696e7436345dTarget
+ gvsTarget KnowledgeTarget
+ vdl.TargetBase
+ vdl.FieldsTargetBase
+}
+
+func (t *DataDeltaReqTarget) StartFields(tt *vdl.Type) (vdl.FieldsTarget, error) {
+
+ if ttWant := vdl.TypeOf((*DataDeltaReq)(nil)).Elem(); !vdl.Compatible(tt, ttWant) {
+ return nil, fmt.Errorf("type %v incompatible with %v", tt, ttWant)
+ }
+ return t, nil
+}
+func (t *DataDeltaReqTarget) StartField(name string) (key, field vdl.Target, _ error) {
+ switch name {
+ case "AppName":
+ t.appNameTarget.Value = &t.Value.AppName
+ target, err := &t.appNameTarget, error(nil)
+ return nil, target, err
+ case "DbName":
+ t.dbNameTarget.Value = &t.Value.DbName
+ target, err := &t.dbNameTarget, error(nil)
+ return nil, target, err
+ case "SgIds":
+ t.sgIdsTarget.Value = &t.Value.SgIds
+ target, err := &t.sgIdsTarget, error(nil)
+ return nil, target, err
+ case "Gvs":
+ t.gvsTarget.Value = &t.Value.Gvs
+ target, err := &t.gvsTarget, error(nil)
+ return nil, target, err
+ default:
+ return nil, nil, fmt.Errorf("field %s not in struct v.io/x/ref/services/syncbase/server/interfaces.DataDeltaReq", name)
+ }
+}
+func (t *DataDeltaReqTarget) FinishField(_, _ vdl.Target) error {
+ return nil
+}
+func (t *DataDeltaReqTarget) FinishFields(_ vdl.FieldsTarget) error {
+
+ return nil
+}
+
+// map[GroupId]struct{}
+type unnamed_7365745b762e696f2f782f7265662f73657276696365732f73796e63626173652f7365727665722f696e74657266616365732e47726f757049642075696e7436345dTarget struct {
+ Value *map[GroupId]struct{}
+ currKey GroupId
+ keyTarget GroupIdTarget
+ vdl.TargetBase
+ vdl.SetTargetBase
+}
+
+func (t *unnamed_7365745b762e696f2f782f7265662f73657276696365732f73796e63626173652f7365727665722f696e74657266616365732e47726f757049642075696e7436345dTarget) StartSet(tt *vdl.Type, len int) (vdl.SetTarget, error) {
+
+ if ttWant := vdl.TypeOf((*map[GroupId]struct{})(nil)); !vdl.Compatible(tt, ttWant) {
+ return nil, fmt.Errorf("type %v incompatible with %v", tt, ttWant)
+ }
+ *t.Value = make(map[GroupId]struct{})
+ return t, nil
+}
+func (t *unnamed_7365745b762e696f2f782f7265662f73657276696365732f73796e63626173652f7365727665722f696e74657266616365732e47726f757049642075696e7436345dTarget) StartKey() (key vdl.Target, _ error) {
+ t.currKey = GroupId(0)
+ t.keyTarget.Value = &t.currKey
+ target, err := &t.keyTarget, error(nil)
+ return target, err
+}
+func (t *unnamed_7365745b762e696f2f782f7265662f73657276696365732f73796e63626173652f7365727665722f696e74657266616365732e47726f757049642075696e7436345dTarget) FinishKey(key vdl.Target) error {
+ (*t.Value)[t.currKey] = struct{}{}
+ return nil
+}
+func (t *unnamed_7365745b762e696f2f782f7265662f73657276696365732f73796e63626173652f7365727665722f696e74657266616365732e47726f757049642075696e7436345dTarget) FinishSet(list vdl.SetTarget) error {
+ if len(*t.Value) == 0 {
+ *t.Value = nil
+ }
+
+ return nil
+}
+
type (
// DeltaReq represents any single field of the DeltaReq union type.
//
@@ -1083,7 +1372,7 @@
func (x DeltaReqSgs) __VDLReflect(__DeltaReqReflect) {}
func (m DeltaReqSgs) FillVDLTarget(t vdl.Target, tt *vdl.Type) error {
- fieldsTarget1, err := t.StartFields(__VDLType_v_io_x_ref_services_syncbase_server_interfaces_DeltaReq)
+ fieldsTarget1, err := t.StartFields(tt)
if err != nil {
return err
}
@@ -1092,7 +1381,7 @@
return err
}
- if err := m.Value.FillVDLTarget(fieldTarget3, __VDLType_v_io_x_ref_services_syncbase_server_interfaces_SgDeltaReq); err != nil {
+ if err := m.Value.FillVDLTarget(fieldTarget3, tt.NonOptional().Field(0).Type); err != nil {
return err
}
if err := fieldsTarget1.FinishField(keyTarget2, fieldTarget3); err != nil {
@@ -1115,7 +1404,7 @@
func (x DeltaReqData) __VDLReflect(__DeltaReqReflect) {}
func (m DeltaReqData) FillVDLTarget(t vdl.Target, tt *vdl.Type) error {
- fieldsTarget1, err := t.StartFields(__VDLType_v_io_x_ref_services_syncbase_server_interfaces_DeltaReq)
+ fieldsTarget1, err := t.StartFields(tt)
if err != nil {
return err
}
@@ -1124,7 +1413,7 @@
return err
}
- if err := m.Value.FillVDLTarget(fieldTarget3, __VDLType_v_io_x_ref_services_syncbase_server_interfaces_DataDeltaReq); err != nil {
+ if err := m.Value.FillVDLTarget(fieldTarget3, tt.NonOptional().Field(1).Type); err != nil {
return err
}
if err := fieldsTarget1.FinishField(keyTarget2, fieldTarget3); err != nil {
@@ -1141,301 +1430,6 @@
return nil
}
-// DataDeltaReq contains the initiator's genvectors and the set of syncgroups it
-// is interested in within a Database (specified by the AppName/DbName) when
-// requesting deltas for that Database.
-type DataDeltaReq struct {
- AppName string
- DbName string
- SgIds map[GroupId]struct{}
- Gvs Knowledge
-}
-
-func (DataDeltaReq) __VDLReflect(struct {
- Name string `vdl:"v.io/x/ref/services/syncbase/server/interfaces.DataDeltaReq"`
-}) {
-}
-
-func (m *DataDeltaReq) FillVDLTarget(t vdl.Target, tt *vdl.Type) error {
- if __VDLType_v_io_x_ref_services_syncbase_server_interfaces_DataDeltaReq == nil || __VDLType6 == nil {
- panic("Initialization order error: types generated for FillVDLTarget not initialized. Consider moving caller to an init() block.")
- }
- fieldsTarget1, err := t.StartFields(tt)
- if err != nil {
- return err
- }
-
- keyTarget2, fieldTarget3, err := fieldsTarget1.StartField("AppName")
- if err != vdl.ErrFieldNoExist && err != nil {
- return err
- }
- if err != vdl.ErrFieldNoExist {
- if err := fieldTarget3.FromString(string(m.AppName), vdl.StringType); err != nil {
- return err
- }
- if err := fieldsTarget1.FinishField(keyTarget2, fieldTarget3); err != nil {
- return err
- }
- }
- keyTarget4, fieldTarget5, err := fieldsTarget1.StartField("DbName")
- if err != vdl.ErrFieldNoExist && err != nil {
- return err
- }
- if err != vdl.ErrFieldNoExist {
- if err := fieldTarget5.FromString(string(m.DbName), vdl.StringType); err != nil {
- return err
- }
- if err := fieldsTarget1.FinishField(keyTarget4, fieldTarget5); err != nil {
- return err
- }
- }
- keyTarget6, fieldTarget7, err := fieldsTarget1.StartField("SgIds")
- if err != vdl.ErrFieldNoExist && err != nil {
- return err
- }
- if err != vdl.ErrFieldNoExist {
-
- setTarget8, err := fieldTarget7.StartSet(__VDLType7, len(m.SgIds))
- if err != nil {
- return err
- }
- for key10 := range m.SgIds {
- keyTarget9, err := setTarget8.StartKey()
- if err != nil {
- return err
- }
-
- if err := key10.FillVDLTarget(keyTarget9, __VDLType_v_io_x_ref_services_syncbase_server_interfaces_GroupId); err != nil {
- return err
- }
- if err := setTarget8.FinishKey(keyTarget9); err != nil {
- return err
- }
- }
- if err := fieldTarget7.FinishSet(setTarget8); err != nil {
- return err
- }
- if err := fieldsTarget1.FinishField(keyTarget6, fieldTarget7); err != nil {
- return err
- }
- }
- keyTarget11, fieldTarget12, err := fieldsTarget1.StartField("Gvs")
- if err != vdl.ErrFieldNoExist && err != nil {
- return err
- }
- if err != vdl.ErrFieldNoExist {
-
- if err := m.Gvs.FillVDLTarget(fieldTarget12, __VDLType_v_io_x_ref_services_syncbase_server_interfaces_Knowledge); err != nil {
- return err
- }
- if err := fieldsTarget1.FinishField(keyTarget11, fieldTarget12); err != nil {
- return err
- }
- }
- if err := t.FinishFields(fieldsTarget1); err != nil {
- return err
- }
- return nil
-}
-
-func (m *DataDeltaReq) MakeVDLTarget() vdl.Target {
- return &DataDeltaReqTarget{Value: m}
-}
-
-type DataDeltaReqTarget struct {
- Value *DataDeltaReq
- appNameTarget vdl.StringTarget
- dbNameTarget vdl.StringTarget
- sgIdsTarget unnamed_7365745b762e696f2f782f7265662f73657276696365732f73796e63626173652f7365727665722f696e74657266616365732e47726f757049642075696e7436345dTarget
- gvsTarget KnowledgeTarget
- vdl.TargetBase
- vdl.FieldsTargetBase
-}
-
-func (t *DataDeltaReqTarget) StartFields(tt *vdl.Type) (vdl.FieldsTarget, error) {
-
- if !vdl.Compatible(tt, __VDLType_v_io_x_ref_services_syncbase_server_interfaces_DataDeltaReq) {
- return nil, fmt.Errorf("type %v incompatible with %v", tt, __VDLType_v_io_x_ref_services_syncbase_server_interfaces_DataDeltaReq)
- }
- return t, nil
-}
-func (t *DataDeltaReqTarget) StartField(name string) (key, field vdl.Target, _ error) {
- switch name {
- case "AppName":
- t.appNameTarget.Value = &t.Value.AppName
- target, err := &t.appNameTarget, error(nil)
- return nil, target, err
- case "DbName":
- t.dbNameTarget.Value = &t.Value.DbName
- target, err := &t.dbNameTarget, error(nil)
- return nil, target, err
- case "SgIds":
- t.sgIdsTarget.Value = &t.Value.SgIds
- target, err := &t.sgIdsTarget, error(nil)
- return nil, target, err
- case "Gvs":
- t.gvsTarget.Value = &t.Value.Gvs
- target, err := &t.gvsTarget, error(nil)
- return nil, target, err
- default:
- return nil, nil, fmt.Errorf("field %s not in struct %v", name, __VDLType_v_io_x_ref_services_syncbase_server_interfaces_DataDeltaReq)
- }
-}
-func (t *DataDeltaReqTarget) FinishField(_, _ vdl.Target) error {
- return nil
-}
-func (t *DataDeltaReqTarget) FinishFields(_ vdl.FieldsTarget) error {
-
- return nil
-}
-
-// map[GroupId]struct{}
-type unnamed_7365745b762e696f2f782f7265662f73657276696365732f73796e63626173652f7365727665722f696e74657266616365732e47726f757049642075696e7436345dTarget struct {
- Value *map[GroupId]struct{}
- currKey GroupId
- keyTarget GroupIdTarget
- vdl.TargetBase
- vdl.SetTargetBase
-}
-
-func (t *unnamed_7365745b762e696f2f782f7265662f73657276696365732f73796e63626173652f7365727665722f696e74657266616365732e47726f757049642075696e7436345dTarget) StartSet(tt *vdl.Type, len int) (vdl.SetTarget, error) {
-
- if !vdl.Compatible(tt, __VDLType7) {
- return nil, fmt.Errorf("type %v incompatible with %v", tt, __VDLType7)
- }
- *t.Value = make(map[GroupId]struct{})
- return t, nil
-}
-func (t *unnamed_7365745b762e696f2f782f7265662f73657276696365732f73796e63626173652f7365727665722f696e74657266616365732e47726f757049642075696e7436345dTarget) StartKey() (key vdl.Target, _ error) {
- t.currKey = GroupId(0)
- t.keyTarget.Value = &t.currKey
- target, err := &t.keyTarget, error(nil)
- return target, err
-}
-func (t *unnamed_7365745b762e696f2f782f7265662f73657276696365732f73796e63626173652f7365727665722f696e74657266616365732e47726f757049642075696e7436345dTarget) FinishKey(key vdl.Target) error {
- (*t.Value)[t.currKey] = struct{}{}
- return nil
-}
-func (t *unnamed_7365745b762e696f2f782f7265662f73657276696365732f73796e63626173652f7365727665722f696e74657266616365732e47726f757049642075696e7436345dTarget) FinishSet(list vdl.SetTarget) error {
- if len(*t.Value) == 0 {
- *t.Value = nil
- }
-
- return nil
-}
-
-// SgDeltaReq contains the initiator's genvectors for the syncgroups it is
-// interested in within a Database (specified by the AppName/DbName) when
-// requesting deltas for those syncgroups.
-type SgDeltaReq struct {
- AppName string
- DbName string
- Gvs Knowledge // Contains a genvector per syncgroup.
-}
-
-func (SgDeltaReq) __VDLReflect(struct {
- Name string `vdl:"v.io/x/ref/services/syncbase/server/interfaces.SgDeltaReq"`
-}) {
-}
-
-func (m *SgDeltaReq) FillVDLTarget(t vdl.Target, tt *vdl.Type) error {
- if __VDLType_v_io_x_ref_services_syncbase_server_interfaces_SgDeltaReq == nil || __VDLType8 == nil {
- panic("Initialization order error: types generated for FillVDLTarget not initialized. Consider moving caller to an init() block.")
- }
- fieldsTarget1, err := t.StartFields(tt)
- if err != nil {
- return err
- }
-
- keyTarget2, fieldTarget3, err := fieldsTarget1.StartField("AppName")
- if err != vdl.ErrFieldNoExist && err != nil {
- return err
- }
- if err != vdl.ErrFieldNoExist {
- if err := fieldTarget3.FromString(string(m.AppName), vdl.StringType); err != nil {
- return err
- }
- if err := fieldsTarget1.FinishField(keyTarget2, fieldTarget3); err != nil {
- return err
- }
- }
- keyTarget4, fieldTarget5, err := fieldsTarget1.StartField("DbName")
- if err != vdl.ErrFieldNoExist && err != nil {
- return err
- }
- if err != vdl.ErrFieldNoExist {
- if err := fieldTarget5.FromString(string(m.DbName), vdl.StringType); err != nil {
- return err
- }
- if err := fieldsTarget1.FinishField(keyTarget4, fieldTarget5); err != nil {
- return err
- }
- }
- keyTarget6, fieldTarget7, err := fieldsTarget1.StartField("Gvs")
- if err != vdl.ErrFieldNoExist && err != nil {
- return err
- }
- if err != vdl.ErrFieldNoExist {
-
- if err := m.Gvs.FillVDLTarget(fieldTarget7, __VDLType_v_io_x_ref_services_syncbase_server_interfaces_Knowledge); err != nil {
- return err
- }
- if err := fieldsTarget1.FinishField(keyTarget6, fieldTarget7); err != nil {
- return err
- }
- }
- if err := t.FinishFields(fieldsTarget1); err != nil {
- return err
- }
- return nil
-}
-
-func (m *SgDeltaReq) MakeVDLTarget() vdl.Target {
- return &SgDeltaReqTarget{Value: m}
-}
-
-type SgDeltaReqTarget struct {
- Value *SgDeltaReq
- appNameTarget vdl.StringTarget
- dbNameTarget vdl.StringTarget
- gvsTarget KnowledgeTarget
- vdl.TargetBase
- vdl.FieldsTargetBase
-}
-
-func (t *SgDeltaReqTarget) StartFields(tt *vdl.Type) (vdl.FieldsTarget, error) {
-
- if !vdl.Compatible(tt, __VDLType_v_io_x_ref_services_syncbase_server_interfaces_SgDeltaReq) {
- return nil, fmt.Errorf("type %v incompatible with %v", tt, __VDLType_v_io_x_ref_services_syncbase_server_interfaces_SgDeltaReq)
- }
- return t, nil
-}
-func (t *SgDeltaReqTarget) StartField(name string) (key, field vdl.Target, _ error) {
- switch name {
- case "AppName":
- t.appNameTarget.Value = &t.Value.AppName
- target, err := &t.appNameTarget, error(nil)
- return nil, target, err
- case "DbName":
- t.dbNameTarget.Value = &t.Value.DbName
- target, err := &t.dbNameTarget, error(nil)
- return nil, target, err
- case "Gvs":
- t.gvsTarget.Value = &t.Value.Gvs
- target, err := &t.gvsTarget, error(nil)
- return nil, target, err
- default:
- return nil, nil, fmt.Errorf("field %s not in struct %v", name, __VDLType_v_io_x_ref_services_syncbase_server_interfaces_SgDeltaReq)
- }
-}
-func (t *SgDeltaReqTarget) FinishField(_, _ vdl.Target) error {
- return nil
-}
-func (t *SgDeltaReqTarget) FinishFields(_ vdl.FieldsTarget) error {
-
- return nil
-}
-
type (
// DeltaResp represents any single field of the DeltaResp union type.
//
@@ -1473,7 +1467,7 @@
func (x DeltaRespRec) __VDLReflect(__DeltaRespReflect) {}
func (m DeltaRespRec) FillVDLTarget(t vdl.Target, tt *vdl.Type) error {
- fieldsTarget1, err := t.StartFields(__VDLType_v_io_x_ref_services_syncbase_server_interfaces_DeltaResp)
+ fieldsTarget1, err := t.StartFields(tt)
if err != nil {
return err
}
@@ -1482,7 +1476,7 @@
return err
}
- if err := m.Value.FillVDLTarget(fieldTarget3, __VDLType_v_io_x_ref_services_syncbase_server_interfaces_LogRec); err != nil {
+ if err := m.Value.FillVDLTarget(fieldTarget3, tt.NonOptional().Field(0).Type); err != nil {
return err
}
if err := fieldsTarget1.FinishField(keyTarget2, fieldTarget3); err != nil {
@@ -1505,7 +1499,7 @@
func (x DeltaRespGvs) __VDLReflect(__DeltaRespReflect) {}
func (m DeltaRespGvs) FillVDLTarget(t vdl.Target, tt *vdl.Type) error {
- fieldsTarget1, err := t.StartFields(__VDLType_v_io_x_ref_services_syncbase_server_interfaces_DeltaResp)
+ fieldsTarget1, err := t.StartFields(tt)
if err != nil {
return err
}
@@ -1514,7 +1508,7 @@
return err
}
- if err := m.Value.FillVDLTarget(fieldTarget3, __VDLType_v_io_x_ref_services_syncbase_server_interfaces_Knowledge); err != nil {
+ if err := m.Value.FillVDLTarget(fieldTarget3, tt.NonOptional().Field(1).Type); err != nil {
return err
}
if err := fieldsTarget1.FinishField(keyTarget2, fieldTarget3); err != nil {
@@ -1531,33 +1525,51 @@
return nil
}
-// DeltaFinalResp contains the data returned at the end of a GetDeltas call.
-type DeltaFinalResp struct {
- SgPriorities SgPriorities
+// A SgPriority represents data used to decide whether to transfer blob ownership
+// between two devices.
+type SgPriority struct {
+ Distance int32 // number of hops from a server-quality member of the syncgroup
+ ServerTime time.Time // when data from a server-quality member reached this device
}
-func (DeltaFinalResp) __VDLReflect(struct {
- Name string `vdl:"v.io/x/ref/services/syncbase/server/interfaces.DeltaFinalResp"`
+func (SgPriority) __VDLReflect(struct {
+ Name string `vdl:"v.io/x/ref/services/syncbase/server/interfaces.SgPriority"`
}) {
}
-func (m *DeltaFinalResp) FillVDLTarget(t vdl.Target, tt *vdl.Type) error {
- __VDLEnsureNativeBuilt()
+func (m *SgPriority) FillVDLTarget(t vdl.Target, tt *vdl.Type) error {
fieldsTarget1, err := t.StartFields(tt)
if err != nil {
return err
}
- keyTarget2, fieldTarget3, err := fieldsTarget1.StartField("SgPriorities")
+ keyTarget2, fieldTarget3, err := fieldsTarget1.StartField("Distance")
+ if err != vdl.ErrFieldNoExist && err != nil {
+ return err
+ }
+ if err != vdl.ErrFieldNoExist {
+ if err := fieldTarget3.FromInt(int64(m.Distance), tt.NonOptional().Field(0).Type); err != nil {
+ return err
+ }
+ if err := fieldsTarget1.FinishField(keyTarget2, fieldTarget3); err != nil {
+ return err
+ }
+ }
+ var wireValue4 time_2.Time
+ if err := time_2.TimeFromNative(&wireValue4, m.ServerTime); err != nil {
+ return err
+ }
+
+ keyTarget5, fieldTarget6, err := fieldsTarget1.StartField("ServerTime")
if err != vdl.ErrFieldNoExist && err != nil {
return err
}
if err != vdl.ErrFieldNoExist {
- if err := m.SgPriorities.FillVDLTarget(fieldTarget3, __VDLType_v_io_x_ref_services_syncbase_server_interfaces_SgPriorities); err != nil {
+ if err := wireValue4.FillVDLTarget(fieldTarget6, tt.NonOptional().Field(1).Type); err != nil {
return err
}
- if err := fieldsTarget1.FinishField(keyTarget2, fieldTarget3); err != nil {
+ if err := fieldsTarget1.FinishField(keyTarget5, fieldTarget6); err != nil {
return err
}
}
@@ -1567,42 +1579,93 @@
return nil
}
-func (m *DeltaFinalResp) MakeVDLTarget() vdl.Target {
- return &DeltaFinalRespTarget{Value: m}
+func (m *SgPriority) MakeVDLTarget() vdl.Target {
+ return &SgPriorityTarget{Value: m}
}
-type DeltaFinalRespTarget struct {
- Value *DeltaFinalResp
- sgPrioritiesTarget SgPrioritiesTarget
+type SgPriorityTarget struct {
+ Value *SgPriority
+ distanceTarget vdl.Int32Target
+ serverTimeTarget time_2.TimeTarget
vdl.TargetBase
vdl.FieldsTargetBase
}
-func (t *DeltaFinalRespTarget) StartFields(tt *vdl.Type) (vdl.FieldsTarget, error) {
+func (t *SgPriorityTarget) StartFields(tt *vdl.Type) (vdl.FieldsTarget, error) {
- if !vdl.Compatible(tt, __VDLType_v_io_x_ref_services_syncbase_server_interfaces_DeltaFinalResp) {
- return nil, fmt.Errorf("type %v incompatible with %v", tt, __VDLType_v_io_x_ref_services_syncbase_server_interfaces_DeltaFinalResp)
+ if ttWant := vdl.TypeOf((*SgPriority)(nil)).Elem(); !vdl.Compatible(tt, ttWant) {
+ return nil, fmt.Errorf("type %v incompatible with %v", tt, ttWant)
}
return t, nil
}
-func (t *DeltaFinalRespTarget) StartField(name string) (key, field vdl.Target, _ error) {
+func (t *SgPriorityTarget) StartField(name string) (key, field vdl.Target, _ error) {
switch name {
- case "SgPriorities":
- t.sgPrioritiesTarget.Value = &t.Value.SgPriorities
- target, err := &t.sgPrioritiesTarget, error(nil)
+ case "Distance":
+ t.distanceTarget.Value = &t.Value.Distance
+ target, err := &t.distanceTarget, error(nil)
+ return nil, target, err
+ case "ServerTime":
+ t.serverTimeTarget.Value = &t.Value.ServerTime
+ target, err := &t.serverTimeTarget, error(nil)
return nil, target, err
default:
- return nil, nil, fmt.Errorf("field %s not in struct %v", name, __VDLType_v_io_x_ref_services_syncbase_server_interfaces_DeltaFinalResp)
+ return nil, nil, fmt.Errorf("field %s not in struct v.io/x/ref/services/syncbase/server/interfaces.SgPriority", name)
}
}
-func (t *DeltaFinalRespTarget) FinishField(_, _ vdl.Target) error {
+func (t *SgPriorityTarget) FinishField(_, _ vdl.Target) error {
return nil
}
-func (t *DeltaFinalRespTarget) FinishFields(_ vdl.FieldsTarget) error {
+func (t *SgPriorityTarget) FinishFields(_ vdl.FieldsTarget) error {
return nil
}
+// A SgPriorities maps syncgroup IDs to SgPriority structures. It is sent and
+// received in GetDeltas calls to allow the participants to assess who has
+// higher priorities for keeping blobs.
+type SgPriorities map[GroupId]SgPriority
+
+func (SgPriorities) __VDLReflect(struct {
+ Name string `vdl:"v.io/x/ref/services/syncbase/server/interfaces.SgPriorities"`
+}) {
+}
+
+func (m *SgPriorities) FillVDLTarget(t vdl.Target, tt *vdl.Type) error {
+ mapTarget1, err := t.StartMap(tt, len((*m)))
+ if err != nil {
+ return err
+ }
+ for key3, value5 := range *m {
+ keyTarget2, err := mapTarget1.StartKey()
+ if err != nil {
+ return err
+ }
+
+ if err := key3.FillVDLTarget(keyTarget2, tt.NonOptional().Key()); err != nil {
+ return err
+ }
+ valueTarget4, err := mapTarget1.FinishKeyStartField(keyTarget2)
+ if err != nil {
+ return err
+ }
+
+ if err := value5.FillVDLTarget(valueTarget4, tt.NonOptional().Elem()); err != nil {
+ return err
+ }
+ if err := mapTarget1.FinishField(keyTarget2, valueTarget4); err != nil {
+ return err
+ }
+ }
+ if err := t.FinishMap(mapTarget1); err != nil {
+ return err
+ }
+ return nil
+}
+
+func (m *SgPriorities) MakeVDLTarget() vdl.Target {
+ return &SgPrioritiesTarget{Value: m}
+}
+
type SgPrioritiesTarget struct {
Value *SgPriorities
currKey GroupId
@@ -1615,8 +1678,8 @@
func (t *SgPrioritiesTarget) StartMap(tt *vdl.Type, len int) (vdl.MapTarget, error) {
- if !vdl.Compatible(tt, __VDLType_v_io_x_ref_services_syncbase_server_interfaces_SgPriorities) {
- return nil, fmt.Errorf("type %v incompatible with %v", tt, __VDLType_v_io_x_ref_services_syncbase_server_interfaces_SgPriorities)
+ if ttWant := vdl.TypeOf((*SgPriorities)(nil)); !vdl.Compatible(tt, ttWant) {
+ return nil, fmt.Errorf("type %v incompatible with %v", tt, ttWant)
}
*t.Value = make(SgPriorities)
return t, nil
@@ -1645,39 +1708,73 @@
return nil
}
-type SgPriorityTarget struct {
- Value *SgPriority
- distanceTarget vdl.Int32Target
- serverTimeTarget time_2.TimeTarget
+// DeltaFinalResp contains the data returned at the end of a GetDeltas call.
+type DeltaFinalResp struct {
+ SgPriorities SgPriorities
+}
+
+func (DeltaFinalResp) __VDLReflect(struct {
+ Name string `vdl:"v.io/x/ref/services/syncbase/server/interfaces.DeltaFinalResp"`
+}) {
+}
+
+func (m *DeltaFinalResp) FillVDLTarget(t vdl.Target, tt *vdl.Type) error {
+ fieldsTarget1, err := t.StartFields(tt)
+ if err != nil {
+ return err
+ }
+
+ keyTarget2, fieldTarget3, err := fieldsTarget1.StartField("SgPriorities")
+ if err != vdl.ErrFieldNoExist && err != nil {
+ return err
+ }
+ if err != vdl.ErrFieldNoExist {
+
+ if err := m.SgPriorities.FillVDLTarget(fieldTarget3, tt.NonOptional().Field(0).Type); err != nil {
+ return err
+ }
+ if err := fieldsTarget1.FinishField(keyTarget2, fieldTarget3); err != nil {
+ return err
+ }
+ }
+ if err := t.FinishFields(fieldsTarget1); err != nil {
+ return err
+ }
+ return nil
+}
+
+func (m *DeltaFinalResp) MakeVDLTarget() vdl.Target {
+ return &DeltaFinalRespTarget{Value: m}
+}
+
+type DeltaFinalRespTarget struct {
+ Value *DeltaFinalResp
+ sgPrioritiesTarget SgPrioritiesTarget
vdl.TargetBase
vdl.FieldsTargetBase
}
-func (t *SgPriorityTarget) StartFields(tt *vdl.Type) (vdl.FieldsTarget, error) {
+func (t *DeltaFinalRespTarget) StartFields(tt *vdl.Type) (vdl.FieldsTarget, error) {
- if !vdl.Compatible(tt, __VDLType_v_io_x_ref_services_syncbase_server_interfaces_SgPriority) {
- return nil, fmt.Errorf("type %v incompatible with %v", tt, __VDLType_v_io_x_ref_services_syncbase_server_interfaces_SgPriority)
+ if ttWant := vdl.TypeOf((*DeltaFinalResp)(nil)).Elem(); !vdl.Compatible(tt, ttWant) {
+ return nil, fmt.Errorf("type %v incompatible with %v", tt, ttWant)
}
return t, nil
}
-func (t *SgPriorityTarget) StartField(name string) (key, field vdl.Target, _ error) {
+func (t *DeltaFinalRespTarget) StartField(name string) (key, field vdl.Target, _ error) {
switch name {
- case "Distance":
- t.distanceTarget.Value = &t.Value.Distance
- target, err := &t.distanceTarget, error(nil)
- return nil, target, err
- case "ServerTime":
- t.serverTimeTarget.Value = &t.Value.ServerTime
- target, err := &t.serverTimeTarget, error(nil)
+ case "SgPriorities":
+ t.sgPrioritiesTarget.Value = &t.Value.SgPriorities
+ target, err := &t.sgPrioritiesTarget, error(nil)
return nil, target, err
default:
- return nil, nil, fmt.Errorf("field %s not in struct %v", name, __VDLType_v_io_x_ref_services_syncbase_server_interfaces_SgPriority)
+ return nil, nil, fmt.Errorf("field %s not in struct v.io/x/ref/services/syncbase/server/interfaces.DeltaFinalResp", name)
}
}
-func (t *SgPriorityTarget) FinishField(_, _ vdl.Target) error {
+func (t *DeltaFinalRespTarget) FinishField(_, _ vdl.Target) error {
return nil
}
-func (t *SgPriorityTarget) FinishFields(_ vdl.FieldsTarget) error {
+func (t *DeltaFinalRespTarget) FinishFields(_ vdl.FieldsTarget) error {
return nil
}
@@ -1693,9 +1790,6 @@
}
func (m *ChunkHash) FillVDLTarget(t vdl.Target, tt *vdl.Type) error {
- if __VDLType_v_io_x_ref_services_syncbase_server_interfaces_ChunkHash == nil || __VDLType10 == nil {
- panic("Initialization order error: types generated for FillVDLTarget not initialized. Consider moving caller to an init() block.")
- }
fieldsTarget1, err := t.StartFields(tt)
if err != nil {
return err
@@ -1707,7 +1801,7 @@
}
if err != vdl.ErrFieldNoExist {
- if err := fieldTarget3.FromBytes([]byte(m.Hash), __VDLType3); err != nil {
+ if err := fieldTarget3.FromBytes([]byte(m.Hash), tt.NonOptional().Field(0).Type); err != nil {
return err
}
if err := fieldsTarget1.FinishField(keyTarget2, fieldTarget3); err != nil {
@@ -1733,8 +1827,8 @@
func (t *ChunkHashTarget) StartFields(tt *vdl.Type) (vdl.FieldsTarget, error) {
- if !vdl.Compatible(tt, __VDLType_v_io_x_ref_services_syncbase_server_interfaces_ChunkHash) {
- return nil, fmt.Errorf("type %v incompatible with %v", tt, __VDLType_v_io_x_ref_services_syncbase_server_interfaces_ChunkHash)
+ if ttWant := vdl.TypeOf((*ChunkHash)(nil)).Elem(); !vdl.Compatible(tt, ttWant) {
+ return nil, fmt.Errorf("type %v incompatible with %v", tt, ttWant)
}
return t, nil
}
@@ -1745,7 +1839,7 @@
target, err := &t.hashTarget, error(nil)
return nil, target, err
default:
- return nil, nil, fmt.Errorf("field %s not in struct %v", name, __VDLType_v_io_x_ref_services_syncbase_server_interfaces_ChunkHash)
+ return nil, nil, fmt.Errorf("field %s not in struct v.io/x/ref/services/syncbase/server/interfaces.ChunkHash", name)
}
}
func (t *ChunkHashTarget) FinishField(_, _ vdl.Target) error {
@@ -1767,9 +1861,6 @@
}
func (m *ChunkData) FillVDLTarget(t vdl.Target, tt *vdl.Type) error {
- if __VDLType_v_io_x_ref_services_syncbase_server_interfaces_ChunkData == nil || __VDLType11 == nil {
- panic("Initialization order error: types generated for FillVDLTarget not initialized. Consider moving caller to an init() block.")
- }
fieldsTarget1, err := t.StartFields(tt)
if err != nil {
return err
@@ -1781,7 +1872,7 @@
}
if err != vdl.ErrFieldNoExist {
- if err := fieldTarget3.FromBytes([]byte(m.Data), __VDLType3); err != nil {
+ if err := fieldTarget3.FromBytes([]byte(m.Data), tt.NonOptional().Field(0).Type); err != nil {
return err
}
if err := fieldsTarget1.FinishField(keyTarget2, fieldTarget3); err != nil {
@@ -1807,8 +1898,8 @@
func (t *ChunkDataTarget) StartFields(tt *vdl.Type) (vdl.FieldsTarget, error) {
- if !vdl.Compatible(tt, __VDLType_v_io_x_ref_services_syncbase_server_interfaces_ChunkData) {
- return nil, fmt.Errorf("type %v incompatible with %v", tt, __VDLType_v_io_x_ref_services_syncbase_server_interfaces_ChunkData)
+ if ttWant := vdl.TypeOf((*ChunkData)(nil)).Elem(); !vdl.Compatible(tt, ttWant) {
+ return nil, fmt.Errorf("type %v incompatible with %v", tt, ttWant)
}
return t, nil
}
@@ -1819,7 +1910,7 @@
target, err := &t.dataTarget, error(nil)
return nil, target, err
default:
- return nil, nil, fmt.Errorf("field %s not in struct %v", name, __VDLType_v_io_x_ref_services_syncbase_server_interfaces_ChunkData)
+ return nil, nil, fmt.Errorf("field %s not in struct v.io/x/ref/services/syncbase/server/interfaces.ChunkData", name)
}
}
func (t *ChunkDataTarget) FinishField(_, _ vdl.Target) error {
@@ -1841,7 +1932,6 @@
}
func (m *TimeReq) FillVDLTarget(t vdl.Target, tt *vdl.Type) error {
- __VDLEnsureNativeBuilt()
fieldsTarget1, err := t.StartFields(tt)
if err != nil {
return err
@@ -1858,7 +1948,7 @@
}
if err != vdl.ErrFieldNoExist {
- if err := wireValue2.FillVDLTarget(fieldTarget4, __VDLType_time_Time); err != nil {
+ if err := wireValue2.FillVDLTarget(fieldTarget4, tt.NonOptional().Field(0).Type); err != nil {
return err
}
if err := fieldsTarget1.FinishField(keyTarget3, fieldTarget4); err != nil {
@@ -1884,8 +1974,8 @@
func (t *TimeReqTarget) StartFields(tt *vdl.Type) (vdl.FieldsTarget, error) {
- if !vdl.Compatible(tt, __VDLType_v_io_x_ref_services_syncbase_server_interfaces_TimeReq) {
- return nil, fmt.Errorf("type %v incompatible with %v", tt, __VDLType_v_io_x_ref_services_syncbase_server_interfaces_TimeReq)
+ if ttWant := vdl.TypeOf((*TimeReq)(nil)).Elem(); !vdl.Compatible(tt, ttWant) {
+ return nil, fmt.Errorf("type %v incompatible with %v", tt, ttWant)
}
return t, nil
}
@@ -1896,7 +1986,7 @@
target, err := &t.sendTsTarget, error(nil)
return nil, target, err
default:
- return nil, nil, fmt.Errorf("field %s not in struct %v", name, __VDLType_v_io_x_ref_services_syncbase_server_interfaces_TimeReq)
+ return nil, nil, fmt.Errorf("field %s not in struct v.io/x/ref/services/syncbase/server/interfaces.TimeReq", name)
}
}
func (t *TimeReqTarget) FinishField(_, _ vdl.Target) error {
@@ -1930,7 +2020,6 @@
}
func (m *TimeResp) FillVDLTarget(t vdl.Target, tt *vdl.Type) error {
- __VDLEnsureNativeBuilt()
fieldsTarget1, err := t.StartFields(tt)
if err != nil {
return err
@@ -1947,7 +2036,7 @@
}
if err != vdl.ErrFieldNoExist {
- if err := wireValue2.FillVDLTarget(fieldTarget4, __VDLType_time_Time); err != nil {
+ if err := wireValue2.FillVDLTarget(fieldTarget4, tt.NonOptional().Field(0).Type); err != nil {
return err
}
if err := fieldsTarget1.FinishField(keyTarget3, fieldTarget4); err != nil {
@@ -1965,7 +2054,7 @@
}
if err != vdl.ErrFieldNoExist {
- if err := wireValue5.FillVDLTarget(fieldTarget7, __VDLType_time_Time); err != nil {
+ if err := wireValue5.FillVDLTarget(fieldTarget7, tt.NonOptional().Field(1).Type); err != nil {
return err
}
if err := fieldsTarget1.FinishField(keyTarget6, fieldTarget7); err != nil {
@@ -1983,7 +2072,7 @@
}
if err != vdl.ErrFieldNoExist {
- if err := wireValue8.FillVDLTarget(fieldTarget10, __VDLType_time_Time); err != nil {
+ if err := wireValue8.FillVDLTarget(fieldTarget10, tt.NonOptional().Field(2).Type); err != nil {
return err
}
if err := fieldsTarget1.FinishField(keyTarget9, fieldTarget10); err != nil {
@@ -2001,7 +2090,7 @@
}
if err != vdl.ErrFieldNoExist {
- if err := wireValue11.FillVDLTarget(fieldTarget13, __VDLType_time_Time); err != nil {
+ if err := wireValue11.FillVDLTarget(fieldTarget13, tt.NonOptional().Field(3).Type); err != nil {
return err
}
if err := fieldsTarget1.FinishField(keyTarget12, fieldTarget13); err != nil {
@@ -2013,7 +2102,7 @@
return err
}
if err != vdl.ErrFieldNoExist {
- if err := fieldTarget15.FromUint(uint64(m.NumReboots), vdl.Uint16Type); err != nil {
+ if err := fieldTarget15.FromUint(uint64(m.NumReboots), tt.NonOptional().Field(4).Type); err != nil {
return err
}
if err := fieldsTarget1.FinishField(keyTarget14, fieldTarget15); err != nil {
@@ -2025,7 +2114,7 @@
return err
}
if err != vdl.ErrFieldNoExist {
- if err := fieldTarget17.FromUint(uint64(m.NumHops), vdl.Uint16Type); err != nil {
+ if err := fieldTarget17.FromUint(uint64(m.NumHops), tt.NonOptional().Field(5).Type); err != nil {
return err
}
if err := fieldsTarget1.FinishField(keyTarget16, fieldTarget17); err != nil {
@@ -2056,8 +2145,8 @@
func (t *TimeRespTarget) StartFields(tt *vdl.Type) (vdl.FieldsTarget, error) {
- if !vdl.Compatible(tt, __VDLType_v_io_x_ref_services_syncbase_server_interfaces_TimeResp) {
- return nil, fmt.Errorf("type %v incompatible with %v", tt, __VDLType_v_io_x_ref_services_syncbase_server_interfaces_TimeResp)
+ if ttWant := vdl.TypeOf((*TimeResp)(nil)).Elem(); !vdl.Compatible(tt, ttWant) {
+ return nil, fmt.Errorf("type %v incompatible with %v", tt, ttWant)
}
return t, nil
}
@@ -2088,7 +2177,7 @@
target, err := &t.numHopsTarget, error(nil)
return nil, target, err
default:
- return nil, nil, fmt.Errorf("field %s not in struct %v", name, __VDLType_v_io_x_ref_services_syncbase_server_interfaces_TimeResp)
+ return nil, nil, fmt.Errorf("field %s not in struct v.io/x/ref/services/syncbase/server/interfaces.TimeResp", name)
}
}
func (t *TimeRespTarget) FinishField(_, _ vdl.Target) error {
@@ -2099,111 +2188,6 @@
return nil
}
-// A SgPriority represents data used to decide whether to transfer blob ownership
-// between two devices.
-type SgPriority struct {
- Distance int32 // number of hops from a server-quality member of the syncgroup
- ServerTime time.Time // when data from a server-quality member reached this device
-}
-
-func (SgPriority) __VDLReflect(struct {
- Name string `vdl:"v.io/x/ref/services/syncbase/server/interfaces.SgPriority"`
-}) {
-}
-
-func (m *SgPriority) FillVDLTarget(t vdl.Target, tt *vdl.Type) error {
- __VDLEnsureNativeBuilt()
- fieldsTarget1, err := t.StartFields(tt)
- if err != nil {
- return err
- }
-
- keyTarget2, fieldTarget3, err := fieldsTarget1.StartField("Distance")
- if err != vdl.ErrFieldNoExist && err != nil {
- return err
- }
- if err != vdl.ErrFieldNoExist {
- if err := fieldTarget3.FromInt(int64(m.Distance), vdl.Int32Type); err != nil {
- return err
- }
- if err := fieldsTarget1.FinishField(keyTarget2, fieldTarget3); err != nil {
- return err
- }
- }
- var wireValue4 time_2.Time
- if err := time_2.TimeFromNative(&wireValue4, m.ServerTime); err != nil {
- return err
- }
-
- keyTarget5, fieldTarget6, err := fieldsTarget1.StartField("ServerTime")
- if err != vdl.ErrFieldNoExist && err != nil {
- return err
- }
- if err != vdl.ErrFieldNoExist {
-
- if err := wireValue4.FillVDLTarget(fieldTarget6, __VDLType_time_Time); err != nil {
- return err
- }
- if err := fieldsTarget1.FinishField(keyTarget5, fieldTarget6); err != nil {
- return err
- }
- }
- if err := t.FinishFields(fieldsTarget1); err != nil {
- return err
- }
- return nil
-}
-
-func (m *SgPriority) MakeVDLTarget() vdl.Target {
- return &SgPriorityTarget{Value: m}
-}
-
-// A SgPriorities maps syncgroup IDs to SgPriority structures. It is sent and
-// received in GetDeltas calls to allow the participants to assess who has
-// higher priorities for keeping blobs.
-type SgPriorities map[GroupId]SgPriority
-
-func (SgPriorities) __VDLReflect(struct {
- Name string `vdl:"v.io/x/ref/services/syncbase/server/interfaces.SgPriorities"`
-}) {
-}
-
-func (m *SgPriorities) FillVDLTarget(t vdl.Target, tt *vdl.Type) error {
- mapTarget1, err := t.StartMap(__VDLType_v_io_x_ref_services_syncbase_server_interfaces_SgPriorities, len((*m)))
- if err != nil {
- return err
- }
- for key3, value5 := range *m {
- keyTarget2, err := mapTarget1.StartKey()
- if err != nil {
- return err
- }
-
- if err := key3.FillVDLTarget(keyTarget2, __VDLType_v_io_x_ref_services_syncbase_server_interfaces_GroupId); err != nil {
- return err
- }
- valueTarget4, err := mapTarget1.FinishKeyStartField(keyTarget2)
- if err != nil {
- return err
- }
-
- if err := value5.FillVDLTarget(valueTarget4, __VDLType_v_io_x_ref_services_syncbase_server_interfaces_SgPriority); err != nil {
- return err
- }
- if err := mapTarget1.FinishField(keyTarget2, valueTarget4); err != nil {
- return err
- }
- }
- if err := t.FinishMap(mapTarget1); err != nil {
- return err
- }
- return nil
-}
-
-func (m *SgPriorities) MakeVDLTarget() vdl.Target {
- return &SgPrioritiesTarget{Value: m}
-}
-
// A BlobSharesBySyncgroup maps syncgroup IDs to integer share numbers that a
// syncbase instance may have for a blob.
type BlobSharesBySyncgroup map[GroupId]int32
@@ -2214,7 +2198,7 @@
}
func (m *BlobSharesBySyncgroup) FillVDLTarget(t vdl.Target, tt *vdl.Type) error {
- mapTarget1, err := t.StartMap(__VDLType_v_io_x_ref_services_syncbase_server_interfaces_BlobSharesBySyncgroup, len((*m)))
+ mapTarget1, err := t.StartMap(tt, len((*m)))
if err != nil {
return err
}
@@ -2224,14 +2208,14 @@
return err
}
- if err := key3.FillVDLTarget(keyTarget2, __VDLType_v_io_x_ref_services_syncbase_server_interfaces_GroupId); err != nil {
+ if err := key3.FillVDLTarget(keyTarget2, tt.NonOptional().Key()); err != nil {
return err
}
valueTarget4, err := mapTarget1.FinishKeyStartField(keyTarget2)
if err != nil {
return err
}
- if err := valueTarget4.FromInt(int64(value5), vdl.Int32Type); err != nil {
+ if err := valueTarget4.FromInt(int64(value5), tt.NonOptional().Elem()); err != nil {
return err
}
if err := mapTarget1.FinishField(keyTarget2, valueTarget4); err != nil {
@@ -2260,8 +2244,8 @@
func (t *BlobSharesBySyncgroupTarget) StartMap(tt *vdl.Type, len int) (vdl.MapTarget, error) {
- if !vdl.Compatible(tt, __VDLType_v_io_x_ref_services_syncbase_server_interfaces_BlobSharesBySyncgroup) {
- return nil, fmt.Errorf("type %v incompatible with %v", tt, __VDLType_v_io_x_ref_services_syncbase_server_interfaces_BlobSharesBySyncgroup)
+ if ttWant := vdl.TypeOf((*BlobSharesBySyncgroup)(nil)); !vdl.Compatible(tt, ttWant) {
+ return nil, fmt.Errorf("type %v incompatible with %v", tt, ttWant)
}
*t.Value = make(BlobSharesBySyncgroup)
return t, nil
@@ -2305,9 +2289,6 @@
}
func (m *Signpost) FillVDLTarget(t vdl.Target, tt *vdl.Type) error {
- if __VDLType_v_io_x_ref_services_syncbase_server_interfaces_Signpost == nil || __VDLType15 == nil {
- panic("Initialization order error: types generated for FillVDLTarget not initialized. Consider moving caller to an init() block.")
- }
fieldsTarget1, err := t.StartFields(tt)
if err != nil {
return err
@@ -2318,7 +2299,7 @@
return err
}
if err != vdl.ErrFieldNoExist {
- if err := fieldTarget3.FromString(string(m.Peer), vdl.StringType); err != nil {
+ if err := fieldTarget3.FromString(string(m.Peer), tt.NonOptional().Field(0).Type); err != nil {
return err
}
if err := fieldsTarget1.FinishField(keyTarget2, fieldTarget3); err != nil {
@@ -2330,7 +2311,7 @@
return err
}
if err != vdl.ErrFieldNoExist {
- if err := fieldTarget5.FromString(string(m.Source), vdl.StringType); err != nil {
+ if err := fieldTarget5.FromString(string(m.Source), tt.NonOptional().Field(1).Type); err != nil {
return err
}
if err := fieldsTarget1.FinishField(keyTarget4, fieldTarget5); err != nil {
@@ -2343,7 +2324,7 @@
}
if err != vdl.ErrFieldNoExist {
- setTarget8, err := fieldTarget7.StartSet(__VDLType7, len(m.SgIds))
+ setTarget8, err := fieldTarget7.StartSet(tt.NonOptional().Field(2).Type, len(m.SgIds))
if err != nil {
return err
}
@@ -2353,7 +2334,7 @@
return err
}
- if err := key10.FillVDLTarget(keyTarget9, __VDLType_v_io_x_ref_services_syncbase_server_interfaces_GroupId); err != nil {
+ if err := key10.FillVDLTarget(keyTarget9, tt.NonOptional().Field(2).Type.Key()); err != nil {
return err
}
if err := setTarget8.FinishKey(keyTarget9); err != nil {
@@ -2388,8 +2369,8 @@
func (t *SignpostTarget) StartFields(tt *vdl.Type) (vdl.FieldsTarget, error) {
- if !vdl.Compatible(tt, __VDLType_v_io_x_ref_services_syncbase_server_interfaces_Signpost) {
- return nil, fmt.Errorf("type %v incompatible with %v", tt, __VDLType_v_io_x_ref_services_syncbase_server_interfaces_Signpost)
+ if ttWant := vdl.TypeOf((*Signpost)(nil)).Elem(); !vdl.Compatible(tt, ttWant) {
+ return nil, fmt.Errorf("type %v incompatible with %v", tt, ttWant)
}
return t, nil
}
@@ -2408,7 +2389,7 @@
target, err := &t.sgIdsTarget, error(nil)
return nil, target, err
default:
- return nil, nil, fmt.Errorf("field %s not in struct %v", name, __VDLType_v_io_x_ref_services_syncbase_server_interfaces_Signpost)
+ return nil, nil, fmt.Errorf("field %s not in struct v.io/x/ref/services/syncbase/server/interfaces.Signpost", name)
}
}
func (t *SignpostTarget) FinishField(_, _ vdl.Target) error {
@@ -2419,642 +2400,8 @@
return nil
}
-func init() {
- vdl.Register((*GenVector)(nil))
- vdl.Register((*Knowledge)(nil))
- vdl.Register((*LogRecMetadata)(nil))
- vdl.Register((*LogRec)(nil))
- vdl.Register((*GroupId)(nil))
- vdl.Register((*SyncgroupStatus)(nil))
- vdl.Register((*Syncgroup)(nil))
- vdl.Register((*DeltaReq)(nil))
- vdl.Register((*DataDeltaReq)(nil))
- vdl.Register((*SgDeltaReq)(nil))
- vdl.Register((*DeltaResp)(nil))
- vdl.Register((*DeltaFinalResp)(nil))
- vdl.Register((*ChunkHash)(nil))
- vdl.Register((*ChunkData)(nil))
- vdl.Register((*TimeReq)(nil))
- vdl.Register((*TimeResp)(nil))
- vdl.Register((*SgPriority)(nil))
- vdl.Register((*SgPriorities)(nil))
- vdl.Register((*BlobSharesBySyncgroup)(nil))
- vdl.Register((*Signpost)(nil))
-}
-
-var __VDLType11 *vdl.Type = vdl.TypeOf((*ChunkData)(nil))
-var __VDLType10 *vdl.Type = vdl.TypeOf((*ChunkHash)(nil))
-var __VDLType6 *vdl.Type = vdl.TypeOf((*DataDeltaReq)(nil))
-var __VDLType9 *vdl.Type
-
-func __VDLType9_gen() *vdl.Type {
- __VDLType9Builder := vdl.TypeBuilder{}
-
- __VDLType91 := __VDLType9Builder.Optional()
- __VDLType92 := __VDLType9Builder.Struct()
- __VDLType93 := __VDLType9Builder.Named("v.io/x/ref/services/syncbase/server/interfaces.DeltaFinalResp").AssignBase(__VDLType92)
- __VDLType94 := __VDLType9Builder.Map()
- __VDLType95 := __VDLType9Builder.Named("v.io/x/ref/services/syncbase/server/interfaces.SgPriorities").AssignBase(__VDLType94)
- __VDLType96 := vdl.Uint64Type
- __VDLType97 := __VDLType9Builder.Named("v.io/x/ref/services/syncbase/server/interfaces.GroupId").AssignBase(__VDLType96)
- __VDLType94.AssignKey(__VDLType97)
- __VDLType98 := __VDLType9Builder.Struct()
- __VDLType99 := __VDLType9Builder.Named("v.io/x/ref/services/syncbase/server/interfaces.SgPriority").AssignBase(__VDLType98)
- __VDLType910 := vdl.Int32Type
- __VDLType98.AppendField("Distance", __VDLType910)
- __VDLType911 := __VDLType9Builder.Struct()
- __VDLType912 := __VDLType9Builder.Named("time.Time").AssignBase(__VDLType911)
- __VDLType913 := vdl.Int64Type
- __VDLType911.AppendField("Seconds", __VDLType913)
- __VDLType911.AppendField("Nanos", __VDLType910)
- __VDLType98.AppendField("ServerTime", __VDLType912)
- __VDLType94.AssignElem(__VDLType99)
- __VDLType92.AppendField("SgPriorities", __VDLType95)
- __VDLType91.AssignElem(__VDLType93)
- __VDLType9Builder.Build()
- __VDLType9v, err := __VDLType91.Built()
- if err != nil {
- panic(err)
- }
- return __VDLType9v
-}
-func init() {
- __VDLType9 = __VDLType9_gen()
-}
-
-var __VDLType2 *vdl.Type
-
-func __VDLType2_gen() *vdl.Type {
- __VDLType2Builder := vdl.TypeBuilder{}
-
- __VDLType21 := __VDLType2Builder.Optional()
- __VDLType22 := __VDLType2Builder.Struct()
- __VDLType23 := __VDLType2Builder.Named("v.io/x/ref/services/syncbase/server/interfaces.LogRec").AssignBase(__VDLType22)
- __VDLType24 := __VDLType2Builder.Struct()
- __VDLType25 := __VDLType2Builder.Named("v.io/x/ref/services/syncbase/server/interfaces.LogRecMetadata").AssignBase(__VDLType24)
- __VDLType26 := vdl.Uint64Type
- __VDLType24.AppendField("Id", __VDLType26)
- __VDLType24.AppendField("Gen", __VDLType26)
- __VDLType27 := vdl.ByteType
- __VDLType24.AppendField("RecType", __VDLType27)
- __VDLType28 := vdl.StringType
- __VDLType24.AppendField("ObjId", __VDLType28)
- __VDLType24.AppendField("CurVers", __VDLType28)
- __VDLType29 := __VDLType2Builder.List()
- __VDLType29.AssignElem(__VDLType28)
- __VDLType24.AppendField("Parents", __VDLType29)
- __VDLType210 := __VDLType2Builder.Struct()
- __VDLType211 := __VDLType2Builder.Named("time.Time").AssignBase(__VDLType210)
- __VDLType212 := vdl.Int64Type
- __VDLType210.AppendField("Seconds", __VDLType212)
- __VDLType213 := vdl.Int32Type
- __VDLType210.AppendField("Nanos", __VDLType213)
- __VDLType24.AppendField("UpdTime", __VDLType211)
- __VDLType24.AppendField("PermId", __VDLType28)
- __VDLType24.AppendField("PermVers", __VDLType28)
- __VDLType214 := vdl.BoolType
- __VDLType24.AppendField("Delete", __VDLType214)
- __VDLType24.AppendField("BatchId", __VDLType26)
- __VDLType24.AppendField("BatchCount", __VDLType26)
- __VDLType22.AppendField("Metadata", __VDLType25)
- __VDLType215 := __VDLType2Builder.List()
- __VDLType215.AssignElem(__VDLType27)
- __VDLType22.AppendField("Value", __VDLType215)
- __VDLType22.AppendField("Shell", __VDLType214)
- __VDLType21.AssignElem(__VDLType23)
- __VDLType2Builder.Build()
- __VDLType2v, err := __VDLType21.Built()
- if err != nil {
- panic(err)
- }
- return __VDLType2v
-}
-func init() {
- __VDLType2 = __VDLType2_gen()
-}
-
-var __VDLType0 *vdl.Type
-
-func __VDLType0_gen() *vdl.Type {
- __VDLType0Builder := vdl.TypeBuilder{}
-
- __VDLType01 := __VDLType0Builder.Optional()
- __VDLType02 := __VDLType0Builder.Struct()
- __VDLType03 := __VDLType0Builder.Named("v.io/x/ref/services/syncbase/server/interfaces.LogRecMetadata").AssignBase(__VDLType02)
- __VDLType04 := vdl.Uint64Type
- __VDLType02.AppendField("Id", __VDLType04)
- __VDLType02.AppendField("Gen", __VDLType04)
- __VDLType05 := vdl.ByteType
- __VDLType02.AppendField("RecType", __VDLType05)
- __VDLType06 := vdl.StringType
- __VDLType02.AppendField("ObjId", __VDLType06)
- __VDLType02.AppendField("CurVers", __VDLType06)
- __VDLType07 := __VDLType0Builder.List()
- __VDLType07.AssignElem(__VDLType06)
- __VDLType02.AppendField("Parents", __VDLType07)
- __VDLType08 := __VDLType0Builder.Struct()
- __VDLType09 := __VDLType0Builder.Named("time.Time").AssignBase(__VDLType08)
- __VDLType010 := vdl.Int64Type
- __VDLType08.AppendField("Seconds", __VDLType010)
- __VDLType011 := vdl.Int32Type
- __VDLType08.AppendField("Nanos", __VDLType011)
- __VDLType02.AppendField("UpdTime", __VDLType09)
- __VDLType02.AppendField("PermId", __VDLType06)
- __VDLType02.AppendField("PermVers", __VDLType06)
- __VDLType012 := vdl.BoolType
- __VDLType02.AppendField("Delete", __VDLType012)
- __VDLType02.AppendField("BatchId", __VDLType04)
- __VDLType02.AppendField("BatchCount", __VDLType04)
- __VDLType01.AssignElem(__VDLType03)
- __VDLType0Builder.Build()
- __VDLType0v, err := __VDLType01.Built()
- if err != nil {
- panic(err)
- }
- return __VDLType0v
-}
-func init() {
- __VDLType0 = __VDLType0_gen()
-}
-
-var __VDLType8 *vdl.Type = vdl.TypeOf((*SgDeltaReq)(nil))
-var __VDLType14 *vdl.Type
-
-func __VDLType14_gen() *vdl.Type {
- __VDLType14Builder := vdl.TypeBuilder{}
-
- __VDLType141 := __VDLType14Builder.Optional()
- __VDLType142 := __VDLType14Builder.Struct()
- __VDLType143 := __VDLType14Builder.Named("v.io/x/ref/services/syncbase/server/interfaces.SgPriority").AssignBase(__VDLType142)
- __VDLType144 := vdl.Int32Type
- __VDLType142.AppendField("Distance", __VDLType144)
- __VDLType145 := __VDLType14Builder.Struct()
- __VDLType146 := __VDLType14Builder.Named("time.Time").AssignBase(__VDLType145)
- __VDLType147 := vdl.Int64Type
- __VDLType145.AppendField("Seconds", __VDLType147)
- __VDLType145.AppendField("Nanos", __VDLType144)
- __VDLType142.AppendField("ServerTime", __VDLType146)
- __VDLType141.AssignElem(__VDLType143)
- __VDLType14Builder.Build()
- __VDLType14v, err := __VDLType141.Built()
- if err != nil {
- panic(err)
- }
- return __VDLType14v
-}
-func init() {
- __VDLType14 = __VDLType14_gen()
-}
-
-var __VDLType15 *vdl.Type = vdl.TypeOf((*Signpost)(nil))
-var __VDLType4 *vdl.Type = vdl.TypeOf((*Syncgroup)(nil))
-var __VDLType12 *vdl.Type
-
-func __VDLType12_gen() *vdl.Type {
- __VDLType12Builder := vdl.TypeBuilder{}
-
- __VDLType121 := __VDLType12Builder.Optional()
- __VDLType122 := __VDLType12Builder.Struct()
- __VDLType123 := __VDLType12Builder.Named("v.io/x/ref/services/syncbase/server/interfaces.TimeReq").AssignBase(__VDLType122)
- __VDLType124 := __VDLType12Builder.Struct()
- __VDLType125 := __VDLType12Builder.Named("time.Time").AssignBase(__VDLType124)
- __VDLType126 := vdl.Int64Type
- __VDLType124.AppendField("Seconds", __VDLType126)
- __VDLType127 := vdl.Int32Type
- __VDLType124.AppendField("Nanos", __VDLType127)
- __VDLType122.AppendField("SendTs", __VDLType125)
- __VDLType121.AssignElem(__VDLType123)
- __VDLType12Builder.Build()
- __VDLType12v, err := __VDLType121.Built()
- if err != nil {
- panic(err)
- }
- return __VDLType12v
-}
-func init() {
- __VDLType12 = __VDLType12_gen()
-}
-
-var __VDLType13 *vdl.Type
-
-func __VDLType13_gen() *vdl.Type {
- __VDLType13Builder := vdl.TypeBuilder{}
-
- __VDLType131 := __VDLType13Builder.Optional()
- __VDLType132 := __VDLType13Builder.Struct()
- __VDLType133 := __VDLType13Builder.Named("v.io/x/ref/services/syncbase/server/interfaces.TimeResp").AssignBase(__VDLType132)
- __VDLType134 := __VDLType13Builder.Struct()
- __VDLType135 := __VDLType13Builder.Named("time.Time").AssignBase(__VDLType134)
- __VDLType136 := vdl.Int64Type
- __VDLType134.AppendField("Seconds", __VDLType136)
- __VDLType137 := vdl.Int32Type
- __VDLType134.AppendField("Nanos", __VDLType137)
- __VDLType132.AppendField("OrigTs", __VDLType135)
- __VDLType132.AppendField("RecvTs", __VDLType135)
- __VDLType132.AppendField("SendTs", __VDLType135)
- __VDLType132.AppendField("LastNtpTs", __VDLType135)
- __VDLType138 := vdl.Uint16Type
- __VDLType132.AppendField("NumReboots", __VDLType138)
- __VDLType132.AppendField("NumHops", __VDLType138)
- __VDLType131.AssignElem(__VDLType133)
- __VDLType13Builder.Build()
- __VDLType13v, err := __VDLType131.Built()
- if err != nil {
- panic(err)
- }
- return __VDLType13v
-}
-func init() {
- __VDLType13 = __VDLType13_gen()
-}
-
-var __VDLType3 *vdl.Type = vdl.TypeOf([]byte(nil))
-var __VDLType1 *vdl.Type = vdl.TypeOf([]string(nil))
-var __VDLType5 *vdl.Type = vdl.TypeOf(map[string]nosql.SyncgroupMemberInfo(nil))
-var __VDLType7 *vdl.Type = vdl.TypeOf(map[GroupId]struct{}(nil))
-var __VDLType_time_Time *vdl.Type
-
-func __VDLType_time_Time_gen() *vdl.Type {
- __VDLType_time_TimeBuilder := vdl.TypeBuilder{}
-
- __VDLType_time_Time1 := __VDLType_time_TimeBuilder.Struct()
- __VDLType_time_Time2 := __VDLType_time_TimeBuilder.Named("time.Time").AssignBase(__VDLType_time_Time1)
- __VDLType_time_Time3 := vdl.Int64Type
- __VDLType_time_Time1.AppendField("Seconds", __VDLType_time_Time3)
- __VDLType_time_Time4 := vdl.Int32Type
- __VDLType_time_Time1.AppendField("Nanos", __VDLType_time_Time4)
- __VDLType_time_TimeBuilder.Build()
- __VDLType_time_Timev, err := __VDLType_time_Time2.Built()
- if err != nil {
- panic(err)
- }
- return __VDLType_time_Timev
-}
-func init() {
- __VDLType_time_Time = __VDLType_time_Time_gen()
-}
-
-var __VDLType_v_io_v23_services_syncbase_nosql_SyncgroupMemberInfo *vdl.Type = vdl.TypeOf(nosql.SyncgroupMemberInfo{})
-var __VDLType_v_io_v23_services_syncbase_nosql_SyncgroupSpec *vdl.Type = vdl.TypeOf(nosql.SyncgroupSpec{})
-var __VDLType_v_io_x_ref_services_syncbase_server_interfaces_BlobSharesBySyncgroup *vdl.Type = vdl.TypeOf(BlobSharesBySyncgroup(nil))
-var __VDLType_v_io_x_ref_services_syncbase_server_interfaces_ChunkData *vdl.Type = vdl.TypeOf(ChunkData{})
-var __VDLType_v_io_x_ref_services_syncbase_server_interfaces_ChunkHash *vdl.Type = vdl.TypeOf(ChunkHash{})
-var __VDLType_v_io_x_ref_services_syncbase_server_interfaces_DataDeltaReq *vdl.Type = vdl.TypeOf(DataDeltaReq{})
-var __VDLType_v_io_x_ref_services_syncbase_server_interfaces_DeltaFinalResp *vdl.Type
-
-func __VDLType_v_io_x_ref_services_syncbase_server_interfaces_DeltaFinalResp_gen() *vdl.Type {
- __VDLType_v_io_x_ref_services_syncbase_server_interfaces_DeltaFinalRespBuilder := vdl.TypeBuilder{}
-
- __VDLType_v_io_x_ref_services_syncbase_server_interfaces_DeltaFinalResp1 := __VDLType_v_io_x_ref_services_syncbase_server_interfaces_DeltaFinalRespBuilder.Struct()
- __VDLType_v_io_x_ref_services_syncbase_server_interfaces_DeltaFinalResp2 := __VDLType_v_io_x_ref_services_syncbase_server_interfaces_DeltaFinalRespBuilder.Named("v.io/x/ref/services/syncbase/server/interfaces.DeltaFinalResp").AssignBase(__VDLType_v_io_x_ref_services_syncbase_server_interfaces_DeltaFinalResp1)
- __VDLType_v_io_x_ref_services_syncbase_server_interfaces_DeltaFinalResp3 := __VDLType_v_io_x_ref_services_syncbase_server_interfaces_DeltaFinalRespBuilder.Map()
- __VDLType_v_io_x_ref_services_syncbase_server_interfaces_DeltaFinalResp4 := __VDLType_v_io_x_ref_services_syncbase_server_interfaces_DeltaFinalRespBuilder.Named("v.io/x/ref/services/syncbase/server/interfaces.SgPriorities").AssignBase(__VDLType_v_io_x_ref_services_syncbase_server_interfaces_DeltaFinalResp3)
- __VDLType_v_io_x_ref_services_syncbase_server_interfaces_DeltaFinalResp5 := vdl.Uint64Type
- __VDLType_v_io_x_ref_services_syncbase_server_interfaces_DeltaFinalResp6 := __VDLType_v_io_x_ref_services_syncbase_server_interfaces_DeltaFinalRespBuilder.Named("v.io/x/ref/services/syncbase/server/interfaces.GroupId").AssignBase(__VDLType_v_io_x_ref_services_syncbase_server_interfaces_DeltaFinalResp5)
- __VDLType_v_io_x_ref_services_syncbase_server_interfaces_DeltaFinalResp3.AssignKey(__VDLType_v_io_x_ref_services_syncbase_server_interfaces_DeltaFinalResp6)
- __VDLType_v_io_x_ref_services_syncbase_server_interfaces_DeltaFinalResp7 := __VDLType_v_io_x_ref_services_syncbase_server_interfaces_DeltaFinalRespBuilder.Struct()
- __VDLType_v_io_x_ref_services_syncbase_server_interfaces_DeltaFinalResp8 := __VDLType_v_io_x_ref_services_syncbase_server_interfaces_DeltaFinalRespBuilder.Named("v.io/x/ref/services/syncbase/server/interfaces.SgPriority").AssignBase(__VDLType_v_io_x_ref_services_syncbase_server_interfaces_DeltaFinalResp7)
- __VDLType_v_io_x_ref_services_syncbase_server_interfaces_DeltaFinalResp9 := vdl.Int32Type
- __VDLType_v_io_x_ref_services_syncbase_server_interfaces_DeltaFinalResp7.AppendField("Distance", __VDLType_v_io_x_ref_services_syncbase_server_interfaces_DeltaFinalResp9)
- __VDLType_v_io_x_ref_services_syncbase_server_interfaces_DeltaFinalResp10 := __VDLType_v_io_x_ref_services_syncbase_server_interfaces_DeltaFinalRespBuilder.Struct()
- __VDLType_v_io_x_ref_services_syncbase_server_interfaces_DeltaFinalResp11 := __VDLType_v_io_x_ref_services_syncbase_server_interfaces_DeltaFinalRespBuilder.Named("time.Time").AssignBase(__VDLType_v_io_x_ref_services_syncbase_server_interfaces_DeltaFinalResp10)
- __VDLType_v_io_x_ref_services_syncbase_server_interfaces_DeltaFinalResp12 := vdl.Int64Type
- __VDLType_v_io_x_ref_services_syncbase_server_interfaces_DeltaFinalResp10.AppendField("Seconds", __VDLType_v_io_x_ref_services_syncbase_server_interfaces_DeltaFinalResp12)
- __VDLType_v_io_x_ref_services_syncbase_server_interfaces_DeltaFinalResp10.AppendField("Nanos", __VDLType_v_io_x_ref_services_syncbase_server_interfaces_DeltaFinalResp9)
- __VDLType_v_io_x_ref_services_syncbase_server_interfaces_DeltaFinalResp7.AppendField("ServerTime", __VDLType_v_io_x_ref_services_syncbase_server_interfaces_DeltaFinalResp11)
- __VDLType_v_io_x_ref_services_syncbase_server_interfaces_DeltaFinalResp3.AssignElem(__VDLType_v_io_x_ref_services_syncbase_server_interfaces_DeltaFinalResp8)
- __VDLType_v_io_x_ref_services_syncbase_server_interfaces_DeltaFinalResp1.AppendField("SgPriorities", __VDLType_v_io_x_ref_services_syncbase_server_interfaces_DeltaFinalResp4)
- __VDLType_v_io_x_ref_services_syncbase_server_interfaces_DeltaFinalRespBuilder.Build()
- __VDLType_v_io_x_ref_services_syncbase_server_interfaces_DeltaFinalRespv, err := __VDLType_v_io_x_ref_services_syncbase_server_interfaces_DeltaFinalResp2.Built()
- if err != nil {
- panic(err)
- }
- return __VDLType_v_io_x_ref_services_syncbase_server_interfaces_DeltaFinalRespv
-}
-func init() {
- __VDLType_v_io_x_ref_services_syncbase_server_interfaces_DeltaFinalResp = __VDLType_v_io_x_ref_services_syncbase_server_interfaces_DeltaFinalResp_gen()
-}
-
-var __VDLType_v_io_x_ref_services_syncbase_server_interfaces_DeltaReq *vdl.Type = vdl.TypeOf(DeltaReq(DeltaReqSgs{SgDeltaReq{}}))
-var __VDLType_v_io_x_ref_services_syncbase_server_interfaces_DeltaResp *vdl.Type
-
-func __VDLType_v_io_x_ref_services_syncbase_server_interfaces_DeltaResp_gen() *vdl.Type {
- __VDLType_v_io_x_ref_services_syncbase_server_interfaces_DeltaRespBuilder := vdl.TypeBuilder{}
-
- __VDLType_v_io_x_ref_services_syncbase_server_interfaces_DeltaResp1 := __VDLType_v_io_x_ref_services_syncbase_server_interfaces_DeltaRespBuilder.Union()
- __VDLType_v_io_x_ref_services_syncbase_server_interfaces_DeltaResp2 := __VDLType_v_io_x_ref_services_syncbase_server_interfaces_DeltaRespBuilder.Named("v.io/x/ref/services/syncbase/server/interfaces.DeltaResp").AssignBase(__VDLType_v_io_x_ref_services_syncbase_server_interfaces_DeltaResp1)
- __VDLType_v_io_x_ref_services_syncbase_server_interfaces_DeltaResp3 := __VDLType_v_io_x_ref_services_syncbase_server_interfaces_DeltaRespBuilder.Struct()
- __VDLType_v_io_x_ref_services_syncbase_server_interfaces_DeltaResp4 := __VDLType_v_io_x_ref_services_syncbase_server_interfaces_DeltaRespBuilder.Named("v.io/x/ref/services/syncbase/server/interfaces.LogRec").AssignBase(__VDLType_v_io_x_ref_services_syncbase_server_interfaces_DeltaResp3)
- __VDLType_v_io_x_ref_services_syncbase_server_interfaces_DeltaResp5 := __VDLType_v_io_x_ref_services_syncbase_server_interfaces_DeltaRespBuilder.Struct()
- __VDLType_v_io_x_ref_services_syncbase_server_interfaces_DeltaResp6 := __VDLType_v_io_x_ref_services_syncbase_server_interfaces_DeltaRespBuilder.Named("v.io/x/ref/services/syncbase/server/interfaces.LogRecMetadata").AssignBase(__VDLType_v_io_x_ref_services_syncbase_server_interfaces_DeltaResp5)
- __VDLType_v_io_x_ref_services_syncbase_server_interfaces_DeltaResp7 := vdl.Uint64Type
- __VDLType_v_io_x_ref_services_syncbase_server_interfaces_DeltaResp5.AppendField("Id", __VDLType_v_io_x_ref_services_syncbase_server_interfaces_DeltaResp7)
- __VDLType_v_io_x_ref_services_syncbase_server_interfaces_DeltaResp5.AppendField("Gen", __VDLType_v_io_x_ref_services_syncbase_server_interfaces_DeltaResp7)
- __VDLType_v_io_x_ref_services_syncbase_server_interfaces_DeltaResp8 := vdl.ByteType
- __VDLType_v_io_x_ref_services_syncbase_server_interfaces_DeltaResp5.AppendField("RecType", __VDLType_v_io_x_ref_services_syncbase_server_interfaces_DeltaResp8)
- __VDLType_v_io_x_ref_services_syncbase_server_interfaces_DeltaResp9 := vdl.StringType
- __VDLType_v_io_x_ref_services_syncbase_server_interfaces_DeltaResp5.AppendField("ObjId", __VDLType_v_io_x_ref_services_syncbase_server_interfaces_DeltaResp9)
- __VDLType_v_io_x_ref_services_syncbase_server_interfaces_DeltaResp5.AppendField("CurVers", __VDLType_v_io_x_ref_services_syncbase_server_interfaces_DeltaResp9)
- __VDLType_v_io_x_ref_services_syncbase_server_interfaces_DeltaResp10 := __VDLType_v_io_x_ref_services_syncbase_server_interfaces_DeltaRespBuilder.List()
- __VDLType_v_io_x_ref_services_syncbase_server_interfaces_DeltaResp10.AssignElem(__VDLType_v_io_x_ref_services_syncbase_server_interfaces_DeltaResp9)
- __VDLType_v_io_x_ref_services_syncbase_server_interfaces_DeltaResp5.AppendField("Parents", __VDLType_v_io_x_ref_services_syncbase_server_interfaces_DeltaResp10)
- __VDLType_v_io_x_ref_services_syncbase_server_interfaces_DeltaResp11 := __VDLType_v_io_x_ref_services_syncbase_server_interfaces_DeltaRespBuilder.Struct()
- __VDLType_v_io_x_ref_services_syncbase_server_interfaces_DeltaResp12 := __VDLType_v_io_x_ref_services_syncbase_server_interfaces_DeltaRespBuilder.Named("time.Time").AssignBase(__VDLType_v_io_x_ref_services_syncbase_server_interfaces_DeltaResp11)
- __VDLType_v_io_x_ref_services_syncbase_server_interfaces_DeltaResp13 := vdl.Int64Type
- __VDLType_v_io_x_ref_services_syncbase_server_interfaces_DeltaResp11.AppendField("Seconds", __VDLType_v_io_x_ref_services_syncbase_server_interfaces_DeltaResp13)
- __VDLType_v_io_x_ref_services_syncbase_server_interfaces_DeltaResp14 := vdl.Int32Type
- __VDLType_v_io_x_ref_services_syncbase_server_interfaces_DeltaResp11.AppendField("Nanos", __VDLType_v_io_x_ref_services_syncbase_server_interfaces_DeltaResp14)
- __VDLType_v_io_x_ref_services_syncbase_server_interfaces_DeltaResp5.AppendField("UpdTime", __VDLType_v_io_x_ref_services_syncbase_server_interfaces_DeltaResp12)
- __VDLType_v_io_x_ref_services_syncbase_server_interfaces_DeltaResp5.AppendField("PermId", __VDLType_v_io_x_ref_services_syncbase_server_interfaces_DeltaResp9)
- __VDLType_v_io_x_ref_services_syncbase_server_interfaces_DeltaResp5.AppendField("PermVers", __VDLType_v_io_x_ref_services_syncbase_server_interfaces_DeltaResp9)
- __VDLType_v_io_x_ref_services_syncbase_server_interfaces_DeltaResp15 := vdl.BoolType
- __VDLType_v_io_x_ref_services_syncbase_server_interfaces_DeltaResp5.AppendField("Delete", __VDLType_v_io_x_ref_services_syncbase_server_interfaces_DeltaResp15)
- __VDLType_v_io_x_ref_services_syncbase_server_interfaces_DeltaResp5.AppendField("BatchId", __VDLType_v_io_x_ref_services_syncbase_server_interfaces_DeltaResp7)
- __VDLType_v_io_x_ref_services_syncbase_server_interfaces_DeltaResp5.AppendField("BatchCount", __VDLType_v_io_x_ref_services_syncbase_server_interfaces_DeltaResp7)
- __VDLType_v_io_x_ref_services_syncbase_server_interfaces_DeltaResp3.AppendField("Metadata", __VDLType_v_io_x_ref_services_syncbase_server_interfaces_DeltaResp6)
- __VDLType_v_io_x_ref_services_syncbase_server_interfaces_DeltaResp16 := __VDLType_v_io_x_ref_services_syncbase_server_interfaces_DeltaRespBuilder.List()
- __VDLType_v_io_x_ref_services_syncbase_server_interfaces_DeltaResp16.AssignElem(__VDLType_v_io_x_ref_services_syncbase_server_interfaces_DeltaResp8)
- __VDLType_v_io_x_ref_services_syncbase_server_interfaces_DeltaResp3.AppendField("Value", __VDLType_v_io_x_ref_services_syncbase_server_interfaces_DeltaResp16)
- __VDLType_v_io_x_ref_services_syncbase_server_interfaces_DeltaResp3.AppendField("Shell", __VDLType_v_io_x_ref_services_syncbase_server_interfaces_DeltaResp15)
- __VDLType_v_io_x_ref_services_syncbase_server_interfaces_DeltaResp1.AppendField("Rec", __VDLType_v_io_x_ref_services_syncbase_server_interfaces_DeltaResp4)
- __VDLType_v_io_x_ref_services_syncbase_server_interfaces_DeltaResp17 := __VDLType_v_io_x_ref_services_syncbase_server_interfaces_DeltaRespBuilder.Map()
- __VDLType_v_io_x_ref_services_syncbase_server_interfaces_DeltaResp18 := __VDLType_v_io_x_ref_services_syncbase_server_interfaces_DeltaRespBuilder.Named("v.io/x/ref/services/syncbase/server/interfaces.Knowledge").AssignBase(__VDLType_v_io_x_ref_services_syncbase_server_interfaces_DeltaResp17)
- __VDLType_v_io_x_ref_services_syncbase_server_interfaces_DeltaResp17.AssignKey(__VDLType_v_io_x_ref_services_syncbase_server_interfaces_DeltaResp9)
- __VDLType_v_io_x_ref_services_syncbase_server_interfaces_DeltaResp19 := __VDLType_v_io_x_ref_services_syncbase_server_interfaces_DeltaRespBuilder.Map()
- __VDLType_v_io_x_ref_services_syncbase_server_interfaces_DeltaResp20 := __VDLType_v_io_x_ref_services_syncbase_server_interfaces_DeltaRespBuilder.Named("v.io/x/ref/services/syncbase/server/interfaces.GenVector").AssignBase(__VDLType_v_io_x_ref_services_syncbase_server_interfaces_DeltaResp19)
- __VDLType_v_io_x_ref_services_syncbase_server_interfaces_DeltaResp19.AssignKey(__VDLType_v_io_x_ref_services_syncbase_server_interfaces_DeltaResp7)
- __VDLType_v_io_x_ref_services_syncbase_server_interfaces_DeltaResp19.AssignElem(__VDLType_v_io_x_ref_services_syncbase_server_interfaces_DeltaResp7)
- __VDLType_v_io_x_ref_services_syncbase_server_interfaces_DeltaResp17.AssignElem(__VDLType_v_io_x_ref_services_syncbase_server_interfaces_DeltaResp20)
- __VDLType_v_io_x_ref_services_syncbase_server_interfaces_DeltaResp1.AppendField("Gvs", __VDLType_v_io_x_ref_services_syncbase_server_interfaces_DeltaResp18)
- __VDLType_v_io_x_ref_services_syncbase_server_interfaces_DeltaRespBuilder.Build()
- __VDLType_v_io_x_ref_services_syncbase_server_interfaces_DeltaRespv, err := __VDLType_v_io_x_ref_services_syncbase_server_interfaces_DeltaResp2.Built()
- if err != nil {
- panic(err)
- }
- return __VDLType_v_io_x_ref_services_syncbase_server_interfaces_DeltaRespv
-}
-func init() {
- __VDLType_v_io_x_ref_services_syncbase_server_interfaces_DeltaResp = __VDLType_v_io_x_ref_services_syncbase_server_interfaces_DeltaResp_gen()
-}
-
-var __VDLType_v_io_x_ref_services_syncbase_server_interfaces_GenVector *vdl.Type = vdl.TypeOf(GenVector(nil))
-var __VDLType_v_io_x_ref_services_syncbase_server_interfaces_GroupId *vdl.Type = vdl.TypeOf(GroupId(0))
-var __VDLType_v_io_x_ref_services_syncbase_server_interfaces_Knowledge *vdl.Type = vdl.TypeOf(Knowledge(nil))
-var __VDLType_v_io_x_ref_services_syncbase_server_interfaces_LogRec *vdl.Type
-
-func __VDLType_v_io_x_ref_services_syncbase_server_interfaces_LogRec_gen() *vdl.Type {
- __VDLType_v_io_x_ref_services_syncbase_server_interfaces_LogRecBuilder := vdl.TypeBuilder{}
-
- __VDLType_v_io_x_ref_services_syncbase_server_interfaces_LogRec1 := __VDLType_v_io_x_ref_services_syncbase_server_interfaces_LogRecBuilder.Struct()
- __VDLType_v_io_x_ref_services_syncbase_server_interfaces_LogRec2 := __VDLType_v_io_x_ref_services_syncbase_server_interfaces_LogRecBuilder.Named("v.io/x/ref/services/syncbase/server/interfaces.LogRec").AssignBase(__VDLType_v_io_x_ref_services_syncbase_server_interfaces_LogRec1)
- __VDLType_v_io_x_ref_services_syncbase_server_interfaces_LogRec3 := __VDLType_v_io_x_ref_services_syncbase_server_interfaces_LogRecBuilder.Struct()
- __VDLType_v_io_x_ref_services_syncbase_server_interfaces_LogRec4 := __VDLType_v_io_x_ref_services_syncbase_server_interfaces_LogRecBuilder.Named("v.io/x/ref/services/syncbase/server/interfaces.LogRecMetadata").AssignBase(__VDLType_v_io_x_ref_services_syncbase_server_interfaces_LogRec3)
- __VDLType_v_io_x_ref_services_syncbase_server_interfaces_LogRec5 := vdl.Uint64Type
- __VDLType_v_io_x_ref_services_syncbase_server_interfaces_LogRec3.AppendField("Id", __VDLType_v_io_x_ref_services_syncbase_server_interfaces_LogRec5)
- __VDLType_v_io_x_ref_services_syncbase_server_interfaces_LogRec3.AppendField("Gen", __VDLType_v_io_x_ref_services_syncbase_server_interfaces_LogRec5)
- __VDLType_v_io_x_ref_services_syncbase_server_interfaces_LogRec6 := vdl.ByteType
- __VDLType_v_io_x_ref_services_syncbase_server_interfaces_LogRec3.AppendField("RecType", __VDLType_v_io_x_ref_services_syncbase_server_interfaces_LogRec6)
- __VDLType_v_io_x_ref_services_syncbase_server_interfaces_LogRec7 := vdl.StringType
- __VDLType_v_io_x_ref_services_syncbase_server_interfaces_LogRec3.AppendField("ObjId", __VDLType_v_io_x_ref_services_syncbase_server_interfaces_LogRec7)
- __VDLType_v_io_x_ref_services_syncbase_server_interfaces_LogRec3.AppendField("CurVers", __VDLType_v_io_x_ref_services_syncbase_server_interfaces_LogRec7)
- __VDLType_v_io_x_ref_services_syncbase_server_interfaces_LogRec8 := __VDLType_v_io_x_ref_services_syncbase_server_interfaces_LogRecBuilder.List()
- __VDLType_v_io_x_ref_services_syncbase_server_interfaces_LogRec8.AssignElem(__VDLType_v_io_x_ref_services_syncbase_server_interfaces_LogRec7)
- __VDLType_v_io_x_ref_services_syncbase_server_interfaces_LogRec3.AppendField("Parents", __VDLType_v_io_x_ref_services_syncbase_server_interfaces_LogRec8)
- __VDLType_v_io_x_ref_services_syncbase_server_interfaces_LogRec9 := __VDLType_v_io_x_ref_services_syncbase_server_interfaces_LogRecBuilder.Struct()
- __VDLType_v_io_x_ref_services_syncbase_server_interfaces_LogRec10 := __VDLType_v_io_x_ref_services_syncbase_server_interfaces_LogRecBuilder.Named("time.Time").AssignBase(__VDLType_v_io_x_ref_services_syncbase_server_interfaces_LogRec9)
- __VDLType_v_io_x_ref_services_syncbase_server_interfaces_LogRec11 := vdl.Int64Type
- __VDLType_v_io_x_ref_services_syncbase_server_interfaces_LogRec9.AppendField("Seconds", __VDLType_v_io_x_ref_services_syncbase_server_interfaces_LogRec11)
- __VDLType_v_io_x_ref_services_syncbase_server_interfaces_LogRec12 := vdl.Int32Type
- __VDLType_v_io_x_ref_services_syncbase_server_interfaces_LogRec9.AppendField("Nanos", __VDLType_v_io_x_ref_services_syncbase_server_interfaces_LogRec12)
- __VDLType_v_io_x_ref_services_syncbase_server_interfaces_LogRec3.AppendField("UpdTime", __VDLType_v_io_x_ref_services_syncbase_server_interfaces_LogRec10)
- __VDLType_v_io_x_ref_services_syncbase_server_interfaces_LogRec3.AppendField("PermId", __VDLType_v_io_x_ref_services_syncbase_server_interfaces_LogRec7)
- __VDLType_v_io_x_ref_services_syncbase_server_interfaces_LogRec3.AppendField("PermVers", __VDLType_v_io_x_ref_services_syncbase_server_interfaces_LogRec7)
- __VDLType_v_io_x_ref_services_syncbase_server_interfaces_LogRec13 := vdl.BoolType
- __VDLType_v_io_x_ref_services_syncbase_server_interfaces_LogRec3.AppendField("Delete", __VDLType_v_io_x_ref_services_syncbase_server_interfaces_LogRec13)
- __VDLType_v_io_x_ref_services_syncbase_server_interfaces_LogRec3.AppendField("BatchId", __VDLType_v_io_x_ref_services_syncbase_server_interfaces_LogRec5)
- __VDLType_v_io_x_ref_services_syncbase_server_interfaces_LogRec3.AppendField("BatchCount", __VDLType_v_io_x_ref_services_syncbase_server_interfaces_LogRec5)
- __VDLType_v_io_x_ref_services_syncbase_server_interfaces_LogRec1.AppendField("Metadata", __VDLType_v_io_x_ref_services_syncbase_server_interfaces_LogRec4)
- __VDLType_v_io_x_ref_services_syncbase_server_interfaces_LogRec14 := __VDLType_v_io_x_ref_services_syncbase_server_interfaces_LogRecBuilder.List()
- __VDLType_v_io_x_ref_services_syncbase_server_interfaces_LogRec14.AssignElem(__VDLType_v_io_x_ref_services_syncbase_server_interfaces_LogRec6)
- __VDLType_v_io_x_ref_services_syncbase_server_interfaces_LogRec1.AppendField("Value", __VDLType_v_io_x_ref_services_syncbase_server_interfaces_LogRec14)
- __VDLType_v_io_x_ref_services_syncbase_server_interfaces_LogRec1.AppendField("Shell", __VDLType_v_io_x_ref_services_syncbase_server_interfaces_LogRec13)
- __VDLType_v_io_x_ref_services_syncbase_server_interfaces_LogRecBuilder.Build()
- __VDLType_v_io_x_ref_services_syncbase_server_interfaces_LogRecv, err := __VDLType_v_io_x_ref_services_syncbase_server_interfaces_LogRec2.Built()
- if err != nil {
- panic(err)
- }
- return __VDLType_v_io_x_ref_services_syncbase_server_interfaces_LogRecv
-}
-func init() {
- __VDLType_v_io_x_ref_services_syncbase_server_interfaces_LogRec = __VDLType_v_io_x_ref_services_syncbase_server_interfaces_LogRec_gen()
-}
-
-var __VDLType_v_io_x_ref_services_syncbase_server_interfaces_LogRecMetadata *vdl.Type
-
-func __VDLType_v_io_x_ref_services_syncbase_server_interfaces_LogRecMetadata_gen() *vdl.Type {
- __VDLType_v_io_x_ref_services_syncbase_server_interfaces_LogRecMetadataBuilder := vdl.TypeBuilder{}
-
- __VDLType_v_io_x_ref_services_syncbase_server_interfaces_LogRecMetadata1 := __VDLType_v_io_x_ref_services_syncbase_server_interfaces_LogRecMetadataBuilder.Struct()
- __VDLType_v_io_x_ref_services_syncbase_server_interfaces_LogRecMetadata2 := __VDLType_v_io_x_ref_services_syncbase_server_interfaces_LogRecMetadataBuilder.Named("v.io/x/ref/services/syncbase/server/interfaces.LogRecMetadata").AssignBase(__VDLType_v_io_x_ref_services_syncbase_server_interfaces_LogRecMetadata1)
- __VDLType_v_io_x_ref_services_syncbase_server_interfaces_LogRecMetadata3 := vdl.Uint64Type
- __VDLType_v_io_x_ref_services_syncbase_server_interfaces_LogRecMetadata1.AppendField("Id", __VDLType_v_io_x_ref_services_syncbase_server_interfaces_LogRecMetadata3)
- __VDLType_v_io_x_ref_services_syncbase_server_interfaces_LogRecMetadata1.AppendField("Gen", __VDLType_v_io_x_ref_services_syncbase_server_interfaces_LogRecMetadata3)
- __VDLType_v_io_x_ref_services_syncbase_server_interfaces_LogRecMetadata4 := vdl.ByteType
- __VDLType_v_io_x_ref_services_syncbase_server_interfaces_LogRecMetadata1.AppendField("RecType", __VDLType_v_io_x_ref_services_syncbase_server_interfaces_LogRecMetadata4)
- __VDLType_v_io_x_ref_services_syncbase_server_interfaces_LogRecMetadata5 := vdl.StringType
- __VDLType_v_io_x_ref_services_syncbase_server_interfaces_LogRecMetadata1.AppendField("ObjId", __VDLType_v_io_x_ref_services_syncbase_server_interfaces_LogRecMetadata5)
- __VDLType_v_io_x_ref_services_syncbase_server_interfaces_LogRecMetadata1.AppendField("CurVers", __VDLType_v_io_x_ref_services_syncbase_server_interfaces_LogRecMetadata5)
- __VDLType_v_io_x_ref_services_syncbase_server_interfaces_LogRecMetadata6 := __VDLType_v_io_x_ref_services_syncbase_server_interfaces_LogRecMetadataBuilder.List()
- __VDLType_v_io_x_ref_services_syncbase_server_interfaces_LogRecMetadata6.AssignElem(__VDLType_v_io_x_ref_services_syncbase_server_interfaces_LogRecMetadata5)
- __VDLType_v_io_x_ref_services_syncbase_server_interfaces_LogRecMetadata1.AppendField("Parents", __VDLType_v_io_x_ref_services_syncbase_server_interfaces_LogRecMetadata6)
- __VDLType_v_io_x_ref_services_syncbase_server_interfaces_LogRecMetadata7 := __VDLType_v_io_x_ref_services_syncbase_server_interfaces_LogRecMetadataBuilder.Struct()
- __VDLType_v_io_x_ref_services_syncbase_server_interfaces_LogRecMetadata8 := __VDLType_v_io_x_ref_services_syncbase_server_interfaces_LogRecMetadataBuilder.Named("time.Time").AssignBase(__VDLType_v_io_x_ref_services_syncbase_server_interfaces_LogRecMetadata7)
- __VDLType_v_io_x_ref_services_syncbase_server_interfaces_LogRecMetadata9 := vdl.Int64Type
- __VDLType_v_io_x_ref_services_syncbase_server_interfaces_LogRecMetadata7.AppendField("Seconds", __VDLType_v_io_x_ref_services_syncbase_server_interfaces_LogRecMetadata9)
- __VDLType_v_io_x_ref_services_syncbase_server_interfaces_LogRecMetadata10 := vdl.Int32Type
- __VDLType_v_io_x_ref_services_syncbase_server_interfaces_LogRecMetadata7.AppendField("Nanos", __VDLType_v_io_x_ref_services_syncbase_server_interfaces_LogRecMetadata10)
- __VDLType_v_io_x_ref_services_syncbase_server_interfaces_LogRecMetadata1.AppendField("UpdTime", __VDLType_v_io_x_ref_services_syncbase_server_interfaces_LogRecMetadata8)
- __VDLType_v_io_x_ref_services_syncbase_server_interfaces_LogRecMetadata1.AppendField("PermId", __VDLType_v_io_x_ref_services_syncbase_server_interfaces_LogRecMetadata5)
- __VDLType_v_io_x_ref_services_syncbase_server_interfaces_LogRecMetadata1.AppendField("PermVers", __VDLType_v_io_x_ref_services_syncbase_server_interfaces_LogRecMetadata5)
- __VDLType_v_io_x_ref_services_syncbase_server_interfaces_LogRecMetadata11 := vdl.BoolType
- __VDLType_v_io_x_ref_services_syncbase_server_interfaces_LogRecMetadata1.AppendField("Delete", __VDLType_v_io_x_ref_services_syncbase_server_interfaces_LogRecMetadata11)
- __VDLType_v_io_x_ref_services_syncbase_server_interfaces_LogRecMetadata1.AppendField("BatchId", __VDLType_v_io_x_ref_services_syncbase_server_interfaces_LogRecMetadata3)
- __VDLType_v_io_x_ref_services_syncbase_server_interfaces_LogRecMetadata1.AppendField("BatchCount", __VDLType_v_io_x_ref_services_syncbase_server_interfaces_LogRecMetadata3)
- __VDLType_v_io_x_ref_services_syncbase_server_interfaces_LogRecMetadataBuilder.Build()
- __VDLType_v_io_x_ref_services_syncbase_server_interfaces_LogRecMetadatav, err := __VDLType_v_io_x_ref_services_syncbase_server_interfaces_LogRecMetadata2.Built()
- if err != nil {
- panic(err)
- }
- return __VDLType_v_io_x_ref_services_syncbase_server_interfaces_LogRecMetadatav
-}
-func init() {
- __VDLType_v_io_x_ref_services_syncbase_server_interfaces_LogRecMetadata = __VDLType_v_io_x_ref_services_syncbase_server_interfaces_LogRecMetadata_gen()
-}
-
-var __VDLType_v_io_x_ref_services_syncbase_server_interfaces_SgDeltaReq *vdl.Type = vdl.TypeOf(SgDeltaReq{})
-var __VDLType_v_io_x_ref_services_syncbase_server_interfaces_SgPriorities *vdl.Type
-
-func __VDLType_v_io_x_ref_services_syncbase_server_interfaces_SgPriorities_gen() *vdl.Type {
- __VDLType_v_io_x_ref_services_syncbase_server_interfaces_SgPrioritiesBuilder := vdl.TypeBuilder{}
-
- __VDLType_v_io_x_ref_services_syncbase_server_interfaces_SgPriorities1 := __VDLType_v_io_x_ref_services_syncbase_server_interfaces_SgPrioritiesBuilder.Map()
- __VDLType_v_io_x_ref_services_syncbase_server_interfaces_SgPriorities2 := __VDLType_v_io_x_ref_services_syncbase_server_interfaces_SgPrioritiesBuilder.Named("v.io/x/ref/services/syncbase/server/interfaces.SgPriorities").AssignBase(__VDLType_v_io_x_ref_services_syncbase_server_interfaces_SgPriorities1)
- __VDLType_v_io_x_ref_services_syncbase_server_interfaces_SgPriorities3 := vdl.Uint64Type
- __VDLType_v_io_x_ref_services_syncbase_server_interfaces_SgPriorities4 := __VDLType_v_io_x_ref_services_syncbase_server_interfaces_SgPrioritiesBuilder.Named("v.io/x/ref/services/syncbase/server/interfaces.GroupId").AssignBase(__VDLType_v_io_x_ref_services_syncbase_server_interfaces_SgPriorities3)
- __VDLType_v_io_x_ref_services_syncbase_server_interfaces_SgPriorities1.AssignKey(__VDLType_v_io_x_ref_services_syncbase_server_interfaces_SgPriorities4)
- __VDLType_v_io_x_ref_services_syncbase_server_interfaces_SgPriorities5 := __VDLType_v_io_x_ref_services_syncbase_server_interfaces_SgPrioritiesBuilder.Struct()
- __VDLType_v_io_x_ref_services_syncbase_server_interfaces_SgPriorities6 := __VDLType_v_io_x_ref_services_syncbase_server_interfaces_SgPrioritiesBuilder.Named("v.io/x/ref/services/syncbase/server/interfaces.SgPriority").AssignBase(__VDLType_v_io_x_ref_services_syncbase_server_interfaces_SgPriorities5)
- __VDLType_v_io_x_ref_services_syncbase_server_interfaces_SgPriorities7 := vdl.Int32Type
- __VDLType_v_io_x_ref_services_syncbase_server_interfaces_SgPriorities5.AppendField("Distance", __VDLType_v_io_x_ref_services_syncbase_server_interfaces_SgPriorities7)
- __VDLType_v_io_x_ref_services_syncbase_server_interfaces_SgPriorities8 := __VDLType_v_io_x_ref_services_syncbase_server_interfaces_SgPrioritiesBuilder.Struct()
- __VDLType_v_io_x_ref_services_syncbase_server_interfaces_SgPriorities9 := __VDLType_v_io_x_ref_services_syncbase_server_interfaces_SgPrioritiesBuilder.Named("time.Time").AssignBase(__VDLType_v_io_x_ref_services_syncbase_server_interfaces_SgPriorities8)
- __VDLType_v_io_x_ref_services_syncbase_server_interfaces_SgPriorities10 := vdl.Int64Type
- __VDLType_v_io_x_ref_services_syncbase_server_interfaces_SgPriorities8.AppendField("Seconds", __VDLType_v_io_x_ref_services_syncbase_server_interfaces_SgPriorities10)
- __VDLType_v_io_x_ref_services_syncbase_server_interfaces_SgPriorities8.AppendField("Nanos", __VDLType_v_io_x_ref_services_syncbase_server_interfaces_SgPriorities7)
- __VDLType_v_io_x_ref_services_syncbase_server_interfaces_SgPriorities5.AppendField("ServerTime", __VDLType_v_io_x_ref_services_syncbase_server_interfaces_SgPriorities9)
- __VDLType_v_io_x_ref_services_syncbase_server_interfaces_SgPriorities1.AssignElem(__VDLType_v_io_x_ref_services_syncbase_server_interfaces_SgPriorities6)
- __VDLType_v_io_x_ref_services_syncbase_server_interfaces_SgPrioritiesBuilder.Build()
- __VDLType_v_io_x_ref_services_syncbase_server_interfaces_SgPrioritiesv, err := __VDLType_v_io_x_ref_services_syncbase_server_interfaces_SgPriorities2.Built()
- if err != nil {
- panic(err)
- }
- return __VDLType_v_io_x_ref_services_syncbase_server_interfaces_SgPrioritiesv
-}
-func init() {
- __VDLType_v_io_x_ref_services_syncbase_server_interfaces_SgPriorities = __VDLType_v_io_x_ref_services_syncbase_server_interfaces_SgPriorities_gen()
-}
-
-var __VDLType_v_io_x_ref_services_syncbase_server_interfaces_SgPriority *vdl.Type
-
-func __VDLType_v_io_x_ref_services_syncbase_server_interfaces_SgPriority_gen() *vdl.Type {
- __VDLType_v_io_x_ref_services_syncbase_server_interfaces_SgPriorityBuilder := vdl.TypeBuilder{}
-
- __VDLType_v_io_x_ref_services_syncbase_server_interfaces_SgPriority1 := __VDLType_v_io_x_ref_services_syncbase_server_interfaces_SgPriorityBuilder.Struct()
- __VDLType_v_io_x_ref_services_syncbase_server_interfaces_SgPriority2 := __VDLType_v_io_x_ref_services_syncbase_server_interfaces_SgPriorityBuilder.Named("v.io/x/ref/services/syncbase/server/interfaces.SgPriority").AssignBase(__VDLType_v_io_x_ref_services_syncbase_server_interfaces_SgPriority1)
- __VDLType_v_io_x_ref_services_syncbase_server_interfaces_SgPriority3 := vdl.Int32Type
- __VDLType_v_io_x_ref_services_syncbase_server_interfaces_SgPriority1.AppendField("Distance", __VDLType_v_io_x_ref_services_syncbase_server_interfaces_SgPriority3)
- __VDLType_v_io_x_ref_services_syncbase_server_interfaces_SgPriority4 := __VDLType_v_io_x_ref_services_syncbase_server_interfaces_SgPriorityBuilder.Struct()
- __VDLType_v_io_x_ref_services_syncbase_server_interfaces_SgPriority5 := __VDLType_v_io_x_ref_services_syncbase_server_interfaces_SgPriorityBuilder.Named("time.Time").AssignBase(__VDLType_v_io_x_ref_services_syncbase_server_interfaces_SgPriority4)
- __VDLType_v_io_x_ref_services_syncbase_server_interfaces_SgPriority6 := vdl.Int64Type
- __VDLType_v_io_x_ref_services_syncbase_server_interfaces_SgPriority4.AppendField("Seconds", __VDLType_v_io_x_ref_services_syncbase_server_interfaces_SgPriority6)
- __VDLType_v_io_x_ref_services_syncbase_server_interfaces_SgPriority4.AppendField("Nanos", __VDLType_v_io_x_ref_services_syncbase_server_interfaces_SgPriority3)
- __VDLType_v_io_x_ref_services_syncbase_server_interfaces_SgPriority1.AppendField("ServerTime", __VDLType_v_io_x_ref_services_syncbase_server_interfaces_SgPriority5)
- __VDLType_v_io_x_ref_services_syncbase_server_interfaces_SgPriorityBuilder.Build()
- __VDLType_v_io_x_ref_services_syncbase_server_interfaces_SgPriorityv, err := __VDLType_v_io_x_ref_services_syncbase_server_interfaces_SgPriority2.Built()
- if err != nil {
- panic(err)
- }
- return __VDLType_v_io_x_ref_services_syncbase_server_interfaces_SgPriorityv
-}
-func init() {
- __VDLType_v_io_x_ref_services_syncbase_server_interfaces_SgPriority = __VDLType_v_io_x_ref_services_syncbase_server_interfaces_SgPriority_gen()
-}
-
-var __VDLType_v_io_x_ref_services_syncbase_server_interfaces_Signpost *vdl.Type = vdl.TypeOf(Signpost{})
-var __VDLType_v_io_x_ref_services_syncbase_server_interfaces_Syncgroup *vdl.Type = vdl.TypeOf(Syncgroup{})
-var __VDLType_v_io_x_ref_services_syncbase_server_interfaces_SyncgroupStatus *vdl.Type = vdl.TypeOf(SyncgroupStatusPublishPending)
-var __VDLType_v_io_x_ref_services_syncbase_server_interfaces_TimeReq *vdl.Type
-
-func __VDLType_v_io_x_ref_services_syncbase_server_interfaces_TimeReq_gen() *vdl.Type {
- __VDLType_v_io_x_ref_services_syncbase_server_interfaces_TimeReqBuilder := vdl.TypeBuilder{}
-
- __VDLType_v_io_x_ref_services_syncbase_server_interfaces_TimeReq1 := __VDLType_v_io_x_ref_services_syncbase_server_interfaces_TimeReqBuilder.Struct()
- __VDLType_v_io_x_ref_services_syncbase_server_interfaces_TimeReq2 := __VDLType_v_io_x_ref_services_syncbase_server_interfaces_TimeReqBuilder.Named("v.io/x/ref/services/syncbase/server/interfaces.TimeReq").AssignBase(__VDLType_v_io_x_ref_services_syncbase_server_interfaces_TimeReq1)
- __VDLType_v_io_x_ref_services_syncbase_server_interfaces_TimeReq3 := __VDLType_v_io_x_ref_services_syncbase_server_interfaces_TimeReqBuilder.Struct()
- __VDLType_v_io_x_ref_services_syncbase_server_interfaces_TimeReq4 := __VDLType_v_io_x_ref_services_syncbase_server_interfaces_TimeReqBuilder.Named("time.Time").AssignBase(__VDLType_v_io_x_ref_services_syncbase_server_interfaces_TimeReq3)
- __VDLType_v_io_x_ref_services_syncbase_server_interfaces_TimeReq5 := vdl.Int64Type
- __VDLType_v_io_x_ref_services_syncbase_server_interfaces_TimeReq3.AppendField("Seconds", __VDLType_v_io_x_ref_services_syncbase_server_interfaces_TimeReq5)
- __VDLType_v_io_x_ref_services_syncbase_server_interfaces_TimeReq6 := vdl.Int32Type
- __VDLType_v_io_x_ref_services_syncbase_server_interfaces_TimeReq3.AppendField("Nanos", __VDLType_v_io_x_ref_services_syncbase_server_interfaces_TimeReq6)
- __VDLType_v_io_x_ref_services_syncbase_server_interfaces_TimeReq1.AppendField("SendTs", __VDLType_v_io_x_ref_services_syncbase_server_interfaces_TimeReq4)
- __VDLType_v_io_x_ref_services_syncbase_server_interfaces_TimeReqBuilder.Build()
- __VDLType_v_io_x_ref_services_syncbase_server_interfaces_TimeReqv, err := __VDLType_v_io_x_ref_services_syncbase_server_interfaces_TimeReq2.Built()
- if err != nil {
- panic(err)
- }
- return __VDLType_v_io_x_ref_services_syncbase_server_interfaces_TimeReqv
-}
-func init() {
- __VDLType_v_io_x_ref_services_syncbase_server_interfaces_TimeReq = __VDLType_v_io_x_ref_services_syncbase_server_interfaces_TimeReq_gen()
-}
-
-var __VDLType_v_io_x_ref_services_syncbase_server_interfaces_TimeResp *vdl.Type
-
-func __VDLType_v_io_x_ref_services_syncbase_server_interfaces_TimeResp_gen() *vdl.Type {
- __VDLType_v_io_x_ref_services_syncbase_server_interfaces_TimeRespBuilder := vdl.TypeBuilder{}
-
- __VDLType_v_io_x_ref_services_syncbase_server_interfaces_TimeResp1 := __VDLType_v_io_x_ref_services_syncbase_server_interfaces_TimeRespBuilder.Struct()
- __VDLType_v_io_x_ref_services_syncbase_server_interfaces_TimeResp2 := __VDLType_v_io_x_ref_services_syncbase_server_interfaces_TimeRespBuilder.Named("v.io/x/ref/services/syncbase/server/interfaces.TimeResp").AssignBase(__VDLType_v_io_x_ref_services_syncbase_server_interfaces_TimeResp1)
- __VDLType_v_io_x_ref_services_syncbase_server_interfaces_TimeResp3 := __VDLType_v_io_x_ref_services_syncbase_server_interfaces_TimeRespBuilder.Struct()
- __VDLType_v_io_x_ref_services_syncbase_server_interfaces_TimeResp4 := __VDLType_v_io_x_ref_services_syncbase_server_interfaces_TimeRespBuilder.Named("time.Time").AssignBase(__VDLType_v_io_x_ref_services_syncbase_server_interfaces_TimeResp3)
- __VDLType_v_io_x_ref_services_syncbase_server_interfaces_TimeResp5 := vdl.Int64Type
- __VDLType_v_io_x_ref_services_syncbase_server_interfaces_TimeResp3.AppendField("Seconds", __VDLType_v_io_x_ref_services_syncbase_server_interfaces_TimeResp5)
- __VDLType_v_io_x_ref_services_syncbase_server_interfaces_TimeResp6 := vdl.Int32Type
- __VDLType_v_io_x_ref_services_syncbase_server_interfaces_TimeResp3.AppendField("Nanos", __VDLType_v_io_x_ref_services_syncbase_server_interfaces_TimeResp6)
- __VDLType_v_io_x_ref_services_syncbase_server_interfaces_TimeResp1.AppendField("OrigTs", __VDLType_v_io_x_ref_services_syncbase_server_interfaces_TimeResp4)
- __VDLType_v_io_x_ref_services_syncbase_server_interfaces_TimeResp1.AppendField("RecvTs", __VDLType_v_io_x_ref_services_syncbase_server_interfaces_TimeResp4)
- __VDLType_v_io_x_ref_services_syncbase_server_interfaces_TimeResp1.AppendField("SendTs", __VDLType_v_io_x_ref_services_syncbase_server_interfaces_TimeResp4)
- __VDLType_v_io_x_ref_services_syncbase_server_interfaces_TimeResp1.AppendField("LastNtpTs", __VDLType_v_io_x_ref_services_syncbase_server_interfaces_TimeResp4)
- __VDLType_v_io_x_ref_services_syncbase_server_interfaces_TimeResp7 := vdl.Uint16Type
- __VDLType_v_io_x_ref_services_syncbase_server_interfaces_TimeResp1.AppendField("NumReboots", __VDLType_v_io_x_ref_services_syncbase_server_interfaces_TimeResp7)
- __VDLType_v_io_x_ref_services_syncbase_server_interfaces_TimeResp1.AppendField("NumHops", __VDLType_v_io_x_ref_services_syncbase_server_interfaces_TimeResp7)
- __VDLType_v_io_x_ref_services_syncbase_server_interfaces_TimeRespBuilder.Build()
- __VDLType_v_io_x_ref_services_syncbase_server_interfaces_TimeRespv, err := __VDLType_v_io_x_ref_services_syncbase_server_interfaces_TimeResp2.Built()
- if err != nil {
- panic(err)
- }
- return __VDLType_v_io_x_ref_services_syncbase_server_interfaces_TimeRespv
-}
-func init() {
- __VDLType_v_io_x_ref_services_syncbase_server_interfaces_TimeResp = __VDLType_v_io_x_ref_services_syncbase_server_interfaces_TimeResp_gen()
-}
-func __VDLEnsureNativeBuilt() {
- if __VDLType9 == nil {
- __VDLType9 = __VDLType9_gen()
- }
- if __VDLType2 == nil {
- __VDLType2 = __VDLType2_gen()
- }
- if __VDLType0 == nil {
- __VDLType0 = __VDLType0_gen()
- }
- if __VDLType14 == nil {
- __VDLType14 = __VDLType14_gen()
- }
- if __VDLType12 == nil {
- __VDLType12 = __VDLType12_gen()
- }
- if __VDLType13 == nil {
- __VDLType13 = __VDLType13_gen()
- }
- if __VDLType_time_Time == nil {
- __VDLType_time_Time = __VDLType_time_Time_gen()
- }
- if __VDLType_v_io_x_ref_services_syncbase_server_interfaces_DeltaFinalResp == nil {
- __VDLType_v_io_x_ref_services_syncbase_server_interfaces_DeltaFinalResp = __VDLType_v_io_x_ref_services_syncbase_server_interfaces_DeltaFinalResp_gen()
- }
- if __VDLType_v_io_x_ref_services_syncbase_server_interfaces_DeltaResp == nil {
- __VDLType_v_io_x_ref_services_syncbase_server_interfaces_DeltaResp = __VDLType_v_io_x_ref_services_syncbase_server_interfaces_DeltaResp_gen()
- }
- if __VDLType_v_io_x_ref_services_syncbase_server_interfaces_LogRec == nil {
- __VDLType_v_io_x_ref_services_syncbase_server_interfaces_LogRec = __VDLType_v_io_x_ref_services_syncbase_server_interfaces_LogRec_gen()
- }
- if __VDLType_v_io_x_ref_services_syncbase_server_interfaces_LogRecMetadata == nil {
- __VDLType_v_io_x_ref_services_syncbase_server_interfaces_LogRecMetadata = __VDLType_v_io_x_ref_services_syncbase_server_interfaces_LogRecMetadata_gen()
- }
- if __VDLType_v_io_x_ref_services_syncbase_server_interfaces_SgPriorities == nil {
- __VDLType_v_io_x_ref_services_syncbase_server_interfaces_SgPriorities = __VDLType_v_io_x_ref_services_syncbase_server_interfaces_SgPriorities_gen()
- }
- if __VDLType_v_io_x_ref_services_syncbase_server_interfaces_SgPriority == nil {
- __VDLType_v_io_x_ref_services_syncbase_server_interfaces_SgPriority = __VDLType_v_io_x_ref_services_syncbase_server_interfaces_SgPriority_gen()
- }
- if __VDLType_v_io_x_ref_services_syncbase_server_interfaces_TimeReq == nil {
- __VDLType_v_io_x_ref_services_syncbase_server_interfaces_TimeReq = __VDLType_v_io_x_ref_services_syncbase_server_interfaces_TimeReq_gen()
- }
- if __VDLType_v_io_x_ref_services_syncbase_server_interfaces_TimeResp == nil {
- __VDLType_v_io_x_ref_services_syncbase_server_interfaces_TimeResp = __VDLType_v_io_x_ref_services_syncbase_server_interfaces_TimeResp_gen()
- }
-}
+//////////////////////////////////////////////////
+// Const definitions
const NoGroupId = GroupId(0)
@@ -3067,6 +2414,8 @@
// version.
const LinkRec = byte(1)
+//////////////////////////////////////////////////
+// Error definitions
var (
ErrDupSyncgroupPublish = verror.Register("v.io/x/ref/services/syncbase/server/interfaces.DupSyncgroupPublish", verror.NoRetry, "{1:}{2:} duplicate publish on syncgroup: {3}")
ErrConnFail = verror.Register("v.io/x/ref/services/syncbase/server/interfaces.ConnFail", verror.NoRetry, "{1:}{2:} connection to peer failed{:_}")
@@ -3076,15 +2425,6 @@
ErrNotAdmin = verror.Register("v.io/x/ref/services/syncbase/server/interfaces.NotAdmin", verror.NoRetry, "{1:}{2:} not an admin of the syncgroup")
)
-func init() {
- i18n.Cat().SetWithBase(i18n.LangID("en"), i18n.MsgID(ErrDupSyncgroupPublish.ID), "{1:}{2:} duplicate publish on syncgroup: {3}")
- i18n.Cat().SetWithBase(i18n.LangID("en"), i18n.MsgID(ErrConnFail.ID), "{1:}{2:} connection to peer failed{:_}")
- i18n.Cat().SetWithBase(i18n.LangID("en"), i18n.MsgID(ErrBrokenCrConnection.ID), "{1:}{2:} CrConnection stream to client does not exist or is broken")
- i18n.Cat().SetWithBase(i18n.LangID("en"), i18n.MsgID(ErrDbOffline.ID), "{1:}{2:} database {3} in app {4} is offline and cannot be synced{:_}")
- i18n.Cat().SetWithBase(i18n.LangID("en"), i18n.MsgID(ErrGetTimeFailed.ID), "{1:}{2:} GetTime failed{:_}")
- i18n.Cat().SetWithBase(i18n.LangID("en"), i18n.MsgID(ErrNotAdmin.ID), "{1:}{2:} not an admin of the syncgroup")
-}
-
// NewErrDupSyncgroupPublish returns an error with the ErrDupSyncgroupPublish ID.
func NewErrDupSyncgroupPublish(ctx *context.T, name string) error {
return verror.New(ErrDupSyncgroupPublish, ctx, name)
@@ -3115,6 +2455,9 @@
return verror.New(ErrNotAdmin, ctx)
}
+//////////////////////////////////////////////////
+// Interface definitions
+
// SyncClientMethods is the client interface
// containing Sync methods.
//
@@ -4043,3 +3386,56 @@
func (s implSyncFetchChunksServerCallSend) Send(item ChunkData) error {
return s.s.Send(item)
}
+
+var __VDLInitCalled bool
+
+// __VDLInit performs vdl initialization. It is safe to call multiple times.
+// If you have an init ordering issue, just insert the following line verbatim
+// into your source files in this package, right after the "package foo" clause:
+//
+// var _ = __VDLInit()
+//
+// The purpose of this function is to ensure that vdl initialization occurs in
+// the right order, and very early in the init sequence. In particular, vdl
+// registration and package variable initialization needs to occur before
+// functions like vdl.TypeOf will work properly.
+//
+// This function returns a dummy value, so that it can be used to initialize the
+// first var in the file, to take advantage of Go's defined init order.
+func __VDLInit() struct{} {
+ if __VDLInitCalled {
+ return struct{}{}
+ }
+
+ // Register types.
+ vdl.Register((*GenVector)(nil))
+ vdl.Register((*Knowledge)(nil))
+ vdl.Register((*LogRecMetadata)(nil))
+ vdl.Register((*LogRec)(nil))
+ vdl.Register((*GroupId)(nil))
+ vdl.Register((*SyncgroupStatus)(nil))
+ vdl.Register((*Syncgroup)(nil))
+ vdl.Register((*SgDeltaReq)(nil))
+ vdl.Register((*DataDeltaReq)(nil))
+ vdl.Register((*DeltaReq)(nil))
+ vdl.Register((*DeltaResp)(nil))
+ vdl.Register((*SgPriority)(nil))
+ vdl.Register((*SgPriorities)(nil))
+ vdl.Register((*DeltaFinalResp)(nil))
+ vdl.Register((*ChunkHash)(nil))
+ vdl.Register((*ChunkData)(nil))
+ vdl.Register((*TimeReq)(nil))
+ vdl.Register((*TimeResp)(nil))
+ vdl.Register((*BlobSharesBySyncgroup)(nil))
+ vdl.Register((*Signpost)(nil))
+
+ // Set error format strings.
+ i18n.Cat().SetWithBase(i18n.LangID("en"), i18n.MsgID(ErrDupSyncgroupPublish.ID), "{1:}{2:} duplicate publish on syncgroup: {3}")
+ i18n.Cat().SetWithBase(i18n.LangID("en"), i18n.MsgID(ErrConnFail.ID), "{1:}{2:} connection to peer failed{:_}")
+ i18n.Cat().SetWithBase(i18n.LangID("en"), i18n.MsgID(ErrBrokenCrConnection.ID), "{1:}{2:} CrConnection stream to client does not exist or is broken")
+ i18n.Cat().SetWithBase(i18n.LangID("en"), i18n.MsgID(ErrDbOffline.ID), "{1:}{2:} database {3} in app {4} is offline and cannot be synced{:_}")
+ i18n.Cat().SetWithBase(i18n.LangID("en"), i18n.MsgID(ErrGetTimeFailed.ID), "{1:}{2:} GetTime failed{:_}")
+ i18n.Cat().SetWithBase(i18n.LangID("en"), i18n.MsgID(ErrNotAdmin.ID), "{1:}{2:} not an admin of the syncgroup")
+
+ return struct{}{}
+}
diff --git a/services/syncbase/server/nosql/nosql.vdl.go b/services/syncbase/server/nosql/nosql.vdl.go
index 51d6fc2..c39f8a3 100644
--- a/services/syncbase/server/nosql/nosql.vdl.go
+++ b/services/syncbase/server/nosql/nosql.vdl.go
@@ -14,6 +14,11 @@
"v.io/v23/vdl"
)
+var _ = __VDLInit() // Must be first; see __VDLInit comments for details.
+
+//////////////////////////////////////////////////
+// Type definitions
+
// DatabaseData represents the persistent state of a Database.
type DatabaseData struct {
Name string
@@ -28,9 +33,6 @@
}
func (m *DatabaseData) FillVDLTarget(t vdl.Target, tt *vdl.Type) error {
- if __VDLType_v_io_x_ref_services_syncbase_server_nosql_DatabaseData == nil || __VDLType0 == nil {
- panic("Initialization order error: types generated for FillVDLTarget not initialized. Consider moving caller to an init() block.")
- }
fieldsTarget1, err := t.StartFields(tt)
if err != nil {
return err
@@ -41,7 +43,7 @@
return err
}
if err != vdl.ErrFieldNoExist {
- if err := fieldTarget3.FromString(string(m.Name), vdl.StringType); err != nil {
+ if err := fieldTarget3.FromString(string(m.Name), tt.NonOptional().Field(0).Type); err != nil {
return err
}
if err := fieldsTarget1.FinishField(keyTarget2, fieldTarget3); err != nil {
@@ -53,7 +55,7 @@
return err
}
if err != vdl.ErrFieldNoExist {
- if err := fieldTarget5.FromUint(uint64(m.Version), vdl.Uint64Type); err != nil {
+ if err := fieldTarget5.FromUint(uint64(m.Version), tt.NonOptional().Field(1).Type); err != nil {
return err
}
if err := fieldsTarget1.FinishField(keyTarget4, fieldTarget5); err != nil {
@@ -66,7 +68,7 @@
}
if err != vdl.ErrFieldNoExist {
- if err := m.Perms.FillVDLTarget(fieldTarget7, __VDLType_v_io_v23_security_access_Permissions); err != nil {
+ if err := m.Perms.FillVDLTarget(fieldTarget7, tt.NonOptional().Field(2).Type); err != nil {
return err
}
if err := fieldsTarget1.FinishField(keyTarget6, fieldTarget7); err != nil {
@@ -80,11 +82,11 @@
if err != vdl.ErrFieldNoExist {
if m.SchemaMetadata == nil {
- if err := fieldTarget9.FromNil(__VDLType1); err != nil {
+ if err := fieldTarget9.FromNil(tt.NonOptional().Field(3).Type); err != nil {
return err
}
} else {
- if err := m.SchemaMetadata.FillVDLTarget(fieldTarget9, __VDLType_v_io_v23_services_syncbase_nosql_SchemaMetadata); err != nil {
+ if err := m.SchemaMetadata.FillVDLTarget(fieldTarget9, tt.NonOptional().Field(3).Type); err != nil {
return err
}
}
@@ -114,8 +116,8 @@
func (t *DatabaseDataTarget) StartFields(tt *vdl.Type) (vdl.FieldsTarget, error) {
- if !vdl.Compatible(tt, __VDLType_v_io_x_ref_services_syncbase_server_nosql_DatabaseData) {
- return nil, fmt.Errorf("type %v incompatible with %v", tt, __VDLType_v_io_x_ref_services_syncbase_server_nosql_DatabaseData)
+ if ttWant := vdl.TypeOf((*DatabaseData)(nil)).Elem(); !vdl.Compatible(tt, ttWant) {
+ return nil, fmt.Errorf("type %v incompatible with %v", tt, ttWant)
}
return t, nil
}
@@ -138,7 +140,7 @@
target, err := &t.schemaMetadataTarget, error(nil)
return nil, target, err
default:
- return nil, nil, fmt.Errorf("field %s not in struct %v", name, __VDLType_v_io_x_ref_services_syncbase_server_nosql_DatabaseData)
+ return nil, nil, fmt.Errorf("field %s not in struct v.io/x/ref/services/syncbase/server/nosql.DatabaseData", name)
}
}
func (t *DatabaseDataTarget) FinishField(_, _ vdl.Target) error {
@@ -192,9 +194,6 @@
}
func (m *TableData) FillVDLTarget(t vdl.Target, tt *vdl.Type) error {
- if __VDLType_v_io_x_ref_services_syncbase_server_nosql_TableData == nil || __VDLType2 == nil {
- panic("Initialization order error: types generated for FillVDLTarget not initialized. Consider moving caller to an init() block.")
- }
fieldsTarget1, err := t.StartFields(tt)
if err != nil {
return err
@@ -205,7 +204,7 @@
return err
}
if err != vdl.ErrFieldNoExist {
- if err := fieldTarget3.FromString(string(m.Name), vdl.StringType); err != nil {
+ if err := fieldTarget3.FromString(string(m.Name), tt.NonOptional().Field(0).Type); err != nil {
return err
}
if err := fieldsTarget1.FinishField(keyTarget2, fieldTarget3); err != nil {
@@ -218,7 +217,7 @@
}
if err != vdl.ErrFieldNoExist {
- if err := m.Perms.FillVDLTarget(fieldTarget5, __VDLType_v_io_v23_security_access_Permissions); err != nil {
+ if err := m.Perms.FillVDLTarget(fieldTarget5, tt.NonOptional().Field(1).Type); err != nil {
return err
}
if err := fieldsTarget1.FinishField(keyTarget4, fieldTarget5); err != nil {
@@ -245,8 +244,8 @@
func (t *TableDataTarget) StartFields(tt *vdl.Type) (vdl.FieldsTarget, error) {
- if !vdl.Compatible(tt, __VDLType_v_io_x_ref_services_syncbase_server_nosql_TableData) {
- return nil, fmt.Errorf("type %v incompatible with %v", tt, __VDLType_v_io_x_ref_services_syncbase_server_nosql_TableData)
+ if ttWant := vdl.TypeOf((*TableData)(nil)).Elem(); !vdl.Compatible(tt, ttWant) {
+ return nil, fmt.Errorf("type %v incompatible with %v", tt, ttWant)
}
return t, nil
}
@@ -261,7 +260,7 @@
target, err := &t.permsTarget, error(nil)
return nil, target, err
default:
- return nil, nil, fmt.Errorf("field %s not in struct %v", name, __VDLType_v_io_x_ref_services_syncbase_server_nosql_TableData)
+ return nil, nil, fmt.Errorf("field %s not in struct v.io/x/ref/services/syncbase/server/nosql.TableData", name)
}
}
func (t *TableDataTarget) FinishField(_, _ vdl.Target) error {
@@ -272,18 +271,29 @@
return nil
}
-func init() {
+var __VDLInitCalled bool
+
+// __VDLInit performs vdl initialization. It is safe to call multiple times.
+// If you have an init ordering issue, just insert the following line verbatim
+// into your source files in this package, right after the "package foo" clause:
+//
+// var _ = __VDLInit()
+//
+// The purpose of this function is to ensure that vdl initialization occurs in
+// the right order, and very early in the init sequence. In particular, vdl
+// registration and package variable initialization needs to occur before
+// functions like vdl.TypeOf will work properly.
+//
+// This function returns a dummy value, so that it can be used to initialize the
+// first var in the file, to take advantage of Go's defined init order.
+func __VDLInit() struct{} {
+ if __VDLInitCalled {
+ return struct{}{}
+ }
+
+ // Register types.
vdl.Register((*DatabaseData)(nil))
vdl.Register((*TableData)(nil))
-}
-var __VDLType1 *vdl.Type = vdl.TypeOf((*nosql.SchemaMetadata)(nil))
-var __VDLType0 *vdl.Type = vdl.TypeOf((*DatabaseData)(nil))
-var __VDLType2 *vdl.Type = vdl.TypeOf((*TableData)(nil))
-var __VDLType_v_io_v23_security_access_Permissions *vdl.Type = vdl.TypeOf(access.Permissions(nil))
-var __VDLType_v_io_v23_services_syncbase_nosql_SchemaMetadata *vdl.Type = vdl.TypeOf(nosql.SchemaMetadata{})
-var __VDLType_v_io_x_ref_services_syncbase_server_nosql_DatabaseData *vdl.Type = vdl.TypeOf(DatabaseData{})
-var __VDLType_v_io_x_ref_services_syncbase_server_nosql_TableData *vdl.Type = vdl.TypeOf(TableData{})
-
-func __VDLEnsureNativeBuilt() {
+ return struct{}{}
}
diff --git a/services/syncbase/server/server.vdl.go b/services/syncbase/server/server.vdl.go
index 59cb136..b76a2fc 100644
--- a/services/syncbase/server/server.vdl.go
+++ b/services/syncbase/server/server.vdl.go
@@ -13,6 +13,11 @@
"v.io/v23/vdl"
)
+var _ = __VDLInit() // Must be first; see __VDLInit comments for details.
+
+//////////////////////////////////////////////////
+// Type definitions
+
// ServiceData represents the persistent state of a Service.
type ServiceData struct {
Version uint64 // covers the fields below
@@ -25,9 +30,6 @@
}
func (m *ServiceData) FillVDLTarget(t vdl.Target, tt *vdl.Type) error {
- if __VDLType_v_io_x_ref_services_syncbase_server_ServiceData == nil || __VDLType0 == nil {
- panic("Initialization order error: types generated for FillVDLTarget not initialized. Consider moving caller to an init() block.")
- }
fieldsTarget1, err := t.StartFields(tt)
if err != nil {
return err
@@ -38,7 +40,7 @@
return err
}
if err != vdl.ErrFieldNoExist {
- if err := fieldTarget3.FromUint(uint64(m.Version), vdl.Uint64Type); err != nil {
+ if err := fieldTarget3.FromUint(uint64(m.Version), tt.NonOptional().Field(0).Type); err != nil {
return err
}
if err := fieldsTarget1.FinishField(keyTarget2, fieldTarget3); err != nil {
@@ -51,7 +53,7 @@
}
if err != vdl.ErrFieldNoExist {
- if err := m.Perms.FillVDLTarget(fieldTarget5, __VDLType_v_io_v23_security_access_Permissions); err != nil {
+ if err := m.Perms.FillVDLTarget(fieldTarget5, tt.NonOptional().Field(1).Type); err != nil {
return err
}
if err := fieldsTarget1.FinishField(keyTarget4, fieldTarget5); err != nil {
@@ -78,8 +80,8 @@
func (t *ServiceDataTarget) StartFields(tt *vdl.Type) (vdl.FieldsTarget, error) {
- if !vdl.Compatible(tt, __VDLType_v_io_x_ref_services_syncbase_server_ServiceData) {
- return nil, fmt.Errorf("type %v incompatible with %v", tt, __VDLType_v_io_x_ref_services_syncbase_server_ServiceData)
+ if ttWant := vdl.TypeOf((*ServiceData)(nil)).Elem(); !vdl.Compatible(tt, ttWant) {
+ return nil, fmt.Errorf("type %v incompatible with %v", tt, ttWant)
}
return t, nil
}
@@ -94,7 +96,7 @@
target, err := &t.permsTarget, error(nil)
return nil, target, err
default:
- return nil, nil, fmt.Errorf("field %s not in struct %v", name, __VDLType_v_io_x_ref_services_syncbase_server_ServiceData)
+ return nil, nil, fmt.Errorf("field %s not in struct v.io/x/ref/services/syncbase/server.ServiceData", name)
}
}
func (t *ServiceDataTarget) FinishField(_, _ vdl.Target) error {
@@ -118,9 +120,6 @@
}
func (m *AppData) FillVDLTarget(t vdl.Target, tt *vdl.Type) error {
- if __VDLType_v_io_x_ref_services_syncbase_server_AppData == nil || __VDLType1 == nil {
- panic("Initialization order error: types generated for FillVDLTarget not initialized. Consider moving caller to an init() block.")
- }
fieldsTarget1, err := t.StartFields(tt)
if err != nil {
return err
@@ -131,7 +130,7 @@
return err
}
if err != vdl.ErrFieldNoExist {
- if err := fieldTarget3.FromString(string(m.Name), vdl.StringType); err != nil {
+ if err := fieldTarget3.FromString(string(m.Name), tt.NonOptional().Field(0).Type); err != nil {
return err
}
if err := fieldsTarget1.FinishField(keyTarget2, fieldTarget3); err != nil {
@@ -143,7 +142,7 @@
return err
}
if err != vdl.ErrFieldNoExist {
- if err := fieldTarget5.FromUint(uint64(m.Version), vdl.Uint64Type); err != nil {
+ if err := fieldTarget5.FromUint(uint64(m.Version), tt.NonOptional().Field(1).Type); err != nil {
return err
}
if err := fieldsTarget1.FinishField(keyTarget4, fieldTarget5); err != nil {
@@ -156,7 +155,7 @@
}
if err != vdl.ErrFieldNoExist {
- if err := m.Perms.FillVDLTarget(fieldTarget7, __VDLType_v_io_v23_security_access_Permissions); err != nil {
+ if err := m.Perms.FillVDLTarget(fieldTarget7, tt.NonOptional().Field(2).Type); err != nil {
return err
}
if err := fieldsTarget1.FinishField(keyTarget6, fieldTarget7); err != nil {
@@ -184,8 +183,8 @@
func (t *AppDataTarget) StartFields(tt *vdl.Type) (vdl.FieldsTarget, error) {
- if !vdl.Compatible(tt, __VDLType_v_io_x_ref_services_syncbase_server_AppData) {
- return nil, fmt.Errorf("type %v incompatible with %v", tt, __VDLType_v_io_x_ref_services_syncbase_server_AppData)
+ if ttWant := vdl.TypeOf((*AppData)(nil)).Elem(); !vdl.Compatible(tt, ttWant) {
+ return nil, fmt.Errorf("type %v incompatible with %v", tt, ttWant)
}
return t, nil
}
@@ -204,7 +203,7 @@
target, err := &t.permsTarget, error(nil)
return nil, target, err
default:
- return nil, nil, fmt.Errorf("field %s not in struct %v", name, __VDLType_v_io_x_ref_services_syncbase_server_AppData)
+ return nil, nil, fmt.Errorf("field %s not in struct v.io/x/ref/services/syncbase/server.AppData", name)
}
}
func (t *AppDataTarget) FinishField(_, _ vdl.Target) error {
@@ -231,9 +230,6 @@
}
func (m *DbInfo) FillVDLTarget(t vdl.Target, tt *vdl.Type) error {
- if __VDLType_v_io_x_ref_services_syncbase_server_DbInfo == nil || __VDLType2 == nil {
- panic("Initialization order error: types generated for FillVDLTarget not initialized. Consider moving caller to an init() block.")
- }
fieldsTarget1, err := t.StartFields(tt)
if err != nil {
return err
@@ -244,7 +240,7 @@
return err
}
if err != vdl.ErrFieldNoExist {
- if err := fieldTarget3.FromString(string(m.Name), vdl.StringType); err != nil {
+ if err := fieldTarget3.FromString(string(m.Name), tt.NonOptional().Field(0).Type); err != nil {
return err
}
if err := fieldsTarget1.FinishField(keyTarget2, fieldTarget3); err != nil {
@@ -256,7 +252,7 @@
return err
}
if err != vdl.ErrFieldNoExist {
- if err := fieldTarget5.FromString(string(m.RootDir), vdl.StringType); err != nil {
+ if err := fieldTarget5.FromString(string(m.RootDir), tt.NonOptional().Field(1).Type); err != nil {
return err
}
if err := fieldsTarget1.FinishField(keyTarget4, fieldTarget5); err != nil {
@@ -268,7 +264,7 @@
return err
}
if err != vdl.ErrFieldNoExist {
- if err := fieldTarget7.FromString(string(m.Engine), vdl.StringType); err != nil {
+ if err := fieldTarget7.FromString(string(m.Engine), tt.NonOptional().Field(2).Type); err != nil {
return err
}
if err := fieldsTarget1.FinishField(keyTarget6, fieldTarget7); err != nil {
@@ -296,8 +292,8 @@
func (t *DbInfoTarget) StartFields(tt *vdl.Type) (vdl.FieldsTarget, error) {
- if !vdl.Compatible(tt, __VDLType_v_io_x_ref_services_syncbase_server_DbInfo) {
- return nil, fmt.Errorf("type %v incompatible with %v", tt, __VDLType_v_io_x_ref_services_syncbase_server_DbInfo)
+ if ttWant := vdl.TypeOf((*DbInfo)(nil)).Elem(); !vdl.Compatible(tt, ttWant) {
+ return nil, fmt.Errorf("type %v incompatible with %v", tt, ttWant)
}
return t, nil
}
@@ -316,7 +312,7 @@
target, err := &t.engineTarget, error(nil)
return nil, target, err
default:
- return nil, nil, fmt.Errorf("field %s not in struct %v", name, __VDLType_v_io_x_ref_services_syncbase_server_DbInfo)
+ return nil, nil, fmt.Errorf("field %s not in struct v.io/x/ref/services/syncbase/server.DbInfo", name)
}
}
func (t *DbInfoTarget) FinishField(_, _ vdl.Target) error {
@@ -327,19 +323,30 @@
return nil
}
-func init() {
+var __VDLInitCalled bool
+
+// __VDLInit performs vdl initialization. It is safe to call multiple times.
+// If you have an init ordering issue, just insert the following line verbatim
+// into your source files in this package, right after the "package foo" clause:
+//
+// var _ = __VDLInit()
+//
+// The purpose of this function is to ensure that vdl initialization occurs in
+// the right order, and very early in the init sequence. In particular, vdl
+// registration and package variable initialization needs to occur before
+// functions like vdl.TypeOf will work properly.
+//
+// This function returns a dummy value, so that it can be used to initialize the
+// first var in the file, to take advantage of Go's defined init order.
+func __VDLInit() struct{} {
+ if __VDLInitCalled {
+ return struct{}{}
+ }
+
+ // Register types.
vdl.Register((*ServiceData)(nil))
vdl.Register((*AppData)(nil))
vdl.Register((*DbInfo)(nil))
-}
-var __VDLType1 *vdl.Type = vdl.TypeOf((*AppData)(nil))
-var __VDLType2 *vdl.Type = vdl.TypeOf((*DbInfo)(nil))
-var __VDLType0 *vdl.Type = vdl.TypeOf((*ServiceData)(nil))
-var __VDLType_v_io_v23_security_access_Permissions *vdl.Type = vdl.TypeOf(access.Permissions(nil))
-var __VDLType_v_io_x_ref_services_syncbase_server_AppData *vdl.Type = vdl.TypeOf(AppData{})
-var __VDLType_v_io_x_ref_services_syncbase_server_DbInfo *vdl.Type = vdl.TypeOf(DbInfo{})
-var __VDLType_v_io_x_ref_services_syncbase_server_ServiceData *vdl.Type = vdl.TypeOf(ServiceData{})
-
-func __VDLEnsureNativeBuilt() {
+ return struct{}{}
}
diff --git a/services/syncbase/server/watchable/watchable.vdl.go b/services/syncbase/server/watchable/watchable.vdl.go
index a1a754b..52373b2 100644
--- a/services/syncbase/server/watchable/watchable.vdl.go
+++ b/services/syncbase/server/watchable/watchable.vdl.go
@@ -14,6 +14,11 @@
"v.io/x/ref/services/syncbase/server/interfaces"
)
+var _ = __VDLInit() // Must be first; see __VDLInit comments for details.
+
+//////////////////////////////////////////////////
+// Type definitions
+
// GetOp represents a store get operation.
type GetOp struct {
Key []byte
@@ -25,9 +30,6 @@
}
func (m *GetOp) FillVDLTarget(t vdl.Target, tt *vdl.Type) error {
- if __VDLType_v_io_x_ref_services_syncbase_server_watchable_GetOp == nil || __VDLType0 == nil {
- panic("Initialization order error: types generated for FillVDLTarget not initialized. Consider moving caller to an init() block.")
- }
fieldsTarget1, err := t.StartFields(tt)
if err != nil {
return err
@@ -39,7 +41,7 @@
}
if err != vdl.ErrFieldNoExist {
- if err := fieldTarget3.FromBytes([]byte(m.Key), __VDLType1); err != nil {
+ if err := fieldTarget3.FromBytes([]byte(m.Key), tt.NonOptional().Field(0).Type); err != nil {
return err
}
if err := fieldsTarget1.FinishField(keyTarget2, fieldTarget3); err != nil {
@@ -65,8 +67,8 @@
func (t *GetOpTarget) StartFields(tt *vdl.Type) (vdl.FieldsTarget, error) {
- if !vdl.Compatible(tt, __VDLType_v_io_x_ref_services_syncbase_server_watchable_GetOp) {
- return nil, fmt.Errorf("type %v incompatible with %v", tt, __VDLType_v_io_x_ref_services_syncbase_server_watchable_GetOp)
+ if ttWant := vdl.TypeOf((*GetOp)(nil)).Elem(); !vdl.Compatible(tt, ttWant) {
+ return nil, fmt.Errorf("type %v incompatible with %v", tt, ttWant)
}
return t, nil
}
@@ -77,7 +79,7 @@
target, err := &t.keyTarget, error(nil)
return nil, target, err
default:
- return nil, nil, fmt.Errorf("field %s not in struct %v", name, __VDLType_v_io_x_ref_services_syncbase_server_watchable_GetOp)
+ return nil, nil, fmt.Errorf("field %s not in struct v.io/x/ref/services/syncbase/server/watchable.GetOp", name)
}
}
func (t *GetOpTarget) FinishField(_, _ vdl.Target) error {
@@ -100,9 +102,6 @@
}
func (m *ScanOp) FillVDLTarget(t vdl.Target, tt *vdl.Type) error {
- if __VDLType_v_io_x_ref_services_syncbase_server_watchable_ScanOp == nil || __VDLType2 == nil {
- panic("Initialization order error: types generated for FillVDLTarget not initialized. Consider moving caller to an init() block.")
- }
fieldsTarget1, err := t.StartFields(tt)
if err != nil {
return err
@@ -114,7 +113,7 @@
}
if err != vdl.ErrFieldNoExist {
- if err := fieldTarget3.FromBytes([]byte(m.Start), __VDLType1); err != nil {
+ if err := fieldTarget3.FromBytes([]byte(m.Start), tt.NonOptional().Field(0).Type); err != nil {
return err
}
if err := fieldsTarget1.FinishField(keyTarget2, fieldTarget3); err != nil {
@@ -127,7 +126,7 @@
}
if err != vdl.ErrFieldNoExist {
- if err := fieldTarget5.FromBytes([]byte(m.Limit), __VDLType1); err != nil {
+ if err := fieldTarget5.FromBytes([]byte(m.Limit), tt.NonOptional().Field(1).Type); err != nil {
return err
}
if err := fieldsTarget1.FinishField(keyTarget4, fieldTarget5); err != nil {
@@ -154,8 +153,8 @@
func (t *ScanOpTarget) StartFields(tt *vdl.Type) (vdl.FieldsTarget, error) {
- if !vdl.Compatible(tt, __VDLType_v_io_x_ref_services_syncbase_server_watchable_ScanOp) {
- return nil, fmt.Errorf("type %v incompatible with %v", tt, __VDLType_v_io_x_ref_services_syncbase_server_watchable_ScanOp)
+ if ttWant := vdl.TypeOf((*ScanOp)(nil)).Elem(); !vdl.Compatible(tt, ttWant) {
+ return nil, fmt.Errorf("type %v incompatible with %v", tt, ttWant)
}
return t, nil
}
@@ -170,7 +169,7 @@
target, err := &t.limitTarget, error(nil)
return nil, target, err
default:
- return nil, nil, fmt.Errorf("field %s not in struct %v", name, __VDLType_v_io_x_ref_services_syncbase_server_watchable_ScanOp)
+ return nil, nil, fmt.Errorf("field %s not in struct v.io/x/ref/services/syncbase/server/watchable.ScanOp", name)
}
}
func (t *ScanOpTarget) FinishField(_, _ vdl.Target) error {
@@ -199,9 +198,6 @@
}
func (m *PutOp) FillVDLTarget(t vdl.Target, tt *vdl.Type) error {
- if __VDLType_v_io_x_ref_services_syncbase_server_watchable_PutOp == nil || __VDLType3 == nil {
- panic("Initialization order error: types generated for FillVDLTarget not initialized. Consider moving caller to an init() block.")
- }
fieldsTarget1, err := t.StartFields(tt)
if err != nil {
return err
@@ -213,7 +209,7 @@
}
if err != vdl.ErrFieldNoExist {
- if err := fieldTarget3.FromBytes([]byte(m.Key), __VDLType1); err != nil {
+ if err := fieldTarget3.FromBytes([]byte(m.Key), tt.NonOptional().Field(0).Type); err != nil {
return err
}
if err := fieldsTarget1.FinishField(keyTarget2, fieldTarget3); err != nil {
@@ -226,7 +222,7 @@
}
if err != vdl.ErrFieldNoExist {
- if err := fieldTarget5.FromBytes([]byte(m.Version), __VDLType1); err != nil {
+ if err := fieldTarget5.FromBytes([]byte(m.Version), tt.NonOptional().Field(1).Type); err != nil {
return err
}
if err := fieldsTarget1.FinishField(keyTarget4, fieldTarget5); err != nil {
@@ -239,7 +235,7 @@
}
if err != vdl.ErrFieldNoExist {
- if err := fieldTarget7.FromBytes([]byte(m.PermKey), __VDLType1); err != nil {
+ if err := fieldTarget7.FromBytes([]byte(m.PermKey), tt.NonOptional().Field(2).Type); err != nil {
return err
}
if err := fieldsTarget1.FinishField(keyTarget6, fieldTarget7); err != nil {
@@ -252,7 +248,7 @@
}
if err != vdl.ErrFieldNoExist {
- if err := fieldTarget9.FromBytes([]byte(m.PermVersion), __VDLType1); err != nil {
+ if err := fieldTarget9.FromBytes([]byte(m.PermVersion), tt.NonOptional().Field(3).Type); err != nil {
return err
}
if err := fieldsTarget1.FinishField(keyTarget8, fieldTarget9); err != nil {
@@ -281,8 +277,8 @@
func (t *PutOpTarget) StartFields(tt *vdl.Type) (vdl.FieldsTarget, error) {
- if !vdl.Compatible(tt, __VDLType_v_io_x_ref_services_syncbase_server_watchable_PutOp) {
- return nil, fmt.Errorf("type %v incompatible with %v", tt, __VDLType_v_io_x_ref_services_syncbase_server_watchable_PutOp)
+ if ttWant := vdl.TypeOf((*PutOp)(nil)).Elem(); !vdl.Compatible(tt, ttWant) {
+ return nil, fmt.Errorf("type %v incompatible with %v", tt, ttWant)
}
return t, nil
}
@@ -305,7 +301,7 @@
target, err := &t.permVersionTarget, error(nil)
return nil, target, err
default:
- return nil, nil, fmt.Errorf("field %s not in struct %v", name, __VDLType_v_io_x_ref_services_syncbase_server_watchable_PutOp)
+ return nil, nil, fmt.Errorf("field %s not in struct v.io/x/ref/services/syncbase/server/watchable.PutOp", name)
}
}
func (t *PutOpTarget) FinishField(_, _ vdl.Target) error {
@@ -331,9 +327,6 @@
}
func (m *DeleteOp) FillVDLTarget(t vdl.Target, tt *vdl.Type) error {
- if __VDLType_v_io_x_ref_services_syncbase_server_watchable_DeleteOp == nil || __VDLType4 == nil {
- panic("Initialization order error: types generated for FillVDLTarget not initialized. Consider moving caller to an init() block.")
- }
fieldsTarget1, err := t.StartFields(tt)
if err != nil {
return err
@@ -345,7 +338,7 @@
}
if err != vdl.ErrFieldNoExist {
- if err := fieldTarget3.FromBytes([]byte(m.Key), __VDLType1); err != nil {
+ if err := fieldTarget3.FromBytes([]byte(m.Key), tt.NonOptional().Field(0).Type); err != nil {
return err
}
if err := fieldsTarget1.FinishField(keyTarget2, fieldTarget3); err != nil {
@@ -358,7 +351,7 @@
}
if err != vdl.ErrFieldNoExist {
- if err := fieldTarget5.FromBytes([]byte(m.PermKey), __VDLType1); err != nil {
+ if err := fieldTarget5.FromBytes([]byte(m.PermKey), tt.NonOptional().Field(1).Type); err != nil {
return err
}
if err := fieldsTarget1.FinishField(keyTarget4, fieldTarget5); err != nil {
@@ -371,7 +364,7 @@
}
if err != vdl.ErrFieldNoExist {
- if err := fieldTarget7.FromBytes([]byte(m.PermVersion), __VDLType1); err != nil {
+ if err := fieldTarget7.FromBytes([]byte(m.PermVersion), tt.NonOptional().Field(2).Type); err != nil {
return err
}
if err := fieldsTarget1.FinishField(keyTarget6, fieldTarget7); err != nil {
@@ -399,8 +392,8 @@
func (t *DeleteOpTarget) StartFields(tt *vdl.Type) (vdl.FieldsTarget, error) {
- if !vdl.Compatible(tt, __VDLType_v_io_x_ref_services_syncbase_server_watchable_DeleteOp) {
- return nil, fmt.Errorf("type %v incompatible with %v", tt, __VDLType_v_io_x_ref_services_syncbase_server_watchable_DeleteOp)
+ if ttWant := vdl.TypeOf((*DeleteOp)(nil)).Elem(); !vdl.Compatible(tt, ttWant) {
+ return nil, fmt.Errorf("type %v incompatible with %v", tt, ttWant)
}
return t, nil
}
@@ -419,7 +412,7 @@
target, err := &t.permVersionTarget, error(nil)
return nil, target, err
default:
- return nil, nil, fmt.Errorf("field %s not in struct %v", name, __VDLType_v_io_x_ref_services_syncbase_server_watchable_DeleteOp)
+ return nil, nil, fmt.Errorf("field %s not in struct v.io/x/ref/services/syncbase/server/watchable.DeleteOp", name)
}
}
func (t *DeleteOpTarget) FinishField(_, _ vdl.Target) error {
@@ -446,9 +439,6 @@
}
func (m *SyncgroupOp) FillVDLTarget(t vdl.Target, tt *vdl.Type) error {
- if __VDLType_v_io_x_ref_services_syncbase_server_watchable_SyncgroupOp == nil || __VDLType5 == nil {
- panic("Initialization order error: types generated for FillVDLTarget not initialized. Consider moving caller to an init() block.")
- }
fieldsTarget1, err := t.StartFields(tt)
if err != nil {
return err
@@ -460,7 +450,7 @@
}
if err != vdl.ErrFieldNoExist {
- if err := m.SgId.FillVDLTarget(fieldTarget3, __VDLType_v_io_x_ref_services_syncbase_server_interfaces_GroupId); err != nil {
+ if err := m.SgId.FillVDLTarget(fieldTarget3, tt.NonOptional().Field(0).Type); err != nil {
return err
}
if err := fieldsTarget1.FinishField(keyTarget2, fieldTarget3); err != nil {
@@ -473,7 +463,7 @@
}
if err != vdl.ErrFieldNoExist {
- listTarget6, err := fieldTarget5.StartList(__VDLType6, len(m.Prefixes))
+ listTarget6, err := fieldTarget5.StartList(tt.NonOptional().Field(1).Type, len(m.Prefixes))
if err != nil {
return err
}
@@ -482,7 +472,7 @@
if err != nil {
return err
}
- if err := elemTarget7.FromString(string(elem8), vdl.StringType); err != nil {
+ if err := elemTarget7.FromString(string(elem8), tt.NonOptional().Field(1).Type.Elem()); err != nil {
return err
}
if err := listTarget6.FinishElem(elemTarget7); err != nil {
@@ -501,7 +491,7 @@
return err
}
if err != vdl.ErrFieldNoExist {
- if err := fieldTarget10.FromBool(bool(m.Remove), vdl.BoolType); err != nil {
+ if err := fieldTarget10.FromBool(bool(m.Remove), tt.NonOptional().Field(2).Type); err != nil {
return err
}
if err := fieldsTarget1.FinishField(keyTarget9, fieldTarget10); err != nil {
@@ -529,8 +519,8 @@
func (t *SyncgroupOpTarget) StartFields(tt *vdl.Type) (vdl.FieldsTarget, error) {
- if !vdl.Compatible(tt, __VDLType_v_io_x_ref_services_syncbase_server_watchable_SyncgroupOp) {
- return nil, fmt.Errorf("type %v incompatible with %v", tt, __VDLType_v_io_x_ref_services_syncbase_server_watchable_SyncgroupOp)
+ if ttWant := vdl.TypeOf((*SyncgroupOp)(nil)).Elem(); !vdl.Compatible(tt, ttWant) {
+ return nil, fmt.Errorf("type %v incompatible with %v", tt, ttWant)
}
return t, nil
}
@@ -549,7 +539,7 @@
target, err := &t.removeTarget, error(nil)
return nil, target, err
default:
- return nil, nil, fmt.Errorf("field %s not in struct %v", name, __VDLType_v_io_x_ref_services_syncbase_server_watchable_SyncgroupOp)
+ return nil, nil, fmt.Errorf("field %s not in struct v.io/x/ref/services/syncbase/server/watchable.SyncgroupOp", name)
}
}
func (t *SyncgroupOpTarget) FinishField(_, _ vdl.Target) error {
@@ -582,9 +572,6 @@
}
func (m *SyncSnapshotOp) FillVDLTarget(t vdl.Target, tt *vdl.Type) error {
- if __VDLType_v_io_x_ref_services_syncbase_server_watchable_SyncSnapshotOp == nil || __VDLType7 == nil {
- panic("Initialization order error: types generated for FillVDLTarget not initialized. Consider moving caller to an init() block.")
- }
fieldsTarget1, err := t.StartFields(tt)
if err != nil {
return err
@@ -596,7 +583,7 @@
}
if err != vdl.ErrFieldNoExist {
- if err := fieldTarget3.FromBytes([]byte(m.Key), __VDLType1); err != nil {
+ if err := fieldTarget3.FromBytes([]byte(m.Key), tt.NonOptional().Field(0).Type); err != nil {
return err
}
if err := fieldsTarget1.FinishField(keyTarget2, fieldTarget3); err != nil {
@@ -609,7 +596,7 @@
}
if err != vdl.ErrFieldNoExist {
- if err := fieldTarget5.FromBytes([]byte(m.Version), __VDLType1); err != nil {
+ if err := fieldTarget5.FromBytes([]byte(m.Version), tt.NonOptional().Field(1).Type); err != nil {
return err
}
if err := fieldsTarget1.FinishField(keyTarget4, fieldTarget5); err != nil {
@@ -622,7 +609,7 @@
}
if err != vdl.ErrFieldNoExist {
- if err := fieldTarget7.FromBytes([]byte(m.PermKey), __VDLType1); err != nil {
+ if err := fieldTarget7.FromBytes([]byte(m.PermKey), tt.NonOptional().Field(2).Type); err != nil {
return err
}
if err := fieldsTarget1.FinishField(keyTarget6, fieldTarget7); err != nil {
@@ -635,7 +622,7 @@
}
if err != vdl.ErrFieldNoExist {
- if err := fieldTarget9.FromBytes([]byte(m.PermVersion), __VDLType1); err != nil {
+ if err := fieldTarget9.FromBytes([]byte(m.PermVersion), tt.NonOptional().Field(3).Type); err != nil {
return err
}
if err := fieldsTarget1.FinishField(keyTarget8, fieldTarget9); err != nil {
@@ -664,8 +651,8 @@
func (t *SyncSnapshotOpTarget) StartFields(tt *vdl.Type) (vdl.FieldsTarget, error) {
- if !vdl.Compatible(tt, __VDLType_v_io_x_ref_services_syncbase_server_watchable_SyncSnapshotOp) {
- return nil, fmt.Errorf("type %v incompatible with %v", tt, __VDLType_v_io_x_ref_services_syncbase_server_watchable_SyncSnapshotOp)
+ if ttWant := vdl.TypeOf((*SyncSnapshotOp)(nil)).Elem(); !vdl.Compatible(tt, ttWant) {
+ return nil, fmt.Errorf("type %v incompatible with %v", tt, ttWant)
}
return t, nil
}
@@ -688,7 +675,7 @@
target, err := &t.permVersionTarget, error(nil)
return nil, target, err
default:
- return nil, nil, fmt.Errorf("field %s not in struct %v", name, __VDLType_v_io_x_ref_services_syncbase_server_watchable_SyncSnapshotOp)
+ return nil, nil, fmt.Errorf("field %s not in struct v.io/x/ref/services/syncbase/server/watchable.SyncSnapshotOp", name)
}
}
func (t *SyncSnapshotOpTarget) FinishField(_, _ vdl.Target) error {
@@ -748,7 +735,7 @@
}
func (m *StateChange) FillVDLTarget(t vdl.Target, tt *vdl.Type) error {
- if err := t.FromEnumLabel((*m).String(), __VDLType_v_io_x_ref_services_syncbase_server_watchable_StateChange); err != nil {
+ if err := t.FromEnumLabel((*m).String(), tt); err != nil {
return err
}
return nil
@@ -765,8 +752,8 @@
func (t *StateChangeTarget) FromEnumLabel(src string, tt *vdl.Type) error {
- if !vdl.Compatible(tt, __VDLType_v_io_x_ref_services_syncbase_server_watchable_StateChange) {
- return fmt.Errorf("type %v incompatible with %v", tt, __VDLType_v_io_x_ref_services_syncbase_server_watchable_StateChange)
+ if ttWant := vdl.TypeOf((*StateChange)(nil)); !vdl.Compatible(tt, ttWant) {
+ return fmt.Errorf("type %v incompatible with %v", tt, ttWant)
}
switch src {
case "PauseSync":
@@ -774,7 +761,7 @@
case "ResumeSync":
*t.Value = 1
default:
- return fmt.Errorf("label %s not in enum %v", src, __VDLType_v_io_x_ref_services_syncbase_server_watchable_StateChange)
+ return fmt.Errorf("label %s not in enum v.io/x/ref/services/syncbase/server/watchable.StateChange", src)
}
return nil
@@ -795,9 +782,6 @@
}
func (m *DbStateChangeRequestOp) FillVDLTarget(t vdl.Target, tt *vdl.Type) error {
- if __VDLType_v_io_x_ref_services_syncbase_server_watchable_DbStateChangeRequestOp == nil || __VDLType8 == nil {
- panic("Initialization order error: types generated for FillVDLTarget not initialized. Consider moving caller to an init() block.")
- }
fieldsTarget1, err := t.StartFields(tt)
if err != nil {
return err
@@ -809,7 +793,7 @@
}
if err != vdl.ErrFieldNoExist {
- if err := m.RequestType.FillVDLTarget(fieldTarget3, __VDLType_v_io_x_ref_services_syncbase_server_watchable_StateChange); err != nil {
+ if err := m.RequestType.FillVDLTarget(fieldTarget3, tt.NonOptional().Field(0).Type); err != nil {
return err
}
if err := fieldsTarget1.FinishField(keyTarget2, fieldTarget3); err != nil {
@@ -835,8 +819,8 @@
func (t *DbStateChangeRequestOpTarget) StartFields(tt *vdl.Type) (vdl.FieldsTarget, error) {
- if !vdl.Compatible(tt, __VDLType_v_io_x_ref_services_syncbase_server_watchable_DbStateChangeRequestOp) {
- return nil, fmt.Errorf("type %v incompatible with %v", tt, __VDLType_v_io_x_ref_services_syncbase_server_watchable_DbStateChangeRequestOp)
+ if ttWant := vdl.TypeOf((*DbStateChangeRequestOp)(nil)).Elem(); !vdl.Compatible(tt, ttWant) {
+ return nil, fmt.Errorf("type %v incompatible with %v", tt, ttWant)
}
return t, nil
}
@@ -847,7 +831,7 @@
target, err := &t.requestTypeTarget, error(nil)
return nil, target, err
default:
- return nil, nil, fmt.Errorf("field %s not in struct %v", name, __VDLType_v_io_x_ref_services_syncbase_server_watchable_DbStateChangeRequestOp)
+ return nil, nil, fmt.Errorf("field %s not in struct v.io/x/ref/services/syncbase/server/watchable.DbStateChangeRequestOp", name)
}
}
func (t *DbStateChangeRequestOpTarget) FinishField(_, _ vdl.Target) error {
@@ -909,7 +893,7 @@
func (x OpGet) __VDLReflect(__OpReflect) {}
func (m OpGet) FillVDLTarget(t vdl.Target, tt *vdl.Type) error {
- fieldsTarget1, err := t.StartFields(__VDLType_v_io_x_ref_services_syncbase_server_watchable_Op)
+ fieldsTarget1, err := t.StartFields(tt)
if err != nil {
return err
}
@@ -918,7 +902,7 @@
return err
}
- if err := m.Value.FillVDLTarget(fieldTarget3, __VDLType_v_io_x_ref_services_syncbase_server_watchable_GetOp); err != nil {
+ if err := m.Value.FillVDLTarget(fieldTarget3, tt.NonOptional().Field(0).Type); err != nil {
return err
}
if err := fieldsTarget1.FinishField(keyTarget2, fieldTarget3); err != nil {
@@ -941,7 +925,7 @@
func (x OpScan) __VDLReflect(__OpReflect) {}
func (m OpScan) FillVDLTarget(t vdl.Target, tt *vdl.Type) error {
- fieldsTarget1, err := t.StartFields(__VDLType_v_io_x_ref_services_syncbase_server_watchable_Op)
+ fieldsTarget1, err := t.StartFields(tt)
if err != nil {
return err
}
@@ -950,7 +934,7 @@
return err
}
- if err := m.Value.FillVDLTarget(fieldTarget3, __VDLType_v_io_x_ref_services_syncbase_server_watchable_ScanOp); err != nil {
+ if err := m.Value.FillVDLTarget(fieldTarget3, tt.NonOptional().Field(1).Type); err != nil {
return err
}
if err := fieldsTarget1.FinishField(keyTarget2, fieldTarget3); err != nil {
@@ -973,7 +957,7 @@
func (x OpPut) __VDLReflect(__OpReflect) {}
func (m OpPut) FillVDLTarget(t vdl.Target, tt *vdl.Type) error {
- fieldsTarget1, err := t.StartFields(__VDLType_v_io_x_ref_services_syncbase_server_watchable_Op)
+ fieldsTarget1, err := t.StartFields(tt)
if err != nil {
return err
}
@@ -982,7 +966,7 @@
return err
}
- if err := m.Value.FillVDLTarget(fieldTarget3, __VDLType_v_io_x_ref_services_syncbase_server_watchable_PutOp); err != nil {
+ if err := m.Value.FillVDLTarget(fieldTarget3, tt.NonOptional().Field(2).Type); err != nil {
return err
}
if err := fieldsTarget1.FinishField(keyTarget2, fieldTarget3); err != nil {
@@ -1005,7 +989,7 @@
func (x OpDelete) __VDLReflect(__OpReflect) {}
func (m OpDelete) FillVDLTarget(t vdl.Target, tt *vdl.Type) error {
- fieldsTarget1, err := t.StartFields(__VDLType_v_io_x_ref_services_syncbase_server_watchable_Op)
+ fieldsTarget1, err := t.StartFields(tt)
if err != nil {
return err
}
@@ -1014,7 +998,7 @@
return err
}
- if err := m.Value.FillVDLTarget(fieldTarget3, __VDLType_v_io_x_ref_services_syncbase_server_watchable_DeleteOp); err != nil {
+ if err := m.Value.FillVDLTarget(fieldTarget3, tt.NonOptional().Field(3).Type); err != nil {
return err
}
if err := fieldsTarget1.FinishField(keyTarget2, fieldTarget3); err != nil {
@@ -1037,7 +1021,7 @@
func (x OpSyncgroup) __VDLReflect(__OpReflect) {}
func (m OpSyncgroup) FillVDLTarget(t vdl.Target, tt *vdl.Type) error {
- fieldsTarget1, err := t.StartFields(__VDLType_v_io_x_ref_services_syncbase_server_watchable_Op)
+ fieldsTarget1, err := t.StartFields(tt)
if err != nil {
return err
}
@@ -1046,7 +1030,7 @@
return err
}
- if err := m.Value.FillVDLTarget(fieldTarget3, __VDLType_v_io_x_ref_services_syncbase_server_watchable_SyncgroupOp); err != nil {
+ if err := m.Value.FillVDLTarget(fieldTarget3, tt.NonOptional().Field(4).Type); err != nil {
return err
}
if err := fieldsTarget1.FinishField(keyTarget2, fieldTarget3); err != nil {
@@ -1069,7 +1053,7 @@
func (x OpSyncSnapshot) __VDLReflect(__OpReflect) {}
func (m OpSyncSnapshot) FillVDLTarget(t vdl.Target, tt *vdl.Type) error {
- fieldsTarget1, err := t.StartFields(__VDLType_v_io_x_ref_services_syncbase_server_watchable_Op)
+ fieldsTarget1, err := t.StartFields(tt)
if err != nil {
return err
}
@@ -1078,7 +1062,7 @@
return err
}
- if err := m.Value.FillVDLTarget(fieldTarget3, __VDLType_v_io_x_ref_services_syncbase_server_watchable_SyncSnapshotOp); err != nil {
+ if err := m.Value.FillVDLTarget(fieldTarget3, tt.NonOptional().Field(5).Type); err != nil {
return err
}
if err := fieldsTarget1.FinishField(keyTarget2, fieldTarget3); err != nil {
@@ -1101,7 +1085,7 @@
func (x OpDbStateChangeRequest) __VDLReflect(__OpReflect) {}
func (m OpDbStateChangeRequest) FillVDLTarget(t vdl.Target, tt *vdl.Type) error {
- fieldsTarget1, err := t.StartFields(__VDLType_v_io_x_ref_services_syncbase_server_watchable_Op)
+ fieldsTarget1, err := t.StartFields(tt)
if err != nil {
return err
}
@@ -1110,7 +1094,7 @@
return err
}
- if err := m.Value.FillVDLTarget(fieldTarget3, __VDLType_v_io_x_ref_services_syncbase_server_watchable_DbStateChangeRequestOp); err != nil {
+ if err := m.Value.FillVDLTarget(fieldTarget3, tt.NonOptional().Field(6).Type); err != nil {
return err
}
if err := fieldsTarget1.FinishField(keyTarget2, fieldTarget3); err != nil {
@@ -1150,9 +1134,6 @@
}
func (m *LogEntry) FillVDLTarget(t vdl.Target, tt *vdl.Type) error {
- if __VDLType_v_io_x_ref_services_syncbase_server_watchable_LogEntry == nil || __VDLType9 == nil {
- panic("Initialization order error: types generated for FillVDLTarget not initialized. Consider moving caller to an init() block.")
- }
fieldsTarget1, err := t.StartFields(tt)
if err != nil {
return err
@@ -1168,7 +1149,7 @@
if unionValue4 == nil {
unionValue4 = OpGet{}
}
- if err := unionValue4.FillVDLTarget(fieldTarget3, __VDLType_v_io_x_ref_services_syncbase_server_watchable_Op); err != nil {
+ if err := unionValue4.FillVDLTarget(fieldTarget3, tt.NonOptional().Field(0).Type); err != nil {
return err
}
if err := fieldsTarget1.FinishField(keyTarget2, fieldTarget3); err != nil {
@@ -1180,7 +1161,7 @@
return err
}
if err != vdl.ErrFieldNoExist {
- if err := fieldTarget6.FromInt(int64(m.CommitTimestamp), vdl.Int64Type); err != nil {
+ if err := fieldTarget6.FromInt(int64(m.CommitTimestamp), tt.NonOptional().Field(1).Type); err != nil {
return err
}
if err := fieldsTarget1.FinishField(keyTarget5, fieldTarget6); err != nil {
@@ -1192,7 +1173,7 @@
return err
}
if err != vdl.ErrFieldNoExist {
- if err := fieldTarget8.FromBool(bool(m.FromSync), vdl.BoolType); err != nil {
+ if err := fieldTarget8.FromBool(bool(m.FromSync), tt.NonOptional().Field(2).Type); err != nil {
return err
}
if err := fieldsTarget1.FinishField(keyTarget7, fieldTarget8); err != nil {
@@ -1204,7 +1185,7 @@
return err
}
if err != vdl.ErrFieldNoExist {
- if err := fieldTarget10.FromBool(bool(m.Continued), vdl.BoolType); err != nil {
+ if err := fieldTarget10.FromBool(bool(m.Continued), tt.NonOptional().Field(3).Type); err != nil {
return err
}
if err := fieldsTarget1.FinishField(keyTarget9, fieldTarget10); err != nil {
@@ -1233,8 +1214,8 @@
func (t *LogEntryTarget) StartFields(tt *vdl.Type) (vdl.FieldsTarget, error) {
- if !vdl.Compatible(tt, __VDLType_v_io_x_ref_services_syncbase_server_watchable_LogEntry) {
- return nil, fmt.Errorf("type %v incompatible with %v", tt, __VDLType_v_io_x_ref_services_syncbase_server_watchable_LogEntry)
+ if ttWant := vdl.TypeOf((*LogEntry)(nil)).Elem(); !vdl.Compatible(tt, ttWant) {
+ return nil, fmt.Errorf("type %v incompatible with %v", tt, ttWant)
}
return t, nil
}
@@ -1256,7 +1237,7 @@
target, err := &t.continuedTarget, error(nil)
return nil, target, err
default:
- return nil, nil, fmt.Errorf("field %s not in struct %v", name, __VDLType_v_io_x_ref_services_syncbase_server_watchable_LogEntry)
+ return nil, nil, fmt.Errorf("field %s not in struct v.io/x/ref/services/syncbase/server/watchable.LogEntry", name)
}
}
func (t *LogEntryTarget) FinishField(_, _ vdl.Target) error {
@@ -1267,7 +1248,27 @@
return nil
}
-func init() {
+var __VDLInitCalled bool
+
+// __VDLInit performs vdl initialization. It is safe to call multiple times.
+// If you have an init ordering issue, just insert the following line verbatim
+// into your source files in this package, right after the "package foo" clause:
+//
+// var _ = __VDLInit()
+//
+// The purpose of this function is to ensure that vdl initialization occurs in
+// the right order, and very early in the init sequence. In particular, vdl
+// registration and package variable initialization needs to occur before
+// functions like vdl.TypeOf will work properly.
+//
+// This function returns a dummy value, so that it can be used to initialize the
+// first var in the file, to take advantage of Go's defined init order.
+func __VDLInit() struct{} {
+ if __VDLInitCalled {
+ return struct{}{}
+ }
+
+ // Register types.
vdl.Register((*GetOp)(nil))
vdl.Register((*ScanOp)(nil))
vdl.Register((*PutOp)(nil))
@@ -1278,31 +1279,6 @@
vdl.Register((*DbStateChangeRequestOp)(nil))
vdl.Register((*Op)(nil))
vdl.Register((*LogEntry)(nil))
-}
-var __VDLType8 *vdl.Type = vdl.TypeOf((*DbStateChangeRequestOp)(nil))
-var __VDLType4 *vdl.Type = vdl.TypeOf((*DeleteOp)(nil))
-var __VDLType0 *vdl.Type = vdl.TypeOf((*GetOp)(nil))
-var __VDLType9 *vdl.Type = vdl.TypeOf((*LogEntry)(nil))
-var __VDLType3 *vdl.Type = vdl.TypeOf((*PutOp)(nil))
-var __VDLType2 *vdl.Type = vdl.TypeOf((*ScanOp)(nil))
-var __VDLType7 *vdl.Type = vdl.TypeOf((*SyncSnapshotOp)(nil))
-var __VDLType5 *vdl.Type = vdl.TypeOf((*SyncgroupOp)(nil))
-var __VDLType1 *vdl.Type = vdl.TypeOf([]byte(nil))
-var __VDLType6 *vdl.Type = vdl.TypeOf([]string(nil))
-var __VDLType_v_io_x_ref_services_syncbase_server_interfaces_GroupId *vdl.Type = vdl.TypeOf(interfaces.GroupId(0))
-var __VDLType_v_io_x_ref_services_syncbase_server_watchable_DbStateChangeRequestOp *vdl.Type = vdl.TypeOf(DbStateChangeRequestOp{})
-var __VDLType_v_io_x_ref_services_syncbase_server_watchable_DeleteOp *vdl.Type = vdl.TypeOf(DeleteOp{})
-var __VDLType_v_io_x_ref_services_syncbase_server_watchable_GetOp *vdl.Type = vdl.TypeOf(GetOp{})
-var __VDLType_v_io_x_ref_services_syncbase_server_watchable_LogEntry *vdl.Type = vdl.TypeOf(LogEntry{
- Op: OpGet{GetOp{}},
-})
-var __VDLType_v_io_x_ref_services_syncbase_server_watchable_Op *vdl.Type = vdl.TypeOf(Op(OpGet{GetOp{}}))
-var __VDLType_v_io_x_ref_services_syncbase_server_watchable_PutOp *vdl.Type = vdl.TypeOf(PutOp{})
-var __VDLType_v_io_x_ref_services_syncbase_server_watchable_ScanOp *vdl.Type = vdl.TypeOf(ScanOp{})
-var __VDLType_v_io_x_ref_services_syncbase_server_watchable_StateChange *vdl.Type = vdl.TypeOf(StateChangePauseSync)
-var __VDLType_v_io_x_ref_services_syncbase_server_watchable_SyncSnapshotOp *vdl.Type = vdl.TypeOf(SyncSnapshotOp{})
-var __VDLType_v_io_x_ref_services_syncbase_server_watchable_SyncgroupOp *vdl.Type = vdl.TypeOf(SyncgroupOp{})
-
-func __VDLEnsureNativeBuilt() {
+ return struct{}{}
}
diff --git a/services/syncbase/signing/signing.vdl.go b/services/syncbase/signing/signing.vdl.go
index 375c662..3a76e2f 100644
--- a/services/syncbase/signing/signing.vdl.go
+++ b/services/syncbase/signing/signing.vdl.go
@@ -14,256 +14,10 @@
"v.io/v23/vdl"
)
-// A DataWithSignature represents a signed, and possibily validated, collection
-// of Item structs.
-//
-// If IsValidated==false and the AuthorSigned signature is valid, it means:
-// The signer whose Blessings have hash BlessingsHash asserts Data.
-//
-// If IsValidated==true and both AuthorSigned and ValidatorSigned signatures are is valid,
-// it means both:
-// 1) The signer whose Blessings b have hash BlessingsHash asserts Data.
-// 2) If vd is the ValidatorData with hash ValidatorDataHash, the owner of
-// vd.PublicKey asserts that it checked that at least the names vd.Names[] were
-// valid in b.
-//
-// The sender obtains:
-// - BlessingsHash (and the wire form of the blessings) with ValidationCache.AddBlessings().
-// - ValidatorDataHash (and the wire form of the ValidataData) with ValidationCache.AddValidatorData().
-//
-// The receiver looks up:
-// - BlessingsHash with ValidationCache.LookupBlessingsData()
-// - ValidatorDataHash with ValidationCache.LookupValidatorData()
-//
-// If not yet there, the receiver inserts the valus into its ValidationCache with:
-// - ValidationCache.AddWireBlessings()
-// - ValidationCache.AddValidatorData()
-type DataWithSignature struct {
- Data []Item
- // BlessingsHash is a key for the validation cache; the corresponding
- // cached value is a security.Blessings.
- BlessingsHash []byte
- // AuthorSigned is the signature of Data and BlessingsHash using the
- // private key associated with the blessings hashed in BlessingsHash.
- AuthorSigned security.Signature
- IsValidated bool // Whether fields below are meaningful.
- // ValidatorDataHash is a key for the validation cache returned by
- // ValidatorData.Hash(); the corresponding cached value is the
- // ValidatorData.
- ValidatorDataHash []byte
- ValidatorSigned security.Signature
-}
+var _ = __VDLInit() // Must be first; see __VDLInit comments for details.
-func (DataWithSignature) __VDLReflect(struct {
- Name string `vdl:"v.io/x/ref/services/syncbase/signing.DataWithSignature"`
-}) {
-}
-
-func (m *DataWithSignature) FillVDLTarget(t vdl.Target, tt *vdl.Type) error {
- if __VDLType_v_io_x_ref_services_syncbase_signing_DataWithSignature == nil || __VDLType0 == nil {
- panic("Initialization order error: types generated for FillVDLTarget not initialized. Consider moving caller to an init() block.")
- }
- fieldsTarget1, err := t.StartFields(tt)
- if err != nil {
- return err
- }
-
- keyTarget2, fieldTarget3, err := fieldsTarget1.StartField("Data")
- if err != vdl.ErrFieldNoExist && err != nil {
- return err
- }
- if err != vdl.ErrFieldNoExist {
-
- listTarget4, err := fieldTarget3.StartList(__VDLType1, len(m.Data))
- if err != nil {
- return err
- }
- for i, elem6 := range m.Data {
- elemTarget5, err := listTarget4.StartElem(i)
- if err != nil {
- return err
- }
-
- unionValue7 := elem6
- if unionValue7 == nil {
- unionValue7 = ItemData{}
- }
- if err := unionValue7.FillVDLTarget(elemTarget5, __VDLType_v_io_x_ref_services_syncbase_signing_Item); err != nil {
- return err
- }
- if err := listTarget4.FinishElem(elemTarget5); err != nil {
- return err
- }
- }
- if err := fieldTarget3.FinishList(listTarget4); err != nil {
- return err
- }
- if err := fieldsTarget1.FinishField(keyTarget2, fieldTarget3); err != nil {
- return err
- }
- }
- keyTarget8, fieldTarget9, err := fieldsTarget1.StartField("BlessingsHash")
- if err != vdl.ErrFieldNoExist && err != nil {
- return err
- }
- if err != vdl.ErrFieldNoExist {
-
- if err := fieldTarget9.FromBytes([]byte(m.BlessingsHash), __VDLType2); err != nil {
- return err
- }
- if err := fieldsTarget1.FinishField(keyTarget8, fieldTarget9); err != nil {
- return err
- }
- }
- keyTarget10, fieldTarget11, err := fieldsTarget1.StartField("AuthorSigned")
- if err != vdl.ErrFieldNoExist && err != nil {
- return err
- }
- if err != vdl.ErrFieldNoExist {
-
- if err := m.AuthorSigned.FillVDLTarget(fieldTarget11, __VDLType_v_io_v23_security_Signature); err != nil {
- return err
- }
- if err := fieldsTarget1.FinishField(keyTarget10, fieldTarget11); err != nil {
- return err
- }
- }
- keyTarget12, fieldTarget13, err := fieldsTarget1.StartField("IsValidated")
- if err != vdl.ErrFieldNoExist && err != nil {
- return err
- }
- if err != vdl.ErrFieldNoExist {
- if err := fieldTarget13.FromBool(bool(m.IsValidated), vdl.BoolType); err != nil {
- return err
- }
- if err := fieldsTarget1.FinishField(keyTarget12, fieldTarget13); err != nil {
- return err
- }
- }
- keyTarget14, fieldTarget15, err := fieldsTarget1.StartField("ValidatorDataHash")
- if err != vdl.ErrFieldNoExist && err != nil {
- return err
- }
- if err != vdl.ErrFieldNoExist {
-
- if err := fieldTarget15.FromBytes([]byte(m.ValidatorDataHash), __VDLType2); err != nil {
- return err
- }
- if err := fieldsTarget1.FinishField(keyTarget14, fieldTarget15); err != nil {
- return err
- }
- }
- keyTarget16, fieldTarget17, err := fieldsTarget1.StartField("ValidatorSigned")
- if err != vdl.ErrFieldNoExist && err != nil {
- return err
- }
- if err != vdl.ErrFieldNoExist {
-
- if err := m.ValidatorSigned.FillVDLTarget(fieldTarget17, __VDLType_v_io_v23_security_Signature); err != nil {
- return err
- }
- if err := fieldsTarget1.FinishField(keyTarget16, fieldTarget17); err != nil {
- return err
- }
- }
- if err := t.FinishFields(fieldsTarget1); err != nil {
- return err
- }
- return nil
-}
-
-func (m *DataWithSignature) MakeVDLTarget() vdl.Target {
- return &DataWithSignatureTarget{Value: m}
-}
-
-type DataWithSignatureTarget struct {
- Value *DataWithSignature
- dataTarget unnamed_5b5d762e696f2f782f7265662f73657276696365732f73796e63626173652f7369676e696e672e4974656d20756e696f6e7b44617461205b5d627974653b48617368205b5d627974657dTarget
- blessingsHashTarget vdl.BytesTarget
- authorSignedTarget security.SignatureTarget
- isValidatedTarget vdl.BoolTarget
- validatorDataHashTarget vdl.BytesTarget
- validatorSignedTarget security.SignatureTarget
- vdl.TargetBase
- vdl.FieldsTargetBase
-}
-
-func (t *DataWithSignatureTarget) StartFields(tt *vdl.Type) (vdl.FieldsTarget, error) {
-
- if !vdl.Compatible(tt, __VDLType_v_io_x_ref_services_syncbase_signing_DataWithSignature) {
- return nil, fmt.Errorf("type %v incompatible with %v", tt, __VDLType_v_io_x_ref_services_syncbase_signing_DataWithSignature)
- }
- return t, nil
-}
-func (t *DataWithSignatureTarget) StartField(name string) (key, field vdl.Target, _ error) {
- switch name {
- case "Data":
- t.dataTarget.Value = &t.Value.Data
- target, err := &t.dataTarget, error(nil)
- return nil, target, err
- case "BlessingsHash":
- t.blessingsHashTarget.Value = &t.Value.BlessingsHash
- target, err := &t.blessingsHashTarget, error(nil)
- return nil, target, err
- case "AuthorSigned":
- t.authorSignedTarget.Value = &t.Value.AuthorSigned
- target, err := &t.authorSignedTarget, error(nil)
- return nil, target, err
- case "IsValidated":
- t.isValidatedTarget.Value = &t.Value.IsValidated
- target, err := &t.isValidatedTarget, error(nil)
- return nil, target, err
- case "ValidatorDataHash":
- t.validatorDataHashTarget.Value = &t.Value.ValidatorDataHash
- target, err := &t.validatorDataHashTarget, error(nil)
- return nil, target, err
- case "ValidatorSigned":
- t.validatorSignedTarget.Value = &t.Value.ValidatorSigned
- target, err := &t.validatorSignedTarget, error(nil)
- return nil, target, err
- default:
- return nil, nil, fmt.Errorf("field %s not in struct %v", name, __VDLType_v_io_x_ref_services_syncbase_signing_DataWithSignature)
- }
-}
-func (t *DataWithSignatureTarget) FinishField(_, _ vdl.Target) error {
- return nil
-}
-func (t *DataWithSignatureTarget) FinishFields(_ vdl.FieldsTarget) error {
-
- return nil
-}
-
-// []Item
-type unnamed_5b5d762e696f2f782f7265662f73657276696365732f73796e63626173652f7369676e696e672e4974656d20756e696f6e7b44617461205b5d627974653b48617368205b5d627974657dTarget struct {
- Value *[]Item
-
- vdl.TargetBase
- vdl.ListTargetBase
-}
-
-func (t *unnamed_5b5d762e696f2f782f7265662f73657276696365732f73796e63626173652f7369676e696e672e4974656d20756e696f6e7b44617461205b5d627974653b48617368205b5d627974657dTarget) StartList(tt *vdl.Type, len int) (vdl.ListTarget, error) {
-
- if !vdl.Compatible(tt, __VDLType1) {
- return nil, fmt.Errorf("type %v incompatible with %v", tt, __VDLType1)
- }
- if cap(*t.Value) < len {
- *t.Value = make([]Item, len)
- } else {
- *t.Value = (*t.Value)[:len]
- }
- return t, nil
-}
-func (t *unnamed_5b5d762e696f2f782f7265662f73657276696365732f73796e63626173652f7369676e696e672e4974656d20756e696f6e7b44617461205b5d627974653b48617368205b5d627974657dTarget) StartElem(index int) (elem vdl.Target, _ error) {
- target, err := vdl.ReflectTarget(reflect.ValueOf(&(*t.Value)[index]))
- return target, err
-}
-func (t *unnamed_5b5d762e696f2f782f7265662f73657276696365732f73796e63626173652f7369676e696e672e4974656d20756e696f6e7b44617461205b5d627974653b48617368205b5d627974657dTarget) FinishElem(elem vdl.Target) error {
- return nil
-}
-func (t *unnamed_5b5d762e696f2f782f7265662f73657276696365732f73796e63626173652f7369676e696e672e4974656d20756e696f6e7b44617461205b5d627974653b48617368205b5d627974657dTarget) FinishList(elem vdl.ListTarget) error {
-
- return nil
-}
+//////////////////////////////////////////////////
+// Type definitions
type (
// Item represents any single field of the Item union type.
@@ -311,7 +65,7 @@
func (x ItemData) __VDLReflect(__ItemReflect) {}
func (m ItemData) FillVDLTarget(t vdl.Target, tt *vdl.Type) error {
- fieldsTarget1, err := t.StartFields(__VDLType_v_io_x_ref_services_syncbase_signing_Item)
+ fieldsTarget1, err := t.StartFields(tt)
if err != nil {
return err
}
@@ -320,7 +74,7 @@
return err
}
- if err := fieldTarget3.FromBytes([]byte(m.Value), __VDLType2); err != nil {
+ if err := fieldTarget3.FromBytes([]byte(m.Value), tt.NonOptional().Field(0).Type); err != nil {
return err
}
if err := fieldsTarget1.FinishField(keyTarget2, fieldTarget3); err != nil {
@@ -343,7 +97,7 @@
func (x ItemHash) __VDLReflect(__ItemReflect) {}
func (m ItemHash) FillVDLTarget(t vdl.Target, tt *vdl.Type) error {
- fieldsTarget1, err := t.StartFields(__VDLType_v_io_x_ref_services_syncbase_signing_Item)
+ fieldsTarget1, err := t.StartFields(tt)
if err != nil {
return err
}
@@ -352,7 +106,7 @@
return err
}
- if err := fieldTarget3.FromBytes([]byte(m.Value), __VDLType2); err != nil {
+ if err := fieldTarget3.FromBytes([]byte(m.Value), tt.NonOptional().Field(1).Type); err != nil {
return err
}
if err := fieldsTarget1.FinishField(keyTarget2, fieldTarget3); err != nil {
@@ -369,6 +123,254 @@
return nil
}
+// A DataWithSignature represents a signed, and possibily validated, collection
+// of Item structs.
+//
+// If IsValidated==false and the AuthorSigned signature is valid, it means:
+// The signer whose Blessings have hash BlessingsHash asserts Data.
+//
+// If IsValidated==true and both AuthorSigned and ValidatorSigned signatures are is valid,
+// it means both:
+// 1) The signer whose Blessings b have hash BlessingsHash asserts Data.
+// 2) If vd is the ValidatorData with hash ValidatorDataHash, the owner of
+// vd.PublicKey asserts that it checked that at least the names vd.Names[] were
+// valid in b.
+//
+// The sender obtains:
+// - BlessingsHash (and the wire form of the blessings) with ValidationCache.AddBlessings().
+// - ValidatorDataHash (and the wire form of the ValidataData) with ValidationCache.AddValidatorData().
+//
+// The receiver looks up:
+// - BlessingsHash with ValidationCache.LookupBlessingsData()
+// - ValidatorDataHash with ValidationCache.LookupValidatorData()
+//
+// If not yet there, the receiver inserts the valus into its ValidationCache with:
+// - ValidationCache.AddWireBlessings()
+// - ValidationCache.AddValidatorData()
+type DataWithSignature struct {
+ Data []Item
+ // BlessingsHash is a key for the validation cache; the corresponding
+ // cached value is a security.Blessings.
+ BlessingsHash []byte
+ // AuthorSigned is the signature of Data and BlessingsHash using the
+ // private key associated with the blessings hashed in BlessingsHash.
+ AuthorSigned security.Signature
+ IsValidated bool // Whether fields below are meaningful.
+ // ValidatorDataHash is a key for the validation cache returned by
+ // ValidatorData.Hash(); the corresponding cached value is the
+ // ValidatorData.
+ ValidatorDataHash []byte
+ ValidatorSigned security.Signature
+}
+
+func (DataWithSignature) __VDLReflect(struct {
+ Name string `vdl:"v.io/x/ref/services/syncbase/signing.DataWithSignature"`
+}) {
+}
+
+func (m *DataWithSignature) FillVDLTarget(t vdl.Target, tt *vdl.Type) error {
+ fieldsTarget1, err := t.StartFields(tt)
+ if err != nil {
+ return err
+ }
+
+ keyTarget2, fieldTarget3, err := fieldsTarget1.StartField("Data")
+ if err != vdl.ErrFieldNoExist && err != nil {
+ return err
+ }
+ if err != vdl.ErrFieldNoExist {
+
+ listTarget4, err := fieldTarget3.StartList(tt.NonOptional().Field(0).Type, len(m.Data))
+ if err != nil {
+ return err
+ }
+ for i, elem6 := range m.Data {
+ elemTarget5, err := listTarget4.StartElem(i)
+ if err != nil {
+ return err
+ }
+
+ unionValue7 := elem6
+ if unionValue7 == nil {
+ unionValue7 = ItemData{}
+ }
+ if err := unionValue7.FillVDLTarget(elemTarget5, tt.NonOptional().Field(0).Type.Elem()); err != nil {
+ return err
+ }
+ if err := listTarget4.FinishElem(elemTarget5); err != nil {
+ return err
+ }
+ }
+ if err := fieldTarget3.FinishList(listTarget4); err != nil {
+ return err
+ }
+ if err := fieldsTarget1.FinishField(keyTarget2, fieldTarget3); err != nil {
+ return err
+ }
+ }
+ keyTarget8, fieldTarget9, err := fieldsTarget1.StartField("BlessingsHash")
+ if err != vdl.ErrFieldNoExist && err != nil {
+ return err
+ }
+ if err != vdl.ErrFieldNoExist {
+
+ if err := fieldTarget9.FromBytes([]byte(m.BlessingsHash), tt.NonOptional().Field(1).Type); err != nil {
+ return err
+ }
+ if err := fieldsTarget1.FinishField(keyTarget8, fieldTarget9); err != nil {
+ return err
+ }
+ }
+ keyTarget10, fieldTarget11, err := fieldsTarget1.StartField("AuthorSigned")
+ if err != vdl.ErrFieldNoExist && err != nil {
+ return err
+ }
+ if err != vdl.ErrFieldNoExist {
+
+ if err := m.AuthorSigned.FillVDLTarget(fieldTarget11, tt.NonOptional().Field(2).Type); err != nil {
+ return err
+ }
+ if err := fieldsTarget1.FinishField(keyTarget10, fieldTarget11); err != nil {
+ return err
+ }
+ }
+ keyTarget12, fieldTarget13, err := fieldsTarget1.StartField("IsValidated")
+ if err != vdl.ErrFieldNoExist && err != nil {
+ return err
+ }
+ if err != vdl.ErrFieldNoExist {
+ if err := fieldTarget13.FromBool(bool(m.IsValidated), tt.NonOptional().Field(3).Type); err != nil {
+ return err
+ }
+ if err := fieldsTarget1.FinishField(keyTarget12, fieldTarget13); err != nil {
+ return err
+ }
+ }
+ keyTarget14, fieldTarget15, err := fieldsTarget1.StartField("ValidatorDataHash")
+ if err != vdl.ErrFieldNoExist && err != nil {
+ return err
+ }
+ if err != vdl.ErrFieldNoExist {
+
+ if err := fieldTarget15.FromBytes([]byte(m.ValidatorDataHash), tt.NonOptional().Field(4).Type); err != nil {
+ return err
+ }
+ if err := fieldsTarget1.FinishField(keyTarget14, fieldTarget15); err != nil {
+ return err
+ }
+ }
+ keyTarget16, fieldTarget17, err := fieldsTarget1.StartField("ValidatorSigned")
+ if err != vdl.ErrFieldNoExist && err != nil {
+ return err
+ }
+ if err != vdl.ErrFieldNoExist {
+
+ if err := m.ValidatorSigned.FillVDLTarget(fieldTarget17, tt.NonOptional().Field(5).Type); err != nil {
+ return err
+ }
+ if err := fieldsTarget1.FinishField(keyTarget16, fieldTarget17); err != nil {
+ return err
+ }
+ }
+ if err := t.FinishFields(fieldsTarget1); err != nil {
+ return err
+ }
+ return nil
+}
+
+func (m *DataWithSignature) MakeVDLTarget() vdl.Target {
+ return &DataWithSignatureTarget{Value: m}
+}
+
+type DataWithSignatureTarget struct {
+ Value *DataWithSignature
+ dataTarget unnamed_5b5d762e696f2f782f7265662f73657276696365732f73796e63626173652f7369676e696e672e4974656d20756e696f6e7b44617461205b5d627974653b48617368205b5d627974657dTarget
+ blessingsHashTarget vdl.BytesTarget
+ authorSignedTarget security.SignatureTarget
+ isValidatedTarget vdl.BoolTarget
+ validatorDataHashTarget vdl.BytesTarget
+ validatorSignedTarget security.SignatureTarget
+ vdl.TargetBase
+ vdl.FieldsTargetBase
+}
+
+func (t *DataWithSignatureTarget) StartFields(tt *vdl.Type) (vdl.FieldsTarget, error) {
+
+ if ttWant := vdl.TypeOf((*DataWithSignature)(nil)).Elem(); !vdl.Compatible(tt, ttWant) {
+ return nil, fmt.Errorf("type %v incompatible with %v", tt, ttWant)
+ }
+ return t, nil
+}
+func (t *DataWithSignatureTarget) StartField(name string) (key, field vdl.Target, _ error) {
+ switch name {
+ case "Data":
+ t.dataTarget.Value = &t.Value.Data
+ target, err := &t.dataTarget, error(nil)
+ return nil, target, err
+ case "BlessingsHash":
+ t.blessingsHashTarget.Value = &t.Value.BlessingsHash
+ target, err := &t.blessingsHashTarget, error(nil)
+ return nil, target, err
+ case "AuthorSigned":
+ t.authorSignedTarget.Value = &t.Value.AuthorSigned
+ target, err := &t.authorSignedTarget, error(nil)
+ return nil, target, err
+ case "IsValidated":
+ t.isValidatedTarget.Value = &t.Value.IsValidated
+ target, err := &t.isValidatedTarget, error(nil)
+ return nil, target, err
+ case "ValidatorDataHash":
+ t.validatorDataHashTarget.Value = &t.Value.ValidatorDataHash
+ target, err := &t.validatorDataHashTarget, error(nil)
+ return nil, target, err
+ case "ValidatorSigned":
+ t.validatorSignedTarget.Value = &t.Value.ValidatorSigned
+ target, err := &t.validatorSignedTarget, error(nil)
+ return nil, target, err
+ default:
+ return nil, nil, fmt.Errorf("field %s not in struct v.io/x/ref/services/syncbase/signing.DataWithSignature", name)
+ }
+}
+func (t *DataWithSignatureTarget) FinishField(_, _ vdl.Target) error {
+ return nil
+}
+func (t *DataWithSignatureTarget) FinishFields(_ vdl.FieldsTarget) error {
+
+ return nil
+}
+
+// []Item
+type unnamed_5b5d762e696f2f782f7265662f73657276696365732f73796e63626173652f7369676e696e672e4974656d20756e696f6e7b44617461205b5d627974653b48617368205b5d627974657dTarget struct {
+ Value *[]Item
+
+ vdl.TargetBase
+ vdl.ListTargetBase
+}
+
+func (t *unnamed_5b5d762e696f2f782f7265662f73657276696365732f73796e63626173652f7369676e696e672e4974656d20756e696f6e7b44617461205b5d627974653b48617368205b5d627974657dTarget) StartList(tt *vdl.Type, len int) (vdl.ListTarget, error) {
+
+ if ttWant := vdl.TypeOf((*[]Item)(nil)); !vdl.Compatible(tt, ttWant) {
+ return nil, fmt.Errorf("type %v incompatible with %v", tt, ttWant)
+ }
+ if cap(*t.Value) < len {
+ *t.Value = make([]Item, len)
+ } else {
+ *t.Value = (*t.Value)[:len]
+ }
+ return t, nil
+}
+func (t *unnamed_5b5d762e696f2f782f7265662f73657276696365732f73796e63626173652f7369676e696e672e4974656d20756e696f6e7b44617461205b5d627974653b48617368205b5d627974657dTarget) StartElem(index int) (elem vdl.Target, _ error) {
+ target, err := vdl.ReflectTarget(reflect.ValueOf(&(*t.Value)[index]))
+ return target, err
+}
+func (t *unnamed_5b5d762e696f2f782f7265662f73657276696365732f73796e63626173652f7369676e696e672e4974656d20756e696f6e7b44617461205b5d627974653b48617368205b5d627974657dTarget) FinishElem(elem vdl.Target) error {
+ return nil
+}
+func (t *unnamed_5b5d762e696f2f782f7265662f73657276696365732f73796e63626173652f7369676e696e672e4974656d20756e696f6e7b44617461205b5d627974653b48617368205b5d627974657dTarget) FinishList(elem vdl.ListTarget) error {
+
+ return nil
+}
+
// WireValidatorData is the wire form of ValidatorData.
// It excludes the unmarshalled form of the public key.
type WireValidatorData struct {
@@ -382,9 +384,6 @@
}
func (m *WireValidatorData) FillVDLTarget(t vdl.Target, tt *vdl.Type) error {
- if __VDLType_v_io_x_ref_services_syncbase_signing_WireValidatorData == nil || __VDLType3 == nil {
- panic("Initialization order error: types generated for FillVDLTarget not initialized. Consider moving caller to an init() block.")
- }
fieldsTarget1, err := t.StartFields(tt)
if err != nil {
return err
@@ -396,7 +395,7 @@
}
if err != vdl.ErrFieldNoExist {
- listTarget4, err := fieldTarget3.StartList(__VDLType4, len(m.Names))
+ listTarget4, err := fieldTarget3.StartList(tt.NonOptional().Field(0).Type, len(m.Names))
if err != nil {
return err
}
@@ -405,7 +404,7 @@
if err != nil {
return err
}
- if err := elemTarget5.FromString(string(elem6), vdl.StringType); err != nil {
+ if err := elemTarget5.FromString(string(elem6), tt.NonOptional().Field(0).Type.Elem()); err != nil {
return err
}
if err := listTarget4.FinishElem(elemTarget5); err != nil {
@@ -425,7 +424,7 @@
}
if err != vdl.ErrFieldNoExist {
- if err := fieldTarget8.FromBytes([]byte(m.MarshalledPublicKey), __VDLType2); err != nil {
+ if err := fieldTarget8.FromBytes([]byte(m.MarshalledPublicKey), tt.NonOptional().Field(1).Type); err != nil {
return err
}
if err := fieldsTarget1.FinishField(keyTarget7, fieldTarget8); err != nil {
@@ -452,8 +451,8 @@
func (t *WireValidatorDataTarget) StartFields(tt *vdl.Type) (vdl.FieldsTarget, error) {
- if !vdl.Compatible(tt, __VDLType_v_io_x_ref_services_syncbase_signing_WireValidatorData) {
- return nil, fmt.Errorf("type %v incompatible with %v", tt, __VDLType_v_io_x_ref_services_syncbase_signing_WireValidatorData)
+ if ttWant := vdl.TypeOf((*WireValidatorData)(nil)).Elem(); !vdl.Compatible(tt, ttWant) {
+ return nil, fmt.Errorf("type %v incompatible with %v", tt, ttWant)
}
return t, nil
}
@@ -468,7 +467,7 @@
target, err := &t.marshalledPublicKeyTarget, error(nil)
return nil, target, err
default:
- return nil, nil, fmt.Errorf("field %s not in struct %v", name, __VDLType_v_io_x_ref_services_syncbase_signing_WireValidatorData)
+ return nil, nil, fmt.Errorf("field %s not in struct v.io/x/ref/services/syncbase/signing.WireValidatorData", name)
}
}
func (t *WireValidatorDataTarget) FinishField(_, _ vdl.Target) error {
@@ -479,21 +478,30 @@
return nil
}
-func init() {
- vdl.Register((*DataWithSignature)(nil))
+var __VDLInitCalled bool
+
+// __VDLInit performs vdl initialization. It is safe to call multiple times.
+// If you have an init ordering issue, just insert the following line verbatim
+// into your source files in this package, right after the "package foo" clause:
+//
+// var _ = __VDLInit()
+//
+// The purpose of this function is to ensure that vdl initialization occurs in
+// the right order, and very early in the init sequence. In particular, vdl
+// registration and package variable initialization needs to occur before
+// functions like vdl.TypeOf will work properly.
+//
+// This function returns a dummy value, so that it can be used to initialize the
+// first var in the file, to take advantage of Go's defined init order.
+func __VDLInit() struct{} {
+ if __VDLInitCalled {
+ return struct{}{}
+ }
+
+ // Register types.
vdl.Register((*Item)(nil))
+ vdl.Register((*DataWithSignature)(nil))
vdl.Register((*WireValidatorData)(nil))
-}
-var __VDLType0 *vdl.Type = vdl.TypeOf((*DataWithSignature)(nil))
-var __VDLType3 *vdl.Type = vdl.TypeOf((*WireValidatorData)(nil))
-var __VDLType2 *vdl.Type = vdl.TypeOf([]byte(nil))
-var __VDLType4 *vdl.Type = vdl.TypeOf([]string(nil))
-var __VDLType1 *vdl.Type = vdl.TypeOf([]Item(nil))
-var __VDLType_v_io_v23_security_Signature *vdl.Type = vdl.TypeOf(security.Signature{})
-var __VDLType_v_io_x_ref_services_syncbase_signing_DataWithSignature *vdl.Type = vdl.TypeOf(DataWithSignature{})
-var __VDLType_v_io_x_ref_services_syncbase_signing_Item *vdl.Type = vdl.TypeOf(Item(ItemData{[]byte(nil)}))
-var __VDLType_v_io_x_ref_services_syncbase_signing_WireValidatorData *vdl.Type = vdl.TypeOf(WireValidatorData{})
-
-func __VDLEnsureNativeBuilt() {
+ return struct{}{}
}
diff --git a/services/syncbase/store/store.vdl.go b/services/syncbase/store/store.vdl.go
index bcc0229..872bb92 100644
--- a/services/syncbase/store/store.vdl.go
+++ b/services/syncbase/store/store.vdl.go
@@ -13,10 +13,12 @@
"v.io/v23/verror"
)
-func __VDLEnsureNativeBuilt() {
-}
+var _ = __VDLInit() // Must be first; see __VDLInit comments for details.
+//////////////////////////////////////////////////
+// Error definitions
var (
+
// ConcurrentTransaction means that the current transaction failed to commit
// because its read set was invalidated by some other transaction.
ErrConcurrentTransaction = verror.Register("v.io/x/ref/services/syncbase/store.ConcurrentTransaction", verror.NoRetry, "{1:}{2:} Concurrent transaction{:_}")
@@ -24,11 +26,6 @@
ErrUnknownKey = verror.Register("v.io/x/ref/services/syncbase/store.UnknownKey", verror.NoRetry, "{1:}{2:} Unknown key{:_}")
)
-func init() {
- i18n.Cat().SetWithBase(i18n.LangID("en"), i18n.MsgID(ErrConcurrentTransaction.ID), "{1:}{2:} Concurrent transaction{:_}")
- i18n.Cat().SetWithBase(i18n.LangID("en"), i18n.MsgID(ErrUnknownKey.ID), "{1:}{2:} Unknown key{:_}")
-}
-
// NewErrConcurrentTransaction returns an error with the ErrConcurrentTransaction ID.
func NewErrConcurrentTransaction(ctx *context.T) error {
return verror.New(ErrConcurrentTransaction, ctx)
@@ -38,3 +35,30 @@
func NewErrUnknownKey(ctx *context.T) error {
return verror.New(ErrUnknownKey, ctx)
}
+
+var __VDLInitCalled bool
+
+// __VDLInit performs vdl initialization. It is safe to call multiple times.
+// If you have an init ordering issue, just insert the following line verbatim
+// into your source files in this package, right after the "package foo" clause:
+//
+// var _ = __VDLInit()
+//
+// The purpose of this function is to ensure that vdl initialization occurs in
+// the right order, and very early in the init sequence. In particular, vdl
+// registration and package variable initialization needs to occur before
+// functions like vdl.TypeOf will work properly.
+//
+// This function returns a dummy value, so that it can be used to initialize the
+// first var in the file, to take advantage of Go's defined init order.
+func __VDLInit() struct{} {
+ if __VDLInitCalled {
+ return struct{}{}
+ }
+
+ // Set error format strings.
+ i18n.Cat().SetWithBase(i18n.LangID("en"), i18n.MsgID(ErrConcurrentTransaction.ID), "{1:}{2:} Concurrent transaction{:_}")
+ i18n.Cat().SetWithBase(i18n.LangID("en"), i18n.MsgID(ErrUnknownKey.ID), "{1:}{2:} Unknown key{:_}")
+
+ return struct{}{}
+}
diff --git a/services/syncbase/vclock/vclock.vdl.go b/services/syncbase/vclock/vclock.vdl.go
index da773d4..30b7747 100644
--- a/services/syncbase/vclock/vclock.vdl.go
+++ b/services/syncbase/vclock/vclock.vdl.go
@@ -14,6 +14,11 @@
time_2 "v.io/v23/vdlroot/time"
)
+var _ = __VDLInit() // Must be first; see __VDLInit comments for details.
+
+//////////////////////////////////////////////////
+// Type definitions
+
// VClockData is the persistent state of the Syncbase virtual clock.
// All times are UTC.
type VClockData struct {
@@ -41,7 +46,6 @@
}
func (m *VClockData) FillVDLTarget(t vdl.Target, tt *vdl.Type) error {
- __VDLEnsureNativeBuilt()
fieldsTarget1, err := t.StartFields(tt)
if err != nil {
return err
@@ -58,7 +62,7 @@
}
if err != vdl.ErrFieldNoExist {
- if err := wireValue2.FillVDLTarget(fieldTarget4, __VDLType_time_Time); err != nil {
+ if err := wireValue2.FillVDLTarget(fieldTarget4, tt.NonOptional().Field(0).Type); err != nil {
return err
}
if err := fieldsTarget1.FinishField(keyTarget3, fieldTarget4); err != nil {
@@ -76,7 +80,7 @@
}
if err != vdl.ErrFieldNoExist {
- if err := wireValue5.FillVDLTarget(fieldTarget7, __VDLType_time_Duration); err != nil {
+ if err := wireValue5.FillVDLTarget(fieldTarget7, tt.NonOptional().Field(1).Type); err != nil {
return err
}
if err := fieldsTarget1.FinishField(keyTarget6, fieldTarget7); err != nil {
@@ -94,7 +98,7 @@
}
if err != vdl.ErrFieldNoExist {
- if err := wireValue8.FillVDLTarget(fieldTarget10, __VDLType_time_Duration); err != nil {
+ if err := wireValue8.FillVDLTarget(fieldTarget10, tt.NonOptional().Field(2).Type); err != nil {
return err
}
if err := fieldsTarget1.FinishField(keyTarget9, fieldTarget10); err != nil {
@@ -112,7 +116,7 @@
}
if err != vdl.ErrFieldNoExist {
- if err := wireValue11.FillVDLTarget(fieldTarget13, __VDLType_time_Time); err != nil {
+ if err := wireValue11.FillVDLTarget(fieldTarget13, tt.NonOptional().Field(3).Type); err != nil {
return err
}
if err := fieldsTarget1.FinishField(keyTarget12, fieldTarget13); err != nil {
@@ -124,7 +128,7 @@
return err
}
if err != vdl.ErrFieldNoExist {
- if err := fieldTarget15.FromUint(uint64(m.NumReboots), vdl.Uint16Type); err != nil {
+ if err := fieldTarget15.FromUint(uint64(m.NumReboots), tt.NonOptional().Field(4).Type); err != nil {
return err
}
if err := fieldsTarget1.FinishField(keyTarget14, fieldTarget15); err != nil {
@@ -136,7 +140,7 @@
return err
}
if err != vdl.ErrFieldNoExist {
- if err := fieldTarget17.FromUint(uint64(m.NumHops), vdl.Uint16Type); err != nil {
+ if err := fieldTarget17.FromUint(uint64(m.NumHops), tt.NonOptional().Field(5).Type); err != nil {
return err
}
if err := fieldsTarget1.FinishField(keyTarget16, fieldTarget17); err != nil {
@@ -167,8 +171,8 @@
func (t *VClockDataTarget) StartFields(tt *vdl.Type) (vdl.FieldsTarget, error) {
- if !vdl.Compatible(tt, __VDLType_v_io_x_ref_services_syncbase_vclock_VClockData) {
- return nil, fmt.Errorf("type %v incompatible with %v", tt, __VDLType_v_io_x_ref_services_syncbase_vclock_VClockData)
+ if ttWant := vdl.TypeOf((*VClockData)(nil)).Elem(); !vdl.Compatible(tt, ttWant) {
+ return nil, fmt.Errorf("type %v incompatible with %v", tt, ttWant)
}
return t, nil
}
@@ -199,7 +203,7 @@
target, err := &t.numHopsTarget, error(nil)
return nil, target, err
default:
- return nil, nil, fmt.Errorf("field %s not in struct %v", name, __VDLType_v_io_x_ref_services_syncbase_vclock_VClockData)
+ return nil, nil, fmt.Errorf("field %s not in struct v.io/x/ref/services/syncbase/vclock.VClockData", name)
}
}
func (t *VClockDataTarget) FinishField(_, _ vdl.Target) error {
@@ -210,136 +214,28 @@
return nil
}
-func init() {
+var __VDLInitCalled bool
+
+// __VDLInit performs vdl initialization. It is safe to call multiple times.
+// If you have an init ordering issue, just insert the following line verbatim
+// into your source files in this package, right after the "package foo" clause:
+//
+// var _ = __VDLInit()
+//
+// The purpose of this function is to ensure that vdl initialization occurs in
+// the right order, and very early in the init sequence. In particular, vdl
+// registration and package variable initialization needs to occur before
+// functions like vdl.TypeOf will work properly.
+//
+// This function returns a dummy value, so that it can be used to initialize the
+// first var in the file, to take advantage of Go's defined init order.
+func __VDLInit() struct{} {
+ if __VDLInitCalled {
+ return struct{}{}
+ }
+
+ // Register types.
vdl.Register((*VClockData)(nil))
-}
-var __VDLType0 *vdl.Type
-
-func __VDLType0_gen() *vdl.Type {
- __VDLType0Builder := vdl.TypeBuilder{}
-
- __VDLType01 := __VDLType0Builder.Optional()
- __VDLType02 := __VDLType0Builder.Struct()
- __VDLType03 := __VDLType0Builder.Named("v.io/x/ref/services/syncbase/vclock.VClockData").AssignBase(__VDLType02)
- __VDLType04 := __VDLType0Builder.Struct()
- __VDLType05 := __VDLType0Builder.Named("time.Time").AssignBase(__VDLType04)
- __VDLType06 := vdl.Int64Type
- __VDLType04.AppendField("Seconds", __VDLType06)
- __VDLType07 := vdl.Int32Type
- __VDLType04.AppendField("Nanos", __VDLType07)
- __VDLType02.AppendField("SystemTimeAtBoot", __VDLType05)
- __VDLType08 := __VDLType0Builder.Struct()
- __VDLType09 := __VDLType0Builder.Named("time.Duration").AssignBase(__VDLType08)
- __VDLType08.AppendField("Seconds", __VDLType06)
- __VDLType08.AppendField("Nanos", __VDLType07)
- __VDLType02.AppendField("Skew", __VDLType09)
- __VDLType02.AppendField("ElapsedTimeSinceBoot", __VDLType09)
- __VDLType02.AppendField("LastNtpTs", __VDLType05)
- __VDLType010 := vdl.Uint16Type
- __VDLType02.AppendField("NumReboots", __VDLType010)
- __VDLType02.AppendField("NumHops", __VDLType010)
- __VDLType01.AssignElem(__VDLType03)
- __VDLType0Builder.Build()
- __VDLType0v, err := __VDLType01.Built()
- if err != nil {
- panic(err)
- }
- return __VDLType0v
-}
-func init() {
- __VDLType0 = __VDLType0_gen()
-}
-
-var __VDLType_time_Duration *vdl.Type
-
-func __VDLType_time_Duration_gen() *vdl.Type {
- __VDLType_time_DurationBuilder := vdl.TypeBuilder{}
-
- __VDLType_time_Duration1 := __VDLType_time_DurationBuilder.Struct()
- __VDLType_time_Duration2 := __VDLType_time_DurationBuilder.Named("time.Duration").AssignBase(__VDLType_time_Duration1)
- __VDLType_time_Duration3 := vdl.Int64Type
- __VDLType_time_Duration1.AppendField("Seconds", __VDLType_time_Duration3)
- __VDLType_time_Duration4 := vdl.Int32Type
- __VDLType_time_Duration1.AppendField("Nanos", __VDLType_time_Duration4)
- __VDLType_time_DurationBuilder.Build()
- __VDLType_time_Durationv, err := __VDLType_time_Duration2.Built()
- if err != nil {
- panic(err)
- }
- return __VDLType_time_Durationv
-}
-func init() {
- __VDLType_time_Duration = __VDLType_time_Duration_gen()
-}
-
-var __VDLType_time_Time *vdl.Type
-
-func __VDLType_time_Time_gen() *vdl.Type {
- __VDLType_time_TimeBuilder := vdl.TypeBuilder{}
-
- __VDLType_time_Time1 := __VDLType_time_TimeBuilder.Struct()
- __VDLType_time_Time2 := __VDLType_time_TimeBuilder.Named("time.Time").AssignBase(__VDLType_time_Time1)
- __VDLType_time_Time3 := vdl.Int64Type
- __VDLType_time_Time1.AppendField("Seconds", __VDLType_time_Time3)
- __VDLType_time_Time4 := vdl.Int32Type
- __VDLType_time_Time1.AppendField("Nanos", __VDLType_time_Time4)
- __VDLType_time_TimeBuilder.Build()
- __VDLType_time_Timev, err := __VDLType_time_Time2.Built()
- if err != nil {
- panic(err)
- }
- return __VDLType_time_Timev
-}
-func init() {
- __VDLType_time_Time = __VDLType_time_Time_gen()
-}
-
-var __VDLType_v_io_x_ref_services_syncbase_vclock_VClockData *vdl.Type
-
-func __VDLType_v_io_x_ref_services_syncbase_vclock_VClockData_gen() *vdl.Type {
- __VDLType_v_io_x_ref_services_syncbase_vclock_VClockDataBuilder := vdl.TypeBuilder{}
-
- __VDLType_v_io_x_ref_services_syncbase_vclock_VClockData1 := __VDLType_v_io_x_ref_services_syncbase_vclock_VClockDataBuilder.Struct()
- __VDLType_v_io_x_ref_services_syncbase_vclock_VClockData2 := __VDLType_v_io_x_ref_services_syncbase_vclock_VClockDataBuilder.Named("v.io/x/ref/services/syncbase/vclock.VClockData").AssignBase(__VDLType_v_io_x_ref_services_syncbase_vclock_VClockData1)
- __VDLType_v_io_x_ref_services_syncbase_vclock_VClockData3 := __VDLType_v_io_x_ref_services_syncbase_vclock_VClockDataBuilder.Struct()
- __VDLType_v_io_x_ref_services_syncbase_vclock_VClockData4 := __VDLType_v_io_x_ref_services_syncbase_vclock_VClockDataBuilder.Named("time.Time").AssignBase(__VDLType_v_io_x_ref_services_syncbase_vclock_VClockData3)
- __VDLType_v_io_x_ref_services_syncbase_vclock_VClockData5 := vdl.Int64Type
- __VDLType_v_io_x_ref_services_syncbase_vclock_VClockData3.AppendField("Seconds", __VDLType_v_io_x_ref_services_syncbase_vclock_VClockData5)
- __VDLType_v_io_x_ref_services_syncbase_vclock_VClockData6 := vdl.Int32Type
- __VDLType_v_io_x_ref_services_syncbase_vclock_VClockData3.AppendField("Nanos", __VDLType_v_io_x_ref_services_syncbase_vclock_VClockData6)
- __VDLType_v_io_x_ref_services_syncbase_vclock_VClockData1.AppendField("SystemTimeAtBoot", __VDLType_v_io_x_ref_services_syncbase_vclock_VClockData4)
- __VDLType_v_io_x_ref_services_syncbase_vclock_VClockData7 := __VDLType_v_io_x_ref_services_syncbase_vclock_VClockDataBuilder.Struct()
- __VDLType_v_io_x_ref_services_syncbase_vclock_VClockData8 := __VDLType_v_io_x_ref_services_syncbase_vclock_VClockDataBuilder.Named("time.Duration").AssignBase(__VDLType_v_io_x_ref_services_syncbase_vclock_VClockData7)
- __VDLType_v_io_x_ref_services_syncbase_vclock_VClockData7.AppendField("Seconds", __VDLType_v_io_x_ref_services_syncbase_vclock_VClockData5)
- __VDLType_v_io_x_ref_services_syncbase_vclock_VClockData7.AppendField("Nanos", __VDLType_v_io_x_ref_services_syncbase_vclock_VClockData6)
- __VDLType_v_io_x_ref_services_syncbase_vclock_VClockData1.AppendField("Skew", __VDLType_v_io_x_ref_services_syncbase_vclock_VClockData8)
- __VDLType_v_io_x_ref_services_syncbase_vclock_VClockData1.AppendField("ElapsedTimeSinceBoot", __VDLType_v_io_x_ref_services_syncbase_vclock_VClockData8)
- __VDLType_v_io_x_ref_services_syncbase_vclock_VClockData1.AppendField("LastNtpTs", __VDLType_v_io_x_ref_services_syncbase_vclock_VClockData4)
- __VDLType_v_io_x_ref_services_syncbase_vclock_VClockData9 := vdl.Uint16Type
- __VDLType_v_io_x_ref_services_syncbase_vclock_VClockData1.AppendField("NumReboots", __VDLType_v_io_x_ref_services_syncbase_vclock_VClockData9)
- __VDLType_v_io_x_ref_services_syncbase_vclock_VClockData1.AppendField("NumHops", __VDLType_v_io_x_ref_services_syncbase_vclock_VClockData9)
- __VDLType_v_io_x_ref_services_syncbase_vclock_VClockDataBuilder.Build()
- __VDLType_v_io_x_ref_services_syncbase_vclock_VClockDatav, err := __VDLType_v_io_x_ref_services_syncbase_vclock_VClockData2.Built()
- if err != nil {
- panic(err)
- }
- return __VDLType_v_io_x_ref_services_syncbase_vclock_VClockDatav
-}
-func init() {
- __VDLType_v_io_x_ref_services_syncbase_vclock_VClockData = __VDLType_v_io_x_ref_services_syncbase_vclock_VClockData_gen()
-}
-func __VDLEnsureNativeBuilt() {
- if __VDLType0 == nil {
- __VDLType0 = __VDLType0_gen()
- }
- if __VDLType_time_Duration == nil {
- __VDLType_time_Duration = __VDLType_time_Duration_gen()
- }
- if __VDLType_time_Time == nil {
- __VDLType_time_Time = __VDLType_time_Time_gen()
- }
- if __VDLType_v_io_x_ref_services_syncbase_vclock_VClockData == nil {
- __VDLType_v_io_x_ref_services_syncbase_vclock_VClockData = __VDLType_v_io_x_ref_services_syncbase_vclock_VClockData_gen()
- }
+ return struct{}{}
}
diff --git a/services/syncbase/vsync/testdata/blobtestsvdl.vdl.go b/services/syncbase/vsync/testdata/blobtestsvdl.vdl.go
index defe51b..e3e33cf 100644
--- a/services/syncbase/vsync/testdata/blobtestsvdl.vdl.go
+++ b/services/syncbase/vsync/testdata/blobtestsvdl.vdl.go
@@ -15,6 +15,11 @@
"v.io/v23/vom"
)
+var _ = __VDLInit() // Must be first; see __VDLInit comments for details.
+
+//////////////////////////////////////////////////
+// Type definitions
+
type BlobInfo struct {
Info string
Br nosql.BlobRef
@@ -26,9 +31,6 @@
}
func (m *BlobInfo) FillVDLTarget(t vdl.Target, tt *vdl.Type) error {
- if __VDLType_v_io_x_ref_services_syncbase_vsync_testdata_BlobInfo == nil || __VDLType0 == nil {
- panic("Initialization order error: types generated for FillVDLTarget not initialized. Consider moving caller to an init() block.")
- }
fieldsTarget1, err := t.StartFields(tt)
if err != nil {
return err
@@ -39,7 +41,7 @@
return err
}
if err != vdl.ErrFieldNoExist {
- if err := fieldTarget3.FromString(string(m.Info), vdl.StringType); err != nil {
+ if err := fieldTarget3.FromString(string(m.Info), tt.NonOptional().Field(0).Type); err != nil {
return err
}
if err := fieldsTarget1.FinishField(keyTarget2, fieldTarget3); err != nil {
@@ -52,7 +54,7 @@
}
if err != vdl.ErrFieldNoExist {
- if err := m.Br.FillVDLTarget(fieldTarget5, __VDLType_v_io_v23_services_syncbase_nosql_BlobRef); err != nil {
+ if err := m.Br.FillVDLTarget(fieldTarget5, tt.NonOptional().Field(1).Type); err != nil {
return err
}
if err := fieldsTarget1.FinishField(keyTarget4, fieldTarget5); err != nil {
@@ -79,8 +81,8 @@
func (t *BlobInfoTarget) StartFields(tt *vdl.Type) (vdl.FieldsTarget, error) {
- if !vdl.Compatible(tt, __VDLType_v_io_x_ref_services_syncbase_vsync_testdata_BlobInfo) {
- return nil, fmt.Errorf("type %v incompatible with %v", tt, __VDLType_v_io_x_ref_services_syncbase_vsync_testdata_BlobInfo)
+ if ttWant := vdl.TypeOf((*BlobInfo)(nil)).Elem(); !vdl.Compatible(tt, ttWant) {
+ return nil, fmt.Errorf("type %v incompatible with %v", tt, ttWant)
}
return t, nil
}
@@ -95,7 +97,7 @@
target, err := &t.brTarget, error(nil)
return nil, target, err
default:
- return nil, nil, fmt.Errorf("field %s not in struct %v", name, __VDLType_v_io_x_ref_services_syncbase_vsync_testdata_BlobInfo)
+ return nil, nil, fmt.Errorf("field %s not in struct v.io/x/ref/services/syncbase/vsync/testdata.BlobInfo", name)
}
}
func (t *BlobInfoTarget) FinishField(_, _ vdl.Target) error {
@@ -140,7 +142,7 @@
func (x BlobUnionNum) __VDLReflect(__BlobUnionReflect) {}
func (m BlobUnionNum) FillVDLTarget(t vdl.Target, tt *vdl.Type) error {
- fieldsTarget1, err := t.StartFields(__VDLType_v_io_x_ref_services_syncbase_vsync_testdata_BlobUnion)
+ fieldsTarget1, err := t.StartFields(tt)
if err != nil {
return err
}
@@ -148,7 +150,7 @@
if err != nil {
return err
}
- if err := fieldTarget3.FromInt(int64(m.Value), vdl.Int32Type); err != nil {
+ if err := fieldTarget3.FromInt(int64(m.Value), tt.NonOptional().Field(0).Type); err != nil {
return err
}
if err := fieldsTarget1.FinishField(keyTarget2, fieldTarget3); err != nil {
@@ -171,7 +173,7 @@
func (x BlobUnionBi) __VDLReflect(__BlobUnionReflect) {}
func (m BlobUnionBi) FillVDLTarget(t vdl.Target, tt *vdl.Type) error {
- fieldsTarget1, err := t.StartFields(__VDLType_v_io_x_ref_services_syncbase_vsync_testdata_BlobUnion)
+ fieldsTarget1, err := t.StartFields(tt)
if err != nil {
return err
}
@@ -180,7 +182,7 @@
return err
}
- if err := m.Value.FillVDLTarget(fieldTarget3, __VDLType_v_io_x_ref_services_syncbase_vsync_testdata_BlobInfo); err != nil {
+ if err := m.Value.FillVDLTarget(fieldTarget3, tt.NonOptional().Field(1).Type); err != nil {
return err
}
if err := fieldsTarget1.FinishField(keyTarget2, fieldTarget3); err != nil {
@@ -208,9 +210,6 @@
}
func (m *BlobSet) FillVDLTarget(t vdl.Target, tt *vdl.Type) error {
- if __VDLType_v_io_x_ref_services_syncbase_vsync_testdata_BlobSet == nil || __VDLType1 == nil {
- panic("Initialization order error: types generated for FillVDLTarget not initialized. Consider moving caller to an init() block.")
- }
fieldsTarget1, err := t.StartFields(tt)
if err != nil {
return err
@@ -221,7 +220,7 @@
return err
}
if err != vdl.ErrFieldNoExist {
- if err := fieldTarget3.FromString(string(m.Info), vdl.StringType); err != nil {
+ if err := fieldTarget3.FromString(string(m.Info), tt.NonOptional().Field(0).Type); err != nil {
return err
}
if err := fieldsTarget1.FinishField(keyTarget2, fieldTarget3); err != nil {
@@ -234,7 +233,7 @@
}
if err != vdl.ErrFieldNoExist {
- setTarget6, err := fieldTarget5.StartSet(__VDLType2, len(m.Bs))
+ setTarget6, err := fieldTarget5.StartSet(tt.NonOptional().Field(1).Type, len(m.Bs))
if err != nil {
return err
}
@@ -244,7 +243,7 @@
return err
}
- if err := key8.FillVDLTarget(keyTarget7, __VDLType_v_io_v23_services_syncbase_nosql_BlobRef); err != nil {
+ if err := key8.FillVDLTarget(keyTarget7, tt.NonOptional().Field(1).Type.Key()); err != nil {
return err
}
if err := setTarget6.FinishKey(keyTarget7); err != nil {
@@ -278,8 +277,8 @@
func (t *BlobSetTarget) StartFields(tt *vdl.Type) (vdl.FieldsTarget, error) {
- if !vdl.Compatible(tt, __VDLType_v_io_x_ref_services_syncbase_vsync_testdata_BlobSet) {
- return nil, fmt.Errorf("type %v incompatible with %v", tt, __VDLType_v_io_x_ref_services_syncbase_vsync_testdata_BlobSet)
+ if ttWant := vdl.TypeOf((*BlobSet)(nil)).Elem(); !vdl.Compatible(tt, ttWant) {
+ return nil, fmt.Errorf("type %v incompatible with %v", tt, ttWant)
}
return t, nil
}
@@ -294,7 +293,7 @@
target, err := &t.bsTarget, error(nil)
return nil, target, err
default:
- return nil, nil, fmt.Errorf("field %s not in struct %v", name, __VDLType_v_io_x_ref_services_syncbase_vsync_testdata_BlobSet)
+ return nil, nil, fmt.Errorf("field %s not in struct v.io/x/ref/services/syncbase/vsync/testdata.BlobSet", name)
}
}
func (t *BlobSetTarget) FinishField(_, _ vdl.Target) error {
@@ -316,8 +315,8 @@
func (t *unnamed_7365745b762e696f2f7632332f73657276696365732f73796e63626173652f6e6f73716c2e426c6f6252656620737472696e675dTarget) StartSet(tt *vdl.Type, len int) (vdl.SetTarget, error) {
- if !vdl.Compatible(tt, __VDLType2) {
- return nil, fmt.Errorf("type %v incompatible with %v", tt, __VDLType2)
+ if ttWant := vdl.TypeOf((*map[nosql.BlobRef]struct{})(nil)); !vdl.Compatible(tt, ttWant) {
+ return nil, fmt.Errorf("type %v incompatible with %v", tt, ttWant)
}
*t.Value = make(map[nosql.BlobRef]struct{})
return t, nil
@@ -351,9 +350,6 @@
}
func (m *BlobAny) FillVDLTarget(t vdl.Target, tt *vdl.Type) error {
- if __VDLType_v_io_x_ref_services_syncbase_vsync_testdata_BlobAny == nil || __VDLType3 == nil {
- panic("Initialization order error: types generated for FillVDLTarget not initialized. Consider moving caller to an init() block.")
- }
fieldsTarget1, err := t.StartFields(tt)
if err != nil {
return err
@@ -364,7 +360,7 @@
return err
}
if err != vdl.ErrFieldNoExist {
- if err := fieldTarget3.FromString(string(m.Info), vdl.StringType); err != nil {
+ if err := fieldTarget3.FromString(string(m.Info), tt.NonOptional().Field(0).Type); err != nil {
return err
}
if err := fieldsTarget1.FinishField(keyTarget2, fieldTarget3); err != nil {
@@ -377,7 +373,7 @@
}
if err != vdl.ErrFieldNoExist {
- listTarget6, err := fieldTarget5.StartList(__VDLType4, len(m.Baa))
+ listTarget6, err := fieldTarget5.StartList(tt.NonOptional().Field(1).Type, len(m.Baa))
if err != nil {
return err
}
@@ -388,11 +384,11 @@
}
if elem8 == nil {
- if err := elemTarget7.FromNil(vdl.AnyType); err != nil {
+ if err := elemTarget7.FromNil(tt.NonOptional().Field(1).Type.Elem()); err != nil {
return err
}
} else {
- if err := elem8.FillVDLTarget(elemTarget7, vdl.AnyType); err != nil {
+ if err := elem8.FillVDLTarget(elemTarget7, tt.NonOptional().Field(1).Type.Elem()); err != nil {
return err
}
}
@@ -427,8 +423,8 @@
func (t *BlobAnyTarget) StartFields(tt *vdl.Type) (vdl.FieldsTarget, error) {
- if !vdl.Compatible(tt, __VDLType_v_io_x_ref_services_syncbase_vsync_testdata_BlobAny) {
- return nil, fmt.Errorf("type %v incompatible with %v", tt, __VDLType_v_io_x_ref_services_syncbase_vsync_testdata_BlobAny)
+ if ttWant := vdl.TypeOf((*BlobAny)(nil)).Elem(); !vdl.Compatible(tt, ttWant) {
+ return nil, fmt.Errorf("type %v incompatible with %v", tt, ttWant)
}
return t, nil
}
@@ -443,7 +439,7 @@
target, err := &t.baaTarget, error(nil)
return nil, target, err
default:
- return nil, nil, fmt.Errorf("field %s not in struct %v", name, __VDLType_v_io_x_ref_services_syncbase_vsync_testdata_BlobAny)
+ return nil, nil, fmt.Errorf("field %s not in struct v.io/x/ref/services/syncbase/vsync/testdata.BlobAny", name)
}
}
func (t *BlobAnyTarget) FinishField(_, _ vdl.Target) error {
@@ -464,8 +460,8 @@
func (t *unnamed_5b5d616e79Target) StartList(tt *vdl.Type, len int) (vdl.ListTarget, error) {
- if !vdl.Compatible(tt, __VDLType4) {
- return nil, fmt.Errorf("type %v incompatible with %v", tt, __VDLType4)
+ if ttWant := vdl.TypeOf((*[]*vom.RawBytes)(nil)); !vdl.Compatible(tt, ttWant) {
+ return nil, fmt.Errorf("type %v incompatible with %v", tt, ttWant)
}
if cap(*t.Value) < len {
*t.Value = make([]*vom.RawBytes, len)
@@ -497,9 +493,6 @@
}
func (m *NonBlobSet) FillVDLTarget(t vdl.Target, tt *vdl.Type) error {
- if __VDLType_v_io_x_ref_services_syncbase_vsync_testdata_NonBlobSet == nil || __VDLType5 == nil {
- panic("Initialization order error: types generated for FillVDLTarget not initialized. Consider moving caller to an init() block.")
- }
fieldsTarget1, err := t.StartFields(tt)
if err != nil {
return err
@@ -510,7 +503,7 @@
return err
}
if err != vdl.ErrFieldNoExist {
- if err := fieldTarget3.FromString(string(m.Info), vdl.StringType); err != nil {
+ if err := fieldTarget3.FromString(string(m.Info), tt.NonOptional().Field(0).Type); err != nil {
return err
}
if err := fieldsTarget1.FinishField(keyTarget2, fieldTarget3); err != nil {
@@ -523,7 +516,7 @@
}
if err != vdl.ErrFieldNoExist {
- setTarget6, err := fieldTarget5.StartSet(__VDLType6, len(m.S))
+ setTarget6, err := fieldTarget5.StartSet(tt.NonOptional().Field(1).Type, len(m.S))
if err != nil {
return err
}
@@ -532,7 +525,7 @@
if err != nil {
return err
}
- if err := keyTarget7.FromString(string(key8), vdl.StringType); err != nil {
+ if err := keyTarget7.FromString(string(key8), tt.NonOptional().Field(1).Type.Key()); err != nil {
return err
}
if err := setTarget6.FinishKey(keyTarget7); err != nil {
@@ -566,8 +559,8 @@
func (t *NonBlobSetTarget) StartFields(tt *vdl.Type) (vdl.FieldsTarget, error) {
- if !vdl.Compatible(tt, __VDLType_v_io_x_ref_services_syncbase_vsync_testdata_NonBlobSet) {
- return nil, fmt.Errorf("type %v incompatible with %v", tt, __VDLType_v_io_x_ref_services_syncbase_vsync_testdata_NonBlobSet)
+ if ttWant := vdl.TypeOf((*NonBlobSet)(nil)).Elem(); !vdl.Compatible(tt, ttWant) {
+ return nil, fmt.Errorf("type %v incompatible with %v", tt, ttWant)
}
return t, nil
}
@@ -582,7 +575,7 @@
target, err := &t.sTarget, error(nil)
return nil, target, err
default:
- return nil, nil, fmt.Errorf("field %s not in struct %v", name, __VDLType_v_io_x_ref_services_syncbase_vsync_testdata_NonBlobSet)
+ return nil, nil, fmt.Errorf("field %s not in struct v.io/x/ref/services/syncbase/vsync/testdata.NonBlobSet", name)
}
}
func (t *NonBlobSetTarget) FinishField(_, _ vdl.Target) error {
@@ -604,8 +597,8 @@
func (t *unnamed_7365745b737472696e675dTarget) StartSet(tt *vdl.Type, len int) (vdl.SetTarget, error) {
- if !vdl.Compatible(tt, __VDLType6) {
- return nil, fmt.Errorf("type %v incompatible with %v", tt, __VDLType6)
+ if ttWant := vdl.TypeOf((*map[string]struct{})(nil)); !vdl.Compatible(tt, ttWant) {
+ return nil, fmt.Errorf("type %v incompatible with %v", tt, ttWant)
}
*t.Value = make(map[string]struct{})
return t, nil
@@ -639,9 +632,6 @@
}
func (m *BlobOpt) FillVDLTarget(t vdl.Target, tt *vdl.Type) error {
- if __VDLType_v_io_x_ref_services_syncbase_vsync_testdata_BlobOpt == nil || __VDLType7 == nil {
- panic("Initialization order error: types generated for FillVDLTarget not initialized. Consider moving caller to an init() block.")
- }
fieldsTarget1, err := t.StartFields(tt)
if err != nil {
return err
@@ -652,7 +642,7 @@
return err
}
if err != vdl.ErrFieldNoExist {
- if err := fieldTarget3.FromString(string(m.Info), vdl.StringType); err != nil {
+ if err := fieldTarget3.FromString(string(m.Info), tt.NonOptional().Field(0).Type); err != nil {
return err
}
if err := fieldsTarget1.FinishField(keyTarget2, fieldTarget3); err != nil {
@@ -666,11 +656,11 @@
if err != vdl.ErrFieldNoExist {
if m.Bo == nil {
- if err := fieldTarget5.FromNil(__VDLType0); err != nil {
+ if err := fieldTarget5.FromNil(tt.NonOptional().Field(1).Type); err != nil {
return err
}
} else {
- if err := m.Bo.FillVDLTarget(fieldTarget5, __VDLType_v_io_x_ref_services_syncbase_vsync_testdata_BlobInfo); err != nil {
+ if err := m.Bo.FillVDLTarget(fieldTarget5, tt.NonOptional().Field(1).Type); err != nil {
return err
}
}
@@ -698,8 +688,8 @@
func (t *BlobOptTarget) StartFields(tt *vdl.Type) (vdl.FieldsTarget, error) {
- if !vdl.Compatible(tt, __VDLType_v_io_x_ref_services_syncbase_vsync_testdata_BlobOpt) {
- return nil, fmt.Errorf("type %v incompatible with %v", tt, __VDLType_v_io_x_ref_services_syncbase_vsync_testdata_BlobOpt)
+ if ttWant := vdl.TypeOf((*BlobOpt)(nil)).Elem(); !vdl.Compatible(tt, ttWant) {
+ return nil, fmt.Errorf("type %v incompatible with %v", tt, ttWant)
}
return t, nil
}
@@ -714,7 +704,7 @@
target, err := &t.boTarget, error(nil)
return nil, target, err
default:
- return nil, nil, fmt.Errorf("field %s not in struct %v", name, __VDLType_v_io_x_ref_services_syncbase_vsync_testdata_BlobOpt)
+ return nil, nil, fmt.Errorf("field %s not in struct v.io/x/ref/services/syncbase/vsync/testdata.BlobOpt", name)
}
}
func (t *BlobOptTarget) FinishField(_, _ vdl.Target) error {
@@ -756,30 +746,33 @@
return nil
}
-func init() {
+var __VDLInitCalled bool
+
+// __VDLInit performs vdl initialization. It is safe to call multiple times.
+// If you have an init ordering issue, just insert the following line verbatim
+// into your source files in this package, right after the "package foo" clause:
+//
+// var _ = __VDLInit()
+//
+// The purpose of this function is to ensure that vdl initialization occurs in
+// the right order, and very early in the init sequence. In particular, vdl
+// registration and package variable initialization needs to occur before
+// functions like vdl.TypeOf will work properly.
+//
+// This function returns a dummy value, so that it can be used to initialize the
+// first var in the file, to take advantage of Go's defined init order.
+func __VDLInit() struct{} {
+ if __VDLInitCalled {
+ return struct{}{}
+ }
+
+ // Register types.
vdl.Register((*BlobInfo)(nil))
vdl.Register((*BlobUnion)(nil))
vdl.Register((*BlobSet)(nil))
vdl.Register((*BlobAny)(nil))
vdl.Register((*NonBlobSet)(nil))
vdl.Register((*BlobOpt)(nil))
-}
-var __VDLType3 *vdl.Type = vdl.TypeOf((*BlobAny)(nil))
-var __VDLType0 *vdl.Type = vdl.TypeOf((*BlobInfo)(nil))
-var __VDLType7 *vdl.Type = vdl.TypeOf((*BlobOpt)(nil))
-var __VDLType1 *vdl.Type = vdl.TypeOf((*BlobSet)(nil))
-var __VDLType5 *vdl.Type = vdl.TypeOf((*NonBlobSet)(nil))
-var __VDLType4 *vdl.Type = vdl.TypeOf([]*vom.RawBytes(nil))
-var __VDLType6 *vdl.Type = vdl.TypeOf(map[string]struct{}(nil))
-var __VDLType2 *vdl.Type = vdl.TypeOf(map[nosql.BlobRef]struct{}(nil))
-var __VDLType_v_io_v23_services_syncbase_nosql_BlobRef *vdl.Type = vdl.TypeOf(nosql.BlobRef(""))
-var __VDLType_v_io_x_ref_services_syncbase_vsync_testdata_BlobAny *vdl.Type = vdl.TypeOf(BlobAny{})
-var __VDLType_v_io_x_ref_services_syncbase_vsync_testdata_BlobInfo *vdl.Type = vdl.TypeOf(BlobInfo{})
-var __VDLType_v_io_x_ref_services_syncbase_vsync_testdata_BlobOpt *vdl.Type = vdl.TypeOf(BlobOpt{})
-var __VDLType_v_io_x_ref_services_syncbase_vsync_testdata_BlobSet *vdl.Type = vdl.TypeOf(BlobSet{})
-var __VDLType_v_io_x_ref_services_syncbase_vsync_testdata_BlobUnion *vdl.Type = vdl.TypeOf(BlobUnion(BlobUnionNum{int32(0)}))
-var __VDLType_v_io_x_ref_services_syncbase_vsync_testdata_NonBlobSet *vdl.Type = vdl.TypeOf(NonBlobSet{})
-
-func __VDLEnsureNativeBuilt() {
+ return struct{}{}
}
diff --git a/services/syncbase/vsync/vsync.vdl.go b/services/syncbase/vsync/vsync.vdl.go
index 2e83118..beaed13 100644
--- a/services/syncbase/vsync/vsync.vdl.go
+++ b/services/syncbase/vsync/vsync.vdl.go
@@ -13,6 +13,11 @@
"v.io/x/ref/services/syncbase/server/interfaces"
)
+var _ = __VDLInit() // Must be first; see __VDLInit comments for details.
+
+//////////////////////////////////////////////////
+// Type definitions
+
// SyncData represents the persistent state of the sync module.
type SyncData struct {
Id uint64
@@ -24,9 +29,6 @@
}
func (m *SyncData) FillVDLTarget(t vdl.Target, tt *vdl.Type) error {
- if __VDLType_v_io_x_ref_services_syncbase_vsync_SyncData == nil || __VDLType0 == nil {
- panic("Initialization order error: types generated for FillVDLTarget not initialized. Consider moving caller to an init() block.")
- }
fieldsTarget1, err := t.StartFields(tt)
if err != nil {
return err
@@ -37,7 +39,7 @@
return err
}
if err != vdl.ErrFieldNoExist {
- if err := fieldTarget3.FromUint(uint64(m.Id), vdl.Uint64Type); err != nil {
+ if err := fieldTarget3.FromUint(uint64(m.Id), tt.NonOptional().Field(0).Type); err != nil {
return err
}
if err := fieldsTarget1.FinishField(keyTarget2, fieldTarget3); err != nil {
@@ -63,8 +65,8 @@
func (t *SyncDataTarget) StartFields(tt *vdl.Type) (vdl.FieldsTarget, error) {
- if !vdl.Compatible(tt, __VDLType_v_io_x_ref_services_syncbase_vsync_SyncData) {
- return nil, fmt.Errorf("type %v incompatible with %v", tt, __VDLType_v_io_x_ref_services_syncbase_vsync_SyncData)
+ if ttWant := vdl.TypeOf((*SyncData)(nil)).Elem(); !vdl.Compatible(tt, ttWant) {
+ return nil, fmt.Errorf("type %v incompatible with %v", tt, ttWant)
}
return t, nil
}
@@ -75,7 +77,7 @@
target, err := &t.idTarget, error(nil)
return nil, target, err
default:
- return nil, nil, fmt.Errorf("field %s not in struct %v", name, __VDLType_v_io_x_ref_services_syncbase_vsync_SyncData)
+ return nil, nil, fmt.Errorf("field %s not in struct v.io/x/ref/services/syncbase/vsync.SyncData", name)
}
}
func (t *SyncDataTarget) FinishField(_, _ vdl.Target) error {
@@ -99,9 +101,6 @@
}
func (m *DbSyncState) FillVDLTarget(t vdl.Target, tt *vdl.Type) error {
- if __VDLType_v_io_x_ref_services_syncbase_vsync_DbSyncState == nil || __VDLType1 == nil {
- panic("Initialization order error: types generated for FillVDLTarget not initialized. Consider moving caller to an init() block.")
- }
fieldsTarget1, err := t.StartFields(tt)
if err != nil {
return err
@@ -113,7 +112,7 @@
}
if err != vdl.ErrFieldNoExist {
- if err := m.GenVecs.FillVDLTarget(fieldTarget3, __VDLType_v_io_x_ref_services_syncbase_server_interfaces_Knowledge); err != nil {
+ if err := m.GenVecs.FillVDLTarget(fieldTarget3, tt.NonOptional().Field(0).Type); err != nil {
return err
}
if err := fieldsTarget1.FinishField(keyTarget2, fieldTarget3); err != nil {
@@ -126,7 +125,7 @@
}
if err != vdl.ErrFieldNoExist {
- if err := m.SgGenVecs.FillVDLTarget(fieldTarget5, __VDLType_v_io_x_ref_services_syncbase_server_interfaces_Knowledge); err != nil {
+ if err := m.SgGenVecs.FillVDLTarget(fieldTarget5, tt.NonOptional().Field(1).Type); err != nil {
return err
}
if err := fieldsTarget1.FinishField(keyTarget4, fieldTarget5); err != nil {
@@ -138,7 +137,7 @@
return err
}
if err != vdl.ErrFieldNoExist {
- if err := fieldTarget7.FromBool(bool(m.IsPaused), vdl.BoolType); err != nil {
+ if err := fieldTarget7.FromBool(bool(m.IsPaused), tt.NonOptional().Field(2).Type); err != nil {
return err
}
if err := fieldsTarget1.FinishField(keyTarget6, fieldTarget7); err != nil {
@@ -166,8 +165,8 @@
func (t *DbSyncStateTarget) StartFields(tt *vdl.Type) (vdl.FieldsTarget, error) {
- if !vdl.Compatible(tt, __VDLType_v_io_x_ref_services_syncbase_vsync_DbSyncState) {
- return nil, fmt.Errorf("type %v incompatible with %v", tt, __VDLType_v_io_x_ref_services_syncbase_vsync_DbSyncState)
+ if ttWant := vdl.TypeOf((*DbSyncState)(nil)).Elem(); !vdl.Compatible(tt, ttWant) {
+ return nil, fmt.Errorf("type %v incompatible with %v", tt, ttWant)
}
return t, nil
}
@@ -186,7 +185,7 @@
target, err := &t.isPausedTarget, error(nil)
return nil, target, err
default:
- return nil, nil, fmt.Errorf("field %s not in struct %v", name, __VDLType_v_io_x_ref_services_syncbase_vsync_DbSyncState)
+ return nil, nil, fmt.Errorf("field %s not in struct v.io/x/ref/services/syncbase/vsync.DbSyncState", name)
}
}
func (t *DbSyncStateTarget) FinishField(_, _ vdl.Target) error {
@@ -211,7 +210,6 @@
}
func (m *LocalLogRec) FillVDLTarget(t vdl.Target, tt *vdl.Type) error {
- __VDLEnsureNativeBuilt()
fieldsTarget1, err := t.StartFields(tt)
if err != nil {
return err
@@ -223,7 +221,7 @@
}
if err != vdl.ErrFieldNoExist {
- if err := m.Metadata.FillVDLTarget(fieldTarget3, __VDLType_v_io_x_ref_services_syncbase_server_interfaces_LogRecMetadata); err != nil {
+ if err := m.Metadata.FillVDLTarget(fieldTarget3, tt.NonOptional().Field(0).Type); err != nil {
return err
}
if err := fieldsTarget1.FinishField(keyTarget2, fieldTarget3); err != nil {
@@ -235,7 +233,7 @@
return err
}
if err != vdl.ErrFieldNoExist {
- if err := fieldTarget5.FromUint(uint64(m.Pos), vdl.Uint64Type); err != nil {
+ if err := fieldTarget5.FromUint(uint64(m.Pos), tt.NonOptional().Field(1).Type); err != nil {
return err
}
if err := fieldsTarget1.FinishField(keyTarget4, fieldTarget5); err != nil {
@@ -247,7 +245,7 @@
return err
}
if err != vdl.ErrFieldNoExist {
- if err := fieldTarget7.FromBool(bool(m.Shell), vdl.BoolType); err != nil {
+ if err := fieldTarget7.FromBool(bool(m.Shell), tt.NonOptional().Field(2).Type); err != nil {
return err
}
if err := fieldsTarget1.FinishField(keyTarget6, fieldTarget7); err != nil {
@@ -275,8 +273,8 @@
func (t *LocalLogRecTarget) StartFields(tt *vdl.Type) (vdl.FieldsTarget, error) {
- if !vdl.Compatible(tt, __VDLType_v_io_x_ref_services_syncbase_vsync_LocalLogRec) {
- return nil, fmt.Errorf("type %v incompatible with %v", tt, __VDLType_v_io_x_ref_services_syncbase_vsync_LocalLogRec)
+ if ttWant := vdl.TypeOf((*LocalLogRec)(nil)).Elem(); !vdl.Compatible(tt, ttWant) {
+ return nil, fmt.Errorf("type %v incompatible with %v", tt, ttWant)
}
return t, nil
}
@@ -295,7 +293,7 @@
target, err := &t.shellTarget, error(nil)
return nil, target, err
default:
- return nil, nil, fmt.Errorf("field %s not in struct %v", name, __VDLType_v_io_x_ref_services_syncbase_vsync_LocalLogRec)
+ return nil, nil, fmt.Errorf("field %s not in struct v.io/x/ref/services/syncbase/vsync.LocalLogRec", name)
}
}
func (t *LocalLogRecTarget) FinishField(_, _ vdl.Target) error {
@@ -350,9 +348,6 @@
}
func (m *SgLocalState) FillVDLTarget(t vdl.Target, tt *vdl.Type) error {
- if __VDLType_v_io_x_ref_services_syncbase_vsync_SgLocalState == nil || __VDLType3 == nil {
- panic("Initialization order error: types generated for FillVDLTarget not initialized. Consider moving caller to an init() block.")
- }
fieldsTarget1, err := t.StartFields(tt)
if err != nil {
return err
@@ -363,7 +358,7 @@
return err
}
if err != vdl.ErrFieldNoExist {
- if err := fieldTarget3.FromUint(uint64(m.NumLocalJoiners), vdl.Uint32Type); err != nil {
+ if err := fieldTarget3.FromUint(uint64(m.NumLocalJoiners), tt.NonOptional().Field(0).Type); err != nil {
return err
}
if err := fieldsTarget1.FinishField(keyTarget2, fieldTarget3); err != nil {
@@ -375,7 +370,7 @@
return err
}
if err != vdl.ErrFieldNoExist {
- if err := fieldTarget5.FromBool(bool(m.Watched), vdl.BoolType); err != nil {
+ if err := fieldTarget5.FromBool(bool(m.Watched), tt.NonOptional().Field(1).Type); err != nil {
return err
}
if err := fieldsTarget1.FinishField(keyTarget4, fieldTarget5); err != nil {
@@ -387,7 +382,7 @@
return err
}
if err != vdl.ErrFieldNoExist {
- if err := fieldTarget7.FromString(string(m.RemotePublisher), vdl.StringType); err != nil {
+ if err := fieldTarget7.FromString(string(m.RemotePublisher), tt.NonOptional().Field(2).Type); err != nil {
return err
}
if err := fieldsTarget1.FinishField(keyTarget6, fieldTarget7); err != nil {
@@ -399,7 +394,7 @@
return err
}
if err != vdl.ErrFieldNoExist {
- if err := fieldTarget9.FromBool(bool(m.SyncPending), vdl.BoolType); err != nil {
+ if err := fieldTarget9.FromBool(bool(m.SyncPending), tt.NonOptional().Field(3).Type); err != nil {
return err
}
if err := fieldsTarget1.FinishField(keyTarget8, fieldTarget9); err != nil {
@@ -412,7 +407,7 @@
}
if err != vdl.ErrFieldNoExist {
- if err := m.PendingGenVec.FillVDLTarget(fieldTarget11, __VDLType_v_io_x_ref_services_syncbase_server_interfaces_GenVector); err != nil {
+ if err := m.PendingGenVec.FillVDLTarget(fieldTarget11, tt.NonOptional().Field(4).Type); err != nil {
return err
}
if err := fieldsTarget1.FinishField(keyTarget10, fieldTarget11); err != nil {
@@ -442,8 +437,8 @@
func (t *SgLocalStateTarget) StartFields(tt *vdl.Type) (vdl.FieldsTarget, error) {
- if !vdl.Compatible(tt, __VDLType_v_io_x_ref_services_syncbase_vsync_SgLocalState) {
- return nil, fmt.Errorf("type %v incompatible with %v", tt, __VDLType_v_io_x_ref_services_syncbase_vsync_SgLocalState)
+ if ttWant := vdl.TypeOf((*SgLocalState)(nil)).Elem(); !vdl.Compatible(tt, ttWant) {
+ return nil, fmt.Errorf("type %v incompatible with %v", tt, ttWant)
}
return t, nil
}
@@ -470,7 +465,7 @@
target, err := &t.pendingGenVecTarget, error(nil)
return nil, target, err
default:
- return nil, nil, fmt.Errorf("field %s not in struct %v", name, __VDLType_v_io_x_ref_services_syncbase_vsync_SgLocalState)
+ return nil, nil, fmt.Errorf("field %s not in struct v.io/x/ref/services/syncbase/vsync.SgLocalState", name)
}
}
func (t *SgLocalStateTarget) FinishField(_, _ vdl.Target) error {
@@ -502,9 +497,6 @@
}
func (m *DagNode) FillVDLTarget(t vdl.Target, tt *vdl.Type) error {
- if __VDLType_v_io_x_ref_services_syncbase_vsync_DagNode == nil || __VDLType4 == nil {
- panic("Initialization order error: types generated for FillVDLTarget not initialized. Consider moving caller to an init() block.")
- }
fieldsTarget1, err := t.StartFields(tt)
if err != nil {
return err
@@ -515,7 +507,7 @@
return err
}
if err != vdl.ErrFieldNoExist {
- if err := fieldTarget3.FromUint(uint64(m.Level), vdl.Uint64Type); err != nil {
+ if err := fieldTarget3.FromUint(uint64(m.Level), tt.NonOptional().Field(0).Type); err != nil {
return err
}
if err := fieldsTarget1.FinishField(keyTarget2, fieldTarget3); err != nil {
@@ -528,7 +520,7 @@
}
if err != vdl.ErrFieldNoExist {
- listTarget6, err := fieldTarget5.StartList(__VDLType5, len(m.Parents))
+ listTarget6, err := fieldTarget5.StartList(tt.NonOptional().Field(1).Type, len(m.Parents))
if err != nil {
return err
}
@@ -537,7 +529,7 @@
if err != nil {
return err
}
- if err := elemTarget7.FromString(string(elem8), vdl.StringType); err != nil {
+ if err := elemTarget7.FromString(string(elem8), tt.NonOptional().Field(1).Type.Elem()); err != nil {
return err
}
if err := listTarget6.FinishElem(elemTarget7); err != nil {
@@ -556,7 +548,7 @@
return err
}
if err != vdl.ErrFieldNoExist {
- if err := fieldTarget10.FromString(string(m.Logrec), vdl.StringType); err != nil {
+ if err := fieldTarget10.FromString(string(m.Logrec), tt.NonOptional().Field(2).Type); err != nil {
return err
}
if err := fieldsTarget1.FinishField(keyTarget9, fieldTarget10); err != nil {
@@ -568,7 +560,7 @@
return err
}
if err != vdl.ErrFieldNoExist {
- if err := fieldTarget12.FromUint(uint64(m.BatchId), vdl.Uint64Type); err != nil {
+ if err := fieldTarget12.FromUint(uint64(m.BatchId), tt.NonOptional().Field(3).Type); err != nil {
return err
}
if err := fieldsTarget1.FinishField(keyTarget11, fieldTarget12); err != nil {
@@ -580,7 +572,7 @@
return err
}
if err != vdl.ErrFieldNoExist {
- if err := fieldTarget14.FromBool(bool(m.Shell), vdl.BoolType); err != nil {
+ if err := fieldTarget14.FromBool(bool(m.Shell), tt.NonOptional().Field(4).Type); err != nil {
return err
}
if err := fieldsTarget1.FinishField(keyTarget13, fieldTarget14); err != nil {
@@ -592,7 +584,7 @@
return err
}
if err != vdl.ErrFieldNoExist {
- if err := fieldTarget16.FromBool(bool(m.Deleted), vdl.BoolType); err != nil {
+ if err := fieldTarget16.FromBool(bool(m.Deleted), tt.NonOptional().Field(5).Type); err != nil {
return err
}
if err := fieldsTarget1.FinishField(keyTarget15, fieldTarget16); err != nil {
@@ -604,7 +596,7 @@
return err
}
if err != vdl.ErrFieldNoExist {
- if err := fieldTarget18.FromString(string(m.PermId), vdl.StringType); err != nil {
+ if err := fieldTarget18.FromString(string(m.PermId), tt.NonOptional().Field(6).Type); err != nil {
return err
}
if err := fieldsTarget1.FinishField(keyTarget17, fieldTarget18); err != nil {
@@ -616,7 +608,7 @@
return err
}
if err != vdl.ErrFieldNoExist {
- if err := fieldTarget20.FromString(string(m.PermVers), vdl.StringType); err != nil {
+ if err := fieldTarget20.FromString(string(m.PermVers), tt.NonOptional().Field(7).Type); err != nil {
return err
}
if err := fieldsTarget1.FinishField(keyTarget19, fieldTarget20); err != nil {
@@ -649,8 +641,8 @@
func (t *DagNodeTarget) StartFields(tt *vdl.Type) (vdl.FieldsTarget, error) {
- if !vdl.Compatible(tt, __VDLType_v_io_x_ref_services_syncbase_vsync_DagNode) {
- return nil, fmt.Errorf("type %v incompatible with %v", tt, __VDLType_v_io_x_ref_services_syncbase_vsync_DagNode)
+ if ttWant := vdl.TypeOf((*DagNode)(nil)).Elem(); !vdl.Compatible(tt, ttWant) {
+ return nil, fmt.Errorf("type %v incompatible with %v", tt, ttWant)
}
return t, nil
}
@@ -689,7 +681,7 @@
target, err := &t.permVersTarget, error(nil)
return nil, target, err
default:
- return nil, nil, fmt.Errorf("field %s not in struct %v", name, __VDLType_v_io_x_ref_services_syncbase_vsync_DagNode)
+ return nil, nil, fmt.Errorf("field %s not in struct v.io/x/ref/services/syncbase/vsync.DagNode", name)
}
}
func (t *DagNodeTarget) FinishField(_, _ vdl.Target) error {
@@ -723,9 +715,6 @@
}
func (m *BatchInfo) FillVDLTarget(t vdl.Target, tt *vdl.Type) error {
- if __VDLType_v_io_x_ref_services_syncbase_vsync_BatchInfo == nil || __VDLType6 == nil {
- panic("Initialization order error: types generated for FillVDLTarget not initialized. Consider moving caller to an init() block.")
- }
fieldsTarget1, err := t.StartFields(tt)
if err != nil {
return err
@@ -737,7 +726,7 @@
}
if err != vdl.ErrFieldNoExist {
- mapTarget4, err := fieldTarget3.StartMap(__VDLType7, len(m.Objects))
+ mapTarget4, err := fieldTarget3.StartMap(tt.NonOptional().Field(0).Type, len(m.Objects))
if err != nil {
return err
}
@@ -746,14 +735,14 @@
if err != nil {
return err
}
- if err := keyTarget5.FromString(string(key6), vdl.StringType); err != nil {
+ if err := keyTarget5.FromString(string(key6), tt.NonOptional().Field(0).Type.Key()); err != nil {
return err
}
valueTarget7, err := mapTarget4.FinishKeyStartField(keyTarget5)
if err != nil {
return err
}
- if err := valueTarget7.FromString(string(value8), vdl.StringType); err != nil {
+ if err := valueTarget7.FromString(string(value8), tt.NonOptional().Field(0).Type.Elem()); err != nil {
return err
}
if err := mapTarget4.FinishField(keyTarget5, valueTarget7); err != nil {
@@ -773,7 +762,7 @@
}
if err != vdl.ErrFieldNoExist {
- mapTarget11, err := fieldTarget10.StartMap(__VDLType7, len(m.LinkedObjects))
+ mapTarget11, err := fieldTarget10.StartMap(tt.NonOptional().Field(1).Type, len(m.LinkedObjects))
if err != nil {
return err
}
@@ -782,14 +771,14 @@
if err != nil {
return err
}
- if err := keyTarget12.FromString(string(key13), vdl.StringType); err != nil {
+ if err := keyTarget12.FromString(string(key13), tt.NonOptional().Field(1).Type.Key()); err != nil {
return err
}
valueTarget14, err := mapTarget11.FinishKeyStartField(keyTarget12)
if err != nil {
return err
}
- if err := valueTarget14.FromString(string(value15), vdl.StringType); err != nil {
+ if err := valueTarget14.FromString(string(value15), tt.NonOptional().Field(1).Type.Elem()); err != nil {
return err
}
if err := mapTarget11.FinishField(keyTarget12, valueTarget14); err != nil {
@@ -808,7 +797,7 @@
return err
}
if err != vdl.ErrFieldNoExist {
- if err := fieldTarget17.FromUint(uint64(m.Count), vdl.Uint64Type); err != nil {
+ if err := fieldTarget17.FromUint(uint64(m.Count), tt.NonOptional().Field(2).Type); err != nil {
return err
}
if err := fieldsTarget1.FinishField(keyTarget16, fieldTarget17); err != nil {
@@ -836,8 +825,8 @@
func (t *BatchInfoTarget) StartFields(tt *vdl.Type) (vdl.FieldsTarget, error) {
- if !vdl.Compatible(tt, __VDLType_v_io_x_ref_services_syncbase_vsync_BatchInfo) {
- return nil, fmt.Errorf("type %v incompatible with %v", tt, __VDLType_v_io_x_ref_services_syncbase_vsync_BatchInfo)
+ if ttWant := vdl.TypeOf((*BatchInfo)(nil)).Elem(); !vdl.Compatible(tt, ttWant) {
+ return nil, fmt.Errorf("type %v incompatible with %v", tt, ttWant)
}
return t, nil
}
@@ -856,7 +845,7 @@
target, err := &t.countTarget, error(nil)
return nil, target, err
default:
- return nil, nil, fmt.Errorf("field %s not in struct %v", name, __VDLType_v_io_x_ref_services_syncbase_vsync_BatchInfo)
+ return nil, nil, fmt.Errorf("field %s not in struct v.io/x/ref/services/syncbase/vsync.BatchInfo", name)
}
}
func (t *BatchInfoTarget) FinishField(_, _ vdl.Target) error {
@@ -880,8 +869,8 @@
func (t *unnamed_6d61705b737472696e675d737472696e67Target) StartMap(tt *vdl.Type, len int) (vdl.MapTarget, error) {
- if !vdl.Compatible(tt, __VDLType7) {
- return nil, fmt.Errorf("type %v incompatible with %v", tt, __VDLType7)
+ if ttWant := vdl.TypeOf((*map[string]string)(nil)); !vdl.Compatible(tt, ttWant) {
+ return nil, fmt.Errorf("type %v incompatible with %v", tt, ttWant)
}
*t.Value = make(map[string]string)
return t, nil
@@ -910,176 +899,33 @@
return nil
}
-func init() {
+var __VDLInitCalled bool
+
+// __VDLInit performs vdl initialization. It is safe to call multiple times.
+// If you have an init ordering issue, just insert the following line verbatim
+// into your source files in this package, right after the "package foo" clause:
+//
+// var _ = __VDLInit()
+//
+// The purpose of this function is to ensure that vdl initialization occurs in
+// the right order, and very early in the init sequence. In particular, vdl
+// registration and package variable initialization needs to occur before
+// functions like vdl.TypeOf will work properly.
+//
+// This function returns a dummy value, so that it can be used to initialize the
+// first var in the file, to take advantage of Go's defined init order.
+func __VDLInit() struct{} {
+ if __VDLInitCalled {
+ return struct{}{}
+ }
+
+ // Register types.
vdl.Register((*SyncData)(nil))
vdl.Register((*DbSyncState)(nil))
vdl.Register((*LocalLogRec)(nil))
vdl.Register((*SgLocalState)(nil))
vdl.Register((*DagNode)(nil))
vdl.Register((*BatchInfo)(nil))
-}
-var __VDLType6 *vdl.Type = vdl.TypeOf((*BatchInfo)(nil))
-var __VDLType4 *vdl.Type = vdl.TypeOf((*DagNode)(nil))
-var __VDLType1 *vdl.Type = vdl.TypeOf((*DbSyncState)(nil))
-var __VDLType2 *vdl.Type
-
-func __VDLType2_gen() *vdl.Type {
- __VDLType2Builder := vdl.TypeBuilder{}
-
- __VDLType21 := __VDLType2Builder.Optional()
- __VDLType22 := __VDLType2Builder.Struct()
- __VDLType23 := __VDLType2Builder.Named("v.io/x/ref/services/syncbase/vsync.LocalLogRec").AssignBase(__VDLType22)
- __VDLType24 := __VDLType2Builder.Struct()
- __VDLType25 := __VDLType2Builder.Named("v.io/x/ref/services/syncbase/server/interfaces.LogRecMetadata").AssignBase(__VDLType24)
- __VDLType26 := vdl.Uint64Type
- __VDLType24.AppendField("Id", __VDLType26)
- __VDLType24.AppendField("Gen", __VDLType26)
- __VDLType27 := vdl.ByteType
- __VDLType24.AppendField("RecType", __VDLType27)
- __VDLType28 := vdl.StringType
- __VDLType24.AppendField("ObjId", __VDLType28)
- __VDLType24.AppendField("CurVers", __VDLType28)
- __VDLType29 := __VDLType2Builder.List()
- __VDLType29.AssignElem(__VDLType28)
- __VDLType24.AppendField("Parents", __VDLType29)
- __VDLType210 := __VDLType2Builder.Struct()
- __VDLType211 := __VDLType2Builder.Named("time.Time").AssignBase(__VDLType210)
- __VDLType212 := vdl.Int64Type
- __VDLType210.AppendField("Seconds", __VDLType212)
- __VDLType213 := vdl.Int32Type
- __VDLType210.AppendField("Nanos", __VDLType213)
- __VDLType24.AppendField("UpdTime", __VDLType211)
- __VDLType24.AppendField("PermId", __VDLType28)
- __VDLType24.AppendField("PermVers", __VDLType28)
- __VDLType214 := vdl.BoolType
- __VDLType24.AppendField("Delete", __VDLType214)
- __VDLType24.AppendField("BatchId", __VDLType26)
- __VDLType24.AppendField("BatchCount", __VDLType26)
- __VDLType22.AppendField("Metadata", __VDLType25)
- __VDLType22.AppendField("Pos", __VDLType26)
- __VDLType22.AppendField("Shell", __VDLType214)
- __VDLType21.AssignElem(__VDLType23)
- __VDLType2Builder.Build()
- __VDLType2v, err := __VDLType21.Built()
- if err != nil {
- panic(err)
- }
- return __VDLType2v
-}
-func init() {
- __VDLType2 = __VDLType2_gen()
-}
-
-var __VDLType3 *vdl.Type = vdl.TypeOf((*SgLocalState)(nil))
-var __VDLType0 *vdl.Type = vdl.TypeOf((*SyncData)(nil))
-var __VDLType5 *vdl.Type = vdl.TypeOf([]string(nil))
-var __VDLType7 *vdl.Type = vdl.TypeOf(map[string]string(nil))
-var __VDLType_v_io_x_ref_services_syncbase_server_interfaces_GenVector *vdl.Type = vdl.TypeOf(interfaces.GenVector(nil))
-var __VDLType_v_io_x_ref_services_syncbase_server_interfaces_Knowledge *vdl.Type = vdl.TypeOf(interfaces.Knowledge(nil))
-var __VDLType_v_io_x_ref_services_syncbase_server_interfaces_LogRecMetadata *vdl.Type
-
-func __VDLType_v_io_x_ref_services_syncbase_server_interfaces_LogRecMetadata_gen() *vdl.Type {
- __VDLType_v_io_x_ref_services_syncbase_server_interfaces_LogRecMetadataBuilder := vdl.TypeBuilder{}
-
- __VDLType_v_io_x_ref_services_syncbase_server_interfaces_LogRecMetadata1 := __VDLType_v_io_x_ref_services_syncbase_server_interfaces_LogRecMetadataBuilder.Struct()
- __VDLType_v_io_x_ref_services_syncbase_server_interfaces_LogRecMetadata2 := __VDLType_v_io_x_ref_services_syncbase_server_interfaces_LogRecMetadataBuilder.Named("v.io/x/ref/services/syncbase/server/interfaces.LogRecMetadata").AssignBase(__VDLType_v_io_x_ref_services_syncbase_server_interfaces_LogRecMetadata1)
- __VDLType_v_io_x_ref_services_syncbase_server_interfaces_LogRecMetadata3 := vdl.Uint64Type
- __VDLType_v_io_x_ref_services_syncbase_server_interfaces_LogRecMetadata1.AppendField("Id", __VDLType_v_io_x_ref_services_syncbase_server_interfaces_LogRecMetadata3)
- __VDLType_v_io_x_ref_services_syncbase_server_interfaces_LogRecMetadata1.AppendField("Gen", __VDLType_v_io_x_ref_services_syncbase_server_interfaces_LogRecMetadata3)
- __VDLType_v_io_x_ref_services_syncbase_server_interfaces_LogRecMetadata4 := vdl.ByteType
- __VDLType_v_io_x_ref_services_syncbase_server_interfaces_LogRecMetadata1.AppendField("RecType", __VDLType_v_io_x_ref_services_syncbase_server_interfaces_LogRecMetadata4)
- __VDLType_v_io_x_ref_services_syncbase_server_interfaces_LogRecMetadata5 := vdl.StringType
- __VDLType_v_io_x_ref_services_syncbase_server_interfaces_LogRecMetadata1.AppendField("ObjId", __VDLType_v_io_x_ref_services_syncbase_server_interfaces_LogRecMetadata5)
- __VDLType_v_io_x_ref_services_syncbase_server_interfaces_LogRecMetadata1.AppendField("CurVers", __VDLType_v_io_x_ref_services_syncbase_server_interfaces_LogRecMetadata5)
- __VDLType_v_io_x_ref_services_syncbase_server_interfaces_LogRecMetadata6 := __VDLType_v_io_x_ref_services_syncbase_server_interfaces_LogRecMetadataBuilder.List()
- __VDLType_v_io_x_ref_services_syncbase_server_interfaces_LogRecMetadata6.AssignElem(__VDLType_v_io_x_ref_services_syncbase_server_interfaces_LogRecMetadata5)
- __VDLType_v_io_x_ref_services_syncbase_server_interfaces_LogRecMetadata1.AppendField("Parents", __VDLType_v_io_x_ref_services_syncbase_server_interfaces_LogRecMetadata6)
- __VDLType_v_io_x_ref_services_syncbase_server_interfaces_LogRecMetadata7 := __VDLType_v_io_x_ref_services_syncbase_server_interfaces_LogRecMetadataBuilder.Struct()
- __VDLType_v_io_x_ref_services_syncbase_server_interfaces_LogRecMetadata8 := __VDLType_v_io_x_ref_services_syncbase_server_interfaces_LogRecMetadataBuilder.Named("time.Time").AssignBase(__VDLType_v_io_x_ref_services_syncbase_server_interfaces_LogRecMetadata7)
- __VDLType_v_io_x_ref_services_syncbase_server_interfaces_LogRecMetadata9 := vdl.Int64Type
- __VDLType_v_io_x_ref_services_syncbase_server_interfaces_LogRecMetadata7.AppendField("Seconds", __VDLType_v_io_x_ref_services_syncbase_server_interfaces_LogRecMetadata9)
- __VDLType_v_io_x_ref_services_syncbase_server_interfaces_LogRecMetadata10 := vdl.Int32Type
- __VDLType_v_io_x_ref_services_syncbase_server_interfaces_LogRecMetadata7.AppendField("Nanos", __VDLType_v_io_x_ref_services_syncbase_server_interfaces_LogRecMetadata10)
- __VDLType_v_io_x_ref_services_syncbase_server_interfaces_LogRecMetadata1.AppendField("UpdTime", __VDLType_v_io_x_ref_services_syncbase_server_interfaces_LogRecMetadata8)
- __VDLType_v_io_x_ref_services_syncbase_server_interfaces_LogRecMetadata1.AppendField("PermId", __VDLType_v_io_x_ref_services_syncbase_server_interfaces_LogRecMetadata5)
- __VDLType_v_io_x_ref_services_syncbase_server_interfaces_LogRecMetadata1.AppendField("PermVers", __VDLType_v_io_x_ref_services_syncbase_server_interfaces_LogRecMetadata5)
- __VDLType_v_io_x_ref_services_syncbase_server_interfaces_LogRecMetadata11 := vdl.BoolType
- __VDLType_v_io_x_ref_services_syncbase_server_interfaces_LogRecMetadata1.AppendField("Delete", __VDLType_v_io_x_ref_services_syncbase_server_interfaces_LogRecMetadata11)
- __VDLType_v_io_x_ref_services_syncbase_server_interfaces_LogRecMetadata1.AppendField("BatchId", __VDLType_v_io_x_ref_services_syncbase_server_interfaces_LogRecMetadata3)
- __VDLType_v_io_x_ref_services_syncbase_server_interfaces_LogRecMetadata1.AppendField("BatchCount", __VDLType_v_io_x_ref_services_syncbase_server_interfaces_LogRecMetadata3)
- __VDLType_v_io_x_ref_services_syncbase_server_interfaces_LogRecMetadataBuilder.Build()
- __VDLType_v_io_x_ref_services_syncbase_server_interfaces_LogRecMetadatav, err := __VDLType_v_io_x_ref_services_syncbase_server_interfaces_LogRecMetadata2.Built()
- if err != nil {
- panic(err)
- }
- return __VDLType_v_io_x_ref_services_syncbase_server_interfaces_LogRecMetadatav
-}
-func init() {
- __VDLType_v_io_x_ref_services_syncbase_server_interfaces_LogRecMetadata = __VDLType_v_io_x_ref_services_syncbase_server_interfaces_LogRecMetadata_gen()
-}
-
-var __VDLType_v_io_x_ref_services_syncbase_vsync_BatchInfo *vdl.Type = vdl.TypeOf(BatchInfo{})
-var __VDLType_v_io_x_ref_services_syncbase_vsync_DagNode *vdl.Type = vdl.TypeOf(DagNode{})
-var __VDLType_v_io_x_ref_services_syncbase_vsync_DbSyncState *vdl.Type = vdl.TypeOf(DbSyncState{})
-var __VDLType_v_io_x_ref_services_syncbase_vsync_LocalLogRec *vdl.Type
-
-func __VDLType_v_io_x_ref_services_syncbase_vsync_LocalLogRec_gen() *vdl.Type {
- __VDLType_v_io_x_ref_services_syncbase_vsync_LocalLogRecBuilder := vdl.TypeBuilder{}
-
- __VDLType_v_io_x_ref_services_syncbase_vsync_LocalLogRec1 := __VDLType_v_io_x_ref_services_syncbase_vsync_LocalLogRecBuilder.Struct()
- __VDLType_v_io_x_ref_services_syncbase_vsync_LocalLogRec2 := __VDLType_v_io_x_ref_services_syncbase_vsync_LocalLogRecBuilder.Named("v.io/x/ref/services/syncbase/vsync.LocalLogRec").AssignBase(__VDLType_v_io_x_ref_services_syncbase_vsync_LocalLogRec1)
- __VDLType_v_io_x_ref_services_syncbase_vsync_LocalLogRec3 := __VDLType_v_io_x_ref_services_syncbase_vsync_LocalLogRecBuilder.Struct()
- __VDLType_v_io_x_ref_services_syncbase_vsync_LocalLogRec4 := __VDLType_v_io_x_ref_services_syncbase_vsync_LocalLogRecBuilder.Named("v.io/x/ref/services/syncbase/server/interfaces.LogRecMetadata").AssignBase(__VDLType_v_io_x_ref_services_syncbase_vsync_LocalLogRec3)
- __VDLType_v_io_x_ref_services_syncbase_vsync_LocalLogRec5 := vdl.Uint64Type
- __VDLType_v_io_x_ref_services_syncbase_vsync_LocalLogRec3.AppendField("Id", __VDLType_v_io_x_ref_services_syncbase_vsync_LocalLogRec5)
- __VDLType_v_io_x_ref_services_syncbase_vsync_LocalLogRec3.AppendField("Gen", __VDLType_v_io_x_ref_services_syncbase_vsync_LocalLogRec5)
- __VDLType_v_io_x_ref_services_syncbase_vsync_LocalLogRec6 := vdl.ByteType
- __VDLType_v_io_x_ref_services_syncbase_vsync_LocalLogRec3.AppendField("RecType", __VDLType_v_io_x_ref_services_syncbase_vsync_LocalLogRec6)
- __VDLType_v_io_x_ref_services_syncbase_vsync_LocalLogRec7 := vdl.StringType
- __VDLType_v_io_x_ref_services_syncbase_vsync_LocalLogRec3.AppendField("ObjId", __VDLType_v_io_x_ref_services_syncbase_vsync_LocalLogRec7)
- __VDLType_v_io_x_ref_services_syncbase_vsync_LocalLogRec3.AppendField("CurVers", __VDLType_v_io_x_ref_services_syncbase_vsync_LocalLogRec7)
- __VDLType_v_io_x_ref_services_syncbase_vsync_LocalLogRec8 := __VDLType_v_io_x_ref_services_syncbase_vsync_LocalLogRecBuilder.List()
- __VDLType_v_io_x_ref_services_syncbase_vsync_LocalLogRec8.AssignElem(__VDLType_v_io_x_ref_services_syncbase_vsync_LocalLogRec7)
- __VDLType_v_io_x_ref_services_syncbase_vsync_LocalLogRec3.AppendField("Parents", __VDLType_v_io_x_ref_services_syncbase_vsync_LocalLogRec8)
- __VDLType_v_io_x_ref_services_syncbase_vsync_LocalLogRec9 := __VDLType_v_io_x_ref_services_syncbase_vsync_LocalLogRecBuilder.Struct()
- __VDLType_v_io_x_ref_services_syncbase_vsync_LocalLogRec10 := __VDLType_v_io_x_ref_services_syncbase_vsync_LocalLogRecBuilder.Named("time.Time").AssignBase(__VDLType_v_io_x_ref_services_syncbase_vsync_LocalLogRec9)
- __VDLType_v_io_x_ref_services_syncbase_vsync_LocalLogRec11 := vdl.Int64Type
- __VDLType_v_io_x_ref_services_syncbase_vsync_LocalLogRec9.AppendField("Seconds", __VDLType_v_io_x_ref_services_syncbase_vsync_LocalLogRec11)
- __VDLType_v_io_x_ref_services_syncbase_vsync_LocalLogRec12 := vdl.Int32Type
- __VDLType_v_io_x_ref_services_syncbase_vsync_LocalLogRec9.AppendField("Nanos", __VDLType_v_io_x_ref_services_syncbase_vsync_LocalLogRec12)
- __VDLType_v_io_x_ref_services_syncbase_vsync_LocalLogRec3.AppendField("UpdTime", __VDLType_v_io_x_ref_services_syncbase_vsync_LocalLogRec10)
- __VDLType_v_io_x_ref_services_syncbase_vsync_LocalLogRec3.AppendField("PermId", __VDLType_v_io_x_ref_services_syncbase_vsync_LocalLogRec7)
- __VDLType_v_io_x_ref_services_syncbase_vsync_LocalLogRec3.AppendField("PermVers", __VDLType_v_io_x_ref_services_syncbase_vsync_LocalLogRec7)
- __VDLType_v_io_x_ref_services_syncbase_vsync_LocalLogRec13 := vdl.BoolType
- __VDLType_v_io_x_ref_services_syncbase_vsync_LocalLogRec3.AppendField("Delete", __VDLType_v_io_x_ref_services_syncbase_vsync_LocalLogRec13)
- __VDLType_v_io_x_ref_services_syncbase_vsync_LocalLogRec3.AppendField("BatchId", __VDLType_v_io_x_ref_services_syncbase_vsync_LocalLogRec5)
- __VDLType_v_io_x_ref_services_syncbase_vsync_LocalLogRec3.AppendField("BatchCount", __VDLType_v_io_x_ref_services_syncbase_vsync_LocalLogRec5)
- __VDLType_v_io_x_ref_services_syncbase_vsync_LocalLogRec1.AppendField("Metadata", __VDLType_v_io_x_ref_services_syncbase_vsync_LocalLogRec4)
- __VDLType_v_io_x_ref_services_syncbase_vsync_LocalLogRec1.AppendField("Pos", __VDLType_v_io_x_ref_services_syncbase_vsync_LocalLogRec5)
- __VDLType_v_io_x_ref_services_syncbase_vsync_LocalLogRec1.AppendField("Shell", __VDLType_v_io_x_ref_services_syncbase_vsync_LocalLogRec13)
- __VDLType_v_io_x_ref_services_syncbase_vsync_LocalLogRecBuilder.Build()
- __VDLType_v_io_x_ref_services_syncbase_vsync_LocalLogRecv, err := __VDLType_v_io_x_ref_services_syncbase_vsync_LocalLogRec2.Built()
- if err != nil {
- panic(err)
- }
- return __VDLType_v_io_x_ref_services_syncbase_vsync_LocalLogRecv
-}
-func init() {
- __VDLType_v_io_x_ref_services_syncbase_vsync_LocalLogRec = __VDLType_v_io_x_ref_services_syncbase_vsync_LocalLogRec_gen()
-}
-
-var __VDLType_v_io_x_ref_services_syncbase_vsync_SgLocalState *vdl.Type = vdl.TypeOf(SgLocalState{})
-var __VDLType_v_io_x_ref_services_syncbase_vsync_SyncData *vdl.Type = vdl.TypeOf(SyncData{})
-
-func __VDLEnsureNativeBuilt() {
- if __VDLType2 == nil {
- __VDLType2 = __VDLType2_gen()
- }
- if __VDLType_v_io_x_ref_services_syncbase_server_interfaces_LogRecMetadata == nil {
- __VDLType_v_io_x_ref_services_syncbase_server_interfaces_LogRecMetadata = __VDLType_v_io_x_ref_services_syncbase_server_interfaces_LogRecMetadata_gen()
- }
- if __VDLType_v_io_x_ref_services_syncbase_vsync_LocalLogRec == nil {
- __VDLType_v_io_x_ref_services_syncbase_vsync_LocalLogRec = __VDLType_v_io_x_ref_services_syncbase_vsync_LocalLogRec_gen()
- }
+ return struct{}{}
}
diff --git a/services/wspr/internal/account/account.vdl.go b/services/wspr/internal/account/account.vdl.go
index ab5d2de..8b8f89c 100644
--- a/services/wspr/internal/account/account.vdl.go
+++ b/services/wspr/internal/account/account.vdl.go
@@ -12,6 +12,11 @@
"v.io/v23/vdl"
)
+var _ = __VDLInit() // Must be first; see __VDLInit comments for details.
+
+//////////////////////////////////////////////////
+// Type definitions
+
// Caveat describes a restriction on the validity of a blessing/discharge.
// TODO Remove this
type Caveat struct {
@@ -25,9 +30,6 @@
}
func (m *Caveat) FillVDLTarget(t vdl.Target, tt *vdl.Type) error {
- if __VDLType_v_io_x_ref_services_wspr_internal_account_Caveat == nil || __VDLType0 == nil {
- panic("Initialization order error: types generated for FillVDLTarget not initialized. Consider moving caller to an init() block.")
- }
fieldsTarget1, err := t.StartFields(tt)
if err != nil {
return err
@@ -38,7 +40,7 @@
return err
}
if err != vdl.ErrFieldNoExist {
- if err := fieldTarget3.FromString(string(m.Type), vdl.StringType); err != nil {
+ if err := fieldTarget3.FromString(string(m.Type), tt.NonOptional().Field(0).Type); err != nil {
return err
}
if err := fieldsTarget1.FinishField(keyTarget2, fieldTarget3); err != nil {
@@ -50,7 +52,7 @@
return err
}
if err != vdl.ErrFieldNoExist {
- if err := fieldTarget5.FromString(string(m.Args), vdl.StringType); err != nil {
+ if err := fieldTarget5.FromString(string(m.Args), tt.NonOptional().Field(1).Type); err != nil {
return err
}
if err := fieldsTarget1.FinishField(keyTarget4, fieldTarget5); err != nil {
@@ -77,8 +79,8 @@
func (t *CaveatTarget) StartFields(tt *vdl.Type) (vdl.FieldsTarget, error) {
- if !vdl.Compatible(tt, __VDLType_v_io_x_ref_services_wspr_internal_account_Caveat) {
- return nil, fmt.Errorf("type %v incompatible with %v", tt, __VDLType_v_io_x_ref_services_wspr_internal_account_Caveat)
+ if ttWant := vdl.TypeOf((*Caveat)(nil)).Elem(); !vdl.Compatible(tt, ttWant) {
+ return nil, fmt.Errorf("type %v incompatible with %v", tt, ttWant)
}
return t, nil
}
@@ -93,7 +95,7 @@
target, err := &t.argsTarget, error(nil)
return nil, target, err
default:
- return nil, nil, fmt.Errorf("field %s not in struct %v", name, __VDLType_v_io_x_ref_services_wspr_internal_account_Caveat)
+ return nil, nil, fmt.Errorf("field %s not in struct v.io/x/ref/services/wspr/internal/account.Caveat", name)
}
}
func (t *CaveatTarget) FinishField(_, _ vdl.Target) error {
@@ -104,12 +106,28 @@
return nil
}
-func init() {
+var __VDLInitCalled bool
+
+// __VDLInit performs vdl initialization. It is safe to call multiple times.
+// If you have an init ordering issue, just insert the following line verbatim
+// into your source files in this package, right after the "package foo" clause:
+//
+// var _ = __VDLInit()
+//
+// The purpose of this function is to ensure that vdl initialization occurs in
+// the right order, and very early in the init sequence. In particular, vdl
+// registration and package variable initialization needs to occur before
+// functions like vdl.TypeOf will work properly.
+//
+// This function returns a dummy value, so that it can be used to initialize the
+// first var in the file, to take advantage of Go's defined init order.
+func __VDLInit() struct{} {
+ if __VDLInitCalled {
+ return struct{}{}
+ }
+
+ // Register types.
vdl.Register((*Caveat)(nil))
-}
-var __VDLType0 *vdl.Type = vdl.TypeOf((*Caveat)(nil))
-var __VDLType_v_io_x_ref_services_wspr_internal_account_Caveat *vdl.Type = vdl.TypeOf(Caveat{})
-
-func __VDLEnsureNativeBuilt() {
+ return struct{}{}
}
diff --git a/services/wspr/internal/app/app.vdl.go b/services/wspr/internal/app/app.vdl.go
index 183355c..7f8d230 100644
--- a/services/wspr/internal/app/app.vdl.go
+++ b/services/wspr/internal/app/app.vdl.go
@@ -27,625 +27,10 @@
"v.io/x/ref/services/wspr/internal/rpc/server"
)
-type RpcRequest struct {
- Name string
- Method string
- NumInArgs int32
- NumOutArgs int32
- IsStreaming bool
- Deadline time.Deadline
- TraceRequest vtrace.Request
- Context server.Context
- CallOptions []RpcCallOption
-}
+var _ = __VDLInit() // Must be first; see __VDLInit comments for details.
-func (RpcRequest) __VDLReflect(struct {
- Name string `vdl:"v.io/x/ref/services/wspr/internal/app.RpcRequest"`
-}) {
-}
-
-func (m *RpcRequest) FillVDLTarget(t vdl.Target, tt *vdl.Type) error {
- __VDLEnsureNativeBuilt()
- fieldsTarget1, err := t.StartFields(tt)
- if err != nil {
- return err
- }
-
- keyTarget2, fieldTarget3, err := fieldsTarget1.StartField("Name")
- if err != vdl.ErrFieldNoExist && err != nil {
- return err
- }
- if err != vdl.ErrFieldNoExist {
- if err := fieldTarget3.FromString(string(m.Name), vdl.StringType); err != nil {
- return err
- }
- if err := fieldsTarget1.FinishField(keyTarget2, fieldTarget3); err != nil {
- return err
- }
- }
- keyTarget4, fieldTarget5, err := fieldsTarget1.StartField("Method")
- if err != vdl.ErrFieldNoExist && err != nil {
- return err
- }
- if err != vdl.ErrFieldNoExist {
- if err := fieldTarget5.FromString(string(m.Method), vdl.StringType); err != nil {
- return err
- }
- if err := fieldsTarget1.FinishField(keyTarget4, fieldTarget5); err != nil {
- return err
- }
- }
- keyTarget6, fieldTarget7, err := fieldsTarget1.StartField("NumInArgs")
- if err != vdl.ErrFieldNoExist && err != nil {
- return err
- }
- if err != vdl.ErrFieldNoExist {
- if err := fieldTarget7.FromInt(int64(m.NumInArgs), vdl.Int32Type); err != nil {
- return err
- }
- if err := fieldsTarget1.FinishField(keyTarget6, fieldTarget7); err != nil {
- return err
- }
- }
- keyTarget8, fieldTarget9, err := fieldsTarget1.StartField("NumOutArgs")
- if err != vdl.ErrFieldNoExist && err != nil {
- return err
- }
- if err != vdl.ErrFieldNoExist {
- if err := fieldTarget9.FromInt(int64(m.NumOutArgs), vdl.Int32Type); err != nil {
- return err
- }
- if err := fieldsTarget1.FinishField(keyTarget8, fieldTarget9); err != nil {
- return err
- }
- }
- keyTarget10, fieldTarget11, err := fieldsTarget1.StartField("IsStreaming")
- if err != vdl.ErrFieldNoExist && err != nil {
- return err
- }
- if err != vdl.ErrFieldNoExist {
- if err := fieldTarget11.FromBool(bool(m.IsStreaming), vdl.BoolType); err != nil {
- return err
- }
- if err := fieldsTarget1.FinishField(keyTarget10, fieldTarget11); err != nil {
- return err
- }
- }
- var wireValue12 time.WireDeadline
- if err := time.WireDeadlineFromNative(&wireValue12, m.Deadline); err != nil {
- return err
- }
-
- keyTarget13, fieldTarget14, err := fieldsTarget1.StartField("Deadline")
- if err != vdl.ErrFieldNoExist && err != nil {
- return err
- }
- if err != vdl.ErrFieldNoExist {
-
- if err := wireValue12.FillVDLTarget(fieldTarget14, __VDLType_time_WireDeadline); err != nil {
- return err
- }
- if err := fieldsTarget1.FinishField(keyTarget13, fieldTarget14); err != nil {
- return err
- }
- }
- keyTarget15, fieldTarget16, err := fieldsTarget1.StartField("TraceRequest")
- if err != vdl.ErrFieldNoExist && err != nil {
- return err
- }
- if err != vdl.ErrFieldNoExist {
-
- if err := m.TraceRequest.FillVDLTarget(fieldTarget16, __VDLType_v_io_v23_vtrace_Request); err != nil {
- return err
- }
- if err := fieldsTarget1.FinishField(keyTarget15, fieldTarget16); err != nil {
- return err
- }
- }
- keyTarget17, fieldTarget18, err := fieldsTarget1.StartField("Context")
- if err != vdl.ErrFieldNoExist && err != nil {
- return err
- }
- if err != vdl.ErrFieldNoExist {
-
- if err := m.Context.FillVDLTarget(fieldTarget18, __VDLType_v_io_x_ref_services_wspr_internal_rpc_server_Context); err != nil {
- return err
- }
- if err := fieldsTarget1.FinishField(keyTarget17, fieldTarget18); err != nil {
- return err
- }
- }
- keyTarget19, fieldTarget20, err := fieldsTarget1.StartField("CallOptions")
- if err != vdl.ErrFieldNoExist && err != nil {
- return err
- }
- if err != vdl.ErrFieldNoExist {
-
- listTarget21, err := fieldTarget20.StartList(__VDLType1, len(m.CallOptions))
- if err != nil {
- return err
- }
- for i, elem23 := range m.CallOptions {
- elemTarget22, err := listTarget21.StartElem(i)
- if err != nil {
- return err
- }
-
- unionValue24 := elem23
- if unionValue24 == nil {
- unionValue24 = RpcCallOptionAllowedServersPolicy{}
- }
- if err := unionValue24.FillVDLTarget(elemTarget22, __VDLType_v_io_x_ref_services_wspr_internal_app_RpcCallOption); err != nil {
- return err
- }
- if err := listTarget21.FinishElem(elemTarget22); err != nil {
- return err
- }
- }
- if err := fieldTarget20.FinishList(listTarget21); err != nil {
- return err
- }
- if err := fieldsTarget1.FinishField(keyTarget19, fieldTarget20); err != nil {
- return err
- }
- }
- if err := t.FinishFields(fieldsTarget1); err != nil {
- return err
- }
- return nil
-}
-
-func (m *RpcRequest) MakeVDLTarget() vdl.Target {
- return &RpcRequestTarget{Value: m}
-}
-
-type RpcRequestTarget struct {
- Value *RpcRequest
- nameTarget vdl.StringTarget
- methodTarget vdl.StringTarget
- numInArgsTarget vdl.Int32Target
- numOutArgsTarget vdl.Int32Target
- isStreamingTarget vdl.BoolTarget
- deadlineTarget time.WireDeadlineTarget
- traceRequestTarget vtrace.RequestTarget
- contextTarget server.ContextTarget
- callOptionsTarget unnamed_5b5d762e696f2f782f7265662f73657276696365732f777370722f696e7465726e616c2f6170702e52706343616c6c4f7074696f6e20756e696f6e7b416c6c6f77656453657276657273506f6c696379205b5d762e696f2f7632332f73656375726974792e426c657373696e675061747465726e20737472696e673b4772616e74657220762e696f2f782f7265662f73657276696365732f777370722f696e7465726e616c2f6170702e4772616e74657248616e646c6520696e7433327dTarget
- vdl.TargetBase
- vdl.FieldsTargetBase
-}
-
-func (t *RpcRequestTarget) StartFields(tt *vdl.Type) (vdl.FieldsTarget, error) {
-
- if !vdl.Compatible(tt, __VDLType_v_io_x_ref_services_wspr_internal_app_RpcRequest) {
- return nil, fmt.Errorf("type %v incompatible with %v", tt, __VDLType_v_io_x_ref_services_wspr_internal_app_RpcRequest)
- }
- return t, nil
-}
-func (t *RpcRequestTarget) StartField(name string) (key, field vdl.Target, _ error) {
- switch name {
- case "Name":
- t.nameTarget.Value = &t.Value.Name
- target, err := &t.nameTarget, error(nil)
- return nil, target, err
- case "Method":
- t.methodTarget.Value = &t.Value.Method
- target, err := &t.methodTarget, error(nil)
- return nil, target, err
- case "NumInArgs":
- t.numInArgsTarget.Value = &t.Value.NumInArgs
- target, err := &t.numInArgsTarget, error(nil)
- return nil, target, err
- case "NumOutArgs":
- t.numOutArgsTarget.Value = &t.Value.NumOutArgs
- target, err := &t.numOutArgsTarget, error(nil)
- return nil, target, err
- case "IsStreaming":
- t.isStreamingTarget.Value = &t.Value.IsStreaming
- target, err := &t.isStreamingTarget, error(nil)
- return nil, target, err
- case "Deadline":
- t.deadlineTarget.Value = &t.Value.Deadline
- target, err := &t.deadlineTarget, error(nil)
- return nil, target, err
- case "TraceRequest":
- t.traceRequestTarget.Value = &t.Value.TraceRequest
- target, err := &t.traceRequestTarget, error(nil)
- return nil, target, err
- case "Context":
- t.contextTarget.Value = &t.Value.Context
- target, err := &t.contextTarget, error(nil)
- return nil, target, err
- case "CallOptions":
- t.callOptionsTarget.Value = &t.Value.CallOptions
- target, err := &t.callOptionsTarget, error(nil)
- return nil, target, err
- default:
- return nil, nil, fmt.Errorf("field %s not in struct %v", name, __VDLType_v_io_x_ref_services_wspr_internal_app_RpcRequest)
- }
-}
-func (t *RpcRequestTarget) FinishField(_, _ vdl.Target) error {
- return nil
-}
-func (t *RpcRequestTarget) FinishFields(_ vdl.FieldsTarget) error {
-
- return nil
-}
-
-// []RpcCallOption
-type unnamed_5b5d762e696f2f782f7265662f73657276696365732f777370722f696e7465726e616c2f6170702e52706343616c6c4f7074696f6e20756e696f6e7b416c6c6f77656453657276657273506f6c696379205b5d762e696f2f7632332f73656375726974792e426c657373696e675061747465726e20737472696e673b4772616e74657220762e696f2f782f7265662f73657276696365732f777370722f696e7465726e616c2f6170702e4772616e74657248616e646c6520696e7433327dTarget struct {
- Value *[]RpcCallOption
-
- vdl.TargetBase
- vdl.ListTargetBase
-}
-
-func (t *unnamed_5b5d762e696f2f782f7265662f73657276696365732f777370722f696e7465726e616c2f6170702e52706343616c6c4f7074696f6e20756e696f6e7b416c6c6f77656453657276657273506f6c696379205b5d762e696f2f7632332f73656375726974792e426c657373696e675061747465726e20737472696e673b4772616e74657220762e696f2f782f7265662f73657276696365732f777370722f696e7465726e616c2f6170702e4772616e74657248616e646c6520696e7433327dTarget) StartList(tt *vdl.Type, len int) (vdl.ListTarget, error) {
-
- if !vdl.Compatible(tt, __VDLType1) {
- return nil, fmt.Errorf("type %v incompatible with %v", tt, __VDLType1)
- }
- if cap(*t.Value) < len {
- *t.Value = make([]RpcCallOption, len)
- } else {
- *t.Value = (*t.Value)[:len]
- }
- return t, nil
-}
-func (t *unnamed_5b5d762e696f2f782f7265662f73657276696365732f777370722f696e7465726e616c2f6170702e52706343616c6c4f7074696f6e20756e696f6e7b416c6c6f77656453657276657273506f6c696379205b5d762e696f2f7632332f73656375726974792e426c657373696e675061747465726e20737472696e673b4772616e74657220762e696f2f782f7265662f73657276696365732f777370722f696e7465726e616c2f6170702e4772616e74657248616e646c6520696e7433327dTarget) StartElem(index int) (elem vdl.Target, _ error) {
- target, err := vdl.ReflectTarget(reflect.ValueOf(&(*t.Value)[index]))
- return target, err
-}
-func (t *unnamed_5b5d762e696f2f782f7265662f73657276696365732f777370722f696e7465726e616c2f6170702e52706343616c6c4f7074696f6e20756e696f6e7b416c6c6f77656453657276657273506f6c696379205b5d762e696f2f7632332f73656375726974792e426c657373696e675061747465726e20737472696e673b4772616e74657220762e696f2f782f7265662f73657276696365732f777370722f696e7465726e616c2f6170702e4772616e74657248616e646c6520696e7433327dTarget) FinishElem(elem vdl.Target) error {
- return nil
-}
-func (t *unnamed_5b5d762e696f2f782f7265662f73657276696365732f777370722f696e7465726e616c2f6170702e52706343616c6c4f7074696f6e20756e696f6e7b416c6c6f77656453657276657273506f6c696379205b5d762e696f2f7632332f73656375726974792e426c657373696e675061747465726e20737472696e673b4772616e74657220762e696f2f782f7265662f73657276696365732f777370722f696e7465726e616c2f6170702e4772616e74657248616e646c6520696e7433327dTarget) FinishList(elem vdl.ListTarget) error {
-
- return nil
-}
-
-type (
- // RpcCallOption represents any single field of the RpcCallOption union type.
- RpcCallOption interface {
- // Index returns the field index.
- Index() int
- // Interface returns the field value as an interface.
- Interface() interface{}
- // Name returns the field name.
- Name() string
- // __VDLReflect describes the RpcCallOption union type.
- __VDLReflect(__RpcCallOptionReflect)
- FillVDLTarget(vdl.Target, *vdl.Type) error
- }
- // RpcCallOptionAllowedServersPolicy represents field AllowedServersPolicy of the RpcCallOption union type.
- RpcCallOptionAllowedServersPolicy struct{ Value []security.BlessingPattern }
- // RpcCallOptionGranter represents field Granter of the RpcCallOption union type.
- RpcCallOptionGranter struct{ Value GranterHandle }
- // __RpcCallOptionReflect describes the RpcCallOption union type.
- __RpcCallOptionReflect struct {
- Name string `vdl:"v.io/x/ref/services/wspr/internal/app.RpcCallOption"`
- Type RpcCallOption
- Union struct {
- AllowedServersPolicy RpcCallOptionAllowedServersPolicy
- Granter RpcCallOptionGranter
- }
- }
-)
-
-func (x RpcCallOptionAllowedServersPolicy) Index() int { return 0 }
-func (x RpcCallOptionAllowedServersPolicy) Interface() interface{} { return x.Value }
-func (x RpcCallOptionAllowedServersPolicy) Name() string { return "AllowedServersPolicy" }
-func (x RpcCallOptionAllowedServersPolicy) __VDLReflect(__RpcCallOptionReflect) {}
-
-func (m RpcCallOptionAllowedServersPolicy) FillVDLTarget(t vdl.Target, tt *vdl.Type) error {
- fieldsTarget1, err := t.StartFields(__VDLType_v_io_x_ref_services_wspr_internal_app_RpcCallOption)
- if err != nil {
- return err
- }
- keyTarget2, fieldTarget3, err := fieldsTarget1.StartField("AllowedServersPolicy")
- if err != nil {
- return err
- }
-
- listTarget4, err := fieldTarget3.StartList(__VDLType2, len(m.Value))
- if err != nil {
- return err
- }
- for i, elem6 := range m.Value {
- elemTarget5, err := listTarget4.StartElem(i)
- if err != nil {
- return err
- }
-
- if err := elem6.FillVDLTarget(elemTarget5, __VDLType_v_io_v23_security_BlessingPattern); err != nil {
- return err
- }
- if err := listTarget4.FinishElem(elemTarget5); err != nil {
- return err
- }
- }
- if err := fieldTarget3.FinishList(listTarget4); err != nil {
- return err
- }
- if err := fieldsTarget1.FinishField(keyTarget2, fieldTarget3); err != nil {
- return err
- }
- if err := t.FinishFields(fieldsTarget1); err != nil {
- return err
- }
-
- return nil
-}
-
-func (m RpcCallOptionAllowedServersPolicy) MakeVDLTarget() vdl.Target {
- return nil
-}
-
-func (x RpcCallOptionGranter) Index() int { return 1 }
-func (x RpcCallOptionGranter) Interface() interface{} { return x.Value }
-func (x RpcCallOptionGranter) Name() string { return "Granter" }
-func (x RpcCallOptionGranter) __VDLReflect(__RpcCallOptionReflect) {}
-
-func (m RpcCallOptionGranter) FillVDLTarget(t vdl.Target, tt *vdl.Type) error {
- fieldsTarget1, err := t.StartFields(__VDLType_v_io_x_ref_services_wspr_internal_app_RpcCallOption)
- if err != nil {
- return err
- }
- keyTarget2, fieldTarget3, err := fieldsTarget1.StartField("Granter")
- if err != nil {
- return err
- }
-
- if err := m.Value.FillVDLTarget(fieldTarget3, __VDLType_v_io_x_ref_services_wspr_internal_app_GranterHandle); err != nil {
- return err
- }
- if err := fieldsTarget1.FinishField(keyTarget2, fieldTarget3); err != nil {
- return err
- }
- if err := t.FinishFields(fieldsTarget1); err != nil {
- return err
- }
-
- return nil
-}
-
-func (m RpcCallOptionGranter) MakeVDLTarget() vdl.Target {
- return nil
-}
-
-type (
- // RpcServerOption represents any single field of the RpcServerOption union type.
- RpcServerOption interface {
- // Index returns the field index.
- Index() int
- // Interface returns the field value as an interface.
- Interface() interface{}
- // Name returns the field name.
- Name() string
- // __VDLReflect describes the RpcServerOption union type.
- __VDLReflect(__RpcServerOptionReflect)
- FillVDLTarget(vdl.Target, *vdl.Type) error
- }
- // RpcServerOptionIsLeaf represents field IsLeaf of the RpcServerOption union type.
- RpcServerOptionIsLeaf struct{ Value bool }
- // RpcServerOptionServesMountTable represents field ServesMountTable of the RpcServerOption union type.
- RpcServerOptionServesMountTable struct{ Value bool }
- // __RpcServerOptionReflect describes the RpcServerOption union type.
- __RpcServerOptionReflect struct {
- Name string `vdl:"v.io/x/ref/services/wspr/internal/app.RpcServerOption"`
- Type RpcServerOption
- Union struct {
- IsLeaf RpcServerOptionIsLeaf
- ServesMountTable RpcServerOptionServesMountTable
- }
- }
-)
-
-func (x RpcServerOptionIsLeaf) Index() int { return 0 }
-func (x RpcServerOptionIsLeaf) Interface() interface{} { return x.Value }
-func (x RpcServerOptionIsLeaf) Name() string { return "IsLeaf" }
-func (x RpcServerOptionIsLeaf) __VDLReflect(__RpcServerOptionReflect) {}
-
-func (m RpcServerOptionIsLeaf) FillVDLTarget(t vdl.Target, tt *vdl.Type) error {
- fieldsTarget1, err := t.StartFields(__VDLType_v_io_x_ref_services_wspr_internal_app_RpcServerOption)
- if err != nil {
- return err
- }
- keyTarget2, fieldTarget3, err := fieldsTarget1.StartField("IsLeaf")
- if err != nil {
- return err
- }
- if err := fieldTarget3.FromBool(bool(m.Value), vdl.BoolType); err != nil {
- return err
- }
- if err := fieldsTarget1.FinishField(keyTarget2, fieldTarget3); err != nil {
- return err
- }
- if err := t.FinishFields(fieldsTarget1); err != nil {
- return err
- }
-
- return nil
-}
-
-func (m RpcServerOptionIsLeaf) MakeVDLTarget() vdl.Target {
- return nil
-}
-
-func (x RpcServerOptionServesMountTable) Index() int { return 1 }
-func (x RpcServerOptionServesMountTable) Interface() interface{} { return x.Value }
-func (x RpcServerOptionServesMountTable) Name() string { return "ServesMountTable" }
-func (x RpcServerOptionServesMountTable) __VDLReflect(__RpcServerOptionReflect) {}
-
-func (m RpcServerOptionServesMountTable) FillVDLTarget(t vdl.Target, tt *vdl.Type) error {
- fieldsTarget1, err := t.StartFields(__VDLType_v_io_x_ref_services_wspr_internal_app_RpcServerOption)
- if err != nil {
- return err
- }
- keyTarget2, fieldTarget3, err := fieldsTarget1.StartField("ServesMountTable")
- if err != nil {
- return err
- }
- if err := fieldTarget3.FromBool(bool(m.Value), vdl.BoolType); err != nil {
- return err
- }
- if err := fieldsTarget1.FinishField(keyTarget2, fieldTarget3); err != nil {
- return err
- }
- if err := t.FinishFields(fieldsTarget1); err != nil {
- return err
- }
-
- return nil
-}
-
-func (m RpcServerOptionServesMountTable) MakeVDLTarget() vdl.Target {
- return nil
-}
-
-type RpcResponse struct {
- OutArgs []*vom.RawBytes
- TraceResponse vtrace.Response
-}
-
-func (RpcResponse) __VDLReflect(struct {
- Name string `vdl:"v.io/x/ref/services/wspr/internal/app.RpcResponse"`
-}) {
-}
-
-func (m *RpcResponse) FillVDLTarget(t vdl.Target, tt *vdl.Type) error {
- __VDLEnsureNativeBuilt()
- fieldsTarget1, err := t.StartFields(tt)
- if err != nil {
- return err
- }
-
- keyTarget2, fieldTarget3, err := fieldsTarget1.StartField("OutArgs")
- if err != vdl.ErrFieldNoExist && err != nil {
- return err
- }
- if err != vdl.ErrFieldNoExist {
-
- listTarget4, err := fieldTarget3.StartList(__VDLType4, len(m.OutArgs))
- if err != nil {
- return err
- }
- for i, elem6 := range m.OutArgs {
- elemTarget5, err := listTarget4.StartElem(i)
- if err != nil {
- return err
- }
-
- if elem6 == nil {
- if err := elemTarget5.FromNil(vdl.AnyType); err != nil {
- return err
- }
- } else {
- if err := elem6.FillVDLTarget(elemTarget5, vdl.AnyType); err != nil {
- return err
- }
- }
- if err := listTarget4.FinishElem(elemTarget5); err != nil {
- return err
- }
- }
- if err := fieldTarget3.FinishList(listTarget4); err != nil {
- return err
- }
- if err := fieldsTarget1.FinishField(keyTarget2, fieldTarget3); err != nil {
- return err
- }
- }
- keyTarget7, fieldTarget8, err := fieldsTarget1.StartField("TraceResponse")
- if err != vdl.ErrFieldNoExist && err != nil {
- return err
- }
- if err != vdl.ErrFieldNoExist {
-
- if err := m.TraceResponse.FillVDLTarget(fieldTarget8, __VDLType_v_io_v23_vtrace_Response); err != nil {
- return err
- }
- if err := fieldsTarget1.FinishField(keyTarget7, fieldTarget8); err != nil {
- return err
- }
- }
- if err := t.FinishFields(fieldsTarget1); err != nil {
- return err
- }
- return nil
-}
-
-func (m *RpcResponse) MakeVDLTarget() vdl.Target {
- return &RpcResponseTarget{Value: m}
-}
-
-type RpcResponseTarget struct {
- Value *RpcResponse
- outArgsTarget unnamed_5b5d616e79Target
- traceResponseTarget vtrace.ResponseTarget
- vdl.TargetBase
- vdl.FieldsTargetBase
-}
-
-func (t *RpcResponseTarget) StartFields(tt *vdl.Type) (vdl.FieldsTarget, error) {
-
- if !vdl.Compatible(tt, __VDLType_v_io_x_ref_services_wspr_internal_app_RpcResponse) {
- return nil, fmt.Errorf("type %v incompatible with %v", tt, __VDLType_v_io_x_ref_services_wspr_internal_app_RpcResponse)
- }
- return t, nil
-}
-func (t *RpcResponseTarget) StartField(name string) (key, field vdl.Target, _ error) {
- switch name {
- case "OutArgs":
- t.outArgsTarget.Value = &t.Value.OutArgs
- target, err := &t.outArgsTarget, error(nil)
- return nil, target, err
- case "TraceResponse":
- t.traceResponseTarget.Value = &t.Value.TraceResponse
- target, err := &t.traceResponseTarget, error(nil)
- return nil, target, err
- default:
- return nil, nil, fmt.Errorf("field %s not in struct %v", name, __VDLType_v_io_x_ref_services_wspr_internal_app_RpcResponse)
- }
-}
-func (t *RpcResponseTarget) FinishField(_, _ vdl.Target) error {
- return nil
-}
-func (t *RpcResponseTarget) FinishFields(_ vdl.FieldsTarget) error {
-
- return nil
-}
-
-// []*vom.RawBytes
-type unnamed_5b5d616e79Target struct {
- Value *[]*vom.RawBytes
-
- vdl.TargetBase
- vdl.ListTargetBase
-}
-
-func (t *unnamed_5b5d616e79Target) StartList(tt *vdl.Type, len int) (vdl.ListTarget, error) {
-
- if !vdl.Compatible(tt, __VDLType4) {
- return nil, fmt.Errorf("type %v incompatible with %v", tt, __VDLType4)
- }
- if cap(*t.Value) < len {
- *t.Value = make([]*vom.RawBytes, len)
- } else {
- *t.Value = (*t.Value)[:len]
- }
- return t, nil
-}
-func (t *unnamed_5b5d616e79Target) StartElem(index int) (elem vdl.Target, _ error) {
- target, err := vdl.ReflectTarget(reflect.ValueOf(&(*t.Value)[index]))
- return target, err
-}
-func (t *unnamed_5b5d616e79Target) FinishElem(elem vdl.Target) error {
- return nil
-}
-func (t *unnamed_5b5d616e79Target) FinishList(elem vdl.ListTarget) error {
-
- return nil
-}
+//////////////////////////////////////////////////
+// Type definitions
type GranterHandle int32
@@ -655,7 +40,7 @@
}
func (m *GranterHandle) FillVDLTarget(t vdl.Target, tt *vdl.Type) error {
- if err := t.FromInt(int64((*m)), __VDLType_v_io_x_ref_services_wspr_internal_app_GranterHandle); err != nil {
+ if err := t.FromInt(int64((*m)), tt); err != nil {
return err
}
return nil
@@ -711,6 +96,624 @@
return nil
}
+type (
+ // RpcCallOption represents any single field of the RpcCallOption union type.
+ RpcCallOption interface {
+ // Index returns the field index.
+ Index() int
+ // Interface returns the field value as an interface.
+ Interface() interface{}
+ // Name returns the field name.
+ Name() string
+ // __VDLReflect describes the RpcCallOption union type.
+ __VDLReflect(__RpcCallOptionReflect)
+ FillVDLTarget(vdl.Target, *vdl.Type) error
+ }
+ // RpcCallOptionAllowedServersPolicy represents field AllowedServersPolicy of the RpcCallOption union type.
+ RpcCallOptionAllowedServersPolicy struct{ Value []security.BlessingPattern }
+ // RpcCallOptionGranter represents field Granter of the RpcCallOption union type.
+ RpcCallOptionGranter struct{ Value GranterHandle }
+ // __RpcCallOptionReflect describes the RpcCallOption union type.
+ __RpcCallOptionReflect struct {
+ Name string `vdl:"v.io/x/ref/services/wspr/internal/app.RpcCallOption"`
+ Type RpcCallOption
+ Union struct {
+ AllowedServersPolicy RpcCallOptionAllowedServersPolicy
+ Granter RpcCallOptionGranter
+ }
+ }
+)
+
+func (x RpcCallOptionAllowedServersPolicy) Index() int { return 0 }
+func (x RpcCallOptionAllowedServersPolicy) Interface() interface{} { return x.Value }
+func (x RpcCallOptionAllowedServersPolicy) Name() string { return "AllowedServersPolicy" }
+func (x RpcCallOptionAllowedServersPolicy) __VDLReflect(__RpcCallOptionReflect) {}
+
+func (m RpcCallOptionAllowedServersPolicy) FillVDLTarget(t vdl.Target, tt *vdl.Type) error {
+ fieldsTarget1, err := t.StartFields(tt)
+ if err != nil {
+ return err
+ }
+ keyTarget2, fieldTarget3, err := fieldsTarget1.StartField("AllowedServersPolicy")
+ if err != nil {
+ return err
+ }
+
+ listTarget4, err := fieldTarget3.StartList(tt.NonOptional().Field(0).Type, len(m.Value))
+ if err != nil {
+ return err
+ }
+ for i, elem6 := range m.Value {
+ elemTarget5, err := listTarget4.StartElem(i)
+ if err != nil {
+ return err
+ }
+
+ if err := elem6.FillVDLTarget(elemTarget5, tt.NonOptional().Field(0).Type.Elem()); err != nil {
+ return err
+ }
+ if err := listTarget4.FinishElem(elemTarget5); err != nil {
+ return err
+ }
+ }
+ if err := fieldTarget3.FinishList(listTarget4); err != nil {
+ return err
+ }
+ if err := fieldsTarget1.FinishField(keyTarget2, fieldTarget3); err != nil {
+ return err
+ }
+ if err := t.FinishFields(fieldsTarget1); err != nil {
+ return err
+ }
+
+ return nil
+}
+
+func (m RpcCallOptionAllowedServersPolicy) MakeVDLTarget() vdl.Target {
+ return nil
+}
+
+func (x RpcCallOptionGranter) Index() int { return 1 }
+func (x RpcCallOptionGranter) Interface() interface{} { return x.Value }
+func (x RpcCallOptionGranter) Name() string { return "Granter" }
+func (x RpcCallOptionGranter) __VDLReflect(__RpcCallOptionReflect) {}
+
+func (m RpcCallOptionGranter) FillVDLTarget(t vdl.Target, tt *vdl.Type) error {
+ fieldsTarget1, err := t.StartFields(tt)
+ if err != nil {
+ return err
+ }
+ keyTarget2, fieldTarget3, err := fieldsTarget1.StartField("Granter")
+ if err != nil {
+ return err
+ }
+
+ if err := m.Value.FillVDLTarget(fieldTarget3, tt.NonOptional().Field(1).Type); err != nil {
+ return err
+ }
+ if err := fieldsTarget1.FinishField(keyTarget2, fieldTarget3); err != nil {
+ return err
+ }
+ if err := t.FinishFields(fieldsTarget1); err != nil {
+ return err
+ }
+
+ return nil
+}
+
+func (m RpcCallOptionGranter) MakeVDLTarget() vdl.Target {
+ return nil
+}
+
+type RpcRequest struct {
+ Name string
+ Method string
+ NumInArgs int32
+ NumOutArgs int32
+ IsStreaming bool
+ Deadline time.Deadline
+ TraceRequest vtrace.Request
+ Context server.Context
+ CallOptions []RpcCallOption
+}
+
+func (RpcRequest) __VDLReflect(struct {
+ Name string `vdl:"v.io/x/ref/services/wspr/internal/app.RpcRequest"`
+}) {
+}
+
+func (m *RpcRequest) FillVDLTarget(t vdl.Target, tt *vdl.Type) error {
+ fieldsTarget1, err := t.StartFields(tt)
+ if err != nil {
+ return err
+ }
+
+ keyTarget2, fieldTarget3, err := fieldsTarget1.StartField("Name")
+ if err != vdl.ErrFieldNoExist && err != nil {
+ return err
+ }
+ if err != vdl.ErrFieldNoExist {
+ if err := fieldTarget3.FromString(string(m.Name), tt.NonOptional().Field(0).Type); err != nil {
+ return err
+ }
+ if err := fieldsTarget1.FinishField(keyTarget2, fieldTarget3); err != nil {
+ return err
+ }
+ }
+ keyTarget4, fieldTarget5, err := fieldsTarget1.StartField("Method")
+ if err != vdl.ErrFieldNoExist && err != nil {
+ return err
+ }
+ if err != vdl.ErrFieldNoExist {
+ if err := fieldTarget5.FromString(string(m.Method), tt.NonOptional().Field(1).Type); err != nil {
+ return err
+ }
+ if err := fieldsTarget1.FinishField(keyTarget4, fieldTarget5); err != nil {
+ return err
+ }
+ }
+ keyTarget6, fieldTarget7, err := fieldsTarget1.StartField("NumInArgs")
+ if err != vdl.ErrFieldNoExist && err != nil {
+ return err
+ }
+ if err != vdl.ErrFieldNoExist {
+ if err := fieldTarget7.FromInt(int64(m.NumInArgs), tt.NonOptional().Field(2).Type); err != nil {
+ return err
+ }
+ if err := fieldsTarget1.FinishField(keyTarget6, fieldTarget7); err != nil {
+ return err
+ }
+ }
+ keyTarget8, fieldTarget9, err := fieldsTarget1.StartField("NumOutArgs")
+ if err != vdl.ErrFieldNoExist && err != nil {
+ return err
+ }
+ if err != vdl.ErrFieldNoExist {
+ if err := fieldTarget9.FromInt(int64(m.NumOutArgs), tt.NonOptional().Field(3).Type); err != nil {
+ return err
+ }
+ if err := fieldsTarget1.FinishField(keyTarget8, fieldTarget9); err != nil {
+ return err
+ }
+ }
+ keyTarget10, fieldTarget11, err := fieldsTarget1.StartField("IsStreaming")
+ if err != vdl.ErrFieldNoExist && err != nil {
+ return err
+ }
+ if err != vdl.ErrFieldNoExist {
+ if err := fieldTarget11.FromBool(bool(m.IsStreaming), tt.NonOptional().Field(4).Type); err != nil {
+ return err
+ }
+ if err := fieldsTarget1.FinishField(keyTarget10, fieldTarget11); err != nil {
+ return err
+ }
+ }
+ var wireValue12 time.WireDeadline
+ if err := time.WireDeadlineFromNative(&wireValue12, m.Deadline); err != nil {
+ return err
+ }
+
+ keyTarget13, fieldTarget14, err := fieldsTarget1.StartField("Deadline")
+ if err != vdl.ErrFieldNoExist && err != nil {
+ return err
+ }
+ if err != vdl.ErrFieldNoExist {
+
+ if err := wireValue12.FillVDLTarget(fieldTarget14, tt.NonOptional().Field(5).Type); err != nil {
+ return err
+ }
+ if err := fieldsTarget1.FinishField(keyTarget13, fieldTarget14); err != nil {
+ return err
+ }
+ }
+ keyTarget15, fieldTarget16, err := fieldsTarget1.StartField("TraceRequest")
+ if err != vdl.ErrFieldNoExist && err != nil {
+ return err
+ }
+ if err != vdl.ErrFieldNoExist {
+
+ if err := m.TraceRequest.FillVDLTarget(fieldTarget16, tt.NonOptional().Field(6).Type); err != nil {
+ return err
+ }
+ if err := fieldsTarget1.FinishField(keyTarget15, fieldTarget16); err != nil {
+ return err
+ }
+ }
+ keyTarget17, fieldTarget18, err := fieldsTarget1.StartField("Context")
+ if err != vdl.ErrFieldNoExist && err != nil {
+ return err
+ }
+ if err != vdl.ErrFieldNoExist {
+
+ if err := m.Context.FillVDLTarget(fieldTarget18, tt.NonOptional().Field(7).Type); err != nil {
+ return err
+ }
+ if err := fieldsTarget1.FinishField(keyTarget17, fieldTarget18); err != nil {
+ return err
+ }
+ }
+ keyTarget19, fieldTarget20, err := fieldsTarget1.StartField("CallOptions")
+ if err != vdl.ErrFieldNoExist && err != nil {
+ return err
+ }
+ if err != vdl.ErrFieldNoExist {
+
+ listTarget21, err := fieldTarget20.StartList(tt.NonOptional().Field(8).Type, len(m.CallOptions))
+ if err != nil {
+ return err
+ }
+ for i, elem23 := range m.CallOptions {
+ elemTarget22, err := listTarget21.StartElem(i)
+ if err != nil {
+ return err
+ }
+
+ unionValue24 := elem23
+ if unionValue24 == nil {
+ unionValue24 = RpcCallOptionAllowedServersPolicy{}
+ }
+ if err := unionValue24.FillVDLTarget(elemTarget22, tt.NonOptional().Field(8).Type.Elem()); err != nil {
+ return err
+ }
+ if err := listTarget21.FinishElem(elemTarget22); err != nil {
+ return err
+ }
+ }
+ if err := fieldTarget20.FinishList(listTarget21); err != nil {
+ return err
+ }
+ if err := fieldsTarget1.FinishField(keyTarget19, fieldTarget20); err != nil {
+ return err
+ }
+ }
+ if err := t.FinishFields(fieldsTarget1); err != nil {
+ return err
+ }
+ return nil
+}
+
+func (m *RpcRequest) MakeVDLTarget() vdl.Target {
+ return &RpcRequestTarget{Value: m}
+}
+
+type RpcRequestTarget struct {
+ Value *RpcRequest
+ nameTarget vdl.StringTarget
+ methodTarget vdl.StringTarget
+ numInArgsTarget vdl.Int32Target
+ numOutArgsTarget vdl.Int32Target
+ isStreamingTarget vdl.BoolTarget
+ deadlineTarget time.WireDeadlineTarget
+ traceRequestTarget vtrace.RequestTarget
+ contextTarget server.ContextTarget
+ callOptionsTarget unnamed_5b5d762e696f2f782f7265662f73657276696365732f777370722f696e7465726e616c2f6170702e52706343616c6c4f7074696f6e20756e696f6e7b416c6c6f77656453657276657273506f6c696379205b5d762e696f2f7632332f73656375726974792e426c657373696e675061747465726e20737472696e673b4772616e74657220762e696f2f782f7265662f73657276696365732f777370722f696e7465726e616c2f6170702e4772616e74657248616e646c6520696e7433327dTarget
+ vdl.TargetBase
+ vdl.FieldsTargetBase
+}
+
+func (t *RpcRequestTarget) StartFields(tt *vdl.Type) (vdl.FieldsTarget, error) {
+
+ if ttWant := vdl.TypeOf((*RpcRequest)(nil)).Elem(); !vdl.Compatible(tt, ttWant) {
+ return nil, fmt.Errorf("type %v incompatible with %v", tt, ttWant)
+ }
+ return t, nil
+}
+func (t *RpcRequestTarget) StartField(name string) (key, field vdl.Target, _ error) {
+ switch name {
+ case "Name":
+ t.nameTarget.Value = &t.Value.Name
+ target, err := &t.nameTarget, error(nil)
+ return nil, target, err
+ case "Method":
+ t.methodTarget.Value = &t.Value.Method
+ target, err := &t.methodTarget, error(nil)
+ return nil, target, err
+ case "NumInArgs":
+ t.numInArgsTarget.Value = &t.Value.NumInArgs
+ target, err := &t.numInArgsTarget, error(nil)
+ return nil, target, err
+ case "NumOutArgs":
+ t.numOutArgsTarget.Value = &t.Value.NumOutArgs
+ target, err := &t.numOutArgsTarget, error(nil)
+ return nil, target, err
+ case "IsStreaming":
+ t.isStreamingTarget.Value = &t.Value.IsStreaming
+ target, err := &t.isStreamingTarget, error(nil)
+ return nil, target, err
+ case "Deadline":
+ t.deadlineTarget.Value = &t.Value.Deadline
+ target, err := &t.deadlineTarget, error(nil)
+ return nil, target, err
+ case "TraceRequest":
+ t.traceRequestTarget.Value = &t.Value.TraceRequest
+ target, err := &t.traceRequestTarget, error(nil)
+ return nil, target, err
+ case "Context":
+ t.contextTarget.Value = &t.Value.Context
+ target, err := &t.contextTarget, error(nil)
+ return nil, target, err
+ case "CallOptions":
+ t.callOptionsTarget.Value = &t.Value.CallOptions
+ target, err := &t.callOptionsTarget, error(nil)
+ return nil, target, err
+ default:
+ return nil, nil, fmt.Errorf("field %s not in struct v.io/x/ref/services/wspr/internal/app.RpcRequest", name)
+ }
+}
+func (t *RpcRequestTarget) FinishField(_, _ vdl.Target) error {
+ return nil
+}
+func (t *RpcRequestTarget) FinishFields(_ vdl.FieldsTarget) error {
+
+ return nil
+}
+
+// []RpcCallOption
+type unnamed_5b5d762e696f2f782f7265662f73657276696365732f777370722f696e7465726e616c2f6170702e52706343616c6c4f7074696f6e20756e696f6e7b416c6c6f77656453657276657273506f6c696379205b5d762e696f2f7632332f73656375726974792e426c657373696e675061747465726e20737472696e673b4772616e74657220762e696f2f782f7265662f73657276696365732f777370722f696e7465726e616c2f6170702e4772616e74657248616e646c6520696e7433327dTarget struct {
+ Value *[]RpcCallOption
+
+ vdl.TargetBase
+ vdl.ListTargetBase
+}
+
+func (t *unnamed_5b5d762e696f2f782f7265662f73657276696365732f777370722f696e7465726e616c2f6170702e52706343616c6c4f7074696f6e20756e696f6e7b416c6c6f77656453657276657273506f6c696379205b5d762e696f2f7632332f73656375726974792e426c657373696e675061747465726e20737472696e673b4772616e74657220762e696f2f782f7265662f73657276696365732f777370722f696e7465726e616c2f6170702e4772616e74657248616e646c6520696e7433327dTarget) StartList(tt *vdl.Type, len int) (vdl.ListTarget, error) {
+
+ if ttWant := vdl.TypeOf((*[]RpcCallOption)(nil)); !vdl.Compatible(tt, ttWant) {
+ return nil, fmt.Errorf("type %v incompatible with %v", tt, ttWant)
+ }
+ if cap(*t.Value) < len {
+ *t.Value = make([]RpcCallOption, len)
+ } else {
+ *t.Value = (*t.Value)[:len]
+ }
+ return t, nil
+}
+func (t *unnamed_5b5d762e696f2f782f7265662f73657276696365732f777370722f696e7465726e616c2f6170702e52706343616c6c4f7074696f6e20756e696f6e7b416c6c6f77656453657276657273506f6c696379205b5d762e696f2f7632332f73656375726974792e426c657373696e675061747465726e20737472696e673b4772616e74657220762e696f2f782f7265662f73657276696365732f777370722f696e7465726e616c2f6170702e4772616e74657248616e646c6520696e7433327dTarget) StartElem(index int) (elem vdl.Target, _ error) {
+ target, err := vdl.ReflectTarget(reflect.ValueOf(&(*t.Value)[index]))
+ return target, err
+}
+func (t *unnamed_5b5d762e696f2f782f7265662f73657276696365732f777370722f696e7465726e616c2f6170702e52706343616c6c4f7074696f6e20756e696f6e7b416c6c6f77656453657276657273506f6c696379205b5d762e696f2f7632332f73656375726974792e426c657373696e675061747465726e20737472696e673b4772616e74657220762e696f2f782f7265662f73657276696365732f777370722f696e7465726e616c2f6170702e4772616e74657248616e646c6520696e7433327dTarget) FinishElem(elem vdl.Target) error {
+ return nil
+}
+func (t *unnamed_5b5d762e696f2f782f7265662f73657276696365732f777370722f696e7465726e616c2f6170702e52706343616c6c4f7074696f6e20756e696f6e7b416c6c6f77656453657276657273506f6c696379205b5d762e696f2f7632332f73656375726974792e426c657373696e675061747465726e20737472696e673b4772616e74657220762e696f2f782f7265662f73657276696365732f777370722f696e7465726e616c2f6170702e4772616e74657248616e646c6520696e7433327dTarget) FinishList(elem vdl.ListTarget) error {
+
+ return nil
+}
+
+type (
+ // RpcServerOption represents any single field of the RpcServerOption union type.
+ RpcServerOption interface {
+ // Index returns the field index.
+ Index() int
+ // Interface returns the field value as an interface.
+ Interface() interface{}
+ // Name returns the field name.
+ Name() string
+ // __VDLReflect describes the RpcServerOption union type.
+ __VDLReflect(__RpcServerOptionReflect)
+ FillVDLTarget(vdl.Target, *vdl.Type) error
+ }
+ // RpcServerOptionIsLeaf represents field IsLeaf of the RpcServerOption union type.
+ RpcServerOptionIsLeaf struct{ Value bool }
+ // RpcServerOptionServesMountTable represents field ServesMountTable of the RpcServerOption union type.
+ RpcServerOptionServesMountTable struct{ Value bool }
+ // __RpcServerOptionReflect describes the RpcServerOption union type.
+ __RpcServerOptionReflect struct {
+ Name string `vdl:"v.io/x/ref/services/wspr/internal/app.RpcServerOption"`
+ Type RpcServerOption
+ Union struct {
+ IsLeaf RpcServerOptionIsLeaf
+ ServesMountTable RpcServerOptionServesMountTable
+ }
+ }
+)
+
+func (x RpcServerOptionIsLeaf) Index() int { return 0 }
+func (x RpcServerOptionIsLeaf) Interface() interface{} { return x.Value }
+func (x RpcServerOptionIsLeaf) Name() string { return "IsLeaf" }
+func (x RpcServerOptionIsLeaf) __VDLReflect(__RpcServerOptionReflect) {}
+
+func (m RpcServerOptionIsLeaf) FillVDLTarget(t vdl.Target, tt *vdl.Type) error {
+ fieldsTarget1, err := t.StartFields(tt)
+ if err != nil {
+ return err
+ }
+ keyTarget2, fieldTarget3, err := fieldsTarget1.StartField("IsLeaf")
+ if err != nil {
+ return err
+ }
+ if err := fieldTarget3.FromBool(bool(m.Value), tt.NonOptional().Field(0).Type); err != nil {
+ return err
+ }
+ if err := fieldsTarget1.FinishField(keyTarget2, fieldTarget3); err != nil {
+ return err
+ }
+ if err := t.FinishFields(fieldsTarget1); err != nil {
+ return err
+ }
+
+ return nil
+}
+
+func (m RpcServerOptionIsLeaf) MakeVDLTarget() vdl.Target {
+ return nil
+}
+
+func (x RpcServerOptionServesMountTable) Index() int { return 1 }
+func (x RpcServerOptionServesMountTable) Interface() interface{} { return x.Value }
+func (x RpcServerOptionServesMountTable) Name() string { return "ServesMountTable" }
+func (x RpcServerOptionServesMountTable) __VDLReflect(__RpcServerOptionReflect) {}
+
+func (m RpcServerOptionServesMountTable) FillVDLTarget(t vdl.Target, tt *vdl.Type) error {
+ fieldsTarget1, err := t.StartFields(tt)
+ if err != nil {
+ return err
+ }
+ keyTarget2, fieldTarget3, err := fieldsTarget1.StartField("ServesMountTable")
+ if err != nil {
+ return err
+ }
+ if err := fieldTarget3.FromBool(bool(m.Value), tt.NonOptional().Field(1).Type); err != nil {
+ return err
+ }
+ if err := fieldsTarget1.FinishField(keyTarget2, fieldTarget3); err != nil {
+ return err
+ }
+ if err := t.FinishFields(fieldsTarget1); err != nil {
+ return err
+ }
+
+ return nil
+}
+
+func (m RpcServerOptionServesMountTable) MakeVDLTarget() vdl.Target {
+ return nil
+}
+
+type RpcResponse struct {
+ OutArgs []*vom.RawBytes
+ TraceResponse vtrace.Response
+}
+
+func (RpcResponse) __VDLReflect(struct {
+ Name string `vdl:"v.io/x/ref/services/wspr/internal/app.RpcResponse"`
+}) {
+}
+
+func (m *RpcResponse) FillVDLTarget(t vdl.Target, tt *vdl.Type) error {
+ fieldsTarget1, err := t.StartFields(tt)
+ if err != nil {
+ return err
+ }
+
+ keyTarget2, fieldTarget3, err := fieldsTarget1.StartField("OutArgs")
+ if err != vdl.ErrFieldNoExist && err != nil {
+ return err
+ }
+ if err != vdl.ErrFieldNoExist {
+
+ listTarget4, err := fieldTarget3.StartList(tt.NonOptional().Field(0).Type, len(m.OutArgs))
+ if err != nil {
+ return err
+ }
+ for i, elem6 := range m.OutArgs {
+ elemTarget5, err := listTarget4.StartElem(i)
+ if err != nil {
+ return err
+ }
+
+ if elem6 == nil {
+ if err := elemTarget5.FromNil(tt.NonOptional().Field(0).Type.Elem()); err != nil {
+ return err
+ }
+ } else {
+ if err := elem6.FillVDLTarget(elemTarget5, tt.NonOptional().Field(0).Type.Elem()); err != nil {
+ return err
+ }
+ }
+ if err := listTarget4.FinishElem(elemTarget5); err != nil {
+ return err
+ }
+ }
+ if err := fieldTarget3.FinishList(listTarget4); err != nil {
+ return err
+ }
+ if err := fieldsTarget1.FinishField(keyTarget2, fieldTarget3); err != nil {
+ return err
+ }
+ }
+ keyTarget7, fieldTarget8, err := fieldsTarget1.StartField("TraceResponse")
+ if err != vdl.ErrFieldNoExist && err != nil {
+ return err
+ }
+ if err != vdl.ErrFieldNoExist {
+
+ if err := m.TraceResponse.FillVDLTarget(fieldTarget8, tt.NonOptional().Field(1).Type); err != nil {
+ return err
+ }
+ if err := fieldsTarget1.FinishField(keyTarget7, fieldTarget8); err != nil {
+ return err
+ }
+ }
+ if err := t.FinishFields(fieldsTarget1); err != nil {
+ return err
+ }
+ return nil
+}
+
+func (m *RpcResponse) MakeVDLTarget() vdl.Target {
+ return &RpcResponseTarget{Value: m}
+}
+
+type RpcResponseTarget struct {
+ Value *RpcResponse
+ outArgsTarget unnamed_5b5d616e79Target
+ traceResponseTarget vtrace.ResponseTarget
+ vdl.TargetBase
+ vdl.FieldsTargetBase
+}
+
+func (t *RpcResponseTarget) StartFields(tt *vdl.Type) (vdl.FieldsTarget, error) {
+
+ if ttWant := vdl.TypeOf((*RpcResponse)(nil)).Elem(); !vdl.Compatible(tt, ttWant) {
+ return nil, fmt.Errorf("type %v incompatible with %v", tt, ttWant)
+ }
+ return t, nil
+}
+func (t *RpcResponseTarget) StartField(name string) (key, field vdl.Target, _ error) {
+ switch name {
+ case "OutArgs":
+ t.outArgsTarget.Value = &t.Value.OutArgs
+ target, err := &t.outArgsTarget, error(nil)
+ return nil, target, err
+ case "TraceResponse":
+ t.traceResponseTarget.Value = &t.Value.TraceResponse
+ target, err := &t.traceResponseTarget, error(nil)
+ return nil, target, err
+ default:
+ return nil, nil, fmt.Errorf("field %s not in struct v.io/x/ref/services/wspr/internal/app.RpcResponse", name)
+ }
+}
+func (t *RpcResponseTarget) FinishField(_, _ vdl.Target) error {
+ return nil
+}
+func (t *RpcResponseTarget) FinishFields(_ vdl.FieldsTarget) error {
+
+ return nil
+}
+
+// []*vom.RawBytes
+type unnamed_5b5d616e79Target struct {
+ Value *[]*vom.RawBytes
+
+ vdl.TargetBase
+ vdl.ListTargetBase
+}
+
+func (t *unnamed_5b5d616e79Target) StartList(tt *vdl.Type, len int) (vdl.ListTarget, error) {
+
+ if ttWant := vdl.TypeOf((*[]*vom.RawBytes)(nil)); !vdl.Compatible(tt, ttWant) {
+ return nil, fmt.Errorf("type %v incompatible with %v", tt, ttWant)
+ }
+ if cap(*t.Value) < len {
+ *t.Value = make([]*vom.RawBytes, len)
+ } else {
+ *t.Value = (*t.Value)[:len]
+ }
+ return t, nil
+}
+func (t *unnamed_5b5d616e79Target) StartElem(index int) (elem vdl.Target, _ error) {
+ target, err := vdl.ReflectTarget(reflect.ValueOf(&(*t.Value)[index]))
+ return target, err
+}
+func (t *unnamed_5b5d616e79Target) FinishElem(elem vdl.Target) error {
+ return nil
+}
+func (t *unnamed_5b5d616e79Target) FinishList(elem vdl.ListTarget) error {
+
+ return nil
+}
+
type GranterRequest struct {
GranterHandle GranterHandle
Call server.SecurityCall
@@ -722,9 +725,6 @@
}
func (m *GranterRequest) FillVDLTarget(t vdl.Target, tt *vdl.Type) error {
- if __VDLType_v_io_x_ref_services_wspr_internal_app_GranterRequest == nil || __VDLType5 == nil {
- panic("Initialization order error: types generated for FillVDLTarget not initialized. Consider moving caller to an init() block.")
- }
fieldsTarget1, err := t.StartFields(tt)
if err != nil {
return err
@@ -736,7 +736,7 @@
}
if err != vdl.ErrFieldNoExist {
- if err := m.GranterHandle.FillVDLTarget(fieldTarget3, __VDLType_v_io_x_ref_services_wspr_internal_app_GranterHandle); err != nil {
+ if err := m.GranterHandle.FillVDLTarget(fieldTarget3, tt.NonOptional().Field(0).Type); err != nil {
return err
}
if err := fieldsTarget1.FinishField(keyTarget2, fieldTarget3); err != nil {
@@ -749,7 +749,7 @@
}
if err != vdl.ErrFieldNoExist {
- if err := m.Call.FillVDLTarget(fieldTarget5, __VDLType_v_io_x_ref_services_wspr_internal_rpc_server_SecurityCall); err != nil {
+ if err := m.Call.FillVDLTarget(fieldTarget5, tt.NonOptional().Field(1).Type); err != nil {
return err
}
if err := fieldsTarget1.FinishField(keyTarget4, fieldTarget5); err != nil {
@@ -776,8 +776,8 @@
func (t *GranterRequestTarget) StartFields(tt *vdl.Type) (vdl.FieldsTarget, error) {
- if !vdl.Compatible(tt, __VDLType_v_io_x_ref_services_wspr_internal_app_GranterRequest) {
- return nil, fmt.Errorf("type %v incompatible with %v", tt, __VDLType_v_io_x_ref_services_wspr_internal_app_GranterRequest)
+ if ttWant := vdl.TypeOf((*GranterRequest)(nil)).Elem(); !vdl.Compatible(tt, ttWant) {
+ return nil, fmt.Errorf("type %v incompatible with %v", tt, ttWant)
}
return t, nil
}
@@ -792,7 +792,7 @@
target, err := &t.callTarget, error(nil)
return nil, target, err
default:
- return nil, nil, fmt.Errorf("field %s not in struct %v", name, __VDLType_v_io_x_ref_services_wspr_internal_app_GranterRequest)
+ return nil, nil, fmt.Errorf("field %s not in struct v.io/x/ref/services/wspr/internal/app.GranterRequest", name)
}
}
func (t *GranterRequestTarget) FinishField(_, _ vdl.Target) error {
@@ -814,7 +814,6 @@
}
func (m *GranterResponse) FillVDLTarget(t vdl.Target, tt *vdl.Type) error {
- __VDLEnsureNativeBuilt()
fieldsTarget1, err := t.StartFields(tt)
if err != nil {
return err
@@ -831,7 +830,7 @@
}
if err != vdl.ErrFieldNoExist {
- if err := wireValue2.FillVDLTarget(fieldTarget4, __VDLType_v_io_v23_security_WireBlessings); err != nil {
+ if err := wireValue2.FillVDLTarget(fieldTarget4, tt.NonOptional().Field(0).Type); err != nil {
return err
}
if err := fieldsTarget1.FinishField(keyTarget3, fieldTarget4); err != nil {
@@ -845,7 +844,7 @@
if err != vdl.ErrFieldNoExist {
if m.Err == nil {
- if err := fieldTarget6.FromNil(vdl.ErrorType); err != nil {
+ if err := fieldTarget6.FromNil(tt.NonOptional().Field(1).Type); err != nil {
return err
}
} else {
@@ -882,8 +881,8 @@
func (t *GranterResponseTarget) StartFields(tt *vdl.Type) (vdl.FieldsTarget, error) {
- if !vdl.Compatible(tt, __VDLType_v_io_x_ref_services_wspr_internal_app_GranterResponse) {
- return nil, fmt.Errorf("type %v incompatible with %v", tt, __VDLType_v_io_x_ref_services_wspr_internal_app_GranterResponse)
+ if ttWant := vdl.TypeOf((*GranterResponse)(nil)).Elem(); !vdl.Compatible(tt, ttWant) {
+ return nil, fmt.Errorf("type %v incompatible with %v", tt, ttWant)
}
return t, nil
}
@@ -898,7 +897,7 @@
target, err := &t.errTarget, error(nil)
return nil, target, err
default:
- return nil, nil, fmt.Errorf("field %s not in struct %v", name, __VDLType_v_io_x_ref_services_wspr_internal_app_GranterResponse)
+ return nil, nil, fmt.Errorf("field %s not in struct v.io/x/ref/services/wspr/internal/app.GranterResponse", name)
}
}
func (t *GranterResponseTarget) FinishField(_, _ vdl.Target) error {
@@ -909,594 +908,8 @@
return nil
}
-func init() {
- vdl.Register((*RpcRequest)(nil))
- vdl.Register((*RpcCallOption)(nil))
- vdl.Register((*RpcServerOption)(nil))
- vdl.Register((*RpcResponse)(nil))
- vdl.Register((*GranterHandle)(nil))
- vdl.Register((*GranterRequest)(nil))
- vdl.Register((*GranterResponse)(nil))
-}
-
-var __VDLType5 *vdl.Type = vdl.TypeOf((*GranterRequest)(nil))
-var __VDLType6 *vdl.Type
-
-func __VDLType6_gen() *vdl.Type {
- __VDLType6Builder := vdl.TypeBuilder{}
-
- __VDLType61 := __VDLType6Builder.Optional()
- __VDLType62 := __VDLType6Builder.Struct()
- __VDLType63 := __VDLType6Builder.Named("v.io/x/ref/services/wspr/internal/app.GranterResponse").AssignBase(__VDLType62)
- __VDLType64 := __VDLType6Builder.Struct()
- __VDLType65 := __VDLType6Builder.Named("v.io/v23/security.WireBlessings").AssignBase(__VDLType64)
- __VDLType66 := __VDLType6Builder.List()
- __VDLType67 := __VDLType6Builder.List()
- __VDLType68 := __VDLType6Builder.Struct()
- __VDLType69 := __VDLType6Builder.Named("v.io/v23/security.Certificate").AssignBase(__VDLType68)
- __VDLType610 := vdl.StringType
- __VDLType68.AppendField("Extension", __VDLType610)
- __VDLType611 := __VDLType6Builder.List()
- __VDLType612 := vdl.ByteType
- __VDLType611.AssignElem(__VDLType612)
- __VDLType68.AppendField("PublicKey", __VDLType611)
- __VDLType613 := __VDLType6Builder.List()
- __VDLType614 := __VDLType6Builder.Struct()
- __VDLType615 := __VDLType6Builder.Named("v.io/v23/security.Caveat").AssignBase(__VDLType614)
- __VDLType616 := __VDLType6Builder.Array()
- __VDLType617 := __VDLType6Builder.Named("v.io/v23/uniqueid.Id").AssignBase(__VDLType616)
- __VDLType616.AssignElem(__VDLType612)
- __VDLType616.AssignLen(16)
- __VDLType614.AppendField("Id", __VDLType617)
- __VDLType614.AppendField("ParamVom", __VDLType611)
- __VDLType613.AssignElem(__VDLType615)
- __VDLType68.AppendField("Caveats", __VDLType613)
- __VDLType618 := __VDLType6Builder.Struct()
- __VDLType619 := __VDLType6Builder.Named("v.io/v23/security.Signature").AssignBase(__VDLType618)
- __VDLType618.AppendField("Purpose", __VDLType611)
- __VDLType620 := vdl.StringType
- __VDLType621 := __VDLType6Builder.Named("v.io/v23/security.Hash").AssignBase(__VDLType620)
- __VDLType618.AppendField("Hash", __VDLType621)
- __VDLType618.AppendField("R", __VDLType611)
- __VDLType618.AppendField("S", __VDLType611)
- __VDLType68.AppendField("Signature", __VDLType619)
- __VDLType67.AssignElem(__VDLType69)
- __VDLType66.AssignElem(__VDLType67)
- __VDLType64.AppendField("CertificateChains", __VDLType66)
- __VDLType62.AppendField("Blessings", __VDLType65)
- __VDLType622 := __VDLType6Builder.Optional()
- __VDLType623 := __VDLType6Builder.Struct()
- __VDLType624 := __VDLType6Builder.Named("error").AssignBase(__VDLType623)
- __VDLType623.AppendField("Id", __VDLType610)
- __VDLType625 := __VDLType6Builder.Enum()
- __VDLType625.AppendLabel("NoRetry")
- __VDLType625.AppendLabel("RetryConnection")
- __VDLType625.AppendLabel("RetryRefetch")
- __VDLType625.AppendLabel("RetryBackoff")
- __VDLType623.AppendField("RetryCode", __VDLType625)
- __VDLType623.AppendField("Msg", __VDLType610)
- __VDLType626 := __VDLType6Builder.List()
- __VDLType627 := vdl.AnyType
- __VDLType626.AssignElem(__VDLType627)
- __VDLType623.AppendField("ParamList", __VDLType626)
- __VDLType622.AssignElem(__VDLType624)
- __VDLType62.AppendField("Err", __VDLType622)
- __VDLType61.AssignElem(__VDLType63)
- __VDLType6Builder.Build()
- __VDLType6v, err := __VDLType61.Built()
- if err != nil {
- panic(err)
- }
- return __VDLType6v
-}
-func init() {
- __VDLType6 = __VDLType6_gen()
-}
-
-var __VDLType0 *vdl.Type
-
-func __VDLType0_gen() *vdl.Type {
- __VDLType0Builder := vdl.TypeBuilder{}
-
- __VDLType01 := __VDLType0Builder.Optional()
- __VDLType02 := __VDLType0Builder.Struct()
- __VDLType03 := __VDLType0Builder.Named("v.io/x/ref/services/wspr/internal/app.RpcRequest").AssignBase(__VDLType02)
- __VDLType04 := vdl.StringType
- __VDLType02.AppendField("Name", __VDLType04)
- __VDLType02.AppendField("Method", __VDLType04)
- __VDLType05 := vdl.Int32Type
- __VDLType02.AppendField("NumInArgs", __VDLType05)
- __VDLType02.AppendField("NumOutArgs", __VDLType05)
- __VDLType06 := vdl.BoolType
- __VDLType02.AppendField("IsStreaming", __VDLType06)
- __VDLType07 := __VDLType0Builder.Struct()
- __VDLType08 := __VDLType0Builder.Named("time.WireDeadline").AssignBase(__VDLType07)
- __VDLType09 := __VDLType0Builder.Struct()
- __VDLType010 := __VDLType0Builder.Named("time.Duration").AssignBase(__VDLType09)
- __VDLType011 := vdl.Int64Type
- __VDLType09.AppendField("Seconds", __VDLType011)
- __VDLType09.AppendField("Nanos", __VDLType05)
- __VDLType07.AppendField("FromNow", __VDLType010)
- __VDLType07.AppendField("NoDeadline", __VDLType06)
- __VDLType02.AppendField("Deadline", __VDLType08)
- __VDLType012 := __VDLType0Builder.Struct()
- __VDLType013 := __VDLType0Builder.Named("v.io/v23/vtrace.Request").AssignBase(__VDLType012)
- __VDLType014 := __VDLType0Builder.Array()
- __VDLType015 := __VDLType0Builder.Named("v.io/v23/uniqueid.Id").AssignBase(__VDLType014)
- __VDLType016 := vdl.ByteType
- __VDLType014.AssignElem(__VDLType016)
- __VDLType014.AssignLen(16)
- __VDLType012.AppendField("SpanId", __VDLType015)
- __VDLType012.AppendField("TraceId", __VDLType015)
- __VDLType017 := vdl.Int32Type
- __VDLType018 := __VDLType0Builder.Named("v.io/v23/vtrace.TraceFlags").AssignBase(__VDLType017)
- __VDLType012.AppendField("Flags", __VDLType018)
- __VDLType012.AppendField("LogLevel", __VDLType05)
- __VDLType02.AppendField("TraceRequest", __VDLType013)
- __VDLType019 := __VDLType0Builder.Struct()
- __VDLType020 := __VDLType0Builder.Named("v.io/x/ref/services/wspr/internal/rpc/server.Context").AssignBase(__VDLType019)
- __VDLType019.AppendField("Language", __VDLType04)
- __VDLType02.AppendField("Context", __VDLType020)
- __VDLType021 := __VDLType0Builder.List()
- __VDLType022 := __VDLType0Builder.Union()
- __VDLType023 := __VDLType0Builder.Named("v.io/x/ref/services/wspr/internal/app.RpcCallOption").AssignBase(__VDLType022)
- __VDLType024 := __VDLType0Builder.List()
- __VDLType025 := vdl.StringType
- __VDLType026 := __VDLType0Builder.Named("v.io/v23/security.BlessingPattern").AssignBase(__VDLType025)
- __VDLType024.AssignElem(__VDLType026)
- __VDLType022.AppendField("AllowedServersPolicy", __VDLType024)
- __VDLType027 := vdl.Int32Type
- __VDLType028 := __VDLType0Builder.Named("v.io/x/ref/services/wspr/internal/app.GranterHandle").AssignBase(__VDLType027)
- __VDLType022.AppendField("Granter", __VDLType028)
- __VDLType021.AssignElem(__VDLType023)
- __VDLType02.AppendField("CallOptions", __VDLType021)
- __VDLType01.AssignElem(__VDLType03)
- __VDLType0Builder.Build()
- __VDLType0v, err := __VDLType01.Built()
- if err != nil {
- panic(err)
- }
- return __VDLType0v
-}
-func init() {
- __VDLType0 = __VDLType0_gen()
-}
-
-var __VDLType3 *vdl.Type
-
-func __VDLType3_gen() *vdl.Type {
- __VDLType3Builder := vdl.TypeBuilder{}
-
- __VDLType31 := __VDLType3Builder.Optional()
- __VDLType32 := __VDLType3Builder.Struct()
- __VDLType33 := __VDLType3Builder.Named("v.io/x/ref/services/wspr/internal/app.RpcResponse").AssignBase(__VDLType32)
- __VDLType34 := __VDLType3Builder.List()
- __VDLType35 := vdl.AnyType
- __VDLType34.AssignElem(__VDLType35)
- __VDLType32.AppendField("OutArgs", __VDLType34)
- __VDLType36 := __VDLType3Builder.Struct()
- __VDLType37 := __VDLType3Builder.Named("v.io/v23/vtrace.Response").AssignBase(__VDLType36)
- __VDLType38 := vdl.Int32Type
- __VDLType39 := __VDLType3Builder.Named("v.io/v23/vtrace.TraceFlags").AssignBase(__VDLType38)
- __VDLType36.AppendField("Flags", __VDLType39)
- __VDLType310 := __VDLType3Builder.Struct()
- __VDLType311 := __VDLType3Builder.Named("v.io/v23/vtrace.TraceRecord").AssignBase(__VDLType310)
- __VDLType312 := __VDLType3Builder.Array()
- __VDLType313 := __VDLType3Builder.Named("v.io/v23/uniqueid.Id").AssignBase(__VDLType312)
- __VDLType314 := vdl.ByteType
- __VDLType312.AssignElem(__VDLType314)
- __VDLType312.AssignLen(16)
- __VDLType310.AppendField("Id", __VDLType313)
- __VDLType315 := __VDLType3Builder.List()
- __VDLType316 := __VDLType3Builder.Struct()
- __VDLType317 := __VDLType3Builder.Named("v.io/v23/vtrace.SpanRecord").AssignBase(__VDLType316)
- __VDLType316.AppendField("Id", __VDLType313)
- __VDLType316.AppendField("Parent", __VDLType313)
- __VDLType318 := vdl.StringType
- __VDLType316.AppendField("Name", __VDLType318)
- __VDLType319 := __VDLType3Builder.Struct()
- __VDLType320 := __VDLType3Builder.Named("time.Time").AssignBase(__VDLType319)
- __VDLType321 := vdl.Int64Type
- __VDLType319.AppendField("Seconds", __VDLType321)
- __VDLType322 := vdl.Int32Type
- __VDLType319.AppendField("Nanos", __VDLType322)
- __VDLType316.AppendField("Start", __VDLType320)
- __VDLType316.AppendField("End", __VDLType320)
- __VDLType323 := __VDLType3Builder.List()
- __VDLType324 := __VDLType3Builder.Struct()
- __VDLType325 := __VDLType3Builder.Named("v.io/v23/vtrace.Annotation").AssignBase(__VDLType324)
- __VDLType324.AppendField("When", __VDLType320)
- __VDLType324.AppendField("Message", __VDLType318)
- __VDLType323.AssignElem(__VDLType325)
- __VDLType316.AppendField("Annotations", __VDLType323)
- __VDLType315.AssignElem(__VDLType317)
- __VDLType310.AppendField("Spans", __VDLType315)
- __VDLType36.AppendField("Trace", __VDLType311)
- __VDLType32.AppendField("TraceResponse", __VDLType37)
- __VDLType31.AssignElem(__VDLType33)
- __VDLType3Builder.Build()
- __VDLType3v, err := __VDLType31.Built()
- if err != nil {
- panic(err)
- }
- return __VDLType3v
-}
-func init() {
- __VDLType3 = __VDLType3_gen()
-}
-
-var __VDLType4 *vdl.Type = vdl.TypeOf([]*vom.RawBytes(nil))
-var __VDLType2 *vdl.Type = vdl.TypeOf([]security.BlessingPattern(nil))
-var __VDLType1 *vdl.Type = vdl.TypeOf([]RpcCallOption(nil))
-var __VDLType_time_WireDeadline *vdl.Type
-
-func __VDLType_time_WireDeadline_gen() *vdl.Type {
- __VDLType_time_WireDeadlineBuilder := vdl.TypeBuilder{}
-
- __VDLType_time_WireDeadline1 := __VDLType_time_WireDeadlineBuilder.Struct()
- __VDLType_time_WireDeadline2 := __VDLType_time_WireDeadlineBuilder.Named("time.WireDeadline").AssignBase(__VDLType_time_WireDeadline1)
- __VDLType_time_WireDeadline3 := __VDLType_time_WireDeadlineBuilder.Struct()
- __VDLType_time_WireDeadline4 := __VDLType_time_WireDeadlineBuilder.Named("time.Duration").AssignBase(__VDLType_time_WireDeadline3)
- __VDLType_time_WireDeadline5 := vdl.Int64Type
- __VDLType_time_WireDeadline3.AppendField("Seconds", __VDLType_time_WireDeadline5)
- __VDLType_time_WireDeadline6 := vdl.Int32Type
- __VDLType_time_WireDeadline3.AppendField("Nanos", __VDLType_time_WireDeadline6)
- __VDLType_time_WireDeadline1.AppendField("FromNow", __VDLType_time_WireDeadline4)
- __VDLType_time_WireDeadline7 := vdl.BoolType
- __VDLType_time_WireDeadline1.AppendField("NoDeadline", __VDLType_time_WireDeadline7)
- __VDLType_time_WireDeadlineBuilder.Build()
- __VDLType_time_WireDeadlinev, err := __VDLType_time_WireDeadline2.Built()
- if err != nil {
- panic(err)
- }
- return __VDLType_time_WireDeadlinev
-}
-func init() {
- __VDLType_time_WireDeadline = __VDLType_time_WireDeadline_gen()
-}
-
-var __VDLType_v_io_v23_security_BlessingPattern *vdl.Type = vdl.TypeOf(security.BlessingPattern(""))
-var __VDLType_v_io_v23_security_WireBlessings *vdl.Type
-
-func __VDLType_v_io_v23_security_WireBlessings_gen() *vdl.Type {
- __VDLType_v_io_v23_security_WireBlessingsBuilder := vdl.TypeBuilder{}
-
- __VDLType_v_io_v23_security_WireBlessings1 := __VDLType_v_io_v23_security_WireBlessingsBuilder.Struct()
- __VDLType_v_io_v23_security_WireBlessings2 := __VDLType_v_io_v23_security_WireBlessingsBuilder.Named("v.io/v23/security.WireBlessings").AssignBase(__VDLType_v_io_v23_security_WireBlessings1)
- __VDLType_v_io_v23_security_WireBlessings3 := __VDLType_v_io_v23_security_WireBlessingsBuilder.List()
- __VDLType_v_io_v23_security_WireBlessings4 := __VDLType_v_io_v23_security_WireBlessingsBuilder.List()
- __VDLType_v_io_v23_security_WireBlessings5 := __VDLType_v_io_v23_security_WireBlessingsBuilder.Struct()
- __VDLType_v_io_v23_security_WireBlessings6 := __VDLType_v_io_v23_security_WireBlessingsBuilder.Named("v.io/v23/security.Certificate").AssignBase(__VDLType_v_io_v23_security_WireBlessings5)
- __VDLType_v_io_v23_security_WireBlessings7 := vdl.StringType
- __VDLType_v_io_v23_security_WireBlessings5.AppendField("Extension", __VDLType_v_io_v23_security_WireBlessings7)
- __VDLType_v_io_v23_security_WireBlessings8 := __VDLType_v_io_v23_security_WireBlessingsBuilder.List()
- __VDLType_v_io_v23_security_WireBlessings9 := vdl.ByteType
- __VDLType_v_io_v23_security_WireBlessings8.AssignElem(__VDLType_v_io_v23_security_WireBlessings9)
- __VDLType_v_io_v23_security_WireBlessings5.AppendField("PublicKey", __VDLType_v_io_v23_security_WireBlessings8)
- __VDLType_v_io_v23_security_WireBlessings10 := __VDLType_v_io_v23_security_WireBlessingsBuilder.List()
- __VDLType_v_io_v23_security_WireBlessings11 := __VDLType_v_io_v23_security_WireBlessingsBuilder.Struct()
- __VDLType_v_io_v23_security_WireBlessings12 := __VDLType_v_io_v23_security_WireBlessingsBuilder.Named("v.io/v23/security.Caveat").AssignBase(__VDLType_v_io_v23_security_WireBlessings11)
- __VDLType_v_io_v23_security_WireBlessings13 := __VDLType_v_io_v23_security_WireBlessingsBuilder.Array()
- __VDLType_v_io_v23_security_WireBlessings14 := __VDLType_v_io_v23_security_WireBlessingsBuilder.Named("v.io/v23/uniqueid.Id").AssignBase(__VDLType_v_io_v23_security_WireBlessings13)
- __VDLType_v_io_v23_security_WireBlessings13.AssignElem(__VDLType_v_io_v23_security_WireBlessings9)
- __VDLType_v_io_v23_security_WireBlessings13.AssignLen(16)
- __VDLType_v_io_v23_security_WireBlessings11.AppendField("Id", __VDLType_v_io_v23_security_WireBlessings14)
- __VDLType_v_io_v23_security_WireBlessings11.AppendField("ParamVom", __VDLType_v_io_v23_security_WireBlessings8)
- __VDLType_v_io_v23_security_WireBlessings10.AssignElem(__VDLType_v_io_v23_security_WireBlessings12)
- __VDLType_v_io_v23_security_WireBlessings5.AppendField("Caveats", __VDLType_v_io_v23_security_WireBlessings10)
- __VDLType_v_io_v23_security_WireBlessings15 := __VDLType_v_io_v23_security_WireBlessingsBuilder.Struct()
- __VDLType_v_io_v23_security_WireBlessings16 := __VDLType_v_io_v23_security_WireBlessingsBuilder.Named("v.io/v23/security.Signature").AssignBase(__VDLType_v_io_v23_security_WireBlessings15)
- __VDLType_v_io_v23_security_WireBlessings15.AppendField("Purpose", __VDLType_v_io_v23_security_WireBlessings8)
- __VDLType_v_io_v23_security_WireBlessings17 := vdl.StringType
- __VDLType_v_io_v23_security_WireBlessings18 := __VDLType_v_io_v23_security_WireBlessingsBuilder.Named("v.io/v23/security.Hash").AssignBase(__VDLType_v_io_v23_security_WireBlessings17)
- __VDLType_v_io_v23_security_WireBlessings15.AppendField("Hash", __VDLType_v_io_v23_security_WireBlessings18)
- __VDLType_v_io_v23_security_WireBlessings15.AppendField("R", __VDLType_v_io_v23_security_WireBlessings8)
- __VDLType_v_io_v23_security_WireBlessings15.AppendField("S", __VDLType_v_io_v23_security_WireBlessings8)
- __VDLType_v_io_v23_security_WireBlessings5.AppendField("Signature", __VDLType_v_io_v23_security_WireBlessings16)
- __VDLType_v_io_v23_security_WireBlessings4.AssignElem(__VDLType_v_io_v23_security_WireBlessings6)
- __VDLType_v_io_v23_security_WireBlessings3.AssignElem(__VDLType_v_io_v23_security_WireBlessings4)
- __VDLType_v_io_v23_security_WireBlessings1.AppendField("CertificateChains", __VDLType_v_io_v23_security_WireBlessings3)
- __VDLType_v_io_v23_security_WireBlessingsBuilder.Build()
- __VDLType_v_io_v23_security_WireBlessingsv, err := __VDLType_v_io_v23_security_WireBlessings2.Built()
- if err != nil {
- panic(err)
- }
- return __VDLType_v_io_v23_security_WireBlessingsv
-}
-func init() {
- __VDLType_v_io_v23_security_WireBlessings = __VDLType_v_io_v23_security_WireBlessings_gen()
-}
-
-var __VDLType_v_io_v23_vtrace_Request *vdl.Type = vdl.TypeOf(vtrace.Request{})
-var __VDLType_v_io_v23_vtrace_Response *vdl.Type
-
-func __VDLType_v_io_v23_vtrace_Response_gen() *vdl.Type {
- __VDLType_v_io_v23_vtrace_ResponseBuilder := vdl.TypeBuilder{}
-
- __VDLType_v_io_v23_vtrace_Response1 := __VDLType_v_io_v23_vtrace_ResponseBuilder.Struct()
- __VDLType_v_io_v23_vtrace_Response2 := __VDLType_v_io_v23_vtrace_ResponseBuilder.Named("v.io/v23/vtrace.Response").AssignBase(__VDLType_v_io_v23_vtrace_Response1)
- __VDLType_v_io_v23_vtrace_Response3 := vdl.Int32Type
- __VDLType_v_io_v23_vtrace_Response4 := __VDLType_v_io_v23_vtrace_ResponseBuilder.Named("v.io/v23/vtrace.TraceFlags").AssignBase(__VDLType_v_io_v23_vtrace_Response3)
- __VDLType_v_io_v23_vtrace_Response1.AppendField("Flags", __VDLType_v_io_v23_vtrace_Response4)
- __VDLType_v_io_v23_vtrace_Response5 := __VDLType_v_io_v23_vtrace_ResponseBuilder.Struct()
- __VDLType_v_io_v23_vtrace_Response6 := __VDLType_v_io_v23_vtrace_ResponseBuilder.Named("v.io/v23/vtrace.TraceRecord").AssignBase(__VDLType_v_io_v23_vtrace_Response5)
- __VDLType_v_io_v23_vtrace_Response7 := __VDLType_v_io_v23_vtrace_ResponseBuilder.Array()
- __VDLType_v_io_v23_vtrace_Response8 := __VDLType_v_io_v23_vtrace_ResponseBuilder.Named("v.io/v23/uniqueid.Id").AssignBase(__VDLType_v_io_v23_vtrace_Response7)
- __VDLType_v_io_v23_vtrace_Response9 := vdl.ByteType
- __VDLType_v_io_v23_vtrace_Response7.AssignElem(__VDLType_v_io_v23_vtrace_Response9)
- __VDLType_v_io_v23_vtrace_Response7.AssignLen(16)
- __VDLType_v_io_v23_vtrace_Response5.AppendField("Id", __VDLType_v_io_v23_vtrace_Response8)
- __VDLType_v_io_v23_vtrace_Response10 := __VDLType_v_io_v23_vtrace_ResponseBuilder.List()
- __VDLType_v_io_v23_vtrace_Response11 := __VDLType_v_io_v23_vtrace_ResponseBuilder.Struct()
- __VDLType_v_io_v23_vtrace_Response12 := __VDLType_v_io_v23_vtrace_ResponseBuilder.Named("v.io/v23/vtrace.SpanRecord").AssignBase(__VDLType_v_io_v23_vtrace_Response11)
- __VDLType_v_io_v23_vtrace_Response11.AppendField("Id", __VDLType_v_io_v23_vtrace_Response8)
- __VDLType_v_io_v23_vtrace_Response11.AppendField("Parent", __VDLType_v_io_v23_vtrace_Response8)
- __VDLType_v_io_v23_vtrace_Response13 := vdl.StringType
- __VDLType_v_io_v23_vtrace_Response11.AppendField("Name", __VDLType_v_io_v23_vtrace_Response13)
- __VDLType_v_io_v23_vtrace_Response14 := __VDLType_v_io_v23_vtrace_ResponseBuilder.Struct()
- __VDLType_v_io_v23_vtrace_Response15 := __VDLType_v_io_v23_vtrace_ResponseBuilder.Named("time.Time").AssignBase(__VDLType_v_io_v23_vtrace_Response14)
- __VDLType_v_io_v23_vtrace_Response16 := vdl.Int64Type
- __VDLType_v_io_v23_vtrace_Response14.AppendField("Seconds", __VDLType_v_io_v23_vtrace_Response16)
- __VDLType_v_io_v23_vtrace_Response17 := vdl.Int32Type
- __VDLType_v_io_v23_vtrace_Response14.AppendField("Nanos", __VDLType_v_io_v23_vtrace_Response17)
- __VDLType_v_io_v23_vtrace_Response11.AppendField("Start", __VDLType_v_io_v23_vtrace_Response15)
- __VDLType_v_io_v23_vtrace_Response11.AppendField("End", __VDLType_v_io_v23_vtrace_Response15)
- __VDLType_v_io_v23_vtrace_Response18 := __VDLType_v_io_v23_vtrace_ResponseBuilder.List()
- __VDLType_v_io_v23_vtrace_Response19 := __VDLType_v_io_v23_vtrace_ResponseBuilder.Struct()
- __VDLType_v_io_v23_vtrace_Response20 := __VDLType_v_io_v23_vtrace_ResponseBuilder.Named("v.io/v23/vtrace.Annotation").AssignBase(__VDLType_v_io_v23_vtrace_Response19)
- __VDLType_v_io_v23_vtrace_Response19.AppendField("When", __VDLType_v_io_v23_vtrace_Response15)
- __VDLType_v_io_v23_vtrace_Response19.AppendField("Message", __VDLType_v_io_v23_vtrace_Response13)
- __VDLType_v_io_v23_vtrace_Response18.AssignElem(__VDLType_v_io_v23_vtrace_Response20)
- __VDLType_v_io_v23_vtrace_Response11.AppendField("Annotations", __VDLType_v_io_v23_vtrace_Response18)
- __VDLType_v_io_v23_vtrace_Response10.AssignElem(__VDLType_v_io_v23_vtrace_Response12)
- __VDLType_v_io_v23_vtrace_Response5.AppendField("Spans", __VDLType_v_io_v23_vtrace_Response10)
- __VDLType_v_io_v23_vtrace_Response1.AppendField("Trace", __VDLType_v_io_v23_vtrace_Response6)
- __VDLType_v_io_v23_vtrace_ResponseBuilder.Build()
- __VDLType_v_io_v23_vtrace_Responsev, err := __VDLType_v_io_v23_vtrace_Response2.Built()
- if err != nil {
- panic(err)
- }
- return __VDLType_v_io_v23_vtrace_Responsev
-}
-func init() {
- __VDLType_v_io_v23_vtrace_Response = __VDLType_v_io_v23_vtrace_Response_gen()
-}
-
-var __VDLType_v_io_x_ref_services_wspr_internal_app_GranterHandle *vdl.Type = vdl.TypeOf(GranterHandle(0))
-var __VDLType_v_io_x_ref_services_wspr_internal_app_GranterRequest *vdl.Type = vdl.TypeOf(GranterRequest{})
-var __VDLType_v_io_x_ref_services_wspr_internal_app_GranterResponse *vdl.Type
-
-func __VDLType_v_io_x_ref_services_wspr_internal_app_GranterResponse_gen() *vdl.Type {
- __VDLType_v_io_x_ref_services_wspr_internal_app_GranterResponseBuilder := vdl.TypeBuilder{}
-
- __VDLType_v_io_x_ref_services_wspr_internal_app_GranterResponse1 := __VDLType_v_io_x_ref_services_wspr_internal_app_GranterResponseBuilder.Struct()
- __VDLType_v_io_x_ref_services_wspr_internal_app_GranterResponse2 := __VDLType_v_io_x_ref_services_wspr_internal_app_GranterResponseBuilder.Named("v.io/x/ref/services/wspr/internal/app.GranterResponse").AssignBase(__VDLType_v_io_x_ref_services_wspr_internal_app_GranterResponse1)
- __VDLType_v_io_x_ref_services_wspr_internal_app_GranterResponse3 := __VDLType_v_io_x_ref_services_wspr_internal_app_GranterResponseBuilder.Struct()
- __VDLType_v_io_x_ref_services_wspr_internal_app_GranterResponse4 := __VDLType_v_io_x_ref_services_wspr_internal_app_GranterResponseBuilder.Named("v.io/v23/security.WireBlessings").AssignBase(__VDLType_v_io_x_ref_services_wspr_internal_app_GranterResponse3)
- __VDLType_v_io_x_ref_services_wspr_internal_app_GranterResponse5 := __VDLType_v_io_x_ref_services_wspr_internal_app_GranterResponseBuilder.List()
- __VDLType_v_io_x_ref_services_wspr_internal_app_GranterResponse6 := __VDLType_v_io_x_ref_services_wspr_internal_app_GranterResponseBuilder.List()
- __VDLType_v_io_x_ref_services_wspr_internal_app_GranterResponse7 := __VDLType_v_io_x_ref_services_wspr_internal_app_GranterResponseBuilder.Struct()
- __VDLType_v_io_x_ref_services_wspr_internal_app_GranterResponse8 := __VDLType_v_io_x_ref_services_wspr_internal_app_GranterResponseBuilder.Named("v.io/v23/security.Certificate").AssignBase(__VDLType_v_io_x_ref_services_wspr_internal_app_GranterResponse7)
- __VDLType_v_io_x_ref_services_wspr_internal_app_GranterResponse9 := vdl.StringType
- __VDLType_v_io_x_ref_services_wspr_internal_app_GranterResponse7.AppendField("Extension", __VDLType_v_io_x_ref_services_wspr_internal_app_GranterResponse9)
- __VDLType_v_io_x_ref_services_wspr_internal_app_GranterResponse10 := __VDLType_v_io_x_ref_services_wspr_internal_app_GranterResponseBuilder.List()
- __VDLType_v_io_x_ref_services_wspr_internal_app_GranterResponse11 := vdl.ByteType
- __VDLType_v_io_x_ref_services_wspr_internal_app_GranterResponse10.AssignElem(__VDLType_v_io_x_ref_services_wspr_internal_app_GranterResponse11)
- __VDLType_v_io_x_ref_services_wspr_internal_app_GranterResponse7.AppendField("PublicKey", __VDLType_v_io_x_ref_services_wspr_internal_app_GranterResponse10)
- __VDLType_v_io_x_ref_services_wspr_internal_app_GranterResponse12 := __VDLType_v_io_x_ref_services_wspr_internal_app_GranterResponseBuilder.List()
- __VDLType_v_io_x_ref_services_wspr_internal_app_GranterResponse13 := __VDLType_v_io_x_ref_services_wspr_internal_app_GranterResponseBuilder.Struct()
- __VDLType_v_io_x_ref_services_wspr_internal_app_GranterResponse14 := __VDLType_v_io_x_ref_services_wspr_internal_app_GranterResponseBuilder.Named("v.io/v23/security.Caveat").AssignBase(__VDLType_v_io_x_ref_services_wspr_internal_app_GranterResponse13)
- __VDLType_v_io_x_ref_services_wspr_internal_app_GranterResponse15 := __VDLType_v_io_x_ref_services_wspr_internal_app_GranterResponseBuilder.Array()
- __VDLType_v_io_x_ref_services_wspr_internal_app_GranterResponse16 := __VDLType_v_io_x_ref_services_wspr_internal_app_GranterResponseBuilder.Named("v.io/v23/uniqueid.Id").AssignBase(__VDLType_v_io_x_ref_services_wspr_internal_app_GranterResponse15)
- __VDLType_v_io_x_ref_services_wspr_internal_app_GranterResponse15.AssignElem(__VDLType_v_io_x_ref_services_wspr_internal_app_GranterResponse11)
- __VDLType_v_io_x_ref_services_wspr_internal_app_GranterResponse15.AssignLen(16)
- __VDLType_v_io_x_ref_services_wspr_internal_app_GranterResponse13.AppendField("Id", __VDLType_v_io_x_ref_services_wspr_internal_app_GranterResponse16)
- __VDLType_v_io_x_ref_services_wspr_internal_app_GranterResponse13.AppendField("ParamVom", __VDLType_v_io_x_ref_services_wspr_internal_app_GranterResponse10)
- __VDLType_v_io_x_ref_services_wspr_internal_app_GranterResponse12.AssignElem(__VDLType_v_io_x_ref_services_wspr_internal_app_GranterResponse14)
- __VDLType_v_io_x_ref_services_wspr_internal_app_GranterResponse7.AppendField("Caveats", __VDLType_v_io_x_ref_services_wspr_internal_app_GranterResponse12)
- __VDLType_v_io_x_ref_services_wspr_internal_app_GranterResponse17 := __VDLType_v_io_x_ref_services_wspr_internal_app_GranterResponseBuilder.Struct()
- __VDLType_v_io_x_ref_services_wspr_internal_app_GranterResponse18 := __VDLType_v_io_x_ref_services_wspr_internal_app_GranterResponseBuilder.Named("v.io/v23/security.Signature").AssignBase(__VDLType_v_io_x_ref_services_wspr_internal_app_GranterResponse17)
- __VDLType_v_io_x_ref_services_wspr_internal_app_GranterResponse17.AppendField("Purpose", __VDLType_v_io_x_ref_services_wspr_internal_app_GranterResponse10)
- __VDLType_v_io_x_ref_services_wspr_internal_app_GranterResponse19 := vdl.StringType
- __VDLType_v_io_x_ref_services_wspr_internal_app_GranterResponse20 := __VDLType_v_io_x_ref_services_wspr_internal_app_GranterResponseBuilder.Named("v.io/v23/security.Hash").AssignBase(__VDLType_v_io_x_ref_services_wspr_internal_app_GranterResponse19)
- __VDLType_v_io_x_ref_services_wspr_internal_app_GranterResponse17.AppendField("Hash", __VDLType_v_io_x_ref_services_wspr_internal_app_GranterResponse20)
- __VDLType_v_io_x_ref_services_wspr_internal_app_GranterResponse17.AppendField("R", __VDLType_v_io_x_ref_services_wspr_internal_app_GranterResponse10)
- __VDLType_v_io_x_ref_services_wspr_internal_app_GranterResponse17.AppendField("S", __VDLType_v_io_x_ref_services_wspr_internal_app_GranterResponse10)
- __VDLType_v_io_x_ref_services_wspr_internal_app_GranterResponse7.AppendField("Signature", __VDLType_v_io_x_ref_services_wspr_internal_app_GranterResponse18)
- __VDLType_v_io_x_ref_services_wspr_internal_app_GranterResponse6.AssignElem(__VDLType_v_io_x_ref_services_wspr_internal_app_GranterResponse8)
- __VDLType_v_io_x_ref_services_wspr_internal_app_GranterResponse5.AssignElem(__VDLType_v_io_x_ref_services_wspr_internal_app_GranterResponse6)
- __VDLType_v_io_x_ref_services_wspr_internal_app_GranterResponse3.AppendField("CertificateChains", __VDLType_v_io_x_ref_services_wspr_internal_app_GranterResponse5)
- __VDLType_v_io_x_ref_services_wspr_internal_app_GranterResponse1.AppendField("Blessings", __VDLType_v_io_x_ref_services_wspr_internal_app_GranterResponse4)
- __VDLType_v_io_x_ref_services_wspr_internal_app_GranterResponse21 := __VDLType_v_io_x_ref_services_wspr_internal_app_GranterResponseBuilder.Optional()
- __VDLType_v_io_x_ref_services_wspr_internal_app_GranterResponse22 := __VDLType_v_io_x_ref_services_wspr_internal_app_GranterResponseBuilder.Struct()
- __VDLType_v_io_x_ref_services_wspr_internal_app_GranterResponse23 := __VDLType_v_io_x_ref_services_wspr_internal_app_GranterResponseBuilder.Named("error").AssignBase(__VDLType_v_io_x_ref_services_wspr_internal_app_GranterResponse22)
- __VDLType_v_io_x_ref_services_wspr_internal_app_GranterResponse22.AppendField("Id", __VDLType_v_io_x_ref_services_wspr_internal_app_GranterResponse9)
- __VDLType_v_io_x_ref_services_wspr_internal_app_GranterResponse24 := __VDLType_v_io_x_ref_services_wspr_internal_app_GranterResponseBuilder.Enum()
- __VDLType_v_io_x_ref_services_wspr_internal_app_GranterResponse24.AppendLabel("NoRetry")
- __VDLType_v_io_x_ref_services_wspr_internal_app_GranterResponse24.AppendLabel("RetryConnection")
- __VDLType_v_io_x_ref_services_wspr_internal_app_GranterResponse24.AppendLabel("RetryRefetch")
- __VDLType_v_io_x_ref_services_wspr_internal_app_GranterResponse24.AppendLabel("RetryBackoff")
- __VDLType_v_io_x_ref_services_wspr_internal_app_GranterResponse22.AppendField("RetryCode", __VDLType_v_io_x_ref_services_wspr_internal_app_GranterResponse24)
- __VDLType_v_io_x_ref_services_wspr_internal_app_GranterResponse22.AppendField("Msg", __VDLType_v_io_x_ref_services_wspr_internal_app_GranterResponse9)
- __VDLType_v_io_x_ref_services_wspr_internal_app_GranterResponse25 := __VDLType_v_io_x_ref_services_wspr_internal_app_GranterResponseBuilder.List()
- __VDLType_v_io_x_ref_services_wspr_internal_app_GranterResponse26 := vdl.AnyType
- __VDLType_v_io_x_ref_services_wspr_internal_app_GranterResponse25.AssignElem(__VDLType_v_io_x_ref_services_wspr_internal_app_GranterResponse26)
- __VDLType_v_io_x_ref_services_wspr_internal_app_GranterResponse22.AppendField("ParamList", __VDLType_v_io_x_ref_services_wspr_internal_app_GranterResponse25)
- __VDLType_v_io_x_ref_services_wspr_internal_app_GranterResponse21.AssignElem(__VDLType_v_io_x_ref_services_wspr_internal_app_GranterResponse23)
- __VDLType_v_io_x_ref_services_wspr_internal_app_GranterResponse1.AppendField("Err", __VDLType_v_io_x_ref_services_wspr_internal_app_GranterResponse21)
- __VDLType_v_io_x_ref_services_wspr_internal_app_GranterResponseBuilder.Build()
- __VDLType_v_io_x_ref_services_wspr_internal_app_GranterResponsev, err := __VDLType_v_io_x_ref_services_wspr_internal_app_GranterResponse2.Built()
- if err != nil {
- panic(err)
- }
- return __VDLType_v_io_x_ref_services_wspr_internal_app_GranterResponsev
-}
-func init() {
- __VDLType_v_io_x_ref_services_wspr_internal_app_GranterResponse = __VDLType_v_io_x_ref_services_wspr_internal_app_GranterResponse_gen()
-}
-
-var __VDLType_v_io_x_ref_services_wspr_internal_app_RpcCallOption *vdl.Type = vdl.TypeOf(RpcCallOption(RpcCallOptionAllowedServersPolicy{[]security.BlessingPattern(nil)}))
-var __VDLType_v_io_x_ref_services_wspr_internal_app_RpcRequest *vdl.Type
-
-func __VDLType_v_io_x_ref_services_wspr_internal_app_RpcRequest_gen() *vdl.Type {
- __VDLType_v_io_x_ref_services_wspr_internal_app_RpcRequestBuilder := vdl.TypeBuilder{}
-
- __VDLType_v_io_x_ref_services_wspr_internal_app_RpcRequest1 := __VDLType_v_io_x_ref_services_wspr_internal_app_RpcRequestBuilder.Struct()
- __VDLType_v_io_x_ref_services_wspr_internal_app_RpcRequest2 := __VDLType_v_io_x_ref_services_wspr_internal_app_RpcRequestBuilder.Named("v.io/x/ref/services/wspr/internal/app.RpcRequest").AssignBase(__VDLType_v_io_x_ref_services_wspr_internal_app_RpcRequest1)
- __VDLType_v_io_x_ref_services_wspr_internal_app_RpcRequest3 := vdl.StringType
- __VDLType_v_io_x_ref_services_wspr_internal_app_RpcRequest1.AppendField("Name", __VDLType_v_io_x_ref_services_wspr_internal_app_RpcRequest3)
- __VDLType_v_io_x_ref_services_wspr_internal_app_RpcRequest1.AppendField("Method", __VDLType_v_io_x_ref_services_wspr_internal_app_RpcRequest3)
- __VDLType_v_io_x_ref_services_wspr_internal_app_RpcRequest4 := vdl.Int32Type
- __VDLType_v_io_x_ref_services_wspr_internal_app_RpcRequest1.AppendField("NumInArgs", __VDLType_v_io_x_ref_services_wspr_internal_app_RpcRequest4)
- __VDLType_v_io_x_ref_services_wspr_internal_app_RpcRequest1.AppendField("NumOutArgs", __VDLType_v_io_x_ref_services_wspr_internal_app_RpcRequest4)
- __VDLType_v_io_x_ref_services_wspr_internal_app_RpcRequest5 := vdl.BoolType
- __VDLType_v_io_x_ref_services_wspr_internal_app_RpcRequest1.AppendField("IsStreaming", __VDLType_v_io_x_ref_services_wspr_internal_app_RpcRequest5)
- __VDLType_v_io_x_ref_services_wspr_internal_app_RpcRequest6 := __VDLType_v_io_x_ref_services_wspr_internal_app_RpcRequestBuilder.Struct()
- __VDLType_v_io_x_ref_services_wspr_internal_app_RpcRequest7 := __VDLType_v_io_x_ref_services_wspr_internal_app_RpcRequestBuilder.Named("time.WireDeadline").AssignBase(__VDLType_v_io_x_ref_services_wspr_internal_app_RpcRequest6)
- __VDLType_v_io_x_ref_services_wspr_internal_app_RpcRequest8 := __VDLType_v_io_x_ref_services_wspr_internal_app_RpcRequestBuilder.Struct()
- __VDLType_v_io_x_ref_services_wspr_internal_app_RpcRequest9 := __VDLType_v_io_x_ref_services_wspr_internal_app_RpcRequestBuilder.Named("time.Duration").AssignBase(__VDLType_v_io_x_ref_services_wspr_internal_app_RpcRequest8)
- __VDLType_v_io_x_ref_services_wspr_internal_app_RpcRequest10 := vdl.Int64Type
- __VDLType_v_io_x_ref_services_wspr_internal_app_RpcRequest8.AppendField("Seconds", __VDLType_v_io_x_ref_services_wspr_internal_app_RpcRequest10)
- __VDLType_v_io_x_ref_services_wspr_internal_app_RpcRequest8.AppendField("Nanos", __VDLType_v_io_x_ref_services_wspr_internal_app_RpcRequest4)
- __VDLType_v_io_x_ref_services_wspr_internal_app_RpcRequest6.AppendField("FromNow", __VDLType_v_io_x_ref_services_wspr_internal_app_RpcRequest9)
- __VDLType_v_io_x_ref_services_wspr_internal_app_RpcRequest6.AppendField("NoDeadline", __VDLType_v_io_x_ref_services_wspr_internal_app_RpcRequest5)
- __VDLType_v_io_x_ref_services_wspr_internal_app_RpcRequest1.AppendField("Deadline", __VDLType_v_io_x_ref_services_wspr_internal_app_RpcRequest7)
- __VDLType_v_io_x_ref_services_wspr_internal_app_RpcRequest11 := __VDLType_v_io_x_ref_services_wspr_internal_app_RpcRequestBuilder.Struct()
- __VDLType_v_io_x_ref_services_wspr_internal_app_RpcRequest12 := __VDLType_v_io_x_ref_services_wspr_internal_app_RpcRequestBuilder.Named("v.io/v23/vtrace.Request").AssignBase(__VDLType_v_io_x_ref_services_wspr_internal_app_RpcRequest11)
- __VDLType_v_io_x_ref_services_wspr_internal_app_RpcRequest13 := __VDLType_v_io_x_ref_services_wspr_internal_app_RpcRequestBuilder.Array()
- __VDLType_v_io_x_ref_services_wspr_internal_app_RpcRequest14 := __VDLType_v_io_x_ref_services_wspr_internal_app_RpcRequestBuilder.Named("v.io/v23/uniqueid.Id").AssignBase(__VDLType_v_io_x_ref_services_wspr_internal_app_RpcRequest13)
- __VDLType_v_io_x_ref_services_wspr_internal_app_RpcRequest15 := vdl.ByteType
- __VDLType_v_io_x_ref_services_wspr_internal_app_RpcRequest13.AssignElem(__VDLType_v_io_x_ref_services_wspr_internal_app_RpcRequest15)
- __VDLType_v_io_x_ref_services_wspr_internal_app_RpcRequest13.AssignLen(16)
- __VDLType_v_io_x_ref_services_wspr_internal_app_RpcRequest11.AppendField("SpanId", __VDLType_v_io_x_ref_services_wspr_internal_app_RpcRequest14)
- __VDLType_v_io_x_ref_services_wspr_internal_app_RpcRequest11.AppendField("TraceId", __VDLType_v_io_x_ref_services_wspr_internal_app_RpcRequest14)
- __VDLType_v_io_x_ref_services_wspr_internal_app_RpcRequest16 := vdl.Int32Type
- __VDLType_v_io_x_ref_services_wspr_internal_app_RpcRequest17 := __VDLType_v_io_x_ref_services_wspr_internal_app_RpcRequestBuilder.Named("v.io/v23/vtrace.TraceFlags").AssignBase(__VDLType_v_io_x_ref_services_wspr_internal_app_RpcRequest16)
- __VDLType_v_io_x_ref_services_wspr_internal_app_RpcRequest11.AppendField("Flags", __VDLType_v_io_x_ref_services_wspr_internal_app_RpcRequest17)
- __VDLType_v_io_x_ref_services_wspr_internal_app_RpcRequest11.AppendField("LogLevel", __VDLType_v_io_x_ref_services_wspr_internal_app_RpcRequest4)
- __VDLType_v_io_x_ref_services_wspr_internal_app_RpcRequest1.AppendField("TraceRequest", __VDLType_v_io_x_ref_services_wspr_internal_app_RpcRequest12)
- __VDLType_v_io_x_ref_services_wspr_internal_app_RpcRequest18 := __VDLType_v_io_x_ref_services_wspr_internal_app_RpcRequestBuilder.Struct()
- __VDLType_v_io_x_ref_services_wspr_internal_app_RpcRequest19 := __VDLType_v_io_x_ref_services_wspr_internal_app_RpcRequestBuilder.Named("v.io/x/ref/services/wspr/internal/rpc/server.Context").AssignBase(__VDLType_v_io_x_ref_services_wspr_internal_app_RpcRequest18)
- __VDLType_v_io_x_ref_services_wspr_internal_app_RpcRequest18.AppendField("Language", __VDLType_v_io_x_ref_services_wspr_internal_app_RpcRequest3)
- __VDLType_v_io_x_ref_services_wspr_internal_app_RpcRequest1.AppendField("Context", __VDLType_v_io_x_ref_services_wspr_internal_app_RpcRequest19)
- __VDLType_v_io_x_ref_services_wspr_internal_app_RpcRequest20 := __VDLType_v_io_x_ref_services_wspr_internal_app_RpcRequestBuilder.List()
- __VDLType_v_io_x_ref_services_wspr_internal_app_RpcRequest21 := __VDLType_v_io_x_ref_services_wspr_internal_app_RpcRequestBuilder.Union()
- __VDLType_v_io_x_ref_services_wspr_internal_app_RpcRequest22 := __VDLType_v_io_x_ref_services_wspr_internal_app_RpcRequestBuilder.Named("v.io/x/ref/services/wspr/internal/app.RpcCallOption").AssignBase(__VDLType_v_io_x_ref_services_wspr_internal_app_RpcRequest21)
- __VDLType_v_io_x_ref_services_wspr_internal_app_RpcRequest23 := __VDLType_v_io_x_ref_services_wspr_internal_app_RpcRequestBuilder.List()
- __VDLType_v_io_x_ref_services_wspr_internal_app_RpcRequest24 := vdl.StringType
- __VDLType_v_io_x_ref_services_wspr_internal_app_RpcRequest25 := __VDLType_v_io_x_ref_services_wspr_internal_app_RpcRequestBuilder.Named("v.io/v23/security.BlessingPattern").AssignBase(__VDLType_v_io_x_ref_services_wspr_internal_app_RpcRequest24)
- __VDLType_v_io_x_ref_services_wspr_internal_app_RpcRequest23.AssignElem(__VDLType_v_io_x_ref_services_wspr_internal_app_RpcRequest25)
- __VDLType_v_io_x_ref_services_wspr_internal_app_RpcRequest21.AppendField("AllowedServersPolicy", __VDLType_v_io_x_ref_services_wspr_internal_app_RpcRequest23)
- __VDLType_v_io_x_ref_services_wspr_internal_app_RpcRequest26 := vdl.Int32Type
- __VDLType_v_io_x_ref_services_wspr_internal_app_RpcRequest27 := __VDLType_v_io_x_ref_services_wspr_internal_app_RpcRequestBuilder.Named("v.io/x/ref/services/wspr/internal/app.GranterHandle").AssignBase(__VDLType_v_io_x_ref_services_wspr_internal_app_RpcRequest26)
- __VDLType_v_io_x_ref_services_wspr_internal_app_RpcRequest21.AppendField("Granter", __VDLType_v_io_x_ref_services_wspr_internal_app_RpcRequest27)
- __VDLType_v_io_x_ref_services_wspr_internal_app_RpcRequest20.AssignElem(__VDLType_v_io_x_ref_services_wspr_internal_app_RpcRequest22)
- __VDLType_v_io_x_ref_services_wspr_internal_app_RpcRequest1.AppendField("CallOptions", __VDLType_v_io_x_ref_services_wspr_internal_app_RpcRequest20)
- __VDLType_v_io_x_ref_services_wspr_internal_app_RpcRequestBuilder.Build()
- __VDLType_v_io_x_ref_services_wspr_internal_app_RpcRequestv, err := __VDLType_v_io_x_ref_services_wspr_internal_app_RpcRequest2.Built()
- if err != nil {
- panic(err)
- }
- return __VDLType_v_io_x_ref_services_wspr_internal_app_RpcRequestv
-}
-func init() {
- __VDLType_v_io_x_ref_services_wspr_internal_app_RpcRequest = __VDLType_v_io_x_ref_services_wspr_internal_app_RpcRequest_gen()
-}
-
-var __VDLType_v_io_x_ref_services_wspr_internal_app_RpcResponse *vdl.Type
-
-func __VDLType_v_io_x_ref_services_wspr_internal_app_RpcResponse_gen() *vdl.Type {
- __VDLType_v_io_x_ref_services_wspr_internal_app_RpcResponseBuilder := vdl.TypeBuilder{}
-
- __VDLType_v_io_x_ref_services_wspr_internal_app_RpcResponse1 := __VDLType_v_io_x_ref_services_wspr_internal_app_RpcResponseBuilder.Struct()
- __VDLType_v_io_x_ref_services_wspr_internal_app_RpcResponse2 := __VDLType_v_io_x_ref_services_wspr_internal_app_RpcResponseBuilder.Named("v.io/x/ref/services/wspr/internal/app.RpcResponse").AssignBase(__VDLType_v_io_x_ref_services_wspr_internal_app_RpcResponse1)
- __VDLType_v_io_x_ref_services_wspr_internal_app_RpcResponse3 := __VDLType_v_io_x_ref_services_wspr_internal_app_RpcResponseBuilder.List()
- __VDLType_v_io_x_ref_services_wspr_internal_app_RpcResponse4 := vdl.AnyType
- __VDLType_v_io_x_ref_services_wspr_internal_app_RpcResponse3.AssignElem(__VDLType_v_io_x_ref_services_wspr_internal_app_RpcResponse4)
- __VDLType_v_io_x_ref_services_wspr_internal_app_RpcResponse1.AppendField("OutArgs", __VDLType_v_io_x_ref_services_wspr_internal_app_RpcResponse3)
- __VDLType_v_io_x_ref_services_wspr_internal_app_RpcResponse5 := __VDLType_v_io_x_ref_services_wspr_internal_app_RpcResponseBuilder.Struct()
- __VDLType_v_io_x_ref_services_wspr_internal_app_RpcResponse6 := __VDLType_v_io_x_ref_services_wspr_internal_app_RpcResponseBuilder.Named("v.io/v23/vtrace.Response").AssignBase(__VDLType_v_io_x_ref_services_wspr_internal_app_RpcResponse5)
- __VDLType_v_io_x_ref_services_wspr_internal_app_RpcResponse7 := vdl.Int32Type
- __VDLType_v_io_x_ref_services_wspr_internal_app_RpcResponse8 := __VDLType_v_io_x_ref_services_wspr_internal_app_RpcResponseBuilder.Named("v.io/v23/vtrace.TraceFlags").AssignBase(__VDLType_v_io_x_ref_services_wspr_internal_app_RpcResponse7)
- __VDLType_v_io_x_ref_services_wspr_internal_app_RpcResponse5.AppendField("Flags", __VDLType_v_io_x_ref_services_wspr_internal_app_RpcResponse8)
- __VDLType_v_io_x_ref_services_wspr_internal_app_RpcResponse9 := __VDLType_v_io_x_ref_services_wspr_internal_app_RpcResponseBuilder.Struct()
- __VDLType_v_io_x_ref_services_wspr_internal_app_RpcResponse10 := __VDLType_v_io_x_ref_services_wspr_internal_app_RpcResponseBuilder.Named("v.io/v23/vtrace.TraceRecord").AssignBase(__VDLType_v_io_x_ref_services_wspr_internal_app_RpcResponse9)
- __VDLType_v_io_x_ref_services_wspr_internal_app_RpcResponse11 := __VDLType_v_io_x_ref_services_wspr_internal_app_RpcResponseBuilder.Array()
- __VDLType_v_io_x_ref_services_wspr_internal_app_RpcResponse12 := __VDLType_v_io_x_ref_services_wspr_internal_app_RpcResponseBuilder.Named("v.io/v23/uniqueid.Id").AssignBase(__VDLType_v_io_x_ref_services_wspr_internal_app_RpcResponse11)
- __VDLType_v_io_x_ref_services_wspr_internal_app_RpcResponse13 := vdl.ByteType
- __VDLType_v_io_x_ref_services_wspr_internal_app_RpcResponse11.AssignElem(__VDLType_v_io_x_ref_services_wspr_internal_app_RpcResponse13)
- __VDLType_v_io_x_ref_services_wspr_internal_app_RpcResponse11.AssignLen(16)
- __VDLType_v_io_x_ref_services_wspr_internal_app_RpcResponse9.AppendField("Id", __VDLType_v_io_x_ref_services_wspr_internal_app_RpcResponse12)
- __VDLType_v_io_x_ref_services_wspr_internal_app_RpcResponse14 := __VDLType_v_io_x_ref_services_wspr_internal_app_RpcResponseBuilder.List()
- __VDLType_v_io_x_ref_services_wspr_internal_app_RpcResponse15 := __VDLType_v_io_x_ref_services_wspr_internal_app_RpcResponseBuilder.Struct()
- __VDLType_v_io_x_ref_services_wspr_internal_app_RpcResponse16 := __VDLType_v_io_x_ref_services_wspr_internal_app_RpcResponseBuilder.Named("v.io/v23/vtrace.SpanRecord").AssignBase(__VDLType_v_io_x_ref_services_wspr_internal_app_RpcResponse15)
- __VDLType_v_io_x_ref_services_wspr_internal_app_RpcResponse15.AppendField("Id", __VDLType_v_io_x_ref_services_wspr_internal_app_RpcResponse12)
- __VDLType_v_io_x_ref_services_wspr_internal_app_RpcResponse15.AppendField("Parent", __VDLType_v_io_x_ref_services_wspr_internal_app_RpcResponse12)
- __VDLType_v_io_x_ref_services_wspr_internal_app_RpcResponse17 := vdl.StringType
- __VDLType_v_io_x_ref_services_wspr_internal_app_RpcResponse15.AppendField("Name", __VDLType_v_io_x_ref_services_wspr_internal_app_RpcResponse17)
- __VDLType_v_io_x_ref_services_wspr_internal_app_RpcResponse18 := __VDLType_v_io_x_ref_services_wspr_internal_app_RpcResponseBuilder.Struct()
- __VDLType_v_io_x_ref_services_wspr_internal_app_RpcResponse19 := __VDLType_v_io_x_ref_services_wspr_internal_app_RpcResponseBuilder.Named("time.Time").AssignBase(__VDLType_v_io_x_ref_services_wspr_internal_app_RpcResponse18)
- __VDLType_v_io_x_ref_services_wspr_internal_app_RpcResponse20 := vdl.Int64Type
- __VDLType_v_io_x_ref_services_wspr_internal_app_RpcResponse18.AppendField("Seconds", __VDLType_v_io_x_ref_services_wspr_internal_app_RpcResponse20)
- __VDLType_v_io_x_ref_services_wspr_internal_app_RpcResponse21 := vdl.Int32Type
- __VDLType_v_io_x_ref_services_wspr_internal_app_RpcResponse18.AppendField("Nanos", __VDLType_v_io_x_ref_services_wspr_internal_app_RpcResponse21)
- __VDLType_v_io_x_ref_services_wspr_internal_app_RpcResponse15.AppendField("Start", __VDLType_v_io_x_ref_services_wspr_internal_app_RpcResponse19)
- __VDLType_v_io_x_ref_services_wspr_internal_app_RpcResponse15.AppendField("End", __VDLType_v_io_x_ref_services_wspr_internal_app_RpcResponse19)
- __VDLType_v_io_x_ref_services_wspr_internal_app_RpcResponse22 := __VDLType_v_io_x_ref_services_wspr_internal_app_RpcResponseBuilder.List()
- __VDLType_v_io_x_ref_services_wspr_internal_app_RpcResponse23 := __VDLType_v_io_x_ref_services_wspr_internal_app_RpcResponseBuilder.Struct()
- __VDLType_v_io_x_ref_services_wspr_internal_app_RpcResponse24 := __VDLType_v_io_x_ref_services_wspr_internal_app_RpcResponseBuilder.Named("v.io/v23/vtrace.Annotation").AssignBase(__VDLType_v_io_x_ref_services_wspr_internal_app_RpcResponse23)
- __VDLType_v_io_x_ref_services_wspr_internal_app_RpcResponse23.AppendField("When", __VDLType_v_io_x_ref_services_wspr_internal_app_RpcResponse19)
- __VDLType_v_io_x_ref_services_wspr_internal_app_RpcResponse23.AppendField("Message", __VDLType_v_io_x_ref_services_wspr_internal_app_RpcResponse17)
- __VDLType_v_io_x_ref_services_wspr_internal_app_RpcResponse22.AssignElem(__VDLType_v_io_x_ref_services_wspr_internal_app_RpcResponse24)
- __VDLType_v_io_x_ref_services_wspr_internal_app_RpcResponse15.AppendField("Annotations", __VDLType_v_io_x_ref_services_wspr_internal_app_RpcResponse22)
- __VDLType_v_io_x_ref_services_wspr_internal_app_RpcResponse14.AssignElem(__VDLType_v_io_x_ref_services_wspr_internal_app_RpcResponse16)
- __VDLType_v_io_x_ref_services_wspr_internal_app_RpcResponse9.AppendField("Spans", __VDLType_v_io_x_ref_services_wspr_internal_app_RpcResponse14)
- __VDLType_v_io_x_ref_services_wspr_internal_app_RpcResponse5.AppendField("Trace", __VDLType_v_io_x_ref_services_wspr_internal_app_RpcResponse10)
- __VDLType_v_io_x_ref_services_wspr_internal_app_RpcResponse1.AppendField("TraceResponse", __VDLType_v_io_x_ref_services_wspr_internal_app_RpcResponse6)
- __VDLType_v_io_x_ref_services_wspr_internal_app_RpcResponseBuilder.Build()
- __VDLType_v_io_x_ref_services_wspr_internal_app_RpcResponsev, err := __VDLType_v_io_x_ref_services_wspr_internal_app_RpcResponse2.Built()
- if err != nil {
- panic(err)
- }
- return __VDLType_v_io_x_ref_services_wspr_internal_app_RpcResponsev
-}
-func init() {
- __VDLType_v_io_x_ref_services_wspr_internal_app_RpcResponse = __VDLType_v_io_x_ref_services_wspr_internal_app_RpcResponse_gen()
-}
-
-var __VDLType_v_io_x_ref_services_wspr_internal_app_RpcServerOption *vdl.Type = vdl.TypeOf(RpcServerOption(RpcServerOptionIsLeaf{false}))
-var __VDLType_v_io_x_ref_services_wspr_internal_rpc_server_Context *vdl.Type = vdl.TypeOf(server.Context{})
-var __VDLType_v_io_x_ref_services_wspr_internal_rpc_server_SecurityCall *vdl.Type = vdl.TypeOf(server.SecurityCall{})
-
-func __VDLEnsureNativeBuilt() {
- if __VDLType6 == nil {
- __VDLType6 = __VDLType6_gen()
- }
- if __VDLType0 == nil {
- __VDLType0 = __VDLType0_gen()
- }
- if __VDLType3 == nil {
- __VDLType3 = __VDLType3_gen()
- }
- if __VDLType_time_WireDeadline == nil {
- __VDLType_time_WireDeadline = __VDLType_time_WireDeadline_gen()
- }
- if __VDLType_v_io_v23_security_WireBlessings == nil {
- __VDLType_v_io_v23_security_WireBlessings = __VDLType_v_io_v23_security_WireBlessings_gen()
- }
- if __VDLType_v_io_v23_vtrace_Response == nil {
- __VDLType_v_io_v23_vtrace_Response = __VDLType_v_io_v23_vtrace_Response_gen()
- }
- if __VDLType_v_io_x_ref_services_wspr_internal_app_GranterResponse == nil {
- __VDLType_v_io_x_ref_services_wspr_internal_app_GranterResponse = __VDLType_v_io_x_ref_services_wspr_internal_app_GranterResponse_gen()
- }
- if __VDLType_v_io_x_ref_services_wspr_internal_app_RpcRequest == nil {
- __VDLType_v_io_x_ref_services_wspr_internal_app_RpcRequest = __VDLType_v_io_x_ref_services_wspr_internal_app_RpcRequest_gen()
- }
- if __VDLType_v_io_x_ref_services_wspr_internal_app_RpcResponse == nil {
- __VDLType_v_io_x_ref_services_wspr_internal_app_RpcResponse = __VDLType_v_io_x_ref_services_wspr_internal_app_RpcResponse_gen()
- }
-}
+//////////////////////////////////////////////////
+// Interface definitions
// ControllerClientMethods is the client interface
// containing Controller methods.
@@ -1930,3 +1343,35 @@
},
},
}
+
+var __VDLInitCalled bool
+
+// __VDLInit performs vdl initialization. It is safe to call multiple times.
+// If you have an init ordering issue, just insert the following line verbatim
+// into your source files in this package, right after the "package foo" clause:
+//
+// var _ = __VDLInit()
+//
+// The purpose of this function is to ensure that vdl initialization occurs in
+// the right order, and very early in the init sequence. In particular, vdl
+// registration and package variable initialization needs to occur before
+// functions like vdl.TypeOf will work properly.
+//
+// This function returns a dummy value, so that it can be used to initialize the
+// first var in the file, to take advantage of Go's defined init order.
+func __VDLInit() struct{} {
+ if __VDLInitCalled {
+ return struct{}{}
+ }
+
+ // Register types.
+ vdl.Register((*GranterHandle)(nil))
+ vdl.Register((*RpcCallOption)(nil))
+ vdl.Register((*RpcRequest)(nil))
+ vdl.Register((*RpcServerOption)(nil))
+ vdl.Register((*RpcResponse)(nil))
+ vdl.Register((*GranterRequest)(nil))
+ vdl.Register((*GranterResponse)(nil))
+
+ return struct{}{}
+}
diff --git a/services/wspr/internal/browspr/browspr.vdl.go b/services/wspr/internal/browspr/browspr.vdl.go
index 7b1a412..c67086b 100644
--- a/services/wspr/internal/browspr/browspr.vdl.go
+++ b/services/wspr/internal/browspr/browspr.vdl.go
@@ -14,6 +14,11 @@
"v.io/x/ref/services/wspr/internal/account"
)
+var _ = __VDLInit() // Must be first; see __VDLInit comments for details.
+
+//////////////////////////////////////////////////
+// Type definitions
+
type StartMessage struct {
CleanupBlessings bool
Identityd string
@@ -30,9 +35,6 @@
}
func (m *StartMessage) FillVDLTarget(t vdl.Target, tt *vdl.Type) error {
- if __VDLType_v_io_x_ref_services_wspr_internal_browspr_StartMessage == nil || __VDLType0 == nil {
- panic("Initialization order error: types generated for FillVDLTarget not initialized. Consider moving caller to an init() block.")
- }
fieldsTarget1, err := t.StartFields(tt)
if err != nil {
return err
@@ -43,7 +45,7 @@
return err
}
if err != vdl.ErrFieldNoExist {
- if err := fieldTarget3.FromBool(bool(m.CleanupBlessings), vdl.BoolType); err != nil {
+ if err := fieldTarget3.FromBool(bool(m.CleanupBlessings), tt.NonOptional().Field(0).Type); err != nil {
return err
}
if err := fieldsTarget1.FinishField(keyTarget2, fieldTarget3); err != nil {
@@ -55,7 +57,7 @@
return err
}
if err != vdl.ErrFieldNoExist {
- if err := fieldTarget5.FromString(string(m.Identityd), vdl.StringType); err != nil {
+ if err := fieldTarget5.FromString(string(m.Identityd), tt.NonOptional().Field(1).Type); err != nil {
return err
}
if err := fieldsTarget1.FinishField(keyTarget4, fieldTarget5); err != nil {
@@ -68,7 +70,7 @@
}
if err != vdl.ErrFieldNoExist {
- if err := m.IdentitydBlessingRoot.FillVDLTarget(fieldTarget7, __VDLType_v_io_x_ref_services_identity_BlessingRootResponse); err != nil {
+ if err := m.IdentitydBlessingRoot.FillVDLTarget(fieldTarget7, tt.NonOptional().Field(2).Type); err != nil {
return err
}
if err := fieldsTarget1.FinishField(keyTarget6, fieldTarget7); err != nil {
@@ -80,7 +82,7 @@
return err
}
if err != vdl.ErrFieldNoExist {
- if err := fieldTarget9.FromString(string(m.Proxy), vdl.StringType); err != nil {
+ if err := fieldTarget9.FromString(string(m.Proxy), tt.NonOptional().Field(3).Type); err != nil {
return err
}
if err := fieldsTarget1.FinishField(keyTarget8, fieldTarget9); err != nil {
@@ -92,7 +94,7 @@
return err
}
if err != vdl.ErrFieldNoExist {
- if err := fieldTarget11.FromString(string(m.NamespaceRoot), vdl.StringType); err != nil {
+ if err := fieldTarget11.FromString(string(m.NamespaceRoot), tt.NonOptional().Field(4).Type); err != nil {
return err
}
if err := fieldsTarget1.FinishField(keyTarget10, fieldTarget11); err != nil {
@@ -104,7 +106,7 @@
return err
}
if err != vdl.ErrFieldNoExist {
- if err := fieldTarget13.FromInt(int64(m.LogLevel), vdl.Int32Type); err != nil {
+ if err := fieldTarget13.FromInt(int64(m.LogLevel), tt.NonOptional().Field(5).Type); err != nil {
return err
}
if err := fieldsTarget1.FinishField(keyTarget12, fieldTarget13); err != nil {
@@ -116,7 +118,7 @@
return err
}
if err != vdl.ErrFieldNoExist {
- if err := fieldTarget15.FromString(string(m.LogModule), vdl.StringType); err != nil {
+ if err := fieldTarget15.FromString(string(m.LogModule), tt.NonOptional().Field(6).Type); err != nil {
return err
}
if err := fieldsTarget1.FinishField(keyTarget14, fieldTarget15); err != nil {
@@ -148,8 +150,8 @@
func (t *StartMessageTarget) StartFields(tt *vdl.Type) (vdl.FieldsTarget, error) {
- if !vdl.Compatible(tt, __VDLType_v_io_x_ref_services_wspr_internal_browspr_StartMessage) {
- return nil, fmt.Errorf("type %v incompatible with %v", tt, __VDLType_v_io_x_ref_services_wspr_internal_browspr_StartMessage)
+ if ttWant := vdl.TypeOf((*StartMessage)(nil)).Elem(); !vdl.Compatible(tt, ttWant) {
+ return nil, fmt.Errorf("type %v incompatible with %v", tt, ttWant)
}
return t, nil
}
@@ -184,7 +186,7 @@
target, err := &t.logModuleTarget, error(nil)
return nil, target, err
default:
- return nil, nil, fmt.Errorf("field %s not in struct %v", name, __VDLType_v_io_x_ref_services_wspr_internal_browspr_StartMessage)
+ return nil, nil, fmt.Errorf("field %s not in struct v.io/x/ref/services/wspr/internal/browspr.StartMessage", name)
}
}
func (t *StartMessageTarget) FinishField(_, _ vdl.Target) error {
@@ -207,9 +209,6 @@
}
func (m *AssociateAccountMessage) FillVDLTarget(t vdl.Target, tt *vdl.Type) error {
- if __VDLType_v_io_x_ref_services_wspr_internal_browspr_AssociateAccountMessage == nil || __VDLType1 == nil {
- panic("Initialization order error: types generated for FillVDLTarget not initialized. Consider moving caller to an init() block.")
- }
fieldsTarget1, err := t.StartFields(tt)
if err != nil {
return err
@@ -220,7 +219,7 @@
return err
}
if err != vdl.ErrFieldNoExist {
- if err := fieldTarget3.FromString(string(m.Account), vdl.StringType); err != nil {
+ if err := fieldTarget3.FromString(string(m.Account), tt.NonOptional().Field(0).Type); err != nil {
return err
}
if err := fieldsTarget1.FinishField(keyTarget2, fieldTarget3); err != nil {
@@ -232,7 +231,7 @@
return err
}
if err != vdl.ErrFieldNoExist {
- if err := fieldTarget5.FromString(string(m.Origin), vdl.StringType); err != nil {
+ if err := fieldTarget5.FromString(string(m.Origin), tt.NonOptional().Field(1).Type); err != nil {
return err
}
if err := fieldsTarget1.FinishField(keyTarget4, fieldTarget5); err != nil {
@@ -245,7 +244,7 @@
}
if err != vdl.ErrFieldNoExist {
- listTarget8, err := fieldTarget7.StartList(__VDLType2, len(m.Caveats))
+ listTarget8, err := fieldTarget7.StartList(tt.NonOptional().Field(2).Type, len(m.Caveats))
if err != nil {
return err
}
@@ -255,7 +254,7 @@
return err
}
- if err := elem10.FillVDLTarget(elemTarget9, __VDLType_v_io_x_ref_services_wspr_internal_account_Caveat); err != nil {
+ if err := elem10.FillVDLTarget(elemTarget9, tt.NonOptional().Field(2).Type.Elem()); err != nil {
return err
}
if err := listTarget8.FinishElem(elemTarget9); err != nil {
@@ -290,8 +289,8 @@
func (t *AssociateAccountMessageTarget) StartFields(tt *vdl.Type) (vdl.FieldsTarget, error) {
- if !vdl.Compatible(tt, __VDLType_v_io_x_ref_services_wspr_internal_browspr_AssociateAccountMessage) {
- return nil, fmt.Errorf("type %v incompatible with %v", tt, __VDLType_v_io_x_ref_services_wspr_internal_browspr_AssociateAccountMessage)
+ if ttWant := vdl.TypeOf((*AssociateAccountMessage)(nil)).Elem(); !vdl.Compatible(tt, ttWant) {
+ return nil, fmt.Errorf("type %v incompatible with %v", tt, ttWant)
}
return t, nil
}
@@ -310,7 +309,7 @@
target, err := &t.caveatsTarget, error(nil)
return nil, target, err
default:
- return nil, nil, fmt.Errorf("field %s not in struct %v", name, __VDLType_v_io_x_ref_services_wspr_internal_browspr_AssociateAccountMessage)
+ return nil, nil, fmt.Errorf("field %s not in struct v.io/x/ref/services/wspr/internal/browspr.AssociateAccountMessage", name)
}
}
func (t *AssociateAccountMessageTarget) FinishField(_, _ vdl.Target) error {
@@ -331,8 +330,8 @@
func (t *unnamed_5b5d762e696f2f782f7265662f73657276696365732f777370722f696e7465726e616c2f6163636f756e742e436176656174207374727563747b5479706520737472696e673b4172677320737472696e677dTarget) StartList(tt *vdl.Type, len int) (vdl.ListTarget, error) {
- if !vdl.Compatible(tt, __VDLType2) {
- return nil, fmt.Errorf("type %v incompatible with %v", tt, __VDLType2)
+ if ttWant := vdl.TypeOf((*[]account.Caveat)(nil)); !vdl.Compatible(tt, ttWant) {
+ return nil, fmt.Errorf("type %v incompatible with %v", tt, ttWant)
}
if cap(*t.Value) < len {
*t.Value = make([]account.Caveat, len)
@@ -364,9 +363,6 @@
}
func (m *CreateAccountMessage) FillVDLTarget(t vdl.Target, tt *vdl.Type) error {
- if __VDLType_v_io_x_ref_services_wspr_internal_browspr_CreateAccountMessage == nil || __VDLType3 == nil {
- panic("Initialization order error: types generated for FillVDLTarget not initialized. Consider moving caller to an init() block.")
- }
fieldsTarget1, err := t.StartFields(tt)
if err != nil {
return err
@@ -377,7 +373,7 @@
return err
}
if err != vdl.ErrFieldNoExist {
- if err := fieldTarget3.FromString(string(m.Token), vdl.StringType); err != nil {
+ if err := fieldTarget3.FromString(string(m.Token), tt.NonOptional().Field(0).Type); err != nil {
return err
}
if err := fieldsTarget1.FinishField(keyTarget2, fieldTarget3); err != nil {
@@ -403,8 +399,8 @@
func (t *CreateAccountMessageTarget) StartFields(tt *vdl.Type) (vdl.FieldsTarget, error) {
- if !vdl.Compatible(tt, __VDLType_v_io_x_ref_services_wspr_internal_browspr_CreateAccountMessage) {
- return nil, fmt.Errorf("type %v incompatible with %v", tt, __VDLType_v_io_x_ref_services_wspr_internal_browspr_CreateAccountMessage)
+ if ttWant := vdl.TypeOf((*CreateAccountMessage)(nil)).Elem(); !vdl.Compatible(tt, ttWant) {
+ return nil, fmt.Errorf("type %v incompatible with %v", tt, ttWant)
}
return t, nil
}
@@ -415,7 +411,7 @@
target, err := &t.tokenTarget, error(nil)
return nil, target, err
default:
- return nil, nil, fmt.Errorf("field %s not in struct %v", name, __VDLType_v_io_x_ref_services_wspr_internal_browspr_CreateAccountMessage)
+ return nil, nil, fmt.Errorf("field %s not in struct v.io/x/ref/services/wspr/internal/browspr.CreateAccountMessage", name)
}
}
func (t *CreateAccountMessageTarget) FinishField(_, _ vdl.Target) error {
@@ -436,9 +432,6 @@
}
func (m *CleanupMessage) FillVDLTarget(t vdl.Target, tt *vdl.Type) error {
- if __VDLType_v_io_x_ref_services_wspr_internal_browspr_CleanupMessage == nil || __VDLType4 == nil {
- panic("Initialization order error: types generated for FillVDLTarget not initialized. Consider moving caller to an init() block.")
- }
fieldsTarget1, err := t.StartFields(tt)
if err != nil {
return err
@@ -449,7 +442,7 @@
return err
}
if err != vdl.ErrFieldNoExist {
- if err := fieldTarget3.FromInt(int64(m.InstanceId), vdl.Int32Type); err != nil {
+ if err := fieldTarget3.FromInt(int64(m.InstanceId), tt.NonOptional().Field(0).Type); err != nil {
return err
}
if err := fieldsTarget1.FinishField(keyTarget2, fieldTarget3); err != nil {
@@ -475,8 +468,8 @@
func (t *CleanupMessageTarget) StartFields(tt *vdl.Type) (vdl.FieldsTarget, error) {
- if !vdl.Compatible(tt, __VDLType_v_io_x_ref_services_wspr_internal_browspr_CleanupMessage) {
- return nil, fmt.Errorf("type %v incompatible with %v", tt, __VDLType_v_io_x_ref_services_wspr_internal_browspr_CleanupMessage)
+ if ttWant := vdl.TypeOf((*CleanupMessage)(nil)).Elem(); !vdl.Compatible(tt, ttWant) {
+ return nil, fmt.Errorf("type %v incompatible with %v", tt, ttWant)
}
return t, nil
}
@@ -487,7 +480,7 @@
target, err := &t.instanceIdTarget, error(nil)
return nil, target, err
default:
- return nil, nil, fmt.Errorf("field %s not in struct %v", name, __VDLType_v_io_x_ref_services_wspr_internal_browspr_CleanupMessage)
+ return nil, nil, fmt.Errorf("field %s not in struct v.io/x/ref/services/wspr/internal/browspr.CleanupMessage", name)
}
}
func (t *CleanupMessageTarget) FinishField(_, _ vdl.Target) error {
@@ -508,9 +501,6 @@
}
func (m *OriginHasAccountMessage) FillVDLTarget(t vdl.Target, tt *vdl.Type) error {
- if __VDLType_v_io_x_ref_services_wspr_internal_browspr_OriginHasAccountMessage == nil || __VDLType5 == nil {
- panic("Initialization order error: types generated for FillVDLTarget not initialized. Consider moving caller to an init() block.")
- }
fieldsTarget1, err := t.StartFields(tt)
if err != nil {
return err
@@ -521,7 +511,7 @@
return err
}
if err != vdl.ErrFieldNoExist {
- if err := fieldTarget3.FromString(string(m.Origin), vdl.StringType); err != nil {
+ if err := fieldTarget3.FromString(string(m.Origin), tt.NonOptional().Field(0).Type); err != nil {
return err
}
if err := fieldsTarget1.FinishField(keyTarget2, fieldTarget3); err != nil {
@@ -547,8 +537,8 @@
func (t *OriginHasAccountMessageTarget) StartFields(tt *vdl.Type) (vdl.FieldsTarget, error) {
- if !vdl.Compatible(tt, __VDLType_v_io_x_ref_services_wspr_internal_browspr_OriginHasAccountMessage) {
- return nil, fmt.Errorf("type %v incompatible with %v", tt, __VDLType_v_io_x_ref_services_wspr_internal_browspr_OriginHasAccountMessage)
+ if ttWant := vdl.TypeOf((*OriginHasAccountMessage)(nil)).Elem(); !vdl.Compatible(tt, ttWant) {
+ return nil, fmt.Errorf("type %v incompatible with %v", tt, ttWant)
}
return t, nil
}
@@ -559,7 +549,7 @@
target, err := &t.originTarget, error(nil)
return nil, target, err
default:
- return nil, nil, fmt.Errorf("field %s not in struct %v", name, __VDLType_v_io_x_ref_services_wspr_internal_browspr_OriginHasAccountMessage)
+ return nil, nil, fmt.Errorf("field %s not in struct v.io/x/ref/services/wspr/internal/browspr.OriginHasAccountMessage", name)
}
}
func (t *OriginHasAccountMessageTarget) FinishField(_, _ vdl.Target) error {
@@ -579,9 +569,6 @@
}
func (m *GetAccountsMessage) FillVDLTarget(t vdl.Target, tt *vdl.Type) error {
- if __VDLType_v_io_x_ref_services_wspr_internal_browspr_GetAccountsMessage == nil || __VDLType6 == nil {
- panic("Initialization order error: types generated for FillVDLTarget not initialized. Consider moving caller to an init() block.")
- }
fieldsTarget1, err := t.StartFields(tt)
if err != nil {
return err
@@ -605,15 +592,15 @@
func (t *GetAccountsMessageTarget) StartFields(tt *vdl.Type) (vdl.FieldsTarget, error) {
- if !vdl.Compatible(tt, __VDLType_v_io_x_ref_services_wspr_internal_browspr_GetAccountsMessage) {
- return nil, fmt.Errorf("type %v incompatible with %v", tt, __VDLType_v_io_x_ref_services_wspr_internal_browspr_GetAccountsMessage)
+ if ttWant := vdl.TypeOf((*GetAccountsMessage)(nil)).Elem(); !vdl.Compatible(tt, ttWant) {
+ return nil, fmt.Errorf("type %v incompatible with %v", tt, ttWant)
}
return t, nil
}
func (t *GetAccountsMessageTarget) StartField(name string) (key, field vdl.Target, _ error) {
switch name {
default:
- return nil, nil, fmt.Errorf("field %s not in struct %v", name, __VDLType_v_io_x_ref_services_wspr_internal_browspr_GetAccountsMessage)
+ return nil, nil, fmt.Errorf("field %s not in struct v.io/x/ref/services/wspr/internal/browspr.GetAccountsMessage", name)
}
}
func (t *GetAccountsMessageTarget) FinishField(_, _ vdl.Target) error {
@@ -637,9 +624,6 @@
}
func (m *CreateInstanceMessage) FillVDLTarget(t vdl.Target, tt *vdl.Type) error {
- if __VDLType_v_io_x_ref_services_wspr_internal_browspr_CreateInstanceMessage == nil || __VDLType7 == nil {
- panic("Initialization order error: types generated for FillVDLTarget not initialized. Consider moving caller to an init() block.")
- }
fieldsTarget1, err := t.StartFields(tt)
if err != nil {
return err
@@ -650,7 +634,7 @@
return err
}
if err != vdl.ErrFieldNoExist {
- if err := fieldTarget3.FromInt(int64(m.InstanceId), vdl.Int32Type); err != nil {
+ if err := fieldTarget3.FromInt(int64(m.InstanceId), tt.NonOptional().Field(0).Type); err != nil {
return err
}
if err := fieldsTarget1.FinishField(keyTarget2, fieldTarget3); err != nil {
@@ -662,7 +646,7 @@
return err
}
if err != vdl.ErrFieldNoExist {
- if err := fieldTarget5.FromString(string(m.Origin), vdl.StringType); err != nil {
+ if err := fieldTarget5.FromString(string(m.Origin), tt.NonOptional().Field(1).Type); err != nil {
return err
}
if err := fieldsTarget1.FinishField(keyTarget4, fieldTarget5); err != nil {
@@ -675,7 +659,7 @@
}
if err != vdl.ErrFieldNoExist {
- listTarget8, err := fieldTarget7.StartList(__VDLType8, len(m.NamespaceRoots))
+ listTarget8, err := fieldTarget7.StartList(tt.NonOptional().Field(2).Type, len(m.NamespaceRoots))
if err != nil {
return err
}
@@ -684,7 +668,7 @@
if err != nil {
return err
}
- if err := elemTarget9.FromString(string(elem10), vdl.StringType); err != nil {
+ if err := elemTarget9.FromString(string(elem10), tt.NonOptional().Field(2).Type.Elem()); err != nil {
return err
}
if err := listTarget8.FinishElem(elemTarget9); err != nil {
@@ -703,7 +687,7 @@
return err
}
if err != vdl.ErrFieldNoExist {
- if err := fieldTarget12.FromString(string(m.Proxy), vdl.StringType); err != nil {
+ if err := fieldTarget12.FromString(string(m.Proxy), tt.NonOptional().Field(3).Type); err != nil {
return err
}
if err := fieldsTarget1.FinishField(keyTarget11, fieldTarget12); err != nil {
@@ -732,8 +716,8 @@
func (t *CreateInstanceMessageTarget) StartFields(tt *vdl.Type) (vdl.FieldsTarget, error) {
- if !vdl.Compatible(tt, __VDLType_v_io_x_ref_services_wspr_internal_browspr_CreateInstanceMessage) {
- return nil, fmt.Errorf("type %v incompatible with %v", tt, __VDLType_v_io_x_ref_services_wspr_internal_browspr_CreateInstanceMessage)
+ if ttWant := vdl.TypeOf((*CreateInstanceMessage)(nil)).Elem(); !vdl.Compatible(tt, ttWant) {
+ return nil, fmt.Errorf("type %v incompatible with %v", tt, ttWant)
}
return t, nil
}
@@ -756,7 +740,7 @@
target, err := &t.proxyTarget, error(nil)
return nil, target, err
default:
- return nil, nil, fmt.Errorf("field %s not in struct %v", name, __VDLType_v_io_x_ref_services_wspr_internal_browspr_CreateInstanceMessage)
+ return nil, nil, fmt.Errorf("field %s not in struct v.io/x/ref/services/wspr/internal/browspr.CreateInstanceMessage", name)
}
}
func (t *CreateInstanceMessageTarget) FinishField(_, _ vdl.Target) error {
@@ -767,7 +751,27 @@
return nil
}
-func init() {
+var __VDLInitCalled bool
+
+// __VDLInit performs vdl initialization. It is safe to call multiple times.
+// If you have an init ordering issue, just insert the following line verbatim
+// into your source files in this package, right after the "package foo" clause:
+//
+// var _ = __VDLInit()
+//
+// The purpose of this function is to ensure that vdl initialization occurs in
+// the right order, and very early in the init sequence. In particular, vdl
+// registration and package variable initialization needs to occur before
+// functions like vdl.TypeOf will work properly.
+//
+// This function returns a dummy value, so that it can be used to initialize the
+// first var in the file, to take advantage of Go's defined init order.
+func __VDLInit() struct{} {
+ if __VDLInitCalled {
+ return struct{}{}
+ }
+
+ // Register types.
vdl.Register((*StartMessage)(nil))
vdl.Register((*AssociateAccountMessage)(nil))
vdl.Register((*CreateAccountMessage)(nil))
@@ -775,26 +779,6 @@
vdl.Register((*OriginHasAccountMessage)(nil))
vdl.Register((*GetAccountsMessage)(nil))
vdl.Register((*CreateInstanceMessage)(nil))
-}
-var __VDLType1 *vdl.Type = vdl.TypeOf((*AssociateAccountMessage)(nil))
-var __VDLType4 *vdl.Type = vdl.TypeOf((*CleanupMessage)(nil))
-var __VDLType3 *vdl.Type = vdl.TypeOf((*CreateAccountMessage)(nil))
-var __VDLType7 *vdl.Type = vdl.TypeOf((*CreateInstanceMessage)(nil))
-var __VDLType6 *vdl.Type = vdl.TypeOf((*GetAccountsMessage)(nil))
-var __VDLType5 *vdl.Type = vdl.TypeOf((*OriginHasAccountMessage)(nil))
-var __VDLType0 *vdl.Type = vdl.TypeOf((*StartMessage)(nil))
-var __VDLType8 *vdl.Type = vdl.TypeOf([]string(nil))
-var __VDLType2 *vdl.Type = vdl.TypeOf([]account.Caveat(nil))
-var __VDLType_v_io_x_ref_services_identity_BlessingRootResponse *vdl.Type = vdl.TypeOf(identity.BlessingRootResponse{})
-var __VDLType_v_io_x_ref_services_wspr_internal_account_Caveat *vdl.Type = vdl.TypeOf(account.Caveat{})
-var __VDLType_v_io_x_ref_services_wspr_internal_browspr_AssociateAccountMessage *vdl.Type = vdl.TypeOf(AssociateAccountMessage{})
-var __VDLType_v_io_x_ref_services_wspr_internal_browspr_CleanupMessage *vdl.Type = vdl.TypeOf(CleanupMessage{})
-var __VDLType_v_io_x_ref_services_wspr_internal_browspr_CreateAccountMessage *vdl.Type = vdl.TypeOf(CreateAccountMessage{})
-var __VDLType_v_io_x_ref_services_wspr_internal_browspr_CreateInstanceMessage *vdl.Type = vdl.TypeOf(CreateInstanceMessage{})
-var __VDLType_v_io_x_ref_services_wspr_internal_browspr_GetAccountsMessage *vdl.Type = vdl.TypeOf(GetAccountsMessage{})
-var __VDLType_v_io_x_ref_services_wspr_internal_browspr_OriginHasAccountMessage *vdl.Type = vdl.TypeOf(OriginHasAccountMessage{})
-var __VDLType_v_io_x_ref_services_wspr_internal_browspr_StartMessage *vdl.Type = vdl.TypeOf(StartMessage{})
-
-func __VDLEnsureNativeBuilt() {
+ return struct{}{}
}
diff --git a/services/wspr/internal/channel/channel.vdl.go b/services/wspr/internal/channel/channel.vdl.go
index 804d6b3..145b5ce 100644
--- a/services/wspr/internal/channel/channel.vdl.go
+++ b/services/wspr/internal/channel/channel.vdl.go
@@ -14,6 +14,11 @@
"v.io/v23/vom"
)
+var _ = __VDLInit() // Must be first; see __VDLInit comments for details.
+
+//////////////////////////////////////////////////
+// Type definitions
+
type Request struct {
Type string
Seq uint32
@@ -26,9 +31,6 @@
}
func (m *Request) FillVDLTarget(t vdl.Target, tt *vdl.Type) error {
- if __VDLType_v_io_x_ref_services_wspr_internal_channel_Request == nil || __VDLType0 == nil {
- panic("Initialization order error: types generated for FillVDLTarget not initialized. Consider moving caller to an init() block.")
- }
fieldsTarget1, err := t.StartFields(tt)
if err != nil {
return err
@@ -39,7 +41,7 @@
return err
}
if err != vdl.ErrFieldNoExist {
- if err := fieldTarget3.FromString(string(m.Type), vdl.StringType); err != nil {
+ if err := fieldTarget3.FromString(string(m.Type), tt.NonOptional().Field(0).Type); err != nil {
return err
}
if err := fieldsTarget1.FinishField(keyTarget2, fieldTarget3); err != nil {
@@ -51,7 +53,7 @@
return err
}
if err != vdl.ErrFieldNoExist {
- if err := fieldTarget5.FromUint(uint64(m.Seq), vdl.Uint32Type); err != nil {
+ if err := fieldTarget5.FromUint(uint64(m.Seq), tt.NonOptional().Field(1).Type); err != nil {
return err
}
if err := fieldsTarget1.FinishField(keyTarget4, fieldTarget5); err != nil {
@@ -65,11 +67,11 @@
if err != vdl.ErrFieldNoExist {
if m.Body == nil {
- if err := fieldTarget7.FromNil(vdl.AnyType); err != nil {
+ if err := fieldTarget7.FromNil(tt.NonOptional().Field(2).Type); err != nil {
return err
}
} else {
- if err := m.Body.FillVDLTarget(fieldTarget7, vdl.AnyType); err != nil {
+ if err := m.Body.FillVDLTarget(fieldTarget7, tt.NonOptional().Field(2).Type); err != nil {
return err
}
}
@@ -98,8 +100,8 @@
func (t *RequestTarget) StartFields(tt *vdl.Type) (vdl.FieldsTarget, error) {
- if !vdl.Compatible(tt, __VDLType_v_io_x_ref_services_wspr_internal_channel_Request) {
- return nil, fmt.Errorf("type %v incompatible with %v", tt, __VDLType_v_io_x_ref_services_wspr_internal_channel_Request)
+ if ttWant := vdl.TypeOf((*Request)(nil)).Elem(); !vdl.Compatible(tt, ttWant) {
+ return nil, fmt.Errorf("type %v incompatible with %v", tt, ttWant)
}
return t, nil
}
@@ -117,7 +119,7 @@
target, err := vdl.ReflectTarget(reflect.ValueOf(&t.Value.Body))
return nil, target, err
default:
- return nil, nil, fmt.Errorf("field %s not in struct %v", name, __VDLType_v_io_x_ref_services_wspr_internal_channel_Request)
+ return nil, nil, fmt.Errorf("field %s not in struct v.io/x/ref/services/wspr/internal/channel.Request", name)
}
}
func (t *RequestTarget) FinishField(_, _ vdl.Target) error {
@@ -140,9 +142,6 @@
}
func (m *Response) FillVDLTarget(t vdl.Target, tt *vdl.Type) error {
- if __VDLType_v_io_x_ref_services_wspr_internal_channel_Response == nil || __VDLType1 == nil {
- panic("Initialization order error: types generated for FillVDLTarget not initialized. Consider moving caller to an init() block.")
- }
fieldsTarget1, err := t.StartFields(tt)
if err != nil {
return err
@@ -153,7 +152,7 @@
return err
}
if err != vdl.ErrFieldNoExist {
- if err := fieldTarget3.FromUint(uint64(m.ReqSeq), vdl.Uint32Type); err != nil {
+ if err := fieldTarget3.FromUint(uint64(m.ReqSeq), tt.NonOptional().Field(0).Type); err != nil {
return err
}
if err := fieldsTarget1.FinishField(keyTarget2, fieldTarget3); err != nil {
@@ -165,7 +164,7 @@
return err
}
if err != vdl.ErrFieldNoExist {
- if err := fieldTarget5.FromString(string(m.Err), vdl.StringType); err != nil {
+ if err := fieldTarget5.FromString(string(m.Err), tt.NonOptional().Field(1).Type); err != nil {
return err
}
if err := fieldsTarget1.FinishField(keyTarget4, fieldTarget5); err != nil {
@@ -179,11 +178,11 @@
if err != vdl.ErrFieldNoExist {
if m.Body == nil {
- if err := fieldTarget7.FromNil(vdl.AnyType); err != nil {
+ if err := fieldTarget7.FromNil(tt.NonOptional().Field(2).Type); err != nil {
return err
}
} else {
- if err := m.Body.FillVDLTarget(fieldTarget7, vdl.AnyType); err != nil {
+ if err := m.Body.FillVDLTarget(fieldTarget7, tt.NonOptional().Field(2).Type); err != nil {
return err
}
}
@@ -212,8 +211,8 @@
func (t *ResponseTarget) StartFields(tt *vdl.Type) (vdl.FieldsTarget, error) {
- if !vdl.Compatible(tt, __VDLType_v_io_x_ref_services_wspr_internal_channel_Response) {
- return nil, fmt.Errorf("type %v incompatible with %v", tt, __VDLType_v_io_x_ref_services_wspr_internal_channel_Response)
+ if ttWant := vdl.TypeOf((*Response)(nil)).Elem(); !vdl.Compatible(tt, ttWant) {
+ return nil, fmt.Errorf("type %v incompatible with %v", tt, ttWant)
}
return t, nil
}
@@ -231,7 +230,7 @@
target, err := vdl.ReflectTarget(reflect.ValueOf(&t.Value.Body))
return nil, target, err
default:
- return nil, nil, fmt.Errorf("field %s not in struct %v", name, __VDLType_v_io_x_ref_services_wspr_internal_channel_Response)
+ return nil, nil, fmt.Errorf("field %s not in struct v.io/x/ref/services/wspr/internal/channel.Response", name)
}
}
func (t *ResponseTarget) FinishField(_, _ vdl.Target) error {
@@ -276,7 +275,7 @@
func (x MessageRequest) __VDLReflect(__MessageReflect) {}
func (m MessageRequest) FillVDLTarget(t vdl.Target, tt *vdl.Type) error {
- fieldsTarget1, err := t.StartFields(__VDLType_v_io_x_ref_services_wspr_internal_channel_Message)
+ fieldsTarget1, err := t.StartFields(tt)
if err != nil {
return err
}
@@ -285,7 +284,7 @@
return err
}
- if err := m.Value.FillVDLTarget(fieldTarget3, __VDLType_v_io_x_ref_services_wspr_internal_channel_Request); err != nil {
+ if err := m.Value.FillVDLTarget(fieldTarget3, tt.NonOptional().Field(0).Type); err != nil {
return err
}
if err := fieldsTarget1.FinishField(keyTarget2, fieldTarget3); err != nil {
@@ -308,7 +307,7 @@
func (x MessageResponse) __VDLReflect(__MessageReflect) {}
func (m MessageResponse) FillVDLTarget(t vdl.Target, tt *vdl.Type) error {
- fieldsTarget1, err := t.StartFields(__VDLType_v_io_x_ref_services_wspr_internal_channel_Message)
+ fieldsTarget1, err := t.StartFields(tt)
if err != nil {
return err
}
@@ -317,7 +316,7 @@
return err
}
- if err := m.Value.FillVDLTarget(fieldTarget3, __VDLType_v_io_x_ref_services_wspr_internal_channel_Response); err != nil {
+ if err := m.Value.FillVDLTarget(fieldTarget3, tt.NonOptional().Field(1).Type); err != nil {
return err
}
if err := fieldsTarget1.FinishField(keyTarget2, fieldTarget3); err != nil {
@@ -334,17 +333,30 @@
return nil
}
-func init() {
+var __VDLInitCalled bool
+
+// __VDLInit performs vdl initialization. It is safe to call multiple times.
+// If you have an init ordering issue, just insert the following line verbatim
+// into your source files in this package, right after the "package foo" clause:
+//
+// var _ = __VDLInit()
+//
+// The purpose of this function is to ensure that vdl initialization occurs in
+// the right order, and very early in the init sequence. In particular, vdl
+// registration and package variable initialization needs to occur before
+// functions like vdl.TypeOf will work properly.
+//
+// This function returns a dummy value, so that it can be used to initialize the
+// first var in the file, to take advantage of Go's defined init order.
+func __VDLInit() struct{} {
+ if __VDLInitCalled {
+ return struct{}{}
+ }
+
+ // Register types.
vdl.Register((*Request)(nil))
vdl.Register((*Response)(nil))
vdl.Register((*Message)(nil))
-}
-var __VDLType0 *vdl.Type = vdl.TypeOf((*Request)(nil))
-var __VDLType1 *vdl.Type = vdl.TypeOf((*Response)(nil))
-var __VDLType_v_io_x_ref_services_wspr_internal_channel_Message *vdl.Type = vdl.TypeOf(Message(MessageRequest{Request{}}))
-var __VDLType_v_io_x_ref_services_wspr_internal_channel_Request *vdl.Type = vdl.TypeOf(Request{})
-var __VDLType_v_io_x_ref_services_wspr_internal_channel_Response *vdl.Type = vdl.TypeOf(Response{})
-
-func __VDLEnsureNativeBuilt() {
+ return struct{}{}
}
diff --git a/services/wspr/internal/lib/lib.vdl.go b/services/wspr/internal/lib/lib.vdl.go
index 4a0f52a..8e57e22 100644
--- a/services/wspr/internal/lib/lib.vdl.go
+++ b/services/wspr/internal/lib/lib.vdl.go
@@ -16,6 +16,11 @@
"v.io/v23/vtrace"
)
+var _ = __VDLInit() // Must be first; see __VDLInit comments for details.
+
+//////////////////////////////////////////////////
+// Type definitions
+
// The response from the javascript server to the proxy.
type ServerRpcReply struct {
Results []*vom.RawBytes
@@ -29,7 +34,6 @@
}
func (m *ServerRpcReply) FillVDLTarget(t vdl.Target, tt *vdl.Type) error {
- __VDLEnsureNativeBuilt()
fieldsTarget1, err := t.StartFields(tt)
if err != nil {
return err
@@ -41,7 +45,7 @@
}
if err != vdl.ErrFieldNoExist {
- listTarget4, err := fieldTarget3.StartList(__VDLType1, len(m.Results))
+ listTarget4, err := fieldTarget3.StartList(tt.NonOptional().Field(0).Type, len(m.Results))
if err != nil {
return err
}
@@ -52,11 +56,11 @@
}
if elem6 == nil {
- if err := elemTarget5.FromNil(vdl.AnyType); err != nil {
+ if err := elemTarget5.FromNil(tt.NonOptional().Field(0).Type.Elem()); err != nil {
return err
}
} else {
- if err := elem6.FillVDLTarget(elemTarget5, vdl.AnyType); err != nil {
+ if err := elem6.FillVDLTarget(elemTarget5, tt.NonOptional().Field(0).Type.Elem()); err != nil {
return err
}
}
@@ -78,7 +82,7 @@
if err != vdl.ErrFieldNoExist {
if m.Err == nil {
- if err := fieldTarget8.FromNil(vdl.ErrorType); err != nil {
+ if err := fieldTarget8.FromNil(tt.NonOptional().Field(1).Type); err != nil {
return err
}
} else {
@@ -101,7 +105,7 @@
}
if err != vdl.ErrFieldNoExist {
- if err := m.TraceResponse.FillVDLTarget(fieldTarget11, __VDLType_v_io_v23_vtrace_Response); err != nil {
+ if err := m.TraceResponse.FillVDLTarget(fieldTarget11, tt.NonOptional().Field(2).Type); err != nil {
return err
}
if err := fieldsTarget1.FinishField(keyTarget10, fieldTarget11); err != nil {
@@ -129,8 +133,8 @@
func (t *ServerRpcReplyTarget) StartFields(tt *vdl.Type) (vdl.FieldsTarget, error) {
- if !vdl.Compatible(tt, __VDLType_v_io_x_ref_services_wspr_internal_lib_ServerRpcReply) {
- return nil, fmt.Errorf("type %v incompatible with %v", tt, __VDLType_v_io_x_ref_services_wspr_internal_lib_ServerRpcReply)
+ if ttWant := vdl.TypeOf((*ServerRpcReply)(nil)).Elem(); !vdl.Compatible(tt, ttWant) {
+ return nil, fmt.Errorf("type %v incompatible with %v", tt, ttWant)
}
return t, nil
}
@@ -149,7 +153,7 @@
target, err := &t.traceResponseTarget, error(nil)
return nil, target, err
default:
- return nil, nil, fmt.Errorf("field %s not in struct %v", name, __VDLType_v_io_x_ref_services_wspr_internal_lib_ServerRpcReply)
+ return nil, nil, fmt.Errorf("field %s not in struct v.io/x/ref/services/wspr/internal/lib.ServerRpcReply", name)
}
}
func (t *ServerRpcReplyTarget) FinishField(_, _ vdl.Target) error {
@@ -170,8 +174,8 @@
func (t *unnamed_5b5d616e79Target) StartList(tt *vdl.Type, len int) (vdl.ListTarget, error) {
- if !vdl.Compatible(tt, __VDLType1) {
- return nil, fmt.Errorf("type %v incompatible with %v", tt, __VDLType1)
+ if ttWant := vdl.TypeOf((*[]*vom.RawBytes)(nil)); !vdl.Compatible(tt, ttWant) {
+ return nil, fmt.Errorf("type %v incompatible with %v", tt, ttWant)
}
if cap(*t.Value) < len {
*t.Value = make([]*vom.RawBytes, len)
@@ -240,7 +244,7 @@
}
func (m *LogLevel) FillVDLTarget(t vdl.Target, tt *vdl.Type) error {
- if err := t.FromEnumLabel((*m).String(), __VDLType_v_io_x_ref_services_wspr_internal_lib_LogLevel); err != nil {
+ if err := t.FromEnumLabel((*m).String(), tt); err != nil {
return err
}
return nil
@@ -257,8 +261,8 @@
func (t *LogLevelTarget) FromEnumLabel(src string, tt *vdl.Type) error {
- if !vdl.Compatible(tt, __VDLType_v_io_x_ref_services_wspr_internal_lib_LogLevel) {
- return fmt.Errorf("type %v incompatible with %v", tt, __VDLType_v_io_x_ref_services_wspr_internal_lib_LogLevel)
+ if ttWant := vdl.TypeOf((*LogLevel)(nil)); !vdl.Compatible(tt, ttWant) {
+ return fmt.Errorf("type %v incompatible with %v", tt, ttWant)
}
switch src {
case "Info":
@@ -266,7 +270,7 @@
case "Error":
*t.Value = 1
default:
- return fmt.Errorf("label %s not in enum %v", src, __VDLType_v_io_x_ref_services_wspr_internal_lib_LogLevel)
+ return fmt.Errorf("label %s not in enum v.io/x/ref/services/wspr/internal/lib.LogLevel", src)
}
return nil
@@ -283,9 +287,6 @@
}
func (m *LogMessage) FillVDLTarget(t vdl.Target, tt *vdl.Type) error {
- if __VDLType_v_io_x_ref_services_wspr_internal_lib_LogMessage == nil || __VDLType2 == nil {
- panic("Initialization order error: types generated for FillVDLTarget not initialized. Consider moving caller to an init() block.")
- }
fieldsTarget1, err := t.StartFields(tt)
if err != nil {
return err
@@ -297,7 +298,7 @@
}
if err != vdl.ErrFieldNoExist {
- if err := m.Level.FillVDLTarget(fieldTarget3, __VDLType_v_io_x_ref_services_wspr_internal_lib_LogLevel); err != nil {
+ if err := m.Level.FillVDLTarget(fieldTarget3, tt.NonOptional().Field(0).Type); err != nil {
return err
}
if err := fieldsTarget1.FinishField(keyTarget2, fieldTarget3); err != nil {
@@ -309,7 +310,7 @@
return err
}
if err != vdl.ErrFieldNoExist {
- if err := fieldTarget5.FromString(string(m.Message), vdl.StringType); err != nil {
+ if err := fieldTarget5.FromString(string(m.Message), tt.NonOptional().Field(1).Type); err != nil {
return err
}
if err := fieldsTarget1.FinishField(keyTarget4, fieldTarget5); err != nil {
@@ -336,8 +337,8 @@
func (t *LogMessageTarget) StartFields(tt *vdl.Type) (vdl.FieldsTarget, error) {
- if !vdl.Compatible(tt, __VDLType_v_io_x_ref_services_wspr_internal_lib_LogMessage) {
- return nil, fmt.Errorf("type %v incompatible with %v", tt, __VDLType_v_io_x_ref_services_wspr_internal_lib_LogMessage)
+ if ttWant := vdl.TypeOf((*LogMessage)(nil)).Elem(); !vdl.Compatible(tt, ttWant) {
+ return nil, fmt.Errorf("type %v incompatible with %v", tt, ttWant)
}
return t, nil
}
@@ -352,7 +353,7 @@
target, err := &t.messageTarget, error(nil)
return nil, target, err
default:
- return nil, nil, fmt.Errorf("field %s not in struct %v", name, __VDLType_v_io_x_ref_services_wspr_internal_lib_LogMessage)
+ return nil, nil, fmt.Errorf("field %s not in struct v.io/x/ref/services/wspr/internal/lib.LogMessage", name)
}
}
func (t *LogMessageTarget) FinishField(_, _ vdl.Target) error {
@@ -363,229 +364,30 @@
return nil
}
-func init() {
+var __VDLInitCalled bool
+
+// __VDLInit performs vdl initialization. It is safe to call multiple times.
+// If you have an init ordering issue, just insert the following line verbatim
+// into your source files in this package, right after the "package foo" clause:
+//
+// var _ = __VDLInit()
+//
+// The purpose of this function is to ensure that vdl initialization occurs in
+// the right order, and very early in the init sequence. In particular, vdl
+// registration and package variable initialization needs to occur before
+// functions like vdl.TypeOf will work properly.
+//
+// This function returns a dummy value, so that it can be used to initialize the
+// first var in the file, to take advantage of Go's defined init order.
+func __VDLInit() struct{} {
+ if __VDLInitCalled {
+ return struct{}{}
+ }
+
+ // Register types.
vdl.Register((*ServerRpcReply)(nil))
vdl.Register((*LogLevel)(nil))
vdl.Register((*LogMessage)(nil))
-}
-var __VDLType2 *vdl.Type = vdl.TypeOf((*LogMessage)(nil))
-var __VDLType0 *vdl.Type
-
-func __VDLType0_gen() *vdl.Type {
- __VDLType0Builder := vdl.TypeBuilder{}
-
- __VDLType01 := __VDLType0Builder.Optional()
- __VDLType02 := __VDLType0Builder.Struct()
- __VDLType03 := __VDLType0Builder.Named("v.io/x/ref/services/wspr/internal/lib.ServerRpcReply").AssignBase(__VDLType02)
- __VDLType04 := __VDLType0Builder.List()
- __VDLType05 := vdl.AnyType
- __VDLType04.AssignElem(__VDLType05)
- __VDLType02.AppendField("Results", __VDLType04)
- __VDLType06 := __VDLType0Builder.Optional()
- __VDLType07 := __VDLType0Builder.Struct()
- __VDLType08 := __VDLType0Builder.Named("error").AssignBase(__VDLType07)
- __VDLType09 := vdl.StringType
- __VDLType07.AppendField("Id", __VDLType09)
- __VDLType010 := __VDLType0Builder.Enum()
- __VDLType010.AppendLabel("NoRetry")
- __VDLType010.AppendLabel("RetryConnection")
- __VDLType010.AppendLabel("RetryRefetch")
- __VDLType010.AppendLabel("RetryBackoff")
- __VDLType07.AppendField("RetryCode", __VDLType010)
- __VDLType07.AppendField("Msg", __VDLType09)
- __VDLType07.AppendField("ParamList", __VDLType04)
- __VDLType06.AssignElem(__VDLType08)
- __VDLType02.AppendField("Err", __VDLType06)
- __VDLType011 := __VDLType0Builder.Struct()
- __VDLType012 := __VDLType0Builder.Named("v.io/v23/vtrace.Response").AssignBase(__VDLType011)
- __VDLType013 := vdl.Int32Type
- __VDLType014 := __VDLType0Builder.Named("v.io/v23/vtrace.TraceFlags").AssignBase(__VDLType013)
- __VDLType011.AppendField("Flags", __VDLType014)
- __VDLType015 := __VDLType0Builder.Struct()
- __VDLType016 := __VDLType0Builder.Named("v.io/v23/vtrace.TraceRecord").AssignBase(__VDLType015)
- __VDLType017 := __VDLType0Builder.Array()
- __VDLType018 := __VDLType0Builder.Named("v.io/v23/uniqueid.Id").AssignBase(__VDLType017)
- __VDLType019 := vdl.ByteType
- __VDLType017.AssignElem(__VDLType019)
- __VDLType017.AssignLen(16)
- __VDLType015.AppendField("Id", __VDLType018)
- __VDLType020 := __VDLType0Builder.List()
- __VDLType021 := __VDLType0Builder.Struct()
- __VDLType022 := __VDLType0Builder.Named("v.io/v23/vtrace.SpanRecord").AssignBase(__VDLType021)
- __VDLType021.AppendField("Id", __VDLType018)
- __VDLType021.AppendField("Parent", __VDLType018)
- __VDLType021.AppendField("Name", __VDLType09)
- __VDLType023 := __VDLType0Builder.Struct()
- __VDLType024 := __VDLType0Builder.Named("time.Time").AssignBase(__VDLType023)
- __VDLType025 := vdl.Int64Type
- __VDLType023.AppendField("Seconds", __VDLType025)
- __VDLType026 := vdl.Int32Type
- __VDLType023.AppendField("Nanos", __VDLType026)
- __VDLType021.AppendField("Start", __VDLType024)
- __VDLType021.AppendField("End", __VDLType024)
- __VDLType027 := __VDLType0Builder.List()
- __VDLType028 := __VDLType0Builder.Struct()
- __VDLType029 := __VDLType0Builder.Named("v.io/v23/vtrace.Annotation").AssignBase(__VDLType028)
- __VDLType028.AppendField("When", __VDLType024)
- __VDLType028.AppendField("Message", __VDLType09)
- __VDLType027.AssignElem(__VDLType029)
- __VDLType021.AppendField("Annotations", __VDLType027)
- __VDLType020.AssignElem(__VDLType022)
- __VDLType015.AppendField("Spans", __VDLType020)
- __VDLType011.AppendField("Trace", __VDLType016)
- __VDLType02.AppendField("TraceResponse", __VDLType012)
- __VDLType01.AssignElem(__VDLType03)
- __VDLType0Builder.Build()
- __VDLType0v, err := __VDLType01.Built()
- if err != nil {
- panic(err)
- }
- return __VDLType0v
-}
-func init() {
- __VDLType0 = __VDLType0_gen()
-}
-
-var __VDLType1 *vdl.Type = vdl.TypeOf([]*vom.RawBytes(nil))
-var __VDLType_v_io_v23_vtrace_Response *vdl.Type
-
-func __VDLType_v_io_v23_vtrace_Response_gen() *vdl.Type {
- __VDLType_v_io_v23_vtrace_ResponseBuilder := vdl.TypeBuilder{}
-
- __VDLType_v_io_v23_vtrace_Response1 := __VDLType_v_io_v23_vtrace_ResponseBuilder.Struct()
- __VDLType_v_io_v23_vtrace_Response2 := __VDLType_v_io_v23_vtrace_ResponseBuilder.Named("v.io/v23/vtrace.Response").AssignBase(__VDLType_v_io_v23_vtrace_Response1)
- __VDLType_v_io_v23_vtrace_Response3 := vdl.Int32Type
- __VDLType_v_io_v23_vtrace_Response4 := __VDLType_v_io_v23_vtrace_ResponseBuilder.Named("v.io/v23/vtrace.TraceFlags").AssignBase(__VDLType_v_io_v23_vtrace_Response3)
- __VDLType_v_io_v23_vtrace_Response1.AppendField("Flags", __VDLType_v_io_v23_vtrace_Response4)
- __VDLType_v_io_v23_vtrace_Response5 := __VDLType_v_io_v23_vtrace_ResponseBuilder.Struct()
- __VDLType_v_io_v23_vtrace_Response6 := __VDLType_v_io_v23_vtrace_ResponseBuilder.Named("v.io/v23/vtrace.TraceRecord").AssignBase(__VDLType_v_io_v23_vtrace_Response5)
- __VDLType_v_io_v23_vtrace_Response7 := __VDLType_v_io_v23_vtrace_ResponseBuilder.Array()
- __VDLType_v_io_v23_vtrace_Response8 := __VDLType_v_io_v23_vtrace_ResponseBuilder.Named("v.io/v23/uniqueid.Id").AssignBase(__VDLType_v_io_v23_vtrace_Response7)
- __VDLType_v_io_v23_vtrace_Response9 := vdl.ByteType
- __VDLType_v_io_v23_vtrace_Response7.AssignElem(__VDLType_v_io_v23_vtrace_Response9)
- __VDLType_v_io_v23_vtrace_Response7.AssignLen(16)
- __VDLType_v_io_v23_vtrace_Response5.AppendField("Id", __VDLType_v_io_v23_vtrace_Response8)
- __VDLType_v_io_v23_vtrace_Response10 := __VDLType_v_io_v23_vtrace_ResponseBuilder.List()
- __VDLType_v_io_v23_vtrace_Response11 := __VDLType_v_io_v23_vtrace_ResponseBuilder.Struct()
- __VDLType_v_io_v23_vtrace_Response12 := __VDLType_v_io_v23_vtrace_ResponseBuilder.Named("v.io/v23/vtrace.SpanRecord").AssignBase(__VDLType_v_io_v23_vtrace_Response11)
- __VDLType_v_io_v23_vtrace_Response11.AppendField("Id", __VDLType_v_io_v23_vtrace_Response8)
- __VDLType_v_io_v23_vtrace_Response11.AppendField("Parent", __VDLType_v_io_v23_vtrace_Response8)
- __VDLType_v_io_v23_vtrace_Response13 := vdl.StringType
- __VDLType_v_io_v23_vtrace_Response11.AppendField("Name", __VDLType_v_io_v23_vtrace_Response13)
- __VDLType_v_io_v23_vtrace_Response14 := __VDLType_v_io_v23_vtrace_ResponseBuilder.Struct()
- __VDLType_v_io_v23_vtrace_Response15 := __VDLType_v_io_v23_vtrace_ResponseBuilder.Named("time.Time").AssignBase(__VDLType_v_io_v23_vtrace_Response14)
- __VDLType_v_io_v23_vtrace_Response16 := vdl.Int64Type
- __VDLType_v_io_v23_vtrace_Response14.AppendField("Seconds", __VDLType_v_io_v23_vtrace_Response16)
- __VDLType_v_io_v23_vtrace_Response17 := vdl.Int32Type
- __VDLType_v_io_v23_vtrace_Response14.AppendField("Nanos", __VDLType_v_io_v23_vtrace_Response17)
- __VDLType_v_io_v23_vtrace_Response11.AppendField("Start", __VDLType_v_io_v23_vtrace_Response15)
- __VDLType_v_io_v23_vtrace_Response11.AppendField("End", __VDLType_v_io_v23_vtrace_Response15)
- __VDLType_v_io_v23_vtrace_Response18 := __VDLType_v_io_v23_vtrace_ResponseBuilder.List()
- __VDLType_v_io_v23_vtrace_Response19 := __VDLType_v_io_v23_vtrace_ResponseBuilder.Struct()
- __VDLType_v_io_v23_vtrace_Response20 := __VDLType_v_io_v23_vtrace_ResponseBuilder.Named("v.io/v23/vtrace.Annotation").AssignBase(__VDLType_v_io_v23_vtrace_Response19)
- __VDLType_v_io_v23_vtrace_Response19.AppendField("When", __VDLType_v_io_v23_vtrace_Response15)
- __VDLType_v_io_v23_vtrace_Response19.AppendField("Message", __VDLType_v_io_v23_vtrace_Response13)
- __VDLType_v_io_v23_vtrace_Response18.AssignElem(__VDLType_v_io_v23_vtrace_Response20)
- __VDLType_v_io_v23_vtrace_Response11.AppendField("Annotations", __VDLType_v_io_v23_vtrace_Response18)
- __VDLType_v_io_v23_vtrace_Response10.AssignElem(__VDLType_v_io_v23_vtrace_Response12)
- __VDLType_v_io_v23_vtrace_Response5.AppendField("Spans", __VDLType_v_io_v23_vtrace_Response10)
- __VDLType_v_io_v23_vtrace_Response1.AppendField("Trace", __VDLType_v_io_v23_vtrace_Response6)
- __VDLType_v_io_v23_vtrace_ResponseBuilder.Build()
- __VDLType_v_io_v23_vtrace_Responsev, err := __VDLType_v_io_v23_vtrace_Response2.Built()
- if err != nil {
- panic(err)
- }
- return __VDLType_v_io_v23_vtrace_Responsev
-}
-func init() {
- __VDLType_v_io_v23_vtrace_Response = __VDLType_v_io_v23_vtrace_Response_gen()
-}
-
-var __VDLType_v_io_x_ref_services_wspr_internal_lib_LogLevel *vdl.Type = vdl.TypeOf(LogLevelInfo)
-var __VDLType_v_io_x_ref_services_wspr_internal_lib_LogMessage *vdl.Type = vdl.TypeOf(LogMessage{})
-var __VDLType_v_io_x_ref_services_wspr_internal_lib_ServerRpcReply *vdl.Type
-
-func __VDLType_v_io_x_ref_services_wspr_internal_lib_ServerRpcReply_gen() *vdl.Type {
- __VDLType_v_io_x_ref_services_wspr_internal_lib_ServerRpcReplyBuilder := vdl.TypeBuilder{}
-
- __VDLType_v_io_x_ref_services_wspr_internal_lib_ServerRpcReply1 := __VDLType_v_io_x_ref_services_wspr_internal_lib_ServerRpcReplyBuilder.Struct()
- __VDLType_v_io_x_ref_services_wspr_internal_lib_ServerRpcReply2 := __VDLType_v_io_x_ref_services_wspr_internal_lib_ServerRpcReplyBuilder.Named("v.io/x/ref/services/wspr/internal/lib.ServerRpcReply").AssignBase(__VDLType_v_io_x_ref_services_wspr_internal_lib_ServerRpcReply1)
- __VDLType_v_io_x_ref_services_wspr_internal_lib_ServerRpcReply3 := __VDLType_v_io_x_ref_services_wspr_internal_lib_ServerRpcReplyBuilder.List()
- __VDLType_v_io_x_ref_services_wspr_internal_lib_ServerRpcReply4 := vdl.AnyType
- __VDLType_v_io_x_ref_services_wspr_internal_lib_ServerRpcReply3.AssignElem(__VDLType_v_io_x_ref_services_wspr_internal_lib_ServerRpcReply4)
- __VDLType_v_io_x_ref_services_wspr_internal_lib_ServerRpcReply1.AppendField("Results", __VDLType_v_io_x_ref_services_wspr_internal_lib_ServerRpcReply3)
- __VDLType_v_io_x_ref_services_wspr_internal_lib_ServerRpcReply5 := __VDLType_v_io_x_ref_services_wspr_internal_lib_ServerRpcReplyBuilder.Optional()
- __VDLType_v_io_x_ref_services_wspr_internal_lib_ServerRpcReply6 := __VDLType_v_io_x_ref_services_wspr_internal_lib_ServerRpcReplyBuilder.Struct()
- __VDLType_v_io_x_ref_services_wspr_internal_lib_ServerRpcReply7 := __VDLType_v_io_x_ref_services_wspr_internal_lib_ServerRpcReplyBuilder.Named("error").AssignBase(__VDLType_v_io_x_ref_services_wspr_internal_lib_ServerRpcReply6)
- __VDLType_v_io_x_ref_services_wspr_internal_lib_ServerRpcReply8 := vdl.StringType
- __VDLType_v_io_x_ref_services_wspr_internal_lib_ServerRpcReply6.AppendField("Id", __VDLType_v_io_x_ref_services_wspr_internal_lib_ServerRpcReply8)
- __VDLType_v_io_x_ref_services_wspr_internal_lib_ServerRpcReply9 := __VDLType_v_io_x_ref_services_wspr_internal_lib_ServerRpcReplyBuilder.Enum()
- __VDLType_v_io_x_ref_services_wspr_internal_lib_ServerRpcReply9.AppendLabel("NoRetry")
- __VDLType_v_io_x_ref_services_wspr_internal_lib_ServerRpcReply9.AppendLabel("RetryConnection")
- __VDLType_v_io_x_ref_services_wspr_internal_lib_ServerRpcReply9.AppendLabel("RetryRefetch")
- __VDLType_v_io_x_ref_services_wspr_internal_lib_ServerRpcReply9.AppendLabel("RetryBackoff")
- __VDLType_v_io_x_ref_services_wspr_internal_lib_ServerRpcReply6.AppendField("RetryCode", __VDLType_v_io_x_ref_services_wspr_internal_lib_ServerRpcReply9)
- __VDLType_v_io_x_ref_services_wspr_internal_lib_ServerRpcReply6.AppendField("Msg", __VDLType_v_io_x_ref_services_wspr_internal_lib_ServerRpcReply8)
- __VDLType_v_io_x_ref_services_wspr_internal_lib_ServerRpcReply6.AppendField("ParamList", __VDLType_v_io_x_ref_services_wspr_internal_lib_ServerRpcReply3)
- __VDLType_v_io_x_ref_services_wspr_internal_lib_ServerRpcReply5.AssignElem(__VDLType_v_io_x_ref_services_wspr_internal_lib_ServerRpcReply7)
- __VDLType_v_io_x_ref_services_wspr_internal_lib_ServerRpcReply1.AppendField("Err", __VDLType_v_io_x_ref_services_wspr_internal_lib_ServerRpcReply5)
- __VDLType_v_io_x_ref_services_wspr_internal_lib_ServerRpcReply10 := __VDLType_v_io_x_ref_services_wspr_internal_lib_ServerRpcReplyBuilder.Struct()
- __VDLType_v_io_x_ref_services_wspr_internal_lib_ServerRpcReply11 := __VDLType_v_io_x_ref_services_wspr_internal_lib_ServerRpcReplyBuilder.Named("v.io/v23/vtrace.Response").AssignBase(__VDLType_v_io_x_ref_services_wspr_internal_lib_ServerRpcReply10)
- __VDLType_v_io_x_ref_services_wspr_internal_lib_ServerRpcReply12 := vdl.Int32Type
- __VDLType_v_io_x_ref_services_wspr_internal_lib_ServerRpcReply13 := __VDLType_v_io_x_ref_services_wspr_internal_lib_ServerRpcReplyBuilder.Named("v.io/v23/vtrace.TraceFlags").AssignBase(__VDLType_v_io_x_ref_services_wspr_internal_lib_ServerRpcReply12)
- __VDLType_v_io_x_ref_services_wspr_internal_lib_ServerRpcReply10.AppendField("Flags", __VDLType_v_io_x_ref_services_wspr_internal_lib_ServerRpcReply13)
- __VDLType_v_io_x_ref_services_wspr_internal_lib_ServerRpcReply14 := __VDLType_v_io_x_ref_services_wspr_internal_lib_ServerRpcReplyBuilder.Struct()
- __VDLType_v_io_x_ref_services_wspr_internal_lib_ServerRpcReply15 := __VDLType_v_io_x_ref_services_wspr_internal_lib_ServerRpcReplyBuilder.Named("v.io/v23/vtrace.TraceRecord").AssignBase(__VDLType_v_io_x_ref_services_wspr_internal_lib_ServerRpcReply14)
- __VDLType_v_io_x_ref_services_wspr_internal_lib_ServerRpcReply16 := __VDLType_v_io_x_ref_services_wspr_internal_lib_ServerRpcReplyBuilder.Array()
- __VDLType_v_io_x_ref_services_wspr_internal_lib_ServerRpcReply17 := __VDLType_v_io_x_ref_services_wspr_internal_lib_ServerRpcReplyBuilder.Named("v.io/v23/uniqueid.Id").AssignBase(__VDLType_v_io_x_ref_services_wspr_internal_lib_ServerRpcReply16)
- __VDLType_v_io_x_ref_services_wspr_internal_lib_ServerRpcReply18 := vdl.ByteType
- __VDLType_v_io_x_ref_services_wspr_internal_lib_ServerRpcReply16.AssignElem(__VDLType_v_io_x_ref_services_wspr_internal_lib_ServerRpcReply18)
- __VDLType_v_io_x_ref_services_wspr_internal_lib_ServerRpcReply16.AssignLen(16)
- __VDLType_v_io_x_ref_services_wspr_internal_lib_ServerRpcReply14.AppendField("Id", __VDLType_v_io_x_ref_services_wspr_internal_lib_ServerRpcReply17)
- __VDLType_v_io_x_ref_services_wspr_internal_lib_ServerRpcReply19 := __VDLType_v_io_x_ref_services_wspr_internal_lib_ServerRpcReplyBuilder.List()
- __VDLType_v_io_x_ref_services_wspr_internal_lib_ServerRpcReply20 := __VDLType_v_io_x_ref_services_wspr_internal_lib_ServerRpcReplyBuilder.Struct()
- __VDLType_v_io_x_ref_services_wspr_internal_lib_ServerRpcReply21 := __VDLType_v_io_x_ref_services_wspr_internal_lib_ServerRpcReplyBuilder.Named("v.io/v23/vtrace.SpanRecord").AssignBase(__VDLType_v_io_x_ref_services_wspr_internal_lib_ServerRpcReply20)
- __VDLType_v_io_x_ref_services_wspr_internal_lib_ServerRpcReply20.AppendField("Id", __VDLType_v_io_x_ref_services_wspr_internal_lib_ServerRpcReply17)
- __VDLType_v_io_x_ref_services_wspr_internal_lib_ServerRpcReply20.AppendField("Parent", __VDLType_v_io_x_ref_services_wspr_internal_lib_ServerRpcReply17)
- __VDLType_v_io_x_ref_services_wspr_internal_lib_ServerRpcReply20.AppendField("Name", __VDLType_v_io_x_ref_services_wspr_internal_lib_ServerRpcReply8)
- __VDLType_v_io_x_ref_services_wspr_internal_lib_ServerRpcReply22 := __VDLType_v_io_x_ref_services_wspr_internal_lib_ServerRpcReplyBuilder.Struct()
- __VDLType_v_io_x_ref_services_wspr_internal_lib_ServerRpcReply23 := __VDLType_v_io_x_ref_services_wspr_internal_lib_ServerRpcReplyBuilder.Named("time.Time").AssignBase(__VDLType_v_io_x_ref_services_wspr_internal_lib_ServerRpcReply22)
- __VDLType_v_io_x_ref_services_wspr_internal_lib_ServerRpcReply24 := vdl.Int64Type
- __VDLType_v_io_x_ref_services_wspr_internal_lib_ServerRpcReply22.AppendField("Seconds", __VDLType_v_io_x_ref_services_wspr_internal_lib_ServerRpcReply24)
- __VDLType_v_io_x_ref_services_wspr_internal_lib_ServerRpcReply25 := vdl.Int32Type
- __VDLType_v_io_x_ref_services_wspr_internal_lib_ServerRpcReply22.AppendField("Nanos", __VDLType_v_io_x_ref_services_wspr_internal_lib_ServerRpcReply25)
- __VDLType_v_io_x_ref_services_wspr_internal_lib_ServerRpcReply20.AppendField("Start", __VDLType_v_io_x_ref_services_wspr_internal_lib_ServerRpcReply23)
- __VDLType_v_io_x_ref_services_wspr_internal_lib_ServerRpcReply20.AppendField("End", __VDLType_v_io_x_ref_services_wspr_internal_lib_ServerRpcReply23)
- __VDLType_v_io_x_ref_services_wspr_internal_lib_ServerRpcReply26 := __VDLType_v_io_x_ref_services_wspr_internal_lib_ServerRpcReplyBuilder.List()
- __VDLType_v_io_x_ref_services_wspr_internal_lib_ServerRpcReply27 := __VDLType_v_io_x_ref_services_wspr_internal_lib_ServerRpcReplyBuilder.Struct()
- __VDLType_v_io_x_ref_services_wspr_internal_lib_ServerRpcReply28 := __VDLType_v_io_x_ref_services_wspr_internal_lib_ServerRpcReplyBuilder.Named("v.io/v23/vtrace.Annotation").AssignBase(__VDLType_v_io_x_ref_services_wspr_internal_lib_ServerRpcReply27)
- __VDLType_v_io_x_ref_services_wspr_internal_lib_ServerRpcReply27.AppendField("When", __VDLType_v_io_x_ref_services_wspr_internal_lib_ServerRpcReply23)
- __VDLType_v_io_x_ref_services_wspr_internal_lib_ServerRpcReply27.AppendField("Message", __VDLType_v_io_x_ref_services_wspr_internal_lib_ServerRpcReply8)
- __VDLType_v_io_x_ref_services_wspr_internal_lib_ServerRpcReply26.AssignElem(__VDLType_v_io_x_ref_services_wspr_internal_lib_ServerRpcReply28)
- __VDLType_v_io_x_ref_services_wspr_internal_lib_ServerRpcReply20.AppendField("Annotations", __VDLType_v_io_x_ref_services_wspr_internal_lib_ServerRpcReply26)
- __VDLType_v_io_x_ref_services_wspr_internal_lib_ServerRpcReply19.AssignElem(__VDLType_v_io_x_ref_services_wspr_internal_lib_ServerRpcReply21)
- __VDLType_v_io_x_ref_services_wspr_internal_lib_ServerRpcReply14.AppendField("Spans", __VDLType_v_io_x_ref_services_wspr_internal_lib_ServerRpcReply19)
- __VDLType_v_io_x_ref_services_wspr_internal_lib_ServerRpcReply10.AppendField("Trace", __VDLType_v_io_x_ref_services_wspr_internal_lib_ServerRpcReply15)
- __VDLType_v_io_x_ref_services_wspr_internal_lib_ServerRpcReply1.AppendField("TraceResponse", __VDLType_v_io_x_ref_services_wspr_internal_lib_ServerRpcReply11)
- __VDLType_v_io_x_ref_services_wspr_internal_lib_ServerRpcReplyBuilder.Build()
- __VDLType_v_io_x_ref_services_wspr_internal_lib_ServerRpcReplyv, err := __VDLType_v_io_x_ref_services_wspr_internal_lib_ServerRpcReply2.Built()
- if err != nil {
- panic(err)
- }
- return __VDLType_v_io_x_ref_services_wspr_internal_lib_ServerRpcReplyv
-}
-func init() {
- __VDLType_v_io_x_ref_services_wspr_internal_lib_ServerRpcReply = __VDLType_v_io_x_ref_services_wspr_internal_lib_ServerRpcReply_gen()
-}
-func __VDLEnsureNativeBuilt() {
- if __VDLType0 == nil {
- __VDLType0 = __VDLType0_gen()
- }
- if __VDLType_v_io_v23_vtrace_Response == nil {
- __VDLType_v_io_v23_vtrace_Response = __VDLType_v_io_v23_vtrace_Response_gen()
- }
- if __VDLType_v_io_x_ref_services_wspr_internal_lib_ServerRpcReply == nil {
- __VDLType_v_io_x_ref_services_wspr_internal_lib_ServerRpcReply = __VDLType_v_io_x_ref_services_wspr_internal_lib_ServerRpcReply_gen()
- }
+ return struct{}{}
}
diff --git a/services/wspr/internal/namespace/namespace.vdl.go b/services/wspr/internal/namespace/namespace.vdl.go
index 661086c..cb1bfe3 100644
--- a/services/wspr/internal/namespace/namespace.vdl.go
+++ b/services/wspr/internal/namespace/namespace.vdl.go
@@ -22,8 +22,10 @@
_ "v.io/v23/vdlroot/time"
)
-func __VDLEnsureNativeBuilt() {
-}
+var _ = __VDLInit() // Must be first; see __VDLInit comments for details.
+
+//////////////////////////////////////////////////
+// Interface definitions
// NamespaceClientMethods is the client interface
// containing Namespace methods.
@@ -543,3 +545,26 @@
func (s implNamespaceGlobServerCallSend) Send(item naming.GlobReply) error {
return s.s.Send(item)
}
+
+var __VDLInitCalled bool
+
+// __VDLInit performs vdl initialization. It is safe to call multiple times.
+// If you have an init ordering issue, just insert the following line verbatim
+// into your source files in this package, right after the "package foo" clause:
+//
+// var _ = __VDLInit()
+//
+// The purpose of this function is to ensure that vdl initialization occurs in
+// the right order, and very early in the init sequence. In particular, vdl
+// registration and package variable initialization needs to occur before
+// functions like vdl.TypeOf will work properly.
+//
+// This function returns a dummy value, so that it can be used to initialize the
+// first var in the file, to take advantage of Go's defined init order.
+func __VDLInit() struct{} {
+ if __VDLInitCalled {
+ return struct{}{}
+ }
+
+ return struct{}{}
+}
diff --git a/services/wspr/internal/principal/principal.vdl.go b/services/wspr/internal/principal/principal.vdl.go
index 647816e..a769274 100644
--- a/services/wspr/internal/principal/principal.vdl.go
+++ b/services/wspr/internal/principal/principal.vdl.go
@@ -14,6 +14,11 @@
"v.io/v23/vdl/vdlconv"
)
+var _ = __VDLInit() // Must be first; see __VDLInit comments for details.
+
+//////////////////////////////////////////////////
+// Type definitions
+
// Identifier of a blessings cache entry.
type BlessingsId uint32
@@ -23,7 +28,7 @@
}
func (m *BlessingsId) FillVDLTarget(t vdl.Target, tt *vdl.Type) error {
- if err := t.FromUint(uint64((*m)), __VDLType_v_io_x_ref_services_wspr_internal_principal_BlessingsId); err != nil {
+ if err := t.FromUint(uint64((*m)), tt); err != nil {
return err
}
return nil
@@ -90,7 +95,6 @@
}
func (m *BlessingsCacheAddMessage) FillVDLTarget(t vdl.Target, tt *vdl.Type) error {
- __VDLEnsureNativeBuilt()
fieldsTarget1, err := t.StartFields(tt)
if err != nil {
return err
@@ -102,7 +106,7 @@
}
if err != vdl.ErrFieldNoExist {
- if err := m.CacheId.FillVDLTarget(fieldTarget3, __VDLType_v_io_x_ref_services_wspr_internal_principal_BlessingsId); err != nil {
+ if err := m.CacheId.FillVDLTarget(fieldTarget3, tt.NonOptional().Field(0).Type); err != nil {
return err
}
if err := fieldsTarget1.FinishField(keyTarget2, fieldTarget3); err != nil {
@@ -120,7 +124,7 @@
}
if err != vdl.ErrFieldNoExist {
- if err := wireValue4.FillVDLTarget(fieldTarget6, __VDLType_v_io_v23_security_WireBlessings); err != nil {
+ if err := wireValue4.FillVDLTarget(fieldTarget6, tt.NonOptional().Field(1).Type); err != nil {
return err
}
if err := fieldsTarget1.FinishField(keyTarget5, fieldTarget6); err != nil {
@@ -147,8 +151,8 @@
func (t *BlessingsCacheAddMessageTarget) StartFields(tt *vdl.Type) (vdl.FieldsTarget, error) {
- if !vdl.Compatible(tt, __VDLType_v_io_x_ref_services_wspr_internal_principal_BlessingsCacheAddMessage) {
- return nil, fmt.Errorf("type %v incompatible with %v", tt, __VDLType_v_io_x_ref_services_wspr_internal_principal_BlessingsCacheAddMessage)
+ if ttWant := vdl.TypeOf((*BlessingsCacheAddMessage)(nil)).Elem(); !vdl.Compatible(tt, ttWant) {
+ return nil, fmt.Errorf("type %v incompatible with %v", tt, ttWant)
}
return t, nil
}
@@ -163,7 +167,7 @@
target, err := &t.blessingsTarget, error(nil)
return nil, target, err
default:
- return nil, nil, fmt.Errorf("field %s not in struct %v", name, __VDLType_v_io_x_ref_services_wspr_internal_principal_BlessingsCacheAddMessage)
+ return nil, nil, fmt.Errorf("field %s not in struct v.io/x/ref/services/wspr/internal/principal.BlessingsCacheAddMessage", name)
}
}
func (t *BlessingsCacheAddMessageTarget) FinishField(_, _ vdl.Target) error {
@@ -189,9 +193,6 @@
}
func (m *BlessingsCacheDeleteMessage) FillVDLTarget(t vdl.Target, tt *vdl.Type) error {
- if __VDLType_v_io_x_ref_services_wspr_internal_principal_BlessingsCacheDeleteMessage == nil || __VDLType1 == nil {
- panic("Initialization order error: types generated for FillVDLTarget not initialized. Consider moving caller to an init() block.")
- }
fieldsTarget1, err := t.StartFields(tt)
if err != nil {
return err
@@ -203,7 +204,7 @@
}
if err != vdl.ErrFieldNoExist {
- if err := m.CacheId.FillVDLTarget(fieldTarget3, __VDLType_v_io_x_ref_services_wspr_internal_principal_BlessingsId); err != nil {
+ if err := m.CacheId.FillVDLTarget(fieldTarget3, tt.NonOptional().Field(0).Type); err != nil {
return err
}
if err := fieldsTarget1.FinishField(keyTarget2, fieldTarget3); err != nil {
@@ -215,7 +216,7 @@
return err
}
if err != vdl.ErrFieldNoExist {
- if err := fieldTarget5.FromUint(uint64(m.DeleteAfter), vdl.Uint32Type); err != nil {
+ if err := fieldTarget5.FromUint(uint64(m.DeleteAfter), tt.NonOptional().Field(1).Type); err != nil {
return err
}
if err := fieldsTarget1.FinishField(keyTarget4, fieldTarget5); err != nil {
@@ -242,8 +243,8 @@
func (t *BlessingsCacheDeleteMessageTarget) StartFields(tt *vdl.Type) (vdl.FieldsTarget, error) {
- if !vdl.Compatible(tt, __VDLType_v_io_x_ref_services_wspr_internal_principal_BlessingsCacheDeleteMessage) {
- return nil, fmt.Errorf("type %v incompatible with %v", tt, __VDLType_v_io_x_ref_services_wspr_internal_principal_BlessingsCacheDeleteMessage)
+ if ttWant := vdl.TypeOf((*BlessingsCacheDeleteMessage)(nil)).Elem(); !vdl.Compatible(tt, ttWant) {
+ return nil, fmt.Errorf("type %v incompatible with %v", tt, ttWant)
}
return t, nil
}
@@ -258,7 +259,7 @@
target, err := &t.deleteAfterTarget, error(nil)
return nil, target, err
default:
- return nil, nil, fmt.Errorf("field %s not in struct %v", name, __VDLType_v_io_x_ref_services_wspr_internal_principal_BlessingsCacheDeleteMessage)
+ return nil, nil, fmt.Errorf("field %s not in struct v.io/x/ref/services/wspr/internal/principal.BlessingsCacheDeleteMessage", name)
}
}
func (t *BlessingsCacheDeleteMessageTarget) FinishField(_, _ vdl.Target) error {
@@ -303,7 +304,7 @@
func (x BlessingsCacheMessageAdd) __VDLReflect(__BlessingsCacheMessageReflect) {}
func (m BlessingsCacheMessageAdd) FillVDLTarget(t vdl.Target, tt *vdl.Type) error {
- fieldsTarget1, err := t.StartFields(__VDLType_v_io_x_ref_services_wspr_internal_principal_BlessingsCacheMessage)
+ fieldsTarget1, err := t.StartFields(tt)
if err != nil {
return err
}
@@ -312,7 +313,7 @@
return err
}
- if err := m.Value.FillVDLTarget(fieldTarget3, __VDLType_v_io_x_ref_services_wspr_internal_principal_BlessingsCacheAddMessage); err != nil {
+ if err := m.Value.FillVDLTarget(fieldTarget3, tt.NonOptional().Field(0).Type); err != nil {
return err
}
if err := fieldsTarget1.FinishField(keyTarget2, fieldTarget3); err != nil {
@@ -335,7 +336,7 @@
func (x BlessingsCacheMessageDelete) __VDLReflect(__BlessingsCacheMessageReflect) {}
func (m BlessingsCacheMessageDelete) FillVDLTarget(t vdl.Target, tt *vdl.Type) error {
- fieldsTarget1, err := t.StartFields(__VDLType_v_io_x_ref_services_wspr_internal_principal_BlessingsCacheMessage)
+ fieldsTarget1, err := t.StartFields(tt)
if err != nil {
return err
}
@@ -344,7 +345,7 @@
return err
}
- if err := m.Value.FillVDLTarget(fieldTarget3, __VDLType_v_io_x_ref_services_wspr_internal_principal_BlessingsCacheDeleteMessage); err != nil {
+ if err := m.Value.FillVDLTarget(fieldTarget3, tt.NonOptional().Field(1).Type); err != nil {
return err
}
if err := fieldsTarget1.FinishField(keyTarget2, fieldTarget3); err != nil {
@@ -361,261 +362,31 @@
return nil
}
-func init() {
+var __VDLInitCalled bool
+
+// __VDLInit performs vdl initialization. It is safe to call multiple times.
+// If you have an init ordering issue, just insert the following line verbatim
+// into your source files in this package, right after the "package foo" clause:
+//
+// var _ = __VDLInit()
+//
+// The purpose of this function is to ensure that vdl initialization occurs in
+// the right order, and very early in the init sequence. In particular, vdl
+// registration and package variable initialization needs to occur before
+// functions like vdl.TypeOf will work properly.
+//
+// This function returns a dummy value, so that it can be used to initialize the
+// first var in the file, to take advantage of Go's defined init order.
+func __VDLInit() struct{} {
+ if __VDLInitCalled {
+ return struct{}{}
+ }
+
+ // Register types.
vdl.Register((*BlessingsId)(nil))
vdl.Register((*BlessingsCacheAddMessage)(nil))
vdl.Register((*BlessingsCacheDeleteMessage)(nil))
vdl.Register((*BlessingsCacheMessage)(nil))
-}
-var __VDLType0 *vdl.Type
-
-func __VDLType0_gen() *vdl.Type {
- __VDLType0Builder := vdl.TypeBuilder{}
-
- __VDLType01 := __VDLType0Builder.Optional()
- __VDLType02 := __VDLType0Builder.Struct()
- __VDLType03 := __VDLType0Builder.Named("v.io/x/ref/services/wspr/internal/principal.BlessingsCacheAddMessage").AssignBase(__VDLType02)
- __VDLType04 := vdl.Uint32Type
- __VDLType05 := __VDLType0Builder.Named("v.io/x/ref/services/wspr/internal/principal.BlessingsId").AssignBase(__VDLType04)
- __VDLType02.AppendField("CacheId", __VDLType05)
- __VDLType06 := __VDLType0Builder.Struct()
- __VDLType07 := __VDLType0Builder.Named("v.io/v23/security.WireBlessings").AssignBase(__VDLType06)
- __VDLType08 := __VDLType0Builder.List()
- __VDLType09 := __VDLType0Builder.List()
- __VDLType010 := __VDLType0Builder.Struct()
- __VDLType011 := __VDLType0Builder.Named("v.io/v23/security.Certificate").AssignBase(__VDLType010)
- __VDLType012 := vdl.StringType
- __VDLType010.AppendField("Extension", __VDLType012)
- __VDLType013 := __VDLType0Builder.List()
- __VDLType014 := vdl.ByteType
- __VDLType013.AssignElem(__VDLType014)
- __VDLType010.AppendField("PublicKey", __VDLType013)
- __VDLType015 := __VDLType0Builder.List()
- __VDLType016 := __VDLType0Builder.Struct()
- __VDLType017 := __VDLType0Builder.Named("v.io/v23/security.Caveat").AssignBase(__VDLType016)
- __VDLType018 := __VDLType0Builder.Array()
- __VDLType019 := __VDLType0Builder.Named("v.io/v23/uniqueid.Id").AssignBase(__VDLType018)
- __VDLType018.AssignElem(__VDLType014)
- __VDLType018.AssignLen(16)
- __VDLType016.AppendField("Id", __VDLType019)
- __VDLType016.AppendField("ParamVom", __VDLType013)
- __VDLType015.AssignElem(__VDLType017)
- __VDLType010.AppendField("Caveats", __VDLType015)
- __VDLType020 := __VDLType0Builder.Struct()
- __VDLType021 := __VDLType0Builder.Named("v.io/v23/security.Signature").AssignBase(__VDLType020)
- __VDLType020.AppendField("Purpose", __VDLType013)
- __VDLType022 := vdl.StringType
- __VDLType023 := __VDLType0Builder.Named("v.io/v23/security.Hash").AssignBase(__VDLType022)
- __VDLType020.AppendField("Hash", __VDLType023)
- __VDLType020.AppendField("R", __VDLType013)
- __VDLType020.AppendField("S", __VDLType013)
- __VDLType010.AppendField("Signature", __VDLType021)
- __VDLType09.AssignElem(__VDLType011)
- __VDLType08.AssignElem(__VDLType09)
- __VDLType06.AppendField("CertificateChains", __VDLType08)
- __VDLType02.AppendField("Blessings", __VDLType07)
- __VDLType01.AssignElem(__VDLType03)
- __VDLType0Builder.Build()
- __VDLType0v, err := __VDLType01.Built()
- if err != nil {
- panic(err)
- }
- return __VDLType0v
-}
-func init() {
- __VDLType0 = __VDLType0_gen()
-}
-
-var __VDLType1 *vdl.Type = vdl.TypeOf((*BlessingsCacheDeleteMessage)(nil))
-var __VDLType_v_io_v23_security_WireBlessings *vdl.Type
-
-func __VDLType_v_io_v23_security_WireBlessings_gen() *vdl.Type {
- __VDLType_v_io_v23_security_WireBlessingsBuilder := vdl.TypeBuilder{}
-
- __VDLType_v_io_v23_security_WireBlessings1 := __VDLType_v_io_v23_security_WireBlessingsBuilder.Struct()
- __VDLType_v_io_v23_security_WireBlessings2 := __VDLType_v_io_v23_security_WireBlessingsBuilder.Named("v.io/v23/security.WireBlessings").AssignBase(__VDLType_v_io_v23_security_WireBlessings1)
- __VDLType_v_io_v23_security_WireBlessings3 := __VDLType_v_io_v23_security_WireBlessingsBuilder.List()
- __VDLType_v_io_v23_security_WireBlessings4 := __VDLType_v_io_v23_security_WireBlessingsBuilder.List()
- __VDLType_v_io_v23_security_WireBlessings5 := __VDLType_v_io_v23_security_WireBlessingsBuilder.Struct()
- __VDLType_v_io_v23_security_WireBlessings6 := __VDLType_v_io_v23_security_WireBlessingsBuilder.Named("v.io/v23/security.Certificate").AssignBase(__VDLType_v_io_v23_security_WireBlessings5)
- __VDLType_v_io_v23_security_WireBlessings7 := vdl.StringType
- __VDLType_v_io_v23_security_WireBlessings5.AppendField("Extension", __VDLType_v_io_v23_security_WireBlessings7)
- __VDLType_v_io_v23_security_WireBlessings8 := __VDLType_v_io_v23_security_WireBlessingsBuilder.List()
- __VDLType_v_io_v23_security_WireBlessings9 := vdl.ByteType
- __VDLType_v_io_v23_security_WireBlessings8.AssignElem(__VDLType_v_io_v23_security_WireBlessings9)
- __VDLType_v_io_v23_security_WireBlessings5.AppendField("PublicKey", __VDLType_v_io_v23_security_WireBlessings8)
- __VDLType_v_io_v23_security_WireBlessings10 := __VDLType_v_io_v23_security_WireBlessingsBuilder.List()
- __VDLType_v_io_v23_security_WireBlessings11 := __VDLType_v_io_v23_security_WireBlessingsBuilder.Struct()
- __VDLType_v_io_v23_security_WireBlessings12 := __VDLType_v_io_v23_security_WireBlessingsBuilder.Named("v.io/v23/security.Caveat").AssignBase(__VDLType_v_io_v23_security_WireBlessings11)
- __VDLType_v_io_v23_security_WireBlessings13 := __VDLType_v_io_v23_security_WireBlessingsBuilder.Array()
- __VDLType_v_io_v23_security_WireBlessings14 := __VDLType_v_io_v23_security_WireBlessingsBuilder.Named("v.io/v23/uniqueid.Id").AssignBase(__VDLType_v_io_v23_security_WireBlessings13)
- __VDLType_v_io_v23_security_WireBlessings13.AssignElem(__VDLType_v_io_v23_security_WireBlessings9)
- __VDLType_v_io_v23_security_WireBlessings13.AssignLen(16)
- __VDLType_v_io_v23_security_WireBlessings11.AppendField("Id", __VDLType_v_io_v23_security_WireBlessings14)
- __VDLType_v_io_v23_security_WireBlessings11.AppendField("ParamVom", __VDLType_v_io_v23_security_WireBlessings8)
- __VDLType_v_io_v23_security_WireBlessings10.AssignElem(__VDLType_v_io_v23_security_WireBlessings12)
- __VDLType_v_io_v23_security_WireBlessings5.AppendField("Caveats", __VDLType_v_io_v23_security_WireBlessings10)
- __VDLType_v_io_v23_security_WireBlessings15 := __VDLType_v_io_v23_security_WireBlessingsBuilder.Struct()
- __VDLType_v_io_v23_security_WireBlessings16 := __VDLType_v_io_v23_security_WireBlessingsBuilder.Named("v.io/v23/security.Signature").AssignBase(__VDLType_v_io_v23_security_WireBlessings15)
- __VDLType_v_io_v23_security_WireBlessings15.AppendField("Purpose", __VDLType_v_io_v23_security_WireBlessings8)
- __VDLType_v_io_v23_security_WireBlessings17 := vdl.StringType
- __VDLType_v_io_v23_security_WireBlessings18 := __VDLType_v_io_v23_security_WireBlessingsBuilder.Named("v.io/v23/security.Hash").AssignBase(__VDLType_v_io_v23_security_WireBlessings17)
- __VDLType_v_io_v23_security_WireBlessings15.AppendField("Hash", __VDLType_v_io_v23_security_WireBlessings18)
- __VDLType_v_io_v23_security_WireBlessings15.AppendField("R", __VDLType_v_io_v23_security_WireBlessings8)
- __VDLType_v_io_v23_security_WireBlessings15.AppendField("S", __VDLType_v_io_v23_security_WireBlessings8)
- __VDLType_v_io_v23_security_WireBlessings5.AppendField("Signature", __VDLType_v_io_v23_security_WireBlessings16)
- __VDLType_v_io_v23_security_WireBlessings4.AssignElem(__VDLType_v_io_v23_security_WireBlessings6)
- __VDLType_v_io_v23_security_WireBlessings3.AssignElem(__VDLType_v_io_v23_security_WireBlessings4)
- __VDLType_v_io_v23_security_WireBlessings1.AppendField("CertificateChains", __VDLType_v_io_v23_security_WireBlessings3)
- __VDLType_v_io_v23_security_WireBlessingsBuilder.Build()
- __VDLType_v_io_v23_security_WireBlessingsv, err := __VDLType_v_io_v23_security_WireBlessings2.Built()
- if err != nil {
- panic(err)
- }
- return __VDLType_v_io_v23_security_WireBlessingsv
-}
-func init() {
- __VDLType_v_io_v23_security_WireBlessings = __VDLType_v_io_v23_security_WireBlessings_gen()
-}
-
-var __VDLType_v_io_x_ref_services_wspr_internal_principal_BlessingsCacheAddMessage *vdl.Type
-
-func __VDLType_v_io_x_ref_services_wspr_internal_principal_BlessingsCacheAddMessage_gen() *vdl.Type {
- __VDLType_v_io_x_ref_services_wspr_internal_principal_BlessingsCacheAddMessageBuilder := vdl.TypeBuilder{}
-
- __VDLType_v_io_x_ref_services_wspr_internal_principal_BlessingsCacheAddMessage1 := __VDLType_v_io_x_ref_services_wspr_internal_principal_BlessingsCacheAddMessageBuilder.Struct()
- __VDLType_v_io_x_ref_services_wspr_internal_principal_BlessingsCacheAddMessage2 := __VDLType_v_io_x_ref_services_wspr_internal_principal_BlessingsCacheAddMessageBuilder.Named("v.io/x/ref/services/wspr/internal/principal.BlessingsCacheAddMessage").AssignBase(__VDLType_v_io_x_ref_services_wspr_internal_principal_BlessingsCacheAddMessage1)
- __VDLType_v_io_x_ref_services_wspr_internal_principal_BlessingsCacheAddMessage3 := vdl.Uint32Type
- __VDLType_v_io_x_ref_services_wspr_internal_principal_BlessingsCacheAddMessage4 := __VDLType_v_io_x_ref_services_wspr_internal_principal_BlessingsCacheAddMessageBuilder.Named("v.io/x/ref/services/wspr/internal/principal.BlessingsId").AssignBase(__VDLType_v_io_x_ref_services_wspr_internal_principal_BlessingsCacheAddMessage3)
- __VDLType_v_io_x_ref_services_wspr_internal_principal_BlessingsCacheAddMessage1.AppendField("CacheId", __VDLType_v_io_x_ref_services_wspr_internal_principal_BlessingsCacheAddMessage4)
- __VDLType_v_io_x_ref_services_wspr_internal_principal_BlessingsCacheAddMessage5 := __VDLType_v_io_x_ref_services_wspr_internal_principal_BlessingsCacheAddMessageBuilder.Struct()
- __VDLType_v_io_x_ref_services_wspr_internal_principal_BlessingsCacheAddMessage6 := __VDLType_v_io_x_ref_services_wspr_internal_principal_BlessingsCacheAddMessageBuilder.Named("v.io/v23/security.WireBlessings").AssignBase(__VDLType_v_io_x_ref_services_wspr_internal_principal_BlessingsCacheAddMessage5)
- __VDLType_v_io_x_ref_services_wspr_internal_principal_BlessingsCacheAddMessage7 := __VDLType_v_io_x_ref_services_wspr_internal_principal_BlessingsCacheAddMessageBuilder.List()
- __VDLType_v_io_x_ref_services_wspr_internal_principal_BlessingsCacheAddMessage8 := __VDLType_v_io_x_ref_services_wspr_internal_principal_BlessingsCacheAddMessageBuilder.List()
- __VDLType_v_io_x_ref_services_wspr_internal_principal_BlessingsCacheAddMessage9 := __VDLType_v_io_x_ref_services_wspr_internal_principal_BlessingsCacheAddMessageBuilder.Struct()
- __VDLType_v_io_x_ref_services_wspr_internal_principal_BlessingsCacheAddMessage10 := __VDLType_v_io_x_ref_services_wspr_internal_principal_BlessingsCacheAddMessageBuilder.Named("v.io/v23/security.Certificate").AssignBase(__VDLType_v_io_x_ref_services_wspr_internal_principal_BlessingsCacheAddMessage9)
- __VDLType_v_io_x_ref_services_wspr_internal_principal_BlessingsCacheAddMessage11 := vdl.StringType
- __VDLType_v_io_x_ref_services_wspr_internal_principal_BlessingsCacheAddMessage9.AppendField("Extension", __VDLType_v_io_x_ref_services_wspr_internal_principal_BlessingsCacheAddMessage11)
- __VDLType_v_io_x_ref_services_wspr_internal_principal_BlessingsCacheAddMessage12 := __VDLType_v_io_x_ref_services_wspr_internal_principal_BlessingsCacheAddMessageBuilder.List()
- __VDLType_v_io_x_ref_services_wspr_internal_principal_BlessingsCacheAddMessage13 := vdl.ByteType
- __VDLType_v_io_x_ref_services_wspr_internal_principal_BlessingsCacheAddMessage12.AssignElem(__VDLType_v_io_x_ref_services_wspr_internal_principal_BlessingsCacheAddMessage13)
- __VDLType_v_io_x_ref_services_wspr_internal_principal_BlessingsCacheAddMessage9.AppendField("PublicKey", __VDLType_v_io_x_ref_services_wspr_internal_principal_BlessingsCacheAddMessage12)
- __VDLType_v_io_x_ref_services_wspr_internal_principal_BlessingsCacheAddMessage14 := __VDLType_v_io_x_ref_services_wspr_internal_principal_BlessingsCacheAddMessageBuilder.List()
- __VDLType_v_io_x_ref_services_wspr_internal_principal_BlessingsCacheAddMessage15 := __VDLType_v_io_x_ref_services_wspr_internal_principal_BlessingsCacheAddMessageBuilder.Struct()
- __VDLType_v_io_x_ref_services_wspr_internal_principal_BlessingsCacheAddMessage16 := __VDLType_v_io_x_ref_services_wspr_internal_principal_BlessingsCacheAddMessageBuilder.Named("v.io/v23/security.Caveat").AssignBase(__VDLType_v_io_x_ref_services_wspr_internal_principal_BlessingsCacheAddMessage15)
- __VDLType_v_io_x_ref_services_wspr_internal_principal_BlessingsCacheAddMessage17 := __VDLType_v_io_x_ref_services_wspr_internal_principal_BlessingsCacheAddMessageBuilder.Array()
- __VDLType_v_io_x_ref_services_wspr_internal_principal_BlessingsCacheAddMessage18 := __VDLType_v_io_x_ref_services_wspr_internal_principal_BlessingsCacheAddMessageBuilder.Named("v.io/v23/uniqueid.Id").AssignBase(__VDLType_v_io_x_ref_services_wspr_internal_principal_BlessingsCacheAddMessage17)
- __VDLType_v_io_x_ref_services_wspr_internal_principal_BlessingsCacheAddMessage17.AssignElem(__VDLType_v_io_x_ref_services_wspr_internal_principal_BlessingsCacheAddMessage13)
- __VDLType_v_io_x_ref_services_wspr_internal_principal_BlessingsCacheAddMessage17.AssignLen(16)
- __VDLType_v_io_x_ref_services_wspr_internal_principal_BlessingsCacheAddMessage15.AppendField("Id", __VDLType_v_io_x_ref_services_wspr_internal_principal_BlessingsCacheAddMessage18)
- __VDLType_v_io_x_ref_services_wspr_internal_principal_BlessingsCacheAddMessage15.AppendField("ParamVom", __VDLType_v_io_x_ref_services_wspr_internal_principal_BlessingsCacheAddMessage12)
- __VDLType_v_io_x_ref_services_wspr_internal_principal_BlessingsCacheAddMessage14.AssignElem(__VDLType_v_io_x_ref_services_wspr_internal_principal_BlessingsCacheAddMessage16)
- __VDLType_v_io_x_ref_services_wspr_internal_principal_BlessingsCacheAddMessage9.AppendField("Caveats", __VDLType_v_io_x_ref_services_wspr_internal_principal_BlessingsCacheAddMessage14)
- __VDLType_v_io_x_ref_services_wspr_internal_principal_BlessingsCacheAddMessage19 := __VDLType_v_io_x_ref_services_wspr_internal_principal_BlessingsCacheAddMessageBuilder.Struct()
- __VDLType_v_io_x_ref_services_wspr_internal_principal_BlessingsCacheAddMessage20 := __VDLType_v_io_x_ref_services_wspr_internal_principal_BlessingsCacheAddMessageBuilder.Named("v.io/v23/security.Signature").AssignBase(__VDLType_v_io_x_ref_services_wspr_internal_principal_BlessingsCacheAddMessage19)
- __VDLType_v_io_x_ref_services_wspr_internal_principal_BlessingsCacheAddMessage19.AppendField("Purpose", __VDLType_v_io_x_ref_services_wspr_internal_principal_BlessingsCacheAddMessage12)
- __VDLType_v_io_x_ref_services_wspr_internal_principal_BlessingsCacheAddMessage21 := vdl.StringType
- __VDLType_v_io_x_ref_services_wspr_internal_principal_BlessingsCacheAddMessage22 := __VDLType_v_io_x_ref_services_wspr_internal_principal_BlessingsCacheAddMessageBuilder.Named("v.io/v23/security.Hash").AssignBase(__VDLType_v_io_x_ref_services_wspr_internal_principal_BlessingsCacheAddMessage21)
- __VDLType_v_io_x_ref_services_wspr_internal_principal_BlessingsCacheAddMessage19.AppendField("Hash", __VDLType_v_io_x_ref_services_wspr_internal_principal_BlessingsCacheAddMessage22)
- __VDLType_v_io_x_ref_services_wspr_internal_principal_BlessingsCacheAddMessage19.AppendField("R", __VDLType_v_io_x_ref_services_wspr_internal_principal_BlessingsCacheAddMessage12)
- __VDLType_v_io_x_ref_services_wspr_internal_principal_BlessingsCacheAddMessage19.AppendField("S", __VDLType_v_io_x_ref_services_wspr_internal_principal_BlessingsCacheAddMessage12)
- __VDLType_v_io_x_ref_services_wspr_internal_principal_BlessingsCacheAddMessage9.AppendField("Signature", __VDLType_v_io_x_ref_services_wspr_internal_principal_BlessingsCacheAddMessage20)
- __VDLType_v_io_x_ref_services_wspr_internal_principal_BlessingsCacheAddMessage8.AssignElem(__VDLType_v_io_x_ref_services_wspr_internal_principal_BlessingsCacheAddMessage10)
- __VDLType_v_io_x_ref_services_wspr_internal_principal_BlessingsCacheAddMessage7.AssignElem(__VDLType_v_io_x_ref_services_wspr_internal_principal_BlessingsCacheAddMessage8)
- __VDLType_v_io_x_ref_services_wspr_internal_principal_BlessingsCacheAddMessage5.AppendField("CertificateChains", __VDLType_v_io_x_ref_services_wspr_internal_principal_BlessingsCacheAddMessage7)
- __VDLType_v_io_x_ref_services_wspr_internal_principal_BlessingsCacheAddMessage1.AppendField("Blessings", __VDLType_v_io_x_ref_services_wspr_internal_principal_BlessingsCacheAddMessage6)
- __VDLType_v_io_x_ref_services_wspr_internal_principal_BlessingsCacheAddMessageBuilder.Build()
- __VDLType_v_io_x_ref_services_wspr_internal_principal_BlessingsCacheAddMessagev, err := __VDLType_v_io_x_ref_services_wspr_internal_principal_BlessingsCacheAddMessage2.Built()
- if err != nil {
- panic(err)
- }
- return __VDLType_v_io_x_ref_services_wspr_internal_principal_BlessingsCacheAddMessagev
-}
-func init() {
- __VDLType_v_io_x_ref_services_wspr_internal_principal_BlessingsCacheAddMessage = __VDLType_v_io_x_ref_services_wspr_internal_principal_BlessingsCacheAddMessage_gen()
-}
-
-var __VDLType_v_io_x_ref_services_wspr_internal_principal_BlessingsCacheDeleteMessage *vdl.Type = vdl.TypeOf(BlessingsCacheDeleteMessage{})
-var __VDLType_v_io_x_ref_services_wspr_internal_principal_BlessingsCacheMessage *vdl.Type
-
-func __VDLType_v_io_x_ref_services_wspr_internal_principal_BlessingsCacheMessage_gen() *vdl.Type {
- __VDLType_v_io_x_ref_services_wspr_internal_principal_BlessingsCacheMessageBuilder := vdl.TypeBuilder{}
-
- __VDLType_v_io_x_ref_services_wspr_internal_principal_BlessingsCacheMessage1 := __VDLType_v_io_x_ref_services_wspr_internal_principal_BlessingsCacheMessageBuilder.Union()
- __VDLType_v_io_x_ref_services_wspr_internal_principal_BlessingsCacheMessage2 := __VDLType_v_io_x_ref_services_wspr_internal_principal_BlessingsCacheMessageBuilder.Named("v.io/x/ref/services/wspr/internal/principal.BlessingsCacheMessage").AssignBase(__VDLType_v_io_x_ref_services_wspr_internal_principal_BlessingsCacheMessage1)
- __VDLType_v_io_x_ref_services_wspr_internal_principal_BlessingsCacheMessage3 := __VDLType_v_io_x_ref_services_wspr_internal_principal_BlessingsCacheMessageBuilder.Struct()
- __VDLType_v_io_x_ref_services_wspr_internal_principal_BlessingsCacheMessage4 := __VDLType_v_io_x_ref_services_wspr_internal_principal_BlessingsCacheMessageBuilder.Named("v.io/x/ref/services/wspr/internal/principal.BlessingsCacheAddMessage").AssignBase(__VDLType_v_io_x_ref_services_wspr_internal_principal_BlessingsCacheMessage3)
- __VDLType_v_io_x_ref_services_wspr_internal_principal_BlessingsCacheMessage5 := vdl.Uint32Type
- __VDLType_v_io_x_ref_services_wspr_internal_principal_BlessingsCacheMessage6 := __VDLType_v_io_x_ref_services_wspr_internal_principal_BlessingsCacheMessageBuilder.Named("v.io/x/ref/services/wspr/internal/principal.BlessingsId").AssignBase(__VDLType_v_io_x_ref_services_wspr_internal_principal_BlessingsCacheMessage5)
- __VDLType_v_io_x_ref_services_wspr_internal_principal_BlessingsCacheMessage3.AppendField("CacheId", __VDLType_v_io_x_ref_services_wspr_internal_principal_BlessingsCacheMessage6)
- __VDLType_v_io_x_ref_services_wspr_internal_principal_BlessingsCacheMessage7 := __VDLType_v_io_x_ref_services_wspr_internal_principal_BlessingsCacheMessageBuilder.Struct()
- __VDLType_v_io_x_ref_services_wspr_internal_principal_BlessingsCacheMessage8 := __VDLType_v_io_x_ref_services_wspr_internal_principal_BlessingsCacheMessageBuilder.Named("v.io/v23/security.WireBlessings").AssignBase(__VDLType_v_io_x_ref_services_wspr_internal_principal_BlessingsCacheMessage7)
- __VDLType_v_io_x_ref_services_wspr_internal_principal_BlessingsCacheMessage9 := __VDLType_v_io_x_ref_services_wspr_internal_principal_BlessingsCacheMessageBuilder.List()
- __VDLType_v_io_x_ref_services_wspr_internal_principal_BlessingsCacheMessage10 := __VDLType_v_io_x_ref_services_wspr_internal_principal_BlessingsCacheMessageBuilder.List()
- __VDLType_v_io_x_ref_services_wspr_internal_principal_BlessingsCacheMessage11 := __VDLType_v_io_x_ref_services_wspr_internal_principal_BlessingsCacheMessageBuilder.Struct()
- __VDLType_v_io_x_ref_services_wspr_internal_principal_BlessingsCacheMessage12 := __VDLType_v_io_x_ref_services_wspr_internal_principal_BlessingsCacheMessageBuilder.Named("v.io/v23/security.Certificate").AssignBase(__VDLType_v_io_x_ref_services_wspr_internal_principal_BlessingsCacheMessage11)
- __VDLType_v_io_x_ref_services_wspr_internal_principal_BlessingsCacheMessage13 := vdl.StringType
- __VDLType_v_io_x_ref_services_wspr_internal_principal_BlessingsCacheMessage11.AppendField("Extension", __VDLType_v_io_x_ref_services_wspr_internal_principal_BlessingsCacheMessage13)
- __VDLType_v_io_x_ref_services_wspr_internal_principal_BlessingsCacheMessage14 := __VDLType_v_io_x_ref_services_wspr_internal_principal_BlessingsCacheMessageBuilder.List()
- __VDLType_v_io_x_ref_services_wspr_internal_principal_BlessingsCacheMessage15 := vdl.ByteType
- __VDLType_v_io_x_ref_services_wspr_internal_principal_BlessingsCacheMessage14.AssignElem(__VDLType_v_io_x_ref_services_wspr_internal_principal_BlessingsCacheMessage15)
- __VDLType_v_io_x_ref_services_wspr_internal_principal_BlessingsCacheMessage11.AppendField("PublicKey", __VDLType_v_io_x_ref_services_wspr_internal_principal_BlessingsCacheMessage14)
- __VDLType_v_io_x_ref_services_wspr_internal_principal_BlessingsCacheMessage16 := __VDLType_v_io_x_ref_services_wspr_internal_principal_BlessingsCacheMessageBuilder.List()
- __VDLType_v_io_x_ref_services_wspr_internal_principal_BlessingsCacheMessage17 := __VDLType_v_io_x_ref_services_wspr_internal_principal_BlessingsCacheMessageBuilder.Struct()
- __VDLType_v_io_x_ref_services_wspr_internal_principal_BlessingsCacheMessage18 := __VDLType_v_io_x_ref_services_wspr_internal_principal_BlessingsCacheMessageBuilder.Named("v.io/v23/security.Caveat").AssignBase(__VDLType_v_io_x_ref_services_wspr_internal_principal_BlessingsCacheMessage17)
- __VDLType_v_io_x_ref_services_wspr_internal_principal_BlessingsCacheMessage19 := __VDLType_v_io_x_ref_services_wspr_internal_principal_BlessingsCacheMessageBuilder.Array()
- __VDLType_v_io_x_ref_services_wspr_internal_principal_BlessingsCacheMessage20 := __VDLType_v_io_x_ref_services_wspr_internal_principal_BlessingsCacheMessageBuilder.Named("v.io/v23/uniqueid.Id").AssignBase(__VDLType_v_io_x_ref_services_wspr_internal_principal_BlessingsCacheMessage19)
- __VDLType_v_io_x_ref_services_wspr_internal_principal_BlessingsCacheMessage19.AssignElem(__VDLType_v_io_x_ref_services_wspr_internal_principal_BlessingsCacheMessage15)
- __VDLType_v_io_x_ref_services_wspr_internal_principal_BlessingsCacheMessage19.AssignLen(16)
- __VDLType_v_io_x_ref_services_wspr_internal_principal_BlessingsCacheMessage17.AppendField("Id", __VDLType_v_io_x_ref_services_wspr_internal_principal_BlessingsCacheMessage20)
- __VDLType_v_io_x_ref_services_wspr_internal_principal_BlessingsCacheMessage17.AppendField("ParamVom", __VDLType_v_io_x_ref_services_wspr_internal_principal_BlessingsCacheMessage14)
- __VDLType_v_io_x_ref_services_wspr_internal_principal_BlessingsCacheMessage16.AssignElem(__VDLType_v_io_x_ref_services_wspr_internal_principal_BlessingsCacheMessage18)
- __VDLType_v_io_x_ref_services_wspr_internal_principal_BlessingsCacheMessage11.AppendField("Caveats", __VDLType_v_io_x_ref_services_wspr_internal_principal_BlessingsCacheMessage16)
- __VDLType_v_io_x_ref_services_wspr_internal_principal_BlessingsCacheMessage21 := __VDLType_v_io_x_ref_services_wspr_internal_principal_BlessingsCacheMessageBuilder.Struct()
- __VDLType_v_io_x_ref_services_wspr_internal_principal_BlessingsCacheMessage22 := __VDLType_v_io_x_ref_services_wspr_internal_principal_BlessingsCacheMessageBuilder.Named("v.io/v23/security.Signature").AssignBase(__VDLType_v_io_x_ref_services_wspr_internal_principal_BlessingsCacheMessage21)
- __VDLType_v_io_x_ref_services_wspr_internal_principal_BlessingsCacheMessage21.AppendField("Purpose", __VDLType_v_io_x_ref_services_wspr_internal_principal_BlessingsCacheMessage14)
- __VDLType_v_io_x_ref_services_wspr_internal_principal_BlessingsCacheMessage23 := vdl.StringType
- __VDLType_v_io_x_ref_services_wspr_internal_principal_BlessingsCacheMessage24 := __VDLType_v_io_x_ref_services_wspr_internal_principal_BlessingsCacheMessageBuilder.Named("v.io/v23/security.Hash").AssignBase(__VDLType_v_io_x_ref_services_wspr_internal_principal_BlessingsCacheMessage23)
- __VDLType_v_io_x_ref_services_wspr_internal_principal_BlessingsCacheMessage21.AppendField("Hash", __VDLType_v_io_x_ref_services_wspr_internal_principal_BlessingsCacheMessage24)
- __VDLType_v_io_x_ref_services_wspr_internal_principal_BlessingsCacheMessage21.AppendField("R", __VDLType_v_io_x_ref_services_wspr_internal_principal_BlessingsCacheMessage14)
- __VDLType_v_io_x_ref_services_wspr_internal_principal_BlessingsCacheMessage21.AppendField("S", __VDLType_v_io_x_ref_services_wspr_internal_principal_BlessingsCacheMessage14)
- __VDLType_v_io_x_ref_services_wspr_internal_principal_BlessingsCacheMessage11.AppendField("Signature", __VDLType_v_io_x_ref_services_wspr_internal_principal_BlessingsCacheMessage22)
- __VDLType_v_io_x_ref_services_wspr_internal_principal_BlessingsCacheMessage10.AssignElem(__VDLType_v_io_x_ref_services_wspr_internal_principal_BlessingsCacheMessage12)
- __VDLType_v_io_x_ref_services_wspr_internal_principal_BlessingsCacheMessage9.AssignElem(__VDLType_v_io_x_ref_services_wspr_internal_principal_BlessingsCacheMessage10)
- __VDLType_v_io_x_ref_services_wspr_internal_principal_BlessingsCacheMessage7.AppendField("CertificateChains", __VDLType_v_io_x_ref_services_wspr_internal_principal_BlessingsCacheMessage9)
- __VDLType_v_io_x_ref_services_wspr_internal_principal_BlessingsCacheMessage3.AppendField("Blessings", __VDLType_v_io_x_ref_services_wspr_internal_principal_BlessingsCacheMessage8)
- __VDLType_v_io_x_ref_services_wspr_internal_principal_BlessingsCacheMessage1.AppendField("Add", __VDLType_v_io_x_ref_services_wspr_internal_principal_BlessingsCacheMessage4)
- __VDLType_v_io_x_ref_services_wspr_internal_principal_BlessingsCacheMessage25 := __VDLType_v_io_x_ref_services_wspr_internal_principal_BlessingsCacheMessageBuilder.Struct()
- __VDLType_v_io_x_ref_services_wspr_internal_principal_BlessingsCacheMessage26 := __VDLType_v_io_x_ref_services_wspr_internal_principal_BlessingsCacheMessageBuilder.Named("v.io/x/ref/services/wspr/internal/principal.BlessingsCacheDeleteMessage").AssignBase(__VDLType_v_io_x_ref_services_wspr_internal_principal_BlessingsCacheMessage25)
- __VDLType_v_io_x_ref_services_wspr_internal_principal_BlessingsCacheMessage25.AppendField("CacheId", __VDLType_v_io_x_ref_services_wspr_internal_principal_BlessingsCacheMessage6)
- __VDLType_v_io_x_ref_services_wspr_internal_principal_BlessingsCacheMessage27 := vdl.Uint32Type
- __VDLType_v_io_x_ref_services_wspr_internal_principal_BlessingsCacheMessage25.AppendField("DeleteAfter", __VDLType_v_io_x_ref_services_wspr_internal_principal_BlessingsCacheMessage27)
- __VDLType_v_io_x_ref_services_wspr_internal_principal_BlessingsCacheMessage1.AppendField("Delete", __VDLType_v_io_x_ref_services_wspr_internal_principal_BlessingsCacheMessage26)
- __VDLType_v_io_x_ref_services_wspr_internal_principal_BlessingsCacheMessageBuilder.Build()
- __VDLType_v_io_x_ref_services_wspr_internal_principal_BlessingsCacheMessagev, err := __VDLType_v_io_x_ref_services_wspr_internal_principal_BlessingsCacheMessage2.Built()
- if err != nil {
- panic(err)
- }
- return __VDLType_v_io_x_ref_services_wspr_internal_principal_BlessingsCacheMessagev
-}
-func init() {
- __VDLType_v_io_x_ref_services_wspr_internal_principal_BlessingsCacheMessage = __VDLType_v_io_x_ref_services_wspr_internal_principal_BlessingsCacheMessage_gen()
-}
-
-var __VDLType_v_io_x_ref_services_wspr_internal_principal_BlessingsId *vdl.Type = vdl.TypeOf(BlessingsId(0))
-
-func __VDLEnsureNativeBuilt() {
- if __VDLType0 == nil {
- __VDLType0 = __VDLType0_gen()
- }
- if __VDLType_v_io_v23_security_WireBlessings == nil {
- __VDLType_v_io_v23_security_WireBlessings = __VDLType_v_io_v23_security_WireBlessings_gen()
- }
- if __VDLType_v_io_x_ref_services_wspr_internal_principal_BlessingsCacheAddMessage == nil {
- __VDLType_v_io_x_ref_services_wspr_internal_principal_BlessingsCacheAddMessage = __VDLType_v_io_x_ref_services_wspr_internal_principal_BlessingsCacheAddMessage_gen()
- }
- if __VDLType_v_io_x_ref_services_wspr_internal_principal_BlessingsCacheMessage == nil {
- __VDLType_v_io_x_ref_services_wspr_internal_principal_BlessingsCacheMessage = __VDLType_v_io_x_ref_services_wspr_internal_principal_BlessingsCacheMessage_gen()
- }
+ return struct{}{}
}
diff --git a/services/wspr/internal/rpc/server/server.vdl.go b/services/wspr/internal/rpc/server/server.vdl.go
index 9514732..acacb3f 100644
--- a/services/wspr/internal/rpc/server/server.vdl.go
+++ b/services/wspr/internal/rpc/server/server.vdl.go
@@ -22,6 +22,11 @@
"v.io/x/ref/services/wspr/internal/principal"
)
+var _ = __VDLInit() // Must be first; see __VDLInit comments for details.
+
+//////////////////////////////////////////////////
+// Type definitions
+
type Context struct {
Language string
}
@@ -32,9 +37,6 @@
}
func (m *Context) FillVDLTarget(t vdl.Target, tt *vdl.Type) error {
- if __VDLType_v_io_x_ref_services_wspr_internal_rpc_server_Context == nil || __VDLType0 == nil {
- panic("Initialization order error: types generated for FillVDLTarget not initialized. Consider moving caller to an init() block.")
- }
fieldsTarget1, err := t.StartFields(tt)
if err != nil {
return err
@@ -45,7 +47,7 @@
return err
}
if err != vdl.ErrFieldNoExist {
- if err := fieldTarget3.FromString(string(m.Language), vdl.StringType); err != nil {
+ if err := fieldTarget3.FromString(string(m.Language), tt.NonOptional().Field(0).Type); err != nil {
return err
}
if err := fieldsTarget1.FinishField(keyTarget2, fieldTarget3); err != nil {
@@ -71,8 +73,8 @@
func (t *ContextTarget) StartFields(tt *vdl.Type) (vdl.FieldsTarget, error) {
- if !vdl.Compatible(tt, __VDLType_v_io_x_ref_services_wspr_internal_rpc_server_Context) {
- return nil, fmt.Errorf("type %v incompatible with %v", tt, __VDLType_v_io_x_ref_services_wspr_internal_rpc_server_Context)
+ if ttWant := vdl.TypeOf((*Context)(nil)).Elem(); !vdl.Compatible(tt, ttWant) {
+ return nil, fmt.Errorf("type %v incompatible with %v", tt, ttWant)
}
return t, nil
}
@@ -83,7 +85,7 @@
target, err := &t.languageTarget, error(nil)
return nil, target, err
default:
- return nil, nil, fmt.Errorf("field %s not in struct %v", name, __VDLType_v_io_x_ref_services_wspr_internal_rpc_server_Context)
+ return nil, nil, fmt.Errorf("field %s not in struct v.io/x/ref/services/wspr/internal/rpc/server.Context", name)
}
}
func (t *ContextTarget) FinishField(_, _ vdl.Target) error {
@@ -112,9 +114,6 @@
}
func (m *SecurityCall) FillVDLTarget(t vdl.Target, tt *vdl.Type) error {
- if __VDLType_v_io_x_ref_services_wspr_internal_rpc_server_SecurityCall == nil || __VDLType1 == nil {
- panic("Initialization order error: types generated for FillVDLTarget not initialized. Consider moving caller to an init() block.")
- }
fieldsTarget1, err := t.StartFields(tt)
if err != nil {
return err
@@ -125,7 +124,7 @@
return err
}
if err != vdl.ErrFieldNoExist {
- if err := fieldTarget3.FromString(string(m.Method), vdl.StringType); err != nil {
+ if err := fieldTarget3.FromString(string(m.Method), tt.NonOptional().Field(0).Type); err != nil {
return err
}
if err := fieldsTarget1.FinishField(keyTarget2, fieldTarget3); err != nil {
@@ -137,7 +136,7 @@
return err
}
if err != vdl.ErrFieldNoExist {
- if err := fieldTarget5.FromString(string(m.Suffix), vdl.StringType); err != nil {
+ if err := fieldTarget5.FromString(string(m.Suffix), tt.NonOptional().Field(1).Type); err != nil {
return err
}
if err := fieldsTarget1.FinishField(keyTarget4, fieldTarget5); err != nil {
@@ -150,7 +149,7 @@
}
if err != vdl.ErrFieldNoExist {
- listTarget8, err := fieldTarget7.StartList(__VDLType2, len(m.MethodTags))
+ listTarget8, err := fieldTarget7.StartList(tt.NonOptional().Field(2).Type, len(m.MethodTags))
if err != nil {
return err
}
@@ -161,11 +160,11 @@
}
if elem10 == nil {
- if err := elemTarget9.FromNil(vdl.AnyType); err != nil {
+ if err := elemTarget9.FromNil(tt.NonOptional().Field(2).Type.Elem()); err != nil {
return err
}
} else {
- if err := elem10.FillVDLTarget(elemTarget9, vdl.AnyType); err != nil {
+ if err := elem10.FillVDLTarget(elemTarget9, tt.NonOptional().Field(2).Type.Elem()); err != nil {
return err
}
}
@@ -186,7 +185,7 @@
}
if err != vdl.ErrFieldNoExist {
- if err := m.LocalBlessings.FillVDLTarget(fieldTarget12, __VDLType_v_io_x_ref_services_wspr_internal_principal_BlessingsId); err != nil {
+ if err := m.LocalBlessings.FillVDLTarget(fieldTarget12, tt.NonOptional().Field(3).Type); err != nil {
return err
}
if err := fieldsTarget1.FinishField(keyTarget11, fieldTarget12); err != nil {
@@ -199,7 +198,7 @@
}
if err != vdl.ErrFieldNoExist {
- listTarget15, err := fieldTarget14.StartList(__VDLType3, len(m.LocalBlessingStrings))
+ listTarget15, err := fieldTarget14.StartList(tt.NonOptional().Field(4).Type, len(m.LocalBlessingStrings))
if err != nil {
return err
}
@@ -208,7 +207,7 @@
if err != nil {
return err
}
- if err := elemTarget16.FromString(string(elem17), vdl.StringType); err != nil {
+ if err := elemTarget16.FromString(string(elem17), tt.NonOptional().Field(4).Type.Elem()); err != nil {
return err
}
if err := listTarget15.FinishElem(elemTarget16); err != nil {
@@ -228,7 +227,7 @@
}
if err != vdl.ErrFieldNoExist {
- if err := m.RemoteBlessings.FillVDLTarget(fieldTarget19, __VDLType_v_io_x_ref_services_wspr_internal_principal_BlessingsId); err != nil {
+ if err := m.RemoteBlessings.FillVDLTarget(fieldTarget19, tt.NonOptional().Field(5).Type); err != nil {
return err
}
if err := fieldsTarget1.FinishField(keyTarget18, fieldTarget19); err != nil {
@@ -241,7 +240,7 @@
}
if err != vdl.ErrFieldNoExist {
- listTarget22, err := fieldTarget21.StartList(__VDLType3, len(m.RemoteBlessingStrings))
+ listTarget22, err := fieldTarget21.StartList(tt.NonOptional().Field(6).Type, len(m.RemoteBlessingStrings))
if err != nil {
return err
}
@@ -250,7 +249,7 @@
if err != nil {
return err
}
- if err := elemTarget23.FromString(string(elem24), vdl.StringType); err != nil {
+ if err := elemTarget23.FromString(string(elem24), tt.NonOptional().Field(6).Type.Elem()); err != nil {
return err
}
if err := listTarget22.FinishElem(elemTarget23); err != nil {
@@ -269,7 +268,7 @@
return err
}
if err != vdl.ErrFieldNoExist {
- if err := fieldTarget26.FromString(string(m.LocalEndpoint), vdl.StringType); err != nil {
+ if err := fieldTarget26.FromString(string(m.LocalEndpoint), tt.NonOptional().Field(7).Type); err != nil {
return err
}
if err := fieldsTarget1.FinishField(keyTarget25, fieldTarget26); err != nil {
@@ -281,7 +280,7 @@
return err
}
if err != vdl.ErrFieldNoExist {
- if err := fieldTarget28.FromString(string(m.RemoteEndpoint), vdl.StringType); err != nil {
+ if err := fieldTarget28.FromString(string(m.RemoteEndpoint), tt.NonOptional().Field(8).Type); err != nil {
return err
}
if err := fieldsTarget1.FinishField(keyTarget27, fieldTarget28); err != nil {
@@ -315,8 +314,8 @@
func (t *SecurityCallTarget) StartFields(tt *vdl.Type) (vdl.FieldsTarget, error) {
- if !vdl.Compatible(tt, __VDLType_v_io_x_ref_services_wspr_internal_rpc_server_SecurityCall) {
- return nil, fmt.Errorf("type %v incompatible with %v", tt, __VDLType_v_io_x_ref_services_wspr_internal_rpc_server_SecurityCall)
+ if ttWant := vdl.TypeOf((*SecurityCall)(nil)).Elem(); !vdl.Compatible(tt, ttWant) {
+ return nil, fmt.Errorf("type %v incompatible with %v", tt, ttWant)
}
return t, nil
}
@@ -359,7 +358,7 @@
target, err := &t.remoteEndpointTarget, error(nil)
return nil, target, err
default:
- return nil, nil, fmt.Errorf("field %s not in struct %v", name, __VDLType_v_io_x_ref_services_wspr_internal_rpc_server_SecurityCall)
+ return nil, nil, fmt.Errorf("field %s not in struct v.io/x/ref/services/wspr/internal/rpc/server.SecurityCall", name)
}
}
func (t *SecurityCallTarget) FinishField(_, _ vdl.Target) error {
@@ -380,8 +379,8 @@
func (t *unnamed_5b5d616e79Target) StartList(tt *vdl.Type, len int) (vdl.ListTarget, error) {
- if !vdl.Compatible(tt, __VDLType2) {
- return nil, fmt.Errorf("type %v incompatible with %v", tt, __VDLType2)
+ if ttWant := vdl.TypeOf((*[]*vom.RawBytes)(nil)); !vdl.Compatible(tt, ttWant) {
+ return nil, fmt.Errorf("type %v incompatible with %v", tt, ttWant)
}
if cap(*t.Value) < len {
*t.Value = make([]*vom.RawBytes, len)
@@ -414,9 +413,6 @@
}
func (m *CaveatValidationRequest) FillVDLTarget(t vdl.Target, tt *vdl.Type) error {
- if __VDLType_v_io_x_ref_services_wspr_internal_rpc_server_CaveatValidationRequest == nil || __VDLType4 == nil {
- panic("Initialization order error: types generated for FillVDLTarget not initialized. Consider moving caller to an init() block.")
- }
fieldsTarget1, err := t.StartFields(tt)
if err != nil {
return err
@@ -428,7 +424,7 @@
}
if err != vdl.ErrFieldNoExist {
- if err := m.Call.FillVDLTarget(fieldTarget3, __VDLType_v_io_x_ref_services_wspr_internal_rpc_server_SecurityCall); err != nil {
+ if err := m.Call.FillVDLTarget(fieldTarget3, tt.NonOptional().Field(0).Type); err != nil {
return err
}
if err := fieldsTarget1.FinishField(keyTarget2, fieldTarget3); err != nil {
@@ -441,7 +437,7 @@
}
if err != vdl.ErrFieldNoExist {
- if err := m.Context.FillVDLTarget(fieldTarget5, __VDLType_v_io_x_ref_services_wspr_internal_rpc_server_Context); err != nil {
+ if err := m.Context.FillVDLTarget(fieldTarget5, tt.NonOptional().Field(1).Type); err != nil {
return err
}
if err := fieldsTarget1.FinishField(keyTarget4, fieldTarget5); err != nil {
@@ -454,7 +450,7 @@
}
if err != vdl.ErrFieldNoExist {
- listTarget8, err := fieldTarget7.StartList(__VDLType5, len(m.Cavs))
+ listTarget8, err := fieldTarget7.StartList(tt.NonOptional().Field(2).Type, len(m.Cavs))
if err != nil {
return err
}
@@ -464,7 +460,7 @@
return err
}
- listTarget11, err := elemTarget9.StartList(__VDLType6, len(elem10))
+ listTarget11, err := elemTarget9.StartList(tt.NonOptional().Field(2).Type.Elem(), len(elem10))
if err != nil {
return err
}
@@ -474,7 +470,7 @@
return err
}
- if err := elem13.FillVDLTarget(elemTarget12, __VDLType_v_io_v23_security_Caveat); err != nil {
+ if err := elem13.FillVDLTarget(elemTarget12, tt.NonOptional().Field(2).Type.Elem().Elem()); err != nil {
return err
}
if err := listTarget11.FinishElem(elemTarget12); err != nil {
@@ -516,8 +512,8 @@
func (t *CaveatValidationRequestTarget) StartFields(tt *vdl.Type) (vdl.FieldsTarget, error) {
- if !vdl.Compatible(tt, __VDLType_v_io_x_ref_services_wspr_internal_rpc_server_CaveatValidationRequest) {
- return nil, fmt.Errorf("type %v incompatible with %v", tt, __VDLType_v_io_x_ref_services_wspr_internal_rpc_server_CaveatValidationRequest)
+ if ttWant := vdl.TypeOf((*CaveatValidationRequest)(nil)).Elem(); !vdl.Compatible(tt, ttWant) {
+ return nil, fmt.Errorf("type %v incompatible with %v", tt, ttWant)
}
return t, nil
}
@@ -536,7 +532,7 @@
target, err := &t.cavsTarget, error(nil)
return nil, target, err
default:
- return nil, nil, fmt.Errorf("field %s not in struct %v", name, __VDLType_v_io_x_ref_services_wspr_internal_rpc_server_CaveatValidationRequest)
+ return nil, nil, fmt.Errorf("field %s not in struct v.io/x/ref/services/wspr/internal/rpc/server.CaveatValidationRequest", name)
}
}
func (t *CaveatValidationRequestTarget) FinishField(_, _ vdl.Target) error {
@@ -557,8 +553,8 @@
func (t *unnamed_5b5d5b5d762e696f2f7632332f73656375726974792e436176656174207374727563747b496420762e696f2f7632332f756e6971756569642e4964205b31365d627974653b506172616d566f6d205b5d627974657dTarget) StartList(tt *vdl.Type, len int) (vdl.ListTarget, error) {
- if !vdl.Compatible(tt, __VDLType5) {
- return nil, fmt.Errorf("type %v incompatible with %v", tt, __VDLType5)
+ if ttWant := vdl.TypeOf((*[][]security.Caveat)(nil)); !vdl.Compatible(tt, ttWant) {
+ return nil, fmt.Errorf("type %v incompatible with %v", tt, ttWant)
}
if cap(*t.Value) < len {
*t.Value = make([][]security.Caveat, len)
@@ -590,8 +586,8 @@
func (t *unnamed_5b5d762e696f2f7632332f73656375726974792e436176656174207374727563747b496420762e696f2f7632332f756e6971756569642e4964205b31365d627974653b506172616d566f6d205b5d627974657dTarget) StartList(tt *vdl.Type, len int) (vdl.ListTarget, error) {
- if !vdl.Compatible(tt, __VDLType6) {
- return nil, fmt.Errorf("type %v incompatible with %v", tt, __VDLType6)
+ if ttWant := vdl.TypeOf((*[]security.Caveat)(nil)); !vdl.Compatible(tt, ttWant) {
+ return nil, fmt.Errorf("type %v incompatible with %v", tt, ttWant)
}
if cap(*t.Value) < len {
*t.Value = make([]security.Caveat, len)
@@ -623,9 +619,6 @@
}
func (m *CaveatValidationResponse) FillVDLTarget(t vdl.Target, tt *vdl.Type) error {
- if __VDLType_v_io_x_ref_services_wspr_internal_rpc_server_CaveatValidationResponse == nil || __VDLType7 == nil {
- panic("Initialization order error: types generated for FillVDLTarget not initialized. Consider moving caller to an init() block.")
- }
fieldsTarget1, err := t.StartFields(tt)
if err != nil {
return err
@@ -637,7 +630,7 @@
}
if err != vdl.ErrFieldNoExist {
- listTarget4, err := fieldTarget3.StartList(__VDLType8, len(m.Results))
+ listTarget4, err := fieldTarget3.StartList(tt.NonOptional().Field(0).Type, len(m.Results))
if err != nil {
return err
}
@@ -648,7 +641,7 @@
}
if elem6 == nil {
- if err := elemTarget5.FromNil(vdl.ErrorType); err != nil {
+ if err := elemTarget5.FromNil(tt.NonOptional().Field(0).Type.Elem()); err != nil {
return err
}
} else {
@@ -691,8 +684,8 @@
func (t *CaveatValidationResponseTarget) StartFields(tt *vdl.Type) (vdl.FieldsTarget, error) {
- if !vdl.Compatible(tt, __VDLType_v_io_x_ref_services_wspr_internal_rpc_server_CaveatValidationResponse) {
- return nil, fmt.Errorf("type %v incompatible with %v", tt, __VDLType_v_io_x_ref_services_wspr_internal_rpc_server_CaveatValidationResponse)
+ if ttWant := vdl.TypeOf((*CaveatValidationResponse)(nil)).Elem(); !vdl.Compatible(tt, ttWant) {
+ return nil, fmt.Errorf("type %v incompatible with %v", tt, ttWant)
}
return t, nil
}
@@ -703,7 +696,7 @@
target, err := &t.resultsTarget, error(nil)
return nil, target, err
default:
- return nil, nil, fmt.Errorf("field %s not in struct %v", name, __VDLType_v_io_x_ref_services_wspr_internal_rpc_server_CaveatValidationResponse)
+ return nil, nil, fmt.Errorf("field %s not in struct v.io/x/ref/services/wspr/internal/rpc/server.CaveatValidationResponse", name)
}
}
func (t *CaveatValidationResponseTarget) FinishField(_, _ vdl.Target) error {
@@ -724,8 +717,8 @@
func (t *unnamed_5b5d3f6572726f72207374727563747b496420737472696e673b5265747279436f646520656e756d7b4e6f52657472793b5265747279436f6e6e656374696f6e3b5265747279526566657463683b52657472794261636b6f66667d3b4d736720737472696e673b506172616d4c697374205b5d616e797dTarget) StartList(tt *vdl.Type, len int) (vdl.ListTarget, error) {
- if !vdl.Compatible(tt, __VDLType8) {
- return nil, fmt.Errorf("type %v incompatible with %v", tt, __VDLType8)
+ if ttWant := vdl.TypeOf((*[]error)(nil)); !vdl.Compatible(tt, ttWant) {
+ return nil, fmt.Errorf("type %v incompatible with %v", tt, ttWant)
}
if cap(*t.Value) < len {
*t.Value = make([]error, len)
@@ -761,7 +754,6 @@
}
func (m *ServerRpcRequestCall) FillVDLTarget(t vdl.Target, tt *vdl.Type) error {
- __VDLEnsureNativeBuilt()
fieldsTarget1, err := t.StartFields(tt)
if err != nil {
return err
@@ -773,7 +765,7 @@
}
if err != vdl.ErrFieldNoExist {
- if err := m.SecurityCall.FillVDLTarget(fieldTarget3, __VDLType_v_io_x_ref_services_wspr_internal_rpc_server_SecurityCall); err != nil {
+ if err := m.SecurityCall.FillVDLTarget(fieldTarget3, tt.NonOptional().Field(0).Type); err != nil {
return err
}
if err := fieldsTarget1.FinishField(keyTarget2, fieldTarget3); err != nil {
@@ -791,7 +783,7 @@
}
if err != vdl.ErrFieldNoExist {
- if err := wireValue4.FillVDLTarget(fieldTarget6, __VDLType_time_WireDeadline); err != nil {
+ if err := wireValue4.FillVDLTarget(fieldTarget6, tt.NonOptional().Field(1).Type); err != nil {
return err
}
if err := fieldsTarget1.FinishField(keyTarget5, fieldTarget6); err != nil {
@@ -804,7 +796,7 @@
}
if err != vdl.ErrFieldNoExist {
- if err := m.Context.FillVDLTarget(fieldTarget8, __VDLType_v_io_x_ref_services_wspr_internal_rpc_server_Context); err != nil {
+ if err := m.Context.FillVDLTarget(fieldTarget8, tt.NonOptional().Field(2).Type); err != nil {
return err
}
if err := fieldsTarget1.FinishField(keyTarget7, fieldTarget8); err != nil {
@@ -817,7 +809,7 @@
}
if err != vdl.ErrFieldNoExist {
- if err := m.TraceRequest.FillVDLTarget(fieldTarget10, __VDLType_v_io_v23_vtrace_Request); err != nil {
+ if err := m.TraceRequest.FillVDLTarget(fieldTarget10, tt.NonOptional().Field(3).Type); err != nil {
return err
}
if err := fieldsTarget1.FinishField(keyTarget9, fieldTarget10); err != nil {
@@ -830,7 +822,7 @@
}
if err != vdl.ErrFieldNoExist {
- if err := m.GrantedBlessings.FillVDLTarget(fieldTarget12, __VDLType_v_io_x_ref_services_wspr_internal_principal_BlessingsId); err != nil {
+ if err := m.GrantedBlessings.FillVDLTarget(fieldTarget12, tt.NonOptional().Field(4).Type); err != nil {
return err
}
if err := fieldsTarget1.FinishField(keyTarget11, fieldTarget12); err != nil {
@@ -860,8 +852,8 @@
func (t *ServerRpcRequestCallTarget) StartFields(tt *vdl.Type) (vdl.FieldsTarget, error) {
- if !vdl.Compatible(tt, __VDLType_v_io_x_ref_services_wspr_internal_rpc_server_ServerRpcRequestCall) {
- return nil, fmt.Errorf("type %v incompatible with %v", tt, __VDLType_v_io_x_ref_services_wspr_internal_rpc_server_ServerRpcRequestCall)
+ if ttWant := vdl.TypeOf((*ServerRpcRequestCall)(nil)).Elem(); !vdl.Compatible(tt, ttWant) {
+ return nil, fmt.Errorf("type %v incompatible with %v", tt, ttWant)
}
return t, nil
}
@@ -888,7 +880,7 @@
target, err := &t.grantedBlessingsTarget, error(nil)
return nil, target, err
default:
- return nil, nil, fmt.Errorf("field %s not in struct %v", name, __VDLType_v_io_x_ref_services_wspr_internal_rpc_server_ServerRpcRequestCall)
+ return nil, nil, fmt.Errorf("field %s not in struct v.io/x/ref/services/wspr/internal/rpc/server.ServerRpcRequestCall", name)
}
}
func (t *ServerRpcRequestCallTarget) FinishField(_, _ vdl.Target) error {
@@ -914,7 +906,6 @@
}
func (m *ServerRpcRequest) FillVDLTarget(t vdl.Target, tt *vdl.Type) error {
- __VDLEnsureNativeBuilt()
fieldsTarget1, err := t.StartFields(tt)
if err != nil {
return err
@@ -925,7 +916,7 @@
return err
}
if err != vdl.ErrFieldNoExist {
- if err := fieldTarget3.FromUint(uint64(m.ServerId), vdl.Uint32Type); err != nil {
+ if err := fieldTarget3.FromUint(uint64(m.ServerId), tt.NonOptional().Field(0).Type); err != nil {
return err
}
if err := fieldsTarget1.FinishField(keyTarget2, fieldTarget3); err != nil {
@@ -937,7 +928,7 @@
return err
}
if err != vdl.ErrFieldNoExist {
- if err := fieldTarget5.FromInt(int64(m.Handle), vdl.Int32Type); err != nil {
+ if err := fieldTarget5.FromInt(int64(m.Handle), tt.NonOptional().Field(1).Type); err != nil {
return err
}
if err := fieldsTarget1.FinishField(keyTarget4, fieldTarget5); err != nil {
@@ -949,7 +940,7 @@
return err
}
if err != vdl.ErrFieldNoExist {
- if err := fieldTarget7.FromString(string(m.Method), vdl.StringType); err != nil {
+ if err := fieldTarget7.FromString(string(m.Method), tt.NonOptional().Field(2).Type); err != nil {
return err
}
if err := fieldsTarget1.FinishField(keyTarget6, fieldTarget7); err != nil {
@@ -962,7 +953,7 @@
}
if err != vdl.ErrFieldNoExist {
- listTarget10, err := fieldTarget9.StartList(__VDLType2, len(m.Args))
+ listTarget10, err := fieldTarget9.StartList(tt.NonOptional().Field(3).Type, len(m.Args))
if err != nil {
return err
}
@@ -973,11 +964,11 @@
}
if elem12 == nil {
- if err := elemTarget11.FromNil(vdl.AnyType); err != nil {
+ if err := elemTarget11.FromNil(tt.NonOptional().Field(3).Type.Elem()); err != nil {
return err
}
} else {
- if err := elem12.FillVDLTarget(elemTarget11, vdl.AnyType); err != nil {
+ if err := elem12.FillVDLTarget(elemTarget11, tt.NonOptional().Field(3).Type.Elem()); err != nil {
return err
}
}
@@ -998,7 +989,7 @@
}
if err != vdl.ErrFieldNoExist {
- if err := m.Call.FillVDLTarget(fieldTarget14, __VDLType_v_io_x_ref_services_wspr_internal_rpc_server_ServerRpcRequestCall); err != nil {
+ if err := m.Call.FillVDLTarget(fieldTarget14, tt.NonOptional().Field(4).Type); err != nil {
return err
}
if err := fieldsTarget1.FinishField(keyTarget13, fieldTarget14); err != nil {
@@ -1028,8 +1019,8 @@
func (t *ServerRpcRequestTarget) StartFields(tt *vdl.Type) (vdl.FieldsTarget, error) {
- if !vdl.Compatible(tt, __VDLType_v_io_x_ref_services_wspr_internal_rpc_server_ServerRpcRequest) {
- return nil, fmt.Errorf("type %v incompatible with %v", tt, __VDLType_v_io_x_ref_services_wspr_internal_rpc_server_ServerRpcRequest)
+ if ttWant := vdl.TypeOf((*ServerRpcRequest)(nil)).Elem(); !vdl.Compatible(tt, ttWant) {
+ return nil, fmt.Errorf("type %v incompatible with %v", tt, ttWant)
}
return t, nil
}
@@ -1056,7 +1047,7 @@
target, err := &t.callTarget, error(nil)
return nil, target, err
default:
- return nil, nil, fmt.Errorf("field %s not in struct %v", name, __VDLType_v_io_x_ref_services_wspr_internal_rpc_server_ServerRpcRequest)
+ return nil, nil, fmt.Errorf("field %s not in struct v.io/x/ref/services/wspr/internal/rpc/server.ServerRpcRequest", name)
}
}
func (t *ServerRpcRequestTarget) FinishField(_, _ vdl.Target) error {
@@ -1082,9 +1073,6 @@
}
func (m *LookupReply) FillVDLTarget(t vdl.Target, tt *vdl.Type) error {
- if __VDLType_v_io_x_ref_services_wspr_internal_rpc_server_LookupReply == nil || __VDLType11 == nil {
- panic("Initialization order error: types generated for FillVDLTarget not initialized. Consider moving caller to an init() block.")
- }
fieldsTarget1, err := t.StartFields(tt)
if err != nil {
return err
@@ -1095,7 +1083,7 @@
return err
}
if err != vdl.ErrFieldNoExist {
- if err := fieldTarget3.FromInt(int64(m.Handle), vdl.Int32Type); err != nil {
+ if err := fieldTarget3.FromInt(int64(m.Handle), tt.NonOptional().Field(0).Type); err != nil {
return err
}
if err := fieldsTarget1.FinishField(keyTarget2, fieldTarget3); err != nil {
@@ -1107,7 +1095,7 @@
return err
}
if err != vdl.ErrFieldNoExist {
- if err := fieldTarget5.FromBool(bool(m.HasAuthorizer), vdl.BoolType); err != nil {
+ if err := fieldTarget5.FromBool(bool(m.HasAuthorizer), tt.NonOptional().Field(1).Type); err != nil {
return err
}
if err := fieldsTarget1.FinishField(keyTarget4, fieldTarget5); err != nil {
@@ -1119,7 +1107,7 @@
return err
}
if err != vdl.ErrFieldNoExist {
- if err := fieldTarget7.FromBool(bool(m.HasGlobber), vdl.BoolType); err != nil {
+ if err := fieldTarget7.FromBool(bool(m.HasGlobber), tt.NonOptional().Field(2).Type); err != nil {
return err
}
if err := fieldsTarget1.FinishField(keyTarget6, fieldTarget7); err != nil {
@@ -1132,7 +1120,7 @@
}
if err != vdl.ErrFieldNoExist {
- listTarget10, err := fieldTarget9.StartList(__VDLType12, len(m.Signature))
+ listTarget10, err := fieldTarget9.StartList(tt.NonOptional().Field(3).Type, len(m.Signature))
if err != nil {
return err
}
@@ -1142,7 +1130,7 @@
return err
}
- if err := elem12.FillVDLTarget(elemTarget11, __VDLType_signature_Interface); err != nil {
+ if err := elem12.FillVDLTarget(elemTarget11, tt.NonOptional().Field(3).Type.Elem()); err != nil {
return err
}
if err := listTarget10.FinishElem(elemTarget11); err != nil {
@@ -1163,7 +1151,7 @@
if err != vdl.ErrFieldNoExist {
if m.Err == nil {
- if err := fieldTarget14.FromNil(vdl.ErrorType); err != nil {
+ if err := fieldTarget14.FromNil(tt.NonOptional().Field(4).Type); err != nil {
return err
}
} else {
@@ -1203,8 +1191,8 @@
func (t *LookupReplyTarget) StartFields(tt *vdl.Type) (vdl.FieldsTarget, error) {
- if !vdl.Compatible(tt, __VDLType_v_io_x_ref_services_wspr_internal_rpc_server_LookupReply) {
- return nil, fmt.Errorf("type %v incompatible with %v", tt, __VDLType_v_io_x_ref_services_wspr_internal_rpc_server_LookupReply)
+ if ttWant := vdl.TypeOf((*LookupReply)(nil)).Elem(); !vdl.Compatible(tt, ttWant) {
+ return nil, fmt.Errorf("type %v incompatible with %v", tt, ttWant)
}
return t, nil
}
@@ -1231,7 +1219,7 @@
target, err := &t.errTarget, error(nil)
return nil, target, err
default:
- return nil, nil, fmt.Errorf("field %s not in struct %v", name, __VDLType_v_io_x_ref_services_wspr_internal_rpc_server_LookupReply)
+ return nil, nil, fmt.Errorf("field %s not in struct v.io/x/ref/services/wspr/internal/rpc/server.LookupReply", name)
}
}
func (t *LookupReplyTarget) FinishField(_, _ vdl.Target) error {
@@ -1252,8 +1240,8 @@
func (t *unnamed_5b5d7369676e61747572652e496e74657266616365207374727563747b4e616d6520737472696e673b506b675061746820737472696e673b446f6320737472696e673b456d62656473205b5d7369676e61747572652e456d626564207374727563747b4e616d6520737472696e673b506b675061746820737472696e673b446f6320737472696e677d3b4d6574686f6473205b5d7369676e61747572652e4d6574686f64207374727563747b4e616d6520737472696e673b446f6320737472696e673b496e41726773205b5d7369676e61747572652e417267207374727563747b4e616d6520737472696e673b446f6320737472696e673b5479706520747970656f626a6563747d3b4f757441726773205b5d7369676e61747572652e4172673b496e53747265616d203f7369676e61747572652e4172673b4f757453747265616d203f7369676e61747572652e4172673b54616773205b5d616e797d7dTarget) StartList(tt *vdl.Type, len int) (vdl.ListTarget, error) {
- if !vdl.Compatible(tt, __VDLType12) {
- return nil, fmt.Errorf("type %v incompatible with %v", tt, __VDLType12)
+ if ttWant := vdl.TypeOf((*[]signature.Interface)(nil)); !vdl.Compatible(tt, ttWant) {
+ return nil, fmt.Errorf("type %v incompatible with %v", tt, ttWant)
}
if cap(*t.Value) < len {
*t.Value = make([]signature.Interface, len)
@@ -1286,9 +1274,6 @@
}
func (m *AuthReply) FillVDLTarget(t vdl.Target, tt *vdl.Type) error {
- if __VDLType_v_io_x_ref_services_wspr_internal_rpc_server_AuthReply == nil || __VDLType13 == nil {
- panic("Initialization order error: types generated for FillVDLTarget not initialized. Consider moving caller to an init() block.")
- }
fieldsTarget1, err := t.StartFields(tt)
if err != nil {
return err
@@ -1301,7 +1286,7 @@
if err != vdl.ErrFieldNoExist {
if m.Err == nil {
- if err := fieldTarget3.FromNil(vdl.ErrorType); err != nil {
+ if err := fieldTarget3.FromNil(tt.NonOptional().Field(0).Type); err != nil {
return err
}
} else {
@@ -1337,8 +1322,8 @@
func (t *AuthReplyTarget) StartFields(tt *vdl.Type) (vdl.FieldsTarget, error) {
- if !vdl.Compatible(tt, __VDLType_v_io_x_ref_services_wspr_internal_rpc_server_AuthReply) {
- return nil, fmt.Errorf("type %v incompatible with %v", tt, __VDLType_v_io_x_ref_services_wspr_internal_rpc_server_AuthReply)
+ if ttWant := vdl.TypeOf((*AuthReply)(nil)).Elem(); !vdl.Compatible(tt, ttWant) {
+ return nil, fmt.Errorf("type %v incompatible with %v", tt, ttWant)
}
return t, nil
}
@@ -1349,7 +1334,7 @@
target, err := &t.errTarget, error(nil)
return nil, target, err
default:
- return nil, nil, fmt.Errorf("field %s not in struct %v", name, __VDLType_v_io_x_ref_services_wspr_internal_rpc_server_AuthReply)
+ return nil, nil, fmt.Errorf("field %s not in struct v.io/x/ref/services/wspr/internal/rpc/server.AuthReply", name)
}
}
func (t *AuthReplyTarget) FinishField(_, _ vdl.Target) error {
@@ -1360,391 +1345,14 @@
return nil
}
-func init() {
- vdl.Register((*Context)(nil))
- vdl.Register((*SecurityCall)(nil))
- vdl.Register((*CaveatValidationRequest)(nil))
- vdl.Register((*CaveatValidationResponse)(nil))
- vdl.Register((*ServerRpcRequestCall)(nil))
- vdl.Register((*ServerRpcRequest)(nil))
- vdl.Register((*LookupReply)(nil))
- vdl.Register((*AuthReply)(nil))
-}
-
-var __VDLType13 *vdl.Type = vdl.TypeOf((*AuthReply)(nil))
-var __VDLType4 *vdl.Type = vdl.TypeOf((*CaveatValidationRequest)(nil))
-var __VDLType7 *vdl.Type = vdl.TypeOf((*CaveatValidationResponse)(nil))
-var __VDLType0 *vdl.Type = vdl.TypeOf((*Context)(nil))
-var __VDLType11 *vdl.Type = vdl.TypeOf((*LookupReply)(nil))
-var __VDLType1 *vdl.Type = vdl.TypeOf((*SecurityCall)(nil))
-var __VDLType10 *vdl.Type
-
-func __VDLType10_gen() *vdl.Type {
- __VDLType10Builder := vdl.TypeBuilder{}
-
- __VDLType101 := __VDLType10Builder.Optional()
- __VDLType102 := __VDLType10Builder.Struct()
- __VDLType103 := __VDLType10Builder.Named("v.io/x/ref/services/wspr/internal/rpc/server.ServerRpcRequest").AssignBase(__VDLType102)
- __VDLType104 := vdl.Uint32Type
- __VDLType102.AppendField("ServerId", __VDLType104)
- __VDLType105 := vdl.Int32Type
- __VDLType102.AppendField("Handle", __VDLType105)
- __VDLType106 := vdl.StringType
- __VDLType102.AppendField("Method", __VDLType106)
- __VDLType107 := __VDLType10Builder.List()
- __VDLType108 := vdl.AnyType
- __VDLType107.AssignElem(__VDLType108)
- __VDLType102.AppendField("Args", __VDLType107)
- __VDLType109 := __VDLType10Builder.Struct()
- __VDLType1010 := __VDLType10Builder.Named("v.io/x/ref/services/wspr/internal/rpc/server.ServerRpcRequestCall").AssignBase(__VDLType109)
- __VDLType1011 := __VDLType10Builder.Struct()
- __VDLType1012 := __VDLType10Builder.Named("v.io/x/ref/services/wspr/internal/rpc/server.SecurityCall").AssignBase(__VDLType1011)
- __VDLType1011.AppendField("Method", __VDLType106)
- __VDLType1011.AppendField("Suffix", __VDLType106)
- __VDLType1011.AppendField("MethodTags", __VDLType107)
- __VDLType1013 := vdl.Uint32Type
- __VDLType1014 := __VDLType10Builder.Named("v.io/x/ref/services/wspr/internal/principal.BlessingsId").AssignBase(__VDLType1013)
- __VDLType1011.AppendField("LocalBlessings", __VDLType1014)
- __VDLType1015 := __VDLType10Builder.List()
- __VDLType1015.AssignElem(__VDLType106)
- __VDLType1011.AppendField("LocalBlessingStrings", __VDLType1015)
- __VDLType1011.AppendField("RemoteBlessings", __VDLType1014)
- __VDLType1011.AppendField("RemoteBlessingStrings", __VDLType1015)
- __VDLType1011.AppendField("LocalEndpoint", __VDLType106)
- __VDLType1011.AppendField("RemoteEndpoint", __VDLType106)
- __VDLType109.AppendField("SecurityCall", __VDLType1012)
- __VDLType1016 := __VDLType10Builder.Struct()
- __VDLType1017 := __VDLType10Builder.Named("time.WireDeadline").AssignBase(__VDLType1016)
- __VDLType1018 := __VDLType10Builder.Struct()
- __VDLType1019 := __VDLType10Builder.Named("time.Duration").AssignBase(__VDLType1018)
- __VDLType1020 := vdl.Int64Type
- __VDLType1018.AppendField("Seconds", __VDLType1020)
- __VDLType1018.AppendField("Nanos", __VDLType105)
- __VDLType1016.AppendField("FromNow", __VDLType1019)
- __VDLType1021 := vdl.BoolType
- __VDLType1016.AppendField("NoDeadline", __VDLType1021)
- __VDLType109.AppendField("Deadline", __VDLType1017)
- __VDLType1022 := __VDLType10Builder.Struct()
- __VDLType1023 := __VDLType10Builder.Named("v.io/x/ref/services/wspr/internal/rpc/server.Context").AssignBase(__VDLType1022)
- __VDLType1022.AppendField("Language", __VDLType106)
- __VDLType109.AppendField("Context", __VDLType1023)
- __VDLType1024 := __VDLType10Builder.Struct()
- __VDLType1025 := __VDLType10Builder.Named("v.io/v23/vtrace.Request").AssignBase(__VDLType1024)
- __VDLType1026 := __VDLType10Builder.Array()
- __VDLType1027 := __VDLType10Builder.Named("v.io/v23/uniqueid.Id").AssignBase(__VDLType1026)
- __VDLType1028 := vdl.ByteType
- __VDLType1026.AssignElem(__VDLType1028)
- __VDLType1026.AssignLen(16)
- __VDLType1024.AppendField("SpanId", __VDLType1027)
- __VDLType1024.AppendField("TraceId", __VDLType1027)
- __VDLType1029 := vdl.Int32Type
- __VDLType1030 := __VDLType10Builder.Named("v.io/v23/vtrace.TraceFlags").AssignBase(__VDLType1029)
- __VDLType1024.AppendField("Flags", __VDLType1030)
- __VDLType1024.AppendField("LogLevel", __VDLType105)
- __VDLType109.AppendField("TraceRequest", __VDLType1025)
- __VDLType109.AppendField("GrantedBlessings", __VDLType1014)
- __VDLType102.AppendField("Call", __VDLType1010)
- __VDLType101.AssignElem(__VDLType103)
- __VDLType10Builder.Build()
- __VDLType10v, err := __VDLType101.Built()
- if err != nil {
- panic(err)
- }
- return __VDLType10v
-}
-func init() {
- __VDLType10 = __VDLType10_gen()
-}
-
-var __VDLType9 *vdl.Type
-
-func __VDLType9_gen() *vdl.Type {
- __VDLType9Builder := vdl.TypeBuilder{}
-
- __VDLType91 := __VDLType9Builder.Optional()
- __VDLType92 := __VDLType9Builder.Struct()
- __VDLType93 := __VDLType9Builder.Named("v.io/x/ref/services/wspr/internal/rpc/server.ServerRpcRequestCall").AssignBase(__VDLType92)
- __VDLType94 := __VDLType9Builder.Struct()
- __VDLType95 := __VDLType9Builder.Named("v.io/x/ref/services/wspr/internal/rpc/server.SecurityCall").AssignBase(__VDLType94)
- __VDLType96 := vdl.StringType
- __VDLType94.AppendField("Method", __VDLType96)
- __VDLType94.AppendField("Suffix", __VDLType96)
- __VDLType97 := __VDLType9Builder.List()
- __VDLType98 := vdl.AnyType
- __VDLType97.AssignElem(__VDLType98)
- __VDLType94.AppendField("MethodTags", __VDLType97)
- __VDLType99 := vdl.Uint32Type
- __VDLType910 := __VDLType9Builder.Named("v.io/x/ref/services/wspr/internal/principal.BlessingsId").AssignBase(__VDLType99)
- __VDLType94.AppendField("LocalBlessings", __VDLType910)
- __VDLType911 := __VDLType9Builder.List()
- __VDLType911.AssignElem(__VDLType96)
- __VDLType94.AppendField("LocalBlessingStrings", __VDLType911)
- __VDLType94.AppendField("RemoteBlessings", __VDLType910)
- __VDLType94.AppendField("RemoteBlessingStrings", __VDLType911)
- __VDLType94.AppendField("LocalEndpoint", __VDLType96)
- __VDLType94.AppendField("RemoteEndpoint", __VDLType96)
- __VDLType92.AppendField("SecurityCall", __VDLType95)
- __VDLType912 := __VDLType9Builder.Struct()
- __VDLType913 := __VDLType9Builder.Named("time.WireDeadline").AssignBase(__VDLType912)
- __VDLType914 := __VDLType9Builder.Struct()
- __VDLType915 := __VDLType9Builder.Named("time.Duration").AssignBase(__VDLType914)
- __VDLType916 := vdl.Int64Type
- __VDLType914.AppendField("Seconds", __VDLType916)
- __VDLType917 := vdl.Int32Type
- __VDLType914.AppendField("Nanos", __VDLType917)
- __VDLType912.AppendField("FromNow", __VDLType915)
- __VDLType918 := vdl.BoolType
- __VDLType912.AppendField("NoDeadline", __VDLType918)
- __VDLType92.AppendField("Deadline", __VDLType913)
- __VDLType919 := __VDLType9Builder.Struct()
- __VDLType920 := __VDLType9Builder.Named("v.io/x/ref/services/wspr/internal/rpc/server.Context").AssignBase(__VDLType919)
- __VDLType919.AppendField("Language", __VDLType96)
- __VDLType92.AppendField("Context", __VDLType920)
- __VDLType921 := __VDLType9Builder.Struct()
- __VDLType922 := __VDLType9Builder.Named("v.io/v23/vtrace.Request").AssignBase(__VDLType921)
- __VDLType923 := __VDLType9Builder.Array()
- __VDLType924 := __VDLType9Builder.Named("v.io/v23/uniqueid.Id").AssignBase(__VDLType923)
- __VDLType925 := vdl.ByteType
- __VDLType923.AssignElem(__VDLType925)
- __VDLType923.AssignLen(16)
- __VDLType921.AppendField("SpanId", __VDLType924)
- __VDLType921.AppendField("TraceId", __VDLType924)
- __VDLType926 := vdl.Int32Type
- __VDLType927 := __VDLType9Builder.Named("v.io/v23/vtrace.TraceFlags").AssignBase(__VDLType926)
- __VDLType921.AppendField("Flags", __VDLType927)
- __VDLType921.AppendField("LogLevel", __VDLType917)
- __VDLType92.AppendField("TraceRequest", __VDLType922)
- __VDLType92.AppendField("GrantedBlessings", __VDLType910)
- __VDLType91.AssignElem(__VDLType93)
- __VDLType9Builder.Build()
- __VDLType9v, err := __VDLType91.Built()
- if err != nil {
- panic(err)
- }
- return __VDLType9v
-}
-func init() {
- __VDLType9 = __VDLType9_gen()
-}
-
-var __VDLType8 *vdl.Type = vdl.TypeOf([]error(nil))
-var __VDLType5 *vdl.Type = vdl.TypeOf([][]security.Caveat(nil))
-var __VDLType2 *vdl.Type = vdl.TypeOf([]*vom.RawBytes(nil))
-var __VDLType12 *vdl.Type = vdl.TypeOf([]signature.Interface(nil))
-var __VDLType3 *vdl.Type = vdl.TypeOf([]string(nil))
-var __VDLType6 *vdl.Type = vdl.TypeOf([]security.Caveat(nil))
-var __VDLType_signature_Interface *vdl.Type = vdl.TypeOf(signature.Interface{})
-var __VDLType_time_WireDeadline *vdl.Type
-
-func __VDLType_time_WireDeadline_gen() *vdl.Type {
- __VDLType_time_WireDeadlineBuilder := vdl.TypeBuilder{}
-
- __VDLType_time_WireDeadline1 := __VDLType_time_WireDeadlineBuilder.Struct()
- __VDLType_time_WireDeadline2 := __VDLType_time_WireDeadlineBuilder.Named("time.WireDeadline").AssignBase(__VDLType_time_WireDeadline1)
- __VDLType_time_WireDeadline3 := __VDLType_time_WireDeadlineBuilder.Struct()
- __VDLType_time_WireDeadline4 := __VDLType_time_WireDeadlineBuilder.Named("time.Duration").AssignBase(__VDLType_time_WireDeadline3)
- __VDLType_time_WireDeadline5 := vdl.Int64Type
- __VDLType_time_WireDeadline3.AppendField("Seconds", __VDLType_time_WireDeadline5)
- __VDLType_time_WireDeadline6 := vdl.Int32Type
- __VDLType_time_WireDeadline3.AppendField("Nanos", __VDLType_time_WireDeadline6)
- __VDLType_time_WireDeadline1.AppendField("FromNow", __VDLType_time_WireDeadline4)
- __VDLType_time_WireDeadline7 := vdl.BoolType
- __VDLType_time_WireDeadline1.AppendField("NoDeadline", __VDLType_time_WireDeadline7)
- __VDLType_time_WireDeadlineBuilder.Build()
- __VDLType_time_WireDeadlinev, err := __VDLType_time_WireDeadline2.Built()
- if err != nil {
- panic(err)
- }
- return __VDLType_time_WireDeadlinev
-}
-func init() {
- __VDLType_time_WireDeadline = __VDLType_time_WireDeadline_gen()
-}
-
-var __VDLType_v_io_v23_security_Caveat *vdl.Type = vdl.TypeOf(security.Caveat{})
-var __VDLType_v_io_v23_vtrace_Request *vdl.Type = vdl.TypeOf(vtrace.Request{})
-var __VDLType_v_io_x_ref_services_wspr_internal_principal_BlessingsId *vdl.Type = vdl.TypeOf(principal.BlessingsId(0))
-var __VDLType_v_io_x_ref_services_wspr_internal_rpc_server_AuthReply *vdl.Type = vdl.TypeOf(AuthReply{})
-var __VDLType_v_io_x_ref_services_wspr_internal_rpc_server_CaveatValidationRequest *vdl.Type = vdl.TypeOf(CaveatValidationRequest{})
-var __VDLType_v_io_x_ref_services_wspr_internal_rpc_server_CaveatValidationResponse *vdl.Type = vdl.TypeOf(CaveatValidationResponse{})
-var __VDLType_v_io_x_ref_services_wspr_internal_rpc_server_Context *vdl.Type = vdl.TypeOf(Context{})
-var __VDLType_v_io_x_ref_services_wspr_internal_rpc_server_LookupReply *vdl.Type = vdl.TypeOf(LookupReply{})
-var __VDLType_v_io_x_ref_services_wspr_internal_rpc_server_SecurityCall *vdl.Type = vdl.TypeOf(SecurityCall{})
-var __VDLType_v_io_x_ref_services_wspr_internal_rpc_server_ServerRpcRequest *vdl.Type
-
-func __VDLType_v_io_x_ref_services_wspr_internal_rpc_server_ServerRpcRequest_gen() *vdl.Type {
- __VDLType_v_io_x_ref_services_wspr_internal_rpc_server_ServerRpcRequestBuilder := vdl.TypeBuilder{}
-
- __VDLType_v_io_x_ref_services_wspr_internal_rpc_server_ServerRpcRequest1 := __VDLType_v_io_x_ref_services_wspr_internal_rpc_server_ServerRpcRequestBuilder.Struct()
- __VDLType_v_io_x_ref_services_wspr_internal_rpc_server_ServerRpcRequest2 := __VDLType_v_io_x_ref_services_wspr_internal_rpc_server_ServerRpcRequestBuilder.Named("v.io/x/ref/services/wspr/internal/rpc/server.ServerRpcRequest").AssignBase(__VDLType_v_io_x_ref_services_wspr_internal_rpc_server_ServerRpcRequest1)
- __VDLType_v_io_x_ref_services_wspr_internal_rpc_server_ServerRpcRequest3 := vdl.Uint32Type
- __VDLType_v_io_x_ref_services_wspr_internal_rpc_server_ServerRpcRequest1.AppendField("ServerId", __VDLType_v_io_x_ref_services_wspr_internal_rpc_server_ServerRpcRequest3)
- __VDLType_v_io_x_ref_services_wspr_internal_rpc_server_ServerRpcRequest4 := vdl.Int32Type
- __VDLType_v_io_x_ref_services_wspr_internal_rpc_server_ServerRpcRequest1.AppendField("Handle", __VDLType_v_io_x_ref_services_wspr_internal_rpc_server_ServerRpcRequest4)
- __VDLType_v_io_x_ref_services_wspr_internal_rpc_server_ServerRpcRequest5 := vdl.StringType
- __VDLType_v_io_x_ref_services_wspr_internal_rpc_server_ServerRpcRequest1.AppendField("Method", __VDLType_v_io_x_ref_services_wspr_internal_rpc_server_ServerRpcRequest5)
- __VDLType_v_io_x_ref_services_wspr_internal_rpc_server_ServerRpcRequest6 := __VDLType_v_io_x_ref_services_wspr_internal_rpc_server_ServerRpcRequestBuilder.List()
- __VDLType_v_io_x_ref_services_wspr_internal_rpc_server_ServerRpcRequest7 := vdl.AnyType
- __VDLType_v_io_x_ref_services_wspr_internal_rpc_server_ServerRpcRequest6.AssignElem(__VDLType_v_io_x_ref_services_wspr_internal_rpc_server_ServerRpcRequest7)
- __VDLType_v_io_x_ref_services_wspr_internal_rpc_server_ServerRpcRequest1.AppendField("Args", __VDLType_v_io_x_ref_services_wspr_internal_rpc_server_ServerRpcRequest6)
- __VDLType_v_io_x_ref_services_wspr_internal_rpc_server_ServerRpcRequest8 := __VDLType_v_io_x_ref_services_wspr_internal_rpc_server_ServerRpcRequestBuilder.Struct()
- __VDLType_v_io_x_ref_services_wspr_internal_rpc_server_ServerRpcRequest9 := __VDLType_v_io_x_ref_services_wspr_internal_rpc_server_ServerRpcRequestBuilder.Named("v.io/x/ref/services/wspr/internal/rpc/server.ServerRpcRequestCall").AssignBase(__VDLType_v_io_x_ref_services_wspr_internal_rpc_server_ServerRpcRequest8)
- __VDLType_v_io_x_ref_services_wspr_internal_rpc_server_ServerRpcRequest10 := __VDLType_v_io_x_ref_services_wspr_internal_rpc_server_ServerRpcRequestBuilder.Struct()
- __VDLType_v_io_x_ref_services_wspr_internal_rpc_server_ServerRpcRequest11 := __VDLType_v_io_x_ref_services_wspr_internal_rpc_server_ServerRpcRequestBuilder.Named("v.io/x/ref/services/wspr/internal/rpc/server.SecurityCall").AssignBase(__VDLType_v_io_x_ref_services_wspr_internal_rpc_server_ServerRpcRequest10)
- __VDLType_v_io_x_ref_services_wspr_internal_rpc_server_ServerRpcRequest10.AppendField("Method", __VDLType_v_io_x_ref_services_wspr_internal_rpc_server_ServerRpcRequest5)
- __VDLType_v_io_x_ref_services_wspr_internal_rpc_server_ServerRpcRequest10.AppendField("Suffix", __VDLType_v_io_x_ref_services_wspr_internal_rpc_server_ServerRpcRequest5)
- __VDLType_v_io_x_ref_services_wspr_internal_rpc_server_ServerRpcRequest10.AppendField("MethodTags", __VDLType_v_io_x_ref_services_wspr_internal_rpc_server_ServerRpcRequest6)
- __VDLType_v_io_x_ref_services_wspr_internal_rpc_server_ServerRpcRequest12 := vdl.Uint32Type
- __VDLType_v_io_x_ref_services_wspr_internal_rpc_server_ServerRpcRequest13 := __VDLType_v_io_x_ref_services_wspr_internal_rpc_server_ServerRpcRequestBuilder.Named("v.io/x/ref/services/wspr/internal/principal.BlessingsId").AssignBase(__VDLType_v_io_x_ref_services_wspr_internal_rpc_server_ServerRpcRequest12)
- __VDLType_v_io_x_ref_services_wspr_internal_rpc_server_ServerRpcRequest10.AppendField("LocalBlessings", __VDLType_v_io_x_ref_services_wspr_internal_rpc_server_ServerRpcRequest13)
- __VDLType_v_io_x_ref_services_wspr_internal_rpc_server_ServerRpcRequest14 := __VDLType_v_io_x_ref_services_wspr_internal_rpc_server_ServerRpcRequestBuilder.List()
- __VDLType_v_io_x_ref_services_wspr_internal_rpc_server_ServerRpcRequest14.AssignElem(__VDLType_v_io_x_ref_services_wspr_internal_rpc_server_ServerRpcRequest5)
- __VDLType_v_io_x_ref_services_wspr_internal_rpc_server_ServerRpcRequest10.AppendField("LocalBlessingStrings", __VDLType_v_io_x_ref_services_wspr_internal_rpc_server_ServerRpcRequest14)
- __VDLType_v_io_x_ref_services_wspr_internal_rpc_server_ServerRpcRequest10.AppendField("RemoteBlessings", __VDLType_v_io_x_ref_services_wspr_internal_rpc_server_ServerRpcRequest13)
- __VDLType_v_io_x_ref_services_wspr_internal_rpc_server_ServerRpcRequest10.AppendField("RemoteBlessingStrings", __VDLType_v_io_x_ref_services_wspr_internal_rpc_server_ServerRpcRequest14)
- __VDLType_v_io_x_ref_services_wspr_internal_rpc_server_ServerRpcRequest10.AppendField("LocalEndpoint", __VDLType_v_io_x_ref_services_wspr_internal_rpc_server_ServerRpcRequest5)
- __VDLType_v_io_x_ref_services_wspr_internal_rpc_server_ServerRpcRequest10.AppendField("RemoteEndpoint", __VDLType_v_io_x_ref_services_wspr_internal_rpc_server_ServerRpcRequest5)
- __VDLType_v_io_x_ref_services_wspr_internal_rpc_server_ServerRpcRequest8.AppendField("SecurityCall", __VDLType_v_io_x_ref_services_wspr_internal_rpc_server_ServerRpcRequest11)
- __VDLType_v_io_x_ref_services_wspr_internal_rpc_server_ServerRpcRequest15 := __VDLType_v_io_x_ref_services_wspr_internal_rpc_server_ServerRpcRequestBuilder.Struct()
- __VDLType_v_io_x_ref_services_wspr_internal_rpc_server_ServerRpcRequest16 := __VDLType_v_io_x_ref_services_wspr_internal_rpc_server_ServerRpcRequestBuilder.Named("time.WireDeadline").AssignBase(__VDLType_v_io_x_ref_services_wspr_internal_rpc_server_ServerRpcRequest15)
- __VDLType_v_io_x_ref_services_wspr_internal_rpc_server_ServerRpcRequest17 := __VDLType_v_io_x_ref_services_wspr_internal_rpc_server_ServerRpcRequestBuilder.Struct()
- __VDLType_v_io_x_ref_services_wspr_internal_rpc_server_ServerRpcRequest18 := __VDLType_v_io_x_ref_services_wspr_internal_rpc_server_ServerRpcRequestBuilder.Named("time.Duration").AssignBase(__VDLType_v_io_x_ref_services_wspr_internal_rpc_server_ServerRpcRequest17)
- __VDLType_v_io_x_ref_services_wspr_internal_rpc_server_ServerRpcRequest19 := vdl.Int64Type
- __VDLType_v_io_x_ref_services_wspr_internal_rpc_server_ServerRpcRequest17.AppendField("Seconds", __VDLType_v_io_x_ref_services_wspr_internal_rpc_server_ServerRpcRequest19)
- __VDLType_v_io_x_ref_services_wspr_internal_rpc_server_ServerRpcRequest17.AppendField("Nanos", __VDLType_v_io_x_ref_services_wspr_internal_rpc_server_ServerRpcRequest4)
- __VDLType_v_io_x_ref_services_wspr_internal_rpc_server_ServerRpcRequest15.AppendField("FromNow", __VDLType_v_io_x_ref_services_wspr_internal_rpc_server_ServerRpcRequest18)
- __VDLType_v_io_x_ref_services_wspr_internal_rpc_server_ServerRpcRequest20 := vdl.BoolType
- __VDLType_v_io_x_ref_services_wspr_internal_rpc_server_ServerRpcRequest15.AppendField("NoDeadline", __VDLType_v_io_x_ref_services_wspr_internal_rpc_server_ServerRpcRequest20)
- __VDLType_v_io_x_ref_services_wspr_internal_rpc_server_ServerRpcRequest8.AppendField("Deadline", __VDLType_v_io_x_ref_services_wspr_internal_rpc_server_ServerRpcRequest16)
- __VDLType_v_io_x_ref_services_wspr_internal_rpc_server_ServerRpcRequest21 := __VDLType_v_io_x_ref_services_wspr_internal_rpc_server_ServerRpcRequestBuilder.Struct()
- __VDLType_v_io_x_ref_services_wspr_internal_rpc_server_ServerRpcRequest22 := __VDLType_v_io_x_ref_services_wspr_internal_rpc_server_ServerRpcRequestBuilder.Named("v.io/x/ref/services/wspr/internal/rpc/server.Context").AssignBase(__VDLType_v_io_x_ref_services_wspr_internal_rpc_server_ServerRpcRequest21)
- __VDLType_v_io_x_ref_services_wspr_internal_rpc_server_ServerRpcRequest21.AppendField("Language", __VDLType_v_io_x_ref_services_wspr_internal_rpc_server_ServerRpcRequest5)
- __VDLType_v_io_x_ref_services_wspr_internal_rpc_server_ServerRpcRequest8.AppendField("Context", __VDLType_v_io_x_ref_services_wspr_internal_rpc_server_ServerRpcRequest22)
- __VDLType_v_io_x_ref_services_wspr_internal_rpc_server_ServerRpcRequest23 := __VDLType_v_io_x_ref_services_wspr_internal_rpc_server_ServerRpcRequestBuilder.Struct()
- __VDLType_v_io_x_ref_services_wspr_internal_rpc_server_ServerRpcRequest24 := __VDLType_v_io_x_ref_services_wspr_internal_rpc_server_ServerRpcRequestBuilder.Named("v.io/v23/vtrace.Request").AssignBase(__VDLType_v_io_x_ref_services_wspr_internal_rpc_server_ServerRpcRequest23)
- __VDLType_v_io_x_ref_services_wspr_internal_rpc_server_ServerRpcRequest25 := __VDLType_v_io_x_ref_services_wspr_internal_rpc_server_ServerRpcRequestBuilder.Array()
- __VDLType_v_io_x_ref_services_wspr_internal_rpc_server_ServerRpcRequest26 := __VDLType_v_io_x_ref_services_wspr_internal_rpc_server_ServerRpcRequestBuilder.Named("v.io/v23/uniqueid.Id").AssignBase(__VDLType_v_io_x_ref_services_wspr_internal_rpc_server_ServerRpcRequest25)
- __VDLType_v_io_x_ref_services_wspr_internal_rpc_server_ServerRpcRequest27 := vdl.ByteType
- __VDLType_v_io_x_ref_services_wspr_internal_rpc_server_ServerRpcRequest25.AssignElem(__VDLType_v_io_x_ref_services_wspr_internal_rpc_server_ServerRpcRequest27)
- __VDLType_v_io_x_ref_services_wspr_internal_rpc_server_ServerRpcRequest25.AssignLen(16)
- __VDLType_v_io_x_ref_services_wspr_internal_rpc_server_ServerRpcRequest23.AppendField("SpanId", __VDLType_v_io_x_ref_services_wspr_internal_rpc_server_ServerRpcRequest26)
- __VDLType_v_io_x_ref_services_wspr_internal_rpc_server_ServerRpcRequest23.AppendField("TraceId", __VDLType_v_io_x_ref_services_wspr_internal_rpc_server_ServerRpcRequest26)
- __VDLType_v_io_x_ref_services_wspr_internal_rpc_server_ServerRpcRequest28 := vdl.Int32Type
- __VDLType_v_io_x_ref_services_wspr_internal_rpc_server_ServerRpcRequest29 := __VDLType_v_io_x_ref_services_wspr_internal_rpc_server_ServerRpcRequestBuilder.Named("v.io/v23/vtrace.TraceFlags").AssignBase(__VDLType_v_io_x_ref_services_wspr_internal_rpc_server_ServerRpcRequest28)
- __VDLType_v_io_x_ref_services_wspr_internal_rpc_server_ServerRpcRequest23.AppendField("Flags", __VDLType_v_io_x_ref_services_wspr_internal_rpc_server_ServerRpcRequest29)
- __VDLType_v_io_x_ref_services_wspr_internal_rpc_server_ServerRpcRequest23.AppendField("LogLevel", __VDLType_v_io_x_ref_services_wspr_internal_rpc_server_ServerRpcRequest4)
- __VDLType_v_io_x_ref_services_wspr_internal_rpc_server_ServerRpcRequest8.AppendField("TraceRequest", __VDLType_v_io_x_ref_services_wspr_internal_rpc_server_ServerRpcRequest24)
- __VDLType_v_io_x_ref_services_wspr_internal_rpc_server_ServerRpcRequest8.AppendField("GrantedBlessings", __VDLType_v_io_x_ref_services_wspr_internal_rpc_server_ServerRpcRequest13)
- __VDLType_v_io_x_ref_services_wspr_internal_rpc_server_ServerRpcRequest1.AppendField("Call", __VDLType_v_io_x_ref_services_wspr_internal_rpc_server_ServerRpcRequest9)
- __VDLType_v_io_x_ref_services_wspr_internal_rpc_server_ServerRpcRequestBuilder.Build()
- __VDLType_v_io_x_ref_services_wspr_internal_rpc_server_ServerRpcRequestv, err := __VDLType_v_io_x_ref_services_wspr_internal_rpc_server_ServerRpcRequest2.Built()
- if err != nil {
- panic(err)
- }
- return __VDLType_v_io_x_ref_services_wspr_internal_rpc_server_ServerRpcRequestv
-}
-func init() {
- __VDLType_v_io_x_ref_services_wspr_internal_rpc_server_ServerRpcRequest = __VDLType_v_io_x_ref_services_wspr_internal_rpc_server_ServerRpcRequest_gen()
-}
-
-var __VDLType_v_io_x_ref_services_wspr_internal_rpc_server_ServerRpcRequestCall *vdl.Type
-
-func __VDLType_v_io_x_ref_services_wspr_internal_rpc_server_ServerRpcRequestCall_gen() *vdl.Type {
- __VDLType_v_io_x_ref_services_wspr_internal_rpc_server_ServerRpcRequestCallBuilder := vdl.TypeBuilder{}
-
- __VDLType_v_io_x_ref_services_wspr_internal_rpc_server_ServerRpcRequestCall1 := __VDLType_v_io_x_ref_services_wspr_internal_rpc_server_ServerRpcRequestCallBuilder.Struct()
- __VDLType_v_io_x_ref_services_wspr_internal_rpc_server_ServerRpcRequestCall2 := __VDLType_v_io_x_ref_services_wspr_internal_rpc_server_ServerRpcRequestCallBuilder.Named("v.io/x/ref/services/wspr/internal/rpc/server.ServerRpcRequestCall").AssignBase(__VDLType_v_io_x_ref_services_wspr_internal_rpc_server_ServerRpcRequestCall1)
- __VDLType_v_io_x_ref_services_wspr_internal_rpc_server_ServerRpcRequestCall3 := __VDLType_v_io_x_ref_services_wspr_internal_rpc_server_ServerRpcRequestCallBuilder.Struct()
- __VDLType_v_io_x_ref_services_wspr_internal_rpc_server_ServerRpcRequestCall4 := __VDLType_v_io_x_ref_services_wspr_internal_rpc_server_ServerRpcRequestCallBuilder.Named("v.io/x/ref/services/wspr/internal/rpc/server.SecurityCall").AssignBase(__VDLType_v_io_x_ref_services_wspr_internal_rpc_server_ServerRpcRequestCall3)
- __VDLType_v_io_x_ref_services_wspr_internal_rpc_server_ServerRpcRequestCall5 := vdl.StringType
- __VDLType_v_io_x_ref_services_wspr_internal_rpc_server_ServerRpcRequestCall3.AppendField("Method", __VDLType_v_io_x_ref_services_wspr_internal_rpc_server_ServerRpcRequestCall5)
- __VDLType_v_io_x_ref_services_wspr_internal_rpc_server_ServerRpcRequestCall3.AppendField("Suffix", __VDLType_v_io_x_ref_services_wspr_internal_rpc_server_ServerRpcRequestCall5)
- __VDLType_v_io_x_ref_services_wspr_internal_rpc_server_ServerRpcRequestCall6 := __VDLType_v_io_x_ref_services_wspr_internal_rpc_server_ServerRpcRequestCallBuilder.List()
- __VDLType_v_io_x_ref_services_wspr_internal_rpc_server_ServerRpcRequestCall7 := vdl.AnyType
- __VDLType_v_io_x_ref_services_wspr_internal_rpc_server_ServerRpcRequestCall6.AssignElem(__VDLType_v_io_x_ref_services_wspr_internal_rpc_server_ServerRpcRequestCall7)
- __VDLType_v_io_x_ref_services_wspr_internal_rpc_server_ServerRpcRequestCall3.AppendField("MethodTags", __VDLType_v_io_x_ref_services_wspr_internal_rpc_server_ServerRpcRequestCall6)
- __VDLType_v_io_x_ref_services_wspr_internal_rpc_server_ServerRpcRequestCall8 := vdl.Uint32Type
- __VDLType_v_io_x_ref_services_wspr_internal_rpc_server_ServerRpcRequestCall9 := __VDLType_v_io_x_ref_services_wspr_internal_rpc_server_ServerRpcRequestCallBuilder.Named("v.io/x/ref/services/wspr/internal/principal.BlessingsId").AssignBase(__VDLType_v_io_x_ref_services_wspr_internal_rpc_server_ServerRpcRequestCall8)
- __VDLType_v_io_x_ref_services_wspr_internal_rpc_server_ServerRpcRequestCall3.AppendField("LocalBlessings", __VDLType_v_io_x_ref_services_wspr_internal_rpc_server_ServerRpcRequestCall9)
- __VDLType_v_io_x_ref_services_wspr_internal_rpc_server_ServerRpcRequestCall10 := __VDLType_v_io_x_ref_services_wspr_internal_rpc_server_ServerRpcRequestCallBuilder.List()
- __VDLType_v_io_x_ref_services_wspr_internal_rpc_server_ServerRpcRequestCall10.AssignElem(__VDLType_v_io_x_ref_services_wspr_internal_rpc_server_ServerRpcRequestCall5)
- __VDLType_v_io_x_ref_services_wspr_internal_rpc_server_ServerRpcRequestCall3.AppendField("LocalBlessingStrings", __VDLType_v_io_x_ref_services_wspr_internal_rpc_server_ServerRpcRequestCall10)
- __VDLType_v_io_x_ref_services_wspr_internal_rpc_server_ServerRpcRequestCall3.AppendField("RemoteBlessings", __VDLType_v_io_x_ref_services_wspr_internal_rpc_server_ServerRpcRequestCall9)
- __VDLType_v_io_x_ref_services_wspr_internal_rpc_server_ServerRpcRequestCall3.AppendField("RemoteBlessingStrings", __VDLType_v_io_x_ref_services_wspr_internal_rpc_server_ServerRpcRequestCall10)
- __VDLType_v_io_x_ref_services_wspr_internal_rpc_server_ServerRpcRequestCall3.AppendField("LocalEndpoint", __VDLType_v_io_x_ref_services_wspr_internal_rpc_server_ServerRpcRequestCall5)
- __VDLType_v_io_x_ref_services_wspr_internal_rpc_server_ServerRpcRequestCall3.AppendField("RemoteEndpoint", __VDLType_v_io_x_ref_services_wspr_internal_rpc_server_ServerRpcRequestCall5)
- __VDLType_v_io_x_ref_services_wspr_internal_rpc_server_ServerRpcRequestCall1.AppendField("SecurityCall", __VDLType_v_io_x_ref_services_wspr_internal_rpc_server_ServerRpcRequestCall4)
- __VDLType_v_io_x_ref_services_wspr_internal_rpc_server_ServerRpcRequestCall11 := __VDLType_v_io_x_ref_services_wspr_internal_rpc_server_ServerRpcRequestCallBuilder.Struct()
- __VDLType_v_io_x_ref_services_wspr_internal_rpc_server_ServerRpcRequestCall12 := __VDLType_v_io_x_ref_services_wspr_internal_rpc_server_ServerRpcRequestCallBuilder.Named("time.WireDeadline").AssignBase(__VDLType_v_io_x_ref_services_wspr_internal_rpc_server_ServerRpcRequestCall11)
- __VDLType_v_io_x_ref_services_wspr_internal_rpc_server_ServerRpcRequestCall13 := __VDLType_v_io_x_ref_services_wspr_internal_rpc_server_ServerRpcRequestCallBuilder.Struct()
- __VDLType_v_io_x_ref_services_wspr_internal_rpc_server_ServerRpcRequestCall14 := __VDLType_v_io_x_ref_services_wspr_internal_rpc_server_ServerRpcRequestCallBuilder.Named("time.Duration").AssignBase(__VDLType_v_io_x_ref_services_wspr_internal_rpc_server_ServerRpcRequestCall13)
- __VDLType_v_io_x_ref_services_wspr_internal_rpc_server_ServerRpcRequestCall15 := vdl.Int64Type
- __VDLType_v_io_x_ref_services_wspr_internal_rpc_server_ServerRpcRequestCall13.AppendField("Seconds", __VDLType_v_io_x_ref_services_wspr_internal_rpc_server_ServerRpcRequestCall15)
- __VDLType_v_io_x_ref_services_wspr_internal_rpc_server_ServerRpcRequestCall16 := vdl.Int32Type
- __VDLType_v_io_x_ref_services_wspr_internal_rpc_server_ServerRpcRequestCall13.AppendField("Nanos", __VDLType_v_io_x_ref_services_wspr_internal_rpc_server_ServerRpcRequestCall16)
- __VDLType_v_io_x_ref_services_wspr_internal_rpc_server_ServerRpcRequestCall11.AppendField("FromNow", __VDLType_v_io_x_ref_services_wspr_internal_rpc_server_ServerRpcRequestCall14)
- __VDLType_v_io_x_ref_services_wspr_internal_rpc_server_ServerRpcRequestCall17 := vdl.BoolType
- __VDLType_v_io_x_ref_services_wspr_internal_rpc_server_ServerRpcRequestCall11.AppendField("NoDeadline", __VDLType_v_io_x_ref_services_wspr_internal_rpc_server_ServerRpcRequestCall17)
- __VDLType_v_io_x_ref_services_wspr_internal_rpc_server_ServerRpcRequestCall1.AppendField("Deadline", __VDLType_v_io_x_ref_services_wspr_internal_rpc_server_ServerRpcRequestCall12)
- __VDLType_v_io_x_ref_services_wspr_internal_rpc_server_ServerRpcRequestCall18 := __VDLType_v_io_x_ref_services_wspr_internal_rpc_server_ServerRpcRequestCallBuilder.Struct()
- __VDLType_v_io_x_ref_services_wspr_internal_rpc_server_ServerRpcRequestCall19 := __VDLType_v_io_x_ref_services_wspr_internal_rpc_server_ServerRpcRequestCallBuilder.Named("v.io/x/ref/services/wspr/internal/rpc/server.Context").AssignBase(__VDLType_v_io_x_ref_services_wspr_internal_rpc_server_ServerRpcRequestCall18)
- __VDLType_v_io_x_ref_services_wspr_internal_rpc_server_ServerRpcRequestCall18.AppendField("Language", __VDLType_v_io_x_ref_services_wspr_internal_rpc_server_ServerRpcRequestCall5)
- __VDLType_v_io_x_ref_services_wspr_internal_rpc_server_ServerRpcRequestCall1.AppendField("Context", __VDLType_v_io_x_ref_services_wspr_internal_rpc_server_ServerRpcRequestCall19)
- __VDLType_v_io_x_ref_services_wspr_internal_rpc_server_ServerRpcRequestCall20 := __VDLType_v_io_x_ref_services_wspr_internal_rpc_server_ServerRpcRequestCallBuilder.Struct()
- __VDLType_v_io_x_ref_services_wspr_internal_rpc_server_ServerRpcRequestCall21 := __VDLType_v_io_x_ref_services_wspr_internal_rpc_server_ServerRpcRequestCallBuilder.Named("v.io/v23/vtrace.Request").AssignBase(__VDLType_v_io_x_ref_services_wspr_internal_rpc_server_ServerRpcRequestCall20)
- __VDLType_v_io_x_ref_services_wspr_internal_rpc_server_ServerRpcRequestCall22 := __VDLType_v_io_x_ref_services_wspr_internal_rpc_server_ServerRpcRequestCallBuilder.Array()
- __VDLType_v_io_x_ref_services_wspr_internal_rpc_server_ServerRpcRequestCall23 := __VDLType_v_io_x_ref_services_wspr_internal_rpc_server_ServerRpcRequestCallBuilder.Named("v.io/v23/uniqueid.Id").AssignBase(__VDLType_v_io_x_ref_services_wspr_internal_rpc_server_ServerRpcRequestCall22)
- __VDLType_v_io_x_ref_services_wspr_internal_rpc_server_ServerRpcRequestCall24 := vdl.ByteType
- __VDLType_v_io_x_ref_services_wspr_internal_rpc_server_ServerRpcRequestCall22.AssignElem(__VDLType_v_io_x_ref_services_wspr_internal_rpc_server_ServerRpcRequestCall24)
- __VDLType_v_io_x_ref_services_wspr_internal_rpc_server_ServerRpcRequestCall22.AssignLen(16)
- __VDLType_v_io_x_ref_services_wspr_internal_rpc_server_ServerRpcRequestCall20.AppendField("SpanId", __VDLType_v_io_x_ref_services_wspr_internal_rpc_server_ServerRpcRequestCall23)
- __VDLType_v_io_x_ref_services_wspr_internal_rpc_server_ServerRpcRequestCall20.AppendField("TraceId", __VDLType_v_io_x_ref_services_wspr_internal_rpc_server_ServerRpcRequestCall23)
- __VDLType_v_io_x_ref_services_wspr_internal_rpc_server_ServerRpcRequestCall25 := vdl.Int32Type
- __VDLType_v_io_x_ref_services_wspr_internal_rpc_server_ServerRpcRequestCall26 := __VDLType_v_io_x_ref_services_wspr_internal_rpc_server_ServerRpcRequestCallBuilder.Named("v.io/v23/vtrace.TraceFlags").AssignBase(__VDLType_v_io_x_ref_services_wspr_internal_rpc_server_ServerRpcRequestCall25)
- __VDLType_v_io_x_ref_services_wspr_internal_rpc_server_ServerRpcRequestCall20.AppendField("Flags", __VDLType_v_io_x_ref_services_wspr_internal_rpc_server_ServerRpcRequestCall26)
- __VDLType_v_io_x_ref_services_wspr_internal_rpc_server_ServerRpcRequestCall20.AppendField("LogLevel", __VDLType_v_io_x_ref_services_wspr_internal_rpc_server_ServerRpcRequestCall16)
- __VDLType_v_io_x_ref_services_wspr_internal_rpc_server_ServerRpcRequestCall1.AppendField("TraceRequest", __VDLType_v_io_x_ref_services_wspr_internal_rpc_server_ServerRpcRequestCall21)
- __VDLType_v_io_x_ref_services_wspr_internal_rpc_server_ServerRpcRequestCall1.AppendField("GrantedBlessings", __VDLType_v_io_x_ref_services_wspr_internal_rpc_server_ServerRpcRequestCall9)
- __VDLType_v_io_x_ref_services_wspr_internal_rpc_server_ServerRpcRequestCallBuilder.Build()
- __VDLType_v_io_x_ref_services_wspr_internal_rpc_server_ServerRpcRequestCallv, err := __VDLType_v_io_x_ref_services_wspr_internal_rpc_server_ServerRpcRequestCall2.Built()
- if err != nil {
- panic(err)
- }
- return __VDLType_v_io_x_ref_services_wspr_internal_rpc_server_ServerRpcRequestCallv
-}
-func init() {
- __VDLType_v_io_x_ref_services_wspr_internal_rpc_server_ServerRpcRequestCall = __VDLType_v_io_x_ref_services_wspr_internal_rpc_server_ServerRpcRequestCall_gen()
-}
-func __VDLEnsureNativeBuilt() {
- if __VDLType10 == nil {
- __VDLType10 = __VDLType10_gen()
- }
- if __VDLType9 == nil {
- __VDLType9 = __VDLType9_gen()
- }
- if __VDLType_time_WireDeadline == nil {
- __VDLType_time_WireDeadline = __VDLType_time_WireDeadline_gen()
- }
- if __VDLType_v_io_x_ref_services_wspr_internal_rpc_server_ServerRpcRequest == nil {
- __VDLType_v_io_x_ref_services_wspr_internal_rpc_server_ServerRpcRequest = __VDLType_v_io_x_ref_services_wspr_internal_rpc_server_ServerRpcRequest_gen()
- }
- if __VDLType_v_io_x_ref_services_wspr_internal_rpc_server_ServerRpcRequestCall == nil {
- __VDLType_v_io_x_ref_services_wspr_internal_rpc_server_ServerRpcRequestCall = __VDLType_v_io_x_ref_services_wspr_internal_rpc_server_ServerRpcRequestCall_gen()
- }
-}
-
+//////////////////////////////////////////////////
+// Error definitions
var (
ErrCaveatValidationTimeout = verror.Register("v.io/x/ref/services/wspr/internal/rpc/server.CaveatValidationTimeout", verror.NoRetry, "{1:}{2:} Caveat validation has timed out")
ErrInvalidValidationResponseFromJavascript = verror.Register("v.io/x/ref/services/wspr/internal/rpc/server.InvalidValidationResponseFromJavascript", verror.NoRetry, "{1:}{2:} Invalid validation response from javascript")
ErrServerStopped = verror.Register("v.io/x/ref/services/wspr/internal/rpc/server.ServerStopped", verror.RetryBackoff, "{1:}{2:} Server has been stopped")
)
-func init() {
- i18n.Cat().SetWithBase(i18n.LangID("en"), i18n.MsgID(ErrCaveatValidationTimeout.ID), "{1:}{2:} Caveat validation has timed out")
- i18n.Cat().SetWithBase(i18n.LangID("en"), i18n.MsgID(ErrInvalidValidationResponseFromJavascript.ID), "{1:}{2:} Invalid validation response from javascript")
- i18n.Cat().SetWithBase(i18n.LangID("en"), i18n.MsgID(ErrServerStopped.ID), "{1:}{2:} Server has been stopped")
-}
-
// NewErrCaveatValidationTimeout returns an error with the ErrCaveatValidationTimeout ID.
func NewErrCaveatValidationTimeout(ctx *context.T) error {
return verror.New(ErrCaveatValidationTimeout, ctx)
@@ -1759,3 +1367,41 @@
func NewErrServerStopped(ctx *context.T) error {
return verror.New(ErrServerStopped, ctx)
}
+
+var __VDLInitCalled bool
+
+// __VDLInit performs vdl initialization. It is safe to call multiple times.
+// If you have an init ordering issue, just insert the following line verbatim
+// into your source files in this package, right after the "package foo" clause:
+//
+// var _ = __VDLInit()
+//
+// The purpose of this function is to ensure that vdl initialization occurs in
+// the right order, and very early in the init sequence. In particular, vdl
+// registration and package variable initialization needs to occur before
+// functions like vdl.TypeOf will work properly.
+//
+// This function returns a dummy value, so that it can be used to initialize the
+// first var in the file, to take advantage of Go's defined init order.
+func __VDLInit() struct{} {
+ if __VDLInitCalled {
+ return struct{}{}
+ }
+
+ // Register types.
+ vdl.Register((*Context)(nil))
+ vdl.Register((*SecurityCall)(nil))
+ vdl.Register((*CaveatValidationRequest)(nil))
+ vdl.Register((*CaveatValidationResponse)(nil))
+ vdl.Register((*ServerRpcRequestCall)(nil))
+ vdl.Register((*ServerRpcRequest)(nil))
+ vdl.Register((*LookupReply)(nil))
+ vdl.Register((*AuthReply)(nil))
+
+ // Set error format strings.
+ i18n.Cat().SetWithBase(i18n.LangID("en"), i18n.MsgID(ErrCaveatValidationTimeout.ID), "{1:}{2:} Caveat validation has timed out")
+ i18n.Cat().SetWithBase(i18n.LangID("en"), i18n.MsgID(ErrInvalidValidationResponseFromJavascript.ID), "{1:}{2:} Invalid validation response from javascript")
+ i18n.Cat().SetWithBase(i18n.LangID("en"), i18n.MsgID(ErrServerStopped.ID), "{1:}{2:} Server has been stopped")
+
+ return struct{}{}
+}
diff --git a/services/xproxy/xproxy/xproxy.vdl.go b/services/xproxy/xproxy/xproxy.vdl.go
index 61474d4..8b8bcd6 100644
--- a/services/xproxy/xproxy/xproxy.vdl.go
+++ b/services/xproxy/xproxy/xproxy.vdl.go
@@ -13,9 +13,10 @@
"v.io/v23/verror"
)
-func __VDLEnsureNativeBuilt() {
-}
+var _ = __VDLInit() // Must be first; see __VDLInit comments for details.
+//////////////////////////////////////////////////
+// Error definitions
var (
ErrNotListening = verror.Register("v.io/x/ref/services/xproxy/xproxy.NotListening", verror.NoRetry, "{1:}{2:} Proxy is not listening on any endpoints.")
ErrUnexpectedMessage = verror.Register("v.io/x/ref/services/xproxy/xproxy.UnexpectedMessage", verror.NoRetry, "{1:}{2:} Unexpected message of type{:3}")
@@ -24,14 +25,6 @@
ErrProxyResponse = verror.Register("v.io/x/ref/services/xproxy/xproxy.ProxyResponse", verror.NoRetry, "{1:}{2:} proxy returned{:3}")
)
-func init() {
- i18n.Cat().SetWithBase(i18n.LangID("en"), i18n.MsgID(ErrNotListening.ID), "{1:}{2:} Proxy is not listening on any endpoints.")
- i18n.Cat().SetWithBase(i18n.LangID("en"), i18n.MsgID(ErrUnexpectedMessage.ID), "{1:}{2:} Unexpected message of type{:3}")
- i18n.Cat().SetWithBase(i18n.LangID("en"), i18n.MsgID(ErrFailedToResolveToEndpoint.ID), "{1:}{2:} Failed to resolve '{3}' to endpoint")
- i18n.Cat().SetWithBase(i18n.LangID("en"), i18n.MsgID(ErrProxyAlreadyClosed.ID), "{1:}{2:} Proxy has already been closed")
- i18n.Cat().SetWithBase(i18n.LangID("en"), i18n.MsgID(ErrProxyResponse.ID), "{1:}{2:} proxy returned{:3}")
-}
-
// NewErrNotListening returns an error with the ErrNotListening ID.
func NewErrNotListening(ctx *context.T) error {
return verror.New(ErrNotListening, ctx)
@@ -56,3 +49,33 @@
func NewErrProxyResponse(ctx *context.T, msg string) error {
return verror.New(ErrProxyResponse, ctx, msg)
}
+
+var __VDLInitCalled bool
+
+// __VDLInit performs vdl initialization. It is safe to call multiple times.
+// If you have an init ordering issue, just insert the following line verbatim
+// into your source files in this package, right after the "package foo" clause:
+//
+// var _ = __VDLInit()
+//
+// The purpose of this function is to ensure that vdl initialization occurs in
+// the right order, and very early in the init sequence. In particular, vdl
+// registration and package variable initialization needs to occur before
+// functions like vdl.TypeOf will work properly.
+//
+// This function returns a dummy value, so that it can be used to initialize the
+// first var in the file, to take advantage of Go's defined init order.
+func __VDLInit() struct{} {
+ if __VDLInitCalled {
+ return struct{}{}
+ }
+
+ // Set error format strings.
+ i18n.Cat().SetWithBase(i18n.LangID("en"), i18n.MsgID(ErrNotListening.ID), "{1:}{2:} Proxy is not listening on any endpoints.")
+ i18n.Cat().SetWithBase(i18n.LangID("en"), i18n.MsgID(ErrUnexpectedMessage.ID), "{1:}{2:} Unexpected message of type{:3}")
+ i18n.Cat().SetWithBase(i18n.LangID("en"), i18n.MsgID(ErrFailedToResolveToEndpoint.ID), "{1:}{2:} Failed to resolve '{3}' to endpoint")
+ i18n.Cat().SetWithBase(i18n.LangID("en"), i18n.MsgID(ErrProxyAlreadyClosed.ID), "{1:}{2:} Proxy has already been closed")
+ i18n.Cat().SetWithBase(i18n.LangID("en"), i18n.MsgID(ErrProxyResponse.ID), "{1:}{2:} proxy returned{:3}")
+
+ return struct{}{}
+}
