Moving CBotInt class in its own header and source files.
Grunaka
parent
b01e2180d8
commit
0373692ea1
|
|
@ -70,6 +70,7 @@
|
|||
#include "CBotInstr/CBotIf.h"
|
||||
#include "CBotInstr/CBotListArray.h"
|
||||
#include "CBotInstr/CBotInstArray.h"
|
||||
#include "CBotInstr/CBotInt.h"
|
||||
|
||||
|
||||
// Local include
|
||||
|
|
@ -373,24 +374,6 @@ bool CBotInstr::CompCase(CBotStack* &pj, int val)
|
|||
return false;
|
||||
}
|
||||
|
||||
//////////////////////////////////////////////////////////////////////////////////////
|
||||
// definition of an integer variable
|
||||
// int a, b = 12;
|
||||
|
||||
CBotInt::CBotInt()
|
||||
{
|
||||
m_next = nullptr; // for multiple definitions
|
||||
m_var =
|
||||
m_expr = nullptr;
|
||||
name = "CBotInt";
|
||||
}
|
||||
|
||||
CBotInt::~CBotInt()
|
||||
{
|
||||
delete m_var;
|
||||
delete m_expr;
|
||||
}
|
||||
|
||||
CBotInstr* CBotInstr::CompileArray(CBotToken* &p, CBotCStack* pStack, CBotTypResult type, bool first)
|
||||
{
|
||||
if (IsOfType(p, ID_OPBRK))
|
||||
|
|
@ -431,144 +414,6 @@ CBotInstr* CBotInstr::CompileArray(CBotToken* &p, CBotCStack* pStack, CBotTypRes
|
|||
return nullptr;
|
||||
}
|
||||
|
||||
CBotInstr* CBotInt::Compile(CBotToken* &p, CBotCStack* pStack, bool cont, bool noskip)
|
||||
{
|
||||
CBotToken* pp = cont ? nullptr : p; // no repetition of the token "int"
|
||||
|
||||
if (!cont && !IsOfType(p, ID_INT)) return nullptr;
|
||||
|
||||
CBotInt* inst = static_cast<CBotInt*>(CompileArray(p, pStack, CBotTypInt));
|
||||
if (inst != nullptr || !pStack->IsOk()) return inst;
|
||||
|
||||
CBotCStack* pStk = pStack->TokenStack(pp);
|
||||
|
||||
inst = new CBotInt();
|
||||
|
||||
inst->m_expr = nullptr;
|
||||
|
||||
CBotToken* vartoken = p;
|
||||
inst->SetToken(vartoken);
|
||||
|
||||
// determines the expression is valid for the item on the left side
|
||||
if (nullptr != (inst->m_var = CBotLeftExprVar::Compile( p, pStk )))
|
||||
{
|
||||
(static_cast<CBotLeftExprVar*>(inst->m_var))->m_typevar = CBotTypInt;
|
||||
if (pStk->CheckVarLocal(vartoken)) // redefinition of the variable
|
||||
{
|
||||
pStk->SetError(TX_REDEFVAR, vartoken);
|
||||
goto error;
|
||||
}
|
||||
|
||||
if (IsOfType(p, ID_OPBRK))
|
||||
{
|
||||
delete inst; // type is not CBotInt
|
||||
p = vartoken; // returns the variable name
|
||||
|
||||
// compiles an array declaration
|
||||
|
||||
CBotInstr* inst2 = CBotInstArray::Compile(p, pStk, CBotTypInt);
|
||||
|
||||
if (!pStk->IsOk() )
|
||||
{
|
||||
pStk->SetError(TX_CLBRK, p->GetStart());
|
||||
goto error;
|
||||
}
|
||||
|
||||
if (IsOfType(p, ID_COMMA)) // several definition chained
|
||||
{
|
||||
if (nullptr != ( inst2->m_next2b = CBotInt::Compile(p, pStk, true, noskip))) // compile the next one
|
||||
{
|
||||
return pStack->Return(inst2, pStk);
|
||||
}
|
||||
}
|
||||
inst = static_cast<CBotInt*>(inst2);
|
||||
goto suite; // no assignment, variable already created
|
||||
}
|
||||
|
||||
if (IsOfType(p, ID_ASS)) // with an assignment?
|
||||
{
|
||||
if (nullptr == ( inst->m_expr = CBotTwoOpExpr::Compile( p, pStk )))
|
||||
{
|
||||
goto error;
|
||||
}
|
||||
if (pStk->GetType() >= CBotTypBoolean) // compatible type ?
|
||||
{
|
||||
pStk->SetError(TX_BADTYPE, p->GetStart());
|
||||
goto error;
|
||||
}
|
||||
}
|
||||
|
||||
{
|
||||
CBotVar* var = CBotVar::Create(vartoken, CBotTypInt);// create the variable (evaluated after the assignment)
|
||||
var->SetInit(inst->m_expr != nullptr ? CBotVar::InitType::DEF : CBotVar::InitType::UNDEF); // if initialized with assignment
|
||||
var->SetUniqNum( //set it with a unique number
|
||||
(static_cast<CBotLeftExprVar*>(inst->m_var))->m_nIdent = CBotVar::NextUniqNum());
|
||||
pStack->AddVar(var); // place it on the stack
|
||||
}
|
||||
|
||||
if (IsOfType(p, ID_COMMA)) // chained several definitions
|
||||
{
|
||||
if (nullptr != ( inst->m_next2b = CBotInt::Compile(p, pStk, true, noskip))) // compile next one
|
||||
{
|
||||
return pStack->Return(inst, pStk);
|
||||
}
|
||||
}
|
||||
suite:
|
||||
if (noskip || IsOfType(p, ID_SEP)) // instruction is completed
|
||||
{
|
||||
return pStack->Return(inst, pStk);
|
||||
}
|
||||
|
||||
pStk->SetError(TX_ENDOF, p->GetStart());
|
||||
}
|
||||
|
||||
error:
|
||||
delete inst;
|
||||
return pStack->Return(nullptr, pStk);
|
||||
}
|
||||
|
||||
// execute the definition of the integer variable
|
||||
|
||||
bool CBotInt::Execute(CBotStack* &pj)
|
||||
{
|
||||
CBotStack* pile = pj->AddStack(this); // essential for SetState()
|
||||
|
||||
if ( pile->GetState()==0)
|
||||
{
|
||||
if (m_expr && !m_expr->Execute(pile)) return false; // initial value // interrupted?
|
||||
m_var->Execute(pile); // creates and assign the result
|
||||
|
||||
if (!pile->SetState(1)) return false;
|
||||
}
|
||||
|
||||
if (pile->IfStep()) return false;
|
||||
|
||||
if ( m_next2b &&
|
||||
!m_next2b->Execute(pile)) return false; // other(s) definition(s)
|
||||
|
||||
return pj->Return(pile); // forward below
|
||||
}
|
||||
|
||||
void CBotInt::RestoreState(CBotStack* &pj, bool bMain)
|
||||
{
|
||||
CBotStack* pile = pj;
|
||||
if (bMain)
|
||||
{
|
||||
pile = pj->RestoreStack(this);
|
||||
if (pile == nullptr) return;
|
||||
|
||||
if ( pile->GetState()==0)
|
||||
{
|
||||
if (m_expr) m_expr->RestoreState(pile, bMain); // initial value // interrupted?
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
m_var->RestoreState(pile, bMain);
|
||||
|
||||
if (m_next2b) m_next2b->RestoreState(pile, bMain); // other(s) definition(s)
|
||||
}
|
||||
|
||||
//////////////////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
// compile a list of parameters
|
||||
|
|
|
|||
|
|
@ -467,24 +467,6 @@ public:
|
|||
bool IsOfClass(CBotString name);
|
||||
};
|
||||
|
||||
// definition of an integer
|
||||
|
||||
class CBotInt : public CBotInstr
|
||||
{
|
||||
private:
|
||||
CBotInstr* m_var; // the variable to initialize
|
||||
CBotInstr* m_expr; // a value to put, if there is
|
||||
/// CBotInstr* m_next; // several definitions chained
|
||||
|
||||
public:
|
||||
CBotInt();
|
||||
~CBotInt();
|
||||
static
|
||||
CBotInstr* Compile(CBotToken* &p, CBotCStack* pStack, bool cont = false, bool noskip = false);
|
||||
bool Execute(CBotStack* &pj) override;
|
||||
void RestoreState(CBotStack* &pj, bool bMain) override;
|
||||
};
|
||||
|
||||
#define MAX(a,b) ((a>b) ? a : b)
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -0,0 +1,185 @@
|
|||
/*
|
||||
* This file is part of the Colobot: Gold Edition source code
|
||||
* Copyright (C) 2001-2015, Daniel Roux, EPSITEC SA & TerranovaTeam
|
||||
* http://epsitec.ch; http://colobot.info; http://github.com/colobot
|
||||
*
|
||||
* This program is free software: you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
* the Free Software Foundation, either version 3 of the License, or
|
||||
* (at your option) any later version.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
|
||||
* See the GNU General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with this program. If not, see http://gnu.org/licenses
|
||||
*/
|
||||
|
||||
// Modules inlcude
|
||||
#include "CBotInt.h"
|
||||
|
||||
#include "CBotLeftExprVar.h"
|
||||
#include "CBotInstArray.h"
|
||||
#include "CBotTwoOpExpr.h"
|
||||
|
||||
// Local include
|
||||
|
||||
// Global include
|
||||
|
||||
|
||||
////////////////////////////////////////////////////////////////////////////////
|
||||
CBotInt::CBotInt()
|
||||
{
|
||||
m_next = nullptr; // for multiple definitions
|
||||
m_var =
|
||||
m_expr = nullptr;
|
||||
name = "CBotInt";
|
||||
}
|
||||
|
||||
////////////////////////////////////////////////////////////////////////////////
|
||||
CBotInt::~CBotInt()
|
||||
{
|
||||
delete m_var;
|
||||
delete m_expr;
|
||||
}
|
||||
|
||||
////////////////////////////////////////////////////////////////////////////////
|
||||
CBotInstr* CBotInt::Compile(CBotToken* &p, CBotCStack* pStack, bool cont, bool noskip)
|
||||
{
|
||||
CBotToken* pp = cont ? nullptr : p; // no repetition of the token "int"
|
||||
|
||||
if (!cont && !IsOfType(p, ID_INT)) return nullptr;
|
||||
|
||||
CBotInt* inst = static_cast<CBotInt*>(CompileArray(p, pStack, CBotTypInt));
|
||||
if (inst != nullptr || !pStack->IsOk()) return inst;
|
||||
|
||||
CBotCStack* pStk = pStack->TokenStack(pp);
|
||||
|
||||
inst = new CBotInt();
|
||||
|
||||
inst->m_expr = nullptr;
|
||||
|
||||
CBotToken* vartoken = p;
|
||||
inst->SetToken(vartoken);
|
||||
|
||||
// determines the expression is valid for the item on the left side
|
||||
if (nullptr != (inst->m_var = CBotLeftExprVar::Compile( p, pStk )))
|
||||
{
|
||||
(static_cast<CBotLeftExprVar*>(inst->m_var))->m_typevar = CBotTypInt;
|
||||
if (pStk->CheckVarLocal(vartoken)) // redefinition of the variable
|
||||
{
|
||||
pStk->SetError(TX_REDEFVAR, vartoken);
|
||||
goto error;
|
||||
}
|
||||
|
||||
if (IsOfType(p, ID_OPBRK))
|
||||
{
|
||||
delete inst; // type is not CBotInt
|
||||
p = vartoken; // returns the variable name
|
||||
|
||||
// compiles an array declaration
|
||||
|
||||
CBotInstr* inst2 = CBotInstArray::Compile(p, pStk, CBotTypInt);
|
||||
|
||||
if (!pStk->IsOk() )
|
||||
{
|
||||
pStk->SetError(TX_CLBRK, p->GetStart());
|
||||
goto error;
|
||||
}
|
||||
|
||||
if (IsOfType(p, ID_COMMA)) // several definition chained
|
||||
{
|
||||
if (nullptr != ( inst2->m_next2b = CBotInt::Compile(p, pStk, true, noskip))) // compile the next one
|
||||
{
|
||||
return pStack->Return(inst2, pStk);
|
||||
}
|
||||
}
|
||||
inst = static_cast<CBotInt*>(inst2);
|
||||
goto suite; // no assignment, variable already created
|
||||
}
|
||||
|
||||
if (IsOfType(p, ID_ASS)) // with an assignment?
|
||||
{
|
||||
if (nullptr == ( inst->m_expr = CBotTwoOpExpr::Compile( p, pStk )))
|
||||
{
|
||||
goto error;
|
||||
}
|
||||
if (pStk->GetType() >= CBotTypBoolean) // compatible type ?
|
||||
{
|
||||
pStk->SetError(TX_BADTYPE, p->GetStart());
|
||||
goto error;
|
||||
}
|
||||
}
|
||||
|
||||
{
|
||||
CBotVar* var = CBotVar::Create(vartoken, CBotTypInt);// create the variable (evaluated after the assignment)
|
||||
var->SetInit(inst->m_expr != nullptr ? CBotVar::InitType::DEF : CBotVar::InitType::UNDEF); // if initialized with assignment
|
||||
var->SetUniqNum( //set it with a unique number
|
||||
(static_cast<CBotLeftExprVar*>(inst->m_var))->m_nIdent = CBotVar::NextUniqNum());
|
||||
pStack->AddVar(var); // place it on the stack
|
||||
}
|
||||
|
||||
if (IsOfType(p, ID_COMMA)) // chained several definitions
|
||||
{
|
||||
if (nullptr != ( inst->m_next2b = CBotInt::Compile(p, pStk, true, noskip))) // compile next one
|
||||
{
|
||||
return pStack->Return(inst, pStk);
|
||||
}
|
||||
}
|
||||
suite:
|
||||
if (noskip || IsOfType(p, ID_SEP)) // instruction is completed
|
||||
{
|
||||
return pStack->Return(inst, pStk);
|
||||
}
|
||||
|
||||
pStk->SetError(TX_ENDOF, p->GetStart());
|
||||
}
|
||||
|
||||
error:
|
||||
delete inst;
|
||||
return pStack->Return(nullptr, pStk);
|
||||
}
|
||||
|
||||
////////////////////////////////////////////////////////////////////////////////
|
||||
bool CBotInt::Execute(CBotStack* &pj)
|
||||
{
|
||||
CBotStack* pile = pj->AddStack(this); // essential for SetState()
|
||||
|
||||
if ( pile->GetState()==0)
|
||||
{
|
||||
if (m_expr && !m_expr->Execute(pile)) return false; // initial value // interrupted?
|
||||
m_var->Execute(pile); // creates and assign the result
|
||||
|
||||
if (!pile->SetState(1)) return false;
|
||||
}
|
||||
|
||||
if (pile->IfStep()) return false;
|
||||
|
||||
if ( m_next2b &&
|
||||
!m_next2b->Execute(pile)) return false; // other(s) definition(s)
|
||||
|
||||
return pj->Return(pile); // forward below
|
||||
}
|
||||
|
||||
////////////////////////////////////////////////////////////////////////////////
|
||||
void CBotInt::RestoreState(CBotStack* &pj, bool bMain)
|
||||
{
|
||||
CBotStack* pile = pj;
|
||||
if (bMain)
|
||||
{
|
||||
pile = pj->RestoreStack(this);
|
||||
if (pile == nullptr) return;
|
||||
|
||||
if ( pile->GetState()==0)
|
||||
{
|
||||
if (m_expr) m_expr->RestoreState(pile, bMain); // initial value // interrupted?
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
m_var->RestoreState(pile, bMain);
|
||||
|
||||
if (m_next2b) m_next2b->RestoreState(pile, bMain); // other(s) definition(s)
|
||||
}
|
||||
|
|
@ -0,0 +1,78 @@
|
|||
/*
|
||||
* This file is part of the Colobot: Gold Edition source code
|
||||
* Copyright (C) 2001-2015, Daniel Roux, EPSITEC SA & TerranovaTeam
|
||||
* http://epsitec.ch; http://colobot.info; http://github.com/colobot
|
||||
*
|
||||
* This program is free software: you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
* the Free Software Foundation, either version 3 of the License, or
|
||||
* (at your option) any later version.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
|
||||
* See the GNU General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with this program. If not, see http://gnu.org/licenses
|
||||
*/
|
||||
|
||||
#pragma once
|
||||
|
||||
// Modules inlcude
|
||||
#include "CBot.h"
|
||||
|
||||
// Local include
|
||||
|
||||
// Global include
|
||||
|
||||
|
||||
/*!
|
||||
* \brief The CBotInt class Definition of an integer variable
|
||||
* int a, b = 12;
|
||||
*/
|
||||
class CBotInt : public CBotInstr
|
||||
{
|
||||
public:
|
||||
|
||||
/*!
|
||||
* \brief CBotInt
|
||||
*/
|
||||
CBotInt();
|
||||
|
||||
/*!
|
||||
* \brief ~CBotInt
|
||||
*/
|
||||
~CBotInt();
|
||||
|
||||
/*!
|
||||
* \brief Compile
|
||||
* \param p
|
||||
* \param pStack
|
||||
* \param cont
|
||||
* \param noskip
|
||||
* \return
|
||||
*/
|
||||
static CBotInstr* Compile(CBotToken* &p, CBotCStack* pStack, bool cont = false, bool noskip = false);
|
||||
|
||||
/*!
|
||||
* \brief Execute Execute the definition of the integer variable.
|
||||
* \param pj
|
||||
* \return
|
||||
*/
|
||||
bool Execute(CBotStack* &pj) override;
|
||||
|
||||
/*!
|
||||
* \brief RestoreState
|
||||
* \param pj
|
||||
* \param bMain
|
||||
*/
|
||||
void RestoreState(CBotStack* &pj, bool bMain) override;
|
||||
|
||||
private:
|
||||
|
||||
//! The variable to initialize.
|
||||
CBotInstr* m_var;
|
||||
//! A value to put, if there is.
|
||||
CBotInstr* m_expr;
|
||||
};
|
||||
|
|
@ -23,6 +23,7 @@
|
|||
#include "CBotIString.h"
|
||||
#include "CBotFloat.h"
|
||||
#include "CBotBoolean.h"
|
||||
#include "CBotInt.h"
|
||||
|
||||
// Local include
|
||||
|
||||
|
|
|
|||
|
|
@ -50,6 +50,7 @@ set(SOURCES
|
|||
CBotInstr/CBotIf.cpp
|
||||
CBotInstr/CBotListArray.cpp
|
||||
CBotInstr/CBotInstArray.cpp
|
||||
CBotInstr/CBotInt.cpp
|
||||
)
|
||||
|
||||
# Includes
|
||||
|
|
|
|||
Loading…
Reference in New Issue