Use hslua >= 0.7, update Lua code

author: Albert Krewinkel <albert@zeitkraut.de> 2017-08-13 12:37:10 +0200
committer: Albert Krewinkel <albert@zeitkraut.de> 2017-08-13 14:23:54 +0200
commit: 2dc3dbd68b557cbd8974b9daf84df3d26ab5f843 (patch)
tree: acd1e83277f97cddd2e2717da6cb8243c3e4f57e /src/Text/Pandoc/Lua
parent: 418bda81282c82325c5a296a3c486fdc5ab1dfe0 (diff)
download: pandoc-2dc3dbd68b557cbd8974b9daf84df3d26ab5f843.tar.gz
5 files changed, 260 insertions, 395 deletions
diff --git a/src/Text/Pandoc/Lua/Compat.hs b/src/Text/Pandoc/Lua/Compat.hs
deleted file mode 100644
index 3fc81a15c..000000000
--- a/src/Text/Pandoc/Lua/Compat.hs
+++ /dev/null
@@ -1,40 +0,0 @@
-{-
-Copyright © 2017 Albert Krewinkel <tarleb+pandoc@moltkeplatz.de>
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
--}
-{-# LANGUAGE CPP #-}
-{- |
-   Module      : Text.Pandoc.Lua.Compat
-   Copyright   : Copyright © 2017 Albert Krewinkel
-   License     : GNU GPL, version 2 or above
-
-   Maintainer  : Albert Krewinkel <tarleb+pandoc@moltkeplatz.de>
-   Stability   : alpha
-
-Compatibility helpers for hslua
--}
-module Text.Pandoc.Lua.Compat ( loadstring ) where
-
-import Scripting.Lua (LuaState)
-import qualified Scripting.Lua as Lua
-
--- | Interpret string as lua code and load into the lua environment.
-loadstring :: LuaState -> String -> String -> IO Int
-#if MIN_VERSION_hslua(0,5,0)
-loadstring lua script _  = Lua.loadstring lua script
-#else
-loadstring lua script cn = Lua.loadstring lua script cn
-#endif
diff --git a/src/Text/Pandoc/Lua/PandocModule.hs b/src/Text/Pandoc/Lua/PandocModule.hs
index d46ed3629..c8eaf3da0 100644
--- a/src/Text/Pandoc/Lua/PandocModule.hs
+++ b/src/Text/Pandoc/Lua/PandocModule.hs
@@ -31,31 +31,31 @@ import Control.Monad (unless)
 import Data.ByteString.Char8 (unpack)
 import Data.Default (Default (..))
 import Data.Text (pack)
-import Scripting.Lua (LuaState, call, push, pushhsfunction, rawset)
+import Foreign.Lua (Lua, Status (OK), liftIO, push, pushHaskellFunction)
+import Foreign.Lua.Api (call, loadstring, rawset)
 import Text.Pandoc.Class
 import Text.Pandoc.Definition (Pandoc)
 import Text.Pandoc.Options (ReaderOptions(readerExtensions))
-import Text.Pandoc.Lua.Compat (loadstring)
 import Text.Pandoc.Lua.StackInstances ()
 import Text.Pandoc.Readers (Reader (..), getReader)
 
 -- | Push the "pandoc" on the lua stack.
-pushPandocModule :: Maybe FilePath -> LuaState -> IO ()
-pushPandocModule datadir lua = do
-  script <- pandocModuleScript datadir
-  status <- loadstring lua script "pandoc.lua"
-  unless (status /= 0) $ call lua 0 1
-  push lua "__read"
-  pushhsfunction lua read_doc
-  rawset lua (-3)
+pushPandocModule :: Maybe FilePath -> Lua ()
+pushPandocModule datadir = do
+  script <- liftIO (pandocModuleScript datadir)
+  status <- loadstring script
+  unless (status /= OK) $ call 0 1
+  push "__read"
+  pushHaskellFunction readDoc
+  rawset (-3)
 
 -- | Get the string representation of the pandoc module
 pandocModuleScript :: Maybe FilePath -> IO String
 pandocModuleScript datadir = unpack <$>
   runIOorExplode (setUserDataDir datadir >> readDataFile "pandoc.lua")
 
-read_doc :: String -> String -> IO (Either String Pandoc)
-read_doc formatSpec content = do
+readDoc :: String -> String -> Lua (Either String Pandoc)
+readDoc formatSpec content = liftIO $ do
   case getReader formatSpec of
     Left  s      -> return $ Left s
     Right (reader, es) ->
diff --git a/src/Text/Pandoc/Lua/SharedInstances.hs b/src/Text/Pandoc/Lua/SharedInstances.hs
index a5d4ba1e9..e9e72c219 100644
--- a/src/Text/Pandoc/Lua/SharedInstances.hs
+++ b/src/Text/Pandoc/Lua/SharedInstances.hs
@@ -36,81 +36,9 @@ Shared StackValue instances for pandoc and generic types.
 -}
 module Text.Pandoc.Lua.SharedInstances () where
 
-import Scripting.Lua (LTYPE (..), StackValue (..), newtable)
-import Text.Pandoc.Lua.Util (addRawInt, addValue, getRawInt, keyValuePairs)
+import Foreign.Lua (ToLuaStack (push))
 
-import qualified Data.Map as M
-import qualified Text.Pandoc.UTF8 as UTF8
-
-#if MIN_VERSION_base(4,8,0)
-instance {-# OVERLAPS #-} StackValue [Char] where
-#else
-instance StackValue [Char] where
-#endif
-  push lua cs = push lua (UTF8.fromString cs)
-  peek lua i = fmap UTF8.toString <$> peek lua i
-  valuetype _ = TSTRING
-
-instance (StackValue a, StackValue b) => StackValue (a, b) where
-  push lua (a, b) = do
-    newtable lua
-    addRawInt lua 1 a
-    addRawInt lua 2 b
-  peek lua idx = do
-    a <- getRawInt lua idx 1
-    b <- getRawInt lua idx 2
-    return $ (,) <$> a <*> b
-  valuetype _ = TTABLE
-
-instance (StackValue a, StackValue b, StackValue c) =>
-         StackValue (a, b, c)
- where
-  push lua (a, b, c) = do
-    newtable lua
-    addRawInt lua 1 a
-    addRawInt lua 2 b
-    addRawInt lua 3 c
-  peek lua idx = do
-    a <- getRawInt lua idx 1
-    b <- getRawInt lua idx 2
-    c <- getRawInt lua idx 3
-    return $ (,,) <$> a <*> b <*> c
-  valuetype _ = TTABLE
-
-instance (StackValue a, StackValue b, StackValue c,
-          StackValue d, StackValue e) =>
-         StackValue (a, b, c, d, e)
- where
-  push lua (a, b, c, d, e) = do
-    newtable lua
-    addRawInt lua 1 a
-    addRawInt lua 2 b
-    addRawInt lua 3 c
-    addRawInt lua 4 d
-    addRawInt lua 5 e
-  peek lua idx = do
-    a <- getRawInt lua idx 1
-    b <- getRawInt lua idx 2
-    c <- getRawInt lua idx 3
-    d <- getRawInt lua idx 4
-    e <- getRawInt lua idx 5
-    return $ (,,,,) <$> a <*> b <*> c <*> d <*> e
-  valuetype _ = TTABLE
-
-instance (Ord a, StackValue a, StackValue b) =>
-         StackValue (M.Map a b) where
-  push lua m = do
-    newtable lua
-    mapM_ (uncurry $ addValue lua) $ M.toList m
-  peek lua idx = fmap M.fromList <$> keyValuePairs lua idx
-  valuetype _ = TTABLE
-
-instance (StackValue a, StackValue b) => StackValue (Either a b) where
-  push lua = \case
-    Left x -> push lua x
-    Right x -> push lua x
-  peek lua idx = peek lua idx >>= \case
-      Just left -> return . Just $ Left left
-      Nothing   -> fmap Right <$> peek lua idx
-  valuetype (Left x)  = valuetype x
-  valuetype (Right x) = valuetype x
+instance (ToLuaStack a, ToLuaStack b) => ToLuaStack (Either a b) where
+  push = \case
+    Left x -> push x
+    Right x -> push x
diff --git a/src/Text/Pandoc/Lua/StackInstances.hs b/src/Text/Pandoc/Lua/StackInstances.hs
index d2e3f630a..4eea5bc2f 100644
--- a/src/Text/Pandoc/Lua/StackInstances.hs
+++ b/src/Text/Pandoc/Lua/StackInstances.hs
@@ -33,243 +33,244 @@ StackValue instances for pandoc types.
 module Text.Pandoc.Lua.StackInstances () where
 
 import Control.Applicative ((<|>))
-import Scripting.Lua (LTYPE (..), LuaState, StackValue (..), ltype, newtable,
-                      objlen)
+import Foreign.Lua (Lua, Type (..), FromLuaStack (peek), ToLuaStack (push),
+                    StackIndex, peekEither, throwLuaError)
+import Foreign.Lua.Api (getfield, ltype, newtable, pop, rawlen)
 import Text.Pandoc.Definition
 import Text.Pandoc.Lua.SharedInstances ()
 import Text.Pandoc.Lua.Util (addValue, getTable, pushViaConstructor)
 import Text.Pandoc.Shared (safeRead)
 
-instance StackValue Pandoc where
-  push lua (Pandoc meta blocks) = do
-    newtable lua
-    addValue lua "blocks" blocks
-    addValue lua "meta"   meta
-  peek lua idx = do
-    blocks <- getTable lua idx "blocks"
-    meta   <- getTable lua idx "meta"
-    return $ Pandoc <$> meta <*> blocks
-  valuetype _ = TTABLE
-
-instance StackValue Meta where
-  push lua (Meta mmap) = push lua mmap
-  peek lua idx = fmap Meta <$> peek lua idx
-  valuetype _ = TTABLE
-
-instance StackValue MetaValue where
+instance ToLuaStack Pandoc where
+  push (Pandoc meta blocks) = do
+    newtable
+    addValue "blocks" blocks
+    addValue "meta"   meta
+instance FromLuaStack Pandoc where
+  peek idx = do
+    blocks <- getTable idx "blocks"
+    meta   <- getTable idx "meta"
+    return $ Pandoc meta blocks
+
+instance ToLuaStack Meta where
+  push (Meta mmap) = push mmap
+instance FromLuaStack Meta where
+  peek idx = Meta <$> peek idx
+
+instance ToLuaStack MetaValue where
   push = pushMetaValue
+instance FromLuaStack MetaValue where
   peek = peekMetaValue
-  valuetype = \case
-    MetaBlocks _  -> TTABLE
-    MetaBool _    -> TBOOLEAN
-    MetaInlines _ -> TTABLE
-    MetaList _    -> TTABLE
-    MetaMap _     -> TTABLE
-    MetaString _  -> TSTRING
-
-instance StackValue Block where
+
+instance ToLuaStack Block where
   push = pushBlock
+
+instance FromLuaStack Block where
   peek = peekBlock
-  valuetype _ = TTABLE
 
-instance StackValue Inline where
+-- Inline
+instance ToLuaStack Inline where
   push = pushInline
+
+instance FromLuaStack Inline where
   peek = peekInline
-  valuetype _ = TTABLE
-
-instance StackValue Citation where
-  push lua (Citation cid prefix suffix mode noteNum hash) =
-    pushViaConstructor lua "Citation" cid mode prefix suffix noteNum hash
-  peek lua idx = do
-    id' <- getTable lua idx "citationId"
-    prefix <- getTable lua idx "citationPrefix"
-    suffix <- getTable lua idx "citationSuffix"
-    mode <- getTable lua idx "citationMode"
-    num <- getTable lua idx "citationNoteNum"
-    hash <- getTable lua idx "citationHash"
-    return $ Citation <$> id' <*> prefix <*> suffix <*> mode <*> num <*> hash
-  valuetype _ = TTABLE
-
-instance StackValue Alignment where
-  push lua = push lua . show
-  peek lua idx = (>>= safeRead) <$> peek lua idx
-  valuetype _ = TSTRING
-
-instance StackValue CitationMode where
-  push lua = push lua . show
-  peek lua idx = (>>= safeRead) <$> peek lua idx
-  valuetype _ = TSTRING
-
-instance StackValue Format where
-  push lua (Format f) = push lua f
-  peek lua idx = fmap Format <$> peek lua idx
-  valuetype _ = TSTRING
-
-instance StackValue ListNumberDelim where
-  push lua = push lua . show
-  peek lua idx = (>>= safeRead) <$> peek lua idx
-  valuetype _ = TSTRING
-
-instance StackValue ListNumberStyle where
-  push lua = push lua . show
-  peek lua idx = (>>= safeRead) <$> peek lua idx
-  valuetype _ = TSTRING
-
-instance StackValue MathType where
-  push lua = push lua . show
-  peek lua idx = (>>= safeRead) <$> peek lua idx
-  valuetype _ = TSTRING
-
-instance StackValue QuoteType where
-  push lua = push lua . show
-  peek lua idx = (>>= safeRead) <$> peek lua idx
-  valuetype _ = TSTRING
+
+-- Citation
+instance ToLuaStack Citation where
+  push (Citation cid prefix suffix mode noteNum hash) =
+    pushViaConstructor "Citation" cid mode prefix suffix noteNum hash
+
+instance FromLuaStack Citation where
+  peek idx = do
+    id' <- getTable idx "citationId"
+    prefix <- getTable idx "citationPrefix"
+    suffix <- getTable idx "citationSuffix"
+    mode <- getTable idx "citationMode"
+    num <- getTable idx "citationNoteNum"
+    hash <- getTable idx "citationHash"
+    return $ Citation id' prefix suffix mode num hash
+
+instance ToLuaStack Alignment where
+  push = push . show
+instance FromLuaStack Alignment where
+  peek idx = safeRead' =<< peek idx
+
+instance ToLuaStack CitationMode where
+  push = push . show
+instance FromLuaStack CitationMode where
+  peek idx = safeRead' =<< peek idx
+
+instance ToLuaStack Format where
+  push (Format f) = push f
+instance FromLuaStack Format where
+  peek idx = Format <$> peek idx
+
+instance ToLuaStack ListNumberDelim where
+  push = push . show
+instance FromLuaStack ListNumberDelim where
+  peek idx = safeRead' =<< peek idx
+
+instance ToLuaStack ListNumberStyle where
+  push = push . show
+instance FromLuaStack ListNumberStyle where
+  peek idx = safeRead' =<< peek idx
+
+instance ToLuaStack MathType where
+  push = push . show
+instance FromLuaStack MathType where
+  peek idx = safeRead' =<< peek idx
+
+instance ToLuaStack QuoteType where
+  push = push . show
+instance FromLuaStack QuoteType where
+  peek idx = safeRead' =<< peek idx
+
+safeRead' :: Read a => String -> Lua a
+safeRead' s = case safeRead s of
+  Nothing -> throwLuaError ("Could not read: " ++ s)
+  Just x -> return x
 
 -- | Push an meta value element to the top of the lua stack.
-pushMetaValue :: LuaState -> MetaValue -> IO ()
-pushMetaValue lua = \case
-  MetaBlocks blcks  -> pushViaConstructor lua "MetaBlocks" blcks
-  MetaBool bool     -> push lua bool
-  MetaInlines inlns -> pushViaConstructor lua "MetaInlines" inlns
-  MetaList metalist -> pushViaConstructor lua "MetaList" metalist
-  MetaMap metamap   -> pushViaConstructor lua "MetaMap" metamap
-  MetaString str    -> push lua str
+pushMetaValue :: MetaValue -> Lua ()
+pushMetaValue = \case
+  MetaBlocks blcks  -> pushViaConstructor "MetaBlocks" blcks
+  MetaBool bool     -> push bool
+  MetaInlines inlns -> pushViaConstructor "MetaInlines" inlns
+  MetaList metalist -> pushViaConstructor "MetaList" metalist
+  MetaMap metamap   -> pushViaConstructor "MetaMap" metamap
+  MetaString str    -> push str
 
 -- | Interpret the value at the given stack index as meta value.
-peekMetaValue :: LuaState -> Int -> IO (Maybe MetaValue)
-peekMetaValue lua idx = do
+peekMetaValue :: StackIndex -> Lua MetaValue
+peekMetaValue idx = do
   -- Get the contents of an AST element.
-  let elementContent :: StackValue a => IO (Maybe a)
-      elementContent = peek lua idx
-  luatype <- ltype lua idx
+  let elementContent :: FromLuaStack a => Lua a
+      elementContent = peek idx
+  luatype <- ltype idx
   case luatype of
-    TBOOLEAN -> fmap MetaBool <$> peek lua idx
-    TSTRING  -> fmap MetaString <$> peek lua idx
-    TTABLE   -> do
-      tag <- getTable lua idx "t"
+    TypeBoolean -> MetaBool <$> peek idx
+    TypeString  -> MetaString <$> peek idx
+    TypeTable   -> do
+      tag <- getfield idx "t" *> peekEither (-1) <* pop 1
       case tag of
-        Just "MetaBlocks"  -> fmap MetaBlocks  <$> elementContent
-        Just "MetaBool"    -> fmap MetaBool    <$> elementContent
-        Just "MetaMap"     -> fmap MetaMap     <$> elementContent
-        Just "MetaInlines" -> fmap MetaInlines <$> elementContent
-        Just "MetaList"    -> fmap MetaList    <$> elementContent
-        Just "MetaString"  -> fmap MetaString  <$> elementContent
-        Nothing -> do
+        Right "MetaBlocks"  -> MetaBlocks  <$> elementContent
+        Right "MetaBool"    -> MetaBool    <$> elementContent
+        Right "MetaMap"     -> MetaMap     <$> elementContent
+        Right "MetaInlines" -> MetaInlines <$> elementContent
+        Right "MetaList"    -> MetaList    <$> elementContent
+        Right "MetaString"  -> MetaString  <$> elementContent
+        Right t             -> throwLuaError ("Unknown meta tag: " ++ t)
+        Left _ -> do
           -- no meta value tag given, try to guess.
-          len <- objlen lua idx
+          len <- rawlen idx
           if len <= 0
-            then fmap MetaMap <$> peek lua idx
-            else  (fmap MetaInlines <$> peek lua idx)
-                  <|> (fmap MetaBlocks <$> peek lua idx)
-                  <|> (fmap MetaList <$> peek lua idx)
-        _        -> return Nothing
-    _        -> return Nothing
+            then MetaMap <$> peek idx
+            else  (MetaInlines <$> peek idx)
+                  <|> (MetaBlocks <$> peek idx)
+                  <|> (MetaList <$> peek idx)
+    _        -> throwLuaError ("could not get meta value")
 
 -- | Push an block element to the top of the lua stack.
-pushBlock :: LuaState -> Block -> IO ()
-pushBlock lua = \case
-  BlockQuote blcks         -> pushViaConstructor lua "BlockQuote" blcks
-  BulletList items         -> pushViaConstructor lua "BulletList" items
-  CodeBlock attr code      -> pushViaConstructor lua "CodeBlock" code (LuaAttr attr)
-  DefinitionList items     -> pushViaConstructor lua "DefinitionList" items
-  Div attr blcks           -> pushViaConstructor lua "Div" blcks (LuaAttr attr)
-  Header lvl attr inlns    -> pushViaConstructor lua "Header" lvl inlns (LuaAttr attr)
-  HorizontalRule           -> pushViaConstructor lua "HorizontalRule"
-  LineBlock blcks          -> pushViaConstructor lua "LineBlock" blcks
-  OrderedList lstAttr list -> pushViaConstructor lua "OrderedList" list lstAttr
-  Null                     -> pushViaConstructor lua "Null"
-  Para blcks               -> pushViaConstructor lua "Para" blcks
-  Plain blcks              -> pushViaConstructor lua "Plain" blcks
-  RawBlock f cs            -> pushViaConstructor lua "RawBlock" f cs
+pushBlock :: Block -> Lua ()
+pushBlock = \case
+  BlockQuote blcks         -> pushViaConstructor "BlockQuote" blcks
+  BulletList items         -> pushViaConstructor "BulletList" items
+  CodeBlock attr code      -> pushViaConstructor "CodeBlock" code (LuaAttr attr)
+  DefinitionList items     -> pushViaConstructor "DefinitionList" items
+  Div attr blcks           -> pushViaConstructor "Div" blcks (LuaAttr attr)
+  Header lvl attr inlns    -> pushViaConstructor "Header" lvl inlns (LuaAttr attr)
+  HorizontalRule           -> pushViaConstructor "HorizontalRule"
+  LineBlock blcks          -> pushViaConstructor "LineBlock" blcks
+  OrderedList lstAttr list -> pushViaConstructor "OrderedList" list lstAttr
+  Null                     -> pushViaConstructor "Null"
+  Para blcks               -> pushViaConstructor "Para" blcks
+  Plain blcks              -> pushViaConstructor "Plain" blcks
+  RawBlock f cs            -> pushViaConstructor "RawBlock" f cs
   Table capt aligns widths headers rows ->
-    pushViaConstructor lua "Table" capt aligns widths headers rows
+    pushViaConstructor "Table" capt aligns widths headers rows
 
 -- | Return the value at the given index as block if possible.
-peekBlock :: LuaState -> Int -> IO (Maybe Block)
-peekBlock lua idx = do
-  tag <- getTable lua idx "t"
+peekBlock :: StackIndex -> Lua Block
+peekBlock idx = do
+  tag <- getTable idx "t"
   case tag of
-    Nothing -> return Nothing
-    Just t -> case t of
-      "BlockQuote"     -> fmap BlockQuote <$> elementContent
-      "BulletList"     -> fmap BulletList <$> elementContent
-      "CodeBlock"      -> fmap (withAttr CodeBlock) <$> elementContent
-      "DefinitionList" -> fmap DefinitionList <$> elementContent
-      "Div"            -> fmap (withAttr Div) <$> elementContent
-      "Header"         -> fmap (\(lvl, LuaAttr attr, lst) -> Header lvl attr lst)
+      "BlockQuote"     -> BlockQuote <$> elementContent
+      "BulletList"     -> BulletList <$> elementContent
+      "CodeBlock"      -> (withAttr CodeBlock) <$> elementContent
+      "DefinitionList" -> DefinitionList <$> elementContent
+      "Div"            -> (withAttr Div) <$> elementContent
+      "Header"         -> (\(lvl, LuaAttr attr, lst) -> Header lvl attr lst)
                           <$> elementContent
-      "HorizontalRule" -> return (Just HorizontalRule)
-      "LineBlock"      -> fmap LineBlock <$> elementContent
-      "OrderedList"    -> fmap (uncurry OrderedList) <$> elementContent
-      "Null"           -> return (Just Null)
-      "Para"           -> fmap Para <$> elementContent
-      "Plain"          -> fmap Plain <$> elementContent
-      "RawBlock"       -> fmap (uncurry RawBlock) <$> elementContent
-      "Table"          -> fmap (\(capt, aligns, widths, headers, body) ->
+      "HorizontalRule" -> return HorizontalRule
+      "LineBlock"      -> LineBlock <$> elementContent
+      "OrderedList"    -> (uncurry OrderedList) <$> elementContent
+      "Null"           -> return Null
+      "Para"           -> Para <$> elementContent
+      "Plain"          -> Plain <$> elementContent
+      "RawBlock"       -> (uncurry RawBlock) <$> elementContent
+      "Table"          -> (\(capt, aligns, widths, headers, body) ->
                                   Table capt aligns widths headers body)
                           <$> elementContent
-      _ -> return Nothing
+      _ -> throwLuaError ("Unknown block type: " ++ tag)
  where
    -- Get the contents of an AST element.
-   elementContent :: StackValue a => IO (Maybe a)
-   elementContent = getTable lua idx "c"
+   elementContent :: FromLuaStack a => Lua a
+   elementContent = getTable idx "c"
 
 -- | Push an inline element to the top of the lua stack.
-pushInline :: LuaState -> Inline -> IO ()
-pushInline lua = \case
-  Cite citations lst       -> pushViaConstructor lua "Cite" lst citations
-  Code attr lst            -> pushViaConstructor lua "Code" lst (LuaAttr attr)
-  Emph inlns               -> pushViaConstructor lua "Emph" inlns
-  Image attr alt (src,tit) -> pushViaConstructor lua "Image" alt src tit (LuaAttr attr)
-  LineBreak                -> pushViaConstructor lua "LineBreak"
-  Link attr lst (src,tit)  -> pushViaConstructor lua "Link" lst src tit (LuaAttr attr)
-  Note blcks               -> pushViaConstructor lua "Note" blcks
-  Math mty str             -> pushViaConstructor lua "Math" mty str
-  Quoted qt inlns          -> pushViaConstructor lua "Quoted" qt inlns
-  RawInline f cs           -> pushViaConstructor lua "RawInline" f cs
-  SmallCaps inlns          -> pushViaConstructor lua "SmallCaps" inlns
-  SoftBreak                -> pushViaConstructor lua "SoftBreak"
-  Space                    -> pushViaConstructor lua "Space"
-  Span attr inlns          -> pushViaConstructor lua "Span" inlns (LuaAttr attr)
-  Str str                  -> pushViaConstructor lua "Str" str
-  Strikeout inlns          -> pushViaConstructor lua "Strikeout" inlns
-  Strong inlns             -> pushViaConstructor lua "Strong" inlns
-  Subscript inlns          -> pushViaConstructor lua "Subscript" inlns
-  Superscript inlns        -> pushViaConstructor lua "Superscript" inlns
+pushInline :: Inline -> Lua ()
+pushInline = \case
+  Cite citations lst       -> pushViaConstructor "Cite" lst citations
+  Code attr lst            -> pushViaConstructor "Code" lst (LuaAttr attr)
+  Emph inlns               -> pushViaConstructor "Emph" inlns
+  Image attr alt (src,tit) -> pushViaConstructor "Image" alt src tit (LuaAttr attr)
+  LineBreak                -> pushViaConstructor "LineBreak"
+  Link attr lst (src,tit)  -> pushViaConstructor "Link" lst src tit (LuaAttr attr)
+  Note blcks               -> pushViaConstructor "Note" blcks
+  Math mty str             -> pushViaConstructor "Math" mty str
+  Quoted qt inlns          -> pushViaConstructor "Quoted" qt inlns
+  RawInline f cs           -> pushViaConstructor "RawInline" f cs
+  SmallCaps inlns          -> pushViaConstructor "SmallCaps" inlns
+  SoftBreak                -> pushViaConstructor "SoftBreak"
+  Space                    -> pushViaConstructor "Space"
+  Span attr inlns          -> pushViaConstructor "Span" inlns (LuaAttr attr)
+  Str str                  -> pushViaConstructor "Str" str
+  Strikeout inlns          -> pushViaConstructor "Strikeout" inlns
+  Strong inlns             -> pushViaConstructor "Strong" inlns
+  Subscript inlns          -> pushViaConstructor "Subscript" inlns
+  Superscript inlns        -> pushViaConstructor "Superscript" inlns
 
 -- | Return the value at the given index as inline if possible.
-peekInline :: LuaState -> Int -> IO (Maybe Inline)
-peekInline lua idx = do
-  tag <- getTable lua idx "t"
+peekInline :: StackIndex -> Lua Inline
+peekInline idx = do
+  tag <- getTable idx "t"
   case tag of
-    Nothing -> return Nothing
-    Just t -> case t of
-      "Cite"       -> fmap (uncurry Cite) <$> elementContent
-      "Code"       -> fmap (withAttr Code) <$> elementContent
-      "Emph"       -> fmap Emph <$> elementContent
-      "Image"      -> fmap (\(LuaAttr attr, lst, tgt) -> Image attr lst tgt)
-                      <$> elementContent
-      "Link"       -> fmap (\(LuaAttr attr, lst, tgt) -> Link attr lst tgt)
-                      <$> elementContent
-      "LineBreak"  -> return (Just LineBreak)
-      "Note"       -> fmap Note <$> elementContent
-      "Math"       -> fmap (uncurry Math) <$> elementContent
-      "Quoted"     -> fmap (uncurry Quoted) <$> elementContent
-      "RawInline"  -> fmap (uncurry RawInline) <$> elementContent
-      "SmallCaps"  -> fmap SmallCaps <$> elementContent
-      "SoftBreak"  -> return (Just SoftBreak)
-      "Space"      -> return (Just Space)
-      "Span"       -> fmap (withAttr Span) <$> elementContent
-      "Str"        -> fmap Str <$> elementContent
-      "Strikeout"  -> fmap Strikeout <$> elementContent
-      "Strong"     -> fmap Strong <$> elementContent
-      "Subscript"  -> fmap Subscript <$> elementContent
-      "Superscript"-> fmap Superscript <$> elementContent
-      _ -> return Nothing
+    "Cite"       -> (uncurry Cite) <$> elementContent
+    "Code"       -> (withAttr Code) <$> elementContent
+    "Emph"       -> Emph <$> elementContent
+    "Image"      -> (\(LuaAttr attr, lst, tgt) -> Image attr lst tgt)
+                    <$> elementContent
+    "Link"       -> (\(LuaAttr attr, lst, tgt) -> Link attr lst tgt)
+                    <$> elementContent
+    "LineBreak"  -> return LineBreak
+    "Note"       -> Note <$> elementContent
+    "Math"       -> (uncurry Math) <$> elementContent
+    "Quoted"     -> (uncurry Quoted) <$> elementContent
+    "RawInline"  -> (uncurry RawInline) <$> elementContent
+    "SmallCaps"  -> SmallCaps <$> elementContent
+    "SoftBreak"  -> return SoftBreak
+    "Space"      -> return Space
+    "Span"       -> (withAttr Span) <$> elementContent
+    "Str"        -> Str <$> elementContent
+    "Strikeout"  -> Strikeout <$> elementContent
+    "Strong"     -> Strong <$> elementContent
+    "Subscript"  -> Subscript <$> elementContent
+    "Superscript"-> Superscript <$> elementContent
+    _ -> throwLuaError ("Unknown inline type: " ++ tag)
  where
    -- Get the contents of an AST element.
-   elementContent :: StackValue a => IO (Maybe a)
-   elementContent = getTable lua idx "c"
+   elementContent :: FromLuaStack a => Lua a
+   elementContent = getTable idx "c"
 
 withAttr :: (Attr -> a -> b) -> (LuaAttr, a) -> b
 withAttr f (attributes, x) = f (fromLuaAttr attributes) x
@@ -277,8 +278,8 @@ withAttr f (attributes, x) = f (fromLuaAttr attributes) x
 -- | Wrapper for Attr
 newtype LuaAttr = LuaAttr { fromLuaAttr :: Attr }
 
-instance StackValue LuaAttr where
-  push lua (LuaAttr (id', classes, kv)) =
-    pushViaConstructor lua "Attr" id' classes kv
-  peek lua idx = fmap LuaAttr <$> peek lua idx
-  valuetype _ = TTABLE
+instance ToLuaStack LuaAttr where
+  push (LuaAttr (id', classes, kv)) =
+    pushViaConstructor "Attr" id' classes kv
+instance FromLuaStack LuaAttr where
+  peek idx = LuaAttr <$> peek idx
diff --git a/src/Text/Pandoc/Lua/Util.hs b/src/Text/Pandoc/Lua/Util.hs
index 0a704d027..9e72b652c 100644
--- a/src/Text/Pandoc/Lua/Util.hs
+++ b/src/Text/Pandoc/Lua/Util.hs
@@ -36,103 +36,79 @@ module Text.Pandoc.Lua.Util
   , getRawInt
   , setRawInt
   , addRawInt
-  , keyValuePairs
   , PushViaCall
   , pushViaCall
   , pushViaConstructor
   ) where
 
-import Scripting.Lua (LuaState, StackValue (..), call, getglobal2, gettable,
-                      next, pop, pushnil, rawgeti, rawseti, settable)
+import Foreign.Lua (Lua, FromLuaStack (..), ToLuaStack (..), NumArgs,
+                    StackIndex, getglobal')
+import Foreign.Lua.Api (call, gettable, pop, rawgeti, rawseti, settable)
 
 -- | Adjust the stack index, assuming that @n@ new elements have been pushed on
 -- the stack.
-adjustIndexBy :: Int -> Int -> Int
+adjustIndexBy :: StackIndex -> StackIndex -> StackIndex
 adjustIndexBy idx n =
   if idx < 0
   then idx - n
   else idx
 
 -- | Get value behind key from table at given index.
-getTable :: (StackValue a, StackValue b) => LuaState -> Int -> a -> IO (Maybe b)
-getTable lua idx key = do
-  push lua key
-  gettable lua (idx `adjustIndexBy` 1)
-  peek lua (-1) <* pop lua 1
+getTable :: (ToLuaStack a, FromLuaStack b) => StackIndex -> a -> Lua b
+getTable idx key = do
+  push key
+  gettable (idx `adjustIndexBy` 1)
+  peek (-1) <* pop 1
 
 -- | Set value for key for table at the given index
-setTable :: (StackValue a, StackValue b) => LuaState -> Int -> a -> b -> IO ()
-setTable lua idx key value = do
-  push lua key
-  push lua value
-  settable lua (idx `adjustIndexBy` 2)
+setTable :: (ToLuaStack a, ToLuaStack b) => StackIndex -> a -> b -> Lua ()
+setTable idx key value = do
+  push key
+  push value
+  settable (idx `adjustIndexBy` 2)
 
 -- | Add a key-value pair to the table at the top of the stack
-addValue :: (StackValue a, StackValue b) => LuaState -> a -> b -> IO ()
-addValue lua = setTable lua (-1)
+addValue :: (ToLuaStack a, ToLuaStack b) => a -> b -> Lua ()
+addValue = setTable (-1)
 
 -- | Get value behind key from table at given index.
-getRawInt :: StackValue a => LuaState -> Int -> Int -> IO (Maybe a)
-getRawInt lua idx key =
-  rawgeti lua idx key
-  *> peek lua (-1)
-  <* pop lua 1
+getRawInt :: FromLuaStack a => StackIndex -> Int -> Lua a
+getRawInt idx key =
+  rawgeti idx key
+  *> peek (-1)
+  <* pop 1
 
 -- | Set numeric key/value in table at the given index
-setRawInt :: StackValue a => LuaState -> Int -> Int -> a -> IO ()
-setRawInt lua idx key value = do
-  push lua value
-  rawseti lua (idx `adjustIndexBy` 1) key
+setRawInt :: ToLuaStack a => StackIndex -> Int -> a -> Lua ()
+setRawInt idx key value = do
+  push value
+  rawseti (idx `adjustIndexBy` 1) key
 
 -- | Set numeric key/value in table at the top of the stack.
-addRawInt :: StackValue a => LuaState -> Int -> a -> IO ()
-addRawInt lua = setRawInt lua (-1)
-
--- | Try reading the table under the given index as a list of key-value pairs.
-keyValuePairs :: (StackValue a, StackValue b)
-              => LuaState -> Int -> IO (Maybe [(a, b)])
-keyValuePairs lua idx = do
-  pushnil lua
-  sequence <$> remainingPairs
- where
-  remainingPairs = do
-    res <- nextPair
-    case res of
-      Nothing -> return []
-      Just a  -> (a:) <$> remainingPairs
-  nextPair :: (StackValue a, StackValue b) => IO (Maybe (Maybe (a,b)))
-  nextPair = do
-    hasNext <- next lua (idx `adjustIndexBy` 1)
-    if hasNext
-      then do
-        val <- peek lua (-1)
-        key <- peek lua (-2)
-        pop lua 1 -- removes the value, keeps the key
-        return $ Just <$> ((,) <$> key <*> val)
-      else do
-        return Nothing
+addRawInt :: ToLuaStack a => Int -> a -> Lua ()
+addRawInt = setRawInt (-1)
 
 -- | Helper class for pushing a single value to the stack via a lua function.
 -- See @pushViaCall@.
 class PushViaCall a where
-  pushViaCall' :: LuaState -> String -> IO () -> Int -> a
+  pushViaCall' :: String -> Lua () -> NumArgs -> a
 
-instance PushViaCall (IO ()) where
-  pushViaCall' lua fn pushArgs num = do
-    getglobal2 lua fn
+instance PushViaCall (Lua ()) where
+  pushViaCall' fn pushArgs num = do
+    getglobal' fn
     pushArgs
-    call lua num 1
+    call num 1
 
-instance (StackValue a, PushViaCall b) => PushViaCall (a -> b) where
-  pushViaCall' lua fn pushArgs num x =
-    pushViaCall' lua fn (pushArgs *> push lua x) (num + 1)
+instance (ToLuaStack a, PushViaCall b) => PushViaCall (a -> b) where
+  pushViaCall' fn pushArgs num x =
+    pushViaCall' fn (pushArgs *> push x) (num + 1)
 
 -- | Push an value to the stack via a lua function. The lua function is called
 -- with all arguments that are passed to this function and is expected to return
 -- a single value.
-pushViaCall :: PushViaCall a => LuaState -> String -> a
-pushViaCall lua fn = pushViaCall' lua fn (return ()) 0
+pushViaCall :: PushViaCall a => String -> a
+pushViaCall fn = pushViaCall' fn (return ()) 0
 
 -- | Call a pandoc element constructor within lua, passing all given arguments.
-pushViaConstructor :: PushViaCall a => LuaState -> String -> a
-pushViaConstructor lua pandocFn = pushViaCall lua ("pandoc." ++ pandocFn)
+pushViaConstructor :: PushViaCall a => String -> a
+pushViaConstructor pandocFn = pushViaCall ("pandoc." ++ pandocFn)
author	Albert Krewinkel <albert@zeitkraut.de>	2017-08-13 12:37:10 +0200
committer	Albert Krewinkel <albert@zeitkraut.de>	2017-08-13 14:23:54 +0200
commit	2dc3dbd68b557cbd8974b9daf84df3d26ab5f843 (patch)
tree	acd1e83277f97cddd2e2717da6cb8243c3e4f57e /src/Text/Pandoc/Lua
parent	418bda81282c82325c5a296a3c486fdc5ab1dfe0 (diff)
download	pandoc-2dc3dbd68b557cbd8974b9daf84df3d26ab5f843.tar.gz