Module:ConvertNumeric - Revision history

Johnuniq: please don't use tricky syntax: stick to boring stuff that works

2023-02-09T01:04:17Z

please don't use tricky syntax: stick to boring stuff that works

← Previous revision		Revision as of 01:04, 9 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]]		require('strict')

	local ones_position = {		local ones_position = {

Uzume: strict

2023-02-08T20:35:23Z

strict

← Previous revision		Revision as of 20:35, 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 = {

Uzume: consolidate and optimize code converting from #expr to mw.ext.ParserFunctions.expr

2023-02-07T23:00:10Z

consolidate and optimize code converting from #expr to mw.ext.ParserFunctions.expr

@@ Line 626: / Line 626: @@
 local function _numeral_to_english2(args)
-	local num = args.num
+	local num = tostring(args.num)
-		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
-				-- Input not in a valid format, try to pass it through #expr to see
+			-- if that produces a number (e.g. "3 + 5" will become "8").
 			end
 		end
 	end
 	return _numeral_to_english(
 		num,
@@ Line 681: / Line 682: @@
 function p.numeral_to_english(frame)
 	local args = frame.args
 end

Tom.Reding: Sync from sandbox

2021-10-16T13:47:53Z

Sync from sandbox

Show changes

Tom.Reding: +function p._english_to_numeral(frame); var/ws/-- ce; from sandbox

2021-09-26T18:06:43Z

+function p._english_to_numeral(frame); var/ws/-- ce; from sandbox

Show changes

Gonnym at 15:35, 17 January 2020

2020-01-17T15:35:40Z

← Previous revision		Revision as of 15:35, 17 January 2020
Line 640:		Line 640:
	args['numerator'],		args['numerator'],
	args['denominator'],		args['denominator'],
	args['capitalize'] ~~== 'U' or args['capitalize'] == 'u'~~,		args['capitalize'],
	args['use_and'] ~~~= 'us'~~,		args['use_and'],
	args['hyphenate'] ~~== 'on'~~,		args['hyphenate'],
	args['ordinal'] ~~== 'on'~~,		args['ordinal'],
	args['plural'] ~~== 'on'~~,		args['plural'],
	args['links'],		args['links'],
	args['negative_word'],		args['negative_word'],
	args['round'],		args['round'],
	args['zero'],		args['zero'],
			args['use_one']
	args['use_one'] == 'one' -- experiment: using '\|one=one' makes fraction 2+1/2 give "two and one-half" instead of "two and a half"
	) or ''		) or ''
	end		end

Gonnym: adding _numeral_to_english2 so an editor does not need to add 12 "nil"/"false" and actually add what they need. The code can be refactored with the main call, but that requires much more testing and fixing than what I'm prepared to do now seeing as there are current bugs in the code (such as in scientific_notation_to_decimal).

2020-01-17T13:34:29Z

adding _numeral_to_english2 so an editor does not need to add 12 "nil"/"false" and actually add what they need. The code can be refactored with the main call, but that requires much more testing and fixing than what I'm prepared to do now seeing as there are current bugs in the code (such as in scientific_notation_to_decimal).

@@ Line 617: / Line 617: @@
 	if capitalize then s = s:gsub("^%l", string.upper) end
 	return s
 end
@@ Line 622: / Line 656: @@
 	roman_to_numeral = roman_to_numeral,
 	spell_number = _numeral_to_english,
 	english_to_ordinal = english_to_ordinal,
+}

Tom.Reding: nil check

2019-06-15T15:42:16Z

nil check

← Previous revision		Revision as of 15:42, 15 June 2019
Line 304:		Line 304:
	-- Converts an English-text ordinal between 'zeroth' and 'ninety-ninth' to a number [0–99], else -1		-- Converts an English-text ordinal between 'zeroth' and 'ninety-ninth' to a number [0–99], else -1
	local function english_to_ordinal(english)		local function english_to_ordinal(english)
	local eng = string.lower(english)		local eng = string.lower(english or '')

	local eng_lt20 = eng_lt20		local eng_lt20 = eng_lt20

Tom.Reding: +function english_to_ordinal() -- Converts an English-text ordinal between 'zeroth' and 'ninety-ninth' to a number [0–99], else -1; from sandbox

2019-06-13T11:50:32Z

+function english_to_ordinal() -- Converts an English-text ordinal between 'zeroth' and 'ninety-ninth' to a number [0–99], else -1; from sandbox

@@ Line 1: / Line 1: @@
 -- Module for converting between different representations of numbers. See talk page for user documentation.
 -- For unit tests see: [[Module:ConvertNumeric/testcases]]
--- When editing, preview with: Module_talk:ConvertNumeric/testcases
+-- When editing, preview with: [[Module_talk:ConvertNumeric/testcases]]
--- First edit [[Module:ConvertNumeric/sandbox]] and preview with Module_talk:ConvertNumeric/sandbox/testcases
+-- First, edit [[Module:ConvertNumeric/sandbox]], then preview with [[Module_talk:ConvertNumeric/sandbox/testcases]]
 local ones_position = {
@@ Line 187: / Line 187: @@
 	D = 500,
 	M = 1000
+}
@@ Line 257: / Line 300: @@
 		return ones_position[math.floor(num/100)] .. ' hundred ' .. (use_and and 'and ' or '') .. numeral_to_english_less_100(num % 100, ordinal, plural, zero)
 	end
 end
@@ Line 554: / Line 622: @@
 	roman_to_numeral = roman_to_numeral,
 	spell_number = _numeral_to_english,
+}
 function p._roman_to_numeral(frame) -- Callable via {{#invoke:ConvertNumeric|_roman_to_numeral|VI}}
 	return roman_to_numeral(frame.args[1])
 end

Tom.Reding: +{{#invoke}} access to roman_to_numeral, from sandbox

2019-06-08T16:15:06Z

+{{#invoke}} access to roman_to_numeral, from sandbox

← Previous revision		Revision as of 16:15, 8 June 2019
Line 551:		Line 551:
	end		end

	local p = { -- ~~functions~~ that can be called from another module		local p = { -- Functions that can be called from another module
	roman_to_numeral = roman_to_numeral,		roman_to_numeral = roman_to_numeral,
	spell_number = _numeral_to_english,		spell_number = _numeral_to_english,
	}		}

			function p._roman_to_numeral(frame) -- Callable via {{#invoke:ConvertNumeric\|_roman_to_numeral\|VI}}
			return roman_to_numeral(frame.args[1])
			end

	function p.numeral_to_english(frame)		function p.numeral_to_english(frame)