Skip to content

Misc. cleanup #11

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ json = require('json')
print(json.encode({ 1, 2, 'fred', {first='mars',second='venus',third='earth'} }))
```
```json
[1,2,"fred", {"first":"mars","second":"venus","third","earth"}]
[1,2,"fred",{"first":"mars","second":"venus","third":"earth"}]
```

## Decoding ##
Expand Down
Empty file modified doc/INSTALL.txt
100755 → 100644
Empty file.
Empty file modified doc/LICENCE.txt
100755 → 100644
Empty file.
Empty file modified doc/README.txt
100755 → 100644
Empty file.
Empty file modified doc/VERSION.txt
100755 → 100644
Empty file.
Empty file modified doc/cgilua_patch.html
100755 → 100644
Empty file.
Empty file modified doc/index.html
100755 → 100644
Empty file.
Empty file modified doc/pics/json4lua.gif
100755 → 100644
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Empty file modified doc/pics/lunartone.gif
100755 → 100644
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Empty file modified examples/example.lua
100755 → 100644
Empty file.
Empty file modified examples/jsonrpc.lua
100755 → 100644
Empty file.
Empty file modified examples/tests.lua
100755 → 100644
Empty file.
4 changes: 2 additions & 2 deletions examples/timetrials.lua
100755 → 100644
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
--[[
Some Time Trails for the JSON4Lua package
Some Time Trials for the JSON4Lua package
]]--


Expand Down Expand Up @@ -43,4 +43,4 @@ print (jstr)
--print(type(t1))
local t2 = os.clock()

print ("Elapsed time=" .. os.difftime(t2,t1) .. "s")
print ("Elapsed time=" .. os.difftime(t2,t1) .. "s")
Empty file modified json/json.lua
100755 → 100644
Empty file.
Empty file modified json/rpc.lua
100755 → 100644
Empty file.
2 changes: 1 addition & 1 deletion json/rpcserver.lua
100755 → 100644
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ function serve(luaClass, packReturn)
jsonResponse.error = 'Method ' .. jsonRequest.method .. ' does not exist at this server.'
else
local callResult = { pcall( method, unpack( jsonRequest.params ) ) }
if callResult[1] then -- Function call successfull
if callResult[1] then -- Function call successful
table.remove(callResult,1)
if packReturn and table.getn(callResult)>1 then
jsonResponse.result = callResult
Expand Down