mirror of
https://gerrit.wikimedia.org/r/mediawiki/extensions/Scribunto
synced 2024-11-24 08:14:09 +00:00
cebe775ee8
Package library: * Added a simulation of the Lua 5.1 package library. * Removed mw.import(), replaced it with a package loader. Packages can be retrieved from the wiki, using require('Module:Foo'), or from files distributed with Scribunto, using require('foo'). The "Module:" prefix allows for source compatibility with existing Lua code. * Added a couple of libraries from LuaForge: luabit and stringtools. * Made fetchModuleFromParser() return null on error instead of throwing an exception, to more easily support the desired behaviour of the package loader, which needs to return null on error. * Renamed mw.setupEnvironment() to mw.setup() since it is setting up things other than the environment now. * In MWServer:handleRegisterLibrary(), remove the feature which interprets dots in library names, since LuaSandbox doesn't support this. Improved module isolation and related refactoring: * Expose restricted versions of getfenv() and setfenv() to user Lua code. Requires luasandbox r114952. * Don't cache the export list returned by module execution for later function calls. This breaks isolation of #invoke calls, since the local variables are persistent. * Removed ScribuntoFunctionBase and its children, since it doesn't really have a purpose if it can't cache anything. Instead, invoke functions using a module method called invoke(). * Removed Module::initialize(), replaced it with a validate() function. This is a more elegant interface and works better with the new module caching scheme. * Use a Status object for the return value of Engine::validate() instead of an array. Use the formatting facilities of the Status class. Other: * Removed "too many returns" error, doesn't fit in with Lua conventions. * Use the standalone engine by default, so that the extension will work without configuration for more people. * Added an accessor for $engine->interpreter * Fix mw.clone() to correctly clone metatables * If the standalone interpreter exits due to an error, there are some contexts where the initial error will be caught and ignored, and the user will see the error from checkValid() instead. In this case, rethrow the original error for a more informative message. * Load mw.lua into the initial standalone environment, to reduce code duplication between mw.lua and MWServer.lua. * Fixed a bug in Scribunto_LuaStandaloneInterpreter::handleCall() for functions that return no results. * Fixed a bug in encodeLuaVar() for strings with "\r". Added test case. * In MWServer.lua, don't call error() for internal errors, instead just print the error and exit. This avoids a protocol violation when an error is encountered from within handleCall(). * Added lots of documentation. Lua doc comments are in LuaDoc format. Change-Id: Ie2fd572c362bedf02f45d3fa5352a5280e034740
95 lines
1.7 KiB
Lua
95 lines
1.7 KiB
Lua
--[[---------------
|
|
Hex v0.4
|
|
-------------------
|
|
Hex conversion lib for lua.
|
|
|
|
How to use:
|
|
hex.to_hex(n) -- convert a number to a hex string
|
|
hex.to_dec(hex) -- convert a hex string(prefix with '0x' or '0X') to number
|
|
|
|
Part of LuaBit(http://luaforge.net/projects/bit/).
|
|
|
|
Under the MIT license.
|
|
|
|
copyright(c) 2006~2007 hanzhao (abrash_han@hotmail.com)
|
|
--]]---------------
|
|
|
|
require 'bit'
|
|
|
|
do
|
|
|
|
local function to_hex(n)
|
|
if(type(n) ~= "number") then
|
|
error("non-number type passed in.")
|
|
end
|
|
|
|
-- checking not float
|
|
if(n - math.floor(n) > 0) then
|
|
error("trying to apply bitwise operation on non-integer!")
|
|
end
|
|
|
|
if(n < 0) then
|
|
-- negative
|
|
n = bit.tobits(bit.bnot(math.abs(n)) + 1)
|
|
n = bit.tonumb(n)
|
|
end
|
|
|
|
hex_tbl = {'A', 'B', 'C', 'D', 'E', 'F'}
|
|
hex_str = ""
|
|
|
|
while(n ~= 0) do
|
|
last = math.mod(n, 16)
|
|
if(last < 10) then
|
|
hex_str = tostring(last) .. hex_str
|
|
else
|
|
hex_str = hex_tbl[last-10+1] .. hex_str
|
|
end
|
|
n = math.floor(n/16)
|
|
end
|
|
if(hex_str == "") then
|
|
hex_str = "0"
|
|
end
|
|
return "0x" .. hex_str
|
|
end
|
|
|
|
local function to_dec(hex)
|
|
if(type(hex) ~= "string") then
|
|
error("non-string type passed in.")
|
|
end
|
|
|
|
head = string.sub(hex, 1, 2)
|
|
|
|
if( head ~= "0x" and head ~= "0X") then
|
|
error("wrong hex format, should lead by 0x or 0X.")
|
|
end
|
|
|
|
v = tonumber(string.sub(hex, 3), 16)
|
|
|
|
return v;
|
|
end
|
|
|
|
--------------------
|
|
-- hex lib interface
|
|
hex = {
|
|
to_dec = to_dec,
|
|
to_hex = to_hex,
|
|
}
|
|
|
|
end
|
|
|
|
--[[
|
|
-- test
|
|
d = 4341688
|
|
h = to_hex(d)
|
|
print(h)
|
|
print(to_dec(h))
|
|
|
|
|
|
for i = 1, 100000 do
|
|
h = hex.to_hex(i)
|
|
d = hex.to_dec(h)
|
|
if(d ~= i) then
|
|
error("failed " .. i .. ", " .. h)
|
|
end
|
|
end
|
|
--]] |