Better handling of casting

src/Binder/Binder.cpp

@@ -590,7 +590,7 @@ namespace Porygon::Binder {
             boundParameters[i] = this -> BindExpression(givenParameters->at(i));
         }
 
-        auto functionOption = functionType->GetFunctionOption(this->_scriptData->Diagnostics, boundParameters);
+        auto functionOption = functionType->GetFunctionOption(this->_scriptData->Diagnostics, &boundParameters);
         if (functionOption == nullptr){
             this->_scriptData->Diagnostics->LogError(Diagnostics::DiagnosticCode::InvalidFunctionParameters,
                                                      expression->GetStartPosition(),

src/Binder/BoundExpressions/BoundExpression.hpp

@@ -28,6 +28,7 @@ namespace Porygon::Binder {
         NumericalTable,
         Table,
         Require,
+        ImplicitCast,
     };
 
     class BoundExpression {
@@ -332,6 +333,28 @@ namespace Porygon::Binder {
         }
     };
 
+    class BoundImplicitCastExpression : public BoundExpression {
+        const BoundExpression* _expression;
+    public:
+        BoundImplicitCastExpression(BoundExpression* expression, shared_ptr<const ScriptType> castType)
+        : BoundExpression(expression->GetStartPosition(), expression->GetLength(), castType),
+            _expression(expression)
+        {}
+
+        const BoundExpression* GetExpression() const{
+            return _expression;
+        }
+
+        ~BoundImplicitCastExpression() final {
+            delete _expression;
+        }
+
+        [[nodiscard]]
+        inline BoundExpressionKind GetKind() const final {
+            return BoundExpressionKind::ImplicitCast;
+        }
+    };
+
 }
 
 #endif //PORYGONLANG_BOUNDEXPRESSION_HPP

src/Evaluator/EvalValues/EvalValue.hpp

@@ -87,6 +87,11 @@ namespace Porygon::Evaluation {
         virtual EvalValue* UnaryOperation(Binder::BoundUnaryOperation operation) const{
             throw EvaluationException("Unary operations are not implemented for this type.");
         }
+
+        [[nodiscard]]
+        virtual EvalValue* Cast(shared_ptr<const ScriptType> castType) const{
+            throw new EvaluationException("Casting to invalid type.");
+        }
     };
 
     class BooleanEvalValue : public EvalValue {

src/Evaluator/EvalValues/NumericEvalValue.cpp

@@ -176,4 +176,24 @@ namespace Porygon::Evaluation {
             }
         }
     }
+
+    EvalValue *IntegerEvalValue::Cast(shared_ptr<const ScriptType> castType) const {
+        if (castType->GetClass() == TypeClass::Number){
+            auto num = static_pointer_cast<const NumericScriptType>(castType);
+            if (num->IsFloat()){
+                return new FloatEvalValue(GetIntegerValue());
+            }
+        }
+        return EvalValue::Cast(castType);
+    }
+
+    EvalValue *FloatEvalValue::Cast(shared_ptr<const ScriptType> castType) const {
+        if (castType->GetClass() == TypeClass::Number){
+            auto num = static_pointer_cast<const NumericScriptType>(castType);
+            if (!num->IsFloat()){
+                return new IntegerEvalValue(GetFloatValue());
+            }
+        }
+        return EvalValue::Cast(castType);
+    }
 }

src/Evaluator/EvalValues/NumericEvalValue.hpp

@@ -68,11 +68,6 @@ namespace Porygon::Evaluation {
             return _value;
         }
 
-        [[nodiscard]]
-        inline double EvaluateFloat() const final {
-            return static_cast<double>(_value);
-        }
-
         [[nodiscard]]
         inline std::u16string EvaluateString() const final{
             return Utilities::StringUtils::IntToString(_value);
@@ -98,14 +93,17 @@ namespace Porygon::Evaluation {
                 default: throw;
             }
         }
+
+        [[nodiscard]]
+        EvalValue* Cast(shared_ptr<const ScriptType> castType) const final;
     };
 
     class FloatEvalValue : public NumericEvalValue {
         const double _value;
 
         [[nodiscard]]
-        inline int64_t GetIntegerValue() const final {
-            return _value;
+        int64_t GetIntegerValue() const final {
+            throw EvaluationException("Attempting to retrieve int from float eval value.");
         }
 
         [[nodiscard]]
@@ -127,11 +125,6 @@ namespace Porygon::Evaluation {
             return _value;
         }
 
-        [[nodiscard]]
-        inline int64_t EvaluateInteger() const final {
-            return static_cast<int64_t >(_value);
-        }
-
         [[nodiscard]]
         inline std::u16string EvaluateString() const final{
             return Utilities::StringUtils::FloatToString(_value);
@@ -196,6 +189,9 @@ namespace Porygon::Evaluation {
                 default: throw;
             }
         }
+
+        [[nodiscard]]
+        EvalValue* Cast(shared_ptr<const ScriptType> castType) const final;
     };
 }
 

src/Evaluator/Evaluator.cpp

@@ -257,6 +257,8 @@ namespace Porygon::Evaluation {
                 return this->EvaluateComplexTableExpression(expression);
             case BoundExpressionKind::Require:
                 return this -> EvaluateRequireExpression(expression);
+            case BoundExpressionKind::ImplicitCast:
+                return this -> EvaluateImplicitCastExpression(expression);
         }
     }
 
@@ -412,4 +414,10 @@ namespace Porygon::Evaluation {
             return result.Take();
         }
     }
+
+    EvalValuePointer Evaluator::EvaluateImplicitCastExpression(const BoundExpression *pExpression) {
+        auto iCExpression = dynamic_cast<const BoundImplicitCastExpression*>(pExpression);
+        auto val = EvaluateExpression(iCExpression->GetExpression());
+        return val->Cast(iCExpression->GetType());
+    }
 }

src/Evaluator/Evaluator.hpp

@@ -48,6 +48,7 @@ namespace Porygon::Evaluation{
         EvalValuePointer EvaluateComplexTableExpression(const BoundExpression *expression);
 
         EvalValuePointer EvaluateRequireExpression(const BoundExpression* expression);
+        EvalValuePointer EvaluateImplicitCastExpression(const BoundExpression *pExpression);
 
         EvalValuePointer GetVariable(const BoundVariableExpression *expression);
     public:

src/ScriptTypes/FunctionScriptType.hpp

@@ -36,23 +36,26 @@ namespace Porygon {
         }
 
         bool IsValid(const shared_ptr<Diagnostics::DiagnosticsHolder>& diagnostics,
-                const vector<Binder::BoundExpression *>& parameters){
-            if (parameters.size() != _parameterTypes.size()){
+                vector<Binder::BoundExpression *>* parameters){
+            if (parameters->size() != _parameterTypes.size()){
                 return false;
             }
-            for (size_t i = 0; i < parameters.size(); i++){
+            for (size_t i = 0; i < parameters->size(); i++){
                 if (_parameterTypes[i]->GetClass() == TypeClass::All)
                     continue;
-                auto parameter = parameters[i];
+                auto parameter = parameters->at(i);
                 const auto& parameterType = parameter->GetType();
                 if (parameterType->operator!=(_parameterTypes[i].get())){
                     auto castResult = parameterType->CastableTo(_parameterTypes[i], false);
                     if (castResult == CastResult::Failure){
                         return false;
                     }
-                    else if (castResult == CastResult::DataLoss){
-                        diagnostics->LogWarning(Diagnostics::DiagnosticCode::DataLossOnImplicitCast, parameter->GetStartPosition(),
-                                parameter->GetLength());
+                    else{
+                        if (castResult == CastResult::DataLoss){
+                            diagnostics->LogWarning(Diagnostics::DiagnosticCode::DataLossOnImplicitCast, parameter->GetStartPosition(),
+                                                    parameter->GetLength());
+                        }
+                        parameters->at(i) = new Binder::BoundImplicitCastExpression(parameter, _parameterTypes[i]);
                     }
                 }
             }
@@ -103,8 +106,9 @@ namespace Porygon {
             return this;
         }
 
+        [[nodiscard]]
         GenericFunctionOption* GetFunctionOption(const shared_ptr<Diagnostics::DiagnosticsHolder>& diagnostics,
-                const vector<Binder::BoundExpression *>& parameters) const{
+                vector<Binder::BoundExpression *>* parameters) const{
             for (auto o: *_options){
                 if (o->IsValid(diagnostics, parameters)){
                     return o;