Mirrors/fish-shell
2
0
Fork 0
mirror of https://github.com/fish-shell/fish-shell synced 2025-01-12 13:08:49 +00:00
Code Issues Projects Releases Packages Wiki Activity

Run restyle.sh to enforce style rules.

Browse source
This commit is contained in:
ridiculousfish 2014-03-31 10:01:39 -07:00
parent fe3b439e31
commit 0d3169ef70
30 changed files with 450 additions and 443 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
parse_execution.h
View file

@ -116,7 +116,10 @@ public:
parse_execution_context_t(const parse_node_tree_t &t, const wcstring &s, parser_t *p, int initial_eval_level); parse_execution_context_t(const parse_node_tree_t &t, const wcstring &s, parser_t *p, int initial_eval_level);
/* Returns the current eval level */ /* Returns the current eval level */
int current_eval_level() const { return eval_level; } int current_eval_level() const
{
return eval_level;
}
/* Returns the current line number, indexed from 1. Not const since it touches cached_lineno_offset */ /* Returns the current line number, indexed from 1. Not const since it touches cached_lineno_offset */
int get_current_line_number(); int get_current_line_number();
@ -125,7 +128,10 @@ public:
int get_current_source_offset() const; int get_current_source_offset() const;
/* Returns the source string */ /* Returns the source string */
const wcstring &get_source() const { return src; } const wcstring &get_source() const
{
return src;
}
/* Start executing at the given node offset. Returns 0 if there was no error, 1 if there was an error */ /* Start executing at the given node offset. Returns 0 if there was no error, 1 if there was an error */
parse_execution_result_t eval_node_at_offset(node_offset_t offset, const block_t *associated_block, const io_chain_t &io); parse_execution_result_t eval_node_at_offset(node_offset_t offset, const block_t *associated_block, const io_chain_t &io);

3
parse_tree.cpp
View file

@ -1502,7 +1502,8 @@ bool parse_node_tree_t::job_should_be_backgrounded(const parse_node_t &job) cons
assert(job.production_idx == 0); assert(job.production_idx == 0);
bool result = false; bool result = false;
const parse_node_t *opt_background = get_child(job, 2, symbol_optional_background); const parse_node_t *opt_background = get_child(job, 2, symbol_optional_background);
if (opt_background != NULL) { if (opt_background != NULL)
{
assert(opt_background->production_idx <= 1); assert(opt_background->production_idx <= 1);
result = (opt_background->production_idx == 1); result = (opt_background->production_idx == 1);
} }