akkartik/sokoban.love - Change VVXVV2D2F5Y6D6N5VVPUPK3N6GMDTG2YCYPQDYTYEKVKBYHRRYEAC

change data model; text can now have metadata

Created by Kartik K. Agaram on May 17, 2022

VVXVV2D2F5Y6D6N5VVPUPK3N6GMDTG2YCYPQDYTYEKVKBYHRRYEAC

Dependencies

In channels

main

Change contents

Replacement in main.lua at line 5 [9.2]

B:BD[7.22] → [8.3:104]

-- lines is an array of lines
-- a line is either:
--    a string containing text
--    or a drawing

[7.22]

[8.104]

-- a line is either text or a drawing
-- a text is a table with:
--    mode = 'text'
--    string data

Replacement in main.lua at line 10 [9.2]

B:BD[8.134] → [8.134:163]

--    a (y) coord in pixels,

[8.134]

[8.163]

--    mode = 'drawing'
--    a (y) coord in pixels (updated while painting screen),

Replacement in main.lua at line 32 [9.2]
B:BD[8.1237] → [10.1:14]
```
lines = {''}
```
[8.1237]
[10.14]
```
lines = {{mode='text', data=''}}
```
Replacement in main.lua at line 39 [9.2]
B:BD[10.148] → [10.148:183]
```
cursor_pos = #lines[cursor_line]+1
```
[10.148]
[8.1238]
```
cursor_pos = #lines[cursor_line].data+1
```

Replacement in main.lua at line 92 [9.2]

B:BD[11.80] → [12.73:96]

    if line == '' then

[12.72]

[12.96]

    if line.mode == 'text' and line.data == '' then

Replacement in main.lua at line 102 [9.2]

B:BD[12.500] → [13.3:97]

                     table.insert(lines, i, {y=y, h=256/2, points={}, shapes={}, pending={}})

[12.500]

[12.588]

                     table.insert(lines, i, {mode='drawing', y=y, h=256/2, points={}, shapes={}, pending={}})

Replacement in main.lua at line 108 [9.2]
∅:D[3.200] → [12.613:651]
B:BD[12.613] → [12.613:651]
```
    elseif type(line) == 'table' then
```
[3.200]
[12.651]
```
    elseif line.mode == 'drawing' then
```

Replacement in main.lua at line 159 [9.2]

B:BD[14.38] → [5.1:73]

      local text = love.graphics.newText(love.graphics.getFont(), line)

[14.38]

[12.1249]

      local text = love.graphics.newText(love.graphics.getFont(), line.data)

Replacement in main.lua at line 163 [9.2]

B:BD[15.88] → [16.1:158]

        love.graphics.print('_', 25+cursor_x(lines[cursor_line], cursor_pos)*1.5, y+6)  -- drop the cursor down a bit to account for the increased font size

[15.50]

[15.411]

        love.graphics.print('_', 25+cursor_x(line.data, cursor_pos)*1.5, y+6)  -- drop the cursor down a bit to account for the increased font size

Replacement in main.lua at line 172 [9.2]

B:BD[17.29] → [17.29:104]

      local drawing = lines.current
      if type(drawing) == 'table' then

[17.29]

[18.2]

      if lines.current.mode == 'drawing' then
        local drawing = lines.current

Replacement in main.lua at line 266 [9.2]
B:BD[17.223] → [17.223:260]
```
    if type(drawing) == 'table' then
```
[17.223]
[17.260]
```
    if drawing.mode == 'drawing' then
```
Deletion in main.lua at line 478 [9.2]
B:BD[19.1633] → [19.1633:1691]
```
--?   print(s,e, angle-math.pi*2, angle, angle+math.pi*2)
```

Replacement in main.lua at line 497 [9.2]

B:BD[20.41] → [6.1:58]

  if type(lines[cursor_line]) == 'table' then return end

[20.41]

[10.490]

  if lines[cursor_line].mode == 'drawing' then return end

Replacement in main.lua at line 500 [9.2]

B:BD[10.534] → [10.534:597]

    byteoffset = utf8.offset(lines[cursor_line], cursor_pos-1)

[10.534]

[10.597]

    byteoffset = utf8.offset(lines[cursor_line].data, cursor_pos-1)

Replacement in main.lua at line 504 [9.2]

B:BD[10.629] → [10.629:747]

  lines[cursor_line] = string.sub(lines[cursor_line], 1, byteoffset)..t..string.sub(lines[cursor_line], byteoffset+1)

[10.629]

[10.747]

  lines[cursor_line].data = string.sub(lines[cursor_line].data, 1, byteoffset)..t..string.sub(lines[cursor_line].data, byteoffset+1)

Replacement in main.lua at line 514 [9.2]

B:BD[7.224] → [15.422:465]

    table.insert(lines, cursor_line+1, '')

[7.224]

[15.465]

    table.insert(lines, cursor_line+1, {mode='text', data=''})

Replacement in main.lua at line 518 [9.2]

B:BD[21.66] → [21.66:139]

B:BD[21.139] → [2.2:99]

    if #lines > 1 and lines[#lines] == '' then
      table.remove(lines)
    elseif type(lines[#lines]) == 'table' then
      table.remove(lines)  -- we'll add undo soon

[21.66]

[21.139]

    if cursor_line > 1 and lines[cursor_line].data == '' then
      table.remove(lines, cursor_line)
      cursor_line = cursor_line-1
      if lines[cursor_line].mode == 'text' then
        cursor_pos = #lines[cursor_line].data+1
      else
        cursor_pos = 1
      end
    elseif lines[cursor_line].mode == 'drawing' then
      table.remove(lines, cursor_line)  -- we'll add undo soon
      cursor_line = cursor_line-1
      if lines[cursor_line].mode == 'text' then
        cursor_pos = #lines[cursor_line].data+1
      else
        cursor_pos = 1
      end

Replacement in main.lua at line 536 [9.2]

B:BD[10.805] → [10.805:947]

        local byte_start = utf8.offset(lines[cursor_line], cursor_pos-1)
        local byte_end = utf8.offset(lines[cursor_line], cursor_pos)

[10.805]

[10.947]

        local byte_start = utf8.offset(lines[cursor_line].data, cursor_pos-1)
        local byte_end = utf8.offset(lines[cursor_line].data, cursor_pos)

Replacement in main.lua at line 540 [9.2]

B:BD[10.1001] → [10.1001:1124]

            lines[cursor_line] = string.sub(lines[cursor_line], 1, byte_start-1)..string.sub(lines[cursor_line], byte_end)

[10.1001]

[10.1124]

            lines[cursor_line].data = string.sub(lines[cursor_line].data, 1, byte_start-1)..string.sub(lines[cursor_line].data, byte_end)

Replacement in main.lua at line 542 [9.2]

B:BD[10.1139] → [10.1139:1220]

            lines[cursor_line] = string.sub(lines[cursor_line], 1, byte_start-1)

[10.1139]

[10.1220]

            lines[cursor_line].data = string.sub(lines[cursor_line].data, 1, byte_start-1)

Replacement in main.lua at line 553 [9.2]

B:BD[10.1430] → [10.1430:1476]

    if cursor_pos <= #lines[cursor_line] then

[10.1430]

[10.1476]

    if cursor_pos <= #lines[cursor_line].data then

Replacement in main.lua at line 559 [9.2]

B:BD[16.237] → [16.237:276]

    cursor_pos = #lines[cursor_line]+1

[16.237]

[15.525]

    cursor_pos = #lines[cursor_line].data+1

Replacement in main.lua at line 562 [9.2]

B:BD[15.581] → [16.277:338]

      local old_x = cursor_x(lines[cursor_line], cursor_pos)

[15.581]

      local old_x = cursor_x(lines[cursor_line].data, cursor_pos)

Replacement in main.lua at line 564 [9.2]

B:BD[15.615] → [22.1:78]

      cursor_pos = nearest_cursor_pos(lines[cursor_line], old_x, cursor_pos)

[15.615]

[10.1510]

      cursor_pos = nearest_cursor_pos(lines[cursor_line].data, old_x, cursor_pos)

Replacement in main.lua at line 568 [9.2]

B:BD[15.779] → [16.405:466]

      local old_x = cursor_x(lines[cursor_line], cursor_pos)

[15.779]

      local old_x = cursor_x(lines[cursor_line].data, cursor_pos)

Replacement in main.lua at line 570 [9.2]

B:BD[15.813] → [22.79:156]

      cursor_pos = nearest_cursor_pos(lines[cursor_line], old_x, cursor_pos)

[15.813]

[15.913]

      cursor_pos = nearest_cursor_pos(lines[cursor_line].data, old_x, cursor_pos)

Replacement in main.lua at line 573 [9.2]

B:BD[10.1550] → [10.1550:1734]

    if cursor_pos <= #lines[cursor_line] then
      local byte_start = utf8.offset(lines[cursor_line], cursor_pos)
      local byte_end = utf8.offset(lines[cursor_line], cursor_pos+1)

[10.1550]

[10.1734]

    if cursor_pos <= #lines[cursor_line].data then
      local byte_start = utf8.offset(lines[cursor_line].data, cursor_pos)
      local byte_end = utf8.offset(lines[cursor_line].data, cursor_pos+1)

Replacement in main.lua at line 578 [9.2]

B:BD[10.1784] → [10.1784:1905]

          lines[cursor_line] = string.sub(lines[cursor_line], 1, byte_start-1)..string.sub(lines[cursor_line], byte_end)

[10.1784]

[10.1905]

          lines[cursor_line].data = string.sub(lines[cursor_line].data, 1, byte_start-1)..string.sub(lines[cursor_line].data, byte_end)

Replacement in main.lua at line 580 [9.2]

B:BD[10.1918] → [10.1918:1997]

          lines[cursor_line] = string.sub(lines[cursor_line], 1, byte_start-1)

[10.1918]

[10.1997]

          lines[cursor_line].data = string.sub(lines[cursor_line].data, 1, byte_start-1)

Replacement in main.lua at line 725 [9.2]

B:BD[16.588] → [4.1:46]

  if type(line) == 'table' then return 0 end

[16.588]

  if line.mode == 'drawing' then return 0 end

Replacement in main.lua at line 732 [9.2]

B:BD[22.200] → [4.47:95]

  if type(line) == 'table' then return hint end

[22.200]

[16.820]

  if line.mode == 'drawing' then return hint end

Replacement in main.lua at line 768 [9.2]
B:BD[23.603] → [23.603:640]
```
    if type(drawing) == 'table' then
```
[23.603]
[24.795]
```
    if drawing.mode == 'drawing' then
```
Replacement in main.lua at line 780 [9.2]
B:BD[23.918] → [23.918:955]
```
    if type(drawing) == 'table' then
```
[23.918]
[24.895]
```
    if drawing.mode == 'drawing' then
```
Replacement in main.lua at line 791 [9.2]
B:BD[25.199] → [25.199:236]
```
    if type(drawing) == 'table' then
```
[25.199]
[25.236]
```
    if drawing.mode == 'drawing' then
```
Replacement in main.lua at line 808 [9.2]
B:BD[26.1197] → [26.1197:1234]
```
    if type(drawing) == 'table' then
```
[26.1197]
[26.1234]
```
    if drawing.mode == 'drawing' then
```
Replacement in main.lua at line 825 [9.2]
B:BD[27.1597] → [27.1597:1634]
```
    if type(drawing) == 'table' then
```
[27.1597]
[27.1634]
```
    if drawing.mode == 'drawing' then
```

Replacement in main.lua at line 949 [9.2]

B:BD[28.554] → [28.554:589]

        table.insert(result, line)

[28.554]

[28.589]

        table.insert(result, {mode='text', data=line})

Replacement in main.lua at line 954 [9.2]
B:BD[29.128] → [29.128:157]
```
    table.insert(result, '')
```
[29.128]
[29.157]
```
    table.insert(result, {mode='text', data=''})
```
Replacement in main.lua at line 962 [9.2]
B:BD[28.747] → [28.747:781]
```
    if type(line) == 'table' then
```
[28.747]
[28.781]
```
    if line.mode == 'drawing' then
```
Replacement in main.lua at line 965 [9.2]
B:BD[28.825] → [28.825:857]
```
      outfile:write(line..'\n')
```
[28.825]
[28.857]
```
      outfile:write(line.data..'\n')
```

Replacement in main.lua at line 973 [9.2]

∅:D[30.544] → [28.928:990]

B:BD[28.928] → [28.928:990]

  local drawing = {h=256/2, points={}, shapes={}, pending={}}

[30.544]

[28.990]

  local drawing = {mode='drawing', h=256/2, points={}, shapes={}, pending={}}