diff --git a/42sh/includes/ft_readline.h b/42sh/includes/ft_readline.h index a1760ef5..f73e6770 100644 --- a/42sh/includes/ft_readline.h +++ b/42sh/includes/ft_readline.h @@ -6,7 +6,7 @@ /* By: sbenning +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2016/12/08 18:02:25 by sbenning #+# #+# */ -/* Updated: 2016/12/09 18:26:46 by sbenning ### ########.fr */ +/* Updated: 2016/12/10 11:49:42 by sbenning ### ########.fr */ /* */ /* ************************************************************************** */ @@ -26,11 +26,13 @@ /* * Bitset manipulation : X is the bitset and Y is the bit to manipulate * IS : Is Y set in X + * NOT : Is Y not set in X * SET : Set Y in X * UNSET : Unset Y from X */ # define RL_IS(X, Y) (X & Y) +# define RL_NOT(X, Y) (!RL_IS(X, Y)) # define RL_SET(X, Y) (X |= Y) # define RL_UNSET(X, Y) (X &= ~Y) diff --git a/42sh/src/line-editing/ft_readline.c b/42sh/src/line-editing/ft_readline.c index 4f496620..b7483ed9 100644 --- a/42sh/src/line-editing/ft_readline.c +++ b/42sh/src/line-editing/ft_readline.c @@ -6,7 +6,7 @@ /* By: sbenning +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2016/12/08 18:03:48 by sbenning #+# #+# */ -/* Updated: 2016/12/09 18:27:49 by sbenning ### ########.fr */ +/* Updated: 2016/12/10 11:50:51 by sbenning ### ########.fr */ /* */ /* ************************************************************************** */ @@ -60,7 +60,7 @@ static void rl_toogle_bitset(t_line *line, int set) RL_UNSET(line->bitset, RL_ESC); esc = 0; } - if ((select && !RL_IS(line->bitset, RL_SELECT)) || (!select && RL_IS(line->bitset, RL_SELECT))) + if ((select && RL_NOT(line->bitset, RL_SELECT)) || (!select && RL_IS(line->bitset, RL_SELECT))) { rl_reset_display(line); } @@ -75,7 +75,7 @@ static int rl_finish(t_line *line) write(1, "\n", 1); if (rl_stack_line(line) < 0) return (-1); - if (!RL_IS(line->bitset, RL_FINISH)) + if (RL_NOT(line->bitset, RL_FINISH)) { if (curs_coo_setup(&line->curs) < 0) return (-1); diff --git a/42sh/src/line-editing/rl_display.c b/42sh/src/line-editing/rl_display.c index 0261bd7e..26f787f5 100644 --- a/42sh/src/line-editing/rl_display.c +++ b/42sh/src/line-editing/rl_display.c @@ -6,7 +6,7 @@ /* By: sbenning +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2016/12/08 18:38:39 by sbenning #+# #+# */ -/* Updated: 2016/12/09 13:16:11 by sbenning ### ########.fr */ +/* Updated: 2016/12/10 11:52:18 by sbenning ### ########.fr */ /* */ /* ************************************************************************** */ @@ -20,7 +20,7 @@ void rl_reset_display_post(t_line *line) curs_clear_post(&line->curs); if (len == 0) return ; - if (!RL_IS(line->bitset, RL_SELECT) || (RL_IS(line->bitset, RL_SELECT) && line->select < line->pos)) + if (RL_NOT(line->bitset, RL_SELECT) || (RL_IS(line->bitset, RL_SELECT) && line->select < line->pos)) { curs_write_static(&line->curs, line->input + line->pos, len); return; @@ -40,7 +40,7 @@ void rl_reset_display_ante(t_line *line) if (!line->pos) return ; curs_backward(&line->curs, line->pos); - if (!RL_IS(line->bitset, RL_SELECT) || (RL_IS(line->bitset, RL_SELECT) && line->select > line->pos)) + if (RL_NOT(line->bitset, RL_SELECT) || (RL_IS(line->bitset, RL_SELECT) && line->select > line->pos)) { curs_write(&line->curs, line->input, line->pos); return ; diff --git a/42sh/src/line-editing/rl_dquote_function.c b/42sh/src/line-editing/rl_dquote_function.c index 2737131c..a6266282 100644 --- a/42sh/src/line-editing/rl_dquote_function.c +++ b/42sh/src/line-editing/rl_dquote_function.c @@ -6,7 +6,7 @@ /* By: sbenning +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2016/12/09 00:46:36 by sbenning #+# #+# */ -/* Updated: 2016/12/09 02:20:10 by sbenning ### ########.fr */ +/* Updated: 2016/12/10 12:05:12 by sbenning ### ########.fr */ /* */ /* ************************************************************************** */ @@ -14,7 +14,7 @@ int rl_dquote_function(t_line *line, long int input) { - if (!RL_IS(line->bitset, RL_ESC)) + if (RL_NOT(line->bitset, RL_ESC)) { if (RL_IS(line->bitset, RL_DQUOTE)) RL_UNSET(line->bitset, RL_DQUOTE); diff --git a/42sh/src/line-editing/rl_esc_function.c b/42sh/src/line-editing/rl_esc_function.c index 99e700c0..ee1e85bf 100644 --- a/42sh/src/line-editing/rl_esc_function.c +++ b/42sh/src/line-editing/rl_esc_function.c @@ -6,7 +6,7 @@ /* By: sbenning +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2016/12/09 00:40:22 by sbenning #+# #+# */ -/* Updated: 2016/12/09 02:18:11 by sbenning ### ########.fr */ +/* Updated: 2016/12/10 12:05:51 by sbenning ### ########.fr */ /* */ /* ************************************************************************** */ @@ -14,7 +14,7 @@ int rl_esc_function(t_line *line, long int input) { - if (!RL_IS(line->bitset, RL_ESC)) + if (RL_NOT(line->bitset, RL_ESC)) RL_SET(line->bitset, RL_ESC); return (rl_default_function(line, input)); } diff --git a/42sh/src/line-editing/rl_nl_function.c b/42sh/src/line-editing/rl_nl_function.c index 2450d72f..9b57334c 100644 --- a/42sh/src/line-editing/rl_nl_function.c +++ b/42sh/src/line-editing/rl_nl_function.c @@ -6,7 +6,7 @@ /* By: sbenning +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2016/12/08 19:03:22 by sbenning #+# #+# */ -/* Updated: 2016/12/09 13:02:00 by sbenning ### ########.fr */ +/* Updated: 2016/12/10 12:06:41 by sbenning ### ########.fr */ /* */ /* ************************************************************************** */ @@ -16,7 +16,7 @@ int rl_nl_function(t_line *line, long int input) { if (RL_IS(line->bitset, RL_SELECT)) RL_UNSET(line->bitset, RL_SELECT); - if (!RL_IS(line->bitset, RL_QUOTING)) + if (RL_NOT(line->bitset, RL_QUOTING)) RL_SET(line->bitset, RL_FINISH); RL_SET(line->bitset, RL_STACK); return (0); diff --git a/42sh/src/line-editing/rl_quote_function.c b/42sh/src/line-editing/rl_quote_function.c index 7a1a8024..834f6c61 100644 --- a/42sh/src/line-editing/rl_quote_function.c +++ b/42sh/src/line-editing/rl_quote_function.c @@ -6,7 +6,7 @@ /* By: sbenning +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2016/12/09 00:45:34 by sbenning #+# #+# */ -/* Updated: 2016/12/09 02:20:20 by sbenning ### ########.fr */ +/* Updated: 2016/12/10 12:05:26 by sbenning ### ########.fr */ /* */ /* ************************************************************************** */ @@ -14,7 +14,7 @@ int rl_quote_function(t_line *line, long int input) { - if (!RL_IS(line->bitset, RL_ESC)) + if (RL_NOT(line->bitset, RL_ESC)) { if (RL_IS(line->bitset, RL_QUOTE)) RL_UNSET(line->bitset, RL_QUOTE); diff --git a/42sh/src/line-editing/rl_select_end_function.c b/42sh/src/line-editing/rl_select_end_function.c index f79862eb..785785d7 100644 --- a/42sh/src/line-editing/rl_select_end_function.c +++ b/42sh/src/line-editing/rl_select_end_function.c @@ -6,7 +6,7 @@ /* By: sbenning +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2016/12/09 13:19:35 by sbenning #+# #+# */ -/* Updated: 2016/12/09 13:20:31 by sbenning ### ########.fr */ +/* Updated: 2016/12/10 12:07:40 by sbenning ### ########.fr */ /* */ /* ************************************************************************** */ @@ -18,7 +18,7 @@ int rl_select_end_function(t_line *line, long int input) if (line->pos == line->used) return (0); - if (!RL_IS(line->bitset, RL_SELECT)) + if (RL_NOT(line->bitset, RL_SELECT)) line->select = line->pos; ret = rl_end_function(line, input); RL_SET(line->bitset, RL_SELECT); diff --git a/42sh/src/line-editing/rl_select_home_function.c b/42sh/src/line-editing/rl_select_home_function.c index 6bdb5692..2f59596d 100644 --- a/42sh/src/line-editing/rl_select_home_function.c +++ b/42sh/src/line-editing/rl_select_home_function.c @@ -6,7 +6,7 @@ /* By: sbenning +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2016/12/09 13:18:43 by sbenning #+# #+# */ -/* Updated: 2016/12/09 13:20:31 by sbenning ### ########.fr */ +/* Updated: 2016/12/10 12:07:55 by sbenning ### ########.fr */ /* */ /* ************************************************************************** */ @@ -18,7 +18,7 @@ int rl_select_home_function(t_line *line, long int input) if (!line->pos) return (0); - if (!RL_IS(line->bitset, RL_SELECT)) + if (RL_NOT(line->bitset, RL_SELECT)) line->select = line->pos; ret = rl_home_function(line, input); RL_SET(line->bitset, RL_SELECT); diff --git a/42sh/src/line-editing/rl_select_left_function.c b/42sh/src/line-editing/rl_select_left_function.c index 9e91cdfc..a3801cb0 100644 --- a/42sh/src/line-editing/rl_select_left_function.c +++ b/42sh/src/line-editing/rl_select_left_function.c @@ -6,7 +6,7 @@ /* By: sbenning +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2016/12/09 03:06:59 by sbenning #+# #+# */ -/* Updated: 2016/12/09 12:37:28 by sbenning ### ########.fr */ +/* Updated: 2016/12/10 12:08:10 by sbenning ### ########.fr */ /* */ /* ************************************************************************** */ @@ -18,7 +18,7 @@ int rl_select_left_function(t_line *line, long int input) if (!line->pos) return (0); - if (!RL_IS(line->bitset, RL_SELECT)) + if (RL_NOT(line->bitset, RL_SELECT)) line->select = line->pos; ret = rl_left_function(line, input); RL_SET(line->bitset, RL_SELECT); diff --git a/42sh/src/line-editing/rl_select_pagedown_function.c b/42sh/src/line-editing/rl_select_pagedown_function.c index 9dd81a5b..3f0cab1a 100644 --- a/42sh/src/line-editing/rl_select_pagedown_function.c +++ b/42sh/src/line-editing/rl_select_pagedown_function.c @@ -6,7 +6,7 @@ /* By: sbenning +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2016/12/09 03:16:57 by sbenning #+# #+# */ -/* Updated: 2016/12/09 13:29:15 by sbenning ### ########.fr */ +/* Updated: 2016/12/10 12:08:30 by sbenning ### ########.fr */ /* */ /* ************************************************************************** */ @@ -19,7 +19,7 @@ int rl_select_pagedown_function(t_line *line, long int input) if (line->pos == line->used) return (0); - if (!RL_IS(line->bitset, RL_SELECT)) + if (RL_NOT(line->bitset, RL_SELECT)) line->select = line->pos; ret = rl_pagedown_function(line, input); RL_SET(line->bitset, RL_SELECT); diff --git a/42sh/src/line-editing/rl_select_pageup_function.c b/42sh/src/line-editing/rl_select_pageup_function.c index acceff3c..aff40bc9 100644 --- a/42sh/src/line-editing/rl_select_pageup_function.c +++ b/42sh/src/line-editing/rl_select_pageup_function.c @@ -6,7 +6,7 @@ /* By: sbenning +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2016/12/09 03:06:59 by sbenning #+# #+# */ -/* Updated: 2016/12/09 13:29:30 by sbenning ### ########.fr */ +/* Updated: 2016/12/10 12:08:47 by sbenning ### ########.fr */ /* */ /* ************************************************************************** */ @@ -18,7 +18,7 @@ int rl_select_pageup_function(t_line *line, long int input) if (!line->pos) return (0); - if (!RL_IS(line->bitset, RL_SELECT)) + if (RL_NOT(line->bitset, RL_SELECT)) line->select = line->pos; ret = rl_pageup_function(line, input); RL_SET(line->bitset, RL_SELECT); diff --git a/42sh/src/line-editing/rl_select_wleft_function.c b/42sh/src/line-editing/rl_select_wleft_function.c index 9c4314d9..40843bd6 100644 --- a/42sh/src/line-editing/rl_select_wleft_function.c +++ b/42sh/src/line-editing/rl_select_wleft_function.c @@ -6,7 +6,7 @@ /* By: sbenning +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2016/12/09 03:06:59 by sbenning #+# #+# */ -/* Updated: 2016/12/09 13:28:20 by sbenning ### ########.fr */ +/* Updated: 2016/12/10 12:09:03 by sbenning ### ########.fr */ /* */ /* ************************************************************************** */ @@ -18,7 +18,7 @@ int rl_select_wleft_function(t_line *line, long int input) if (!line->pos) return (0); - if (!RL_IS(line->bitset, RL_SELECT)) + if (RL_NOT(line->bitset, RL_SELECT)) line->select = line->pos; ret = rl_wleft_function(line, input); RL_SET(line->bitset, RL_SELECT); diff --git a/42sh/src/line-editing/rl_select_wright_function.c b/42sh/src/line-editing/rl_select_wright_function.c index af75dd2a..96527e9f 100644 --- a/42sh/src/line-editing/rl_select_wright_function.c +++ b/42sh/src/line-editing/rl_select_wright_function.c @@ -6,7 +6,7 @@ /* By: sbenning +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2016/12/09 03:16:57 by sbenning #+# #+# */ -/* Updated: 2016/12/09 13:28:37 by sbenning ### ########.fr */ +/* Updated: 2016/12/10 12:09:16 by sbenning ### ########.fr */ /* */ /* ************************************************************************** */ @@ -19,7 +19,7 @@ int rl_select_wright_function(t_line *line, long int input) if (line->pos == line->used) return (0); - if (!RL_IS(line->bitset, RL_SELECT)) + if (RL_NOT(line->bitset, RL_SELECT)) line->select = line->pos; ret = rl_wright_function(line, input); RL_SET(line->bitset, RL_SELECT);