summaryrefslogtreecommitdiff
path: root/Data/Libraries/LDoc/tests/merge
diff options
context:
space:
mode:
Diffstat (limited to 'Data/Libraries/LDoc/tests/merge')
-rw-r--r--Data/Libraries/LDoc/tests/merge/config.ld2
-rw-r--r--Data/Libraries/LDoc/tests/merge/merge1.lua7
-rw-r--r--Data/Libraries/LDoc/tests/merge/merge2.lua19
3 files changed, 28 insertions, 0 deletions
diff --git a/Data/Libraries/LDoc/tests/merge/config.ld b/Data/Libraries/LDoc/tests/merge/config.ld
new file mode 100644
index 0000000..f08e90c
--- /dev/null
+++ b/Data/Libraries/LDoc/tests/merge/config.ld
@@ -0,0 +1,2 @@
+merge=true
+file={'merge1.lua','merge2.lua'}
diff --git a/Data/Libraries/LDoc/tests/merge/merge1.lua b/Data/Libraries/LDoc/tests/merge/merge1.lua
new file mode 100644
index 0000000..3bdbc36
--- /dev/null
+++ b/Data/Libraries/LDoc/tests/merge/merge1.lua
@@ -0,0 +1,7 @@
+----
+-- main module
+-- @module merge
+
+---- first fun
+function one()
+end
diff --git a/Data/Libraries/LDoc/tests/merge/merge2.lua b/Data/Libraries/LDoc/tests/merge/merge2.lua
new file mode 100644
index 0000000..02bc63c
--- /dev/null
+++ b/Data/Libraries/LDoc/tests/merge/merge2.lua
@@ -0,0 +1,19 @@
+----
+-- submodule
+-- @module merge
+
+---- second fun
+-- @param x
+function two(x)
+end
+
+--- extra stuff
+-- @section extra
+
+--- third fun
+function three ()
+end
+
+--- fourth fun
+function four ()
+end