refactoring

util/core.lua

@@ -142,7 +142,7 @@ do
 end
 
 function public.join(parts, separator)
-	local str = parts[1]
+	local str = parts[1] or ''
 	for i=2,getn(parts) do
 		if not parts[i] then break end
 		str = str..separator..parts[i]

util/filter.lua

@@ -415,7 +415,7 @@ function public.queries(query_string)
     local parts = aux.util.split(query_string, ';')
 
     local queries = {}
-    for _, str in ipairs(parts) do
+    for _, str in parts do
         str = aux.util.trim(str)
 
         local query, _, error = m.query(str)
@@ -463,7 +463,7 @@ function private.suggestions(components)
 
     -- classes
     if not blizzard_filters.class then
-        for _, class in ipairs({ GetAuctionItemClasses() }) do
+        for _, class in { GetAuctionItemClasses() } do
             tinsert(suggestions, class)
         end
     end
@@ -471,7 +471,7 @@ function private.suggestions(components)
     -- subclasses
     local class_index = blizzard_filters.class and aux.info.item_class_index(blizzard_filters.class)
     if class_index and not blizzard_filters.subclass then
-        for _, subclass in ipairs({ GetAuctionItemSubClasses(class_index) }) do
+        for _, subclass in { GetAuctionItemSubClasses(class_index) } do
             tinsert(suggestions, subclass)
         end
     end
@@ -479,7 +479,7 @@ function private.suggestions(components)
     -- slots
     local subclass_index = class_index and blizzard_filters.subclass and aux.info.item_subclass_index(class_index, blizzard_filters.subclass)
     if subclass_index and not blizzard_filters.slot then
-        for _, invtype in ipairs({ GetAuctionInvTypes(class_index, aux.info.item_subclass_index(class_index, blizzard_filters.subclass)) }) do
+        for _, invtype in { GetAuctionInvTypes(class_index, aux.info.item_subclass_index(class_index, blizzard_filters.subclass)) } do
             tinsert(suggestions, getglobal(invtype))
         end
     end

util/info.lua

@@ -310,7 +310,7 @@ function public.tooltip(setter)
 end
 
 function private.item_charges(tooltip)
-	for _, line in ipairs(tooltip) do
+	for _, line in tooltip do
         local pattern = '^'..gsub(gsub(ITEM_SPELL_CHARGES_P1, '%%d', '(%%d+)'), '%%%d+%$d', '(%%d+)')..'$'
 
         local _, _, left_charges_string = strfind(line.left_text or '', pattern)
@@ -350,7 +350,7 @@ function public.max_item_charges(item_id)
 end
 
 function public.durability(tooltip)
-    for _, line in ipairs(tooltip) do
+    for _, line in tooltip do
         local pattern = '^'..gsub(gsub(DURABILITY_TEMPLATE, '%%d', '(%%d+)'), '%%%d+%$d', '(%%d+)')..'$'
         local _, _, left_durability_string, left_max_durability_string = strfind(line.left_text or '', pattern)
         local _, _, right_durability_string, right_max_durability_string = strfind(line.right_text or '', pattern)
@@ -393,7 +393,7 @@ function public.item(item_id, suffix_id)
 end
 
 function public.item_class_index(item_class)
-    for i, class in ipairs({ GetAuctionItemClasses() }) do
+    for i, class in { GetAuctionItemClasses() } do
         if strupper(class) == strupper(item_class) then
             return i
         end
@@ -401,7 +401,7 @@ function public.item_class_index(item_class)
 end
 
 function public.item_subclass_index(class_index, item_subclass)
-    for i, subclass in ipairs({ GetAuctionItemSubClasses(class_index) }) do
+    for i, subclass in { GetAuctionItemSubClasses(class_index) } do
         if strupper(subclass) == strupper(item_subclass) then
             return i
         end
@@ -409,7 +409,7 @@ function public.item_subclass_index(class_index, item_subclass)
 end
 
 function public.item_slot_index(class_index, subclass_index, slot_name)
-    for i, slot in ipairs({ GetAuctionInvTypes(class_index, subclass_index) }) do
+    for i, slot in { GetAuctionInvTypes(class_index, subclass_index) } do
         if strupper(getglobal(slot)) == strupper(slot_name) then
             return i
         end

util/persistence.lua

@@ -91,7 +91,6 @@ function public.write_record(schema, record)
     local parts = {}
     for i=3,getn(schema) do
         local key, type = next(schema[i])
-        aux.log(type, record[key], m.write(type, record[key]))
         tinsert(parts, m.write(type, record[key]))
     end
     return aux.util.join(parts, separator)