From d7c3180de5b51264fa657bd0e4fb02391b82af39 Mon Sep 17 00:00:00 2001 From: "Johnny C. Lam" Date: Sun, 10 Nov 2013 00:29:33 +0000 Subject: [PATCH] Change all "dumb" modules into AceAddon-3.0 sub-modules of Ovale. This allows for all modules to be accessed via the basic methods provided by AceAddon-3.0 instead of needing to invent a separate registration process for Ovale modules. git-svn-id: svn://svn.curseforge.net/wow/ovale/mainline/trunk@1137 d5049fe3-3747-40f7-a4b5-f36d6801af5f --- OvaleBestAction.lua | 2 +- OvaleCondition.lua | 2 +- OvaleData.lua | 2 +- OvalePool.lua | 2 +- OvalePoolGC.lua | 2 +- OvaleQueue.lua | 2 +- OvaleSkada.lua | 2 +- OvaleState.lua | 2 +- OvaleTimeSpan.lua | 2 +- compiler.pl | 8 -------- 10 files changed, 9 insertions(+), 17 deletions(-) diff --git a/OvaleBestAction.lua b/OvaleBestAction.lua index 64ece77..9890f89 100644 --- a/OvaleBestAction.lua +++ b/OvaleBestAction.lua @@ -9,7 +9,7 @@ --]]-------------------------------------------------------------------- local _, Ovale = ... -local OvaleBestAction = {} +local OvaleBestAction = Ovale:NewModule("OvaleBestAction") Ovale.OvaleBestAction = OvaleBestAction -- diff --git a/OvaleCondition.lua b/OvaleCondition.lua index 5f48281..b9d44d2 100644 --- a/OvaleCondition.lua +++ b/OvaleCondition.lua @@ -9,7 +9,7 @@ --]]-------------------------------------------------------------------- local _, Ovale = ... -local OvaleCondition = {} +local OvaleCondition = Ovale:NewModule("OvaleCondition") Ovale.OvaleCondition = OvaleCondition -- diff --git a/OvaleData.lua b/OvaleData.lua index 22fc9ef..8663824 100644 --- a/OvaleData.lua +++ b/OvaleData.lua @@ -9,7 +9,7 @@ --]]-------------------------------------------------------------------- local _, Ovale = ... -local OvaleData = {} +local OvaleData = Ovale:NewModule("OvaleData") Ovale.OvaleData = OvaleData -- diff --git a/OvalePool.lua b/OvalePool.lua index f6536d0..a93b63f 100644 --- a/OvalePool.lua +++ b/OvalePool.lua @@ -9,7 +9,7 @@ -- Simple resource pool. local _, Ovale = ... -local OvalePool = {} +local OvalePool = Ovale:NewModule("OvalePool") Ovale.OvalePool = OvalePool -- diff --git a/OvalePoolGC.lua b/OvalePoolGC.lua index acb904d..b2387c5 100644 --- a/OvalePoolGC.lua +++ b/OvalePoolGC.lua @@ -9,7 +9,7 @@ -- This module wraps the standard Lua garbage collector using the Pool interface. local _, Ovale = ... -local OvalePoolGC = {} +local OvalePoolGC = Ovale:NewModule("OvalePoolGC") Ovale.OvalePoolGC = OvalePoolGC -- diff --git a/OvaleQueue.lua b/OvaleQueue.lua index 3693a49..8b3170f 100644 --- a/OvaleQueue.lua +++ b/OvaleQueue.lua @@ -9,7 +9,7 @@ -- Double-ended queue. local _, Ovale = ... -local OvaleQueue = {} +local OvaleQueue = Ovale:NewModule("OvaleQueue") Ovale.OvaleQueue = OvaleQueue -- diff --git a/OvaleSkada.lua b/OvaleSkada.lua index 3423839..55ec55e 100644 --- a/OvaleSkada.lua +++ b/OvaleSkada.lua @@ -10,7 +10,7 @@ local _, Ovale = ... local Skada = LibStub("AceAddon-3.0"):GetAddon("Skada", true) -local OvaleSkada = Skada and Skada:NewModule("Ovale Spell Priority") or {} +local OvaleSkada = Skada and Skada:NewModule("Ovale Spell Priority") or Ovale:NewModule("OvaleSkada") Ovale.OvaleSkada = OvaleSkada -- diff --git a/OvaleState.lua b/OvaleState.lua index f9b22e7..64151b7 100644 --- a/OvaleState.lua +++ b/OvaleState.lua @@ -11,7 +11,7 @@ -- Keep the current state in the simulation local _, Ovale = ... -OvaleState = {} +local OvaleState = Ovale:NewModule("OvaleState") Ovale.OvaleState = OvaleState -- diff --git a/OvaleTimeSpan.lua b/OvaleTimeSpan.lua index 56eb448..3bd9f39 100644 --- a/OvaleTimeSpan.lua +++ b/OvaleTimeSpan.lua @@ -21,7 +21,7 @@ --]] local _, Ovale = ... -local OvaleTimeSpan = {} +local OvaleTimeSpan = Ovale:NewModule("OvaleTimeSpan") Ovale.OvaleTimeSpan = OvaleTimeSpan -- diff --git a/compiler.pl b/compiler.pl index d7b1cd8..483ca61 100644 --- a/compiler.pl +++ b/compiler.pl @@ -90,15 +90,7 @@ $m{Skada}{get_player} = true; $p{Skada}{current} = true; $p{Skada}{total} = true; -$sp{Ovale}{OvaleBestAction} = true; -$sp{Ovale}{OvaleCondition} = true; -$sp{Ovale}{OvaleData} = true; -$sp{Ovale}{OvaleQueue} = true; -$sp{Ovale}{OvalePool} = true; -$sp{Ovale}{OvalePoolGC} = true; $sp{Ovale}{OvaleSkada} = true; -$sp{Ovale}{OvaleState} = true; -$sp{Ovale}{OvaleTimeSpan} = true; $sp{OvaleQueue}{Front} = true; $sp{OvaleQueue}{FrontToBackIterator} = true; -- 1.7.9.5