Reclaim SendChatMessage hook so #showtooltip stays filtered

Our #showtooltip filter hooks the global SendChatMessage. An addon that
snapshots SendChatMessage at its own file-load and later calls that
snapshot directly (e.g. LeafVillageAchievements at PLAYER_ENTERING_WORLD+3s)
orphans our hook if it loaded before us -- its snapshot predates our filter,
so #showtooltip leaks to chat. This bites the fork specifically: it sorts
after LeafVillageAchievements alphabetically, so it loads too late to be in
the snapshot, whereas upstream "CleveRoidMacros" sorted before it.

Make the filter a named function and add EnsureSendChatMessageHook, which
re-asserts it as the outermost SendChatMessage hook (no-op once on top).
OnUpdate calls it each throttled tick via a cheap identity check, so we
reclaim the top of the chain within a frame of being displaced. Normal
messages still flow through the chained-over hook untouched.

Console.lua

@@ -67,6 +67,10 @@ SLASH_UNSHIFT1 = "/unshift"
 
 SlashCmdList.UNSHIFT = CleveRoids.DoUnshift
 
+SLASH_CANCELFORM1 = "/cancelform"
+
+SlashCmdList.CANCELFORM = CleveRoids.DoCancelForm
+
 SLASH_UNQUEUE1 = "/unqueue"
 SlashCmdList.UNQUEUE = SpellStopCasting
 

Core.lua

@@ -574,124 +574,34 @@ function CleveRoids.QueueActionUpdate()
     end
 end
 
-local function _StripColor(s)
-  if not s then return s end
-  if string.sub(s,1,2) == "|c" then return string.sub(s,11,-3) end
-  return s
-end
+-- Count of `itemId` in *bags only* (not bank), matched by itemID throughout --
+-- locale-independent, no hardcoded item names.
+-- PERFORMANCE: uses the CleveRoids.Items cache (itemId -> name -> data) for an
+-- O(1) lookup when available, falling back to a bag scan on a cache miss.
+function CleveRoids.GetReagentCount(itemId)
+  if not itemId then return 0 end
 
-local _ReagentBySpell = {
-  ["Vanish"] = "Flash Powder",    -- 5140
-  ["Blind"]  = "Blinding Powder", -- 5530
-}
-
--- Expose for use in Generic.lua (IndexSpells fallback)
-CleveRoids.ReagentBySpell = _ReagentBySpell
-
--- Minimal map for rogue reagents; extend as needed
-local _ReagentIdByName = {
-    ["Flash Powder"]   = 5140, -- Vanish
-    ["Blinding Powder"] = 5530, -- Blind
-}
-
--- Lazy bag-scan tooltip (only if we need to scan a bag slot by name)
-local function CRM_GetBagScanTip()
-  local tip = _G.CleveRoidsBagScanTip
-  if tip then return tip end
-  local ok, created = pcall(CreateFrame, "GameTooltip", "CleveRoidsBagScanTip", UIParent, "GameTooltipTemplate")
-  if ok and created then
-    tip = created
-  else
-    tip = CreateFrame("GameTooltip", "CleveRoidsBagScanTip", UIParent)
-    local L1 = tip:CreateFontString("$parentTextLeft1",  nil, "GameTooltipText")
-    local R1 = tip:CreateFontString("$parentTextRight1", nil, "GameTooltipText")
-    tip:AddFontStrings(L1, R1)
-    for i=2,10 do
-      tip:CreateFontString("$parentTextLeft"..i,  nil, "GameTooltipText")
-      tip:CreateFontString("$parentTextRight"..i, nil, "GameTooltipText")
-    end
-  end
-  tip:SetOwner(WorldFrame, "ANCHOR_NONE")
-  _G.CleveRoidsBagScanTip = tip
-  return tip
-end
-
--- Return total in *bags only* (not bank), by id when possible; fallback to name
--- PERFORMANCE: Uses CleveRoids.Items cache for O(1) lookup when available
-function CleveRoids.GetReagentCount(reagentName)
-  if not reagentName or reagentName == "" then return 0 end
-
-  -- Fast path: check cache first
   local Items = CleveRoids.Items
   if Items then
-    local wantId = _ReagentIdByName[reagentName]
-
-    -- Try by ID first if we have a mapping
-    if wantId then
-      local itemName = Items[wantId]
-      if itemName then
-        local itemData = Items[itemName]
-        if itemData and itemData.count and not itemData.inventoryID then
-          -- Item is in bags (not equipped), return cached count
-          return itemData.count
-        end
+    local itemName = Items[itemId]
+    if itemName then
+      local itemData = Items[itemName]
+      if itemData and itemData.count and not itemData.inventoryID then
+        -- Item is in bags (not equipped), return cached count
+        return itemData.count
       end
     end
-
-    -- Try by name
-    local itemData = Items[reagentName]
-    if type(itemData) == "string" then
-      itemData = Items[itemData]  -- Resolve indirection
-    end
-    if itemData and type(itemData) == "table" and itemData.count and not itemData.inventoryID then
-      return itemData.count
-    end
-
-    -- Try lowercase
-    local lowerName = string.lower(reagentName)
-    local resolved = Items[lowerName]
-    if type(resolved) == "string" then
-      itemData = Items[resolved]
-    elseif type(resolved) == "table" then
-      itemData = resolved
-    end
-    if itemData and type(itemData) == "table" and itemData.count and not itemData.inventoryID then
-      return itemData.count
-    end
   end
 
-  -- Slow path fallback: full bag scan (only when cache miss)
-  local wantId = _ReagentIdByName[reagentName]
+  -- Slow path: scan bags by itemID (only on a cache miss)
   local total = 0
-
   for bag = 0, 4 do
     local slots = GetContainerNumSlots(bag) or 0
     for slot = 1, slots do
-      local _, count = GetContainerItemInfo(bag, slot)
-      count = count or 0
       -- Base itemID straight off the slot (no link string, no regex).
-      local id = C_Container.GetContainerItemID(bag, slot)
-      if id then
-        local match
-        if wantId then
-          match = (id == wantId)
-        else
-          local name = C_Item.GetItemNameByID(id)
-          if name then
-            match = (name == reagentName)
-          else
-            -- Name not cached yet: fall back to a tooltip scan (expensive, rare)
-            local tip = CRM_GetBagScanTip()
-            tip:ClearLines()
-            tip:SetBagItem(bag, slot)
-            local left1 = _G[tip:GetName().."TextLeft1"]
-            local tname = left1 and left1:GetText()
-            match = (tname == reagentName)
-          end
-        end
-        if match then
-          total = total + count
-        end
+      if C_Container.GetContainerItemID(bag, slot) == itemId then
+        local _, count = GetContainerItemInfo(bag, slot)
+        total = total + (count or 0)
       end
     end
   end
@@ -722,85 +632,37 @@ function CleveRoids.GetLiveItemCount(itemName)
   return total
 end
 
-function CleveRoids.GetSpellCost(spellSlot, bookType)
-  -- Fast path: existing fixed-slot read
-  CleveRoids.Frame:SetOwner(WorldFrame, "ANCHOR_NONE")
-  CleveRoids.Frame:SetSpell(spellSlot, bookType)
-
-  local cost, reagent
-  local costText = CleveRoids.Frame.costFontString:GetText()
-  if costText then
-      _, _, cost = string.find(costText, "^(%d+)%s+[^yYsS]")
+-- Power cost and (first) reagent for a spellbook slot, read from Spell.dbc via
+-- ClassicAPI -- no GameTooltip scan, no locale-dependent string parsing. Pass
+-- spellId to skip the slot->id resolution when the caller already has it.
+--   cost:    C_Spell.GetSpellPowerCost returns the *effective* (talent-modified)
+--            cost the engine actually charges -- matches the old tooltip value,
+--            unlike GetSpellInfo().cost which is base-only.
+--   reagent: C_Spell.GetSpellReagents returns { {itemID, count}, ... }; take the
+--            first reagent's itemID (Spell.dbc covers reagent spells like Vanish).
+-- Returns cost, reagentName (localized, for display), reagentId (for counting).
+function CleveRoids.GetSpellCost(spellSlot, bookType, spellId)
+  if not spellId then
+    spellId = select(10, GetSpellInfo(spellSlot, bookType))
   end
 
-  local reagentText = CleveRoids.Frame.reagentFontString:GetText()
-  if reagentText then
-      _, _, reagent = string.find(reagentText, "^Reagents?%s*:%s*(.*)")
-  end
-  reagent = _StripColor(reagent)
-  if reagent == "" then reagent = nil end
+  local cost = 0
+  local reagent, reagentId
 
-  -- Fallback: scan all lines on a named tooltip (handles Vanish layout)
-  if not reagent or not cost then
-    local tip = CleveRoidsTooltipScan
-    if not tip then
-      -- belt & suspenders: create if somehow missing
-      local ok,_ = pcall(CreateFrame, "GameTooltip", "CleveRoidsTooltipScan", UIParent, "GameTooltipTemplate")
-      if not ok or not CleveRoidsTooltipScan then
-        CleveRoidsTooltipScan = CreateFrame("GameTooltip", "CleveRoidsTooltipScan", UIParent)
-        local L1 = CleveRoidsTooltipScan:CreateFontString("$parentTextLeft1",  nil, "GameTooltipText")
-        local R1 = CleveRoidsTooltipScan:CreateFontString("$parentTextRight1", nil, "GameTooltipText")
-        CleveRoidsTooltipScan:AddFontStrings(L1, R1)
-        for i=2,32 do
-          CleveRoidsTooltipScan:CreateFontString("$parentTextLeft"..i,  nil, "GameTooltipText")
-          CleveRoidsTooltipScan:CreateFontString("$parentTextRight"..i, nil, "GameTooltipText")
-        end
-      end
-      CleveRoidsTooltipScan:SetOwner(WorldFrame, "ANCHOR_NONE")
-      tip = CleveRoidsTooltipScan
+  if spellId then
+    local costs = C_Spell.GetSpellPowerCost(spellId)
+    if costs and costs[1] and costs[1].cost then
+      cost = costs[1].cost
     end
 
-    tip:ClearLines()
-    tip:SetOwner(WorldFrame, "ANCHOR_NONE")
-    tip:SetSpell(spellSlot, bookType)
-
-    local base = tip:GetName() or "CleveRoidsTooltipScan"
-    local maxLines = (tip.NumLines and tip:NumLines()) or 32
-
-    for i = 1, maxLines do
-      local L = _G[base.."TextLeft"..i]
-      local R = _G[base.."TextRight"..i]
-      local lt = L and L:GetText() or ""
-      local rt = R and R:GetText() or ""
-
-      if not reagent then
-        if string.find(lt, "^[Rr]eagents?%s*:") then
-          reagent = _StripColor((rt ~= "" and rt) or (string.gsub(lt, "^[Rr]eagents?%s*:%s*", "")))
-        elseif string.find(rt, "^[Rr]eagents?%s*:") then
-          reagent = _StripColor((lt ~= "" and lt) or (string.gsub(rt, "^[Rr]eagents?%s*:%s*", "")))
-        end
-        if reagent == "" then reagent = nil end
-      end
-
-      if not cost and rt ~= "" then
-          local _, _, num = string.find(rt, "^(%d+)%s+(Mana|Energy|Rage|Focus)")
-          if num then cost = tonumber(num) end
-      end
-
-      if reagent and cost then break end
+    local reagents = C_Spell.GetSpellReagents(spellId)
+    if reagents and reagents[1] and reagents[1].itemID then
+      reagentId = reagents[1].itemID
+      reagent = C_Item.GetItemNameByID(reagentId)
     end
   end
 
-  if not reagent or reagent == "" then
-    reagent = nil
-    local name = GetSpellName(spellSlot, bookType)
-    if name then
-        name = CleveRoids.StripRank(name)
-        reagent = _ReagentBySpell[name]
-    end
-  end
-
-  return (cost and tonumber(cost) or 0), (reagent and reagent ~= "" and tostring(reagent) or nil)
+  return cost, (reagent and reagent ~= "" and tostring(reagent) or nil), reagentId
 end
 
 function CleveRoids.GetProxyActionSlot(slot)
@@ -3654,11 +3516,8 @@ local function _equipRing2Action(msg)
     return CleveRoids.EquipBagItem(msg, 12)
 end
 
-local function _unshiftAction()
-    local currentShapeshiftIndex = CleveRoids.GetCurrentShapeshiftIndex()
-    if currentShapeshiftIndex ~= 0 then
-        CastShapeshiftForm(currentShapeshiftIndex)
-    end
+local function _cancelFormAction()
+    CancelShapeshiftForm()
 end
 
 function CleveRoids.DoEquipMainhand(msg)
@@ -3729,27 +3588,29 @@ function CleveRoids.DoEquipRing2(msg)
     return false
 end
 
-function CleveRoids.DoUnshift(msg)
+function CleveRoids.DoCancelForm(msg)
     local handled
     -- PERFORMANCE: Use numeric iteration to avoid pairs() iterator allocation
     local parts = CleveRoids.splitStringIgnoringQuotes(msg)
     for i = 1, table.getn(parts) do
         handled = false
-        if CleveRoids.DoWithConditionals(parts[i], _unshiftAction, CleveRoids.FixEmptyTarget, false, _unshiftAction) then
+        if CleveRoids.DoWithConditionals(parts[i], _cancelFormAction, CleveRoids.FixEmptyTarget, false, _cancelFormAction) then
             handled = true
             break
         end
     end
 
     if handled == nil then
-        _unshiftAction()
+        _cancelFormAction()
     end
 
     return handled
 end
 
+CleveRoids.DoUnshift = CleveRoids.DoCancelForm
+
 function CleveRoids.DoRetarget()
-    if GetUnitName("target") == nil
+    if UnitName("target") == nil
         or UnitHealth("target") == 0
         or not UnitCanAttack("player", "target")
     then
@@ -4074,6 +3935,13 @@ function CleveRoids.OnUpdate(self)
 
     CR.lastUpdate = time
 
+    -- Reclaim the top of the SendChatMessage hook chain if another addon has
+    -- displaced our #showtooltip filter (see EnsureSendChatMessageHook). Cheap
+    -- identity check; only re-hooks when actually displaced.
+    if CR.EnsureSendChatMessageHook then
+        CR.EnsureSendChatMessageHook()
+    end
+
     -- Process deferred equipment index updates (for throttled UNIT_INVENTORY_CHANGED)
     -- PERFORMANCE: Skip check entirely if no pending update
     local pendingTime = CR.equipIndexPendingTime
@@ -4802,21 +4670,17 @@ function GetActionCount(slot)
             count = CleveRoids.GetLiveItemCount(actionToCheck.item.name or actionToCheck.action)
 
         elseif actionToCheck.spell then
-            local reagent = actionToCheck.spell.reagent
-            if not reagent or reagent == "" then
-                reagent = nil
+            local reagentId = actionToCheck.spell.reagentId
+            if not reagentId then
                 local ss, bt = actionToCheck.spell.spellSlot, actionToCheck.spell.bookType
                 if ss and bt then
-                    local _, r = CleveRoids.GetSpellCost(ss, bt)
-                    reagent = r
+                    local _, _, rid = CleveRoids.GetSpellCost(ss, bt, actionToCheck.spell.id)
+                    actionToCheck.spell.reagentId = rid    -- cache itemID so we don't re-derive every frame
+                    reagentId = rid
                 end
-                if (not reagent) and _ReagentBySpell and actionToCheck.spell.name then
-                    reagent = _ReagentBySpell[actionToCheck.spell.name]  -- e.g., Vanish → Flash Powder
-                end
-                actionToCheck.spell.reagent = reagent  -- cache it so we don't re-scan every frame
             end
-            if reagent and reagent ~= "" then
-                count = CleveRoids.GetReagentCount(reagent)  -- id-first bag scan, falls back to name/tooltip
+            if reagentId then
+                count = CleveRoids.GetReagentCount(reagentId)  -- id-based bag scan
             end
         end
     end
@@ -4854,17 +4718,8 @@ function IsConsumableAction(slot)
         end
 
 
-        if actionToCheck.spell then
-            local reagent = actionToCheck.spell.reagent
-            if (not reagent or reagent == "") and actionToCheck.spell.name then
-                reagent = _ReagentBySpell[actionToCheck.spell.name]
-                if reagent then
-                    actionToCheck.spell.reagent = reagent
-                end
-            end
-            if reagent and reagent ~= "" then
-                return 1
-            end
+        if actionToCheck.spell and actionToCheck.spell.reagentId then
+            return 1
         end
     end
 
@@ -4934,37 +4789,9 @@ if not CleveRoids.RunMacroHooked then
     CleveRoids.RunMacroHooked = true
 end
 
--- Robust named tooltip for scanning spells/items
-if not CleveRoidsTooltipScan then
-  -- Try to create with the standard template first
-  local ok, _ = pcall(CreateFrame, "GameTooltip", "CleveRoidsTooltipScan", UIParent, "GameTooltipTemplate")
-  if not ok or not CleveRoidsTooltipScan then
-    -- Fallback: manual tooltip with plenty of prebuilt lines
-    CleveRoidsTooltipScan = CreateFrame("GameTooltip", "CleveRoidsTooltipScan", UIParent)
-    local L1 = CleveRoidsTooltipScan:CreateFontString("$parentTextLeft1",  nil, "GameTooltipText")
-    local R1 = CleveRoidsTooltipScan:CreateFontString("$parentTextRight1", nil, "GameTooltipText")
-    CleveRoidsTooltipScan:AddFontStrings(L1, R1)
-    for i = 2, 32 do
-      CleveRoidsTooltipScan:CreateFontString("$parentTextLeft"..i,  nil, "GameTooltipText")
-      CleveRoidsTooltipScan:CreateFontString("$parentTextRight"..i, nil, "GameTooltipText")
-    end
-  end
-  CleveRoidsTooltipScan:SetOwner(WorldFrame, "ANCHOR_NONE")
-  CleveRoidsTooltipScan:EnableMouse(false)
-end
-
--- This single dummy frame handles events AND serves as our tooltip scanner.
-CleveRoids.Frame = CreateFrame("GameTooltip")
-CleveRoids.Frame:EnableMouse(false)  -- Prevent tooltip from capturing mouse input
-
--- Create the extra font strings needed for other functions like GetSpellCost.
-CleveRoids.Frame.costFontString = CleveRoids.Frame:CreateFontString()
-CleveRoids.Frame.rangeFontString = CleveRoids.Frame:CreateFontString()
-CleveRoids.Frame.reagentFontString = CleveRoids.Frame:CreateFontString()
-CleveRoids.Frame:AddFontStrings(CleveRoids.Frame:CreateFontString(), CleveRoids.Frame:CreateFontString())
-CleveRoids.Frame:AddFontStrings(CleveRoids.Frame.costFontString, CleveRoids.Frame.rangeFontString)
-CleveRoids.Frame:AddFontStrings(CleveRoids.Frame:CreateFontString(), CleveRoids.Frame:CreateFontString())
-CleveRoids.Frame:AddFontStrings(CleveRoids.Frame.reagentFontString, CleveRoids.Frame:CreateFontString())
+-- This single frame drives the addon's event loop and OnUpdate. (Spell cost /
+-- reagent lookups now read Spell.dbc directly via ClassicAPI -- no tooltip scan.)
+CleveRoids.Frame = CreateFrame("Frame")
 
 CleveRoids.Frame:SetScript("OnUpdate", CleveRoids.OnUpdate)
 CleveRoids.Frame:SetScript("OnEvent", function(...)
@@ -6170,18 +5997,36 @@ function CleveRoids.Frame:KEY_UP()
     CleveRoids.isActionUpdateQueued = true
 end
 
-CleveRoids.Hooks.SendChatMessage = SendChatMessage
-function SendChatMessage(msg, ...)
-    -- Filter out #showtooltip lines
-    -- pfUI's macrotweak also does this, but our pattern is more specific
+-- Filter out the #showtooltip line that Blizzard's native macro executor sends
+-- to chat when a macro runs from an action button. Named (not anonymous) so we
+-- can detect displacement and reclaim the top of the hook chain.
+local function CleveRoids_SendChatMessage(msg, ...)
     if msg and string.find(msg, "^#showtooltip") then
         return
     end
-    
-    -- Call the original (or pfUI's hook if it's in the chain)
+    -- Call whatever we chained over (another addon's hook, or the real function)
     CleveRoids.Hooks.SendChatMessage(msg, unpack(arg))
 end
 
+-- (Re-)assert our filter as the OUTERMOST SendChatMessage hook. This is a no-op
+-- once we're already on top. It matters because some addons snapshot
+-- SendChatMessage at their file-load and later install a hook that calls that
+-- snapshot DIRECTLY -- if they loaded before us, their snapshot predates our
+-- filter, so calling it directly orphans us and #showtooltip leaks to chat.
+-- (LeafVillageAchievements does exactly this at PLAYER_ENTERING_WORLD+3s; and
+-- because the fork sorts after it alphabetically, we load too late to be in its
+-- snapshot -- upstream "CleveRoidMacros" sorted before it and wasn't affected.)
+-- OnUpdate calls this so we reclaim the top within a frame of being displaced;
+-- being outermost also guarantees we see the pristine line for the anchor match.
+function CleveRoids.EnsureSendChatMessageHook()
+    if SendChatMessage ~= CleveRoids_SendChatMessage then
+        CleveRoids.Hooks.SendChatMessage = SendChatMessage
+        SendChatMessage = CleveRoids_SendChatMessage
+    end
+end
+
+CleveRoids.EnsureSendChatMessageHook()
+
 CleveRoids.RegisterActionEventHandler = function(fn)
     if type(fn) == "function" then
         table.insert(CleveRoids.actionEventHandlers, fn)

Extensions/Tooltip/Generic.lua

@@ -58,11 +58,7 @@ function CleveRoids.IndexSpells()
             bookType = CleveRoids.bookTypes[book]
             spells[bookType] = {}
         else
-            local cost, reagent = CleveRoids.GetSpellCost(i, bookType)
-            -- Fallback for known reagent spells if tooltip scan failed
-            if (not reagent or reagent == "") and CleveRoids.ReagentBySpell then
-                reagent = CleveRoids.ReagentBySpell[spellName]
-            end
+            local cost, reagent, reagentId = CleveRoids.GetSpellCost(i, bookType, spellId)
             if not spells[bookType][spellName] then
                 spells[bookType][spellName] = {
                     spellSlot = i,
@@ -71,7 +67,7 @@ function CleveRoids.IndexSpells()
                     bookType = bookType,
                     texture = texture,
                     cost = cost,
-                    reagent = reagent,
+                    reagentId = reagentId,
                 }
             end
             if spellRank and not spells[bookType][spellName][spellRank] then
@@ -83,7 +79,7 @@ function CleveRoids.IndexSpells()
                     bookType = bookType,
                     texture = texture,
                     cost = cost,
-                    reagent = reagent
+                    reagentId = reagentId,
                 }
                 spells[bookType][spellName].highest = spells[bookType][spellName][spellRank]
             end
@@ -94,6 +90,13 @@ function CleveRoids.IndexSpells()
 
             if reagent then
                 CleveRoids.countedItemTypes[reagent] = true
+            elseif reagentId and Item then
+                Item:CreateFromItemID(reagentId):ContinueOnItemLoad(function()
+                    local loadedName = C_Item.GetItemNameByID(reagentId)
+                    if loadedName and loadedName ~= "" then
+                        CleveRoids.countedItemTypes[loadedName] = true
+                    end
+                end)
             end
         end
     end
@@ -501,7 +504,7 @@ local function makeBagItem(bagID, slot, link, Items)
 
     local itemID = C_Container.GetContainerItemID(bagID, slot)
 
-    local name = C_Item.GetItemName(ItemLocation:CreateFromBagAndSlot(bagID, slot))
+    local name = C_Item.GetItemName({bagID = bagID, slotIndex = slot})
     local count = 0
     local texture, itemCount = GetContainerItemInfo(bagID, slot)
     if itemCount then count = itemCount end
@@ -747,20 +750,17 @@ function CleveRoids.FindItemQuick(text)
     for inv = 1, 19 do
         local link = GetInventoryItemLink("player", inv)
         if link then
-            local _, _, itemID = string_find(link, "item:(%d+)")
-            if itemID then
-                itemID = tonumber(itemID)
-                -- ID match: fast path
-                if qid and qid == itemID then
+            local itemID = GetInventoryItemID("player", inv)
+            -- ID match: fast path
+            if qid and qid == itemID then
+                return makeInventoryItem(inv, link, Items)
+            end
+            -- Name match: extract name from link (faster than GetItemInfo)
+            if qname then
+                local nm = GetNameFromLink(link)
+                if nm and string_lower(nm) == qname then
                     return makeInventoryItem(inv, link, Items)
                 end
-                -- Name match: extract name from link (faster than GetItemInfo)
-                if qname then
-                    local nm = GetNameFromLink(link)
-                    if nm and string_lower(nm) == qname then
-                        return makeInventoryItem(inv, link, Items)
-                    end
-                end
             end
         end
     end