correction TypeCheck

2025-04-26 23:23:16 +02:00
parent 3d4750f7e4
commit af2e42ab89
4 changed files with 221 additions and 202 deletions
--- a/src/main/java/TP2/Error/TypeCheckExprDiag.java
+++ b/src/main/java/TP2/Error/TypeCheckExprDiag.java
@@ -1,34 +1,34 @@
-//package TP2.Error;
-//import TP2.asd.Interface.*;
-//public class TypeCheckExprDiag {
-//    private Type t;
-//    private String err;
-//    private boolean check;
-//
-//    public TypeCheckExprDiag(Type type) {
-//        this.t = type;
-//        this.check = true;
-//        this.err = null;
-//    }
-//
-//    public TypeCheckExprDiag(String error){
-//        this.err=error;
-//        this.check=false;
-//    }
-//
-//    public boolean get_check(){
-//        return this.check;
-//    }
-//    
-//    public Type get_type(){
-//        return this.t;
-//    }
-//    
-//    public static TypeCheckExprDiag error(String err){
-//        return new TypeCheckExprDiag(err);
-//    }
-//
-//    public static TypeCheckExprDiag checked(Type type){
-//        return new TypeCheckExprDiag(type);
-//    }
-//}
+package TP2.Error;
+import TP2.asd.Interface.*;
+public class TypeCheckExprDiag {
+    private Type t;
+    private String err;
+    private boolean check;
+
+    public TypeCheckExprDiag(Type type) {
+        this.t = type;
+        this.check = true;
+        this.err = null;
+    }
+
+    public TypeCheckExprDiag(String error){
+        this.err=error;
+        this.check=false;
+    }
+
+    public boolean get_check(){
+        return this.check;
+    }
+    
+    public Type get_type(){
+        return this.t;
+    }
+    
+    public static TypeCheckExprDiag error(String err){
+        return new TypeCheckExprDiag(err);
+    }
+
+    public static TypeCheckExprDiag checked(Type type){
+        return new TypeCheckExprDiag(type);
+    }
+}
--- a/src/main/java/TP2/Error/TypeChecking.java
+++ b/src/main/java/TP2/Error/TypeChecking.java
@@ -1,155 +1,166 @@
-//package TP2.Error;
-//
-//import TP2.asd.SymTable;
-//import TP2.asd.Program.*;
-//import TP2.asd.Interface.*;
-//
-//public class TypeChecking {
-//
-//    public class TypeCheckProg implements ProgramVisitor<SymTable, TypeCheckExprDiag>{
-//        private TypeCheckFunction func_check;
-//        @Override
-//        public TypeCheckExprDiag visitProgram(ProgramImp prog, SymTable h) {
-//            SymTable st= new SymTable();
-//            for (Function f : prog.fonctions()) {
-//                TypeCheckExprDiag diag = f.accept(func_check, h);
-//                if (!diag.get_check()) return diag;
-//            }
-//            return TypeCheckExprDiag.checked(null);
-//        }
-//    }
-//
-//    public class TypeCheckFunction implements FunctionVisitor<SymTable, TypeCheckExprDiag>{
-//        private TypeCheckInstr instr_check;
-//        @Override
-//        public TypeCheckExprDiag visitFunction(FunctionImp f, SymTable h) {
-//           return f.instruction().accept(instr_check,h);
-//        }
-//    }
-//
-//    public class TypeCheckInstr implements InstrVisitor<SymTable, TypeCheckExprDiag> {
-//        private TypeCheckExpr expr_check; 
-//        @Override
-//        public TypeCheckExprDiag visitReturn(Return_instrImp instr, SymTable h) {
-//            return instr.e().accept(expr_check, h);
-//        }
-//
-//        @Override
-//        public TypeCheckExprDiag visitBloc(BlocImp instr, SymTable h) {
-//            for(Instruction i: instr.instrs()){
-//                TypeCheckExprDiag diag= i.accept(this, h);
-//                if(!diag.get_check()) return diag;
-//            }
-//            return TypeCheckExprDiag.checked(null);
-//        }
-//
-//        @Override
-//        public TypeCheckExprDiag visitBlocDec(BlocDecImp instr, SymTable h) {
-//            // TODO Auto-generated method stub
-//            throw new UnsupportedOperationException("Unimplemented method 'visitBlocDec'");
-//        }
-//
-//        @Override
-//        public TypeCheckExprDiag visitAssign(AssignImp instr, SymTable h) {
-//            if(!h.searchVar(instr.t())){
-//                return TypeCheckExprDiag.error("Variable "+instr.t()+" n'existe pas");
-//            }
-//            Type t_type=h.getvar_Type(instr.t());
-//            TypeCheckExprDiag expr= instr.e().accept(expr_check, h);
-//
-//            if (!expr.get_check()) return expr;
-//            //Verify type t = Type expr
-//            if(!t_type.getClass().equals(expr.get_type().getClass())){
-//                return TypeCheckExprDiag.error("Type d'expression est different que le type de variable");
-//            }
-//            return TypeCheckExprDiag.checked(t_type);
-//        }
-//
-//        @Override
-//        public TypeCheckExprDiag visitPrint(PrintImp instr, SymTable h) {
-//           for(Object o :instr.t()){
-//            //We have string and expression
-//            if(o instanceof Expression e){
-//                TypeCheckExprDiag result = e.accept(expr_check, h);
-//                if (!result.get_check()) return result;
-//            }
-//           }
-//           return TypeCheckExprDiag.checked(null);
-//        }
-//
-//        @Override
-//        public TypeCheckExprDiag visitRead(ReadImp instr, SymTable h) {
-//            for(VarImp v: instr.t()){
-//                if(!h.searchVar(v.name())){
-//                    return TypeCheckExprDiag.error("Variable "+v.name()+" n'existe pas");
-//                }
-//            }
-//            return TypeCheckExprDiag.checked(null);
-//        }
-//
-//        @Override
-//        public TypeCheckExprDiag visitIfThen(IfThenImp instr, SymTable h) {
-//            TypeCheckExprDiag cond =instr.e().accept(expr_check, h);
-//            if(!cond.get_check()) return cond;
-//            if (!(cond.get_type() instanceof Type_intImp)){
-//                return TypeCheckExprDiag.error("Condition n'est pas un int");
-//            }
-//            return instr.i1().accept(this, h);
-//        }
-//
-//        @Override
-//        public TypeCheckExprDiag visitIfThenElse(IfThenElseImp instr, SymTable h) {
-//            TypeCheckExprDiag cond =instr.e().accept(expr_check, h);
-//            if(!cond.get_check()) return cond;
-//            if (!(cond.get_type() instanceof Type_intImp)){
-//                return TypeCheckExprDiag.error("Condition n'est pas un int");
-//            }
-//            
-//            TypeCheckExprDiag then= instr.i1().accept(this, h);
-//            if (!then.get_check()) return then;
-//            return instr.i2().accept(this, h);
-//        }
-//
-//        @Override
-//        public TypeCheckExprDiag visitWhile(WhileImp instr, SymTable h) {
-//            TypeCheckExprDiag cond =instr.e().accept(expr_check, h);
-//            if(!cond.get_check()) return cond;
-//            if (!(cond.get_type() instanceof Type_intImp)){
-//                return TypeCheckExprDiag.error("Condition n'est pas un int");
-//            }
-//            return instr.i1().accept(this, h);
-//        } 
-//    }
-//
-//    public class TypeCheckExpr implements ExprVisitor<SymTable ,TypeCheckExprDiag>{
-//        @Override
-//        public TypeCheckExprDiag visitConst(ConstImp e, SymTable h) {
-//            return TypeCheckExprDiag.checked(new Type_intImp());
-//        }
-//
-//        @Override
-//        public TypeCheckExprDiag visitVar(VarImp e, SymTable h) {
-//            if(!h.searchVar(e.name())){
-//                return TypeCheckExprDiag.error("Ce variable n'existe pas");
-//            }
-//            Type e_type= h.getvar_Type(e.name());
-//            return TypeCheckExprDiag.checked(e_type);
-//        }
-//
-//        @Override
-//        public TypeCheckExprDiag visitBinOp(BinopExpressionImp e, SymTable h) {
-//            TypeCheckExprDiag tce1 = e.e1().accept(this, h);
-//            TypeCheckExprDiag tce2 = e.e2().accept(this, h);
-//            
-//            // Check if not ok then return its error
-//            if(!tce1.get_check()) return tce1;
-//            if(!tce2.get_check()) return tce2;
-//
-//            // Check int + int
-//            if (!(tce1.get_type() instanceof Type_intImp) || !(tce2.get_type() instanceof Type_intImp) ){
-//                return TypeCheckExprDiag.error("Ses types sont different");
-//            }
-//            return TypeCheckExprDiag.checked(tce1.get_type());
-//        }
-//    }
-//}
+package TP2.Error;
+
+import TP2.asd.SymTable;
+import TP2.asd.Program.*;
+import TP2.asd.Interface.*;
+
+public class TypeChecking {
+
+    public class TypeCheckProg implements ProgramVisitor<SymTable, TypeCheckExprDiag>{
+        private TypeCheckFunction func_check;
+        @Override
+        public TypeCheckExprDiag visitProgram(ProgramImp prog, SymTable h) {
+            SymTable st= new SymTable();
+            for (Function f : prog.fonctions()) {
+                TypeCheckExprDiag diag = f.accept(func_check, h);
+                if (!diag.get_check()) return diag;
+            }
+            return TypeCheckExprDiag.checked(null);
+        }
+    }
+
+    public class TypeCheckFunction implements FunctionVisitor<SymTable, TypeCheckExprDiag>{
+        private TypeCheckInstr instr_check;
+        @Override
+        public TypeCheckExprDiag visitFunction(FunctionImp f, SymTable h) {
+           return f.instruction().accept(instr_check,h);
+        }
+        @Override
+        public TypeCheckExprDiag visitPrototype(PrototypeImp proto, SymTable h) {
+            // TODO Auto-generated method stub
+            throw new UnsupportedOperationException("Unimplemented method 'visitPrototype'");
+        }
+    }
+
+    public class TypeCheckInstr implements InstrVisitor<SymTable, TypeCheckExprDiag> {
+        private TypeCheckExpr expr_check; 
+        @Override
+        public TypeCheckExprDiag visitReturn(Return_instrImp instr, SymTable h) {
+            return instr.e().accept(expr_check, h);
+        }
+
+        @Override
+        public TypeCheckExprDiag visitBloc(BlocImp instr, SymTable h) {
+            for(Instruction i: instr.instrs()){
+                TypeCheckExprDiag diag= i.accept(this, h);
+                if(!diag.get_check()) return diag;
+            }
+            return TypeCheckExprDiag.checked(null);
+        }
+
+        @Override
+        public TypeCheckExprDiag visitBlocDec(BlocDecImp instr, SymTable h) {
+            // TODO Auto-generated method stub
+            throw new UnsupportedOperationException("Unimplemented method 'visitBlocDec'");
+        }
+
+        @Override
+        public TypeCheckExprDiag visitAssign(AssignImp instr, SymTable h) {
+            if(!h.searchVar(instr.t())){
+                return TypeCheckExprDiag.error("Variable "+instr.t()+" n'existe pas");
+            }
+            Type t_type=h.getvar_Type(instr.t());
+            TypeCheckExprDiag expr= instr.e().accept(expr_check, h);
+
+            if (!expr.get_check()) return expr;
+            //Verify type t = Type expr
+            if(!t_type.getClass().equals(expr.get_type().getClass())){
+                return TypeCheckExprDiag.error("Type d'expression est different que le type de variable");
+            }
+            return TypeCheckExprDiag.checked(t_type);
+        }
+
+        @Override
+        public TypeCheckExprDiag visitPrint(PrintImp instr, SymTable h) {
+           for(Object o :instr.t()){
+            //We have string and expression
+            if(o instanceof Expression e){
+                TypeCheckExprDiag result = e.accept(expr_check, h);
+                if (!result.get_check()) return result;
+            }
+           }
+           return TypeCheckExprDiag.checked(null);
+        }
+
+        @Override
+        public TypeCheckExprDiag visitRead(ReadImp instr, SymTable h) {
+            for(VarImp v: instr.t()){
+                if(!h.searchVar(v.name())){
+                    return TypeCheckExprDiag.error("Variable "+v.name()+" n'existe pas");
+                }
+            }
+            return TypeCheckExprDiag.checked(null);
+        }
+
+        @Override
+        public TypeCheckExprDiag visitIfThen(IfThenImp instr, SymTable h) {
+            TypeCheckExprDiag cond =instr.e().accept(expr_check, h);
+            if(!cond.get_check()) return cond;
+            if (!(cond.get_type() instanceof Type_intImp)){
+                return TypeCheckExprDiag.error("Condition n'est pas un int");
+            }
+            return instr.i1().accept(this, h);
+        }
+
+        @Override
+        public TypeCheckExprDiag visitIfThenElse(IfThenElseImp instr, SymTable h) {
+            TypeCheckExprDiag cond =instr.e().accept(expr_check, h);
+            if(!cond.get_check()) return cond;
+            if (!(cond.get_type() instanceof Type_intImp)){
+                return TypeCheckExprDiag.error("Condition n'est pas un int");
+            }
+            
+            TypeCheckExprDiag then= instr.i1().accept(this, h);
+            if (!then.get_check()) return then;
+            return instr.i2().accept(this, h);
+        }
+
+        @Override
+        public TypeCheckExprDiag visitWhile(WhileImp instr, SymTable h) {
+            TypeCheckExprDiag cond =instr.e().accept(expr_check, h);
+            if(!cond.get_check()) return cond;
+            if (!(cond.get_type() instanceof Type_intImp)){
+                return TypeCheckExprDiag.error("Condition n'est pas un int");
+            }
+            return instr.i1().accept(this, h);
+        } 
+    }
+
+    public class TypeCheckExpr implements ExprVisitor<SymTable ,TypeCheckExprDiag>{
+        @Override
+        public TypeCheckExprDiag visitConst(ConstImp e, SymTable h) {
+            return TypeCheckExprDiag.checked(new Type_intImp());
+        }
+
+        @Override
+        public TypeCheckExprDiag visitVar(VarImp e, SymTable h) {
+            if(!h.searchVar(e.name())){
+                return TypeCheckExprDiag.error("Ce variable n'existe pas");
+            }
+            Type e_type= h.getvar_Type(e.name());
+            return TypeCheckExprDiag.checked(e_type);
+        }
+
+        @Override
+        public TypeCheckExprDiag visitBinOp(BinopExpressionImp e, SymTable h) {
+            TypeCheckExprDiag tce1 = e.e1().accept(this, h);
+            TypeCheckExprDiag tce2 = e.e2().accept(this, h);
+            
+            // Check if not ok then return its error
+            if(!tce1.get_check()) return tce1;
+            if(!tce2.get_check()) return tce2;
+
+            // Check int + int
+            if (!(tce1.get_type() instanceof Type_intImp) || !(tce2.get_type() instanceof Type_intImp) ){
+                return TypeCheckExprDiag.error("Ses types sont different");
+            }
+            return TypeCheckExprDiag.checked(tce1.get_type());
+        }
+
+        @Override
+        public TypeCheckExprDiag visitAppeal(Appeal instr, SymTable h) {
+            // TODO Auto-generated method stub
+            throw new UnsupportedOperationException("Unimplemented method 'visitAppeal'");
+        }
+    }
+}
--- a/src/main/java/TP2/asd/toLLVM_Visitor.java
+++ b/src/main/java/TP2/asd/toLLVM_Visitor.java
@@ -98,19 +98,6 @@ public class toLLVM_Visitor implements  ProgramVisitor<SymTable,ProgramLLVMImpl>

    //INSTRUCTION 

-    @Override
-    public ArrayList<InstructionLLVM> visitReturn(Return_instrImp instr, SymTable h) {
-        InstrAndVal res = instr.e().accept(this,h);
-        ValLLVM var = res.val;
-
-        InstructionLLVM r = new ReturnLLVMImpl(var.getType(),var);
-        ArrayList<InstructionLLVM> result = new ArrayList<>();
-        result.addAll(res.instrs);
-        result.add(r);
-
-        return result;
-    }
-
    @Override
    public ArrayList<InstructionLLVM> visitBloc(BlocImp instr, SymTable h) {
        ArrayList<InstructionLLVM> instrLLVM = new ArrayList<>();
@@ -134,6 +121,20 @@ public class toLLVM_Visitor implements  ProgramVisitor<SymTable,ProgramLLVMImpl>
        return instrLLVM;
    }

+    @Override
+    public ArrayList<InstructionLLVM> visitReturn(Return_instrImp instr, SymTable h) {
+        InstrAndVal res = instr.e().accept(this,h);
+        ValLLVM var = res.val;
+
+        InstructionLLVM r = new ReturnLLVMImpl(var.getType(),var);
+        ArrayList<InstructionLLVM> result = new ArrayList<>();
+        result.addAll(res.instrs);
+        result.add(r);
+
+        return result;
+    }
+
+
    @Override
    public ArrayList<InstructionLLVM> visitAssign(AssignImp instr, SymTable h) {
        InstrAndVal res = instr.e().accept(this,h);