From fa7077c05382fd1a24dab22a2b43b1f8a31cba55 Mon Sep 17 00:00:00 2001 From: Maieul BOYER Date: Sat, 31 Aug 2024 17:32:43 +0000 Subject: [PATCH] Normed parser/src/point.c --- parser/Filelist.parser.mk | 3 +- parser/src/point.c | 63 --------------------------------- parser/src/point/point_funcs1.c | 44 +++++++++++++++++++++++ parser/src/point/point_funcs2.c | 44 +++++++++++++++++++++++ 4 files changed, 90 insertions(+), 64 deletions(-) delete mode 100644 parser/src/point.c create mode 100644 parser/src/point/point_funcs1.c create mode 100644 parser/src/point/point_funcs2.c diff --git a/parser/Filelist.parser.mk b/parser/Filelist.parser.mk index c51b4fc0..d05611c2 100644 --- a/parser/Filelist.parser.mk +++ b/parser/Filelist.parser.mk @@ -16,7 +16,8 @@ node/node_getter_funcs3 \ node/node_iterator \ node/node_relevent \ parser \ -point \ +point/point_funcs1 \ +point/point_funcs2 \ reduce_action \ scanner \ stack/stack_add_link \ diff --git a/parser/src/point.c b/parser/src/point.c deleted file mode 100644 index 9f8a3fb0..00000000 --- a/parser/src/point.c +++ /dev/null @@ -1,63 +0,0 @@ -#include "parser/point.h" - -TSPoint point__new(t_u32 row, t_u32 column) -{ - return ((TSPoint){row, column}); -} - -TSPoint point_add(TSPoint a, TSPoint b) -{ - if (b.row > 0) - return (point__new(a.row + b.row, b.column)); - else - return (point__new(a.row, a.column + b.column)); -} - -TSPoint point_sub(TSPoint a, TSPoint b) -{ - if (a.row > b.row) - return (point__new(a.row - b.row, a.column)); - else - return (point__new(0, a.column - b.column)); -} - -bool point_lte(TSPoint a, TSPoint b) -{ - return ((a.row < b.row) || (a.row == b.row && a.column <= b.column)); -} - -bool point_lt(TSPoint a, TSPoint b) -{ - return ((a.row < b.row) || (a.row == b.row && a.column < b.column)); -} - -bool point_gt(TSPoint a, TSPoint b) -{ - return ((a.row > b.row) || (a.row == b.row && a.column > b.column)); -} - -bool point_gte(TSPoint a, TSPoint b) -{ - return ((a.row > b.row) || (a.row == b.row && a.column >= b.column)); -} - -bool point_eq(TSPoint a, TSPoint b) -{ - return (a.row == b.row && a.column == b.column); -} - -TSPoint point_min(TSPoint a, TSPoint b) -{ - if (a.row < b.row || (a.row == b.row && a.column < b.column)) - return (a); - else - return (b); -} - -TSPoint point_max(TSPoint a, TSPoint b) -{ - if (a.row > b.row || (a.row == b.row && a.column > b.column)) - return (a); - else - return (b); -} \ No newline at end of file diff --git a/parser/src/point/point_funcs1.c b/parser/src/point/point_funcs1.c new file mode 100644 index 00000000..27c41b32 --- /dev/null +++ b/parser/src/point/point_funcs1.c @@ -0,0 +1,44 @@ +/* ************************************************************************** */ +/* */ +/* ::: :::::::: */ +/* point_funcs1.c :+: :+: :+: */ +/* +:+ +:+ +:+ */ +/* By: maiboyer +#+ +:+ +#+ */ +/* +#+#+#+#+#+ +#+ */ +/* Created: 2024/08/31 17:31:13 by maiboyer #+# #+# */ +/* Updated: 2024/08/31 17:31:33 by maiboyer ### ########.fr */ +/* */ +/* ************************************************************************** */ + +#include "parser/point.h" + +TSPoint point__new(t_u32 row, t_u32 column) +{ + return ((TSPoint){row, column}); +} + +TSPoint point_add(TSPoint a, TSPoint b) +{ + if (b.row > 0) + return (point__new(a.row + b.row, b.column)); + else + return (point__new(a.row, a.column + b.column)); +} + +TSPoint point_sub(TSPoint a, TSPoint b) +{ + if (a.row > b.row) + return (point__new(a.row - b.row, a.column)); + else + return (point__new(0, a.column - b.column)); +} + +bool point_lte(TSPoint a, TSPoint b) +{ + return ((a.row < b.row) || (a.row == b.row && a.column <= b.column)); +} + +bool point_lt(TSPoint a, TSPoint b) +{ + return ((a.row < b.row) || (a.row == b.row && a.column < b.column)); +} diff --git a/parser/src/point/point_funcs2.c b/parser/src/point/point_funcs2.c new file mode 100644 index 00000000..ff569fca --- /dev/null +++ b/parser/src/point/point_funcs2.c @@ -0,0 +1,44 @@ +/* ************************************************************************** */ +/* */ +/* ::: :::::::: */ +/* point_funcs2.c :+: :+: :+: */ +/* +:+ +:+ +:+ */ +/* By: maiboyer +#+ +:+ +#+ */ +/* +#+#+#+#+#+ +#+ */ +/* Created: 2024/08/31 17:31:56 by maiboyer #+# #+# */ +/* Updated: 2024/08/31 17:31:57 by maiboyer ### ########.fr */ +/* */ +/* ************************************************************************** */ + +#include "parser/point.h" + +bool point_gt(TSPoint a, TSPoint b) +{ + return ((a.row > b.row) || (a.row == b.row && a.column > b.column)); +} + +bool point_gte(TSPoint a, TSPoint b) +{ + return ((a.row > b.row) || (a.row == b.row && a.column >= b.column)); +} + +bool point_eq(TSPoint a, TSPoint b) +{ + return (a.row == b.row && a.column == b.column); +} + +TSPoint point_min(TSPoint a, TSPoint b) +{ + if (a.row < b.row || (a.row == b.row && a.column < b.column)) + return (a); + else + return (b); +} + +TSPoint point_max(TSPoint a, TSPoint b) +{ + if (a.row > b.row || (a.row == b.row && a.column > b.column)) + return (a); + else + return (b); +}