Merge with /trunk

jossonsmith · jossonsmith · commit 6b8af47868e8 · 2006-08-12T06:52:19.000Z
diff --git a/src/net/sf/j2s/core/astvisitors/ASTKeywordParser.java b/src/net/sf/j2s/core/astvisitors/ASTKeywordParser.java
@@ -76,6 +76,7 @@
 import org.eclipse.jdt.core.dom.ThisExpression;
 import org.eclipse.jdt.core.dom.ThrowStatement;
 import org.eclipse.jdt.core.dom.TryStatement;
+import org.eclipse.jdt.core.dom.Type;
 import org.eclipse.jdt.core.dom.VariableDeclarationExpression;
 import org.eclipse.jdt.core.dom.VariableDeclarationFragment;
 import org.eclipse.jdt.core.dom.VariableDeclarationStatement;
@@ -1262,7 +1263,12 @@ public boolean visit(InstanceofExpression node) {
 		buffer.append("Clazz.instanceOf (");
 		node.getLeftOperand().accept(this);
 		buffer.append(", ");
-		node.getRightOperand().accept(this);
+		Type right = node.getRightOperand();
+		if (right instanceof ArrayType) {
+			buffer.append("Array");
+		} else {
+			right.accept(this);
+		}
 		buffer.append(")");
 		return false;
 	}
diff --git a/src/net/sf/j2s/core/astvisitors/ASTScriptVisitor.java b/src/net/sf/j2s/core/astvisitors/ASTScriptVisitor.java
@@ -2718,8 +2718,10 @@ public void endVisit(TypeDeclaration node) {
 					element.accept(this);
 				}
 			} else if (element instanceof Initializer) {
-				buffer.append(");\r\n");
-				staticCount = -1;
+				if (staticCount != -1) {
+					buffer.append(");\r\n");
+					staticCount = -1;
+				}
 					//buffer.append(",\r\nfunction () {\r\n");
 				element.accept(this);
 				//if (staticCount) {
