haskal
/
kicad
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

PCB_EXPR_EVALUATOR: post-rebase fixes

This commit is contained in:
Tomasz Wlostowski 2020-08-12 00:16:45 +02:00
parent e907e43bd9
commit c607a60e3b
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pcbnew/pcb_expr_evaluator.h
View File

@ -51,7 +51,7 @@ public:
class PCB_EXPR_CONTEXT : public LIBEVAL::CONTEXT class PCB_EXPR_CONTEXT : public LIBEVAL::CONTEXT
{ {
public: public:
PCB_EXPR_CONTEXT( PCB_LAYER_ID aLayer ) : PCB_EXPR_CONTEXT( PCB_LAYER_ID aLayer = UNDEFINED_LAYER ) :
m_layer( aLayer ) m_layer( aLayer )
{ {
m_items[0] = nullptr; m_items[0] = nullptr;
@ -119,8 +119,6 @@ private:
class PCB_EXPR_BUILTIN_FUNCTIONS class PCB_EXPR_BUILTIN_FUNCTIONS
{ {
public: public:
using FPTR = LIBEVAL::UCODE::FUNC_PTR;
PCB_EXPR_BUILTIN_FUNCTIONS(); PCB_EXPR_BUILTIN_FUNCTIONS();
static PCB_EXPR_BUILTIN_FUNCTIONS& Instance() static PCB_EXPR_BUILTIN_FUNCTIONS& Instance()
@ -129,9 +127,9 @@ public:
return self; return self;
} }
LIBEVAL::FUNC_CALL_REF Get( const std::string &name ) LIBEVAL::FUNC_CALL_REF Get( const wxString &name )
{ {
return m_funcs[ name ]; return m_funcs[ name ];
} }
const wxArrayString GetSignatures() const const wxArrayString GetSignatures() const
@ -140,7 +138,7 @@ public:
} }
private: private:
std::map<std::string, LIBEVAL::FUNC_CALL_REF> m_funcs; std::map<wxString, LIBEVAL::FUNC_CALL_REF> m_funcs;
wxArrayString m_funcSigs; wxArrayString m_funcSigs;
}; };
@ -149,7 +147,7 @@ private:
class PCB_EXPR_COMPILER : public LIBEVAL::COMPILER class PCB_EXPR_COMPILER : public LIBEVAL::COMPILER
{ {
public: public:
PCB_EXPR_COMPILER( REPORTER* aReporter, int aSourceLine, int aSourcePos ); PCB_EXPR_COMPILER();
}; };