Refactor AST, support source::Range inside Interpreter instead of source::Location.

Author: nos1dot618

CMakeLists.txt

@@ -83,16 +83,27 @@ target_link_libraries(lbdDiagnostics PUBLIC
     fmt::fmt
 )
 
+
+###### TYPE ######
+
+file(GLOB_RECURSE TYPE_SOURCE_FILES CONFIGURE_DEPENDS
+    ${PROJECT_SOURCE_DIR}/src/type/*.cpp
+)
+
+add_library(lbdType STATIC
+    ${TYPE_SOURCE_FILES}
+)
+
+target_include_directories(lbdType PUBLIC
+    ${PROJECT_SOURCE_DIR}/include
+)
+
 ###### FRONTEND ######
 
 file(GLOB_RECURSE FRONTEND_SOURCE_FILES CONFIGURE_DEPENDS
     ${PROJECT_SOURCE_DIR}/src/frontend/*.cpp
 )
 
-list(FILTER FRONTEND_SOURCE_FILES EXCLUDE REGEX
-    ".*/src/frontend/ast/.*\\.cpp$"
-)
-
 add_library(lbdFrontend STATIC
     ${FRONTEND_SOURCE_FILES}
 )
@@ -144,6 +155,7 @@ target_link_libraries(lbd PRIVATE
     lbdDiagnostics
     lbdFrontend
     lbdRuntime
+    lbdType
     replxx
     CLI11::CLI11
 )

README.md

@@ -119,5 +119,6 @@ SUBCOMMANDS:
 
 ## Dependencies
 
-1. [replxx](https://github.com/AmokHuginnsson/replxx.git): For better REPL user experience.
-2. [CLI11](https://github.com/CLIUtils/CLI11.git): For better CLI support.
+1. [fmt](https://github.com/fmtlib/fmt.git): String formatting.
+2. [replxx](https://github.com/AmokHuginnsson/replxx.git): For better REPL user experience.
+3. [CLI11](https://github.com/CLIUtils/CLI11.git): For better CLI support.

include/lbd/diagnostics/DiagnosticInfo.hpp

@@ -27,4 +27,4 @@ static_assert(
   static_cast<std::size_t>(DiagnosticId::COUNT) == std::size(DIAGNOSTIC_INFOS),
   "Mismatch between DiagnosticId and DiagnosticInfo table."
 );
-}
+}

include/lbd/frontend/Program.hpp

@@ -1,19 +1,22 @@
 #pragma once
 
-#include <iostream>
 #include <vector>
-#include <lbd/frontend/ast/Ast.hpp>
+#include <lbd/frontend/ast/AstNode.hpp>
 
 namespace lbd::frontend
 {
-  // TODO: Remove this later.
   class Program
   {
   public:
-    explicit Program(std::vector<std::unique_ptr<ast::AstNode>> nodes);
+    explicit Program(std::vector<ast::AstNodePtr> astNodePtrs);
 
     friend std::ostream &operator<<(std::ostream &outputStream, const Program &program);
 
-    std::vector<std::unique_ptr<ast::AstNode>> astNodes;
+    [[nodiscard]] std::vector<ast::AstNodePtr> &getAstNodePtrs() noexcept;
+
+    [[nodiscard]] const std::vector<ast::AstNodePtr> &getAstNodePtrs() const noexcept;
+
+  private:
+    std::vector<ast::AstNodePtr> astNodePtrs;
   };
-}
+}

include/lbd/frontend/Type.hpp

@@ -1,26 +1,36 @@
 #pragma once
 
+#include <memory>
 #include <lbd/frontend/ast/AstNodeKind.hpp>
 #include <lbd/source/Range.hpp>
 
 namespace lbd::frontend::ast
 {
+  class AstNode;
+  using AstNodePtr = std::unique_ptr<AstNode>;
+
   class AstNode
   {
   public:
     AstNode(AstNodeKind kind, source::Range range);
 
     virtual ~AstNode() = default;
 
+    [[nodiscard]] source::Range getRange() const;
+
     virtual void print(std::ostream &outputStream, size_t indent) const noexcept = 0;
 
     friend std::ostream &operator<<(std::ostream &outputStream, const AstNode &node);
 
+    AstNode(const AstNode &) = delete;
+
+    AstNode &operator=(const AstNode &) = delete;
+
   private:
     const AstNodeKind kind;
     const source::Range range;
 
   protected:
     static void printIndent(std::ostream &outputStream, size_t indent) noexcept;
   };
-}
+}

include/lbd/frontend/ast/Ast.hpp

@@ -9,8 +9,7 @@ namespace lbd::frontend::ast
     NUMBER_EXPRESSION,
     LAMBDA_EXPRESSION,
     FUNCTION_APPLICATION_EXPRESSION,
-    SYMBOL_DEFINITION,
     EXPRESSION_STATEMENT,
     SYMBOL_DEFINITION_STATEMENT,
   };
-}
+}

include/lbd/frontend/ast/AstNode.hpp

@@ -4,8 +4,11 @@
 
 namespace lbd::frontend::ast::expression
 {
+  class Expression;
+  using ExpressionPtr = std::unique_ptr<Expression>;
+
   class Expression : public AstNode
   {
     using AstNode::AstNode;
   };
-}
+}

include/lbd/frontend/ast/AstNodeKind.hpp

@@ -0,0 +1,27 @@
+#pragma once
+
+#include <memory>
+#include <vector>
+#include <lbd/frontend/ast/expression/IdentifierExpression.hpp>
+
+namespace lbd::frontend::ast::expression
+{
+  class FunctionApplicationExpression final : public Expression
+  {
+  public:
+    // TODO: Update the design: instead of function-name callee should also be able to provide a lambda-expression.
+    FunctionApplicationExpression(const source::Range &range,
+                                  IdentifierExpressionPtr functionNameIdentifierExpressionPtr,
+                                  std::vector<ExpressionPtr> argumentPtrs) noexcept;
+
+    void print(std::ostream &outputStream, size_t indent) const noexcept override;
+
+    [[nodiscard]] const IdentifierExpression &getFunctionNameIdentifierExpression() const noexcept;
+
+    [[nodiscard]] const std::vector<ExpressionPtr> &getArguments() const noexcept;
+
+  private:
+    IdentifierExpressionPtr functionNameIdentifierExpressionPtr;
+    std::vector<ExpressionPtr> argumentPtrs;
+  };
+}