Cleaned up array literal

src/Parser/Expression/ExpressionArrayLiteral.cpp

@@ -3,17 +3,18 @@
 #include "Lexer/Token.h"
 #include "Parser/Expression/ExpressionLiteral.h"
 
-ExpressionArrayLiteral::ExpressionArrayLiteral(vector<shared_ptr<Expression>> expressions):
-Expression(ExpressionKind::ARRAY_LITERAL, nullptr), expressions(expressions) { }
-
 shared_ptr<ExpressionArrayLiteral> ExpressionArrayLiteral::expressionArrayLiteralForExpressions(vector<shared_ptr<Expression>> expressions) {
-    return make_shared<ExpressionArrayLiteral>(expressions);
+    shared_ptr<ExpressionArrayLiteral> expression = make_shared<ExpressionArrayLiteral>();
+    expression->expressions = expressions;
+    return expression;
 }
 
 shared_ptr<ExpressionArrayLiteral> ExpressionArrayLiteral::expressionArrayLiteralForTokenString(shared_ptr<Token> tokenString) {
     if (tokenString->getKind() != TokenKind::STRING)
         return nullptr;
 
+    shared_ptr<ExpressionArrayLiteral> expression = make_shared<ExpressionArrayLiteral>();
+
     vector<shared_ptr<Expression>> expressions;
     string stringValue = tokenString->getLexme();
     for (int i=1; i<stringValue.length()-1; i++) {
@@ -26,9 +27,14 @@ shared_ptr<ExpressionArrayLiteral> ExpressionArrayLiteral::expressionArrayLitera
         shared_ptr<ExpressionLiteral> expression = ExpressionLiteral::expressionLiteralForToken(token);
         expressions.push_back(expression);
     }
-    return make_shared<ExpressionArrayLiteral>(expressions);
+
+    expression->expressions = expressions;
+    return expression;
 }
 
+ExpressionArrayLiteral::ExpressionArrayLiteral():
+Expression(ExpressionKind::ARRAY_LITERAL, nullptr) { }
+
 vector<shared_ptr<Expression>> ExpressionArrayLiteral::getExpressions() {
     return expressions;
 } 

src/Parser/Expression/ExpressionArrayLiteral.h

@@ -6,12 +6,12 @@
 class ExpressionArrayLiteral: public Expression {
 private:
     vector<shared_ptr<Expression>> expressions;
-
+    
 public:
-    ExpressionArrayLiteral(vector<shared_ptr<Expression>> expressions);
-    //ExpressionArrayLiteral(shared_ptr<Token> tokenString);
     static shared_ptr<ExpressionArrayLiteral> expressionArrayLiteralForExpressions(vector<shared_ptr<Expression>> expressions);
     static shared_ptr<ExpressionArrayLiteral> expressionArrayLiteralForTokenString(shared_ptr<Token> tokenString);
+
+    ExpressionArrayLiteral();
     vector<shared_ptr<Expression>> getExpressions();
 };
 

src/Parser/Parser.cpp

@@ -483,8 +483,7 @@ shared_ptr<Expression> Parser::matchExpressionArrayLiteral() {
             }
         }
 
-
+        return ExpressionArrayLiteral::expressionArrayLiteralForExpressions(expressions);
-        return make_shared<ExpressionArrayLiteral>(expressions);
     }
 
     return nullptr;