From ae7e9e02b684a1c961fa650226e3d6fc8e50681a Mon Sep 17 00:00:00 2001
From: "Johnny C. Lam" <jlam88@gmail.com>
Date: Tue, 26 Nov 2013 14:04:02 +0000
Subject: [PATCH] Move initialization of OvaleData.spellInfo into
 OvaleCompile.

git-svn-id: svn://svn.curseforge.net/wow/ovale/mainline/trunk@1200 d5049fe3-3747-40f7-a4b5-f36d6801af5f
---
 OvaleCompile.lua |   30 ++++++++++++++++++++++--------
 OvaleData.lua    |   11 -----------
 2 files changed, 22 insertions(+), 19 deletions(-)

diff --git a/OvaleCompile.lua b/OvaleCompile.lua
index cec5287..2f7f731 100644
--- a/OvaleCompile.lua
+++ b/OvaleCompile.lua
@@ -279,6 +279,19 @@ local function ParseFunction(prefix, func, params)
 	return nodeName
 end
 
+local function GetSpellInfo(spellId)
+	if not OvaleData.spellInfo[spellId] then
+		OvaleData.spellInfo[spellId] = {
+			aura = {
+				player = {},
+				target = {},
+			},
+			damageAura = {},
+		}
+	end
+	return OvaleData.spellInfo[spellId]
+end
+
 --[[
 	Parse the various Spell*{Buff,Debuff}() declarations.
 	Check for test conditions to see whether this declaration is active.
@@ -310,42 +323,42 @@ end
 local function ParseSpellAddBuff(params)
 	local paramList = ParseParameters(params)
 	local spellId = paramList[1]
-	local si = OvaleData:GetSpellInfo(spellId)
+	local si = GetSpellInfo(spellId)
 	return ParseSpellAuraList(si.aura.player, "HELPFUL", paramList)
 end
 
 local function ParseSpellAddDebuff(params)
 	local paramList = ParseParameters(params)
 	local spellId = paramList[1]
-	local si = OvaleData:GetSpellInfo(spellId)
+	local si = GetSpellInfo(spellId)
 	return ParseSpellAuraList(si.aura.player, "HARMFUL", paramList)
 end
 
 local function ParseSpellAddTargetBuff(params)
 	local paramList = ParseParameters(params)
 	local spellId = paramList[1]
-	local si = OvaleData:GetSpellInfo(spellId)
+	local si = GetSpellInfo(spellId)
 	return ParseSpellAuraList(si.aura.target, "HELPFUL", paramList)
 end
 
 local function ParseSpellAddTargetDebuff(params)
 	local paramList = ParseParameters(params)
 	local spellId = paramList[1]
-	local si = OvaleData:GetSpellInfo(spellId)
+	local si = GetSpellInfo(spellId)
 	return ParseSpellAuraList(si.aura.target, "HARMFUL", paramList)
 end
 
 local function ParseSpellDamageBuff(params)
 	local paramList = ParseParameters(params)
 	local spellId = paramList[1]
-	local si = OvaleData:GetSpellInfo(spellId)
+	local si = GetSpellInfo(spellId)
 	return ParseSpellAuraList(si.damageAura, "HELPFUL", paramList)
 end
 
 local function ParseSpellDamageDebuff(params)
 	local paramList = ParseParameters(params)
 	local spellId = paramList[1]
-	local si = OvaleData:GetSpellInfo(spellId)
+	local si = GetSpellInfo(spellId)
 	return ParseSpellAuraList(si.damageAura, "HARMFUL", paramList)
 end
 
@@ -356,7 +369,7 @@ local function ParseSpellInfo(params)
 		if not TestConditions(paramList) then
 			return ""
 		end
-		local si = OvaleData:GetSpellInfo(spellId)
+		local si = GetSpellInfo(spellId)
 		for k,v in pairs(paramList) do
 			if k == "addduration" then
 				si.duration = si.duration + v
@@ -679,7 +692,8 @@ end
 local function ParseCanStopChannelling(text)
 	local spellId = tonumber(text)
 	if spellId then
-		OvaleData:GetSpellInfo(spellId).canStopChannelling = true
+		local si = GetSpellInfo(spellId)
+		si.canStopChannelling = true
 	else
 		Ovale:FormatPrint("CanStopChannelling with unknown spell %s", text)
 	end
diff --git a/OvaleData.lua b/OvaleData.lua
index 55681cf..0839923 100644
--- a/OvaleData.lua
+++ b/OvaleData.lua
@@ -243,17 +243,6 @@ OvaleData.buffSpellList.heroism = OvaleData.buffSpellList.burst_haste
 --</public-static-properties>
 
 --<public-static-methods>
-function OvaleData:GetSpellInfo(spellId)
-	if (not self.spellInfo[spellId]) then
-		self.spellInfo[spellId] =
-		{
-			aura = {player = {}, target = {}},
-			damageAura = {},
-		}
-	end
-	return self.spellInfo[spellId]
-end
-
 function OvaleData:ResetSpellInfo()
 	self.spellInfo = {}
 end
-- 
1.7.9.5