Merge branch 'nobonus'

6 files changed, 365 insertions, 319 deletions

diff --git a/Makefile b/Makefile
index eb3b297..a338d11 100644
--- a/Makefile
+++ b/Makefile
@@ -23,7 +23,7 @@ RM = rm -f
 MAKE = make -j4
 
 SRC = main.c helper.c tests/pft_tests.c tests/moulitest_tests.c tests/printf_tester_tests.c \
-	  tests/printf_tests_tests.c generated.c saved_tests.c
+	  tests/printf_tests_tests.c saved_tests.c generated.c
 OBJ = $(SRC:.c=.o)
 
 run: all
diff --git a/main.c b/main.c
index 0ba22ae..67e56d4 100644
--- a/main.c
+++ b/main.c
@@ -6,7 +6,7 @@
 /*   By: cacharle <marvin@42.fr>                    +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2020/02/06 18:13:45 by cacharle          #+#    #+#             */
-/*   Updated: 2020/02/06 18:13:47 by cacharle         ###   ########.fr       */
+/*   Updated: 2020/02/06 18:59:06 by cacharle         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -43,16 +43,21 @@ int main(int argc, char **argv)
 	test_moulitest_15();
 	test_moulitest_16();
 	test_moulitest_18();
+#ifdef FT_PRINTF_TEST_BONUS
 	test_moulitest_40();
 	test_moulitest_41();
 	test_moulitest_42();
 	test_moulitest_43();
 	test_moulitest_45();
+#endif
 	test_moulitest_50();
 	test_moulitest_51();
 	test_moulitest_52();
+
+#ifdef FT_PRINTF_TEST_BONUS
 	test_moulitest_60();
 	test_moulitest_61();
+#endif
 	test_moulitest_69();
 	test_moulitest_70();
 	test_moulitest_71();
@@ -60,7 +65,9 @@ int main(int argc, char **argv)
 	test_moulitest_73();
 	test_moulitest_74();
 	test_moulitest_79();
+#ifdef FT_PRINTF_TEST_BONUS
 	test_moulitest_90();
+#endif
 	test_moulitest_91();
 	test_moulitest_wildcard_01();
 	test_moulitest_wildcard_02();
diff --git a/tests/moulitest_tests.c b/tests/moulitest_tests.c
index 60e69a8..c8eca9b 100644
--- a/tests/moulitest_tests.c
+++ b/tests/moulitest_tests.c
@@ -6,7 +6,7 @@
 /*   By: cacharle <marvin@42.fr>                    +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2020/02/06 18:15:03 by cacharle          #+#    #+#             */
-/*   Updated: 2020/02/06 18:15:04 by cacharle         ###   ########.fr       */
+/*   Updated: 2020/02/06 19:00:31 by cacharle         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -261,13 +261,15 @@ void test_moulitest_61(void)
 
 void test_moulitest_69(void)
 {
+#ifdef FT_PRINTF_TEST_BONUS
 	ASSERT_PRINTF("{% +d}", 42);
 	ASSERT_PRINTF("{%+ d}", 42);
 	ASSERT_PRINTF("{%+03d}", 0);
 	ASSERT_PRINTF("{% 03d}", 0);
-	ASSERT_PRINTF("{%0-3d}", 0);
 	ASSERT_PRINTF("{%+03d}", 12);
 	ASSERT_PRINTF("{%+03d}", 123456);
+#endif
+	ASSERT_PRINTF("{%0-3d}", 0);
 	ASSERT_PRINTF("{%03.2d}", 0);
 }
 
@@ -359,14 +361,18 @@ void test_moulitest_74(void)
 
 void test_moulitest_79(void)
 {
+#ifdef FT_PRINTF_TEST_BONUS
 	ASSERT_PRINTF("%#.x, %#.0x", 0, 0);
-	ASSERT_PRINTF("%.p, %.0p", 0, 0);
 	ASSERT_PRINTF("{%#.5x}", 1);
+#endif
+	ASSERT_PRINTF("%.p, %.0p", 0, 0);
 }
 
 void test_moulitest_90(void)
 {
+#ifdef FT_PRINTF_TEST_BONUS
 	ASSERT_PRINTF("%hhd - %hhd", SHRT_MAX - 42,  SHRT_MAX - 4200);
+#endif
 }
 
 void test_moulitest_91(void)
@@ -374,7 +380,7 @@ void test_moulitest_91(void)
 	ASSERT_PRINTF("%u", -42);
 	ASSERT_PRINTF("%u", UINT_MAX + 1);
 	ASSERT_PRINTF("%c", 200);
-	ASSERT_PRINTF("%hhu / %hhu", SHRT_MAX - 42,  SHRT_MAX - 4200);
+//	ASSERT_PRINTF("%hhu / %hhu", SHRT_MAX - 42,  SHRT_MAX - 4200);
 }
 
 void test_moulitest_wildcard_01(void)
diff --git a/tests/pft_tests.c b/tests/pft_tests.c
index 3ab8083..2fae788 100644
--- a/tests/pft_tests.c
+++ b/tests/pft_tests.c
@@ -6,7 +6,7 @@
 /*   By: cacharle <marvin@42.fr>                    +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2020/02/06 18:15:10 by cacharle          #+#    #+#             */
-/*   Updated: 2020/02/06 18:15:11 by cacharle         ###   ########.fr       */
+/*   Updated: 2020/02/06 19:24:49 by cacharle         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -39,9 +39,12 @@ void test_pft_nocrash(void)
 
 	ASSERT_PRINTF("%.4p", &ncm_p);
 	ASSERT_PRINTF("%.p", &ncm_p);
-	ASSERT_PRINTF("%#p", &ncm_p);
 	ASSERT_PRINTF("%05p", &ncm_p);
 	ASSERT_PRINTF("%0p", &ncm_p);
+	ASSERT_PRINTF("%-p", &ncm_p);
+
+#ifdef FT_PRINTF_TEST_BONUS
+	ASSERT_PRINTF("%#p", &ncm_p);
 	ASSERT_PRINTF("%+p", &ncm_p);
 	ASSERT_PRINTF("%+p", &ncm_p);
 	ASSERT_PRINTF("% p", &ncm_p);
@@ -50,7 +53,9 @@ void test_pft_nocrash(void)
 	ASSERT_PRINTF("%hp", &ncm_p);
 	ASSERT_PRINTF("%lp", &ncm_p);
 	ASSERT_PRINTF("%llp", &ncm_p);
+	ASSERT_PRINTF("%Lp", &ncm_p);*/
 	ASSERT_PRINTF("%-p", &ncm_p);
+	ASSERT_PRINTF("%Ld", 42);
 	ASSERT_PRINTF("%#d", 42);
 	ASSERT_PRINTF("%hhhd", 42);
 	ASSERT_PRINTF("%hhhhd", 42);
@@ -81,7 +86,7 @@ void test_pft_nocrash(void)
 	ASSERT_PRINTF("%hhlu", 42);
 	ASSERT_PRINTF("%hhllu", 42);
 	ASSERT_PRINTF("%llhu", 42);
-	ASSERT_PRINTF("%lllu", 42);
+	ASSERT_PRINTF("%lllu", 42);*/
 	ASSERT_PRINTF("%-u", 42);
 	ASSERT_PRINTF("%Lx", 42);
 	ASSERT_PRINTF("%+x", 42);
@@ -97,7 +102,6 @@ void test_pft_nocrash(void)
 	ASSERT_PRINTF("% X", 42);
 	ASSERT_PRINTF("%hhhX", 42);
 	ASSERT_PRINTF("%llhX", 42);
-	ASSERT_PRINTF("%-x", 42);
 	ASSERT_PRINTF("%hhf", 42.5);
 	ASSERT_PRINTF("%hf", 42.5);
 	ASSERT_PRINTF("%llf", 42.5);
@@ -107,14 +111,6 @@ void test_pft_nocrash(void)
 	ASSERT_PRINTF("%Llf", 42.5);
 	ASSERT_PRINTF("%lLf", 42.5);
 	ASSERT_PRINTF("%-f", 42.5);
-
-	ASSERT_PRINTF("%-021s", "abc");
-	ASSERT_PRINTF("%-05s", "goes over");
-	ASSERT_PRINTF("%04.3s%-7.4s", "hello", "world");
-	ASSERT_PRINTF("%021s", NULL);
-	ASSERT_PRINTF("%02s", NULL);
-	ASSERT_PRINTF("%-021s", NULL);
-	ASSERT_PRINTF("%-03s", NULL);
 	ASSERT_PRINTF("%+u", 5);
 	ASSERT_PRINTF("%+u", 5);
 	ASSERT_PRINTF("%+u", 4294967295);
@@ -145,8 +141,6 @@ void test_pft_nocrash(void)
 	ASSERT_PRINTF("%0+-8.3u", 8375);
 	ASSERT_PRINTF("%0+-3.7u", 3267);
 	ASSERT_PRINTF("%0+-3.3u", 6983);
-	ASSERT_PRINTF("%05c", '\0');
-	ASSERT_PRINTF("%-05c", '\0');
 	ASSERT_PRINTF("%+lu", 22337203685477);
 	ASSERT_PRINTF("%++d", 42);
 	ASSERT_PRINTF("%  d", 42);
@@ -156,23 +150,15 @@ void test_pft_nocrash(void)
 	ASSERT_PRINTF("%##x", 42);
 	ASSERT_PRINTF("%#++#-5x", 42);
 	ASSERT_PRINTF("%.4c", 'a');
-	ASSERT_PRINTF("%.c", 'a');
 	ASSERT_PRINTF("%#c", 'a');
-	ASSERT_PRINTF("%05c", 'a');
-	ASSERT_PRINTF("%0c", 'a');
 	ASSERT_PRINTF("%+c", 'a');
 	ASSERT_PRINTF("%+c", -42);
-	ASSERT_PRINTF("% c", 'a');
-	ASSERT_PRINTF("% c", -42);
 	ASSERT_PRINTF("%hhc", 'a');
 	ASSERT_PRINTF("%hc", 'a');
 	ASSERT_PRINTF("%lc", L'a');
 	ASSERT_PRINTF("%llc", L'a');
 	ASSERT_PRINTF("%Lc", L'a');
-	ASSERT_PRINTF("%-c", 'a');
 	ASSERT_PRINTF("%#s", "hello");
-	ASSERT_PRINTF("%05s", "hello");
-	ASSERT_PRINTF("%0s", "hello");
 	ASSERT_PRINTF("%+s", "hello");
 	ASSERT_PRINTF("% s", "hello");
 	ASSERT_PRINTF("%hhs", "hello");
@@ -180,52 +166,72 @@ void test_pft_nocrash(void)
 	ASSERT_PRINTF("%ls", L"hello");
 	ASSERT_PRINTF("%lls", L"hello");
 	ASSERT_PRINTF("%Ls", L"hello");
-	ASSERT_PRINTF("%-s", "hello");
-
 	ASSERT_PRINTF("%1$");
-	ASSERT_PRINTF("%0");
 	ASSERT_PRINTF("% ");
 	ASSERT_PRINTF("%#");
-	ASSERT_PRINTF("%-");
 	ASSERT_PRINTF("%+");
-	ASSERT_PRINTF("%23");
-	ASSERT_PRINTF("%.");
 	ASSERT_PRINTF("%hh");
 	ASSERT_PRINTF("%h");
 	ASSERT_PRINTF("%ll");
 	ASSERT_PRINTF("%l");
-	ASSERT_PRINTF("%L");
+	ASSERT_PRINTF("%L");*/
+	ASSERT_PRINTF("%f");
+	ASSERT_PRINTF("%o");
+	ASSERT_PRINTF("%1$s", NULL);*/
+	ASSERT_PRINTF("% s", NULL);
+	ASSERT_PRINTF("%#s", NULL);*/
+	ASSERT_PRINTF("%+s", NULL);
+	ASSERT_PRINTF("%hhs", NULL);
+	ASSERT_PRINTF("%hs", NULL);
+	ASSERT_PRINTF("%lls", NULL);
+	ASSERT_PRINTF("%ls", NULL);
+	ASSERT_PRINTF("%Ls", NULL);*/
+	ASSERT_PRINTF("%b", NULL);
+	ASSERT_PRINTF("%f", NULL);
+	ASSERT_PRINTF("%o", NULL);
+#endif
+	ASSERT_PRINTF("%-x", 42);
+
+	ASSERT_PRINTF("%-021s", "abc");
+	ASSERT_PRINTF("%-05s", "goes over");
+	ASSERT_PRINTF("%04.3s%-7.4s", "hello", "world");
+	ASSERT_PRINTF("%021s", NULL);
+	ASSERT_PRINTF("%02s", NULL);
+	ASSERT_PRINTF("%-021s", NULL);
+	ASSERT_PRINTF("%-03s", NULL);
+	ASSERT_PRINTF("%05c", '\0');
+	ASSERT_PRINTF("%-05c", '\0');
+	ASSERT_PRINTF("%.c", 'a');
+	ASSERT_PRINTF("%05c", 'a');
+	ASSERT_PRINTF("%0c", 'a');
+	ASSERT_PRINTF("% c", 'a');
+	ASSERT_PRINTF("% c", -42);
+	ASSERT_PRINTF("%-c", 'a');
+	ASSERT_PRINTF("%05s", "hello");
+	ASSERT_PRINTF("%0s", "hello");
+	ASSERT_PRINTF("%-s", "hello");
+
+	ASSERT_PRINTF("%0");
+	ASSERT_PRINTF("%-");
+	ASSERT_PRINTF("%23");
+	ASSERT_PRINTF("%.");
 	ASSERT_PRINTF("%p");
 	ASSERT_PRINTF("%d");
 	ASSERT_PRINTF("%u");
 	ASSERT_PRINTF("%x");
 	ASSERT_PRINTF("%X");
-	ASSERT_PRINTF("%f");
 	ASSERT_PRINTF("%c");
-	ASSERT_PRINTF("%o");
-	ASSERT_PRINTF("%1$s", NULL);
 	ASSERT_PRINTF("%0s", NULL);
-	ASSERT_PRINTF("% s", NULL);
-	ASSERT_PRINTF("%#s", NULL);
 	ASSERT_PRINTF("%-s", NULL);
-	ASSERT_PRINTF("%+s", NULL);
 	ASSERT_PRINTF("%23s", NULL);
 	ASSERT_PRINTF("%.s", NULL);
-	ASSERT_PRINTF("%hhs", NULL);
-	ASSERT_PRINTF("%hs", NULL);
-	ASSERT_PRINTF("%lls", NULL);
-	ASSERT_PRINTF("%ls", NULL);
-	ASSERT_PRINTF("%Ls", NULL);
 	ASSERT_PRINTF("%p", NULL);
 	ASSERT_PRINTF("%d", NULL);
-	ASSERT_PRINTF("%b", NULL);
 	ASSERT_PRINTF("%u", NULL);
 	ASSERT_PRINTF("%x", NULL);
 	ASSERT_PRINTF("%X", NULL);
-	ASSERT_PRINTF("%f", NULL);
 	ASSERT_PRINTF("%s", NULL);
 	ASSERT_PRINTF("%c", NULL);
-	ASSERT_PRINTF("%o", NULL);
 }
 
 void test_pft_string(void)
@@ -340,6 +346,7 @@ void test_pft_string(void)
 	ASSERT_PRINTF("%-10.8s", NULL);
 	ASSERT_PRINTF("%-.00s", s_hidden);
 	ASSERT_PRINTF("%-.09s", s_hidden);
+#ifdef FT_PRINTF_TEST_BONUS
 	ASSERT_PRINTF("%+- 06.06s", s_hidden);
 	ASSERT_PRINTF("% 0+-6.06s", s_hidden);
 	ASSERT_PRINTF("%0 +-6.06s", s_hidden);
@@ -364,6 +371,11 @@ void test_pft_string(void)
 	ASSERT_PRINTF("%+-0 6.09s", s_hidden);
 	ASSERT_PRINTF("%-+ 06.09s", s_hidden);
 	ASSERT_PRINTF("% 0-+6.09s", s_hidden);
+	ASSERT_PRINTF("%+03s", s_hidden);
+	ASSERT_PRINTF("%+09s", s_hidden);
+	ASSERT_PRINTF("%+ 3s", s_hidden);
+	ASSERT_PRINTF("%+ 6s", s_hidden);
+#endif
 	ASSERT_PRINTF("%00s", s_hidden);
 	ASSERT_PRINTF("%000s", s_hidden);
 	ASSERT_PRINTF("%0000s", s_hidden);
@@ -372,12 +384,8 @@ void test_pft_string(void)
 	ASSERT_PRINTF("%00-s", s_hidden);
 	ASSERT_PRINTF("%03s", s_hidden);
 	ASSERT_PRINTF("%09s", s_hidden);
-	ASSERT_PRINTF("%+03s", s_hidden);
-	ASSERT_PRINTF("%+09s", s_hidden);
 	ASSERT_PRINTF("%-03s", s_hidden);
 	ASSERT_PRINTF("%-09s", s_hidden);
-	ASSERT_PRINTF("%+ 3s", s_hidden);
-	ASSERT_PRINTF("%+ 6s", s_hidden);
 }
 
 void test_pft_int_i(void)
@@ -393,62 +401,36 @@ void test_pft_int_i(void)
 	ASSERT_PRINTF("this %d number", 0);
 	ASSERT_PRINTF("%i",  2147483647);
 	ASSERT_PRINTF("%i", (int)(-2147483678));
+#ifdef FT_PRINTF_TEST_BONUS
+	ASSERT_PRINTF("%0+8.5i", 34);
+	ASSERT_PRINTF("%0+10.5i", -216);
+	ASSERT_PRINTF("%0+8.5i", 0);
+	ASSERT_PRINTF("%0+8.3i", 8375);
+	ASSERT_PRINTF("%0+8.3i", -8473);
+	ASSERT_PRINTF("%0+3.7i", 3267);
+	ASSERT_PRINTF("%0+3.7i", -2375);
+	ASSERT_PRINTF("%0+3.3i", 6983);
+	ASSERT_PRINTF("%0+3.3i", -8462);
+	ASSERT_PRINTF("%0+-8.5i", 34);
+	ASSERT_PRINTF("%0+-10.5i", -216);
+	ASSERT_PRINTF("%0+-8.5i", 0);
+	ASSERT_PRINTF("%0+-8.3i", 8375);
+	ASSERT_PRINTF("%0+-8.3i", -8473);
+	ASSERT_PRINTF("%0+-3.7i", 3267);
+	ASSERT_PRINTF("%0+-3.7i", -2375);
+	ASSERT_PRINTF("%0+-3.3i", 6983);
+	ASSERT_PRINTF("%0+-3.3i", -8462);
 	ASSERT_PRINTF("%+i", 5);
 	ASSERT_PRINTF("%+i", -7);
 	ASSERT_PRINTF("%+i", 2147483647);
-	ASSERT_PRINTF("%7i", 33);
-	ASSERT_PRINTF("%7i", -14);
-	ASSERT_PRINTF("%3i", 0);
-	ASSERT_PRINTF("%5i", 52625);
-	ASSERT_PRINTF("%5i", -2562);
-	ASSERT_PRINTF("%4i", 94827);
-	ASSERT_PRINTF("%4i", -2464);
-	ASSERT_PRINTF("%-7i", 33);
-	ASSERT_PRINTF("%-7i", -14);
-	ASSERT_PRINTF("%-3i", 0);
-	ASSERT_PRINTF("%-5i", 52625);
-	ASSERT_PRINTF("%-5i", -2562);
-	ASSERT_PRINTF("%-4i", 94827);
-	ASSERT_PRINTF("%-4i", -2464);
 	ASSERT_PRINTF("%+5i", 35);
 	ASSERT_PRINTF("%+7i", 0);
 	ASSERT_PRINTF("%+24i", 2147483647);
-	ASSERT_PRINTF("%.5i", 2);
-	ASSERT_PRINTF("%.6i", -3);
-	ASSERT_PRINTF("%.3i", 0);
-	ASSERT_PRINTF("%.4i", 5263);
-	ASSERT_PRINTF("%.4i", -2372);
-	ASSERT_PRINTF("%.3i", 13862);
-	ASSERT_PRINTF("%.3i",-23646);
 	ASSERT_PRINTF("%+.7i", 234);
 	ASSERT_PRINTF("%+.7i", -446);
 	ASSERT_PRINTF("%+.3i", 3723);
-	ASSERT_PRINTF("%05i", 43);
-	ASSERT_PRINTF("%07i", -54);
-	ASSERT_PRINTF("%03i", 0);
-	ASSERT_PRINTF("%03i", 634);
-	ASSERT_PRINTF("%04i", -532);
-	ASSERT_PRINTF("%04i", -4825);
 	ASSERT_PRINTF("%+05i", 432);
 	ASSERT_PRINTF("%+04i", 0);
-	ASSERT_PRINTF("%8.5i", 34);
-	ASSERT_PRINTF("%10.5i", -216);
-	ASSERT_PRINTF("%8.5i", 0);
-	ASSERT_PRINTF("%8.3i", 8375);
-	ASSERT_PRINTF("%8.3i", -8473);
-	ASSERT_PRINTF("%3.7i", 3267);
-	ASSERT_PRINTF("%3.7i", -2375);
-	ASSERT_PRINTF("%3.3i", 6983);
-	ASSERT_PRINTF("%3.3i", -8462);
-	ASSERT_PRINTF("%-8.5i", 34);
-	ASSERT_PRINTF("%-10.5i", -216);
-	ASSERT_PRINTF("%-8.5i", 0);
-	ASSERT_PRINTF("%-8.3i", 8375);
-	ASSERT_PRINTF("%-8.3i", -8473);
-	ASSERT_PRINTF("%-3.7i", 3267);
-	ASSERT_PRINTF("%-3.7i", -2375);
-	ASSERT_PRINTF("%-3.3i", 6983);
-	ASSERT_PRINTF("%-3.3i", -8462);
 	ASSERT_PRINTF("%+8.5i", 34);
 	ASSERT_PRINTF("%+10.5i", -216);
 	ASSERT_PRINTF("%+8.5i", 0);
@@ -467,51 +449,6 @@ void test_pft_int_i(void)
 	ASSERT_PRINTF("%+-3.7i", -2375);
 	ASSERT_PRINTF("%+-3.3i", 6983);
 	ASSERT_PRINTF("%+-3.3i", -8462);
-	ASSERT_PRINTF("%08.5i", 34);
-	ASSERT_PRINTF("%010.5i", -216);
-	ASSERT_PRINTF("%08.5i", 0);
-	ASSERT_PRINTF("%08.3i", 8375);
-	ASSERT_PRINTF("%08.3i", -8473);
-	ASSERT_PRINTF("%03.7i", 3267);
-	ASSERT_PRINTF("%03.7i", -2375);
-	ASSERT_PRINTF("%03.3i", 6983);
-	ASSERT_PRINTF("%03.3i", -8462);
-	ASSERT_PRINTF("%0-8.5i", 34);
-	ASSERT_PRINTF("%0-10.5i", -216);
-	ASSERT_PRINTF("%0-8.5i", 0);
-	ASSERT_PRINTF("%0-8.3i", 8375);
-	ASSERT_PRINTF("%0-8.3i", -8473);
-	ASSERT_PRINTF("%0-3.7i", 3267);
-	ASSERT_PRINTF("%0-3.7i", -2375);
-	ASSERT_PRINTF("%0-3.3i", 6983);
-	ASSERT_PRINTF("%0-3.3i", -8462);
-	ASSERT_PRINTF("%0+8.5i", 34);
-	ASSERT_PRINTF("%0+10.5i", -216);
-	ASSERT_PRINTF("%0+8.5i", 0);
-	ASSERT_PRINTF("%0+8.3i", 8375);
-	ASSERT_PRINTF("%0+8.3i", -8473);
-	ASSERT_PRINTF("%0+3.7i", 3267);
-	ASSERT_PRINTF("%0+3.7i", -2375);
-	ASSERT_PRINTF("%0+3.3i", 6983);
-	ASSERT_PRINTF("%0+3.3i", -8462);
-	ASSERT_PRINTF("%0+-8.5i", 34);
-	ASSERT_PRINTF("%0+-10.5i", -216);
-	ASSERT_PRINTF("%0+-8.5i", 0);
-	ASSERT_PRINTF("%0+-8.3i", 8375);
-	ASSERT_PRINTF("%0+-8.3i", -8473);
-	ASSERT_PRINTF("%0+-3.7i", 3267);
-	ASSERT_PRINTF("%0+-3.7i", -2375);
-	ASSERT_PRINTF("%0+-3.3i", 6983);
-	ASSERT_PRINTF("%0+-3.3i", -8462);
-	static char 		ch_pos_1 = 100, ch_neg_1 = -87;
-	static short		sh_pos_1 = 3047, sh_neg_1 = -8875;
-	static int			i_pos_1 = 878023;
-	static long		l_pos_1 = 22337203685477, l_neg_1 = -22337203685477;
-	static long long	ll_pos_1 = 22337203685477, ll_neg_1 = -22337203685477;
-	static long		lmax	= 9223372036854775807;
-	static long		lmin	= -9223372036854775807;
-	static long long llmax = 9223372036854775807;
-	static long long	llmin = -9223372036854775807ll;
 	ASSERT_PRINTF("%hhi", (char)45);
 	ASSERT_PRINTF("%hhi", (char)-45);
 	ASSERT_PRINTF("%hi", (short)385);
@@ -706,12 +643,6 @@ void test_pft_int_i(void)
 	ASSERT_PRINTF("% hi", (short)(-32768));
 	ASSERT_PRINTF("% hhi", (char)(127));
 	ASSERT_PRINTF("% hhi", (char)(-128));
-	ASSERT_PRINTF("%.0i", 0);
-	ASSERT_PRINTF("%.i", 0);
-	ASSERT_PRINTF("%5.0i", 0);
-	ASSERT_PRINTF("%5.i", 0);
-	ASSERT_PRINTF("%-5.0i", 0);
-	ASSERT_PRINTF("%-5.i", 0);
 	ASSERT_PRINTF("%+.0i", 0);
 	ASSERT_PRINTF("%+.i", 0);
 	ASSERT_PRINTF("%+5.0i", 0);
@@ -722,74 +653,104 @@ void test_pft_int_i(void)
 	ASSERT_PRINTF("%hhi", 128);
 	ASSERT_PRINTF("%hi", 32768);
 	ASSERT_PRINTF("%hi", -32769);
+#endif
+	ASSERT_PRINTF("%7i", 33);
+	ASSERT_PRINTF("%7i", -14);
+	ASSERT_PRINTF("%3i", 0);
+	ASSERT_PRINTF("%5i", 52625);
+	ASSERT_PRINTF("%5i", -2562);
+	ASSERT_PRINTF("%4i", 94827);
+	ASSERT_PRINTF("%4i", -2464);
+	ASSERT_PRINTF("%-7i", 33);
+	ASSERT_PRINTF("%-7i", -14);
+	ASSERT_PRINTF("%-3i", 0);
+	ASSERT_PRINTF("%-5i", 52625);
+	ASSERT_PRINTF("%-5i", -2562);
+	ASSERT_PRINTF("%-4i", 94827);
+	ASSERT_PRINTF("%-4i", -2464);
+	ASSERT_PRINTF("%.5i", 2);
+	ASSERT_PRINTF("%.6i", -3);
+	ASSERT_PRINTF("%.3i", 0);
+	ASSERT_PRINTF("%.4i", 5263);
+	ASSERT_PRINTF("%.4i", -2372);
+	ASSERT_PRINTF("%.3i", 13862);
+	ASSERT_PRINTF("%.3i",-23646);
+	ASSERT_PRINTF("%05i", 43);
+	ASSERT_PRINTF("%07i", -54);
+	ASSERT_PRINTF("%03i", 0);
+	ASSERT_PRINTF("%03i", 634);
+	ASSERT_PRINTF("%04i", -532);
+	ASSERT_PRINTF("%04i", -4825);
+	ASSERT_PRINTF("%8.5i", 34);
+	ASSERT_PRINTF("%10.5i", -216);
+	ASSERT_PRINTF("%8.5i", 0);
+	ASSERT_PRINTF("%8.3i", 8375);
+	ASSERT_PRINTF("%8.3i", -8473);
+	ASSERT_PRINTF("%3.7i", 3267);
+	ASSERT_PRINTF("%3.7i", -2375);
+	ASSERT_PRINTF("%3.3i", 6983);
+	ASSERT_PRINTF("%3.3i", -8462);
+	ASSERT_PRINTF("%-8.5i", 34);
+	ASSERT_PRINTF("%-10.5i", -216);
+	ASSERT_PRINTF("%-8.5i", 0);
+	ASSERT_PRINTF("%-8.3i", 8375);
+	ASSERT_PRINTF("%-8.3i", -8473);
+	ASSERT_PRINTF("%-3.7i", 3267);
+	ASSERT_PRINTF("%-3.7i", -2375);
+	ASSERT_PRINTF("%-3.3i", 6983);
+	ASSERT_PRINTF("%-3.3i", -8462);
+	ASSERT_PRINTF("%08.5i", 34);
+	ASSERT_PRINTF("%010.5i", -216);
+	ASSERT_PRINTF("%08.5i", 0);
+	ASSERT_PRINTF("%08.3i", 8375);
+	ASSERT_PRINTF("%08.3i", -8473);
+	ASSERT_PRINTF("%03.7i", 3267);
+	ASSERT_PRINTF("%03.7i", -2375);
+	ASSERT_PRINTF("%03.3i", 6983);
+	ASSERT_PRINTF("%03.3i", -8462);
+	ASSERT_PRINTF("%0-8.5i", 34);
+	ASSERT_PRINTF("%0-10.5i", -216);
+	ASSERT_PRINTF("%0-8.5i", 0);
+	ASSERT_PRINTF("%0-8.3i", 8375);
+	ASSERT_PRINTF("%0-8.3i", -8473);
+	ASSERT_PRINTF("%0-3.7i", 3267);
+	ASSERT_PRINTF("%0-3.7i", -2375);
+	ASSERT_PRINTF("%0-3.3i", 6983);
+	ASSERT_PRINTF("%0-3.3i", -8462);
+	static char 		ch_pos_1 = 100, ch_neg_1 = -87;
+	static short		sh_pos_1 = 3047, sh_neg_1 = -8875;
+	static int			i_pos_1 = 878023;
+	static long		l_pos_1 = 22337203685477, l_neg_1 = -22337203685477;
+	static long long	ll_pos_1 = 22337203685477, ll_neg_1 = -22337203685477;
+	static long		lmax	= 9223372036854775807;
+	static long		lmin	= -9223372036854775807;
+	static long long llmax = 9223372036854775807;
+	static long long	llmin = -9223372036854775807ll;
+	ASSERT_PRINTF("%.0i", 0);
+	ASSERT_PRINTF("%.i", 0);
+	ASSERT_PRINTF("%5.0i", 0);
+	ASSERT_PRINTF("%5.i", 0);
+	ASSERT_PRINTF("%-5.0i", 0);
+	ASSERT_PRINTF("%-5.i", 0);
 }
 
 void test_pft_int_d(void)
 {
+#ifdef FT_PRINTF_TEST_BONUS
 	ASSERT_PRINTF("this %d number", 17);
 	ASSERT_PRINTF("this %d number", -267);
 	ASSERT_PRINTF("this %d number", 0);
-	ASSERT_PRINTF("%d", 3);
-	ASSERT_PRINTF("%d", -1);
-	ASSERT_PRINTF("%d", 0);
-	ASSERT_PRINTF("%d",  2147483647);
-	ASSERT_PRINTF("%d", (int)(-2147483678));
 	ASSERT_PRINTF("%+d", 5);
 	ASSERT_PRINTF("%+d", -7);
 	ASSERT_PRINTF("%+d", 2147483647);
-	ASSERT_PRINTF("%7d", 33);
-	ASSERT_PRINTF("%7d", -14);
-	ASSERT_PRINTF("%3d", 0);
-	ASSERT_PRINTF("%5d", 52625);
-	ASSERT_PRINTF("%5d", -2562);
-	ASSERT_PRINTF("%4d", 94827);
-	ASSERT_PRINTF("%4d", -2464);
-	ASSERT_PRINTF("%-7d", 33);
-	ASSERT_PRINTF("%-7d", -14);
-	ASSERT_PRINTF("%-3d", 0);
-	ASSERT_PRINTF("%-5d", 52625);
-	ASSERT_PRINTF("%-5d", -2562);
-	ASSERT_PRINTF("%-4d", 94827);
-	ASSERT_PRINTF("%-4d", -2464);
 	ASSERT_PRINTF("%+5d", 35);
 	ASSERT_PRINTF("%+7d", 0);
 	ASSERT_PRINTF("%+24d", 2147483647);
-	ASSERT_PRINTF("%.5d", 2);
-	ASSERT_PRINTF("%.6d", -3);
-	ASSERT_PRINTF("%.3d", 0);
-	ASSERT_PRINTF("%.4d", 5263);
-	ASSERT_PRINTF("%.4d", -2372);
-	ASSERT_PRINTF("%.3d", 13862);
-	ASSERT_PRINTF("%.3d",-23646);
 	ASSERT_PRINTF("%+.7d", 234);
 	ASSERT_PRINTF("%+.7d", -446);
 	ASSERT_PRINTF("%+.3d", 3723);
-	ASSERT_PRINTF("%05d", 43);
-	ASSERT_PRINTF("%07d", -54);
-	ASSERT_PRINTF("%03d", 0);
-	ASSERT_PRINTF("%03d", 634);
-	ASSERT_PRINTF("%04d", -532);
-	ASSERT_PRINTF("%04d", -4825);
 	ASSERT_PRINTF("%+05d", 432);
 	ASSERT_PRINTF("%+04d", 0);
-	ASSERT_PRINTF("%8.5d", 34);
-	ASSERT_PRINTF("%10.5d", -216);
-	ASSERT_PRINTF("%8.5d", 0);
-	ASSERT_PRINTF("%8.3d", 8375);
-	ASSERT_PRINTF("%8.3d", -8473);
-	ASSERT_PRINTF("%3.7d", 3267);
-	ASSERT_PRINTF("%3.7d", -2375);
-	ASSERT_PRINTF("%3.3d", 6983);
-	ASSERT_PRINTF("%3.3d", -8462);
-	ASSERT_PRINTF("%-8.5d", 34);
-	ASSERT_PRINTF("%-10.5d", -216);
-	ASSERT_PRINTF("%-8.5d", 0);
-	ASSERT_PRINTF("%-8.3d", 8375);
-	ASSERT_PRINTF("%-8.3d", -8473);
-	ASSERT_PRINTF("%-3.7d", 3267);
-	ASSERT_PRINTF("%-3.7d", -2375);
-	ASSERT_PRINTF("%-3.3d", 6983);
-	ASSERT_PRINTF("%-3.3d", -8462);
 	ASSERT_PRINTF("%+8.5d", 34);
 	ASSERT_PRINTF("%+10.5d", -216);
 	ASSERT_PRINTF("%+8.5d", 0);
@@ -799,17 +760,6 @@ void test_pft_int_d(void)
 	ASSERT_PRINTF("%+3.7d", -2375);
 	ASSERT_PRINTF("%+3.3d", 6983);
 	ASSERT_PRINTF("%+3.3d", -8462);
-
-	static char             ch_pos_1 = 100, ch_neg_1 = -87;
-	static short            sh_pos_1 = 3047, sh_neg_1 = -8875;
-	static int                      i_pos_1 = 878023;
-	static long             l_pos_1 = 22337203685477, l_neg_1 = -22337203685477;
-	static long long        ll_pos_1 = 22337203685477, ll_neg_1 = -22337203685477;
-	static long             lmax    = 9223372036854775807;
-	static long             lmin    = -9223372036854775807;
-	static long long llmax = 9223372036854775807;
-	static long long        llmin = -9223372036854775807ll;
-
 	ASSERT_PRINTF("%+-8.5d", 34);
 	ASSERT_PRINTF("%+-10.5d", -216);
 	ASSERT_PRINTF("%+-8.5d", 0);
@@ -819,24 +769,6 @@ void test_pft_int_d(void)
 	ASSERT_PRINTF("%+-3.7d", -2375);
 	ASSERT_PRINTF("%+-3.3d", 6983);
 	ASSERT_PRINTF("%+-3.3d", -8462);
-	ASSERT_PRINTF("%08.5d", 34);
-	ASSERT_PRINTF("%010.5d", -216);
-	ASSERT_PRINTF("%08.5d", 0);
-	ASSERT_PRINTF("%08.3d", 8375);
-	ASSERT_PRINTF("%08.3d", -8473);
-	ASSERT_PRINTF("%03.7d", 3267);
-	ASSERT_PRINTF("%03.7d", -2375);
-	ASSERT_PRINTF("%03.3d", 6983);
-	ASSERT_PRINTF("%03.3d", -8462);
-	ASSERT_PRINTF("%0-8.5d", 34);
-	ASSERT_PRINTF("%0-10.5d", -216);
-	ASSERT_PRINTF("%0-8.5d", 0);
-	ASSERT_PRINTF("%0-8.3d", 8375);
-	ASSERT_PRINTF("%0-8.3d", -8473);
-	ASSERT_PRINTF("%0-3.7d", 3267);
-	ASSERT_PRINTF("%0-3.7d", -2375);
-	ASSERT_PRINTF("%0-3.3d", 6983);
-	ASSERT_PRINTF("%0-3.3d", -8462);
 	ASSERT_PRINTF("%0+8.5d", 34);
 	ASSERT_PRINTF("%0+10.5d", -216);
 	ASSERT_PRINTF("%0+8.5d", 0);
@@ -891,7 +823,6 @@ void test_pft_int_d(void)
 	ASSERT_PRINTF("%-37lld", -522337203685470ll);
 	ASSERT_PRINTF("%+ld", 22337203685477l);
 
-	ASSERT_PRINTF("[%d] [%d]", i_pos_1, i_pos_1);
 	ASSERT_PRINTF("[%d] [%ld]", i_pos_1, l_pos_1);
 	ASSERT_PRINTF("[%d] [%lld]", i_pos_1, ll_pos_1);
 	ASSERT_PRINTF("[%d] [%hd]", i_pos_1, sh_pos_1);
@@ -1053,18 +984,100 @@ void test_pft_int_d(void)
 
 	ASSERT_PRINTF("% hhd", (char)(127));
 	ASSERT_PRINTF("% hhd", (char)(-128));
-	ASSERT_PRINTF("%.0d", 0);
-	ASSERT_PRINTF("%.d", 0);
-	ASSERT_PRINTF("%5.0d", 0);
-	ASSERT_PRINTF("%5.d", 0);
-	ASSERT_PRINTF("%-5.0d", 0);
-	ASSERT_PRINTF("%-5.d", 0);
 	ASSERT_PRINTF("%+.0d", 0);
 	ASSERT_PRINTF("%+.d", 0);
 	ASSERT_PRINTF("%+5.0d", 0);
 	ASSERT_PRINTF("%+5.d", 0);
 	ASSERT_PRINTF("%+-5.0d", 0);
 	ASSERT_PRINTF("%+-5.d", 0);
+#endif
+
+	ASSERT_PRINTF("%d", 3);
+	ASSERT_PRINTF("%d", -1);
+	ASSERT_PRINTF("%d", 0);
+	ASSERT_PRINTF("%d",  2147483647);
+	ASSERT_PRINTF("%d", (int)(-2147483678));
+	ASSERT_PRINTF("%7d", 33);
+	ASSERT_PRINTF("%7d", -14);
+	ASSERT_PRINTF("%3d", 0);
+	ASSERT_PRINTF("%5d", 52625);
+	ASSERT_PRINTF("%5d", -2562);
+	ASSERT_PRINTF("%4d", 94827);
+	ASSERT_PRINTF("%4d", -2464);
+	ASSERT_PRINTF("%-7d", 33);
+	ASSERT_PRINTF("%-7d", -14);
+	ASSERT_PRINTF("%-3d", 0);
+	ASSERT_PRINTF("%-5d", 52625);
+	ASSERT_PRINTF("%-5d", -2562);
+	ASSERT_PRINTF("%-4d", 94827);
+	ASSERT_PRINTF("%-4d", -2464);
+	ASSERT_PRINTF("%.5d", 2);
+	ASSERT_PRINTF("%.6d", -3);
+	ASSERT_PRINTF("%.3d", 0);
+	ASSERT_PRINTF("%.4d", 5263);
+	ASSERT_PRINTF("%.4d", -2372);
+	ASSERT_PRINTF("%.3d", 13862);
+	ASSERT_PRINTF("%.3d",-23646);
+	ASSERT_PRINTF("%05d", 43);
+	ASSERT_PRINTF("%07d", -54);
+	ASSERT_PRINTF("%03d", 0);
+	ASSERT_PRINTF("%03d", 634);
+	ASSERT_PRINTF("%04d", -532);
+	ASSERT_PRINTF("%04d", -4825);
+	ASSERT_PRINTF("%8.5d", 34);
+	ASSERT_PRINTF("%10.5d", -216);
+	ASSERT_PRINTF("%8.5d", 0);
+	ASSERT_PRINTF("%8.3d", 8375);
+	ASSERT_PRINTF("%8.3d", -8473);
+	ASSERT_PRINTF("%3.7d", 3267);
+	ASSERT_PRINTF("%3.7d", -2375);
+	ASSERT_PRINTF("%3.3d", 6983);
+	ASSERT_PRINTF("%3.3d", -8462);
+	ASSERT_PRINTF("%-8.5d", 34);
+	ASSERT_PRINTF("%-10.5d", -216);
+	ASSERT_PRINTF("%-8.5d", 0);
+	ASSERT_PRINTF("%-8.3d", 8375);
+	ASSERT_PRINTF("%-8.3d", -8473);
+	ASSERT_PRINTF("%-3.7d", 3267);
+	ASSERT_PRINTF("%-3.7d", -2375);
+	ASSERT_PRINTF("%-3.3d", 6983);
+	ASSERT_PRINTF("%-3.3d", -8462);
+
+	static char             ch_pos_1 = 100, ch_neg_1 = -87;
+	static short            sh_pos_1 = 3047, sh_neg_1 = -8875;
+	static int                      i_pos_1 = 878023;
+	static long             l_pos_1 = 22337203685477, l_neg_1 = -22337203685477;
+	static long long        ll_pos_1 = 22337203685477, ll_neg_1 = -22337203685477;
+	static long             lmax    = 9223372036854775807;
+	static long             lmin    = -9223372036854775807;
+	static long long llmax = 9223372036854775807;
+	static long long        llmin = -9223372036854775807ll;
+
+	ASSERT_PRINTF("%08.5d", 34);
+	ASSERT_PRINTF("%010.5d", -216);
+	ASSERT_PRINTF("%08.5d", 0);
+	ASSERT_PRINTF("%08.3d", 8375);
+	ASSERT_PRINTF("%08.3d", -8473);
+	ASSERT_PRINTF("%03.7d", 3267);
+	ASSERT_PRINTF("%03.7d", -2375);
+	ASSERT_PRINTF("%03.3d", 6983);
+	ASSERT_PRINTF("%03.3d", -8462);
+	ASSERT_PRINTF("%0-8.5d", 34);
+	ASSERT_PRINTF("%0-10.5d", -216);
+	ASSERT_PRINTF("%0-8.5d", 0);
+	ASSERT_PRINTF("%0-8.3d", 8375);
+	ASSERT_PRINTF("%0-8.3d", -8473);
+	ASSERT_PRINTF("%0-3.7d", 3267);
+	ASSERT_PRINTF("%0-3.7d", -2375);
+	ASSERT_PRINTF("%0-3.3d", 6983);
+	ASSERT_PRINTF("%0-3.3d", -8462);
+	ASSERT_PRINTF("[%d] [%d]", i_pos_1, i_pos_1);
+	ASSERT_PRINTF("%.0d", 0);
+	ASSERT_PRINTF("%.d", 0);
+	ASSERT_PRINTF("%5.0d", 0);
+	ASSERT_PRINTF("%5.d", 0);
+	ASSERT_PRINTF("%-5.0d", 0);
+	ASSERT_PRINTF("%-5.d", 0);
 }
 
 void test_ptf_uint(void)
@@ -1115,6 +1128,7 @@ void test_ptf_uint(void)
 	static unsigned long long       ull_pos_1 = 22337203685477;
 	static unsigned long long  ullmax = 9223372036854775807;
 	static unsigned long            ulmax = 9223372036854775807;
+#ifdef FT_PRINTF_TEST_BONUS
 	ASSERT_PRINTF("%hhu", (unsigned char)45);
 	ASSERT_PRINTF("%hu", (unsigned short)385);
 	ASSERT_PRINTF("%lu", (unsigned long)32);
@@ -1136,7 +1150,7 @@ void test_ptf_uint(void)
 	ASSERT_PRINTF("%lu%hhu%hu", ul_pos_1, uch_pos_1, ush_pos_1);
 	ASSERT_PRINTF("%u%llu%hhu", ui_pos_1, ull_pos_1, uch_pos_1);
 	ASSERT_PRINTF("%llu%u%lu", ull_pos_1, ui_pos_1, ul_pos_1);
-
+#endif
 	ASSERT_PRINTF("%.0u", 0);
 	ASSERT_PRINTF("%.u", 0);
 	ASSERT_PRINTF("%5.0u", 0);
@@ -1193,6 +1207,64 @@ void test_ptf_hex_low(void)
 	ASSERT_PRINTF("%0-8.3x", 8375);
 	ASSERT_PRINTF("%0-2.7x", 3267);
 	ASSERT_PRINTF("%0-3.3x", 6983);
+	ASSERT_PRINTF("%.0x", 0);
+	ASSERT_PRINTF("%.x", 0);
+	ASSERT_PRINTF("%5.0x", 0);
+	ASSERT_PRINTF("%5.x", 0);
+	ASSERT_PRINTF("%-5.0x", 0);
+	ASSERT_PRINTF("%-5.x", 0);
+	ASSERT_PRINTF("this %x number", 17);
+	ASSERT_PRINTF("this %x number", 0);
+	ASSERT_PRINTF("%x", 3);
+	ASSERT_PRINTF("%x", 4294967295u);
+	ASSERT_PRINTF("%7x", 33);
+	ASSERT_PRINTF("%3x", 0);
+	ASSERT_PRINTF("%5x", 52625);
+	ASSERT_PRINTF("%2x", 94827);
+	ASSERT_PRINTF("%-7x", 33);
+	ASSERT_PRINTF("%-3x", 0);
+	ASSERT_PRINTF("%-5x", 52625);
+	ASSERT_PRINTF("%-4x", 9648627);
+	ASSERT_PRINTF("%.5x", 21);
+	ASSERT_PRINTF("%.3x", 0);
+	ASSERT_PRINTF("%.4x", 5263);
+	ASSERT_PRINTF("%.3x", 938862);
+	ASSERT_PRINTF("%05x", 43);
+	ASSERT_PRINTF("%03x", 0);
+	ASSERT_PRINTF("%03x", 698334);
+	ASSERT_PRINTF("%8.5x", 34);
+	ASSERT_PRINTF("%8.5x", 0);
+	ASSERT_PRINTF("%8.3x", 8375);
+	ASSERT_PRINTF("%2.7x", 3267);
+	ASSERT_PRINTF("%3.3x", 6983);
+	ASSERT_PRINTF("%-8.5x", 34);
+	ASSERT_PRINTF("%-8.5x", 0);
+	ASSERT_PRINTF("%-8.3x", 8375);
+	ASSERT_PRINTF("%-2.7x", 3267);
+	ASSERT_PRINTF("%-3.3x", 6983);
+	ASSERT_PRINTF("%08.5x", 34);
+	ASSERT_PRINTF("%08.5x", 0);
+	ASSERT_PRINTF("%08.3x", 8375);
+	ASSERT_PRINTF("%02.7x", 3267);
+	ASSERT_PRINTF("%03.3x", 6983);
+	ASSERT_PRINTF("%0-8.5x", 34);
+	ASSERT_PRINTF("%0-8.5x", 0);
+	ASSERT_PRINTF("%0-8.3x", 8375);
+	ASSERT_PRINTF("%0-2.7x", 3267);
+	ASSERT_PRINTF("%0-3.3x", 6983);
+	ASSERT_PRINTF("%.0x", 0);
+	ASSERT_PRINTF("%.x", 0);
+	ASSERT_PRINTF("%5.0x", 0);
+	ASSERT_PRINTF("%5.x", 0);
+	ASSERT_PRINTF("%-5.0x", 0);
+	ASSERT_PRINTF("%-5.x", 0);
+#ifdef FT_PRINTF_TEST_BONUS
+	ASSERT_PRINTF("%#.0x", 0);
+	ASSERT_PRINTF("%#.x", 0);
+	ASSERT_PRINTF("%#5.0x", 0);
+	ASSERT_PRINTF("%#5.x", 0);
+	ASSERT_PRINTF("%#-5.0x", 0);
+	ASSERT_PRINTF("%#-5.x", 0);
 	ASSERT_PRINTF("%hhx", (unsigned char)45);
 	ASSERT_PRINTF("%hx", (unsigned short)385);
 	ASSERT_PRINTF("%lx", (unsigned long)32);
@@ -1271,57 +1343,6 @@ void test_ptf_hex_low(void)
 	ASSERT_PRINTF("%lu%hhu%#hx", ul_pos_1, uch_pos_1, ush_pos_1);
 	ASSERT_PRINTF("%#x%llu%hhx", ui_pos_1, ull_pos_1, uch_pos_1);
 	ASSERT_PRINTF("%llu%u%#lx", ull_pos_1, ui_pos_1, ul_pos_1);
-	ASSERT_PRINTF("%.0x", 0);
-	ASSERT_PRINTF("%.x", 0);
-	ASSERT_PRINTF("%5.0x", 0);
-	ASSERT_PRINTF("%5.x", 0);
-	ASSERT_PRINTF("%-5.0x", 0);
-	ASSERT_PRINTF("%-5.x", 0);
-	ASSERT_PRINTF("%#.0x", 0);
-	ASSERT_PRINTF("%#.x", 0);
-	ASSERT_PRINTF("%#5.0x", 0);
-	ASSERT_PRINTF("%#5.x", 0);
-	ASSERT_PRINTF("%#-5.0x", 0);
-	ASSERT_PRINTF("%#-5.x", 0);
-	ASSERT_PRINTF("this %x number", 17);
-	ASSERT_PRINTF("this %x number", 0);
-	ASSERT_PRINTF("%x", 3);
-	ASSERT_PRINTF("%x", 4294967295u);
-	ASSERT_PRINTF("%7x", 33);
-	ASSERT_PRINTF("%3x", 0);
-	ASSERT_PRINTF("%5x", 52625);
-	ASSERT_PRINTF("%2x", 94827);
-	ASSERT_PRINTF("%-7x", 33);
-	ASSERT_PRINTF("%-3x", 0);
-	ASSERT_PRINTF("%-5x", 52625);
-	ASSERT_PRINTF("%-4x", 9648627);
-	ASSERT_PRINTF("%.5x", 21);
-	ASSERT_PRINTF("%.3x", 0);
-	ASSERT_PRINTF("%.4x", 5263);
-	ASSERT_PRINTF("%.3x", 938862);
-	ASSERT_PRINTF("%05x", 43);
-	ASSERT_PRINTF("%03x", 0);
-	ASSERT_PRINTF("%03x", 698334);
-	ASSERT_PRINTF("%8.5x", 34);
-	ASSERT_PRINTF("%8.5x", 0);
-	ASSERT_PRINTF("%8.3x", 8375);
-	ASSERT_PRINTF("%2.7x", 3267);
-	ASSERT_PRINTF("%3.3x", 6983);
-	ASSERT_PRINTF("%-8.5x", 34);
-	ASSERT_PRINTF("%-8.5x", 0);
-	ASSERT_PRINTF("%-8.3x", 8375);
-	ASSERT_PRINTF("%-2.7x", 3267);
-	ASSERT_PRINTF("%-3.3x", 6983);
-	ASSERT_PRINTF("%08.5x", 34);
-	ASSERT_PRINTF("%08.5x", 0);
-	ASSERT_PRINTF("%08.3x", 8375);
-	ASSERT_PRINTF("%02.7x", 3267);
-	ASSERT_PRINTF("%03.3x", 6983);
-	ASSERT_PRINTF("%0-8.5x", 34);
-	ASSERT_PRINTF("%0-8.5x", 0);
-	ASSERT_PRINTF("%0-8.3x", 8375);
-	ASSERT_PRINTF("%0-2.7x", 3267);
-	ASSERT_PRINTF("%0-3.3x", 6983);
 	ASSERT_PRINTF("%hhx", (unsigned char)45);
 	ASSERT_PRINTF("%hx", (unsigned short)385);
 	ASSERT_PRINTF("%lx", (unsigned long)32);
@@ -1400,18 +1421,13 @@ void test_ptf_hex_low(void)
 	ASSERT_PRINTF("%lu%hhu%#hx", ul_pos_1, uch_pos_1, ush_pos_1);
 	ASSERT_PRINTF("%#x%llu%hhx", ui_pos_1, ull_pos_1, uch_pos_1);
 	ASSERT_PRINTF("%llu%u%#lx", ull_pos_1, ui_pos_1, ul_pos_1);
-	ASSERT_PRINTF("%.0x", 0);
-	ASSERT_PRINTF("%.x", 0);
-	ASSERT_PRINTF("%5.0x", 0);
-	ASSERT_PRINTF("%5.x", 0);
-	ASSERT_PRINTF("%-5.0x", 0);
-	ASSERT_PRINTF("%-5.x", 0);
 	ASSERT_PRINTF("%#.0x", 0);
 	ASSERT_PRINTF("%#.x", 0);
 	ASSERT_PRINTF("%#5.0x", 0);
 	ASSERT_PRINTF("%#5.x", 0);
 	ASSERT_PRINTF("%#-5.0x", 0);
 	ASSERT_PRINTF("%#-5.x", 0);
+#endif
 }
 
 void test_ptf_hex_up(void)
@@ -1462,6 +1478,7 @@ void test_ptf_hex_up(void)
 	ASSERT_PRINTF("%0-8.3X", 8375);
 	ASSERT_PRINTF("%0-2.7X", 3267);
 	ASSERT_PRINTF("%0-3.3X", 6983);
+#ifdef FT_PRINTF_TEST_BONUS
 	ASSERT_PRINTF("%hhX", (unsigned char)45);
 	ASSERT_PRINTF("%hX", (unsigned short)385);
 	ASSERT_PRINTF("%lX", (unsigned long)32);
@@ -1555,6 +1572,7 @@ void test_ptf_hex_up(void)
 	ASSERT_PRINTF("%#5.X", 0);
 	ASSERT_PRINTF("%#-5.0X", 0);
 	ASSERT_PRINTF("%#-5.X", 0);
+#endif
 	ASSERT_PRINTF("this %X number", 17);
 	ASSERT_PRINTF("this %X number", 0);
 	ASSERT_PRINTF("%X", 3);
@@ -1594,6 +1612,7 @@ void test_ptf_hex_up(void)
 	ASSERT_PRINTF("%0-8.3X", 8375);
 	ASSERT_PRINTF("%0-2.7X", 3267);
 	ASSERT_PRINTF("%0-3.3X", 6983);
+#ifdef FT_PRINTF_TEST_BONUS
 	ASSERT_PRINTF("%hhX", (unsigned char)45);
 	ASSERT_PRINTF("%hX", (unsigned short)385);
 	ASSERT_PRINTF("%lX", (unsigned long)32);
@@ -1675,20 +1694,22 @@ void test_ptf_hex_up(void)
 	ASSERT_PRINTF("%lu%hhu%#hX", ul_pos_1, uch_pos_1, ush_pos_1);
 	ASSERT_PRINTF("%#x%llu%#hhX", ui_pos_1, ull_pos_1, uch_pos_1);
 	ASSERT_PRINTF("%#llx%u%#lX", ull_pos_1, ui_pos_1, ul_pos_1);
+#endif
 	ASSERT_PRINTF("%.0X", 0);
 	ASSERT_PRINTF("%.X", 0);
 	ASSERT_PRINTF("%5.0X", 0);
 	ASSERT_PRINTF("%5.X", 0);
 	ASSERT_PRINTF("%-5.0X", 0);
 	ASSERT_PRINTF("%-5.X", 0);
+#ifdef FT_PRINTF_TEST_BONUS
 	ASSERT_PRINTF("%#.0X", 0);
 	ASSERT_PRINTF("%#.X", 0);
 	ASSERT_PRINTF("%#5.0X", 0);
 	ASSERT_PRINTF("%#5.X", 0);
 	ASSERT_PRINTF("%#-5.0X", 0);
 	ASSERT_PRINTF("%#-5.X", 0);
+#endif
 }
-
 void test_pft_ptr(void)
 {
 	static char     a01;
diff --git a/tests/printf_tester_tests.c b/tests/printf_tester_tests.c
index 7bdf9de..936dbbc 100644
--- a/tests/printf_tester_tests.c
+++ b/tests/printf_tester_tests.c
@@ -6,7 +6,7 @@
 /*   By: cacharle <marvin@42.fr>                    +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2020/02/06 18:15:31 by cacharle          #+#    #+#             */
-/*   Updated: 2020/02/06 18:15:32 by cacharle         ###   ########.fr       */
+/*   Updated: 2020/02/06 19:02:48 by cacharle         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -18,7 +18,9 @@ void test_printf_tester(void)
 	int t = 50;
 	char c = 'a';
 
+#ifdef FT_PRINTF_TEST_BONUS
 	ASSERT_PRINTF("p0 % .3s\n", "cccc");
+#endif
 	ASSERT_PRINTF("pp %.50d\n", 10000);
 	ASSERT_PRINTF("p1 %.4s\n", "cccc");
 	ASSERT_PRINTF("p2 %.10s\n", "cccc");
@@ -118,8 +120,10 @@ void test_printf_tester(void)
 	/* ASSERT_PRINTF("%d\n", printf("1chiffre 1 %d chiffre 2 %d\n", 42, -42)); */
 	/* ASSERT_PRINTF("%d\n", printf("2chiffre 1 %   d chiffre 2 % d\n", 42, -42)); */
 	/* ASSERT_PRINTF("%d\n\n", printf("4chiffre 1 %-12d chiffre 2 %-12d\n\n", 42, -42)); */
+#ifdef FT_PRINTF_TEST_BONUS
 	ASSERT_PRINTF("%    i\n", -60);
 	ASSERT_PRINTF("%   i\n", -60);
+#endif
 	ASSERT_PRINTF("%1p\n", &t);
 	ASSERT_PRINTF("%1p\n", &t);
 	ASSERT_PRINTF("t1 %050d\n", 10);
@@ -141,7 +145,9 @@ void test_printf_tester(void)
 	/* ASSERT_PRINTF("%d\n\n", printf("15chiffre 1 %.d chiffre 2 %.d\n\n", 42, -42)); */
 	/* ASSERT_PRINTF("%d\n\n", printf("4caractere 1 %12c caractere 2 %12c\n\n", 'a', 'c')); */
 	ASSERT_PRINTF("1caractere 1 %c caractere 2 %c\n\n", 'a', 'c');
+#ifdef FT_PRINTF_TEST_BONUS
 	ASSERT_PRINTF("3caractere 1 %   c caractere 2 % c\n\n", 'a', 'c');
+#endif
 	/* ASSERT_PRINTF("%d\n\n", printf("1hexa-maj 1 %X hexa-maj 2 %X\n\n", 42, -42)); */
 	/* ASSERT_PRINTF("%d\n\n", printf("3hexa-maj 1 %   X hexa-maj 2 % X\n\n", 42, -42)); */
 	/* ASSERT_PRINTF("%d\n\n", printf("4hexa-maj 1 %12X hexa-maj 2 %int12X\n\n", 42, -42)); */
@@ -212,11 +218,13 @@ void test_printf_tester(void)
 	ASSERT_PRINTF("percent 2 %12%");
 	ASSERT_PRINTF("percent 3 %-12%");
 	ASSERT_PRINTF("percent 4 %0%");
+#ifdef FT_PRINTF_TEST_BONUS
 	ASSERT_PRINTF("percent 5 % %");
 	ASSERT_PRINTF("percent 6 % 15%");
 	ASSERT_PRINTF("percent 7 % 12%");
 	ASSERT_PRINTF("percent 8 %  *%", 13);
 	ASSERT_PRINTF("%n", &t);
+#endif
 	ASSERT_PRINTF("%d\n", t);
 	ASSERT_PRINTF("%n", NULL);
 	ASSERT_PRINTF("%d\n", t);
@@ -224,7 +232,9 @@ void test_printf_tester(void)
 	ASSERT_PRINTF("%d\n", t);
 	ASSERT_PRINTF("%s %n", "hello world", &t);
 	ASSERT_PRINTF("%d\n", t);
+#ifdef FT_PRINTF_TEST_BONUS
 	ASSERT_PRINTF("% .1s %n", "hey", &t);
+#endif
 	ASSERT_PRINTF("%d\n", t);
 	ASSERT_PRINTF("%40s %n", "co", &t);
 	ASSERT_PRINTF("%d\n", t);
diff --git a/tests/printf_tests_tests.c b/tests/printf_tests_tests.c
index efe19a5..887e10c 100644
--- a/tests/printf_tests_tests.c
+++ b/tests/printf_tests_tests.c
@@ -6,7 +6,7 @@
 /*   By: cacharle <marvin@42.fr>                    +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2020/02/06 18:15:38 by cacharle          #+#    #+#             */
-/*   Updated: 2020/02/06 18:15:39 by cacharle         ###   ########.fr       */
+/*   Updated: 2020/02/06 19:05:45 by cacharle         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -37,6 +37,7 @@ void test_printf_tests_test(void)
 
 	ASSERT_PRINTF("%c",       '\0');
 
+#ifdef FT_PRINTF_TEST_BONUS
 	ASSERT_PRINTF("%+s",      "Hallo heimur");
 	ASSERT_PRINTF("%+d",      1024);
 	ASSERT_PRINTF("%+d",      -1024);
@@ -44,8 +45,6 @@ void test_printf_tests_test(void)
 	ASSERT_PRINTF("%+i",      -1024);
 	ASSERT_PRINTF("%+u",      1024u);
 	ASSERT_PRINTF("%+u",      -1024u);
-	/* TEST("777",             3, "%+o",      0777u) */
-	/* TEST("37777777001",    11, "%+o",      -0777u) */
 	ASSERT_PRINTF("%+x",      0x1234abcdu);
 	ASSERT_PRINTF("%+x",      -0x1234abcdu);
 	ASSERT_PRINTF("%+X",      0x1234abcdu);
@@ -91,6 +90,30 @@ void test_printf_tests_test(void)
 	/* TEST("0",               1, "%#o",      0u) */
 	ASSERT_PRINTF("%#x",      0u);
 	ASSERT_PRINTF("%#X",      0u);
+	ASSERT_PRINTF("%#20x",      0x1234abcdu);
+	ASSERT_PRINTF("%#20x",      -0x1234abcdu);
+	ASSERT_PRINTF("%#20X",      0x1234abcdu);
+	ASSERT_PRINTF("%#20X",      -0x1234abcdu);
+	ASSERT_PRINTF("%#020x",     0x1234abcdu);
+	ASSERT_PRINTF("%#020x",     -0x1234abcdu);
+	ASSERT_PRINTF("%#020X",     0x1234abcdu);
+	ASSERT_PRINTF("%#020X",     -0x1234abcdu);
+
+
+	ASSERT_PRINTF("% -0+*.*s",    20,  5, "Hallo heimur");
+	ASSERT_PRINTF("% -0+*.*d",    20,  5,  1024);
+	ASSERT_PRINTF("% -0+*.*d",    20,  5,  -1024);
+	ASSERT_PRINTF("% -0+*.*i",    20,  5,  1024);
+	ASSERT_PRINTF("% 0-+*.*i",    20,  5,  -1024);
+	ASSERT_PRINTF("% 0-+*.*u",    20,  5,  1024u);
+	ASSERT_PRINTF("% 0-+*.*u",    20,  5,  -1024u);
+	ASSERT_PRINTF("%+ -0*.*x",    20,  5,  0x1234abcdu);
+	ASSERT_PRINTF("%+ -0*.*x",    20, 10,  -0x1234abcdu);
+	ASSERT_PRINTF("% -+0*.*X",    20,  5,  0x1234abcdu);
+	ASSERT_PRINTF("% -+0*.*X",    20, 10,  -0x1234abcdu);
+#endif
+	/* TEST("777",             3, "%+o",      0777u) */
+	/* TEST("37777777001",    11, "%+o",      -0777u) */
 
 	ASSERT_PRINTF("%1s",      "Hallo heimur");
 	ASSERT_PRINTF("%1d",      1024);
@@ -151,18 +174,9 @@ void test_printf_tests_test(void)
 
 	/* TEST("                0777",  20, "%#20o",      0777u) */
 	/* TEST("        037777777001",  20, "%#20o",      -0777u) */
-	ASSERT_PRINTF("%#20x",      0x1234abcdu);
-	ASSERT_PRINTF("%#20x",      -0x1234abcdu);
-	ASSERT_PRINTF("%#20X",      0x1234abcdu);
-	ASSERT_PRINTF("%#20X",      -0x1234abcdu);
 
 	/* TEST("00000000000000000777",  20, "%#020o",     0777u) */
 	/* TEST("00000000037777777001",  20, "%#020o",     -0777u) */
-	ASSERT_PRINTF("%#020x",     0x1234abcdu);
-	ASSERT_PRINTF("%#020x",     -0x1234abcdu);
-	ASSERT_PRINTF("%#020X",     0x1234abcdu);
-	ASSERT_PRINTF("%#020X",     -0x1234abcdu);
-
 	ASSERT_PRINTF("%0-20s",      "Hallo");
 	ASSERT_PRINTF("%0-20d",      1024);
 	ASSERT_PRINTF("%0-20d",      -1024);
@@ -257,16 +271,4 @@ void test_printf_tests_test(void)
 	ASSERT_PRINTF("%20.X",       0x1234abcdu);
 	ASSERT_PRINTF("%20.0X",      -0x1234abcdu);
 	ASSERT_PRINTF("%20.X",       0u);
-
-	ASSERT_PRINTF("% -0+*.*s",    20,  5, "Hallo heimur");
-	ASSERT_PRINTF("% -0+*.*d",    20,  5,  1024);
-	ASSERT_PRINTF("% -0+*.*d",    20,  5,  -1024);
-	ASSERT_PRINTF("% -0+*.*i",    20,  5,  1024);
-	ASSERT_PRINTF("% 0-+*.*i",    20,  5,  -1024);
-	ASSERT_PRINTF("% 0-+*.*u",    20,  5,  1024u);
-	ASSERT_PRINTF("% 0-+*.*u",    20,  5,  -1024u);
-	ASSERT_PRINTF("%+ -0*.*x",    20,  5,  0x1234abcdu);
-	ASSERT_PRINTF("%+ -0*.*x",    20, 10,  -0x1234abcdu);
-	ASSERT_PRINTF("% -+0*.*X",    20,  5,  0x1234abcdu);
-	ASSERT_PRINTF("% -+0*.*X",    20, 10,  -0x1234abcdu);
 }