Mirrors/fish-shell
2
0
Fork 0
mirror of https://github.com/fish-shell/fish-shell synced 2024-12-27 05:13:10 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix for issue in new parser where no error would be reported if the very

Browse source 
first token is an error. Fixes #1239.
This commit is contained in:
ridiculousfish 2014-01-14 00:38:55 -08:00
parent dc8014562b
commit ff5e2746da
2 changed files with 11 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
fish_tests.cpp
View file

@ -2453,6 +2453,7 @@ static void test_new_parser_errors(void)
tests[] = tests[] =
{ {
{L"echo 'abc", parse_error_tokenizer_unterminated_quote}, {L"echo 'abc", parse_error_tokenizer_unterminated_quote},
{L"'", parse_error_tokenizer_unterminated_quote},
{L"echo (abc", parse_error_tokenizer_unterminated_subshell}, {L"echo (abc", parse_error_tokenizer_unterminated_subshell},
{L"end", parse_error_unbalancing_end}, {L"end", parse_error_unbalancing_end},

16
parse_tree.cpp
View file

@ -1116,10 +1116,10 @@ bool parse_tree_from_string(const wcstring &str, parse_tree_flags_t parse_flags,
tokenizer_t tok = tokenizer_t(str.c_str(), tok_options); tokenizer_t tok = tokenizer_t(str.c_str(), tok_options);
/* We are an LL(2) parser. We pass two tokens at a time. New tokens come in at index 1. Seed our queue with an initial token at index 1. */ /* We are an LL(2) parser. We pass two tokens at a time. New tokens come in at index 1. Seed our queue with an initial token at index 1. */
parse_token_t queue[2] = {kInvalidToken, next_parse_token(&tok)}; parse_token_t queue[2] = {kInvalidToken, kInvalidToken};
/* Loop until we get a terminal token */ /* Loop until we have a terminal token. */
do for (size_t token_count = 0; queue[0].type != parse_token_type_terminate; token_count++)
{ {
/* Push a new token onto the queue */ /* Push a new token onto the queue */
queue[0] = queue[1]; queue[0] = queue[1];
@ -1131,8 +1131,11 @@ bool parse_tree_from_string(const wcstring &str, parse_tree_flags_t parse_flags,
break; break;
} }
/* Pass these two tokens. We know that queue[0] is valid; queue[1] may be invalid. */ /* Pass these two tokens, unless we're still loading the queue. We know that queue[0] is valid; queue[1] may be invalid. */
if (token_count > 0)
{
parser.accept_tokens(queue[0], queue[1]); parser.accept_tokens(queue[0], queue[1]);
}
/* Handle tokenizer errors. This is a hack because really the parser should report this for itself; but it has no way of getting the tokenizer message */ /* Handle tokenizer errors. This is a hack because really the parser should report this for itself; but it has no way of getting the tokenizer message */
if (queue[1].type == parse_special_type_tokenizer_error) if (queue[1].type == parse_special_type_tokenizer_error)
@ -1159,10 +1162,7 @@ bool parse_tree_from_string(const wcstring &str, parse_tree_flags_t parse_flags,
break; break;
} }
} }
}
/* If this was the last token, then stop the loop */
} while (queue[0].type != parse_token_type_terminate);
// Teach each node where its source range is // Teach each node where its source range is
parser.determine_node_ranges(); parser.determine_node_ranges();