refactor(shell): move read-eval-loop script to repl.lua
Signed-off-by: Leonardo de Moura <leonardo@microsoft.com>
This commit is contained in:
parent
0bc2c51c9c
commit
2cd2527d9f
3 changed files with 37 additions and 81 deletions
36
src/builtin/repl.lua
Normal file
36
src/builtin/repl.lua
Normal file
|
@ -0,0 +1,36 @@
|
|||
-- Simple read-eval-print loop for Lean Lua frontend
|
||||
local function trim(s)
|
||||
return s:gsub('^%s+', ''):gsub('%s+$', '')
|
||||
end
|
||||
|
||||
local function show_results(...)
|
||||
if select('#', ...) > 1 then
|
||||
print(select(2, ...))
|
||||
end
|
||||
end
|
||||
|
||||
print([[Type 'exit' to exit.]])
|
||||
repeat
|
||||
io.write'lean > '
|
||||
local s = io.read()
|
||||
if s == nil then print(); break end
|
||||
if trim(s) == 'exit' then break end
|
||||
local f, err = loadstring(s, 'stdin')
|
||||
if err then
|
||||
f = loadstring('return (' .. s .. ')', 'stdin')
|
||||
end
|
||||
if f then
|
||||
local ok, err = pcall(f)
|
||||
if not ok then
|
||||
if is_exception(err) then
|
||||
print(err:what())
|
||||
else
|
||||
print(err)
|
||||
end
|
||||
else
|
||||
if err then print(err) end
|
||||
end
|
||||
else
|
||||
print(err)
|
||||
end
|
||||
until false
|
|
@ -27,7 +27,6 @@ Author: Leonardo de Moura
|
|||
#include "frontends/lean/shell.h"
|
||||
#include "frontends/lean/frontend.h"
|
||||
#include "frontends/lua/register_modules.h"
|
||||
#include "shell/lua_repl.h"
|
||||
#include "version.h"
|
||||
#include "githash.h" // NOLINT
|
||||
|
||||
|
@ -183,7 +182,7 @@ int main(int argc, char ** argv) {
|
|||
} else {
|
||||
lean_assert(default_k == input_kind::Lua);
|
||||
script_state S;
|
||||
S.dostring(g_lua_repl);
|
||||
S.import("repl");
|
||||
}
|
||||
} else {
|
||||
environment env;
|
||||
|
|
|
@ -1,79 +0,0 @@
|
|||
/*
|
||||
Copyright (c) 2013 Microsoft Corporation. All rights reserved.
|
||||
Released under Apache 2.0 license as described in the file LICENSE.
|
||||
|
||||
Author: Leonardo de Moura
|
||||
*/
|
||||
// Very simple read-eval-print for Lua
|
||||
|
||||
#if LUA_VERSION_NUM >= 520
|
||||
static char const * g_lua_repl =
|
||||
"local function trim(s)\n"
|
||||
" return s:gsub('^%s+', ''):gsub('%s+$', '')\n"
|
||||
"end\n"
|
||||
"local function show_results(...)\n"
|
||||
" if select('#', ...) > 1 then\n"
|
||||
" print(select(2, ...))\n"
|
||||
" end\n"
|
||||
"end\n"
|
||||
"print([[Type 'Exit' to exit.]])\n"
|
||||
"repeat\n"
|
||||
" io.write'lean > '\n"
|
||||
" local s = io.read()\n"
|
||||
" if s == nil then print(""); break end\n"
|
||||
" if trim(s) == 'Exit' then break end\n"
|
||||
" local f, err = load(s, 'stdin')\n"
|
||||
" if err then\n"
|
||||
" f = load('return (' .. s .. ')', 'stdin')\n"
|
||||
" end\n"
|
||||
" if f then\n"
|
||||
" local ok, err = pcall(f)\n"
|
||||
" if not ok then\n"
|
||||
" if is_exception(err) then\n"
|
||||
" print(err:what())\n"
|
||||
" else\n"
|
||||
" print(err)\n"
|
||||
" end\n"
|
||||
" else\n"
|
||||
" if err then print(err) end\n"
|
||||
" end\n"
|
||||
" else\n"
|
||||
" print(err)\n"
|
||||
" end\n"
|
||||
"until false\n";
|
||||
#else /* For Lua 5.1, we uses loadstring instead of load */
|
||||
static char const * g_lua_repl =
|
||||
"local function trim(s)\n"
|
||||
" return s:gsub('^%s+', ''):gsub('%s+$', '')\n"
|
||||
"end\n"
|
||||
"local function show_results(...)\n"
|
||||
" if select('#', ...) > 1 then\n"
|
||||
" print(select(2, ...))\n"
|
||||
" end\n"
|
||||
"end\n"
|
||||
"print([[Type 'Exit' to exit.]])\n"
|
||||
"repeat\n"
|
||||
" io.write'lean > '\n"
|
||||
" local s = io.read()\n"
|
||||
" if s == nil then print(""); break end\n"
|
||||
" if trim(s) == 'Exit' then break end\n"
|
||||
" local f, err = loadstring(s, 'stdin')\n"
|
||||
" if err then\n"
|
||||
" f = loadstring('return (' .. s .. ')', 'stdin')\n"
|
||||
" end\n"
|
||||
" if f then\n"
|
||||
" local ok, err = pcall(f)\n"
|
||||
" if not ok then\n"
|
||||
" if is_exception(err) then\n"
|
||||
" print(err:what())\n"
|
||||
" else\n"
|
||||
" print(err)\n"
|
||||
" end\n"
|
||||
" else\n"
|
||||
" if err then print(err) end\n"
|
||||
" end\n"
|
||||
" else\n"
|
||||
" print(err)\n"
|
||||
" end\n"
|
||||
"until false\n";
|
||||
#endif
|
Loading…
Reference in a new issue