TBR jni: updated vdl files for FromZero change.
MultiPart: 3/6
Change-Id: I31250e60b4f285ba5041587d2626d20c5c6922e1
diff --git a/test/fortune/fortune.vdl.go b/test/fortune/fortune.vdl.go
index 37d5af1..78fa324 100644
--- a/test/fortune/fortune.vdl.go
+++ b/test/fortune/fortune.vdl.go
@@ -40,57 +40,83 @@
if err != nil {
return err
}
-
keyTarget2, fieldTarget3, err := fieldsTarget1.StartField("Str")
if err != vdl.ErrFieldNoExist && err != nil {
return err
}
if err != vdl.ErrFieldNoExist {
- if err := fieldTarget3.FromString(string(m.Str), tt.NonOptional().Field(0).Type); err != nil {
- return err
+
+ var4 := (m.Str == "")
+ if var4 {
+ if err := fieldTarget3.FromZero(tt.NonOptional().Field(0).Type); err != nil {
+ return err
+ }
+ } else {
+ if err := fieldTarget3.FromString(string(m.Str), tt.NonOptional().Field(0).Type); err != nil {
+ return err
+ }
}
if err := fieldsTarget1.FinishField(keyTarget2, fieldTarget3); err != nil {
return err
}
}
- keyTarget4, fieldTarget5, err := fieldsTarget1.StartField("Num")
- if err != vdl.ErrFieldNoExist && err != nil {
- return err
- }
- if err != vdl.ErrFieldNoExist {
- if err := fieldTarget5.FromInt(int64(m.Num), tt.NonOptional().Field(1).Type); err != nil {
- return err
- }
- if err := fieldsTarget1.FinishField(keyTarget4, fieldTarget5); err != nil {
- return err
- }
- }
- keyTarget6, fieldTarget7, err := fieldsTarget1.StartField("List")
+ keyTarget5, fieldTarget6, err := fieldsTarget1.StartField("Num")
if err != vdl.ErrFieldNoExist && err != nil {
return err
}
if err != vdl.ErrFieldNoExist {
- listTarget8, err := fieldTarget7.StartList(tt.NonOptional().Field(2).Type, len(m.List))
- if err != nil {
+ var7 := (m.Num == int32(0))
+ if var7 {
+ if err := fieldTarget6.FromZero(tt.NonOptional().Field(1).Type); err != nil {
+ return err
+ }
+ } else {
+ if err := fieldTarget6.FromInt(int64(m.Num), tt.NonOptional().Field(1).Type); err != nil {
+ return err
+ }
+ }
+ if err := fieldsTarget1.FinishField(keyTarget5, fieldTarget6); err != nil {
return err
}
- for i, elem10 := range m.List {
- elemTarget9, err := listTarget8.StartElem(i)
+ }
+ keyTarget8, fieldTarget9, err := fieldsTarget1.StartField("List")
+ if err != vdl.ErrFieldNoExist && err != nil {
+ return err
+ }
+ if err != vdl.ErrFieldNoExist {
+
+ var var10 bool
+ if len(m.List) == 0 {
+ var10 = true
+ }
+ if var10 {
+ if err := fieldTarget9.FromZero(tt.NonOptional().Field(2).Type); err != nil {
+ return err
+ }
+ } else {
+
+ listTarget11, err := fieldTarget9.StartList(tt.NonOptional().Field(2).Type, len(m.List))
if err != nil {
return err
}
- if err := elemTarget9.FromUint(uint64(elem10), tt.NonOptional().Field(2).Type.Elem()); err != nil {
- return err
+ for i, elem13 := range m.List {
+ elemTarget12, err := listTarget11.StartElem(i)
+ if err != nil {
+ return err
+ }
+ if err := elemTarget12.FromUint(uint64(elem13), tt.NonOptional().Field(2).Type.Elem()); err != nil {
+ return err
+ }
+ if err := listTarget11.FinishElem(elemTarget12); err != nil {
+ return err
+ }
}
- if err := listTarget8.FinishElem(elemTarget9); err != nil {
+ if err := fieldTarget9.FinishList(listTarget11); err != nil {
return err
}
}
- if err := fieldTarget7.FinishList(listTarget8); err != nil {
- return err
- }
- if err := fieldsTarget1.FinishField(keyTarget6, fieldTarget7); err != nil {
+ if err := fieldsTarget1.FinishField(keyTarget8, fieldTarget9); err != nil {
return err
}
}
@@ -145,6 +171,10 @@
return nil
}
+func (t *ComplexErrorParamTarget) FromZero(tt *vdl.Type) error {
+ *t.Value = ComplexErrorParam{}
+ return nil
+}
// []uint32
type __VDLTarget1_list struct {
@@ -178,11 +208,10 @@
return nil
}
-
-// Create zero values for each type.
-var (
- __VDLZeroComplexErrorParam = ComplexErrorParam{}
-)
+func (t *__VDLTarget1_list) FromZero(tt *vdl.Type) error {
+ *t.Value = []uint32(nil)
+ return nil
+}
//////////////////////////////////////////////////
// Error definitions
@@ -922,6 +951,7 @@
if __VDLInitCalled {
return struct{}{}
}
+ __VDLInitCalled = true
// Register types.
vdl.Register((*ComplexErrorParam)(nil))
diff --git a/test/security/security.vdl.go b/test/security/security.vdl.go
index e9d073b..fbc90a4 100644
--- a/test/security/security.vdl.go
+++ b/test/security/security.vdl.go
@@ -60,6 +60,7 @@
if __VDLInitCalled {
return struct{}{}
}
+ __VDLInitCalled = true
return struct{}{}
}
