Vendor libs/hump, sfxrlua, json4lua, narrator as real files
These were committed as empty submodule gitlinks with no .gitmodules, so the folders were never populated and the game could not load (require of libs/hump/timer, libs/sfxrlua/sfxr, narrator.narrator). Checked out each at its pinned commit and vendored the files, matching the existing bundled-libs convention. Removed the junk libs/libs/ tree. Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
This commit is contained in:
parent
e73f63b5d4
commit
03532d29e4
219 changed files with 20254 additions and 252 deletions
23
libs/json4lua/examples/example.lua
Executable file
23
libs/json4lua/examples/example.lua
Executable file
|
|
@ -0,0 +1,23 @@
|
|||
--[[
|
||||
JSON4Lua example script.
|
||||
Demonstrates the simple functionality of the json module.
|
||||
]]--
|
||||
json = require('json')
|
||||
|
||||
|
||||
-- Object to JSON encode
|
||||
test = {
|
||||
one='first',two='second',three={2,3,5}
|
||||
}
|
||||
|
||||
jsonTest = json.encode(test)
|
||||
|
||||
print('JSON encoded test is: ' .. jsonTest)
|
||||
|
||||
-- Now JSON decode the json string
|
||||
result = json.decode(jsonTest)
|
||||
|
||||
print ("The decoded table result:")
|
||||
table.foreach(result,print)
|
||||
print ("The decoded table result.three")
|
||||
table.foreach(result.three, print)
|
||||
21
libs/json4lua/examples/jsonrpc.lua
Executable file
21
libs/json4lua/examples/jsonrpc.lua
Executable file
|
|
@ -0,0 +1,21 @@
|
|||
--
|
||||
-- jsonrpc.lua
|
||||
-- Installed in a CGILua webserver environment (with necessary CGI Lua 5.0 patch)
|
||||
--
|
||||
require ('json.rpcserver')
|
||||
|
||||
-- The Lua class that is to serve JSON RPC requests
|
||||
local myServer = {
|
||||
echo = function (msg) return msg end,
|
||||
average = function(...)
|
||||
local total=0
|
||||
local count=0
|
||||
for i=1, table.getn(arg) do
|
||||
total = total + arg[i]
|
||||
count = count + 1
|
||||
end
|
||||
return { average= total/count, sum = total, n=count }
|
||||
end
|
||||
}
|
||||
|
||||
json.rpcserver.serve(myServer)
|
||||
223
libs/json4lua/examples/tests.lua
Executable file
223
libs/json4lua/examples/tests.lua
Executable file
|
|
@ -0,0 +1,223 @@
|
|||
--[[
|
||||
Some basic tests for JSON4Lua.
|
||||
]]--
|
||||
|
||||
--- Compares two tables for being data-identical.
|
||||
function compareData(a,b)
|
||||
if (type(a)=='string' or type(a)=='number' or type(a)=='boolean' or type(a)=='nil') then return a==b end
|
||||
-- After basic data types, we're only interested in tables
|
||||
if (type(a)~='table') then return true end
|
||||
-- Check that a has everything b has
|
||||
for k,v in pairs(b) do
|
||||
if (not compareData( a[k], v ) ) then return false end
|
||||
end
|
||||
for k,v in pairs(a) do
|
||||
if (not compareData( v, b[k] ) ) then return false end
|
||||
end
|
||||
return true
|
||||
end
|
||||
|
||||
---
|
||||
-- Checks that our compareData function works properly
|
||||
function testCompareData()
|
||||
s = "name"
|
||||
r = "name"
|
||||
assert(compareData(s,r))
|
||||
assert(not compareData('fred',s))
|
||||
assert(not compareData(nil, s))
|
||||
assert(not compareData("123",123))
|
||||
assert(not compareData(false, nil))
|
||||
assert(compareData(true, true))
|
||||
assert(compareData({1,2,3},{1,2,3}))
|
||||
assert(compareData({'one',2,'three'},{'one',2,'three'}))
|
||||
assert(not compareData({'one',2,4},{4,2,'one'}))
|
||||
assert(compareData({one='ichi',two='nichi',three='san'}, {three='san',two='nichi',one='ichi'}))
|
||||
s = { one={1,2,3}, two={one='hitotsu',two='futatsu',three='mitsu'} }
|
||||
assert(compareData(s,s))
|
||||
t = { one={1,2,3}, two={one='een',two='twee',three='drie'} }
|
||||
assert(not compareData(s,t))
|
||||
end
|
||||
|
||||
testCompareData()
|
||||
|
||||
--
|
||||
--
|
||||
-- Performs some perfunctory tests on JSON module
|
||||
function testJSON4Lua()
|
||||
json = require('json')
|
||||
|
||||
if nil then
|
||||
-- Test encodeString
|
||||
s = [["\"
|
||||
]]
|
||||
r = json._encodeString(s)
|
||||
assert(r=='\\"\\\\\\"\\n')
|
||||
s = [["""\\\"]]
|
||||
r = json._encodeString(s)
|
||||
assert(r==[[\"\"\"\\\\\\\"]])
|
||||
|
||||
end
|
||||
|
||||
-- Test encode for basic strings (complicated strings)
|
||||
s = [[Hello, Lua!]]
|
||||
r = json.encode(s)
|
||||
assert(r=='"Hello, Lua!"')
|
||||
s = [["\"
|
||||
]]
|
||||
r = json.encode(s)
|
||||
assert(r=='\"\\"\\\\\\"\\n\"')
|
||||
s = [["""\\\"]]
|
||||
r = json.encode(s)
|
||||
assert(r==[["\"\"\"\\\\\\\""]])
|
||||
|
||||
-- Test encode for numeric values
|
||||
s = 23
|
||||
r = json.encode(s)
|
||||
assert(r=='23')
|
||||
s=48.123
|
||||
r = json.encode(s)
|
||||
assert(r=='48.123')
|
||||
|
||||
-- Test encode for boolean values
|
||||
assert(json.encode(true)=='true')
|
||||
assert(json.encode(false)=='false')
|
||||
assert(json.encode(nil)=='null')
|
||||
|
||||
-- Test encode for arrays
|
||||
s = {1,2,3}
|
||||
r = json.encode(s)
|
||||
assert(r=="[1,2,3]")
|
||||
s = {9,9,9}
|
||||
r = json.encode(s)
|
||||
assert(r=="[9,9,9]")
|
||||
|
||||
-- Complex array test
|
||||
s = { 2, 'joe', false, nil, 'hi' }
|
||||
r = json.encode(s)
|
||||
assert(r=='[2,"joe",false,null,"hi"]')
|
||||
|
||||
-- Test encode for tables
|
||||
s = {Name='Craig',email='craig@lateral.co.za',age=35}
|
||||
r = json.encode(s)
|
||||
-- NB: This test can fail because of order: need to test further once
|
||||
-- decoding is supported.
|
||||
-- assert(r==[[{"age":35,"Name":"Craig","email":"craig@lateral.co.za"}]])
|
||||
|
||||
-- Test encoding tables with numeric (string) indexes
|
||||
s = {}
|
||||
s['1']='One'
|
||||
r = json.encode(s)
|
||||
-- print("r = ", r)
|
||||
assert(r=='{"1":"One"}')
|
||||
|
||||
s['2']= {One='Uno'}
|
||||
r = json.encode(s)
|
||||
assert(compareData(json.decode(r), s))
|
||||
|
||||
-- Test decode_scanWhitespace
|
||||
if nil then
|
||||
s = " \n \r \t "
|
||||
e = json._decode_scanWhitespace(s,1)
|
||||
assert(e==string.len(s)+1)
|
||||
s = " \n\r\t4"
|
||||
assert(json._decode_scanWhitespace(s,1)==5)
|
||||
|
||||
-- Test decode_scanString
|
||||
s = [["Test"]]
|
||||
r,e = json._decode_scanString(s,1)
|
||||
assert(r=='Test' and e==7)
|
||||
s = [["This\nis a \"test"]]
|
||||
r = json._decode_scanString(s,1)
|
||||
assert(r=="This\nis a \"test")
|
||||
|
||||
s = [["Test\u00A7\\"]]
|
||||
r,e = json._decode_scanString(s,1)
|
||||
assert(r=="Test\xC2\xA7\\" and e==9)
|
||||
|
||||
-- Test decode_scanNumber
|
||||
s = [[354]]
|
||||
r,e = json._decode_scanNumber(s,1)
|
||||
assert(r==354 and e==4)
|
||||
s = [[ 4565.23 AND OTHER THINGS ]]
|
||||
r,e = json._decode_scanNumber(s,2)
|
||||
assert(r==4565.23 and e==9)
|
||||
s = [[ -23.22 and ]]
|
||||
r,e = json._decode_scanNumber(s,2)
|
||||
assert(r==-23.22 and e==8)
|
||||
|
||||
-- Test decode_scanConstant
|
||||
s = "true"
|
||||
r,e = json._decode_scanConstant(s,1)
|
||||
assert(r==true and e==5)
|
||||
s = " false "
|
||||
r,e = json._decode_scanConstant(s,3)
|
||||
assert(r==false and e==8)
|
||||
s = "1null6"
|
||||
r,e = json._decode_scanConstant(s,2)
|
||||
assert(r==nil and e==6)
|
||||
|
||||
-- Test decode_scanArray
|
||||
s = "[1,2,3]"
|
||||
r,e = json._decode_scanArray(s,1)
|
||||
assert(compareData(r,{1,2,3}))
|
||||
s = [[[ 1 , 3 ,5 , "Fred" , true, false, null, -23 ] ]]
|
||||
r,e = json._decode_scanArray(s,1)
|
||||
assert(compareData(r, {1,3,5,'Fred',true,false,nil,-23} ) )
|
||||
s = "[3,5,null,7,9]"
|
||||
r,e = json._decode_scanArray(s,1)
|
||||
assert(compareData(r, {3,5,nil,7,9}))
|
||||
s = "[3,5,null,7,9,null,null]"
|
||||
r,e = json._decode_scanArray(s,1)
|
||||
assert(compareData(r, {3,5,nil,7,9,nil,nil}))
|
||||
|
||||
end
|
||||
|
||||
s = [["Test\u00A7\\\""]]
|
||||
r,e = json.decode(s)
|
||||
assert(r=="Test\xC2\xA7\\\"", r)
|
||||
|
||||
-- Test decode_scanObject
|
||||
s = [[ {"one":1, "two":2, "three":"three", "four":true} ]]
|
||||
r,e = json.decode(s)
|
||||
-- for x,y in pairs(r) do
|
||||
-- print(x,y)
|
||||
-- end
|
||||
assert(compareData(r,{one=1,two=2,three='three',four=true}))
|
||||
s = [[ { "one" : { "first":1,"second":2,"third":3}, "two":2, "three":false } ]]
|
||||
r,e = json.decode(s)
|
||||
assert(compareData(r, {one={first=1,second=2,third=3},two=2,three=false}))
|
||||
s = [[ { "primes" : [2,3,5,7,9], "user":{"name":"craig","age":35,"programs_lua":true},
|
||||
"lua_is_great":true } ]]
|
||||
r,e = json.decode(s)
|
||||
assert(compareData(r, {primes={2,3,5,7,9},user={name='craig',age=35,programs_lua=true},lua_is_great=true}))
|
||||
|
||||
-- Test json.null management
|
||||
t = { 1,2,json.null,4 }
|
||||
assert( json.encode(t)=="[1,2,null,4]" )
|
||||
t = {x=json.null }
|
||||
r = json.encode(t)
|
||||
assert( json.encode(t) == '{"x":null}' )
|
||||
|
||||
-- Test comment decoding
|
||||
s = [[ /* A comment
|
||||
that spans
|
||||
a few lines
|
||||
*/
|
||||
"test"
|
||||
]]
|
||||
r,e = json.decode(s)
|
||||
assert(r=='test',"Comment decoding failed")
|
||||
|
||||
-- Per error reported by M.Hund, with incorrect decoding of string-numbered tables
|
||||
s = {}
|
||||
subt = {a="a",b="b",c="c"}
|
||||
s['1'] = subt
|
||||
s['2'] = subt
|
||||
s['3'] = subt
|
||||
r = json.decode('{"1":{"a":"a","b":"b","c":"c"},"2":{"a":"a","b":"b","c":"c"},"3":{"a":"a","b":"b","c":"c"}}')
|
||||
assert(compareData(s, r))
|
||||
end
|
||||
|
||||
testJSON4Lua()
|
||||
|
||||
print("JSON4Lua tests completed successfully")
|
||||
46
libs/json4lua/examples/timetrials.lua
Executable file
46
libs/json4lua/examples/timetrials.lua
Executable file
|
|
@ -0,0 +1,46 @@
|
|||
--[[
|
||||
Some Time Trails for the JSON4Lua package
|
||||
]]--
|
||||
|
||||
|
||||
require('json')
|
||||
require('os')
|
||||
require('table')
|
||||
|
||||
local t1 = os.clock()
|
||||
local jstr
|
||||
local v
|
||||
for i=1,100 do
|
||||
local t = {}
|
||||
for j=1,500 do
|
||||
table.insert(t,j)
|
||||
end
|
||||
for j=1,500 do
|
||||
table.insert(t,"VALUE")
|
||||
end
|
||||
jstr = json.encode(t)
|
||||
v = json.decode(jstr)
|
||||
--print(json.encode(t))
|
||||
end
|
||||
|
||||
for i = 1,100 do
|
||||
local t = {}
|
||||
for j=1,500 do
|
||||
local m= math.mod(j,3)
|
||||
if (m==0) then
|
||||
t['a'..j] = true
|
||||
elseif m==1 then
|
||||
t['a'..j] = json.null
|
||||
else
|
||||
t['a'..j] = j
|
||||
end
|
||||
end
|
||||
jstr = json.encode(t)
|
||||
v = json.decode(jstr)
|
||||
end
|
||||
|
||||
print (jstr)
|
||||
--print(type(t1))
|
||||
local t2 = os.clock()
|
||||
|
||||
print ("Elapsed time=" .. os.difftime(t2,t1) .. "s")
|
||||
Loading…
Add table
Add a link
Reference in a new issue