From f0f4ba45b0413a9b42b8acdb87392cf8c31622b5 Mon Sep 17 00:00:00 2001
From: Riyyi <riyyi3@gmail.com>
Date: Mon, 3 Apr 2023 21:41:02 +0200
Subject: [PATCH] Eval: Improve logic sharing between List and Vector

---
 src/eval.cpp | 19 ++++---------------
 1 file changed, 4 insertions(+), 15 deletions(-)

diff --git a/src/eval.cpp b/src/eval.cpp
index 74ee110..ec12c7c 100644
--- a/src/eval.cpp
+++ b/src/eval.cpp
@@ -87,21 +87,10 @@ ASTNodePtr Eval::evalAst(ASTNodePtr ast, EnvironmentPtr env)
 		}
 		return result;
 	}
-	else if (is<List>(ast_raw_ptr)) {
-		auto result = makePtr<List>();
-		auto nodes = std::static_pointer_cast<List>(ast)->nodes();
-		for (auto node : nodes) {
-			ASTNodePtr eval_node = evalImpl(node, env);
-			if (eval_node == nullptr) {
-				return nullptr;
-			}
-			result->add(eval_node);
-		}
-		return result;
-	}
-	else if (is<Vector>(ast_raw_ptr)) {
-		auto result = makePtr<Vector>();
-		auto nodes = std::static_pointer_cast<Vector>(ast)->nodes();
+	else if (is<Collection>(ast_raw_ptr)) {
+		std::shared_ptr<Collection> result = nullptr;
+		(is<List>(ast_raw_ptr)) ? result = makePtr<List>() : result = makePtr<Vector>();
+		auto nodes = std::static_pointer_cast<Collection>(ast)->nodes();
 		for (auto node : nodes) {
 			ASTNodePtr eval_node = evalImpl(node, env);
 			if (eval_node == nullptr) {