[colobot] 30/74: Syntax sugar: Accessing members of returned objects (#808)

[Didier Raboud]

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

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

commit b9d4d57e335bee1f2eefde2ec53428948449d868
Merge: d83553c a205eac
Author: krzys-h <krzys_h at interia.pl>
Date:   Tue Aug 9 20:28:37 2016 +0200

    Syntax sugar: Accessing members of returned objects (#808)
    
    Conflicts:
    	src/CBot/CBotInstr/CBotInstrMethode.h

 src/CBot/CBotInstr/CBotExprRetVar.cpp              | 206 +++++++++++++++++
 .../{CBotInstrCall.h => CBotExprRetVar.h}          |  30 +--
 src/CBot/CBotInstr/CBotIndexExpr.h                 |   1 +
 src/CBot/CBotInstr/CBotInstrCall.cpp               |  93 ++++----
 src/CBot/CBotInstr/CBotInstrCall.h                 |   4 +
 src/CBot/CBotInstr/CBotInstrMethode.cpp            |  43 +++-
 src/CBot/CBotInstr/CBotInstrMethode.h              |   3 +
 src/CBot/CMakeLists.txt                            |   2 +
 test/unit/CBot/CBot_test.cpp                       | 251 +++++++++++++++++++++
 9 files changed, 567 insertions(+), 66 deletions(-)

diff --cc src/CBot/CBotInstr/CBotInstrMethode.h
index 10bfe49,fb2b205..a74a49a
--- a/src/CBot/CBotInstr/CBotInstrMethode.h
+++ b/src/CBot/CBotInstr/CBotInstrMethode.h
@@@ -83,9 -83,10 +83,12 @@@ private
      long m_MethodeIdent;
      //! Name of the class.
      std::string m_className;
 +    //! Variable ID
 +    long m_thisIdent;
  
+     //! Instruction to return a member of the returned object.
+     CBotInstr* m_exprRetVar;
+ 
  };
  
  } // namespace CBot

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