From 2de1189adef5b5ea2550da2609c1f40d78188748 Mon Sep 17 00:00:00 2001
From: Kevin Lyles <kevinlyles@gmail.com>
Date: Sun, 31 Jan 2010 02:37:07 -0600
Subject: [PATCH] Added support for dual-stat lines

---
 Regexps.lua        |   35 +++++++++++------------------------
 WeightsWatcher.lua |    6 +++---
 2 files changed, 14 insertions(+), 27 deletions(-)

diff --git a/Regexps.lua b/Regexps.lua
index 08af0a4..c5427af 100644
--- a/Regexps.lua
+++ b/Regexps.lua
@@ -2,33 +2,15 @@ if not WeightsWatcher then
 	WeightsWatcher = AceLibrary("AceAddon-2.0"):new("AceEvent-2.0", "AceHook-2.1")
 end
 
-function WeightsWatcher.multipleStats(text)
-	local stat, stringTable
-	local stats = WeightsWatcher.newStatTable()
-	local origText = text
-
-	start, _, value = string.find(text, " and %a[%a ]+ by (%d+)%.")
+function WeightsWatcher.twoStats(text, pattern)
+	local start, _, stat1, stat2 = string.find(text, pattern)
 	if start then
-		text = string.gsub(text, ".*[iI]ncrease[sd]? ", "")
-		text = string.gsub(text, " by (%d+)%..*", " %1")
-		text = string.gsub(text, ",? and ", " " .. value .. "\a")
-		text = string.gsub(text, ", ", " " .. value .. "\a")
-	else
-		text = string.gsub(string.gsub(text, ",? and ", "\a"), ", ", "\a")
-	end
-	stringTable = { strsplit("\a", text) }
-	for _, statString in ipairs(stringTable) do
-		stat = WeightsWatcher.singleStat(statString)
-		if stat then
-			stats = stats + stat
-		else
-			ww_unparsed_lines[origText] = true
+		stat1 = WeightsWatcher.singleStat(stat1)
+		stat2 = WeightsWatcher.singleStat(stat2)
+		if stat1 and stat2 then
+			return stat1 + stat2
 		end
 	end
-	-- Don't return an empty table
-	for _, _ in pairs (stats) do
-		return stats
-	end
 end
 
 function WeightsWatcher.damageRange(textL, textR)
@@ -201,6 +183,11 @@ SocketLines = {
 }
 
 MultipleStatLines = {
+	{"^([^,]+) and ([^,]+)$", WeightsWatcher.twoStats},
+	-- currently used only by items 31864 and 31872
+	{"^([^,]+) & ([^,]+)$", WeightsWatcher.twoStats},
+	-- currently only used by item 28363
+	{"^([^,]+), ([^,]+)$", WeightsWatcher.twoStats},
 }
 
 SingleStatLines = {
diff --git a/WeightsWatcher.lua b/WeightsWatcher.lua
index 6072b8a..fd6a83b 100644
--- a/WeightsWatcher.lua
+++ b/WeightsWatcher.lua
@@ -971,9 +971,9 @@ function WeightsWatcher.parseLine(textL, textR, link)
 	for _, regex in ipairs(MultipleStatLines) do
 		local pattern, func = unpack(regex)
 		if string.find(textL, pattern) then
-			local statsList = func(textL, textR)
-			if statsList then
-				return statsList
+			local stats = func(textL, pattern)
+			if stats then
+				return stats
 			end
 		end
 	end
-- 
1.7.9.5