Deukhoofd/PorygonLang
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Greatly simplify handling numerical eval values, using std::variant
All checks were successful
continuous-integration/drone/push Build is passing
Details

Browse Source
This commit is contained in:
Deukhoofd
2019-09-07 10:57:09 +02:00
parent 7b5d03ed74
commit 5d700aa0e9
12 changed files with 183 additions and 393 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/UserData/UserDataCollections/UserDataCollectionRangeIterator.hpp
View File

@@ -18,7 +18,7 @@ namespace Porygon::UserData{
}
const Evaluation::EvalValue* GetCurrent() final{
return new Evaluation::IntegerEvalValue(_current);
return new Evaluation::NumericEvalValue(static_cast<int64_t>(_current));
}
bool MoveNext() final{
_current ++;

4
src/UserData/UserDataTemplates.hpp
View File

@@ -51,11 +51,11 @@
#define PORYGON_INTEGER_FIELD(fieldName) \
PORYGON_FIELD(fieldName, PORYGON_INTEGER_TYPE, \
const Porygon::Evaluation::IntegerEvalValue(((T_USERDATA*)obj)->fieldName), val->EvaluateInteger())
const Porygon::Evaluation::NumericEvalValue(((T_USERDATA*)obj)->fieldName), val->EvaluateInteger())
#define PORYGON_READONLY_INTEGER_FIELD(fieldName) \
PORYGON_READONLY_FIELD(fieldName, PORYGON_INTEGER_TYPE, \
Porygon::Evaluation::IntegerEvalValue(((T_USERDATA*)obj)->fieldName))
Porygon::Evaluation::NumericEvalValue(((T_USERDATA*)obj)->fieldName))
#define PORYGON_FLOAT_FIELD(fieldName) \
PORYGON_FIELD(fieldName, PORYGON_FLOAT_TYPE, \