using smart pointers instead of normal ones for

easier setup of tests (to call setup() multiple
times without leaks)

src/lexer/lexer.cpp

@@ -7,6 +7,8 @@
 #include <iostream>
 
 namespace lexer {
+    lexer::lexer(std::istream& input): input(input) {}
+
     token::token lexer::next_token() {
         if (!(input >> c))
             return {token::type::END_OF_FILE, ""};

src/lexer/lexer.hpp

@@ -6,6 +6,7 @@
 
 namespace lexer {
     struct lexer {
+        lexer(std::istream&);
         std::istream& input;
         char c = 0;
         token::token next_token();

src/parser/parser.cpp

@@ -84,8 +84,8 @@ namespace parser {
              next_token()) {};
     }
 
-    ast::program* parser::parse_program() {
+    std::unique_ptr<ast::program> parser::parse_program() {
-        ast::program* p = new ast::program();
+        std::unique_ptr<ast::program> p = std::make_unique<ast::program>();
 
         for (; current.type != token::type::END_OF_FILE; next_token()) {
             ast::statement* stmt = parse_statement();

src/parser/parser.hpp

@@ -11,6 +11,7 @@
 #include "token/token.hpp"
 
 #include <functional>
+#include <memory>
 #include <vector>
 
 namespace parser {
@@ -23,7 +24,7 @@ namespace parser {
         ~parser();
         std::vector<ast::error::error*> errors;
 
-        ast::program* parse_program();
+        std::unique_ptr<ast::program> parse_program();
 
       private:
         lexer::lexer& lexer;

test/parser/let.cpp

@@ -7,6 +7,7 @@
 #include "utils.hpp"
 
 #include <doctest.h>
+#include <memory>
 #include <sstream>
 
 void test_let_statement(ast::statement* stmt, const std::string name) {
@@ -27,7 +28,7 @@ void test_failing_let_parsing(
     lexer::lexer l{input};
     parser::parser p{l};
 
-    ast::program* program = p.parse_program();
+    std::unique_ptr<ast::program> program = p.parse_program();
 
     // Check for errors
     REQUIRE(p.errors.size() == expected_types.size());
@@ -45,7 +46,6 @@ void test_failing_let_parsing(
         "parse_program() returned a null pointer"
     );
     REQUIRE(program->statements.size() == n_good_statements);
-    delete program;
 }
 
 TEST_SUITE("Parser: let") {

test/parser/utils.cpp

@@ -18,8 +18,8 @@ void check_parser_errors(const std::vector<ast::error::error*>& errors) {
 
 void ParserFixture::setup(std::string source) {
     input << source;
-    lexer = new lexer::lexer{input};
+    lexer = std::make_unique<lexer::lexer>(input);
-    parser = new parser::parser(*lexer);
+    parser = std::make_unique<parser::parser>(*lexer);
     program = parser->parse_program();
     check_parser_errors(parser->errors);
 
@@ -30,9 +30,3 @@ void ParserFixture::setup(std::string source) {
         "parse_program() returned a null pointer"
     );
 }
-
-ParserFixture::~ParserFixture() {
-    delete lexer;
-    delete parser;
-    delete program;
-}

test/parser/utils.hpp

@@ -52,13 +52,11 @@ T* cast(ast::error::error* err) {
 
 struct ParserFixture {
     std::stringstream input;
-    lexer::lexer* lexer = nullptr;
+    std::unique_ptr<lexer::lexer> lexer;
-    parser::parser* parser = nullptr;
+    std::unique_ptr<parser::parser> parser;
-    ast::program* program = nullptr;
+    std::unique_ptr<ast::program> program;
 
     ParserFixture() = default;
 
     void setup(std::string);
-
-    ~ParserFixture();
 };