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

parsing loop presque

Browse source
This commit is contained in:
ariard@student.42.fr 2017-02-05 19:38:46 +01:00
parent 65b6658978
commit 63b25532b3
8 changed files with 15637 additions and 47 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15516
42sh/file1
View file

File diff suppressed because it is too large Load diff

2
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/02/04 15:05:41 by ariard ### ########.fr */
/* Updated: 2017/02/05 18:12:04 by ariard ### ########.fr */
/* */
/* ************************************************************************** */

2
42sh/includes/parser.h
View file

@ -6,7 +6,7 @@
/* By: jhalford <jack@crans.org> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2016/12/01 12:15:54 by jhalford #+# #+# */
/* Updated: 2017/02/04 19:17:26 by ariard ### ########.fr */
/* Updated: 2017/02/05 17:59:47 by ariard ### ########.fr */
/* */
/* ************************************************************************** */

14
42sh/sample/while.sh
View file

@ -1,8 +1,12 @@
while ls | cat ;
while
ls | cat
do
echo hello
while ls
while [ 1 ]
do
echo ; cat
while [ 1 ]
do
echo
done
done > file1
done
done > file1 > file2

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

@ -6,7 +6,7 @@
/* By: ariard <ariard@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2017/01/22 23:06:34 by ariard #+# #+# */
/* Updated: 2017/02/04 22:16:49 by ariard ### ########.fr */
/* Updated: 2017/02/05 19:36:56 by ariard ### ########.fr */
/* */
/* ************************************************************************** */

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

@ -6,7 +6,7 @@
/* By: jhalford <jack@crans.org> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2016/11/30 17:14:58 by jhalford #+# #+# */
/* Updated: 2017/02/05 00:39:31 by ariard ### ########.fr */
/* Updated: 2017/02/05 18:54:19 by ariard ### ########.fr */
/* */
/* ************************************************************************** */
@ -15,8 +15,7 @@
t_parser g_parser[] =
{
{TK_WHILE, &parse_while},
{TK_SEMI, &parse_separator},
// {TK_NEWLINE, &parse_newline},
{TK_SEMI | TK_NEWLINE, &parse_separator},
{TK_AND_IF | TK_OR_IF, &parse_separator},
{TK_AMP, &parse_separator},
{TK_PIPE, &parse_separator},
@ -44,6 +43,7 @@ int ft_parse(t_btree **ast, t_list **start)
{
*ast = btree_create_node(&item, sizeof(item));
((t_astnode *)(*ast)->item)->data.token = NULL;
((t_astnode *)(*ast)->item)->type = 0;
}
while (g_parser[i].type)
{

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

@ -6,7 +6,7 @@
/* By: ariard <ariard@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2017/01/26 19:26:41 by ariard #+# #+# */
/* Updated: 2017/02/05 00:40:14 by ariard ### ########.fr */
/* Updated: 2017/02/05 17:17:00 by ariard ### ########.fr */
/* */
/* ************************************************************************** */
@ -17,7 +17,6 @@ int parse_newline(t_btree **ast, t_list **start, t_list **lst)
t_astnode *node;
t_token *token;
(void)start;
token = (*lst)->content;
node = (*ast)->item;
node->type = TK_NEWLINE;

131
42sh/src/parser/parse_while.c
View file

@ -6,38 +6,34 @@
/* By: ariard <ariard@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2017/01/30 16:03:28 by ariard #+# #+# */
/* Updated: 2017/02/05 00:40:21 by ariard ### ########.fr */
/* UpdatGed: 2017/02/05 18:28:11 by ariard ### ########.fr */
/* */
/* ************************************************************************** */
#include "parser.h"
static int delete_all_newline(t_list **lst)
static int delete_newline(t_list **start, t_list **lst)
{
t_token *token;
t_list *start;
t_list *del;
while ((*lst))
{
token = (*lst)->content;
start = *lst;
(*lst) = (*lst)->next;
del = *lst;
if (token->type & TK_NEWLINE)
ft_lstdelone(&start, &token_free);
ft_lst_delif(start, del->content, &ft_addrcmp, &token_free);
else
break;
*lst = (*lst)->next;
}
return (0);
}
int parse_while(t_btree **ast, t_list **start, t_list **lst)
static int parse_after_loop(t_btree **ast, t_list **start, t_list **lst)
{
t_list *temp;
t_list *temp4;
t_btree *temp2;
t_btree *temp3;
t_astnode *node;
t_astnode item;
t_list *del;
t_token *token;
int nest;
@ -53,35 +49,114 @@ int parse_while(t_btree **ast, t_list **start, t_list **lst)
if (nest == 0 && (token->type & TK_DONE))
break;
}
temp4 = temp;
del = temp;
temp = temp->next;
temp4->next = NULL;
ft_lst_delif(start, temp4->content, &ft_addrcmp, &token_free);
del->next = NULL;
ft_lst_delif(start, del->content, &ft_addrcmp, &token_free);
if (temp)
ft_parse(ast, &temp);
temp2 = *ast;
while (temp2->left)
temp2 = temp2->left;
temp3 = btree_create_node(&item, sizeof(item));
((t_astnode *)(*ast)->item)->data.token = NULL;
temp2->left = temp3;
return (0);
}
node = temp3->item;
node->type = TK_WHILE;
static int parse_head(t_btree **ast,
t_btree **new_ast, t_list **start, t_list **lst)
{
t_btree *father;
t_token *token;
t_astnode *node;
t_astnode item;
father = *ast;
while (father->left)
father = father->left;
*new_ast = btree_create_node(&item, sizeof(item));
((t_astnode *)(*new_ast)->item)->data.token = NULL;
node = (*ast)->item;
if (node->type > 0)
father->left = *new_ast;
else
*new_ast = *ast;
token = (*lst)->content;
node = (*new_ast)->item;
node->type = token->type;
ft_lst_delif(start, (*lst)->content, &ft_addrcmp, &token_free);
*lst = (*lst)->next;
return (0);
}
while (((*lst) = (*lst)->next))
if ((token = (*lst)->content)->type & TK_DO)
/*static int parse_condition(t_btree **ast, t_list **start, t_list **lst)
{
t_token *token;
int nest;
delete_newline(start, lst);
nest = 0;
while ((*lst))
{
token = (*lst)->content;
if (token->type & TK_DO)
nest++;
else if (token->type & TK_DONE)
nest--;
if (nest == 1 && (token->type & TK_DO))
break;
temp = (*lst)->next;
*lst = (*lst)->next;
}
(*lst)->next = NULL;
ft_lst_delif(start, (*lst)->content, &ft_addrcmp, &token_free);
ft_parse(&(temp3)->left, start);
DG("new token");
token_print(*start);
ft_parse(&(*ast)->left, start);
return (0);
}*/
static int parse_execution(t_btree **ast, t_list **start, t_list **lst)
{
t_token *token;
t_list *temp;
int nest;
(void)ast;
nest = 0;
while ((*lst)->next)
*lst = (*lst)->next;
ft_lst_reverse(start);
temp = *lst;
while ((*lst))
{
token = (*lst)->content;
if (token->type & TK_DO)
nest++;
else if (token->type & TK_DONE)
nest--;
if (nest == 1 && (token->type & TK_DO))
break;
*lst = (*lst)->next;
}
ft_lst_reverse(&temp);
ft_lst_delif(start, (*lst)->content, &ft_addrcmp, &token_free);
*lst = (*lst)->next;
delete_newline(start, lst);
ft_parse(&(*ast)->right, lst);
return (0);
}
int parse_while(t_btree **ast, t_list **start, t_list **lst)
{
t_btree *new_ast;
parse_after_loop(ast, start, lst);
parse_head(ast, &new_ast, start, lst);
parse_execution(&new_ast, start, lst);
return (0);
delete_all_newline(&temp);
/*
temp = temp->next;
ft_parse(&(temp3)->right, &temp);
return (0);
delete_all_newline(&temp);
*/
}