remove frames from tup

Tupfile.lua

@@ -63,7 +63,14 @@ rule(
 
 -- Smogdex social images
 
-local input = glob("newsrc/models/*", {filter=function() return not (expand("%B"):find("-b") or expand("%B"):find("-s")) end})
+local input = glob(
+    "newsrc/models/*",
+    {
+        filter=function(file)
+            return not (file:find("-b") or file:find("-s"))
+        end
+    }
+)
 
 foreach_rule(
     input,
@@ -113,9 +120,16 @@ foreach_rule(
 
 -- Build missing CAP dex
 
-local input = glob({"newsrc/sprites/gen5/*.gif", "newsrc/models/*.gif"}, {filter=function()
-        return not ((expand("%B")):find("-b") or (expand("%B")):find("-s")) and not glob_matches("newsrc/dex/%B.png")
-    end, key="%B"})
+local input = glob({"newsrc/sprites/gen5/*.gif", "newsrc/models/*.gif"}, {
+        filter=function(file)
+            return not (
+                file:find("-b") or
+                file:find("-s") or
+                glob_matches(rep{"newsrc/dex/${base}.png", base=tup.base(file)})
+            )
+        end,
+        key=tup.base
+})
 
 foreach_rule(
     input,

util/tup-ext.lua

@@ -18,14 +18,11 @@ end
 --
 
 -- A glob pattern is either an interpolated string, or a table of glob patterns
---
--- A normalized glob pattern is a table of strings, with interpolation resolved.
 -- globpat_normalize("foo/*") --> {"foo/*"}
 -- globpat_normalize({"foo/*"}) --> {"foo/*"}
--- globpat_normalize({"foo/*", {"{bar}/*"}}) --> {"foo/*", "baz_value/*"}
 local function globpat_normalize(pat)
     if type(pat) == "string" then
-        return {expand(pat)}
+        return {pat}
     elseif type(pat) == 'table' then
         local result = {}
         for x in iter(pat) do
@@ -43,15 +40,12 @@ function glob(pat, opts)
     local key = opts and opts.key
     local seen = {}
     for pat in iter(globpat_normalize(pat)) do
-        local frame = {}
-        push_frame(frame)
         for file in iter(tup.glob(pat)) do
             -- Workaround a weird issue pre reported
             file = file:gsub("//", "/")
-            frame.input = file
             
             if key then
-                local k = expand(key)
+                local k = key(file)
                 if seen[k] then
                     goto continue
                 end
@@ -59,7 +53,7 @@ function glob(pat, opts)
             end
 
             if filter then
-                if not filter() then
+                if not filter(file) then
                     goto continue
                 end
             end
@@ -67,7 +61,6 @@ function glob(pat, opts)
             table.insert(results, file)
             ::continue::
         end
-        pop_frame()
     end
     return results
 end