mirrors/CC-Tweaked
1
0
Fork 0
mirror of https://github.com/SquidDev-CC/CC-Tweaked synced 2025-01-11 18:00:29 +00:00
Code Issues Releases Wiki Activity

Merge pull request #376 from CrazedProgrammer/fix-argument-checks

Browse Source 
Fix argument checks made in PR #304 and #338
This commit is contained in:
Daniel Ratcliffe 2017-07-25 23:13:34 +01:00 committed by GitHub
commit df1c8e22b8
2 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,5 +1,8 @@
function slowWrite( sText, nRate )
if nRate ~= nil and type( nRate ) ~= "number" then
error( "bad argument #2 (expected number, got " .. type( nRate ) .. ")", 2 )
end
nRate = nRate or 20
if nRate < 0 then
error( "Rate must be positive", 2 )
@ -20,7 +23,7 @@ function slowWrite( sText, nRate )
end
function slowPrint( sText, nRate )
slowWrite( sText, nRate)
slowWrite( sText, nRate )
print()
end
@ -329,11 +332,11 @@ function unserialize( s )
end
function serializeJSON( t, bNBTStyle )
if type( t ) ~= "string" then
error( "bad argument #1 (expected string, got " .. type( t ) .. ")", 2 )
if type( t ) ~= "table" and type( t ) ~= "string" and type( t ) ~= "number" and type( t ) ~= "boolean" then
error( "bad argument #1 (expected table/string/number/boolean, got " .. type( t ) .. ")", 2 )
end
if bNBTStyle ~= nil and type( bNBTStyle ) ~= "boolean" then
error( "bad argument #2 (expected boolean, got " .. type( bNBTStyle ) .. ")", 2 )
error( "bad argument #2 (expected boolean, got " .. type( bNBTStyle ) .. ")", 2 )
end
local tTracking = {}
return serializeJSONImpl( t, tTracking, bNBTStyle or false )
@ -367,7 +370,7 @@ function complete( sSearchText, tSearchTable )
if type( sSearchText ) ~= "string" then
error( "bad argument #1 (expected string, got " .. type( sSearchText ) .. ")", 2 )
end
if type( tSearchTable ) ~= "table" then
if tSearchTable ~= nil and type( tSearchTable ) ~= "table" then
error( "bad argument #2 (expected table, got " .. type( tSearchTable ) .. ")", 2 )
end

4
src/main/resources/assets/computercraft/lua/rom/apis/window.lua
View File

@ -413,8 +413,8 @@ function create( parent, nX, nY, nWidth, nHeight, bStartVisible )
function window.reposition( nNewX, nNewY, nNewWidth, nNewHeight )
if type( nNewX ) ~= "number" then error( "bad argument #1 (expected number, got " .. type( nNewX ) .. ")", 2 ) end
if type( nNewY ) ~= "number" then error( "bad argument #2 (expected number, got " .. type( nNewY ) .. ")", 2 ) end
if type( nNewWidth ) ~= "number" then error( "bad argument #3 (expected number, got " .. type( nNewWidth ) .. ")", 2 ) end
if type( nNewHeight ) ~= "number" then error( "bad argument #4 (expected number, got " .. type( nNewHeight ) .. ")", 2 ) end
if nNewWidth ~= nil and type( nNewWidth ) ~= "number" then error( "bad argument #3 (expected number, got " .. type( nNewWidth ) .. ")", 2 ) end
if nNewHeight ~= nil and type( nNewHeight ) ~= "number" then error( "bad argument #4 (expected number, got " .. type( nNewHeight ) .. ")", 2 ) end
nX = nNewX
nY = nNewY