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

Restored to old state that doesn't leak

Browse source
This commit is contained in:
Maix0 2024-08-18 21:46:29 +02:00
parent 1a74bb38d3
commit 7329c95ba0
11 changed files with 1028 additions and 328 deletions
Download patch file Download diff file Expand all files Collapse all files

26
parser/src/scanner.c
View file

@ -57,22 +57,22 @@ typedef struct Scanner
Array(Heredoc) heredocs;
} Scanner;
/*R static inline R*/ void advance(TSLexer *lexer)
static inline void advance(TSLexer *lexer)
{
lexer->advance(lexer, false);
}
/*R static inline R*/ void skip(TSLexer *lexer)
static inline void skip(TSLexer *lexer)
{
lexer->advance(lexer, true);
}
/*R static inline R*/ bool in_error_recovery(const bool *valid_symbols)
static inline bool in_error_recovery(const bool *valid_symbols)
{
return valid_symbols[ERROR_RECOVERY];
}
/*R static inline R*/ void reset_string(String *string)
static inline void reset_string(String *string)
{
if (string->size > 0)
{
@ -81,7 +81,7 @@ typedef struct Scanner
}
}
/*R static inline R*/ void reset_heredoc(Heredoc *heredoc)
static inline void reset_heredoc(Heredoc *heredoc)
{
heredoc->is_raw = false;
heredoc->started = false;
@ -89,7 +89,7 @@ typedef struct Scanner
reset_string(&heredoc->delimiter);
}
/*R static inline R*/ void reset(Scanner *scanner)
static inline void reset(Scanner *scanner)
{
for (t_u32 i = 0; i < scanner->heredocs.size; i++)
{
@ -129,7 +129,7 @@ static t_u32 serialize(Scanner *scanner, t_u8 *buffer)
return size;
}
/*R static R*/ void deserialize(Scanner *scanner, const t_u8 *buffer, t_u32 length)
static void deserialize(Scanner *scanner, const t_u8 *buffer, t_u32 length)
{
if (length == 0)
{
@ -181,7 +181,7 @@ static t_u32 serialize(Scanner *scanner, t_u8 *buffer)
* POSIX-mandated substitution, and assumes the default value for
* IFS.
*/
/*R static R*/ bool advance_word(TSLexer *lexer, String *unquoted_word)
static bool advance_word(TSLexer *lexer, String *unquoted_word)
{
bool empty = true;
t_i32 quote = 0;
@ -213,7 +213,7 @@ static t_u32 serialize(Scanner *scanner, t_u8 *buffer)
return !empty;
}
/*R static inline R*/ bool scan_bare_dollar(TSLexer *lexer)
static inline bool scan_bare_dollar(TSLexer *lexer)
{
while (iswspace(lexer->lookahead) && lexer->lookahead != '\n' && !lexer->eof(lexer))
skip(lexer);
@ -229,7 +229,7 @@ static t_u32 serialize(Scanner *scanner, t_u8 *buffer)
return false;
}
/*R static R*/ bool scan_heredoc_start(Heredoc *heredoc, TSLexer *lexer)
static bool scan_heredoc_start(Heredoc *heredoc, TSLexer *lexer)
{
while (iswspace(lexer->lookahead))
{
@ -248,7 +248,7 @@ static t_u32 serialize(Scanner *scanner, t_u8 *buffer)
return found_delimiter;
}
/*R static R*/ bool scan_heredoc_end_identifier(Heredoc *heredoc, TSLexer *lexer)
static bool scan_heredoc_end_identifier(Heredoc *heredoc, TSLexer *lexer)
{
reset_string(&heredoc->current_leading_word);
// Scan the first 'n' characters on this line, to see if they match the
@ -268,7 +268,7 @@ static t_u32 serialize(Scanner *scanner, t_u8 *buffer)
return heredoc->delimiter.size == 0 ? false : strcmp(heredoc->current_leading_word.contents, heredoc->delimiter.contents) == 0;
}
/*R static R*/ bool scan_heredoc_content(Scanner *scanner, TSLexer *lexer, enum TokenType middle_type, enum TokenType end_type)
static bool scan_heredoc_content(Scanner *scanner, TSLexer *lexer, enum TokenType middle_type, enum TokenType end_type)
{
bool did_advance = false;
Heredoc *heredoc = array_back(&scanner->heredocs);
@ -394,7 +394,7 @@ static t_u32 serialize(Scanner *scanner, t_u8 *buffer)
}
}
/*R static R*/ bool scan(Scanner *scanner, TSLexer *lexer, const bool *valid_symbols)
static bool scan(Scanner *scanner, TSLexer *lexer, const bool *valid_symbols)
{
if (valid_symbols[CONCAT] && !in_error_recovery(valid_symbols))
{