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

Modify parser to accept 'begin' without ';'

Browse Source 
Examples that work as expected (even completions don't get confused):

$ begin true; end;
$ begin if true; end; end
$ begin if true; echo hi; end

The last example correctly expects another 'end' to match 'begin'.

Fixes #1248.
This commit is contained in:
Sanne Wouda
2015-03-11 23:53:24 +01:00
committed by David Adam
parent d1a56139e1
commit fd731fb74f
3 changed files with 23 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
parse_execution.cpp
View File

@@ -413,7 +413,7 @@ parse_execution_result_t parse_execution_context_t::run_block_statement(const pa
const parse_node_t &block_header = *get_child(statement, 0, symbol_block_header); //block header
const parse_node_t &header = *get_child(block_header, 0); //specific header type (e.g. for loop)
const parse_node_t &contents = *get_child(statement, 2, symbol_job_list); //block contents
const parse_node_t &contents = *get_child(statement, 1, symbol_job_list); //block contents
parse_execution_result_t ret = parse_execution_success;
switch (header.type)
@@ -428,7 +428,7 @@ parse_execution_result_t parse_execution_context_t::run_block_statement(const pa
case symbol_function_header:
{
const parse_node_t &function_end = *get_child(statement, 3, symbol_end_command); //the 'end' associated with the block
const parse_node_t &function_end = *get_child(statement, 2, symbol_end_command); //the 'end' associated with the block
ret = run_function_statement(header, function_end);
break;
}