From a2cff970f6ad46678803452e3a8d022a6e4e283d Mon Sep 17 00:00:00 2001 From: AJ Kelly Date: Thu, 18 Aug 2011 23:40:38 -0500 Subject: [PATCH] eol issues? idk --- Themes/_fallback/Scripts/01 base.lua | 136 +++++++++++++-------------- 1 file changed, 68 insertions(+), 68 deletions(-) diff --git a/Themes/_fallback/Scripts/01 base.lua b/Themes/_fallback/Scripts/01 base.lua index afc034a39b..4d6db99f5e 100644 --- a/Themes/_fallback/Scripts/01 base.lua +++ b/Themes/_fallback/Scripts/01 base.lua @@ -1,68 +1,68 @@ --- Override Lua's loadfile to use lua.ReadFile. -function loadfile(file) - local data, err = lua.ReadFile(file) - if not data then - return nil, ("what " .. file) - end - - local chunk, err = load( - function() - local ret = data - data = nil - return ret - end, - "@" .. file - ); - - if not chunk then return nil, err end - - -- Set the environment, like loadfile does. - setfenv(chunk, getfenv(2)) - return chunk -end - --- Override Lua's dofile to use our loadfile. -function dofile(file) - if not file then - error( "dofile(nil) unsupported", 2 ) - end - local chunk, err = loadfile(file) - if not chunk then - error(err, 2) - end - return chunk() -end - --- Like ipairs(), but returns only values. -function ivalues(t) - local n = 0 - return function() - n = n + 1 - return t[n]; - end -end - -Var = lua.GetThreadVariable - --- (c) 2006 Glenn Maynard --- All rights reserved. --- --- Permission is hereby granted, free of charge, to any person obtaining a --- copy of this software and associated documentation files (the --- "Software"), to deal in the Software without restriction, including --- without limitation the rights to use, copy, modify, merge, publish, --- distribute, and/or sell copies of the Software, and to permit persons to --- whom the Software is furnished to do so, provided that the above --- copyright notice(s) and this permission notice appear in all copies of --- the Software and that both the above copyright notice(s) and this --- permission notice appear in supporting documentation. --- --- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS --- OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF --- MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF --- THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS --- INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT --- OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS --- OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR --- OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR --- PERFORMANCE OF THIS SOFTWARE. +-- Override Lua's loadfile to use lua.ReadFile. +function loadfile(file) + local data, err = lua.ReadFile(file) + if not data then + return nil, ("what " .. file) + end + + local chunk, err = load( + function() + local ret = data + data = nil + return ret + end, + "@" .. file + ); + + if not chunk then return nil, err end + + -- Set the environment, like loadfile does. + setfenv(chunk, getfenv(2)) + return chunk +end + +-- Override Lua's dofile to use our loadfile. +function dofile(file) + if not file then + error( "dofile(nil) unsupported", 2 ) + end + local chunk, err = loadfile(file) + if not chunk then + error(err, 2) + end + return chunk() +end + +-- Like ipairs(), but returns only values. +function ivalues(t) + local n = 0 + return function() + n = n + 1 + return t[n]; + end +end + +Var = lua.GetThreadVariable + +-- (c) 2006 Glenn Maynard +-- All rights reserved. +-- +-- Permission is hereby granted, free of charge, to any person obtaining a +-- copy of this software and associated documentation files (the +-- "Software"), to deal in the Software without restriction, including +-- without limitation the rights to use, copy, modify, merge, publish, +-- distribute, and/or sell copies of the Software, and to permit persons to +-- whom the Software is furnished to do so, provided that the above +-- copyright notice(s) and this permission notice appear in all copies of +-- the Software and that both the above copyright notice(s) and this +-- permission notice appear in supporting documentation. +-- +-- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS +-- OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +-- MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF +-- THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS +-- INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT +-- OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS +-- OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR +-- OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR +-- PERFORMANCE OF THIS SOFTWARE.