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

Better handling of exceptions for extern usage
All checks were successful
continuous-integration/drone/push Build is passing
Details

Browse Source
This commit is contained in:
Deukhoofd
2019-07-27 19:45:15 +02:00
parent 586dd994e2
commit 2b248101d5
2 changed files with 73 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/Script.cpp
View File

@@ -7,6 +7,7 @@
#include "Parser/Lexer.hpp"
#include "Parser/Parser.hpp"
#include "Binder/Binder.hpp"
#include "EvaluateResult.hpp"
Porygon::Script* Porygon::Script::Create(const u16string& script) {
return new Script(script);
@@ -103,15 +104,19 @@ Porygon::Script::Script(shared_ptr<BoundScriptStatement> boundScript,
_evaluator = new Evaluator(_scriptVariables);
}
extern "C" {
Porygon::Script* CreateScript(char16_t * s){
return Porygon::Script::Create(s);
}
const EvalValue* EvaluateScript(Porygon::Script* script){
auto result = script -> Evaluate();
return result.Clone();
Porygon::EvaluateResult* EvaluateScript(Porygon::Script* script){
try{
auto result = script -> Evaluate();
return new Porygon::EvaluateResult(result.Take());
}
catch (const EvaluationException& e){
return new Porygon::EvaluateResult(e.what());
}
}
bool HasVariable(Porygon::Script* script, const char16_t* key){
@@ -126,8 +131,18 @@ extern "C" {
return script->HasFunction(key);
}
const EvalValue* CallFunction(Porygon::Script* script, const char16_t* key, EvalValue* parameters[], int parameterCount){
std::vector<EvalValue*> v(parameters, parameters + parameterCount);
return script->CallFunction(key, v);
Porygon::EvaluateResult* CallFunction(Porygon::Script* script, const char16_t* key, EvalValue* parameters[], int parameterCount){
try{
std::vector<EvalValue*> v(parameters, parameters + parameterCount);
auto result = script->CallFunction(key, v);
return new Porygon::EvaluateResult(result);
}
catch (const EvaluationException& e){
return new Porygon::EvaluateResult(e.what());
}
}
const char * GetResultError(Porygon::EvaluateResult * result){
return result->GetError();
}
}