Module:Template input parse: Difference between revisions

← Older edit Newer edit →

@@ Line 73: / Line 73: @@
 -- Helper function
 -- Parses a list of numeric pairs
--- Delimiter between each pair must be a semicolon
+-- Delimiter between each entry can be anything; default is semicolon; this
+-- allows for entry of subgroup entries
 -- Delimiter between the pair's two values can be anything; default is slash
 -- as the intended use is parsing ratios a/b, so input must be formatted as such
 -- "a/b; c/d; e/f"
-function p.parse_numeric_pairs(unparsed, delimiter)
+function p.parse_numeric_pairs(unparsed, delimiter1, delimiter2)
-	local delimiter = delimiter or "/"
+	local delimiter1 = delimiter1 or ";"
+	local delimiter2 = delimiter2 or "/"
 	-- Split the string of unparsed pairs
-	local parsed = p.parse_entries(unparsed)
+	local parsed = p.parse_entries(unparsed, delimiter1)
+	-- Then tokenize the tokens into numeric pairs
+	local pairs_ = {}
+	for i = 1, #parsed do
+		local pair = p.parse_numeric_pair(parsed[i], delimiter2)
+		if pair ~= nil and #pair == 2 then
+			table.insert(pairs_, pair)
+		end
+	end
+	return pairs_
+end
+-- Helper function
+-- A less strict version of parse-numeric-pairs that parses singular values
+-- as a ratio with denominator 1.
+function p.parse_numeric_pair_fuzzy(unparsed, delimiter)
+	local parsed = {}
+	local delimiter = delimiter or ':'
+	local expr = '([^' .. delimiter .. ']+)'
+	for entry in string.gmatch(unparsed, expr) do
+		local trimmed = entry:gsub("^%s*(.-)%s*$", "%1")
+		local numeric = tonumber(trimmed)
+		table.insert(parsed, numeric)		-- Add to array
+	end
+	if #parsed == 2 then
+		return parsed
+	elseif #parsed == 1 then
+		return { parsed[1], 1 }
+	else
+		return nil
+	end
+end
+-- Helper function
+-- Parses a list of numeric pairs, where if values are not ratios, they're
+-- interpreted as ratios with denominator 1.
+function p.parse_numeric_pairs_fuzzy(unparsed, delimiter1, delimiter2)
+	local delimiter1 = delimiter1 or ";"
+	local delimiter2 = delimiter2 or "/"
+	-- Split the string of unparsed pairs
+	local parsed = p.parse_entries(unparsed, delimiter1)
 	-- Then tokenize the tokens into numeric pairs
 	local pairs_ = {}
 	for i = 1, #parsed do
-		local pair = p.parse_numeric_pair(parsed[i], delimiter)
+		local pair = p.parse_numeric_pair_fuzzy(parsed[i], delimiter2)
 		if pair ~= nil and #pair == 2 then
 			table.insert(pairs_, pair)
@@ Line 109: / Line 151: @@
 	end
 	return pairs_
+end
+function p.tester()
+	return p.parse_numeric_pairs_fuzzy("2.5.7/6.11/6", ".", "/")
 end
 return p