Architectural changes have been made to the AST and are under develop…

…ment.

compiler/ast/CMakeLists.txt

@@ -6,7 +6,11 @@ cmake_minimum_required(VERSION 3.10)
 
 include_directories(${PROJECT_SOURCE_DIR})
 
-set(SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/decl.cc ${CMAKE_CURRENT_SOURCE_DIR}/expr.cc ${CMAKE_CURRENT_SOURCE_DIR}/stmt.cc ${CMAKE_CURRENT_SOURCE_DIR}/type.cc)
+set(SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/ast.cc 
+${CMAKE_CURRENT_SOURCE_DIR}/decl.cc 
+${CMAKE_CURRENT_SOURCE_DIR}/expr.cc 
+${CMAKE_CURRENT_SOURCE_DIR}/stmt.cc 
+${CMAKE_CURRENT_SOURCE_DIR}/type.cc)
 
 add_library(AqCompilerAst STATIC ${SOURCES})
 

compiler/ast/ast.cc

@@ -0,0 +1,7 @@
+// Copyright 2024 AQ authors, All Rights Reserved.
+// This program is licensed under the AQ License. You can find the AQ license in
+// the root directory.
+
+#include "compiler/ast/ast.h"
+
+// TODO: AST

compiler/ast/ast.h

@@ -5,9 +5,22 @@
 #ifndef AQ_COMPILER_AST_AST_H_
 #define AQ_COMPILER_AST_AST_H_
 
-#include "compiler/ast/decl.h"
-#include "compiler/ast/expr.h"
-#include "compiler/ast/stmt.h"
-#include "compiler/ast/type.h"
+#include "compiler/compiler.h"
+
+namespace Aq {
+class Compiler::Ast {
+ public:
+  Ast();
+  ~Ast();
+
+  class FuncDecl;
+  class Expr;
+  class Stmt;
+  class Type;
+
+ private:
+  // TODO: Waiting for development.
+};
+}  // namespace Aq
 
 #endif

compiler/ast/decl.cc

@@ -2,6 +2,7 @@
 // This program is licensed under the AQ License. You can find the AQ license in
 // the root directory.
 
+#include "compiler/ast/ast.h"
 #include "compiler/ast/decl.h"
 
 // TODO: AST

compiler/ast/decl.h

@@ -5,11 +5,12 @@
 #ifndef AQ_COMPILER_AST_DECL_H_
 #define AQ_COMPILER_AST_DECL_H_
 
+#include "compiler/ast/ast.h"
 #include "compiler/compiler.h"
 
 namespace Aq {
 // TODO: Decl AST
-class Compiler::FuncDecl {
+class Compiler::Ast::FuncDecl {
  public:
   FuncDecl();
   ~FuncDecl();
@@ -20,7 +21,6 @@ class Compiler::FuncDecl {
   FuncDecl& operator=(FuncDecl&&) noexcept = default;
 
  private:
-  // Type* type;
   // std::string name;
   // std::vector<Expr*> args;
   // Stmt* body;

compiler/ast/expr.cc

@@ -2,6 +2,7 @@
 // This program is licensed under the AQ License. You can find the AQ license in
 // the root directory.
 
+#include "compiler/ast/ast.h"
 #include "compiler/ast/expr.h"
 
 // TODO: AST

compiler/ast/expr.h

@@ -5,6 +5,7 @@
 #ifndef AQ_COMPILER_AST_EXPR_H_
 #define AQ_COMPILER_AST_EXPR_H_
 
+#include "compiler/ast/ast.h"
 #include "compiler/compiler.h"
 
 namespace Aq {

compiler/ast/stmt.cc

@@ -2,6 +2,7 @@
 // This program is licensed under the AQ License. You can find the AQ license in
 // the root directory.
 
+#include "compiler/ast/ast.h"
 #include "compiler/ast/stmt.h"
 
 // TODO: AST

compiler/ast/stmt.h

@@ -5,6 +5,7 @@
 #ifndef AQ_COMPILER_AST_STMT_H_
 #define AQ_COMPILER_AST_STMT_H_
 
+#include "compiler/ast/ast.h"
 #include "compiler/compiler.h"
 
 namespace Aq {

compiler/ast/type.cc

@@ -2,6 +2,7 @@
 // This program is licensed under the AQ License. You can find the AQ license in
 // the root directory.
 
+#include "compiler/ast/ast.h"
 #include "compiler/ast/type.h"
 
 // TODO: AST

compiler/ast/type.h

@@ -5,6 +5,7 @@
 #ifndef AQ_COMPILER_AST_TYPE_H_
 #define AQ_COMPILER_AST_TYPE_H_
 
+#include "compiler/ast/ast.h"
 #include "compiler/compiler.h"
 
 namespace Aq {

compiler/compiler.cc

@@ -40,12 +40,7 @@ Compiler::Compiler(const char* filename) {
   Token token;
   while (true) {
     lexer.LexToken(token);
-    if (token.type == Token::Type::NONE) {
-      std::cout << "END OF THE CODE.";
-    } else {
-      std::cout << "" << std::endl;
-    }
-    if (lexer.IsReadEnd()) {
+    if (token.type == Token::Type::NONE || lexer.IsReadEnd()) {
       break;
     }
   }

compiler/compiler.h

@@ -23,10 +23,7 @@ class Compiler {
 
   class Parser;
 
-  class FuncDecl;
-  class Expr;
-  class Stmt;
-  class Type;
+  class Ast;
 };
 }  // namespace Aq