From 0dc3b60d12f9c32fb9bd99f8ff65bb24defb528c Mon Sep 17 00:00:00 2001
From: trochas <thibaut.rochas@etudiant.univ-rennes1.fr>
Date: Thu, 10 Apr 2025 12:28:25 +0200
Subject: [PATCH] block presque bon

---
 src/main/java/TP2/asd/toLLVM_Visitor.java | 23 ++++++++++++++++-------
 src/main/java/TP2/llvm/Interface.java     |  4 ++--
 2 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/src/main/java/TP2/asd/toLLVM_Visitor.java b/src/main/java/TP2/asd/toLLVM_Visitor.java
index 23a9015..96c0657 100644
--- a/src/main/java/TP2/asd/toLLVM_Visitor.java
+++ b/src/main/java/TP2/asd/toLLVM_Visitor.java
@@ -56,9 +56,7 @@ public class toLLVM_Visitor implements  ProgramVisitor<SymTable,ProgramLLVMImpl>
     @Override
     public DefineLLVM visitFunction(FunctionImp fun, SymTable h) {
         ArrayList<InstructionLLVM> instrLLVM = new ArrayList<>();
-        for(int i = 0; i<fun.instructions().size(); i++){
-            instrLLVM.addAll(fun.instructions().get(i).accept(this, h));
-        }
+        instrLLVM.addAll(fun.instruction().accept(this, h));
         return new DefineLLVMImpl(fun.nom(), fun.type().accept(this, h), instrLLVM);
     }
 
@@ -95,14 +93,25 @@ public class toLLVM_Visitor implements  ProgramVisitor<SymTable,ProgramLLVMImpl>
 
     @Override
     public ArrayList<InstructionLLVM> visitBloc(BlocImp instr, SymTable h) {
-        // TODO Auto-generated method stub
-        throw new UnsupportedOperationException("Unimplemented method 'visitBloc'");
+        ArrayList<InstructionLLVM> instrLLVM = new ArrayList<>();
+        for(int i = 0; i<instr.instrs().size(); i++){
+            instrLLVM.addAll(instr.instrs().get(i).accept(this, h));
+        }
+        return instrLLVM;
     }
 
     @Override
     public ArrayList<InstructionLLVM> visitBlocDec(BlocDecImp instr, SymTable h) {
-        // TODO Auto-generated method stub
-        throw new UnsupportedOperationException("Unimplemented method 'visitBlocDec'");
+        ArrayList<InstructionLLVM> instrLLVM = new ArrayList<>();
+        for(int i = 0; i<instr.decls().size(); i++){
+            InstrAndSymTable temp = instr.decls().get(i).accept(this, h);
+            h = temp.symTable;
+            instrLLVM.addAll(temp.instrs);
+        }
+        for(int i = 0; i<instr.instrs().size(); i++){
+            instrLLVM.addAll(instr.instrs().get(i).accept(this, h));
+        }
+        return instrLLVM;
     }
 
     @Override
diff --git a/src/main/java/TP2/llvm/Interface.java b/src/main/java/TP2/llvm/Interface.java
index 2238fdc..f288fb7 100644
--- a/src/main/java/TP2/llvm/Interface.java
+++ b/src/main/java/TP2/llvm/Interface.java
@@ -33,8 +33,8 @@ public interface Interface {
         public S visitPrintLLVM(PrintLLVMImpl instr, H h);
         public S visitReadLLVM(ReadLLVMImpl instr, H h);
         public S visitIfThenElseLLVM(IfThenElseImp instr, H h);
-        public S visitIfThenLLVM(IfThenImp instr, H h);
-        public S visitWhileLLVM(WhileImp instr, H h);
+        //public S visitIfThenLLVM(IfThenImp instr, H h); TODO
+        //public S visitWhileLLVM(WhileImp instr, H h);
     }
 
     //////////ExpressionLLVM (expression)