Aire-One
/
LDoc2tl
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

issue #178 Allow class merging

This commit is contained in:
steve donovan 2014-09-28 18:54:17 +02:00
parent 049945ce3d
commit c34957cd16
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ldoc/doc.lua
View File

@ -238,7 +238,7 @@ function File:finish()
elseif doc.project_level(item.type) then elseif doc.project_level(item.type) then
this_mod = item this_mod = item
local package,mname,submodule local package,mname,submodule
if item.type == 'module' then if item.type == 'module' or item.type == 'classmod' then
-- if name is 'package.mod', then mod_name is 'mod' -- if name is 'package.mod', then mod_name is 'mod'
package,mname = split_dotted_name(this_mod.name) package,mname = split_dotted_name(this_mod.name)
if self.args.merge then if self.args.merge then

3
tests/styles/four.lua
View File

@ -31,12 +31,13 @@ end
--- third useless function. --- third useless function.
-- Can always put comments inline, may -- Can always put comments inline, may
-- be multiple. -- be multiple.
-- note that first comment is refers to return -- note that first comment refers to return type!
function three ( -- person: function three ( -- person:
name, -- string: person's name name, -- string: person's name
age -- int: age -- int:
-- not less than zero! -- not less than zero!
) )
end
---- function with single optional arg ---- function with single optional arg
-- @param[opt] one -- @param[opt] one