diff options
Diffstat (limited to 'lua')
| -rw-r--r-- | lua/cjson/util.lua (renamed from lua/cjson-misc.lua) | 0 | ||||
| -rwxr-xr-x | lua/json2lua.lua | 6 | ||||
| -rwxr-xr-x | lua/lua2json.lua | 4 |
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 | ||
| 9 | local json = require "cjson" | 9 | local json = require "cjson" |
| 10 | local misc = require "cjson-misc" | 10 | local util = require "cjson.util" |
| 11 | 11 | ||
| 12 | local json_text = misc.file_load(arg[1]) | 12 | local json_text = util.file_load(arg[1]) |
| 13 | local t = json.decode(json_text) | 13 | local t = json.decode(json_text) |
| 14 | print(misc.serialise_value(t)) | 14 | print(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 | ||
| 9 | local json = require "cjson" | 9 | local json = require "cjson" |
| 10 | local misc = require "cjson-misc" | 10 | local util = require "cjson.util" |
| 11 | 11 | ||
| 12 | local env = { | 12 | local env = { |
| 13 | json = { null = json.null }, | 13 | json = { null = json.null }, |
| 14 | null = json.null | 14 | null = json.null |
| 15 | } | 15 | } |
| 16 | 16 | ||
| 17 | local t = misc.run_script("data = " .. misc.file_load(arg[1]), env) | 17 | local t = util.run_script("data = " .. util.file_load(arg[1]), env) |
| 18 | print(json.encode(t.data)) | 18 | print(json.encode(t.data)) |
| 19 | 19 | ||
| 20 | -- vi:ai et sw=4 ts=4: | 20 | -- vi:ai et sw=4 ts=4: |
