raphael/minishell
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

merged from master!

Browse source
This commit is contained in:
Maix0 2024-05-10 21:44:35 +02:00
commit b4c6aed6c4
15 changed files with 210 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

6
parser/src/scanner.c
View file

@ -304,8 +304,8 @@ static bool scan_heredoc_content(Scanner *scanner, t_lexer_data *lexer, enum Tok
lexer->result_symbol = heredoc->started ? middle_type : end_type;
lexer->mark_end(lexer);
if (scan_heredoc_end_identifier(heredoc, lexer)) {
if (lexer->result_symbol == HEREDOC_END) {
array_pop(&scanner->heredocs);
if (lexer->result_symbol == HEREDOC_END) {
(void) array_pop(&scanner->heredocs);
}
return true;
}
@ -444,7 +444,7 @@ static bool scan(Scanner *scanner, t_lexer_data *lexer, const bool *valid_symbol
if (scan_heredoc_end_identifier(heredoc, lexer)) {
array_delete(&heredoc->current_leading_word);
array_delete(&heredoc->delimiter);
array_pop(&scanner->heredocs);
(void)array_pop(&scanner->heredocs);
lexer->result_symbol = HEREDOC_END;
return true;
}