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

minor tricks

Browse source
This commit is contained in:
wescande 2017-03-15 04:26:17 +01:00
parent cdfac4c3fc
commit 7b6f848d00
2 changed files with 7 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
42sh/src/exec/exec_leaf.c
View file

@ -6,7 +6,7 @@
/* By: wescande <wescande@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2017/03/07 15:47:30 by wescande #+# #+# */
/* Updated: 2017/03/15 02:04:30 by ariard ### ########.fr */
/* Updated: 2017/03/15 04:18:47 by wescande ### ########.fr */
/* */
/* ************************************************************************** */
@ -35,6 +35,8 @@ int exec_leaf(t_btree **ast)
job = &data_singleton()->exec.job;
if (process_set(&p, *ast))
return (1);
if (p.type >= PROCESS_MAX)
return (1);
p.map = g_process_map[p.type];
if (!(process_launch(&p)))
{

12
42sh/src/parser/error_syntax.c
View file

@ -6,7 +6,7 @@
/* By: ariard <ariard@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2017/02/09 20:15:35 by ariard #+# #+# */
/* Updated: 2017/03/13 14:41:45 by jhalford ### ########.fr */
/* Updated: 2017/03/15 04:12:31 by wescande ### ########.fr */
/* */
/* ************************************************************************** */
@ -30,7 +30,6 @@ t_errormatch g_errormatch[] =
{TK_DLESSDASH, "<<-"},
{TK_AND_IF, "&&"},
{TK_OR_IF, "||"},
{TK_DSEMI, ";;"},
{TK_IF, "if"},
{TK_THEN, "then"},
{TK_ELSE, "else"},
@ -66,17 +65,14 @@ int error_syntax(t_list **lst, t_parser *parser,
{
if (g_errormatch[i].token == token->type)
{
ft_putstr_fd("syntax error near unexpected token `", 2);
ft_putstr_fd(g_errormatch[i].error, 2);
ft_putstr_fd("'\n", 2);
ft_dprintf(2, "syntax error near unexpected token « %s »\n",
g_errormatch[i].error);
instruction_free(lst, parser, ast);
return (0);
}
i++;
}
ft_putstr_fd("syntax error near unexpected token`", 2);
ft_putstr_fd(token->data, 2);
ft_putstr_fd("'\n", 2);
ft_dprintf(2, "syntax error near unexpected token « %s »\n", token->data);
instruction_free(lst, parser, ast);
return (0);
}