commit ca1bf94c90697fcbc53310f6a991646e73f3181c
author Lei Zhang <antiagainst@google.com> Wed Apr 27 16:47:13 2016 -0400
committer Lei Zhang <antiagainst@google.com> Wed Apr 27 17:05:24 2016 -0400
tree 9a1d0bb9c2f811b136ce1c12e4214826d5888ce1
parent 45d391b7b17fcd2643f05d5505512c9e3c9ea06f

Use a single definition of ARRAY_SIZE to simplify code.

source/operand.cpp

diff --git a/source/operand.cpp b/source/operand.cpp
index f82c36e..2b225fb 100644
--- a/source/operand.cpp
+++ b/source/operand.cpp
@@ -29,11 +29,7 @@
 #include <assert.h>
 #include <string.h>
 
-// Evaluates to the number of elements of array A.
-// If we could use constexpr, then we could make this a template function.
-// If the source arrays were std::array, then we could have used
-// std::array::size.
-#define ARRAY_SIZE(A) (static_cast<uint32_t>(sizeof(A) / sizeof(A[0])))
+#include "macro.h"
 
 // Pull in operand info tables automatically generated from JSON grammar.
 namespace v1_0 {
@@ -78,16 +74,14 @@
   if (!name || !pEntry) return SPV_ERROR_INVALID_POINTER;
 
   for (uint64_t typeIndex = 0; typeIndex < table->count; ++typeIndex) {
-    if (type == table->types[typeIndex].type) {
-      for (uint64_t operandIndex = 0;
-           operandIndex < table->types[typeIndex].count; ++operandIndex) {
-        if (nameLength ==
-                strlen(table->types[typeIndex].entries[operandIndex].name) &&
-            !strncmp(table->types[typeIndex].entries[operandIndex].name, name,
-                     nameLength)) {
-          *pEntry = &table->types[typeIndex].entries[operandIndex];
-          return SPV_SUCCESS;
-        }
+    const auto& group = table->types[typeIndex];
+    if (type != group.type) continue;
+    for (uint64_t index = 0; index < group.count; ++index) {
+      const auto& entry = group.entries[index];
+      if (nameLength == strlen(entry.name) &&
+          !strncmp(entry.name, name, nameLength)) {
+        *pEntry = &entry;
+        return SPV_SUCCESS;
       }
     }
   }
@@ -103,13 +97,13 @@
   if (!pEntry) return SPV_ERROR_INVALID_POINTER;
 
   for (uint64_t typeIndex = 0; typeIndex < table->count; ++typeIndex) {
-    if (type == table->types[typeIndex].type) {
-      for (uint64_t operandIndex = 0;
-           operandIndex < table->types[typeIndex].count; ++operandIndex) {
-        if (value == table->types[typeIndex].entries[operandIndex].value) {
-          *pEntry = &table->types[typeIndex].entries[operandIndex];
-          return SPV_SUCCESS;
-        }
+    const auto& group = table->types[typeIndex];
+    if (type != group.type) continue;
+    for (uint64_t index = 0; index < group.count; ++index) {
+      const auto& entry = group.entries[index];
+      if (value == entry.value) {
+        *pEntry = &entry;
+        return SPV_SUCCESS;
       }
     }
   }