From b998f45e497a72e433dd058058bca53756479626 Mon Sep 17 00:00:00 2001 From: Jack Halford Date: Sun, 5 Mar 2017 17:30:32 +0100 Subject: [PATCH] comments with # --- 42sh/Makefile | 1 - 42sh/includes/lexer.h | 3 +-- 42sh/src/lexer/get_state_global.c | 4 +--- 42sh/src/lexer/lexer_comment.c | 23 ----------------------- 42sh/src/lexer/lexer_dquote.c | 2 +- 42sh/src/lexer/lexer_end.c | 18 ++++++++++++++---- 42sh/src/lexer/lexer_lex.c | 8 +++++--- 42sh/src/main/shell_get_opts.c | 2 +- 8 files changed, 23 insertions(+), 38 deletions(-) delete mode 100644 42sh/src/lexer/lexer_comment.c diff --git a/42sh/Makefile b/42sh/Makefile index e0bfe3a8..5a75871a 100644 --- a/42sh/Makefile +++ b/42sh/Makefile @@ -178,7 +178,6 @@ lexer/insert_newline.c\ lexer/lexer_assignement_word.c\ lexer/lexer_backslash.c\ lexer/lexer_bquote.c\ -lexer/lexer_comment.c\ lexer/lexer_curly_braces.c\ lexer/lexer_default.c\ lexer/lexer_delim.c\ diff --git a/42sh/includes/lexer.h b/42sh/includes/lexer.h index 89fa6f55..74fd80bc 100644 --- a/42sh/includes/lexer.h +++ b/42sh/includes/lexer.h @@ -6,7 +6,7 @@ /* 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, CURLY_BRACKETS, ASSIGNEMENT_WORD, - COMMENT, END, }; diff --git a/42sh/src/lexer/get_state_global.c b/42sh/src/lexer/get_state_global.c index d6af9653..a723edc5 100644 --- a/42sh/src/lexer/get_state_global.c +++ b/42sh/src/lexer/get_state_global.c @@ -6,7 +6,7 @@ /* 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]); if (ft_is_delim(c)) return (DELIM); - else if (c == '#') - return (COMMENT); else if (c == '&' || c == ';' || c == '|') return (SEP); else if (c == '\\') diff --git a/42sh/src/lexer/lexer_comment.c b/42sh/src/lexer/lexer_comment.c deleted file mode 100644 index 8a302869..00000000 --- a/42sh/src/lexer/lexer_comment.c +++ /dev/null @@ -1,23 +0,0 @@ -/* ************************************************************************** */ -/* */ -/* ::: :::::::: */ -/* lexer_comment.c :+: :+: :+: */ -/* +:+ +:+ +:+ */ -/* By: jhalford +#+ +:+ +#+ */ -/* +#+#+#+#+#+ +#+ */ -/* 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)); -} diff --git a/42sh/src/lexer/lexer_dquote.c b/42sh/src/lexer/lexer_dquote.c index 3c241889..b158a14d 100644 --- a/42sh/src/lexer/lexer_dquote.c +++ b/42sh/src/lexer/lexer_dquote.c @@ -6,7 +6,7 @@ /* 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 */ /* */ /* ************************************************************************** */ diff --git a/42sh/src/lexer/lexer_end.c b/42sh/src/lexer/lexer_end.c index 2ec70dd2..dcc162c8 100644 --- a/42sh/src/lexer/lexer_end.c +++ b/42sh/src/lexer/lexer_end.c @@ -1,13 +1,23 @@ +/* ************************************************************************** */ +/* */ +/* ::: :::::::: */ +/* lexer_end.c :+: :+: :+: */ +/* +:+ +:+ +:+ */ +/* By: jhalford +#+ +:+ +#+ */ +/* +#+#+#+#+#+ +#+ */ +/* Created: 2017/03/05 16:58:24 by jhalford #+# #+# */ +/* Updated: 2017/03/05 17:29:17 by jhalford ### ########.fr */ +/* */ +/* ************************************************************************** */ + #include "lexer.h" int lexer_end(t_list **alst, t_lexer *lexer) { t_token *token; - if ((*alst && (lexer->state == QUOTE - || lexer->state == DQUOTE - || lexer->state == BQUOTE)) - || get_lexer_stack(*lexer) == DLESS) + if ((*alst && (lexer->state == QUOTE || lexer->state == DQUOTE + || lexer->state == BQUOTE)) || get_lexer_stack(*lexer) == DLESS) { ft_strappend(&lexer->str, (char[]){'\n', 0}); lexer->pos++; diff --git a/42sh/src/lexer/lexer_lex.c b/42sh/src/lexer/lexer_lex.c index c5900571..06c72698 100644 --- a/42sh/src/lexer/lexer_lex.c +++ b/42sh/src/lexer/lexer_lex.c @@ -6,7 +6,7 @@ /* 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_curly_braces, &lexer_assignement_word, - &lexer_comment, &lexer_end, }; @@ -51,7 +50,10 @@ int lexer_lex(t_list **alst, t_lexer *lexer) { 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)); if (!*alst) { diff --git a/42sh/src/main/shell_get_opts.c b/42sh/src/main/shell_get_opts.c index 6e259f08..2b03c6ae 100644 --- a/42sh/src/main/shell_get_opts.c +++ b/42sh/src/main/shell_get_opts.c @@ -6,7 +6,7 @@ /* 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 */ /* */ /* ************************************************************************** */