commit 5c69deb2a90d487d7b57618eb07a34c85c8112e7
author Casey Dahlin <sadmac@google.com> Thu Oct 01 14:44:12 2015 -0700
committer Casey Dahlin <sadmac@google.com> Thu Oct 01 14:44:12 2015 -0700
tree abb8d4375563217b7f0fabdce5767da6a8f88e13
parent 70078e6d2b1afd3d1a5f4370fd4e116e6d0510e1

Replace method_type with AidlMethod

As usual, we're leaving most of the same members in place and public. However,
we have removed the linked list pointer and switched to std::vector for lists
of methods.

Change-Id: Id0aa55340e2c56bfa1001c6c8a8343bb4815d38e
Test: unit tests
Bug: 24410295
Signed-off-by: Casey Dahlin <sadmac@google.com>

aidl.cpp

diff --git a/aidl.cpp b/aidl.cpp
index c88c9de..11a4fea 100644
--- a/aidl.cpp
+++ b/aidl.cpp
@@ -204,8 +204,8 @@
                 interface_type* c,
                 TypeNamespace* types) {
   int err = 0;
-  map<string,method_type*> method_names;
-  for (method_type* m = c->interface_items; m; m = m->next) {
+  set<string> method_names;
+  for (const auto& m : *c->methods) {
     if (!types->AddContainerType(m->type->type.data) ||
         !types->IsValidReturnType(*m->type, filename)) {
       err = 1;  // return type is invalid
@@ -221,7 +221,7 @@
 
     // prevent duplicate methods
     if (method_names.find(m->name.data) == method_names.end()) {
-      method_names[m->name.data] = m;
+      method_names.insert(m->name.data);
     } else {
       cerr << filename << ":" << m->name.lineno
            << " attempt to redefine method " << m->name.data << "," << endl
@@ -449,15 +449,14 @@
 }
 
 int check_and_assign_method_ids(const char * filename,
-                                method_type* first_item) {
+                                const std::vector<std::unique_ptr<AidlMethod>>& items) {
     // Check whether there are any methods with manually assigned id's and any that are not.
     // Either all method id's must be manually assigned or all of them must not.
     // Also, check for duplicates of user set id's and that the id's are within the proper bounds.
     set<int> usedIds;
-    method_type* item = first_item;
     bool hasUnassignedIds = false;
     bool hasAssignedIds = false;
-    while (item != NULL) {
+    for (const auto& item : items) {
         if (item->hasId) {
             hasAssignedIds = true;
             item->assigned_id = atoi(item->id.data);
@@ -490,16 +489,13 @@
                     filename);
             return 1;
         }
-        item = item->next;
     }
 
     // In the case that all methods have unassigned id's, set a unique id for them.
     if (hasUnassignedIds) {
         int newId = 0;
-        item = first_item;
-        while (item != NULL) {
+        for (const auto& item : items) {
             item->assigned_id = newId++;
-            item = item->next;
         }
     }
 
@@ -593,7 +589,7 @@
 
   // assign method ids and validate.
   err |= check_and_assign_method_ids(input_file_name.c_str(),
-                                     interface->interface_items);
+                                     *interface->methods);
 
   // after this, there shouldn't be any more errors because of the
   // input.