immibis
/
colobot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update CBotFieldExpr::ProtectionError docs

dev-new-models
krzys-h 2016-09-24 17:04:47 +02:00
parent 81aae35565
commit ca548e2902
6 changed files with 21 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/CBot/CBotInstr/CBotExprRetVar.cpp
View File

@ -110,7 +110,7 @@ CBotInstr* CBotExprRetVar::Compile(CBotToken*& p, CBotCStack* pStack, bool bMeth
if (var != nullptr) if (var != nullptr)
{ {
i->SetUniqNum(var->GetUniqNum()); i->SetUniqNum(var->GetUniqNum());
if (CBotFieldExpr::ProtectionError(pStk, preVar, var)) if (CBotFieldExpr::CheckProtectionError(pStk, preVar, var))
{ {
pStk->SetError(CBotErrPrivate, pp); pStk->SetError(CBotErrPrivate, pp);
goto err; goto err;

4
src/CBot/CBotInstr/CBotExprVar.cpp
View File

@ -67,7 +67,7 @@ CBotInstr* CBotExprVar::Compile(CBotToken*& p, CBotCStack* pStack, CBotVar::Prot
if (ident > 0 && ident < 9000) if (ident > 0 && ident < 9000)
{ {
if (CBotFieldExpr::ProtectionError(pStk, nullptr, var, privat)) if (CBotFieldExpr::CheckProtectionError(pStk, nullptr, var, privat))
{ {
pStk->SetError(CBotErrPrivate, p); pStk->SetError(CBotErrPrivate, p);
goto err; goto err;
@ -137,7 +137,7 @@ CBotInstr* CBotExprVar::Compile(CBotToken*& p, CBotCStack* pStack, CBotVar::Prot
if (var != nullptr) if (var != nullptr)
{ {
i->SetUniqNum(var->GetUniqNum()); i->SetUniqNum(var->GetUniqNum());
if (CBotFieldExpr::ProtectionError(pStk, preVar, var, privat)) if (CBotFieldExpr::CheckProtectionError(pStk, preVar, var, privat))
{ {
pStk->SetError(CBotErrPrivate, pp); pStk->SetError(CBotErrPrivate, pp);
goto err; goto err;

4
src/CBot/CBotInstr/CBotFieldExpr.cpp
View File

@ -135,8 +135,8 @@ std::string CBotFieldExpr::GetDebugData()
} }
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
bool CBotFieldExpr::ProtectionError(CBotCStack* pStack, CBotVar* pPrev, CBotVar* pVar, bool CBotFieldExpr::CheckProtectionError(CBotCStack* pStack, CBotVar* pPrev, CBotVar* pVar,
CBotVar::ProtectionLevel privat) CBotVar::ProtectionLevel privat)
{ {
CBotVar::ProtectionLevel varPriv = pVar->GetPrivate(); CBotVar::ProtectionLevel varPriv = pVar->GetPrivate();

20
src/CBot/CBotInstr/CBotFieldExpr.h
View File

@ -66,15 +66,19 @@ public:
void RestoreStateVar(CBotStack* &pj, bool bMain) override; void RestoreStateVar(CBotStack* &pj, bool bMain) override;
/*! /*!
* \brief ProtectionError Test if access to a variable is not allowed. * \brief Check if access to a variable is allowed or not depending on public/private/protected setting
* \param pStack *
* \param pPrev * If this function returns true, the caller is responsible for failing the compilation with ::CBotErrPrivate error.
* \param pVar * This function doesn't set the error flag itself.
* \param privat *
* \return True if pVar is protected in the current context. * \param pStack Current compilation stack frame
* \param pPrev Class instance which variable to check is part of, or nullptr if not part of a class
* \param pVar Variable to check
* \param privat CBotVar::ProtectionLevel::ReadOnly if requesting read-only access, anything else otherwise
* \return true if pVar is inaccessible in the current context, false if access should be allowed
*/ */
static bool ProtectionError(CBotCStack* pStack, CBotVar* pPrev, CBotVar* pVar, static bool CheckProtectionError(CBotCStack* pStack, CBotVar* pPrev, CBotVar* pVar,
CBotVar::ProtectionLevel privat = CBotVar::ProtectionLevel::Protected); CBotVar::ProtectionLevel privat = CBotVar::ProtectionLevel::Protected);
protected: protected:
virtual const std::string GetDebugName() override { return "CBotFieldExpr"; } virtual const std::string GetDebugName() override { return "CBotFieldExpr"; }

5
src/CBot/CBotInstr/CBotLeftExpr.cpp
View File

@ -64,7 +64,7 @@ CBotLeftExpr* CBotLeftExpr::Compile(CBotToken* &p, CBotCStack* pStack)
inst->m_nIdent = var->GetUniqNum(); inst->m_nIdent = var->GetUniqNum();
if (inst->m_nIdent > 0 && inst->m_nIdent < 9000) if (inst->m_nIdent > 0 && inst->m_nIdent < 9000)
{ {
if (CBotFieldExpr::ProtectionError(pStk, nullptr, var, CBotVar::ProtectionLevel::ReadOnly)) if (CBotFieldExpr::CheckProtectionError(pStk, nullptr, var, CBotVar::ProtectionLevel::ReadOnly))
{ {
pStk->SetError(CBotErrPrivate, p); pStk->SetError(CBotErrPrivate, p);
goto err; goto err;
@ -128,7 +128,8 @@ CBotLeftExpr* CBotLeftExpr::Compile(CBotToken* &p, CBotCStack* pStack)
var = var->GetItem(p->GetString()); // get item correspondent var = var->GetItem(p->GetString()); // get item correspondent
if (var != nullptr) if (var != nullptr)
{ {
if (CBotFieldExpr::ProtectionError(pStk, preVar, var, CBotVar::ProtectionLevel::ReadOnly)) if (CBotFieldExpr::CheckProtectionError(pStk, preVar, var,
CBotVar::ProtectionLevel::ReadOnly))
{ {
pStk->SetError(CBotErrPrivate, pp); pStk->SetError(CBotErrPrivate, pp);
goto err; goto err;

2
src/CBot/CBotTypResult.h
View File

@ -106,7 +106,7 @@ public:
/** /**
* \brief Returns ::CBotType or ::CBotError stored in this object * \brief Returns ::CBotType or ::CBotError stored in this object
* \param mode Mode, see ::GetTypeMode enum * \param mode Mode, see GetTypeMode enum
*/ */
int GetType(GetTypeMode mode = GetTypeMode::NORMAL) const; int GetType(GetTypeMode mode = GetTypeMode::NORMAL) const;