Replace table iterations with new for-loop syntax

Didn't even know this existed!
ckafi · Mar 28, 2015 · f01c268 · f01c268
1 parent 79f8ce3
commit f01c268
Show file tree

Hide file tree

Showing 9 changed files with 27 additions and 31 deletions.
diff --git a/cpp/Reader.cpp b/cpp/Reader.cpp
@@ -174,18 +174,16 @@ static malValuePtr readAtom(Tokeniser& tokeniser)
         { "~@",  "splice-unquote" },
         { "~",   "unquote" },
     };
-    const ReaderMacro* macroTableEnd = macroTable + ARRAY_SIZE(macroTable);
 
     struct Constant {
         const char* token;
         malValuePtr value;
     };
-    Constant constTable[] = {
+    Constant constantTable[] = {
         { "false",  mal::falseValue()  },
         { "nil",    mal::nilValue()          },
         { "true",   mal::trueValue()   },
     };
-    const Constant* constTableEnd = constTable + ARRAY_SIZE(constTable);
 
     String token = tokeniser.next();
     if (token[0] == '"') {
@@ -200,14 +198,14 @@ static malValuePtr readAtom(Tokeniser& tokeniser)
         // Note that meta and value switch places
         return mal::list(mal::symbol("with-meta"), value, meta);
     }
-    for (Constant* it = constTable; it != constTableEnd; ++it) {
-        if (token == it->token) {
-            return it->value;
+    for (auto &constant : constantTable) {
+        if (token == constant.token) {
+            return constant.value;
         }
     }
-    for (ReaderMacro *it = macroTable; it < macroTableEnd; ++it) {
-        if (token == it->token) {
-            return processMacro(tokeniser, it->symbol);
+    for (auto &macro : macroTable) {
+        if (token == macro.token) {
+            return processMacro(tokeniser, macro.symbol);
         }
     }
     if (std::regex_match(token, intRegex)) {

diff --git a/cpp/Types.h b/cpp/Types.h
@@ -6,8 +6,6 @@
 #include <exception>
 #include <map>
 
-#define ARRAY_SIZE(a)   (sizeof(a)/(sizeof(*(a))))
-
 class malEmptyInputException : public std::exception { };
 
 class malValue : public RefCounted {

diff --git a/cpp/step4_if_fn_do.cpp b/cpp/step4_if_fn_do.cpp
@@ -149,8 +149,8 @@ static const char* malFunctionTable[] = {
 };
 
 static void installFunctions(malEnvPtr env) {
-    for (int i = 0; i < ARRAY_SIZE(malFunctionTable); i++) {
-        rep(malFunctionTable[i], env);
+    for (auto &function : malFunctionTable) {
+        rep(function, env);
     }
 }
 

diff --git a/cpp/step5_tco.cpp b/cpp/step5_tco.cpp
@@ -156,8 +156,8 @@ static const char* malFunctionTable[] = {
 };
 
 static void installFunctions(malEnvPtr env) {
-    for (int i = 0; i < ARRAY_SIZE(malFunctionTable); i++) {
-        rep(malFunctionTable[i], env);
+    for (auto &function : malFunctionTable) {
+        rep(function, env);
     }
 }
 

diff --git a/cpp/step6_file.cpp b/cpp/step6_file.cpp
@@ -181,8 +181,8 @@ static const char* malFunctionTable[] = {
 };
 
 static void installFunctions(malEnvPtr env) {
-    for (int i = 0; i < ARRAY_SIZE(malFunctionTable); i++) {
-        rep(malFunctionTable[i], env);
+    for (auto &function : malFunctionTable) {
+        rep(function, env);
     }
 }
 

diff --git a/cpp/step7_quote.cpp b/cpp/step7_quote.cpp
@@ -239,8 +239,8 @@ static const char* malFunctionTable[] = {
 };
 
 static void installFunctions(malEnvPtr env) {
-    for (int i = 0; i < ARRAY_SIZE(malFunctionTable); i++) {
-        rep(malFunctionTable[i], env);
+    for (auto &function : malFunctionTable) {
+        rep(function, env);
     }
 }
 

diff --git a/cpp/step8_macros.cpp b/cpp/step8_macros.cpp
@@ -282,8 +282,8 @@ static const char* macroTable[] = {
 
 static void installMacros(malEnvPtr env)
 {
-    for (int i = 0; i < ARRAY_SIZE(macroTable); i++) {
-        rep(macroTable[i], env);
+    for (auto &macro : macroTable) {
+        rep(macro, env);
     }
 }
 
@@ -298,8 +298,8 @@ static const char* malFunctionTable[] = {
 };
 
 static void installFunctions(malEnvPtr env) {
-    for (int i = 0; i < ARRAY_SIZE(malFunctionTable); i++) {
-        rep(malFunctionTable[i], env);
+    for (auto &function : malFunctionTable) {
+        rep(function, env);
     }
 }
 

diff --git a/cpp/step9_try.cpp b/cpp/step9_try.cpp
@@ -323,8 +323,8 @@ static const char* macroTable[] = {
 
 static void installMacros(malEnvPtr env)
 {
-    for (int i = 0; i < ARRAY_SIZE(macroTable); i++) {
-        rep(macroTable[i], env);
+    for (auto &macro : macroTable) {
+        rep(macro, env);
     }
 }
 
@@ -341,8 +341,8 @@ static const char* malFunctionTable[] = {
 };
 
 static void installFunctions(malEnvPtr env) {
-    for (int i = 0; i < ARRAY_SIZE(malFunctionTable); i++) {
-        rep(malFunctionTable[i], env);
+    for (auto &function : malFunctionTable) {
+        rep(function, env);
     }
 }
 

diff --git a/cpp/stepA_mal.cpp b/cpp/stepA_mal.cpp
@@ -323,8 +323,8 @@ static const char* macroTable[] = {
 
 static void installMacros(malEnvPtr env)
 {
-    for (int i = 0; i < ARRAY_SIZE(macroTable); i++) {
-        rep(macroTable[i], env);
+    for (auto &macro : macroTable) {
+        rep(macro, env);
     }
 }
 
@@ -352,7 +352,7 @@ static const char* malFunctionTable[] = {
 };
 
 static void installFunctions(malEnvPtr env) {
-    for (int i = 0; i < ARRAY_SIZE(malFunctionTable); i++) {
-        rep(malFunctionTable[i], env);
+    for (auto &function : malFunctionTable) {
+        rep(function, env);
     }
 }