chore: refactor interpreter module

Author: nos1dot618

CMakeLists.txt

@@ -15,13 +15,13 @@ add_library(frontend STATIC
     ${CMAKE_SOURCE_DIR}/src/frontend/parser.cpp
 )
 
-add_library(intp STATIC
-    ${CMAKE_SOURCE_DIR}/src/intp/types.cpp
-    ${CMAKE_SOURCE_DIR}/src/intp/interpreter.cpp
-    ${CMAKE_SOURCE_DIR}/src/intp/builtins.cpp
-    ${CMAKE_SOURCE_DIR}/src/intp/builtin-modules/builtin_module_core.cpp
-    ${CMAKE_SOURCE_DIR}/src/intp/builtin-modules/builtin_module_list.cpp
-    ${CMAKE_SOURCE_DIR}/src/intp/builtin-modules/builtin_module_io.cpp
+add_library(interpreter STATIC
+    ${CMAKE_SOURCE_DIR}/src/interpreter/type.cpp
+    ${CMAKE_SOURCE_DIR}/src/interpreter/interpreter.cpp
+    ${CMAKE_SOURCE_DIR}/src/interpreter/builtins.cpp
+    ${CMAKE_SOURCE_DIR}/src/interpreter/builtin-modules/builtin_module_core.cpp
+    ${CMAKE_SOURCE_DIR}/src/interpreter/builtin-modules/builtin_module_list.cpp
+    ${CMAKE_SOURCE_DIR}/src/interpreter/builtin-modules/builtin_module_io.cpp
 )
 
 add_executable(lbd
@@ -30,7 +30,7 @@ add_executable(lbd
     ${CMAKE_SOURCE_DIR}/src/repl.cpp
 )
 
-target_link_libraries(lbd PRIVATE frontend intp -static)
+target_link_libraries(lbd PRIVATE frontend interpreter -static)
 
 # TODO: Add build tests
 # EXAMPLE: add_executable(lexer_test ../tests/lexer_test.cc)

README.md

@@ -120,5 +120,5 @@ lbd [options]
 ## TODO
 
 - TODO: Add better examples (e.g., Advent of Code snippets).
-- TODO: Maybe use rere.py for testing
+- TODO: CI/CD for testing.
 - TODO: Fix tests output in README.

include/lbd/frontend/ast.h

@@ -1,7 +1,7 @@
 #pragma once
 
 #include <lbd/frontend/location.h>
-#include <lbd/intp/types.h>
+#include <lbd/interpreter/type.h>
 #include <string>
 #include <variant>
 #include <vector>
@@ -32,12 +32,12 @@ namespace frontend {
 
     struct LambdaExpression {
         IdentifierAstNode argument;
-        intp::types::Type argumentType;
+        interpreter::type::Type argumentType;
         std::unique_ptr<Expression> expression;
         Location location;
         /// Maybe, this is redundant.
         // TODO: Remove after checking.
-        intp::types::CompoundType lambdaExpressionType;
+        interpreter::type::CompoundType lambdaExpressionType;
 
         void print(std::ostream &stream, size_t indent) const;
 
@@ -92,7 +92,7 @@ namespace frontend {
 
     struct DefinitionAstNode {
         IdentifierAstNode definitionName;
-        intp::types::Type definitionType;
+        interpreter::type::Type definitionType;
         Expression expression;
         Location location;
 

include/lbd/frontend/lexer.h

@@ -15,9 +15,9 @@ namespace frontend {
 
     struct Lexer {
         // TODO: Make factory instead of these constructors.
-        Lexer(const std::string &filepath, FromFile, options::Options options_ = {});
+        Lexer(const std::string &filepath, FromFile, global::Options options_ = {});
 
-        Lexer(std::string str, FromRepl, options::Options options_ = {});
+        Lexer(std::string str, FromRepl, global::Options options_ = {});
 
         token::Token nextToken();
 

include/lbd/frontend/parser.h

@@ -3,14 +3,14 @@
 #include <lbd/options.h>
 #include <lbd/frontend/ast.h>
 #include <lbd/frontend/token.h>
-#include <lbd/intp/types.h>
+#include <lbd/interpreter/type.h>
 #include <vector>
 
 namespace frontend {
     struct Parser {
         Program program;
 
-        explicit Parser(const std::vector<token::Token> &tokens, options::Options options_ = {});
+        explicit Parser(const std::vector<token::Token> &tokens, global::Options options_ = {});
 
     private:
         // TODO: Add checks for T to be a variant of frontend::TokenType
@@ -22,9 +22,9 @@ namespace frontend {
 
         static IdentifierAstNode consumeIdentifier(const std::vector<token::Token> &tokens, size_t &index);
 
-        static intp::types::PrimitiveType consumePrimitiveTypeName(const std::vector<token::Token> &tokens, size_t &index);
+        static interpreter::type::PrimitiveType consumePrimitiveTypeName(const std::vector<token::Token> &tokens, size_t &index);
 
-        static intp::types::Type parseType(const std::vector<token::Token> &tokens, size_t &index);
+        static interpreter::type::Type parseType(const std::vector<token::Token> &tokens, size_t &index);
 
         static Expression parseExpression(const std::vector<token::Token> &tokens, size_t &index);
 

…tp/builtin-modules/builtin_module_core.h …er/builtin-modules/builtin_module_core.hinclude/lbd/intp/builtin-modules/builtin_module_core.h renamed to include/lbd/interpreter/builtin-modules/builtin_module_core.h include/lbd/intp/builtin-modules/builtin_module_core.h renamed to include/lbd/interpreter/builtin-modules/builtin_module_core.h

@@ -1,8 +1,8 @@
 #pragma once
 
-#include <lbd/intp/builtins.h>
+#include <lbd/interpreter/builtins.h>
 
-namespace intp::interp::builtins {
+namespace interpreter::builtins {
     NativeFunction makePrint();
 
     NativeFunction makeAdd();

…intp/builtin-modules/builtin_module_io.h …eter/builtin-modules/builtin_module_io.hinclude/lbd/intp/builtin-modules/builtin_module_io.h renamed to include/lbd/interpreter/builtin-modules/builtin_module_io.h include/lbd/intp/builtin-modules/builtin_module_io.h renamed to include/lbd/interpreter/builtin-modules/builtin_module_io.h

@@ -1,8 +1,8 @@
 #pragma once
 
-#include <lbd/intp/builtins.h>
+#include <lbd/interpreter/builtins.h>
 
-namespace intp::interp::builtins {
+namespace interpreter::builtins {
     NativeFunction makeSlurpFile();
 
     NativeFunction makeLines();

…tp/builtin-modules/builtin_module_list.h …er/builtin-modules/builtin_module_list.hinclude/lbd/intp/builtin-modules/builtin_module_list.h renamed to include/lbd/interpreter/builtin-modules/builtin_module_list.h include/lbd/intp/builtin-modules/builtin_module_list.h renamed to include/lbd/interpreter/builtin-modules/builtin_module_list.h

@@ -1,8 +1,8 @@
 #pragma once
 
-#include <lbd/intp/builtins.h>
+#include <lbd/interpreter/builtins.h>
 
-namespace intp::interp::builtins {
+namespace interpreter::builtins {
     NativeFunction makeList();
 
     NativeFunction makeListSize();

include/lbd/interpreter/builtins.h

@@ -0,0 +1,10 @@
+#pragma once
+
+#include <lbd/interpreter/interpreter.h>
+#include <lbd/options.h>
+
+namespace interpreter::builtins {
+    extern global::Options optionsValue;
+
+    std::vector<NativeFunction> getBuiltins(global::Options options_ = {});
+}

include/lbd/intp/interpreter.h include/lbd/interpreter/interpreter.hinclude/lbd/intp/interpreter.h renamed to include/lbd/interpreter/interpreter.h

@@ -8,7 +8,7 @@
 #include <lbd/frontend/parser.h>
 #include <lbd/options.h>
 
-namespace intp::interp {
+namespace interpreter {
     struct NativeFunction;
     struct Thunk;
     struct Environment;
@@ -54,6 +54,7 @@ namespace intp::interp {
     struct ResultOptions {
         bool sideEffects = false;
 
+        // TODO: _ may not be needed here
         void interpolate(const ResultOptions &resultOptions_);
     };
 
@@ -91,8 +92,8 @@ namespace intp::interp {
         void set(const frontend::Expression *expression_, std::shared_ptr<Environment> environment_,
                  std::optional<frontend::Location> origin_ = std::nullopt);
 
-        void set_owned(frontend::Expression expression_, std::shared_ptr<Environment> environment_,
-                       std::optional<frontend::Location> origin_ = std::nullopt);
+        void setOwned(frontend::Expression expression_, std::shared_ptr<Environment> environment_,
+                      std::optional<frontend::Location> origin_ = std::nullopt);
     };
 
     struct Environment : std::enable_shared_from_this<Environment> {
@@ -121,8 +122,9 @@ namespace intp::interp {
         ResultOptions options = {};
     };
 
-    Result interpret(frontend::Program &program, std::optional<std::shared_ptr<Environment> > globalEnvironment = std::nullopt,
-                     options::Options options_ = {});
+    Result interpret(frontend::Program &program,
+                     std::optional<std::shared_ptr<Environment> > globalEnvironment = std::nullopt,
+                     global::Options options_ = {});
 
     /// Add builtins Native Functions into Environment.
     void installBuiltins(const std::shared_ptr<Environment> &environment);