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

Move libeval to kicommon

This commit is contained in:
Marek Roszko 2024-05-07 20:44:19 -04:00
parent f1e8495dc9
commit f87bd91d61
3 changed files with 16 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
common/CMakeLists.txt
View File

@ -815,7 +815,7 @@ add_dependencies( pcbcommon delaunator )
# The lemon grammar for the numeric evaluator # The lemon grammar for the numeric evaluator
generate_lemon_grammar( generate_lemon_grammar(
common kicommon
libeval libeval
libeval/numeric_evaluator.cpp libeval/numeric_evaluator.cpp
libeval/grammar.lemon libeval/grammar.lemon
@ -823,7 +823,7 @@ generate_lemon_grammar(
# The lemon grammar for the expression compiler # The lemon grammar for the expression compiler
generate_lemon_grammar( generate_lemon_grammar(
common kicommon
libeval_compiler libeval_compiler
libeval_compiler/libeval_compiler.cpp libeval_compiler/libeval_compiler.cpp
libeval_compiler/grammar.lemon libeval_compiler/grammar.lemon

2
include/libeval/numeric_evaluator.h
View File

@ -90,7 +90,7 @@ namespace numEval
} // namespace numEval } // namespace numEval
class NUMERIC_EVALUATOR class KICOMMON_API NUMERIC_EVALUATOR
{ {
enum class Unit { Invalid, UM, MM, CM, Inch, Mil, Degrees, SI }; enum class Unit { Invalid, UM, MM, CM, Inch, Mil, Degrees, SI };

25
include/libeval_compiler/libeval_compiler.h
View File

@ -27,6 +27,7 @@
#include <string> #include <string>
#include <stack> #include <stack>
#include <kicommon.h>
#include <base_units.h> #include <base_units.h>
#include <wx/intl.h> #include <wx/intl.h>
@ -69,7 +70,7 @@ enum COMPILATION_STAGE
CST_RUNTIME CST_RUNTIME
}; };
struct ERROR_STATUS struct KICOMMON_API ERROR_STATUS
{ {
bool pendingError = false; bool pendingError = false;
@ -107,7 +108,7 @@ class VAR_REF;
typedef std::function<void( CONTEXT*, void* )> FUNC_CALL_REF; typedef std::function<void( CONTEXT*, void* )> FUNC_CALL_REF;
struct T_TOKEN_VALUE struct KICOMMON_API T_TOKEN_VALUE
{ {
wxString* str; wxString* str;
double num; double num;
@ -118,7 +119,7 @@ struct T_TOKEN_VALUE
constexpr T_TOKEN_VALUE defaultTokenValue = { nullptr, 0.0, 0 }; constexpr T_TOKEN_VALUE defaultTokenValue = { nullptr, 0.0, 0 };
struct T_TOKEN struct KICOMMON_API T_TOKEN
{ {
int token; int token;
T_TOKEN_VALUE value; T_TOKEN_VALUE value;
@ -128,7 +129,7 @@ struct T_TOKEN
constexpr T_TOKEN defaultToken = { TR_UNDEFINED, defaultTokenValue }; constexpr T_TOKEN defaultToken = { TR_UNDEFINED, defaultTokenValue };
class TREE_NODE class KICOMMON_API TREE_NODE
{ {
public: public:
T_TOKEN_VALUE value; T_TOKEN_VALUE value;
@ -151,7 +152,7 @@ public:
TREE_NODE* newNode( LIBEVAL::COMPILER* compiler, int op, TREE_NODE* newNode( LIBEVAL::COMPILER* compiler, int op,
const T_TOKEN_VALUE& value = defaultTokenValue ); const T_TOKEN_VALUE& value = defaultTokenValue );
class UNIT_RESOLVER class KICOMMON_API UNIT_RESOLVER
{ {
public: public:
UNIT_RESOLVER() UNIT_RESOLVER()
@ -181,7 +182,7 @@ public:
}; };
class VALUE class KICOMMON_API VALUE
{ {
public: public:
VALUE() : VALUE() :
@ -289,7 +290,7 @@ private:
std::function<wxString()> m_lambdaStr; std::function<wxString()> m_lambdaStr;
}; };
class VAR_REF class KICOMMON_API VAR_REF
{ {
public: public:
VAR_REF() {}; VAR_REF() {};
@ -300,7 +301,7 @@ public:
}; };
class CONTEXT class KICOMMON_API CONTEXT
{ {
public: public:
CONTEXT() : CONTEXT() :
@ -369,7 +370,7 @@ private:
}; };
class UCODE class KICOMMON_API UCODE
{ {
public: public:
virtual ~UCODE(); virtual ~UCODE();
@ -398,7 +399,7 @@ protected:
}; };
class UOP class KICOMMON_API UOP
{ {
public: public:
UOP( int op, std::unique_ptr<VALUE> value ) : UOP( int op, std::unique_ptr<VALUE> value ) :
@ -436,7 +437,7 @@ private:
std::unique_ptr<VALUE> m_value; std::unique_ptr<VALUE> m_value;
}; };
class TOKENIZER class KICOMMON_API TOKENIZER
{ {
public: public:
void Restart( const wxString& aStr ) void Restart( const wxString& aStr )
@ -487,7 +488,7 @@ private:
}; };
class COMPILER class KICOMMON_API COMPILER
{ {
public: public:
COMPILER(); COMPILER();