Module:LogicUtils - Revision history

Felipe: support math style binary operators

2025-09-09T18:57:45Z

support math style binary operators

← Older revision		Revision as of 18:57, 9 September 2025
Line 30:		Line 30:

	local function isBinOp(c)		local function isBinOp(c)
	return c == "&" or c == "\|" or c == "^"		return c == "&" or c == "\|" or c == "^" or c == "+" or c == "*"
	end		end

Line 47:		Line 47:
	if v2 == nil then error("Invalid expression: missing operand") end		if v2 == nil then error("Invalid expression: missing operand") end

	if c == "&" then		if c == "&" or c == "*" then
	table.insert(stack, v and v2)		table.insert(stack, v and v2)
	elseif c == "\|" then		elseif c == "\|" or c == "+" then
	table.insert(stack, v or v2)		table.insert(stack, v or v2)
	elseif c == "^" then		elseif c == "^" then
Line 238:		Line 238:
	row:tag("td")		row:tag("td")
	:addClass("signal-spacer")		:addClass("signal-spacer")

	~~mw.log(mw.dumpObject(signal))~~

	local prevValue = nil		local prevValue = nil

Felipe: properly support multiple outputs

2025-09-09T18:51:25Z

properly support multiple outputs

← Older revision		Revision as of 18:51, 9 September 2025
Line 1:		Line 1:
	local p = {}		local p = {}

			local bit32 = require( 'bit32' )

	function parse_io(kind, row, str)		function parse_io(kind, row, str)
Line 73:		Line 75:
	local function evalAll(expr, num_vars, callback)		local function evalAll(expr, num_vars, callback)
	local totalCombinations = 2 ^ num_vars		local totalCombinations = 2 ^ num_vars
	~~local bit32 = require( 'bit32' )~~

	for i = 0, totalCombinations - 1 do		for i = 0, totalCombinations - 1 do
Line 179:		Line 180:
	local nOutputs = parse_io("Output", header, args.outputs)		local nOutputs = parse_io("Output", header, args.outputs)

			local exprs = {}
	for i = 1,nOutputs do		for i = 1,nOutputs do
	local exprStr = args["expr"..i]		local exprStr = args["expr"..i]
	if exprStr == nil then		if exprStr == nil then error("Missing expression for output " .. i) end
	error("Missing expression for output " .. i)		table.insert(exprs, algebraicToRPN(exprStr))
			end

			local totalCombinations = 2 ^ nInputs
			local values = {}

			for i = 0,totalCombinations - 1 do
			local row = tbl:tag('tr')

			for j = 1, nInputs do
			values[j] = bit32.band(i, bit32.lshift(1, nInputs - j)) ~= 0
			renderCell(row, values[j])
	end		end

	~~evalAll(algebraicToRPN(exprStr), nInputs~~, ~~function~~(~~values, result~~)		for _, expr in pairs(exprs) do
	~~local~~ row ~~= tbl:tag('tr')~~		renderCell(row, eval(expr, values))
	~~for j = 1~~,~~nInputs do~~		end
	~~renderCell~~(~~row~~, values~~[j]~~)
	~~end~~
	~~renderCell(row, result~~)
	end)

	~~i = i + 1~~
	end		end

Felipe at 17:53, 8 September 2025

2025-09-08T17:53:51Z

← Older revision		Revision as of 17:53, 8 September 2025
Line 231:		Line 231:
	row:tag("td")		row:tag("td")
	:addClass("signal-spacer")		:addClass("signal-spacer")

			mw.log(mw.dumpObject(signal))

	local prevValue = nil		local prevValue = nil
	for _, v in pairs(signal.values) do		for _, v in pairs(signal.values) do
			if v == "nil" then v = nil end

	local cell = row:tag("td")		local cell = row:tag("td")
	:addClass("signal-value-cell")		:addClass("signal-value-cell")
Line 278:		Line 282:
	local values = {}		local values = {}

	for token in string.gmatch(str, "[~~01x~~]") do		for token in string.gmatch(str, "[01?]") do
	table.insert(values, ~~token ~=~~ "x" ~~and~~ tonumber(token) ~~or nil~~)		if token == "?" then
			table.insert(values, "nil") -- lua tables can't store nil
			else
			table.insert(values, tonumber(token))
			end
	end		end

Felipe at 17:48, 8 September 2025

2025-09-08T17:48:05Z

← Older revision		Revision as of 17:48, 8 September 2025
Line 279:		Line 279:

	for token in string.gmatch(str, "[01x]") do		for token in string.gmatch(str, "[01x]") do
	table.insert(values, token == "x" and ~~nil or~~ tonumber(token))		table.insert(values, token ~= "x" and tonumber(token) or nil)
	end		end

Felipe at 17:47, 8 September 2025

2025-09-08T17:47:17Z

← Older revision		Revision as of 17:47, 8 September 2025
Line 29:		Line 29:
	local function isBinOp(c)		local function isBinOp(c)
	return c == "&" or c == "\|" or c == "^"		return c == "&" or c == "\|" or c == "^"
			end

			local function letterToCell(c)
			return c:lower():byte() - 96
	end		end

Line 53:		Line 57:
	table.insert(stack, not v)		table.insert(stack, not v)
	else		else
	local index = c~~:lower():byte(~~) ~~- 96~~ -- 'a' = 1, 'b' = 2, etc.		local index = letterToCell(c) -- 'a' = 1, 'b' = 2, etc.
	if index then		if index then
	if values[index] == nil and not ignoreMissing then error("Value for variable '" .. c .. "' not provided") end		if values[index] == nil and not ignoreMissing then error("Value for variable '" .. c .. "' not provided") end
Line 274:		Line 278:
	local values = {}		local values = {}

	for token in string.gmatch(str, "[01]") do		for token in string.gmatch(str, "[01x]") do
	table.insert(values, tonumber(token))		table.insert(values, token == "x" and nil or tonumber(token))
	end		end

Felipe: better styling

2025-09-08T17:10:21Z

better styling

← Older revision		Revision as of 17:10, 8 September 2025
Line 247:		Line 247:
	end		end

	local function renderBinaryGraph(signals)		local function renderBinaryGraph(parent, signals)
	local tickCount = #signals[1].values		local tickCount = #signals[1].values

	local tbl = ~~mw.html.create('table')~~		local tbl = parent:tag('table')
	:~~addClass~~('~~signal-graph-~~table')

	renderBinaryGraphHeader(tbl, tickCount)		renderBinaryGraphHeader(tbl, tickCount)
Line 260:		Line 259:
	renderBinaryGraphSpacerRow(tbl, tickCount)		renderBinaryGraphSpacerRow(tbl, tickCount)
	end		end

	~~return tostring(tbl)~~
	end		end

Line 269:		Line 266:
	local signalNames = mw.text.split(args.signals, ",")		local signalNames = mw.text.split(args.signals, ",")
	local signals = {}		local signals = {}

			local container = mw.html.create('div')
			:addClass('signal-graph-table')

	for i = 1,#signalNames do		for i = 1,#signalNames do
Line 281:		Line 281:
	end		end

	~~return~~ renderBinaryGraph(signals)		renderBinaryGraph(container, signals)

			return tostring(container)
	end		end

	return p		return p

Felipe: add binary_signal_graph

2025-09-08T16:44:30Z

add binary_signal_graph

Show changes

Felipe: add support for algebraic style formulas

2025-09-08T16:18:15Z

add support for algebraic style formulas

← Older revision		Revision as of 16:18, 8 September 2025
Line 27:		Line 27:
	end		end

	local function eval(~~str~~, values)		local function isBinOp(c)
			return c == "&" or c == "\|" or c == "^"
			end

			local function eval(expr, values)
	local stack = {}		local stack = {}

	~~str:gsub("[^%s()]"~~, ~~function~~(c)		for _, c in pairs(expr) do
	if c ~~== "&" or c == "\|" or c == "^"~~ then		if isBinOp(c) then
	local v = table.remove(stack)		local v = table.remove(stack)
	if v == nil then error("Invalid expression: missing operand") end		if v == nil then error("Invalid expression: missing operand") end
Line 58:		Line 62:
	end		end
	end		end
	end)		end

	return stack[1]		return stack[1]
	end		end

	local function evalAll(~~str~~, num_vars, callback)		local function evalAll(expr, num_vars, callback)
	local totalCombinations = 2 ^ num_vars		local totalCombinations = 2 ^ num_vars
	local bit32 = require( 'bit32' )		local bit32 = require( 'bit32' )
Line 73:		Line 77:
	end		end

	local result = eval(~~str~~, values)		local result = eval(expr, values)
	callback(values, result)		callback(values, result)
	end		end
			end

			local function algebraicToRPN(input)
			local output = {}
			local opstack = {}

			input:gsub("[^%s]", function(c)
			if isBinOp(c) then
			while opstack[#opstack] == "!" do
			table.insert(output, table.remove(opstack))
			end

			table.insert(opstack, c)
			elseif c == "!" or c == "(" then
			table.insert(opstack, c)
			elseif c == ")" then
			while #opstack > 0 do
			local op = table.remove(opstack)
			if op == "(" then
			break
			end
			table.insert(output, op)
			end
			else
			table.insert(output, c)
			end
			end)

			-- Drain the operator stack to the output
			while #opstack > 0 do table.insert(output, table.remove(opstack)) end

			return output
	end		end

Line 140:		Line 176:

	for i = 1,nOutputs do		for i = 1,nOutputs do
	local ~~expr~~ = args["expr"..i]		local exprStr = args["expr"..i]
	if ~~expr~~ == nil then		if exprStr == nil then
	error("Missing expression for output " .. i)		error("Missing expression for output " .. i)
	end		end

	evalAll(~~expr~~, nInputs, function(values, result)		evalAll(algebraicToRPN(exprStr), nInputs, function(values, result)
	local row = tbl:tag('tr')		local row = tbl:tag('tr')
	for j = 1,nInputs do		for j = 1,nInputs do
Line 157:		Line 193:

	return tostring(tbl)		return tostring(tbl)
			end

			local function renderBinaryGraph(signals)

	end		end

	return p		return p

Felipe: use string:byte instead of searching a string

2025-09-08T15:17:23Z

use string:byte instead of searching a string

← Older revision		Revision as of 15:17, 8 September 2025
Line 49:		Line 49:
	table.insert(stack, not v)		table.insert(stack, not v)
	else		else
	local index = ~~string.find~~(~~"abcdefghijklmnopqrstuvwxyz"~~, c)		local index = c:lower():byte() - 96 -- 'a' = 1, 'b' = 2, etc.
	if index then		if index then
	if values[index] == nil and not ignoreMissing then error("Value for variable '" .. c .. "' not provided") end		if values[index] == nil and not ignoreMissing then error("Value for variable '" .. c .. "' not provided") end

Felipe at 12:12, 8 September 2025

2025-09-08T12:12:09Z

← Older revision		Revision as of 12:12, 8 September 2025
Line 80:		Line 80:
	local function renderCell(row, value)		local function renderCell(row, value)
	local style = "color:white; text-align:center;"		local style = "color:white; text-align:center;"
	if value == false then		if value == false or value == "0" then
	row:tag('td')		row:tag('td')
	:attr('style', 'background-color:#1f1e1e;'..style)		:attr('style', 'background-color:#1f1e1e;'..style)
	:wikitext("0")		:wikitext("0")
	elseif value == true then		elseif value == true or value == "1" then
	row:tag('td')		row:tag('td')
	:attr('style', 'background-color:#fd140f;'..style)		:attr('style', 'background-color:#fd140f;'..style)
Line 90:		Line 90:
	else		else
	row:tag('td')		row:tag('td')
			:cssText("text-align:center")
	:wikitext(value)		:wikitext(value)
	end		end
Line 114:		Line 115:

	for token in string.gmatch(args[i], "[^%s]+") do		for token in string.gmatch(args[i], "[^%s]+") do
	renderCell(row, token ~~== "1" and true or (token == "0" and false or token)~~)		renderCell(row, token)
	end		end