The big change

[Rakka.git] / Rakka / Wiki / Interpreter.hs

diff --git a/Rakka/Wiki/Interpreter.hs b/Rakka/Wiki/Interpreter.hs
index 09f7414671e75c3a7a047826d7b6e8a9f49a9c6d..9c40816e47519aedf6ac27a7731f7e8b20dee4f6 100644 (file)
--- a/Rakka/Wiki/Interpreter.hs
+++ b/Rakka/Wiki/Interpreter.hs
@@ -11,25 +11,28 @@ import           Rakka.Page
 import           Rakka.Storage
 import           Rakka.SystemConfig
 import           Rakka.Wiki
+import           Text.XML.HXT.DOM.TypeDefs
 
 
 data Interpreter
     = InlineCommandInterpreter {
-        iciName      :: String
-      , iciInterpret :: InterpreterContext -> InlineCommand -> IO InlineElement
+        iciName      :: !String
+      , iciInterpret :: !(InterpreterContext -> InlineCommand -> IO InlineElement)
       }
     | BlockCommandInterpreter {
-        bciName      :: String
-      , bciInterpret :: InterpreterContext -> BlockCommand -> IO BlockElement
+        bciName      :: !String
+      , bciInterpret :: !(InterpreterContext -> BlockCommand -> IO BlockElement)
       }
 
 
 data InterpreterContext
     = InterpreterContext {
-        ctxPage    :: Maybe Page
-      , ctxTree    :: WikiPage
-      , ctxStorage :: Storage
-      , ctxSysConf :: SystemConfig
+        ctxPageName   :: !PageName
+      , ctxMainPage   :: !(Maybe XmlTree)
+      , ctxMainWiki   :: !(Maybe WikiPage)
+      , ctxTargetWiki :: !WikiPage
+      , ctxStorage    :: !Storage
+      , ctxSysConf    :: !SystemConfig
       }