Implements basic numerical tables

src/Evaluator/Evaluator.cpp

@@ -5,6 +5,7 @@
 #include "../Script.hpp"
 #include "EvaluationScope/EvaluationScope.hpp"
 #include "EvalValues/ScriptFunctionEvalValue.hpp"
+#include "EvalValues/TableEvalValue.hpp"
 
 using namespace std;
 
@@ -97,6 +98,7 @@ shared_ptr<EvalValue> Evaluator::EvaluateExpression(BoundExpression *expression)
         case TypeClass ::String: return this -> EvaluateStringExpression(expression);
         case TypeClass ::Function: return this->EvaluateFunctionExpression(expression);
         case TypeClass ::Nil: return this->EvaluateNilExpression(expression);
+        case TypeClass ::Table: return this-> EvaluateTableExpression(expression);
         default: throw;
     }
 }
@@ -119,6 +121,7 @@ shared_ptr<NumericEvalValue> Evaluator::EvaluateIntegerExpression(BoundExpressio
         case BoundExpressionKind ::LiteralString:
         case BoundExpressionKind ::LiteralBool:
         case BoundExpressionKind ::Bad:
+        case BoundExpressionKind::NumericalTable:
             throw;
     }
 }
@@ -136,6 +139,7 @@ shared_ptr<BooleanEvalValue> Evaluator::EvaluateBoolExpression(BoundExpression *
         case BoundExpressionKind::LiteralInteger:
         case BoundExpressionKind::LiteralFloat:
         case BoundExpressionKind::LiteralString:
+        case BoundExpressionKind::NumericalTable:
             throw;
 
     }
@@ -156,6 +160,7 @@ shared_ptr<StringEvalValue> Evaluator::EvaluateStringExpression(BoundExpression
         case BoundExpressionKind::LiteralFloat:
         case BoundExpressionKind::LiteralBool:
         case BoundExpressionKind::Unary:
+        case BoundExpressionKind::NumericalTable:
             throw;
 
     }
@@ -175,6 +180,19 @@ shared_ptr<EvalValue> Evaluator::EvaluateNilExpression(BoundExpression * express
             return nullptr;
     }
 }
+shared_ptr<EvalValue> Evaluator::EvaluateTableExpression(BoundExpression * expression){
+    switch (expression->GetKind()){
+        case BoundExpressionKind ::FunctionCall:
+            return this->EvaluateFunctionCallExpression(expression);
+        case BoundExpressionKind ::Variable: return this->GetVariable((BoundVariableExpression*)expression);
+        case BoundExpressionKind ::Index: return this->EvaluateIndexExpression(expression);
+        case BoundExpressionKind ::NumericalTable: return this-> EvaluateNumericTableExpression(expression);
+        default:
+            return nullptr;
+    }
+}
+
+
 
 
 shared_ptr<EvalValue> Evaluator::EvaluateFunctionCallExpression(BoundExpression* expression){
@@ -239,6 +257,18 @@ shared_ptr<EvalValue> Evaluator::EvaluateIndexExpression(BoundExpression *expres
     auto indexExpression = (BoundIndexExpression*)expression;
     auto index = this -> EvaluateExpression(indexExpression->GetIndexExpression());
     auto indexable = this -> EvaluateExpression(indexExpression->GetIndexableExpression());
-    return shared_ptr<EvalValue>(indexable -> IndexValue(index.get()));
+    return indexable -> IndexValue(index.get()) -> Clone();
+}
+
+shared_ptr<EvalValue> Evaluator::EvaluateNumericTableExpression(BoundExpression *expression) {
+    auto tableExpression = (BoundNumericalTableExpression*)expression;
+    auto valueExpressions = tableExpression->GetExpressions();
+    auto values = new unordered_map<size_t, shared_ptr<EvalValue>>(valueExpressions.size());
+    for (int i = 0; i < valueExpressions.size(); i++){
+        auto val = this -> EvaluateExpression(valueExpressions[i]);
+        values -> insert({i + 1, val});
+    }
+    auto valuesPointer = shared_ptr<unordered_map<size_t, shared_ptr<EvalValue>>>(values);
+    return make_shared<TableEvalValue>(valuesPointer, tableExpression->GetType());
 }