Formatted entire codebase of SQUISH.LUA

Author: Lethja

util/SQUISH.LUA

@@ -2,46 +2,45 @@
 
 local function Squish(fileName)
     local f, e = io.open(fileName, "r")
+
     if not f then
         print(e)
         return
     end
+
     local function tokenizeFile(file)
         local data, tokens, pos = file:read("all"), {}, 1
 
-        if data:sub(1, 2) == "#!" then
+        if data:sub(1, 2) == "#!" then -- Handle shebang if there is one
             local lineEnd = data:find("\n", 1) or #data + 1
-            table.insert(tokens, {type = "shebang", value = data:sub(1, lineEnd - 1)})
+            table.insert(tokens, { type = "shebang", value = data:sub(1, lineEnd - 1) })
             pos = lineEnd
         end
 
         while pos <= #data do
             local c = data:sub(pos, pos)
 
-            -- Handle comments
-            if c == "-" and data:sub(pos, pos + 1) == "--" then
+            if c == "-" and data:sub(pos, pos + 1) == "--" then -- Handle comments
                 local commentStart = pos
-                -- Check for multi-line comment
-                if data:sub(pos + 2, pos + 3) == "[[" then
+
+                if data:sub(pos + 2, pos + 3) == "[[" then -- Check for multi-line comment
                     local commentEnd = data:find("]]", pos + 4, true)
+
                     if commentEnd then
-                        table.insert(tokens, {type = "comment", value = data:sub(commentStart, commentEnd + 1)})
+                        table.insert(tokens, { type = "comment", value = data:sub(commentStart, commentEnd + 1) })
                         pos = commentEnd + 2
-                    else
-                        -- Unclosed comment, treat as single line
+                    else -- Unclosed comment, treat as single line
                         local lineEnd = data:find("\n", pos) or #data + 1
-                        table.insert(tokens, {type = "comment", value = data:sub(commentStart, lineEnd - 1)})
+                        table.insert(tokens, { type = "comment", value = data:sub(commentStart, lineEnd - 1) })
                         pos = lineEnd
                     end
-                    -- Standard single-line comment
-                else
+                else -- Standard single-line comment
                     local lineEnd = data:find("\n", pos) or #data + 1
-                    table.insert(tokens, {type = "comment", value = data:sub(commentStart, lineEnd - 1)})
+                    table.insert(tokens, { type = "comment", value = data:sub(commentStart, lineEnd - 1) })
                     pos = lineEnd
                 end
 
-            -- Handle quoted strings
-            elseif c == '"' or c == "'" then
+            elseif c == '"' or c == "'" then -- Handle quoted strings
                 local stringStart = pos
                 pos = pos + 1
                 while pos <= #data do
@@ -54,31 +53,28 @@ local function Squish(fileName)
                     end
                 end
                 if pos <= #data then
-                    table.insert(tokens, {type = "string", value = data:sub(stringStart, pos)})
+                    table.insert(tokens, { type = "string", value = data:sub(stringStart, pos) })
                     pos = pos + 1
-                else
-                    -- Unclosed string, treat as code (this is an error in Lua)
-                    table.insert(tokens, {type = "code", value = data:sub(stringStart, pos - 1)})
+                else -- Unclosed string, treat as code (this is an error in Lua)
+                    table.insert(tokens, { type = "code", value = data:sub(stringStart, pos - 1) })
                 end
 
-            -- Handle bracket strings
-            elseif c == "[" and data:sub(pos, pos + 1):match("%[=*%[") then
+            elseif c == "[" and data:sub(pos, pos + 1):match("%[=*%[") then -- Handle bracket strings
                 local stringStart = pos
                 local openBracket = data:match("%[=*%[", pos)
                 local closeBracket = openBracket:gsub("%[", "]")
                 local stringEnd = data:find(closeBracket, pos + #openBracket, true)
 
                 if stringEnd then
-                    table.insert(tokens, {type = "string", value = data:sub(stringStart, stringEnd + #closeBracket - 1)})
+                    table.insert(tokens, { type = "string", value = data:sub(stringStart, stringEnd + #closeBracket - 1) })
                     pos = stringEnd + #closeBracket
                 else
                     -- Unclosed long bracket, treat as code (this is an error in Lua)
-                    table.insert(tokens, {type = "code", value = data:sub(stringStart, pos)})
+                    table.insert(tokens, { type = "code", value = data:sub(stringStart, pos) })
                     pos = pos + 1
                 end
 
-            -- Handle normal code
-            else
+            else -- Handle normal code
                 local codeStart = pos
                 while pos <= #data do
                     local next_char = data:sub(pos, pos)
@@ -91,7 +87,7 @@ local function Squish(fileName)
                 end
 
                 if codeStart < pos then
-                    table.insert(tokens, {type = "code", value = data:sub(codeStart, pos - 1)})
+                    table.insert(tokens, { type = "code", value = data:sub(codeStart, pos - 1) })
                 end
             end
         end
@@ -119,13 +115,12 @@ local function Squish(fileName)
     -- Include the shebang on its own line if there is one
     local data = #tokens > 0 and tokens[1].type == "shebang" and table.remove(tokens, 1).value .. '\n' or ""
 
-    -- Concatenate data together
-    for _, token in ipairs(tokens) do
+    for _, token in ipairs(tokens) do -- Drop comments and concatenate code and strings back together
         if token.type ~= "comment" then
             local function pad()
                 local last, start = #data > 1 and data:sub(-1, -1), #token.value > 1 and token.value:sub(1, 1)
-                if (last and (last:find("%a") or last:find("%d")))
-                and (start and (start:find("%a") or start:find("%d"))) then
+                local function needsPadding(x) return x and (x:find("%a") or x:find("%d")) end
+                if needsPadding(last) and needsPadding(start) then
                     return " "
                 end
                 return ""
@@ -149,11 +144,13 @@ local function Squish(fileName)
 end
 
 if #arg < 1 then
-    print(arg[0],[[[LUA SCRIPT...]
+    print(arg[0], [[[LUA SCRIPT...]
 
 Removes comments, lines and whitespace from Lua scripts to save disk space.
 Always backup any script before running it with ]] .. arg[0])
     os.exit(1)
 end
 
-for _,v in ipairs(arg) do Squish(v) end
+for _, v in ipairs(arg) do
+    Squish(v)
+end