mirrors/CC-Tweaked
1
0
Fork 0
mirror of https://github.com/SquidDev-CC/CC-Tweaked synced 2025-02-09 07:30:04 +00:00
Code Issues Releases Wiki Activity

Merge pull request #412 from Wilma456/ComputerCraft-1/textfix

Browse Source 
Add Check to textutils.tabulate/pagedTabulate
This commit is contained in:
SquidDev 2017-11-15 16:58:13 +00:00
commit d7301ff15e
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/main/resources/assets/computercraft/lua/rom/apis/textutils.lua
View File

@ -113,7 +113,7 @@ local function tabulateCommon( bPaged, ... )
local tAll = { ... }
for k,v in ipairs( tAll ) do
if type( v ) ~= "number" and type( v ) ~= "table" then
error( "bad argument #"..k.." (expected number/table, got " .. type( v ) .. ")", 3 )
error( "bad argument #"..k.." (expected number or table, got " .. type( v ) .. ")", 3 )
end
end
@ -121,7 +121,10 @@ local function tabulateCommon( bPaged, ... )
local nMaxLen = w / 8
for n, t in ipairs( tAll ) do
if type(t) == "table" then
for n, sItem in pairs(t) do
for nu, sItem in pairs(t) do
if type( sItem ) ~= "string" then
error( "bad argument #"..n.."."..nu.." (expected string, got " .. type( sItem ) .. ")", 3 )
end
nMaxLen = math.max( string.len( sItem ) + 1, nMaxLen )
end
end