commit 59c2159058de52d6d563c26a1df77b6a2b1c4dda
author Pascal Perez <pascallouis@google.com> Thu Feb 28 17:29:41 2019 -0500
committer Pascal Perez <pascallouis@google.com> Fri Mar 01 04:28:11 2019 +0000
tree ddafcb9f9cf4108269a24194fc4e25a1a4f90e5d
parent 770a9b478a61b078d093e4938cc338df4af14d03

[fidl][dart] Reusing the NullableFidlType

Test: fx shell runtests /pkgfs/packages/fidl_bindings_test/0/test
Change-Id: I1dbcfb5f27ceece619eafece034945fe3cefe31a

public/dart/fidl/lib/src/types.dart

diff --git a/public/dart/fidl/lib/src/types.dart b/public/dart/fidl/lib/src/types.dart
index 3503033..c1fe59b 100644
--- a/public/dart/fidl/lib/src/types.dart
+++ b/public/dart/fidl/lib/src/types.dart
@@ -444,12 +444,10 @@
 // We could also explore having a Handle be itself a subtype of HandleWrapper
 // to further standardize handling of handles.
 
-class HandleType extends FidlType<Handle> {
+class HandleType extends NullableFidlType<Handle> {
   const HandleType({
-    this.nullable,
-  }) : super(encodedSize: 4);
-
-  final bool nullable;
+    bool nullable,
+  }) : super(encodedSize: 4, nullable: nullable);
 
   @override
   void encode(Encoder encoder, Handle value, int offset) {
@@ -461,12 +459,10 @@
       _decodeHandle(decoder, offset, nullable);
 }
 
-class ChannelType extends FidlType<Channel> {
+class ChannelType extends NullableFidlType<Channel> {
   const ChannelType({
-    this.nullable,
-  }) : super(encodedSize: 4);
-
-  final bool nullable;
+    bool nullable,
+  }) : super(encodedSize: 4, nullable: nullable);
 
   @override
   void encode(Encoder encoder, Channel value, int offset) {
@@ -478,12 +474,10 @@
       new Channel(_decodeHandle(decoder, offset, nullable));
 }
 
-class EventPairType extends FidlType<EventPair> {
+class EventPairType extends NullableFidlType<EventPair> {
   const EventPairType({
-    this.nullable,
-  }) : super(encodedSize: 4);
-
-  final bool nullable;
+    bool nullable,
+  }) : super(encodedSize: 4, nullable: nullable);
 
   @override
   void encode(Encoder encoder, EventPair value, int offset) {
@@ -495,12 +489,10 @@
       new EventPair(_decodeHandle(decoder, offset, nullable));
 }
 
-class SocketType extends FidlType<Socket> {
+class SocketType extends NullableFidlType<Socket> {
   const SocketType({
-    this.nullable,
-  }) : super(encodedSize: 4);
-
-  final bool nullable;
+    bool nullable,
+  }) : super(encodedSize: 4, nullable: nullable);
 
   @override
   void encode(Encoder encoder, Socket value, int offset) {
@@ -512,12 +504,10 @@
       new Socket(_decodeHandle(decoder, offset, nullable));
 }
 
-class VmoType extends FidlType<Vmo> {
+class VmoType extends NullableFidlType<Vmo> {
   const VmoType({
-    this.nullable,
-  }) : super(encodedSize: 4);
-
-  final bool nullable;
+    bool nullable,
+  }) : super(encodedSize: 4, nullable: nullable);
 
   @override
   void encode(Encoder encoder, Vmo value, int offset) {
@@ -529,12 +519,10 @@
       new Vmo(_decodeHandle(decoder, offset, nullable));
 }
 
-class InterfaceHandleType<T> extends FidlType<InterfaceHandle<T>> {
+class InterfaceHandleType<T> extends NullableFidlType<InterfaceHandle<T>> {
   const InterfaceHandleType({
-    this.nullable,
-  }) : super(encodedSize: 4);
-
-  final bool nullable;
+    bool nullable,
+  }) : super(encodedSize: 4, nullable: nullable);
 
   @override
   void encode(Encoder encoder, InterfaceHandle<T> value, int offset) {
@@ -548,12 +536,10 @@
   }
 }
 
-class InterfaceRequestType<T> extends FidlType<InterfaceRequest<T>> {
+class InterfaceRequestType<T> extends NullableFidlType<InterfaceRequest<T>> {
   const InterfaceRequestType({
-    this.nullable,
-  }) : super(encodedSize: 4);
-
-  final bool nullable;
+    bool nullable,
+  }) : super(encodedSize: 4, nullable: nullable);
 
   @override
   void encode(Encoder encoder, InterfaceRequest<T> value, int offset) {
@@ -567,14 +553,13 @@
   }
 }
 
-class StringType extends FidlType<String> {
+class StringType extends NullableFidlType<String> {
   const StringType({
     this.maybeElementCount,
-    this.nullable,
-  }) : super(encodedSize: 16);
+    bool nullable,
+  }) : super(encodedSize: 16, nullable: nullable);
 
   final int maybeElementCount;
-  final bool nullable;
 
   // See fidl_string_t.
 
@@ -1008,16 +993,15 @@
   }
 }
 
-class VectorType<T extends List> extends FidlType<T> {
+class VectorType<T extends List> extends NullableFidlType<T> {
   const VectorType({
     this.element,
     this.maybeElementCount,
-    this.nullable,
-  }) : super(encodedSize: 16);
+    bool nullable,
+  }) : super(encodedSize: 16, nullable: nullable);
 
   final FidlType element;
   final int maybeElementCount;
-  final bool nullable;
 
   @override
   void encode(Encoder encoder, T value, int offset) {