resolve conflicts

akkartik

Nov 18, 2023, 11:27 PM

2I6LYHNCYGC2BKXDS5DQKZZY2HTDXSPI2S5SWDI7XRTP4T54U2SQC

Dependencies

• [2] UZHSWA3D Merge text0
• [3] LBYVPRVR late-bind my App.* handlers
• [4] ORRSP7FV deduce test names on failures
• [5] KE4T63TS stop using keyboard.isDown
• [6] QRUFNFPP Merge text0
• [7] ED4Z6ORC cleaner API for file-system access
• [8] JNJ4R56X support running tests multiple times
• [9] AVTNUQYR basic test-enabled framework
• [*] 3QNOKBFM beginnings of a test harness

Change contents

• edit in app.lua at line 19
  [4.77]

  [4.77]
  + -- make sure to late-bind handlers like LÖVE's defaults do
• replacement in app.lua at line 35
  [2.774]→[2.774:814](∅→∅)
  − love.handlers[name] = App[name]
  [2.774]

  [2.814]
  + love.handlers[name] = function(...) App[name](...) end
• edit in app.lua at line 540
  [4.7727]→[3.0:62](∅→∅),[4.7727]→[3.0:62](∅→∅),[4.705]→[3.63:126](∅→∅),[4.705]→[3.63:126](∅→∅)
  − -- make sure to late-bind handlers like LÖVE's defaults do

  − love.handlers[name] = function(...) App[name](...) end