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 ddece0976db593759b9d43e04e843f87ebe6511e..f1b1ea52e3170987e001fc82d1de238269efb972 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 @@ -9,14 +9,14 @@ editor.rereplace(r"\$slaves\[\$i\]", r"slave") # Update all references editor.rereplace(r"\$", r"V\.") -# Clean up print -editor.rereplace(r"<<print (.*)>>", r"${\1}") -editor.rereplace(r"<<= (.*?)>>", r"${\1}") - # Line breaks for embedded code, beautify later editor.rereplace(r"([a-zA-Z@].*?)<<", r"$1\n<<") editor.rereplace(r">>([a-zA-Z,\.@ ].*?)", r">>\n\t$1") +# Clean up print +editor.rereplace(r"<<print (.*)>>", r"V.\1") +editor.rereplace(r"<<= (.*?)>>", r"V\.\1") + # Raw text editor.rereplace(r" ([a-zA-Z@\.,`'; ].*)", r" r.push\(`\1`\);") @@ -94,8 +94,8 @@ 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}") +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"/*")