redo/lua-logic
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

changed Tz to Hz; added fixes for empty strings in gate properties

Browse Source
This commit is contained in:
Redo 2019-05-05 14:01:27 -05:00
parent 1f0b6f8629
commit 10611449bf
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
sim/main.lua
View File

@ -24,12 +24,12 @@ local totalticks = 0
sim = Simulation:new() sim = Simulation:new()
local units = { local units = {
"uTz", "uHz",
"mTz", "mHz",
"Tz", "Hz",
"kTz", "kHz",
"MTz", "MHz",
"GTz", "GHz",
} }
local function round(x) local function round(x)
@ -109,7 +109,7 @@ while 1 do
local i = 1 local i = 1
line = line:gsub(";;", "; ;") line = line:gsub(";;", "; ;")
for str in string.gmatch(line, "([^;]+)") do for str in string.gmatch(line, "([^;]+)") do
data[i] = str data[i] = str or ""
i = i + 1 i = i + 1
end end
@ -146,7 +146,7 @@ while 1 do
elseif data[i] == "GD" then elseif data[i] == "GD" then
--print(table.concat(data, "\n", i, math.min(#data, i+100))) --print(table.concat(data, "\n", i, math.min(#data, i+100)))
local objref = tonumber(data[i+1]) local objref = tonumber(data[i+1])
local name = data[i+2] or "" local name = data[i+2]
local desc = data[i+3] local desc = data[i+3]
local init = data[i+4] local init = data[i+4]
local logic = data[i+5] local logic = data[i+5]
@ -161,7 +161,7 @@ while 1 do
position = vectotable(data[a+1]), position = vectotable(data[a+1]),
direction = tonumber(data[a+2]), direction = tonumber(data[a+2]),
causeupdate = toboolean(data[a+3]), causeupdate = toboolean(data[a+3]),
name = data[a+4] or "", name = data[a+4],
} }
ports[#ports+1] = port ports[#ports+1] = port