Updated parser to be more normed

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

View file

@ -6,17 +6,17 @@
/* By: maiboyer <maiboyer@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2024/09/02 17:37:05 by maiboyer #+# #+# */
/* Updated: 2024/09/02 17:42:58 by maiboyer ### ########.fr */
/* Updated: 2024/09/02 18:03:17 by maiboyer ### ########.fr */
/* */
/* ************************************************************************** */
#include "me/char/char.h"
#include "parser/inner/scanner.h"
bool scan_concat(t_scanner *scanner, TSLexer *lexer, const bool *valid_symbols)
bool scan_concat(\
t_scanner *scanner, TSLexer *lexer, const bool *valid_symbols)
{
(void)(scanner);
(void)(valid_symbols);
((void)(scanner), (void)(valid_symbols));
lexer->result_symbol = CONCAT;
if (lexer->lookahead == '`')
{
@ -34,7 +34,8 @@ bool scan_concat(t_scanner *scanner, TSLexer *lexer, const bool *valid_symbols)
{
lexer->mark_end(lexer);
lexer->advance(lexer, false);
if (lexer->lookahead == '"' || lexer->lookahead == '\'' || lexer->lookahead == '\\')
if (lexer->lookahead == '"' || lexer->lookahead == '\'' \
|| lexer->lookahead == '\\')
return (true);
if (lexer->eof(lexer))
return (false);
@ -42,11 +43,15 @@ bool scan_concat(t_scanner *scanner, TSLexer *lexer, const bool *valid_symbols)
return (true);
}
bool check_scan_concat(t_scanner *scanner, TSLexer *lexer, const bool *valid_symbols)
bool check_scan_concat(\
t_scanner *scanner, TSLexer *lexer, const bool *valid_symbols)
{
(void)(scanner);
return (valid_symbols[CONCAT] && !valid_symbols[ERROR_RECOVERY]) &&
(!(lexer->lookahead == 0 || me_isspace(lexer->lookahead) || lexer->lookahead == '>' || lexer->lookahead == '<' ||
lexer->lookahead == ')' || lexer->lookahead == '(' || lexer->lookahead == ';' || lexer->lookahead == '&' ||
lexer->lookahead == '|' || lexer->lookahead == '{' || lexer->lookahead == '}'));
return ((valid_symbols[CONCAT] && !valid_symbols[ERROR_RECOVERY]) \
&& (!(lexer->lookahead == 0 || me_isspace(lexer->lookahead) \
|| lexer->lookahead == '>' || lexer->lookahead == '<' \
|| lexer->lookahead == ')' || lexer->lookahead == '(' \
|| lexer->lookahead == ';' || lexer->lookahead == '&' \
|| lexer->lookahead == '|' || lexer->lookahead == '{' \
|| lexer->lookahead == '}')));
}