commit c5afb404a8e71475993f70239df09209fa428d25
author Casey Dahlin <sadmac@google.com> Tue Mar 01 13:54:05 2016 -0800
committer Casey Dahlin <sadmac@google.com> Thu Mar 03 20:58:56 2016 +0000
tree ae78d579547130fe5f142c7f6647087c954b0025
parent 5f848524b89bc0604c418cbc7f2c39f7d70819c4

Propagate interface annotations to methods

Change-Id: I85f9686e4b5df7df0d9fb77e6a1b50a93ff3e2d7
Test: Unit tests pass
Bug: 26911508

aidl.cpp

diff --git a/aidl.cpp b/aidl.cpp
index 6cc25a0..c60626f 100644
--- a/aidl.cpp
+++ b/aidl.cpp
@@ -189,6 +189,12 @@
                 TypeNamespace* types) {
   int err = 0;
 
+  if (c->IsUtf8() && c->IsUtf8InCpp()) {
+    cerr << filename << ":" << c->GetLine()
+         << "Interface cannot be marked as both @utf8 and @utf8InCpp";
+    err = 1;
+  }
+
   // Has to be a pointer due to deleting copy constructor. No idea why.
   map<string, const AidlMethod*> method_names;
   for (const auto& m : c->GetMethods()) {
@@ -199,7 +205,7 @@
     }
 
     const ValidatableType* return_type =
-        types->GetReturnType(m->GetType(), filename);
+        types->GetReturnType(m->GetType(), filename, *c);
 
     if (!return_type) {
       err = 1;
@@ -221,7 +227,7 @@
       }
 
       const ValidatableType* arg_type =
-          types->GetArgType(*arg, index, filename);
+          types->GetArgType(*arg, index, filename, *c);
 
       if (!arg_type) {
         err = 1;