parser norminette is done 🏁

minishell/srcs/parser/filename_expansion.c

@@ -40,7 +40,7 @@ static t_list	*insert_new_tokens(t_list **tokens, t_list *prev, t_list *curr)
 {
 	t_list	**new_tokens;
 	t_list	*new_curr;
-	
+
 	new_curr = curr;
 	new_tokens = calloc_or_exit(1, sizeof(t_list *));
 	new_tokens = expand_filenames(new_tokens, ((t_token *)curr->content)->str);
@@ -71,7 +71,7 @@ static t_list	**expand_filenames(t_list **new_tokens, char *str)
 	curr_dir = open_current_dir(curr_dir_str);
 	if (curr_dir_str)
 		free((void *)curr_dir_str);
-	errno = 0;		// Necessary to check readdir error result
+	errno = 0;
 	curr_dir_entry = readdir(curr_dir);
 	while (curr_dir_entry)
 	{

minishell/srcs/parser/filename_expansion_util.c

@@ -2,7 +2,8 @@
 
 static char		*last_consecutive_asterisk(char *str);
 static int		get_str_to_match_len(char *str);
-static char		*pos_last_match(char *d_name, char *str_to_match, int match_len);
+static char		*pos_last_match(char *d_name,
+					char *str_to_match, int match_len);
 static void		add_new_word_token(t_list **new_tokens, char *token_str);
 
 void	save_expansion_if_match(t_list **new_tokens, char *d_name,
@@ -27,7 +28,6 @@ void	save_expansion_if_match(t_list **new_tokens, char *d_name,
 			return ;
 		token_str += 1 + str_to_match_len;
 	}
-	DEBUG(printf("%sMATCHED          : %s\n%s", CLR_BLUE, original_d_name, CLR_WHITE);)
 	add_new_word_token(new_tokens, (char *)original_d_name);
 }
 
@@ -47,7 +47,7 @@ static char	*last_consecutive_asterisk(char *str)
 static int	get_str_to_match_len(char *str)
 {
 	const char	*o_str = str;
-	
+
 	while (*str && *str != '*')
 		str++;
 	return (str - o_str);
@@ -59,10 +59,6 @@ static char	*pos_last_match(char *d_name, char *str_to_match, int match_len)
 	int		nb_possible_matchs;
 
 	nb_possible_matchs = ft_strlen(d_name) - match_len + 1;
-	DEBUG (
-		printf("  %sd_name:%-14s | str_to_match: %-8.*s | match_len: %d | nb_pos: %d\n%s",
-			CLR_YELLOW, d_name, match_len, str_to_match, match_len, nb_possible_matchs, CLR_WHITE);
-	)
 	curr_match = NULL;
 	while (nb_possible_matchs > 0)
 	{

minishell/srcs/parser/lexer.c

@@ -1,9 +1,9 @@
 #include "minishell.h"
 
-static t_token	*init_token(char *token_start);
-static t_token_type	get_token_type(char *token_start);
+static t_token			*init_token(char *token_start);
+static t_token_type		get_token_type(char *token_start);
 static t_operator_type	get_operator_type(t_token *token);
-static void	save_token(t_list **tokens, t_token *curr_token);
+static void				save_token(t_list **tokens, t_token *curr_token);
 
 t_list	**lexer(char *line, t_list **tokens)
 {

minishell/srcs/parser/parameter_expansion.c

@@ -3,7 +3,7 @@
 static char	*par_name_start(char *str);
 static int	get_len_par_name(char *par_start);
 
-void			parameter_expansion(t_list **tokens)
+void	parameter_expansion(t_list **tokens)
 {
 	t_list	*curr;
 	char	*start_par_name;
@@ -32,12 +32,14 @@ static char	*par_name_start(char *str)
 	while (*str)
 	{
 		if (!update_quote_type(get_quote_type(*str), &prev_qt_type))
+		{
 			if (prev_qt_type != SINGLE_QUOTES && *str == '$')
 			{
 				next_c = *(str + 1);
 				if (ft_isalpha(next_c) || next_c == '?' || next_c == '_')
 					return (str);
 			}
+		}
 		str++;
 	}
 	return (NULL);

minishell/srcs/parser/parameter_expansion_util.c

@@ -2,7 +2,7 @@
 
 static char	*expand_exit_code(char *start_name, t_token *token);
 static char	*expand_std_parameter(char *start_name, const char *par_name,
-	t_token *token);
+				t_token *token);
 
 void	expand_parameter(char *start_name, int size_name, t_token *token)
 {
@@ -42,16 +42,16 @@ static char	*expand_std_parameter(char *start_name, const char *par_name,
 
 	if (par_value == NULL)
 	{
-		new_str = calloc_or_exit(1, ft_strlen(token->str)
-			- par_name_len + 1);
+		new_str = calloc_or_exit(1,
+				ft_strlen(token->str) - par_name_len + 1);
 		ft_strlcat(new_str, token->str, start_name - token->str + 1);
 		ft_strlcat(new_str, start_name + par_name_len,
 			ft_strlen(new_str) + ft_strlen(start_name + par_name_len) + 1);
 	}
 	else
 	{
 		new_str = calloc_or_exit(1, ft_strlen(token->str)
-			+ ft_strlen(par_value) - par_name_len + 1);
+				+ ft_strlen(par_value) - par_name_len + 1);
 		ft_strlcat(new_str, token->str, start_name - token->str + 1);
 		ft_strlcat(new_str, par_value,
 			ft_strlen(new_str) + ft_strlen(par_value) + 1);

minishell/srcs/parser/perform_expansions.c

@@ -5,4 +5,4 @@ void	perform_expansions(t_list **tokens)
 	parameter_expansion(tokens);
 	filename_expansion(tokens);
 	quote_removal(*tokens);
-}
+}

minishell/srcs/parser/validate_grammar.c

@@ -1,9 +1,10 @@
 #include <minishell.h>
 
 static void	advance_node(t_grammar_vars *grammar);
-static void	initializes_grammar_vars(t_grammar_vars *grammar, t_list *curr_node);
+static void	initializes_grammar_vars(t_grammar_vars *grammar,
+				t_list *curr_node);
 static bool	check_token(t_grammar_vars *grammar);
-static void print_faulty_token(t_grammar_vars *grammar);
+static void	print_faulty_token(t_grammar_vars *grammar);
 
 void	validate_grammar(t_list *curr_node)
 {
@@ -23,9 +24,9 @@ void	validate_grammar(t_list *curr_node)
 	}
 }
 
-static void print_faulty_token(t_grammar_vars *grammar)
+static void	print_faulty_token(t_grammar_vars *grammar)
 {
-	char *token;
+	char	*token;
 
 	token = ((t_token *)grammar->curr->content)->str;
 	write(1, &ERROR_MESSAGE, ft_strlen(ERROR_MESSAGE));
@@ -58,9 +59,9 @@ static bool	check_token(t_grammar_vars *grammar)
 {
 	if (get_token(grammar->curr)->op_type == OP_REDIR
 		&& (!grammar->next || (get_token(grammar->next)->type != WORD)))
-			return (false);
+		return (false);
 	else if (get_token(grammar->curr)->op_type == OP_LOGIC
-			|| get_token(grammar->curr)->op_type == OP_PIPE)
+		|| get_token(grammar->curr)->op_type == OP_PIPE)
 	{
 		if (!grammar->prev || !grammar->next
 			|| (get_token(grammar->prev)->type != WORD