h/fish-shell
1
Fork 0
mirror of https://github.com/fish-shell/fish-shell.git synced 2026-06-23 08:31:16 -03:00
Code Issues Packages Projects Releases Wiki Activity

Make is_event and other globals part of parser_t libdata

Browse Source
This commit is contained in:
ridiculousfish
2019-05-12 18:02:57 -07:00
parent c44dae2d73
commit 508c3a8005
10 changed files with 41 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/parser.cpp
View File

@@ -145,11 +145,11 @@ void parser_t::push_block_int(block_t *new_current) {
// Types TOP and SUBST are not considered blocks for the purposes of `status is-block`.
if (type != TOP && type != SUBST) {
is_block = true;
libdata().is_block = true;
}
if (type == BREAKPOINT) {
is_breakpoint = true;
libdata().is_breakpoint = true;
}
if (new_current->type() != TOP) {
@@ -182,7 +182,7 @@ void parser_t::pop_block(const block_t *expected) {
break;
}
}
is_block = new_is_block;
libdata().is_block = new_is_block;
// Are we still in a breakpoint?
bool new_is_breakpoint = false;
@@ -193,7 +193,7 @@ void parser_t::pop_block(const block_t *expected) {
break;
}
}
is_breakpoint = new_is_breakpoint;
libdata().is_breakpoint = new_is_breakpoint;
}
const wchar_t *parser_t::get_block_desc(int block) const {