empty varargs method call bugfix and compiler support for isExceptionOf

sebastigurin · sebastigurin · commit 2de76ea5dfb4 · 2010-07-29T17:08:08.000Z
diff --git a/src/net/sf/j2s/core/astvisitors/ASTKeywordVisitor.java b/src/net/sf/j2s/core/astvisitors/ASTKeywordVisitor.java
@@ -1136,7 +1136,8 @@ public boolean visit(TryStatement node) {
 						buffer.append("{\r\n");
 						scopeAdded = true;
 					}
-					buffer.append("if (Clazz.instanceOf (" + catchEName + ", ");
+					buffer.append("if (Clazz.exceptionOf (" + catchEName + ", ");//sgurin : isExceptionOf compiler support.
+					//old code was: buffer.append("if (Clazz.instanceOf (" + catchEName + ", ");
 					type.accept(this);
 					buffer.append(")) ");
 				} else {
diff --git a/src/net/sf/j2s/core/astvisitors/ASTScriptVisitor.java b/src/net/sf/j2s/core/astvisitors/ASTScriptVisitor.java
@@ -1855,18 +1855,37 @@ public boolean visit(MethodInvocation node) {
 				buffer.append(", ");
 			}
 			boolean needBrackets = true;
-			//if (args.size() == 1) {
+			
+			//sgurin:  corrected bug when vararg parameter is an empty array.
+			if (args.size() == 0) {
+				if (needBrackets) buffer.append("[]");
+			}
+			else {
 				Expression arg = (Expression) args.get(args.size() - 1);
 				ITypeBinding resolveTypeBinding = arg.resolveTypeBinding();
-				if (resolveTypeBinding != null && resolveTypeBinding.isArray()) {
-					needBrackets = false;
-				}
-			//}
-			if (needBrackets) buffer.append("[");
-			//IMethodBinding methodDeclaration = node.resolveMethodBinding();
-			//visitMethodParameterList(node.arguments(), methodDeclaration, paramTypes.length - 1, size);
-			visitList(args, ", ", paramTypes.length - 1, size);
-			if (needBrackets) buffer.append("]");
+				if (resolveTypeBinding != null && resolveTypeBinding.isArray()) 
+					needBrackets = false;				
+				if (needBrackets) buffer.append("[");
+				visitList(args, ", ", paramTypes.length - 1, size);
+				if (needBrackets) buffer.append("]");
+			}
+			
+			//old Code:
+//			//if (args.size() == 1) {
+//				Expression arg = (Expression) args.get(args.size() - 1);
+//				ITypeBinding resolveTypeBinding = arg.resolveTypeBinding();
+//				if (resolveTypeBinding != null && resolveTypeBinding.isArray()) {
+//					needBrackets = false;
+//				}
+//			//}
+//			if (needBrackets) buffer.append("[");
+//			//IMethodBinding methodDeclaration = node.resolveMethodBinding();
+//			//visitMethodParameterList(node.arguments(), methodDeclaration, paramTypes.length - 1, size);
+//			visitList(args, ", ", paramTypes.length - 1, size);
+//			if (needBrackets) buffer.append("]");
+			
+			
+			
 		} else {
 			IMethodBinding methodDeclaration = node.resolveMethodBinding();
 			visitMethodParameterList(node.arguments(), methodDeclaration);
diff --git a/src/net/sf/j2s/core/compiler/Java2ScriptCompiler.java b/src/net/sf/j2s/core/compiler/Java2ScriptCompiler.java
@@ -531,6 +531,7 @@ public static String[] getClazzAbbrMap() {
 				"Clazz.prepareFields", "Y", //
 				"Clazz.newArray", "A", //
 				"Clazz.instanceOf", "O", //
+				"Clazz.exceptionOf", "e", //sgurin
 				"Clazz.inheritArgs", "G", //
 				"Clazz.checkPrivateMethod", "X", //
 				"Clazz.makeFunction", "Q", //
