diff --git a/vacation.p8 b/vacation.p8 index 3f24007..2eb2a1f 100644 --- a/vacation.p8 +++ b/vacation.p8 @@ -48,7 +48,7 @@ function mknew(tt, more) end end -event_list = {is_event_list=true} +event_list = {} mknew(event_list, function(x) x.next=nil x.tail=x @@ -59,21 +59,6 @@ function event_list:pb(x) self.tail = x end -function event_list:strip(f) - local p, n = self, self.next - while n do - if f(n) then - p.next = n.next - else - p = n - end - n = n.next - end - self.tail = p - return p -end - - function event_list:u() local p, n = self, self.next while n do @@ -114,45 +99,6 @@ blank = {} function blank:u() end function blank:draw() end -function puke(item, indent, seen, hidekey) - if (type(item) ~= "table") return tostr(item) - - seen = seen or {} - if (seen[item]) return "<<...>>" - seen[item] = true - - indent = indent or 0 - local pfx = "\n" - for _=1,indent do - pfx ..= " " - end - local xpfx = pfx.." " - - if item.is_event_list then - local ret,n = "event_list <",0 - item:strip(function(x) - n += 1 - ret ..= xpfx..tostr(n)..": "..puke(x, indent+2, seen, "next") - end) - return ret..pfx..">" - end - - local ret = "{" - for k, v in pairs(item) do - if (k ~= hidekey) ret ..= xpfx..tostr(k)..": "..puke(v, indent+2, seen) - end - return ret..pfx.."}" -end - --- convenience for debugging -function puketh(item, ...) - printh(puke(item), ...) -end - -function pukeboard(item) - puketh(item, "@clip") -end - view = { x=0, y=0,