mirrors/CC-Tweaked
1
0
Fork 0
mirror of https://github.com/SquidDev-CC/CC-Tweaked synced 2025-09-05 03:47:56 +00:00
Code Issues Releases Wiki Activity

Various SNBT parsing improvements

Browse Source
This commit is contained in:
Merith-TK
2021-02-22 17:45:44 -08:00
parent feda08b915
commit eef36e1358
2 changed files with 25 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
patchwork.md
View File

@@ -244,3 +244,15 @@ Tesselator, but this'll do for now.
Fixes Zundrel/cc-tweaked-fabric#20. Fixes Zundrel/cc-tweaked-fabric#20.
``` ```
```
c58441b29c3715f092e7f3747bb3ec65ae5a3d29
Various SNBT parsing improvements
Correctly handle:
- Typed arrays ([I; 1, 2, 3])
- All suffixed numbers (1.2d)
- Single-quoted strings
Fixes #559
```

17
src/main/resources/data/computercraft/lua/rom/apis/textutils.lua
View File

@@ -453,13 +453,13 @@ do
error_at(pos, "Unexpected %s, expected %s.", actual, exp) error_at(pos, "Unexpected %s, expected %s.", actual, exp)
end end
local function parse_string(str, pos) local function parse_string(str, pos, terminate)
local buf, n = {}, 1 local buf, n = {}, 1
while true do while true do
local c = sub(str, pos, pos) local c = sub(str, pos, pos)
if c == "" then error_at(pos, "Unexpected end of input, expected '\"'.") end if c == "" then error_at(pos, "Unexpected end of input, expected '\"'.") end
if c == '"' then break end if c == terminate then break end
if c == '\\' then if c == '\\' then
-- Handle the various escapes -- Handle the various escapes
@@ -485,13 +485,13 @@ do
return concat(buf, "", 1, n - 1), pos + 1 return concat(buf, "", 1, n - 1), pos + 1
end end
local valid = { b = true, B = true, s = true, S = true, l = true, L = true, f = true, F = true, d = true, D = true } local num_types = { b = true, B = true, s = true, S = true, l = true, L = true, f = true, F = true, d = true, D = true }
local function parse_number(str, pos, opts) local function parse_number(str, pos, opts)
local _, last, num_str = find(str, '^(-?%d+%.?%d*[eE]?[+-]?%d*)', pos) local _, last, num_str = find(str, '^(-?%d+%.?%d*[eE]?[+-]?%d*)', pos)
local val = tonumber(num_str) local val = tonumber(num_str)
if not val then error_at(pos, "Malformed number %q.", num_str) end if not val then error_at(pos, "Malformed number %q.", num_str) end
if opts.nbt_style and valid[sub(str, pos + 1, pos + 1)] then return val, last + 2 end if opts.nbt_style and num_types[sub(str, last + 1, last + 1)] then return val, last + 2 end
return val, last + 1 return val, last + 1
end end
@@ -501,9 +501,11 @@ do
return val, last + 1 return val, last + 1
end end
local arr_types = { I = true, L = true, B = true }
local function decode_impl(str, pos, opts) local function decode_impl(str, pos, opts)
local c = sub(str, pos, pos) local c = sub(str, pos, pos)
if c == '"' then return parse_string(str, pos + 1) if c == '"' then return parse_string(str, pos + 1, '"')
elseif c == "'" and opts.nbt_style then return parse_string(str, pos + 1, "\'")
elseif c == "-" or c >= "0" and c <= "9" then return parse_number(str, pos, opts) elseif c == "-" or c >= "0" and c <= "9" then return parse_number(str, pos, opts)
elseif c == "t" then elseif c == "t" then
if sub(str, pos + 1, pos + 3) == "rue" then return true, pos + 4 end if sub(str, pos + 1, pos + 3) == "rue" then return true, pos + 4 end
@@ -560,6 +562,11 @@ do
pos = skip(str, pos + 1) pos = skip(str, pos + 1)
c = sub(str, pos, pos) c = sub(str, pos, pos)
if arr_types[c] and sub(str, pos + 1, pos + 1) == ";" and opts.nbt_style then
pos = skip(str, pos + 2)
c = sub(str, pos, pos)
end
if c == "" then return expected(pos, c, "']'") end if c == "" then return expected(pos, c, "']'") end
if c == "]" then return empty_json_array, pos + 1 end if c == "]" then return empty_json_array, pos + 1 end