osmarks/potatOS
2
1
Fork 5
Code Issues 1 Pull Requests Releases Wiki Activity

Merge pull request 'master' (#1) from osmarks/potatOS:master into master

Browse Source 
Reviewed-on: heavpoot/potatOS#1
This commit is contained in:
heavpoot 2021-01-29 23:08:17 +00:00
commit 3086955653
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/potatobios.lua
View File

@ -220,7 +220,7 @@ local load_log = {}
local set_last_loaded = potatOS.set_last_loaded local set_last_loaded = potatOS.set_last_loaded
potatOS.set_last_loaded = nil potatOS.set_last_loaded = nil
-- Check safety of code. Also log executed code if Protocol Epsilon diagnostics mode is enabled. I should probably develop a better format. -- Check safety of code. Also log executed code if Protocol Epsilon diagnostics mode is enabled. I should probably develop a better format.
function load(code, file, ...) function load(code, file, mode, env)
local start, end_, pxsig = code:find "%-%-%-PXSIG:([0-9A-Fa-f]+)\n" local start, end_, pxsig = code:find "%-%-%-PXSIG:([0-9A-Fa-f]+)\n"
if pxsig then if pxsig then
local rest = code:sub(1, start - 1) .. code:sub(end_ + 1) local rest = code:sub(1, start - 1) .. code:sub(end_ + 1)
@ -247,11 +247,11 @@ function load(code, file, ...)
local ok, ast = pcall(function() return heavlisp.into_ast(heavlisp.tokenize(code)) end) local ok, ast = pcall(function() return heavlisp.into_ast(heavlisp.tokenize(code)) end)
if not ok then return false, ast end if not ok then return false, ast end
return function(imports) return function(imports)
imports = imports or {} imports = imports or env or {}
return heavlisp.interpret(ast, imports) return heavlisp.interpret(ast, imports)
end end
end end
return real_load(code, file, ...) return real_load(code, file, mode, env)
end end
do_something "load" do_something "load"

2
src/xlib/03_heavlisp.lua
View File

@ -578,4 +578,4 @@ end
local function run(x,lua) local function run(x,lua)
return interpret(into_ast(tokenize(x)),lua) return interpret(into_ast(tokenize(x)),lua)
end end
return {run=run} return {run=run, interpret=interpret, into_ast=into_ast, tokenize=tokenize}