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

comments with #

Browse source
This commit is contained in:
Jack Halford 2017-03-05 17:30:32 +01:00
parent e645db2f0f
commit b998f45e49
8 changed files with 23 additions and 38 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
42sh/Makefile
View file

@ -178,7 +178,6 @@ lexer/insert_newline.c\
lexer/lexer_assignement_word.c\ lexer/lexer_assignement_word.c\
lexer/lexer_backslash.c\ lexer/lexer_backslash.c\
lexer/lexer_bquote.c\ lexer/lexer_bquote.c\
lexer/lexer_comment.c\
lexer/lexer_curly_braces.c\ lexer/lexer_curly_braces.c\
lexer/lexer_default.c\ lexer/lexer_default.c\
lexer/lexer_delim.c\ lexer/lexer_delim.c\

3
42sh/includes/lexer.h
View file

@ -6,7 +6,7 @@
/* By: jhalford <jack@crans.org> +#+ +:+ +#+ */ /* By: jhalford <jack@crans.org> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2016/12/01 12:15:50 by jhalford #+# #+# */ /* Created: 2016/12/01 12:15:50 by jhalford #+# #+# */
/* Updated: 2017/03/05 16:28:17 by jhalford ### ########.fr */ /* Updated: 2017/03/05 17:29:09 by jhalford ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
@ -42,7 +42,6 @@ enum e_lexstate
BACKSLASH, BACKSLASH,
CURLY_BRACKETS, CURLY_BRACKETS,
ASSIGNEMENT_WORD, ASSIGNEMENT_WORD,
COMMENT,
END, END,
}; };

4
42sh/src/lexer/get_state_global.c
View file

@ -6,7 +6,7 @@
/* By: jhalford <jack@crans.org> +#+ +:+ +#+ */ /* By: jhalford <jack@crans.org> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2017/02/09 20:39:06 by jhalford #+# #+# */ /* Created: 2017/02/09 20:39:06 by jhalford #+# #+# */
/* Updated: 2017/03/05 16:28:14 by jhalford ### ########.fr */ /* Updated: 2017/03/05 17:29:24 by jhalford ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
@ -20,8 +20,6 @@ t_lexstate get_state_global(t_lexer *lexer)
DG("check, c=%c", lexer->str[lexer->pos]); DG("check, c=%c", lexer->str[lexer->pos]);
if (ft_is_delim(c)) if (ft_is_delim(c))
return (DELIM); return (DELIM);
else if (c == '#')
return (COMMENT);
else if (c == '&' || c == ';' || c == '|') else if (c == '&' || c == ';' || c == '|')
return (SEP); return (SEP);
else if (c == '\\') else if (c == '\\')

23
42sh/src/lexer/lexer_comment.c
View file

@ -1,23 +0,0 @@
/* ************************************************************************** */
/* */
/* ::: :::::::: */
/* lexer_comment.c :+: :+: :+: */
/* +:+ +:+ +:+ */
/* By: jhalford <jack@crans.org> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2017/02/07 12:15:59 by jhalford #+# #+# */
/* Updated: 2017/03/05 15:31:17 by wescande ### ########.fr */
/* */
/* ************************************************************************** */
#include "lexer.h"
int lexer_comment(t_list **alst, t_lexer *lexer)
{
// t_token *token;
// token = (*alst)->content;
if (lexer->str[lexer->pos] == '\n')
return (lexer_lex(&(*alst)->next, lexer));
return (lexer_comment(alst, lexer));
}

2
42sh/src/lexer/lexer_dquote.c
View file

@ -6,7 +6,7 @@
/* By: jhalford <jack@crans.org> +#+ +:+ +#+ */ /* By: jhalford <jack@crans.org> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2016/11/28 18:36:58 by jhalford #+# #+# */ /* Created: 2016/11/28 18:36:58 by jhalford #+# #+# */
/* Updated: 2017/02/20 20:52:24 by ariard ### ########.fr */ /* Updated: 2017/03/05 17:09:20 by jhalford ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */

18
42sh/src/lexer/lexer_end.c
View file

@ -1,13 +1,23 @@
/* ************************************************************************** */
/* */
/* ::: :::::::: */
/* lexer_end.c :+: :+: :+: */
/* +:+ +:+ +:+ */
/* By: jhalford <jack@crans.org> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2017/03/05 16:58:24 by jhalford #+# #+# */
/* Updated: 2017/03/05 17:29:17 by jhalford ### ########.fr */
/* */
/* ************************************************************************** */
#include "lexer.h" #include "lexer.h"
int lexer_end(t_list **alst, t_lexer *lexer) int lexer_end(t_list **alst, t_lexer *lexer)
{ {
t_token *token; t_token *token;
if ((*alst && (lexer->state == QUOTE if ((*alst && (lexer->state == QUOTE || lexer->state == DQUOTE
|| lexer->state == DQUOTE || lexer->state == BQUOTE)) || get_lexer_stack(*lexer) == DLESS)
|| lexer->state == BQUOTE))
|| get_lexer_stack(*lexer) == DLESS)
{ {
ft_strappend(&lexer->str, (char[]){'\n', 0}); ft_strappend(&lexer->str, (char[]){'\n', 0});
lexer->pos++; lexer->pos++;

8
42sh/src/lexer/lexer_lex.c
View file

@ -6,7 +6,7 @@
/* By: jhalford <jack@crans.org> +#+ +:+ +#+ */ /* By: jhalford <jack@crans.org> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2017/02/09 17:08:51 by jhalford #+# #+# */ /* Created: 2017/02/09 17:08:51 by jhalford #+# #+# */
/* Updated: 2017/03/05 16:28:15 by jhalford ### ########.fr */ /* Updated: 2017/03/05 17:30:17 by jhalford ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
@ -33,7 +33,6 @@ int (*g_lexer[])(t_list **alst, t_lexer *lexer) =
&lexer_backslash, &lexer_backslash,
&lexer_curly_braces, &lexer_curly_braces,
&lexer_assignement_word, &lexer_assignement_word,
&lexer_comment,
&lexer_end, &lexer_end,
}; };
@ -51,7 +50,10 @@ int lexer_lex(t_list **alst, t_lexer *lexer)
{ {
t_token *token; t_token *token;
if (lexer->str[lexer->pos] == 0) if (lexer->str[lexer->pos] == 0
|| (lexer->str[lexer->pos] == '#'
&& lexer->state != QUOTE
&& lexer->state != DQUOTE))
return (lexer_end(alst, lexer)); return (lexer_end(alst, lexer));
if (!*alst) if (!*alst)
{ {

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

@ -6,7 +6,7 @@
/* By: jhalford <jack@crans.org> +#+ +:+ +#+ */ /* By: jhalford <jack@crans.org> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2017/01/11 14:04:48 by jhalford #+# #+# */ /* Created: 2017/01/11 14:04:48 by jhalford #+# #+# */
/* Updated: 2017/03/05 16:28:38 by jhalford ### ########.fr */ /* Updated: 2017/03/05 17:09:22 by jhalford ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */