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 f1b1ea52e3170987e001fc82d1de238269efb972..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 @@ -32,11 +32,6 @@ editor.rereplace(r"([ \n])else if ([^\(].*) {", r"\1 else if \(\2\) {") # run can happen directly editor.rereplace(r"<<run (.*?)>>", r"\1;") -# Set: If it uses "=" let's assume we should let and clean up later -editor.rereplace(r"<<set (.*? =.*?)>>", r"let $1;") -editor.rereplace(r"let (slave\.)", r"$1") -editor.rereplace(r"let (V\.)", r"$1") - # Set: otherwise we are likely modifying the value editor.rereplace(r"<<set (.*?)>>", r"$1;") @@ -50,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" === ") @@ -94,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