Permalink
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Browse files
Changes sugested by dan200
- Loading branch information
|
@@ -113,17 +113,17 @@ 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 |
|
|
|
|
|
local w,h = term.getSize() |
|
|
local nMaxLen = w / 8 |
|
|
for n, t in ipairs( tAll ) do |
|
|
if type(t) == "table" then |
|
|
for n, sItem in pairs(t) do |
|
|
if type( sItem ) ~= "number" and type( sItem ) ~= "string" then |
|
|
error( "textutils.tabulate/pagedTabulate only allow strings and numbers in the table", 3 ) |
|
|
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 |
|
|