Implements userdata function support
Some checks failed
continuous-integration/drone/push Build is failing
Some checks failed
continuous-integration/drone/push Build is failing
This commit is contained in:
@@ -9,6 +9,7 @@
|
||||
#include "EvalValues/TableEvalValue.hpp"
|
||||
#include "../Binder/BoundExpressions/BoundTableExpression.hpp"
|
||||
#include "../TableScriptType.hpp"
|
||||
#include "../UserData/UserDataFunction.hpp"
|
||||
|
||||
using namespace std;
|
||||
using namespace Porygon::Binder;
|
||||
@@ -274,7 +275,7 @@ namespace Porygon::Evaluation {
|
||||
|
||||
const shared_ptr<EvalValue> Evaluator::EvaluateFunctionCallExpression(const BoundExpression *expression) {
|
||||
auto functionCall = (BoundFunctionCallExpression *) expression;
|
||||
auto function = dynamic_pointer_cast<ScriptFunctionEvalValue>(
|
||||
auto function = dynamic_pointer_cast<GenericFunctionEvalValue>(
|
||||
this->EvaluateExpression(functionCall->GetFunctionExpression()));
|
||||
|
||||
auto boundParameters = functionCall->GetParameters();
|
||||
@@ -283,24 +284,35 @@ namespace Porygon::Evaluation {
|
||||
parameters[i] = this->EvaluateExpression(boundParameters->at(i));
|
||||
}
|
||||
|
||||
auto type = std::dynamic_pointer_cast<FunctionScriptType>(function->GetType());
|
||||
auto type = std::dynamic_pointer_cast<GenericFunctionScriptType>(function->GetType());
|
||||
auto parameterTypes = type->GetParameterTypes();
|
||||
auto parameterKeys = type->GetParameterKeys();
|
||||
auto originalScope = this->_evaluationScope;
|
||||
this->_evaluationScope = function->GetScope();
|
||||
if (type -> IsScriptFunction()){
|
||||
auto scriptFunctionType = std::dynamic_pointer_cast<FunctionScriptType>(type);
|
||||
auto parameterKeys = scriptFunctionType->GetParameterKeys();
|
||||
auto originalScope = this->_evaluationScope;
|
||||
auto scriptFunction = dynamic_pointer_cast<ScriptFunctionEvalValue>(function);
|
||||
this->_evaluationScope = scriptFunction->GetScope();
|
||||
|
||||
for (int i = 0; i < parameterTypes.size() && i < parameterKeys.size() && i < parameters.size(); i++) {
|
||||
auto parameter = parameters[i];
|
||||
auto key = parameterKeys.at(i);
|
||||
this->_evaluationScope->CreateVariable(key.get(), parameter->Clone());
|
||||
for (int i = 0; i < parameterTypes.size() && i < parameterKeys.size() && i < parameters.size(); i++) {
|
||||
auto parameter = parameters[i];
|
||||
auto key = parameterKeys.at(i);
|
||||
this->_evaluationScope->CreateVariable(key.get(), parameter->Clone());
|
||||
}
|
||||
this->EvaluateBlockStatement(scriptFunction->GetInnerBlock().get());
|
||||
this->_evaluationScope = originalScope;
|
||||
|
||||
this->_hasReturned = false;
|
||||
auto r = this->_returnValue;
|
||||
this->_returnValue = nullptr;
|
||||
return r;
|
||||
} else{
|
||||
auto userDataFunction = dynamic_pointer_cast<UserData::UserDataFunction>(function);
|
||||
EvalValue* arr[parameters.size()];
|
||||
for (int i = 0; i < parameters.size(); i++){
|
||||
arr[i] = parameters[i].get();
|
||||
}
|
||||
return shared_ptr<EvalValue>(userDataFunction -> Call(arr, parameters.size()));
|
||||
}
|
||||
this->EvaluateBlockStatement(function->GetInnerBlock().get());
|
||||
this->_evaluationScope = originalScope;
|
||||
|
||||
this->_hasReturned = false;
|
||||
auto r = this->_returnValue;
|
||||
this->_returnValue = nullptr;
|
||||
return r;
|
||||
}
|
||||
|
||||
const shared_ptr<EvalValue> Evaluator::EvaluateFunction(const ScriptFunctionEvalValue *function,
|
||||
|
||||
Reference in New Issue
Block a user