Fixed bug that the URL part of "str = \"http://...\";" may be treated as inline comment when compressing the generated script

zhourenjian · zhourenjian · commit fd105a9b74a9 · 2009-02-04T16:32:10.000Z
diff --git a/src/net/sf/j2s/core/compiler/RegExCompress.java b/src/net/sf/j2s/core/compiler/RegExCompress.java
@@ -45,7 +45,7 @@ public static String mk(String str, String regex, String replacement) {
 	public static String regexCompress(String str) {
 		String regEx = "('[^\\n\\r]*[^\\\\]')|" + // 1:1
 				"(\"[^\\n\\r]*[^\\\\]\")|" + // 1:2
-				"(\\/\\/[^\\n\\r]*[\\n\\r])|" + // 1:3 // line comments
+				"(\\/\\/[^\\n\\r]*$)|" + // 1:3 // line comments
 				"(\\/\\*[^*]*\\*+([^\\/][^*]*\\*+)*\\/)|" + // 2:4,5 // block comments
 				"(\\s+(\\/[^\\/\\n\\r\\*][^\\/\\n\\r]*\\/[gim]*))|" + // 2:6,7 // regular expression
 				"([^\\w\\x24\\/'\"*)\\?:]\\/[^\\/\\n\\r\\*][^\\/\\n\\r]*\\/[gim]*)"; // 1:8 // regular expression 
@@ -61,7 +61,7 @@ public static String regexCompress2(String str) {
 		String whiteSpace = "[ \\f\\t\\v]";
 		String regEx = "('[^\\n\\r]*[^\\\\]')|" + // 1:1
 				"(\"[^\\n\\r]*[^\\\\]\")|" + // 1:2
-				"(\\/\\/[^\\n\\r]*[\\n\\r])|" + // 1:3 // line comments
+				"(\\/\\/[^\\n\\r]*$)|" + // 1:3 // line comments
 				"(\\/\\*[^*]*\\*+([^\\/][^*]*\\*+)*\\/)|" + // 2:4,5 // block comments
 				"(" + whiteSpace + "+(\\/[^\\/\\n\\r\\*][^\\/\\n\\r]*\\/[gim]*))|" + // 2:6,7 // regular expression
 				"([^\\w\\x24\\/'\"*)\\?:]\\/[^\\/\\n\\r\\*][^\\/\\n\\r]*\\/[gim]*)"; // 1:8 // regular expression 
