[colobot] 78/377: Moving CBotExprVar class in its own header and source files.

Didier Raboud odyx at moszumanska.debian.org
Wed Mar 30 13:34:00 UTC 2016


This is an automated email from the git hooks/post-receive script.

odyx pushed a commit to branch debian/master
in repository colobot.

commit d708be50e736722c53abb257cf779d35ed2cb7f3
Author: Grunaka <dev at romainbreton.fr>
Date:   Wed Nov 11 18:31:31 2015 +0100

    Moving CBotExprVar class in its own header and source files.
---
 src/CBot/CBot.cpp                      | 282 +-----------------------------
 src/CBot/CBot.h                        |  23 ---
 src/CBot/CBotInstr/CBotExprVar.cpp     | 301 +++++++++++++++++++++++++++++++++
 src/CBot/CBotInstr/CBotExprVar.h       | 101 +++++++++++
 src/CBot/CBotInstr/CBotPostIncExpr.cpp |   1 +
 src/CBot/CBotInstr/CBotPreIncExpr.cpp  |   1 +
 src/CBot/CMakeLists.txt                |   1 +
 7 files changed, 406 insertions(+), 304 deletions(-)

diff --git a/src/CBot/CBot.cpp b/src/CBot/CBot.cpp
index b7c8287..9dc0720 100644
--- a/src/CBot/CBot.cpp
+++ b/src/CBot/CBot.cpp
@@ -52,6 +52,7 @@
 #include "CBotInstr/CBotLeftExprVar.h"
 #include "CBotInstr/CBotPreIncExpr.h"
 #include "CBotInstr/CBotPostIncExpr.h"
+#include "CBotInstr/CBotExprVar.h"
 
 // Local include
 
@@ -2505,287 +2506,6 @@ void CBotLeftExpr::RestoreStateVar(CBotStack* &pile, bool bMain)
          m_next3->RestoreStateVar(pile, bMain);
 }
 
-//////////////////////////////////////////////////////////////////////////////////////
-// compile a variable name
-// check that it is known on the stack
-// and it has been initialized
-
-CBotExprVar::CBotExprVar()
-{
-    name    = "CBotExprVar";
-    m_nIdent = 0;
-}
-
-CBotExprVar::~CBotExprVar()
-{
-}
-
-CBotInstr* CBotExprVar::Compile(CBotToken* &p, CBotCStack* pStack, int privat)
-{
-//    CBotToken*    pDebut = p;
-    CBotCStack* pStk = pStack->TokenStack();
-
-    pStk->SetStartError(p->GetStart());
-
-    // is it a variable?
-    if (p->GetType() == TokenTypVar)
-    {
-        CBotInstr* inst = new CBotExprVar();    // create the object
-
-        inst->SetToken(p);
-
-        CBotVar*     var;
-
-        if (nullptr != (var = pStk->FindVar(p)))   // seek if known variable
-        {
-            int        ident = var->GetUniqNum();
-            (static_cast<CBotExprVar*>(inst))->m_nIdent = ident;     // identifies variable by its number
-
-            if (ident > 0 && ident < 9000)
-            {
-                if ( var->IsPrivate(privat) &&
-                     !pStk->GetBotCall()->m_bCompileClass)
-                {
-                    pStk->SetError(TX_PRIVATE, p);
-                    goto err;
-                }
-
-                // This is an element of the current class
-                // ads the equivalent of this. before
-                CBotToken token("this");
-                inst->SetToken(&token);
-                (static_cast<CBotExprVar*>(inst))->m_nIdent = -2;    // identificator for this
-
-                CBotFieldExpr* i = new CBotFieldExpr();     // new element
-                i->SetToken(p);     // keeps the name of the token
-                i->SetUniqNum(ident);
-                inst->AddNext3(i);  // added after
-            }
-
-            p = p->GetNext();   // next token
-
-            while (true)
-            {
-                if (var->GetType() == CBotTypArrayPointer)
-                {
-                    if (IsOfType( p, ID_OPBRK ))    // check if there is an aindex
-                    {
-                        CBotIndexExpr* i = new CBotIndexExpr();
-                        i->m_expr = CBotExpression::Compile(p, pStk);   // compile the formula
-                        inst->AddNext3(i);  // add to the chain
-
-                        var = (static_cast<CBotVarArray*>(var))->GetItem(0,true);    // gets the component [0]
-
-                        if (i->m_expr == nullptr)
-                        {
-                            pStk->SetError(TX_BADINDEX, p->GetStart());
-                            goto err;
-                        }
-                        if (!pStk->IsOk() || !IsOfType( p, ID_CLBRK ))
-                        {
-                            pStk->SetError(TX_CLBRK, p->GetStart());
-                            goto err;
-                        }
-                        continue;
-                    }
-                }
-                if (var->GetType(1) == CBotTypPointer)  // for classes
-                {
-                    if (IsOfType(p, ID_DOT))
-                    {
-                        CBotToken* pp = p;
-
-                        if (p->GetType() == TokenTypVar)    // must be a name
-                        {
-                            if (p->GetNext()->GetType() == ID_OPENPAR)  // a method call?
-                            {
-                                CBotInstr* i = CBotInstrMethode::Compile(p, pStk, var);
-                                if (!pStk->IsOk()) goto err;
-                                inst->AddNext3(i);  // added after
-                                return pStack->Return(inst, pStk);
-                            }
-                            else
-                            {
-                                CBotFieldExpr* i = new CBotFieldExpr();     // new element
-                                i->SetToken(pp);                            // keeps the name of the token
-                                inst->AddNext3(i);                          // add after
-                                var = var->GetItem(p->GetString());         // get item correspondent
-                                if (var != nullptr)
-                                {
-                                    i->SetUniqNum(var->GetUniqNum());
-                                    if ( var->IsPrivate() &&
-                                     !pStk->GetBotCall()->m_bCompileClass)
-                                    {
-                                        pStk->SetError(TX_PRIVATE, pp);
-                                        goto err;
-                                    }
-                                }
-                            }
-
-
-                            if (var != nullptr)
-                            {
-                                p = p->GetNext();   // skips the name
-                                continue;
-                            }
-                            pStk->SetError(TX_NOITEM, p);
-                            goto err;
-                        }
-                        pStk->SetError(TX_DOT, p->GetStart());
-                        goto err;
-                    }
-                }
-
-                break;
-            }
-
-            pStk->SetCopyVar(var);  // place the copy of the variable on the stack (for type)
-            if (pStk->IsOk()) return pStack->Return(inst, pStk);
-        }
-        pStk->SetError(TX_UNDEFVAR, p);
-err:
-        delete inst;
-        return pStack->Return(nullptr, pStk);
-    }
-
-    return pStack->Return(nullptr, pStk);
-}
-
-CBotInstr* CBotExprVar::CompileMethode(CBotToken* &p, CBotCStack* pStack)
-{
-    CBotToken*    pp = p;
-    CBotCStack* pStk = pStack->TokenStack();
-
-    pStk->SetStartError(pp->GetStart());
-
-    // is it a variable ?
-    if (pp->GetType() == TokenTypVar)
-    {
-        CBotToken pthis("this");
-        CBotVar*     var = pStk->FindVar(pthis);
-        if (var == nullptr) return pStack->Return(nullptr, pStk);
-
-        CBotInstr* inst = new CBotExprVar();
-
-        // this is an element of the current class
-        // adds the equivalent of this. before
-
-        inst->SetToken(&pthis);
-        (static_cast<CBotExprVar*>(inst))->m_nIdent = -2;    // ident for this
-
-        CBotToken* pp = p;
-
-        if (pp->GetType() == TokenTypVar)
-        {
-            if (pp->GetNext()->GetType() == ID_OPENPAR)        // a method call?
-            {
-                CBotInstr* i = CBotInstrMethode::Compile(pp, pStk, var);
-                if (pStk->IsOk())
-                {
-                    inst->AddNext3(i);                            // add after
-                    p = pp;                                        // previous instruction
-                    return pStack->Return(inst, pStk);
-                }
-                pStk->SetError(0,0);                            // the error is not adressed here
-            }
-        }
-        delete inst;
-    }
-    return pStack->Return(nullptr, pStk);
-}
-
-
-// execute, making the value of a variable
-
-bool CBotExprVar::Execute(CBotStack* &pj)
-{
-    CBotVar*     pVar = nullptr;
-    CBotStack*     pile  = pj->AddStack(this);
-
-    CBotStack*     pile1 = pile;
-
-    if (pile1->GetState() == 0)
-    {
-        if (!ExecuteVar(pVar, pile, nullptr, true)) return false;        // Get the variable fields and indexes according
-
-        if (pVar) pile1->SetCopyVar(pVar);                            // place a copy on the stack
-        else
-        {
-            return pj->Return(pile1);
-        }
-        pile1->IncState();
-    }
-
-    pVar = pile1->GetVar();
-
-    if (pVar == nullptr)
-    {
-        return pj->Return(pile1);
-    }
-
-    if (pVar->IsUndefined())
-    {
-        CBotToken* pt = &m_token;
-        while (pt->GetNext() != nullptr) pt = pt->GetNext();
-        pile1->SetError(TX_NOTINIT, pt);
-        return pj->Return(pile1);
-    }
-    return pj->Return(pile1);   // operation completed
-}
-
-void CBotExprVar::RestoreState(CBotStack* &pj, bool bMain)
-{
-    if (!bMain) return;
-
-    CBotStack*     pile  = pj->RestoreStack(this);
-    if (pile == nullptr) return;
-
-    CBotStack*     pile1 = pile;
-
-    if (pile1->GetState() == 0)
-    {
-        RestoreStateVar(pile, bMain);   // retrieves the variable fields and indexes according
-        return;
-    }
-}
-
-// fetch a variable at runtime
-
-bool CBotExprVar::ExecuteVar(CBotVar* &pVar, CBotStack* &pj, CBotToken* prevToken, bool bStep)
-{
-    CBotStack*    pile = pj;
-    pj = pj->AddStack(this);
-
-    if (bStep && m_nIdent>0 && pj->IfStep()) return false;
-
-    pVar = pj->FindVar(m_nIdent, true);     // tries with the variable update if necessary
-    if (pVar == nullptr)
-    {
-#ifdef    _DEBUG
-        assert(0);
-#endif
-        pj->SetError(1, &m_token);
-        return false;
-    }
-    if ( m_next3 != nullptr &&
-         !m_next3->ExecuteVar(pVar, pj, &m_token, bStep, false) )
-            return false;   // field of an instance, table, methode
-
-    return pile->ReturnKeep(pj);    // does not put on stack but get the result if a method was called
-}
-
-
-// fetch variable at runtime
-
-void CBotExprVar::RestoreStateVar(CBotStack* &pj, bool bMain)
-{
-    pj = pj->RestoreStack(this);
-    if (pj == nullptr) return;
-
-    if (m_next3 != nullptr)
-         m_next3->RestoreStateVar(pj, bMain);
-}
-
 //////////////////////////////////////////////////////////////////////////////////////////
 
 // compile a list of parameters
diff --git a/src/CBot/CBot.h b/src/CBot/CBot.h
index 6b27e56..ffd2273 100644
--- a/src/CBot/CBot.h
+++ b/src/CBot/CBot.h
@@ -877,29 +877,6 @@ public:
     void        RestoreStateVar(CBotStack* &pj, bool bMain) override;
 };
 
-// expression for the variable name
-
-class CBotExprVar : public CBotInstr
-{
-private:
-    long        m_nIdent;
-    friend class CBotPostIncExpr;
-    friend class CBotPreIncExpr;
-
-public:
-                CBotExprVar();
-                ~CBotExprVar();
-    static
-    CBotInstr*    Compile(CBotToken* &p, CBotCStack* pStack, int privat=PR_PROTECT);
-    static
-    CBotInstr*    CompileMethode(CBotToken* &p, CBotCStack* pStack);
-
-    bool        Execute(CBotStack* &pj) override;
-    void        RestoreState(CBotStack* &pj, bool bMain) override;
-    bool        ExecuteVar(CBotVar* &pVar, CBotStack* &pile, CBotToken* prevToken, bool bStep);
-    void        RestoreStateVar(CBotStack* &pj, bool bMain) override;
-};
-
 #define    MAX(a,b)    ((a>b) ? a : b)
 
 
diff --git a/src/CBot/CBotInstr/CBotExprVar.cpp b/src/CBot/CBotInstr/CBotExprVar.cpp
new file mode 100644
index 0000000..5e0c568
--- /dev/null
+++ b/src/CBot/CBotInstr/CBotExprVar.cpp
@@ -0,0 +1,301 @@
+/*
+ * 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 "CBotExprVar.h"
+
+// Local include
+
+// Global include
+
+////////////////////////////////////////////////////////////////////////////////
+CBotExprVar::CBotExprVar()
+{
+    name    = "CBotExprVar";
+    m_nIdent = 0;
+}
+
+////////////////////////////////////////////////////////////////////////////////
+CBotExprVar::~CBotExprVar()
+{
+}
+
+////////////////////////////////////////////////////////////////////////////////
+CBotInstr* CBotExprVar::Compile(CBotToken* &p, CBotCStack* pStack, int privat)
+{
+//    CBotToken*    pDebut = p;
+    CBotCStack* pStk = pStack->TokenStack();
+
+    pStk->SetStartError(p->GetStart());
+
+    // is it a variable?
+    if (p->GetType() == TokenTypVar)
+    {
+        CBotInstr* inst = new CBotExprVar();    // create the object
+
+        inst->SetToken(p);
+
+        CBotVar*     var;
+
+        if (nullptr != (var = pStk->FindVar(p)))   // seek if known variable
+        {
+            int        ident = var->GetUniqNum();
+            (static_cast<CBotExprVar*>(inst))->m_nIdent = ident;     // identifies variable by its number
+
+            if (ident > 0 && ident < 9000)
+            {
+                if ( var->IsPrivate(privat) &&
+                     !pStk->GetBotCall()->m_bCompileClass)
+                {
+                    pStk->SetError(TX_PRIVATE, p);
+                    goto err;
+                }
+
+                // This is an element of the current class
+                // ads the equivalent of this. before
+                CBotToken token("this");
+                inst->SetToken(&token);
+                (static_cast<CBotExprVar*>(inst))->m_nIdent = -2;    // identificator for this
+
+                CBotFieldExpr* i = new CBotFieldExpr();     // new element
+                i->SetToken(p);     // keeps the name of the token
+                i->SetUniqNum(ident);
+                inst->AddNext3(i);  // added after
+            }
+
+            p = p->GetNext();   // next token
+
+            while (true)
+            {
+                if (var->GetType() == CBotTypArrayPointer)
+                {
+                    if (IsOfType( p, ID_OPBRK ))    // check if there is an aindex
+                    {
+                        CBotIndexExpr* i = new CBotIndexExpr();
+                        i->m_expr = CBotExpression::Compile(p, pStk);   // compile the formula
+                        inst->AddNext3(i);  // add to the chain
+
+                        var = (static_cast<CBotVarArray*>(var))->GetItem(0,true);    // gets the component [0]
+
+                        if (i->m_expr == nullptr)
+                        {
+                            pStk->SetError(TX_BADINDEX, p->GetStart());
+                            goto err;
+                        }
+                        if (!pStk->IsOk() || !IsOfType( p, ID_CLBRK ))
+                        {
+                            pStk->SetError(TX_CLBRK, p->GetStart());
+                            goto err;
+                        }
+                        continue;
+                    }
+                }
+                if (var->GetType(1) == CBotTypPointer)  // for classes
+                {
+                    if (IsOfType(p, ID_DOT))
+                    {
+                        CBotToken* pp = p;
+
+                        if (p->GetType() == TokenTypVar)    // must be a name
+                        {
+                            if (p->GetNext()->GetType() == ID_OPENPAR)  // a method call?
+                            {
+                                CBotInstr* i = CBotInstrMethode::Compile(p, pStk, var);
+                                if (!pStk->IsOk()) goto err;
+                                inst->AddNext3(i);  // added after
+                                return pStack->Return(inst, pStk);
+                            }
+                            else
+                            {
+                                CBotFieldExpr* i = new CBotFieldExpr();     // new element
+                                i->SetToken(pp);                            // keeps the name of the token
+                                inst->AddNext3(i);                          // add after
+                                var = var->GetItem(p->GetString());         // get item correspondent
+                                if (var != nullptr)
+                                {
+                                    i->SetUniqNum(var->GetUniqNum());
+                                    if ( var->IsPrivate() &&
+                                     !pStk->GetBotCall()->m_bCompileClass)
+                                    {
+                                        pStk->SetError(TX_PRIVATE, pp);
+                                        goto err;
+                                    }
+                                }
+                            }
+
+
+                            if (var != nullptr)
+                            {
+                                p = p->GetNext();   // skips the name
+                                continue;
+                            }
+                            pStk->SetError(TX_NOITEM, p);
+                            goto err;
+                        }
+                        pStk->SetError(TX_DOT, p->GetStart());
+                        goto err;
+                    }
+                }
+
+                break;
+            }
+
+            pStk->SetCopyVar(var);  // place the copy of the variable on the stack (for type)
+            if (pStk->IsOk()) return pStack->Return(inst, pStk);
+        }
+        pStk->SetError(TX_UNDEFVAR, p);
+err:
+        delete inst;
+        return pStack->Return(nullptr, pStk);
+    }
+
+    return pStack->Return(nullptr, pStk);
+}
+
+////////////////////////////////////////////////////////////////////////////////
+CBotInstr* CBotExprVar::CompileMethode(CBotToken* &p, CBotCStack* pStack)
+{
+    CBotToken*    pp = p;
+    CBotCStack* pStk = pStack->TokenStack();
+
+    pStk->SetStartError(pp->GetStart());
+
+    // is it a variable ?
+    if (pp->GetType() == TokenTypVar)
+    {
+        CBotToken pthis("this");
+        CBotVar*     var = pStk->FindVar(pthis);
+        if (var == nullptr) return pStack->Return(nullptr, pStk);
+
+        CBotInstr* inst = new CBotExprVar();
+
+        // this is an element of the current class
+        // adds the equivalent of this. before
+
+        inst->SetToken(&pthis);
+        (static_cast<CBotExprVar*>(inst))->m_nIdent = -2;    // ident for this
+
+        CBotToken* pp = p;
+
+        if (pp->GetType() == TokenTypVar)
+        {
+            if (pp->GetNext()->GetType() == ID_OPENPAR)        // a method call?
+            {
+                CBotInstr* i = CBotInstrMethode::Compile(pp, pStk, var);
+                if (pStk->IsOk())
+                {
+                    inst->AddNext3(i);                            // add after
+                    p = pp;                                        // previous instruction
+                    return pStack->Return(inst, pStk);
+                }
+                pStk->SetError(0,0);                            // the error is not adressed here
+            }
+        }
+        delete inst;
+    }
+    return pStack->Return(nullptr, pStk);
+}
+
+////////////////////////////////////////////////////////////////////////////////
+bool CBotExprVar::Execute(CBotStack* &pj)
+{
+    CBotVar*     pVar = nullptr;
+    CBotStack*     pile  = pj->AddStack(this);
+
+    CBotStack*     pile1 = pile;
+
+    if (pile1->GetState() == 0)
+    {
+        if (!ExecuteVar(pVar, pile, nullptr, true)) return false;        // Get the variable fields and indexes according
+
+        if (pVar) pile1->SetCopyVar(pVar);                            // place a copy on the stack
+        else
+        {
+            return pj->Return(pile1);
+        }
+        pile1->IncState();
+    }
+
+    pVar = pile1->GetVar();
+
+    if (pVar == nullptr)
+    {
+        return pj->Return(pile1);
+    }
+
+    if (pVar->IsUndefined())
+    {
+        CBotToken* pt = &m_token;
+        while (pt->GetNext() != nullptr) pt = pt->GetNext();
+        pile1->SetError(TX_NOTINIT, pt);
+        return pj->Return(pile1);
+    }
+    return pj->Return(pile1);   // operation completed
+}
+
+////////////////////////////////////////////////////////////////////////////////
+void CBotExprVar::RestoreState(CBotStack* &pj, bool bMain)
+{
+    if (!bMain) return;
+
+    CBotStack*     pile  = pj->RestoreStack(this);
+    if (pile == nullptr) return;
+
+    CBotStack*     pile1 = pile;
+
+    if (pile1->GetState() == 0)
+    {
+        RestoreStateVar(pile, bMain);   // retrieves the variable fields and indexes according
+        return;
+    }
+}
+
+////////////////////////////////////////////////////////////////////////////////
+bool CBotExprVar::ExecuteVar(CBotVar* &pVar, CBotStack* &pj, CBotToken* prevToken, bool bStep)
+{
+    CBotStack*    pile = pj;
+    pj = pj->AddStack(this);
+
+    if (bStep && m_nIdent>0 && pj->IfStep()) return false;
+
+    pVar = pj->FindVar(m_nIdent, true);     // tries with the variable update if necessary
+    if (pVar == nullptr)
+    {
+#ifdef    _DEBUG
+        assert(0);
+#endif
+        pj->SetError(1, &m_token);
+        return false;
+    }
+    if ( m_next3 != nullptr &&
+         !m_next3->ExecuteVar(pVar, pj, &m_token, bStep, false) )
+            return false;   // field of an instance, table, methode
+
+    return pile->ReturnKeep(pj);    // does not put on stack but get the result if a method was called
+}
+
+////////////////////////////////////////////////////////////////////////////////
+void CBotExprVar::RestoreStateVar(CBotStack* &pj, bool bMain)
+{
+    pj = pj->RestoreStack(this);
+    if (pj == nullptr) return;
+
+    if (m_next3 != nullptr)
+         m_next3->RestoreStateVar(pj, bMain);
+}
diff --git a/src/CBot/CBotInstr/CBotExprVar.h b/src/CBot/CBotInstr/CBotExprVar.h
new file mode 100644
index 0000000..46017e5
--- /dev/null
+++ b/src/CBot/CBotInstr/CBotExprVar.h
@@ -0,0 +1,101 @@
+/*
+ * 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 CBotExprVar class Expression for the variable name. Compile a
+ * variable name check that it is known on the stack and it has been initialized.
+ */
+class CBotExprVar : public CBotInstr
+{
+public:
+
+    /*!
+     * \brief CBotExprVar
+     */
+    CBotExprVar();
+
+    /*!
+     * \brief ~CBotExprVar
+     */
+    ~CBotExprVar();
+
+    /*!
+     * \brief Compile
+     * \param p
+     * \param pStack
+     * \param privat
+     * \return
+     */
+    static CBotInstr* Compile(CBotToken* &p, CBotCStack* pStack, int privat=PR_PROTECT);
+
+    /*!
+     * \brief CompileMethode
+     * \param p
+     * \param pStack
+     * \return
+     */
+    static CBotInstr* CompileMethode(CBotToken* &p, CBotCStack* pStack);
+
+    /*!
+     * \brief Execute Execute, making the value of a variable.
+     * \param pj
+     * \return
+     */
+    bool Execute(CBotStack* &pj) override;
+
+    /*!
+     * \brief RestoreState
+     * \param pj
+     * \param bMain
+     */
+    void RestoreState(CBotStack* &pj, bool bMain) override;
+
+    /*!
+     * \brief ExecuteVar Fetch a variable at runtime.
+     * \param pVar
+     * \param pile
+     * \param prevToken
+     * \param bStep
+     * \return
+     */
+    bool ExecuteVar(CBotVar* &pVar, CBotStack* &pile, CBotToken* prevToken, bool bStep);
+
+    /*!
+     * \brief RestoreStateVar Fetch variable at runtime.
+     * \param pj
+     * \param bMain
+     */
+    void RestoreStateVar(CBotStack* &pj, bool bMain) override;
+
+private:
+    long m_nIdent;
+    friend class CBotPostIncExpr;
+    friend class CBotPreIncExpr;
+
+};
diff --git a/src/CBot/CBotInstr/CBotPostIncExpr.cpp b/src/CBot/CBotInstr/CBotPostIncExpr.cpp
index a0b24fc..cb146ca 100644
--- a/src/CBot/CBotInstr/CBotPostIncExpr.cpp
+++ b/src/CBot/CBotInstr/CBotPostIncExpr.cpp
@@ -19,6 +19,7 @@
 
 // Modules inlcude
 #include "CBotPostIncExpr.h"
+#include "CBotExprVar.h"
 
 // Local include
 
diff --git a/src/CBot/CBotInstr/CBotPreIncExpr.cpp b/src/CBot/CBotInstr/CBotPreIncExpr.cpp
index 700bbff..073e0d4 100644
--- a/src/CBot/CBotInstr/CBotPreIncExpr.cpp
+++ b/src/CBot/CBotInstr/CBotPreIncExpr.cpp
@@ -19,6 +19,7 @@
 
 // Modules inlcude
 #include "CBotPreIncExpr.h"
+#include "CBotExprVar.h"
 
 // Local include
 
diff --git a/src/CBot/CMakeLists.txt b/src/CBot/CMakeLists.txt
index 158478b..2908c5e 100644
--- a/src/CBot/CMakeLists.txt
+++ b/src/CBot/CMakeLists.txt
@@ -28,6 +28,7 @@ set(SOURCES
     CBotInstr/CBotLeftExprVar.cpp
     CBotInstr/CBotPreIncExpr.cpp
     CBotInstr/CBotPostIncExpr.cpp
+    CBotInstr/CBotExprVar.cpp
 )
 
 # Includes

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/colobot.git



More information about the Pkg-games-commits mailing list