python3.4 supported (and probably 3.5 aswell)

6 files changed, 119 insertions, 14 deletions

diff --git a/Makefile b/Makefile
index fe5a84a..38a663d 100644
--- a/Makefile
+++ b/Makefile
@@ -18,10 +18,15 @@ LDFLAGS = -L$(FT_PRINTF_PATH) -lftprintf
 
 NAME = ft_printf_test
 CHECK_LEAKS_NAME = check_leaks
-PYTHON = python3
 RM = rm -f
 MAKE = make
 
+PYTHON = python3
+# ifeq ($(shell $(PYTHON) --version | cut -d ' ' -f 2 | cut -d '.' -f 1),2)
+# PYTHON = python3
+# $(error You must have python3 installed)
+# endif
+
 SRC = main.c helper.c tests/pft_tests.c tests/moulitest_tests.c tests/printf_tester_tests.c \
 	  tests/printf_tests_tests.c saved_tests.c generated.c
 OBJ = $(SRC:.c=.o)
@@ -49,7 +54,7 @@ no_clearbonus: allbonus no_clear
 interactive: all
 	./$(NAME) | $(PYTHON) prettier.py --interactive
 
-interactivebonus: allbonus interactive  
+interactivebonus: allbonus interactive
 
 raw: all
 	./$(NAME)
diff --git a/generate.py b/generate.py
index b727133..ba3b7d1 100644
--- a/generate.py
+++ b/generate.py
@@ -71,7 +71,7 @@ class Generator:
 
     def run(self):
         if self.check_valid:
-            os.system(f"touch {self.tmp_filename}")
+            os.system("touch {}".format(self.tmp_filename))
         with open(self.output_filename, "w") as self.output_file:
             self._write_header()
             while self.test_nb > 0:
@@ -84,7 +84,7 @@ class Generator:
                 print("Generated", self.test_nb)
             self._write_footer()
         if self.check_valid:
-            os.system(f"rm {self.tmp_filename}")
+            os.system("rm {}".format(self.tmp_filename))
 
     def _compile(self, assert_printf):
         with open(self.tmp_filename, "w") as tmp_file:
@@ -95,7 +95,7 @@ class Generator:
     def _gen_printf(self):
         formats, args = self._printf_args()
         args_str = "".join(["," + str(a) for a in args if a is not None])
-        return f"ASSERT_PRINTF(\"{''.join(formats)}\" {args_str});"
+        return "ASSERT_PRINTF(\"{}\" {});".format(''.join(formats), args_str)
 
     def _printf_args(self):
         args = []
diff --git a/generated.c b/generated.c
index 2cea88b..bc98154 100644
--- a/generated.c
+++ b/generated.c
@@ -2,4 +2,104 @@
 
 void generated_test(void)
 {
-}
+	ASSERT_PRINTF("%--87.48u%---86.89d%--*.171i" ,575753980u,-1706753103,-61,-1026886559);
+	ASSERT_PRINTF("%53c%0189.51d%-103.21d%*p%102c" ,-27,231647176,-1119242596,-94,(void*)17541392615378030860lu,80);
+	ASSERT_PRINTF("%-119.98X%--*.57i" ,3622566783u,-40,1402091020);
+	ASSERT_PRINTF("%-49.148X%-144c%---47.*x%-140.*X%-115.118s" ,1788014179u,-42,-140,1771987060u,-145,3144147879u,"H\vYsk&|8>-[gth=Kx5_0Qr`*<Q+");
+	ASSERT_PRINTF("%-44.*x" ,-156,378720039u);
+	ASSERT_PRINTF("%117.51s%0022.90i%106.16s%-26p%--83.182u" ,"\\w/D^i\\5I1Fo_t|jL{1:78",302655923,"#Xcwl?d@KjMTSDV^Qtax0ayEv6",(void*)14070820740064816673lu,2575039322u);
+	ASSERT_PRINTF("%-152.144u%00127.133X%-15.195x%-*.137%%-80.162u" ,2450279521u,2436610582u,160136988u,31,524138014u);
+	ASSERT_PRINTF("%-90.*%%-*.169s%-129.46d%-26.100X%-57.36u" ,178,-108,"N(Z",-1790829278,1376263938u,1964629019u);
+	ASSERT_PRINTF("%0143.180d" ,-497071454);
+	ASSERT_PRINTF("%-106.s" ,"u8}kbE\n2J@ikcV`B8R*M");
+	ASSERT_PRINTF("%-69.*X" ,-83,1902131687u);
+	ASSERT_PRINTF("%---101c%-41d%-28.104i%40.153s" ,-27,-2146355665,-1361187478,"ScUM\fq[e");
+	ASSERT_PRINTF("%--133.150X" ,4118427420u);
+	ASSERT_PRINTF("%-178.105s%--173.u" ,"X;\t#!;$nm\nj#",2346779203u);
+	ASSERT_PRINTF("%-168p%*c%-37.186X%-62.12u%-7.80i" ,(void*)11003863505839120615lu,68,73,2383510380u,2783952512u,-1271710852);
+	ASSERT_PRINTF("%0016.153x%-142.86s" ,3908913739u,"21");
+	ASSERT_PRINTF("%-184.192s%-87.88s%-49.30d" ,"S5W=eYZ5M{\ngT]","#u|&V9wMi'3q98T?",1116458355);
+	ASSERT_PRINTF("%--34.*d%--119.58i%-79.153i%-151p" ,-184,466497980,-1482815710,58984436,(void*)958690792921413138lu);
+	ASSERT_PRINTF("%--81.129i%-176.189d%-56.26X%094.193d%-68.187i" ,-1419416708,1270090585,3524202656u,1023061174,-7405788);
+	ASSERT_PRINTF("%-58.50i%0141.*%%-13.25X%-36p%--82.48x" ,-325554652,-122,636795324u,(void*)17352689100821810594lu,2670537659u);
+	ASSERT_PRINTF("%-113.3s%--41.139i%000147.199d" ,"#S*FlGY8o*",1675841955,816649645);
+	ASSERT_PRINTF("%---83.*u%--c%083.175u%--15c" ,22,2939196153u,72,990033998u,24);
+	ASSERT_PRINTF("%-*.199s%--122.d%0158.87%%-108s" ,-34,":-'D!",800222161,NULL);
+	ASSERT_PRINTF("%0082.u%-7.57u" ,4183054859u,4100129571u);
+	ASSERT_PRINTF("%-62.194i%--152.193X" ,-495446273,2418640363u);
+	ASSERT_PRINTF("%---83.56u%-73c" ,3660193539u,119);
+	ASSERT_PRINTF("%--129.95d%-57.*u%-16.u%47.116s" ,-256104895,141,687349308u,3113262131u,"PG-sW\fn(X+@lusdR");
+	ASSERT_PRINTF("%103.165s%-97.173u%-13.119i%-136c%--*p" ,"*\t{~QTa5BqO*g[sBW-\r|S\\",2675659708u,1850142310,-41,107,(void*)17179493381796959667lu);
+	ASSERT_PRINTF("%--194c%-79.117u%---87.83s%--111.67i%0031.53x" ,-89,2660676645u,NULL,-1546631831,1164244363u);
+	ASSERT_PRINTF("%-52c%-127p%--122u%-149.2x%--53c" ,49,(void*)4107674378471411015lu,2879977307u,3833082675u,-35);
+	ASSERT_PRINTF("%--154.89u%-11.27s%43.188s%-*.134u%-152.137x" ,1115604463u,"Mt'W3JGYzX0cCg%N","J#L36!3G\\",141,101076902u,1115138605u);
+	ASSERT_PRINTF("%-96.15i%24.30s" ,-605743282,"\t2`z]qWSidu{oZ&8(VtK\nD\fj3bw");
+	ASSERT_PRINTF("%--67.199s%-82p%000169.26X%-63.131u" ,"p!%:",(void*)8529584511951505802lu,1006875718u,2572642042u);
+	ASSERT_PRINTF("%161p%0*.191x" ,(void*)5809216531987366905lu,-102,1321562592u);
+	ASSERT_PRINTF("%0174.69u%007.*x%-118.66%%--14.110x%0148.149x" ,916986526u,-73,3901041477u,1211769323u,1839880205u);
+	ASSERT_PRINTF("%-146i%--165p%-166.156s" ,1856443615,(void*)7601284559667288037lu,"Eu<8BAn;z5v;x=d(PPk.B&D)&!");
+	ASSERT_PRINTF("%-113p%--84.119i%--148.*%" ,(void*)5823493674460226049lu,-1063903126,-3);
+	ASSERT_PRINTF("%0198.9X%---187.*s%--*.103%%-92.43x" ,3371063919u,-131,"",51,4096758508u);
+	ASSERT_PRINTF("%20.11s%0168.114x%-167.23s" ,"|~|6O*Se~a[#Km^@Yy{6-",3645295032u,"0Sl'LZ");
+	ASSERT_PRINTF("%--11c" ,63);
+	ASSERT_PRINTF("%00129.*X%00*.32i%-121c%-167.53%" ,113,3120340762u,-88,-387655089,-12);
+	ASSERT_PRINTF("%-*p%00126.26i%*c" ,-192,(void*)3855719944968728755lu,612242261,-139,70);
+	ASSERT_PRINTF("%-129.115d%-77.10X%-32.*u" ,1394635659,1401620965u,48,2454876283u);
+	ASSERT_PRINTF("%0*.%%-*.50s%--105.137d%038.158%%-45.83%" ,-166,-154,"j`YV3W(-|K'\trQ#k/\tfm,nK",961916674);
+	ASSERT_PRINTF("%---21.161u%-106.*u" ,3339562697u,73,2777523813u);
+	ASSERT_PRINTF("%--84c%-33p%000196.55d%c" ,49,(void*)9207531927344177560lu,1619736363,40);
+	ASSERT_PRINTF("%0120.72x%-53.154d" ,1818316797u,1395025530);
+	ASSERT_PRINTF("%-71.32i%0194.117u%--167.124i%-48.77%%-124c" ,1314144866,611009845u,1486475242,68);
+	ASSERT_PRINTF("%-144p%144c" ,(void*)14534807036665133330lu,-61);
+	ASSERT_PRINTF("%0183.5u" ,605728228u);
+	ASSERT_PRINTF("%-116.144u%-8.94X%-68.35x%-166.122i" ,590168184u,3377604698u,4083943406u,-299544582);
+	ASSERT_PRINTF("%*c%--182.%%1c%055.7u" ,-129,-45,48,987889311u);
+	ASSERT_PRINTF("%-70.30u%134c%068.u%--*.84s%--172.52u" ,4110224048u,-90,239189602u,164,"`b[^h~\f>vE@c\fN",4236150522u);
+	ASSERT_PRINTF("%-144.75d%--78.X%-190p%00041.*x%-23.70%" ,-265040099,1164608268u,(void*)17615309680892657552lu,106,3685356723u);
+	ASSERT_PRINTF("%--162.153s" ,"R5lGI<xew_bMLsA:>]=d)JsY%");
+	ASSERT_PRINTF("%-84p" ,(void*)4775667885626284982lu);
+	ASSERT_PRINTF("%0120.60i%--186c%23.91s" ,66904061,123,"+5sL\fbw~DLaeBVx~");
+	ASSERT_PRINTF("%--3p%-149.169X" ,(void*)2930828309239637750lu,2340073959u);
+	ASSERT_PRINTF("%-44.191X%-36.29%%41p%-138c%00052.150X" ,1190215424u,(void*)3018354647187363245lu,46,1472975837u);
+	ASSERT_PRINTF("%-166.189X%-26.100%" ,207473590u);
+	ASSERT_PRINTF("%-153.61d%0105.36i%-77.70u%-80p" ,1957997024,1534377111,2603846243u,(void*)17500981794874329626lu);
+	ASSERT_PRINTF("%-70p%--20p" ,(void*)722858610728296101lu,(void*)4519852823670228835lu);
+	ASSERT_PRINTF("%---118.103i%--28.47u%88.166s%0123i" ,-704112513,3545495823u,"CUX`\\o",-1784647328);
+	ASSERT_PRINTF("%-96.78u%32s" ,3598761892u,"^\vHgagCH)m{hy[Q");
+	ASSERT_PRINTF("%0196.169i%-32c" ,1040966160,53);
+	ASSERT_PRINTF("%-c%-32.61i%-78.13s" ,-70,-739803298,"<C/YL2?}");
+	ASSERT_PRINTF("%--72.*s%-108p%-*.66%%-162.27d%--126.190d" ,137,"Gagp,t>sholGoP@h9#T#PjVsCF+Fx",(void*)604898635787958238lu,27,1458757178,209663612);
+	ASSERT_PRINTF("%-15.28X%157c%--35.189u%100.62s" ,2052648042u,9,1026341267u,"Cf\t3!DOK[M/t1>t1jC=tLBN:~c");
+	ASSERT_PRINTF("%---*c%-14.111u" ,73,72,2447307730u);
+	ASSERT_PRINTF("%--*.18u%-85c%189.170s%150c%-141.*i" ,143,1032677539u,69,"H.\ni-k",-125,32,-645299566);
+	ASSERT_PRINTF("%-197p%03.35d%-101.10%" ,(void*)16358200459980665292lu,1110276224);
+	ASSERT_PRINTF("%00144.60X%--160.157%" ,132210504u);
+	ASSERT_PRINTF("%0135.*%%--39c%095.16i%0120.39x%8.33s" ,-193,15,143560664,578664161u,"V0_(");
+	ASSERT_PRINTF("%000*.137X" ,3,2361478588u);
+	ASSERT_PRINTF("%-138.17%%--*p%-14p%---167p%--47.91u" ,-13,(void*)10740891812216954868lu,(void*)2144050129394666231lu,(void*)11614427029332157430lu,2673098069u);
+	ASSERT_PRINTF("%-57.*X%-194.116u%-140.134d" ,-70,3949637465u,1974205093u,335572653);
+	ASSERT_PRINTF("%---77.62s%-46.195i" ,"^CQ{\vkSl[ceD\f,~A-P",-2130843036);
+	ASSERT_PRINTF("%-*.152u%-78.92s%--44.57u" ,-157,804520638u,"#W|lXhS\\x^i",835290868u);
+	ASSERT_PRINTF("%--140p%-92.95s%-102.115i" ,(void*)15758905526233078610lu,NULL,-1446158942);
+	ASSERT_PRINTF("%-157p%-174p%-131.*X%0146.195x%--150p" ,(void*)7878202630734999894lu,(void*)8508579576981908212lu,189,42041319u,694227551u,(void*)1547752975271419156lu);
+	ASSERT_PRINTF("%--*p%0*.119x%-133.14d%0156.113d%-40c" ,19,(void*)9420508942149040314lu,5,3622177574u,267981691,-545348429,63);
+	ASSERT_PRINTF("%-190.90x%-117.173%" ,2497145861u);
+	ASSERT_PRINTF("%00183.%%-44.48d" ,2066635919);
+	ASSERT_PRINTF("%0*.29u%00079.55u%30.43s%-17.*s" ,-189,2491194593u,1621139216u,"QA`2Any5ew*Fx>\f|\t/",142,"z|:\r$F'+\f");
+	ASSERT_PRINTF("%*p%-114.86%%-27.22d" ,-112,(void*)10233099178825149944lu,500193481);
+	ASSERT_PRINTF("%--74.82s%--127.29X%--153c" ,"T6Hx+%F\t",3836960075u,-25);
+	ASSERT_PRINTF("%-38.54x%--189c%-21.79s" ,4019235240u,88,"M_<r+#dr)5O;\fuQ7");
+	ASSERT_PRINTF("%-164.*%%-108c%-157p%--14p" ,91,-9,(void*)8907860934591409401lu,(void*)15408969479809857993lu);
+	ASSERT_PRINTF("%0083.44X%39c%-18.*X%---74.107d" ,125145512u,-66,47,335687139u,1374193940);
+	ASSERT_PRINTF("%-*.166i%-180p%-3c%-95.171X%042.127X" ,-168,447376323,(void*)4981136401031776223lu,68,2961105249u,1977717553u);
+	ASSERT_PRINTF("%087.123i%0184.88i%--19.87%%000176.145x%-22.154X" ,-75280076,1694678287,555307608u,934788370u);
+	ASSERT_PRINTF("%--195.79s%*c%0181u%-7.140d%074.146i" ,"Lyaw_K!$){V8",-42,38,1322833922u,236864735,680817438);
+	ASSERT_PRINTF("%--159.17i" ,230232062);
+	ASSERT_PRINTF("%-170.%%-*.182%%--130.136u%--35p" ,133,2033636620u,(void*)9790833151496085968lu);
+	ASSERT_PRINTF("%0180.24x%00090.*X%37p" ,2245555842u,86,3125881487u,(void*)2594638458308163120lu);
+	ASSERT_PRINTF("%-149.7s" ,"5Y8WaQ_zsszrkYs%)G(bK");
+	ASSERT_PRINTF("%0078.34d%-197.122s%158p" ,204031315,"{Be-'BlT",(void*)12817666508860541147lu);
+	ASSERT_PRINTF("%--84.140d%010.u" ,82926976,2459542052u);
+	ASSERT_PRINTF("%--99.174%%-152p%---41.22i" ,(void*)13623062879853167239lu,-83457563);
+	ASSERT_PRINTF("%-167.174x%-17.24i%--18.16d" ,2654168458u,1312390500,-804572970);
+	}
diff --git a/prettier.py b/prettier.py
index 16a10f1..1b30db1 100644
--- a/prettier.py
+++ b/prettier.py
@@ -17,11 +17,11 @@ import argparse
 
 
 def green(*strings):
-    return "".join([f"\033[32m{s}\033[0m" for s in strings])
+    return "".join(["\033[32m{}\033[0m".format(s) for s in strings])
 
 
 def red(*strings):
-    return "".join([f"\033[31m{s}\033[0m" for s in strings])
+    return "".join(["\033[31m{}\033[0m".format(s) for s in strings])
 
 
 def parse_args():
@@ -40,7 +40,7 @@ def parse_args():
 
 
 def print_log_ko(ko, options):
-    print(f"- [{red(ko['type'])}] ft_printf({ko['args']})")
+    print("- [{}] ft_printf({})".format(red(ko['type']), ko['args']))
     if options["verbose"]:
         print("   expected: ", ko["expected"])
         print("   actual:   ", ko["actual"])
@@ -87,7 +87,7 @@ def write_logs(logs, options):
     with open(filename, "w") as log_file:
         for ko in logs["ko_info"]:
             try:
-                log_file.write(f"- [{ko['type']}] ft_printf({ko['args']})\n")
+                log_file.write("- [{}] ft_printf({})\n".format(ko['type'], ko['args']))
                 log_file.write("   expected: " + ko["expected"] + "\n")
                 log_file.write("   actual:   " + ko["actual"] + "\n")
             except UnicodeEncodeError:
@@ -97,7 +97,7 @@ def write_logs(logs, options):
 
 
 def print_logs(logs, options):
-    total_str = f"\n\nTotal     {green('OK: ', logs['ok'])}  {red('KO: ', logs['ko'])}"
+    total_str = "\n\nTotal     {}  {}".format(green('OK: ', logs['ok']), red('KO: ', logs['ko']))
     print(total_str)
     print("=" * (len(total_str) - len(green("")) * 2 - len(red("")) * 2 - 2))
 
diff --git a/save_failed.py b/save_failed.py
index a6d37ba..465ba18 100644
--- a/save_failed.py
+++ b/save_failed.py
@@ -31,5 +31,5 @@ if __name__ == "__main__":
         for l in previous_lines:
             save_file.write(l)
         for l in error_lines:
-            save_file.write(f"ASSERT_PRINTF{l}\n\t")
+            save_file.write("ASSERT_PRINTF{}\n\t".format(l))
         save_file.write("}\n")
diff --git a/saved_tests.c b/saved_tests.c
index 5d09624..5891394 100644
--- a/saved_tests.c
+++ b/saved_tests.c
@@ -2,7 +2,7 @@
 
 void saved_test(void)
 {
-																																ASSERT_PRINTF("%24.6x%61.146u%059.u%*p" ,3428759210u,699768298u,3551192901u,-130,(void*)9281414673285757929lu)
+																																	ASSERT_PRINTF("%24.6x%61.146u%059.u%*p" ,3428759210u,699768298u,3551192901u,-130,(void*)9281414673285757929lu)
 	ASSERT_PRINTF("%029.d%  10.8d%179.27s%*c%198.3u" ,-144374035,630963439,"luU",-62,45,2133259791u)
 ASSERT_PRINTF("%182p%*.x%-7.15s%-178.167u%071.i" ,(void*)16481877983539570083lu,66,1196899348u,"2d",2279048326u,-822789086)
 	ASSERT_PRINTF("%81.*s%-144.85X%-187.10s%113.139s%118.X" ,-143,"L)N\vuiBYewse,qzL;23kr>",2587710503u,"Ink.<6*#vZA","\nw%@\rd\vw20!\fNM$\f>",4000484419u)
@@ -967,4 +967,4 @@ ASSERT_PRINTF("%0147.123x%+0195.0d%+63.*d%-113.46u" ,288767637u,718326765,-22,18
 	ASSERT_PRINTF("%++80.97d%0#99.x%166p%--104c%-+104.5d" ,-1906533614,2887801045u,(void*)14018399492132222581lu,122,915016948)
 	ASSERT_PRINTF("%51.57u%-81.105d%19p%0*.u%-51.11x" ,2526386784u,-1121272625,(void*)17872886342797110028lu,26,3857909561u,4144482682u)
 	ASSERT_PRINTF("%#180x%0 142.d%+60.d%-122.25i" ,3179607536u,-708729510,1136972737,-769772092)
-	}
+}