From 80f57a6cf2d7c0029bef2f15e1efb72e2b9d467e Mon Sep 17 00:00:00 2001 From: Josh Kelley Date: Wed, 1 Apr 2015 22:20:24 -0400 Subject: [PATCH] Misc. cleanup Fix spelling; fix invalid JSON in README; remove incorrectly set Unix execute permissions. --- README.md | 2 +- doc/INSTALL.txt | 0 doc/LICENCE.txt | 0 doc/README.txt | 0 doc/VERSION.txt | 0 doc/cgilua_patch.html | 0 doc/index.html | 0 doc/pics/json4lua.gif | Bin doc/pics/lunartone.gif | Bin examples/example.lua | 0 examples/jsonrpc.lua | 0 examples/tests.lua | 0 examples/timetrials.lua | 4 ++-- json/json.lua | 0 json/rpc.lua | 0 json/rpcserver.lua | 2 +- 16 files changed, 4 insertions(+), 4 deletions(-) mode change 100755 => 100644 doc/INSTALL.txt mode change 100755 => 100644 doc/LICENCE.txt mode change 100755 => 100644 doc/README.txt mode change 100755 => 100644 doc/VERSION.txt mode change 100755 => 100644 doc/cgilua_patch.html mode change 100755 => 100644 doc/index.html mode change 100755 => 100644 doc/pics/json4lua.gif mode change 100755 => 100644 doc/pics/lunartone.gif mode change 100755 => 100644 examples/example.lua mode change 100755 => 100644 examples/jsonrpc.lua mode change 100755 => 100644 examples/tests.lua mode change 100755 => 100644 examples/timetrials.lua mode change 100755 => 100644 json/json.lua mode change 100755 => 100644 json/rpc.lua mode change 100755 => 100644 json/rpcserver.lua diff --git a/README.md b/README.md index 9890719..f617a7f 100644 --- a/README.md +++ b/README.md @@ -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 ## diff --git a/doc/INSTALL.txt b/doc/INSTALL.txt old mode 100755 new mode 100644 diff --git a/doc/LICENCE.txt b/doc/LICENCE.txt old mode 100755 new mode 100644 diff --git a/doc/README.txt b/doc/README.txt old mode 100755 new mode 100644 diff --git a/doc/VERSION.txt b/doc/VERSION.txt old mode 100755 new mode 100644 diff --git a/doc/cgilua_patch.html b/doc/cgilua_patch.html old mode 100755 new mode 100644 diff --git a/doc/index.html b/doc/index.html old mode 100755 new mode 100644 diff --git a/doc/pics/json4lua.gif b/doc/pics/json4lua.gif old mode 100755 new mode 100644 diff --git a/doc/pics/lunartone.gif b/doc/pics/lunartone.gif old mode 100755 new mode 100644 diff --git a/examples/example.lua b/examples/example.lua old mode 100755 new mode 100644 diff --git a/examples/jsonrpc.lua b/examples/jsonrpc.lua old mode 100755 new mode 100644 diff --git a/examples/tests.lua b/examples/tests.lua old mode 100755 new mode 100644 diff --git a/examples/timetrials.lua b/examples/timetrials.lua old mode 100755 new mode 100644 index cbda514..ab79446 --- a/examples/timetrials.lua +++ b/examples/timetrials.lua @@ -1,5 +1,5 @@ --[[ - Some Time Trails for the JSON4Lua package + Some Time Trials for the JSON4Lua package ]]-- @@ -43,4 +43,4 @@ print (jstr) --print(type(t1)) local t2 = os.clock() -print ("Elapsed time=" .. os.difftime(t2,t1) .. "s") \ No newline at end of file +print ("Elapsed time=" .. os.difftime(t2,t1) .. "s") diff --git a/json/json.lua b/json/json.lua old mode 100755 new mode 100644 diff --git a/json/rpc.lua b/json/rpc.lua old mode 100755 new mode 100644 diff --git a/json/rpcserver.lua b/json/rpcserver.lua old mode 100755 new mode 100644 index e01f1f8..6ee87bc --- a/json/rpcserver.lua +++ b/json/rpcserver.lua @@ -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