LUA: Use the XOREOS_FALLTHROUGH macro to mark fallthroughs

xoreos · May 25, 2018 · 9b85848 · 9b85848
1 parent f037649
commit 9b85848
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 4 deletions.
diff --git a/lua/ldebug.cpp b/lua/ldebug.cpp
@@ -10,6 +10,8 @@
 
 #define ldebug_c
 
+#include "src/common/fallthrough.h"
+
 #include "lua.h"
 
 #include "lapi.h"
@@ -376,10 +378,10 @@ static Instruction luaG_symbexec (const Proto *pt, int lastpc, int reg) {
       case OP_TFORLOOP:
         checkreg(pt, a+c+5);
         if (reg >= a) last = pc;  /* affect all registers above base */
-        // Fallthrough
+        XOREOS_FALLTHROUGH;
       case OP_FORLOOP:
         checkreg(pt, a+2);
-        // Fallthrough
+        XOREOS_FALLTHROUGH;
       case OP_JMP: {
         int dest = pc+1+b;
 	check(0 <= dest && dest < pt->sizecode);

diff --git a/lua/lstrlib.cpp b/lua/lstrlib.cpp
@@ -13,6 +13,8 @@
 
 #define lstrlib_c
 
+#include "src/common/fallthrough.h"
+
 #include "lua.h"
 
 #include "lauxlib.h"
@@ -731,7 +733,7 @@ static int str_format (lua_State *L) {
             break;
           }
         }
-        // Fallthrough
+          break;
         default: {  /* also treat cases `pnLlh' */
           return luaL_error(L, "invalid option to `format'");
         }

diff --git a/lua/ltable.cpp b/lua/ltable.cpp
@@ -25,6 +25,8 @@
 
 #define ltable_c
 
+#include "src/common/fallthrough.h"
+
 #include "lua.h"
 
 #include "ldebug.h"
@@ -476,7 +478,7 @@ const TObject *luaH_get (Table *t, const TObject *key) {
       if (cast(lua_Number, k) == nvalue(key))  /* is an integer index? */
         return luaH_getnum(t, k);  /* use specialized version */
     }
-    // Fallthrough
+    XOREOS_FALLTHROUGH;
     default: return luaH_getany(t, key);
   }
 }