TBR Fix bug in optional convertibility check, also minor cleanup.
MultiPart: 1/4
Change-Id: Ie0cb1c5f4dedb4af0f685e7b07de077bb08b6acc
diff --git a/discovery/discovery.vdl.go b/discovery/discovery.vdl.go
index ba89165..0e98154 100644
--- a/discovery/discovery.vdl.go
+++ b/discovery/discovery.vdl.go
@@ -656,7 +656,7 @@
return err
}
if (dec.StackDepth() == 1 || dec.IsAny()) && !vdl.Compatible(vdl.TypeOf(*x), dec.Type()) {
- return fmt.Errorf("incompatible array %T, from %v", *x, dec.Type())
+ return fmt.Errorf("incompatible list %T, from %v", *x, dec.Type())
}
switch len := dec.LenHint(); {
case len == 0:
diff --git a/naming/naming.vdl.go b/naming/naming.vdl.go
index 069530c..a4795ee 100644
--- a/naming/naming.vdl.go
+++ b/naming/naming.vdl.go
@@ -564,7 +564,7 @@
return err
}
if (dec.StackDepth() == 1 || dec.IsAny()) && !vdl.Compatible(vdl.TypeOf(*x), dec.Type()) {
- return fmt.Errorf("incompatible array %T, from %v", *x, dec.Type())
+ return fmt.Errorf("incompatible list %T, from %v", *x, dec.Type())
}
switch len := dec.LenHint(); {
case len == 0:
@@ -905,8 +905,8 @@
if err = dec.StartValue(); err != nil {
return err
}
- if (dec.StackDepth() == 1 || dec.IsAny()) && !vdl.Compatible(vdl.TypeOf(*x), dec.Type()) {
- return fmt.Errorf("incompatible union %T, from %v", *x, dec.Type())
+ if (dec.StackDepth() == 1 || dec.IsAny()) && !vdl.Compatible(vdl.TypeOf(x), dec.Type()) {
+ return fmt.Errorf("incompatible union %T, from %v", x, dec.Type())
}
f, err := dec.NextField()
if err != nil {
@@ -1089,8 +1089,8 @@
if err = dec.StartValue(); err != nil {
return err
}
- if (dec.StackDepth() == 1 || dec.IsAny()) && !vdl.Compatible(vdl.TypeOf(*x), dec.Type()) {
- return fmt.Errorf("incompatible union %T, from %v", *x, dec.Type())
+ if (dec.StackDepth() == 1 || dec.IsAny()) && !vdl.Compatible(vdl.TypeOf(x), dec.Type()) {
+ return fmt.Errorf("incompatible union %T, from %v", x, dec.Type())
}
f, err := dec.NextField()
if err != nil {
diff --git a/query/engine/internal/testdata/testdata.vdl.go b/query/engine/internal/testdata/testdata.vdl.go
index 2f68dde..631e6fc 100644
--- a/query/engine/internal/testdata/testdata.vdl.go
+++ b/query/engine/internal/testdata/testdata.vdl.go
@@ -1567,8 +1567,8 @@
if err = dec.StartValue(); err != nil {
return err
}
- if (dec.StackDepth() == 1 || dec.IsAny()) && !vdl.Compatible(vdl.TypeOf(*x), dec.Type()) {
- return fmt.Errorf("incompatible union %T, from %v", *x, dec.Type())
+ if (dec.StackDepth() == 1 || dec.IsAny()) && !vdl.Compatible(vdl.TypeOf(x), dec.Type()) {
+ return fmt.Errorf("incompatible union %T, from %v", x, dec.Type())
}
f, err := dec.NextField()
if err != nil {
@@ -2149,7 +2149,7 @@
return err
}
if (dec.StackDepth() == 1 || dec.IsAny()) && !vdl.Compatible(vdl.TypeOf(*x), dec.Type()) {
- return fmt.Errorf("incompatible array %T, from %v", *x, dec.Type())
+ return fmt.Errorf("incompatible list %T, from %v", *x, dec.Type())
}
switch len := dec.LenHint(); {
case len == 0:
@@ -3052,8 +3052,8 @@
if err = dec.StartValue(); err != nil {
return err
}
- if (dec.StackDepth() == 1 || dec.IsAny()) && !vdl.Compatible(vdl.TypeOf(*x), dec.Type()) {
- return fmt.Errorf("incompatible union %T, from %v", *x, dec.Type())
+ if (dec.StackDepth() == 1 || dec.IsAny()) && !vdl.Compatible(vdl.TypeOf(x), dec.Type()) {
+ return fmt.Errorf("incompatible union %T, from %v", x, dec.Type())
}
f, err := dec.NextField()
if err != nil {
@@ -4380,7 +4380,7 @@
return err
}
if (dec.StackDepth() == 1 || dec.IsAny()) && !vdl.Compatible(vdl.TypeOf(*x), dec.Type()) {
- return fmt.Errorf("incompatible array %T, from %v", *x, dec.Type())
+ return fmt.Errorf("incompatible list %T, from %v", *x, dec.Type())
}
switch len := dec.LenHint(); {
case len == 0:
diff --git a/security/access/access.vdl.go b/security/access/access.vdl.go
index 3d34fa2..adf47aa 100644
--- a/security/access/access.vdl.go
+++ b/security/access/access.vdl.go
@@ -367,7 +367,7 @@
return err
}
if (dec.StackDepth() == 1 || dec.IsAny()) && !vdl.Compatible(vdl.TypeOf(*x), dec.Type()) {
- return fmt.Errorf("incompatible array %T, from %v", *x, dec.Type())
+ return fmt.Errorf("incompatible list %T, from %v", *x, dec.Type())
}
switch len := dec.LenHint(); {
case len == 0:
@@ -396,7 +396,7 @@
return err
}
if (dec.StackDepth() == 1 || dec.IsAny()) && !vdl.Compatible(vdl.TypeOf(*x), dec.Type()) {
- return fmt.Errorf("incompatible array %T, from %v", *x, dec.Type())
+ return fmt.Errorf("incompatible list %T, from %v", *x, dec.Type())
}
switch len := dec.LenHint(); {
case len == 0:
diff --git a/security/security.vdl.go b/security/security.vdl.go
index ac43323..27b6ffc 100644
--- a/security/security.vdl.go
+++ b/security/security.vdl.go
@@ -797,7 +797,7 @@
return err
}
if (dec.StackDepth() == 1 || dec.IsAny()) && !vdl.Compatible(vdl.TypeOf(*x), dec.Type()) {
- return fmt.Errorf("incompatible array %T, from %v", *x, dec.Type())
+ return fmt.Errorf("incompatible list %T, from %v", *x, dec.Type())
}
switch len := dec.LenHint(); {
case len == 0:
@@ -1728,7 +1728,7 @@
return err
}
if (dec.StackDepth() == 1 || dec.IsAny()) && !vdl.Compatible(vdl.TypeOf(*x), dec.Type()) {
- return fmt.Errorf("incompatible array %T, from %v", *x, dec.Type())
+ return fmt.Errorf("incompatible list %T, from %v", *x, dec.Type())
}
switch len := dec.LenHint(); {
case len == 0:
@@ -1757,7 +1757,7 @@
return err
}
if (dec.StackDepth() == 1 || dec.IsAny()) && !vdl.Compatible(vdl.TypeOf(*x), dec.Type()) {
- return fmt.Errorf("incompatible array %T, from %v", *x, dec.Type())
+ return fmt.Errorf("incompatible list %T, from %v", *x, dec.Type())
}
switch len := dec.LenHint(); {
case len == 0:
@@ -2469,7 +2469,7 @@
return err
}
if (dec.StackDepth() == 1 || dec.IsAny()) && !vdl.Compatible(vdl.TypeOf(*x), dec.Type()) {
- return fmt.Errorf("incompatible array %T, from %v", *x, dec.Type())
+ return fmt.Errorf("incompatible list %T, from %v", *x, dec.Type())
}
switch len := dec.LenHint(); {
case len == 0:
@@ -2498,7 +2498,7 @@
return err
}
if (dec.StackDepth() == 1 || dec.IsAny()) && !vdl.Compatible(vdl.TypeOf(*x), dec.Type()) {
- return fmt.Errorf("incompatible array %T, from %v", *x, dec.Type())
+ return fmt.Errorf("incompatible list %T, from %v", *x, dec.Type())
}
switch len := dec.LenHint(); {
case len == 0:
@@ -2637,8 +2637,8 @@
if err = dec.StartValue(); err != nil {
return err
}
- if (dec.StackDepth() == 1 || dec.IsAny()) && !vdl.Compatible(vdl.TypeOf(*x), dec.Type()) {
- return fmt.Errorf("incompatible union %T, from %v", *x, dec.Type())
+ if (dec.StackDepth() == 1 || dec.IsAny()) && !vdl.Compatible(vdl.TypeOf(x), dec.Type()) {
+ return fmt.Errorf("incompatible union %T, from %v", x, dec.Type())
}
f, err := dec.NextField()
if err != nil {
diff --git a/services/application/application.vdl.go b/services/application/application.vdl.go
index cf08632..32b9fa1 100644
--- a/services/application/application.vdl.go
+++ b/services/application/application.vdl.go
@@ -847,7 +847,7 @@
return err
}
if (dec.StackDepth() == 1 || dec.IsAny()) && !vdl.Compatible(vdl.TypeOf(*x), dec.Type()) {
- return fmt.Errorf("incompatible array %T, from %v", *x, dec.Type())
+ return fmt.Errorf("incompatible list %T, from %v", *x, dec.Type())
}
switch len := dec.LenHint(); {
case len == 0:
diff --git a/services/device/device.vdl.go b/services/device/device.vdl.go
index 5222ac9..fee66ad 100644
--- a/services/device/device.vdl.go
+++ b/services/device/device.vdl.go
@@ -1064,8 +1064,8 @@
if err = dec.StartValue(); err != nil {
return err
}
- if (dec.StackDepth() == 1 || dec.IsAny()) && !vdl.Compatible(vdl.TypeOf(*x), dec.Type()) {
- return fmt.Errorf("incompatible union %T, from %v", *x, dec.Type())
+ if (dec.StackDepth() == 1 || dec.IsAny()) && !vdl.Compatible(vdl.TypeOf(x), dec.Type()) {
+ return fmt.Errorf("incompatible union %T, from %v", x, dec.Type())
}
f, err := dec.NextField()
if err != nil {
@@ -1220,8 +1220,8 @@
if err = dec.StartValue(); err != nil {
return err
}
- if (dec.StackDepth() == 1 || dec.IsAny()) && !vdl.Compatible(vdl.TypeOf(*x), dec.Type()) {
- return fmt.Errorf("incompatible union %T, from %v", *x, dec.Type())
+ if (dec.StackDepth() == 1 || dec.IsAny()) && !vdl.Compatible(vdl.TypeOf(x), dec.Type()) {
+ return fmt.Errorf("incompatible union %T, from %v", x, dec.Type())
}
f, err := dec.NextField()
if err != nil {
@@ -1380,8 +1380,8 @@
if err = dec.StartValue(); err != nil {
return err
}
- if (dec.StackDepth() == 1 || dec.IsAny()) && !vdl.Compatible(vdl.TypeOf(*x), dec.Type()) {
- return fmt.Errorf("incompatible union %T, from %v", *x, dec.Type())
+ if (dec.StackDepth() == 1 || dec.IsAny()) && !vdl.Compatible(vdl.TypeOf(x), dec.Type()) {
+ return fmt.Errorf("incompatible union %T, from %v", x, dec.Type())
}
f, err := dec.NextField()
if err != nil {
diff --git a/services/syncbase/syncbase.vdl.go b/services/syncbase/syncbase.vdl.go
index f9e461a..332d2c3 100644
--- a/services/syncbase/syncbase.vdl.go
+++ b/services/syncbase/syncbase.vdl.go
@@ -1427,7 +1427,7 @@
return err
}
if (dec.StackDepth() == 1 || dec.IsAny()) && !vdl.Compatible(vdl.TypeOf(*x), dec.Type()) {
- return fmt.Errorf("incompatible array %T, from %v", *x, dec.Type())
+ return fmt.Errorf("incompatible list %T, from %v", *x, dec.Type())
}
switch len := dec.LenHint(); {
case len == 0:
@@ -1456,7 +1456,7 @@
return err
}
if (dec.StackDepth() == 1 || dec.IsAny()) && !vdl.Compatible(vdl.TypeOf(*x), dec.Type()) {
- return fmt.Errorf("incompatible array %T, from %v", *x, dec.Type())
+ return fmt.Errorf("incompatible list %T, from %v", *x, dec.Type())
}
switch len := dec.LenHint(); {
case len == 0:
@@ -2641,8 +2641,8 @@
return err
}
if dec.IsNil() {
- if (dec.StackDepth() == 1 || dec.IsAny()) && !vdl.Compatible(vdl.TypeOf(*x), dec.Type()) {
- return fmt.Errorf("incompatible union %T, from %v", *x.LocalValue, dec.Type())
+ if (dec.StackDepth() == 1 || dec.IsAny()) && !vdl.Compatible(vdl.TypeOf(x.LocalValue), dec.Type()) {
+ return fmt.Errorf("incompatible optional %T, from %v", x.LocalValue, dec.Type())
}
x.LocalValue = nil
if err = dec.FinishValue(); err != nil {
@@ -2661,8 +2661,8 @@
return err
}
if dec.IsNil() {
- if (dec.StackDepth() == 1 || dec.IsAny()) && !vdl.Compatible(vdl.TypeOf(*x), dec.Type()) {
- return fmt.Errorf("incompatible union %T, from %v", *x.RemoteValue, dec.Type())
+ if (dec.StackDepth() == 1 || dec.IsAny()) && !vdl.Compatible(vdl.TypeOf(x.RemoteValue), dec.Type()) {
+ return fmt.Errorf("incompatible optional %T, from %v", x.RemoteValue, dec.Type())
}
x.RemoteValue = nil
if err = dec.FinishValue(); err != nil {
@@ -2681,8 +2681,8 @@
return err
}
if dec.IsNil() {
- if (dec.StackDepth() == 1 || dec.IsAny()) && !vdl.Compatible(vdl.TypeOf(*x), dec.Type()) {
- return fmt.Errorf("incompatible union %T, from %v", *x.AncestorValue, dec.Type())
+ if (dec.StackDepth() == 1 || dec.IsAny()) && !vdl.Compatible(vdl.TypeOf(x.AncestorValue), dec.Type()) {
+ return fmt.Errorf("incompatible optional %T, from %v", x.AncestorValue, dec.Type())
}
x.AncestorValue = nil
if err = dec.FinishValue(); err != nil {
@@ -3071,8 +3071,8 @@
if err = dec.StartValue(); err != nil {
return err
}
- if (dec.StackDepth() == 1 || dec.IsAny()) && !vdl.Compatible(vdl.TypeOf(*x), dec.Type()) {
- return fmt.Errorf("incompatible union %T, from %v", *x, dec.Type())
+ if (dec.StackDepth() == 1 || dec.IsAny()) && !vdl.Compatible(vdl.TypeOf(x), dec.Type()) {
+ return fmt.Errorf("incompatible union %T, from %v", x, dec.Type())
}
f, err := dec.NextField()
if err != nil {
@@ -3351,7 +3351,7 @@
return err
}
if (dec.StackDepth() == 1 || dec.IsAny()) && !vdl.Compatible(vdl.TypeOf(*x), dec.Type()) {
- return fmt.Errorf("incompatible array %T, from %v", *x, dec.Type())
+ return fmt.Errorf("incompatible list %T, from %v", *x, dec.Type())
}
switch len := dec.LenHint(); {
case len == 0:
@@ -3535,8 +3535,8 @@
if err = dec.StartValue(); err != nil {
return err
}
- if (dec.StackDepth() == 1 || dec.IsAny()) && !vdl.Compatible(vdl.TypeOf(*x), dec.Type()) {
- return fmt.Errorf("incompatible union %T, from %v", *x, dec.Type())
+ if (dec.StackDepth() == 1 || dec.IsAny()) && !vdl.Compatible(vdl.TypeOf(x), dec.Type()) {
+ return fmt.Errorf("incompatible union %T, from %v", x, dec.Type())
}
f, err := dec.NextField()
if err != nil {
@@ -4078,8 +4078,8 @@
return err
}
if dec.IsNil() {
- if (dec.StackDepth() == 1 || dec.IsAny()) && !vdl.Compatible(vdl.TypeOf(*x), dec.Type()) {
- return fmt.Errorf("incompatible union %T, from %v", *x.Result, dec.Type())
+ if (dec.StackDepth() == 1 || dec.IsAny()) && !vdl.Compatible(vdl.TypeOf(x.Result), dec.Type()) {
+ return fmt.Errorf("incompatible optional %T, from %v", x.Result, dec.Type())
}
x.Result = nil
if err = dec.FinishValue(); err != nil {
@@ -4539,7 +4539,7 @@
return err
}
if (dec.StackDepth() == 1 || dec.IsAny()) && !vdl.Compatible(vdl.TypeOf(*x), dec.Type()) {
- return fmt.Errorf("incompatible array %T, from %v", *x, dec.Type())
+ return fmt.Errorf("incompatible list %T, from %v", *x, dec.Type())
}
switch len := dec.LenHint(); {
case len == 0:
diff --git a/syncbase/syncbase.vdl.go b/syncbase/syncbase.vdl.go
index c01783b..7492bf3 100644
--- a/syncbase/syncbase.vdl.go
+++ b/syncbase/syncbase.vdl.go
@@ -648,7 +648,7 @@
return err
}
if (dec.StackDepth() == 1 || dec.IsAny()) && !vdl.Compatible(vdl.TypeOf(*x), dec.Type()) {
- return fmt.Errorf("incompatible array %T, from %v", *x, dec.Type())
+ return fmt.Errorf("incompatible list %T, from %v", *x, dec.Type())
}
switch len := dec.LenHint(); {
case len == 0:
@@ -1123,7 +1123,7 @@
return err
}
if (dec.StackDepth() == 1 || dec.IsAny()) && !vdl.Compatible(vdl.TypeOf(*x), dec.Type()) {
- return fmt.Errorf("incompatible array %T, from %v", *x, dec.Type())
+ return fmt.Errorf("incompatible list %T, from %v", *x, dec.Type())
}
switch len := dec.LenHint(); {
case len == 0:
@@ -1439,7 +1439,7 @@
return err
}
if (dec.StackDepth() == 1 || dec.IsAny()) && !vdl.Compatible(vdl.TypeOf(*x), dec.Type()) {
- return fmt.Errorf("incompatible array %T, from %v", *x, dec.Type())
+ return fmt.Errorf("incompatible list %T, from %v", *x, dec.Type())
}
switch len := dec.LenHint(); {
case len == 0:
@@ -1803,8 +1803,8 @@
return err
}
if dec.IsNil() {
- if (dec.StackDepth() == 1 || dec.IsAny()) && !vdl.Compatible(vdl.TypeOf(*x), dec.Type()) {
- return fmt.Errorf("incompatible union %T, from %v", *x.ReadSet, dec.Type())
+ if (dec.StackDepth() == 1 || dec.IsAny()) && !vdl.Compatible(vdl.TypeOf(x.ReadSet), dec.Type()) {
+ return fmt.Errorf("incompatible optional %T, from %v", x.ReadSet, dec.Type())
}
x.ReadSet = nil
if err = dec.FinishValue(); err != nil {
@@ -1823,8 +1823,8 @@
return err
}
if dec.IsNil() {
- if (dec.StackDepth() == 1 || dec.IsAny()) && !vdl.Compatible(vdl.TypeOf(*x), dec.Type()) {
- return fmt.Errorf("incompatible union %T, from %v", *x.WriteSet, dec.Type())
+ if (dec.StackDepth() == 1 || dec.IsAny()) && !vdl.Compatible(vdl.TypeOf(x.WriteSet), dec.Type()) {
+ return fmt.Errorf("incompatible optional %T, from %v", x.WriteSet, dec.Type())
}
x.WriteSet = nil
if err = dec.FinishValue(); err != nil {
@@ -1843,8 +1843,8 @@
return err
}
if dec.IsNil() {
- if (dec.StackDepth() == 1 || dec.IsAny()) && !vdl.Compatible(vdl.TypeOf(*x), dec.Type()) {
- return fmt.Errorf("incompatible union %T, from %v", *x.ScanSet, dec.Type())
+ if (dec.StackDepth() == 1 || dec.IsAny()) && !vdl.Compatible(vdl.TypeOf(x.ScanSet), dec.Type()) {
+ return fmt.Errorf("incompatible optional %T, from %v", x.ScanSet, dec.Type())
}
x.ScanSet = nil
if err = dec.FinishValue(); err != nil {
@@ -2100,8 +2100,8 @@
return err
}
if dec.IsNil() {
- if (dec.StackDepth() == 1 || dec.IsAny()) && !vdl.Compatible(vdl.TypeOf(*x), dec.Type()) {
- return fmt.Errorf("incompatible union %T, from %v", *x.Result, dec.Type())
+ if (dec.StackDepth() == 1 || dec.IsAny()) && !vdl.Compatible(vdl.TypeOf(x.Result), dec.Type()) {
+ return fmt.Errorf("incompatible optional %T, from %v", x.Result, dec.Type())
}
x.Result = nil
if err = dec.FinishValue(); err != nil {
diff --git a/syncbase/testdata/testdata.vdl.go b/syncbase/testdata/testdata.vdl.go
index fcfcaab..2fe5fc9 100644
--- a/syncbase/testdata/testdata.vdl.go
+++ b/syncbase/testdata/testdata.vdl.go
@@ -1018,8 +1018,8 @@
if err = dec.StartValue(); err != nil {
return err
}
- if (dec.StackDepth() == 1 || dec.IsAny()) && !vdl.Compatible(vdl.TypeOf(*x), dec.Type()) {
- return fmt.Errorf("incompatible union %T, from %v", *x, dec.Type())
+ if (dec.StackDepth() == 1 || dec.IsAny()) && !vdl.Compatible(vdl.TypeOf(x), dec.Type()) {
+ return fmt.Errorf("incompatible union %T, from %v", x, dec.Type())
}
f, err := dec.NextField()
if err != nil {
@@ -2380,8 +2380,8 @@
if err = dec.StartValue(); err != nil {
return err
}
- if (dec.StackDepth() == 1 || dec.IsAny()) && !vdl.Compatible(vdl.TypeOf(*x), dec.Type()) {
- return fmt.Errorf("incompatible union %T, from %v", *x, dec.Type())
+ if (dec.StackDepth() == 1 || dec.IsAny()) && !vdl.Compatible(vdl.TypeOf(x), dec.Type()) {
+ return fmt.Errorf("incompatible union %T, from %v", x, dec.Type())
}
f, err := dec.NextField()
if err != nil {
@@ -3319,7 +3319,7 @@
return err
}
if (dec.StackDepth() == 1 || dec.IsAny()) && !vdl.Compatible(vdl.TypeOf(*x), dec.Type()) {
- return fmt.Errorf("incompatible array %T, from %v", *x, dec.Type())
+ return fmt.Errorf("incompatible list %T, from %v", *x, dec.Type())
}
switch len := dec.LenHint(); {
case len == 0:
diff --git a/vdl/vdl.vdl.go b/vdl/vdl.vdl.go
index 164f0fb..bc8e74d 100644
--- a/vdl/vdl.vdl.go
+++ b/vdl/vdl.vdl.go
@@ -424,7 +424,7 @@
return err
}
if (dec.StackDepth() == 1 || dec.IsAny()) && !Compatible(TypeOf(*x), dec.Type()) {
- return fmt.Errorf("incompatible array %T, from %v", *x, dec.Type())
+ return fmt.Errorf("incompatible list %T, from %v", *x, dec.Type())
}
switch len := dec.LenHint(); {
case len == 0:
diff --git a/vdlroot/signature/signature.vdl.go b/vdlroot/signature/signature.vdl.go
index b987a6b..f6a9157 100644
--- a/vdlroot/signature/signature.vdl.go
+++ b/vdlroot/signature/signature.vdl.go
@@ -904,8 +904,8 @@
return err
}
if dec.IsNil() {
- if (dec.StackDepth() == 1 || dec.IsAny()) && !vdl.Compatible(vdl.TypeOf(*x), dec.Type()) {
- return fmt.Errorf("incompatible union %T, from %v", *x.InStream, dec.Type())
+ if (dec.StackDepth() == 1 || dec.IsAny()) && !vdl.Compatible(vdl.TypeOf(x.InStream), dec.Type()) {
+ return fmt.Errorf("incompatible optional %T, from %v", x.InStream, dec.Type())
}
x.InStream = nil
if err = dec.FinishValue(); err != nil {
@@ -924,8 +924,8 @@
return err
}
if dec.IsNil() {
- if (dec.StackDepth() == 1 || dec.IsAny()) && !vdl.Compatible(vdl.TypeOf(*x), dec.Type()) {
- return fmt.Errorf("incompatible union %T, from %v", *x.OutStream, dec.Type())
+ if (dec.StackDepth() == 1 || dec.IsAny()) && !vdl.Compatible(vdl.TypeOf(x.OutStream), dec.Type()) {
+ return fmt.Errorf("incompatible optional %T, from %v", x.OutStream, dec.Type())
}
x.OutStream = nil
if err = dec.FinishValue(); err != nil {
@@ -957,7 +957,7 @@
return err
}
if (dec.StackDepth() == 1 || dec.IsAny()) && !vdl.Compatible(vdl.TypeOf(*x), dec.Type()) {
- return fmt.Errorf("incompatible array %T, from %v", *x, dec.Type())
+ return fmt.Errorf("incompatible list %T, from %v", *x, dec.Type())
}
switch len := dec.LenHint(); {
case len == 0:
@@ -986,7 +986,7 @@
return err
}
if (dec.StackDepth() == 1 || dec.IsAny()) && !vdl.Compatible(vdl.TypeOf(*x), dec.Type()) {
- return fmt.Errorf("incompatible array %T, from %v", *x, dec.Type())
+ return fmt.Errorf("incompatible list %T, from %v", *x, dec.Type())
}
switch len := dec.LenHint(); {
case len == 0:
@@ -1390,7 +1390,7 @@
return err
}
if (dec.StackDepth() == 1 || dec.IsAny()) && !vdl.Compatible(vdl.TypeOf(*x), dec.Type()) {
- return fmt.Errorf("incompatible array %T, from %v", *x, dec.Type())
+ return fmt.Errorf("incompatible list %T, from %v", *x, dec.Type())
}
switch len := dec.LenHint(); {
case len == 0:
@@ -1419,7 +1419,7 @@
return err
}
if (dec.StackDepth() == 1 || dec.IsAny()) && !vdl.Compatible(vdl.TypeOf(*x), dec.Type()) {
- return fmt.Errorf("incompatible array %T, from %v", *x, dec.Type())
+ return fmt.Errorf("incompatible list %T, from %v", *x, dec.Type())
}
switch len := dec.LenHint(); {
case len == 0:
diff --git a/vdlroot/vdltool/vdltool.vdl.go b/vdlroot/vdltool/vdltool.vdl.go
index a6df1a8..d15c7e9 100644
--- a/vdlroot/vdltool/vdltool.vdl.go
+++ b/vdlroot/vdltool/vdltool.vdl.go
@@ -485,7 +485,7 @@
return err
}
if (dec.StackDepth() == 1 || dec.IsAny()) && !vdl.Compatible(vdl.TypeOf(*x), dec.Type()) {
- return fmt.Errorf("incompatible array %T, from %v", *x, dec.Type())
+ return fmt.Errorf("incompatible list %T, from %v", *x, dec.Type())
}
switch len := dec.LenHint(); {
case len == 0:
diff --git a/vom/internal/internal.vdl.go b/vom/internal/internal.vdl.go
index 8ece4f7..8f546b1 100644
--- a/vom/internal/internal.vdl.go
+++ b/vom/internal/internal.vdl.go
@@ -1016,8 +1016,8 @@
if err = dec.StartValue(); err != nil {
return err
}
- if (dec.StackDepth() == 1 || dec.IsAny()) && !vdl.Compatible(vdl.TypeOf(*x), dec.Type()) {
- return fmt.Errorf("incompatible union %T, from %v", *x, dec.Type())
+ if (dec.StackDepth() == 1 || dec.IsAny()) && !vdl.Compatible(vdl.TypeOf(x), dec.Type()) {
+ return fmt.Errorf("incompatible union %T, from %v", x, dec.Type())
}
f, err := dec.NextField()
if err != nil {
diff --git a/vom/testdata/types/types.vdl.go b/vom/testdata/types/types.vdl.go
index a4c7fd5..c2bbbdf 100644
--- a/vom/testdata/types/types.vdl.go
+++ b/vom/testdata/types/types.vdl.go
@@ -634,7 +634,7 @@
return err
}
if (dec.StackDepth() == 1 || dec.IsAny()) && !vdl.Compatible(vdl.TypeOf(*x), dec.Type()) {
- return fmt.Errorf("incompatible array %T, from %v", *x, dec.Type())
+ return fmt.Errorf("incompatible list %T, from %v", *x, dec.Type())
}
switch len := dec.LenHint(); {
case len == 0:
@@ -1318,7 +1318,7 @@
return err
}
if (dec.StackDepth() == 1 || dec.IsAny()) && !vdl.Compatible(vdl.TypeOf(*x), dec.Type()) {
- return fmt.Errorf("incompatible array %T, from %v", *x, dec.Type())
+ return fmt.Errorf("incompatible list %T, from %v", *x, dec.Type())
}
switch len := dec.LenHint(); {
case len == 0:
@@ -1353,7 +1353,7 @@
return err
}
if (dec.StackDepth() == 1 || dec.IsAny()) && !vdl.Compatible(vdl.TypeOf(*x), dec.Type()) {
- return fmt.Errorf("incompatible array %T, from %v", *x, dec.Type())
+ return fmt.Errorf("incompatible list %T, from %v", *x, dec.Type())
}
switch len := dec.LenHint(); {
case len == 0:
@@ -2391,7 +2391,7 @@
return err
}
if (dec.StackDepth() == 1 || dec.IsAny()) && !vdl.Compatible(vdl.TypeOf(*x), dec.Type()) {
- return fmt.Errorf("incompatible array %T, from %v", *x, dec.Type())
+ return fmt.Errorf("incompatible list %T, from %v", *x, dec.Type())
}
switch len := dec.LenHint(); {
case len == 0:
@@ -3154,8 +3154,8 @@
if err = dec.StartValue(); err != nil {
return err
}
- if (dec.StackDepth() == 1 || dec.IsAny()) && !vdl.Compatible(vdl.TypeOf(*x), dec.Type()) {
- return fmt.Errorf("incompatible union %T, from %v", *x, dec.Type())
+ if (dec.StackDepth() == 1 || dec.IsAny()) && !vdl.Compatible(vdl.TypeOf(x), dec.Type()) {
+ return fmt.Errorf("incompatible union %T, from %v", x, dec.Type())
}
f, err := dec.NextField()
if err != nil {
@@ -3570,8 +3570,8 @@
return err
}
if dec.IsNil() {
- if (dec.StackDepth() == 1 || dec.IsAny()) && !vdl.Compatible(vdl.TypeOf(*x), dec.Type()) {
- return fmt.Errorf("incompatible union %T, from %v", *x.D, dec.Type())
+ if (dec.StackDepth() == 1 || dec.IsAny()) && !vdl.Compatible(vdl.TypeOf(x.D), dec.Type()) {
+ return fmt.Errorf("incompatible optional %T, from %v", x.D, dec.Type())
}
x.D = nil
if err = dec.FinishValue(); err != nil {
@@ -3680,7 +3680,7 @@
return err
}
if (dec.StackDepth() == 1 || dec.IsAny()) && !vdl.Compatible(vdl.TypeOf(*x), dec.Type()) {
- return fmt.Errorf("incompatible array %T, from %v", *x, dec.Type())
+ return fmt.Errorf("incompatible list %T, from %v", *x, dec.Type())
}
switch len := dec.LenHint(); {
case len == 0:
@@ -3952,7 +3952,7 @@
return err
}
if (dec.StackDepth() == 1 || dec.IsAny()) && !vdl.Compatible(vdl.TypeOf(*x), dec.Type()) {
- return fmt.Errorf("incompatible array %T, from %v", *x, dec.Type())
+ return fmt.Errorf("incompatible list %T, from %v", *x, dec.Type())
}
switch len := dec.LenHint(); {
case len == 0:
@@ -4057,7 +4057,7 @@
return err
}
if (dec.StackDepth() == 1 || dec.IsAny()) && !vdl.Compatible(vdl.TypeOf(*x), dec.Type()) {
- return fmt.Errorf("incompatible array %T, from %v", *x, dec.Type())
+ return fmt.Errorf("incompatible list %T, from %v", *x, dec.Type())
}
switch len := dec.LenHint(); {
case len == 0:
@@ -4185,7 +4185,7 @@
return err
}
if (dec.StackDepth() == 1 || dec.IsAny()) && !vdl.Compatible(vdl.TypeOf(*x), dec.Type()) {
- return fmt.Errorf("incompatible array %T, from %v", *x, dec.Type())
+ return fmt.Errorf("incompatible list %T, from %v", *x, dec.Type())
}
switch len := dec.LenHint(); {
case len == 0:
@@ -4249,7 +4249,7 @@
return err
}
if (dec.StackDepth() == 1 || dec.IsAny()) && !vdl.Compatible(vdl.TypeOf(*x), dec.Type()) {
- return fmt.Errorf("incompatible array %T, from %v", *x, dec.Type())
+ return fmt.Errorf("incompatible list %T, from %v", *x, dec.Type())
}
switch len := dec.LenHint(); {
case len == 0:
@@ -4441,7 +4441,7 @@
return err
}
if (dec.StackDepth() == 1 || dec.IsAny()) && !vdl.Compatible(vdl.TypeOf(*x), dec.Type()) {
- return fmt.Errorf("incompatible array %T, from %v", *x, dec.Type())
+ return fmt.Errorf("incompatible list %T, from %v", *x, dec.Type())
}
switch len := dec.LenHint(); {
case len == 0:
@@ -4505,7 +4505,7 @@
return err
}
if (dec.StackDepth() == 1 || dec.IsAny()) && !vdl.Compatible(vdl.TypeOf(*x), dec.Type()) {
- return fmt.Errorf("incompatible array %T, from %v", *x, dec.Type())
+ return fmt.Errorf("incompatible list %T, from %v", *x, dec.Type())
}
switch len := dec.LenHint(); {
case len == 0:
@@ -4569,7 +4569,7 @@
return err
}
if (dec.StackDepth() == 1 || dec.IsAny()) && !vdl.Compatible(vdl.TypeOf(*x), dec.Type()) {
- return fmt.Errorf("incompatible array %T, from %v", *x, dec.Type())
+ return fmt.Errorf("incompatible list %T, from %v", *x, dec.Type())
}
switch len := dec.LenHint(); {
case len == 0:
@@ -4633,7 +4633,7 @@
return err
}
if (dec.StackDepth() == 1 || dec.IsAny()) && !vdl.Compatible(vdl.TypeOf(*x), dec.Type()) {
- return fmt.Errorf("incompatible array %T, from %v", *x, dec.Type())
+ return fmt.Errorf("incompatible list %T, from %v", *x, dec.Type())
}
switch len := dec.LenHint(); {
case len == 0:
@@ -4795,8 +4795,8 @@
return err
}
if dec.IsNil() {
- if (dec.StackDepth() == 1 || dec.IsAny()) && !vdl.Compatible(vdl.TypeOf(*x), dec.Type()) {
- return fmt.Errorf("incompatible union %T, from %v", *x.A, dec.Type())
+ if (dec.StackDepth() == 1 || dec.IsAny()) && !vdl.Compatible(vdl.TypeOf(x.A), dec.Type()) {
+ return fmt.Errorf("incompatible optional %T, from %v", x.A, dec.Type())
}
x.A = nil
if err = dec.FinishValue(); err != nil {
@@ -5313,7 +5313,7 @@
return err
}
if (dec.StackDepth() == 1 || dec.IsAny()) && !vdl.Compatible(vdl.TypeOf(*x), dec.Type()) {
- return fmt.Errorf("incompatible array %T, from %v", *x, dec.Type())
+ return fmt.Errorf("incompatible list %T, from %v", *x, dec.Type())
}
switch len := dec.LenHint(); {
case len == 0:
@@ -5342,7 +5342,7 @@
return err
}
if (dec.StackDepth() == 1 || dec.IsAny()) && !vdl.Compatible(vdl.TypeOf(*x), dec.Type()) {
- return fmt.Errorf("incompatible array %T, from %v", *x, dec.Type())
+ return fmt.Errorf("incompatible list %T, from %v", *x, dec.Type())
}
switch len := dec.LenHint(); {
case len == 0:
@@ -5595,7 +5595,7 @@
return err
}
if (dec.StackDepth() == 1 || dec.IsAny()) && !vdl.Compatible(vdl.TypeOf(*x), dec.Type()) {
- return fmt.Errorf("incompatible array %T, from %v", *x, dec.Type())
+ return fmt.Errorf("incompatible list %T, from %v", *x, dec.Type())
}
switch len := dec.LenHint(); {
case len == 0:
@@ -5865,7 +5865,7 @@
return err
}
if (dec.StackDepth() == 1 || dec.IsAny()) && !vdl.Compatible(vdl.TypeOf(*x), dec.Type()) {
- return fmt.Errorf("incompatible array %T, from %v", *x, dec.Type())
+ return fmt.Errorf("incompatible list %T, from %v", *x, dec.Type())
}
switch len := dec.LenHint(); {
case len == 0:
@@ -9226,8 +9226,8 @@
if err = dec.StartValue(); err != nil {
return err
}
- if (dec.StackDepth() == 1 || dec.IsAny()) && !vdl.Compatible(vdl.TypeOf(*x), dec.Type()) {
- return fmt.Errorf("incompatible union %T, from %v", *x, dec.Type())
+ if (dec.StackDepth() == 1 || dec.IsAny()) && !vdl.Compatible(vdl.TypeOf(x), dec.Type()) {
+ return fmt.Errorf("incompatible union %T, from %v", x, dec.Type())
}
f, err := dec.NextField()
if err != nil {
@@ -10941,7 +10941,7 @@
return err
}
if (dec.StackDepth() == 1 || dec.IsAny()) && !vdl.Compatible(vdl.TypeOf(*x), dec.Type()) {
- return fmt.Errorf("incompatible array %T, from %v", *x, dec.Type())
+ return fmt.Errorf("incompatible list %T, from %v", *x, dec.Type())
}
switch len := dec.LenHint(); {
case len == 0:
@@ -11144,8 +11144,8 @@
return err
}
if dec.IsNil() {
- if (dec.StackDepth() == 1 || dec.IsAny()) && !vdl.Compatible(vdl.TypeOf(*x), dec.Type()) {
- return fmt.Errorf("incompatible union %T, from %v", *x.Next, dec.Type())
+ if (dec.StackDepth() == 1 || dec.IsAny()) && !vdl.Compatible(vdl.TypeOf(x.Next), dec.Type()) {
+ return fmt.Errorf("incompatible optional %T, from %v", x.Next, dec.Type())
}
x.Next = nil
if err = dec.FinishValue(); err != nil {
@@ -11339,8 +11339,8 @@
return err
}
if dec.IsNil() {
- if (dec.StackDepth() == 1 || dec.IsAny()) && !vdl.Compatible(vdl.TypeOf(*x), dec.Type()) {
- return fmt.Errorf("incompatible union %T, from %v", *x.Next, dec.Type())
+ if (dec.StackDepth() == 1 || dec.IsAny()) && !vdl.Compatible(vdl.TypeOf(x.Next), dec.Type()) {
+ return fmt.Errorf("incompatible optional %T, from %v", x.Next, dec.Type())
}
x.Next = nil
if err = dec.FinishValue(); err != nil {
diff --git a/vom/vom.vdl.go b/vom/vom.vdl.go
index 6b239aa..ee1c166 100644
--- a/vom/vom.vdl.go
+++ b/vom/vom.vdl.go
@@ -468,8 +468,8 @@
if err = dec.StartValue(); err != nil {
return err
}
- if (dec.StackDepth() == 1 || dec.IsAny()) && !vdl.Compatible(vdl.TypeOf(*x), dec.Type()) {
- return fmt.Errorf("incompatible union %T, from %v", *x, dec.Type())
+ if (dec.StackDepth() == 1 || dec.IsAny()) && !vdl.Compatible(vdl.TypeOf(x), dec.Type()) {
+ return fmt.Errorf("incompatible union %T, from %v", x, dec.Type())
}
f, err := dec.NextField()
if err != nil {
@@ -1425,7 +1425,7 @@
return err
}
if (dec.StackDepth() == 1 || dec.IsAny()) && !vdl.Compatible(vdl.TypeOf(*x), dec.Type()) {
- return fmt.Errorf("incompatible array %T, from %v", *x, dec.Type())
+ return fmt.Errorf("incompatible list %T, from %v", *x, dec.Type())
}
switch len := dec.LenHint(); {
case len == 0:
@@ -2540,7 +2540,7 @@
return err
}
if (dec.StackDepth() == 1 || dec.IsAny()) && !vdl.Compatible(vdl.TypeOf(*x), dec.Type()) {
- return fmt.Errorf("incompatible array %T, from %v", *x, dec.Type())
+ return fmt.Errorf("incompatible list %T, from %v", *x, dec.Type())
}
switch len := dec.LenHint(); {
case len == 0:
@@ -3338,8 +3338,8 @@
if err = dec.StartValue(); err != nil {
return err
}
- if (dec.StackDepth() == 1 || dec.IsAny()) && !vdl.Compatible(vdl.TypeOf(*x), dec.Type()) {
- return fmt.Errorf("incompatible union %T, from %v", *x, dec.Type())
+ if (dec.StackDepth() == 1 || dec.IsAny()) && !vdl.Compatible(vdl.TypeOf(x), dec.Type()) {
+ return fmt.Errorf("incompatible union %T, from %v", x, dec.Type())
}
f, err := dec.NextField()
if err != nil {
diff --git a/vtrace/vtrace.vdl.go b/vtrace/vtrace.vdl.go
index 976e0f5..5665f27 100644
--- a/vtrace/vtrace.vdl.go
+++ b/vtrace/vtrace.vdl.go
@@ -584,7 +584,7 @@
return err
}
if (dec.StackDepth() == 1 || dec.IsAny()) && !vdl.Compatible(vdl.TypeOf(*x), dec.Type()) {
- return fmt.Errorf("incompatible array %T, from %v", *x, dec.Type())
+ return fmt.Errorf("incompatible list %T, from %v", *x, dec.Type())
}
switch len := dec.LenHint(); {
case len == 0:
@@ -819,7 +819,7 @@
return err
}
if (dec.StackDepth() == 1 || dec.IsAny()) && !vdl.Compatible(vdl.TypeOf(*x), dec.Type()) {
- return fmt.Errorf("incompatible array %T, from %v", *x, dec.Type())
+ return fmt.Errorf("incompatible list %T, from %v", *x, dec.Type())
}
switch len := dec.LenHint(); {
case len == 0:
