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

63
parser/src/scanner/scan_varname.c
View file

@ -6,20 +6,25 @@
/* By: maiboyer <maiboyer@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2024/09/02 17:26:05 by maiboyer #+# #+# */
/* Updated: 2024/09/02 17:28:10 by maiboyer ### ########.fr */
/* Updated: 2024/09/02 18:01:41 by maiboyer ### ########.fr */
/* */
/* ************************************************************************** */
#include "me/char/char.h"
#include "parser/inner/scanner.h"
bool scan_varname(t_scanner *scanner, TSLexer *lexer, const bool *valid_symbols)
bool scan_varname(t_scanner *scanner, TSLexer *lexer,
const bool *valid_symbols)
{
t_heredoc heredoc;
bool is_number;
while (true)
{
if ((lexer->lookahead == ' ' || lexer->lookahead == '\t' || lexer->lookahead == '\r' ||
(lexer->lookahead == '\n' && !valid_symbols[NEWLINE])) &&
!valid_symbols[EXPANSION_WORD])
if ((lexer->lookahead == ' ' || lexer->lookahead == '\t'
|| lexer->lookahead == '\r' || (lexer->lookahead == '\n'
&& !valid_symbols[NEWLINE]))
&& !valid_symbols[EXPANSION_WORD])
lexer->advance(lexer, true);
else if (lexer->lookahead == '\\')
{
@ -42,41 +47,41 @@ bool scan_varname(t_scanner *scanner, TSLexer *lexer, const bool *valid_symbols)
}
}
else
break;
break ;
}
// no '*', '@', '?', '-', '$', '0', '_'
if (!valid_symbols[EXPANSION_WORD] && (lexer->lookahead == '*' || lexer->lookahead == '@' || lexer->lookahead == '?' ||
lexer->lookahead == '-' || lexer->lookahead == '0' || lexer->lookahead == '_'))
if (!valid_symbols[EXPANSION_WORD] && (lexer->lookahead == '*'
|| lexer->lookahead == '@' || lexer->lookahead == '?'
|| lexer->lookahead == '-' || lexer->lookahead == '0'
|| lexer->lookahead == '_'))
{
lexer->mark_end(lexer);
lexer->advance(lexer, false);
if (lexer->lookahead == '=' || lexer->lookahead == '[' || lexer->lookahead == ':' || lexer->lookahead == '-' ||
lexer->lookahead == '%' || lexer->lookahead == '#' || lexer->lookahead == '/')
return false;
if (lexer->lookahead == '=' || lexer->lookahead == '['
|| lexer->lookahead == ':' || lexer->lookahead == '-'
|| lexer->lookahead == '%' || lexer->lookahead == '#'
|| lexer->lookahead == '/')
return (false);
if (valid_symbols[EXTGLOB_PATTERN] && me_isspace(lexer->lookahead))
{
lexer->mark_end(lexer);
lexer->result_symbol = EXTGLOB_PATTERN;
return true;
return (true);
}
}
if (valid_symbols[HEREDOC_ARROW] && lexer->lookahead == '<')
{
lexer->advance(lexer, false);
if (lexer->lookahead == '<')
{
lexer->advance(lexer, false);
t_heredoc heredoc = heredoc_new();
heredoc = heredoc_new();
vec_heredoc_push(&scanner->heredocs, heredoc);
lexer->result_symbol = HEREDOC_ARROW;
return (true);
}
return (false);
}
bool is_number = true;
is_number = true;
if (me_isdigit(lexer->lookahead))
lexer->advance(lexer, false);
else if (me_isalpha(lexer->lookahead) || lexer->lookahead == '_')
@ -92,7 +97,6 @@ bool scan_varname(t_scanner *scanner, TSLexer *lexer, const bool *valid_symbols)
return (scan_expansion_word(scanner, lexer, valid_symbols));
return (false);
}
while (true)
{
if (me_isdigit(lexer->lookahead))
@ -100,12 +104,11 @@ bool scan_varname(t_scanner *scanner, TSLexer *lexer, const bool *valid_symbols)
else if (me_isalpha(lexer->lookahead) || lexer->lookahead == '_')
is_number = (lexer->advance(lexer, false), false);
else
break;
break ;
}
if (is_number && valid_symbols[FILE_DESCRIPTOR] && (lexer->lookahead == '>' || lexer->lookahead == '<'))
if (is_number && valid_symbols[FILE_DESCRIPTOR] && (lexer->lookahead == '>'
|| lexer->lookahead == '<'))
return (lexer->result_symbol = FILE_DESCRIPTOR, true);
if (valid_symbols[VARIABLE_NAME])
{
if (lexer->lookahead == '+')
@ -114,13 +117,17 @@ bool scan_varname(t_scanner *scanner, TSLexer *lexer, const bool *valid_symbols)
lexer->advance(lexer, false);
if (lexer->lookahead == '=' || lexer->lookahead == ':')
return (lexer->result_symbol = VARIABLE_NAME, true);
return false;
return (false);
}
if (lexer->lookahead == '/')
return false;
if (lexer->lookahead == '=' || lexer->lookahead == '[' || (lexer->lookahead == ':' && !valid_symbols[OPENING_PAREN]) ||
lexer->lookahead == '%' || (lexer->lookahead == '#' && !is_number) || lexer->lookahead == '@' || (lexer->lookahead == '-'))
return (lexer->mark_end(lexer), lexer->result_symbol = VARIABLE_NAME, true);
return (false);
if (lexer->lookahead == '=' || lexer->lookahead == '['
|| (lexer->lookahead == ':' && !valid_symbols[OPENING_PAREN])
|| lexer->lookahead == '%' || (lexer->lookahead == '#'
&& !is_number) || lexer->lookahead == '@'
|| (lexer->lookahead == '-'))
return (lexer->mark_end(lexer),
lexer->result_symbol = VARIABLE_NAME, true);
if (lexer->lookahead == '?')
{
lexer->mark_end(lexer);