compilation: add SameFunctionConstructorsDefined exception and modify the testCompilation.java and testCompilatgionException.java to test the exception. And modify addConstructorsToClassDescriptors to permit two constructors have the same name but diffrent parameters

Author: XiaofengZHOU

phase2/Compiling/Compilation.ml

@@ -3,6 +3,7 @@ open Hashtbl
 
 exception ParentClassNotDefined of string
 exception SameFunctionAlreadyDefined of string
+exception SameFunctionConstructorsDefined of string
 
 type classDescriptor =
 {
@@ -115,7 +116,14 @@ let addMethodsToClassDesciptor className methods cmethod =
 	end
 
 let addConstructorsToClassDesciptor constructorsClass constructor =
-	Hashtbl.add constructorsClass (ListII.concat_map "," stringOf_argType constructor.cargstype) constructor
+	let args = (ListII.concat_map "," stringOf_argType constructor.cargstype) in
+	if(verifyHashtbl constructorsClass  args) = false
+	then begin
+		Hashtbl.add constructorsClass args constructor
+	end
+	else begin
+		raise(SameFunctionConstructorsDefined(args  ^  " type constructor already defined in ClassDesciptor " ))
+	end
 
 let addMethodsToClassDesciptorFromParent classTable methodsClass c =
 	if (Hashtbl.mem classTable c.cparent.tid) = true
@@ -181,6 +189,7 @@ let rec compileClass methodTable classTable ast asttype =
 														addToMethodTable methodTable asttype.id c;
 													with
 														| SameFunctionAlreadyDefined str -> raise(SameFunctionAlreadyDefined(str))
+														| SameFunctionConstructorsDefined str -> raise(SameFunctionConstructorsDefined(str))												
 														| _ -> raise(ParentClassNotDefined(c.cparent.tid))
 											end
 								end

phase2/tests/testCompilation.java

@@ -6,20 +6,35 @@ public void f1(){
 class A {
 
   int a = 5;
-  Sttring b ="abc";
+  String b ="abc";
   public void f1(){
   }
+
+  public void f1(int b,int c){
+  }
+
+  public void f1(int d){
+  }
+
   public void f2(){
   }
 
   public A(int num)
   {
-    a = num;
+    int a = num;
   }
 
-  public A(int num,String name)
+
+  public A(int num1,int num2)
   {
-    a = num;
+    int a = num;
   }
 
+
+}
+
+
+
+class C {
+
 }

phase2/tests/testCompilationException.java

@@ -10,17 +10,33 @@ class A {
   public void f1(){
   }
 
+  //test same function exception
   public void f1(int b){
   }
 
   public void f1(int d){
   }
 
+  public void f1(int d,int c){
+  }
+
+  //test constructor exception
   public A(int num)
   {
     int a = num;
   }
 
+  public A(int num,int b)
+  {
+    int a = num;
+  }
+
+  public A(int num1)
+  {
+    int a = num;
+  }
+
+
 
 }