Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Refactor : #83/parsing error 종료 코드 설정 #85

Merged
merged 1 commit into from
Jan 17, 2023
Merged

Refactor : #83/parsing error 종료 코드 설정 #85

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
44 changes: 33 additions & 11 deletions parse.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
/* By: jeongmin <[email protected]> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2023/01/15 17:20:31 by wonyang #+# #+# */
/* Updated: 2023/01/16 20:58:35 by jeongmin ### ########.fr */
/* Updated: 2023/01/16 23:45:52 by jeongmin ### ########.fr */
/* */
/* ************************************************************************** */

Expand All @@ -15,6 +15,9 @@
#include "make_tree.h"
#include "ds_tree.h"
#include "libft.h"
#include "minishell.h"

extern t_global g_var;

static void del_t_paren(void *content)
{
Expand All @@ -31,15 +34,39 @@ static void del_t_paren(void *content)
content = NULL;
}

static t_list *pre_processing(char *str)
{
t_list *lst;

lst = tokenization(str);
if (!lst)
return (NULL);
if (!is_correct_syntax(lst->next))
{
ft_lstclear(&lst, &del_t_token);
return (NULL);
}
return (lst);
}

static t_error post_processing(t_tnode *node)
{
if (!node)
return (ERROR);
if (subst(node) == ERROR)
{
g_var.status = 1;
return (ERROR);
}
if (del_quote(node) == ERROR)
{
g_var.status = 1;
return (ERROR);
}
if (wildcard(node) == ERROR)
{
g_var.status = 1;
return (ERROR);
}
if (!node)
return (ERROR);
return (SCS);
}
Expand All @@ -49,24 +76,19 @@ t_tnode *parse_line(char *str)
t_list *lst;
t_tnode *node;

lst = tokenization(str);
lst = pre_processing(str);
if (!lst)
{
free(str);
return (NULL);
}
if (!is_correct_syntax(lst->next))
{
ft_lstclear(&lst, &del_t_token);
free(str);
g_var.status = 1;
return (NULL);
}
node = make_tree(lst->next);
ft_lstclear(&lst, &del_t_paren);
if (post_processing(node) == ERROR)
{
free(str);
clear_node(node, del_t_token);
clear_node(node, &del_t_token);
return (NULL);
}
return (node);
Expand Down