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

zhourenjian · zhourenjian · commit 99d6bb83e502 · 2009-02-04T16:32:10.000Z
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
@@ -100,7 +100,7 @@ private static void pack(File src, File dest, boolean completelyCompress) throws
 	public static String regexCompress(String str) {
 		String regEx = "('[^\\n\\r]*[^\\\\]')|" + // 1:1
 				"(\"[^\\n\\r]*[^\\\\]\")|" + // 1:2
-				"(\\/\\/[^\\n\\r]*[\\n\\r])|" + // 1:3
+				"(\\/\\/[^\\n\\r]*$)|" + // 1:3
 				"(\\/\\*[^*]*\\*+([^\\/][^*]*\\*+)*\\/)|" + // 2:4,5
 				"(\\s+(\\/[^\\/\\n\\r\\*][^\\/\\n\\r]*\\/[gim]*))|" + // 2:6,7
 				"([^\\w\\x24\\/'\"*)\\?:]\\/[^\\/\\n\\r\\*][^\\/\\n\\r]*\\/[gim]*)"; // 1:8
@@ -116,7 +116,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 
