|
|
@ -225,11 +225,16 @@ bool DFHack::Lua::InterpreterLoop(color_ostream &out, lua_State *state,
|
|
|
|
DFHack::CommandHistory hist;
|
|
|
|
DFHack::CommandHistory hist;
|
|
|
|
hist.load(hfile);
|
|
|
|
hist.load(hfile);
|
|
|
|
|
|
|
|
|
|
|
|
out.print("Type quit to exit interactive lua interpreter.\n"
|
|
|
|
out.print("Type quit to exit interactive lua interpreter.\n");
|
|
|
|
"Shortcuts:\n"
|
|
|
|
|
|
|
|
" '= foo' => '_1,_2,... = foo'\n"
|
|
|
|
static bool print_banner = true;
|
|
|
|
" '! foo' => 'print(foo)'\n"
|
|
|
|
if (print_banner) {
|
|
|
|
"Both assign the first result to '_'\n");
|
|
|
|
out.print("Shortcuts:\n"
|
|
|
|
|
|
|
|
" '= foo' => '_1,_2,... = foo'\n"
|
|
|
|
|
|
|
|
" '! foo' => 'print(foo)'\n"
|
|
|
|
|
|
|
|
"Both save the first result as '_'.\n");
|
|
|
|
|
|
|
|
print_banner = false;
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
Console &con = static_cast<Console&>(out);
|
|
|
|
Console &con = static_cast<Console&>(out);
|
|
|
|
|
|
|
|
|
|
|
@ -305,7 +310,7 @@ bool DFHack::Lua::InterpreterLoop(color_ostream &out, lua_State *state,
|
|
|
|
{
|
|
|
|
{
|
|
|
|
if (!load_with_env(out, state, curline, base))
|
|
|
|
if (!load_with_env(out, state, curline, base))
|
|
|
|
continue;
|
|
|
|
continue;
|
|
|
|
if (!SafeCall(out, state, 0, LUA_MULTRET))
|
|
|
|
if (!SafeCall(out, state, 0, 0))
|
|
|
|
continue;
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|