SHS/pip
4
3
Fork 0
Code Issues 67 Pull Requests 1 Actions Releases Wiki Activity

version 2.93 ready to master

Browse Source 
remove PIString << operators
This commit is contained in:
Пелипенко Иван
2022-06-24 12:10:57 +03:00
parent b66272a68a
commit 1b04d7ecce
19 changed files with 119 additions and 183 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
libs/main/code/picodeparser.cpp
View File

@@ -1050,7 +1050,7 @@ PIString PICodeParser::procMacros(PIString fc) {
if (ifcnt > 0) ifcnt--;
else {
//piCout << "main endif" << skip << grab;
if (grab) pfc << procMacros(nfc);
if (grab) pfc += procMacros(nfc);
skip = grab = false;
continue;
}
@@ -1059,7 +1059,7 @@ PIString PICodeParser::procMacros(PIString fc) {
//piCout << "main elif" << skip << grab << cond_ok;
if (cond_ok) {
if (grab) {
pfc << procMacros(nfc);
pfc += procMacros(nfc);
skip = true; grab = false;
}
continue;
@@ -1075,12 +1075,12 @@ PIString PICodeParser::procMacros(PIString fc) {
}
if (mif.left(4) == s_else && ifcnt == 0) {
//piCout << "main else" << skip << grab;
if (grab) pfc << procMacros(nfc);
if (grab) pfc += procMacros(nfc);
if (skip && !cond_ok) {skip = false; grab = true;}
else {skip = true; grab = false;}
continue;
}
if (grab) nfc << line << '\n';
if (grab) nfc += line + '\n';
continue;
}
if (mif.left(2) == s_if) {
@@ -1095,8 +1095,8 @@ PIString PICodeParser::procMacros(PIString fc) {
//return false; /// WARNING: now skip errors
}
} else {
if (grab) nfc << line << '\n';
else if (!skip) pfc << line << '\n';
if (grab) nfc += line + '\n';
else if (!skip) pfc += line + '\n';
}
}
return pfc;