Module:Template input parse - Revision history

Ganaram inukshuk: testing...?

2024-10-24T02:35:26Z

testing...?

← Older revision		Revision as of 02:35, 24 October 2024
Line 120:		Line 120:

	function p.tester()		function p.tester()
	~~return p.parse_numeric_pairs(~~"~~2.5.7~~/~~6.11~~/~~6.aesrdnt.17~~/12", ".", "/", ~~true~~)		local parse_me = "15625/15552; 325/324, 625/624"

			local parsed_me = p.parse_entries(parse_me, ";")
			local parsed_me_2 = {}
			for i = 1, #parsed_me do
			local parsed = p.parse_numeric_pairs(parsed_me[i], ",", false)
			table.insert(parsed_me_2, parsed)
			end
			return parsed_me_2
	end		end

	return p		return p

ArrowHead294 at 13:33, 24 September 2024

2024-09-24T13:33:22Z

← Older revision		Revision as of 13:33, 24 September 2024
Line 8:		Line 8:
	function p.parse_entries(unparsed, delimiter)		function p.parse_entries(unparsed, delimiter)
	local parsed = {}		local parsed = {}
	local delimiter = delimiter or ';'		local delimiter = delimiter or ";"
	local expr = '([^' .. delimiter .. ']+)'		local expr = "([^" .. delimiter .. "]+)"
	for entry in string.gmatch(unparsed, expr) do		for entry in string.gmatch(unparsed, expr) do
	local trimmed = entry:gsub("^%s(.-)%s$", "%1")		local trimmed = entry:gsub("^%s(.-)%s$", "%1")
Line 23:		Line 23:
	function p.parse_numeric_entries(unparsed, delimiter)		function p.parse_numeric_entries(unparsed, delimiter)
	local parsed = {}		local parsed = {}
	local delimiter = delimiter or ';'		local delimiter = delimiter or ";"
	local expr = '([^' .. delimiter .. ']+)'		local expr = "([^" .. delimiter .. "]+)"
	for entry in string.gmatch(unparsed, expr) do		for entry in string.gmatch(unparsed, expr) do
	local trimmed = entry:gsub("^%s(.-)%s$", "%1")		local trimmed = entry:gsub("^%s(.-)%s$", "%1")
Line 37:		Line 37:
	function p.parse_pair(unparsed, delimiter)		function p.parse_pair(unparsed, delimiter)
	local parsed = {}		local parsed = {}
	local delimiter = delimiter or ':'		local delimiter = delimiter or ":"
	local expr = '([^' .. delimiter .. ']+)'		local expr = "([^" .. delimiter .. "]+)"
	for entry in string.gmatch(unparsed, expr) do		for entry in string.gmatch(unparsed, expr) do
	local trimmed = entry:gsub("^%s(.-)%s$", "%1")		local trimmed = entry:gsub("^%s(.-)%s$", "%1")
Line 56:		Line 56:
	function p.parse_numeric_pair(unparsed, delimiter, is_fuzzy)		function p.parse_numeric_pair(unparsed, delimiter, is_fuzzy)
	local parsed = {}		local parsed = {}
	local delimiter = delimiter or ':'		local delimiter = delimiter or ":"
	local is_fuzzy = is_fuzzy or false		local is_fuzzy = is_fuzzy or false
	local expr = '([^' .. delimiter .. ']+)'		local expr = "([^" .. delimiter .. "]+)"
	for entry in string.gmatch(unparsed, expr) do		for entry in string.gmatch(unparsed, expr) do
	local trimmed = entry:gsub("^%s(.-)%s$", "%1")		local trimmed = entry:gsub("^%s(.-)%s$", "%1")

Ganaram inukshuk: Merged fuzzy-ratio-parsing back into original function, so it's enabled by passing TRUE for the last arg

2024-09-24T04:49:09Z

Merged fuzzy-ratio-parsing back into original function, so it's enabled by passing TRUE for the last arg

@@ Line 52: / Line 52: @@
 -- Helper function
 -- Parses a pair of numeric values
-function p.parse_numeric_pair(unparsed, delimiter)
+-- Passing in TRUE for is_fuzzy allows singular values to be parsed as ratios
 	local parsed = {}
 	local delimiter = delimiter or ':'
 	local expr = '([^' .. delimiter .. ']+)'
 	for entry in string.gmatch(unparsed, expr) do
@@ Line 63: / Line 66: @@
 	if #parsed == 2 then
 		return parsed
 	else
 		return nil
@@ Line 75: / Line 80: @@
 -- 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, delimiter1, delimiter2)
+-- Passing in TRUE for is_fuzzy allows singular values to be parsed as ratios
 	local delimiter1 = delimiter1 or ";"
 	local delimiter2 = delimiter2 or "/"
 	-- Split the string of unparsed pairs
 	local parsed = p.parse_entries(unparsed, delimiter1)
@@ Line 83: / Line 91: @@
 	local pairs_ = {}
 	for i = 1, #parsed do
-		local pair = p.parse_numeric_pair(parsed[i], delimiter2)
+		local pair = p.parse_numeric_pair(parsed[i], delimiter2, is_fuzzy)
 		if pair ~= nil and #pair == 2 then
 			table.insert(pairs_, pair)
@@ Line 150: / Line 118: @@
 end
 function p.tester()
+	return p.parse_numeric_pairs("2.5.7/6.11/6.aesrdnt.17/12", ".", "/", true)
 end
 return p

Ganaram inukshuk: Cleared todo: since tip's purpose is to parse template input, the absence of input should just be an empty table, not nil

2024-09-24T01:22:12Z

Cleared todo: since tip's purpose is to parse template input, the absence of input should just be an empty table, not nil

← Older revision		Revision as of 01:22, 24 September 2024
Line 2:		Line 2:

	-- Helper module for various modules that require entry of multiple labels/values		-- Helper module for various modules that require entry of multiple labels/values

	~~-- TODO:~~
	~~-- Functions that return size-0 arrays should return nil instead.~~

	-- Helper function		-- Helper function

Ganaram inukshuk: Added fuzzy option for parsing a string of ratios (entries that are a single value are interpreted as a ratio with denominator 1); changed parse-numeric-pairs functions to have options to change both delimiters (between entries and within entries)

2024-09-24T01:19:37Z

Added fuzzy option for parsing a string of ratios (entries that are a single value are interpreted as a ratio with denominator 1); changed parse-numeric-pairs functions to have options to change both delimiters (between entries and within entries)

@@ 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
 -- 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 ";"
 	-- 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], 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
 return p

Ganaram inukshuk at 10:51, 31 August 2024

2024-08-31T10:51:01Z

← Older revision		Revision as of 10:51, 31 August 2024
Line 89:		Line 89:
	end		end
	end		end
			return pairs_
	end		end

Line 107:		Line 108:
	end		end
	end		end
			return pairs_
	end		end

	return p		return p

Ganaram inukshuk: Abandoned code that would return nil if the resulting tables were size zero

2024-08-31T10:46:57Z

Abandoned code that would return nil if the resulting tables were size zero

← Older revision		Revision as of 10:46, 31 August 2024
Line 88:		Line 88:
	table.insert(pairs_, pair)		table.insert(pairs_, pair)
	end		end
	~~end~~
	~~if #pairs_ == 0 then~~
	~~return nil~~
	~~else~~
	~~return pairs_~~
	end		end
	end		end
Line 104:		Line 99:
	-- Then tokenize the tokens into key-value pairs		-- Then tokenize the tokens into key-value pairs
	local pairs_ = {}		local pairs_ = {}
	local num_pairs = 0		--local num_pairs = 0
	for i = 1, #parsed do		for i = 1, #parsed do
	local pair = p.parse_pair(parsed[i])		local pair = p.parse_pair(parsed[i])
	if pair ~= nil and #pair == 2 then		if pair ~= nil and #pair == 2 then
	pairs_[pair[1]] = pair[2]		pairs_[pair[1]] = pair[2]
	num_pairs = num_pairs + 1		--num_pairs = num_pairs + 1
	end		end
	~~end~~

	~~if num_pairs == 0 then~~
	~~return nil~~
	~~else~~
	~~return pairs_~~
	end		end
	end		end

	return p		return p

Ganaram inukshuk: Bugfix with parsing kv-pairs

2024-08-31T10:31:45Z

Bugfix with parsing kv-pairs

← Older revision		Revision as of 10:31, 31 August 2024
Line 104:		Line 104:
	-- Then tokenize the tokens into key-value pairs		-- Then tokenize the tokens into key-value pairs
	local pairs_ = {}		local pairs_ = {}
			local num_pairs = 0
	for i = 1, #parsed do		for i = 1, #parsed do
	local pair = p.parse_pair(parsed[i])		local pair = p.parse_pair(parsed[i])
	if pair ~= nil and #pair == 2 then		if pair ~= nil and #pair == 2 then
	pairs_[pair[1]] = pair[2]		pairs_[pair[1]] = pair[2]
			num_pairs = num_pairs + 1
	end		end
	end		end
	if ~~#pairs_~~ == 0 then
			if num_pairs == 0 then
	return nil		return nil
	else		else

Ganaram inukshuk: kv pairs returns nil if the string was empty

2024-08-31T10:08:43Z

kv pairs returns nil if the string was empty

← Older revision		Revision as of 10:08, 31 August 2024
Line 110:		Line 110:
	end		end
	end		end
	return pairs_		if #pairs_ == 0 then
			return nil
			else
			return pairs_
			end
	end		end

	return p		return p

Ganaram inukshuk: Empty table of numeric pairs returns nil instead; to be rolled out for other functions

2024-08-22T19:06:05Z

Empty table of numeric pairs returns nil instead; to be rolled out for other functions

← Older revision		Revision as of 19:06, 22 August 2024
Line 2:		Line 2:

	-- Helper module for various modules that require entry of multiple labels/values		-- Helper module for various modules that require entry of multiple labels/values

			-- TODO:
			-- Functions that return size-0 arrays should return nil instead.

	-- Helper function		-- Helper function
Line 86:		Line 89:
	end		end
	end		end
	return pairs_		if #pairs_ == 0 then
			return nil
			else
			return pairs_
			end
	end		end