modify according to suggestions

CMakeLists.txt

@@ -10,19 +10,17 @@ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O0 -Wall -g -pedantic")
 include_directories(${CMAKE_CURRENT_BINARY_DIR})
 
 include_directories(${CMAKE_CURRENT_SOURCE_DIR}/include)
-include_directories(${CMAKE_CURRENT_SOURCE_DIR}/include/ASTBuilder)
-include_directories(${CMAKE_CURRENT_SOURCE_DIR}/include/ASTPrinter)
+include_directories(${CMAKE_CURRENT_SOURCE_DIR}/include/AST)
 include_directories(${CMAKE_CURRENT_SOURCE_DIR}/include/ErrorReporter)
-include_directories(${CMAKE_CURRENT_SOURCE_DIR}/include/Grammar)
+include_directories(${CMAKE_CURRENT_SOURCE_DIR}/include/Frontend)
 include_directories(${CMAKE_CURRENT_SOURCE_DIR}/include/SysYFIR)
-include_directories(${CMAKE_CURRENT_SOURCE_DIR}/include/SysYFBuilder)
+include_directories(${CMAKE_CURRENT_SOURCE_DIR}/include/SysYFIRBuilder)
 
-add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/src/ASTBuilder)
-add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/src/ASTPrinter)
+add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/src/AST)
 add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/src/ErrorReporter)
-add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/src/Grammar)
+add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/src/Frontend)
 add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/src/SysYFIR)
-add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/src/SysYFBuilder)
+add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/src/SysYFIRBuilder)
 
 add_executable(
   SysYFCompiler
@@ -31,7 +29,7 @@ add_executable(
 
 target_link_libraries(
   SysYFCompiler
-  SysYFBuilder
+  SysYFIRBuilder
   IRLib
   Driver
   ASTPrinter

Student/task2/CMakeLists.txt

@@ -1,4 +1,4 @@
-project(SysYF_Task2)
+project(task2)
 
 cmake_minimum_required(VERSION 3.5)
 
@@ -13,5 +13,5 @@ set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
 include_directories(${SYSYF_SOURCE_DIR}include/SysYFIR)
 add_subdirectory(${SYSYF_SOURCE_DIR}src/SysYFIR src/SysYFIR)
 
-add_subdirectory(ta_demo)
-add_subdirectory(student_cpp)
+add_subdirectory(demo)
+add_subdirectory(cpp)

include/SysYFIR/IRStmtBuilder.h

@@ -1,5 +1,5 @@
-#ifndef _SYSYF_IRBUILDER_H_
-#define _SYSYF_IRBUILDER_H_
+#ifndef _SYSYF_IRSTMTBUILDER_H_
+#define _SYSYF_IRSTMTBUILDER_H_
 
 #include "BasicBlock.h"
 #include "Instruction.h"
@@ -72,4 +72,4 @@ public:
     SiToFpInst *create_sitofp(Value *val, Type *ty) { return SiToFpInst::create_sitofp(val, ty, this->BB_); }
 };
 
-#endif // _SYSYF_IRBUILDER_H_
+#endif // _SYSYF_IRSTMTBUILDER_H_

include/SysYFIRBuilder/IRBuilder.h

@@ -1,9 +1,9 @@
-#ifndef _SYSYF_IR_BUILDER_HPP_
-#define _SYSYF_IR_BUILDER_HPP_
+#ifndef _SYSYF_IR_BUILDER_H_
+#define _SYSYF_IR_BUILDER_H_
 #include "BasicBlock.h"
 #include "Constant.h"
 #include "Function.h"
-#include "IRBuilder.h"
+#include "IRStmtBuilder.h"
 #include "Module.h"
 #include "Type.h"
 #include <map>
@@ -214,4 +214,4 @@ public:
 };
 
 
-#endif // _SYSYF_IR_BUILDER_HPP_
+#endif // _SYSYF_IR_BUILDER_H_

src/AST/CMakeLists.txt

@@ -1,3 +1,8 @@
+add_library(
+    ASTLib STATIC
+    SyntaxTree.cpp
+)
+
 add_library(
     ASTPrinter
     SyntaxTreePrinter.cpp

src/ASTBuilder/CMakeLists.txt

@@ -1,4 +0,0 @@
-add_library(
-    ASTLib STATIC
-    SyntaxTree.cpp
-)

src/SysYFBuilder/CMakeLists.txt

@@ -1,4 +0,0 @@
-add_library(
-    SysYFBuilder STATIC
-    SysYFBuilder.cpp
-)

src/SysYFIR/BasicBlock.cpp

@@ -1,7 +1,7 @@
 #include "Module.h"
 #include "BasicBlock.h"
 #include "Function.h"
-#include "IRprinter.h"
+#include "IRPrinter.h"
 #ifdef DEBUG
 #include <cassert>
 #endif

src/SysYFIR/CMakeLists.txt

@@ -9,5 +9,5 @@ add_library(
         GlobalVariable.cpp
         Instruction.cpp
         Module.cpp
-        IRprinter.cpp
+        IRPrinter.cpp
 )

src/SysYFIR/Function.cpp

@@ -1,6 +1,6 @@
 #include "Module.h"
 #include "Function.h"
-#include "IRprinter.h"
+#include "IRPrinter.h"
 
 Function::Function(FunctionType *ty, const std::string &name, Module *parent)
     : Value(ty, name), parent_(parent), seq_cnt_(0)

src/SysYFIR/GlobalVariable.cpp

@@ -1,5 +1,5 @@
 #include "GlobalVariable.h"
-#include "IRprinter.h"
+#include "IRPrinter.h"
 
 GlobalVariable::GlobalVariable( std::string name, Module *m, Type* ty, bool is_const, Constant* init)
     : User(ty, name, init != nullptr), is_const_(is_const), init_val_(init) 

src/SysYFIR/IRprinter.cpp

@@ -1,4 +1,4 @@
-#include "IRprinter.h"
+#include "IRPrinter.h"
 
 std::string print_as_op( Value *v, bool print_ty )
 {

src/SysYFIR/Instruction.cpp

@@ -3,7 +3,7 @@
 #include "Function.h"
 #include "BasicBlock.h"
 #include "Instruction.h"
-#include "IRprinter.h"
+#include "IRPrinter.h"
 #ifdef DEBUG
 #include <cassert>
 #endif

src/SysYFIRBuilder/CMakeLists.txt

@@ -0,0 +1,4 @@
+add_library(
+    SysYFIRBuilder STATIC
+    IRBuilder.cpp
+)

src/SysYFIRBuilder/IRBuilder.cpp

@@ -1,4 +1,4 @@
-#include "SysYFBuilder.hpp"
+#include "IRBuilder.h"
 
 #define CONST_INT(num) ConstantInt::get(num, module.get())
 #define CONST_FLOAT(num) ConstantFloat::get(num, module.get())

src/main.cpp

@@ -1,5 +1,5 @@
 #include <iostream>
-#include "SysYFBuilder.hpp"
+#include "IRBuilder.h"
 #include "SysYFDriver.h"
 #include "SyntaxTreePrinter.h"
 #include "ErrorReporter.h"