aboutsummaryrefslogtreecommitdiff
path: root/lua
diff options
context:
space:
mode:
authorMark Pulford <mark@kyne.com.au>2012-01-13 07:17:48 +1030
committerMark Pulford <mark@kyne.com.au>2012-03-04 18:54:34 +1030
commit73d33f25760d4d4ffb7fa8acf6a67d0f7e19fec7 (patch)
tree29e1bf0e1d0fb892eb0bdc6959f61da4b6cb639a /lua
parent5fb9fe1c67a070d1e83497c44b7b7364da9f1975 (diff)
downloadlua-cjson-73d33f25760d4d4ffb7fa8acf6a67d0f7e19fec7.tar.gz
lua-cjson-73d33f25760d4d4ffb7fa8acf6a67d0f7e19fec7.tar.bz2
lua-cjson-73d33f25760d4d4ffb7fa8acf6a67d0f7e19fec7.zip
Rename "cjson-misc" module to "cjson.util"
Diffstat (limited to 'lua')
-rw-r--r--lua/cjson/util.lua (renamed from lua/cjson-misc.lua)0
-rwxr-xr-xlua/json2lua.lua6
-rwxr-xr-xlua/lua2json.lua4
3 files changed, 5 insertions, 5 deletions
diff --git a/lua/cjson-misc.lua b/lua/cjson/util.lua
index 2142464..2142464 100644
--- a/lua/cjson-misc.lua
+++ b/lua/cjson/util.lua
diff --git a/lua/json2lua.lua b/lua/json2lua.lua
index 050b89d..014416d 100755
--- a/lua/json2lua.lua
+++ b/lua/json2lua.lua
@@ -7,8 +7,8 @@
7-- ./json2lua.lua test.json 7-- ./json2lua.lua test.json
8 8
9local json = require "cjson" 9local json = require "cjson"
10local misc = require "cjson-misc" 10local util = require "cjson.util"
11 11
12local json_text = misc.file_load(arg[1]) 12local json_text = util.file_load(arg[1])
13local t = json.decode(json_text) 13local t = json.decode(json_text)
14print(misc.serialise_value(t)) 14print(util.serialise_value(t))
diff --git a/lua/lua2json.lua b/lua/lua2json.lua
index 2a9ddf9..aee8869 100755
--- a/lua/lua2json.lua
+++ b/lua/lua2json.lua
@@ -7,14 +7,14 @@
7-- ./lua2json.lua test.lua 7-- ./lua2json.lua test.lua
8 8
9local json = require "cjson" 9local json = require "cjson"
10local misc = require "cjson-misc" 10local util = require "cjson.util"
11 11
12local env = { 12local env = {
13 json = { null = json.null }, 13 json = { null = json.null },
14 null = json.null 14 null = json.null
15} 15}
16 16
17local t = misc.run_script("data = " .. misc.file_load(arg[1]), env) 17local t = util.run_script("data = " .. util.file_load(arg[1]), env)
18print(json.encode(t.data)) 18print(json.encode(t.data))
19 19
20-- vi:ai et sw=4 ts=4: 20-- vi:ai et sw=4 ts=4: