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

Cleaning the CBot.h file.

dev-time-step
Grunaka 2015-11-22 17:54:40 +01:00
parent cedaaad459
commit 575ff47c82
58 changed files with 31 additions and 141 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/CBot/CBot.h
View File

@ -17,34 +17,8 @@
* along with this program. If not, see http://gnu.org/licenses * along with this program. If not, see http://gnu.org/licenses
*/ */
//////////////////////////////////////////////////////////////////// // Modules inlcude
/**
* \file CBot.h
* \brief Interpreter of the language CBot for COLOBOT game
*/
#pragma once // Local include
#include "resource.h" // Global include
#include "CBotToken.h" // token management
#include "CBotProgram.h"
/////////////////////////////////////////////////////////////////////
// forward declaration
class CBotParExpr; // basic type or instruction in parenthesis
// Toto.truc
// 12.5
// "string"
// ( expression )
class CBotExprVar; // a variable name as
// Toto
// chose.truc.machin
class CBotWhile; // while (...) {...};
class CBotIf; // if (...) {...} else {...}
class CBotDefParam; // paramerer list of a function
#if 0
extern void DEBUG( const char* text, int val, CBotStack* pile );
#endif

8
src/CBot/CBotCallMethode.h
View File

@ -20,12 +20,16 @@
#pragma once #pragma once
// Modules inlcude // Modules inlcude
#include "CBot.h" #include "CBotTypResult.h"
#include "CBotString.h"
// Local include // Local include
// Global include // Global include
class CBotVar;
class CBotCStack;
class CBotStack;
class CBotToken;
/*! /*!
* \brief The CBotCallMethode class Class managing the methods declared by * \brief The CBotCallMethode class Class managing the methods declared by

2
src/CBot/CBotDefParam.cpp
View File

@ -20,8 +20,6 @@
// Modules inlcude // Modules inlcude
#include "CBotDefParam.h" #include "CBotDefParam.h"
#include "CBot.h"
#include "CBotUtils.h" #include "CBotUtils.h"
#include "CBotCStack.h" #include "CBotCStack.h"

2
src/CBot/CBotInstr/CBotBlock.h
View File

@ -20,8 +20,6 @@
#pragma once #pragma once
// Modules inlcude // Modules inlcude
#include "CBot.h"
#include "CBotInstr.h" #include "CBotInstr.h"
// Local include // Local include

2
src/CBot/CBotInstr/CBotBoolExpr.h
View File

@ -20,8 +20,6 @@
#pragma once #pragma once
// Modules inlcude // Modules inlcude
#include "CBot.h"
#include "CBotInstr.h" #include "CBotInstr.h"
// Local include // Local include

2
src/CBot/CBotInstr/CBotBoolean.h
View File

@ -20,8 +20,6 @@
#pragma once #pragma once
// Modules inlcude // Modules inlcude
#include "CBot.h"
#include "CBotInstr.h" #include "CBotInstr.h"
// Local include // Local include

2
src/CBot/CBotInstr/CBotBreak.h
View File

@ -20,8 +20,6 @@
#pragma once #pragma once
// Modules inlcude // Modules inlcude
#include "CBot.h"
#include "CBotInstr.h" #include "CBotInstr.h"
// Local include // Local include

2
src/CBot/CBotInstr/CBotCase.h
View File

@ -20,8 +20,6 @@
#pragma once #pragma once
// Modules inlcude // Modules inlcude
#include "CBot.h"
#include "CBotInstr.h" #include "CBotInstr.h"
// Local include // Local include

2
src/CBot/CBotInstr/CBotCatch.h
View File

@ -20,8 +20,6 @@
#pragma once #pragma once
// Modules inlcude // Modules inlcude
#include "CBot.h"
#include "CBotInstr.h" #include "CBotInstr.h"
// Local include // Local include

2
src/CBot/CBotInstr/CBotClassInst.h
View File

@ -20,8 +20,6 @@
#pragma once #pragma once
// Modules inlcude // Modules inlcude
#include "CBot.h"
#include "CBotInstr.h" #include "CBotInstr.h"
// Local include // Local include

2
src/CBot/CBotInstr/CBotCondition.h
View File

@ -20,8 +20,6 @@
#pragma once #pragma once
// Modules inlcude // Modules inlcude
#include "CBot.h"
#include "CBotInstr.h" #include "CBotInstr.h"
// Local include // Local include

2
src/CBot/CBotInstr/CBotDo.h
View File

@ -20,8 +20,6 @@
#pragma once #pragma once
// Modules inlcude // Modules inlcude
#include "CBot.h"
#include "CBotInstr.h" #include "CBotInstr.h"
// Local include // Local include

2
src/CBot/CBotInstr/CBotEmpty.h
View File

@ -20,8 +20,6 @@
#pragma once #pragma once
// Modules inlcude // Modules inlcude
#include "CBot.h"
#include "CBotInstr.h" #include "CBotInstr.h"
// Local include // Local include

2
src/CBot/CBotInstr/CBotExprAlpha.h
View File

@ -20,8 +20,6 @@
#pragma once #pragma once
// Modules inlcude // Modules inlcude
#include "CBot.h"
#include "CBotInstr.h" #include "CBotInstr.h"
// Local include // Local include

2
src/CBot/CBotInstr/CBotExprBool.h
View File

@ -20,8 +20,6 @@
#pragma once #pragma once
// Modules inlcude // Modules inlcude
#include "CBot.h"
#include "CBotInstr.h" #include "CBotInstr.h"
// Local include // Local include

2
src/CBot/CBotInstr/CBotExprNan.h
View File

@ -20,8 +20,6 @@
#pragma once #pragma once
// Modules inlcude // Modules inlcude
#include "CBot.h"
#include "CBotInstr.h" #include "CBotInstr.h"
// Local include // Local include

2
src/CBot/CBotInstr/CBotExprNull.h
View File

@ -20,8 +20,6 @@
#pragma once #pragma once
// Modules inlcude // Modules inlcude
#include "CBot.h"
#include "CBotInstr.h" #include "CBotInstr.h"
// Local include // Local include

2
src/CBot/CBotInstr/CBotExprNum.h
View File

@ -20,8 +20,6 @@
#pragma once #pragma once
// Modules inlcude // Modules inlcude
#include "CBot.h"
#include "CBotInstr.h" #include "CBotInstr.h"
// Local include // Local include

2
src/CBot/CBotInstr/CBotExprUnaire.h
View File

@ -20,8 +20,6 @@
#pragma once #pragma once
// Modules inlcude // Modules inlcude
#include "CBot.h"
#include "CBotInstr.h" #include "CBotInstr.h"
// Local include // Local include

2
src/CBot/CBotInstr/CBotExprVar.h
View File

@ -20,8 +20,6 @@
#pragma once #pragma once
// Modules inlcude // Modules inlcude
#include "CBot.h"
#include "CBotDefines.h" #include "CBotDefines.h"
#include "CBotInstr.h" #include "CBotInstr.h"

2
src/CBot/CBotInstr/CBotExpression.h
View File

@ -20,8 +20,6 @@
#pragma once #pragma once
// Modules inlcude // Modules inlcude
#include "CBot.h"
#include "CBotLeftExpr.h" #include "CBotLeftExpr.h"
#include "CBotInstr.h" #include "CBotInstr.h"

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

@ -20,8 +20,6 @@
#pragma once #pragma once
// Modules inlcude // Modules inlcude
#include "CBot.h"
#include "CBotInstr.h" #include "CBotInstr.h"
// Local include // Local include

2
src/CBot/CBotInstr/CBotFloat.h
View File

@ -20,8 +20,6 @@
#pragma once #pragma once
// Modules inlcude // Modules inlcude
#include "CBot.h"
#include "CBotInstr.h" #include "CBotInstr.h"
// Local include // Local include

2
src/CBot/CBotInstr/CBotFor.h
View File

@ -20,8 +20,6 @@
#pragma once #pragma once
// Modules inlcude // Modules inlcude
#include "CBot.h"
#include "CBotInstr.h" #include "CBotInstr.h"
// Local include // Local include

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

@ -23,8 +23,6 @@
#include "CBotInstr/CBotInstrUtils.h" #include "CBotInstr/CBotInstrUtils.h"
#include "CBot.h"
#include "CBotInstr/CBotBlock.h" #include "CBotInstr/CBotBlock.h"
#include "CBotInstr/CBotTwoOpExpr.h" #include "CBotInstr/CBotTwoOpExpr.h"
#include "CBotInstr/CBotExpression.h" #include "CBotInstr/CBotExpression.h"

2
src/CBot/CBotInstr/CBotFunction.h
View File

@ -20,8 +20,6 @@
#pragma once #pragma once
// Modules inlcude // Modules inlcude
#include "CBot.h"
#include "CBotInstr.h" #include "CBotInstr.h"
// Local include // Local include

2
src/CBot/CBotInstr/CBotIString.h
View File

@ -20,8 +20,6 @@
#pragma once #pragma once
// Modules inlcude // Modules inlcude
#include "CBot.h"
#include "CBotInstr.h" #include "CBotInstr.h"
// Local include // Local include

2
src/CBot/CBotInstr/CBotIf.h
View File

@ -20,8 +20,6 @@
#pragma once #pragma once
// Modules inlcude // Modules inlcude
#include "CBot.h"
#include "CBotInstr.h" #include "CBotInstr.h"
// Local include // Local include

2
src/CBot/CBotInstr/CBotIndexExpr.h
View File

@ -20,8 +20,6 @@
#pragma once #pragma once
// Modules inlcude // Modules inlcude
#include "CBot.h"
#include "CBotInstr.h" #include "CBotInstr.h"
// Local include // Local include

2
src/CBot/CBotInstr/CBotInstArray.h
View File

@ -20,8 +20,6 @@
#pragma once #pragma once
// Modules inlcude // Modules inlcude
#include "CBot.h"
#include "CBotInstr.h" #include "CBotInstr.h"
// Local include // Local include

2
src/CBot/CBotInstr/CBotInstrCall.h
View File

@ -20,8 +20,6 @@
#pragma once #pragma once
// Modules inlcude // Modules inlcude
#include "CBot.h"
#include "CBotInstr.h" #include "CBotInstr.h"
// Local include // Local include

2
src/CBot/CBotInstr/CBotInstrMethode.h
View File

@ -20,8 +20,6 @@
#pragma once #pragma once
// Modules inlcude // Modules inlcude
#include "CBot.h"
#include "CBotInstr.h" #include "CBotInstr.h"
// Local include // Local include

2
src/CBot/CBotInstr/CBotInt.h
View File

@ -20,8 +20,6 @@
#pragma once #pragma once
// Modules inlcude // Modules inlcude
#include "CBot.h"
#include "CBotInstr.h" #include "CBotInstr.h"
// Local include // Local include

2
src/CBot/CBotInstr/CBotLeftExpr.h
View File

@ -20,8 +20,6 @@
#pragma once #pragma once
// Modules inlcude // Modules inlcude
#include "CBot.h"
#include "CBotInstr.h" #include "CBotInstr.h"
// Local include // Local include

2
src/CBot/CBotInstr/CBotLeftExprVar.h
View File

@ -20,8 +20,6 @@
#pragma once #pragma once
// Modules inlcude // Modules inlcude
#include "CBot.h"
#include "CBotInstr.h" #include "CBotInstr.h"
// Local include // Local include

2
src/CBot/CBotInstr/CBotListArray.h
View File

@ -20,8 +20,6 @@
#pragma once #pragma once
// Modules inlcude // Modules inlcude
#include "CBot.h"
#include "CBotInstr.h" #include "CBotInstr.h"
// Local include // Local include

2
src/CBot/CBotInstr/CBotListExpression.h
View File

@ -20,8 +20,6 @@
#pragma once #pragma once
// Modules inlcude // Modules inlcude
#include "CBot.h"
#include "CBotInstr.h" #include "CBotInstr.h"
// Local include // Local include

2
src/CBot/CBotInstr/CBotListInstr.h
View File

@ -20,8 +20,6 @@
#pragma once #pragma once
// Modules inlcude // Modules inlcude
#include "CBot.h"
#include "CBotInstr.h" #include "CBotInstr.h"
// Local include // Local include

2
src/CBot/CBotInstr/CBotLogicExpr.h
View File

@ -20,8 +20,6 @@
#pragma once #pragma once
// Modules inlcude // Modules inlcude
#include "CBot.h"
#include "CBotInstr.h" #include "CBotInstr.h"
// Local include // Local include

2
src/CBot/CBotInstr/CBotNew.h
View File

@ -20,8 +20,6 @@
#pragma once #pragma once
// Modules inlcude // Modules inlcude
#include "CBot.h"
#include "CBotInstr.h" #include "CBotInstr.h"
// Local include // Local include

2
src/CBot/CBotInstr/CBotParExpr.h
View File

@ -20,8 +20,6 @@
#pragma once #pragma once
// Modules inlcude // Modules inlcude
#include "CBot.h"
#include "CBotInstr.h" #include "CBotInstr.h"
// Local include // Local include

2
src/CBot/CBotInstr/CBotPostIncExpr.h
View File

@ -20,8 +20,6 @@
#pragma once #pragma once
// Modules inlcude // Modules inlcude
#include "CBot.h"
#include "CBotInstr.h" #include "CBotInstr.h"
// Local include // Local include

2
src/CBot/CBotInstr/CBotPreIncExpr.h
View File

@ -20,8 +20,6 @@
#pragma once #pragma once
// Modules inlcude // Modules inlcude
#include "CBot.h"
#include "CBotInstr.h" #include "CBotInstr.h"
// Local include // Local include

2
src/CBot/CBotInstr/CBotReturn.h
View File

@ -20,8 +20,6 @@
#pragma once #pragma once
// Modules inlcude // Modules inlcude
#include "CBot.h"
#include "CBotInstr.h" #include "CBotInstr.h"
// Local include // Local include

2
src/CBot/CBotInstr/CBotSwitch.h
View File

@ -20,8 +20,6 @@
#pragma once #pragma once
// Modules inlcude // Modules inlcude
#include "CBot.h"
#include "CBotInstr.h" #include "CBotInstr.h"
// Local include // Local include

2
src/CBot/CBotInstr/CBotThrow.h
View File

@ -20,8 +20,6 @@
#pragma once #pragma once
// Modules inlcude // Modules inlcude
#include "CBot.h"
#include "CBotInstr.h" #include "CBotInstr.h"
// Local include // Local include

1
src/CBot/CBotInstr/CBotTry.h
View File

@ -18,7 +18,6 @@
*/ */
// Modules inlcude // Modules inlcude
#include "CBot.h"
#include "CBotCatch.h" #include "CBotCatch.h"
#include "CBotInstr.h" #include "CBotInstr.h"

2
src/CBot/CBotInstr/CBotTwoOpExpr.h
View File

@ -20,8 +20,6 @@
#pragma once #pragma once
// Modules inlcude // Modules inlcude
#include "CBot.h"
#include "CBotInstr.h" #include "CBotInstr.h"
// Local include // Local include

2
src/CBot/CBotInstr/CBotWhile.h
View File

@ -20,8 +20,6 @@
#pragma once #pragma once
// Modules inlcude // Modules inlcude
#include "CBot.h"
#include "CBotInstr.h" #include "CBotInstr.h"
// Local include // Local include

2
src/CBot/CBotProgram.cpp
View File

@ -18,8 +18,6 @@
*/ */
// Modules inlcude // Modules inlcude
#include "CBot.h"
#include "CBotVar/CBotVar.h" #include "CBotVar/CBotVar.h"
#include "CBotCall.h" #include "CBotCall.h"

18
src/CBot/CBotStack.h
View File

@ -20,17 +20,21 @@
#pragma once #pragma once
// Modules inlcude // Modules inlcude
#include "CBot.h"
#include "CBotDefines.h" #include "CBotDefines.h"
#include "CBotTypResult.h"
#include "CBotString.h"
// Local include // Local include
// Global include // Global include
#include <cstdio>
// Forward declaration // Forward declaration
class CBotInstr; class CBotInstr;
class CBotCall; class CBotCall;
class CBotVar;
class CBotProgram;
class CBotToken;
/*! /*!
* \class CBotStack * \class CBotStack
@ -122,8 +126,9 @@ public:
* \param [in] bModif Not used. Probably need to be removed * \param [in] bModif Not used. Probably need to be removed
* \return Found variable * \return Found variable
*/ */
CBotVar* FindVar(CBotToken* &pToken, bool bUpdate = false, CBotVar* FindVar(CBotToken* &pToken,
bool bModif = false); bool bUpdate = false,
bool bModif = false);
/** /**
* \brief Fetch a variable by its token. * \brief Fetch a variable by its token.
@ -133,8 +138,9 @@ public:
* \param [in] bModif Not used. Probably need to be removed * \param [in] bModif Not used. Probably need to be removed
* \return Found variable * \return Found variable
*/ */
CBotVar* FindVar(CBotToken& pToken, bool bUpdate = false, CBotVar* FindVar(CBotToken& pToken,
bool bModif = false); bool bUpdate = false,
bool bModif = false);
/** /**
* \brief Fetch variable by its name * \brief Fetch variable by its name

5
src/CBot/CBotString.cpp
View File

@ -19,10 +19,9 @@
///////////////////////////////////////////////////// /////////////////////////////////////////////////////
#include "CBotString.h"
//strings management //strings management
#include "CBot.h"
#include <cstdlib> #include <cstdlib>
#include <cstring> #include <cstring>
#include <algorithm> #include <algorithm>

2
src/CBot/CBotToken.cpp
View File

@ -18,7 +18,7 @@
*/ */
// Modules inlcude // Modules inlcude
#include "CBot.h" #include "CBotToken.h"
// Local include // Local include

2
src/CBot/CBotVar/CBotVar.cpp
View File

@ -33,6 +33,8 @@
#include "CBotClass.h" #include "CBotClass.h"
#include "CBotEnums.h"
// Local include // Local include
// Global include // Global include

4
src/CBot/CBotVar/CBotVarArray.cpp
View File

@ -20,9 +20,11 @@
// Modules inlcude // Modules inlcude
#include "CBotVarArray.h" #include "CBotVarArray.h"
#include "CBotVarClass.h" #include "CBotVarClass.h"
#include "CBotToken.h"
#include "CBotFileUtils.h" #include "CBotFileUtils.h"
#include "CBotEnums.h"
// Local include // Local include
// Global include // Global include

1
src/CBot/CBotVar/CBotVarArray.h
View File

@ -20,7 +20,6 @@
#pragma once #pragma once
// Modules inlcude // Modules inlcude
#include "CBot.h"
#include "CBotDefines.h" #include "CBotDefines.h"
#include "CBotVar/CBotVar.h" #include "CBotVar/CBotVar.h"

2
src/CBot/CBotVar/CBotVarClass.h
View File

@ -20,8 +20,6 @@
#pragma once #pragma once
// Modules inlcude // Modules inlcude
#include "CBot.h"
#include "CBotVar/CBotVar.h" #include "CBotVar/CBotVar.h"
// Local include // Local include

3
src/CBot/CBotVar/CBotVarPointer.cpp
View File

@ -20,12 +20,13 @@
// Modules inlcude // Modules inlcude
#include "CBotVarPointer.h" #include "CBotVarPointer.h"
#include "CBotToken.h" #include "CBotToken.h"
#include "CBot.h"
#include "CBotClass.h" #include "CBotClass.h"
#include "CBotVarClass.h" #include "CBotVarClass.h"
#include "CBotFileUtils.h" #include "CBotFileUtils.h"
#include "CBotEnums.h"
// Local include // Local include
// Global include // Global include