aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorCharles Cabergs <me@cacharle.xyz>2020-08-27 09:29:42 +0200
committerCharles Cabergs <me@cacharle.xyz>2020-08-27 09:29:42 +0200
commit454d439575489934791c04329df6e82e56dabf54 (patch)
tree3beaa9ec4eec1e95898d26d77f88cceaff5978d9 /src
parentcde465358750ef03b66655edcbef468a4a2f210b (diff)
downloadminishell-454d439575489934791c04329df6e82e56dabf54.tar.gz
minishell-454d439575489934791c04329df6e82e56dabf54.tar.bz2
minishell-454d439575489934791c04329df6e82e56dabf54.zip
Renaming e_token_tag -> e_tok
Diffstat (limited to 'src')
-rw-r--r--src/eval/redir.c4
-rw-r--r--src/lexer/lexer.c6
-rw-r--r--src/lexer/lexer_utils.c4
-rw-r--r--src/lexer/token.c8
-rw-r--r--src/parse/cmd_parse.c2
-rw-r--r--src/parse/parse.c8
-rw-r--r--src/parse/redir_parse.c2
-rw-r--r--src/preprocess.c2
8 files changed, 18 insertions, 18 deletions
diff --git a/src/eval/redir.c b/src/eval/redir.c
index 49cfa1d..8f3a266 100644
--- a/src/eval/redir.c
+++ b/src/eval/redir.c
@@ -6,13 +6,13 @@
/* By: charles <charles.cabergs@gmail.com> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2020/06/15 11:05:34 by charles #+# #+# */
-/* Updated: 2020/07/19 18:57:03 by charles ### ########.fr */
+/* Updated: 2020/08/27 09:28:55 by charles ### ########.fr */
/* */
/* ************************************************************************** */
#include "eval.h"
-static enum e_token_tag st_lst_tag(t_ftlst *lst)
+static enum e_tok st_lst_tag(t_ftlst *lst)
{
return (((t_token*)lst->data)->tag);
}
diff --git a/src/lexer/lexer.c b/src/lexer/lexer.c
index 2e16eab..6a8a0ca 100644
--- a/src/lexer/lexer.c
+++ b/src/lexer/lexer.c
@@ -99,7 +99,7 @@ int check_input_out(char *input)
return(0);
}
-enum e_token_tag token_verif_stick(t_token *lst_token)
+enum e_tok token_verif_stick(t_token *lst_token)
{
int i;
@@ -110,7 +110,7 @@ enum e_token_tag token_verif_stick(t_token *lst_token)
return(lst_token->tag | TAG_STICK);
}
-enum e_token_tag token_str_or_cote(t_token *lst_token)
+enum e_tok token_str_or_cote(t_token *lst_token)
{
int i;
@@ -139,7 +139,7 @@ enum e_token_tag token_str_or_cote(t_token *lst_token)
t_token *push_token_enum(t_token *lst_token)
{
- enum e_token_tag tk;
+ enum e_tok tk;
tk = ret_token(lst_token->content, 0);
if (tk == 0)
diff --git a/src/lexer/lexer_utils.c b/src/lexer/lexer_utils.c
index 3a1378c..74b1fa4 100644
--- a/src/lexer/lexer_utils.c
+++ b/src/lexer/lexer_utils.c
@@ -13,7 +13,7 @@
#include "lexer.h"
// check for append tag
-enum e_token_tag ret_token_sep_redir_append(char *input, int i)
+enum e_tok ret_token_sep_redir_append(char *input, int i)
{
if (input[i + 1] == '>')
return(TAG_REDIR_APPEND);
@@ -22,7 +22,7 @@ enum e_token_tag ret_token_sep_redir_append(char *input, int i)
}
// return token tag corresponding to string id
-enum e_token_tag ret_token(char *input, int i)
+enum e_tok ret_token(char *input, int i)
{
if (input[i] == ';')
return(TAG_END);
diff --git a/src/lexer/token.c b/src/lexer/token.c
index 43971de..9904351 100644
--- a/src/lexer/token.c
+++ b/src/lexer/token.c
@@ -12,7 +12,7 @@
#include "lexer.h"
-t_token *token_new(enum e_token_tag tag, char *content)
+t_token *token_new(enum e_tok tag, char *content)
{
size_t len;
@@ -22,7 +22,7 @@ t_token *token_new(enum e_token_tag tag, char *content)
return (token_new_until(tag, content, len));
}
-t_token *token_new_until(enum e_token_tag tag, char *content, int n)
+t_token *token_new_until(enum e_tok tag, char *content, int n)
{
t_token *token;
@@ -56,12 +56,12 @@ void token_destroy_lst2(t_ftlst *tokens1, t_ftlst *tokens2)
ft_lstdestroy(&tokens2, (void (*)(void*))token_destroy);
}
-enum e_token_tag token_tag(t_ftlst *token_lst)
+enum e_tok token_tag(t_ftlst *token_lst)
{
return (((t_token*)token_lst->data)->tag);
}
-void token_set_tag(t_ftlst *token_lst, enum e_token_tag tag)
+void token_set_tag(t_ftlst *token_lst, enum e_tok tag)
{
((t_token*)token_lst->data)->tag = tag;
}
diff --git a/src/parse/cmd_parse.c b/src/parse/cmd_parse.c
index 25802c1..bb68dac 100644
--- a/src/parse/cmd_parse.c
+++ b/src/parse/cmd_parse.c
@@ -2,7 +2,7 @@
#include "parser.h"
-int parse_cmd_str_true_false(enum e_token_tag tag)
+int parse_cmd_str_true_false(enum e_tok tag)
{
if (tag & TAG_STR || tag & TAG_STR_DOUBLE || tag & TAG_STR_SINGLE)
return (1);
diff --git a/src/parse/parse.c b/src/parse/parse.c
index 29b3ccb..b1df5ce 100644
--- a/src/parse/parse.c
+++ b/src/parse/parse.c
@@ -42,7 +42,7 @@ t_ret *ret_wrap_ast(t_ast *ast, t_ftlst *rest)
t_ret *parse_redir(t_ftlst *input, t_ftlst **redirs)
{
- enum e_token_tag tag;
+ enum e_tok tag;
t_ret *tmp;
push_token(redirs, input->data);
@@ -77,7 +77,7 @@ t_ret *parse_redir(t_ftlst *input, t_ftlst **redirs)
t_ret *parse_cmd(t_ftlst *input)
{
- enum e_token_tag tag;
+ enum e_tok tag;
t_ast *ast;
t_ret *tmp;
@@ -120,7 +120,7 @@ t_ret *parse_op(t_ftlst *input)
t_ast *ast;
t_ret *left_ret;
t_ret *right_ret;
- enum e_token_tag tag;
+ enum e_tok tag;
t_ret *tmp;
left_ret = parse_expr(input);
@@ -159,7 +159,7 @@ t_ret *parse_op(t_ftlst *input)
t_ret *parse_expr(t_ftlst *input)
{
t_ret *tmp;
- enum e_token_tag tag;
+ enum e_tok tag;
t_ast *new_ast;
tag = ((t_token*)input->data)->tag;
diff --git a/src/parse/redir_parse.c b/src/parse/redir_parse.c
index 768506e..ebd6583 100644
--- a/src/parse/redir_parse.c
+++ b/src/parse/redir_parse.c
@@ -1,7 +1,7 @@
#include "parser.h"
-int parse_redir_true_false(enum e_token_tag tag)
+int parse_redir_true_false(enum e_tok tag)
{
if (tag & TAG_IS_REDIR)
return (1);
diff --git a/src/preprocess.c b/src/preprocess.c
index 5782a45..f594969 100644
--- a/src/preprocess.c
+++ b/src/preprocess.c
@@ -82,7 +82,7 @@ char **st_tokens_to_argv(t_ftlst *tokens)
char **preprocess(t_ftlst **tokens, t_env env)
{
t_ftlst *curr;
- enum e_token_tag prev_tag;
+ enum e_tok prev_tag;
prev_tag = 0;
curr = *tokens;