Use switch-case for sub-VFS trees

Author: vrn-sn

runtime/src/modulepath.cpp

@@ -51,12 +51,11 @@ ModulePath::ModulePath(std::string filePath, size_t endRootDirectory, bool (*isA
     if (endRootDirectory == pathView.size() - 1)
     {
         realPathPrefix = pathView;
+        return;
     }
-    else
-    {
-        realPathPrefix = pathView.substr(0, endRootDirectory + 1);
-        modulePath = pathView.substr(endRootDirectory + 1);
-    }
+
+    realPathPrefix = pathView.substr(0, endRootDirectory + 1);
+    modulePath = pathView.substr(endRootDirectory + 1);
 }
 
 ResolvedRealPath ModulePath::getRealPath() const
@@ -84,6 +83,7 @@ ResolvedRealPath ModulePath::getRealPath() const
             }
         }
     }
+
     if (isADirectory(partialRealPath))
     {
         if (found)

runtime/src/require.cpp

@@ -34,7 +34,8 @@ static luarequire_NavigateResult convert(NavigationStatus status)
 {
     if (status == NavigationStatus::Success)
         return NAVIGATE_SUCCESS;
-    else if (status == NavigationStatus::Ambiguous)
+
+    if (status == NavigationStatus::Ambiguous)
         return NAVIGATE_AMBIGUOUS;
 
     return NAVIGATE_NOT_FOUND;

runtime/src/requirevfs.cpp

@@ -24,18 +24,13 @@ NavigationStatus RequireVfs::reset(lua_State* L, std::string_view requirerChunkn
         vfsType = VFSType::Std;
         return stdLibVfs.resetToPath(std::string(requirerChunkname.substr(1)));
     }
-    else
-    {
-        vfsType = VFSType::Disk;
-        if (requirerChunkname == "=stdin")
-        {
-            return fileVfs.resetToStdIn();
-        }
-        else if (!requirerChunkname.empty() && requirerChunkname[0] == '@')
-        {
-            return fileVfs.resetToPath(std::string(requirerChunkname.substr(1)));
-        }
-    }
+
+    vfsType = VFSType::Disk;
+    if (requirerChunkname == "=stdin")
+        return fileVfs.resetToStdIn();
+
+    if (!requirerChunkname.empty() && requirerChunkname[0] == '@')
+        return fileVfs.resetToPath(std::string(requirerChunkname.substr(1)));
 
     return NavigationStatus::NotFound;
 }
@@ -55,25 +50,35 @@ NavigationStatus RequireVfs::jumpToAlias(lua_State* L, std::string_view path)
         return NavigationStatus::Success;
     }
 
-    if (vfsType == VFSType::Disk)
+    switch (vfsType)
+    {
+    case VFSType::Disk:
         return fileVfs.resetToPath(std::string(path));
-    else if (vfsType == VFSType::Std)
+    case VFSType::Std:
         return stdLibVfs.resetToPath(std::string(path));
-
-    return NavigationStatus::NotFound;
+    default:
+        return NavigationStatus::NotFound;
+    }
 }
 
 NavigationStatus RequireVfs::toParent(lua_State* L)
 {
     NavigationStatus status;
-    if (vfsType == VFSType::Disk)
+
+    switch (vfsType)
+    {
+    case VFSType::Disk:
         status = fileVfs.toParent();
-    else if (vfsType == VFSType::Std)
+        break;
+    case VFSType::Std:
         status = stdLibVfs.toParent();
-    else if (vfsType == VFSType::Lute)
+        break;
+    case VFSType::Lute:
         luaL_error(L, "cannot get the parent of @lute");
-    else
+        break;
+    default:
         return NavigationStatus::NotFound;
+    }
 
     if (status == NavigationStatus::NotFound)
     {
@@ -91,24 +96,36 @@ NavigationStatus RequireVfs::toChild(lua_State* L, std::string_view name)
 {
     atFakeRoot = false;
 
-    if (vfsType == VFSType::Disk)
+    switch (vfsType)
+    {
+    case VFSType::Disk:
         return fileVfs.toChild(std::string(name));
-    else if (vfsType == VFSType::Std)
+    case VFSType::Std:
         return stdLibVfs.toChild(std::string(name));
-    else if (vfsType == VFSType::Lute)
+    case VFSType::Lute:
         luaL_error(L, "'%s' is not a lute library", std::string(name).c_str());
+        break;
+    default:
+        break;
+    }
 
     return NavigationStatus::NotFound;
 }
 
 bool RequireVfs::isModulePresent(lua_State* L) const
 {
-    if (vfsType == VFSType::Disk)
+    switch (vfsType)
+    {
+    case VFSType::Disk:
         return fileVfs.isModulePresent();
-    else if (vfsType == VFSType::Std)
+    case VFSType::Std:
         return stdLibVfs.isModulePresent();
-    else if (vfsType == VFSType::Lute)
+    case VFSType::Lute:
         luaL_error(L, "@lute is not requirable");
+        break;
+    default:
+        break;
+    }
 
     return false;
 }
@@ -117,55 +134,74 @@ std::string RequireVfs::getContents(lua_State* L, const std::string& loadname) c
 {
     std::optional<std::string> contents;
 
-    if (vfsType == VFSType::Disk)
+    switch (vfsType)
+    {
+    case VFSType::Disk:
         contents = fileVfs.getContents(loadname);
-    else if (vfsType == VFSType::Std)
+        break;
+    case VFSType::Std:
         contents = stdLibVfs.getContents(loadname);
+        break;
+    default:
+        break;
+    }
 
     return contents ? *contents : "";
 }
 
 std::string RequireVfs::getChunkname(lua_State* L) const
 {
-    if (vfsType == VFSType::Disk)
+    switch (vfsType)
+    {
+    case VFSType::Disk:
         return "@" + fileVfs.getFilePath();
-    else if (vfsType == VFSType::Std)
+    case VFSType::Std:
         return "@" + stdLibVfs.getIdentifier();
-
-    return "";
+    default:
+        return "";
+    }
 }
 
 std::string RequireVfs::getLoadname(lua_State* L) const
 {
-    if (vfsType == VFSType::Disk)
+    switch (vfsType)
+    {
+    case VFSType::Disk:
         return fileVfs.getAbsoluteFilePath();
-    else if (vfsType == VFSType::Std)
+    case VFSType::Std:
         return stdLibVfs.getIdentifier();
-
-    return "";
+    default:
+        return "";
+    }
 }
 
 std::string RequireVfs::getCacheKey(lua_State* L) const
 {
-    if (vfsType == VFSType::Disk)
+    switch (vfsType)
+    {
+    case VFSType::Disk:
         return fileVfs.getAbsoluteFilePath();
-    else if (vfsType == VFSType::Std)
+    case VFSType::Std:
         return stdLibVfs.getIdentifier();
-
-    return "";
+    default:
+        return "";
+    }
 }
 
 bool RequireVfs::isConfigPresent(lua_State* L) const
 {
     if (atFakeRoot)
         return true;
 
-    if (vfsType == VFSType::Disk)
-        return fileVfs.isConfigPresent();
-    else if (vfsType == VFSType::Std)
+    switch (vfsType)
+    {
+    case VFSType::Disk:
         return fileVfs.isConfigPresent();
-
-    return false;
+    case VFSType::Std:
+        return stdLibVfs.isConfigPresent();
+    default:
+        return false;
+    }
 }
 
 std::string RequireVfs::getConfig(lua_State* L) const
@@ -183,10 +219,17 @@ std::string RequireVfs::getConfig(lua_State* L) const
 
     std::optional<std::string> configContents;
 
-    if (vfsType == VFSType::Disk)
+    switch (vfsType)
+    {
+    case VFSType::Disk:
         configContents = fileVfs.getConfig();
-    else if (vfsType == VFSType::Std)
+        break;
+    case VFSType::Std:
         configContents = stdLibVfs.getConfig();
+        break;
+    default:
+        break;
+    }
 
     return configContents ? *configContents : "";
 }