From 49c438234313924303829a333d4fae901c390f85 Mon Sep 17 00:00:00 2001
From: Vu Tuan Minh <tuan-minh.vu@etudiant.univ-rennes.fr>
Date: Sat, 26 Apr 2025 22:05:05 +0200
Subject: [PATCH] fix prototype

---
 src/main/antlr/VSLParser.g                      |  6 +++---
 src/main/java/TP2/asd/PrettyprinterVisitor.java | 15 +++++++++------
 src/main/java/TP2/asd/Program.java              |  2 +-
 tests/aLaMain.vsl                               |  2 +-
 4 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/src/main/antlr/VSLParser.g b/src/main/antlr/VSLParser.g
index f3df107..a709044 100644
--- a/src/main/antlr/VSLParser.g
+++ b/src/main/antlr/VSLParser.g
@@ -28,16 +28,16 @@ program returns [ProgramImp p] :
   {$p = new ProgramImp($func.out,$pro.out);}
 ;
 
-prototypes returns [ArrayList<Prototype> out]
+prototypes returns [ArrayList<Function> out]
   @init{
-    $out = new ArrayList<Prototype>();
+    $out = new ArrayList<Function>();
   }:
     (proto {
       $out.add($proto.out);
     })*
   ;
 
-proto returns [Prototype out]:
+proto returns [Function out]:
   PROTOTYPE t=type i=ident ParO v=liste_param ParF
     {
       $out=new PrototypeImp($t.return_type,$i.out, $v.out);
diff --git a/src/main/java/TP2/asd/PrettyprinterVisitor.java b/src/main/java/TP2/asd/PrettyprinterVisitor.java
index 57fab59..5031726 100644
--- a/src/main/java/TP2/asd/PrettyprinterVisitor.java
+++ b/src/main/java/TP2/asd/PrettyprinterVisitor.java
@@ -18,10 +18,15 @@ public class PrettyprinterVisitor implements    ProgramVisitor<String,String>,
     @Override
     public String visitProgram(ProgramImp prog, String indent) {
         String str ="";
-            for(int i = 0; i<prog.fonctions().size(); i++){
-                str += prog.fonctions().get(i).accept(this,INDENT);
-                if(i<prog.fonctions().size()-1) str += "\n";
-            }
+        for(int i= 0; i<prog.protos().size();i++){
+            str+=prog.protos().get(i).accept(this, INDENT);
+            if(i<prog.protos().size()-1) str += "\n";
+        }
+        str+="\n";
+        for(int i = 0; i<prog.fonctions().size(); i++){
+            str += prog.fonctions().get(i).accept(this,INDENT);
+            if(i<prog.fonctions().size()-1) str += "\n";
+        }
         return str;
     }
 
@@ -29,7 +34,6 @@ public class PrettyprinterVisitor implements    ProgramVisitor<String,String>,
     @Override
     public String visitPrototype(PrototypeImp proto, String indent){
         String str= indent + "PROTO "+proto.type().accept(this, "")+ " "+ proto.nom() + "(";
-
         for(int i=0; i<proto.params().size();i++){
             str+=proto.params().get(i).accept(this, "");
             if((i<proto.params().size()-1)){
@@ -43,7 +47,6 @@ public class PrettyprinterVisitor implements    ProgramVisitor<String,String>,
     @Override
     public String visitFunction(FunctionImp fun, String indent) {
         String str = indent+"FUNC " + fun.type().accept(this,"")+ " " + fun.nom() +"(";
-
         for(int i=0; i<fun.params().size();i++){
             str+=fun.params().get(i).accept(this, "");
             if((i<fun.params().size()-1)){
diff --git a/src/main/java/TP2/asd/Program.java b/src/main/java/TP2/asd/Program.java
index 8092e71..77306b8 100644
--- a/src/main/java/TP2/asd/Program.java
+++ b/src/main/java/TP2/asd/Program.java
@@ -7,7 +7,7 @@ import TP2.llvm.ProgramLLVM.*;
 public class Program{
 
     //Prog
-    public static record ProgramImp(ArrayList<Function> fonctions) implements ProgramI{
+    public static record ProgramImp(ArrayList<Function> fonctions,ArrayList<Function> protos) implements ProgramI{
         public <H, S> S accept(ProgramVisitor<H, S> v, H h) {
             return v.visitProgram(this, h);
         }
diff --git a/tests/aLaMain.vsl b/tests/aLaMain.vsl
index fa984d7..2aa0dd9 100644
--- a/tests/aLaMain.vsl
+++ b/tests/aLaMain.vsl
@@ -1,7 +1,7 @@
 PROTO INT add(x,y)
 FUNC INT main(x,y) {
     INT a,b,c,minh
-    x = 5
+    x := 5
     minh := x * y
     b:=3
     c:=1