Module:pollasena-roots: Difference between revisions

← Older edit

@@ Line 14: / Line 14: @@
 local export = {}
+local function lang_from_code(...)
+	return m_lang.getByCode(...)
+end
 local function ncategories(categories)
@@ Line 111: / Line 115: @@
 end
-local function parse_args(parent_args, dest_code, ancestor_codes)
+local function get_single_args(args, index)
+	local single = {}
+	for k, v in pairs(args) do
+		if type(v) == "table" and v.maxindex then
+			if v[index] ~= nil then
+				single[k] = v[index]
+			end
+		else
+			single[k] = v
+		end
+	end
+	return single
+end
+local function parse_args(parent_args, dest_code, ancestor_codes, extra_params)
 	local param_mods = m_param_utils.construct_param_mods({{group = {"link", "q", "l"}}})
+	local params = extra_params or {}
+	params.nocap = {type = "boolean"}
+	params.nocat = {type = "boolean"}
+	local termarg_index = 1
+	for _, ancestor in ipairs(ancestor_codes) do
+		local lang_options = ancestor.options or {}
+		if lang_options.roots then
+			params[termarg_index] = {
+				required = not lang_options.optional,
+				list = true,
+				allow_holes = true,
+			}
+		else
+			params[termarg_index] = {
+				required = not lang_options.optional,
+			}
+		end
+		termarg_index = termarg_index + 1
+	end
+	m_param_utils.augment_params_with_modifiers(params, param_mods)
+	local args = m_param.process(parent_args, params)
 	local dest_lang = m_lang.getByCode(dest_code)
 	local etymologies = {}
-	-- iterate in stable order
+	termarg_index = 1
 	for _, ancestor in ipairs(ancestor_codes) do
 		local code = ancestor.code
 		local lang_options = ancestor.options or {}
 		local ancestor_lang = m_lang.getByCode(code)
-		local ancestor_params = {
+		local terms
-			[1] = {
+		local separator = ""
-				required = not lang_options.optional,
-				list = lang_options.roots,
-				default = lang_options.default,
-			},
-		}
 		if lang_options.roots then
-			ancestor_params[1].allow_holes = true
+			local items = m_param_utils.parse_list_with_inline_modifiers_and_separate_params({
-		end
+				processed_args = args,
+				param_mods = param_mods,
+				termarg = termarg_index,
+				lang = ancestor_lang,
+			})
+			terms = {}
+			local root_index = 1
+			for _, item in ipairs(items) do
+				if item.term == "-" or item.term == "+" then
+					separator = item.term
+				elseif item.term then
+					if root_index > 1 and separator == "-" then -- no asterisk after hyphen
+						if not item.alt then
+							item.alt = item.term:gsub("^%*", "")
+						else
+							item.alt = item.alt:gsub("^%*", "")
+						end
+						item.no_alt_ast = true
+					end
+					table.insert(terms, item)
+					root_index = root_index + 1
+				end
+			end
+		else
+			local single_args = get_single_args(args, termarg_index)
+			local parsed = m_param_utils.parse_term_with_inline_modifiers_and_separate_params({
+				processed_args = single_args,
+				param_mods = param_mods,
+				termarg = termarg_index,
+				lang = ancestor_lang,
+			})
-		local parsed = m_param_utils.parse_term_with_inline_modifiers_and_separate_params({
+			terms = parsed.terms or {}
-			params = ancestor_params,
+			if not terms[1] then
-			param_mods = param_mods,
+				if parsed.term then
-			raw_args = parent_args,
+					terms[1] = parsed
-			termarg = 1,
+				else
-			lang = ancestor_lang,
+					terms[1] = { lang = ancestor_lang }
-		})
+				end
+			end
-		local terms = parsed.terms
-		-- ensure at least one term exists
-		if not terms[1] then
-			terms[1] = { lang = ancestor_lang }
 		end
@@ Line 155: / Line 221: @@
 			sources = { ancestor_lang },
 			terms = terms,
-			nocat = parent_args.nocat,
+			conj = lang_options.roots and separator or nil,
+			nocat = args.nocat,
 			template_name = "derived",
 		})
 		table.insert(etymologies, etymology)
+		termarg_index = termarg_index + 1
 	end
-	return etymologies
+	return etymologies, args
 end
-local function concat_etymologies(parent_args, etymologies)
+local function concat_etymologies(args, etymologies)
+	local capital = args.nocap and "f" or "F"
-	local capital = parent_args.nocap and "f" or "F"
 	return capital .. "rom " .. table.concat(etymologies, ", from ") .. "."
 end
@@ Line 174: / Line 240: @@
 function export.qsc(frame)
 	local parent_args = frame:getParent().args
-	local dest_lang = m_lang.getByCode("qsc")
 	local ancestor_codes = {
-		{code = "sekh", options = {default = "asʰilavən"}},
+		{ code = "sekh" },
-		{code = "wasc", options = {optional = true, roots = true, default = "asł-ila"}},
+		{ code = "wasc", options = {optional = true, roots = true } }
 	}
-	local evolution = parse_args(parent_args, "qsc", ancestor_codes)
+	local evolution, args = parse_args(parent_args, "qsc", ancestor_codes)
-	return concat_etymologies(parent_args, evolution)
+	return concat_etymologies(args, evolution)
 end
 function export.lyti(frame)
 	local parent_args = frame:getParent().args
-	local source_code = parent_args.source
+	local source_code = parent_args.source or "und"
 	local ancestor_codes = {
-		{code = "lyti-mid", options = {optional = not parent_args.mid}},
+		{ code = "lyti-mid", options = {optional = not parent_args.mid} },
-		{code = "lyti-old", options = {optional = not parent_args.old}},
+		{ code = "lyti-old", options = {optional = not parent_args.old} },
-		{code = source_code, options = {}},
+		{ code = source_code, options = {} },
+	}
+	local extra_params = {
+		mid = {type = "boolean"},
+		old = {type = "boolean"},
+		source = {},
 	}
-	local etymologies = parse_args(parent_args, "lyti", ancestor_codes)
+	local evolution, args = parse_args(parent_args, "lyti", ancestor_codes, extra_params)
-	return concat_etymologies(parent_args, etymologies)
+	return concat_etymologies(args, evolution)
 end
 return export