commit 737080baf85882c45bb322ee2191ae5fd9e1283a
author Andreas Huber <andih@google.com> Tue Aug 02 15:38:04 2016 -0700
committer Iliyan Malchev <malchev@google.com> Sat Aug 06 09:02:59 2016 -0700
tree 4b4d8c1f6b1a99430688bdb13cb9cf65a8a5f463
parent b82318c682ec581edd5cc31d04ede1e6cbf0eaaf

Keeping track of imported names, resolve enum storage types, some finetuning.

Type.cpp

diff --git a/Type.cpp b/Type.cpp
index 5f3c462..548e425 100644
--- a/Type.cpp
+++ b/Type.cpp
@@ -17,6 +17,10 @@
     return false;
 }
 
+const ScalarType *Type::resolveToScalarType() const {
+    return NULL;
+}
+
 std::string Type::getCppType(StorageMode, std::string *) const {
     CHECK(!"Should not be here");
     return std::string();
@@ -64,6 +68,12 @@
             out << "if (_aidl_err != ::android::OK) { break; }\n\n";
             break;
         }
+
+        case ErrorMode_Return:
+        {
+            out << "if (_aidl_err != ::android::OK) { return _aidl_err; }\n\n";
+            break;
+        }
     }
 }
 
@@ -74,16 +84,24 @@
             out << "goto _aidl_error;\n";
             break;
         }
+
         case ErrorMode_Break:
         {
             out << "break;\n";
             break;
         }
+
         case ErrorMode_Ignore:
         {
             out << "/* ignoring _aidl_error! */";
             break;
         }
+
+        case ErrorMode_Return:
+        {
+            out << "return _aidl_err;\n";
+            break;
+        }
     }
 }