ShuriZma
/
stella
mirror of https://github.com/stella-emu/stella.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

It looks like I can use std::function in expressions after all (keeping 

in mind that YACC stuff deals strictly in pointers, and can't be changed).


git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@3081 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
This commit is contained in:
stephena 2014-11-17 01:50:19 +00:00
parent f0539ae7e1
commit 086658799d
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/debugger/DebuggerExpressions.hxx
View File

@ -20,6 +20,8 @@
#ifndef DEBUGGER_EXPRESSIONS_HXX #ifndef DEBUGGER_EXPRESSIONS_HXX
#define DEBUGGER_EXPRESSIONS_HXX #define DEBUGGER_EXPRESSIONS_HXX
#include <functional>
#include "bspf.hxx" #include "bspf.hxx"
#include "CartDebug.hxx" #include "CartDebug.hxx"
#include "CpuDebug.hxx" #include "CpuDebug.hxx"
@ -104,10 +106,10 @@ class CpuMethodExpression : public Expression
public: public:
CpuMethodExpression(CpuMethod method) : Expression(), myMethod(method) { } CpuMethodExpression(CpuMethod method) : Expression(), myMethod(method) { }
uInt16 evaluate() const uInt16 evaluate() const
{ return (Debugger::debugger().cpuDebug().*myMethod)(); } { return myMethod(Debugger::debugger().cpuDebug()); }
private: private:
CpuMethod myMethod; std::function<int(const CpuDebug&)> myMethod;
}; };
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
@ -286,10 +288,10 @@ class CartMethodExpression : public Expression
public: public:
CartMethodExpression(CartMethod method) : Expression(), myMethod(method) { } CartMethodExpression(CartMethod method) : Expression(), myMethod(method) { }
uInt16 evaluate() const uInt16 evaluate() const
{ return (Debugger::debugger().cartDebug().*myMethod)(); } { return myMethod(Debugger::debugger().cartDebug()); }
private: private:
CartMethod myMethod; std::function<int(CartDebug&)> myMethod;
}; };
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
@ -316,10 +318,10 @@ class TiaMethodExpression : public Expression
public: public:
TiaMethodExpression(TiaMethod method) : Expression(), myMethod(method) { } TiaMethodExpression(TiaMethod method) : Expression(), myMethod(method) { }
uInt16 evaluate() const uInt16 evaluate() const
{ return (Debugger::debugger().tiaDebug().*myMethod)(); } { return myMethod(Debugger::debugger().tiaDebug()); }
private: private:
TiaMethod myMethod; std::function<int(const TIADebug&)> myMethod;
}; };
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -