diff options
Diffstat (limited to 'plugins')
-rw-r--r-- | plugins/boot.lua | 10 | ||||
-rw-r--r-- | plugins/cheat/conv_cheat.lua | 8 | ||||
-rw-r--r-- | plugins/cheat/init.lua | 26 | ||||
-rw-r--r-- | plugins/cheat/xml_conv.lua | 10 | ||||
-rw-r--r-- | plugins/cheatfind/init.lua | 20 | ||||
-rw-r--r-- | plugins/dummy/init.lua | 2 | ||||
-rw-r--r-- | plugins/hiscore/init.lua | 36 | ||||
-rw-r--r-- | plugins/hiscore/sort_hiscore.lua | 58 | ||||
-rw-r--r-- | plugins/json/init.lua | 680 | ||||
-rw-r--r-- | plugins/layout/init.lua | 4 | ||||
-rw-r--r-- | plugins/timer/init.lua | 2 |
11 files changed, 428 insertions, 428 deletions
diff --git a/plugins/boot.lua b/plugins/boot.lua index 37633654240..ea753139aef 100644 --- a/plugins/boot.lua +++ b/plugins/boot.lua @@ -26,10 +26,10 @@ package.path = dir .. "/?.lua;" .. dir .. "/?/init.lua" local json = require('json') local function readAll(file) - local f = io.open(file, "rb") - local content = f:read("*all") - f:close() - return content + local f = io.open(file, "rb") + local content = f:read("*all") + f:close() + return content end for file in lfs.dir(dir) do @@ -37,7 +37,7 @@ for file in lfs.dir(dir) do local filename = dir .. "/" .. file .. "/plugin.json" local meta = json.parse(readAll(filename)) if (meta["plugin"]["type"]=="plugin") and (mame_manager:plugins().entries[meta["plugin"]["name"]]~=nil) then - local entry = mame_manager:plugins().entries[meta["plugin"]["name"]] + local entry = mame_manager:plugins().entries[meta["plugin"]["name"]] if (entry:value()==true) then emu.print_verbose("Starting plugin " .. meta["plugin"]["name"] .. "...") plugin = require(meta["plugin"]["name"]) diff --git a/plugins/cheat/conv_cheat.lua b/plugins/cheat/conv_cheat.lua index 6f583a0178a..1574a9c0f12 100644 --- a/plugins/cheat/conv_cheat.lua +++ b/plugins/cheat/conv_cheat.lua @@ -2,10 +2,10 @@ xml = require("xml_conv") json = dofile("../json/init.lua") function readAll(file) - local f = io.open(file, "rb") - local content = f:read("*all") - f:close() - return content + local f = io.open(file, "rb") + local content = f:read("*all") + f:close() + return content end print(json.stringify(xml.conv_cheat(readAll(arg[1])), {indent = true})) diff --git a/plugins/cheat/init.lua b/plugins/cheat/init.lua index 303ffad6ffd..7b85697fc48 100644 --- a/plugins/cheat/init.lua +++ b/plugins/cheat/init.lua @@ -11,7 +11,7 @@ -- "item" [{ -- "value": "itemval(index*stepval+minval)", -- "text": "text" --- }, +-- }, -- ... ] -- }, -- "space": { @@ -171,17 +171,17 @@ function cheat.startplugin() local function parse_cheat(cheat) cheat.cheat_env = { draw_text = draw_text, - draw_line = draw_line, - draw_box = draw_box, - tobcd = tobcd, - frombcd = frombcd, - pairs = pairs, - ipairs = ipairs, - outputs = manager:machine():outputs(), - time = time, - table = - { insert = table.insert, - remove = table.remove } } + draw_line = draw_line, + draw_box = draw_box, + tobcd = tobcd, + frombcd = frombcd, + pairs = pairs, + ipairs = ipairs, + outputs = manager:machine():outputs(), + time = time, + table = + { insert = table.insert, + remove = table.remove } } cheat.enabled = false -- verify scripts are valid first if not cheat.script then @@ -351,7 +351,7 @@ function cheat.startplugin() end end elseif index == 3 then - for num, cheat in pairs(cheats) do + for num, cheat in pairs(cheats) do if cheat.enabled and cheat.script.off then cheat.script.off() end diff --git a/plugins/cheat/xml_conv.lua b/plugins/cheat/xml_conv.lua index b53f3a92452..0a35f9875f9 100644 --- a/plugins/cheat/xml_conv.lua +++ b/plugins/cheat/xml_conv.lua @@ -55,7 +55,7 @@ function xml.conv_cheat(data) data = xml_parse(data) local function convert_expr(data) local write = false - + local function convert_memref(cpu, phys, space, width, addr, rw) local mod = "" local count @@ -223,16 +223,16 @@ function xml.conv_cheat(data) end end if next(spaces) then - data["cheat"][count]["space"] = {} + data["cheat"][count]["space"] = {} for name, space in pairs(spaces) do - data["cheat"][count]["space"] = {} + data["cheat"][count]["space"] = {} data["cheat"][count]["space"][name] = { type = space["type"], tag = space["tag"] } end end if next(regions) then - data["cheat"][count]["region"] = {} + data["cheat"][count]["region"] = {} for name, region in pairs(regions) do - data["cheat"][count]["region"] = {} + data["cheat"][count]["region"] = {} data["cheat"][count]["region"][name] = region end end diff --git a/plugins/cheatfind/init.lua b/plugins/cheatfind/init.lua index 59260320eff..5649113b265 100644 --- a/plugins/cheatfind/init.lua +++ b/plugins/cheatfind/init.lua @@ -85,7 +85,7 @@ function cheatfind.startplugin() local ref = {} -- this is a helper for comparing two match lists local bitmask = nil - local cfoper = { + local cfoper = { lt = function(a, b, val) return (a < b and val == 0) or (val > 0 and (a + val) == b) end, gt = function(a, b, val) return (a > b and val == 0) or (val > 0 and (a - val) == b) end, eq = function(a, b, val) return a == b end, @@ -142,7 +142,7 @@ function cheatfind.startplugin() newdata = olddata end if olddata.start ~= newdata.start or olddata.size ~= newdata.size or not cfoper[oper] then - return {} + return {} end if not val then val = 0 @@ -206,9 +206,9 @@ function cheatfind.startplugin() resort[#resort + 1] = match end end - return resort + return resort end - + -- compare a data block to the current state function cheat.compcur(olddata, oper, format, val, bcd) @@ -559,7 +559,7 @@ function cheatfind.startplugin() menu_lim(rightop, 1, #menu_blocks[1], m) return m, function(event) local r rightop, r = incdec(event, rightop, 1, #menu_blocks[1]) return r end end - menu[#menu + 1] = function() + menu[#menu + 1] = function() if optable[opsel] == "bne" or optable[opsel] == "beq" or optable[opsel] == "eq" then return nil end @@ -572,7 +572,7 @@ function cheatfind.startplugin() return m, function(event) local r value, r = incdec(event, value, 0, max) return r end end menu[#menu + 1] = function() return { "---", "", "off" }, nil end - menu[#menu + 1] = function() + menu[#menu + 1] = function() local m = { "Data Format", formname[width], 0 } menu_lim(width, 1, #formtable, m) return m, function(event) local r width, r = incdec(event, width, 1, #formtable) return r end @@ -640,7 +640,7 @@ function cheatfind.startplugin() end return i, match end - return mpairs_it, list, 0 + return mpairs_it, list, 0 end local bitwidth = formtable[width]:sub(2, 2):lower() if bitwidth == "h" then @@ -737,8 +737,8 @@ function cheatfind.startplugin() match.mode = 1 end local modes = { "Test", "Write", "Watch" } - local m = { string.format("%08x" .. bitwidth .. bitwidth, match.addr, match.oldval, - match.newval), modes[match.mode], 0 } + local m = { string.format("%08x" .. bitwidth .. bitwidth, match.addr, match.oldval, + match.newval), modes[match.mode], 0 } menu_lim(match.mode, 1, #modes, m) local function f(event) local r @@ -782,7 +782,7 @@ function cheatfind.startplugin() return menu_func[index](event) end emu.register_menu(menu_callback, menu_populate, "Cheat Finder") - emu.register_frame_done(function () + emu.register_frame_done(function () local tag, screen = next(manager:machine().screens) local height = mame_manager:ui():get_line_height() for num, watch in ipairs(watches) do diff --git a/plugins/dummy/init.lua b/plugins/dummy/init.lua index e13e6c4cf79..89ba95a7f86 100644 --- a/plugins/dummy/init.lua +++ b/plugins/dummy/init.lua @@ -13,7 +13,7 @@ function dummy.startplugin() emu.register_start(function() emu.print_verbose("Starting " .. emu.gamename()) end) - + emu.register_stop(function() emu.print_verbose("Exiting " .. emu.gamename()) end) diff --git a/plugins/hiscore/init.lua b/plugins/hiscore/init.lua index c26c25ae21c..1b881317306 100644 --- a/plugins/hiscore/init.lua +++ b/plugins/hiscore/init.lua @@ -1,10 +1,10 @@ -- hiscore.lua -- by borgar@borgar.net, WTFPL license --- +-- -- This uses MAME's built-in Lua scripting to implment -- high-score saving with hiscore.dat infom just as older -- builds did in the past. --- +-- local exports = {} exports.name = "hiscore" exports.version = "1.0.0" @@ -24,7 +24,7 @@ function hiscore.startplugin() local hiscoredata_path = "hiscore.dat"; local hiscore_path = "hi"; local config_path = lfs.env_replace(manager:options().entries.inipath:value():match("[^;]+") .. "/hiscore.ini"); - + local current_checksum = 0; local default_checksum = 0; @@ -36,7 +36,7 @@ function hiscore.startplugin() local positions = {}; -- Configuration file will be searched in the first path defined -- in mame inipath option. - local function read_config() + local function read_config() if config_read then return true end; local file = io.open( config_path, "r" ); if file then @@ -53,7 +53,7 @@ function hiscore.startplugin() end return false end - + local function parse_table ( dsting ) local _table = {}; for line in string.gmatch(dsting, '([^\n]+)') do @@ -75,7 +75,7 @@ function hiscore.startplugin() size = tonumber(len, 16), c_start = tonumber(chk_st, 16), c_end = tonumber(chk_ed, 16), - fill = tonumber(fill, 16) + fill = tonumber(fill, 16) }; end return _table; @@ -143,9 +143,9 @@ function hiscore.startplugin() local function get_file_name () local r; if emu.softname() ~= "" then - r = hiscore_path .. '/' .. emu.romname() .. "_" .. emu.softname() .. ".hi"; + r = hiscore_path .. '/' .. emu.romname() .. "_" .. emu.softname() .. ".hi"; else - r = hiscore_path .. '/' .. emu.romname() .. ".hi"; + r = hiscore_path .. '/' .. emu.romname() .. ".hi"; end return r; end @@ -194,9 +194,9 @@ function hiscore.startplugin() local function check_scores ( posdata ) local r = 0; for ri,row in ipairs(posdata) do - for i=0,row["size"]-1 do - r = r + row["mem"]:read_u8( row["addr"] + i ); - end + for i=0,row["size"]-1 do + r = r + row["mem"]:read_u8( row["addr"] + i ); + end end return r; end @@ -227,7 +227,7 @@ function hiscore.startplugin() local function tick () -- set up scores if they have been init(); - -- only allow save check to run when + -- only allow save check to run when if mem_check_passed then -- The reason for this complicated mess is that -- MAME does expose a hook for "exit". Once it does, @@ -260,14 +260,14 @@ function hiscore.startplugin() mem_check_passed = false scores_have_been_read = false; end - + emu.register_start(function() found_hiscore_entry = false mem_check_passed = false - scores_have_been_read = false; + scores_have_been_read = false; last_write_time = -10 - emu.print_verbose("Starting " .. emu.gamename()) - config_read = read_config(); + emu.print_verbose("Starting " .. emu.gamename()) + config_read = read_config(); local dat = read_hiscore_dat() if dat and dat ~= "" then emu.print_verbose( "hiscore: found hiscore.dat entry for " .. emu.romname() ); @@ -284,13 +284,13 @@ function hiscore.startplugin() end end found_hiscore_entry = true - end + end end) emu.register_frame(function() if found_hiscore_entry then tick() end - end) + end) emu.register_stop(function() reset() end) diff --git a/plugins/hiscore/sort_hiscore.lua b/plugins/hiscore/sort_hiscore.lua index 20a906e6f3b..9337acb7d44 100644 --- a/plugins/hiscore/sort_hiscore.lua +++ b/plugins/hiscore/sort_hiscore.lua @@ -109,35 +109,35 @@ end -- copyright 2010 Uli Schlachter GPLv2 function stable_sort(list, comp) - -- A table could contain non-integer keys which we have to ignore. - local num = 0 - for k, v in ipairs(list) do - num = num + 1 - end - - if num <= 1 then - -- Nothing to do - return - end - - -- Sort until everything is sorted :) - local sorted = false - local n = num - while not sorted do - sorted = true - for i = 1, n - 1 do - -- Two equal elements won't be swapped -> we are stable - if comp(list[i+1], list[i]) then - local tmp = list[i] - list[i] = list[i+1] - list[i+1] = tmp - - sorted = false - end - end - -- The last element is now guaranteed to be in the right spot - n = n - 1 - end + -- A table could contain non-integer keys which we have to ignore. + local num = 0 + for k, v in ipairs(list) do + num = num + 1 + end + + if num <= 1 then + -- Nothing to do + return + end + + -- Sort until everything is sorted :) + local sorted = false + local n = num + while not sorted do + sorted = true + for i = 1, n - 1 do + -- Two equal elements won't be swapped -> we are stable + if comp(list[i+1], list[i]) then + local tmp = list[i] + list[i] = list[i+1] + list[i+1] = tmp + + sorted = false + end + end + -- The last element is now guaranteed to be in the right spot + n = n - 1 + end end stable_sort(sorted, function(a,b) if a.src and b.src then return a.src < b.src else return false end end) diff --git a/plugins/json/init.lua b/plugins/json/init.lua index 39f211c8e11..51b3e4772e3 100644 --- a/plugins/json/init.lua +++ b/plugins/json/init.lua @@ -61,12 +61,12 @@ SOFTWARE. -- global dependencies: local pairs, type, tostring, tonumber, getmetatable, setmetatable = - pairs, type, tostring, tonumber, getmetatable, setmetatable + pairs, type, tostring, tonumber, getmetatable, setmetatable local error, require, pcall, select = error, require, pcall, select local floor, huge = math.floor, math.huge local strrep, gsub, strsub, strbyte, strchar, strfind, strlen, strformat = - string.rep, string.gsub, string.sub, string.byte, string.char, - string.find, string.len, string.format + string.rep, string.gsub, string.sub, string.byte, string.char, + string.find, string.len, string.format local strmatch = string.match local concat = table.concat @@ -93,23 +93,23 @@ json.null = setmetatable ({}, { local function isarray (tbl) local max, n, arraylen = 0, 0, 0 for k,v in pairs (tbl) do - if k == 'n' and type(v) == 'number' then - arraylen = v - if v > max then - max = v - end - else - if type(k) ~= 'number' or k < 1 or floor(k) ~= k then - return false - end - if k > max then - max = k - end - n = n + 1 - end + if k == 'n' and type(v) == 'number' then + arraylen = v + if v > max then + max = v + end + else + if type(k) ~= 'number' or k < 1 or floor(k) ~= k then + return false + end + if k > max then + max = k + end + n = n + 1 + end end if max > 10 and max > arraylen and max > n * 2 then - return false -- don't create an array with too many holes + return false -- don't create an array with too many holes end return true, max end @@ -122,30 +122,30 @@ local escapecodes = { local function escapeutf8 (uchar) local value = escapecodes[uchar] if value then - return value + return value end local a, b, c, d = strbyte (uchar, 1, 4) a, b, c, d = a or 0, b or 0, c or 0, d or 0 if a <= 0x7f then - value = a + value = a elseif 0xc0 <= a and a <= 0xdf and b >= 0x80 then - value = (a - 0xc0) * 0x40 + b - 0x80 + value = (a - 0xc0) * 0x40 + b - 0x80 elseif 0xe0 <= a and a <= 0xef and b >= 0x80 and c >= 0x80 then - value = ((a - 0xe0) * 0x40 + b - 0x80) * 0x40 + c - 0x80 + value = ((a - 0xe0) * 0x40 + b - 0x80) * 0x40 + c - 0x80 elseif 0xf0 <= a and a <= 0xf7 and b >= 0x80 and c >= 0x80 and d >= 0x80 then - value = (((a - 0xf0) * 0x40 + b - 0x80) * 0x40 + c - 0x80) * 0x40 + d - 0x80 + value = (((a - 0xf0) * 0x40 + b - 0x80) * 0x40 + c - 0x80) * 0x40 + d - 0x80 else - return "" + return "" end if value <= 0xffff then - return strformat ("\\u%.4x", value) + return strformat ("\\u%.4x", value) elseif value <= 0x10ffff then - -- encode as UTF-16 surrogate pair - value = value - 0x10000 - local highsur, lowsur = 0xD800 + floor (value/0x400), 0xDC00 + (value % 0x400) - return strformat ("\\u%.4x\\u%.4x", highsur, lowsur) + -- encode as UTF-16 surrogate pair + value = value - 0x10000 + local highsur, lowsur = 0xD800 + floor (value/0x400), 0xDC00 + (value % 0x400) + return strformat ("\\u%.4x\\u%.4x", highsur, lowsur) else - return "" + return "" end end @@ -154,9 +154,9 @@ local function fsub (str, pattern, repl) -- exists. First using find should be more efficient when most strings -- don't contain the pattern. if strfind (str, pattern) then - return gsub (str, pattern, repl) + return gsub (str, pattern, repl) else - return str + return str end end @@ -164,14 +164,14 @@ local function quotestring (value) -- based on the regexp "escapable" in https://github.com/douglascrockford/JSON-js value = fsub (value, "[%z\1-\31\"\\\127]", escapeutf8) if strfind (value, "[\194\216\220\225\226\239]") then - value = fsub (value, "\194[\128-\159\173]", escapeutf8) - value = fsub (value, "\216[\128-\132]", escapeutf8) - value = fsub (value, "\220\143", escapeutf8) - value = fsub (value, "\225\158[\180\181]", escapeutf8) - value = fsub (value, "\226\128[\140-\143\168-\175]", escapeutf8) - value = fsub (value, "\226\129[\160-\175]", escapeutf8) - value = fsub (value, "\239\187\191", escapeutf8) - value = fsub (value, "\239\191[\176-\191]", escapeutf8) + value = fsub (value, "\194[\128-\159\173]", escapeutf8) + value = fsub (value, "\216[\128-\132]", escapeutf8) + value = fsub (value, "\220\143", escapeutf8) + value = fsub (value, "\225\158[\180\181]", escapeutf8) + value = fsub (value, "\226\128[\140-\143\168-\175]", escapeutf8) + value = fsub (value, "\226\129[\160-\175]", escapeutf8) + value = fsub (value, "\239\187\191", escapeutf8) + value = fsub (value, "\239\191[\176-\191]", escapeutf8) end return "\"" .. value .. "\"" end @@ -180,9 +180,9 @@ json.quotestring = quotestring local function replace(str, o, n) local i, j = strfind (str, o, 1, true) if i then - return strsub(str, 1, i-1) .. n .. strsub(str, j+1, -1) + return strsub(str, 1, i-1) .. n .. strsub(str, j+1, -1) else - return str + return str end end @@ -204,8 +204,8 @@ end local function str2num (str) local num = tonumber(replace(str, ".", decpoint)) if not num then - updatedecpoint() - num = tonumber(replace(str, ".", decpoint)) + updatedecpoint() + num = tonumber(replace(str, ".", decpoint)) end return num end @@ -219,8 +219,8 @@ end function json.addnewline (state) if state.indent then - state.bufferlen = addnewline2 (state.level or 0, - state.buffer, state.bufferlen or #(state.buffer)) + state.bufferlen = addnewline2 (state.level or 0, + state.buffer, state.bufferlen or #(state.buffer)) end end @@ -229,14 +229,14 @@ local encode2 -- forward declaration local function addpair (key, value, prev, indent, level, buffer, buflen, tables, globalorder, state) local kt = type (key) if kt ~= 'string' and kt ~= 'number' then - return nil, "type '" .. kt .. "' is not supported as a key by JSON." + return nil, "type '" .. kt .. "' is not supported as a key by JSON." end if prev then - buflen = buflen + 1 - buffer[buflen] = "," + buflen = buflen + 1 + buffer[buflen] = "," end if indent then - buflen = addnewline2 (level, buffer, buflen) + buflen = addnewline2 (level, buffer, buflen) end buffer[buflen+1] = quotestring (key) buffer[buflen+2] = ":" @@ -246,8 +246,8 @@ end local function appendcustom(res, buffer, state) local buflen = state.bufferlen if type (res) == 'string' then - buflen = buflen + 1 - buffer[buflen] = res + buflen = buflen + 1 + buffer[buflen] = res end return buflen end @@ -256,12 +256,12 @@ local function exception(reason, value, state, buffer, buflen, defaultmessage) defaultmessage = defaultmessage or reason local handler = state.exception if not handler then - return nil, defaultmessage + return nil, defaultmessage else - state.bufferlen = buflen - local ret, msg = handler (reason, value, state, defaultmessage) - if not ret then return nil, msg or defaultmessage end - return appendcustom(ret, buffer, state) + state.bufferlen = buflen + local ret, msg = handler (reason, value, state, defaultmessage) + if not ret then return nil, msg or defaultmessage end + return appendcustom(ret, buffer, state) end end @@ -275,100 +275,100 @@ encode2 = function (value, indent, level, buffer, buflen, tables, globalorder, s valmeta = type (valmeta) == 'table' and valmeta -- only tables local valtojson = valmeta and valmeta.__tojson if valtojson then - if tables[value] then - return exception('reference cycle', value, state, buffer, buflen) - end - tables[value] = true - state.bufferlen = buflen - local ret, msg = valtojson (value, state) - if not ret then return exception('custom encoder failed', value, state, buffer, buflen, msg) end - tables[value] = nil - buflen = appendcustom(ret, buffer, state) + if tables[value] then + return exception('reference cycle', value, state, buffer, buflen) + end + tables[value] = true + state.bufferlen = buflen + local ret, msg = valtojson (value, state) + if not ret then return exception('custom encoder failed', value, state, buffer, buflen, msg) end + tables[value] = nil + buflen = appendcustom(ret, buffer, state) elseif value == nil then - buflen = buflen + 1 - buffer[buflen] = "null" + buflen = buflen + 1 + buffer[buflen] = "null" elseif valtype == 'number' then - local s - if value ~= value or value >= huge or -value >= huge then - -- This is the behaviour of the original JSON implementation. - s = "null" - else - s = num2str (value) - end - buflen = buflen + 1 - buffer[buflen] = s + local s + if value ~= value or value >= huge or -value >= huge then + -- This is the behaviour of the original JSON implementation. + s = "null" + else + s = num2str (value) + end + buflen = buflen + 1 + buffer[buflen] = s elseif valtype == 'boolean' then - buflen = buflen + 1 - buffer[buflen] = value and "true" or "false" + buflen = buflen + 1 + buffer[buflen] = value and "true" or "false" elseif valtype == 'string' then - buflen = buflen + 1 - buffer[buflen] = quotestring (value) + buflen = buflen + 1 + buffer[buflen] = quotestring (value) elseif valtype == 'table' then - if tables[value] then - return exception('reference cycle', value, state, buffer, buflen) - end - tables[value] = true - level = level + 1 - local isa, n = isarray (value) - if n == 0 and valmeta and valmeta.__jsontype == 'object' then - isa = false - end - local msg - if isa then -- JSON array - buflen = buflen + 1 - buffer[buflen] = "[" - for i = 1, n do - buflen, msg = encode2 (value[i], indent, level, buffer, buflen, tables, globalorder, state) - if not buflen then return nil, msg end - if i < n then - buflen = buflen + 1 - buffer[buflen] = "," - end - end - buflen = buflen + 1 - buffer[buflen] = "]" - else -- JSON object - local prev = false - buflen = buflen + 1 - buffer[buflen] = "{" - local order = valmeta and valmeta.__jsonorder or globalorder - if order then - local used = {} - n = #order - for i = 1, n do - local k = order[i] - local v = value[k] - local _ - if v then - used[k] = true - buflen, _ = addpair (k, v, prev, indent, level, buffer, buflen, tables, globalorder, state) - prev = true -- add a seperator before the next element - end - end - for k,v in pairs (value) do - if not used[k] then - buflen, msg = addpair (k, v, prev, indent, level, buffer, buflen, tables, globalorder, state) - if not buflen then return nil, msg end - prev = true -- add a seperator before the next element - end - end - else -- unordered - for k,v in pairs (value) do - buflen, msg = addpair (k, v, prev, indent, level, buffer, buflen, tables, globalorder, state) - if not buflen then return nil, msg end - prev = true -- add a seperator before the next element - end - end - if indent then - buflen = addnewline2 (level - 1, buffer, buflen) - end - buflen = buflen + 1 - buffer[buflen] = "}" - end - tables[value] = nil + if tables[value] then + return exception('reference cycle', value, state, buffer, buflen) + end + tables[value] = true + level = level + 1 + local isa, n = isarray (value) + if n == 0 and valmeta and valmeta.__jsontype == 'object' then + isa = false + end + local msg + if isa then -- JSON array + buflen = buflen + 1 + buffer[buflen] = "[" + for i = 1, n do + buflen, msg = encode2 (value[i], indent, level, buffer, buflen, tables, globalorder, state) + if not buflen then return nil, msg end + if i < n then + buflen = buflen + 1 + buffer[buflen] = "," + end + end + buflen = buflen + 1 + buffer[buflen] = "]" + else -- JSON object + local prev = false + buflen = buflen + 1 + buffer[buflen] = "{" + local order = valmeta and valmeta.__jsonorder or globalorder + if order then + local used = {} + n = #order + for i = 1, n do + local k = order[i] + local v = value[k] + local _ + if v then + used[k] = true + buflen, _ = addpair (k, v, prev, indent, level, buffer, buflen, tables, globalorder, state) + prev = true -- add a seperator before the next element + end + end + for k,v in pairs (value) do + if not used[k] then + buflen, msg = addpair (k, v, prev, indent, level, buffer, buflen, tables, globalorder, state) + if not buflen then return nil, msg end + prev = true -- add a seperator before the next element + end + end + else -- unordered + for k,v in pairs (value) do + buflen, msg = addpair (k, v, prev, indent, level, buffer, buflen, tables, globalorder, state) + if not buflen then return nil, msg end + prev = true -- add a seperator before the next element + end + end + if indent then + buflen = addnewline2 (level - 1, buffer, buflen) + end + buflen = buflen + 1 + buffer[buflen] = "}" + end + tables[value] = nil else - return exception ('unsupported type', value, state, buffer, buflen, - "type '" .. valtype .. "' is not supported by JSON.") + return exception ('unsupported type', value, state, buffer, buflen, + "type '" .. valtype .. "' is not supported by JSON.") end return buflen end @@ -380,30 +380,30 @@ function json.encode (value, state) state.buffer = buffer updatedecpoint() local ret, msg = encode2 (value, state.indent, state.level or 0, - buffer, state.bufferlen or 0, state.tables or {}, state.keyorder, state) + buffer, state.bufferlen or 0, state.tables or {}, state.keyorder, state) if not ret then - error (msg, 2) + error (msg, 2) elseif oldbuffer == buffer then - state.bufferlen = ret - return true + state.bufferlen = ret + return true else - state.bufferlen = nil - state.buffer = nil - return concat (buffer) + state.bufferlen = nil + state.buffer = nil + return concat (buffer) end end local function loc (str, where) local line, pos, linepos = 1, 1, 0 while true do - pos = strfind (str, "\n", pos, true) - if pos and pos < where then - line = line + 1 - linepos = pos - pos = pos + 1 - else - break - end + pos = strfind (str, "\n", pos, true) + if pos and pos < where then + line = line + 1 + linepos = pos + pos = pos + 1 + else + break + end end return "line " .. line .. ", column " .. (where - linepos) end @@ -414,22 +414,22 @@ end local function scanwhite (str, pos) while true do - pos = strfind (str, "%S", pos) - if not pos then return nil end - local sub2 = strsub (str, pos, pos + 1) - if sub2 == "\239\187" and strsub (str, pos + 2, pos + 2) == "\191" then - -- UTF-8 Byte Order Mark - pos = pos + 3 - elseif sub2 == "//" then - pos = strfind (str, "[\n\r]", pos + 2) - if not pos then return nil end - elseif sub2 == "/*" then - pos = strfind (str, "*/", pos + 2) - if not pos then return nil end - pos = pos + 2 - else - return pos - end + pos = strfind (str, "%S", pos) + if not pos then return nil end + local sub2 = strsub (str, pos, pos + 1) + if sub2 == "\239\187" and strsub (str, pos + 2, pos + 2) == "\191" then + -- UTF-8 Byte Order Mark + pos = pos + 3 + elseif sub2 == "//" then + pos = strfind (str, "[\n\r]", pos + 2) + if not pos then return nil end + elseif sub2 == "/*" then + pos = strfind (str, "*/", pos + 2) + if not pos then return nil end + pos = pos + 2 + else + return pos + end end end @@ -440,23 +440,23 @@ local escapechars = { local function unichar (value) if value < 0 then - return nil + return nil elseif value <= 0x007f then - return strchar (value) + return strchar (value) elseif value <= 0x07ff then - return strchar (0xc0 + floor(value/0x40), - 0x80 + (floor(value) % 0x40)) + return strchar (0xc0 + floor(value/0x40), + 0x80 + (floor(value) % 0x40)) elseif value <= 0xffff then - return strchar (0xe0 + floor(value/0x1000), - 0x80 + (floor(value/0x40) % 0x40), - 0x80 + (floor(value) % 0x40)) + return strchar (0xe0 + floor(value/0x1000), + 0x80 + (floor(value/0x40) % 0x40), + 0x80 + (floor(value) % 0x40)) elseif value <= 0x10ffff then - return strchar (0xf0 + floor(value/0x40000), - 0x80 + (floor(value/0x1000) % 0x40), - 0x80 + (floor(value/0x40) % 0x40), - 0x80 + (floor(value) % 0x40)) + return strchar (0xf0 + floor(value/0x40000), + 0x80 + (floor(value/0x1000) % 0x40), + 0x80 + (floor(value/0x40) % 0x40), + 0x80 + (floor(value) % 0x40)) else - return nil + return nil end end @@ -464,60 +464,60 @@ local function scanstring (str, pos) local lastpos = pos + 1 local buffer, n = {}, 0 while true do - local nextpos = strfind (str, "[\"\\]", lastpos) - if not nextpos then - return unterminated (str, "string", pos) - end - if nextpos > lastpos then - n = n + 1 - buffer[n] = strsub (str, lastpos, nextpos - 1) - end - if strsub (str, nextpos, nextpos) == "\"" then - lastpos = nextpos + 1 - break - else - local escchar = strsub (str, nextpos + 1, nextpos + 1) - local value - if escchar == "u" then - value = tonumber (strsub (str, nextpos + 2, nextpos + 5), 16) - if value then - local value2 - if 0xD800 <= value and value <= 0xDBff then - -- we have the high surrogate of UTF-16. Check if there is a - -- low surrogate escaped nearby to combine them. - if strsub (str, nextpos + 6, nextpos + 7) == "\\u" then - value2 = tonumber (strsub (str, nextpos + 8, nextpos + 11), 16) - if value2 and 0xDC00 <= value2 and value2 <= 0xDFFF then - value = (value - 0xD800) * 0x400 + (value2 - 0xDC00) + 0x10000 - else - value2 = nil -- in case it was out of range for a low surrogate - end - end - end - value = value and unichar (value) - if value then - if value2 then - lastpos = nextpos + 12 - else - lastpos = nextpos + 6 - end - end - end - end - if not value then - value = escapechars[escchar] or escchar - lastpos = nextpos + 2 - end - n = n + 1 - buffer[n] = value - end + local nextpos = strfind (str, "[\"\\]", lastpos) + if not nextpos then + return unterminated (str, "string", pos) + end + if nextpos > lastpos then + n = n + 1 + buffer[n] = strsub (str, lastpos, nextpos - 1) + end + if strsub (str, nextpos, nextpos) == "\"" then + lastpos = nextpos + 1 + break + else + local escchar = strsub (str, nextpos + 1, nextpos + 1) + local value + if escchar == "u" then + value = tonumber (strsub (str, nextpos + 2, nextpos + 5), 16) + if value then + local value2 + if 0xD800 <= value and value <= 0xDBff then + -- we have the high surrogate of UTF-16. Check if there is a + -- low surrogate escaped nearby to combine them. + if strsub (str, nextpos + 6, nextpos + 7) == "\\u" then + value2 = tonumber (strsub (str, nextpos + 8, nextpos + 11), 16) + if value2 and 0xDC00 <= value2 and value2 <= 0xDFFF then + value = (value - 0xD800) * 0x400 + (value2 - 0xDC00) + 0x10000 + else + value2 = nil -- in case it was out of range for a low surrogate + end + end + end + value = value and unichar (value) + if value then + if value2 then + lastpos = nextpos + 12 + else + lastpos = nextpos + 6 + end + end + end + end + if not value then + value = escapechars[escchar] or escchar + lastpos = nextpos + 2 + end + n = n + 1 + buffer[n] = value + end end if n == 1 then - return buffer[1], lastpos + return buffer[1], lastpos elseif n > 1 then - return concat (buffer), lastpos + return concat (buffer), lastpos else - return "", lastpos + return "", lastpos end end @@ -527,43 +527,43 @@ local function scantable (what, closechar, str, startpos, nullval, objectmeta, a local tbl, n = {}, 0 local pos = startpos + 1 if what == 'object' then - setmetatable (tbl, objectmeta) + setmetatable (tbl, objectmeta) else - setmetatable (tbl, arraymeta) + setmetatable (tbl, arraymeta) end while true do - pos = scanwhite (str, pos) - if not pos then return unterminated (str, what, startpos) end - local char = strsub (str, pos, pos) - if char == closechar then - return tbl, pos + 1 - end - local val1, err - val1, pos, err = scanvalue (str, pos, nullval, objectmeta, arraymeta) - if err then return nil, pos, err end - pos = scanwhite (str, pos) - if not pos then return unterminated (str, what, startpos) end - char = strsub (str, pos, pos) - if char == ":" then - if val1 == nil then - return nil, pos, "cannot use nil as table index (at " .. loc (str, pos) .. ")" - end - pos = scanwhite (str, pos + 1) - if not pos then return unterminated (str, what, startpos) end - local val2 - val2, pos, err = scanvalue (str, pos, nullval, objectmeta, arraymeta) - if err then return nil, pos, err end - tbl[val1] = val2 - pos = scanwhite (str, pos) - if not pos then return unterminated (str, what, startpos) end - char = strsub (str, pos, pos) - else - n = n + 1 - tbl[n] = val1 - end - if char == "," then - pos = pos + 1 - end + pos = scanwhite (str, pos) + if not pos then return unterminated (str, what, startpos) end + local char = strsub (str, pos, pos) + if char == closechar then + return tbl, pos + 1 + end + local val1, err + val1, pos, err = scanvalue (str, pos, nullval, objectmeta, arraymeta) + if err then return nil, pos, err end + pos = scanwhite (str, pos) + if not pos then return unterminated (str, what, startpos) end + char = strsub (str, pos, pos) + if char == ":" then + if val1 == nil then + return nil, pos, "cannot use nil as table index (at " .. loc (str, pos) .. ")" + end + pos = scanwhite (str, pos + 1) + if not pos then return unterminated (str, what, startpos) end + local val2 + val2, pos, err = scanvalue (str, pos, nullval, objectmeta, arraymeta) + if err then return nil, pos, err end + tbl[val1] = val2 + pos = scanwhite (str, pos) + if not pos then return unterminated (str, what, startpos) end + char = strsub (str, pos, pos) + else + n = n + 1 + tbl[n] = val1 + end + if char == "," then + pos = pos + 1 + end end end @@ -571,43 +571,43 @@ scanvalue = function (str, pos, nullval, objectmeta, arraymeta) pos = pos or 1 pos = scanwhite (str, pos) if not pos then - return nil, strlen (str) + 1, "no valid JSON value (reached the end)" + return nil, strlen (str) + 1, "no valid JSON value (reached the end)" end local char = strsub (str, pos, pos) if char == "{" then - return scantable ('object', "}", str, pos, nullval, objectmeta, arraymeta) + return scantable ('object', "}", str, pos, nullval, objectmeta, arraymeta) elseif char == "[" then - return scantable ('array', "]", str, pos, nullval, objectmeta, arraymeta) + return scantable ('array', "]", str, pos, nullval, objectmeta, arraymeta) elseif char == "\"" then - return scanstring (str, pos) + return scanstring (str, pos) else - local pstart, pend = strfind (str, "^%-?[%d%.]+[eE]?[%+%-]?%d*", pos) - if pstart then - local number = str2num (strsub (str, pstart, pend)) - if number then - return number, pend + 1 - end - end - pstart, pend = strfind (str, "^%a%w*", pos) - if pstart then - local name = strsub (str, pstart, pend) - if name == "true" then - return true, pend + 1 - elseif name == "false" then - return false, pend + 1 - elseif name == "null" then - return nullval, pend + 1 - end - end - return nil, pos, "no valid JSON value at " .. loc (str, pos) + local pstart, pend = strfind (str, "^%-?[%d%.]+[eE]?[%+%-]?%d*", pos) + if pstart then + local number = str2num (strsub (str, pstart, pend)) + if number then + return number, pend + 1 + end + end + pstart, pend = strfind (str, "^%a%w*", pos) + if pstart then + local name = strsub (str, pstart, pend) + if name == "true" then + return true, pend + 1 + elseif name == "false" then + return false, pend + 1 + elseif name == "null" then + return nullval, pend + 1 + end + end + return nil, pos, "no valid JSON value at " .. loc (str, pos) end end local function optionalmetatables(...) if select("#", ...) > 0 then - return ... + return ... else - return {__jsontype = 'object'}, {__jsontype = 'array'} + return {__jsontype = 'object'}, {__jsontype = 'array'} end end @@ -620,22 +620,22 @@ function json.use_lpeg () local g = require ("lpeg") if g.version() == "0.11" then - error "due to a bug in LPeg 0.11, it cannot be used for JSON matching" + error "due to a bug in LPeg 0.11, it cannot be used for JSON matching" end local pegmatch = g.match local P, S, R = g.P, g.S, g.R local function ErrorCall (str, pos, msg, state) - if not state.msg then - state.msg = msg .. " at " .. loc (str, pos) - state.pos = pos - end - return false + if not state.msg then + state.msg = msg .. " at " .. loc (str, pos) + state.pos = pos + end + return false end local function Err (msg) - return g.Cmt (g.Cc (msg) * g.Carg (2), ErrorCall) + return g.Cmt (g.Cc (msg) * g.Carg (2), ErrorCall) end local SingleLineComment = P"//" * (1 - S"\n\r")^0 @@ -646,15 +646,15 @@ function json.use_lpeg () local EscapeSequence = (P"\\" * g.C (S"\"\\/bfnrt" + Err "unsupported escape sequence")) / escapechars local HexDigit = R("09", "af", "AF") local function UTF16Surrogate (match, pos, high, low) - high, low = tonumber (high, 16), tonumber (low, 16) - if 0xD800 <= high and high <= 0xDBff and 0xDC00 <= low and low <= 0xDFFF then - return true, unichar ((high - 0xD800) * 0x400 + (low - 0xDC00) + 0x10000) - else - return false - end + high, low = tonumber (high, 16), tonumber (low, 16) + if 0xD800 <= high and high <= 0xDBff and 0xDC00 <= low and low <= 0xDFFF then + return true, unichar ((high - 0xD800) * 0x400 + (low - 0xDC00) + 0x10000) + else + return false + end end local function UTF16BMP (hex) - return unichar (tonumber (hex, 16)) + return unichar (tonumber (hex, 16)) end local U16Sequence = (P"\\u" * g.C (HexDigit * HexDigit * HexDigit * HexDigit)) local UnicodeEscape = g.Cmt (U16Sequence * U16Sequence, UTF16Surrogate) + U16Sequence/UTF16BMP @@ -671,30 +671,30 @@ function json.use_lpeg () -- The functions parsearray and parseobject parse only a single value/pair -- at a time and store them directly to avoid hitting the LPeg limits. local function parsearray (str, pos, nullval, state) - local obj, cont - local npos - local t, nt = {}, 0 - repeat - obj, cont, npos = pegmatch (ArrayContent, str, pos, nullval, state) - if not npos then break end - pos = npos - nt = nt + 1 - t[nt] = obj - until cont == 'last' - return pos, setmetatable (t, state.arraymeta) + local obj, cont + local npos + local t, nt = {}, 0 + repeat + obj, cont, npos = pegmatch (ArrayContent, str, pos, nullval, state) + if not npos then break end + pos = npos + nt = nt + 1 + t[nt] = obj + until cont == 'last' + return pos, setmetatable (t, state.arraymeta) end local function parseobject (str, pos, nullval, state) - local obj, key, cont - local npos - local t = {} - repeat - key, obj, cont, npos = pegmatch (ObjectContent, str, pos, nullval, state) - if not npos then break end - pos = npos - t[key] = obj - until cont == 'last' - return pos, setmetatable (t, state.objectmeta) + local obj, key, cont + local npos + local t = {} + repeat + key, obj, cont, npos = pegmatch (ObjectContent, str, pos, nullval, state) + if not npos then break end + pos = npos + t[key] = obj + until cont == 'last' + return pos, setmetatable (t, state.objectmeta) end local Array = P"[" * g.Cmt (g.Carg(1) * g.Carg(2), parsearray) * Space * (P"]" + Err "']' expected") @@ -707,14 +707,14 @@ function json.use_lpeg () local DecodeValue = ExpectedValue * g.Cp () function json.decode (str, pos, nullval, ...) - local state = {} - state.objectmeta, state.arraymeta = optionalmetatables(...) - local obj, retpos = pegmatch (DecodeValue, str, pos, nullval, state) - if state.msg then - return nil, state.pos, state.msg - else - return obj, retpos - end + local state = {} + state.objectmeta, state.arraymeta = optionalmetatables(...) + local obj, retpos = pegmatch (DecodeValue, str, pos, nullval, state) + if state.msg then + return nil, state.pos, state.msg + else + return obj, retpos + end end -- use this function only once: diff --git a/plugins/layout/init.lua b/plugins/layout/init.lua index fdac807b9b1..8301167633e 100644 --- a/plugins/layout/init.lua +++ b/plugins/layout/init.lua @@ -1,6 +1,6 @@ -- license:BSD-3-Clause -- copyright-holders:Carl --- Layout scripts should return a table and a string. The table can have two optional keys reset and frame +-- Layout scripts should return a table and a string. The table can have two optional keys reset and frame -- which have functions for values called on reset and frame draw respectively and the string is a unique name. local exports = {} exports.name = "layout" @@ -15,7 +15,7 @@ function layout.startplugin() local scripts = {} local function prepare_layout(script) local env = { machine = manager:machine(), pairs = pairs, ipairs = ipairs, - table = { insert = table.insert, remove = table.remove } } + table = { insert = table.insert, remove = table.remove } } local script, err = load(script, script, "t", env) if not script then emu.print_verbose("error loading layout script " .. err) diff --git a/plugins/timer/init.lua b/plugins/timer/init.lua index 6600432634f..97d2e679587 100644 --- a/plugins/timer/init.lua +++ b/plugins/timer/init.lua @@ -65,7 +65,7 @@ function timer.startplugin() play_count = play_count + 1 end) - emu.register_stop(function() + emu.register_stop(function() timer_started = false save() total_time = 0 |