vom/vdl: RawBytes.Decoder() & Decoder.IsTop()
MultiPart: 4/4
Change-Id: I5daf3a1dcaf39b2d080332d4c983d8e6f61d9d4b
diff --git a/go/src/v.io/x/sensorlog/internal/sbmodel/sbmodel.vdl.go b/go/src/v.io/x/sensorlog/internal/sbmodel/sbmodel.vdl.go
index 25ef054..e6d0b42 100644
--- a/go/src/v.io/x/sensorlog/internal/sbmodel/sbmodel.vdl.go
+++ b/go/src/v.io/x/sensorlog/internal/sbmodel/sbmodel.vdl.go
@@ -147,7 +147,7 @@
if err = dec.StartValue(); err != nil {
return err
}
- if dec.Type().Kind() != vdl.Struct {
+ if (dec.StackDepth() == 1 || dec.IsAny()) && !vdl.Compatible(vdl.TypeOf(*x), dec.Type()) {
return fmt.Errorf("incompatible struct %T, from %v", *x, dec.Type())
}
match := 0
@@ -282,7 +282,7 @@
if err = dec.StartValue(); err != nil {
return err
}
- if dec.Type().Kind() != vdl.Struct {
+ if (dec.StackDepth() == 1 || dec.IsAny()) && !vdl.Compatible(vdl.TypeOf(*x), dec.Type()) {
return fmt.Errorf("incompatible struct %T, from %v", *x, dec.Type())
}
match := 0
@@ -490,7 +490,7 @@
if err = dec.StartValue(); err != nil {
return err
}
- if dec.Type().Kind() != vdl.Struct {
+ if (dec.StackDepth() == 1 || dec.IsAny()) && !vdl.Compatible(vdl.TypeOf(*x), dec.Type()) {
return fmt.Errorf("incompatible struct %T, from %v", *x, dec.Type())
}
match := 0
@@ -694,7 +694,7 @@
if err = dec.StartValue(); err != nil {
return err
}
- if dec.Type().Kind() != vdl.Struct {
+ if (dec.StackDepth() == 1 || dec.IsAny()) && !vdl.Compatible(vdl.TypeOf(*x), dec.Type()) {
return fmt.Errorf("incompatible struct %T, from %v", *x, dec.Type())
}
match := 0
@@ -862,7 +862,7 @@
if err = dec.StartValue(); err != nil {
return err
}
- if dec.Type().Kind() != vdl.Struct {
+ if (dec.StackDepth() == 1 || dec.IsAny()) && !vdl.Compatible(vdl.TypeOf(*x), dec.Type()) {
return fmt.Errorf("incompatible struct %T, from %v", *x, dec.Type())
}
match := 0
@@ -1067,7 +1067,7 @@
if err = dec.StartValue(); err != nil {
return err
}
- if dec.Type().Kind() != vdl.Struct {
+ if (dec.StackDepth() == 1 || dec.IsAny()) && !vdl.Compatible(vdl.TypeOf(*x), dec.Type()) {
return fmt.Errorf("incompatible struct %T, from %v", *x, dec.Type())
}
match := 0
@@ -1268,7 +1268,7 @@
if err = dec.StartValue(); err != nil {
return err
}
- if dec.Type().Kind() != vdl.Union {
+ 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()
