commit 57dbe24bcb8f4509a876e8445c78d9504d7e616a
author Casey Dahlin <sadmac@google.com> Fri Dec 04 11:44:02 2015 -0800
committer Casey Dahlin <sadmac@google.com> Tue Dec 15 13:01:23 2015 -0800
tree e61e854a15ff632f2ff75d152ffa2e3eabbf5b5a
parent 7621d4d0592fbf3fb396d0c092a8e41c3c8215cd

Add support for @nullable annotation

Using this annotation will now cause C++ types to be wrapped in
unique_ptr, and by extension be capable of handling null values.

Support extends to all arrays, Strings, Lists, and Parcelables.

Change-Id: I148a3666279c2badcba097b8925e55f8fcecb9c2
Test: Unit tests pass
Bug: 25969194
Signed-off-by: Casey Dahlin <sadmac@google.com>

aidl.cpp

diff --git a/aidl.cpp b/aidl.cpp
index 6ca7bd5..c279a41 100644
--- a/aidl.cpp
+++ b/aidl.cpp
@@ -193,16 +193,15 @@
   for (const auto& m : c->GetMethods()) {
     bool oneway = m->IsOneway() || c->IsOneway();
 
-    if (!types->MaybeAddContainerType(m->GetType().GetName()) ||
-        !types->IsValidReturnType(m->GetType(), filename)) {
+    if (!types->MaybeAddContainerType(m->GetType().GetName())) {
       err = 1;  // return type is invalid
     }
 
     const ValidatableType* return_type =
-        types->GetValidatableType(m->GetType().GetName());
+        types->GetReturnType(m->GetType(), filename);
 
-    if (m->GetType().IsArray()) {
-      return_type = return_type->ArrayType();
+    if (!return_type) {
+      err = 1;
     }
 
     m->GetMutableType()->SetLanguageType(return_type);
@@ -216,16 +215,15 @@
 
     int index = 1;
     for (const auto& arg : m->GetArguments()) {
-      if (!types->MaybeAddContainerType(arg->GetType().GetName()) ||
-          !types->IsValidArg(*arg, index, filename)) {
+      if (!types->MaybeAddContainerType(arg->GetType().GetName())) {
         err = 1;
       }
 
       const ValidatableType* arg_type =
-          types->GetValidatableType(arg->GetType().GetName());
+          types->GetArgType(*arg, index, filename);
 
-      if (arg->GetType().IsArray()) {
-        arg_type = arg_type->ArrayType();
+      if (!arg_type) {
+        err = 1;
       }
 
       arg->GetMutableType()->SetLanguageType(arg_type);