h/fish-shell
1
Fork 0
mirror of https://github.com/fish-shell/fish-shell.git synced 2026-06-10 12:51:15 -03:00
Code Issues Packages Projects Releases Wiki Activity

Default parser_t::eval()'s block type to top

Browse Source 
This is the parameter value at every call site except one. Just make it the
default.
This commit is contained in:
ridiculousfish
2019-12-22 16:27:03 -08:00
parent 0c49dce75d
commit c19407ab0f
10 changed files with 29 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/fish.cpp
View File

@@ -228,7 +228,7 @@ static void source_config_in_directory(const wcstring &dir) {
const wcstring cmd = L"builtin source " + escaped_pathname;
parser_t &parser = parser_t::principal_parser();
set_is_within_fish_initialization(true);
parser.eval(cmd, io_chain_t(), block_type_t::top);
parser.eval(cmd, io_chain_t());
set_is_within_fish_initialization(false);
}
@@ -254,7 +254,7 @@ int run_command_list(std::vector<std::string> *cmds, const io_chain_t &io) {
for (const auto &cmd : *cmds) {
const wcstring cmd_wcs = str2wcstring(cmd);
eval_result_t eval_res = parser.eval(cmd_wcs, io, block_type_t::top);
eval_result_t eval_res = parser.eval(cmd_wcs, io);
res = (eval_res == eval_result_t::ok ? 0 : 1);
}