aboutsummaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorCharles <sircharlesaze@gmail.com>2020-06-12 09:05:28 +0200
committerCharles <sircharlesaze@gmail.com>2020-06-12 12:00:27 +0200
commitf08325f76ba4aac15dc3125b7779045956863a4b (patch)
tree2f6f022dc355c41985aab9e1c188a4e9582713b9 /include
parent4e81fb861a79c9373b070176649bc0f4f8dfa850 (diff)
downloadminishell-f08325f76ba4aac15dc3125b7779045956863a4b.tar.gz
minishell-f08325f76ba4aac15dc3125b7779045956863a4b.tar.bz2
minishell-f08325f76ba4aac15dc3125b7779045956863a4b.zip
Added preprocess escape with backslash, sticky str merge, travis CI before merge
Diffstat (limited to 'include')
-rw-r--r--include/lexer.h7
-rw-r--r--include/minishell.h5
2 files changed, 6 insertions, 6 deletions
diff --git a/include/lexer.h b/include/lexer.h
index 9377807..c56244f 100644
--- a/include/lexer.h
+++ b/include/lexer.h
@@ -4,9 +4,10 @@
//////////////////////////////////////
enum e_token_tag
{
- LTAG_STR,
- LTAG_STR_SINGLE,
- LTAG_STR_DOUBLE,
+ LTAG_STR = 1 << 0,
+ LTAG_STR_SINGLE = 1 << 1,
+ LTAG_STR_DOUBLE = 1 << 2,
+ LTAG_STICK = 1 << 3,
};
typedef struct
diff --git a/include/minishell.h b/include/minishell.h
index 76e4f7a..2afbed9 100644
--- a/include/minishell.h
+++ b/include/minishell.h
@@ -6,7 +6,7 @@
/* By: cacharle <marvin@42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2020/02/26 15:33:51 by cacharle #+# #+# */
-/* Updated: 2020/06/09 14:05:36 by charles ### ########.fr */
+/* Updated: 2020/06/12 11:57:36 by charles ### ########.fr */
/* */
/* ************************************************************************** */
@@ -109,7 +109,6 @@ int builtin_exit(char **argv, t_env env);
** preprocess.c
*/
-char *preprocess(char *input, t_env env);
-char **preprocess_argv(t_ftvec *argv, t_env env);
+char **preprocess(t_ftvec *argv, t_env env);
#endif