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

correctif io number

Browse source
This commit is contained in:
Antoine Riard 2017-03-11 16:47:33 +01:00
parent e8d4800f8c
commit bc97d45f44
6 changed files with 10 additions and 73 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
42sh/libft

@ -1 +1 @@
Subproject commit 934ff3af934eaecf04575a0a7e7e1b76628ae53b Subproject commit b209bb1fb718a68256253d5ab5ff69a46a90d5d6

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

@ -6,7 +6,7 @@
/* By: ariard <ariard@student.42.fr> +#+ +:+ +#+ */ /* By: ariard <ariard@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2017/03/10 14:57:45 by ariard #+# #+# */ /* Created: 2017/03/10 14:57:45 by ariard #+# #+# */
/* Updated: 2017/03/11 16:23:26 by ariard ### ########.fr */ /* Updated: 2017/03/11 16:29:08 by ariard ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */

3
42sh/src/parser/add_number.c
View file

@ -6,7 +6,7 @@
/* By: ariard <ariard@student.42.fr> +#+ +:+ +#+ */ /* By: ariard <ariard@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2017/03/05 17:28:31 by ariard #+# #+# */ /* Created: 2017/03/05 17:28:31 by ariard #+# #+# */
/* Updated: 2017/03/11 15:46:06 by ariard ### ########.fr */ /* Updated: 2017/03/11 16:45:07 by ariard ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
@ -43,6 +43,7 @@ int add_ionumber(t_btree **ast, t_list **lst)
gen_node(ast); gen_node(ast);
token = (*lst)->content; token = (*lst)->content;
node = (*ast)->item; node = (*ast)->item;
node->cache = node->type;
node->type = token->type; node->type = token->type;
redir.n = ft_atoi(token->data); redir.n = ft_atoi(token->data);
ft_lsteadd(&node->data.cmd.redir, ft_lstnew(&redir, sizeof(redir))); ft_lsteadd(&node->data.cmd.redir, ft_lstnew(&redir, sizeof(redir)));

5
42sh/src/parser/add_redir.c
View file

@ -6,7 +6,7 @@
/* By: ariard <ariard@student.42.fr> +#+ +:+ +#+ */ /* By: ariard <ariard@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2017/02/17 16:39:05 by ariard #+# #+# */ /* Created: 2017/02/17 16:39:05 by ariard #+# #+# */
/* Updated: 2017/03/11 15:52:20 by ariard ### ########.fr */ /* Updated: 2017/03/11 16:45:29 by ariard ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
@ -125,7 +125,8 @@ int add_redir_type(t_btree **ast, t_list **lst)
} }
else else
add_redir_type_number(ast, lst); add_redir_type_number(ast, lst);
node->cache = node->type; if (!node->cache)
node->cache = node->type;
node->type = REDIR; node->type = REDIR;
return (0); return (0);
} }

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

@ -6,7 +6,7 @@
/* By: ariard <ariard@student.42.fr> +#+ +:+ +#+ */ /* By: ariard <ariard@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2017/03/11 16:17:38 by ariard #+# #+# */ /* Created: 2017/03/11 16:17:38 by ariard #+# #+# */
/* Updated: 2017/03/11 16:18:35 by ariard ### ########.fr */ /* Updated: 2017/03/11 16:32:15 by ariard ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
@ -61,7 +61,7 @@ int ft_parse(t_btree **ast, t_list **token, t_parser *parser)
else else
ft_lst_delif(token, (*token)->content, &ft_addrcmp, &token_free); ft_lst_delif(token, (*token)->content, &ft_addrcmp, &token_free);
} }
if (parser->state == SUCCESS) // if (parser->state == SUCCESS)
DG("sucessful parsing"); // DG("sucessful parsing");
return (0); return (0);
} }

65
42sh/testmake
View file

@ -1,65 +0,0 @@
 shell_init.c 28 interactive shell settings
 token_print.c 29 13:[ls]
 token_print.c 29 13:[if]
 token_print.c 29 13:[ls]
 token_print.c 29 13:[if ls
]
 token_print.c 29 13:[if ls
then pwd
]
 token_print.c 29 13:[if ls
then pwd
Elif ls
]
 token_print.c 29 13:[if ls
then pwd
Elif ls
Then pwd
]
 token_print.c 29 13:[if ls
then pwd
Elif ls
Then pwd
Elif ls
]
 token_print.c 29 13:[if ls
then pwd
Elif ls
Then pwd
Elif ls
then pwd
]
 token_print.c 29 13:[if ls
then pwd
Elif ls
Then pwd
Elif ls
then pwd
fi
]
 token_print.c 29 13:[if ls
then pwd
Elif ls
Then pwd
Elif ls
then pwd
fi
]
 token_print.c 29 13:[if ls
then pwd
Elif ls
Then pwd
Elif ls
then pwd
fi
]
 token_print.c 29 13:[if ls
then pwd
Elif ls
Then pwd
Elif ls
then pwd
fi
]