Module:BaseConvert/sandbox - Revision history

Johnuniq: tweak

2022-04-12T07:18:47Z

tweak

← Previous revision		Revision as of 07:18, 12 April 2022
Line 69:		Line 69:
	end		end

	local fracPart		local fracPart = table.concat(tf, '')
	fracPart = table.concat(tf, '')

	-- remove trailing zeros if not needed		-- remove trailing zeros if not needed

Johnuniq: any reason to not use tostring? use args.precision etc. like in previous function

2022-04-12T07:11:36Z

any reason to not use tostring? use args.precision etc. like in previous function

← Previous revision		Revision as of 07:11, 12 April 2022
Line 10:		Line 10:

	local function _convert(n, base, from, precision, width, default, prefix, suffix)		local function _convert(n, base, from, precision, width, default, prefix, suffix)
			n = tostring(n)
	n = '' .. n -- convert to a string

	-- strip off any leading '0x' (unless x is a valid digit in the input base)		-- strip off any leading '0x' (unless x is a valid digit in the input base)
Line 111:		Line 111:
	return function(frame)		return function(frame)
	local args = frame.args		local args = frame.args
	return _convert(mw.text.trim(args[1]), base, from, args['precision'], args['width'],		return _convert(mw.text.trim(args[1]), base, from, args.precision, args.width,
	args['default'], args['prefix'], args['suffix'])		args.default, args.prefix, args.suffix)
	end		end
	end		end

Johnuniq: remove unintended globals

2022-04-12T07:02:10Z

remove unintended globals

← Previous revision		Revision as of 07:02, 12 April 2022
Line 107:		Line 107:
	setmetatable(p, {		setmetatable(p, {
	__index = function(t, k)		__index = function(t, k)
	from, base = k:match('^([0-9]+)to([0-9]+)$')		local from, base = k:match('^([0-9]+)to([0-9]+)$')
	if not from then return nil end		if not from then return nil end
	return function(frame)		return function(frame)
	args = frame.args		local args = frame.args
	return _convert(mw.text.trim(args[1]), base, from, args['precision'], args['width'],		return _convert(mw.text.trim(args[1]), base, from, args['precision'], args['width'],
	args['default'], args['prefix'], args['suffix'])		args['default'], args['prefix'], args['suffix'])

Johnuniq: use tabs for indents as is customary

2022-04-12T06:56:59Z

use tabs for indents as is customary

Show changes

Johnuniq: remove trailing whitespace

2022-04-12T06:55:03Z

remove trailing whitespace

← Previous revision		Revision as of 06:55, 12 April 2022
Line 4:		Line 4:

	local function normalizeFullWidthChars(s)		local function normalizeFullWidthChars(s)
	return mw.ustring.gsub(s, '[！-～]', function(s)		return mw.ustring.gsub(s, '[！-～]', function(s)
	return mw.ustring.char(mw.ustring.codepoint(s, 1) - 0xFEE0)		return mw.ustring.char(mw.ustring.codepoint(s, 1) - 0xFEE0)
	end)		end)
	end		end

	local function _convert(n, base, from, precision, width, default, prefix, suffix)		local function _convert(n, base, from, precision, width, default, prefix, suffix)
	n = '' .. n -- convert to a string		n = '' .. n -- convert to a string


	-- strip off any leading '0x' (unless x is a valid digit in the input base)		-- strip off any leading '0x' (unless x is a valid digit in the input base)
	from = tonumber(from)		from = tonumber(from)
Line 26:		Line 26:
	n, c = n:gsub('^-', '')		n, c = n:gsub('^-', '')
	if c > 0 then sign = '-' end		if c > 0 then sign = '-' end


	-- replace any full-width Unicode characters in the string with their ASCII equivalents		-- replace any full-width Unicode characters in the string with their ASCII equivalents
	n = normalizeFullWidthChars(n)		n = normalizeFullWidthChars(n)


	-- handle scientific notation with whitespace around the 'e' e.g. '5 e7'		-- handle scientific notation with whitespace around the 'e' e.g. '5 e7'
	n = n:gsub('%s[eE]%s', 'e')		n = n:gsub('%s[eE]%s', 'e')


	from = from or 10		from = from or 10
	local num = tonumber(n, from)		local num = tonumber(n, from)
Line 38:		Line 38:
	precision = tonumber(precision)		precision = tonumber(precision)
	width = tonumber(width)		width = tonumber(width)


	if not num or not base then return default or n end		if not num or not base then return default or n end


	local i, f = math.modf(num)		local i, f = math.modf(num)

Line 50:		Line 50:
	until i == 0		until i == 0
	while #t < (width or 0) do		while #t < (width or 0) do
	table.insert(t, 1, '0')		table.insert(t, 1, '0')
	end		end
	local intPart = table.concat(t, '')		local intPart = table.concat(t, '')


	-- compute the fractional part		-- compute the fractional part
	local tf = {}		local tf = {}
Line 61:		Line 61:
	table.insert(tf, digits:sub(i + 1, i + 1))		table.insert(tf, digits:sub(i + 1, i + 1))
	end		end


	-- add trailing zeros if needed		-- add trailing zeros if needed
	if precision and #tf < precision then		if precision and #tf < precision then
	for i = 1, precision - #tf do		for i = 1, precision - #tf do
	table.insert(tf, '0')		table.insert(tf, '0')
	end		end
	end		end


	local fracPart		local fracPart
	fracPart = table.concat(tf, '')		fracPart = table.concat(tf, '')


	-- remove trailing zeros if not needed		-- remove trailing zeros if not needed
	if not precision then		if not precision then
	fracPart = fracPart:gsub('0*$', '')		fracPart = fracPart:gsub('0*$', '')
	end		end


	-- add the radix point if needed		-- add the radix point if needed
	if #fracPart > 0 then		if #fracPart > 0 then
	fracPart = '.' .. fracPart		fracPart = '.' .. fracPart
	end		end


	return (prefix or '') .. sign .. intPart .. fracPart .. (suffix or '')		return (prefix or '') .. sign .. intPart .. fracPart .. (suffix or '')
	end		end
Line 93:		Line 93:
	args = frame		args = frame
	end		end


	local n = args.n		local n = args.n
	local base = args.base		local base = args.base

DePiep: require('Module:Log globals') rm test

2022-04-11T21:31:47Z

require('Module:Log globals') rm test

← Previous revision		Revision as of 21:31, 11 April 2022
Line 1:		Line 1:
	local p = {}		local p = {}

	require('Module:Log globals')
	local digits = '0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ'		local digits = '0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ'

DePiep at 21:30, 11 April 2022

2022-04-11T21:30:07Z

← Previous revision		Revision as of 21:30, 11 April 2022
Line 1:		Line 1:
	local p = {}		local p = {}
			require('Module:Log globals')

	local digits = '0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ'		local digits = '0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ'

DePiep at 19:41, 11 April 2022

2022-04-11T19:41:03Z

← Previous revision		Revision as of 19:41, 11 April 2022
Line 1:		Line 1:
	local p = {}		local p = {}
	require('Module:No globals') -- test for now

	local digits = '0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ'		local digits = '0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ'

DePiep at 19:40, 11 April 2022

2022-04-11T19:40:48Z

← Previous revision		Revision as of 19:40, 11 April 2022
Line 70:		Line 70:
	end		end

	local fracPart ~~-- DePiep~~		local fracPart
	fracPart = table.concat(tf, '')		fracPart = table.concat(tf, '')

DePiep at 19:40, 11 April 2022

2022-04-11T19:40:06Z

← Previous revision		Revision as of 19:40, 11 April 2022
Line 69:		Line 69:
	end		end
	end		end


	fracPart ~~= table.concat(tf,~~ ~~'')~~		local fracPart -- DePiep
			fracPart = table.concat(tf, '')

	-- remove trailing zeros if not needed		-- remove trailing zeros if not needed