diff --git a/devTools/Script to convert SC to JS/SC to JS 1.py b/devTools/Script to convert SC to JS/SC to JS 1.py index 4d29c0fb0f68558f4de0c77f4e4d07a25cd58cf4..383023bf7467df999a2ec571dbd4ef98249f16c0 100644 --- a/devTools/Script to convert SC to JS/SC to JS 1.py +++ b/devTools/Script to convert SC to JS/SC to JS 1.py @@ -45,6 +45,9 @@ editor.rereplace(r"<<default>>", r"default:") editor.rereplace(r"@@\.(.*?);(.*?)@@", r"<span class=\"\1\">\2</span>") editor.rereplace(r"@@\.(.*?);", r"<span class=\"\1\">") editor.rereplace(r"@@", r"</span>") +#remove incompatible comment style +editor.rereplace(r"/%", r"/*") +editor.rereplace(r"%/", r"*/") # JS editor.rereplace(r" == ", r" === ") @@ -89,9 +92,5 @@ editor.rereplace(r"_Hers2", r"\${_Hers2}") editor.rereplace(r"_hers2", r"\${_hers2}") #look for variables embedded in literals -editor.rereplace(r"( r.push[^$]*?[^\{])(V\.[^ ,<'`]*)", r"\1${\2}") -editor.rereplace(r"( r.push[^$]*?[^\{])(slave\.[^ ,<'`]*)", r"\1${\2}") - -#remove incompatible comment style -editor.rereplace(r"/%", r"/*") -editor.rereplace(r"%/", r"*/") \ No newline at end of file +editor.rereplace(r"( r.push[^;$]*?)(V\.[^ ,<'`]*)", r"\1${\2}") +editor.rereplace(r"( r.push[^;$]*?)(slave\.[^ ,<'`]*)", r"\1${\2}") \ No newline at end of file