tolpi/brat - Change X7UOHDX4QI4PCXIAVAKCRSLZLEEWT7QU6U6RCBOX2IZKGTBXYFAQC

refactor

Created by 9E8MxN1nvgX4DRC3PhGXug3ydrBXWfmR9XK2eNRJVkA3 today at 02:24

X7UOHDX4QI4PCXIAVAKCRSLZLEEWT7QU6U6RCBOX2IZKGTBXYFAQC

Dependencies

[2] CX5XTYKHJC2JQLVXL7BLAY3UF3ZRHDQ3LX2QOYXOJZRZBY7VMAAQC

In channels

main

Change contents

Replacement in lib/json_helpers.lua at line 26 [2.18951127]

B:BD[2.18952325] → [2.18952325:18952556]

local floor, huge = math.floor, math.huge
local strrep, gsub, strsub, strbyte, strchar, strfind, strlen, strformat =
      string.rep, string.gsub, string.sub, string.byte, string.char,
      string.find, string.len, string.format

[2.18952325]

[2.18952556]

local floor = math.floor
local gsub, strsub, strbyte, strchar, strfind, strformat =
    string.gsub, string.sub, string.byte, string.char,
    string.find, string.format

Replacement in lib/json_helpers.lua at line 33 [2.18951127]

B:BD[2.18952607] → [2.18952607:18952729]

  ["\""] = "\\\"", ["\\"] = "\\\\", ["\b"] = "\\b", ["\f"] = "\\f",
  ["\n"] = "\\n",  ["\r"] = "\\r",  ["\t"] = "\\t"
}

[2.18952607]

[2.18952729]

    ["\""] = "\\\"",
    ["\\"] = "\\\\",
    ["\b"] = "\\b",
    ["\f"] = "\\f",
    ["\n"] = "\\n",
    ["\r"] = "\\r",
    ["\t"] = "\\t"
}

Replacement in lib/json_helpers.lua at line 43 [2.18951127]

B:BD[2.18952752] → [2.18952752:18952868]

  ["\""] = "\"", ["\\"] = "\\", ["/"] = "/", ["b"] = "\b", ["f"] = "\f",
  ["n"] = "\n", ["r"] = "\r", ["t"] = "\t"

[2.18952752]

[2.18952868]

    ["\""] = "\"",
    ["\\"] = "\\",
    ["/"] = "/",
    ["b"] = "\b",
    ["f"] = "\f",
    ["n"] = "\n",
    ["r"] = "\r",
    ["t"] = "\t"

Replacement in lib/json_helpers.lua at line 53 [2.18951127]

B:BD[2.18952871] → [2.18952871:18953574]

local function unichar (value)
  if value < 0 then
    return nil
  elseif value <= 0x007f then
    return strchar (value)
  elseif value <= 0x07ff then
    return strchar (0xc0 + floor(value/0x40),
                    0x80 + (floor(value) % 0x40))
  elseif value <= 0xffff then
    return strchar (0xe0 + floor(value/0x1000),
                    0x80 + (floor(value/0x40) % 0x40),
                    0x80 + (floor(value) % 0x40))
  elseif value <= 0x10ffff then
    return strchar (0xf0 + floor(value/0x40000),
                    0x80 + (floor(value/0x1000) % 0x40),
                    0x80 + (floor(value/0x40) % 0x40),
                    0x80 + (floor(value) % 0x40))
  else
    return nil
  end

[2.18952871]

[2.18953574]

local function unichar(value)
    if value < 0 then
        return nil
    elseif value <= 0x007f then
        return strchar(value)
    elseif value <= 0x07ff then
        return strchar(0xc0 + floor(value / 0x40),
            0x80 + (floor(value) % 0x40))
    elseif value <= 0xffff then
        return strchar(0xe0 + floor(value / 0x1000),
            0x80 + (floor(value / 0x40) % 0x40),
            0x80 + (floor(value) % 0x40))
    elseif value <= 0x10ffff then
        return strchar(0xf0 + floor(value / 0x40000),
            0x80 + (floor(value / 0x1000) % 0x40),
            0x80 + (floor(value / 0x40) % 0x40),
            0x80 + (floor(value) % 0x40))
    else
        return nil
    end

Replacement in lib/json_helpers.lua at line 75 [2.18951127]

B:BD[2.18953579] → [2.18953579:18955087]

local function escapeutf8 (uchar)
  local value = escapecodes[uchar]
  if value then
    return value
  end
  local a, b, c, d = strbyte (uchar, 1, 4)
  a, b, c, d = a or 0, b or 0, c or 0, d or 0
  if a <= 0x7f then        
    value = a
  elseif 0xc0 <= a and a <= 0xdf and b >= 0x80 then
    value = (a - 0xc0) * 0x40 + b - 0x80
  elseif 0xe0 <= a and a <= 0xef and b >= 0x80 and c >= 0x80 then
    value = ((a - 0xe0) * 0x40 + b - 0x80) * 0x40 + c - 0x80
  elseif 0xf0 <= a and a <= 0xf7 and b >= 0x80 and c >= 0x80 and d >= 0x80 then
    value = (((a - 0xf0) * 0x40 + b - 0x80) * 0x40 + c - 0x80) * 0x40 + d - 0x80
  else
    return ""
  end
  if value <= 0xffff then
    return strformat ("\\u%.4x", value)
  elseif value <= 0x10ffff then
    -- encode as UTF-16 surrogate pair
    value = value - 0x10000
    local highsur, lowsur = 0xD800 + floor (value/0x400), 0xDC00 + (value % 0x400)
    return strformat ("\\u%.4x\\u%.4x", highsur, lowsur)
  else
    return ""
  end
end
local function fsub (str, pattern, repl)
  -- gsub always builds a new string in a buffer, even when no match
  -- exists. First using find should be more efficient when most strings
  -- don't contain the pattern.
  if strfind (str, pattern) then
    return gsub (str, pattern, repl)
  else 
    return str
  end
end 
local function scanstring (str, pos)
  local lastpos = pos + 1
  local buffer, n = {}, 0
  while true do
    local nextpos = strfind (str, "[\"\\]", lastpos)
    if not nextpos then
      return nil, pos

[2.18953579]

[2.18955087]

local function escapeutf8(uchar)
    local value = escapecodes[uchar]
    if value then
        return value

Replacement in lib/json_helpers.lua at line 80 [2.18951127]

B:BD[2.18955095] → [2.18955095:18955194]

    if nextpos > lastpos then
      n = n + 1
      buffer[n] = strsub (str, lastpos, nextpos - 1)

[2.18955095]

[2.18955194]

    local a, b, c, d = strbyte(uchar, 1, 4)
    a, b, c, d = a or 0, b or 0, c or 0, d or 0
    local char
    if a <= 0x7f then
        char = a
    elseif 0xc0 <= a and a <= 0xdf and b >= 0x80 then
        char = (a - 0xc0) * 0x40 + b - 0x80
    elseif 0xe0 <= a and a <= 0xef and b >= 0x80 and c >= 0x80 then
        char = ((a - 0xe0) * 0x40 + b - 0x80) * 0x40 + c - 0x80
    elseif 0xf0 <= a and a <= 0xf7 and b >= 0x80 and c >= 0x80 and d >= 0x80 then
        char = (((a - 0xf0) * 0x40 + b - 0x80) * 0x40 + c - 0x80) * 0x40 + d - 0x80
    else
        return ""

Replacement in lib/json_helpers.lua at line 94 [2.18951127]

B:BD[2.18955202] → [2.18955202:18955293]

    if strsub (str, nextpos, nextpos) == "\"" then
      lastpos = nextpos + 1
      break

[2.18955202]

[2.18955293]

    if char <= 0xffff then
        return strformat("\\u%.4x", char)
    elseif char <= 0x10ffff then
        -- encode as UTF-16 surrogate pair
        char = char - 0x10000
        local highsur, lowsur = 0xD800 + floor(char / 0x400), 0xDC00 + (char % 0x400)
        return strformat("\\u%.4x\\u%.4x", highsur, lowsur)

Replacement in lib/json_helpers.lua at line 102 [2.18951127]

B:BD[2.18955302] → [2.18955302:18956129]

      local escchar = strsub (str, nextpos + 1, nextpos + 1)
      local value 
      if escchar == "u" then
        value = tonumber (strsub (str, nextpos + 2, nextpos + 5), 16)
        if value then
          local value2 
          if 0xD800 <= value and value <= 0xDBff then
            -- we have the high surrogate of UTF-16. Check if there is a
            -- low surrogate escaped nearby to combine them.
            if strsub (str, nextpos + 6, nextpos + 7) == "\\u" then
              value2 = tonumber (strsub (str, nextpos + 8, nextpos + 11), 16)
              if value2 and 0xDC00 <= value2 and value2 <= 0xDFFF then
                value = (value - 0xD800)  * 0x400 + (value2 - 0xDC00) + 0x10000
              else
                value2 = nil -- in case it was out of range for a low surrogate
              end

[2.18955302]

[2.18956129]

        return ""
    end
end
local function fsub(str, pattern, repl)
    -- gsub always builds a new string in a buffer, even when no match
    -- exists. First using find should be more efficient when most strings
    -- don't contain the pattern.
    if strfind(str, pattern) then
        return gsub(str, pattern, repl)
    else
        return str
    end
end
local function scanstring(str, pos)
    local lastpos = pos + 1
    local buffer, n = {}, 0
    while true do
        local nextpos = strfind(str, "[\"\\]", lastpos)
        if not nextpos then
            return nil, pos
        end
        if nextpos > lastpos then
            n = n + 1
            buffer[n] = strsub(str, lastpos, nextpos - 1)
        end
        if strsub(str, nextpos, nextpos) == "\"" then
            lastpos = nextpos + 1
            break
        else
            local escchar = strsub(str, nextpos + 1, nextpos + 1)
            local value
            if escchar == "u" then
                value = tonumber(strsub(str, nextpos + 2, nextpos + 5), 16)
                if value then
                    local value2
                    if 0xD800 <= value and value <= 0xDBff then
                        -- we have the high surrogate of UTF-16. Check if there is a
                        -- low surrogate escaped nearby to combine them.
                        if strsub(str, nextpos + 6, nextpos + 7) == "\\u" then
                            value2 = tonumber(strsub(str, nextpos + 8, nextpos + 11), 16)
                            if value2 and 0xDC00 <= value2 and value2 <= 0xDFFF then
                                value = (value - 0xD800) * 0x400 + (value2 - 0xDC00) + 0x10000
                            else
                                value2 = nil -- in case it was out of range for a low surrogate
                            end
                        end
                    end
                    value = value and unichar(value)
                    if value then
                        if value2 then
                            lastpos = nextpos + 12
                        else
                            lastpos = nextpos + 6
                        end
                    end
                end

Replacement in lib/json_helpers.lua at line 161 [2.18951127]

B:BD[2.18956145] → [2.18956145:18956344]

          end
          value = value and unichar (value)
          if value then
            if value2 then
              lastpos = nextpos + 12
            else
              lastpos = nextpos + 6

[2.18956145]

[2.18956344]

            if not value then
                value = escapechars[escchar] or escchar
                lastpos = nextpos + 2

Replacement in lib/json_helpers.lua at line 165 [2.18951127]
B:BD[2.18956360] → [2.18956360:18956374]
```
          end
```
[2.18956360]
[2.18956374]
```
            n = n + 1
            buffer[n] = value
```

Deletion in lib/json_helpers.lua at line 168 [2.18951127]

B:BD[2.18956386] → [2.18956386:18956548]

      end
      if not value then
        value = escapechars[escchar] or escchar
        lastpos = nextpos + 2
      end
      n = n + 1
      buffer[n] = value

Replacement in lib/json_helpers.lua at line 169 [2.18951127]

B:BD[2.18956556] → [2.18956556:18956701]

  end
  if n == 1 then
    return buffer[1], lastpos
  elseif n > 1 then
    return concat (buffer), lastpos
  else
    return "", lastpos
  end

[2.18956556]

[2.18956701]

    if n == 1 then
        return buffer[1], lastpos
    elseif n > 1 then
        return concat(buffer), lastpos
    else
        return "", lastpos
    end

Replacement in lib/json_helpers.lua at line 178 [2.18951127]

B:BD[2.18956706] → [2.18956706:18957439]

local function quotestring (value)
  -- based on the regexp "escapable" in https://github.com/douglascrockford/JSON-js
  value = fsub (value, "[%z\1-\31\"\\\127]", escapeutf8)
  if strfind (value, "[\194\216\220\225\226\239]") then
    value = fsub (value, "\194[\128-\159\173]", escapeutf8)
    value = fsub (value, "\216[\128-\132]", escapeutf8)
    value = fsub (value, "\220\143", escapeutf8)
    value = fsub (value, "\225\158[\180\181]", escapeutf8)
    value = fsub (value, "\226\128[\140-\143\168\175]", escapeutf8)
    value = fsub (value, "\226\129[\160-\175]", escapeutf8)
    value = fsub (value, "\239\187\191", escapeutf8)
    value = fsub (value, "\239\191[\176\191]", escapeutf8)
  end
  return "\"" .. value .. "\""

[2.18956706]

[2.18957439]

local function quotestring(value)
    -- based on the regexp "escapable" in https://github.com/douglascrockford/JSON-js
    value = fsub(value, "[%z\1-\31\"\\\127]", escapeutf8)
    if strfind(value, "[\194\216\220\225\226\239]") then
        value = fsub(value, "\194[\128-\159\173]", escapeutf8)
        value = fsub(value, "\216[\128-\132]", escapeutf8)
        value = fsub(value, "\220\143", escapeutf8)
        value = fsub(value, "\225\158[\180\181]", escapeutf8)
        value = fsub(value, "\226\128[\140-\143\168\175]", escapeutf8)
        value = fsub(value, "\226\129[\160-\175]", escapeutf8)
        value = fsub(value, "\239\187\191", escapeutf8)
        value = fsub(value, "\239\191[\176\191]", escapeutf8)
    end
    return "\"" .. value .. "\""

Replacement in lib/json_helpers.lua at line 194 [2.18951127]

B:BD[2.18957444] → [2.18957444:18957553]

local function json_encode(self, brat_string)
  return base_string:new(quotestring(brat_string._lua_string))

[2.18957444]

[2.18957553]

local function json_encode(_, brat_string)
    return base_string:new(quotestring(brat_string._lua_string))

Replacement in lib/json_helpers.lua at line 198 [2.18951127]

B:BD[2.18957558] → [2.18957558:18957807]

local function json_decode(self, brat_string, pos)
  local result, new_pos = scanstring(brat_string._lua_string, pos)
  if result and result ~= "" then
    return array:new(base_string:new(result), new_pos - 1)
  else
    return object.__null
  end

[2.18957558]

[2.18957807]

local function json_decode(_, brat_string, pos)
    local result, new_pos = scanstring(brat_string._lua_string, pos)
    if result and result ~= "" then
        return array:new(base_string:new(result), new_pos - 1)
    else
        return object.__null
    end