compilation: change the method name to admit functions who have same name but diffrent parameters

XiaofengZHOU · XiaofengZHOU · commit eba5de9450c8 · 2018-02-25T13:10:29.000+01:00
diff --git a/phase2/Compiling/Compilation.ml b/phase2/Compiling/Compilation.ml
@@ -1,7 +1,8 @@
 open AST
 open Hashtbl
 
-
+exception ParentClassNotDefined of string
+exception SameFunctionAlreadyDefined of string
 
 type classDescriptor =
 {
@@ -84,7 +85,7 @@ let printClassTable classTable =
 *)
 
 let addMethodsToMethodTable className methodTable cmethod =
-	let nameMethod = className ^ "_" ^ cmethod.mname in
+	let nameMethod = className ^ "_" ^ cmethod.mname ^ "_" ^ (ListII.concat_map "," stringOf_argType cmethod.margstype) in
 	if(verifyHashtbl methodTable  nameMethod) = false
 	then begin
 		Hashtbl.add methodTable nameMethod cmethod
@@ -102,10 +103,12 @@ let addToMethodTable methodTable className c =
 		ulity: add methods, constructors,attributes in the Hashtbl classTable
 *)
 let addMethodsToClassDesciptor className methods cmethod =
-	if(verifyHashtbl methods  cmethod.mname) = false
+	let nameKey = cmethod.mname ^ "_" ^ (ListII.concat_map "," stringOf_argType cmethod.margstype) in
+
+	if(verifyHashtbl methods  nameKey) = false
 	then begin
-		let nameMethod = className ^ "_" ^ cmethod.mname in
-		Hashtbl.add methods cmethod.mname nameMethod
+		let nameMethod = className ^ "_" ^ cmethod.mname ^ "_" ^ (ListII.concat_map "," stringOf_argType cmethod.margstype) in
+		Hashtbl.add methods nameKey nameMethod
 	end
 	else begin
 		print_endline("function " ^ cmethod.mname ^ " already defined")
@@ -155,9 +158,11 @@ let addToClassTable classTable className c =
 (*asttype ={  mutable modifiers : modifier list; id : string; info : type_info;}
 ulity: add class and methods in the Hashtbl
 *)
-let rec findParentClass cname typelist = match typelist with
+let rec findParentClass cname typelist =
+	match typelist with
   | head::liste -> if head.id = cname then head else findParentClass cname liste
 
+
 let rec compileClass methodTable classTable ast asttype =
   match asttype.info with
   | Class c -> if(verifyHashtbl classTable asttype.id) = false
@@ -169,10 +174,13 @@ let rec compileClass methodTable classTable ast asttype =
 										end
 										else
 										  begin
-												let parenttype = findParentClass c.cparent.tid ast.type_list in
-												compileClass methodTable classTable ast parenttype;
-												addToClassTable classTable asttype.id c;
-												addToMethodTable methodTable asttype.id c
+													try
+														let parenttype = findParentClass c.cparent.tid ast.type_list in
+														compileClass methodTable classTable ast parenttype;
+														addToClassTable classTable asttype.id c;
+														addToMethodTable methodTable asttype.id c;
+													with
+														| _ -> raise(ParentClassNotDefined(c.cparent.tid))
 											end
 								end
 
