Module:ConvertNumeric/sandbox - Revision history

Lemondoge: arg

2023-04-27T18:42:40Z

arg

← Previous revision		Revision as of 18:42, 27 April 2023
Line 567:		Line 567:
	end		end
	local negative = num:find("^%-")		local negative = num:find("^%-")
	local decimal_places = num:~~match~~("^%-?%d*%.(%d+)$")		local decimal_places, subs = num:gsub("^%-?%d*%.(%d+)$", "%1")
			if subs == 0 then decimal_places = nil end
⚫	~~local~~ ~~num~~ = ~~num:match("^%-?(%d)%.?%d$")~~ or error("Invalid decimal numeral")
			num, subs = num:gsub("^%-?(%d)%.?%d$", "%1")
	if num == '' and decimal_places then num = '0' end		if num == '' and decimal_places then num = '0' end
		⚫	if subs == 0 or num == '' then error("Invalid decimal numeral") end

	-- For each group of 3 digits except the last one, print with appropriate group name (e.g. million)		-- For each group of 3 digits except the last one, print with appropriate group name (e.g. million)

2023-04-27T18:39:54Z

oop

← Previous revision		Revision as of 18:39, 27 April 2023
Line 568:		Line 568:
	local negative = num:find("^%-")		local negative = num:find("^%-")
	local decimal_places = num:match("^%-?%d*%.(%d+)$")		local decimal_places = num:match("^%-?%d*%.(%d+)$")
	~~num,~~ ~~subs~~ = num:~~gsub~~("^%-?(%d)%.?%d$", "%1")		local num = num:match("^%-?(%d)%.?%d$") or error("Invalid decimal numeral")
	if num == '' and decimal_places then num = '0' end		if num == '' and decimal_places then num = '0' end
	if subs == 0 or num == '' then error("Invalid decimal numeral") end

	-- For each group of 3 digits except the last one, print with appropriate group name (e.g. million)		-- For each group of 3 digits except the last one, print with appropriate group name (e.g. million)

2023-04-27T18:37:17Z

simplify (use match instead of gsub in instance where the result is set to nil if gsub never matched)

← Previous revision		Revision as of 18:37, 27 April 2023
Line 567:		Line 567:
	end		end
	local negative = num:find("^%-")		local negative = num:find("^%-")
	local decimal_places~~, subs~~ = num:~~gsub~~("^%-?%d*%.(%d+)$~~", "%1~~")		local decimal_places = num:match("^%-?%d*%.(%d+)$")
	if subs == 0 then decimal_places = nil end
	num, subs = num:gsub("^%-?(%d)%.?%d$", "%1")		num, subs = num:gsub("^%-?(%d)%.?%d$", "%1")
	if num == '' and decimal_places then num = '0' end		if num == '' and decimal_places then num = '0' end

2023-04-02T19:05:06Z

Simplified code to increase readability

← Previous revision		Revision as of 19:05, 2 April 2023
Line 346:		Line 346:
	local mantissa = num:gsub("^%-?(%d)%.?(%d)%-?[Ee][+%-]?%d+$", "%1%2")		local mantissa = num:gsub("^%-?(%d)%.?(%d)%-?[Ee][+%-]?%d+$", "%1%2")
	if negative and decimal_pos then decimal_pos = decimal_pos - 1 end		if negative and decimal_pos then decimal_pos = decimal_pos - 1 end
	~~if not~~ decimal_pos ~~then~~ decimal_pos = #mantissa + 1 ~~end~~		decimal_pos = decimal_pos or #mantissa + 1

	-- Remove leading zeros unless decimal point is in first position		-- Remove leading zeros unless decimal point is in first position
Line 498:		Line 498:
	else		else
	numstr = numeral_to_english_less_100(numerator)		numstr = numeral_to_english_less_100(numerator)
	denstr = dendata.plural		denstr = dendata.plural or (sp_us and dendata.us or dendata[1]) .. 's'
	if not denstr then
	denstr = (sp_us and dendata.us or dendata[1]) .. 's'
	end
	end		end
	if finished then		if finished then

2023-02-08T20:37:33Z

sync from active

← Previous revision		Revision as of 20:37, 8 February 2023
Line 3:		Line 3:
	-- When editing, preview with: [[Module_talk:ConvertNumeric/testcases]]		-- When editing, preview with: [[Module_talk:ConvertNumeric/testcases]]
	-- First, edit [[Module:ConvertNumeric/sandbox]], then preview with [[Module_talk:ConvertNumeric/sandbox/testcases]]		-- First, edit [[Module:ConvertNumeric/sandbox]], then preview with [[Module_talk:ConvertNumeric/sandbox/testcases]]
			require[[strict]]

	local ones_position = {		local ones_position = {

2023-02-07T22:56:21Z

better parsing in all cases

← Previous revision		Revision as of 22:56, 7 February 2023
Line 626:		Line 626:

	local function _numeral_to_english2(args)		local function _numeral_to_english2(args)
	local num = args.num		local num = tostring(args.num)

			num = num:gsub("^%s(.-)%s$", "%1") -- Trim whitespace
	if (not tonumber(num)) then
	num = num:gsub("~~^%s(.-)%s$~~", "%1") -- ~~Trim~~ ~~whitespace~~		num = num:gsub(",", "") -- Remove commas
	num = num:gsub(",", "") -- ~~Remove~~ ~~commas~~		num = num:gsub("^<span[^<>]*></span>", "") -- Generated by Template:age
		⚫	if num ~= '' then -- a fraction may have an empty whole number
	num = num:gsub("^<span[^<>]*></span>", "") -- Generated by Template:age
		⚫	if not num:find("^%-?%d%.?%d%-?[Ee]?[+%-]?%d*$") then
⚫	if num ~= '' then -- a fraction may have an empty whole number
			-- Input not in a valid format, try to eval it as an expr to see
⚫	if not num:find("^%-?%d%.?%d%-?[Ee]?[+%-]?%d*$") then
	-- ~~Input~~ ~~not~~ in a ~~valid~~ ~~format,~~ ~~try~~ to ~~eval~~ it as ~~an expr to see~~		-- if that produces a number (e.g. "3 + 5" will become "8").
		⚫	local noerr, result = pcall(mw.ext.ParserFunctions.expr, num)
	-- if that produces a number (e.g. "3 + 5" will become "8").
			if noerr then
⚫	local noerr, result = pcall(mw.ext.ParserFunctions.expr, num)
	if ~~noerr~~ ~~then~~		num = result
	num = result
	end
	end		end
	end		end

2023-02-07T22:50:51Z

merge

@@ Line 644: / Line 644: @@
 	end
 	return _numeral_to_english(
 		num,
@@ Line 684: / Line 684: @@
 function p.numeral_to_english(frame)
 	local args = frame.args
 end

2023-02-07T22:43:44Z

avoid throwing errors while attempting to evaluate as an expression

← Previous revision		Revision as of 22:43, 7 February 2023
Line 636:		Line 636:
	-- Input not in a valid format, try to eval it as an expr to see		-- Input not in a valid format, try to eval it as an expr to see
	-- if that produces a number (e.g. "3 + 5" will become "8").		-- if that produces a number (e.g. "3 + 5" will become "8").
	~~num~~ = mw.ext.ParserFunctions.expr(num)		local noerr, result = pcall(mw.ext.ParserFunctions.expr, num)
			if noerr then
			num = result
			end
	end		end
	end		end
Line 689:		Line 692:
	-- Input not in a valid format, try to eval it as an expr to see		-- Input not in a valid format, try to eval it as an expr to see
	-- if that produces a number (e.g. "3 + 5" will become "8").		-- if that produces a number (e.g. "3 + 5" will become "8").
	~~num~~ = mw.ext.ParserFunctions.expr(num)		local noerr, result = pcall(mw.ext.ParserFunctions.expr, num)
			if noerr then
			num = result
			end
	end		end
	end		end

2023-02-07T22:09:09Z

revert

@@ Line 641: / Line 641: @@
 	end
 	return _numeral_to_english(
 		num,
@@ Line 681: / Line 681: @@
 function p.numeral_to_english(frame)
 	local args = frame.args
 end

2023-02-07T21:57:40Z

improve comments

← Previous revision		Revision as of 21:57, 7 February 2023
Line 641:		Line 641:
	end		end

			-- Call helper function passing args
	-- Pass args from frame to helper function
	return _numeral_to_english(		return _numeral_to_english(
	num,		num,
Line 681:		Line 681:
	function p.numeral_to_english(frame)		function p.numeral_to_english(frame)
	local args = frame.args		local args = frame.args
	-- ~~Pass~~ ~~args from frame~~ to helper function		-- Tail call to helper function passing args from frame
	return _numeral_to_english2{		return _numeral_to_english2{
	['num'] = args[1],		['num'] = args[1],
Line 696:		Line 696:
	['zero'] = args['zero'],		['zero'] = args['zero'],
	['use_one'] = args['one'] == 'one' -- experiment: using '\|one=one' makes fraction 2+1/2 give "two and one-half" instead of "two and a half"		['use_one'] = args['one'] == 'one' -- experiment: using '\|one=one' makes fraction 2+1/2 give "two and one-half" instead of "two and a half"
			}
	} -- tail call
	end		end