feat: fin de TP de métaprog xD

Co-authored-by: gdamms <gdamms@users.noreply.github.com>

src/out.tam

@@ -0,0 +1,85 @@
+; fichiersRat/src-rat-tam-test/testfun2.rat
+JUMP main
+
+pgcd
+LOADL 0
+LOAD (1) -2[LB]
+LOAD (1) -1[LB]
+boucle
+LOAD (1) 5[LB]
+JUMPIF (0) fin
+LOAD (1) 4[LB]
+LOAD (1) 5 [LB]
+SUBR IMod
+STORE (1) 3[LB]
+LOAD (1) 5[LB]
+STORE (1) 4[LB]
+LOAD (1) 3[LB]
+STORE(1) 5[LB]
+JUMP boucle
+fin
+LOAD (1) 4[LB]
+RETURN (1) 2
+
+norm
+LOAD (1) -2[LB]
+LOAD (1) -1[LB]
+CALL (LB) pgcd
+LOAD (1) -2[LB]
+LOAD (1) 3[LB]
+SUBR IDiv
+LOAD (1) -1[LB]
+LOAD (1) 3[LB]
+SUBR IDiv
+RETURN (2) 2
+
+ROut
+LOADL '['
+SUBR COut
+LOAD (1) -2[LB]
+SUBR IOut
+LOADL '/'
+SUBR COut
+LOAD (1) -1[LB]
+SUBR IOut
+LOADL ']'
+SUBR COut
+RETURN (0) 2
+
+RAdd
+LOAD (1) -4[LB]
+LOAD (1) -1[LB]
+SUBR IMul
+LOAD (1) -2[LB]
+LOAD (1) -3[LB]
+SUBR IMul
+SUBR IAdd
+LOAD (1) -3[LB]
+LOAD (1) -1[LB]
+SUBR IMul
+CALL (ST) norm
+RETURN (2) 4
+
+RMul
+LOAD (1) -4[LB]
+LOAD (1) -2[LB]
+SUBR IMul
+LOAD (1) -3[LB]
+LOAD (1) -1[LB]
+SUBR IMul
+CALL (ST) norm
+RETURN (2) 4
+
+f
+LOAD (1) -1[LB]
+POP (1) 1
+RETURN (1) 1
+
+main
+LOADL 3
+LOADL 4
+SUBR IAdd
+CALL (ST) f
+SUBR IOut
+
+HALT

src/out_test.tam

@@ -0,0 +1,113 @@
+JUMP main
+
+pgcd
+LOADL 0
+LOAD (1) -2[LB]
+LOAD (1) -1[LB]
+boucle
+LOAD (1) 5[LB]
+JUMPIF (0) fin
+LOAD (1) 4[LB]
+LOAD (1) 5 [LB]
+SUBR IMod
+STORE (1) 3[LB]
+LOAD (1) 5[LB]
+STORE (1) 4[LB]
+LOAD (1) 3[LB]
+STORE(1) 5[LB]
+JUMP boucle
+fin
+LOAD (1) 4[LB]
+RETURN (1) 2
+
+norm
+LOAD (1) -2[LB]
+LOAD (1) -1[LB]
+CALL (LB) pgcd
+LOAD (1) -2[LB]
+LOAD (1) 3[LB]
+SUBR IDiv
+LOAD (1) -1[LB]
+LOAD (1) 3[LB]
+SUBR IDiv
+RETURN (2) 2
+
+ROut
+LOADL '['
+SUBR COut
+LOAD (1) -2[LB]
+SUBR IOut
+LOADL '/'
+SUBR COut
+LOAD (1) -1[LB]
+SUBR IOut
+LOADL ']'
+SUBR COut
+RETURN (0) 2
+
+RAdd
+LOAD (1) -4[LB]
+LOAD (1) -1[LB]
+SUBR IMul
+LOAD (1) -2[LB]
+LOAD (1) -3[LB]
+SUBR IMul
+SUBR IAdd
+LOAD (1) -3[LB]
+LOAD (1) -1[LB]
+SUBR IMul
+CALL (ST) norm
+RETURN (2) 4
+
+RMul
+LOAD (1) -4[LB]
+LOAD (1) -2[LB]
+SUBR IMul
+LOAD (1) -3[LB]
+LOAD (1) -1[LB]
+SUBR IMul
+CALL (ST) norm
+RETURN (2) 4
+
+add
+LOADL 0
+LOADL 0
+LOAD (1) -2[LB]
+SUBR IAdd
+STORE (1) 3[LB]
+LOAD (1) -2[LB]
+LOAD (1) -1[LB]
+LOAD (1) 3[LB]
+SUBR IAdd
+SUBR IAdd
+POP (1) 2
+RETURN (1) 2
+
+main
+LOADL 3
+LOADL 4
+STORE (1) 0[SB]
+LOAD (1) 0[SB]
+LOADL 5
+SUBR IAdd
+LOAD (1) 0[SB]
+LOADL 0
+SUBR ILss
+JUMPIF (0) label1
+LOADL 1
+LOADL 0
+STORE (1) 2[SB]
+JUMP label2
+label1
+LOADL 4
+LOADL 3
+CALL (ST) norm
+LOADL 5
+LOAD (2) 2[SB]
+LOAD (1) -2[ST]
+CALL (ST) add
+LOAD (2) 2[SB]
+CALL (ST) rout
+label2
+
+HALT

src/passeCodeRatToTam.ml

@@ -84,9 +84,9 @@ and analyse_code_instruction i =
     let etiq1 = getEtiquette () in
     let etiq2 = getEtiquette () in
     (analyse_code_expression e) ^
-    "JUMPIF (0) " ^ etiq1 ^ "[ST]\n" ^
+    "JUMPIF (0) " ^ etiq1 ^ "\n" ^
     (analyse_code_bloc b1) ^
-    "JUMP " ^ etiq2 ^ "[ST]\n" ^
+    "JUMP " ^ etiq2 ^ "\n" ^
     etiq1 ^ "\n" ^
     (analyse_code_bloc b2) ^
     etiq2 ^ "\n"
@@ -94,28 +94,37 @@ and analyse_code_instruction i =
   | TantQue(e, b) ->
     let etiq_while = getEtiquette () in
     let etiq_fin = getEtiquette () in
-    etiq_while ^
+    etiq_while ^ "\n" ^
     (analyse_code_expression e) ^
-    "JUMPIF (0) " ^ etiq_fin ^ "[ST]\n" ^
+    "JUMPIF (0) " ^ etiq_fin ^ "\n" ^
     (analyse_code_bloc b) ^
-    "JUMP " ^ etiq_while ^ "[ST]\n" ^
+    "JUMP " ^ etiq_while ^ "\n" ^
     etiq_fin ^ "\n"
 
-  (* | Retour(e) ->
-    (analyse_code_expression e) ^
-    "RETURN (" ^ r? ^ ") p\n" *)
+  | Retour(e) ->
+    (analyse_code_expression e)
+
+  | Empty -> ""
 
 and analyse_code_bloc bloc =
   List.fold_right (
     fun i res -> (analyse_code_instruction i) ^ res
   ) bloc ""
 
-and analyse_code_fonction (AstPlacement.Fonction(info, l_typinfo, bloc)) = failwith "TODO"
+and analyse_code_fonction (AstPlacement.Fonction(info, l_typinfo, bloc)) =
+  match info_ast_to_info info with
+  | InfoFun(name, t, l_t) ->
+    let taille_return = string_of_int (getTaille t) in
+    let taille_args = string_of_int (List.fold_right (fun e res -> getTaille e + res) l_t 0) in
+    name ^ "\n" ^
+    (analyse_code_bloc bloc) ^
+    "POP (" ^ taille_return ^ ") " ^ taille_args ^ "\n" ^
+    "RETURN (" ^ taille_return ^ ") " ^ taille_args ^ "\n\n"
 
 let analyser (AstPlacement.Programme(fonctions, prog)) =
   let code = getEntete () in
-  (* let code = code ^ List.fold_right (fun e res_q -> (analyse_code_fonction e) ^ res_q) fonctions "" in *)
+  let code = code ^ List.fold_right (fun e res_q -> (analyse_code_fonction e) ^ res_q) fonctions "" in
   let code = code ^ "main\n" in
   let code = code ^ analyse_code_bloc prog in
-  code
+  code ^ "\nHALT"
 end

src/testTam.ml

@@ -24,7 +24,7 @@ let runtam ratfile =
 let%expect_test "testprintint" =
   runtam "../../fichiersRat/src-rat-tam-test/testprintint.rat";
   [%expect{| 42 |}]
-(*
+
 let%expect_test "testprintbool" =
   runtam "../../fichiersRat/src-rat-tam-test/testprintbool.rat";
   [%expect{| true |}]
@@ -84,7 +84,7 @@ let%expect_test "factfun1" =
 let%expect_test "factfun2" =
   runtam "../../fichiersRat/src-rat-tam-test/testfun2.rat";
   [%expect{| 7 |}]
-
+(*
 let%expect_test "factfun3" =
   runtam "../../fichiersRat/src-rat-tam-test/testfun3.rat";
   [%expect{| 10 |}]