Merging /trunk to [172]

jossonsmith · jossonsmith · commit 31882c3442f0 · 2006-07-12T04:54:27.000Z
Patching for [ 1520912 ] Fix for 1520494 - bitwise operators
diff --git a/src/net/sf/j2s/core/astvisitors/ASTKeywordParser.java b/src/net/sf/j2s/core/astvisitors/ASTKeywordParser.java
@@ -563,6 +563,7 @@ public boolean visit(Assignment node) {
 						right.accept(this);
 						buffer.append(')');
 					}
+					buffer.append(".valueOf ()");
 					return false;
 				}
 			} else if ("char".equals(typeBinding.getName())) {
@@ -1226,7 +1227,7 @@ public boolean visit(InfixExpression node) {
 			}
 		}
 		if (simple) {
-			buffer.append(')');
+			buffer.append(").valueOf ()");
 		}
 		return false;
 	}
@@ -1328,7 +1329,13 @@ public boolean visit(PackageDeclaration node) {
 	}
 
 	protected String[] skipDeclarePackages() {
-		return new String[] {"java.lang"};
+		return new String[] {
+				"java.lang", 
+				"java.lang.ref", 
+				"java.lang.ref.reflect", 
+				"java.lang.reflect", 
+				"java.io", 
+				"java.util"};
 	}
 
 	public void endVisit(ParenthesizedExpression node) {

Original file line number	Diff line number	Diff line change
`@@ -563,6 +563,7 @@ public boolean visit(Assignment node) {`
`563`	`563`	`right.accept(this);`
`564`	`564`	`buffer.append(')');`
`565`	`565`	`}`
	`566`	`+ buffer.append(".valueOf ()");`
`566`	`567`	`return false;`
`567`	`568`	`}`
`568`	`569`	`} else if ("char".equals(typeBinding.getName())) {`
`@@ -1226,7 +1227,7 @@ public boolean visit(InfixExpression node) {`
`1226`	`1227`	`}`
`1227`	`1228`	`}`
`1228`	`1229`	`if (simple) {`
`1229`		`- buffer.append(')');`
	`1230`	`+ buffer.append(").valueOf ()");`
`1230`	`1231`	`}`
`1231`	`1232`	`return false;`
`1232`	`1233`	`}`
`@@ -1328,7 +1329,13 @@ public boolean visit(PackageDeclaration node) {`
`1328`	`1329`	`}`
`1329`	`1330`
`1330`	`1331`	`protected String[] skipDeclarePackages() {`
`1331`		`- return new String[] {"java.lang"};`
	`1332`	`+ return new String[] {`
	`1333`	`+ "java.lang",`
	`1334`	`+ "java.lang.ref",`
	`1335`	`+ "java.lang.ref.reflect",`
	`1336`	`+ "java.lang.reflect",`
	`1337`	`+ "java.io",`
	`1338`	`+ "java.util"};`
`1332`	`1339`	`}`
`1333`	`1340`
`1334`	`1341`	`public void endVisit(ParenthesizedExpression node) {`