akkartik/sokoban.love - Change H4R5BHVYKFKF2JOFITQ45VEVW32BOWIMHWFOQ35KAUS6QUI7G5QQC

no more Text allocations

Is it just my imagination, or does the app feel lighter and more fluffy?

Created by Kartik K. Agaram on April 1, 2023

H4R5BHVYKFKF2JOFITQ45VEVW32BOWIMHWFOQ35KAUS6QUI7G5QQC

Dependencies

In channels

main

Change contents

Replacement in text.lua at line 18 [7.1]

∅:D[4.29] → [6.1941:1984]

∅:D[8.3906] → [6.1941:1984]

B:BD[6.1941] → [6.1941:1984]

∅:D[9.46] → [10.1:37]

B:BD[11.62] → [10.1:37]

B:BD[10.37] → [12.3:73]

    local frag, frag_text = f.data, f.text
    local frag_len = utf8.len(frag)
--?     print('text.draw:', frag, 'at', line_index,pos, 'after', x,y)

[4.29]

[2.48]

    local frag_len = utf8.len(f.data)
--?     print('text.draw:', f.data, 'at', line_index,pos, 'after', x,y)

Replacement in text.lua at line 22 [7.1]
B:BD[13.95] → [13.95:129]
```
--?       print('skipping', frag)
```
[13.95]
[13.129]
```
--?       print('skipping', f.data)
```

Replacement in text.lua at line 39 [7.1]

B:BD[14.54] → [9.296:334]

      App.screen.draw(frag_text, x,y)

[10.1066]

[13.259]

      App.screen.print(f.data, x,y)

Replacement in text.lua at line 50 [7.1]

B:BD[13.869] → [13.869:949]

            Text.draw_cursor(State, x+Text.x(frag, State.cursor1.pos-pos+1), y)

[13.869]

[15.530]

            Text.draw_cursor(State, x+Text.x(f.data, State.cursor1.pos-pos+1), y)

Deletion in text.lua at line 90 [7.1]
B:BD[3.528] → [3.528:571]
```
    local frag, frag_text = f.data, f.text
```

Replacement in text.lua at line 97 [7.1]

B:BD[3.792] → [3.792:853]

    local frag_len = utf8.len(frag)
    pos = pos + frag_len

[3.792]

[3.853]

    pos = pos + utf8.len(f.data)

Deletion in text.lua at line 113 [7.1]

B:BD[16.168] → [11.682:747]

    local frag_text = App.newText(love.graphics.getFont(), frag)

Deletion in text.lua at line 127 [7.1]

B:BD[17.729] → [17.729:800]

        local frag1_text = App.newText(love.graphics.getFont(), frag1)

Replacement in text.lua at line 130 [7.1]

B:BD[17.982] → [17.982:1056]

        table.insert(line_cache.fragments, {data=frag1, text=frag1_text})

[17.982]

[17.1056]

        table.insert(line_cache.fragments, {data=frag1})

Deletion in text.lua at line 132 [7.1]

B:BD[17.1097] → [17.1097:1160]

        frag_text = App.newText(love.graphics.getFont(), frag)

Replacement in text.lua at line 138 [7.1]

∅:D[12.618] → [8.4068:4138]

B:BD[16.1485] → [8.4068:4138]

      table.insert(line_cache.fragments, {data=frag, text=frag_text})

[12.618]

[16.1549]

      table.insert(line_cache.fragments, {data=frag})

Replacement in source_text.lua at line 20 [18.83723]

B:BD[18.87502] → [18.87502:87674]

    local frag, frag_text = f.data, f.text
    select_color(frag)
    local frag_len = utf8.len(frag)
--?     print('text.draw:', frag, 'at', line_index,pos, 'after', x,y)

[18.87502]

[18.87674]

    select_color(f.data)
    local frag_len = utf8.len(f.data)
--?     print('text.draw:', f.data, 'at', line_index,pos, 'after', x,y)

Replacement in source_text.lua at line 25 [18.83723]
B:BD[18.87725] → [18.87725:87759]
```
--?       print('skipping', frag)
```
[18.87725]
[18.87759]
```
--?       print('skipping', f.data)
```

Replacement in source_text.lua at line 43 [18.83723]

B:BD[5.84] → [5.84:172]

      local trimmed_word = rtrim(frag)  -- compute_fragments puts whitespace at the end

[5.84]

[5.172]

      local trimmed_word = rtrim(f.data)  -- compute_fragments puts whitespace at the end

Replacement in source_text.lua at line 55 [18.83723]
∅:D[5.779] → [18.88189:88227]
B:BD[18.88189] → [18.88189:88227]
```
      App.screen.draw(frag_text, x,y)
```
[5.779]
[18.88227]
```
      App.screen.print(f.data, x,y)
```

Replacement in source_text.lua at line 66 [18.83723]

B:BD[18.88889] → [18.88889:88969]

            Text.draw_cursor(State, x+Text.x(frag, State.cursor1.pos-pos+1), y)

[18.88889]

[18.88969]

            Text.draw_cursor(State, x+Text.x(f.data, State.cursor1.pos-pos+1), y)

Deletion in source_text.lua at line 106 [18.83723]
B:BD[18.91812] → [18.91812:91855]
```
    local frag, frag_text = f.data, f.text
```
Replacement in source_text.lua at line 113 [18.83723]
B:BD[18.92076] → [18.92076:92137]
```
    local frag_len = utf8.len(frag)
    pos = pos + frag_len
```
[18.92076]
[18.92137]
```
    pos = pos + utf8.len(f.data)
```
Deletion in source_text.lua at line 129 [18.83723]
B:BD[18.92548] → [18.92548:92613]
```
    local frag_text = App.newText(love.graphics.getFont(), frag)
```
Deletion in source_text.lua at line 143 [18.83723]
B:BD[18.93539] → [18.93539:93610]
```
        local frag1_text = App.newText(love.graphics.getFont(), frag1)
```

Replacement in source_text.lua at line 146 [18.83723]

B:BD[18.93792] → [18.93792:93866]

        table.insert(line_cache.fragments, {data=frag1, text=frag1_text})

[18.93792]

[18.93866]

        table.insert(line_cache.fragments, {data=frag1})

Deletion in source_text.lua at line 148 [18.83723]
B:BD[18.93907] → [18.93907:93970]
```
        frag_text = App.newText(love.graphics.getFont(), frag)
```

Replacement in source_text.lua at line 154 [18.83723]

B:BD[18.94166] → [18.94166:94236]

      table.insert(line_cache.fragments, {data=frag, text=frag_text})

[18.94166]

[18.94236]

      table.insert(line_cache.fragments, {data=frag})

Deletion in source_edit.lua at line 91 [18.152440]

B:BD[18.154866] → [18.154866:154954]

    em = App.newText(love.graphics.getFont(), 'm'),  -- widest possible character width

Deletion in edit.lua at line 90 [20.413]

B:BD[19.5282] → [19.5282:5370]

    em = App.newText(love.graphics.getFont(), 'm'),  -- widest possible character width

Deletion in app.lua at line 213 [23.2]

∅:D[21.1618] → [22.6426:6717]

B:BD[22.6426] → [22.6426:6717]

B:BD[22.6717] → [24.266:271]

-- LÖVE's Text primitive retains no trace of the string it was created from,
-- so we'll wrap it for our tests.
--
-- This implies that we need to hook any operations we need on Text objects.
function App.newText(font, s)
  return {type='text', data=s, text=love.graphics.newText(font, s)}
end

Deletion in app.lua at line 418 [23.2]
B:BD[22.8029] → [22.8029:8067]
```
  App.newText = love.graphics.newText
```

no more Text allocations

Dependencies

In channels

Change contents

Replacement in text.lua at line 18 [7.1]

Replacement in text.lua at line 22 [7.1]

Replacement in text.lua at line 39 [7.1]

Replacement in text.lua at line 50 [7.1]

Deletion in text.lua at line 90 [7.1]

Replacement in text.lua at line 97 [7.1]

Deletion in text.lua at line 113 [7.1]

Deletion in text.lua at line 127 [7.1]

Replacement in text.lua at line 130 [7.1]

Deletion in text.lua at line 132 [7.1]

Replacement in text.lua at line 138 [7.1]

Replacement in source_text.lua at line 20 [18.83723]

Replacement in source_text.lua at line 25 [18.83723]

Replacement in source_text.lua at line 43 [18.83723]

Replacement in source_text.lua at line 55 [18.83723]

Replacement in source_text.lua at line 66 [18.83723]

Deletion in source_text.lua at line 106 [18.83723]

Replacement in source_text.lua at line 113 [18.83723]

Deletion in source_text.lua at line 129 [18.83723]

Deletion in source_text.lua at line 143 [18.83723]

Replacement in source_text.lua at line 146 [18.83723]

Deletion in source_text.lua at line 148 [18.83723]

Replacement in source_text.lua at line 154 [18.83723]

Deletion in source_edit.lua at line 91 [18.152440]

Deletion in edit.lua at line 90 [20.413]

Deletion in app.lua at line 213 [23.2]

Deletion in app.lua at line 418 [23.2]