From 2a8056e885151fa155bf82a3d8cc97b0905ea577 Mon Sep 17 00:00:00 2001 From: Charles Cabergs Date: Fri, 9 Oct 2020 14:01:03 +0200 Subject: Norming header, Fixing mistakes detected by static analyser --- include/lexer.h | 66 ++++++++++++++++++++++++++++++--------------------------- 1 file changed, 35 insertions(+), 31 deletions(-) (limited to 'include/lexer.h') diff --git a/include/lexer.h b/include/lexer.h index 72480d5..36dfd5b 100644 --- a/include/lexer.h +++ b/include/lexer.h @@ -6,7 +6,7 @@ /* By: nahaddac +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2020/06/19 10:51:26 by nahaddac #+# #+# */ -/* Updated: 2020/10/08 17:38:33 by cacharle ### ########.fr */ +/* Updated: 2020/10/09 13:44:09 by cacharle ### ########.fr */ /* */ /* ************************************************************************** */ @@ -43,25 +43,25 @@ ** \param TAG_IS_SEP all of separator tags */ -enum e_tok +enum e_tok { - TAG_AND = 1 << 0, - TAG_END = 1 << 1, - TAG_OR = 1 << 2, - TAG_PIPE = 1 << 3, - TAG_REDIR_IN = 1 << 4, - TAG_REDIR_OUT = 1 << 5, + TAG_AND = 1 << 0, + TAG_END = 1 << 1, + TAG_OR = 1 << 2, + TAG_PIPE = 1 << 3, + TAG_REDIR_IN = 1 << 4, + TAG_REDIR_OUT = 1 << 5, TAG_REDIR_APPEND = 1 << 6, - TAG_PARENT_OPEN = 1 << 7, + TAG_PARENT_OPEN = 1 << 7, TAG_PARENT_CLOSE = 1 << 8, - TAG_STR = 1 << 9, - TAG_STR_DOUBLE = 1 << 10, - TAG_STR_SINGLE = 1 << 11, - TAG_STICK = 1 << 12, - - TAG_IS_STR = TAG_STR | TAG_STR_SINGLE | TAG_STR_DOUBLE, - TAG_IS_REDIR = TAG_REDIR_IN | TAG_REDIR_OUT | TAG_REDIR_APPEND, - TAG_IS_SEP = TAG_AND | TAG_END | TAG_OR, + TAG_STR = 1 << 9, + TAG_STR_DOUBLE = 1 << 10, + TAG_STR_SINGLE = 1 << 11, + TAG_STICK = 1 << 12, + + TAG_IS_STR = TAG_STR | TAG_STR_SINGLE | TAG_STR_DOUBLE, + TAG_IS_REDIR = TAG_REDIR_IN | TAG_REDIR_OUT | TAG_REDIR_APPEND, + TAG_IS_SEP = TAG_AND | TAG_END | TAG_OR, }; /* @@ -86,11 +86,16 @@ typedef struct s_tok_lst } t_tok_lst; t_tok_lst *tok_lst_new(enum e_tok tag, char *content); -t_tok_lst *tok_lst_new_until(enum e_tok tag, char *content, size_t n); -void tok_lst_push_back(t_tok_lst **tokens, t_tok_lst *pushed); -t_tok_lst *tok_lst_push_front(t_tok_lst **tokens, t_tok_lst *pushed); -void tok_lst_pop_front(t_tok_lst **tokens, void (*del)(void*)); -void *tok_lst_destroy(t_tok_lst **tokens, void (*del)(void*)); +t_tok_lst *tok_lst_new_until( + enum e_tok tag, char *content, size_t n); +void tok_lst_push_back( + t_tok_lst **tokens, t_tok_lst *pushed); +t_tok_lst *tok_lst_push_front( + t_tok_lst **tokens, t_tok_lst *pushed); +void tok_lst_pop_front( + t_tok_lst **tokens, void (*del)(void*)); +void *tok_lst_destroy( + t_tok_lst **tokens, void (*del)(void*)); t_tok_lst *tok_lst_last(t_tok_lst *tokens); t_tok_lst *tok_lst_uncons(t_tok_lst **tokens); @@ -98,27 +103,26 @@ t_tok_lst *tok_lst_uncons(t_tok_lst **tokens); ** lexer.c */ -int len_until_sep(char *input); +int len_until_sep(char *input); int tok_len(char *input); t_tok_lst *create_token_list(char *input, t_tok_lst **lst); int lexer(char *input, t_tok_lst **out); - /* ** utils.c */ -enum e_tok tok_assign_tag(char *content); -enum e_tok tok_assign_stick(t_tok_lst *tok); -enum e_tok tok_assign_str(t_tok_lst *tok); -int lexer_sep(char input); -int lexer_space(char *input); -int quote_len(char *input, int i); +enum e_tok tok_assign_tag(char *content); +enum e_tok tok_assign_stick(t_tok_lst *tok); +enum e_tok tok_assign_str(t_tok_lst *tok); +int lexer_sep(char input); +int lexer_space(char *input); +int quote_len(char *input, int i); /* ** trim.c */ -int lexer_trim(t_tok_lst *lst); +int lexer_trim(t_tok_lst *lst); #endif -- cgit