[fidl][dart] Strictness for xunions
Bug: 35481
Test: enable gidl test for dart
Test: add unittest
Test: fx run-test fidl_bindings_test
Change-Id: I757342a4e079c12fde3fd110272c93d7546ac1a6
diff --git a/bin/dart_fidl_json/json.fidlmerge b/bin/dart_fidl_json/json.fidlmerge
index 318b587..3b4428d 100644
--- a/bin/dart_fidl_json/json.fidlmerge
+++ b/bin/dart_fidl_json/json.fidlmerge
@@ -319,12 +319,66 @@
{{- end }}
{{- end }}
+{{- define "XUnionConverterDecls" -}}
+ {{- range . -}}
+{{- if eq .MaxHandles 0 }}
+{{- $type := execTmpl "TypeTemplate" .Name }}
+{{- $typeKey := "type" }}
+{{- $valueKey := "value" }}
+{{- $className := (execTmpl "CvtClassTemplate" .Name) }}
+class {{ $className }} {
+ static Object toJson(Object unionVal) {
+ if (unionVal is {{ $type }}) {
+ switch(unionVal.$tag) {
+ {{- if .IsFlexible }}
+ case {{ $type }}Tag.$unknown:
+ return {
+ '{{ $typeKey }}': '{{ .Name }}',
+ '{{ $valueKey }}': '<UNKNOWN>',
+ };
+ {{- end }}
+ {{- range .Members }}
+ {{- $member_name := toLowerCamelCase .Name }}
+ {{- $value_expr := print "unionVal." $member_name }}
+ case {{ $type }}Tag.{{ $member_name }}:
+ return {
+ '{{ $typeKey }}': '{{ .Name }}',
+ '{{ $valueKey }}': {{ printf (execTmpl "EncodeMember" .) $value_expr }},
+ };
+ {{- end }}
+ }
+ }
+
+ return null;
+ }
+
+ static {{ $type }} fromJson(Map<String, dynamic> json) {
+ if (json == null) {
+ return null;
+ }
+
+ switch(json['{{ $typeKey }}']) {
+ {{- range .Members }}
+ {{- $member_ctor := printf "%s.with%s" $type (toUpperCamelCase .Name) -}}
+ {{- $jsonVal := printf "json['%s']" $valueKey }}
+ case '{{ .Name }}':
+ return {{ $member_ctor}}({{ printf (execTmpl "DecodeMember" .) $jsonVal }});
+ {{- end }}
+ }
+
+ return null;
+ }
+}
+{{ end }}
+{{- end }}
+{{- end }}
+
{{- define "ImplementationFile" }}
{{- template "FileHeader" . }}
{{- template "FidlInclude" . }}
{{- template "EnumConverterDecls" . }}
{{- template "UnionConverterDecls" .Unions }}
- {{- template "UnionConverterDecls" .XUnions }}
+ {{- template "XUnionConverterDecls" .XUnions }}
{{- template "StructConverterDecls" . }}
{{- template "TableConverterDecls" . }}
{{- end }}
diff --git a/bin/fidl_bindings_test/fidl/bindings_test.test.fidl b/bin/fidl_bindings_test/fidl/bindings_test.test.fidl
index 0ca0b75..53c74f9 100644
--- a/bin/fidl_bindings_test/fidl/bindings_test.test.fidl
+++ b/bin/fidl_bindings_test/fidl/bindings_test.test.fidl
@@ -10,6 +10,12 @@
vector<uint8> baz;
};
+struct NumberHandleNumber {
+ uint32 n1;
+ handle h;
+ uint32 n2;
+};
+
struct ExampleStruct {
string foo;
int32 bar;
@@ -26,6 +32,14 @@
string foo;
int32 bar;
vector<uint8> baz;
+ NumberHandleNumber with_handle;
+};
+
+strict xunion ExampleStrictXunion {
+ string foo;
+ int32 bar;
+ vector<uint8> baz;
+ NumberHandleNumber with_handle;
};
bits ExampleBits {
diff --git a/bin/fidl_bindings_test/test/test/codec_test.dart b/bin/fidl_bindings_test/test/test/codec_test.dart
new file mode 100644
index 0000000..bc76923
--- /dev/null
+++ b/bin/fidl_bindings_test/test/test/codec_test.dart
@@ -0,0 +1,104 @@
+// Copyright 2019 The Fuchsia Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+import 'dart:typed_data';
+import 'package:fidl/fidl.dart';
+import 'package:test/test.dart';
+import 'package:fidl_fidl_examples_bindingstest/fidl_async.dart';
+import 'package:zircon/zircon.dart';
+
+// TODO(8047) test this in gidl
+void main() async {
+ group('encode/decode', () {
+ test('unknown ordinal flexible', () async {
+ final xunion = ExampleXunion.withBar(0x01020304);
+ var encoder = Encoder()..alloc(24);
+ kExampleXunion_Type.encode(encoder, xunion, 0);
+
+ // overwrite the ordinal to be unknown
+ encoder.encodeUint32(0, 1);
+
+ final decoder = Decoder(encoder.message)..claimMemory(24);
+ ExampleXunion unknownXunion = kExampleXunion_Type.decode(decoder, 0);
+ UnknownRawData actual = unknownXunion.$data;
+ // there are 4 additional bytes of padding for the uint32
+ final expected =
+ UnknownRawData(Uint8List.fromList([4, 3, 2, 1, 0, 0, 0, 0]), []);
+ expect(actual.data, equals(expected.data));
+ expect(actual.handles, equals(expected.handles));
+
+ encoder = Encoder()..alloc(24);
+ kExampleXunion_Type.encode(encoder, unknownXunion, 0);
+ expect(encoder.message.dataLength, 32);
+ final bytes = encoder.message.data.buffer.asUint8List(0, 32);
+ expect(
+ bytes,
+ equals([
+ 0x9e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // ordinal + padding
+ 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // num bytes/handles
+ 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, // PRESENT
+ 0x04, 0x03, 0x02, 0x01, 0x00, 0x00, 0x00, 0x00, // data + padding
+ ]));
+ expect(encoder.message.handlesLength, 0);
+ });
+
+ test('unknown ordinal flexible with handles', () async {
+ ChannelPair pair = ChannelPair();
+ expect(pair.status, equals(ZX.OK));
+ pair.second.close();
+
+ final xunion = ExampleXunion.withWithHandle(
+ NumberHandleNumber(n1: 1, h: pair.first.handle, n2: 2));
+ var encoder = Encoder()..alloc(24);
+ kExampleXunion_Type.encode(encoder, xunion, 0);
+
+ // overwrite the ordinal to be unknown
+ encoder.encodeUint32(0, 1);
+
+ final decoder = Decoder(encoder.message)..claimMemory(24);
+ ExampleXunion unknownXunion = kExampleXunion_Type.decode(decoder, 0);
+ UnknownRawData actual = unknownXunion.$data;
+ final expectedData = Uint8List.fromList([
+ 0x01, 0x00, 0x00, 0x00, // n1
+ 0xFF, 0xFF, 0xFF, 0xFF, // kHandlePresent
+ 0x02, 0x00, 0x00, 0x00, // n2
+ 0x00, 0x00, 0x00, 0x00, // padding
+ ]);
+ expect(actual.data, equals(expectedData));
+ expect(actual.handles.length, equals(1));
+
+ encoder = Encoder()..alloc(24);
+ kExampleXunion_Type.encode(encoder, unknownXunion, 0);
+ expect(encoder.message.dataLength, 40);
+ final bytes = encoder.message.data.buffer.asUint8List(0, 40);
+ expect(
+ bytes,
+ equals([
+ 0x8b, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // ordinal + padding
+ 0x10, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, // num bytes/handles
+ 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, // PRESENT
+ 0x01, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, // n1 + h
+ 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // n2 + paddding
+ ]));
+ expect(encoder.message.handlesLength, equals(1));
+ encoder.message.handles[0].close();
+ });
+
+ test('unknown ordinal strict', () async {
+ final xunion = ExampleStrictXunion.withBar(15);
+ final encoder = Encoder()..alloc(24);
+ kExampleStrictXunion_Type.encode(encoder, xunion, 0);
+
+ // overwrite the ordinal to be unknown
+ encoder.encodeUint32(0, 1);
+
+ final decoder = Decoder(encoder.message)..claimMemory(24);
+ expect(
+ () => kExampleStrictXunion_Type.decode(decoder, 0),
+ throwsA(predicate((e) =>
+ e is FidlError &&
+ e.code == FidlErrorCode.fidlStrictXUnionUnknownField)));
+ });
+ });
+}
diff --git a/bin/fidl_bindings_test/test/test/conformance_test_types.dart b/bin/fidl_bindings_test/test/test/conformance_test_types.dart
index ea0dbd4..79a4cc2 100644
--- a/bin/fidl_bindings_test/test/test/conformance_test_types.dart
+++ b/bin/fidl_bindings_test/test/test/conformance_test_types.dart
@@ -41,6 +41,134 @@
// ignore_for_file: comment_references
// ignore_for_file: avoid_unused_constructor_parameters
+enum UnionWithBoundStringTag {
+ boundFiveStr,
+}
+class UnionWithBoundString extends $fidl.Union {
+
+ const UnionWithBoundString.withBoundFiveStr(String value)
+ : _data = value, _tag = UnionWithBoundStringTag.boundFiveStr;
+
+ UnionWithBoundString._(UnionWithBoundStringTag tag, Object data) : _tag = tag, _data = data;
+
+ final UnionWithBoundStringTag _tag;
+ final _data;
+ String get boundFiveStr {
+ if (_tag != UnionWithBoundStringTag.boundFiveStr) {
+ return null;
+ }
+ return _data;
+ }
+
+ @override
+ String toString() {
+ switch (_tag) {
+ case UnionWithBoundStringTag.boundFiveStr:
+ return r'UnionWithBoundString.boundFiveStr($boundFiveStr)';
+ default:
+ return null;
+ }
+ }
+
+ UnionWithBoundStringTag get $tag => _tag;
+ // TODO: remove, see: FIDL-587
+ UnionWithBoundStringTag get tag => _tag;
+
+ @override
+ int get $index => _tag.index;
+
+ @override
+ Object get $data => _data;
+
+ static UnionWithBoundString _ctor(int index, Object data) {
+ return UnionWithBoundString._(UnionWithBoundStringTag.values[index], data);
+ }
+}
+
+// See FIDL-308:
+// ignore: recursive_compile_time_constant
+const $fidl.UnionType<UnionWithBoundString> kUnionWithBoundString_Type = $fidl.UnionType<UnionWithBoundString>(
+ encodedSize: 24,
+ members: <$fidl.MemberType>[
+ $fidl.MemberType<String>(type: $fidl.StringType(maybeElementCount: 5, nullable: false), offset: 8),
+ ],
+ ctor: UnionWithBoundString._ctor,
+ ordinalToIndex: <int, int>{
+ 921366385: 0,
+ },
+);
+
+enum UnionWithEmptyStructTag {
+ s,
+ s2,
+}
+class UnionWithEmptyStruct extends $fidl.Union {
+
+ const UnionWithEmptyStruct.withS(EmptyStruct value)
+ : _data = value, _tag = UnionWithEmptyStructTag.s;
+
+ const UnionWithEmptyStruct.withS2(EmptyStruct value)
+ : _data = value, _tag = UnionWithEmptyStructTag.s2;
+
+ UnionWithEmptyStruct._(UnionWithEmptyStructTag tag, Object data) : _tag = tag, _data = data;
+
+ final UnionWithEmptyStructTag _tag;
+ final _data;
+ EmptyStruct get s {
+ if (_tag != UnionWithEmptyStructTag.s) {
+ return null;
+ }
+ return _data;
+ }
+ EmptyStruct get s2 {
+ if (_tag != UnionWithEmptyStructTag.s2) {
+ return null;
+ }
+ return _data;
+ }
+
+ @override
+ String toString() {
+ switch (_tag) {
+ case UnionWithEmptyStructTag.s:
+ return r'UnionWithEmptyStruct.s($s)';
+ case UnionWithEmptyStructTag.s2:
+ return r'UnionWithEmptyStruct.s2($s2)';
+ default:
+ return null;
+ }
+ }
+
+ UnionWithEmptyStructTag get $tag => _tag;
+ // TODO: remove, see: FIDL-587
+ UnionWithEmptyStructTag get tag => _tag;
+
+ @override
+ int get $index => _tag.index;
+
+ @override
+ Object get $data => _data;
+
+ static UnionWithEmptyStruct _ctor(int index, Object data) {
+ return UnionWithEmptyStruct._(UnionWithEmptyStructTag.values[index], data);
+ }
+}
+
+// See FIDL-308:
+// ignore: recursive_compile_time_constant
+const $fidl.UnionType<UnionWithEmptyStruct> kUnionWithEmptyStruct_Type = $fidl.UnionType<UnionWithEmptyStruct>(
+ encodedSize: 16,
+ members: <$fidl.MemberType>[
+ $fidl.MemberType<EmptyStruct>(type: kEmptyStruct_Type, offset: 8),
+ $fidl.MemberType<EmptyStruct>(type: $fidl.PointerType<EmptyStruct>(element: kEmptyStruct_Type), offset: 8),
+ ],
+ ctor: UnionWithEmptyStruct._ctor,
+ ordinalToIndex: <int, int>{
+ 2012545430: 0,
+ 1404939714: 1,
+ },
+);
+
enum SimpleUnionTag {
i32,
i64,
@@ -48,31 +176,24 @@
os,
str,
}
-
class SimpleUnion extends $fidl.Union {
+
const SimpleUnion.withI32(int value)
- : _data = value,
- _tag = SimpleUnionTag.i32;
+ : _data = value, _tag = SimpleUnionTag.i32;
const SimpleUnion.withI64(int value)
- : _data = value,
- _tag = SimpleUnionTag.i64;
+ : _data = value, _tag = SimpleUnionTag.i64;
const SimpleUnion.withS(Int64Struct value)
- : _data = value,
- _tag = SimpleUnionTag.s;
+ : _data = value, _tag = SimpleUnionTag.s;
const SimpleUnion.withOs(Int64Struct value)
- : _data = value,
- _tag = SimpleUnionTag.os;
+ : _data = value, _tag = SimpleUnionTag.os;
const SimpleUnion.withStr(String value)
- : _data = value,
- _tag = SimpleUnionTag.str;
+ : _data = value, _tag = SimpleUnionTag.str;
- SimpleUnion._(SimpleUnionTag tag, Object data)
- : _tag = tag,
- _data = data;
+ SimpleUnion._(SimpleUnionTag tag, Object data) : _tag = tag, _data = data;
final SimpleUnionTag _tag;
final _data;
@@ -82,28 +203,24 @@
}
return _data;
}
-
int get i64 {
if (_tag != SimpleUnionTag.i64) {
return null;
}
return _data;
}
-
Int64Struct get s {
if (_tag != SimpleUnionTag.s) {
return null;
}
return _data;
}
-
Int64Struct get os {
if (_tag != SimpleUnionTag.os) {
return null;
}
return _data;
}
-
String get str {
if (_tag != SimpleUnionTag.str) {
return null;
@@ -146,19 +263,14 @@
// See FIDL-308:
// ignore: recursive_compile_time_constant
-const $fidl.UnionType<SimpleUnion> kSimpleUnion_Type =
- $fidl.UnionType<SimpleUnion>(
+const $fidl.UnionType<SimpleUnion> kSimpleUnion_Type = $fidl.UnionType<SimpleUnion>(
encodedSize: 24,
members: <$fidl.MemberType>[
$fidl.MemberType<int>(type: $fidl.Int32Type(), offset: 8),
$fidl.MemberType<int>(type: $fidl.Int64Type(), offset: 8),
$fidl.MemberType<Int64Struct>(type: kInt64Struct_Type, offset: 8),
- $fidl.MemberType<Int64Struct>(
- type: $fidl.PointerType<Int64Struct>(element: kInt64Struct_Type),
- offset: 8),
- $fidl.MemberType<String>(
- type: $fidl.StringType(maybeElementCount: null, nullable: false),
- offset: 8),
+ $fidl.MemberType<Int64Struct>(type: $fidl.PointerType<Int64Struct>(element: kInt64Struct_Type), offset: 8),
+ $fidl.MemberType<String>(type: $fidl.StringType(maybeElementCount: null, nullable: false), offset: 8),
],
ctor: SimpleUnion._ctor,
ordinalToIndex: <int, int>{
@@ -170,102 +282,19 @@
},
);
-enum UnionWithEmptyStructTag {
- s,
- s2,
-}
-
-class UnionWithEmptyStruct extends $fidl.Union {
- const UnionWithEmptyStruct.withS(EmptyStruct value)
- : _data = value,
- _tag = UnionWithEmptyStructTag.s;
-
- const UnionWithEmptyStruct.withS2(EmptyStruct value)
- : _data = value,
- _tag = UnionWithEmptyStructTag.s2;
-
- UnionWithEmptyStruct._(UnionWithEmptyStructTag tag, Object data)
- : _tag = tag,
- _data = data;
-
- final UnionWithEmptyStructTag _tag;
- final _data;
- EmptyStruct get s {
- if (_tag != UnionWithEmptyStructTag.s) {
- return null;
- }
- return _data;
- }
-
- EmptyStruct get s2 {
- if (_tag != UnionWithEmptyStructTag.s2) {
- return null;
- }
- return _data;
- }
-
- @override
- String toString() {
- switch (_tag) {
- case UnionWithEmptyStructTag.s:
- return r'UnionWithEmptyStruct.s($s)';
- case UnionWithEmptyStructTag.s2:
- return r'UnionWithEmptyStruct.s2($s2)';
- default:
- return null;
- }
- }
-
- UnionWithEmptyStructTag get $tag => _tag;
- // TODO: remove, see: FIDL-587
- UnionWithEmptyStructTag get tag => _tag;
-
- @override
- int get $index => _tag.index;
-
- @override
- Object get $data => _data;
-
- static UnionWithEmptyStruct _ctor(int index, Object data) {
- return UnionWithEmptyStruct._(UnionWithEmptyStructTag.values[index], data);
- }
-}
-
-// See FIDL-308:
-// ignore: recursive_compile_time_constant
-const $fidl.UnionType<UnionWithEmptyStruct> kUnionWithEmptyStruct_Type =
- $fidl.UnionType<UnionWithEmptyStruct>(
- encodedSize: 16,
- members: <$fidl.MemberType>[
- $fidl.MemberType<EmptyStruct>(type: kEmptyStruct_Type, offset: 8),
- $fidl.MemberType<EmptyStruct>(
- type: $fidl.PointerType<EmptyStruct>(element: kEmptyStruct_Type),
- offset: 8),
- ],
- ctor: UnionWithEmptyStruct._ctor,
- ordinalToIndex: <int, int>{
- 2012545430: 0,
- 1404939714: 1,
- },
-);
-
enum IpAddressConfigTag {
paddingSize24Align4,
dhcp,
}
-
class IpAddressConfig extends $fidl.Union {
+
const IpAddressConfig.withPaddingSize24Align4(Uint32List value)
- : _data = value,
- _tag = IpAddressConfigTag.paddingSize24Align4;
+ : _data = value, _tag = IpAddressConfigTag.paddingSize24Align4;
const IpAddressConfig.withDhcp(bool value)
- : _data = value,
- _tag = IpAddressConfigTag.dhcp;
+ : _data = value, _tag = IpAddressConfigTag.dhcp;
- IpAddressConfig._(IpAddressConfigTag tag, Object data)
- : _tag = tag,
- _data = data;
+ IpAddressConfig._(IpAddressConfigTag tag, Object data) : _tag = tag, _data = data;
final IpAddressConfigTag _tag;
final _data;
@@ -275,7 +304,6 @@
}
return _data;
}
-
bool get dhcp {
if (_tag != IpAddressConfigTag.dhcp) {
return null;
@@ -312,14 +340,10 @@
// See FIDL-308:
// ignore: recursive_compile_time_constant
-const $fidl.UnionType<IpAddressConfig> kIpAddressConfig_Type =
- $fidl.UnionType<IpAddressConfig>(
+const $fidl.UnionType<IpAddressConfig> kIpAddressConfig_Type = $fidl.UnionType<IpAddressConfig>(
encodedSize: 28,
members: <$fidl.MemberType>[
- $fidl.MemberType<Uint32List>(
- type: $fidl.ArrayType<Uint32List>(
- element: $fidl.Uint32Type(), elementCount: 6),
- offset: 4),
+ $fidl.MemberType<Uint32List>(type: $fidl.ArrayType<Uint32List>(element: $fidl.Uint32Type(), elementCount: 6), offset: 4),
$fidl.MemberType<bool>(type: $fidl.BoolType(), offset: 4),
],
ctor: IpAddressConfig._ctor,
@@ -329,23 +353,34 @@
},
);
-enum UnionWithBoundStringTag {
- boundFiveStr,
+enum XUnionWithEmptyStructTag {
+ $unknown,
+ s, // 0x7499e0fe
}
-class UnionWithBoundString extends $fidl.Union {
- const UnionWithBoundString.withBoundFiveStr(String value)
- : _data = value,
- _tag = UnionWithBoundStringTag.boundFiveStr;
+const Map<int, XUnionWithEmptyStructTag> _XUnionWithEmptyStructTag_map = {
+ 1956241662: XUnionWithEmptyStructTag.s,
+};
- UnionWithBoundString._(UnionWithBoundStringTag tag, Object data)
- : _tag = tag,
- _data = data;
- final UnionWithBoundStringTag _tag;
+class XUnionWithEmptyStruct extends $fidl.XUnion {
+
+ const XUnionWithEmptyStruct.withS(EmptyStruct value)
+ : _ordinal = 1956241662, _data = value;
+
+ XUnionWithEmptyStruct._(int ordinal, Object data) : _ordinal = ordinal, _data = data;
+
+ final int _ordinal;
final _data;
- String get boundFiveStr {
- if (_tag != UnionWithBoundStringTag.boundFiveStr) {
+
+ XUnionWithEmptyStructTag get $tag {
+ final XUnionWithEmptyStructTag $rawtag = _XUnionWithEmptyStructTag_map[_ordinal];
+ return $rawtag == null ? XUnionWithEmptyStructTag.$unknown : $rawtag;
+ }
+
+
+ EmptyStruct get s {
+ if (_ordinal != 1956241662) {
return null;
}
return _data;
@@ -353,46 +388,50 @@
@override
String toString() {
- switch (_tag) {
- case UnionWithBoundStringTag.boundFiveStr:
- return r'UnionWithBoundString.boundFiveStr($boundFiveStr)';
+ switch (_ordinal) {
+ case 1956241662:
+ return 'XUnionWithEmptyStruct.s($s)';
default:
- return null;
+ return 'XUnionWithEmptyStruct.<UNKNOWN>';
}
}
- UnionWithBoundStringTag get $tag => _tag;
- // TODO: remove, see: FIDL-587
- UnionWithBoundStringTag get tag => _tag;
-
@override
- int get $index => _tag.index;
+ int get $ordinal => _ordinal;
@override
Object get $data => _data;
- static UnionWithBoundString _ctor(int index, Object data) {
- return UnionWithBoundString._(UnionWithBoundStringTag.values[index], data);
+ static XUnionWithEmptyStruct _ctor(int ordinal, Object data) {
+ return XUnionWithEmptyStruct._(ordinal, data);
}
}
// See FIDL-308:
// ignore: recursive_compile_time_constant
-const $fidl.UnionType<UnionWithBoundString> kUnionWithBoundString_Type =
- $fidl.UnionType<UnionWithBoundString>(
+const $fidl.XUnionType<XUnionWithEmptyStruct> kXUnionWithEmptyStruct_Type = $fidl.XUnionType<XUnionWithEmptyStruct>(
encodedSize: 24,
- members: <$fidl.MemberType>[
- $fidl.MemberType<String>(
- type: $fidl.StringType(maybeElementCount: 5, nullable: false),
- offset: 8),
- ],
- ctor: UnionWithBoundString._ctor,
- ordinalToIndex: <int, int>{
- 921366385: 0,
+ members: <int, $fidl.FidlType>{
+ 1956241662: kEmptyStruct_Type,
},
+ ctor: XUnionWithEmptyStruct._ctor,
+ nullable: false,
+ flexible: true,
+);
+// See FIDL-308:
+// ignore: recursive_compile_time_constant
+const $fidl.XUnionType<XUnionWithEmptyStruct> kXUnionWithEmptyStruct_OptType = $fidl.XUnionType<XUnionWithEmptyStruct>(
+encodedSize: 24,
+members: <int, $fidl.FidlType>{
+ 1956241662: kEmptyStruct_Type,
+ },
+ctor: XUnionWithEmptyStruct._ctor,
+nullable: true,
+flexible: true,
);
enum SampleXUnionTag {
+ $unknown,
u, // 0x389c56b2
su, // 0x792f4f1d
st, // 0x21de8d5
@@ -404,27 +443,28 @@
35514581: SampleXUnionTag.st,
};
+
class SampleXUnion extends $fidl.XUnion {
+
const SampleXUnion.withU(int value)
- : _ordinal = 949769906,
- _data = value;
+ : _ordinal = 949769906, _data = value;
const SampleXUnion.withSu(SimpleUnion value)
- : _ordinal = 2033143581,
- _data = value;
+ : _ordinal = 2033143581, _data = value;
const SampleXUnion.withSt(SimpleTable value)
- : _ordinal = 35514581,
- _data = value;
+ : _ordinal = 35514581, _data = value;
- SampleXUnion._(int ordinal, Object data)
- : _ordinal = ordinal,
- _data = data;
+ SampleXUnion._(int ordinal, Object data) : _ordinal = ordinal, _data = data;
final int _ordinal;
final _data;
- SampleXUnionTag get $tag => _SampleXUnionTag_map[_ordinal];
+ SampleXUnionTag get $tag {
+ final SampleXUnionTag $rawtag = _SampleXUnionTag_map[_ordinal];
+ return $rawtag == null ? SampleXUnionTag.$unknown : $rawtag;
+ }
+
int get u {
if (_ordinal != 949769906) {
@@ -432,14 +472,12 @@
}
return _data;
}
-
SimpleUnion get su {
if (_ordinal != 2033143581) {
return null;
}
return _data;
}
-
SimpleTable get st {
if (_ordinal != 35514581) {
return null;
@@ -457,7 +495,7 @@
case 35514581:
return 'SampleXUnion.st($st)';
default:
- return null;
+ return 'SampleXUnion.<UNKNOWN>';
}
}
@@ -474,8 +512,7 @@
// See FIDL-308:
// ignore: recursive_compile_time_constant
-const $fidl.XUnionType<SampleXUnion> kSampleXUnion_Type =
- $fidl.XUnionType<SampleXUnion>(
+const $fidl.XUnionType<SampleXUnion> kSampleXUnion_Type = $fidl.XUnionType<SampleXUnion>(
encodedSize: 24,
members: <int, $fidl.FidlType>{
949769906: $fidl.Uint32Type(),
@@ -483,19 +520,21 @@
35514581: kSimpleTable_Type,
},
ctor: SampleXUnion._ctor,
+ nullable: false,
+ flexible: true,
);
// See FIDL-308:
// ignore: recursive_compile_time_constant
-const $fidl.XUnionType<SampleXUnion> kSampleXUnion_OptType =
- $fidl.XUnionType<SampleXUnion>(
- encodedSize: 24,
- members: <int, $fidl.FidlType>{
+const $fidl.XUnionType<SampleXUnion> kSampleXUnion_OptType = $fidl.XUnionType<SampleXUnion>(
+encodedSize: 24,
+members: <int, $fidl.FidlType>{
949769906: $fidl.Uint32Type(),
2033143581: kSimpleUnion_Type,
35514581: kSimpleTable_Type,
},
- ctor: SampleXUnion._ctor,
- nullable: true,
+ctor: SampleXUnion._ctor,
+nullable: true,
+flexible: true,
);
enum SampleStrictXUnionTag {
@@ -510,42 +549,38 @@
925062383: SampleStrictXUnionTag.st,
};
+
class SampleStrictXUnion extends $fidl.XUnion {
+
const SampleStrictXUnion.withU(int value)
- : _ordinal = 149088882,
- _data = value;
+ : _ordinal = 149088882, _data = value;
const SampleStrictXUnion.withSu(SimpleUnion value)
- : _ordinal = 670279483,
- _data = value;
+ : _ordinal = 670279483, _data = value;
const SampleStrictXUnion.withSt(SimpleTable value)
- : _ordinal = 925062383,
- _data = value;
+ : _ordinal = 925062383, _data = value;
- SampleStrictXUnion._(int ordinal, Object data)
- : _ordinal = ordinal,
- _data = data;
+ SampleStrictXUnion._(int ordinal, Object data) : _ordinal = ordinal, _data = data;
final int _ordinal;
final _data;
SampleStrictXUnionTag get $tag => _SampleStrictXUnionTag_map[_ordinal];
+
int get u {
if (_ordinal != 149088882) {
return null;
}
return _data;
}
-
SimpleUnion get su {
if (_ordinal != 670279483) {
return null;
}
return _data;
}
-
SimpleTable get st {
if (_ordinal != 925062383) {
return null;
@@ -580,8 +615,7 @@
// See FIDL-308:
// ignore: recursive_compile_time_constant
-const $fidl.XUnionType<SampleStrictXUnion> kSampleStrictXUnion_Type =
- $fidl.XUnionType<SampleStrictXUnion>(
+const $fidl.XUnionType<SampleStrictXUnion> kSampleStrictXUnion_Type = $fidl.XUnionType<SampleStrictXUnion>(
encodedSize: 24,
members: <int, $fidl.FidlType>{
149088882: $fidl.Uint32Type(),
@@ -589,105 +623,1237 @@
925062383: kSimpleTable_Type,
},
ctor: SampleStrictXUnion._ctor,
+ nullable: false,
+ flexible: false,
);
// See FIDL-308:
// ignore: recursive_compile_time_constant
-const $fidl.XUnionType<SampleStrictXUnion> kSampleStrictXUnion_OptType =
- $fidl.XUnionType<SampleStrictXUnion>(
- encodedSize: 24,
- members: <int, $fidl.FidlType>{
+const $fidl.XUnionType<SampleStrictXUnion> kSampleStrictXUnion_OptType = $fidl.XUnionType<SampleStrictXUnion>(
+encodedSize: 24,
+members: <int, $fidl.FidlType>{
149088882: $fidl.Uint32Type(),
670279483: kSimpleUnion_Type,
925062383: kSimpleTable_Type,
},
- ctor: SampleStrictXUnion._ctor,
- nullable: true,
+ctor: SampleStrictXUnion._ctor,
+nullable: true,
+flexible: false,
);
-enum XUnionWithEmptyStructTag {
- s, // 0x7499e0fe
-}
-const Map<int, XUnionWithEmptyStructTag> _XUnionWithEmptyStructTag_map = {
- 1956241662: XUnionWithEmptyStructTag.s,
-};
+class EmptyStruct extends $fidl.Struct {
+ const EmptyStruct({
+ this.reserved: 0x0,
+ });
+ EmptyStruct.clone(EmptyStruct $orig, {
+ int reserved,
+ }) : this(
+ reserved: reserved ?? $orig.reserved,
+ );
-class XUnionWithEmptyStruct extends $fidl.XUnion {
- const XUnionWithEmptyStruct.withS(EmptyStruct value)
- : _ordinal = 1956241662,
- _data = value;
- XUnionWithEmptyStruct._(int ordinal, Object data)
- : _ordinal = ordinal,
- _data = data;
+
- final int _ordinal;
- final _data;
+ EmptyStruct._(List<Object> argv)
+ : reserved = argv[0];
+ final int reserved;
- XUnionWithEmptyStructTag get $tag => _XUnionWithEmptyStructTag_map[_ordinal];
-
- EmptyStruct get s {
- if (_ordinal != 1956241662) {
- return null;
- }
- return _data;
+ @override
+ List<Object> get $fields {
+ return <Object>[
+ reserved,
+ ];
}
@override
String toString() {
- switch (_ordinal) {
- case 1956241662:
- return 'XUnionWithEmptyStruct.s($s)';
- default:
- return null;
- }
+ // ignore: prefer_interpolation_to_compose_strings
+ return r'EmptyStruct' r'(reserved: ' + reserved.toString() + r')';
}
- @override
- int get $ordinal => _ordinal;
-
- @override
- Object get $data => _data;
-
- static XUnionWithEmptyStruct _ctor(int ordinal, Object data) {
- return XUnionWithEmptyStruct._(ordinal, data);
- }
+ static EmptyStruct _ctor(List<Object> argv) => EmptyStruct._(argv);
}
// See FIDL-308:
// ignore: recursive_compile_time_constant
-const $fidl.XUnionType<XUnionWithEmptyStruct> kXUnionWithEmptyStruct_Type =
- $fidl.XUnionType<XUnionWithEmptyStruct>(
- encodedSize: 24,
- members: <int, $fidl.FidlType>{
- 1956241662: kEmptyStruct_Type,
- },
- ctor: XUnionWithEmptyStruct._ctor,
+const $fidl.StructType<EmptyStruct> kEmptyStruct_Type = $fidl.StructType<EmptyStruct>(
+ encodedSize: 1,
+ members: <$fidl.MemberType>[
+ $fidl.MemberType<int>(type: $fidl.Uint8Type(), offset: 0),
+ ],
+ ctor: EmptyStruct._ctor,
);
+
+
+class EmptyStructSandwich extends $fidl.Struct {
+ const EmptyStructSandwich({
+ @required this.before,
+ @required this.es,
+ @required this.after,
+ });
+ EmptyStructSandwich.clone(EmptyStructSandwich $orig, {
+ String before,
+ EmptyStruct es,
+ String after,
+ }) : this(
+ before: before ?? $orig.before,
+ es: es ?? $orig.es,
+ after: after ?? $orig.after,
+ );
+
+
+
+
+ EmptyStructSandwich._(List<Object> argv)
+ : before = argv[0],
+ es = argv[1],
+ after = argv[2];
+ final String before;
+ final EmptyStruct es;
+ final String after;
+
+ @override
+ List<Object> get $fields {
+ return <Object>[
+ before,
+ es,
+ after,
+ ];
+ }
+
+ @override
+ String toString() {
+ // ignore: prefer_interpolation_to_compose_strings
+ return r'EmptyStructSandwich' r'(before: ' + before.toString() + r', es: ' + es.toString() + r', after: ' + after.toString() + r')';
+ }
+
+ static EmptyStructSandwich _ctor(List<Object> argv) => EmptyStructSandwich._(argv);
+}
+
// See FIDL-308:
// ignore: recursive_compile_time_constant
-const $fidl.XUnionType<XUnionWithEmptyStruct> kXUnionWithEmptyStruct_OptType =
- $fidl.XUnionType<XUnionWithEmptyStruct>(
- encodedSize: 24,
- members: <int, $fidl.FidlType>{
- 1956241662: kEmptyStruct_Type,
- },
- ctor: XUnionWithEmptyStruct._ctor,
- nullable: true,
+const $fidl.StructType<EmptyStructSandwich> kEmptyStructSandwich_Type = $fidl.StructType<EmptyStructSandwich>(
+ encodedSize: 40,
+ members: <$fidl.MemberType>[
+ $fidl.MemberType<String>(type: $fidl.StringType(maybeElementCount: null, nullable: false), offset: 0),
+ $fidl.MemberType<EmptyStruct>(type: kEmptyStruct_Type, offset: 16),
+ $fidl.MemberType<String>(type: $fidl.StringType(maybeElementCount: null, nullable: false), offset: 24),
+ ],
+ ctor: EmptyStructSandwich._ctor,
);
+
+class Uint8Uint16Uint32Uint64 extends $fidl.Struct {
+ const Uint8Uint16Uint32Uint64({
+ @required this.f1,
+ @required this.f2,
+ @required this.f3,
+ @required this.f4,
+ });
+ Uint8Uint16Uint32Uint64.clone(Uint8Uint16Uint32Uint64 $orig, {
+ int f1,
+ int f2,
+ int f3,
+ int f4,
+ }) : this(
+ f1: f1 ?? $orig.f1,
+ f2: f2 ?? $orig.f2,
+ f3: f3 ?? $orig.f3,
+ f4: f4 ?? $orig.f4,
+ );
+
+
+
+
+ Uint8Uint16Uint32Uint64._(List<Object> argv)
+ : f1 = argv[0],
+ f2 = argv[1],
+ f3 = argv[2],
+ f4 = argv[3];
+ final int f1;
+ final int f2;
+ final int f3;
+ final int f4;
+
+ @override
+ List<Object> get $fields {
+ return <Object>[
+ f1,
+ f2,
+ f3,
+ f4,
+ ];
+ }
+
+ @override
+ String toString() {
+ // ignore: prefer_interpolation_to_compose_strings
+ return r'Uint8Uint16Uint32Uint64' r'(f1: ' + f1.toString() + r', f2: ' + f2.toString() + r', f3: ' + f3.toString() + r', f4: ' + f4.toString() + r')';
+ }
+
+ static Uint8Uint16Uint32Uint64 _ctor(List<Object> argv) => Uint8Uint16Uint32Uint64._(argv);
+}
+
+// See FIDL-308:
+// ignore: recursive_compile_time_constant
+const $fidl.StructType<Uint8Uint16Uint32Uint64> kUint8Uint16Uint32Uint64_Type = $fidl.StructType<Uint8Uint16Uint32Uint64>(
+ encodedSize: 16,
+ members: <$fidl.MemberType>[
+ $fidl.MemberType<int>(type: $fidl.Uint8Type(), offset: 0),
+ $fidl.MemberType<int>(type: $fidl.Uint16Type(), offset: 2),
+ $fidl.MemberType<int>(type: $fidl.Uint32Type(), offset: 4),
+ $fidl.MemberType<int>(type: $fidl.Uint64Type(), offset: 8),
+ ],
+ ctor: Uint8Uint16Uint32Uint64._ctor,
+);
+
+
+class Uint64Uint32Uint16Uint8 extends $fidl.Struct {
+ const Uint64Uint32Uint16Uint8({
+ @required this.f1,
+ @required this.f2,
+ @required this.f3,
+ @required this.f4,
+ });
+ Uint64Uint32Uint16Uint8.clone(Uint64Uint32Uint16Uint8 $orig, {
+ int f1,
+ int f2,
+ int f3,
+ int f4,
+ }) : this(
+ f1: f1 ?? $orig.f1,
+ f2: f2 ?? $orig.f2,
+ f3: f3 ?? $orig.f3,
+ f4: f4 ?? $orig.f4,
+ );
+
+
+
+
+ Uint64Uint32Uint16Uint8._(List<Object> argv)
+ : f1 = argv[0],
+ f2 = argv[1],
+ f3 = argv[2],
+ f4 = argv[3];
+ final int f1;
+ final int f2;
+ final int f3;
+ final int f4;
+
+ @override
+ List<Object> get $fields {
+ return <Object>[
+ f1,
+ f2,
+ f3,
+ f4,
+ ];
+ }
+
+ @override
+ String toString() {
+ // ignore: prefer_interpolation_to_compose_strings
+ return r'Uint64Uint32Uint16Uint8' r'(f1: ' + f1.toString() + r', f2: ' + f2.toString() + r', f3: ' + f3.toString() + r', f4: ' + f4.toString() + r')';
+ }
+
+ static Uint64Uint32Uint16Uint8 _ctor(List<Object> argv) => Uint64Uint32Uint16Uint8._(argv);
+}
+
+// See FIDL-308:
+// ignore: recursive_compile_time_constant
+const $fidl.StructType<Uint64Uint32Uint16Uint8> kUint64Uint32Uint16Uint8_Type = $fidl.StructType<Uint64Uint32Uint16Uint8>(
+ encodedSize: 16,
+ members: <$fidl.MemberType>[
+ $fidl.MemberType<int>(type: $fidl.Uint64Type(), offset: 0),
+ $fidl.MemberType<int>(type: $fidl.Uint32Type(), offset: 8),
+ $fidl.MemberType<int>(type: $fidl.Uint16Type(), offset: 12),
+ $fidl.MemberType<int>(type: $fidl.Uint8Type(), offset: 14),
+ ],
+ ctor: Uint64Uint32Uint16Uint8._ctor,
+);
+
+
+class UnionWithBoundStringStruct extends $fidl.Struct {
+ const UnionWithBoundStringStruct({
+ @required this.v,
+ });
+ UnionWithBoundStringStruct.clone(UnionWithBoundStringStruct $orig, {
+ UnionWithBoundString v,
+ }) : this(
+ v: v ?? $orig.v,
+ );
+
+
+
+
+ UnionWithBoundStringStruct._(List<Object> argv)
+ : v = argv[0];
+ final UnionWithBoundString v;
+
+ @override
+ List<Object> get $fields {
+ return <Object>[
+ v,
+ ];
+ }
+
+ @override
+ String toString() {
+ // ignore: prefer_interpolation_to_compose_strings
+ return r'UnionWithBoundStringStruct' r'(v: ' + v.toString() + r')';
+ }
+
+ static UnionWithBoundStringStruct _ctor(List<Object> argv) => UnionWithBoundStringStruct._(argv);
+}
+
+// See FIDL-308:
+// ignore: recursive_compile_time_constant
+const $fidl.StructType<UnionWithBoundStringStruct> kUnionWithBoundStringStruct_Type = $fidl.StructType<UnionWithBoundStringStruct>(
+ encodedSize: 24,
+ members: <$fidl.MemberType>[
+ $fidl.MemberType<UnionWithBoundString>(type: kUnionWithBoundString_Type, offset: 0),
+ ],
+ ctor: UnionWithBoundStringStruct._ctor,
+);
+
+
+class StructWithOptionals extends $fidl.Struct {
+ const StructWithOptionals({
+ @required this.s,
+ this.s2,
+ @required this.t,
+ @required this.xu,
+ this.xu2,
+ @required this.u,
+ this.u2,
+ });
+ StructWithOptionals.clone(StructWithOptionals $orig, {
+ EmptyStruct s,
+ EmptyStruct s2,
+ TableWithEmptyStruct t,
+ XUnionWithEmptyStruct xu,
+ XUnionWithEmptyStruct xu2,
+ UnionWithEmptyStruct u,
+ UnionWithEmptyStruct u2,
+ }) : this(
+ s: s ?? $orig.s,
+ s2: s2 ?? $orig.s2,
+ t: t ?? $orig.t,
+ xu: xu ?? $orig.xu,
+ xu2: xu2 ?? $orig.xu2,
+ u: u ?? $orig.u,
+ u2: u2 ?? $orig.u2,
+ );
+
+
+
+ StructWithOptionals.cloneWithout(StructWithOptionals $orig, {
+
+ bool s2,
+
+
+ bool xu2,
+
+ bool u2,
+ }) : this(
+
+ s: $orig.s,
+
+
+ s2: s2 ? null : $orig.s2,
+
+
+ t: $orig.t,
+
+
+ xu: $orig.xu,
+
+
+ xu2: xu2 ? null : $orig.xu2,
+
+
+ u: $orig.u,
+
+
+ u2: u2 ? null : $orig.u2,
+
+ );
+
+
+ StructWithOptionals._(List<Object> argv)
+ : s = argv[0],
+ s2 = argv[1],
+ t = argv[2],
+ xu = argv[3],
+ xu2 = argv[4],
+ u = argv[5],
+ u2 = argv[6];
+ final EmptyStruct s;
+ final EmptyStruct s2;
+ final TableWithEmptyStruct t;
+ final XUnionWithEmptyStruct xu;
+ final XUnionWithEmptyStruct xu2;
+ final UnionWithEmptyStruct u;
+ final UnionWithEmptyStruct u2;
+
+ @override
+ List<Object> get $fields {
+ return <Object>[
+ s,
+ s2,
+ t,
+ xu,
+ xu2,
+ u,
+ u2,
+ ];
+ }
+
+ @override
+ String toString() {
+ // ignore: prefer_interpolation_to_compose_strings
+ return r'StructWithOptionals' r'(s: ' + s.toString() + r', s2: ' + s2.toString() + r', t: ' + t.toString() + r', xu: ' + xu.toString() + r', xu2: ' + xu2.toString() + r', u: ' + u.toString() + r', u2: ' + u2.toString() + r')';
+ }
+
+ static StructWithOptionals _ctor(List<Object> argv) => StructWithOptionals._(argv);
+}
+
+// See FIDL-308:
+// ignore: recursive_compile_time_constant
+const $fidl.StructType<StructWithOptionals> kStructWithOptionals_Type = $fidl.StructType<StructWithOptionals>(
+ encodedSize: 104,
+ members: <$fidl.MemberType>[
+ $fidl.MemberType<EmptyStruct>(type: kEmptyStruct_Type, offset: 0),
+ $fidl.MemberType<EmptyStruct>(type: $fidl.PointerType<EmptyStruct>(element: kEmptyStruct_Type), offset: 8),
+ $fidl.MemberType<TableWithEmptyStruct>(type: kTableWithEmptyStruct_Type, offset: 16),
+ $fidl.MemberType<XUnionWithEmptyStruct>(type: kXUnionWithEmptyStruct_Type, offset: 32),
+ $fidl.MemberType<XUnionWithEmptyStruct>(type: kXUnionWithEmptyStruct_OptType, offset: 56),
+ $fidl.MemberType<UnionWithEmptyStruct>(type: kUnionWithEmptyStruct_Type, offset: 80),
+ $fidl.MemberType<UnionWithEmptyStruct>(type: $fidl.PointerType<UnionWithEmptyStruct>(element: kUnionWithEmptyStruct_Type), offset: 96),
+ ],
+ ctor: StructWithOptionals._ctor,
+);
+
+
+class ThreeByte extends $fidl.Struct {
+ const ThreeByte({
+ @required this.elem1,
+ @required this.elem2,
+ @required this.elem3,
+ });
+ ThreeByte.clone(ThreeByte $orig, {
+ int elem1,
+ int elem2,
+ int elem3,
+ }) : this(
+ elem1: elem1 ?? $orig.elem1,
+ elem2: elem2 ?? $orig.elem2,
+ elem3: elem3 ?? $orig.elem3,
+ );
+
+
+
+
+ ThreeByte._(List<Object> argv)
+ : elem1 = argv[0],
+ elem2 = argv[1],
+ elem3 = argv[2];
+ final int elem1;
+ final int elem2;
+ final int elem3;
+
+ @override
+ List<Object> get $fields {
+ return <Object>[
+ elem1,
+ elem2,
+ elem3,
+ ];
+ }
+
+ @override
+ String toString() {
+ // ignore: prefer_interpolation_to_compose_strings
+ return r'ThreeByte' r'(elem1: ' + elem1.toString() + r', elem2: ' + elem2.toString() + r', elem3: ' + elem3.toString() + r')';
+ }
+
+ static ThreeByte _ctor(List<Object> argv) => ThreeByte._(argv);
+}
+
+// See FIDL-308:
+// ignore: recursive_compile_time_constant
+const $fidl.StructType<ThreeByte> kThreeByte_Type = $fidl.StructType<ThreeByte>(
+ encodedSize: 3,
+ members: <$fidl.MemberType>[
+ $fidl.MemberType<int>(type: $fidl.Uint8Type(), offset: 0),
+ $fidl.MemberType<int>(type: $fidl.Uint8Type(), offset: 1),
+ $fidl.MemberType<int>(type: $fidl.Uint8Type(), offset: 2),
+ ],
+ ctor: ThreeByte._ctor,
+);
+
+
+class FiveByte extends $fidl.Struct {
+ const FiveByte({
+ @required this.elem1,
+ @required this.elem2,
+ });
+ FiveByte.clone(FiveByte $orig, {
+ int elem1,
+ int elem2,
+ }) : this(
+ elem1: elem1 ?? $orig.elem1,
+ elem2: elem2 ?? $orig.elem2,
+ );
+
+
+
+
+ FiveByte._(List<Object> argv)
+ : elem1 = argv[0],
+ elem2 = argv[1];
+ final int elem1;
+ final int elem2;
+
+ @override
+ List<Object> get $fields {
+ return <Object>[
+ elem1,
+ elem2,
+ ];
+ }
+
+ @override
+ String toString() {
+ // ignore: prefer_interpolation_to_compose_strings
+ return r'FiveByte' r'(elem1: ' + elem1.toString() + r', elem2: ' + elem2.toString() + r')';
+ }
+
+ static FiveByte _ctor(List<Object> argv) => FiveByte._(argv);
+}
+
+// See FIDL-308:
+// ignore: recursive_compile_time_constant
+const $fidl.StructType<FiveByte> kFiveByte_Type = $fidl.StructType<FiveByte>(
+ encodedSize: 8,
+ members: <$fidl.MemberType>[
+ $fidl.MemberType<int>(type: $fidl.Uint32Type(), offset: 0),
+ $fidl.MemberType<int>(type: $fidl.Uint8Type(), offset: 4),
+ ],
+ ctor: FiveByte._ctor,
+);
+
+
+class ThreeByteInStruct extends $fidl.Struct {
+ const ThreeByteInStruct({
+ @required this.elem1,
+ @required this.elem2,
+ @required this.elem3,
+ });
+ ThreeByteInStruct.clone(ThreeByteInStruct $orig, {
+ ThreeByte elem1,
+ ThreeByte elem2,
+ ThreeByte elem3,
+ }) : this(
+ elem1: elem1 ?? $orig.elem1,
+ elem2: elem2 ?? $orig.elem2,
+ elem3: elem3 ?? $orig.elem3,
+ );
+
+
+
+
+ ThreeByteInStruct._(List<Object> argv)
+ : elem1 = argv[0],
+ elem2 = argv[1],
+ elem3 = argv[2];
+ final ThreeByte elem1;
+ final ThreeByte elem2;
+ final ThreeByte elem3;
+
+ @override
+ List<Object> get $fields {
+ return <Object>[
+ elem1,
+ elem2,
+ elem3,
+ ];
+ }
+
+ @override
+ String toString() {
+ // ignore: prefer_interpolation_to_compose_strings
+ return r'ThreeByteInStruct' r'(elem1: ' + elem1.toString() + r', elem2: ' + elem2.toString() + r', elem3: ' + elem3.toString() + r')';
+ }
+
+ static ThreeByteInStruct _ctor(List<Object> argv) => ThreeByteInStruct._(argv);
+}
+
+// See FIDL-308:
+// ignore: recursive_compile_time_constant
+const $fidl.StructType<ThreeByteInStruct> kThreeByteInStruct_Type = $fidl.StructType<ThreeByteInStruct>(
+ encodedSize: 9,
+ members: <$fidl.MemberType>[
+ $fidl.MemberType<ThreeByte>(type: kThreeByte_Type, offset: 0),
+ $fidl.MemberType<ThreeByte>(type: kThreeByte_Type, offset: 3),
+ $fidl.MemberType<ThreeByte>(type: kThreeByte_Type, offset: 6),
+ ],
+ ctor: ThreeByteInStruct._ctor,
+);
+
+
+class FiveByteInStruct extends $fidl.Struct {
+ const FiveByteInStruct({
+ @required this.elem1,
+ @required this.elem2,
+ @required this.elem3,
+ });
+ FiveByteInStruct.clone(FiveByteInStruct $orig, {
+ FiveByte elem1,
+ FiveByte elem2,
+ FiveByte elem3,
+ }) : this(
+ elem1: elem1 ?? $orig.elem1,
+ elem2: elem2 ?? $orig.elem2,
+ elem3: elem3 ?? $orig.elem3,
+ );
+
+
+
+
+ FiveByteInStruct._(List<Object> argv)
+ : elem1 = argv[0],
+ elem2 = argv[1],
+ elem3 = argv[2];
+ final FiveByte elem1;
+ final FiveByte elem2;
+ final FiveByte elem3;
+
+ @override
+ List<Object> get $fields {
+ return <Object>[
+ elem1,
+ elem2,
+ elem3,
+ ];
+ }
+
+ @override
+ String toString() {
+ // ignore: prefer_interpolation_to_compose_strings
+ return r'FiveByteInStruct' r'(elem1: ' + elem1.toString() + r', elem2: ' + elem2.toString() + r', elem3: ' + elem3.toString() + r')';
+ }
+
+ static FiveByteInStruct _ctor(List<Object> argv) => FiveByteInStruct._(argv);
+}
+
+// See FIDL-308:
+// ignore: recursive_compile_time_constant
+const $fidl.StructType<FiveByteInStruct> kFiveByteInStruct_Type = $fidl.StructType<FiveByteInStruct>(
+ encodedSize: 24,
+ members: <$fidl.MemberType>[
+ $fidl.MemberType<FiveByte>(type: kFiveByte_Type, offset: 0),
+ $fidl.MemberType<FiveByte>(type: kFiveByte_Type, offset: 8),
+ $fidl.MemberType<FiveByte>(type: kFiveByte_Type, offset: 16),
+ ],
+ ctor: FiveByteInStruct._ctor,
+);
+
+
+class ThreeByteInVector extends $fidl.Struct {
+ const ThreeByteInVector({
+ @required this.elems,
+ });
+ ThreeByteInVector.clone(ThreeByteInVector $orig, {
+ List<ThreeByte> elems,
+ }) : this(
+ elems: elems ?? $orig.elems,
+ );
+
+
+
+
+ ThreeByteInVector._(List<Object> argv)
+ : elems = argv[0];
+ final List<ThreeByte> elems;
+
+ @override
+ List<Object> get $fields {
+ return <Object>[
+ elems,
+ ];
+ }
+
+ @override
+ String toString() {
+ // ignore: prefer_interpolation_to_compose_strings
+ return r'ThreeByteInVector' r'(elems: ' + elems.toString() + r')';
+ }
+
+ static ThreeByteInVector _ctor(List<Object> argv) => ThreeByteInVector._(argv);
+}
+
+// See FIDL-308:
+// ignore: recursive_compile_time_constant
+const $fidl.StructType<ThreeByteInVector> kThreeByteInVector_Type = $fidl.StructType<ThreeByteInVector>(
+ encodedSize: 16,
+ members: <$fidl.MemberType>[
+ $fidl.MemberType<List<ThreeByte>>(type: $fidl.VectorType<List<ThreeByte>>(element: kThreeByte_Type, maybeElementCount: null, nullable: false), offset: 0),
+ ],
+ ctor: ThreeByteInVector._ctor,
+);
+
+
+class FiveByteInVector extends $fidl.Struct {
+ const FiveByteInVector({
+ @required this.elems,
+ });
+ FiveByteInVector.clone(FiveByteInVector $orig, {
+ List<FiveByte> elems,
+ }) : this(
+ elems: elems ?? $orig.elems,
+ );
+
+
+
+
+ FiveByteInVector._(List<Object> argv)
+ : elems = argv[0];
+ final List<FiveByte> elems;
+
+ @override
+ List<Object> get $fields {
+ return <Object>[
+ elems,
+ ];
+ }
+
+ @override
+ String toString() {
+ // ignore: prefer_interpolation_to_compose_strings
+ return r'FiveByteInVector' r'(elems: ' + elems.toString() + r')';
+ }
+
+ static FiveByteInVector _ctor(List<Object> argv) => FiveByteInVector._(argv);
+}
+
+// See FIDL-308:
+// ignore: recursive_compile_time_constant
+const $fidl.StructType<FiveByteInVector> kFiveByteInVector_Type = $fidl.StructType<FiveByteInVector>(
+ encodedSize: 16,
+ members: <$fidl.MemberType>[
+ $fidl.MemberType<List<FiveByte>>(type: $fidl.VectorType<List<FiveByte>>(element: kFiveByte_Type, maybeElementCount: null, nullable: false), offset: 0),
+ ],
+ ctor: FiveByteInVector._ctor,
+);
+
+
+class ThreeByteInArray extends $fidl.Struct {
+ const ThreeByteInArray({
+ @required this.elems,
+ });
+ ThreeByteInArray.clone(ThreeByteInArray $orig, {
+ List<ThreeByte> elems,
+ }) : this(
+ elems: elems ?? $orig.elems,
+ );
+
+
+
+
+ ThreeByteInArray._(List<Object> argv)
+ : elems = argv[0];
+ final List<ThreeByte> elems;
+
+ @override
+ List<Object> get $fields {
+ return <Object>[
+ elems,
+ ];
+ }
+
+ @override
+ String toString() {
+ // ignore: prefer_interpolation_to_compose_strings
+ return r'ThreeByteInArray' r'(elems: ' + elems.toString() + r')';
+ }
+
+ static ThreeByteInArray _ctor(List<Object> argv) => ThreeByteInArray._(argv);
+}
+
+// See FIDL-308:
+// ignore: recursive_compile_time_constant
+const $fidl.StructType<ThreeByteInArray> kThreeByteInArray_Type = $fidl.StructType<ThreeByteInArray>(
+ encodedSize: 9,
+ members: <$fidl.MemberType>[
+ $fidl.MemberType<List<ThreeByte>>(type: $fidl.ArrayType<List<ThreeByte>>(element: kThreeByte_Type, elementCount: 3), offset: 0),
+ ],
+ ctor: ThreeByteInArray._ctor,
+);
+
+
+class FiveByteInArray extends $fidl.Struct {
+ const FiveByteInArray({
+ @required this.elems,
+ });
+ FiveByteInArray.clone(FiveByteInArray $orig, {
+ List<FiveByte> elems,
+ }) : this(
+ elems: elems ?? $orig.elems,
+ );
+
+
+
+
+ FiveByteInArray._(List<Object> argv)
+ : elems = argv[0];
+ final List<FiveByte> elems;
+
+ @override
+ List<Object> get $fields {
+ return <Object>[
+ elems,
+ ];
+ }
+
+ @override
+ String toString() {
+ // ignore: prefer_interpolation_to_compose_strings
+ return r'FiveByteInArray' r'(elems: ' + elems.toString() + r')';
+ }
+
+ static FiveByteInArray _ctor(List<Object> argv) => FiveByteInArray._(argv);
+}
+
+// See FIDL-308:
+// ignore: recursive_compile_time_constant
+const $fidl.StructType<FiveByteInArray> kFiveByteInArray_Type = $fidl.StructType<FiveByteInArray>(
+ encodedSize: 24,
+ members: <$fidl.MemberType>[
+ $fidl.MemberType<List<FiveByte>>(type: $fidl.ArrayType<List<FiveByte>>(element: kFiveByte_Type, elementCount: 3), offset: 0),
+ ],
+ ctor: FiveByteInArray._ctor,
+);
+
+
+class StructOfSimpleTable extends $fidl.Struct {
+ const StructOfSimpleTable({
+ @required this.table,
+ });
+ StructOfSimpleTable.clone(StructOfSimpleTable $orig, {
+ SimpleTable table,
+ }) : this(
+ table: table ?? $orig.table,
+ );
+
+
+
+
+ StructOfSimpleTable._(List<Object> argv)
+ : table = argv[0];
+ final SimpleTable table;
+
+ @override
+ List<Object> get $fields {
+ return <Object>[
+ table,
+ ];
+ }
+
+ @override
+ String toString() {
+ // ignore: prefer_interpolation_to_compose_strings
+ return r'StructOfSimpleTable' r'(table: ' + table.toString() + r')';
+ }
+
+ static StructOfSimpleTable _ctor(List<Object> argv) => StructOfSimpleTable._(argv);
+}
+
+// See FIDL-308:
+// ignore: recursive_compile_time_constant
+const $fidl.StructType<StructOfSimpleTable> kStructOfSimpleTable_Type = $fidl.StructType<StructOfSimpleTable>(
+ encodedSize: 16,
+ members: <$fidl.MemberType>[
+ $fidl.MemberType<SimpleTable>(type: kSimpleTable_Type, offset: 0),
+ ],
+ ctor: StructOfSimpleTable._ctor,
+);
+
+
+class SimpleTableThenUint64 extends $fidl.Struct {
+ const SimpleTableThenUint64({
+ @required this.table,
+ @required this.number,
+ });
+ SimpleTableThenUint64.clone(SimpleTableThenUint64 $orig, {
+ SimpleTable table,
+ int number,
+ }) : this(
+ table: table ?? $orig.table,
+ number: number ?? $orig.number,
+ );
+
+
+
+
+ SimpleTableThenUint64._(List<Object> argv)
+ : table = argv[0],
+ number = argv[1];
+ final SimpleTable table;
+ final int number;
+
+ @override
+ List<Object> get $fields {
+ return <Object>[
+ table,
+ number,
+ ];
+ }
+
+ @override
+ String toString() {
+ // ignore: prefer_interpolation_to_compose_strings
+ return r'SimpleTableThenUint64' r'(table: ' + table.toString() + r', number: ' + number.toString() + r')';
+ }
+
+ static SimpleTableThenUint64 _ctor(List<Object> argv) => SimpleTableThenUint64._(argv);
+}
+
+// See FIDL-308:
+// ignore: recursive_compile_time_constant
+const $fidl.StructType<SimpleTableThenUint64> kSimpleTableThenUint64_Type = $fidl.StructType<SimpleTableThenUint64>(
+ encodedSize: 24,
+ members: <$fidl.MemberType>[
+ $fidl.MemberType<SimpleTable>(type: kSimpleTable_Type, offset: 0),
+ $fidl.MemberType<int>(type: $fidl.Uint64Type(), offset: 16),
+ ],
+ ctor: SimpleTableThenUint64._ctor,
+);
+
+
+class StructOfTableWithStringAndVector extends $fidl.Struct {
+ const StructOfTableWithStringAndVector({
+ @required this.table,
+ });
+ StructOfTableWithStringAndVector.clone(StructOfTableWithStringAndVector $orig, {
+ TableWithStringAndVector table,
+ }) : this(
+ table: table ?? $orig.table,
+ );
+
+
+
+
+ StructOfTableWithStringAndVector._(List<Object> argv)
+ : table = argv[0];
+ final TableWithStringAndVector table;
+
+ @override
+ List<Object> get $fields {
+ return <Object>[
+ table,
+ ];
+ }
+
+ @override
+ String toString() {
+ // ignore: prefer_interpolation_to_compose_strings
+ return r'StructOfTableWithStringAndVector' r'(table: ' + table.toString() + r')';
+ }
+
+ static StructOfTableWithStringAndVector _ctor(List<Object> argv) => StructOfTableWithStringAndVector._(argv);
+}
+
+// See FIDL-308:
+// ignore: recursive_compile_time_constant
+const $fidl.StructType<StructOfTableWithStringAndVector> kStructOfTableWithStringAndVector_Type = $fidl.StructType<StructOfTableWithStringAndVector>(
+ encodedSize: 16,
+ members: <$fidl.MemberType>[
+ $fidl.MemberType<TableWithStringAndVector>(type: kTableWithStringAndVector_Type, offset: 0),
+ ],
+ ctor: StructOfTableWithStringAndVector._ctor,
+);
+
+
+class Int64Struct extends $fidl.Struct {
+ const Int64Struct({
+ @required this.x,
+ });
+ Int64Struct.clone(Int64Struct $orig, {
+ int x,
+ }) : this(
+ x: x ?? $orig.x,
+ );
+
+
+
+
+ Int64Struct._(List<Object> argv)
+ : x = argv[0];
+ final int x;
+
+ @override
+ List<Object> get $fields {
+ return <Object>[
+ x,
+ ];
+ }
+
+ @override
+ String toString() {
+ // ignore: prefer_interpolation_to_compose_strings
+ return r'Int64Struct' r'(x: ' + x.toString() + r')';
+ }
+
+ static Int64Struct _ctor(List<Object> argv) => Int64Struct._(argv);
+}
+
+// See FIDL-308:
+// ignore: recursive_compile_time_constant
+const $fidl.StructType<Int64Struct> kInt64Struct_Type = $fidl.StructType<Int64Struct>(
+ encodedSize: 8,
+ members: <$fidl.MemberType>[
+ $fidl.MemberType<int>(type: $fidl.Int64Type(), offset: 0),
+ ],
+ ctor: Int64Struct._ctor,
+);
+
+
+class TestInlineXUnionInStruct extends $fidl.Struct {
+ const TestInlineXUnionInStruct({
+ @required this.before,
+ @required this.xu,
+ @required this.after,
+ });
+ TestInlineXUnionInStruct.clone(TestInlineXUnionInStruct $orig, {
+ String before,
+ SampleXUnion xu,
+ String after,
+ }) : this(
+ before: before ?? $orig.before,
+ xu: xu ?? $orig.xu,
+ after: after ?? $orig.after,
+ );
+
+
+
+
+ TestInlineXUnionInStruct._(List<Object> argv)
+ : before = argv[0],
+ xu = argv[1],
+ after = argv[2];
+ final String before;
+ final SampleXUnion xu;
+ final String after;
+
+ @override
+ List<Object> get $fields {
+ return <Object>[
+ before,
+ xu,
+ after,
+ ];
+ }
+
+ @override
+ String toString() {
+ // ignore: prefer_interpolation_to_compose_strings
+ return r'TestInlineXUnionInStruct' r'(before: ' + before.toString() + r', xu: ' + xu.toString() + r', after: ' + after.toString() + r')';
+ }
+
+ static TestInlineXUnionInStruct _ctor(List<Object> argv) => TestInlineXUnionInStruct._(argv);
+}
+
+// See FIDL-308:
+// ignore: recursive_compile_time_constant
+const $fidl.StructType<TestInlineXUnionInStruct> kTestInlineXUnionInStruct_Type = $fidl.StructType<TestInlineXUnionInStruct>(
+ encodedSize: 56,
+ members: <$fidl.MemberType>[
+ $fidl.MemberType<String>(type: $fidl.StringType(maybeElementCount: null, nullable: false), offset: 0),
+ $fidl.MemberType<SampleXUnion>(type: kSampleXUnion_Type, offset: 16),
+ $fidl.MemberType<String>(type: $fidl.StringType(maybeElementCount: null, nullable: false), offset: 40),
+ ],
+ ctor: TestInlineXUnionInStruct._ctor,
+);
+
+
+class TestOptionalXUnionInStruct extends $fidl.Struct {
+ const TestOptionalXUnionInStruct({
+ @required this.before,
+ this.xu,
+ @required this.after,
+ });
+ TestOptionalXUnionInStruct.clone(TestOptionalXUnionInStruct $orig, {
+ String before,
+ SampleXUnion xu,
+ String after,
+ }) : this(
+ before: before ?? $orig.before,
+ xu: xu ?? $orig.xu,
+ after: after ?? $orig.after,
+ );
+
+
+
+ TestOptionalXUnionInStruct.cloneWithout(TestOptionalXUnionInStruct $orig, {
+
+ bool xu,
+
+ }) : this(
+
+ before: $orig.before,
+
+
+ xu: xu ? null : $orig.xu,
+
+
+ after: $orig.after,
+
+ );
+
+
+ TestOptionalXUnionInStruct._(List<Object> argv)
+ : before = argv[0],
+ xu = argv[1],
+ after = argv[2];
+ final String before;
+ final SampleXUnion xu;
+ final String after;
+
+ @override
+ List<Object> get $fields {
+ return <Object>[
+ before,
+ xu,
+ after,
+ ];
+ }
+
+ @override
+ String toString() {
+ // ignore: prefer_interpolation_to_compose_strings
+ return r'TestOptionalXUnionInStruct' r'(before: ' + before.toString() + r', xu: ' + xu.toString() + r', after: ' + after.toString() + r')';
+ }
+
+ static TestOptionalXUnionInStruct _ctor(List<Object> argv) => TestOptionalXUnionInStruct._(argv);
+}
+
+// See FIDL-308:
+// ignore: recursive_compile_time_constant
+const $fidl.StructType<TestOptionalXUnionInStruct> kTestOptionalXUnionInStruct_Type = $fidl.StructType<TestOptionalXUnionInStruct>(
+ encodedSize: 56,
+ members: <$fidl.MemberType>[
+ $fidl.MemberType<String>(type: $fidl.StringType(maybeElementCount: null, nullable: false), offset: 0),
+ $fidl.MemberType<SampleXUnion>(type: kSampleXUnion_OptType, offset: 16),
+ $fidl.MemberType<String>(type: $fidl.StringType(maybeElementCount: null, nullable: false), offset: 40),
+ ],
+ ctor: TestOptionalXUnionInStruct._ctor,
+);
+
+
+class TestStrictXUnionInStruct extends $fidl.Struct {
+ const TestStrictXUnionInStruct({
+ @required this.xu,
+ });
+ TestStrictXUnionInStruct.clone(TestStrictXUnionInStruct $orig, {
+ SampleStrictXUnion xu,
+ }) : this(
+ xu: xu ?? $orig.xu,
+ );
+
+
+
+
+ TestStrictXUnionInStruct._(List<Object> argv)
+ : xu = argv[0];
+ final SampleStrictXUnion xu;
+
+ @override
+ List<Object> get $fields {
+ return <Object>[
+ xu,
+ ];
+ }
+
+ @override
+ String toString() {
+ // ignore: prefer_interpolation_to_compose_strings
+ return r'TestStrictXUnionInStruct' r'(xu: ' + xu.toString() + r')';
+ }
+
+ static TestStrictXUnionInStruct _ctor(List<Object> argv) => TestStrictXUnionInStruct._(argv);
+}
+
+// See FIDL-308:
+// ignore: recursive_compile_time_constant
+const $fidl.StructType<TestStrictXUnionInStruct> kTestStrictXUnionInStruct_Type = $fidl.StructType<TestStrictXUnionInStruct>(
+ encodedSize: 24,
+ members: <$fidl.MemberType>[
+ $fidl.MemberType<SampleStrictXUnion>(type: kSampleStrictXUnion_Type, offset: 0),
+ ],
+ ctor: TestStrictXUnionInStruct._ctor,
+);
+
+
+class TestFlexibleXUnionInStruct extends $fidl.Struct {
+ const TestFlexibleXUnionInStruct({
+ @required this.xu,
+ });
+ TestFlexibleXUnionInStruct.clone(TestFlexibleXUnionInStruct $orig, {
+ SampleXUnion xu,
+ }) : this(
+ xu: xu ?? $orig.xu,
+ );
+
+
+
+
+ TestFlexibleXUnionInStruct._(List<Object> argv)
+ : xu = argv[0];
+ final SampleXUnion xu;
+
+ @override
+ List<Object> get $fields {
+ return <Object>[
+ xu,
+ ];
+ }
+
+ @override
+ String toString() {
+ // ignore: prefer_interpolation_to_compose_strings
+ return r'TestFlexibleXUnionInStruct' r'(xu: ' + xu.toString() + r')';
+ }
+
+ static TestFlexibleXUnionInStruct _ctor(List<Object> argv) => TestFlexibleXUnionInStruct._(argv);
+}
+
+// See FIDL-308:
+// ignore: recursive_compile_time_constant
+const $fidl.StructType<TestFlexibleXUnionInStruct> kTestFlexibleXUnionInStruct_Type = $fidl.StructType<TestFlexibleXUnionInStruct>(
+ encodedSize: 24,
+ members: <$fidl.MemberType>[
+ $fidl.MemberType<SampleXUnion>(type: kSampleXUnion_Type, offset: 0),
+ ],
+ ctor: TestFlexibleXUnionInStruct._ctor,
+);
+
+
class MyBool extends $fidl.Struct {
const MyBool({
@required this.value,
});
- MyBool.clone(
- MyBool $orig, {
- bool value,
+ MyBool.clone(MyBool $orig, {
+ bool value,
}) : this(
- value: value ?? $orig.value,
- );
+ value: value ?? $orig.value,
+ );
- MyBool._(List<Object> argv) : value = argv[0];
+
+
+
+ MyBool._(List<Object> argv)
+ : value = argv[0];
final bool value;
@override
@@ -716,18 +1882,22 @@
ctor: MyBool._ctor,
);
+
class MyByte extends $fidl.Struct {
const MyByte({
@required this.value,
});
- MyByte.clone(
- MyByte $orig, {
- int value,
+ MyByte.clone(MyByte $orig, {
+ int value,
}) : this(
- value: value ?? $orig.value,
- );
+ value: value ?? $orig.value,
+ );
- MyByte._(List<Object> argv) : value = argv[0];
+
+
+
+ MyByte._(List<Object> argv)
+ : value = argv[0];
final int value;
@override
@@ -756,18 +1926,22 @@
ctor: MyByte._ctor,
);
+
class MyInt8 extends $fidl.Struct {
const MyInt8({
@required this.value,
});
- MyInt8.clone(
- MyInt8 $orig, {
- int value,
+ MyInt8.clone(MyInt8 $orig, {
+ int value,
}) : this(
- value: value ?? $orig.value,
- );
+ value: value ?? $orig.value,
+ );
- MyInt8._(List<Object> argv) : value = argv[0];
+
+
+
+ MyInt8._(List<Object> argv)
+ : value = argv[0];
final int value;
@override
@@ -796,18 +1970,22 @@
ctor: MyInt8._ctor,
);
+
class MyInt16 extends $fidl.Struct {
const MyInt16({
@required this.value,
});
- MyInt16.clone(
- MyInt16 $orig, {
- int value,
+ MyInt16.clone(MyInt16 $orig, {
+ int value,
}) : this(
- value: value ?? $orig.value,
- );
+ value: value ?? $orig.value,
+ );
- MyInt16._(List<Object> argv) : value = argv[0];
+
+
+
+ MyInt16._(List<Object> argv)
+ : value = argv[0];
final int value;
@override
@@ -836,18 +2014,22 @@
ctor: MyInt16._ctor,
);
+
class MyInt32 extends $fidl.Struct {
const MyInt32({
@required this.value,
});
- MyInt32.clone(
- MyInt32 $orig, {
- int value,
+ MyInt32.clone(MyInt32 $orig, {
+ int value,
}) : this(
- value: value ?? $orig.value,
- );
+ value: value ?? $orig.value,
+ );
- MyInt32._(List<Object> argv) : value = argv[0];
+
+
+
+ MyInt32._(List<Object> argv)
+ : value = argv[0];
final int value;
@override
@@ -876,18 +2058,22 @@
ctor: MyInt32._ctor,
);
+
class MyInt64 extends $fidl.Struct {
const MyInt64({
@required this.value,
});
- MyInt64.clone(
- MyInt64 $orig, {
- int value,
+ MyInt64.clone(MyInt64 $orig, {
+ int value,
}) : this(
- value: value ?? $orig.value,
- );
+ value: value ?? $orig.value,
+ );
- MyInt64._(List<Object> argv) : value = argv[0];
+
+
+
+ MyInt64._(List<Object> argv)
+ : value = argv[0];
final int value;
@override
@@ -916,18 +2102,22 @@
ctor: MyInt64._ctor,
);
+
class MyUint8 extends $fidl.Struct {
const MyUint8({
@required this.value,
});
- MyUint8.clone(
- MyUint8 $orig, {
- int value,
+ MyUint8.clone(MyUint8 $orig, {
+ int value,
}) : this(
- value: value ?? $orig.value,
- );
+ value: value ?? $orig.value,
+ );
- MyUint8._(List<Object> argv) : value = argv[0];
+
+
+
+ MyUint8._(List<Object> argv)
+ : value = argv[0];
final int value;
@override
@@ -956,18 +2146,22 @@
ctor: MyUint8._ctor,
);
+
class MyUint16 extends $fidl.Struct {
const MyUint16({
@required this.value,
});
- MyUint16.clone(
- MyUint16 $orig, {
- int value,
+ MyUint16.clone(MyUint16 $orig, {
+ int value,
}) : this(
- value: value ?? $orig.value,
- );
+ value: value ?? $orig.value,
+ );
- MyUint16._(List<Object> argv) : value = argv[0];
+
+
+
+ MyUint16._(List<Object> argv)
+ : value = argv[0];
final int value;
@override
@@ -996,18 +2190,22 @@
ctor: MyUint16._ctor,
);
+
class MyUint32 extends $fidl.Struct {
const MyUint32({
@required this.value,
});
- MyUint32.clone(
- MyUint32 $orig, {
- int value,
+ MyUint32.clone(MyUint32 $orig, {
+ int value,
}) : this(
- value: value ?? $orig.value,
- );
+ value: value ?? $orig.value,
+ );
- MyUint32._(List<Object> argv) : value = argv[0];
+
+
+
+ MyUint32._(List<Object> argv)
+ : value = argv[0];
final int value;
@override
@@ -1036,18 +2234,22 @@
ctor: MyUint32._ctor,
);
+
class MyUint64 extends $fidl.Struct {
const MyUint64({
@required this.value,
});
- MyUint64.clone(
- MyUint64 $orig, {
- int value,
+ MyUint64.clone(MyUint64 $orig, {
+ int value,
}) : this(
- value: value ?? $orig.value,
- );
+ value: value ?? $orig.value,
+ );
- MyUint64._(List<Object> argv) : value = argv[0];
+
+
+
+ MyUint64._(List<Object> argv)
+ : value = argv[0];
final int value;
@override
@@ -1076,18 +2278,22 @@
ctor: MyUint64._ctor,
);
+
class MyFloat32 extends $fidl.Struct {
const MyFloat32({
@required this.value,
});
- MyFloat32.clone(
- MyFloat32 $orig, {
- double value,
+ MyFloat32.clone(MyFloat32 $orig, {
+ double value,
}) : this(
- value: value ?? $orig.value,
- );
+ value: value ?? $orig.value,
+ );
- MyFloat32._(List<Object> argv) : value = argv[0];
+
+
+
+ MyFloat32._(List<Object> argv)
+ : value = argv[0];
final double value;
@override
@@ -1116,18 +2322,22 @@
ctor: MyFloat32._ctor,
);
+
class MyFloat64 extends $fidl.Struct {
const MyFloat64({
@required this.value,
});
- MyFloat64.clone(
- MyFloat64 $orig, {
- double value,
+ MyFloat64.clone(MyFloat64 $orig, {
+ double value,
}) : this(
- value: value ?? $orig.value,
- );
+ value: value ?? $orig.value,
+ );
- MyFloat64._(List<Object> argv) : value = argv[0];
+
+
+
+ MyFloat64._(List<Object> argv)
+ : value = argv[0];
final double value;
@override
@@ -1156,1669 +2366,22 @@
ctor: MyFloat64._ctor,
);
-class ThreeByte extends $fidl.Struct {
- const ThreeByte({
- @required this.elem1,
- @required this.elem2,
- @required this.elem3,
- });
- ThreeByte.clone(
- ThreeByte $orig, {
- int elem1,
- int elem2,
- int elem3,
- }) : this(
- elem1: elem1 ?? $orig.elem1,
- elem2: elem2 ?? $orig.elem2,
- elem3: elem3 ?? $orig.elem3,
- );
-
- ThreeByte._(List<Object> argv)
- : elem1 = argv[0],
- elem2 = argv[1],
- elem3 = argv[2];
- final int elem1;
- final int elem2;
- final int elem3;
-
- @override
- List<Object> get $fields {
- return <Object>[
- elem1,
- elem2,
- elem3,
- ];
- }
-
- @override
- String toString() {
- // ignore: prefer_interpolation_to_compose_strings
- return r'ThreeByte' r'(elem1: ' +
- elem1.toString() +
- r', elem2: ' +
- elem2.toString() +
- r', elem3: ' +
- elem3.toString() +
- r')';
- }
-
- static ThreeByte _ctor(List<Object> argv) => ThreeByte._(argv);
-}
-
-// See FIDL-308:
-// ignore: recursive_compile_time_constant
-const $fidl.StructType<ThreeByte> kThreeByte_Type = $fidl.StructType<ThreeByte>(
- encodedSize: 3,
- members: <$fidl.MemberType>[
- $fidl.MemberType<int>(type: $fidl.Uint8Type(), offset: 0),
- $fidl.MemberType<int>(type: $fidl.Uint8Type(), offset: 1),
- $fidl.MemberType<int>(type: $fidl.Uint8Type(), offset: 2),
- ],
- ctor: ThreeByte._ctor,
-);
-
-class FiveByte extends $fidl.Struct {
- const FiveByte({
- @required this.elem1,
- @required this.elem2,
- });
- FiveByte.clone(
- FiveByte $orig, {
- int elem1,
- int elem2,
- }) : this(
- elem1: elem1 ?? $orig.elem1,
- elem2: elem2 ?? $orig.elem2,
- );
-
- FiveByte._(List<Object> argv)
- : elem1 = argv[0],
- elem2 = argv[1];
- final int elem1;
- final int elem2;
-
- @override
- List<Object> get $fields {
- return <Object>[
- elem1,
- elem2,
- ];
- }
-
- @override
- String toString() {
- // ignore: prefer_interpolation_to_compose_strings
- return r'FiveByte' r'(elem1: ' +
- elem1.toString() +
- r', elem2: ' +
- elem2.toString() +
- r')';
- }
-
- static FiveByte _ctor(List<Object> argv) => FiveByte._(argv);
-}
-
-// See FIDL-308:
-// ignore: recursive_compile_time_constant
-const $fidl.StructType<FiveByte> kFiveByte_Type = $fidl.StructType<FiveByte>(
- encodedSize: 8,
- members: <$fidl.MemberType>[
- $fidl.MemberType<int>(type: $fidl.Uint32Type(), offset: 0),
- $fidl.MemberType<int>(type: $fidl.Uint8Type(), offset: 4),
- ],
- ctor: FiveByte._ctor,
-);
-
-class ThreeByteInStruct extends $fidl.Struct {
- const ThreeByteInStruct({
- @required this.elem1,
- @required this.elem2,
- @required this.elem3,
- });
- ThreeByteInStruct.clone(
- ThreeByteInStruct $orig, {
- ThreeByte elem1,
- ThreeByte elem2,
- ThreeByte elem3,
- }) : this(
- elem1: elem1 ?? $orig.elem1,
- elem2: elem2 ?? $orig.elem2,
- elem3: elem3 ?? $orig.elem3,
- );
-
- ThreeByteInStruct._(List<Object> argv)
- : elem1 = argv[0],
- elem2 = argv[1],
- elem3 = argv[2];
- final ThreeByte elem1;
- final ThreeByte elem2;
- final ThreeByte elem3;
-
- @override
- List<Object> get $fields {
- return <Object>[
- elem1,
- elem2,
- elem3,
- ];
- }
-
- @override
- String toString() {
- // ignore: prefer_interpolation_to_compose_strings
- return r'ThreeByteInStruct' r'(elem1: ' +
- elem1.toString() +
- r', elem2: ' +
- elem2.toString() +
- r', elem3: ' +
- elem3.toString() +
- r')';
- }
-
- static ThreeByteInStruct _ctor(List<Object> argv) =>
- ThreeByteInStruct._(argv);
-}
-
-// See FIDL-308:
-// ignore: recursive_compile_time_constant
-const $fidl.StructType<ThreeByteInStruct> kThreeByteInStruct_Type =
- $fidl.StructType<ThreeByteInStruct>(
- encodedSize: 9,
- members: <$fidl.MemberType>[
- $fidl.MemberType<ThreeByte>(type: kThreeByte_Type, offset: 0),
- $fidl.MemberType<ThreeByte>(type: kThreeByte_Type, offset: 3),
- $fidl.MemberType<ThreeByte>(type: kThreeByte_Type, offset: 6),
- ],
- ctor: ThreeByteInStruct._ctor,
-);
-
-class FiveByteInStruct extends $fidl.Struct {
- const FiveByteInStruct({
- @required this.elem1,
- @required this.elem2,
- @required this.elem3,
- });
- FiveByteInStruct.clone(
- FiveByteInStruct $orig, {
- FiveByte elem1,
- FiveByte elem2,
- FiveByte elem3,
- }) : this(
- elem1: elem1 ?? $orig.elem1,
- elem2: elem2 ?? $orig.elem2,
- elem3: elem3 ?? $orig.elem3,
- );
-
- FiveByteInStruct._(List<Object> argv)
- : elem1 = argv[0],
- elem2 = argv[1],
- elem3 = argv[2];
- final FiveByte elem1;
- final FiveByte elem2;
- final FiveByte elem3;
-
- @override
- List<Object> get $fields {
- return <Object>[
- elem1,
- elem2,
- elem3,
- ];
- }
-
- @override
- String toString() {
- // ignore: prefer_interpolation_to_compose_strings
- return r'FiveByteInStruct' r'(elem1: ' +
- elem1.toString() +
- r', elem2: ' +
- elem2.toString() +
- r', elem3: ' +
- elem3.toString() +
- r')';
- }
-
- static FiveByteInStruct _ctor(List<Object> argv) => FiveByteInStruct._(argv);
-}
-
-// See FIDL-308:
-// ignore: recursive_compile_time_constant
-const $fidl.StructType<FiveByteInStruct> kFiveByteInStruct_Type =
- $fidl.StructType<FiveByteInStruct>(
- encodedSize: 24,
- members: <$fidl.MemberType>[
- $fidl.MemberType<FiveByte>(type: kFiveByte_Type, offset: 0),
- $fidl.MemberType<FiveByte>(type: kFiveByte_Type, offset: 8),
- $fidl.MemberType<FiveByte>(type: kFiveByte_Type, offset: 16),
- ],
- ctor: FiveByteInStruct._ctor,
-);
-
-class ThreeByteInVector extends $fidl.Struct {
- const ThreeByteInVector({
- @required this.elems,
- });
- ThreeByteInVector.clone(
- ThreeByteInVector $orig, {
- List<ThreeByte> elems,
- }) : this(
- elems: elems ?? $orig.elems,
- );
-
- ThreeByteInVector._(List<Object> argv) : elems = argv[0];
- final List<ThreeByte> elems;
-
- @override
- List<Object> get $fields {
- return <Object>[
- elems,
- ];
- }
-
- @override
- String toString() {
- // ignore: prefer_interpolation_to_compose_strings
- return r'ThreeByteInVector' r'(elems: ' + elems.toString() + r')';
- }
-
- static ThreeByteInVector _ctor(List<Object> argv) =>
- ThreeByteInVector._(argv);
-}
-
-// See FIDL-308:
-// ignore: recursive_compile_time_constant
-const $fidl.StructType<ThreeByteInVector> kThreeByteInVector_Type =
- $fidl.StructType<ThreeByteInVector>(
- encodedSize: 16,
- members: <$fidl.MemberType>[
- $fidl.MemberType<List<ThreeByte>>(
- type: $fidl.VectorType<List<ThreeByte>>(
- element: kThreeByte_Type, maybeElementCount: null, nullable: false),
- offset: 0),
- ],
- ctor: ThreeByteInVector._ctor,
-);
-
-class FiveByteInVector extends $fidl.Struct {
- const FiveByteInVector({
- @required this.elems,
- });
- FiveByteInVector.clone(
- FiveByteInVector $orig, {
- List<FiveByte> elems,
- }) : this(
- elems: elems ?? $orig.elems,
- );
-
- FiveByteInVector._(List<Object> argv) : elems = argv[0];
- final List<FiveByte> elems;
-
- @override
- List<Object> get $fields {
- return <Object>[
- elems,
- ];
- }
-
- @override
- String toString() {
- // ignore: prefer_interpolation_to_compose_strings
- return r'FiveByteInVector' r'(elems: ' + elems.toString() + r')';
- }
-
- static FiveByteInVector _ctor(List<Object> argv) => FiveByteInVector._(argv);
-}
-
-// See FIDL-308:
-// ignore: recursive_compile_time_constant
-const $fidl.StructType<FiveByteInVector> kFiveByteInVector_Type =
- $fidl.StructType<FiveByteInVector>(
- encodedSize: 16,
- members: <$fidl.MemberType>[
- $fidl.MemberType<List<FiveByte>>(
- type: $fidl.VectorType<List<FiveByte>>(
- element: kFiveByte_Type, maybeElementCount: null, nullable: false),
- offset: 0),
- ],
- ctor: FiveByteInVector._ctor,
-);
-
-class ThreeByteInArray extends $fidl.Struct {
- const ThreeByteInArray({
- @required this.elems,
- });
- ThreeByteInArray.clone(
- ThreeByteInArray $orig, {
- List<ThreeByte> elems,
- }) : this(
- elems: elems ?? $orig.elems,
- );
-
- ThreeByteInArray._(List<Object> argv) : elems = argv[0];
- final List<ThreeByte> elems;
-
- @override
- List<Object> get $fields {
- return <Object>[
- elems,
- ];
- }
-
- @override
- String toString() {
- // ignore: prefer_interpolation_to_compose_strings
- return r'ThreeByteInArray' r'(elems: ' + elems.toString() + r')';
- }
-
- static ThreeByteInArray _ctor(List<Object> argv) => ThreeByteInArray._(argv);
-}
-
-// See FIDL-308:
-// ignore: recursive_compile_time_constant
-const $fidl.StructType<ThreeByteInArray> kThreeByteInArray_Type =
- $fidl.StructType<ThreeByteInArray>(
- encodedSize: 9,
- members: <$fidl.MemberType>[
- $fidl.MemberType<List<ThreeByte>>(
- type: $fidl.ArrayType<List<ThreeByte>>(
- element: kThreeByte_Type, elementCount: 3),
- offset: 0),
- ],
- ctor: ThreeByteInArray._ctor,
-);
-
-class FiveByteInArray extends $fidl.Struct {
- const FiveByteInArray({
- @required this.elems,
- });
- FiveByteInArray.clone(
- FiveByteInArray $orig, {
- List<FiveByte> elems,
- }) : this(
- elems: elems ?? $orig.elems,
- );
-
- FiveByteInArray._(List<Object> argv) : elems = argv[0];
- final List<FiveByte> elems;
-
- @override
- List<Object> get $fields {
- return <Object>[
- elems,
- ];
- }
-
- @override
- String toString() {
- // ignore: prefer_interpolation_to_compose_strings
- return r'FiveByteInArray' r'(elems: ' + elems.toString() + r')';
- }
-
- static FiveByteInArray _ctor(List<Object> argv) => FiveByteInArray._(argv);
-}
-
-// See FIDL-308:
-// ignore: recursive_compile_time_constant
-const $fidl.StructType<FiveByteInArray> kFiveByteInArray_Type =
- $fidl.StructType<FiveByteInArray>(
- encodedSize: 24,
- members: <$fidl.MemberType>[
- $fidl.MemberType<List<FiveByte>>(
- type: $fidl.ArrayType<List<FiveByte>>(
- element: kFiveByte_Type, elementCount: 3),
- offset: 0),
- ],
- ctor: FiveByteInArray._ctor,
-);
-
-class Int64Struct extends $fidl.Struct {
- const Int64Struct({
- @required this.x,
- });
- Int64Struct.clone(
- Int64Struct $orig, {
- int x,
- }) : this(
- x: x ?? $orig.x,
- );
-
- Int64Struct._(List<Object> argv) : x = argv[0];
- final int x;
-
- @override
- List<Object> get $fields {
- return <Object>[
- x,
- ];
- }
-
- @override
- String toString() {
- // ignore: prefer_interpolation_to_compose_strings
- return r'Int64Struct' r'(x: ' + x.toString() + r')';
- }
-
- static Int64Struct _ctor(List<Object> argv) => Int64Struct._(argv);
-}
-
-// See FIDL-308:
-// ignore: recursive_compile_time_constant
-const $fidl.StructType<Int64Struct> kInt64Struct_Type =
- $fidl.StructType<Int64Struct>(
- encodedSize: 8,
- members: <$fidl.MemberType>[
- $fidl.MemberType<int>(type: $fidl.Int64Type(), offset: 0),
- ],
- ctor: Int64Struct._ctor,
-);
-
-class TestInlineXUnionInStruct extends $fidl.Struct {
- const TestInlineXUnionInStruct({
- @required this.before,
- @required this.xu,
- @required this.after,
- });
- TestInlineXUnionInStruct.clone(
- TestInlineXUnionInStruct $orig, {
- String before,
- SampleXUnion xu,
- String after,
- }) : this(
- before: before ?? $orig.before,
- xu: xu ?? $orig.xu,
- after: after ?? $orig.after,
- );
-
- TestInlineXUnionInStruct._(List<Object> argv)
- : before = argv[0],
- xu = argv[1],
- after = argv[2];
- final String before;
- final SampleXUnion xu;
- final String after;
-
- @override
- List<Object> get $fields {
- return <Object>[
- before,
- xu,
- after,
- ];
- }
-
- @override
- String toString() {
- // ignore: prefer_interpolation_to_compose_strings
- return r'TestInlineXUnionInStruct' r'(before: ' +
- before.toString() +
- r', xu: ' +
- xu.toString() +
- r', after: ' +
- after.toString() +
- r')';
- }
-
- static TestInlineXUnionInStruct _ctor(List<Object> argv) =>
- TestInlineXUnionInStruct._(argv);
-}
-
-// See FIDL-308:
-// ignore: recursive_compile_time_constant
-const $fidl.StructType<TestInlineXUnionInStruct>
- kTestInlineXUnionInStruct_Type = $fidl.StructType<TestInlineXUnionInStruct>(
- encodedSize: 56,
- members: <$fidl.MemberType>[
- $fidl.MemberType<String>(
- type: $fidl.StringType(maybeElementCount: null, nullable: false),
- offset: 0),
- $fidl.MemberType<SampleXUnion>(type: kSampleXUnion_Type, offset: 16),
- $fidl.MemberType<String>(
- type: $fidl.StringType(maybeElementCount: null, nullable: false),
- offset: 40),
- ],
- ctor: TestInlineXUnionInStruct._ctor,
-);
-
-class TestOptionalXUnionInStruct extends $fidl.Struct {
- const TestOptionalXUnionInStruct({
- @required this.before,
- this.xu,
- @required this.after,
- });
- TestOptionalXUnionInStruct.clone(
- TestOptionalXUnionInStruct $orig, {
- String before,
- SampleXUnion xu,
- String after,
- }) : this(
- before: before ?? $orig.before,
- xu: xu ?? $orig.xu,
- after: after ?? $orig.after,
- );
-
- TestOptionalXUnionInStruct.cloneWithout(
- TestOptionalXUnionInStruct $orig, {
- bool xu,
- }) : this(
- before: $orig.before,
- xu: xu ? null : $orig.xu,
- after: $orig.after,
- );
-
- TestOptionalXUnionInStruct._(List<Object> argv)
- : before = argv[0],
- xu = argv[1],
- after = argv[2];
- final String before;
- final SampleXUnion xu;
- final String after;
-
- @override
- List<Object> get $fields {
- return <Object>[
- before,
- xu,
- after,
- ];
- }
-
- @override
- String toString() {
- // ignore: prefer_interpolation_to_compose_strings
- return r'TestOptionalXUnionInStruct' r'(before: ' +
- before.toString() +
- r', xu: ' +
- xu.toString() +
- r', after: ' +
- after.toString() +
- r')';
- }
-
- static TestOptionalXUnionInStruct _ctor(List<Object> argv) =>
- TestOptionalXUnionInStruct._(argv);
-}
-
-// See FIDL-308:
-// ignore: recursive_compile_time_constant
-const $fidl.StructType<TestOptionalXUnionInStruct>
- kTestOptionalXUnionInStruct_Type =
- $fidl.StructType<TestOptionalXUnionInStruct>(
- encodedSize: 56,
- members: <$fidl.MemberType>[
- $fidl.MemberType<String>(
- type: $fidl.StringType(maybeElementCount: null, nullable: false),
- offset: 0),
- $fidl.MemberType<SampleXUnion>(type: kSampleXUnion_OptType, offset: 16),
- $fidl.MemberType<String>(
- type: $fidl.StringType(maybeElementCount: null, nullable: false),
- offset: 40),
- ],
- ctor: TestOptionalXUnionInStruct._ctor,
-);
-
-class TestStrictXUnionInStruct extends $fidl.Struct {
- const TestStrictXUnionInStruct({
- @required this.xu,
- });
- TestStrictXUnionInStruct.clone(
- TestStrictXUnionInStruct $orig, {
- SampleStrictXUnion xu,
- }) : this(
- xu: xu ?? $orig.xu,
- );
-
- TestStrictXUnionInStruct._(List<Object> argv) : xu = argv[0];
- final SampleStrictXUnion xu;
-
- @override
- List<Object> get $fields {
- return <Object>[
- xu,
- ];
- }
-
- @override
- String toString() {
- // ignore: prefer_interpolation_to_compose_strings
- return r'TestStrictXUnionInStruct' r'(xu: ' + xu.toString() + r')';
- }
-
- static TestStrictXUnionInStruct _ctor(List<Object> argv) =>
- TestStrictXUnionInStruct._(argv);
-}
-
-// See FIDL-308:
-// ignore: recursive_compile_time_constant
-const $fidl.StructType<TestStrictXUnionInStruct>
- kTestStrictXUnionInStruct_Type = $fidl.StructType<TestStrictXUnionInStruct>(
- encodedSize: 24,
- members: <$fidl.MemberType>[
- $fidl.MemberType<SampleStrictXUnion>(
- type: kSampleStrictXUnion_Type, offset: 0),
- ],
- ctor: TestStrictXUnionInStruct._ctor,
-);
-
-class TestFlexibleXUnionInStruct extends $fidl.Struct {
- const TestFlexibleXUnionInStruct({
- @required this.xu,
- });
- TestFlexibleXUnionInStruct.clone(
- TestFlexibleXUnionInStruct $orig, {
- SampleXUnion xu,
- }) : this(
- xu: xu ?? $orig.xu,
- );
-
- TestFlexibleXUnionInStruct._(List<Object> argv) : xu = argv[0];
- final SampleXUnion xu;
-
- @override
- List<Object> get $fields {
- return <Object>[
- xu,
- ];
- }
-
- @override
- String toString() {
- // ignore: prefer_interpolation_to_compose_strings
- return r'TestFlexibleXUnionInStruct' r'(xu: ' + xu.toString() + r')';
- }
-
- static TestFlexibleXUnionInStruct _ctor(List<Object> argv) =>
- TestFlexibleXUnionInStruct._(argv);
-}
-
-// See FIDL-308:
-// ignore: recursive_compile_time_constant
-const $fidl.StructType<TestFlexibleXUnionInStruct>
- kTestFlexibleXUnionInStruct_Type =
- $fidl.StructType<TestFlexibleXUnionInStruct>(
- encodedSize: 24,
- members: <$fidl.MemberType>[
- $fidl.MemberType<SampleXUnion>(type: kSampleXUnion_Type, offset: 0),
- ],
- ctor: TestFlexibleXUnionInStruct._ctor,
-);
-
-class Length2StringWrapper extends $fidl.Struct {
- const Length2StringWrapper({
- @required this.length2String,
- });
- Length2StringWrapper.clone(
- Length2StringWrapper $orig, {
- String length2String,
- }) : this(
- length2String: length2String ?? $orig.length2String,
- );
-
- Length2StringWrapper._(List<Object> argv) : length2String = argv[0];
- final String length2String;
-
- @override
- List<Object> get $fields {
- return <Object>[
- length2String,
- ];
- }
-
- @override
- String toString() {
- // ignore: prefer_interpolation_to_compose_strings
- return r'Length2StringWrapper' r'(length2String: ' +
- length2String.toString() +
- r')';
- }
-
- static Length2StringWrapper _ctor(List<Object> argv) =>
- Length2StringWrapper._(argv);
-}
-
-// See FIDL-308:
-// ignore: recursive_compile_time_constant
-const $fidl.StructType<Length2StringWrapper> kLength2StringWrapper_Type =
- $fidl.StructType<Length2StringWrapper>(
- encodedSize: 16,
- members: <$fidl.MemberType>[
- $fidl.MemberType<String>(
- type: $fidl.StringType(maybeElementCount: 2, nullable: false),
- offset: 0),
- ],
- ctor: Length2StringWrapper._ctor,
-);
-
-class StringWrapper extends $fidl.Struct {
- const StringWrapper({
- @required this.str,
- });
- StringWrapper.clone(
- StringWrapper $orig, {
- String str,
- }) : this(
- str: str ?? $orig.str,
- );
-
- StringWrapper._(List<Object> argv) : str = argv[0];
- final String str;
-
- @override
- List<Object> get $fields {
- return <Object>[
- str,
- ];
- }
-
- @override
- String toString() {
- // ignore: prefer_interpolation_to_compose_strings
- return r'StringWrapper' r'(str: ' + str.toString() + r')';
- }
-
- static StringWrapper _ctor(List<Object> argv) => StringWrapper._(argv);
-}
-
-// See FIDL-308:
-// ignore: recursive_compile_time_constant
-const $fidl.StructType<StringWrapper> kStringWrapper_Type =
- $fidl.StructType<StringWrapper>(
- encodedSize: 16,
- members: <$fidl.MemberType>[
- $fidl.MemberType<String>(
- type: $fidl.StringType(maybeElementCount: null, nullable: false),
- offset: 0),
- ],
- ctor: StringWrapper._ctor,
-);
-
-class StructWithOptionals extends $fidl.Struct {
- const StructWithOptionals({
- @required this.s,
- this.s2,
- @required this.t,
- @required this.xu,
- this.xu2,
- @required this.u,
- this.u2,
- });
- StructWithOptionals.clone(
- StructWithOptionals $orig, {
- EmptyStruct s,
- EmptyStruct s2,
- TableWithEmptyStruct t,
- XUnionWithEmptyStruct xu,
- XUnionWithEmptyStruct xu2,
- UnionWithEmptyStruct u,
- UnionWithEmptyStruct u2,
- }) : this(
- s: s ?? $orig.s,
- s2: s2 ?? $orig.s2,
- t: t ?? $orig.t,
- xu: xu ?? $orig.xu,
- xu2: xu2 ?? $orig.xu2,
- u: u ?? $orig.u,
- u2: u2 ?? $orig.u2,
- );
-
- StructWithOptionals.cloneWithout(
- StructWithOptionals $orig, {
- bool s2,
- bool xu2,
- bool u2,
- }) : this(
- s: $orig.s,
- s2: s2 ? null : $orig.s2,
- t: $orig.t,
- xu: $orig.xu,
- xu2: xu2 ? null : $orig.xu2,
- u: $orig.u,
- u2: u2 ? null : $orig.u2,
- );
-
- StructWithOptionals._(List<Object> argv)
- : s = argv[0],
- s2 = argv[1],
- t = argv[2],
- xu = argv[3],
- xu2 = argv[4],
- u = argv[5],
- u2 = argv[6];
- final EmptyStruct s;
- final EmptyStruct s2;
- final TableWithEmptyStruct t;
- final XUnionWithEmptyStruct xu;
- final XUnionWithEmptyStruct xu2;
- final UnionWithEmptyStruct u;
- final UnionWithEmptyStruct u2;
-
- @override
- List<Object> get $fields {
- return <Object>[
- s,
- s2,
- t,
- xu,
- xu2,
- u,
- u2,
- ];
- }
-
- @override
- String toString() {
- // ignore: prefer_interpolation_to_compose_strings
- return r'StructWithOptionals' r'(s: ' +
- s.toString() +
- r', s2: ' +
- s2.toString() +
- r', t: ' +
- t.toString() +
- r', xu: ' +
- xu.toString() +
- r', xu2: ' +
- xu2.toString() +
- r', u: ' +
- u.toString() +
- r', u2: ' +
- u2.toString() +
- r')';
- }
-
- static StructWithOptionals _ctor(List<Object> argv) =>
- StructWithOptionals._(argv);
-}
-
-// See FIDL-308:
-// ignore: recursive_compile_time_constant
-const $fidl.StructType<StructWithOptionals> kStructWithOptionals_Type =
- $fidl.StructType<StructWithOptionals>(
- encodedSize: 104,
- members: <$fidl.MemberType>[
- $fidl.MemberType<EmptyStruct>(type: kEmptyStruct_Type, offset: 0),
- $fidl.MemberType<EmptyStruct>(
- type: $fidl.PointerType<EmptyStruct>(element: kEmptyStruct_Type),
- offset: 8),
- $fidl.MemberType<TableWithEmptyStruct>(
- type: kTableWithEmptyStruct_Type, offset: 16),
- $fidl.MemberType<XUnionWithEmptyStruct>(
- type: kXUnionWithEmptyStruct_Type, offset: 32),
- $fidl.MemberType<XUnionWithEmptyStruct>(
- type: kXUnionWithEmptyStruct_OptType, offset: 56),
- $fidl.MemberType<UnionWithEmptyStruct>(
- type: kUnionWithEmptyStruct_Type, offset: 80),
- $fidl.MemberType<UnionWithEmptyStruct>(
- type: $fidl.PointerType<UnionWithEmptyStruct>(
- element: kUnionWithEmptyStruct_Type),
- offset: 96),
- ],
- ctor: StructWithOptionals._ctor,
-);
-
-class TestXUnionInTable extends $fidl.Struct {
- const TestXUnionInTable({
- @required this.value,
- });
- TestXUnionInTable.clone(
- TestXUnionInTable $orig, {
- XUnionInTable value,
- }) : this(
- value: value ?? $orig.value,
- );
-
- TestXUnionInTable._(List<Object> argv) : value = argv[0];
- final XUnionInTable value;
-
- @override
- List<Object> get $fields {
- return <Object>[
- value,
- ];
- }
-
- @override
- String toString() {
- // ignore: prefer_interpolation_to_compose_strings
- return r'TestXUnionInTable' r'(value: ' + value.toString() + r')';
- }
-
- static TestXUnionInTable _ctor(List<Object> argv) =>
- TestXUnionInTable._(argv);
-}
-
-// See FIDL-308:
-// ignore: recursive_compile_time_constant
-const $fidl.StructType<TestXUnionInTable> kTestXUnionInTable_Type =
- $fidl.StructType<TestXUnionInTable>(
- encodedSize: 16,
- members: <$fidl.MemberType>[
- $fidl.MemberType<XUnionInTable>(type: kXUnionInTable_Type, offset: 0),
- ],
- ctor: TestXUnionInTable._ctor,
-);
-
-class InterfaceConfig extends $fidl.Struct {
- const InterfaceConfig({
- @required this.name,
- @required this.ipAddressConfig,
- });
- InterfaceConfig.clone(
- InterfaceConfig $orig, {
- String name,
- IpAddressConfig ipAddressConfig,
- }) : this(
- name: name ?? $orig.name,
- ipAddressConfig: ipAddressConfig ?? $orig.ipAddressConfig,
- );
-
- InterfaceConfig._(List<Object> argv)
- : name = argv[0],
- ipAddressConfig = argv[1];
- final String name;
- final IpAddressConfig ipAddressConfig;
-
- @override
- List<Object> get $fields {
- return <Object>[
- name,
- ipAddressConfig,
- ];
- }
-
- @override
- String toString() {
- // ignore: prefer_interpolation_to_compose_strings
- return r'InterfaceConfig' r'(name: ' +
- name.toString() +
- r', ipAddressConfig: ' +
- ipAddressConfig.toString() +
- r')';
- }
-
- static InterfaceConfig _ctor(List<Object> argv) => InterfaceConfig._(argv);
-}
-
-// See FIDL-308:
-// ignore: recursive_compile_time_constant
-const $fidl.StructType<InterfaceConfig> kInterfaceConfig_Type =
- $fidl.StructType<InterfaceConfig>(
- encodedSize: 48,
- members: <$fidl.MemberType>[
- $fidl.MemberType<String>(
- type: $fidl.StringType(maybeElementCount: null, nullable: false),
- offset: 0),
- $fidl.MemberType<IpAddressConfig>(type: kIpAddressConfig_Type, offset: 16),
- ],
- ctor: InterfaceConfig._ctor,
-);
-
-class TestAddEthernetDeviceRequest extends $fidl.Struct {
- const TestAddEthernetDeviceRequest({
- @required this.topologicalPath,
- @required this.config,
- @required this.thisShouldBeAHandle,
- });
- TestAddEthernetDeviceRequest.clone(
- TestAddEthernetDeviceRequest $orig, {
- String topologicalPath,
- InterfaceConfig config,
- int thisShouldBeAHandle,
- }) : this(
- topologicalPath: topologicalPath ?? $orig.topologicalPath,
- config: config ?? $orig.config,
- thisShouldBeAHandle: thisShouldBeAHandle ?? $orig.thisShouldBeAHandle,
- );
-
- TestAddEthernetDeviceRequest._(List<Object> argv)
- : topologicalPath = argv[0],
- config = argv[1],
- thisShouldBeAHandle = argv[2];
- final String topologicalPath;
- final InterfaceConfig config;
- final int thisShouldBeAHandle;
-
- @override
- List<Object> get $fields {
- return <Object>[
- topologicalPath,
- config,
- thisShouldBeAHandle,
- ];
- }
-
- @override
- String toString() {
- // ignore: prefer_interpolation_to_compose_strings
- return r'TestAddEthernetDeviceRequest' r'(topologicalPath: ' +
- topologicalPath.toString() +
- r', config: ' +
- config.toString() +
- r', thisShouldBeAHandle: ' +
- thisShouldBeAHandle.toString() +
- r')';
- }
-
- static TestAddEthernetDeviceRequest _ctor(List<Object> argv) =>
- TestAddEthernetDeviceRequest._(argv);
-}
-
-// See FIDL-308:
-// ignore: recursive_compile_time_constant
-const $fidl.StructType<TestAddEthernetDeviceRequest>
- kTestAddEthernetDeviceRequest_Type =
- $fidl.StructType<TestAddEthernetDeviceRequest>(
- encodedSize: 72,
- members: <$fidl.MemberType>[
- $fidl.MemberType<String>(
- type: $fidl.StringType(maybeElementCount: null, nullable: false),
- offset: 0),
- $fidl.MemberType<InterfaceConfig>(type: kInterfaceConfig_Type, offset: 16),
- $fidl.MemberType<int>(type: $fidl.Uint32Type(), offset: 64),
- ],
- ctor: TestAddEthernetDeviceRequest._ctor,
-);
-
-class NodeAttributes extends $fidl.Struct {
- const NodeAttributes({
- @required this.mode,
- @required this.id,
- @required this.contentSize,
- @required this.storageSize,
- @required this.linkCount,
- @required this.creationTime,
- @required this.modificationTime,
- });
- NodeAttributes.clone(
- NodeAttributes $orig, {
- int mode,
- int id,
- int contentSize,
- int storageSize,
- int linkCount,
- int creationTime,
- int modificationTime,
- }) : this(
- mode: mode ?? $orig.mode,
- id: id ?? $orig.id,
- contentSize: contentSize ?? $orig.contentSize,
- storageSize: storageSize ?? $orig.storageSize,
- linkCount: linkCount ?? $orig.linkCount,
- creationTime: creationTime ?? $orig.creationTime,
- modificationTime: modificationTime ?? $orig.modificationTime,
- );
-
- NodeAttributes._(List<Object> argv)
- : mode = argv[0],
- id = argv[1],
- contentSize = argv[2],
- storageSize = argv[3],
- linkCount = argv[4],
- creationTime = argv[5],
- modificationTime = argv[6];
- final int mode;
- final int id;
- final int contentSize;
- final int storageSize;
- final int linkCount;
- final int creationTime;
- final int modificationTime;
-
- @override
- List<Object> get $fields {
- return <Object>[
- mode,
- id,
- contentSize,
- storageSize,
- linkCount,
- creationTime,
- modificationTime,
- ];
- }
-
- @override
- String toString() {
- // ignore: prefer_interpolation_to_compose_strings
- return r'NodeAttributes' r'(mode: ' +
- mode.toString() +
- r', id: ' +
- id.toString() +
- r', contentSize: ' +
- contentSize.toString() +
- r', storageSize: ' +
- storageSize.toString() +
- r', linkCount: ' +
- linkCount.toString() +
- r', creationTime: ' +
- creationTime.toString() +
- r', modificationTime: ' +
- modificationTime.toString() +
- r')';
- }
-
- static NodeAttributes _ctor(List<Object> argv) => NodeAttributes._(argv);
-}
-
-// See FIDL-308:
-// ignore: recursive_compile_time_constant
-const $fidl.StructType<NodeAttributes> kNodeAttributes_Type =
- $fidl.StructType<NodeAttributes>(
- encodedSize: 56,
- members: <$fidl.MemberType>[
- $fidl.MemberType<int>(type: $fidl.Uint32Type(), offset: 0),
- $fidl.MemberType<int>(type: $fidl.Uint64Type(), offset: 8),
- $fidl.MemberType<int>(type: $fidl.Uint64Type(), offset: 16),
- $fidl.MemberType<int>(type: $fidl.Uint64Type(), offset: 24),
- $fidl.MemberType<int>(type: $fidl.Uint64Type(), offset: 32),
- $fidl.MemberType<int>(type: $fidl.Uint64Type(), offset: 40),
- $fidl.MemberType<int>(type: $fidl.Uint64Type(), offset: 48),
- ],
- ctor: NodeAttributes._ctor,
-);
-
-class FileGetAttrResponse extends $fidl.Struct {
- const FileGetAttrResponse({
- @required this.s,
- @required this.attributes,
- });
- FileGetAttrResponse.clone(
- FileGetAttrResponse $orig, {
- int s,
- NodeAttributes attributes,
- }) : this(
- s: s ?? $orig.s,
- attributes: attributes ?? $orig.attributes,
- );
-
- FileGetAttrResponse._(List<Object> argv)
- : s = argv[0],
- attributes = argv[1];
- final int s;
- final NodeAttributes attributes;
-
- @override
- List<Object> get $fields {
- return <Object>[
- s,
- attributes,
- ];
- }
-
- @override
- String toString() {
- // ignore: prefer_interpolation_to_compose_strings
- return r'FileGetAttrResponse' r'(s: ' +
- s.toString() +
- r', attributes: ' +
- attributes.toString() +
- r')';
- }
-
- static FileGetAttrResponse _ctor(List<Object> argv) =>
- FileGetAttrResponse._(argv);
-}
-
-// See FIDL-308:
-// ignore: recursive_compile_time_constant
-const $fidl.StructType<FileGetAttrResponse> kFileGetAttrResponse_Type =
- $fidl.StructType<FileGetAttrResponse>(
- encodedSize: 64,
- members: <$fidl.MemberType>[
- $fidl.MemberType<int>(type: $fidl.Int32Type(), offset: 0),
- $fidl.MemberType<NodeAttributes>(type: kNodeAttributes_Type, offset: 8),
- ],
- ctor: FileGetAttrResponse._ctor,
-);
-
-class UnionWithBoundStringStruct extends $fidl.Struct {
- const UnionWithBoundStringStruct({
- @required this.v,
- });
- UnionWithBoundStringStruct.clone(
- UnionWithBoundStringStruct $orig, {
- UnionWithBoundString v,
- }) : this(
- v: v ?? $orig.v,
- );
-
- UnionWithBoundStringStruct._(List<Object> argv) : v = argv[0];
- final UnionWithBoundString v;
-
- @override
- List<Object> get $fields {
- return <Object>[
- v,
- ];
- }
-
- @override
- String toString() {
- // ignore: prefer_interpolation_to_compose_strings
- return r'UnionWithBoundStringStruct' r'(v: ' + v.toString() + r')';
- }
-
- static UnionWithBoundStringStruct _ctor(List<Object> argv) =>
- UnionWithBoundStringStruct._(argv);
-}
-
-// See FIDL-308:
-// ignore: recursive_compile_time_constant
-const $fidl.StructType<UnionWithBoundStringStruct>
- kUnionWithBoundStringStruct_Type =
- $fidl.StructType<UnionWithBoundStringStruct>(
- encodedSize: 24,
- members: <$fidl.MemberType>[
- $fidl.MemberType<UnionWithBoundString>(
- type: kUnionWithBoundString_Type, offset: 0),
- ],
- ctor: UnionWithBoundStringStruct._ctor,
-);
-
-class EmptyStruct extends $fidl.Struct {
- const EmptyStruct({
- this.reserved: 0x0,
- });
- EmptyStruct.clone(
- EmptyStruct $orig, {
- int reserved,
- }) : this(
- reserved: reserved ?? $orig.reserved,
- );
-
- EmptyStruct._(List<Object> argv) : reserved = argv[0];
- final int reserved;
-
- @override
- List<Object> get $fields {
- return <Object>[
- reserved,
- ];
- }
-
- @override
- String toString() {
- // ignore: prefer_interpolation_to_compose_strings
- return r'EmptyStruct' r'(reserved: ' + reserved.toString() + r')';
- }
-
- static EmptyStruct _ctor(List<Object> argv) => EmptyStruct._(argv);
-}
-
-// See FIDL-308:
-// ignore: recursive_compile_time_constant
-const $fidl.StructType<EmptyStruct> kEmptyStruct_Type =
- $fidl.StructType<EmptyStruct>(
- encodedSize: 1,
- members: <$fidl.MemberType>[
- $fidl.MemberType<int>(type: $fidl.Uint8Type(), offset: 0),
- ],
- ctor: EmptyStruct._ctor,
-);
-
-class EmptyStructSandwich extends $fidl.Struct {
- const EmptyStructSandwich({
- @required this.before,
- @required this.es,
- @required this.after,
- });
- EmptyStructSandwich.clone(
- EmptyStructSandwich $orig, {
- String before,
- EmptyStruct es,
- String after,
- }) : this(
- before: before ?? $orig.before,
- es: es ?? $orig.es,
- after: after ?? $orig.after,
- );
-
- EmptyStructSandwich._(List<Object> argv)
- : before = argv[0],
- es = argv[1],
- after = argv[2];
- final String before;
- final EmptyStruct es;
- final String after;
-
- @override
- List<Object> get $fields {
- return <Object>[
- before,
- es,
- after,
- ];
- }
-
- @override
- String toString() {
- // ignore: prefer_interpolation_to_compose_strings
- return r'EmptyStructSandwich' r'(before: ' +
- before.toString() +
- r', es: ' +
- es.toString() +
- r', after: ' +
- after.toString() +
- r')';
- }
-
- static EmptyStructSandwich _ctor(List<Object> argv) =>
- EmptyStructSandwich._(argv);
-}
-
-// See FIDL-308:
-// ignore: recursive_compile_time_constant
-const $fidl.StructType<EmptyStructSandwich> kEmptyStructSandwich_Type =
- $fidl.StructType<EmptyStructSandwich>(
- encodedSize: 40,
- members: <$fidl.MemberType>[
- $fidl.MemberType<String>(
- type: $fidl.StringType(maybeElementCount: null, nullable: false),
- offset: 0),
- $fidl.MemberType<EmptyStruct>(type: kEmptyStruct_Type, offset: 16),
- $fidl.MemberType<String>(
- type: $fidl.StringType(maybeElementCount: null, nullable: false),
- offset: 24),
- ],
- ctor: EmptyStructSandwich._ctor,
-);
-
-class Uint8Uint16Uint32Uint64 extends $fidl.Struct {
- const Uint8Uint16Uint32Uint64({
- @required this.f1,
- @required this.f2,
- @required this.f3,
- @required this.f4,
- });
- Uint8Uint16Uint32Uint64.clone(
- Uint8Uint16Uint32Uint64 $orig, {
- int f1,
- int f2,
- int f3,
- int f4,
- }) : this(
- f1: f1 ?? $orig.f1,
- f2: f2 ?? $orig.f2,
- f3: f3 ?? $orig.f3,
- f4: f4 ?? $orig.f4,
- );
-
- Uint8Uint16Uint32Uint64._(List<Object> argv)
- : f1 = argv[0],
- f2 = argv[1],
- f3 = argv[2],
- f4 = argv[3];
- final int f1;
- final int f2;
- final int f3;
- final int f4;
-
- @override
- List<Object> get $fields {
- return <Object>[
- f1,
- f2,
- f3,
- f4,
- ];
- }
-
- @override
- String toString() {
- // ignore: prefer_interpolation_to_compose_strings
- return r'Uint8Uint16Uint32Uint64' r'(f1: ' +
- f1.toString() +
- r', f2: ' +
- f2.toString() +
- r', f3: ' +
- f3.toString() +
- r', f4: ' +
- f4.toString() +
- r')';
- }
-
- static Uint8Uint16Uint32Uint64 _ctor(List<Object> argv) =>
- Uint8Uint16Uint32Uint64._(argv);
-}
-
-// See FIDL-308:
-// ignore: recursive_compile_time_constant
-const $fidl.StructType<Uint8Uint16Uint32Uint64> kUint8Uint16Uint32Uint64_Type =
- $fidl.StructType<Uint8Uint16Uint32Uint64>(
- encodedSize: 16,
- members: <$fidl.MemberType>[
- $fidl.MemberType<int>(type: $fidl.Uint8Type(), offset: 0),
- $fidl.MemberType<int>(type: $fidl.Uint16Type(), offset: 2),
- $fidl.MemberType<int>(type: $fidl.Uint32Type(), offset: 4),
- $fidl.MemberType<int>(type: $fidl.Uint64Type(), offset: 8),
- ],
- ctor: Uint8Uint16Uint32Uint64._ctor,
-);
-
-class Uint64Uint32Uint16Uint8 extends $fidl.Struct {
- const Uint64Uint32Uint16Uint8({
- @required this.f1,
- @required this.f2,
- @required this.f3,
- @required this.f4,
- });
- Uint64Uint32Uint16Uint8.clone(
- Uint64Uint32Uint16Uint8 $orig, {
- int f1,
- int f2,
- int f3,
- int f4,
- }) : this(
- f1: f1 ?? $orig.f1,
- f2: f2 ?? $orig.f2,
- f3: f3 ?? $orig.f3,
- f4: f4 ?? $orig.f4,
- );
-
- Uint64Uint32Uint16Uint8._(List<Object> argv)
- : f1 = argv[0],
- f2 = argv[1],
- f3 = argv[2],
- f4 = argv[3];
- final int f1;
- final int f2;
- final int f3;
- final int f4;
-
- @override
- List<Object> get $fields {
- return <Object>[
- f1,
- f2,
- f3,
- f4,
- ];
- }
-
- @override
- String toString() {
- // ignore: prefer_interpolation_to_compose_strings
- return r'Uint64Uint32Uint16Uint8' r'(f1: ' +
- f1.toString() +
- r', f2: ' +
- f2.toString() +
- r', f3: ' +
- f3.toString() +
- r', f4: ' +
- f4.toString() +
- r')';
- }
-
- static Uint64Uint32Uint16Uint8 _ctor(List<Object> argv) =>
- Uint64Uint32Uint16Uint8._(argv);
-}
-
-// See FIDL-308:
-// ignore: recursive_compile_time_constant
-const $fidl.StructType<Uint64Uint32Uint16Uint8> kUint64Uint32Uint16Uint8_Type =
- $fidl.StructType<Uint64Uint32Uint16Uint8>(
- encodedSize: 16,
- members: <$fidl.MemberType>[
- $fidl.MemberType<int>(type: $fidl.Uint64Type(), offset: 0),
- $fidl.MemberType<int>(type: $fidl.Uint32Type(), offset: 8),
- $fidl.MemberType<int>(type: $fidl.Uint16Type(), offset: 12),
- $fidl.MemberType<int>(type: $fidl.Uint8Type(), offset: 14),
- ],
- ctor: Uint64Uint32Uint16Uint8._ctor,
-);
-
-class StructOfSimpleTable extends $fidl.Struct {
- const StructOfSimpleTable({
- @required this.table,
- });
- StructOfSimpleTable.clone(
- StructOfSimpleTable $orig, {
- SimpleTable table,
- }) : this(
- table: table ?? $orig.table,
- );
-
- StructOfSimpleTable._(List<Object> argv) : table = argv[0];
- final SimpleTable table;
-
- @override
- List<Object> get $fields {
- return <Object>[
- table,
- ];
- }
-
- @override
- String toString() {
- // ignore: prefer_interpolation_to_compose_strings
- return r'StructOfSimpleTable' r'(table: ' + table.toString() + r')';
- }
-
- static StructOfSimpleTable _ctor(List<Object> argv) =>
- StructOfSimpleTable._(argv);
-}
-
-// See FIDL-308:
-// ignore: recursive_compile_time_constant
-const $fidl.StructType<StructOfSimpleTable> kStructOfSimpleTable_Type =
- $fidl.StructType<StructOfSimpleTable>(
- encodedSize: 16,
- members: <$fidl.MemberType>[
- $fidl.MemberType<SimpleTable>(type: kSimpleTable_Type, offset: 0),
- ],
- ctor: StructOfSimpleTable._ctor,
-);
-
-class SimpleTableThenUint64 extends $fidl.Struct {
- const SimpleTableThenUint64({
- @required this.table,
- @required this.number,
- });
- SimpleTableThenUint64.clone(
- SimpleTableThenUint64 $orig, {
- SimpleTable table,
- int number,
- }) : this(
- table: table ?? $orig.table,
- number: number ?? $orig.number,
- );
-
- SimpleTableThenUint64._(List<Object> argv)
- : table = argv[0],
- number = argv[1];
- final SimpleTable table;
- final int number;
-
- @override
- List<Object> get $fields {
- return <Object>[
- table,
- number,
- ];
- }
-
- @override
- String toString() {
- // ignore: prefer_interpolation_to_compose_strings
- return r'SimpleTableThenUint64' r'(table: ' +
- table.toString() +
- r', number: ' +
- number.toString() +
- r')';
- }
-
- static SimpleTableThenUint64 _ctor(List<Object> argv) =>
- SimpleTableThenUint64._(argv);
-}
-
-// See FIDL-308:
-// ignore: recursive_compile_time_constant
-const $fidl.StructType<SimpleTableThenUint64> kSimpleTableThenUint64_Type =
- $fidl.StructType<SimpleTableThenUint64>(
- encodedSize: 24,
- members: <$fidl.MemberType>[
- $fidl.MemberType<SimpleTable>(type: kSimpleTable_Type, offset: 0),
- $fidl.MemberType<int>(type: $fidl.Uint64Type(), offset: 16),
- ],
- ctor: SimpleTableThenUint64._ctor,
-);
-
-class StructOfTableWithStringAndVector extends $fidl.Struct {
- const StructOfTableWithStringAndVector({
- @required this.table,
- });
- StructOfTableWithStringAndVector.clone(
- StructOfTableWithStringAndVector $orig, {
- TableWithStringAndVector table,
- }) : this(
- table: table ?? $orig.table,
- );
-
- StructOfTableWithStringAndVector._(List<Object> argv) : table = argv[0];
- final TableWithStringAndVector table;
-
- @override
- List<Object> get $fields {
- return <Object>[
- table,
- ];
- }
-
- @override
- String toString() {
- // ignore: prefer_interpolation_to_compose_strings
- return r'StructOfTableWithStringAndVector' r'(table: ' +
- table.toString() +
- r')';
- }
-
- static StructOfTableWithStringAndVector _ctor(List<Object> argv) =>
- StructOfTableWithStringAndVector._(argv);
-}
-
-// See FIDL-308:
-// ignore: recursive_compile_time_constant
-const $fidl.StructType<StructOfTableWithStringAndVector>
- kStructOfTableWithStringAndVector_Type =
- $fidl.StructType<StructOfTableWithStringAndVector>(
- encodedSize: 16,
- members: <$fidl.MemberType>[
- $fidl.MemberType<TableWithStringAndVector>(
- type: kTableWithStringAndVector_Type, offset: 0),
- ],
- ctor: StructOfTableWithStringAndVector._ctor,
-);
class StructWithInt extends $fidl.Struct {
const StructWithInt({
@required this.x,
});
- StructWithInt.clone(
- StructWithInt $orig, {
- int x,
+ StructWithInt.clone(StructWithInt $orig, {
+ int x,
}) : this(
- x: x ?? $orig.x,
- );
+ x: x ?? $orig.x,
+ );
- StructWithInt._(List<Object> argv) : x = argv[0];
+
+
+
+ StructWithInt._(List<Object> argv)
+ : x = argv[0];
final int x;
@override
@@ -2839,8 +2402,7 @@
// See FIDL-308:
// ignore: recursive_compile_time_constant
-const $fidl.StructType<StructWithInt> kStructWithInt_Type =
- $fidl.StructType<StructWithInt>(
+const $fidl.StructType<StructWithInt> kStructWithInt_Type = $fidl.StructType<StructWithInt>(
encodedSize: 4,
members: <$fidl.MemberType>[
$fidl.MemberType<int>(type: $fidl.Int32Type(), offset: 0),
@@ -2848,6 +2410,7 @@
ctor: StructWithInt._ctor,
);
+
class StructWithArrays extends $fidl.Struct {
const StructWithArrays({
@required this.arrInt,
@@ -2857,30 +2420,32 @@
@required this.arrNullableStruct,
@required this.arrArrInt,
});
- StructWithArrays.clone(
- StructWithArrays $orig, {
- Int32List arrInt,
- List<String> arrString,
- List<String> arrNullableString,
- List<StructWithInt> arrStruct,
- List<StructWithInt> arrNullableStruct,
- List<Int32List> arrArrInt,
+ StructWithArrays.clone(StructWithArrays $orig, {
+ Int32List arrInt,
+ List<String> arrString,
+ List<String> arrNullableString,
+ List<StructWithInt> arrStruct,
+ List<StructWithInt> arrNullableStruct,
+ List<Int32List> arrArrInt,
}) : this(
- arrInt: arrInt ?? $orig.arrInt,
- arrString: arrString ?? $orig.arrString,
- arrNullableString: arrNullableString ?? $orig.arrNullableString,
- arrStruct: arrStruct ?? $orig.arrStruct,
- arrNullableStruct: arrNullableStruct ?? $orig.arrNullableStruct,
- arrArrInt: arrArrInt ?? $orig.arrArrInt,
- );
+ arrInt: arrInt ?? $orig.arrInt,
+ arrString: arrString ?? $orig.arrString,
+ arrNullableString: arrNullableString ?? $orig.arrNullableString,
+ arrStruct: arrStruct ?? $orig.arrStruct,
+ arrNullableStruct: arrNullableStruct ?? $orig.arrNullableStruct,
+ arrArrInt: arrArrInt ?? $orig.arrArrInt,
+ );
+
+
+
StructWithArrays._(List<Object> argv)
- : arrInt = argv[0],
- arrString = argv[1],
- arrNullableString = argv[2],
- arrStruct = argv[3],
- arrNullableStruct = argv[4],
- arrArrInt = argv[5];
+ : arrInt = argv[0],
+ arrString = argv[1],
+ arrNullableString = argv[2],
+ arrStruct = argv[3],
+ arrNullableStruct = argv[4],
+ arrArrInt = argv[5];
final Int32List arrInt;
final List<String> arrString;
final List<String> arrNullableString;
@@ -2903,19 +2468,7 @@
@override
String toString() {
// ignore: prefer_interpolation_to_compose_strings
- return r'StructWithArrays' r'(arrInt: ' +
- arrInt.toString() +
- r', arrString: ' +
- arrString.toString() +
- r', arrNullableString: ' +
- arrNullableString.toString() +
- r', arrStruct: ' +
- arrStruct.toString() +
- r', arrNullableStruct: ' +
- arrNullableStruct.toString() +
- r', arrArrInt: ' +
- arrArrInt.toString() +
- r')';
+ return r'StructWithArrays' r'(arrInt: ' + arrInt.toString() + r', arrString: ' + arrString.toString() + r', arrNullableString: ' + arrNullableString.toString() + r', arrStruct: ' + arrStruct.toString() + r', arrNullableStruct: ' + arrNullableStruct.toString() + r', arrArrInt: ' + arrArrInt.toString() + r')';
}
static StructWithArrays _ctor(List<Object> argv) => StructWithArrays._(argv);
@@ -2923,44 +2476,20 @@
// See FIDL-308:
// ignore: recursive_compile_time_constant
-const $fidl.StructType<StructWithArrays> kStructWithArrays_Type =
- $fidl.StructType<StructWithArrays>(
+const $fidl.StructType<StructWithArrays> kStructWithArrays_Type = $fidl.StructType<StructWithArrays>(
encodedSize: 120,
members: <$fidl.MemberType>[
- $fidl.MemberType<Int32List>(
- type: $fidl.ArrayType<Int32List>(
- element: $fidl.Int32Type(), elementCount: 2),
- offset: 0),
- $fidl.MemberType<List<String>>(
- type: $fidl.ArrayType<List<String>>(
- element: $fidl.StringType(maybeElementCount: null, nullable: false),
- elementCount: 2),
- offset: 8),
- $fidl.MemberType<List<String>>(
- type: $fidl.ArrayType<List<String>>(
- element: $fidl.StringType(maybeElementCount: null, nullable: true),
- elementCount: 2),
- offset: 40),
- $fidl.MemberType<List<StructWithInt>>(
- type: $fidl.ArrayType<List<StructWithInt>>(
- element: kStructWithInt_Type, elementCount: 2),
- offset: 72),
- $fidl.MemberType<List<StructWithInt>>(
- type: $fidl.ArrayType<List<StructWithInt>>(
- element:
- $fidl.PointerType<StructWithInt>(element: kStructWithInt_Type),
- elementCount: 2),
- offset: 80),
- $fidl.MemberType<List<Int32List>>(
- type: $fidl.ArrayType<List<Int32List>>(
- element: $fidl.ArrayType<Int32List>(
- element: $fidl.Int32Type(), elementCount: 3),
- elementCount: 2),
- offset: 96),
+ $fidl.MemberType<Int32List>(type: $fidl.ArrayType<Int32List>(element: $fidl.Int32Type(), elementCount: 2), offset: 0),
+ $fidl.MemberType<List<String>>(type: $fidl.ArrayType<List<String>>(element: $fidl.StringType(maybeElementCount: null, nullable: false), elementCount: 2), offset: 8),
+ $fidl.MemberType<List<String>>(type: $fidl.ArrayType<List<String>>(element: $fidl.StringType(maybeElementCount: null, nullable: true), elementCount: 2), offset: 40),
+ $fidl.MemberType<List<StructWithInt>>(type: $fidl.ArrayType<List<StructWithInt>>(element: kStructWithInt_Type, elementCount: 2), offset: 72),
+ $fidl.MemberType<List<StructWithInt>>(type: $fidl.ArrayType<List<StructWithInt>>(element: $fidl.PointerType<StructWithInt>(element: kStructWithInt_Type), elementCount: 2), offset: 80),
+ $fidl.MemberType<List<Int32List>>(type: $fidl.ArrayType<List<Int32List>>(element: $fidl.ArrayType<Int32List>(element: $fidl.Int32Type(), elementCount: 3), elementCount: 2), offset: 96),
],
ctor: StructWithArrays._ctor,
);
+
class StructWithVectors extends $fidl.Struct {
const StructWithVectors({
@required this.vecEmpty,
@@ -2971,33 +2500,35 @@
@required this.vecNullableStruct,
@required this.vecVecInt,
});
- StructWithVectors.clone(
- StructWithVectors $orig, {
- Int32List vecEmpty,
- Int32List vecInt,
- List<String> vecString,
- List<String> vecNullableString,
- List<StructWithInt> vecStruct,
- List<StructWithInt> vecNullableStruct,
- List<Int32List> vecVecInt,
+ StructWithVectors.clone(StructWithVectors $orig, {
+ Int32List vecEmpty,
+ Int32List vecInt,
+ List<String> vecString,
+ List<String> vecNullableString,
+ List<StructWithInt> vecStruct,
+ List<StructWithInt> vecNullableStruct,
+ List<Int32List> vecVecInt,
}) : this(
- vecEmpty: vecEmpty ?? $orig.vecEmpty,
- vecInt: vecInt ?? $orig.vecInt,
- vecString: vecString ?? $orig.vecString,
- vecNullableString: vecNullableString ?? $orig.vecNullableString,
- vecStruct: vecStruct ?? $orig.vecStruct,
- vecNullableStruct: vecNullableStruct ?? $orig.vecNullableStruct,
- vecVecInt: vecVecInt ?? $orig.vecVecInt,
- );
+ vecEmpty: vecEmpty ?? $orig.vecEmpty,
+ vecInt: vecInt ?? $orig.vecInt,
+ vecString: vecString ?? $orig.vecString,
+ vecNullableString: vecNullableString ?? $orig.vecNullableString,
+ vecStruct: vecStruct ?? $orig.vecStruct,
+ vecNullableStruct: vecNullableStruct ?? $orig.vecNullableStruct,
+ vecVecInt: vecVecInt ?? $orig.vecVecInt,
+ );
+
+
+
StructWithVectors._(List<Object> argv)
- : vecEmpty = argv[0],
- vecInt = argv[1],
- vecString = argv[2],
- vecNullableString = argv[3],
- vecStruct = argv[4],
- vecNullableStruct = argv[5],
- vecVecInt = argv[6];
+ : vecEmpty = argv[0],
+ vecInt = argv[1],
+ vecString = argv[2],
+ vecNullableString = argv[3],
+ vecStruct = argv[4],
+ vecNullableStruct = argv[5],
+ vecVecInt = argv[6];
final Int32List vecEmpty;
final Int32List vecInt;
final List<String> vecString;
@@ -3022,106 +2553,428 @@
@override
String toString() {
// ignore: prefer_interpolation_to_compose_strings
- return r'StructWithVectors' r'(vecEmpty: ' +
- vecEmpty.toString() +
- r', vecInt: ' +
- vecInt.toString() +
- r', vecString: ' +
- vecString.toString() +
- r', vecNullableString: ' +
- vecNullableString.toString() +
- r', vecStruct: ' +
- vecStruct.toString() +
- r', vecNullableStruct: ' +
- vecNullableStruct.toString() +
- r', vecVecInt: ' +
- vecVecInt.toString() +
- r')';
+ return r'StructWithVectors' r'(vecEmpty: ' + vecEmpty.toString() + r', vecInt: ' + vecInt.toString() + r', vecString: ' + vecString.toString() + r', vecNullableString: ' + vecNullableString.toString() + r', vecStruct: ' + vecStruct.toString() + r', vecNullableStruct: ' + vecNullableStruct.toString() + r', vecVecInt: ' + vecVecInt.toString() + r')';
}
- static StructWithVectors _ctor(List<Object> argv) =>
- StructWithVectors._(argv);
+ static StructWithVectors _ctor(List<Object> argv) => StructWithVectors._(argv);
}
// See FIDL-308:
// ignore: recursive_compile_time_constant
-const $fidl.StructType<StructWithVectors> kStructWithVectors_Type =
- $fidl.StructType<StructWithVectors>(
+const $fidl.StructType<StructWithVectors> kStructWithVectors_Type = $fidl.StructType<StructWithVectors>(
encodedSize: 112,
members: <$fidl.MemberType>[
- $fidl.MemberType<Int32List>(
- type: $fidl.VectorType<Int32List>(
- element: $fidl.Int32Type(),
- maybeElementCount: null,
- nullable: false),
- offset: 0),
- $fidl.MemberType<Int32List>(
- type: $fidl.VectorType<Int32List>(
- element: $fidl.Int32Type(),
- maybeElementCount: null,
- nullable: false),
- offset: 16),
- $fidl.MemberType<List<String>>(
- type: $fidl.VectorType<List<String>>(
- element: $fidl.StringType(maybeElementCount: null, nullable: false),
- maybeElementCount: null,
- nullable: false),
- offset: 32),
- $fidl.MemberType<List<String>>(
- type: $fidl.VectorType<List<String>>(
- element: $fidl.StringType(maybeElementCount: null, nullable: true),
- maybeElementCount: null,
- nullable: false),
- offset: 48),
- $fidl.MemberType<List<StructWithInt>>(
- type: $fidl.VectorType<List<StructWithInt>>(
- element: kStructWithInt_Type,
- maybeElementCount: null,
- nullable: false),
- offset: 64),
- $fidl.MemberType<List<StructWithInt>>(
- type: $fidl.VectorType<List<StructWithInt>>(
- element:
- $fidl.PointerType<StructWithInt>(element: kStructWithInt_Type),
- maybeElementCount: null,
- nullable: false),
- offset: 80),
- $fidl.MemberType<List<Int32List>>(
- type: $fidl.VectorType<List<Int32List>>(
- element: $fidl.VectorType<Int32List>(
- element: $fidl.Int32Type(),
- maybeElementCount: null,
- nullable: false),
- maybeElementCount: null,
- nullable: false),
- offset: 96),
+ $fidl.MemberType<Int32List>(type: $fidl.VectorType<Int32List>(element: $fidl.Int32Type(), maybeElementCount: null, nullable: false), offset: 0),
+ $fidl.MemberType<Int32List>(type: $fidl.VectorType<Int32List>(element: $fidl.Int32Type(), maybeElementCount: null, nullable: false), offset: 16),
+ $fidl.MemberType<List<String>>(type: $fidl.VectorType<List<String>>(element: $fidl.StringType(maybeElementCount: null, nullable: false), maybeElementCount: null, nullable: false), offset: 32),
+ $fidl.MemberType<List<String>>(type: $fidl.VectorType<List<String>>(element: $fidl.StringType(maybeElementCount: null, nullable: true), maybeElementCount: null, nullable: false), offset: 48),
+ $fidl.MemberType<List<StructWithInt>>(type: $fidl.VectorType<List<StructWithInt>>(element: kStructWithInt_Type, maybeElementCount: null, nullable: false), offset: 64),
+ $fidl.MemberType<List<StructWithInt>>(type: $fidl.VectorType<List<StructWithInt>>(element: $fidl.PointerType<StructWithInt>(element: kStructWithInt_Type), maybeElementCount: null, nullable: false), offset: 80),
+ $fidl.MemberType<List<Int32List>>(type: $fidl.VectorType<List<Int32List>>(element: $fidl.VectorType<Int32List>(element: $fidl.Int32Type(), maybeElementCount: null, nullable: false), maybeElementCount: null, nullable: false), offset: 96),
],
ctor: StructWithVectors._ctor,
);
+
+class Length2StringWrapper extends $fidl.Struct {
+ const Length2StringWrapper({
+ @required this.length2String,
+ });
+ Length2StringWrapper.clone(Length2StringWrapper $orig, {
+ String length2String,
+ }) : this(
+ length2String: length2String ?? $orig.length2String,
+ );
+
+
+
+
+ Length2StringWrapper._(List<Object> argv)
+ : length2String = argv[0];
+ final String length2String;
+
+ @override
+ List<Object> get $fields {
+ return <Object>[
+ length2String,
+ ];
+ }
+
+ @override
+ String toString() {
+ // ignore: prefer_interpolation_to_compose_strings
+ return r'Length2StringWrapper' r'(length2String: ' + length2String.toString() + r')';
+ }
+
+ static Length2StringWrapper _ctor(List<Object> argv) => Length2StringWrapper._(argv);
+}
+
+// See FIDL-308:
+// ignore: recursive_compile_time_constant
+const $fidl.StructType<Length2StringWrapper> kLength2StringWrapper_Type = $fidl.StructType<Length2StringWrapper>(
+ encodedSize: 16,
+ members: <$fidl.MemberType>[
+ $fidl.MemberType<String>(type: $fidl.StringType(maybeElementCount: 2, nullable: false), offset: 0),
+ ],
+ ctor: Length2StringWrapper._ctor,
+);
+
+
+class StringWrapper extends $fidl.Struct {
+ const StringWrapper({
+ @required this.str,
+ });
+ StringWrapper.clone(StringWrapper $orig, {
+ String str,
+ }) : this(
+ str: str ?? $orig.str,
+ );
+
+
+
+
+ StringWrapper._(List<Object> argv)
+ : str = argv[0];
+ final String str;
+
+ @override
+ List<Object> get $fields {
+ return <Object>[
+ str,
+ ];
+ }
+
+ @override
+ String toString() {
+ // ignore: prefer_interpolation_to_compose_strings
+ return r'StringWrapper' r'(str: ' + str.toString() + r')';
+ }
+
+ static StringWrapper _ctor(List<Object> argv) => StringWrapper._(argv);
+}
+
+// See FIDL-308:
+// ignore: recursive_compile_time_constant
+const $fidl.StructType<StringWrapper> kStringWrapper_Type = $fidl.StructType<StringWrapper>(
+ encodedSize: 16,
+ members: <$fidl.MemberType>[
+ $fidl.MemberType<String>(type: $fidl.StringType(maybeElementCount: null, nullable: false), offset: 0),
+ ],
+ ctor: StringWrapper._ctor,
+);
+
+
+class TestXUnionInTable extends $fidl.Struct {
+ const TestXUnionInTable({
+ @required this.value,
+ });
+ TestXUnionInTable.clone(TestXUnionInTable $orig, {
+ XUnionInTable value,
+ }) : this(
+ value: value ?? $orig.value,
+ );
+
+
+
+
+ TestXUnionInTable._(List<Object> argv)
+ : value = argv[0];
+ final XUnionInTable value;
+
+ @override
+ List<Object> get $fields {
+ return <Object>[
+ value,
+ ];
+ }
+
+ @override
+ String toString() {
+ // ignore: prefer_interpolation_to_compose_strings
+ return r'TestXUnionInTable' r'(value: ' + value.toString() + r')';
+ }
+
+ static TestXUnionInTable _ctor(List<Object> argv) => TestXUnionInTable._(argv);
+}
+
+// See FIDL-308:
+// ignore: recursive_compile_time_constant
+const $fidl.StructType<TestXUnionInTable> kTestXUnionInTable_Type = $fidl.StructType<TestXUnionInTable>(
+ encodedSize: 16,
+ members: <$fidl.MemberType>[
+ $fidl.MemberType<XUnionInTable>(type: kXUnionInTable_Type, offset: 0),
+ ],
+ ctor: TestXUnionInTable._ctor,
+);
+
+
+class InterfaceConfig extends $fidl.Struct {
+ const InterfaceConfig({
+ @required this.name,
+ @required this.ipAddressConfig,
+ });
+ InterfaceConfig.clone(InterfaceConfig $orig, {
+ String name,
+ IpAddressConfig ipAddressConfig,
+ }) : this(
+ name: name ?? $orig.name,
+ ipAddressConfig: ipAddressConfig ?? $orig.ipAddressConfig,
+ );
+
+
+
+
+ InterfaceConfig._(List<Object> argv)
+ : name = argv[0],
+ ipAddressConfig = argv[1];
+ final String name;
+ final IpAddressConfig ipAddressConfig;
+
+ @override
+ List<Object> get $fields {
+ return <Object>[
+ name,
+ ipAddressConfig,
+ ];
+ }
+
+ @override
+ String toString() {
+ // ignore: prefer_interpolation_to_compose_strings
+ return r'InterfaceConfig' r'(name: ' + name.toString() + r', ipAddressConfig: ' + ipAddressConfig.toString() + r')';
+ }
+
+ static InterfaceConfig _ctor(List<Object> argv) => InterfaceConfig._(argv);
+}
+
+// See FIDL-308:
+// ignore: recursive_compile_time_constant
+const $fidl.StructType<InterfaceConfig> kInterfaceConfig_Type = $fidl.StructType<InterfaceConfig>(
+ encodedSize: 48,
+ members: <$fidl.MemberType>[
+ $fidl.MemberType<String>(type: $fidl.StringType(maybeElementCount: null, nullable: false), offset: 0),
+ $fidl.MemberType<IpAddressConfig>(type: kIpAddressConfig_Type, offset: 16),
+ ],
+ ctor: InterfaceConfig._ctor,
+);
+
+
+class TestAddEthernetDeviceRequest extends $fidl.Struct {
+ const TestAddEthernetDeviceRequest({
+ @required this.topologicalPath,
+ @required this.config,
+ @required this.thisShouldBeAHandle,
+ });
+ TestAddEthernetDeviceRequest.clone(TestAddEthernetDeviceRequest $orig, {
+ String topologicalPath,
+ InterfaceConfig config,
+ int thisShouldBeAHandle,
+ }) : this(
+ topologicalPath: topologicalPath ?? $orig.topologicalPath,
+ config: config ?? $orig.config,
+ thisShouldBeAHandle: thisShouldBeAHandle ?? $orig.thisShouldBeAHandle,
+ );
+
+
+
+
+ TestAddEthernetDeviceRequest._(List<Object> argv)
+ : topologicalPath = argv[0],
+ config = argv[1],
+ thisShouldBeAHandle = argv[2];
+ final String topologicalPath;
+ final InterfaceConfig config;
+ final int thisShouldBeAHandle;
+
+ @override
+ List<Object> get $fields {
+ return <Object>[
+ topologicalPath,
+ config,
+ thisShouldBeAHandle,
+ ];
+ }
+
+ @override
+ String toString() {
+ // ignore: prefer_interpolation_to_compose_strings
+ return r'TestAddEthernetDeviceRequest' r'(topologicalPath: ' + topologicalPath.toString() + r', config: ' + config.toString() + r', thisShouldBeAHandle: ' + thisShouldBeAHandle.toString() + r')';
+ }
+
+ static TestAddEthernetDeviceRequest _ctor(List<Object> argv) => TestAddEthernetDeviceRequest._(argv);
+}
+
+// See FIDL-308:
+// ignore: recursive_compile_time_constant
+const $fidl.StructType<TestAddEthernetDeviceRequest> kTestAddEthernetDeviceRequest_Type = $fidl.StructType<TestAddEthernetDeviceRequest>(
+ encodedSize: 72,
+ members: <$fidl.MemberType>[
+ $fidl.MemberType<String>(type: $fidl.StringType(maybeElementCount: null, nullable: false), offset: 0),
+ $fidl.MemberType<InterfaceConfig>(type: kInterfaceConfig_Type, offset: 16),
+ $fidl.MemberType<int>(type: $fidl.Uint32Type(), offset: 64),
+ ],
+ ctor: TestAddEthernetDeviceRequest._ctor,
+);
+
+
+class NodeAttributes extends $fidl.Struct {
+ const NodeAttributes({
+ @required this.mode,
+ @required this.id,
+ @required this.contentSize,
+ @required this.storageSize,
+ @required this.linkCount,
+ @required this.creationTime,
+ @required this.modificationTime,
+ });
+ NodeAttributes.clone(NodeAttributes $orig, {
+ int mode,
+ int id,
+ int contentSize,
+ int storageSize,
+ int linkCount,
+ int creationTime,
+ int modificationTime,
+ }) : this(
+ mode: mode ?? $orig.mode,
+ id: id ?? $orig.id,
+ contentSize: contentSize ?? $orig.contentSize,
+ storageSize: storageSize ?? $orig.storageSize,
+ linkCount: linkCount ?? $orig.linkCount,
+ creationTime: creationTime ?? $orig.creationTime,
+ modificationTime: modificationTime ?? $orig.modificationTime,
+ );
+
+
+
+
+ NodeAttributes._(List<Object> argv)
+ : mode = argv[0],
+ id = argv[1],
+ contentSize = argv[2],
+ storageSize = argv[3],
+ linkCount = argv[4],
+ creationTime = argv[5],
+ modificationTime = argv[6];
+ final int mode;
+ final int id;
+ final int contentSize;
+ final int storageSize;
+ final int linkCount;
+ final int creationTime;
+ final int modificationTime;
+
+ @override
+ List<Object> get $fields {
+ return <Object>[
+ mode,
+ id,
+ contentSize,
+ storageSize,
+ linkCount,
+ creationTime,
+ modificationTime,
+ ];
+ }
+
+ @override
+ String toString() {
+ // ignore: prefer_interpolation_to_compose_strings
+ return r'NodeAttributes' r'(mode: ' + mode.toString() + r', id: ' + id.toString() + r', contentSize: ' + contentSize.toString() + r', storageSize: ' + storageSize.toString() + r', linkCount: ' + linkCount.toString() + r', creationTime: ' + creationTime.toString() + r', modificationTime: ' + modificationTime.toString() + r')';
+ }
+
+ static NodeAttributes _ctor(List<Object> argv) => NodeAttributes._(argv);
+}
+
+// See FIDL-308:
+// ignore: recursive_compile_time_constant
+const $fidl.StructType<NodeAttributes> kNodeAttributes_Type = $fidl.StructType<NodeAttributes>(
+ encodedSize: 56,
+ members: <$fidl.MemberType>[
+ $fidl.MemberType<int>(type: $fidl.Uint32Type(), offset: 0),
+ $fidl.MemberType<int>(type: $fidl.Uint64Type(), offset: 8),
+ $fidl.MemberType<int>(type: $fidl.Uint64Type(), offset: 16),
+ $fidl.MemberType<int>(type: $fidl.Uint64Type(), offset: 24),
+ $fidl.MemberType<int>(type: $fidl.Uint64Type(), offset: 32),
+ $fidl.MemberType<int>(type: $fidl.Uint64Type(), offset: 40),
+ $fidl.MemberType<int>(type: $fidl.Uint64Type(), offset: 48),
+ ],
+ ctor: NodeAttributes._ctor,
+);
+
+
+class FileGetAttrResponse extends $fidl.Struct {
+ const FileGetAttrResponse({
+ @required this.s,
+ @required this.attributes,
+ });
+ FileGetAttrResponse.clone(FileGetAttrResponse $orig, {
+ int s,
+ NodeAttributes attributes,
+ }) : this(
+ s: s ?? $orig.s,
+ attributes: attributes ?? $orig.attributes,
+ );
+
+
+
+
+ FileGetAttrResponse._(List<Object> argv)
+ : s = argv[0],
+ attributes = argv[1];
+ final int s;
+ final NodeAttributes attributes;
+
+ @override
+ List<Object> get $fields {
+ return <Object>[
+ s,
+ attributes,
+ ];
+ }
+
+ @override
+ String toString() {
+ // ignore: prefer_interpolation_to_compose_strings
+ return r'FileGetAttrResponse' r'(s: ' + s.toString() + r', attributes: ' + attributes.toString() + r')';
+ }
+
+ static FileGetAttrResponse _ctor(List<Object> argv) => FileGetAttrResponse._(argv);
+}
+
+// See FIDL-308:
+// ignore: recursive_compile_time_constant
+const $fidl.StructType<FileGetAttrResponse> kFileGetAttrResponse_Type = $fidl.StructType<FileGetAttrResponse>(
+ encodedSize: 64,
+ members: <$fidl.MemberType>[
+ $fidl.MemberType<int>(type: $fidl.Int32Type(), offset: 0),
+ $fidl.MemberType<NodeAttributes>(type: kNodeAttributes_Type, offset: 8),
+ ],
+ ctor: FileGetAttrResponse._ctor,
+);
+
+
class TableWithEmptyStruct extends $fidl.Table {
const TableWithEmptyStruct({
this.s,
});
- TableWithEmptyStruct._(Map<int, dynamic> argv) : s = argv[1];
+ TableWithEmptyStruct._(Map<int, dynamic> argv): s = argv[1];
final EmptyStruct s;
@override
Map<int, dynamic> get $fields {
return {
- 1: s,
+ 1: s,
};
}
- static TableWithEmptyStruct _ctor(Map<int, dynamic> argv) =>
- TableWithEmptyStruct._(argv);
+ static TableWithEmptyStruct _ctor(Map<int, dynamic> argv) => TableWithEmptyStruct._(argv);
}
// See FIDL-308:
// ignore: recursive_compile_time_constant
-const $fidl.TableType<TableWithEmptyStruct> kTableWithEmptyStruct_Type =
- $fidl.TableType<TableWithEmptyStruct>(
+const $fidl.TableType<TableWithEmptyStruct> kTableWithEmptyStruct_Type = $fidl.TableType<TableWithEmptyStruct>(
encodedSize: 16,
members: <int, $fidl.FidlType>{
1: kEmptyStruct_Type,
@@ -3129,6 +2982,80 @@
ctor: TableWithEmptyStruct._ctor,
);
+
+class SimpleTable extends $fidl.Table {
+ const SimpleTable({
+ this.x,
+ this.y,
+ });
+
+ SimpleTable._(Map<int, dynamic> argv): x = argv[1],
+ y = argv[5];
+ final int x;
+ final int y;
+
+ @override
+ Map<int, dynamic> get $fields {
+ return {
+ 1: x,
+ 5: y,
+ };
+ }
+
+ static SimpleTable _ctor(Map<int, dynamic> argv) => SimpleTable._(argv);
+}
+
+// See FIDL-308:
+// ignore: recursive_compile_time_constant
+const $fidl.TableType<SimpleTable> kSimpleTable_Type = $fidl.TableType<SimpleTable>(
+ encodedSize: 16,
+ members: <int, $fidl.FidlType>{
+ 1: $fidl.Int64Type(),
+ 5: $fidl.Int64Type(),
+ },
+ ctor: SimpleTable._ctor,
+);
+
+
+class TableWithStringAndVector extends $fidl.Table {
+ const TableWithStringAndVector({
+ this.foo,
+ this.bar,
+ this.baz,
+ });
+
+ TableWithStringAndVector._(Map<int, dynamic> argv): foo = argv[1],
+ bar = argv[2],
+ baz = argv[3];
+ final String foo;
+ final int bar;
+ final Uint8List baz;
+
+ @override
+ Map<int, dynamic> get $fields {
+ return {
+ 1: foo,
+ 2: bar,
+ 3: baz,
+ };
+ }
+
+ static TableWithStringAndVector _ctor(Map<int, dynamic> argv) => TableWithStringAndVector._(argv);
+}
+
+// See FIDL-308:
+// ignore: recursive_compile_time_constant
+const $fidl.TableType<TableWithStringAndVector> kTableWithStringAndVector_Type = $fidl.TableType<TableWithStringAndVector>(
+ encodedSize: 16,
+ members: <int, $fidl.FidlType>{
+ 1: $fidl.StringType(maybeElementCount: null, nullable: false),
+ 2: $fidl.Int32Type(),
+ 3: $fidl.VectorType<Uint8List>(element: $fidl.Uint8Type(), maybeElementCount: null, nullable: false),
+ },
+ ctor: TableWithStringAndVector._ctor,
+);
+
+
class XUnionInTable extends $fidl.Table {
const XUnionInTable({
this.before,
@@ -3136,10 +3063,9 @@
this.after,
});
- XUnionInTable._(Map<int, dynamic> argv)
- : before = argv[1],
- xu = argv[2],
- after = argv[3];
+ XUnionInTable._(Map<int, dynamic> argv): before = argv[1],
+ xu = argv[2],
+ after = argv[3];
final String before;
final SampleXUnion xu;
final String after;
@@ -3147,9 +3073,9 @@
@override
Map<int, dynamic> get $fields {
return {
- 1: before,
- 2: xu,
- 3: after,
+ 1: before,
+ 2: xu,
+ 3: after,
};
}
@@ -3158,8 +3084,7 @@
// See FIDL-308:
// ignore: recursive_compile_time_constant
-const $fidl.TableType<XUnionInTable> kXUnionInTable_Type =
- $fidl.TableType<XUnionInTable>(
+const $fidl.TableType<XUnionInTable> kXUnionInTable_Type = $fidl.TableType<XUnionInTable>(
encodedSize: 16,
members: <int, $fidl.FidlType>{
1: $fidl.StringType(maybeElementCount: null, nullable: false),
@@ -3169,86 +3094,10 @@
ctor: XUnionInTable._ctor,
);
-class SimpleTable extends $fidl.Table {
- const SimpleTable({
- this.x,
- this.y,
- });
-
- SimpleTable._(Map<int, dynamic> argv)
- : x = argv[1],
- y = argv[5];
- final int x;
- final int y;
-
- @override
- Map<int, dynamic> get $fields {
- return {
- 1: x,
- 5: y,
- };
- }
-
- static SimpleTable _ctor(Map<int, dynamic> argv) => SimpleTable._(argv);
-}
-
-// See FIDL-308:
-// ignore: recursive_compile_time_constant
-const $fidl.TableType<SimpleTable> kSimpleTable_Type =
- $fidl.TableType<SimpleTable>(
- encodedSize: 16,
- members: <int, $fidl.FidlType>{
- 1: $fidl.Int64Type(),
- 5: $fidl.Int64Type(),
- },
- ctor: SimpleTable._ctor,
-);
-
-class TableWithStringAndVector extends $fidl.Table {
- const TableWithStringAndVector({
- this.foo,
- this.bar,
- this.baz,
- });
-
- TableWithStringAndVector._(Map<int, dynamic> argv)
- : foo = argv[1],
- bar = argv[2],
- baz = argv[3];
- final String foo;
- final int bar;
- final Uint8List baz;
-
- @override
- Map<int, dynamic> get $fields {
- return {
- 1: foo,
- 2: bar,
- 3: baz,
- };
- }
-
- static TableWithStringAndVector _ctor(Map<int, dynamic> argv) =>
- TableWithStringAndVector._(argv);
-}
-
-// See FIDL-308:
-// ignore: recursive_compile_time_constant
-const $fidl.TableType<TableWithStringAndVector> kTableWithStringAndVector_Type =
- $fidl.TableType<TableWithStringAndVector>(
- encodedSize: 16,
- members: <int, $fidl.FidlType>{
- 1: $fidl.StringType(maybeElementCount: null, nullable: false),
- 2: $fidl.Int32Type(),
- 3: $fidl.VectorType<Uint8List>(
- element: $fidl.Uint8Type(), maybeElementCount: null, nullable: false),
- },
- ctor: TableWithStringAndVector._ctor,
-);
-
// ignore: unused_element, avoid_private_typedef_functions
typedef _VoidCallback = void Function();
+
abstract class EthernetDevice extends $fidl.Service {
static const String $serviceName = null;
@override
@@ -3256,6 +3105,7 @@
}
class EthernetDeviceData implements $fidl.ServiceData<EthernetDevice> {
+
const EthernetDeviceData();
@override
@@ -3268,13 +3118,11 @@
return EthernetDeviceBinding();
}
}
-
class EthernetDeviceProxy extends $fidl.AsyncProxy<EthernetDevice>
implements EthernetDevice {
- EthernetDeviceProxy()
- : super($fidl.AsyncProxyController<EthernetDevice>(
- $serviceName: null, $interfaceName: r'EthernetDevice')) {
+ EthernetDeviceProxy() : super($fidl.AsyncProxyController<EthernetDevice>($serviceName: null, $interfaceName: r'EthernetDevice')) {
ctrl.onResponse = _handleResponse;
+
}
@override
@@ -3284,8 +3132,7 @@
final $fidl.Decoder $decoder = $fidl.Decoder($message);
switch ($message.ordinal) {
default:
- ctrl.proxyError(
- $fidl.FidlError('Unexpected message ordinal: ${$message.ordinal}'));
+ ctrl.proxyError($fidl.FidlError('Unexpected message ordinal: ${$message.ordinal}'));
ctrl.close();
break;
}
@@ -3305,8 +3152,7 @@
final $fidl.Decoder $decoder = $fidl.Decoder($message);
switch ($message.ordinal) {
default:
- ctrl.proxyError(
- $fidl.FidlError('Unexpected message ordinal: ${$message.ordinal}'));
+ ctrl.proxyError($fidl.FidlError('Unexpected message ordinal: ${$message.ordinal}'));
ctrl.close();
break;
}
@@ -3321,8 +3167,9 @@
final $fidl.Decoder $decoder = $fidl.Decoder($message);
switch ($message.ordinal) {
default:
- throw $fidl.FidlError(
- r'Unexpected message name for EthernetDeviceBinding');
+ throw $fidl.FidlError(r'Unexpected message name for EthernetDeviceBinding');
}
}
}
+
+
diff --git a/bin/fidl_bindings_test/test/test/gidl.dart b/bin/fidl_bindings_test/test/test/gidl.dart
index 33446bb..516d613 100644
--- a/bin/fidl_bindings_test/test/test/gidl.dart
+++ b/bin/fidl_bindings_test/test/test/gidl.dart
@@ -110,7 +110,7 @@
ByteData.view(bytes.buffer, 0, bytes.length), [], bytes.length, 0))
..claimMemory(type.encodedSize);
expect(() => type.decode(decoder, 0),
- throwsA(predicate((e) => e.code == code)));
+ throwsA(predicate((e) => e is fidl.FidlError && e.code == code)));
});
}
}
diff --git a/bin/fidlgen_dart/backend/ir/ir.go b/bin/fidlgen_dart/backend/ir/ir.go
index 8ec7816..16ddb0a 100644
--- a/bin/fidlgen_dart/backend/ir/ir.go
+++ b/bin/fidlgen_dart/backend/ir/ir.go
@@ -103,6 +103,7 @@
OptTypeSymbol string
OptTypeExpr string
Documented
+ types.Strictness
}
// XUnionMember represents a member of a xunion declaration.
@@ -1193,18 +1194,22 @@
OptTypeSymbol: c.optTypeSymbolForCompoundIdentifier(ci),
Members: members,
Documented: docString(val),
+ Strictness: val.Strictness,
}
r.TypeExpr = fmt.Sprintf(`$fidl.XUnionType<%s>(
encodedSize: %v,
members: %s,
ctor: %s._ctor,
-)`, r.Name, val.Size, formatXUnionMemberList(r.Members), r.Name)
+ nullable: false,
+ flexible: %t,
+)`, r.Name, val.Size, formatXUnionMemberList(r.Members), r.Name, r.IsFlexible())
r.OptTypeExpr = fmt.Sprintf(`$fidl.XUnionType<%s>(
encodedSize: %v,
members: %s,
ctor: %s._ctor,
nullable: true,
-)`, r.Name, val.Size, formatXUnionMemberList(r.Members), r.Name)
+flexible: %t,
+)`, r.Name, val.Size, formatXUnionMemberList(r.Members), r.Name, r.IsFlexible())
return r
}
diff --git a/bin/fidlgen_dart/backend/templates/xunion.tmpl.go b/bin/fidlgen_dart/backend/templates/xunion.tmpl.go
index e913c83..37f8508 100644
--- a/bin/fidlgen_dart/backend/templates/xunion.tmpl.go
+++ b/bin/fidlgen_dart/backend/templates/xunion.tmpl.go
@@ -8,6 +8,9 @@
const XUnion = `
{{- define "XUnionDeclaration" -}}
enum {{ .TagName }} {
+{{- if .IsFlexible }}
+ $unknown,
+{{- end }}
{{- range .Members }}
{{ .Tag }}, // {{ .Ordinal | printf "%#x" }}
{{- end }}
@@ -33,8 +36,14 @@
final int _ordinal;
final _data;
-
+{{ if .IsFlexible }}
+ {{ .TagName }} get $tag {
+ final {{ .TagName }} $rawtag = _{{ .TagName }}_map[_ordinal];
+ return $rawtag == null ? {{ .TagName }}.$unknown : $rawtag;
+ }
+{{- else }}
{{ .TagName }} get $tag => _{{ .TagName }}_map[_ordinal];
+{{- end }}
{{range .Members }}
{{ .Type.Decl }} get {{ .Name }} {
@@ -54,7 +63,11 @@
return '{{ $.Name }}.{{ .Name }}(${{ .Name }})';
{{- end }}
default:
+{{- if .IsFlexible }}
+ return '{{ $.Name }}.<UNKNOWN>';
+{{- else }}
return null;
+{{- end }}
}
}
diff --git a/bin/fidlgen_dart/goldens/protocols.test.fidl.json b/bin/fidlgen_dart/goldens/protocols.test.fidl.json
index e5b78a5..c178fbd 100644
--- a/bin/fidlgen_dart/goldens/protocols.test.fidl.json
+++ b/bin/fidlgen_dart/goldens/protocols.test.fidl.json
@@ -342,12 +342,54 @@
},
"methods": [
{
+ "ordinal": 5709494219224121344,
+ "generated_ordinal": 6422511116044938191,
+ "name": "ResponseAsStruct",
+ "location": {
+ "filename": "garnet/go/src/fidl/compiler/backend/typestest/protocols.test.fidl",
+ "line": 20,
+ "column": 5
+ },
+ "has_request": true,
+ "maybe_request": [],
+ "maybe_request_size": 16,
+ "maybe_request_alignment": 8,
+ "maybe_request_has_padding": false,
+ "experimental_maybe_request_has_flexible_envelope": false,
+ "has_response": true,
+ "maybe_response": [
+ {
+ "type": {
+ "kind": "identifier",
+ "identifier": "test.name/WithErrorSyntax_ResponseAsStruct_Result",
+ "nullable": false
+ },
+ "name": "result",
+ "location": {
+ "filename": "generated",
+ "line": 18,
+ "column": 1
+ },
+ "size": 32,
+ "max_out_of_line": 0,
+ "alignment": 8,
+ "offset": 16,
+ "max_handles": 0
+ }
+ ],
+ "maybe_response_size": 48,
+ "maybe_response_alignment": 8,
+ "maybe_response_has_padding": true,
+ "experimental_maybe_response_has_flexible_envelope": false,
+ "is_composed": false
+ },
+ {
"ordinal": 8887872801126481920,
"generated_ordinal": 2364249812017832126,
"name": "ErrorAsPrimitive",
"location": {
"filename": "garnet/go/src/fidl/compiler/backend/typestest/protocols.test.fidl",
- "line": 20,
+ "line": 21,
"column": 5
},
"has_request": true,
@@ -367,7 +409,7 @@
"name": "result",
"location": {
"filename": "generated",
- "line": 18,
+ "line": 25,
"column": 1
},
"size": 8,
@@ -389,7 +431,7 @@
"name": "ErrorAsEnum",
"location": {
"filename": "garnet/go/src/fidl/compiler/backend/typestest/protocols.test.fidl",
- "line": 21,
+ "line": 22,
"column": 5
},
"has_request": true,
@@ -409,7 +451,7 @@
"name": "result",
"location": {
"filename": "generated",
- "line": 25,
+ "line": 32,
"column": 1
},
"size": 8,
@@ -431,7 +473,7 @@
"name": "test.name/ChannelProtocol",
"location": {
"filename": "garnet/go/src/fidl/compiler/backend/typestest/protocols.test.fidl",
- "line": 25,
+ "line": 26,
"column": 10
},
"maybe_attributes": [
@@ -447,7 +489,7 @@
"name": "MethodA",
"location": {
"filename": "garnet/go/src/fidl/compiler/backend/typestest/protocols.test.fidl",
- "line": 26,
+ "line": 27,
"column": 5
},
"has_request": true,
@@ -460,7 +502,7 @@
"name": "a",
"location": {
"filename": "garnet/go/src/fidl/compiler/backend/typestest/protocols.test.fidl",
- "line": 26,
+ "line": 27,
"column": 19
},
"size": 8,
@@ -477,7 +519,7 @@
"name": "b",
"location": {
"filename": "garnet/go/src/fidl/compiler/backend/typestest/protocols.test.fidl",
- "line": 26,
+ "line": 27,
"column": 28
},
"size": 8,
@@ -500,7 +542,7 @@
"name": "EventA",
"location": {
"filename": "garnet/go/src/fidl/compiler/backend/typestest/protocols.test.fidl",
- "line": 27,
+ "line": 28,
"column": 8
},
"has_request": false,
@@ -514,7 +556,7 @@
"name": "a",
"location": {
"filename": "garnet/go/src/fidl/compiler/backend/typestest/protocols.test.fidl",
- "line": 27,
+ "line": 28,
"column": 21
},
"size": 8,
@@ -531,7 +573,7 @@
"name": "b",
"location": {
"filename": "garnet/go/src/fidl/compiler/backend/typestest/protocols.test.fidl",
- "line": 27,
+ "line": 28,
"column": 30
},
"size": 8,
@@ -553,7 +595,7 @@
"name": "MethodB",
"location": {
"filename": "garnet/go/src/fidl/compiler/backend/typestest/protocols.test.fidl",
- "line": 28,
+ "line": 29,
"column": 5
},
"has_request": true,
@@ -566,7 +608,7 @@
"name": "a",
"location": {
"filename": "garnet/go/src/fidl/compiler/backend/typestest/protocols.test.fidl",
- "line": 28,
+ "line": 29,
"column": 19
},
"size": 8,
@@ -583,7 +625,7 @@
"name": "b",
"location": {
"filename": "garnet/go/src/fidl/compiler/backend/typestest/protocols.test.fidl",
- "line": 28,
+ "line": 29,
"column": 28
},
"size": 8,
@@ -607,7 +649,7 @@
"name": "result",
"location": {
"filename": "garnet/go/src/fidl/compiler/backend/typestest/protocols.test.fidl",
- "line": 28,
+ "line": 29,
"column": 41
},
"size": 8,
@@ -629,7 +671,7 @@
"name": "MutateSocket",
"location": {
"filename": "garnet/go/src/fidl/compiler/backend/typestest/protocols.test.fidl",
- "line": 29,
+ "line": 30,
"column": 5
},
"has_request": true,
@@ -643,7 +685,7 @@
"name": "a",
"location": {
"filename": "garnet/go/src/fidl/compiler/backend/typestest/protocols.test.fidl",
- "line": 29,
+ "line": 30,
"column": 33
},
"size": 4,
@@ -668,7 +710,7 @@
"name": "b",
"location": {
"filename": "garnet/go/src/fidl/compiler/backend/typestest/protocols.test.fidl",
- "line": 29,
+ "line": 30,
"column": 55
},
"size": 4,
@@ -690,13 +732,80 @@
"service_declarations": [],
"struct_declarations": [
{
- "name": "test.name/WithErrorSyntax_ErrorAsPrimitive_Response",
+ "name": "test.name/WithErrorSyntax_ResponseAsStruct_Response",
"location": {
"filename": "generated",
"line": 14,
"column": 1
},
"anonymous": false,
+ "members": [
+ {
+ "type": {
+ "kind": "primitive",
+ "subtype": "int64"
+ },
+ "name": "a",
+ "location": {
+ "filename": "garnet/go/src/fidl/compiler/backend/typestest/protocols.test.fidl",
+ "line": 20,
+ "column": 34
+ },
+ "size": 8,
+ "max_out_of_line": 0,
+ "alignment": 8,
+ "offset": 0,
+ "max_handles": 0
+ },
+ {
+ "type": {
+ "kind": "primitive",
+ "subtype": "int64"
+ },
+ "name": "b",
+ "location": {
+ "filename": "garnet/go/src/fidl/compiler/backend/typestest/protocols.test.fidl",
+ "line": 20,
+ "column": 43
+ },
+ "size": 8,
+ "max_out_of_line": 0,
+ "alignment": 8,
+ "offset": 8,
+ "max_handles": 0
+ },
+ {
+ "type": {
+ "kind": "primitive",
+ "subtype": "int64"
+ },
+ "name": "c",
+ "location": {
+ "filename": "garnet/go/src/fidl/compiler/backend/typestest/protocols.test.fidl",
+ "line": 20,
+ "column": 52
+ },
+ "size": 8,
+ "max_out_of_line": 0,
+ "alignment": 8,
+ "offset": 16,
+ "max_handles": 0
+ }
+ ],
+ "size": 24,
+ "max_out_of_line": 0,
+ "alignment": 8,
+ "max_handles": 0,
+ "has_padding": false
+ },
+ {
+ "name": "test.name/WithErrorSyntax_ErrorAsPrimitive_Response",
+ "location": {
+ "filename": "generated",
+ "line": 21,
+ "column": 1
+ },
+ "anonymous": false,
"members": [],
"size": 1,
"max_out_of_line": 0,
@@ -708,7 +817,7 @@
"name": "test.name/WithErrorSyntax_ErrorAsEnum_Response",
"location": {
"filename": "generated",
- "line": 21,
+ "line": 28,
"column": 1
},
"anonymous": false,
@@ -723,7 +832,7 @@
"table_declarations": [],
"union_declarations": [
{
- "name": "test.name/WithErrorSyntax_ErrorAsPrimitive_Result",
+ "name": "test.name/WithErrorSyntax_ResponseAsStruct_Result",
"location": {
"filename": "generated",
"line": 15,
@@ -740,13 +849,68 @@
"name": "response",
"type": {
"kind": "identifier",
+ "identifier": "test.name/WithErrorSyntax_ResponseAsStruct_Response",
+ "nullable": false
+ },
+ "xunion_ordinal": 415743989,
+ "location": {
+ "filename": "generated",
+ "line": 16,
+ "column": 1
+ },
+ "size": 24,
+ "max_out_of_line": 0,
+ "alignment": 8,
+ "offset": 8
+ },
+ {
+ "name": "err",
+ "type": {
+ "kind": "primitive",
+ "subtype": "uint32"
+ },
+ "xunion_ordinal": 1728496323,
+ "location": {
+ "filename": "generated",
+ "line": 17,
+ "column": 1
+ },
+ "size": 4,
+ "max_out_of_line": 0,
+ "alignment": 4,
+ "offset": 8
+ }
+ ],
+ "size": 32,
+ "max_out_of_line": 0,
+ "alignment": 8,
+ "max_handles": 0
+ },
+ {
+ "name": "test.name/WithErrorSyntax_ErrorAsPrimitive_Result",
+ "location": {
+ "filename": "generated",
+ "line": 22,
+ "column": 1
+ },
+ "maybe_attributes": [
+ {
+ "name": "Result",
+ "value": ""
+ }
+ ],
+ "members": [
+ {
+ "name": "response",
+ "type": {
+ "kind": "identifier",
"identifier": "test.name/WithErrorSyntax_ErrorAsPrimitive_Response",
"nullable": false
},
"xunion_ordinal": 138512668,
"location": {
"filename": "generated",
- "line": 16,
+ "line": 23,
"column": 1
},
"size": 1,
@@ -763,7 +927,7 @@
"xunion_ordinal": 1043053528,
"location": {
"filename": "generated",
- "line": 17,
+ "line": 24,
"column": 1
},
"size": 4,
@@ -781,7 +945,7 @@
"name": "test.name/WithErrorSyntax_ErrorAsEnum_Result",
"location": {
"filename": "generated",
- "line": 22,
+ "line": 29,
"column": 1
},
"maybe_attributes": [
@@ -801,7 +965,7 @@
"xunion_ordinal": 1951667349,
"location": {
"filename": "generated",
- "line": 23,
+ "line": 30,
"column": 1
},
"size": 1,
@@ -819,7 +983,7 @@
"xunion_ordinal": 887935114,
"location": {
"filename": "generated",
- "line": 24,
+ "line": 31,
"column": 1
},
"size": 4,
@@ -837,6 +1001,8 @@
"xunion_declarations": [],
"type_alias_declarations": [],
"declaration_order": [
+ "test.name/WithErrorSyntax_ResponseAsStruct_Response",
+ "test.name/WithErrorSyntax_ResponseAsStruct_Result",
"test.name/WithErrorSyntax_ErrorAsPrimitive_Response",
"test.name/WithErrorSyntax_ErrorAsPrimitive_Result",
"test.name/WithErrorSyntax_ErrorAsEnum_Response",
@@ -851,8 +1017,10 @@
"test.name/WithAndWithoutRequestResponse": "interface",
"test.name/WithErrorSyntax": "interface",
"test.name/ChannelProtocol": "interface",
+ "test.name/WithErrorSyntax_ResponseAsStruct_Response": "struct",
"test.name/WithErrorSyntax_ErrorAsPrimitive_Response": "struct",
"test.name/WithErrorSyntax_ErrorAsEnum_Response": "struct",
+ "test.name/WithErrorSyntax_ResponseAsStruct_Result": "union",
"test.name/WithErrorSyntax_ErrorAsPrimitive_Result": "union",
"test.name/WithErrorSyntax_ErrorAsEnum_Result": "union"
}
diff --git a/bin/fidlgen_dart/goldens/protocols.test.fidl.json_async.dart.golden b/bin/fidlgen_dart/goldens/protocols.test.fidl.json_async.dart.golden
index ea73e5e..2f05b6e 100644
--- a/bin/fidlgen_dart/goldens/protocols.test.fidl.json_async.dart.golden
+++ b/bin/fidlgen_dart/goldens/protocols.test.fidl.json_async.dart.golden
@@ -88,6 +88,88 @@
const $fidl.EnumType<ErrorEnun> kErrorEnun_Type =
$fidl.EnumType<ErrorEnun>(type: $fidl.Uint32Type(), ctor: ErrorEnun._ctor);
+enum WithErrorSyntaxResponseAsStructResultTag {
+ response,
+ err,
+}
+
+class WithErrorSyntaxResponseAsStructResult extends $fidl.Union {
+ const WithErrorSyntaxResponseAsStructResult.withResponse(
+ WithErrorSyntaxResponseAsStructResponse value)
+ : _data = value,
+ _tag = WithErrorSyntaxResponseAsStructResultTag.response;
+
+ const WithErrorSyntaxResponseAsStructResult.withErr(int value)
+ : _data = value,
+ _tag = WithErrorSyntaxResponseAsStructResultTag.err;
+
+ WithErrorSyntaxResponseAsStructResult._(
+ WithErrorSyntaxResponseAsStructResultTag tag, Object data)
+ : _tag = tag,
+ _data = data;
+
+ final WithErrorSyntaxResponseAsStructResultTag _tag;
+ final _data;
+ WithErrorSyntaxResponseAsStructResponse get response {
+ if (_tag != WithErrorSyntaxResponseAsStructResultTag.response) {
+ return null;
+ }
+ return _data;
+ }
+
+ int get err {
+ if (_tag != WithErrorSyntaxResponseAsStructResultTag.err) {
+ return null;
+ }
+ return _data;
+ }
+
+ @override
+ String toString() {
+ switch (_tag) {
+ case WithErrorSyntaxResponseAsStructResultTag.response:
+ return r'WithErrorSyntaxResponseAsStructResult.response($response)';
+ case WithErrorSyntaxResponseAsStructResultTag.err:
+ return r'WithErrorSyntaxResponseAsStructResult.err($err)';
+ default:
+ return null;
+ }
+ }
+
+ WithErrorSyntaxResponseAsStructResultTag get $tag => _tag;
+ // TODO: remove, see: FIDL-587
+ WithErrorSyntaxResponseAsStructResultTag get tag => _tag;
+
+ @override
+ int get $index => _tag.index;
+
+ @override
+ Object get $data => _data;
+
+ static WithErrorSyntaxResponseAsStructResult _ctor(int index, Object data) {
+ return WithErrorSyntaxResponseAsStructResult._(
+ WithErrorSyntaxResponseAsStructResultTag.values[index], data);
+ }
+}
+
+// See FIDL-308:
+// ignore: recursive_compile_time_constant
+const $fidl.UnionType<WithErrorSyntaxResponseAsStructResult>
+ kWithErrorSyntax_ResponseAsStruct_Result_Type =
+ $fidl.UnionType<WithErrorSyntaxResponseAsStructResult>(
+ encodedSize: 32,
+ members: <$fidl.MemberType>[
+ $fidl.MemberType<WithErrorSyntaxResponseAsStructResponse>(
+ type: kWithErrorSyntax_ResponseAsStruct_Response_Type, offset: 8),
+ $fidl.MemberType<int>(type: $fidl.Uint32Type(), offset: 8),
+ ],
+ ctor: WithErrorSyntaxResponseAsStructResult._ctor,
+ ordinalToIndex: <int, int>{
+ 415743989: 0,
+ 1728496323: 1,
+ },
+);
+
enum WithErrorSyntaxErrorAsPrimitiveResultTag {
response,
err,
@@ -252,6 +334,70 @@
},
);
+class WithErrorSyntaxResponseAsStructResponse extends $fidl.Struct {
+ const WithErrorSyntaxResponseAsStructResponse({
+ @required this.a,
+ @required this.b,
+ @required this.c,
+ });
+ WithErrorSyntaxResponseAsStructResponse.clone(
+ WithErrorSyntaxResponseAsStructResponse $orig, {
+ int a,
+ int b,
+ int c,
+ }) : this(
+ a: a ?? $orig.a,
+ b: b ?? $orig.b,
+ c: c ?? $orig.c,
+ );
+
+ WithErrorSyntaxResponseAsStructResponse._(List<Object> argv)
+ : a = argv[0],
+ b = argv[1],
+ c = argv[2];
+ final int a;
+ final int b;
+ final int c;
+
+ @override
+ List<Object> get $fields {
+ return <Object>[
+ a,
+ b,
+ c,
+ ];
+ }
+
+ @override
+ String toString() {
+ // ignore: prefer_interpolation_to_compose_strings
+ return r'WithErrorSyntaxResponseAsStructResponse' r'(a: ' +
+ a.toString() +
+ r', b: ' +
+ b.toString() +
+ r', c: ' +
+ c.toString() +
+ r')';
+ }
+
+ static WithErrorSyntaxResponseAsStructResponse _ctor(List<Object> argv) =>
+ WithErrorSyntaxResponseAsStructResponse._(argv);
+}
+
+// See FIDL-308:
+// ignore: recursive_compile_time_constant
+const $fidl.StructType<WithErrorSyntaxResponseAsStructResponse>
+ kWithErrorSyntax_ResponseAsStruct_Response_Type =
+ $fidl.StructType<WithErrorSyntaxResponseAsStructResponse>(
+ encodedSize: 24,
+ members: <$fidl.MemberType>[
+ $fidl.MemberType<int>(type: $fidl.Int64Type(), offset: 0),
+ $fidl.MemberType<int>(type: $fidl.Int64Type(), offset: 8),
+ $fidl.MemberType<int>(type: $fidl.Int64Type(), offset: 16),
+ ],
+ ctor: WithErrorSyntaxResponseAsStructResponse._ctor,
+);
+
class WithErrorSyntaxErrorAsPrimitiveResponse extends $fidl.Struct {
const WithErrorSyntaxErrorAsPrimitiveResponse({
this.reserved: 0x0,
@@ -1031,6 +1177,18 @@
}
}
+// responseAsStruct: () -> (int a, int b, int c)
+const int _kWithErrorSyntax_ResponseAsStruct_Ordinal = 0x4f3c32be00000000;
+const int _kWithErrorSyntax_ResponseAsStruct_GenOrdinal = 0x592157d505db2bcf;
+const $fidl.MethodType _kWithErrorSyntax_ResponseAsStruct_Type =
+ $fidl.MethodType(
+ request: null,
+ response: <$fidl.MemberType>[
+ $fidl.MemberType<WithErrorSyntaxResponseAsStructResult>(
+ type: kWithErrorSyntax_ResponseAsStruct_Result_Type, offset: 16),
+ ],
+ name: r"WithErrorSyntax.ResponseAsStruct",
+);
// errorAsPrimitive: () -> ()
const int _kWithErrorSyntax_ErrorAsPrimitive_Ordinal = 0x7b58113900000000;
const int _kWithErrorSyntax_ErrorAsPrimitive_GenOrdinal = 0x20cf80ad7d9b60be;
@@ -1055,10 +1213,22 @@
name: r"WithErrorSyntax.ErrorAsEnum",
);
+class WithErrorSyntax$ResponseAsStruct$Response {
+ final int a;
+ final int b;
+ final int c;
+ WithErrorSyntax$ResponseAsStruct$Response(
+ this.a,
+ this.b,
+ this.c,
+ );
+}
+
abstract class WithErrorSyntax extends $fidl.Service {
static const String $serviceName = null;
@override
$fidl.ServiceData get $serviceData => WithErrorSyntaxData();
+ $async.Future<WithErrorSyntax$ResponseAsStruct$Response> responseAsStruct();
$async.Future<void> errorAsPrimitive();
$async.Future<void> errorAsEnum();
}
@@ -1112,6 +1282,38 @@
}
final $fidl.Decoder $decoder = $fidl.Decoder($message);
switch ($message.ordinal) {
+ case _kWithErrorSyntax_ResponseAsStruct_Ordinal:
+ case _kWithErrorSyntax_ResponseAsStruct_GenOrdinal:
+ final String _name = _kWithErrorSyntax_ResponseAsStruct_Type.name;
+ try {
+ Timeline.startSync(_name);
+ final List<$fidl.MemberType> $types =
+ _kWithErrorSyntax_ResponseAsStruct_Type.response;
+ $decoder.claimMemory(48);
+ // ignore: prefer_const_declarations
+ final $response = $types[0].decode($decoder, 0);
+
+ if ($response.tag ==
+ WithErrorSyntaxResponseAsStructResultTag.response) {
+ $completer.complete(WithErrorSyntax$ResponseAsStruct$Response(
+ $response.response.a,
+ $response.response.b,
+ $response.response.c,
+ ));
+ } else {
+ $completer.completeError($fidl.MethodException($response.err));
+ }
+
+ // ignore: avoid_catches_without_on_clauses
+ } catch (_e) {
+ ctrl.proxyError($fidl.FidlError(
+ 'Exception handling method response $_name: $_e'));
+ ctrl.close();
+ rethrow;
+ } finally {
+ Timeline.finishSync();
+ }
+ break;
case _kWithErrorSyntax_ErrorAsPrimitive_Ordinal:
case _kWithErrorSyntax_ErrorAsPrimitive_GenOrdinal:
final String _name = _kWithErrorSyntax_ErrorAsPrimitive_Type.name;
@@ -1176,6 +1378,23 @@
}
@override
+ $async.Future<WithErrorSyntax$ResponseAsStruct$Response>
+ responseAsStruct() async {
+ if (!ctrl.isBound) {
+ return $async.Future.error(
+ $fidl.FidlStateException('Proxy<${ctrl.$interfaceName}> is closed.'),
+ StackTrace.current);
+ }
+
+ final $fidl.Encoder $encoder = $fidl.Encoder();
+ $encoder.encodeMessageHeader(_kWithErrorSyntax_ResponseAsStruct_Ordinal, 0);
+ final $completer =
+ $async.Completer<WithErrorSyntax$ResponseAsStruct$Response>();
+ ctrl.sendMessageWithResponse($encoder.message, $completer);
+ return $completer.future;
+ }
+
+ @override
$async.Future<void> errorAsPrimitive() async {
if (!ctrl.isBound) {
return $async.Future.error(
@@ -1213,6 +1432,52 @@
void handleMessage($fidl.Message $message, $fidl.MessageSink $respond) {
final $fidl.Decoder $decoder = $fidl.Decoder($message);
switch ($message.ordinal) {
+ case _kWithErrorSyntax_ResponseAsStruct_Ordinal:
+ case _kWithErrorSyntax_ResponseAsStruct_GenOrdinal:
+ final String _name = _kWithErrorSyntax_ResponseAsStruct_Type.name;
+ try {
+ Timeline.startSync(_name);
+ final List<$fidl.MemberType> $types =
+ _kWithErrorSyntax_ResponseAsStruct_Type.request;
+ $decoder.claimMemory(16);
+ final $async.Future<WithErrorSyntax$ResponseAsStruct$Response>
+ $future = impl.responseAsStruct();
+ $future.then(($responseValue) {
+ return WithErrorSyntaxResponseAsStructResult.withResponse(
+ WithErrorSyntaxResponseAsStructResponse(
+ a: $responseValue.a,
+ b: $responseValue.b,
+ c: $responseValue.c,
+ ));
+ }, onError: ($error) {
+ if ($error is $fidl.MethodException) {
+ return WithErrorSyntaxResponseAsStructResult.withErr(
+ $error.value);
+ } else {
+ return Future.error($error);
+ }
+ }).then(($response) {
+ final $fidl.Encoder $encoder = $fidl.Encoder();
+ $encoder.encodeMessageHeader(
+ _kWithErrorSyntax_ResponseAsStruct_Ordinal, $message.txid);
+ $encoder.alloc(48 - $fidl.kMessageHeaderSize);
+ final List<$fidl.MemberType> $types =
+ _kWithErrorSyntax_ResponseAsStruct_Type.response;
+ $types[0].encode($encoder, $response, 0);
+ $respond($encoder.message);
+ }, onError: (_e) {
+ close();
+ print('Exception handling method call $_name: $_e');
+ });
+ // ignore: avoid_catches_without_on_clauses
+ } catch (_e) {
+ close();
+ print('Exception handling method call $_name: $_e');
+ rethrow;
+ } finally {
+ Timeline.finishSync();
+ }
+ break;
case _kWithErrorSyntax_ErrorAsPrimitive_Ordinal:
case _kWithErrorSyntax_ErrorAsPrimitive_GenOrdinal:
final String _name = _kWithErrorSyntax_ErrorAsPrimitive_Type.name;
diff --git a/bin/fidlgen_dart/goldens/protocols.test.fidl.json_test.dart.golden b/bin/fidlgen_dart/goldens/protocols.test.fidl.json_test.dart.golden
index 55894da..44ad87a 100644
--- a/bin/fidlgen_dart/goldens/protocols.test.fidl.json_test.dart.golden
+++ b/bin/fidlgen_dart/goldens/protocols.test.fidl.json_test.dart.golden
@@ -65,6 +65,11 @@
class WithErrorSyntax$TestBase extends WithErrorSyntax {
@override
+ $async.Future<WithErrorSyntax$ResponseAsStruct$Response> responseAsStruct() {
+ return $async.Future.error(UnimplementedError());
+ }
+
+ @override
$async.Future<void> errorAsPrimitive() {
return $async.Future.error(UnimplementedError());
}
diff --git a/bin/fidlgen_dart/goldens/xunion.test.fidl.json_async.dart.golden b/bin/fidlgen_dart/goldens/xunion.test.fidl.json_async.dart.golden
index 6098703..cec53ee 100644
--- a/bin/fidlgen_dart/goldens/xunion.test.fidl.json_async.dart.golden
+++ b/bin/fidlgen_dart/goldens/xunion.test.fidl.json_async.dart.golden
@@ -37,6 +37,7 @@
// ignore_for_file: avoid_unused_constructor_parameters
enum OlderSimpleUnionTag {
+ $unknown,
i, // 0x3d32b1d7
f, // 0x5136cf7e
}
@@ -62,7 +63,10 @@
final int _ordinal;
final _data;
- OlderSimpleUnionTag get $tag => _OlderSimpleUnionTag_map[_ordinal];
+ OlderSimpleUnionTag get $tag {
+ final OlderSimpleUnionTag $rawtag = _OlderSimpleUnionTag_map[_ordinal];
+ return $rawtag == null ? OlderSimpleUnionTag.$unknown : $rawtag;
+ }
int get i {
if (_ordinal != 1026732503) {
@@ -86,7 +90,7 @@
case 1362546558:
return 'OlderSimpleUnion.f($f)';
default:
- return null;
+ return 'OlderSimpleUnion.<UNKNOWN>';
}
}
@@ -111,6 +115,8 @@
1362546558: $fidl.Float32Type(),
},
ctor: OlderSimpleUnion._ctor,
+ nullable: false,
+ flexible: true,
);
// See FIDL-308:
// ignore: recursive_compile_time_constant
@@ -123,9 +129,11 @@
},
ctor: OlderSimpleUnion._ctor,
nullable: true,
+ flexible: true,
);
enum NewerSimpleUnionTag {
+ $unknown,
i, // 0x295cbfde
s, // 0x1c3b9247
v, // 0x6c38b28f
@@ -157,7 +165,10 @@
final int _ordinal;
final _data;
- NewerSimpleUnionTag get $tag => _NewerSimpleUnionTag_map[_ordinal];
+ NewerSimpleUnionTag get $tag {
+ final NewerSimpleUnionTag $rawtag = _NewerSimpleUnionTag_map[_ordinal];
+ return $rawtag == null ? NewerSimpleUnionTag.$unknown : $rawtag;
+ }
int get i {
if (_ordinal != 693944286) {
@@ -190,7 +201,7 @@
case 1815655055:
return 'NewerSimpleUnion.v($v)';
default:
- return null;
+ return 'NewerSimpleUnion.<UNKNOWN>';
}
}
@@ -219,6 +230,8 @@
nullable: false),
},
ctor: NewerSimpleUnion._ctor,
+ nullable: false,
+ flexible: true,
);
// See FIDL-308:
// ignore: recursive_compile_time_constant
@@ -235,6 +248,7 @@
},
ctor: NewerSimpleUnion._ctor,
nullable: true,
+ flexible: true,
);
enum StrictSimpleXUnionTag {
@@ -328,6 +342,8 @@
850602487: $fidl.StringType(maybeElementCount: null, nullable: false),
},
ctor: StrictSimpleXUnion._ctor,
+ nullable: false,
+ flexible: false,
);
// See FIDL-308:
// ignore: recursive_compile_time_constant
@@ -341,9 +357,11 @@
},
ctor: StrictSimpleXUnion._ctor,
nullable: true,
+ flexible: false,
);
enum XUnionContainingEmptyStructTag {
+ $unknown,
empty, // 0x1952d1d5
}
@@ -364,8 +382,11 @@
final int _ordinal;
final _data;
- XUnionContainingEmptyStructTag get $tag =>
- _XUnionContainingEmptyStructTag_map[_ordinal];
+ XUnionContainingEmptyStructTag get $tag {
+ final XUnionContainingEmptyStructTag $rawtag =
+ _XUnionContainingEmptyStructTag_map[_ordinal];
+ return $rawtag == null ? XUnionContainingEmptyStructTag.$unknown : $rawtag;
+ }
Empty get empty {
if (_ordinal != 424858069) {
@@ -380,7 +401,7 @@
case 424858069:
return 'XUnionContainingEmptyStruct.empty($empty)';
default:
- return null;
+ return 'XUnionContainingEmptyStruct.<UNKNOWN>';
}
}
@@ -405,6 +426,8 @@
424858069: kEmpty_Type,
},
ctor: XUnionContainingEmptyStruct._ctor,
+ nullable: false,
+ flexible: true,
);
// See FIDL-308:
// ignore: recursive_compile_time_constant
@@ -417,6 +440,7 @@
},
ctor: XUnionContainingEmptyStruct._ctor,
nullable: true,
+ flexible: true,
);
enum StrictBoundedXUnionTag {
@@ -479,6 +503,8 @@
element: $fidl.Uint8Type(), maybeElementCount: 10, nullable: false),
},
ctor: StrictBoundedXUnion._ctor,
+ nullable: false,
+ flexible: false,
);
// See FIDL-308:
// ignore: recursive_compile_time_constant
@@ -491,6 +517,7 @@
},
ctor: StrictBoundedXUnion._ctor,
nullable: true,
+ flexible: false,
);
class Empty extends $fidl.Struct {
diff --git a/public/dart/fidl/lib/src/error.dart b/public/dart/fidl/lib/src/error.dart
index bfa493a..2e98573 100644
--- a/public/dart/fidl/lib/src/error.dart
+++ b/public/dart/fidl/lib/src/error.dart
@@ -8,7 +8,8 @@
enum FidlErrorCode {
unknown,
fidlStringTooLong,
- fidlNonNullableTypeWithNullValue
+ fidlNonNullableTypeWithNullValue,
+ fidlStrictXUnionUnknownField
}
class FidlError implements Exception {
diff --git a/public/dart/fidl/lib/src/types.dart b/public/dart/fidl/lib/src/types.dart
index f276d09..a45ab6f 100644
--- a/public/dart/fidl/lib/src/types.dart
+++ b/public/dart/fidl/lib/src/types.dart
@@ -161,6 +161,43 @@
final bool nullable;
}
+class UnknownRawData {
+ Uint8List data;
+ List<Handle> handles;
+ UnknownRawData(this.data, this.handles);
+}
+
+/// This encodes/decodes the UnknowRawData assuming it is in an envelope, i.e.
+/// payload bytes followed directly by handles.
+class UnknownRawDataType extends FidlType<UnknownRawData> {
+ const UnknownRawDataType(this.numBytes, this.numHandles)
+ : super(encodedSize: numBytes);
+
+ final int numBytes;
+ final int numHandles;
+
+ @override
+ void encode(Encoder encoder, UnknownRawData value, int offset) {
+ _copyUint8(encoder.data, value.data, offset);
+ for (int i = 0; i < value.handles.length; i++) {
+ encoder.addHandle(value.handles[i]);
+ }
+ }
+
+ @override
+ UnknownRawData decode(Decoder decoder, int offset) {
+ final Uint8List data = Uint8List(numBytes);
+ for (var i = 0; i < numBytes; i++) {
+ data[i] = decoder.decodeUint8(offset + i);
+ }
+ final handles = List<Handle>(numHandles);
+ for (var i = 0; i < numHandles; i++) {
+ handles[i] = decoder.claimHandle();
+ }
+ return UnknownRawData(data, handles);
+ }
+}
+
class BoolType extends FidlType<bool> {
const BoolType() : super(encodedSize: 1);
@@ -719,12 +756,30 @@
kMustBeAbsent,
}
+class EnvelopeHeader {
+ int numBytes;
+ int numHandles;
+ int fieldPresent;
+ EnvelopeHeader(this.numBytes, this.numHandles, this.fieldPresent);
+}
+
T _decodeEnvelope<T>(
Decoder decoder, int offset, _envelopeMode mode, FidlType<T> fieldType) {
- final numBytes = decoder.decodeUint32(offset);
- final numHandles = decoder.decodeUint32(offset + 4);
- final fieldPresent = decoder.decodeUint64(offset + 8);
- switch (fieldPresent) {
+ final header = _decodeEnvelopeHeader(decoder, offset);
+ return _decodeEnvelopeContent(decoder, mode, header, fieldType);
+}
+
+EnvelopeHeader _decodeEnvelopeHeader(Decoder decoder, int offset) {
+ return EnvelopeHeader(
+ decoder.decodeUint32(offset),
+ decoder.decodeUint32(offset + 4),
+ decoder.decodeUint64(offset + 8),
+ );
+}
+
+T _decodeEnvelopeContent<T>(Decoder decoder, _envelopeMode mode,
+ EnvelopeHeader header, FidlType<T> fieldType) {
+ switch (header.fieldPresent) {
case kAllocPresent:
if (mode == _envelopeMode.kMustBeAbsent)
throw FidlError('expected empty envelope');
@@ -736,14 +791,14 @@
final numBytesConsumed = decoder.nextOffset() - fieldOffset;
final numHandlesConsumed =
decoder.countClaimedHandles() - claimedHandles;
- if (numBytes != numBytesConsumed)
+ if (header.numBytes != numBytesConsumed)
throw FidlError('field was mis-sized');
- if (numHandles != numHandlesConsumed)
+ if (header.numHandles != numHandlesConsumed)
throw FidlError('handles were mis-sized');
return field;
} else if (mode == _envelopeMode.kAllowUnknown) {
- decoder.claimMemory(numBytes);
- for (int i = 0; i < numHandles; i++) {
+ decoder.claimMemory(header.numBytes);
+ for (int i = 0; i < header.numHandles; i++) {
final handle = decoder.claimHandle();
try {
handle.close();
@@ -758,8 +813,9 @@
}
break;
case kAllocAbsent:
- if (numBytes != 0) throw FidlError('absent envelope with non-zero bytes');
- if (numHandles != 0)
+ if (header.numBytes != 0)
+ throw FidlError('absent envelope with non-zero bytes');
+ if (header.numHandles != 0)
throw FidlError('absent envelope with non-zero handles');
return null;
default:
@@ -907,15 +963,13 @@
}
class XUnionType<T extends XUnion> extends NullableFidlType<T> {
- const XUnionType({
- int encodedSize,
- this.members,
- this.ctor,
- bool nullable,
- }) : super(encodedSize: encodedSize, nullable: nullable);
+ const XUnionType(
+ {int encodedSize, this.members, this.ctor, bool nullable, this.flexible})
+ : super(encodedSize: encodedSize, nullable: nullable);
final Map<int, FidlType> members;
final XUnionFactory<T> ctor;
+ final bool flexible;
@override
void encode(Encoder encoder, T value, int offset) {
@@ -928,8 +982,16 @@
_encodeEnvelopeAbsent(encoder, envelopeOffset);
} else {
final int ordinal = value.$ordinal;
- final FidlType fieldType = members[ordinal];
- if (fieldType == null) throw FidlError('Bad xunion ordinal: $ordinal');
+ var fieldType = members[ordinal];
+ if (fieldType == null && flexible) {
+ UnknownRawData rawData = value.$data;
+ fieldType =
+ UnknownRawDataType(rawData.data.length, rawData.handles.length);
+ }
+ if (fieldType == null)
+ throw FidlError('Bad xunion ordinal: $ordinal',
+ FidlErrorCode.fidlStrictXUnionUnknownField);
+
encoder.encodeUint32(ordinal, offset);
_encodeEnvelopePresent(encoder, envelopeOffset, value.$data, fieldType);
}
@@ -947,10 +1009,15 @@
decoder, envelopeOffset, _envelopeMode.kMustBeAbsent, null);
return null;
} else {
- final fieldType = members[ordinal];
- if (fieldType == null) throw FidlError('Bad xunion ordinal: $ordinal');
- final field = _decodeEnvelope(
- decoder, envelopeOffset, _envelopeMode.kDisallowUnknown, fieldType);
+ var fieldType = members[ordinal];
+ if (fieldType == null && !flexible)
+ throw FidlError('Bad xunion ordinal: $ordinal',
+ FidlErrorCode.fidlStrictXUnionUnknownField);
+
+ final header = _decodeEnvelopeHeader(decoder, envelopeOffset);
+ fieldType ??= UnknownRawDataType(header.numBytes, header.numHandles);
+ final field = _decodeEnvelopeContent(
+ decoder, _envelopeMode.kDisallowUnknown, header, fieldType);
if (field == null) throw FidlError('Bad xunion: missing content');
return ctor(ordinal, field);
}
