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

Fixed error string from userdata return values not persisting long enough.
continuous-integration/drone/push Build is passing Details

This commit is contained in:
Deukhoofd 2019-09-28 13:35:32 +02:00
parent f8cbe502c9
commit a32b76d904
Signed by: Deukhoofd
GPG Key ID: ADF2E9256009EDCE
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/UserData/UserDataReturnValue.cpp
View File

@ -6,7 +6,7 @@ extern "C"{
} }
Porygon::UserData::UserDataReturnValue* ErrorValue(const char* message){ Porygon::UserData::UserDataReturnValue* ErrorValue(const char* message){
return new Porygon::UserData::UserDataReturnValue(message); return new Porygon::UserData::UserDataReturnValue(string(message));
} }
} }

8
src/UserData/UserDataReturnValue.hpp
View File

@ -8,13 +8,17 @@ namespace Porygon::UserData {
struct UserDataReturnValue { struct UserDataReturnValue {
bool _success; bool _success;
union { union {
const char *_message; string _message;
const Evaluation::EvalValue *_value; const Evaluation::EvalValue *_value;
}; };
public: public:
UserDataReturnValue(Evaluation::EvalValue *value) : _success(true), _value(value) {} UserDataReturnValue(Evaluation::EvalValue *value) : _success(true), _value(value) {}
UserDataReturnValue(const Evaluation::EvalValue *value) : _success(true), _value(value) {} UserDataReturnValue(const Evaluation::EvalValue *value) : _success(true), _value(value) {}
UserDataReturnValue(const char *message) : _success(false), _message(message) {} UserDataReturnValue(string message) : _success(false), _message(message) {}
~UserDataReturnValue(){
}
inline const Evaluation::EvalValue *Evaluate() const{ inline const Evaluation::EvalValue *Evaluate() const{
if (_success) { if (_success) {