Move concat to constructor functions

Author: tarleb

README.md

@@ -67,20 +67,6 @@ Parameters:
 `colwidth`
 :   Maximum number of characters per line
 
-#### concat
-
-`concat (docs[, sep])`
-
-Concatenate the given `Doc`s, interspersing `sep` if specified.
-
-Parameters:
-
-`docs`
-:   List of `Doc`s
-
-`sep`
-:   Separator `Doc`
-
 ### Doc construction
 
 All functions return a fresh `Doc` element.
@@ -148,6 +134,20 @@ Parameters:
 
 Chomps trailing blank space off of a `Doc`.
 
+#### concat
+
+`concat (docs[, sep])`
+
+Concatenate the given `Doc`s, interspersing `sep` if specified.
+
+Parameters:
+
+`docs`
+:   List of `Doc`s
+
+`sep`
+:   Separator `Doc`
+
 #### cr
 
 A carriage return. Does nothing if we're at the beginning of a

src/Foreign/Lua/Module/DocLayout.hs

@@ -29,6 +29,7 @@ module Foreign.Lua.Module.DocLayout (
   , brackets
   , cblock
   , chomp
+  , concat
   , cr
   , double_quotes
   , empty
@@ -49,7 +50,6 @@ module Foreign.Lua.Module.DocLayout (
 
   -- * Functions
   , render
-  , concat
 
   -- * Marshaling
   , peekDoc
@@ -94,6 +94,7 @@ pushModule = do
   Lua.addfunction "brackets"   brackets
   Lua.addfunction "cblock"     cblock
   Lua.addfunction "chomp"      chomp
+  Lua.addfunction "concat"     concat
   Lua.addfunction "double_quotes" double_quotes
   Lua.addfunction "flush"      flush
   Lua.addfunction "hang"       hang
@@ -108,8 +109,7 @@ pushModule = do
   Lua.addfunction "prefixed"   prefixed
   Lua.addfunction "rblock"     rblock
   Lua.addfunction "vfill"      vfill
-  -- renderign
-  Lua.addfunction "concat" concat
+  -- rendering
   Lua.addfunction "render" render
   return 1
 
@@ -124,13 +124,6 @@ preloadModule = flip Lua.preloadhs pushModule
 render :: Doc Text -> Optional Int -> Lua Text
 render doc optLength = return $ Doc.render (Lua.fromOptional optLength) doc
 
--- | Concatenates a list of @'Doc'@s.
-concat :: [Doc Text] -> Optional (Doc Text) -> Lua (Doc Text)
-concat docs optSep = return $
-  case Lua.fromOptional optSep of
-    Nothing  -> mconcat docs
-    Just sep -> mconcat $ intersperse sep docs
-
 --
 -- Constructors
 --
@@ -169,6 +162,13 @@ cblock width = return . Doc.cblock width
 chomp :: Doc Text -> Lua (Doc Text)
 chomp = return . Doc.chomp
 
+-- | Concatenates a list of @'Doc'@s.
+concat :: [Doc Text] -> Optional (Doc Text) -> Lua (Doc Text)
+concat docs optSep = return $
+  case Lua.fromOptional optSep of
+    Nothing  -> mconcat docs
+    Just sep -> mconcat $ intersperse sep docs
+
 -- | A carriage return. Does nothing if we're at the beginning of
 -- a line; otherwise inserts a newline.
 cr :: Doc Text

test/test-doclayout.lua

@@ -23,14 +23,6 @@ return {
     test('space', function ()
       assert.are_equal(type(doclayout.space), 'userdata')
     end),
-  },
-
-  group 'functions' {
-    group 'render' {
-      test('empty doc', function ()
-        assert.are_equal(doclayout.render(doclayout.empty), '')
-      end)
-    },
 
     group 'concat' {
       test('without sep', function ()
@@ -55,6 +47,12 @@ return {
     }
   },
 
+  group 'render' {
+    test('empty doc', function ()
+      assert.are_equal(doclayout.render(doclayout.empty), '')
+    end)
+  },
+
   group 'Doc type' {
     test('empty strings equal the empty Doc', function ()
       assert.are_equal(doclayout.empty .. '', doclayout.empty)