Commit 55bbeed4f44dbe622dbe48eb0842474b81507058 - lua-ldoc

added module merging - see tests/merge directory (--merge flag) steve donovan 11 years ago

6 changed file(s) with 41 addition(s) and 1 deletion(s). Raw diff Collapse all Expand all

-0

ldoc/doc.lua less more

214	214	if item.type == 'module' then
215	215	-- if name is 'package.mod', then mod_name is 'mod'
216	216	package,mname = split_dotted_name(this_mod.name)
	217	if self.args.merge then
	218	local mod,mf = find_module_in_files(item.name)
	219	if mod then
	220	print('found master module',mf)
	221	this_mod = mod
	222	submodule = true
	223	end
	224	end
217	225	elseif item.type == 'submodule' then
218	226	local mf
219	227	submodule = true

-0

ldoc/parse.lua less more

148	148	local F = File(fname)
149	149	local module_found, first_comment = false,true
150	150	local current_item, module_item
	151
	152	F.args = args
151	153
152	154	F.base = package
153	155

-1

ldoc.lua less more

54	54	-D,--define (default none) set a flag to be used in config.ld
55	55	-C,--colon use colon style
56	56	-B,--boilerplate ignore first comment in source files
	57	-M,--merge allow module merging
57	58	--dump debug output dump
58	59	--filter (default none) filter output as Lua data (e.g pl.pretty.dump)
59	60	--tags (default none) show all references to given tags, comma-separated

180	181	'alias','add_language_extension','new_type','add_section', 'tparam_alias',
181	182	'file','project','title','package','format','output','dir','ext', 'topics',
182	183	'one','style','template','description','examples',
183		'readme','all','manual_url', 'ignore', 'colon','boilerplate',
	184	'readme','all','manual_url', 'ignore', 'colon','boilerplate','merge',
184	185	'no_return_or_parms','no_summary','full_description','backtick_references', 'custom_see_handler',
185	186	}
186	187	ldoc_contents = tablex.makeset(ldoc_contents)

347	348	setup_package_base()
348	349
349	350	override 'colon'
	351	override 'merge'
350	352
351	353	if type(args.file) == 'table' then
352	354	-- this can only be set from config file so we can assume it's already read

-0

tests/merge/config.ld less more

	0	merge=true
	1	file={'merge1.lua','merge2.lua'}

-0

tests/merge/merge1.lua less more

+19

-0

tests/merge/merge2.lua less more