From 704a47684d05c13bebe25fe0fa1f241650d2ef39 Mon Sep 17 00:00:00 2001 From: Manzovince Date: Mon, 22 Apr 2019 17:12:36 +0200 Subject: [PATCH] files cleaned (WORKING) --- .gitignore | 4 ++++ .parse_input.c.swo | Bin 12288 -> 0 bytes .parse_input.c.swp | Bin 12288 -> 0 bytes .test_big_map.c.swp | Bin 12288 -> 0 bytes .test_mask.c.swp | Bin 12288 -> 0 bytes add_to_list.c | 23 +++++++++++--------- fillit.h | 7 ++++-- main.c | 2 +- parse_input.c | 52 +++++++------------------------------------- 9 files changed, 31 insertions(+), 57 deletions(-) delete mode 100644 .parse_input.c.swo delete mode 100644 .parse_input.c.swp delete mode 100644 .test_big_map.c.swp delete mode 100644 .test_mask.c.swp diff --git a/.gitignore b/.gitignore index e525c97..862bf81 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,7 @@ objs/ a\.out\.dSYM/ a\.out + +*.swo + +*.swp diff --git a/.parse_input.c.swo b/.parse_input.c.swo deleted file mode 100644 index 90e58e08fc209bacee8a6c959b7789c93f1f66e1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 12288 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 diff --git a/.test_big_map.c.swp b/.test_big_map.c.swp deleted file mode 100644 index e95f62a58530df7ed439eca78784d4bd191dc635..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 12288 zcmeI2O^6&t6vr##M@Ef`9>l2dvSG75JF_!W)6QPFsh=+T@0tGefF4GRG;k!twS-PQH+-oM^^ zwIQ?Fc=4%|biCGLxb9)h{rvLjPaZhPR!%b3&wO`yPJP(_63uuy;_X_iS?k67bbU3S zu-*%^I6ar14eJeOqbGe|ru9@L>Bgqq+8DY~&D&=Z^T{Y+6u5o`vb49YgX z=Z?^Q_r7rb^OzAv0i%FXz$jo8FbWt2i~>dhqreTTKpGujufh783J*4l`++_8;?>-Y z0!9I&fKk9GU=%P47zK<1MggOMQNSo*6u1EuaJ!7XehXs{-Uj3G|NoDU?m>+x%J_8rQ`(PeC1pdB*u|L3% z;7f1`NbnqZ8axgfpalN99X5mSz&GGMz`?~5M|Qloie9i4W$)9xJSHh1hQb@=gi3-7#2ZKuUMZEiQKItLCtE*&5nkTziF4Hkm)^D$ub+gTBY4TC&QL5MX%)uMiy0DZC z5)li6c6L(?1wmQrxXa(H;FxXN8%?OAgDi6nrSmb8Wu#xn`IJHud z#!`pgq+^k>qtx^(6{M!!Y#>_gCRLC!c#^M zB31H|5Ic|i%%0@|Iga@-Bk7X}RN7$qYj5YQuhFT2F0G}}_Ejo_QDvRl4OMS-QKDnV zXnSc%-7HnYmiTCMT=M#^a-fG~(4Oc$O5h<%O&;Y%UcgN3$T*>=Lb0k`L;xh2+(D`% zbKG7}BBG~Vhl5#w7FFb@4~1=7Ll{B$Z5XzUEgT&UD8IVis%pBtjt@GF(J3#uEnR(e zm2f7HZ3F=;>7YW?>Jb>Z=WIy^Y8e=cF8<_ks&#wPD%EkY6UuIW7EVv4i{3g8h{ZZv zTtoptt%&p5wB>m;`}6L+7S-x*EzBUJ3LMNDtAUo_o zSAqq6pNT70UmTxR5(gB@J=`c+p$8q1l(I~ZVgKMb4skwLrbota4V}`vk3*;(yk0^{WbOv DC*IAG diff --git a/.test_mask.c.swp b/.test_mask.c.swp deleted file mode 100644 index 6204ff16068b4fd788010eb44de9c61c630d9c7b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 12288 zcmeI2Ply{;9LL`ZWgY8kRnY6Nu_lvgOlFeZWYgWO;z1A*|A1b)-DQ%@xGzp-!pxg3 zC0oUd;8p6WN5y*dq7)SMpm_5S9>g9+x*+yYXfJ}`_s!(b*i9BJMJT+$XWzfy{O0%j zzTbQ7vT2*IJ@*1N%F7I&V~l;&yu9gOS!C-M7~6?GyMInD9R6{t;p)JGk80Ts4>5f+ zby#tOI27l^*`Q*sY`fg^xTpvx65D+{dZXMq#DiK=3Md6`OMzIpPp&SpTGcY;^N;6_ z(<2YRdRwm4LrMXqfKosypcGIFCo_`aPrYH%INlE$wKi8l`|z zKq;UUPzopolmbctrGQdEDWDWk3Md8cLIvzDV;2`0D`*HF|NkHV{eSI2#{L99fgiwk z;4APY_yl|a-UAMJ1-t}a1UkrrW8kj`7~2O|!EfL*@IH7QG{6$jz`fww5@UaWpTQU4 zB6t}*4O*Z89s<|zXY6Be3491HfVaW3zykY68T$o%1KtG!7@z>204KmAI0F8@kFlHJ z2Dl1-1>b{j!Da9%xCHuO6Fd)2fd(*u4hrA|I06>H4d}QJeg{8-ufgZw9nc4-!84!* z%D@0p`^Uhe;3!ZZrGQdEDWDWk3Md8sHwBCeGmP^<3ynIwsvLu1V9xUUS9v zAQpZ*bo{QTbDxWJRg+!XYmxkBV`4wwH1&}x?rG~xiO^Kjrgo;7 z`X9;=xJ$a-p;n8Qi*hXAMJ>`TT3^SMd~IUpi)1MYgJU3LlLP5QjOq577N8Xy&3Hk#&baY;#9$uqqgAh+|x4DS)0~0*47^QzmmO0a^ z)|OZ5jn!tZL>T2{uG%=u4YG<%8?x!x#JGois|}cObei>Qb&XXj$!xP$PX}^krEWE9 zYxt#8CfSqbX!#l&GIZwWkL0ocaG2~Yw>{dTQSL>0iZUCQ+d4%q7r7##O==>^R8ISW zNSBh((nYDUUfA>t$Pn&l`p;8u@(vW3ZcTm5p)5l@dUl6<4(UDG*l0Eryx}xb9XM%Y$!8B%^GB4%}!^69kOwm9CQYOQQ}&qLi)h*BPS%Ayh1Fv$HxOl zUPuvj1HXe42TMm##3}YEa$=8g>d~Pn9ysA3KriqqXbbM(h*^ofd{RCUVvc;6&apNV zYxAVpGRaDQnkOyvaXm$tuv)1*?vZQ9f+j)Y0AM3=Yhgu%wja4c*mvMeme0WhmsKev z-l$7k;~TVwjUKYyfOn@Cp1d~F+9{zUCIy+?lQUkW=|M+8uRQVTjWOpmPc|uYmgVKO qY&PpCFWH?O>lrs$5@@D|Wq8TUi}=zn_d8zPbtvcYwkygzIra}1U{{g= diff --git a/add_to_list.c b/add_to_list.c index 3630c81..048db2a 100644 --- a/add_to_list.c +++ b/add_to_list.c @@ -6,13 +6,13 @@ /* By: hulamy +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2019/04/14 15:20:53 by hulamy #+# #+# */ -/* Updated: 2019/04/22 15:12:47 by vmanzoni ### ########.fr */ +/* Updated: 2019/04/22 15:58:39 by vmanzoni ### ########.fr */ /* */ /* ************************************************************************** */ #include "fillit.h" #include -#include "libft/includes/libft.h" +//#include "libft/includes/libft.h" /* ** this function prints a 16 bites short @@ -24,8 +24,8 @@ void print_bits(short line) mask = 1 << 27; while (mask >>= 1) - (line & mask) ? ft_putnbr(1) : ft_putnbr(0); - ft_putchar('\n'); + (line & mask) ? write(1, "1", 1) : write(1, "0", 1); + write(1, "\n", 1); } /* @@ -33,17 +33,19 @@ void print_bits(short line) ** then it fills it and its reverse into the list */ -int fill_list(char *line, t_fillist *list) +int fill_list(char line[], t_fillist *list) { short tmp; int test; + int i; - while (*line) + i = 0; + while (line[i]) { list->tetribit <<= 1; - if (*line == '\n') - line++; - if (*(line++) == '#') + if (line[i] == '\n') + i++; + if (line[i++] == '#') list->tetribit |= 1; } tmp = list->tetribit; @@ -128,7 +130,7 @@ void test(unsigned int map[]) mask = (mask >> 1) | (((1 << (i % 32)) & map[j]) << (31 - (i % 32))); } } - +/* int main(int ac, char **av) { static t_fillist *list = NULL; // avant d'appeller add_to_list il faut declarer un pointeur static vers la structure @@ -150,3 +152,4 @@ int main(int ac, char **av) return (0); } +*/ diff --git a/fillit.h b/fillit.h index 94895c2..7a60d6a 100644 --- a/fillit.h +++ b/fillit.h @@ -6,7 +6,7 @@ /* By: vmanzoni +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2019/03/01 13:34:46 by vmanzoni #+# #+# */ -/* Updated: 2019/04/19 14:52:10 by hulamy ### ########.fr */ +/* Updated: 2019/04/22 15:57:43 by vmanzoni ### ########.fr */ /* */ /* ************************************************************************** */ @@ -20,7 +20,9 @@ #include // for debug printf #include // to use bool type -# define BUFF_SIZE 1024 +#include "libft/includes/libft.h" + +//# define BUFF_SIZE 1024 /* ** STRUCTURE @@ -45,5 +47,6 @@ int check_file_errors(char *file); int check_tetri_errors(char *tetri); int check_tetri_errors2(char *tetri); int add_to_list(char *square, t_fillist **list); +int fill_list(char *line, t_fillist *list); #endif diff --git a/main.c b/main.c index d7dfc4b..47cdfd7 100644 --- a/main.c +++ b/main.c @@ -6,7 +6,7 @@ /* By: vmanzoni +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2019/02/12 13:20:48 by vmanzoni #+# #+# */ -/* Updated: 2019/04/16 16:41:28 by vmanzoni ### ########.fr */ +/* Updated: 2019/04/22 15:50:16 by vmanzoni ### ########.fr */ /* */ /* ************************************************************************** */ diff --git a/parse_input.c b/parse_input.c index 9dbda39..4028264 100644 --- a/parse_input.c +++ b/parse_input.c @@ -6,28 +6,12 @@ /* By: vmanzoni +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2019/04/15 14:48:14 by vmanzoni #+# #+# */ -/* Updated: 2019/04/18 16:09:24 by vmanzoni ### ########.fr */ -/* Updated: 2019/04/19 12:53:40 by hulamy ### ########.fr */ +/* Updated: 2019/04/22 17:06:51 by vmanzoni ### ########.fr */ /* */ /* ************************************************************************** */ #include "fillit.h" -/* -** !!! DELETE PRINT_BITS BEFORE EVAL !!! -*/ - -void print_bits(short octet) -{ - int i; - - i = 1 << 16; - while (i >>= 1) - (octet & i) ? write(1, "1", 1) : write(1, "0", 1); - printf("\n"); -} - - /* ** Function that parse a file and put each tetrimino in a linked list */ @@ -56,25 +40,9 @@ char **create_square(char *tetri) return (square); } -short create_tetribit(char *tetri) -{ - short tetribit; - int i; - - i = 0; - tetribit = 0; - while (tetri[i]) - { - if (tetri[i] != '\n') // Pour comparer avec le tetri en char - printf("%c", tetri[i]); - if (tetri[i] == '#') - tetribit = tetribit | 1; - else - tetribit <<= 1; - i++; - } - return (tetribit); -} +/* +** Function that parse a file and put each tetrimino in a linked list +*/ void parse_input(char *input) { @@ -82,24 +50,18 @@ void parse_input(char *input) char tetri[20]; int i; int j; - short test; //DELETE BEFORE EVAL i = 0; - printf("input: %s\n", input); - printf("end\n"); while (input[i]) { j = 0; while (j < 19) tetri[j++] = input[i++]; tetri[19] = '\0'; + printf("%s\n", tetri); if (check_tetri_errors(tetri)) print_error("Error: Tetrimino not valid."); - test = create_tetribit(tetri); - printf("\n"); - print_bits(test); - //test = create_square(tetri); - //add_to_list(test, &list); + add_to_list(tetri, &list); while (input[i] == '\n') i++; } @@ -107,6 +69,7 @@ void parse_input(char *input) ** ce qui suit sert juste a afficher le contenu de tous les tetraminos de la liste chainee ** pour debug, a effacer au rendu */ + /* while (list && (i = -1)) { while (++i < list->size[1]) @@ -114,4 +77,5 @@ void parse_input(char *input) printf("\n"); list = list->next; } + */ }