add ret void pour func void

src/main/antlr/VSLParser.g

@@ -218,6 +218,10 @@ td_expression returns [Expression out]:
 ;
 
 lit  returns [Expression out]:
+    MINUS n=lit {
+        $out = new BinopExpressionImp(Op.MINUS, new ConstImp(0), $n.out);
+      }
+    |
     NUMBER {
       $out = new ConstImp($NUMBER.int);
     }

src/main/java/TP2/asd/toLLVM_Visitor.java

@@ -78,8 +78,8 @@ public class toLLVM_Visitor implements  ProgramVisitor<SymTable,ProgramLLVMImp>,
             if(!(instrLLVM.getLast() instanceof ReturnLLVMImp || instrLLVM.getLast() instanceof BrLLVMImp)){
                 instrLLVM.add(new ReturnLLVMImp(type, new ValLLVMImp(type,0)));
             }
-        }else {
+        }else if(type instanceof VoidLLVMImp){
-            //TODO
+            instrLLVM.add(new ReturnLLVMImp(type,null));
         }
         DefineLLVMImp define = new DefineLLVMImp(fun.nom(), type, paramsLLVM, instrLLVM);
         return define;
@@ -138,14 +138,18 @@ public class toLLVM_Visitor implements  ProgramVisitor<SymTable,ProgramLLVMImp>,
 
     @Override
     public ArrayList<InstructionLLVM> visitReturn(Return_instrImp instr, SymTable h) {
+        ArrayList<InstructionLLVM> result = new ArrayList<>();
+        //ret void
+        if (instr.e() == null) {
+            result.add(new ReturnLLVMImp(new VoidLLVMImp(), null));
+        }else{
             InstrAndVal res = instr.e().accept(this,h);
             ValLLVM var = res.val;
 
             InstructionLLVM r = new ReturnLLVMImp(var.getType(),var);
-        ArrayList<InstructionLLVM> result = new ArrayList<>();
             result.addAll(res.instrs);
             result.add(r);
-
+        }
         return result;
     }
 

src/main/java/TP2/llvm/PrettyprinterLLVM_Visitor.java

@@ -62,7 +62,11 @@ TypeLLVMVisitor<String,String>
 
     @Override
     public String visitReturnLLVM(ReturnLLVMImp instr, String h) {
-        return INDENT+"ret " + instr.type().accept(this, h) + " " + instr.e().accept(this, h);
+        if (instr.e() == null) {
+            return INDENT + "ret " + instr.type().accept(this, h);
+        } else {
+            return INDENT + "ret " + instr.type().accept(this, h) + " " + instr.e().accept(this, h);
+        }
     }
 
     @Override
@@ -128,10 +132,11 @@ TypeLLVMVisitor<String,String>
 
     @Override
     public String visitCallLLVM(CallLLVMImp instr, String h) {
-        String str = "call " + instr.str() + instr.f().type().accept(this, h) + " @"+instr.f().name() + "(";
+        String str = "call " + instr.f().type().accept(this, h) + " (" + instr.str() + ") @" + instr.f().name() + "(";
-        for(int i = 0; i<instr.params().size(); i++){
+
-            str += instr.params().get(i).getType().accept(this, h) + " " + instr.params().get(i).accept(this,h);
+        for (int i = 0; i < instr.params().size(); i++) {
-            if(i<instr.params().size()-1) str += ", ";
+            str += instr.params().get(i).getType().accept(this, h) + " " + instr.params().get(i).accept(this, h);
+            if (i < instr.params().size() - 1) str += ", ";
         }
     return str + ")";
     }
@@ -139,20 +144,20 @@ TypeLLVMVisitor<String,String>
     @Override
     public String visitPrintLLVM(PrintLLVMImp instr, String h) { //TODO
         DefineLLVMImp printLLVM = new DefineLLVMImp("printf", new IntLLVMImp(), new ArrayList<>(), new ArrayList<>());
-        CallLLVMImp callPrint = new CallLLVMImp(printLLVM, instr.l(),"(i8*,...) ");
+        CallLLVMImp callPrint = new CallLLVMImp(printLLVM, instr.l(),"i8*, ...");
         return callPrint.accept(this, h);
     }
 
     @Override
     public String visitScanLLVM(ScanLLVMImp instr, String h) { //TODO
         DefineLLVMImp readLLVM = new DefineLLVMImp("scanf", new IntLLVMImp(), new ArrayList<>(), new ArrayList<>());
-        CallLLVMImp callRead = new CallLLVMImp(readLLVM, instr.l(),"(i8*,...) ");
+        CallLLVMImp callRead = new CallLLVMImp(readLLVM, instr.l(),"i8*, ...");
         return callRead.accept(this, h);
     }
 
     @Override
     public String visitDeclarGlobalLLVM(DeclarGlobalLLVMImp instr, String h) {
-        String str = "@."+instr.var().nom() + " = global";
+        String str = "@"+instr.var().nom() + " = global";
         str += " [" + instr.size() + " x "+ instr.type().accept(this, h) + "] ";
         str+= "c\""+ instr.str()+"\"\n";
 

tests/aLaMain2.vsl

@@ -1,23 +1 @@
-FUNC INT test1(a,b){
+FUNC VOID main() PRINT 1
-    a := a+b
-}
-
-FUNC INT test2(a,b){
-    IF a
-    THEN
-        RETURN a
-    FI
-}
-
-FUNC INT test3(a,b){
-    IF a
-    THEN
-        RETURN a
-    ELSE
-        RETURN b
-    FI
-}
-
-FUNC INT main(x,y) {
-    x := test1(x,y)
-}