From f5b9e120765e33e3a3152234ae1195c061f6b6db Mon Sep 17 00:00:00 2001 From: Redo Date: Sun, 13 Nov 2022 22:49:31 -0600 Subject: [PATCH] fix --- sim/gatedef.lua | 2 +- sim/main.lua | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/sim/gatedef.lua b/sim/gatedef.lua index 56504a1..6073305 100644 --- a/sim/gatedef.lua +++ b/sim/gatedef.lua @@ -1,6 +1,6 @@ local ffi = FFI or require("ffi") -local cFuncsByName, cDataSizeByName = (require or Require)("compiled_sim_gates") +local cFuncsByName, cDataSizeByName = require("compiled_sim_gates") GateDefinition = { ports = {}, diff --git a/sim/main.lua b/sim/main.lua index 0b34d6c..407166c 100644 --- a/sim/main.lua +++ b/sim/main.lua @@ -2,6 +2,7 @@ -- External requirements local socket = require("socket") local ffi = require("ffi") +local require_l = require -- Disallow access to undefined global variables (helps detect errors) assert(getmetatable(_G)==nil, "_G already has a metatable") @@ -19,7 +20,7 @@ print("Save location set to \""..OPT_SAVE_DIR.."\"") dofile("iosafe.lua") FFI = ffi Socket = socket -Require = require +require = require_l dofile("utility.lua") dofile("simulation.lua") dofile("group.lua") @@ -31,7 +32,7 @@ dofile("save.lua") dofile("network.lua") FFI = nil Socket = nil -Require = nil +require = nil -- Default settings OPT_TICK_ENABLED = true