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

Fix io API

Browse Source 
While adding checks to the io API in #424, I had forgot that the io API has his own type() function who overwrite the default one. This PR fix this. Sorry for that.
This commit is contained in:
Wilma456 (Jakob0815) 2017-08-27 17:08:40 +02:00 committed by GitHub
parent fd8837c631
commit 369be7c32c
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/main/resources/assets/computercraft/lua/rom/apis/io.lua
View File

@ -49,13 +49,13 @@ function input( _arg )
elseif _G.type( _arg ) == "nil" then
return g_currentInput
else
error( "bad argument #1 (expected string/table/nil, got " .. type( _arg ) .. ")", 2 )
error( "bad argument #1 (expected string/table/nil, got " .. _G.type( _arg ) .. ")", 2 )
end
end
function lines( _sFileName )
if type( _sFileNamel ) ~= "string" then
error( "bad argument #1 (expected string, got " .. type( _sFileName ) .. ")", 2 )
if _G.type( _sFileNamel ) ~= "string" then
error( "bad argument #1 (expected string, got " .. _G.type( _sFileName ) .. ")", 2 )
end
if _sFileName then
return open( _sFileName, "r" ):lines()
@ -65,11 +65,11 @@ function lines( _sFileName )
end
function open( _sPath, _sMode )
if type( _sPath ) ~= "string" then
error( "bad argument #1 (expected string, got " .. type( _sPath ) .. ")", 2 )
if _G.type( _sPath ) ~= "string" then
error( "bad argument #1 (expected string, got " .. _G.type( _sPath ) .. ")", 2 )
end
if type( _sMode ) ~= "string" then
error( "bad argument #2 (expected string, got " .. type( _sMode ) .. ")", 2 )
if _G.type( _sMode ) ~= "string" then
error( "bad argument #2 (expected string, got " .. _G.type( _sMode ) .. ")", 2 )
end
local sMode = _sMode or "r"
local file, err = fs.open( _sPath, sMode )
@ -167,7 +167,7 @@ function output( _arg )
elseif _G.type( _arg ) == "nil" then
return g_currentOutput
else
error( "bad argument #1 (expected string/table/nil, got " .. type( _arg ) .. ")", 2 )
error( "bad argument #1 (expected string/table/nil, got " .. _G.type( _arg ) .. ")", 2 )
end
end