Fixed bug that compress JavaScript introduce unexpected "@324@();" for

zhourenjian · zhourenjian · commit 8898da6d2791 · 2015-12-31T00:55:44.000+08:00
SWT projects
diff --git a/sources/net.sf.j2s.core/src/net/sf/j2s/core/compiler/RegExCompress.java b/sources/net.sf.j2s.core/src/net/sf/j2s/core/compiler/RegExCompress.java
@@ -59,7 +59,8 @@ public static String regexCompress(String str) {
 				break;
 			}
 		}
-		String specialFunKey = "@324@();\r\n";
+		//String specialFunKey = "@324@();\r\n";
+		String specialFunKey = "@324@();";
 		if (ignoreCSS) {
 			cssCodes = str.substring(idx1, idx2);
 			str = str.substring(0, idx1) + specialFunKey + str.substring(idx2);
@@ -103,7 +104,8 @@ public static String regexCompress2(String str) {
 				break;
 			}
 		}
-		String specialFunKey = "@324@();\r\n";
+		//String specialFunKey = "@324@();\r\n";
+		String specialFunKey = "@324@();";
 		if (ignoreCSS) {
 			cssCodes = str.substring(idx1, idx2);
 			str = str.substring(0, idx1) + specialFunKey + str.substring(idx2);
diff --git a/sources/net.sf.j2s.lib/src/net/sf/j2s/lib/build/RegExCompress.java b/sources/net.sf.j2s.lib/src/net/sf/j2s/lib/build/RegExCompress.java
@@ -158,7 +158,8 @@ public static String regexCompress2(String str) {
 				break;
 			}
 		}
-		String specialFunKey = "@324@();\r\n";
+		//String specialFunKey = "@324@();\r\n";
+		String specialFunKey = "@324@();";
 		if (ignoreCSS) {
 			cssCodes = str.substring(idx1, idx2);
 			str = str.substring(0, idx1) + specialFunKey + str.substring(idx2);

Original file line number	Diff line number	Diff line change
`@@ -59,7 +59,8 @@ public static String regexCompress(String str) {`
`59`	`59`	`break;`
`60`	`60`	`}`
`61`	`61`	`}`
`62`		`- String specialFunKey = "@324@();\r\n";`
	`62`	`+ //String specialFunKey = "@324@();\r\n";`
	`63`	`+ String specialFunKey = "@324@();";`
`63`	`64`	`if (ignoreCSS) {`
`64`	`65`	`cssCodes = str.substring(idx1, idx2);`
`65`	`66`	`str = str.substring(0, idx1) + specialFunKey + str.substring(idx2);`
`@@ -103,7 +104,8 @@ public static String regexCompress2(String str) {`
`103`	`104`	`break;`
`104`	`105`	`}`
`105`	`106`	`}`
`106`		`- String specialFunKey = "@324@();\r\n";`
	`107`	`+ //String specialFunKey = "@324@();\r\n";`
	`108`	`+ String specialFunKey = "@324@();";`
`107`	`109`	`if (ignoreCSS) {`
`108`	`110`	`cssCodes = str.substring(idx1, idx2);`
`109`	`111`	`str = str.substring(0, idx1) + specialFunKey + str.substring(idx2);`
Original file line number	Diff line number	Diff line change
`@@ -158,7 +158,8 @@ public static String regexCompress2(String str) {`
`158`	`158`	`break;`
`159`	`159`	`}`
`160`	`160`	`}`
`161`		`- String specialFunKey = "@324@();\r\n";`
	`161`	`+ //String specialFunKey = "@324@();\r\n";`
	`162`	`+ String specialFunKey = "@324@();";`
`162`	`163`	`if (ignoreCSS) {`
`163`	`164`	`cssCodes = str.substring(idx1, idx2);`
`164`	`165`	`str = str.substring(0, idx1) + specialFunKey + str.substring(idx2);`