Module:Convert/makeunits - Revision history

Johnuniq: accept abbr=off for an alias so it uses unit name; add pernames (names for second unit in a per) for ukwiki

2024-10-22T07:42:28Z

accept abbr=off for an alias so it uses unit name; add pernames (names for second unit in a per) for ukwiki

← Previous revision		Revision as of 07:42, 22 October 2024
Line 153:		Line 153:
	perunits = 'Automatic per units',		perunits = 'Automatic per units',
	varnames = 'Variable names',		varnames = 'Variable names',
			pernames = 'Names for second unit in a per',
	},		},
	titles = {		titles = {
Line 232:		Line 233:
	m_per_undef = 'Unit "$1" has undefined unit code "$2" in the "per".',		m_per_undef = 'Unit "$1" has undefined unit code "$2" in the "per".',
	m_percent_s = 'Field "$1" must not contain "%s".',		m_percent_s = 'Field "$1" must not contain "%s".',
			m_pnm_cnt = 'Names for second unit in a per section: each row must have two columns.',
			m_pnm_dup = 'Unit "$1" already has a per name.',
			m_pnm_miss = 'Missing field for a per name.',
			m_pnm_undef = 'Unit "$1" in per names is not defined.',
	m_pfx_bad = 'Unknown prefix: "$1".',		m_pfx_bad = 'Unknown prefix: "$1".',
	m_pfx_name = 'Unit with Prefix set must include Name.',		m_pfx_name = 'Unit with Prefix set must include Name.',
Line 893:		Line 898:
	end		end

	local function update_units(units, composites, varnames)		local function update_units(units, composites, varnames, pernames)
	-- Update some unit definitions with extra data defined in other sections.		-- Update some unit definitions with extra data defined in other sections.
	-- This is done after all input data has been processed.		-- This is done after all input data has been processed.
Line 901:		Line 906:
	unit.subdivs = '{ ' .. table.concat(comp.subdivs, ', ') .. ' }'		unit.subdivs = '{ ' .. table.concat(comp.subdivs, ', ') .. ' }'
	end		end
	~~local vn =~~ varnames[unit.unitcode]		if varnames[unit.unitcode] then
		⚫	unit.varname = varnames[unit.unitcode]
⚫	if vn then
			end
⚫	unit.varname = vn
			if pernames[unit.unitcode] then
			unit.pername = pernames[unit.unitcode]
	end		end
	end		end
Line 1,086:		Line 1,093:
	local good		local good
	if not empty(rhs) then		if not empty(rhs) then
	for _, item in ipairs({ 'sp', 'default', 'link', 'multiplier', 'symbol', 'symlink' }) do		for _, item in ipairs({ 'sp', 'default', 'link', 'multiplier', 'symbol', 'symlink', 'abbr' }) do
	if lhs == item then		if lhs == item then
	if item == 'sp' then		if item == 'sp' then
Line 1,120:		Line 1,127:
	unit[item] = rhs		unit[item] = rhs
	good = true		good = true
			elseif item == 'abbr' then
			if target and rhs == 'off' then
			unit.usename = 1
			good = true
			end
	else		else
	if target and rhs == target[item] then		if target and rhs == target[item] then
Line 1,518:		Line 1,530:
	end		end
	data[ucode] = table.concat(names, '!')		data[ucode] = table.concat(names, '!')
			end
			end

			local function make_pername(cfg, data)
			-- Return a function which, when called, stores a table that defines a
			-- per name for a unit. The table is stored in data (also a table).
			return function (utype, fields)
			-- Set or update an entry in the data table to record that a unit has a
			-- non-standard per name if used as the second unit in a per unit (x per y).
			-- The target units must be defined first.
			-- Parameter utype is ignored (it is nil).
			-- Throw an error if a problem occurs.
			local count = #fields
			if count ~= 2 then
			quit('m_pnm_cnt')
			end
			local ucode, pername
			for i = 1, count do
			local v = fields[i]
		⚫	if empty(v) then
			quit('m_pnm_miss')
			end
			if i == 1 then -- unitcode
			ucode = v
			if not get_unit(v) then
			quit('m_pnm_undef', v)
			end
			else
			pername = v
			end
			end
			if data[ucode] then
			quit('m_pnm_dup', ucode)
			end
			data[ucode] = pername
	end		end
	end		end
Line 1,795:		Line 1,842:
	'symbol',		'symbol',
	'sp_us',		'sp_us',
			'usename',
	'default',		'default',
	'link',		'link',
Line 1,832:		Line 1,880:
	'name2',		'name2',
	'name2_us',		'name2_us',
			'pername',
	'varname',		'varname',
	'symbol',		'symbol',
Line 2,036:		Line 2,085:
	-- Return units, defaults, links (three tables).		-- Return units, defaults, links (three tables).
	-- Throw an error if a problem occurs.		-- Throw an error if a problem occurs.
	local composites, defaults, links, units, perunits, varnames = {}, {}, {}, {}, {}, {}		local composites, defaults, links, units, perunits, varnames, pernames = {}, {}, {}, {}, {}, {}, {}
	local sections = {		local sections = {
	{ 'overrides' , make_override , overrides , 0 },		{ 'overrides' , make_override , overrides , 0 },
Line 2,047:		Line 2,096:
	{ 'perunits' , make_perunit , perunits , 1 },		{ 'perunits' , make_perunit , perunits , 1 },
	{ 'varnames' , make_varname , varnames , 1 },		{ 'varnames' , make_varname , varnames , 1 },
			{ 'pernames' , make_pername , pernames , 1 },
	}		}
	local lines = get_page_lines(cfg.data_title)		local lines = get_page_lines(cfg.data_title)
Line 2,064:		Line 2,114:
	check_all_defaults(cfg, units)		check_all_defaults(cfg, units)
	check_all_pers(cfg, units)		check_all_pers(cfg, units)
	update_units(units, composites, varnames)		update_units(units, composites, varnames, pernames)
	return units, defaults, links, perunits		return units, defaults, links, perunits
	end		end

Johnuniq: Undid revision 1075162681 by Rwv37 (talk) no, see preceding comment in text

2022-03-04T08:36:29Z

Undid revision 1075162681 by Rwv37 (talk) no, see preceding comment in text

← Previous revision		Revision as of 08:36, 4 March 2022
Line 137:		Line 137:
	-- titles = {		-- titles = {
	-- -- name_used_in_this_script = 'Title of page'		-- -- name_used_in_this_script = 'Title of page'
	-- conversion_data = '~~Module~~:Convert/documentation/conversion data/dok',		-- conversion_data = 'Modul:Convert/documentation/conversion data/dok',
	-- },		-- },
	-- },		-- },

Rwv37: tpyo

2022-03-04T07:36:22Z

tpyo

← Previous revision		Revision as of 07:36, 4 March 2022
Line 137:		Line 137:
	-- titles = {		-- titles = {
	-- -- name_used_in_this_script = 'Title of page'		-- -- name_used_in_this_script = 'Title of page'
	-- conversion_data = '~~Modul~~:Convert/documentation/conversion data/dok',		-- conversion_data = 'Module:Convert/documentation/conversion data/dok',
	-- },		-- },
	-- },		-- },

Pppery: Fix awkward page title

2019-02-28T21:40:46Z

Fix awkward page title

← Previous revision		Revision as of 21:40, 28 February 2019
Line 156:		Line 156:
	titles = {		titles = {
	-- name_used_in_this_script = 'Title of page'		-- name_used_in_this_script = 'Title of page'
	conversion_data = 'Module:Convert/documentation/conversion data~~/doc~~',		conversion_data = 'Module:Convert/documentation/conversion data',
	},		},
	messages = {		messages = {

Johnuniq: handle translation_table varname='pl' for plwiki variable names (4 columns rather than 5 columns for slwiki); more general configuration handling

2017-04-21T05:23:08Z

handle translation_table varname='pl' for plwiki variable names (4 columns rather than 5 columns for slwiki); more general configuration handling

Show changes

Johnuniq: tiny comment fix

2016-06-01T00:42:33Z

tiny comment fix

← Previous revision		Revision as of 00:42, 1 June 2016
Line 93:		Line 93:
	istemperature = {		istemperature = {
	-- Common temperature scales (not keVT or MK).		-- Common temperature scales (not keVT or MK).
	-- ["unit code in local language"] = 1		-- ["unit code in local language"] = true
	["C"] = true,		["C"] = true,
	["F"] = true,		["F"] = true,

Johnuniq: the default output of a unit can be an automatically defined combination; some units like cent have the same ucode, utype and default

2015-04-06T04:57:12Z

the default output of a unit can be an automatically defined combination; some units like cent have the same ucode, utype and default

← Previous revision		Revision as of 04:57, 6 April 2015
Line 663:		Line 663:
	local per_index = {} -- all "per" units (to detect attempts to define more than once)		local per_index = {} -- all "per" units (to detect attempts to define more than once)

	local function get_unit(ucode)		local function get_unit(ucode, utype)
	-- Look up unit code in our cache of units.		-- Look up unit code in our cache of units.
			-- If utype == nil, the unit should already have been defined.
			-- Otherwise, ucode may represent an automatically generated combination
			-- where each component must have the given utype; a dummy unit is returned.
	if empty(ucode) then		if empty(ucode) then
	return nil		return nil
	end		end
	~~return~~ lookup(units_index, ucode)		local unit = lookup(units_index, ucode)
			if unit or not utype then
			return unit
			end
			local combo = collection()
			if ucode:find('+', 1, true) then
			for item in (ucode .. '+'):gmatch('%s(.-)%s%+') do
			if item ~= '' then
			combo:add(item)
			end
			end
			elseif ucode:find('%s') then
			for item in ucode:gmatch('%S+') do
			combo:add(item)
			end
			end
			if combo.n > 1 then
			local result = setmetatable({ utype = utype }, {
			__index = function (self, key)
			error('Bug: invalid use of automatically generated unit')
			end })
			for _, v in ipairs(combo) do
			local component = lookup(units_index, v)
			if not component or component.shouldbe or component.combination then
			return nil
			end
			if utype ~= component.utype then
			result.utype = component.utype -- set wrong type which caller will detect
			break
			end
			end
			return result
			end
	end		end

Line 733:		Line 768:
	local function check_default(default, ucode, utype, unit_table)		local function check_default(default, ucode, utype, unit_table)
	-- Check the given name (or expression) of a default output.		-- Check the given name (or expression) of a default output.
			-- Normally a unit must not define itself as its default. However,
			-- some units are defined merely for use in per units, and they have
			-- the same ucode, utype and default.
			-- Example: unit cent which cannot be converted to anything other than
			-- a cent, but which can work, for example, in cent/km and cent/mi.
	-- Throw an error if a problem occurs.		-- Throw an error if a problem occurs.
	local done = {}		local done = {}
Line 739:		Line 779:
	quit('m_def_rpt', default, ucode)		quit('m_def_rpt', default, ucode)
	end		end
	if default == ucode then		if default == ucode and ucode ~= utype then
	quit('m_def_same', ucode)		quit('m_def_same', ucode)
	end		end
	local default_table = get_unit(default)		local default_table = get_unit(default, utype)
	if not default_table then		if not default_table then
	quit('m_def_undef', default, ucode)		quit('m_def_undef', default, ucode)
Line 1,512:		Line 1,552:
	elseif 2 <= i and i <= 5 then		elseif 2 <= i and i <= 5 then
	if not (i == 5 and v == '') then		if not (i == 5 and v == '') then
	local target = get_unit(v)		local target = get_unit(v, (i == 4) and utype or nil) -- the default may be an auto combination
	if not target then		if not target then
	quit('m_cmp_undef', v, unitcode)		quit('m_cmp_undef', v, unitcode)

Johnuniq: enhanced automatic per units

2015-02-04T05:57:33Z

enhanced automatic per units

← Previous revision		Revision as of 05:57, 4 February 2015
Line 1,393:		Line 1,393:
	-- Return a function which, when called, stores a table that defines a		-- Return a function which, when called, stores a table that defines a
	-- fixup for an automatic per unit. The table is stored in data (also a table).		-- fixup for an automatic per unit. The table is stored in data (also a table).
			local pertype_index = {} -- to detect attempts to define a fixup twice
	return function (utype, fields)		return function (utype, fields)
	-- Store a table to define a fixup.		-- Store a table to define a fixup.
Line 1,398:		Line 1,399:
	-- Parameter utype is ignored (it is nil).		-- Parameter utype is ignored (it is nil).
	-- Throw an error if a problem occurs.		-- Throw an error if a problem occurs.
	local lhs, rhs, multiplier		local lhs, rhs, link, multiplier
	for i, v in ipairs(fields) do		for i, v in ipairs(fields) do
	if v == '' then		if v == '' then
	-- Ignore empty fields.		-- Ignore empty fields.
	elseif i == 1 ~~or i == 2~~ then		elseif i == 1 then
	~~if i~~ == 1 ~~then~~		lhs = v -- like "length/time"
			elseif i == 2 then
	~~lhs~~ = v -- like "~~length/time~~"		rhs = v -- like "speed"
⚫	else
	~~rhs~~ = ~~v -- like~~ ~~"speed"~~		elseif i == 3 then
	~~end~~		link = v
			elseif i == 4 then
⚫	~~else~~
	if not tonumber(v) then		if not tonumber(v) then
	quit('m_per_inv')		quit('m_per_inv')
	end		end
	multiplier = v		multiplier = v
		⚫	else
			quit('m_per_inv')
	end		end
	end		end
	if lhs and rhs then		if lhs and (rhs or link or multiplier) then
	if multiplier then		if link or multiplier then
			local parts = collection()
⚫	~~rhs =~~ '~~{ utype = "' .. rhs .. '",~~ multiplier = ' .. multiplier ~~.. ' }'~~
			if rhs then
			parts:add('utype = "' .. rhs .. '"')
		⚫	end
			if link then
			parts:add('link = "' .. link .. '"')
			end
			if multiplier then
		⚫	parts:add('multiplier = ' .. multiplier)
			end
			rhs = '{ ' .. parts:join(', ') .. ' }'
	else		else
	rhs = '"' .. rhs .. '"'		rhs = '"' .. rhs .. '"'
	end		end
			if pertype_index[lhs] then
			quit('m_per_dup', lhs)
			end
			pertype_index[lhs] = rhs
	table.insert(data, { lhs = lhs, rhs = rhs })		table.insert(data, { lhs = lhs, rhs = rhs })
	else		else

Johnuniq: add new "Automatic per unit" feature so required table is in Module:Convert/data where other wikis can translate it

2015-01-06T08:29:32Z

add new "Automatic per unit" feature so required table is in Module:Convert/data where other wikis can translate it

Show changes

Johnuniq: tweak to remove 0 left over from error()

2014-06-19T08:00:43Z

tweak to remove 0 left over from error()

← Previous revision		Revision as of 08:00, 19 June 2014
Line 353:		Line 353:
	return value		return value
	end		end
	quit_no_message('invalid number "' .. self.text:sub(self.pos) .. '"'~~, 0~~)		quit_no_message('invalid number "' .. self.text:sub(self.pos) .. '"')
	end		end
	end		end
Line 367:		Line 367:
	local rhs = numstack:pop()		local rhs = numstack:pop()
	local lhs = numstack:pop()		local lhs = numstack:pop()
	if not (rhs and lhs) then quit_no_message('missing number'~~, 0~~) end		if not (rhs and lhs) then quit_no_message('missing number') end
	local op = opstack:pop()		local op = opstack:pop()
	numstack:add(op.func(lhs, rhs))		numstack:add(op.func(lhs, rhs))
Line 376:		Line 376:
	if token_last == token_type then		if token_last == token_type then
	local missing = (token_type == 'number') and 'operator' or 'number'		local missing = (token_type == 'number') and 'operator' or 'number'
	quit_no_message('missing ' .. missing~~, 0~~)		quit_no_message('missing ' .. missing)
	end		end
	token_last = token_type		token_last = token_type
Line 396:		Line 396:
	break		break
	end		end
	quit_no_message('unbalanced parentheses'~~, 0~~)		quit_no_message('unbalanced parentheses')
	else		else
	break		break
Line 402:		Line 402:
	end		end
	perform_ops(0)		perform_ops(0)
	if numstack.n > 1 then quit_no_message('missing operator'~~, 0~~) end		if numstack.n > 1 then quit_no_message('missing operator') end
	if numstack.n < 1 then quit_no_message('missing number'~~, 0~~) end		if numstack.n < 1 then quit_no_message('missing number') end
	return numstack:pop()		return numstack:pop()
	end		end
Line 614:		Line 614:
	local arithop, factor, compop, limit = text:match('^%sv%s([]?)(.-)([<>]=?)(.)$')		local arithop, factor, compop, limit = text:match('^%sv%s([]?)(.-)([<>]=?)(.)$')
	if arithop == nil then		if arithop == nil then
	quit_no_message('Invalid default expression.'~~, 0~~)		quit_no_message('Invalid default expression.')
	elseif arithop == '*' then		elseif arithop == '*' then
	factor = tonumber(factor)		factor = tonumber(factor)
	if factor == nil then		if factor == nil then
	quit_no_message('Invalid default expression.'~~, 0~~)		quit_no_message('Invalid default expression.')
	end		end
	value = value * factor		value = value * factor
Line 624:		Line 624:
	limit = tonumber(limit)		limit = tonumber(limit)
	if limit == nil then		if limit == nil then
	quit_no_message('Invalid default expression.'~~, 0~~)		quit_no_message('Invalid default expression.')
	end		end
	if compop == '<' then		if compop == '<' then
Line 635:		Line 635:
	return value >= limit		return value >= limit
	end		end
	quit_no_message('Invalid default expression.'~~, 0~~) -- should not occur		quit_no_message('Invalid default expression.') -- should not occur
	end		end
	local lhs, rhs = condition:match('^(.-%W)and(%W.*)')		local lhs, rhs = condition:match('^(.-%W)and(%W.*)')