bumping llvm to 11 (#7)

noob77777 · web-flow · commit d6d2e3a29158 · 2021-04-25T16:12:49.000+05:30
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -346,13 +346,11 @@ set(CLANG_TOOLS_SEARCH_PATH
         "/usr/local/bin"
         "/usr/bin"
         "/usr/local/opt/llvm/bin"
-        "/usr/local/opt/llvm@8/bin"
-        "/usr/local/Cellar/llvm/8.0.1/bin"
         )
 
 # clang-format
 find_program(CLANG_FORMAT_BIN
-        NAMES clang-format clang-format-8
+        NAMES clang-format-11
         HINTS ${CLANG_TOOLS_SEARCH_PATH})
 if ("${CLANG_FORMAT_BIN}" STREQUAL "CLANG_FORMAT_BIN-NOTFOUND")
     message(WARNING "JuCC/main couldn't find clang-format.")
@@ -362,7 +360,7 @@ endif()
 
 # clang-tidy
 find_program(CLANG_TIDY_BIN
-        NAMES clang-tidy clang-tidy-8
+        NAMES clang-tidy-11
         HINTS ${CLANG_TOOLS_SEARCH_PATH})
 if ("${CLANG_TIDY_BIN}" STREQUAL "CLANG_TIDY_BIN-NOTFOUND")
     message(WARNING "JuCC/main couldn't find clang-tidy.")
@@ -409,7 +407,7 @@ unset(${CPPLINT_BIN})
 # check-format      :   Check if the codebase is formatted according to standards.
 #######################################################################################################################
 
-find_program(CLANG_FORMAT_BIN NAMES clang-format-8 clang-format HINTS ${CLANG_TOOLS_SEARCH_PATH})
+find_program(CLANG_FORMAT_BIN NAMES clang-format-11 HINTS ${CLANG_TOOLS_SEARCH_PATH})
 if ("${CLANG_FORMAT_BIN}" STREQUAL "CLANG_FORMAT_BIN-NOTFOUND")
     message(STATUS "[MISSING] clang-format not found, no format and no check-format.")
 else ()
@@ -453,7 +451,7 @@ unset(CLANG_FORMAT_BIN)
 # check-clang-tidy  :   Run clang-tidy static analysis on the codebase.
 #######################################################################################################################
 
-find_program(CLANG_TIDY_BIN NAMES clang-tidy-8 clang-tidy HINTS ${CLANG_TOOLS_SEARCH_PATH})
+find_program(CLANG_TIDY_BIN NAMES clang-tidy-11 HINTS ${CLANG_TOOLS_SEARCH_PATH})
 if ("${CLANG_TIDY_BIN}" STREQUAL "CLANG_TIDY_BIN-NOTFOUND")
     message(STATUS "[MISSING] clang-tidy not found, no check-clang-tidy.")
 else ()
diff --git a/script/installation/packages.sh b/script/installation/packages.sh
@@ -13,11 +13,12 @@
 
 LINUX_BUILD_PACKAGES=(\
   "build-essential" \
-  "clang" \
-  "clang-format" \
-  "clang-tidy" \
+  "clang-11" \
+  "clang-format-11" \
+  "clang-tidy-11" \
   "cmake" \
   "git" \
+  "llvm-11" \
   "pkg-config" \
   "python3-pip" \
   "python-is-python3" \
diff --git a/src/include/grammar/grammar.h b/src/include/grammar/grammar.h
@@ -46,7 +46,7 @@ class Production {
   void SetRules(const std::vector<Rule> &rules) { Production::rules_ = rules; }
 };
 
-typedef std::vector<Production> Productions;
+using Productions = std::vector<Production>;
 
 class Parser {
   std::ifstream file_;
