jack/42-archive
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

merge

Browse source
This commit is contained in:
Jack Halford 2017-03-28 07:46:24 +02:00
commit 744e864045
19 changed files with 110 additions and 139 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

161
42sh/42ShellTester/log
View file

@ -1,4 +1,4 @@
.x........................xxxx....x.
.x..........................xx....x.
----------------------------------------------------------------
@ -9,17 +9,16 @@
Before test:
 01: rm -rf "./size"
02: rm -rf "TOKEN201703270303"
03: echo '^'$(echo TOKEN201703270303_FILE_TOKEN201703270303_STDOUT | wc -c)'$' > "./size"
02: rm -rf "TOKEN201703271859"
03: echo '^'$(echo TOKEN201703271859_FILE_TOKEN201703271859_STDOUT | wc -c)'$' > "./size"
STDIN:
 01: mkdir TOKEN201703270303 ; cd TOKEN201703270303 ; touch TOKEN201703270303_FILE ; ls -1 ; ls | cat | wc -c > TOKEN201703270303_STDOUT ; cat TOKEN201703270303_STDOUT
 01: mkdir TOKEN201703271859 ; cd TOKEN201703271859 ; touch TOKEN201703271859_FILE ; ls -1 ; ls | cat | wc -c > TOKEN201703271859_STDOUT ; cat TOKEN201703271859_STDOUT
STDOUT:
 SUCCESS expected_to match_regex `TOKEN201703270303_FILE$`
 FAILURE expected_to match_regex `TOKEN201703271859_FILE$`
 FAILURE expected_to match_each_regex_of_file `./size`
 01: TOKEN201703270303_FILE
02: 23
 (no output)
STDERR:
 SUCCESS expected_to be_empty
@ -27,62 +26,6 @@
----------------------------------------------------------------
21sh/redirections/outputs/truncating/multiple/002-together-stdout-first (FAILED)
Description:
 A right redirection can be associated to the twice outputs by using `M>&N`, that means `redirect M to where N is redirected`.
In this test the standard output is specified first.
Before test:
 01: rm -f new_file_stderr_and_stdout
STDIN:
 01: ./write_on_stdout_and_stderr TOKEN201703270303_1 TOKEN201703270303_2 1>new_file_stderr_and_stdout 2>&1
STDOUT:
 SUCCESS expected_to_not match_regex `TOKEN201703270303_1`
 SUCCESS expected_to_not match_regex `TOKEN201703270303_2`
 (no output)
STDERR:
 SUCCESS expected_to_not match_regex `TOKEN201703270303_1`
 SUCCESS expected_to_not match_regex `TOKEN201703270303_2`
 (no output)
MISC:
 FAILURE expected_to create_file `new_file_stderr_and_stdout` matching_regex `TOKEN201703270303_1$`
 SUCCESS expected_to create_file `new_file_stderr_and_stdout` matching_regex `TOKEN201703270303_2$`
----------------------------------------------------------------
21sh/redirections/outputs/truncating/multiple/003-together-stderr-first (FAILED)
Description:
 A right redirection can be associated to the twice outputs by using `M>&N`, that means `redirect M to where N is redirected`.
In this test the standard error is specified first.
Before test:
 01: rm -f new_file_stderr_and_stdout
STDIN:
 01: ./write_on_stdout_and_stderr TOKEN201703270303_1 TOKEN201703270303_2 2>new_file_stderr_and_stdout 1>&2
STDOUT:
 SUCCESS expected_to_not match_regex `TOKEN201703270303_1`
 SUCCESS expected_to_not match_regex `TOKEN201703270303_2`
 (no output)
STDERR:
 SUCCESS expected_to_not match_regex `TOKEN201703270303_1`
 SUCCESS expected_to_not match_regex `TOKEN201703270303_2`
 (no output)
MISC:
 SUCCESS expected_to create_file `new_file_stderr_and_stdout` matching_regex `TOKEN201703270303_1$`
 FAILURE expected_to create_file `new_file_stderr_and_stdout` matching_regex `TOKEN201703270303_2$`
----------------------------------------------------------------
21sh/redirections/outputs/truncating/multiple/004-together (FAILED)
Description:
@ -92,21 +35,21 @@
 01: rm -f "new_file_stderr_and_stdout"
STDIN:
 01: ./write_on_stdout_and_stderr TOKEN201703270303_1 TOKEN201703270303_2 &>new_file_stderr_and_stdout
 01: ./write_on_stdout_and_stderr TOKEN201703271859_1 TOKEN201703271859_2 &>new_file_stderr_and_stdout
STDOUT:
 FAILURE expected_to_not match_regex `TOKEN201703270303_1`
 SUCCESS expected_to_not match_regex `TOKEN201703270303_2`
 01: TOKEN201703270303_1
 FAILURE expected_to_not match_regex `TOKEN201703271859_1`
 SUCCESS expected_to_not match_regex `TOKEN201703271859_2`
 01: TOKEN201703271859_1
STDERR:
 SUCCESS expected_to_not match_regex `TOKEN201703270303_1`
 FAILURE expected_to_not match_regex `TOKEN201703270303_2`
 01: TOKEN201703270303_2
 SUCCESS expected_to_not match_regex `TOKEN201703271859_1`
 FAILURE expected_to_not match_regex `TOKEN201703271859_2`
 01: TOKEN201703271859_2
MISC:
 FAILURE expected_to create_file `new_file_stderr_and_stdout` matching_regex `TOKEN201703270303_1$`
 FAILURE expected_to create_file `new_file_stderr_and_stdout` matching_regex `TOKEN201703270303_2$`
 FAILURE expected_to create_file `new_file_stderr_and_stdout` matching_regex `TOKEN201703271859_1$`
 FAILURE expected_to create_file `new_file_stderr_and_stdout` matching_regex `TOKEN201703271859_2$`
----------------------------------------------------------------
@ -120,21 +63,21 @@
 01: rm -f new_file_stderr_and_stdout
STDIN:
 01: ./write_on_stdout_and_stderr TOKEN201703270303_1 TOKEN201703270303_2 &> new_file_stderr_and_stdout
 01: ./write_on_stdout_and_stderr TOKEN201703271859_1 TOKEN201703271859_2 &> new_file_stderr_and_stdout
STDOUT:
 FAILURE expected_to_not match_regex `TOKEN201703270303_1`
 SUCCESS expected_to_not match_regex `TOKEN201703270303_2`
 01: TOKEN201703270303_1
 FAILURE expected_to_not match_regex `TOKEN201703271859_1`
 SUCCESS expected_to_not match_regex `TOKEN201703271859_2`
 01: TOKEN201703271859_1
STDERR:
 SUCCESS expected_to_not match_regex `TOKEN201703270303_1`
 FAILURE expected_to_not match_regex `TOKEN201703270303_2`
 01: TOKEN201703270303_2
 SUCCESS expected_to_not match_regex `TOKEN201703271859_1`
 FAILURE expected_to_not match_regex `TOKEN201703271859_2`
 01: TOKEN201703271859_2
MISC:
 FAILURE expected_to create_file `new_file_stderr_and_stdout` matching_regex `TOKEN201703270303_1$`
 FAILURE expected_to create_file `new_file_stderr_and_stdout` matching_regex `TOKEN201703270303_2$`
 FAILURE expected_to create_file `new_file_stderr_and_stdout` matching_regex `TOKEN201703271859_1$`
 FAILURE expected_to create_file `new_file_stderr_and_stdout` matching_regex `TOKEN201703271859_2$`
----------------------------------------------------------------
@ -144,7 +87,7 @@
 The purpose of this test is to check that using the simicolon separator `;` with empty commands results in error.
STDIN:
 01: ./write_on_stdout TOKEN201703270303 ; ; ./exit_with_status 42
 01: ./write_on_stdout TOKEN201703271859 ; ; ./exit_with_status 42
STDOUT:
 SUCCESS expected_to be_empty
@ -160,5 +103,57 @@
 FAILURE expected_to_not exit_with_status `0`
Total tests: 36
Total failed tests: 6
Total failed tests: 4
Total pending tests: 0
38;5;160m(FAILED)
Description:
 A right redirection can be associated to the twice outputs by using `&>...`, that means `redirect stdout and stderr to ...`.
In this test, we specify the file name in a separate field.
Before test:
 01: rm -f new_file_stderr_and_stdout
STDIN:
 01: ./write_on_stdout_and_stderr TOKEN201703271859_1 TOKEN201703271859_2 &> new_file_stderr_and_stdout
STDOUT:
 FAILURE expected_to_not match_regex `TOKEN201703271859_1`
 SUCCESS expected_to_not match_regex `TOKEN201703271859_2`
 01: TOKEN201703271859_1
STDERR:
 SUCCESS expected_to_not match_regex `TOKEN201703271859_1`
 FAILURE expected_to_not match_regex `TOKEN201703271859_2`
 01: TOKEN201703271859_2
MISC:
 FAILURE expected_to create_file `new_file_stderr_and_stdout` matching_regex `TOKEN201703271859_1$`
 FAILURE expected_to create_file `new_file_stderr_and_stdout` matching_regex `TOKEN201703271859_2$`
----------------------------------------------------------------
21sh/separators/semicolon/003-parse-error-empty-inline-command (FAILED)
Description:
 The purpose of this test is to check that using the simicolon separator `;` with empty commands results in error.
STDIN:
 01: ./write_on_stdout TOKEN201703271859 ; ; ./exit_with_status 42
STDOUT:
 SUCCESS expected_to be_empty
 (no output)
STDERR:
 SUCCESS expected_to_not be_empty
 SUCCESS might match_regex `([Ss]yntax|[Pp]arse) error`
 01: syntax error near unexpected token `;'
MISC:
 SUCCESS expected_to_not exit_with_status `42`
 FAILURE expected_to_not exit_with_status `0`
Total tests: 36
Total failed tests: 4
Total pending tests: 0

1
42sh/Makefile
View file

@ -226,7 +226,6 @@ lexer/insert_newline.c\
lexer/isrw_delim.c\
lexer/keep_last_type.c\
lexer/lexer_backslash.c\
lexer/lexer_bang.c\
lexer/lexer_bquote.c\
lexer/lexer_curly_braces.c\
lexer/lexer_default.c\

4
42sh/includes/lexer.h
View file

@ -6,7 +6,7 @@
/* By: jhalford <jack@crans.org> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2016/12/01 12:15:50 by jhalford #+# #+# */
/* Updated: 2017/03/27 18:17:39 by jhalford ### ########.fr */
/* Updated: 2017/03/27 19:19:22 by ariard ### ########.fr */
/* */
/* ************************************************************************** */
@ -24,7 +24,6 @@ enum e_lexstate
HEREDOC,
NEWLINE,
DELIM,
BANG,
SEP,
WORD,
NUMBER,
@ -100,7 +99,6 @@ int lexer_default(t_list **alst, t_lexer *lexer);
int lexer_newline(t_list **alst, t_lexer *lexer);
int lexer_heredoc(t_list **alst, t_lexer *lexer);
int lexer_delim(t_list **alst, t_lexer *lexer);
int lexer_bang(t_list **alst, t_lexer *lexer);
int lexer_sep(t_list **alst, t_lexer *lexer);
int lexer_word(t_list **alst, t_lexer *lexer);
int lexer_number(t_list **alst, t_lexer *lexer);

4
42sh/libft/Makefile
View file

@ -6,7 +6,7 @@
# By: jhalford <jack@crans.org> +#+ +:+ +#+ #
# +#+#+#+#+#+ +#+ #
# Created: 2017/02/07 16:09:36 by jhalford #+# #+# #
# Updated: 2017/03/23 16:49:31 by gwojda ### ########.fr #
# Updated: 2017/03/27 21:59:31 by gwojda ### ########.fr #
# #
# **************************************************************************** #
@ -19,7 +19,7 @@ RM = /bin/rm -rf
W_FLAGS = -Wall -Wextra -Werror -g
D_FLAGS = -g
V_FLAGS = -fvisibility=hidden
V_FLAGS = #-fvisibility=hidden
FLAGS = $(W_FLAGS) $(D_FLAGS) $(V_FLAGS)
DELTA = $$(echo "$$(tput cols)-47"|bc)

BIN
42sh/pdf/fdf.fr.pdf
View file

Binary file not shown.

10
42sh/src/lexer/get_reserved_words.c
View file

@ -6,7 +6,7 @@
/* By: ariard <ariard@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2017/01/26 00:07:05 by ariard #+# #+# */
/* Updated: 2017/03/24 15:01:55 by ariard ### ########.fr */
/* Updated: 2017/03/27 21:44:14 by gwojda ### ########.fr */
/* */
/* ************************************************************************** */
@ -60,6 +60,12 @@ static int match_words(t_token *token)
return (0);
}
static int is_bang(t_token *token)
{
return (token && token->type != TK_SEMI && token->type != TK_NEWLINE
&& token->type != TK_AMP);
}
int get_reserved_words(t_list *temp)
{
t_token *token;
@ -73,6 +79,8 @@ int get_reserved_words(t_list *temp)
token = temp->content;
if (recognization_rvwords(pv_tk, ante_token))
match_words(token);
if (token && token->type == TK_BANG && is_bang(pv_tk))
token->type = TK_WORD;
if (ante_token && (ante_token->type == TK_CASE
|| ante_token->type == TK_FOR)
&& ft_strncmp(token->data, "in", 2) == 0)

5
42sh/src/lexer/get_state_global.c
View file

@ -6,7 +6,7 @@
/* By: jhalford <jack@crans.org> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2017/02/09 20:39:06 by jhalford #+# #+# */
/* Updated: 2017/03/27 19:48:41 by jhalford ### ########.fr */
/* Updated: 2017/03/27 19:56:59 by ariard ### ########.fr */
/* */
/* ************************************************************************** */
@ -24,8 +24,7 @@ t_lexstate get_state_global(t_lexer *lexer)
cl = lexer->pos ? lexer->str[lexer->pos - 1] : 0;
ret = 0;
if ((ft_is_delim(c) && (ret = DELIM))
|| ((c == '&' || c == ';' || c == '|') && (ret = SEP))
|| ((c == '!') && (ret = BANG))
|| ((c == '&' || c == ';' || c == '|' || c == '!') && (ret = SEP))
|| ((c == '\\') && (ret = BACKSLASH))
|| ((c == '\n') && (ret = NEWLINE))
|| ((c == '\'') && (ret = QUOTE))

3
42sh/src/lexer/lexer_backslash.c
View file

@ -6,7 +6,7 @@
/* By: jhalford <jhalford@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2016/12/03 11:56:49 by jhalford #+# #+# */
/* Updated: 2017/03/27 18:14:22 by gwojda ### ########.fr */
/* Updated: 2017/03/27 20:23:24 by jhalford ### ########.fr */
/* */
/* ************************************************************************** */
@ -24,6 +24,7 @@ int lexer_backslash(t_list **alst, t_lexer *lexer)
push(&lexer->stack, BACKSLASH);
return (0);
}
token->type = token->type ? token->type : TK_WORD;
lexer->pos++;
token_append(token, lexer, 1, 1);
lexer->pos++;

32
42sh/src/lexer/lexer_bang.c
View file

@ -1,32 +0,0 @@
/* ************************************************************************** */
/* */
/* ::: :::::::: */
/* lexer_bang.c :+: :+: :+: */
/* +:+ +:+ +:+ */
/* By: jhalford <jack@crans.org> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2017/03/27 18:12:03 by jhalford #+# #+# */
/* Updated: 2017/03/27 18:53:10 by ariard ### ########.fr */
/* */
/* ************************************************************************** */
#include "minishell.h"
int lexer_bang(t_list **alst, t_lexer *lexer)
{
t_token *token;
token = (*alst)->content;
if (!token->type || token->type == TK_SEMI || token->type == TK_NEWLINE
|| token->type == TK_AMP)
{
token->type = TK_BANG;
lexer->state = DEFAULT;
lexer->pos++;
return (lexer_lex(&(*alst)->next, lexer));
}
token->type = TK_WORD;
lexer->state = WORD;
lexer->pos++;
return (lexer_lex(alst, lexer));
}

3
42sh/src/lexer/lexer_dquote.c
View file

@ -6,7 +6,7 @@
/* By: jhalford <jhalford@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2016/11/28 18:36:58 by jhalford #+# #+# */
/* Updated: 2017/03/27 18:52:15 by gwojda ### ########.fr */
/* Updated: 2017/03/27 21:27:35 by gwojda ### ########.fr */
/* */
/* ************************************************************************** */
@ -30,7 +30,6 @@ int lexer_dquote(t_list **alst, t_lexer *lexer)
lexer->pos++;
if (lexer->str[lexer->pos] == 0)
return (push(&lexer->stack, BACKSLASH) ? 0 : 0);
token_append(token, lexer, 1, 0);
}
else if (lexer->str[lexer->pos] == '`' && (lexer->state = BQUOTE))
return (lexer_lex(alst, lexer));

3
42sh/src/lexer/lexer_lex.c
View file

@ -6,7 +6,7 @@
/* By: jhalford <jhalford@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2017/02/09 17:08:51 by jhalford #+# #+# */
/* Updated: 2017/03/27 18:13:01 by jhalford ### ########.fr */
/* Updated: 2017/03/27 19:29:37 by ariard ### ########.fr */
/* */
/* ************************************************************************** */
@ -19,7 +19,6 @@ int (*g_lexer[])(t_list **alst, t_lexer *lexer) =
&lexer_heredoc,
&lexer_newline,
&lexer_delim,
&lexer_bang,
&lexer_sep,
&lexer_word,
&lexer_number,

3
42sh/src/lexer/lexer_sep.c
View file

@ -6,7 +6,7 @@
/* By: jhalford <jack@crans.org> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2016/11/30 16:29:57 by jhalford #+# #+# */
/* Updated: 2017/03/27 18:11:51 by jhalford ### ########.fr */
/* Updated: 2017/03/27 19:53:05 by ariard ### ########.fr */
/* */
/* ************************************************************************** */
@ -23,6 +23,7 @@ int lexer_sep(t_list **alst, t_lexer *lexer)
if (token->type)
return (lexer_lex(&(*alst)->next, lexer));
c = lexer->str[lexer->pos];
token_append(token, lexer, 0, 0);
lexer->pos++;
cn = lexer->str[lexer->pos];
if (c == '&')

2
42sh/src/lexer/lexer_word.c
View file

@ -6,7 +6,7 @@
/* By: jhalford <jack@crans.org> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2016/12/03 12:07:11 by jhalford #+# #+# */
/* Updated: 2017/03/23 03:39:38 by wescande ### ########.fr */
/* Updated: 2017/03/27 19:35:55 by ariard ### ########.fr */
/* */
/* ************************************************************************** */

2
42sh/src/line_editing/lib_line_editing/toolz_parseur.c
View file

@ -6,7 +6,7 @@
/* By: gwojda <gwojda@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2016/12/16 16:14:46 by gwojda #+# #+# */
/* Updated: 2017/03/21 10:03:23 by gwojda ### ########.fr */
/* Updated: 2017/03/27 22:06:09 by gwojda ### ########.fr */
/* */
/* ************************************************************************** */

6
42sh/src/line_editing/print_del_completion/print_and_del.c
View file

@ -6,7 +6,7 @@
/* By: gwojda <gwojda@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2017/01/05 16:02:43 by gwojda #+# #+# */
/* Updated: 2017/03/21 10:14:46 by gwojda ### ########.fr */
/* Updated: 2017/03/27 22:07:39 by gwojda ### ########.fr */
/* */
/* ************************************************************************** */
@ -52,7 +52,7 @@ static void ft_suppr_2(char **str, size_t *i, size_t tmp)
++(*i);
ft_putnc('\b', *i - tmp);
(*i) = tmp;
if (ft_strlen(*str) == 0)
if (!**str)
ft_strdel(str);
}
@ -105,5 +105,7 @@ int ft_del(char **str, size_t *pos)
++(*pos);
ft_putnc('\b', *pos - tmp);
*pos = tmp;
if (!**str)
ft_strdel(str);
return (0);
}

2
42sh/src/main/main.c
View file

@ -6,7 +6,7 @@
/* By: gwojda <gwojda@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2017/03/20 14:45:40 by gwojda #+# #+# */
/* Updated: 2017/03/27 19:47:08 by jhalford ### ########.fr */
/* Updated: 2017/03/28 07:46:18 by jhalford ### ########.fr */
/* */
/* ************************************************************************** */

6
42sh/src/parser/do_parser_routine.c
View file

@ -6,7 +6,7 @@
/* By: wescande <wescande@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2017/03/19 14:24:14 by wescande #+# #+# */
/* Updated: 2017/03/21 21:38:36 by ariard ### ########.fr */
/* Updated: 2017/03/27 21:43:44 by gwojda ### ########.fr */
/* */
/* ************************************************************************** */
@ -21,9 +21,11 @@ int do_parser_routine(t_list **token, t_btree **ast)
return (1);
if (data->parser.state == SUCCESS && stack_init(&data->parser))
exit(1);
token_print(*token);
if (ft_parse(ast, token, &data->parser))
exit(1);
if ((data->lexer.state = data->parser.heredoc_queue ? HEREDOC : DEFAULT))
if (data->parser.state != ERROR &&
(data->lexer.state = data->parser.heredoc_queue ? HEREDOC : DEFAULT))
return (0);
if (data->parser.state == ERROR)
{

2
42sh/src/parser/eval_sym.c
View file

@ -6,7 +6,7 @@
/* By: ariard <ariard@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2017/03/11 16:11:21 by ariard #+# #+# */
/* Updated: 2017/03/27 17:29:01 by ariard ### ########.fr */
/* Updated: 2017/03/27 21:03:04 by ariard ### ########.fr */
/* */
/* ************************************************************************** */

0
42sh/test/fifi
View file