Merge branch 'main' of https://gitlab2.istic.univ-rennes1.fr/tuvu/tp2-vsl-pds

src/main/antlr/VSLParser.g

@@ -110,7 +110,7 @@ instruction returns [Instruction out]:
       read.add(new VarImp($i1.out));
     }(VIRGULE i2=ident
     {
-      read.add(new VarImp($i1.out));
+      read.add(new VarImp($i2.out));
     })*
     {$out = new ReadImp(read);}
 

src/main/java/TP2/asd/PrettyprinterVisitor.java

@@ -78,7 +78,7 @@ public class PrettyprinterVisitor implements    ProgramVisitor<String,String>,
     public String visitRead(ReadImp instr, String indent) {
         String str = indent+"READ ";
         for(int i = 0; i<instr.t().size(); i++){
-            str += instr.t().get(i);//.accept(this,h);
+            str += instr.t().get(i).accept(this,indent);
             if(i<instr.t().size()-1) str += ", ";
         }
         return str;

src/main/java/TP2/asd/SymTable.java

@@ -43,7 +43,7 @@ public class SymTable {
 
     public Result addNewTempVar(/*Type type*/){
         //TODO
-        String newVar = "temp"+getNewId();
+        String newVar = "temp"+id;
         SymTable newSymTab = this.addVar(newVar,new Type_intImp()); //TODO
         return new Result(newSymTab,newVar);
     }
@@ -72,7 +72,7 @@ public class SymTable {
         pmap= pmap.plus(s/*+"_"+this.id*/,new ValueTable(t, getNewId()));
         //this.id++;
         //Delete old ones
-        newpstack = newpstack.minus(stackMap.indexOf(stackMap.getLast()));
+        newpstack = newpstack.minus(newpstack.indexOf(newpstack.getLast()));
         //Push the new one
         newpstack = newpstack.plus(pmap);
         return new SymTable(newpstack,this.id);

tests/aLaMain.vsl

@@ -2,6 +2,6 @@ FUNC INT main() {
     INT a,b,c
     b:=3
     c:=1
-    PRINT "coucou, tu peux réparer le visitPrint dans LLVM stp","il manque virgule au milieu"
-    READ a, b
+    PRINT "coucou, tu peux réparer le visitPrint dans LLVM stp","il manque virgule au milieu", c*5+b
+    READ a, b, n, t, m
     RETURN 4 + 6 * 5 + 2 }