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

Updated parser to be more normed

Browse source
This commit is contained in:
Maieul BOYER 2024-09-02 18:07:55 +02:00
parent 5e091fdf85
commit 62ac9f3813
No known key found for this signature in database
16 changed files with 166 additions and 131 deletions
Download patch file Download diff file Expand all files Collapse all files

43
parser/src/scanner/scan_word.c
View file

@ -6,44 +6,46 @@
/* By: maiboyer <maiboyer@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2024/09/02 16:59:16 by maiboyer #+# #+# */
/* Updated: 2024/09/02 17:22:25 by maiboyer ### ########.fr */
/* Updated: 2024/09/02 17:58:43 by maiboyer ### ########.fr */
/* */
/* ************************************************************************** */
#include "me/char/char.h"
#include "parser/inner/scanner.h"
bool scan_expansion_word(t_scanner *scanner, TSLexer *lexer, const bool *valid_symbols)
bool scan_expansion_word(t_scanner *scanner, TSLexer *lexer,
const bool *valid_symbols)
{
bool advanced_once = false;
bool advance_once_space = false;
bool advanced_once;
bool advance_once_space;
advanced_once = false;
advance_once_space = false;
(void)(scanner);
(void)(lexer);
(void)(valid_symbols);
while (true)
{
if (lexer->lookahead == '\"')
return false;
return (false);
if (lexer->lookahead == '$')
{
lexer->mark_end(lexer);
lexer->advance(lexer, false);
if (lexer->lookahead == '{' || lexer->lookahead == '(' || lexer->lookahead == '\'' || me_isalnum(lexer->lookahead))
if (lexer->lookahead == '{' || lexer->lookahead == '('
|| lexer->lookahead == '\'' || me_isalnum(lexer->lookahead))
{
lexer->result_symbol = EXPANSION_WORD;
return advanced_once;
return (advanced_once);
}
advanced_once = true;
}
if (lexer->lookahead == '}')
{
lexer->mark_end(lexer);
lexer->result_symbol = EXPANSION_WORD;
return advanced_once || advance_once_space;
return (advanced_once || advance_once_space);
}
if (lexer->lookahead == '(' && !(advanced_once || advance_once_space))
{
lexer->mark_end(lexer);
@ -54,17 +56,21 @@ bool scan_expansion_word(t_scanner *scanner, TSLexer *lexer, const bool *valid_s
{
lexer->mark_end(lexer);
lexer->advance(lexer, false);
if (lexer->lookahead == '{' || lexer->lookahead == '(' || lexer->lookahead == '\'' || me_isalnum(lexer->lookahead))
if (lexer->lookahead == '{' || lexer->lookahead == '('
|| lexer->lookahead == '\''
|| me_isalnum(lexer->lookahead))
{
lexer->result_symbol = EXPANSION_WORD;
return advanced_once;
return (advanced_once);
}
advanced_once = true;
}
else
{
advanced_once = advanced_once || !me_isspace(lexer->lookahead);
advance_once_space = advance_once_space || me_isspace(lexer->lookahead);
advanced_once = advanced_once
|| !me_isspace(lexer->lookahead);
advance_once_space = advance_once_space
|| me_isspace(lexer->lookahead);
lexer->advance(lexer, false);
}
}
@ -75,16 +81,15 @@ bool scan_expansion_word(t_scanner *scanner, TSLexer *lexer, const bool *valid_s
lexer->advance(lexer, false);
lexer->mark_end(lexer);
if (lexer->lookahead == '}')
return false;
return (false);
}
else
return false;
return (false);
}
if (lexer->lookahead == '\'')
return false;
return (false);
if (lexer->eof(lexer))
return false;
return (false);
advanced_once = advanced_once || !me_isspace(lexer->lookahead);
advance_once_space = advance_once_space || me_isspace(lexer->lookahead);
lexer->advance(lexer, false);