From 4643641d51a3603547a23f28aa2d89618b50b651 Mon Sep 17 00:00:00 2001 From: Merith-TK Date: Mon, 22 Feb 2021 01:23:39 -0800 Subject: [PATCH] Update Patchwork, Handle Tabs when Parsing Json --- patchwork.md | 9 ++++++++- .../data/computercraft/lua/rom/apis/textutils.lua | 4 ++-- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/patchwork.md b/patchwork.md index 4a19c4040..52b637d94 100644 --- a/patchwork.md +++ b/patchwork.md @@ -8,7 +8,8 @@ Title // Commit Title SubScript // Desc of commit ``` -If a edit that is present in CC:T is not needed, i will skip over it +If a edit that is present in CC:T is not needed, I will skip over it. +Any and all references to an issue number, are to be found on CC:T's repo. not this oen ```md 5155e18de279a193c558aa029963486fd1294769 @@ -21,4 +22,10 @@ Co-authored-by: Boom ae6124d1f477487abab1858abde8c4ec49dfee3c Translations for Vienamese Co-authored-by: Boom +``` + +``` +59de21eae29849988e77fad6bc335f5ce78dfec7 +Handle tabs when parsing JSON +Fixes #539 ``` \ No newline at end of file diff --git a/src/main/resources/data/computercraft/lua/rom/apis/textutils.lua b/src/main/resources/data/computercraft/lua/rom/apis/textutils.lua index 40de6924b..576c6755e 100644 --- a/src/main/resources/data/computercraft/lua/rom/apis/textutils.lua +++ b/src/main/resources/data/computercraft/lua/rom/apis/textutils.lua @@ -432,7 +432,7 @@ do --- Skip any whitespace local function skip(str, pos) - local _, last = find(str, "^[ \n\r\v]+", pos) + local _, last = find(str, "^[ \n\r\t]+", pos) if last then return last + 1 else return pos end end @@ -472,7 +472,7 @@ do buf[n], n, pos = utf8.char(tonumber(num_str, 16)), n + 1, pos + 6 else local unesc = escapes[c] - if not unesc then error_at(pos + 1, "Unknown escape character %q.", unesc) end + if not unesc then error_at(pos + 1, "Unknown escape character %q.", c) end buf[n], n, pos = unesc, n + 1, pos + 2 end elseif c >= '\x20' then