logistic-bot/minishell
1
0
Fork 0
mirror of https://codeberg.org/la-chouette/minishell.git synced 2025-12-06 07:28:09 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

cmdgroup parsing: parse cmdlist surrounded by parentheses

Browse source
This commit is contained in:
Khaïs COLIN 2025-03-20 12:17:54 +01:00
parent 185a069044
commit 0fbfee7d78
Signed by: logistic-bot
SSH key fingerprint: SHA256:RlpiqKeXpcPFZZ4y9Ou4xi2M8OhRJovIwDlbCaMsuAo
7 changed files with 169 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

19
src/parser/cmdgroup/cmdgroup.c
View file

@ -6,7 +6,7 @@
/* By: khais <marvin@42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2025/03/11 15:18:02 by khais #+# #+# */
/* Updated: 2025/03/20 12:27:57 by khais ### ########.fr */
/* Updated: 2025/03/20 14:46:25 by khais ### ########.fr */
/* */
/* ************************************************************************** */
@ -14,14 +14,25 @@
#include "cmdgroup_builder.h"
#include <stdlib.h>
#include "libft.h"
#include "paren.h"
#include "../../treedrawing.h"
#include "../../postprocess/redirections/redirection_list.h"
#include "libft/libft.h"
/*
** Recursively parse a cmdgroup
**
** This is responsible for parsing one optional set of parentheses surrounding a
** cmdlist.
**
** If parentheses are present, also parse redirections, which may only occur
** after the closing parenthesis.
*/
t_cmdgroup *cmdgroup_from_wordlist(t_wordlist *wordlist)
{
t_cmdgroup_builder builder;
t_wordlist *words;
t_paren paren;
words = wordlist_copy(wordlist);
if (words == NULL)
@ -30,7 +41,11 @@ t_cmdgroup *cmdgroup_from_wordlist(t_wordlist *wordlist)
return (wordlist_destroy(words), NULL);
while (builder.error == false && builder.current_word != NULL)
{
cmdgroup_builder_next_word(&builder, &words);
paren = match_paren(builder.current_word->word);
if (paren == PAREN_INVALID)
cmdgroup_builder_next_word(&builder, &words);
else
cmdgroup_builder_paren(&builder, &words, paren);
}
if (builder.current_wordlist != NULL)
cmdgroup_builder_delimit(&builder, &words);

22
src/parser/cmdgroup/cmdgroup_builder.c
View file

@ -6,7 +6,7 @@
/* By: khais <marvin@42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2025/03/20 12:32:14 by khais #+# #+# */
/* Updated: 2025/03/20 12:49:37 by khais ### ########.fr */
/* Updated: 2025/03/20 17:19:55 by khais ### ########.fr */
/* */
/* ************************************************************************** */
@ -51,3 +51,23 @@ void cmdgroup_builder_delimit(t_cmdgroup_builder *builder,
builder->current_wordlist = NULL;
(void)words;
}
/*
** discard the current word
*/
void cmdgroup_builder_discard_word(t_cmdgroup_builder *builder,
t_wordlist **words)
{
worddesc_destroy(builder->current_word);
builder->current_word = wordlist_pop(words);
}
/*
** Handle encountering a parenthesis token
*/
void cmdgroup_builder_paren(t_cmdgroup_builder *builder,
t_wordlist **words, t_paren paren)
{
cmdgroup_builder_discard_word(builder, words);
(void)paren;
}

11
src/parser/cmdgroup/cmdgroup_builder.h
View file

@ -6,7 +6,7 @@
/* By: khais <marvin@42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2025/03/20 12:27:20 by khais #+# #+# */
/* Updated: 2025/03/20 12:50:09 by khais ### ########.fr */
/* Updated: 2025/03/20 17:12:52 by khais ### ########.fr */
/* */
/* ************************************************************************** */
@ -15,6 +15,7 @@
# include "../wordlist/wordlist.h"
# include "cmdgroup.h"
# include "paren.h"
typedef struct s_cmdgroup_builder
{
@ -34,6 +35,12 @@ typedef struct s_cmdgroup_builder
** cmdgroup that is being constructed
*/
t_cmdgroup *cmdgroup;
/*
** count of parenthesis tokens
**
** +1 for each opening parenthesis, -1 for each closing
*/
int paren;
} t_cmdgroup_builder;
t_cmdgroup_builder *setup_cmdgroup_builder(t_cmdgroup_builder *builder,
@ -42,5 +49,7 @@ void cmdgroup_builder_next_word(t_cmdgroup_builder *builder,
t_wordlist **words);
void cmdgroup_builder_delimit(t_cmdgroup_builder *builder,
t_wordlist **words);
void cmdgroup_builder_paren(t_cmdgroup_builder *builder,
t_wordlist **words, t_paren paren);
#endif // CMDGROUP_BUILDER_H

23
src/parser/cmdgroup/paren.c Normal file
View file

@ -0,0 +1,23 @@
/* ************************************************************************** */
/* */
/* ::: :::::::: */
/* paren.c :+: :+: :+: */
/* +:+ +:+ +:+ */
/* By: khais <marvin@42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2025/03/20 14:48:55 by khais #+# #+# */
/* Updated: 2025/03/20 14:49:46 by khais ### ########.fr */
/* */
/* ************************************************************************** */
#include "paren.h"
#include "libft.h"
t_paren match_paren(char *word)
{
if (ft_strcmp("(", word) == 0)
return (PAREN_OPEN);
if (ft_strcmp(")", word) == 0)
return (PAREN_CLOSE);
return (PAREN_INVALID);
}

25
src/parser/cmdgroup/paren.h Normal file
View file

@ -0,0 +1,25 @@
/* ************************************************************************** */
/* */
/* ::: :::::::: */
/* paren.h :+: :+: :+: */
/* +:+ +:+ +:+ */
/* By: khais <marvin@42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2025/03/20 14:45:48 by khais #+# #+# */
/* Updated: 2025/03/20 14:48:00 by khais ### ########.fr */
/* */
/* ************************************************************************** */
#ifndef PAREN_H
# define PAREN_H
typedef enum e_paren
{
PAREN_INVALID,
PAREN_OPEN,
PAREN_CLOSE,
} t_paren;
t_paren match_paren(char *word);
#endif // PAREN_H