From 54b7837f80e722582df0e5e1f7f85164607f89f2 Mon Sep 17 00:00:00 2001 From: 15750821961 Date: Fri, 19 Nov 2021 09:46:25 +0800 Subject: [PATCH] modify according to suggestions --- CMakeLists.txt | 16 +++++++--------- .../ta_demo => Student/task1/demo}/go_upstairs.c | 0 .../task1/ll}/assign_hand.ll | 0 .../student_ll => Student/task1/ll}/func_hand.ll | 0 .../student_ll => Student/task1/ll}/if_hand.ll | 0 .../task1/ll}/while_hand.ll | 0 .../task1/sy}/assign_test.sy | 0 .../student_sy => Student/task1/sy}/func_test.sy | 0 .../student_sy => Student/task1/sy}/if_test.sy | 0 .../task1/sy}/while_test.sy | 0 .../SysYF_Task2 => Student/task2}/CMakeLists.txt | 6 +++--- .../task2/cpp}/CMakeLists.txt | 0 .../task2/cpp}/assign_gen.cpp | 0 .../task2/cpp}/func_gen.cpp | 0 .../student_cpp => Student/task2/cpp}/if_gen.cpp | 0 .../task2/cpp}/while_gen.cpp | 0 .../task2/demo}/CMakeLists.txt | 0 .../task2/demo}/go_upstairs.sy | 0 .../task2/demo}/go_upstairs_gen.cpp | 0 .../task2/sy}/assign_test.sy | 0 .../student_sy => Student/task2/sy}/func_test.sy | 0 .../student_sy => Student/task2/sy}/if_test.sy | 0 .../task2/sy}/while_test.sy | 0 .../Test/Easy => Student/task3/test}/01_main.out | 0 .../Test/Easy => Student/task3/test}/01_main.sy | 0 .../Easy => Student/task3/test}/02_var_defn.out | 0 .../Easy => Student/task3/test}/02_var_defn.sy | 0 .../task3/test}/03_empty_stmt.out | 0 .../Easy => Student/task3/test}/03_empty_stmt.sy | 0 .../Easy => Student/task3/test}/04_arr_defn.out | 0 .../Easy => Student/task3/test}/04_arr_defn.sy | 0 .../task3/test}/05_arr_assign.out | 0 .../Easy => Student/task3/test}/05_arr_assign.sy | 0 .../task3/test}/06_const_defn.out | 0 .../Easy => Student/task3/test}/06_const_defn.sy | 0 .../task3/test}/07_const_array_defn.out | 0 .../task3/test}/07_const_array_defn.sy | 0 .../task3/test}/08_var_defn_func.out | 0 .../task3/test}/08_var_defn_func.sy | 0 .../Easy => Student/task3/test}/09_void_func.out | 0 .../Easy => Student/task3/test}/09_void_func.sy | 0 .../Test/Easy => Student/task3/test}/10_if.out | 0 .../Test/Easy => Student/task3/test}/10_if.sy | 0 .../Easy => Student/task3/test}/11_if_else.out | 0 .../Easy => Student/task3/test}/11_if_else.sy | 0 .../Easy => Student/task3/test}/12_while.out | 0 .../Test/Easy => Student/task3/test}/12_while.sy | 0 .../Easy => Student/task3/test}/13_break.out | 0 .../Test/Easy => Student/task3/test}/13_break.sy | 0 .../Easy => Student/task3/test}/14_continue.out | 0 .../Easy => Student/task3/test}/14_continue.sy | 0 .../Easy => Student/task3/test}/15_getint.in | 0 .../Easy => Student/task3/test}/15_getint.out | 0 .../Easy => Student/task3/test}/15_getint.sy | 0 .../Easy => Student/task3/test}/16_func_test.out | 0 .../Easy => Student/task3/test}/16_func_test.sy | 0 .../Test/Easy => Student/task3/test}/17_equal.in | 0 .../Easy => Student/task3/test}/17_equal.out | 0 .../Test/Easy => Student/task3/test}/17_equal.sy | 0 .../Easy => Student/task3/test}/18_scope.out | 0 .../Test/Easy => Student/task3/test}/18_scope.sy | 0 .../Test/Easy => Student/task3/test}/19_gcd.in | 0 .../Test/Easy => Student/task3/test}/19_gcd.out | 0 .../Test/Easy => Student/task3/test}/19_gcd.sy | 0 .../Test/Easy => Student/task3/test}/20_hanoi.in | 0 .../Easy => Student/task3/test}/20_hanoi.out | 0 .../Test/Easy => Student/task3/test}/20_hanoi.sy | 0 .../Test => Student/task3/test}/test.py | 0 include/{ASTBuilder => AST}/SyntaxTree.h | 0 include/{ASTPrinter => AST}/SyntaxTreePrinter.h | 0 include/{Grammar => Frontend}/FlexLexer.h | 0 include/{Grammar => Frontend}/SysYFDriver.h | 0 include/{Grammar => Frontend}/SysYFFlexLexer.h | 0 include/{Grammar => Frontend}/SysYFParser.h | 0 include/{Grammar => Frontend}/location.hh | 0 include/{Grammar => Frontend}/position.hh | 0 include/{Grammar => Frontend}/stack.hh | 0 include/SysYFIR/{IRBuilder.h => IRStmtBuilder.h} | 6 +++--- .../IRBuilder.h} | 8 ++++---- src/{ASTPrinter => AST}/CMakeLists.txt | 5 +++++ src/{ASTBuilder => AST}/SyntaxTree.cpp | 0 src/{ASTPrinter => AST}/SyntaxTreePrinter.cpp | 0 src/ASTBuilder/CMakeLists.txt | 4 ---- src/{Grammar => Frontend}/CMakeLists.txt | 0 src/{Grammar => Frontend}/SysYFDriver.cpp | 0 src/{Grammar => Frontend}/SysYFParser.cpp | 0 src/{Grammar => Frontend}/SysYFScanner.cpp | 0 src/SysYFBuilder/CMakeLists.txt | 4 ---- src/SysYFIR/BasicBlock.cpp | 2 +- src/SysYFIR/CMakeLists.txt | 2 +- src/SysYFIR/Function.cpp | 2 +- src/SysYFIR/GlobalVariable.cpp | 2 +- src/SysYFIR/IRprinter.cpp | 2 +- src/SysYFIR/Instruction.cpp | 2 +- src/SysYFIRBuilder/CMakeLists.txt | 4 ++++ .../IRBuilder.cpp} | 2 +- src/main.cpp | 2 +- 97 files changed, 34 insertions(+), 35 deletions(-) rename {SysYF_Student/SysYF_Task1/ta_demo => Student/task1/demo}/go_upstairs.c (100%) rename {SysYF_Student/SysYF_Task1/student_ll => Student/task1/ll}/assign_hand.ll (100%) rename {SysYF_Student/SysYF_Task1/student_ll => Student/task1/ll}/func_hand.ll (100%) rename {SysYF_Student/SysYF_Task1/student_ll => Student/task1/ll}/if_hand.ll (100%) rename {SysYF_Student/SysYF_Task1/student_ll => Student/task1/ll}/while_hand.ll (100%) rename {SysYF_Student/SysYF_Task1/student_sy => Student/task1/sy}/assign_test.sy (100%) rename {SysYF_Student/SysYF_Task1/student_sy => Student/task1/sy}/func_test.sy (100%) rename {SysYF_Student/SysYF_Task1/student_sy => Student/task1/sy}/if_test.sy (100%) rename {SysYF_Student/SysYF_Task1/student_sy => Student/task1/sy}/while_test.sy (100%) rename {SysYF_Student/SysYF_Task2 => Student/task2}/CMakeLists.txt (84%) rename {SysYF_Student/SysYF_Task2/student_cpp => Student/task2/cpp}/CMakeLists.txt (100%) rename {SysYF_Student/SysYF_Task2/student_cpp => Student/task2/cpp}/assign_gen.cpp (100%) rename {SysYF_Student/SysYF_Task2/student_cpp => Student/task2/cpp}/func_gen.cpp (100%) rename {SysYF_Student/SysYF_Task2/student_cpp => Student/task2/cpp}/if_gen.cpp (100%) rename {SysYF_Student/SysYF_Task2/student_cpp => Student/task2/cpp}/while_gen.cpp (100%) rename {SysYF_Student/SysYF_Task2/ta_demo => Student/task2/demo}/CMakeLists.txt (100%) rename {SysYF_Student/SysYF_Task2/ta_demo => Student/task2/demo}/go_upstairs.sy (100%) rename {SysYF_Student/SysYF_Task2/ta_demo => Student/task2/demo}/go_upstairs_gen.cpp (100%) rename {SysYF_Student/SysYF_Task2/student_sy => Student/task2/sy}/assign_test.sy (100%) rename {SysYF_Student/SysYF_Task2/student_sy => Student/task2/sy}/func_test.sy (100%) rename {SysYF_Student/SysYF_Task2/student_sy => Student/task2/sy}/if_test.sy (100%) rename {SysYF_Student/SysYF_Task2/student_sy => Student/task2/sy}/while_test.sy (100%) rename {SysYF_Student/SysYF_Task3/Test/Easy => Student/task3/test}/01_main.out (100%) rename {SysYF_Student/SysYF_Task3/Test/Easy => Student/task3/test}/01_main.sy (100%) rename {SysYF_Student/SysYF_Task3/Test/Easy => Student/task3/test}/02_var_defn.out (100%) rename {SysYF_Student/SysYF_Task3/Test/Easy => Student/task3/test}/02_var_defn.sy (100%) rename {SysYF_Student/SysYF_Task3/Test/Easy => Student/task3/test}/03_empty_stmt.out (100%) rename {SysYF_Student/SysYF_Task3/Test/Easy => Student/task3/test}/03_empty_stmt.sy (100%) rename {SysYF_Student/SysYF_Task3/Test/Easy => Student/task3/test}/04_arr_defn.out (100%) rename {SysYF_Student/SysYF_Task3/Test/Easy => Student/task3/test}/04_arr_defn.sy (100%) rename {SysYF_Student/SysYF_Task3/Test/Easy => Student/task3/test}/05_arr_assign.out (100%) rename {SysYF_Student/SysYF_Task3/Test/Easy => Student/task3/test}/05_arr_assign.sy (100%) rename {SysYF_Student/SysYF_Task3/Test/Easy => Student/task3/test}/06_const_defn.out (100%) rename {SysYF_Student/SysYF_Task3/Test/Easy => Student/task3/test}/06_const_defn.sy (100%) rename {SysYF_Student/SysYF_Task3/Test/Easy => Student/task3/test}/07_const_array_defn.out (100%) rename {SysYF_Student/SysYF_Task3/Test/Easy => Student/task3/test}/07_const_array_defn.sy (100%) rename {SysYF_Student/SysYF_Task3/Test/Easy => Student/task3/test}/08_var_defn_func.out (100%) rename {SysYF_Student/SysYF_Task3/Test/Easy => Student/task3/test}/08_var_defn_func.sy (100%) rename {SysYF_Student/SysYF_Task3/Test/Easy => Student/task3/test}/09_void_func.out (100%) rename {SysYF_Student/SysYF_Task3/Test/Easy => Student/task3/test}/09_void_func.sy (100%) rename {SysYF_Student/SysYF_Task3/Test/Easy => Student/task3/test}/10_if.out (100%) rename {SysYF_Student/SysYF_Task3/Test/Easy => Student/task3/test}/10_if.sy (100%) rename {SysYF_Student/SysYF_Task3/Test/Easy => Student/task3/test}/11_if_else.out (100%) rename {SysYF_Student/SysYF_Task3/Test/Easy => Student/task3/test}/11_if_else.sy (100%) rename {SysYF_Student/SysYF_Task3/Test/Easy => Student/task3/test}/12_while.out (100%) rename {SysYF_Student/SysYF_Task3/Test/Easy => Student/task3/test}/12_while.sy (100%) rename {SysYF_Student/SysYF_Task3/Test/Easy => Student/task3/test}/13_break.out (100%) rename {SysYF_Student/SysYF_Task3/Test/Easy => Student/task3/test}/13_break.sy (100%) rename {SysYF_Student/SysYF_Task3/Test/Easy => Student/task3/test}/14_continue.out (100%) rename {SysYF_Student/SysYF_Task3/Test/Easy => Student/task3/test}/14_continue.sy (100%) rename {SysYF_Student/SysYF_Task3/Test/Easy => Student/task3/test}/15_getint.in (100%) rename {SysYF_Student/SysYF_Task3/Test/Easy => Student/task3/test}/15_getint.out (100%) rename {SysYF_Student/SysYF_Task3/Test/Easy => Student/task3/test}/15_getint.sy (100%) rename {SysYF_Student/SysYF_Task3/Test/Easy => Student/task3/test}/16_func_test.out (100%) rename {SysYF_Student/SysYF_Task3/Test/Easy => Student/task3/test}/16_func_test.sy (100%) rename {SysYF_Student/SysYF_Task3/Test/Easy => Student/task3/test}/17_equal.in (100%) rename {SysYF_Student/SysYF_Task3/Test/Easy => Student/task3/test}/17_equal.out (100%) rename {SysYF_Student/SysYF_Task3/Test/Easy => Student/task3/test}/17_equal.sy (100%) rename {SysYF_Student/SysYF_Task3/Test/Easy => Student/task3/test}/18_scope.out (100%) rename {SysYF_Student/SysYF_Task3/Test/Easy => Student/task3/test}/18_scope.sy (100%) rename {SysYF_Student/SysYF_Task3/Test/Easy => Student/task3/test}/19_gcd.in (100%) rename {SysYF_Student/SysYF_Task3/Test/Easy => Student/task3/test}/19_gcd.out (100%) rename {SysYF_Student/SysYF_Task3/Test/Easy => Student/task3/test}/19_gcd.sy (100%) rename {SysYF_Student/SysYF_Task3/Test/Easy => Student/task3/test}/20_hanoi.in (100%) rename {SysYF_Student/SysYF_Task3/Test/Easy => Student/task3/test}/20_hanoi.out (100%) rename {SysYF_Student/SysYF_Task3/Test/Easy => Student/task3/test}/20_hanoi.sy (100%) rename {SysYF_Student/SysYF_Task3/Test => Student/task3/test}/test.py (100%) rename include/{ASTBuilder => AST}/SyntaxTree.h (100%) rename include/{ASTPrinter => AST}/SyntaxTreePrinter.h (100%) rename include/{Grammar => Frontend}/FlexLexer.h (100%) rename include/{Grammar => Frontend}/SysYFDriver.h (100%) rename include/{Grammar => Frontend}/SysYFFlexLexer.h (100%) rename include/{Grammar => Frontend}/SysYFParser.h (100%) rename include/{Grammar => Frontend}/location.hh (100%) rename include/{Grammar => Frontend}/position.hh (100%) rename include/{Grammar => Frontend}/stack.hh (100%) rename include/SysYFIR/{IRBuilder.h => IRStmtBuilder.h} (97%) rename include/{SysYFBuilder/SysYFBuilder.hpp => SysYFIRBuilder/IRBuilder.h} (98%) rename src/{ASTPrinter => AST}/CMakeLists.txt (51%) rename src/{ASTBuilder => AST}/SyntaxTree.cpp (100%) rename src/{ASTPrinter => AST}/SyntaxTreePrinter.cpp (100%) delete mode 100644 src/ASTBuilder/CMakeLists.txt rename src/{Grammar => Frontend}/CMakeLists.txt (100%) rename src/{Grammar => Frontend}/SysYFDriver.cpp (100%) rename src/{Grammar => Frontend}/SysYFParser.cpp (100%) rename src/{Grammar => Frontend}/SysYFScanner.cpp (100%) delete mode 100644 src/SysYFBuilder/CMakeLists.txt create mode 100644 src/SysYFIRBuilder/CMakeLists.txt rename src/{SysYFBuilder/SysYFBuilder.cpp => SysYFIRBuilder/IRBuilder.cpp} (98%) diff --git a/CMakeLists.txt b/CMakeLists.txt index a33e42e..751d76b 100644 --- a/CMakeLists.txt +++ b/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 diff --git a/SysYF_Student/SysYF_Task1/ta_demo/go_upstairs.c b/Student/task1/demo/go_upstairs.c similarity index 100% rename from SysYF_Student/SysYF_Task1/ta_demo/go_upstairs.c rename to Student/task1/demo/go_upstairs.c diff --git a/SysYF_Student/SysYF_Task1/student_ll/assign_hand.ll b/Student/task1/ll/assign_hand.ll similarity index 100% rename from SysYF_Student/SysYF_Task1/student_ll/assign_hand.ll rename to Student/task1/ll/assign_hand.ll diff --git a/SysYF_Student/SysYF_Task1/student_ll/func_hand.ll b/Student/task1/ll/func_hand.ll similarity index 100% rename from SysYF_Student/SysYF_Task1/student_ll/func_hand.ll rename to Student/task1/ll/func_hand.ll diff --git a/SysYF_Student/SysYF_Task1/student_ll/if_hand.ll b/Student/task1/ll/if_hand.ll similarity index 100% rename from SysYF_Student/SysYF_Task1/student_ll/if_hand.ll rename to Student/task1/ll/if_hand.ll diff --git a/SysYF_Student/SysYF_Task1/student_ll/while_hand.ll b/Student/task1/ll/while_hand.ll similarity index 100% rename from SysYF_Student/SysYF_Task1/student_ll/while_hand.ll rename to Student/task1/ll/while_hand.ll diff --git a/SysYF_Student/SysYF_Task1/student_sy/assign_test.sy b/Student/task1/sy/assign_test.sy similarity index 100% rename from SysYF_Student/SysYF_Task1/student_sy/assign_test.sy rename to Student/task1/sy/assign_test.sy diff --git a/SysYF_Student/SysYF_Task1/student_sy/func_test.sy b/Student/task1/sy/func_test.sy similarity index 100% rename from SysYF_Student/SysYF_Task1/student_sy/func_test.sy rename to Student/task1/sy/func_test.sy diff --git a/SysYF_Student/SysYF_Task1/student_sy/if_test.sy b/Student/task1/sy/if_test.sy similarity index 100% rename from SysYF_Student/SysYF_Task1/student_sy/if_test.sy rename to Student/task1/sy/if_test.sy diff --git a/SysYF_Student/SysYF_Task1/student_sy/while_test.sy b/Student/task1/sy/while_test.sy similarity index 100% rename from SysYF_Student/SysYF_Task1/student_sy/while_test.sy rename to Student/task1/sy/while_test.sy diff --git a/SysYF_Student/SysYF_Task2/CMakeLists.txt b/Student/task2/CMakeLists.txt similarity index 84% rename from SysYF_Student/SysYF_Task2/CMakeLists.txt rename to Student/task2/CMakeLists.txt index dd44d77..3ff41d8 100644 --- a/SysYF_Student/SysYF_Task2/CMakeLists.txt +++ b/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) diff --git a/SysYF_Student/SysYF_Task2/student_cpp/CMakeLists.txt b/Student/task2/cpp/CMakeLists.txt similarity index 100% rename from SysYF_Student/SysYF_Task2/student_cpp/CMakeLists.txt rename to Student/task2/cpp/CMakeLists.txt diff --git a/SysYF_Student/SysYF_Task2/student_cpp/assign_gen.cpp b/Student/task2/cpp/assign_gen.cpp similarity index 100% rename from SysYF_Student/SysYF_Task2/student_cpp/assign_gen.cpp rename to Student/task2/cpp/assign_gen.cpp diff --git a/SysYF_Student/SysYF_Task2/student_cpp/func_gen.cpp b/Student/task2/cpp/func_gen.cpp similarity index 100% rename from SysYF_Student/SysYF_Task2/student_cpp/func_gen.cpp rename to Student/task2/cpp/func_gen.cpp diff --git a/SysYF_Student/SysYF_Task2/student_cpp/if_gen.cpp b/Student/task2/cpp/if_gen.cpp similarity index 100% rename from SysYF_Student/SysYF_Task2/student_cpp/if_gen.cpp rename to Student/task2/cpp/if_gen.cpp diff --git a/SysYF_Student/SysYF_Task2/student_cpp/while_gen.cpp b/Student/task2/cpp/while_gen.cpp similarity index 100% rename from SysYF_Student/SysYF_Task2/student_cpp/while_gen.cpp rename to Student/task2/cpp/while_gen.cpp diff --git a/SysYF_Student/SysYF_Task2/ta_demo/CMakeLists.txt b/Student/task2/demo/CMakeLists.txt similarity index 100% rename from SysYF_Student/SysYF_Task2/ta_demo/CMakeLists.txt rename to Student/task2/demo/CMakeLists.txt diff --git a/SysYF_Student/SysYF_Task2/ta_demo/go_upstairs.sy b/Student/task2/demo/go_upstairs.sy similarity index 100% rename from SysYF_Student/SysYF_Task2/ta_demo/go_upstairs.sy rename to Student/task2/demo/go_upstairs.sy diff --git a/SysYF_Student/SysYF_Task2/ta_demo/go_upstairs_gen.cpp b/Student/task2/demo/go_upstairs_gen.cpp similarity index 100% rename from SysYF_Student/SysYF_Task2/ta_demo/go_upstairs_gen.cpp rename to Student/task2/demo/go_upstairs_gen.cpp diff --git a/SysYF_Student/SysYF_Task2/student_sy/assign_test.sy b/Student/task2/sy/assign_test.sy similarity index 100% rename from SysYF_Student/SysYF_Task2/student_sy/assign_test.sy rename to Student/task2/sy/assign_test.sy diff --git a/SysYF_Student/SysYF_Task2/student_sy/func_test.sy b/Student/task2/sy/func_test.sy similarity index 100% rename from SysYF_Student/SysYF_Task2/student_sy/func_test.sy rename to Student/task2/sy/func_test.sy diff --git a/SysYF_Student/SysYF_Task2/student_sy/if_test.sy b/Student/task2/sy/if_test.sy similarity index 100% rename from SysYF_Student/SysYF_Task2/student_sy/if_test.sy rename to Student/task2/sy/if_test.sy diff --git a/SysYF_Student/SysYF_Task2/student_sy/while_test.sy b/Student/task2/sy/while_test.sy similarity index 100% rename from SysYF_Student/SysYF_Task2/student_sy/while_test.sy rename to Student/task2/sy/while_test.sy diff --git a/SysYF_Student/SysYF_Task3/Test/Easy/01_main.out b/Student/task3/test/01_main.out similarity index 100% rename from SysYF_Student/SysYF_Task3/Test/Easy/01_main.out rename to Student/task3/test/01_main.out diff --git a/SysYF_Student/SysYF_Task3/Test/Easy/01_main.sy b/Student/task3/test/01_main.sy similarity index 100% rename from SysYF_Student/SysYF_Task3/Test/Easy/01_main.sy rename to Student/task3/test/01_main.sy diff --git a/SysYF_Student/SysYF_Task3/Test/Easy/02_var_defn.out b/Student/task3/test/02_var_defn.out similarity index 100% rename from SysYF_Student/SysYF_Task3/Test/Easy/02_var_defn.out rename to Student/task3/test/02_var_defn.out diff --git a/SysYF_Student/SysYF_Task3/Test/Easy/02_var_defn.sy b/Student/task3/test/02_var_defn.sy similarity index 100% rename from SysYF_Student/SysYF_Task3/Test/Easy/02_var_defn.sy rename to Student/task3/test/02_var_defn.sy diff --git a/SysYF_Student/SysYF_Task3/Test/Easy/03_empty_stmt.out b/Student/task3/test/03_empty_stmt.out similarity index 100% rename from SysYF_Student/SysYF_Task3/Test/Easy/03_empty_stmt.out rename to Student/task3/test/03_empty_stmt.out diff --git a/SysYF_Student/SysYF_Task3/Test/Easy/03_empty_stmt.sy b/Student/task3/test/03_empty_stmt.sy similarity index 100% rename from SysYF_Student/SysYF_Task3/Test/Easy/03_empty_stmt.sy rename to Student/task3/test/03_empty_stmt.sy diff --git a/SysYF_Student/SysYF_Task3/Test/Easy/04_arr_defn.out b/Student/task3/test/04_arr_defn.out similarity index 100% rename from SysYF_Student/SysYF_Task3/Test/Easy/04_arr_defn.out rename to Student/task3/test/04_arr_defn.out diff --git a/SysYF_Student/SysYF_Task3/Test/Easy/04_arr_defn.sy b/Student/task3/test/04_arr_defn.sy similarity index 100% rename from SysYF_Student/SysYF_Task3/Test/Easy/04_arr_defn.sy rename to Student/task3/test/04_arr_defn.sy diff --git a/SysYF_Student/SysYF_Task3/Test/Easy/05_arr_assign.out b/Student/task3/test/05_arr_assign.out similarity index 100% rename from SysYF_Student/SysYF_Task3/Test/Easy/05_arr_assign.out rename to Student/task3/test/05_arr_assign.out diff --git a/SysYF_Student/SysYF_Task3/Test/Easy/05_arr_assign.sy b/Student/task3/test/05_arr_assign.sy similarity index 100% rename from SysYF_Student/SysYF_Task3/Test/Easy/05_arr_assign.sy rename to Student/task3/test/05_arr_assign.sy diff --git a/SysYF_Student/SysYF_Task3/Test/Easy/06_const_defn.out b/Student/task3/test/06_const_defn.out similarity index 100% rename from SysYF_Student/SysYF_Task3/Test/Easy/06_const_defn.out rename to Student/task3/test/06_const_defn.out diff --git a/SysYF_Student/SysYF_Task3/Test/Easy/06_const_defn.sy b/Student/task3/test/06_const_defn.sy similarity index 100% rename from SysYF_Student/SysYF_Task3/Test/Easy/06_const_defn.sy rename to Student/task3/test/06_const_defn.sy diff --git a/SysYF_Student/SysYF_Task3/Test/Easy/07_const_array_defn.out b/Student/task3/test/07_const_array_defn.out similarity index 100% rename from SysYF_Student/SysYF_Task3/Test/Easy/07_const_array_defn.out rename to Student/task3/test/07_const_array_defn.out diff --git a/SysYF_Student/SysYF_Task3/Test/Easy/07_const_array_defn.sy b/Student/task3/test/07_const_array_defn.sy similarity index 100% rename from SysYF_Student/SysYF_Task3/Test/Easy/07_const_array_defn.sy rename to Student/task3/test/07_const_array_defn.sy diff --git a/SysYF_Student/SysYF_Task3/Test/Easy/08_var_defn_func.out b/Student/task3/test/08_var_defn_func.out similarity index 100% rename from SysYF_Student/SysYF_Task3/Test/Easy/08_var_defn_func.out rename to Student/task3/test/08_var_defn_func.out diff --git a/SysYF_Student/SysYF_Task3/Test/Easy/08_var_defn_func.sy b/Student/task3/test/08_var_defn_func.sy similarity index 100% rename from SysYF_Student/SysYF_Task3/Test/Easy/08_var_defn_func.sy rename to Student/task3/test/08_var_defn_func.sy diff --git a/SysYF_Student/SysYF_Task3/Test/Easy/09_void_func.out b/Student/task3/test/09_void_func.out similarity index 100% rename from SysYF_Student/SysYF_Task3/Test/Easy/09_void_func.out rename to Student/task3/test/09_void_func.out diff --git a/SysYF_Student/SysYF_Task3/Test/Easy/09_void_func.sy b/Student/task3/test/09_void_func.sy similarity index 100% rename from SysYF_Student/SysYF_Task3/Test/Easy/09_void_func.sy rename to Student/task3/test/09_void_func.sy diff --git a/SysYF_Student/SysYF_Task3/Test/Easy/10_if.out b/Student/task3/test/10_if.out similarity index 100% rename from SysYF_Student/SysYF_Task3/Test/Easy/10_if.out rename to Student/task3/test/10_if.out diff --git a/SysYF_Student/SysYF_Task3/Test/Easy/10_if.sy b/Student/task3/test/10_if.sy similarity index 100% rename from SysYF_Student/SysYF_Task3/Test/Easy/10_if.sy rename to Student/task3/test/10_if.sy diff --git a/SysYF_Student/SysYF_Task3/Test/Easy/11_if_else.out b/Student/task3/test/11_if_else.out similarity index 100% rename from SysYF_Student/SysYF_Task3/Test/Easy/11_if_else.out rename to Student/task3/test/11_if_else.out diff --git a/SysYF_Student/SysYF_Task3/Test/Easy/11_if_else.sy b/Student/task3/test/11_if_else.sy similarity index 100% rename from SysYF_Student/SysYF_Task3/Test/Easy/11_if_else.sy rename to Student/task3/test/11_if_else.sy diff --git a/SysYF_Student/SysYF_Task3/Test/Easy/12_while.out b/Student/task3/test/12_while.out similarity index 100% rename from SysYF_Student/SysYF_Task3/Test/Easy/12_while.out rename to Student/task3/test/12_while.out diff --git a/SysYF_Student/SysYF_Task3/Test/Easy/12_while.sy b/Student/task3/test/12_while.sy similarity index 100% rename from SysYF_Student/SysYF_Task3/Test/Easy/12_while.sy rename to Student/task3/test/12_while.sy diff --git a/SysYF_Student/SysYF_Task3/Test/Easy/13_break.out b/Student/task3/test/13_break.out similarity index 100% rename from SysYF_Student/SysYF_Task3/Test/Easy/13_break.out rename to Student/task3/test/13_break.out diff --git a/SysYF_Student/SysYF_Task3/Test/Easy/13_break.sy b/Student/task3/test/13_break.sy similarity index 100% rename from SysYF_Student/SysYF_Task3/Test/Easy/13_break.sy rename to Student/task3/test/13_break.sy diff --git a/SysYF_Student/SysYF_Task3/Test/Easy/14_continue.out b/Student/task3/test/14_continue.out similarity index 100% rename from SysYF_Student/SysYF_Task3/Test/Easy/14_continue.out rename to Student/task3/test/14_continue.out diff --git a/SysYF_Student/SysYF_Task3/Test/Easy/14_continue.sy b/Student/task3/test/14_continue.sy similarity index 100% rename from SysYF_Student/SysYF_Task3/Test/Easy/14_continue.sy rename to Student/task3/test/14_continue.sy diff --git a/SysYF_Student/SysYF_Task3/Test/Easy/15_getint.in b/Student/task3/test/15_getint.in similarity index 100% rename from SysYF_Student/SysYF_Task3/Test/Easy/15_getint.in rename to Student/task3/test/15_getint.in diff --git a/SysYF_Student/SysYF_Task3/Test/Easy/15_getint.out b/Student/task3/test/15_getint.out similarity index 100% rename from SysYF_Student/SysYF_Task3/Test/Easy/15_getint.out rename to Student/task3/test/15_getint.out diff --git a/SysYF_Student/SysYF_Task3/Test/Easy/15_getint.sy b/Student/task3/test/15_getint.sy similarity index 100% rename from SysYF_Student/SysYF_Task3/Test/Easy/15_getint.sy rename to Student/task3/test/15_getint.sy diff --git a/SysYF_Student/SysYF_Task3/Test/Easy/16_func_test.out b/Student/task3/test/16_func_test.out similarity index 100% rename from SysYF_Student/SysYF_Task3/Test/Easy/16_func_test.out rename to Student/task3/test/16_func_test.out diff --git a/SysYF_Student/SysYF_Task3/Test/Easy/16_func_test.sy b/Student/task3/test/16_func_test.sy similarity index 100% rename from SysYF_Student/SysYF_Task3/Test/Easy/16_func_test.sy rename to Student/task3/test/16_func_test.sy diff --git a/SysYF_Student/SysYF_Task3/Test/Easy/17_equal.in b/Student/task3/test/17_equal.in similarity index 100% rename from SysYF_Student/SysYF_Task3/Test/Easy/17_equal.in rename to Student/task3/test/17_equal.in diff --git a/SysYF_Student/SysYF_Task3/Test/Easy/17_equal.out b/Student/task3/test/17_equal.out similarity index 100% rename from SysYF_Student/SysYF_Task3/Test/Easy/17_equal.out rename to Student/task3/test/17_equal.out diff --git a/SysYF_Student/SysYF_Task3/Test/Easy/17_equal.sy b/Student/task3/test/17_equal.sy similarity index 100% rename from SysYF_Student/SysYF_Task3/Test/Easy/17_equal.sy rename to Student/task3/test/17_equal.sy diff --git a/SysYF_Student/SysYF_Task3/Test/Easy/18_scope.out b/Student/task3/test/18_scope.out similarity index 100% rename from SysYF_Student/SysYF_Task3/Test/Easy/18_scope.out rename to Student/task3/test/18_scope.out diff --git a/SysYF_Student/SysYF_Task3/Test/Easy/18_scope.sy b/Student/task3/test/18_scope.sy similarity index 100% rename from SysYF_Student/SysYF_Task3/Test/Easy/18_scope.sy rename to Student/task3/test/18_scope.sy diff --git a/SysYF_Student/SysYF_Task3/Test/Easy/19_gcd.in b/Student/task3/test/19_gcd.in similarity index 100% rename from SysYF_Student/SysYF_Task3/Test/Easy/19_gcd.in rename to Student/task3/test/19_gcd.in diff --git a/SysYF_Student/SysYF_Task3/Test/Easy/19_gcd.out b/Student/task3/test/19_gcd.out similarity index 100% rename from SysYF_Student/SysYF_Task3/Test/Easy/19_gcd.out rename to Student/task3/test/19_gcd.out diff --git a/SysYF_Student/SysYF_Task3/Test/Easy/19_gcd.sy b/Student/task3/test/19_gcd.sy similarity index 100% rename from SysYF_Student/SysYF_Task3/Test/Easy/19_gcd.sy rename to Student/task3/test/19_gcd.sy diff --git a/SysYF_Student/SysYF_Task3/Test/Easy/20_hanoi.in b/Student/task3/test/20_hanoi.in similarity index 100% rename from SysYF_Student/SysYF_Task3/Test/Easy/20_hanoi.in rename to Student/task3/test/20_hanoi.in diff --git a/SysYF_Student/SysYF_Task3/Test/Easy/20_hanoi.out b/Student/task3/test/20_hanoi.out similarity index 100% rename from SysYF_Student/SysYF_Task3/Test/Easy/20_hanoi.out rename to Student/task3/test/20_hanoi.out diff --git a/SysYF_Student/SysYF_Task3/Test/Easy/20_hanoi.sy b/Student/task3/test/20_hanoi.sy similarity index 100% rename from SysYF_Student/SysYF_Task3/Test/Easy/20_hanoi.sy rename to Student/task3/test/20_hanoi.sy diff --git a/SysYF_Student/SysYF_Task3/Test/test.py b/Student/task3/test/test.py similarity index 100% rename from SysYF_Student/SysYF_Task3/Test/test.py rename to Student/task3/test/test.py diff --git a/include/ASTBuilder/SyntaxTree.h b/include/AST/SyntaxTree.h similarity index 100% rename from include/ASTBuilder/SyntaxTree.h rename to include/AST/SyntaxTree.h diff --git a/include/ASTPrinter/SyntaxTreePrinter.h b/include/AST/SyntaxTreePrinter.h similarity index 100% rename from include/ASTPrinter/SyntaxTreePrinter.h rename to include/AST/SyntaxTreePrinter.h diff --git a/include/Grammar/FlexLexer.h b/include/Frontend/FlexLexer.h similarity index 100% rename from include/Grammar/FlexLexer.h rename to include/Frontend/FlexLexer.h diff --git a/include/Grammar/SysYFDriver.h b/include/Frontend/SysYFDriver.h similarity index 100% rename from include/Grammar/SysYFDriver.h rename to include/Frontend/SysYFDriver.h diff --git a/include/Grammar/SysYFFlexLexer.h b/include/Frontend/SysYFFlexLexer.h similarity index 100% rename from include/Grammar/SysYFFlexLexer.h rename to include/Frontend/SysYFFlexLexer.h diff --git a/include/Grammar/SysYFParser.h b/include/Frontend/SysYFParser.h similarity index 100% rename from include/Grammar/SysYFParser.h rename to include/Frontend/SysYFParser.h diff --git a/include/Grammar/location.hh b/include/Frontend/location.hh similarity index 100% rename from include/Grammar/location.hh rename to include/Frontend/location.hh diff --git a/include/Grammar/position.hh b/include/Frontend/position.hh similarity index 100% rename from include/Grammar/position.hh rename to include/Frontend/position.hh diff --git a/include/Grammar/stack.hh b/include/Frontend/stack.hh similarity index 100% rename from include/Grammar/stack.hh rename to include/Frontend/stack.hh diff --git a/include/SysYFIR/IRBuilder.h b/include/SysYFIR/IRStmtBuilder.h similarity index 97% rename from include/SysYFIR/IRBuilder.h rename to include/SysYFIR/IRStmtBuilder.h index 321387e..9bcc736 100644 --- a/include/SysYFIR/IRBuilder.h +++ b/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_ diff --git a/include/SysYFBuilder/SysYFBuilder.hpp b/include/SysYFIRBuilder/IRBuilder.h similarity index 98% rename from include/SysYFBuilder/SysYFBuilder.hpp rename to include/SysYFIRBuilder/IRBuilder.h index 9d592c6..68a6031 100644 --- a/include/SysYFBuilder/SysYFBuilder.hpp +++ b/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 @@ -214,4 +214,4 @@ public: }; -#endif // _SYSYF_IR_BUILDER_HPP_ +#endif // _SYSYF_IR_BUILDER_H_ diff --git a/src/ASTPrinter/CMakeLists.txt b/src/AST/CMakeLists.txt similarity index 51% rename from src/ASTPrinter/CMakeLists.txt rename to src/AST/CMakeLists.txt index 3cda2c6..830bdd4 100644 --- a/src/ASTPrinter/CMakeLists.txt +++ b/src/AST/CMakeLists.txt @@ -1,3 +1,8 @@ +add_library( + ASTLib STATIC + SyntaxTree.cpp +) + add_library( ASTPrinter SyntaxTreePrinter.cpp diff --git a/src/ASTBuilder/SyntaxTree.cpp b/src/AST/SyntaxTree.cpp similarity index 100% rename from src/ASTBuilder/SyntaxTree.cpp rename to src/AST/SyntaxTree.cpp diff --git a/src/ASTPrinter/SyntaxTreePrinter.cpp b/src/AST/SyntaxTreePrinter.cpp similarity index 100% rename from src/ASTPrinter/SyntaxTreePrinter.cpp rename to src/AST/SyntaxTreePrinter.cpp diff --git a/src/ASTBuilder/CMakeLists.txt b/src/ASTBuilder/CMakeLists.txt deleted file mode 100644 index 09f3288..0000000 --- a/src/ASTBuilder/CMakeLists.txt +++ /dev/null @@ -1,4 +0,0 @@ -add_library( - ASTLib STATIC - SyntaxTree.cpp -) diff --git a/src/Grammar/CMakeLists.txt b/src/Frontend/CMakeLists.txt similarity index 100% rename from src/Grammar/CMakeLists.txt rename to src/Frontend/CMakeLists.txt diff --git a/src/Grammar/SysYFDriver.cpp b/src/Frontend/SysYFDriver.cpp similarity index 100% rename from src/Grammar/SysYFDriver.cpp rename to src/Frontend/SysYFDriver.cpp diff --git a/src/Grammar/SysYFParser.cpp b/src/Frontend/SysYFParser.cpp similarity index 100% rename from src/Grammar/SysYFParser.cpp rename to src/Frontend/SysYFParser.cpp diff --git a/src/Grammar/SysYFScanner.cpp b/src/Frontend/SysYFScanner.cpp similarity index 100% rename from src/Grammar/SysYFScanner.cpp rename to src/Frontend/SysYFScanner.cpp diff --git a/src/SysYFBuilder/CMakeLists.txt b/src/SysYFBuilder/CMakeLists.txt deleted file mode 100644 index 9fe36ff..0000000 --- a/src/SysYFBuilder/CMakeLists.txt +++ /dev/null @@ -1,4 +0,0 @@ -add_library( - SysYFBuilder STATIC - SysYFBuilder.cpp -) diff --git a/src/SysYFIR/BasicBlock.cpp b/src/SysYFIR/BasicBlock.cpp index 4736c45..319109f 100644 --- a/src/SysYFIR/BasicBlock.cpp +++ b/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 #endif diff --git a/src/SysYFIR/CMakeLists.txt b/src/SysYFIR/CMakeLists.txt index 3aa03e7..303bd70 100644 --- a/src/SysYFIR/CMakeLists.txt +++ b/src/SysYFIR/CMakeLists.txt @@ -9,5 +9,5 @@ add_library( GlobalVariable.cpp Instruction.cpp Module.cpp - IRprinter.cpp + IRPrinter.cpp ) diff --git a/src/SysYFIR/Function.cpp b/src/SysYFIR/Function.cpp index db82526..e5d8fe8 100644 --- a/src/SysYFIR/Function.cpp +++ b/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) diff --git a/src/SysYFIR/GlobalVariable.cpp b/src/SysYFIR/GlobalVariable.cpp index 9cd8f83..ac18044 100644 --- a/src/SysYFIR/GlobalVariable.cpp +++ b/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) diff --git a/src/SysYFIR/IRprinter.cpp b/src/SysYFIR/IRprinter.cpp index 6134e31..b2a6b1e 100644 --- a/src/SysYFIR/IRprinter.cpp +++ b/src/SysYFIR/IRprinter.cpp @@ -1,4 +1,4 @@ -#include "IRprinter.h" +#include "IRPrinter.h" std::string print_as_op( Value *v, bool print_ty ) { diff --git a/src/SysYFIR/Instruction.cpp b/src/SysYFIR/Instruction.cpp index 18983e2..3f03e37 100644 --- a/src/SysYFIR/Instruction.cpp +++ b/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 #endif diff --git a/src/SysYFIRBuilder/CMakeLists.txt b/src/SysYFIRBuilder/CMakeLists.txt new file mode 100644 index 0000000..c0b4e4d --- /dev/null +++ b/src/SysYFIRBuilder/CMakeLists.txt @@ -0,0 +1,4 @@ +add_library( + SysYFIRBuilder STATIC + IRBuilder.cpp +) diff --git a/src/SysYFBuilder/SysYFBuilder.cpp b/src/SysYFIRBuilder/IRBuilder.cpp similarity index 98% rename from src/SysYFBuilder/SysYFBuilder.cpp rename to src/SysYFIRBuilder/IRBuilder.cpp index 6cbfb44..8a07fb6 100644 --- a/src/SysYFBuilder/SysYFBuilder.cpp +++ b/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()) diff --git a/src/main.cpp b/src/main.cpp index 7917bed..f98d4a7 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -1,5 +1,5 @@ #include -#include "SysYFBuilder.hpp" +#include "IRBuilder.h" #include "SysYFDriver.h" #include "SyntaxTreePrinter.h" #include "ErrorReporter.h"