aboutsummaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
Diffstat (limited to 'include')
-rw-r--r--include/minishell.h7
-rw-r--r--include/parser.h4
2 files changed, 7 insertions, 4 deletions
diff --git a/include/minishell.h b/include/minishell.h
index b1af152..04a9ce0 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/10/10 08:14:38 by cacharle ### ########.fr */
+/* Updated: 2020/10/10 10:33:56 by cacharle ### ########.fr */
/* */
/* ************************************************************************** */
@@ -123,11 +123,14 @@ int builtin_exit(char **argv, t_env env);
** preprocess.c
*/
+# define INTERPOLATION_STR 0
+# define INTERPOLATION_CURR 1
+
char **preprocess(t_tok_lst **tokens, t_env env);
int preprocess_filename(
t_tok_lst **tokens, t_env env, char **filename);
size_t interpolate(
- char *str, size_t i, t_tok_lst **curr_addr,
+ void *ptrs[2], size_t i,
enum e_tok prev_tag, t_env env);
/*
diff --git a/include/parser.h b/include/parser.h
index c2d2381..91acfe7 100644
--- a/include/parser.h
+++ b/include/parser.h
@@ -6,7 +6,7 @@
/* By: cacharle <cacharle@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2020/02/28 09:00:00 by cacharle #+# #+# */
-/* Updated: 2020/10/10 09:20:53 by cacharle ### ########.fr */
+/* Updated: 2020/10/10 09:24:15 by cacharle ### ########.fr */
/* */
/* ************************************************************************** */
@@ -119,7 +119,7 @@ void parsed_destroy(t_parsed *parsed);
t_parsed *parsed_error(const char *format, ...);
t_parsed *parsed_expected(void);
t_parsed *parsed_unexpected(char *content);
-bool parsed_err(t_parsed *parsed);
+bool parsed_check(t_parsed *parsed);
/*
** parse.c