From 80288a034080b9eef4948feeb42657492dc3af0e Mon Sep 17 00:00:00 2001 From: Strangerke Date: Wed, 15 May 2024 23:38:23 +0100 Subject: [PATCH] BAGEL: standardize parse code variable name --- engines/bagel/baglib/button_object.cpp | 6 ++--- engines/bagel/baglib/character_object.cpp | 6 ++--- engines/bagel/baglib/command_object.cpp | 6 ++--- engines/bagel/baglib/dossier_object.cpp | 6 ++--- engines/bagel/baglib/expression.cpp | 14 ++++++------ engines/bagel/baglib/expression_object.cpp | 13 +++++------ engines/bagel/baglib/link_object.cpp | 16 ++++++------- engines/bagel/baglib/log_msg.cpp | 24 ++++++++++---------- engines/bagel/baglib/movie_object.cpp | 6 ++--- engines/bagel/baglib/object.cpp | 24 ++++++++++---------- engines/bagel/baglib/rp_object.cpp | 8 +++---- engines/bagel/baglib/sound_object.cpp | 6 ++--- engines/bagel/baglib/sprite_object.cpp | 6 ++--- engines/bagel/baglib/text_object.cpp | 6 ++--- engines/bagel/baglib/time_object.cpp | 8 +++---- engines/bagel/baglib/variable_object.cpp | 26 ++++++++++++---------- 16 files changed, 91 insertions(+), 90 deletions(-) diff --git a/engines/bagel/baglib/button_object.cpp b/engines/bagel/baglib/button_object.cpp index 470c2cc969d..e0abf1a9622 100644 --- a/engines/bagel/baglib/button_object.cpp +++ b/engines/bagel/baglib/button_object.cpp @@ -433,12 +433,12 @@ ParseCodes CBagButtonObject::setInfo(CBagIfstream &istr) { // No match return from function // default: { - ParseCodes rc = CBagObject::setInfo(istr); - if (rc == PARSING_DONE) { + ParseCodes parseCode = CBagObject::setInfo(istr); + if (parseCode == PARSING_DONE) { return PARSING_DONE; } - if (rc == UPDATED_OBJECT) { + if (parseCode == UPDATED_OBJECT) { nObjectUpdated = true; } else { // rc==UNKNOWN_TOKEN if (nObjectUpdated) diff --git a/engines/bagel/baglib/character_object.cpp b/engines/bagel/baglib/character_object.cpp index 15408ffdbfd..d1b3bd6de43 100644 --- a/engines/bagel/baglib/character_object.cpp +++ b/engines/bagel/baglib/character_object.cpp @@ -498,12 +498,12 @@ ParseCodes CBagCharacterObject::setInfo(CBagIfstream &istr) { // No match return from function default: { - ParseCodes rc = CBagObject::setInfo(istr); - if (rc == PARSING_DONE) { + ParseCodes parseCode = CBagObject::setInfo(istr); + if (parseCode == PARSING_DONE) { return PARSING_DONE; } - if (rc == UPDATED_OBJECT) { + if (parseCode == UPDATED_OBJECT) { objectUpdatedFl = true; } else { // rc==UNKNOWN_TOKEN if (objectUpdatedFl) diff --git a/engines/bagel/baglib/command_object.cpp b/engines/bagel/baglib/command_object.cpp index a5e326e3232..c05e5eccc76 100644 --- a/engines/bagel/baglib/command_object.cpp +++ b/engines/bagel/baglib/command_object.cpp @@ -465,12 +465,12 @@ ParseCodes CBagCommandObject::setInfo(CBagIfstream &istr) { // No match return from function // default: { - ParseCodes rc = CBagObject::setInfo(istr); - if (rc == PARSING_DONE) { + ParseCodes parseCode = CBagObject::setInfo(istr); + if (parseCode == PARSING_DONE) { return PARSING_DONE; } - if (rc == UPDATED_OBJECT) { + if (parseCode == UPDATED_OBJECT) { objectUpdatedFl = true; } else { // rc==UNKNOWN_TOKEN if (objectUpdatedFl) diff --git a/engines/bagel/baglib/dossier_object.cpp b/engines/bagel/baglib/dossier_object.cpp index 7ff8046ad80..da01361b587 100644 --- a/engines/bagel/baglib/dossier_object.cpp +++ b/engines/bagel/baglib/dossier_object.cpp @@ -199,12 +199,12 @@ ParseCodes CBagDossierObject::setInfo(CBagIfstream &istr) { // no match return from function // default: - ParseCodes rc = CBagObject::setInfo(istr); - if (rc == PARSING_DONE) { + ParseCodes parseCode = CBagObject::setInfo(istr); + if (parseCode == PARSING_DONE) { return PARSING_DONE; } - if (rc == UPDATED_OBJECT) { + if (parseCode == UPDATED_OBJECT) { objectUpdatedFl = true; } else { // rc==UNKNOWN_TOKEN if (objectUpdatedFl) diff --git a/engines/bagel/baglib/expression.cpp b/engines/bagel/baglib/expression.cpp index da6cfab671a..126251fdb1a 100644 --- a/engines/bagel/baglib/expression.cpp +++ b/engines/bagel/baglib/expression.cpp @@ -568,10 +568,10 @@ ParseCodes CBagExpression::setInfo(CBagIfstream &istr) { // CHECKME: Should we put this string in a debugC at the end of the function? (Currently unused) CBofString errStr(errBuffer, 256); - ParseCodes rc = PARSING_DONE; + ParseCodes parseCode = PARSING_DONE; bool doneFl = false; - while (!doneFl && rc == PARSING_DONE) { + while (!doneFl && parseCode == PARSING_DONE) { istr.eatWhite(); int ch = istr.peek(); switch (ch) { @@ -599,11 +599,11 @@ ParseCodes CBagExpression::setInfo(CBagIfstream &istr) { istr.eatWhite(); ch = istr.peek(); - while ((ch != ')') && rc == PARSING_DONE) { + while ((ch != ')') && parseCode == PARSING_DONE) { OPERATION curOper; getOperatorFromStream(istr, curOper); if (curOper == OP_NONE) { - rc = UNKNOWN_TOKEN; + parseCode = UNKNOWN_TOKEN; errStr = "Bad operator:"; break; } @@ -649,18 +649,18 @@ ParseCodes CBagExpression::setInfo(CBagIfstream &istr) { // FIXME: Is this intentional? // fallthrough default: - rc = UNKNOWN_TOKEN; + parseCode = UNKNOWN_TOKEN; break; } } - if (rc != PARSING_DONE) { + if (parseCode != PARSING_DONE) { parseAlertBox(istr, "Error in expression:", __FILE__, __LINE__); } istr.eatWhite(); - return rc; + return parseCode; } diff --git a/engines/bagel/baglib/expression_object.cpp b/engines/bagel/baglib/expression_object.cpp index 1ae52881f7b..72aead0de45 100644 --- a/engines/bagel/baglib/expression_object.cpp +++ b/engines/bagel/baglib/expression_object.cpp @@ -35,10 +35,9 @@ CBagExpressionObject::CBagExpressionObject() : CBagObject() { } CBagExpressionObject::~CBagExpressionObject() { - if (_expression != nullptr) { - delete _expression; - _expression = nullptr; - } + delete _expression; + _expression = nullptr; + CBagObject::detach(); } @@ -92,12 +91,12 @@ ParseCodes CBagExpressionObject::setInfo(CBagIfstream &istr) { // No match return from function // default: { - ParseCodes rc = CBagObject::setInfo(istr); - if (rc == PARSING_DONE) { + ParseCodes parseCode = CBagObject::setInfo(istr); + if (parseCode == PARSING_DONE) { return PARSING_DONE; } - if (rc == UPDATED_OBJECT) { + if (parseCode == UPDATED_OBJECT) { objectUpdatedFl = true; } else { // rc==UNKNOWN_TOKEN if (objectUpdatedFl) diff --git a/engines/bagel/baglib/link_object.cpp b/engines/bagel/baglib/link_object.cpp index 422a2639403..8ff3201901c 100644 --- a/engines/bagel/baglib/link_object.cpp +++ b/engines/bagel/baglib/link_object.cpp @@ -52,7 +52,7 @@ CBofRect CBagLinkObject::getRect() { ParseCodes CBagLinkObject::setInfo(CBagIfstream &istr) { bool objectUpdatedFl = false; - ParseCodes parsingCode = PARSING_DONE; + ParseCodes returnCode = PARSING_DONE; bool doneFl = false; while (!doneFl && !istr.eof()) { @@ -134,20 +134,20 @@ ParseCodes CBagLinkObject::setInfo(CBagIfstream &istr) { // No match return from function // default: { - ParseCodes rc = CBagObject::setInfo(istr); + ParseCodes parseCode = CBagObject::setInfo(istr); - if (rc == PARSING_DONE) { - parsingCode = PARSING_DONE; + if (parseCode == PARSING_DONE) { + returnCode = PARSING_DONE; doneFl = true; - } else if (rc == UPDATED_OBJECT) { + } else if (parseCode == UPDATED_OBJECT) { objectUpdatedFl = true; } else { // rc==UNKNOWN_TOKEN if (objectUpdatedFl) - parsingCode = UPDATED_OBJECT; + returnCode = UPDATED_OBJECT; else - parsingCode = UNKNOWN_TOKEN; + returnCode = UNKNOWN_TOKEN; doneFl = true; } @@ -156,7 +156,7 @@ ParseCodes CBagLinkObject::setInfo(CBagIfstream &istr) { } } - return parsingCode; + return returnCode; } diff --git a/engines/bagel/baglib/log_msg.cpp b/engines/bagel/baglib/log_msg.cpp index 9118477947e..da740dc9a70 100644 --- a/engines/bagel/baglib/log_msg.cpp +++ b/engines/bagel/baglib/log_msg.cpp @@ -486,12 +486,12 @@ ParseCodes CBagLogMsg::setInfo(CBagIfstream &istr) { } default: { - ParseCodes rc = CBagObject::setInfo(istr); - if (rc == PARSING_DONE) { + ParseCodes parseCode = CBagObject::setInfo(istr); + if (parseCode == PARSING_DONE) { return PARSING_DONE; } - if (rc == UPDATED_OBJECT) { + if (parseCode == UPDATED_OBJECT) { nObjectUpdated = true; } else { // rc==UNKNOWN_TOKEN if (nObjectUpdated) @@ -634,12 +634,12 @@ ParseCodes CBagLogSuspect::setInfo(CBagIfstream &istr) { } default: { - ParseCodes rc = CBagObject::setInfo(istr); - if (rc == PARSING_DONE) { + ParseCodes parseCode = CBagObject::setInfo(istr); + if (parseCode == PARSING_DONE) { return PARSING_DONE; } - if (rc == UPDATED_OBJECT) { + if (parseCode == UPDATED_OBJECT) { objectUpdatedFl = true; } else { // rc==UNKNOWN_TOKEN if (objectUpdatedFl) @@ -871,12 +871,12 @@ ParseCodes CBagEnergyDetectorObject::setInfo(CBagIfstream &istr) { } default: { - ParseCodes rc = CBagObject::setInfo(istr); - if (rc == PARSING_DONE) { + ParseCodes parseCode = CBagObject::setInfo(istr); + if (parseCode == PARSING_DONE) { return PARSING_DONE; } - if (rc == UPDATED_OBJECT) { + if (parseCode == UPDATED_OBJECT) { objectUpdatedFl = true; } else { // rc==UNKNOWN_TOKEN if (objectUpdatedFl) @@ -1043,12 +1043,12 @@ ParseCodes CBagLogClue::setInfo(CBagIfstream &istr) { } default: { - ParseCodes rc = CBagObject::setInfo(istr); - if (rc == PARSING_DONE) { + ParseCodes parseCode = CBagObject::setInfo(istr); + if (parseCode == PARSING_DONE) { return PARSING_DONE; } - if (rc == UPDATED_OBJECT) { + if (parseCode == UPDATED_OBJECT) { nObjectUpdated = true; } else { // rc==UNKNOWN_TOKEN if (nObjectUpdated) diff --git a/engines/bagel/baglib/movie_object.cpp b/engines/bagel/baglib/movie_object.cpp index 017f4d68e66..832ce8a5ed9 100644 --- a/engines/bagel/baglib/movie_object.cpp +++ b/engines/bagel/baglib/movie_object.cpp @@ -493,12 +493,12 @@ ParseCodes CBagMovieObject::setInfo(CBagIfstream &istr) { // No match return from funtion // default: { - ParseCodes rc = CBagObject::setInfo(istr); - if (rc == PARSING_DONE) { + ParseCodes parseCode = CBagObject::setInfo(istr); + if (parseCode == PARSING_DONE) { return PARSING_DONE; } - if (rc == UPDATED_OBJECT) { + if (parseCode == UPDATED_OBJECT) { nObjectUpdated = true; } else { // rc==UNKNOWN_TOKEN if (nObjectUpdated) diff --git a/engines/bagel/baglib/object.cpp b/engines/bagel/baglib/object.cpp index f5b98e91a82..12baae72f09 100644 --- a/engines/bagel/baglib/object.cpp +++ b/engines/bagel/baglib/object.cpp @@ -161,7 +161,7 @@ bool CBagObject::runObject() { } ParseCodes CBagObject::setInfo(CBagIfstream &istr) { - ParseCodes rc = UNKNOWN_TOKEN; + ParseCodes parseCode = UNKNOWN_TOKEN; while (!istr.eof()) { istr.eatWhite(); @@ -171,7 +171,7 @@ ParseCodes CBagObject::setInfo(CBagIfstream &istr) { // =filename.ext // case '=': { - rc = UPDATED_OBJECT; + parseCode = UPDATED_OBJECT; char szLocalBuff[256]; szLocalBuff[0] = 0; CBofString s(szLocalBuff, 256); @@ -184,7 +184,7 @@ ParseCodes CBagObject::setInfo(CBagIfstream &istr) { // { menu objects .... } - Add menu items // case '{': { - rc = UPDATED_OBJECT; + parseCode = UPDATED_OBJECT; if (!_pMenu) { _pMenu = new CBagMenu; if (_pMenu == nullptr) @@ -209,7 +209,7 @@ ParseCodes CBagObject::setInfo(CBagIfstream &istr) { // ^id; - Set id // case '^': { - rc = UPDATED_OBJECT; + parseCode = UPDATED_OBJECT; char c = (char)istr.peek(); if (Common::isDigit(c)) { int nId; @@ -228,7 +228,7 @@ ParseCodes CBagObject::setInfo(CBagIfstream &istr) { // *state; - Set state // case '*': { - rc = UPDATED_OBJECT; + parseCode = UPDATED_OBJECT; int nState; getIntFromStream(istr, nState); setState(nState); @@ -238,7 +238,7 @@ ParseCodes CBagObject::setInfo(CBagIfstream &istr) { // %cusror; - Set cursor // case '%': { - rc = UPDATED_OBJECT; + parseCode = UPDATED_OBJECT; int nCursor; getIntFromStream(istr, nCursor); setOverCursor(nCursor); @@ -248,7 +248,7 @@ ParseCodes CBagObject::setInfo(CBagIfstream &istr) { // [left,top,right,bottom] - Set position // case '[': { - rc = UPDATED_OBJECT; + parseCode = UPDATED_OBJECT; CBofRect r; istr.putBack(); getRectFromStream(istr, r); @@ -263,7 +263,7 @@ ParseCodes CBagObject::setInfo(CBagIfstream &istr) { case 'I': { if (istr.peek() != 'S') { istr.putBack(); - return rc; + return parseCode; break; } char szLocalBuff[256]; @@ -314,10 +314,10 @@ ParseCodes CBagObject::setInfo(CBagIfstream &istr) { if (!b) putbackStringOnStream(istr, " NOT "); putbackStringOnStream(istr, "IS "); - return rc; + return parseCode; break; } - rc = UPDATED_OBJECT; + parseCode = UPDATED_OBJECT; break; } // @@ -332,11 +332,11 @@ ParseCodes CBagObject::setInfo(CBagIfstream &istr) { // default: istr.putBack(); - return rc; + return parseCode; } } - return rc; + return parseCode; } void CBagObject::onLButtonUp(uint32 nFlags, CBofPoint * /*xPoint*/, void *) { diff --git a/engines/bagel/baglib/rp_object.cpp b/engines/bagel/baglib/rp_object.cpp index 39e0caa3b97..7d4d1af04e1 100644 --- a/engines/bagel/baglib/rp_object.cpp +++ b/engines/bagel/baglib/rp_object.cpp @@ -359,7 +359,7 @@ ParseCodes CBagRPObject::setInfo(CBagIfstream &istr) { // complain violently. if (_pVarObj == nullptr) { reportError(ERR_UNKNOWN, "Invalid Residue Print Variable=%s", - sStr.getBuffer()); + sStr.getBuffer()); return UNKNOWN_TOKEN; } } else { @@ -369,12 +369,12 @@ ParseCodes CBagRPObject::setInfo(CBagIfstream &istr) { break; default: { - ParseCodes rc; - if ((rc = CBagObject::setInfo(istr)) == PARSING_DONE) { + ParseCodes parseCode = CBagObject::setInfo(istr); + if (parseCode == PARSING_DONE) { return PARSING_DONE; } - if (rc == UPDATED_OBJECT) { + if (parseCode == UPDATED_OBJECT) { nObjectUpdated = true; } else { // rc==UNKNOWN_TOKEN if (nObjectUpdated) diff --git a/engines/bagel/baglib/sound_object.cpp b/engines/bagel/baglib/sound_object.cpp index b97b9899ef3..004a3b04032 100644 --- a/engines/bagel/baglib/sound_object.cpp +++ b/engines/bagel/baglib/sound_object.cpp @@ -282,12 +282,12 @@ ParseCodes CBagSoundObject::setInfo(CBagIfstream &istr) { // No match return from function // default: { - ParseCodes rc = CBagObject::setInfo(istr); - if (rc == PARSING_DONE) { + ParseCodes parseCode = CBagObject::setInfo(istr); + if (parseCode == PARSING_DONE) { return PARSING_DONE; } - if (rc == UPDATED_OBJECT) { + if (parseCode == UPDATED_OBJECT) { nObjectUpdated = true; } else { // rc==UNKNOWN_TOKEN if (nObjectUpdated) diff --git a/engines/bagel/baglib/sprite_object.cpp b/engines/bagel/baglib/sprite_object.cpp index 3d4eb3e5ede..03c4dcf4e62 100644 --- a/engines/bagel/baglib/sprite_object.cpp +++ b/engines/bagel/baglib/sprite_object.cpp @@ -189,12 +189,12 @@ ParseCodes CBagSpriteObject::setInfo(CBagIfstream &istr) { // no match return from function // default: { - ParseCodes rc = CBagObject::setInfo(istr); - if (rc == PARSING_DONE) { + ParseCodes parseCode = CBagObject::setInfo(istr); + if (parseCode == PARSING_DONE) { return PARSING_DONE; } - if (rc == UPDATED_OBJECT) { + if (parseCode == UPDATED_OBJECT) { nObjectUpdated = true; } else { // rc==UNKNOWN_TOKEN if (nObjectUpdated) diff --git a/engines/bagel/baglib/text_object.cpp b/engines/bagel/baglib/text_object.cpp index 3ac64fd7032..8393b2bdff6 100644 --- a/engines/bagel/baglib/text_object.cpp +++ b/engines/bagel/baglib/text_object.cpp @@ -370,12 +370,12 @@ ParseCodes CBagTextObject::setInfo(CBagIfstream &istr) { // No match return from function // default: { - ParseCodes rc; - if ((rc = CBagObject::setInfo(istr)) == PARSING_DONE) { + ParseCodes parseCode = CBagObject::setInfo(istr); + if (parseCode == PARSING_DONE) { return PARSING_DONE; } - if (rc == UPDATED_OBJECT) { + if (parseCode == UPDATED_OBJECT) { nObjectUpdated = true; } else { // rc==UNKNOWN_TOKEN if (nObjectUpdated) diff --git a/engines/bagel/baglib/time_object.cpp b/engines/bagel/baglib/time_object.cpp index 5cc820ce51e..58ae49df2e3 100644 --- a/engines/bagel/baglib/time_object.cpp +++ b/engines/bagel/baglib/time_object.cpp @@ -208,14 +208,14 @@ ParseCodes CBagTimeObject::setInfo(CBagIfstream &istr) { break; } - // No match return from funtion + // No match return from function default: { - ParseCodes rc = CBagObject::setInfo(istr); - if (rc == PARSING_DONE) { + ParseCodes parseCode = CBagObject::setInfo(istr); + if (parseCode == PARSING_DONE) { return PARSING_DONE; } - if (rc == UPDATED_OBJECT) { + if (parseCode == UPDATED_OBJECT) { nObjectUpdated = true; } else { // rc==UNKNOWN_TOKEN diff --git a/engines/bagel/baglib/variable_object.cpp b/engines/bagel/baglib/variable_object.cpp index a22ecf709e4..7b5bb0f9b20 100644 --- a/engines/bagel/baglib/variable_object.cpp +++ b/engines/bagel/baglib/variable_object.cpp @@ -62,21 +62,21 @@ CBofRect CBagVariableObject::getRect() { // without the relevant info. ParseCodes CBagVariableObject::setInfo(CBagIfstream &istr) { bool nObjectUpdated = false; - char ch; while (!istr.eof()) { int nChanged = 0; istr.eatWhite(); - switch (ch = (char)istr.peek()) { + char ch = (char)istr.peek(); + switch (ch) { // // SIZE n - n point size of the txt // case 'S': { char szLocalStr[256]; szLocalStr[0] = 0; - CBofString sStr(szLocalStr, 256); // jwl 08.28.96 performance improvement + CBofString sStr(szLocalStr, 256); getAlphaNumFromStream(istr, sStr); @@ -97,7 +97,7 @@ ParseCodes CBagVariableObject::setInfo(CBagIfstream &istr) { case 'C': { char szLocalStr[256]; szLocalStr[0] = 0; - CBofString sStr(szLocalStr, 256); // jwl 08.28.96 performance improvement + CBofString sStr(szLocalStr, 256); getAlphaNumFromStream(istr, sStr); @@ -108,12 +108,12 @@ ParseCodes CBagVariableObject::setInfo(CBagIfstream &istr) { switch (nColor) { case 0: _nFGColor = RGB(0, 0, 0); break; // black case 1: _nFGColor = RGB(255, 0, 0); break; - case 2: _nFGColor = CTEXT_YELLOW; break; // yellow + case 2: _nFGColor = CTEXT_YELLOW; break; case 3: _nFGColor = RGB(0, 255, 0); break; case 4: _nFGColor = RGB(0, 255, 255); break; case 5: _nFGColor = RGB(0, 0, 255); break; case 6: _nFGColor = RGB(255, 0, 255); break; - case 7: _nFGColor = CTEXT_WHITE; break; // white + case 7: _nFGColor = CTEXT_WHITE; break; default: break; } @@ -126,19 +126,21 @@ ParseCodes CBagVariableObject::setInfo(CBagIfstream &istr) { } // - // No match return from funtion + // No match return from function // default: - ParseCodes rc; - if ((rc = CBagObject::setInfo(istr)) == PARSING_DONE) { + ParseCodes parseCode = CBagObject::setInfo(istr); + if (parseCode == PARSING_DONE) { return PARSING_DONE; - } else if (rc == UPDATED_OBJECT) { + } + + if (parseCode == UPDATED_OBJECT) { nObjectUpdated = true; } else if (!nChanged) { if (nObjectUpdated) return UPDATED_OBJECT; - else - return UNKNOWN_TOKEN; + + return UNKNOWN_TOKEN; } break; }