Rename to TransUnitNode and remove checking main function

fruits-lab · Jun 22, 2024 · 10f19db · 10f19db
1 parent f37a274
commit 10f19db
Show file tree

Hide file tree

Showing 57 changed files with 78 additions and 85 deletions.
diff --git a/include/ast.hpp b/include/ast.hpp
@@ -220,8 +220,8 @@ struct CompoundStmtNode : public StmtNode {
   std::vector<std::unique_ptr<StmtNode>> stmts;
 };
 
-/// @brief An external definition is an external declaration that is also a
-/// definition of a function(other than an inline definition) or an object.
+/// @brief An external declaration can be a definition of a function or an
+/// object.
 struct ExternDeclNode : public AstNode {
   ExternDeclNode(
       Location loc,
@@ -236,17 +236,18 @@ struct ExternDeclNode : public AstNode {
       decl;
 };
 
-/// @brief Root of the entire program.
-struct ProgramNode : public AstNode {
+/// @brief A translation unit, which the compiler handles individually,
+/// representing a high-level entity in the compilation process.
+struct TransUnitNode : public AstNode {
   /// @note vector of move-only elements are move-only
-  ProgramNode(Location loc,
-              std::vector<std::unique_ptr<ExternDeclNode>> trans_unit)
-      : AstNode{loc}, trans_unit{std::move(trans_unit)} {}
+  TransUnitNode(Location loc,
+                std::vector<std::unique_ptr<ExternDeclNode>> extern_decls)
+      : AstNode{loc}, extern_decls{std::move(extern_decls)} {}
 
   void Accept(NonModifyingVisitor&) const override;
   void Accept(ModifyingVisitor&) override;
 
-  std::vector<std::unique_ptr<ExternDeclNode>> trans_unit;
+  std::vector<std::unique_ptr<ExternDeclNode>> extern_decls;
 };
 
 struct IfStmtNode : public StmtNode {

diff --git a/include/ast_dumper.hpp b/include/ast_dumper.hpp
@@ -18,7 +18,7 @@ class AstDumper : public NonModifyingVisitor {
   void Visit(const FuncDefNode&) override;
   void Visit(const CompoundStmtNode&) override;
   void Visit(const ExternDeclNode&) override;
-  void Visit(const ProgramNode&) override;
+  void Visit(const TransUnitNode&) override;
   void Visit(const IfStmtNode&) override;
   void Visit(const WhileStmtNode&) override;
   void Visit(const ForStmtNode&) override;

diff --git a/include/qbe_ir_generator.hpp b/include/qbe_ir_generator.hpp
@@ -25,7 +25,7 @@ class QbeIrGenerator : public NonModifyingVisitor {
   void Visit(const FuncDefNode&) override;
   void Visit(const CompoundStmtNode&) override;
   void Visit(const ExternDeclNode&) override;
-  void Visit(const ProgramNode&) override;
+  void Visit(const TransUnitNode&) override;
   void Visit(const IfStmtNode&) override;
   void Visit(const WhileStmtNode&) override;
   void Visit(const ForStmtNode&) override;

diff --git a/include/type_checker.hpp b/include/type_checker.hpp
@@ -21,7 +21,7 @@ class TypeChecker : public ModifyingVisitor {
   void Visit(FuncDefNode&) override;
   void Visit(CompoundStmtNode&) override;
   void Visit(ExternDeclNode&) override;
-  void Visit(ProgramNode&) override;
+  void Visit(TransUnitNode&) override;
   void Visit(IfStmtNode&) override;
   void Visit(WhileStmtNode&) override;
   void Visit(ForStmtNode&) override;
@@ -52,7 +52,6 @@ class TypeChecker : public ModifyingVisitor {
 
  private:
   ScopeStack& env_;
-  bool has_main_func_{false};
 
   /// @brief Installs the built-in functions into the environment.
   void InstallBuiltins_(ScopeStack&);

diff --git a/include/visitor.hpp b/include/visitor.hpp
@@ -22,7 +22,7 @@ struct FuncDefNode;
 struct LoopInitNode;
 struct CompoundStmtNode;
 struct ExternDeclNode;
-struct ProgramNode;
+struct TransUnitNode;
 struct IfStmtNode;
 struct WhileStmtNode;
 struct ForStmtNode;
@@ -85,7 +85,7 @@ class Visitor {
   virtual void Visit(CondMut<LoopInitNode>&){};
   virtual void Visit(CondMut<CompoundStmtNode>&){};
   virtual void Visit(CondMut<ExternDeclNode>&){};
-  virtual void Visit(CondMut<ProgramNode>&){};
+  virtual void Visit(CondMut<TransUnitNode>&){};
   virtual void Visit(CondMut<IfStmtNode>&){};
   virtual void Visit(CondMut<WhileStmtNode>&){};
   virtual void Visit(CondMut<ForStmtNode>&){};

diff --git a/main.cpp b/main.cpp
@@ -69,8 +69,8 @@ int main(  // NOLINT(bugprone-exception-escape): Using a big try-catch block to
   }
 
   /// @brief The root node of the program.
-  auto program = std::unique_ptr<AstNode>{};
-  yy::parser parser{program};
+  auto trans_unit = std::unique_ptr<AstNode>{};
+  yy::parser parser{trans_unit};
   int ret = parser.parse();
 
   // NOLINTNEXTLINE(cppcoreguidelines-owning-memory)
@@ -85,19 +85,19 @@ int main(  // NOLINT(bugprone-exception-escape): Using a big try-catch block to
   // perform analyses and transformations on the ast
   auto scopes = ScopeStack{};
   TypeChecker type_checker{scopes};
-  program->Accept(type_checker);
+  trans_unit->Accept(type_checker);
   if (opts["dump"].as<bool>()) {
     const auto max_level = 80u;
     AstDumper ast_dumper{Indenter{' ', Indenter::SizePerLevel{2},
                                   Indenter::MaxLevel{max_level}}};
-    program->Accept(ast_dumper);
+    trans_unit->Accept(ast_dumper);
   }
 
   // generate intermediate representation
   auto input_basename = input_path.stem().string();
   auto output_ir = std::ofstream{fmt::format("{}.ssa", input_basename)};
   QbeIrGenerator code_generator{output_ir};
-  program->Accept(code_generator);
+  trans_unit->Accept(code_generator);
 
   output_ir.close();
 

diff --git a/parser.y b/parser.y
@@ -54,7 +54,7 @@ std::unique_ptr<Type> ResolveType(std::unique_ptr<Type> resolved_type,
 %language "c++"
 %locations
 
-%parse-param {std::unique_ptr<AstNode>& program}
+%parse-param {std::unique_ptr<AstNode>& trans_unit}
 
 // Use complete symbols (parser::symbol_type).
 %define api.token.constructor
@@ -156,7 +156,7 @@ std::unique_ptr<Type> ResolveType(std::unique_ptr<Type> resolved_type,
 
 %%
 entry: trans_unit {
-    program = std::make_unique<ProgramNode>(Loc(@1), $1);
+    trans_unit = std::make_unique<TransUnitNode>(Loc(@1), $1);
   }
   ;
 

diff --git a/src/ast.cpp b/src/ast.cpp
@@ -132,11 +132,11 @@ void CompoundStmtNode::Accept(ModifyingVisitor& v) {
   v.Visit(*this);
 }
 
-void ProgramNode::Accept(NonModifyingVisitor& v) const {
+void TransUnitNode::Accept(NonModifyingVisitor& v) const {
   v.Visit(*this);
 }
 
-void ProgramNode::Accept(ModifyingVisitor& v) {
+void TransUnitNode::Accept(ModifyingVisitor& v) {
   v.Visit(*this);
 }
 

diff --git a/src/ast_dumper.cpp b/src/ast_dumper.cpp
@@ -199,11 +199,12 @@ void AstDumper::Visit(const ExternDeclNode& extern_decl) {
   indenter_.DecreaseLevel();
 }
 
-void AstDumper::Visit(const ProgramNode& program) {
-  std::cout << indenter_.Indent() << "ProgramNode <" << program.loc << ">\n";
+void AstDumper::Visit(const TransUnitNode& trans_unit) {
+  std::cout << indenter_.Indent() << "TransUnitNode <" << trans_unit.loc
+            << ">\n";
   indenter_.IncreaseLevel();
-  for (const auto& trans_unit : program.trans_unit) {
-    trans_unit->Accept(*this);
+  for (const auto& extern_decl : trans_unit.extern_decls) {
+    extern_decl->Accept(*this);
   }
   indenter_.DecreaseLevel();
 }

diff --git a/src/qbe_ir_generator.cpp b/src/qbe_ir_generator.cpp
@@ -316,12 +316,12 @@ void QbeIrGenerator::Visit(const ExternDeclNode& extern_decl) {
              extern_decl.decl);
 }
 
-void QbeIrGenerator::Visit(const ProgramNode& program) {
+void QbeIrGenerator::Visit(const TransUnitNode& trans_unit) {
   // Generate the data of builtin functions.
   Write_("data {} = align 1 {{ b \"%d\\012\\000\", }}\n",
          user_defined::GlobalPointer{"__builtin_print_format"});
 
-  for (const auto& extern_decl : program.trans_unit) {
+  for (const auto& extern_decl : trans_unit.extern_decls) {
     extern_decl->Accept(*this);
   }
 }

diff --git a/src/type_checker.cpp b/src/type_checker.cpp
@@ -186,10 +186,6 @@ void TypeChecker::Visit(FuncDefNode& func_def) {
     // TODO: redefinition of function id
   }
 
-  if (func_def.id == "main") {
-    has_main_func_ = true;
-  }
-
   env_.PushScope(ScopeKind::kFunc);
   // NOTE: This block scope will be merged with the function body. Don't pop it.
   env_.PushScope(ScopeKind::kBlock);
@@ -255,17 +251,13 @@ void TypeChecker::Visit(ExternDeclNode& extern_decl) {
              extern_decl.decl);
 }
 
-void TypeChecker::Visit(ProgramNode& program) {
+void TypeChecker::Visit(TransUnitNode& trans_unit) {
   env_.PushScope(ScopeKind::kFile);
   InstallBuiltins_(env_);
-  for (auto& extern_decl : program.trans_unit) {
+  for (auto& extern_decl : trans_unit.extern_decls) {
     extern_decl->Accept(*this);
   }
 
-  if (!has_main_func_) {
-    // TODO: no main function
-    assert(false);
-  }
   env_.PopScope();
 }
 

diff --git a/test/typecheck/array.exp b/test/typecheck/array.exp
@@ -1,4 +1,4 @@
-ProgramNode <1:1>
+TransUnitNode <1:1>
   ExternDeclNode <1:1>
     FuncDefNode <1:5> main: int ()
       CompoundStmtNode <1:12>

diff --git a/test/typecheck/array_param.exp b/test/typecheck/array_param.exp
@@ -1,4 +1,4 @@
-ProgramNode <2:1>
+TransUnitNode <2:1>
   ExternDeclNode <2:1>
     FuncDefNode <2:5> func: int (int*)
       ParamNode <2:14> a: int*

diff --git a/test/typecheck/assignment_expr.exp b/test/typecheck/assignment_expr.exp
@@ -1,4 +1,4 @@
-ProgramNode <1:1>
+TransUnitNode <1:1>
   ExternDeclNode <1:1>
     FuncDefNode <1:5> main: int ()
       CompoundStmtNode <1:12>

diff --git a/test/typecheck/bin_expr.exp b/test/typecheck/bin_expr.exp
@@ -1,4 +1,4 @@
-ProgramNode <1:1>
+TransUnitNode <1:1>
   ExternDeclNode <1:1>
     FuncDefNode <1:5> main: int ()
       CompoundStmtNode <1:12>

diff --git a/test/typecheck/break_stmt.exp b/test/typecheck/break_stmt.exp
@@ -1,4 +1,4 @@
-ProgramNode <1:1>
+TransUnitNode <1:1>
   ExternDeclNode <1:1>
     FuncDefNode <1:5> main: int ()
       CompoundStmtNode <1:12>

diff --git a/test/typecheck/comma_expr.exp b/test/typecheck/comma_expr.exp
@@ -1,4 +1,4 @@
-ProgramNode <1:1>
+TransUnitNode <1:1>
   ExternDeclNode <1:1>
     FuncDefNode <1:5> main: int ()
       CompoundStmtNode <1:12>

diff --git a/test/typecheck/comment.exp b/test/typecheck/comment.exp
@@ -1,4 +1,4 @@
-ProgramNode <4:1>
+TransUnitNode <4:1>
   ExternDeclNode <4:1>
     FuncDefNode <4:5> main: int ()
       CompoundStmtNode <4:40>

diff --git a/test/typecheck/comp_expr.exp b/test/typecheck/comp_expr.exp
@@ -1,4 +1,4 @@
-ProgramNode <1:1>
+TransUnitNode <1:1>
   ExternDeclNode <1:1>
     FuncDefNode <1:5> main: int ()
       CompoundStmtNode <1:12>

diff --git a/test/typecheck/compound_stmt.exp b/test/typecheck/compound_stmt.exp
@@ -1,4 +1,4 @@
-ProgramNode <1:1>
+TransUnitNode <1:1>
   ExternDeclNode <1:1>
     FuncDefNode <1:5> main: int ()
       CompoundStmtNode <1:12>

diff --git a/test/typecheck/cond_expr.exp b/test/typecheck/cond_expr.exp
@@ -1,4 +1,4 @@
-ProgramNode <1:1>
+TransUnitNode <1:1>
   ExternDeclNode <1:1>
     FuncDefNode <1:5> main: int ()
       CompoundStmtNode <1:12>

diff --git a/test/typecheck/continue_stmt.exp b/test/typecheck/continue_stmt.exp
@@ -1,4 +1,4 @@
-ProgramNode <1:1>
+TransUnitNode <1:1>
   ExternDeclNode <1:1>
     FuncDefNode <1:5> main: int ()
       CompoundStmtNode <1:12>

diff --git a/test/typecheck/decl.exp b/test/typecheck/decl.exp
@@ -1,4 +1,4 @@
-ProgramNode <1:1>
+TransUnitNode <1:1>
   ExternDeclNode <1:1>
     FuncDefNode <1:5> main: int ()
       CompoundStmtNode <1:12>

diff --git a/test/typecheck/do_while_single_stmt.exp b/test/typecheck/do_while_single_stmt.exp
@@ -1,4 +1,4 @@
-ProgramNode <1:1>
+TransUnitNode <1:1>
   ExternDeclNode <1:1>
     FuncDefNode <1:5> main: int ()
       CompoundStmtNode <1:12>

diff --git a/test/typecheck/do_while_stmt.exp b/test/typecheck/do_while_stmt.exp
@@ -1,4 +1,4 @@
-ProgramNode <1:1>
+TransUnitNode <1:1>
   ExternDeclNode <1:1>
     FuncDefNode <1:5> main: int ()
       CompoundStmtNode <1:12>

diff --git a/test/typecheck/for_infinite_loop.exp b/test/typecheck/for_infinite_loop.exp
@@ -1,4 +1,4 @@
-ProgramNode <1:1>
+TransUnitNode <1:1>
   ExternDeclNode <1:1>
     FuncDefNode <1:5> main: int ()
       CompoundStmtNode <1:12>

diff --git a/test/typecheck/for_nested_stmt.exp b/test/typecheck/for_nested_stmt.exp
@@ -1,4 +1,4 @@
-ProgramNode <1:1>
+TransUnitNode <1:1>
   ExternDeclNode <1:1>
     FuncDefNode <1:5> main: int ()
       CompoundStmtNode <1:12>

diff --git a/test/typecheck/for_stmt.exp b/test/typecheck/for_stmt.exp
@@ -1,4 +1,4 @@
-ProgramNode <1:1>
+TransUnitNode <1:1>
   ExternDeclNode <1:1>
     FuncDefNode <1:5> main: int ()
       CompoundStmtNode <1:12>

diff --git a/test/typecheck/func_call.exp b/test/typecheck/func_call.exp
@@ -1,4 +1,4 @@
-ProgramNode <1:1>
+TransUnitNode <1:1>
   ExternDeclNode <1:1>
     FuncDefNode <1:5> five: int ()
       CompoundStmtNode <1:12>

diff --git a/test/typecheck/func_call_param.exp b/test/typecheck/func_call_param.exp
@@ -1,4 +1,4 @@
-ProgramNode <1:1>
+TransUnitNode <1:1>
   ExternDeclNode <1:1>
     FuncDefNode <1:5> sum: int (int, int, int)
       ParamNode <1:13> a: int

diff --git a/test/typecheck/func_pointer.exp b/test/typecheck/func_pointer.exp
@@ -1,4 +1,4 @@
-ProgramNode <1:1>
+TransUnitNode <1:1>
   ExternDeclNode <1:1>
     FuncDefNode <1:5> add: int (int, int)
       ParamNode <1:13> a: int

diff --git a/test/typecheck/func_pointer_param.exp b/test/typecheck/func_pointer_param.exp
@@ -1,4 +1,4 @@
-ProgramNode <1:1>
+TransUnitNode <1:1>
   ExternDeclNode <1:1>
     FuncDefNode <1:5> add: int (int, int)
       ParamNode <1:13> a: int

diff --git a/test/typecheck/global_decl.exp b/test/typecheck/global_decl.exp
@@ -1,4 +1,4 @@
-ProgramNode <1:1>
+TransUnitNode <1:1>
   ExternDeclNode <1:1>
     DeclStmtNode <1:1>
       VarDeclNode <1:5> c: int

diff --git a/test/typecheck/goto_stmt.exp b/test/typecheck/goto_stmt.exp
@@ -1,4 +1,4 @@
-ProgramNode <1:1>
+TransUnitNode <1:1>
   ExternDeclNode <1:1>
     FuncDefNode <1:5> main: int ()
       CompoundStmtNode <1:12>

diff --git a/test/typecheck/id_expr.exp b/test/typecheck/id_expr.exp
@@ -1,4 +1,4 @@
-ProgramNode <1:1>
+TransUnitNode <1:1>
   ExternDeclNode <1:1>
     FuncDefNode <1:5> main: int ()
       CompoundStmtNode <1:12>

diff --git a/test/typecheck/identifier.exp b/test/typecheck/identifier.exp
@@ -1,4 +1,4 @@
-ProgramNode <1:1>
+TransUnitNode <1:1>
   ExternDeclNode <1:1>
     FuncDefNode <1:5> main: int ()
       CompoundStmtNode <1:12>

diff --git a/test/typecheck/if_else_nested_single_stmt.exp b/test/typecheck/if_else_nested_single_stmt.exp
@@ -1,4 +1,4 @@
-ProgramNode <1:1>
+TransUnitNode <1:1>
   ExternDeclNode <1:1>
     FuncDefNode <1:5> main: int ()
       CompoundStmtNode <1:12>

diff --git a/test/typecheck/if_else_nested_stmt.exp b/test/typecheck/if_else_nested_stmt.exp
@@ -1,4 +1,4 @@
-ProgramNode <1:1>
+TransUnitNode <1:1>
   ExternDeclNode <1:1>
     FuncDefNode <1:5> main: int ()
       CompoundStmtNode <1:12>

diff --git a/test/typecheck/if_else_single_stmt.exp b/test/typecheck/if_else_single_stmt.exp
@@ -1,4 +1,4 @@
-ProgramNode <1:1>
+TransUnitNode <1:1>
   ExternDeclNode <1:1>
     FuncDefNode <1:5> main: int ()
       CompoundStmtNode <1:12>

diff --git a/test/typecheck/if_else_stmt.exp b/test/typecheck/if_else_stmt.exp
@@ -1,4 +1,4 @@
-ProgramNode <1:1>
+TransUnitNode <1:1>
   ExternDeclNode <1:1>
     FuncDefNode <1:5> main: int ()
       CompoundStmtNode <1:12>

diff --git a/test/typecheck/if_single_stmt.exp b/test/typecheck/if_single_stmt.exp
@@ -1,4 +1,4 @@
-ProgramNode <1:1>
+TransUnitNode <1:1>
   ExternDeclNode <1:1>
     FuncDefNode <1:5> main: int ()
       CompoundStmtNode <1:12>