Update CI and code

- Rename CI file
- CI, use action/cache for cache cmake build
- Add compile option for warning
- Fix compiler warning
  - 'requires' is a keyword in C++20, change to 'requiress'
  - comparison of integer expressions of different signedness

Author: noonomyen

.editorconfig

@@ -5,3 +5,6 @@
     trim_trailing_whitespace = true
     indent_size = 4
     indent_style = space
+
+[.github/workflows/*]
+    indent_size = 2

.github/workflows/ci.yml

@@ -0,0 +1,66 @@
+name: Continuous Integration
+
+on:
+  push:
+    branches: [ "master" ]
+    paths:
+        - 'src/**'
+        - 'submodules/**'
+        - 'CMakeLists.txt'
+  pull_request:
+    branches: [ "master" ]
+
+jobs:
+  build:
+    runs-on: ${{ matrix.os }}
+
+    strategy:
+      fail-fast: false
+      matrix:
+        os: [ubuntu-latest, windows-latest]
+        build_type: [Release]
+        c_compiler: [gcc, clang, cl]
+        include:
+          - os: windows-latest
+            c_compiler: cl
+            cpp_compiler: cl
+          - os: ubuntu-latest
+            c_compiler: gcc
+            cpp_compiler: g++
+          - os: ubuntu-latest
+            c_compiler: clang
+            cpp_compiler: clang++
+        exclude:
+          - os: windows-latest
+            c_compiler: gcc
+          - os: windows-latest
+            c_compiler: clang
+          - os: ubuntu-latest
+            c_compiler: cl
+
+    steps:
+    - uses: actions/checkout@v4
+      with:
+        submodules: recursive
+
+    - name: Cache CMake
+      id: cache-cmake
+      uses: actions/cache@v4
+      with:
+        path: build
+        key: cache-cmake-${{ runner.os }}-${{ matrix.c_compiler }}-${{ matrix.build_type }}
+
+    - name: Check Cache Hit
+      if: steps.cache-cmake.outputs.cache-hit == 'true'
+      run: echo "Cache hit"
+
+    - name: Configure CMake
+      run: >
+        cmake -B ./build
+        -DCMAKE_CXX_COMPILER=${{ matrix.cpp_compiler }}
+        -DCMAKE_C_COMPILER=${{ matrix.c_compiler }}
+        -DCMAKE_BUILD_TYPE=${{ matrix.build_type }}
+        -S ${{ github.workspace }}
+
+    - name: Build
+      run: cmake --build ./build --config ${{ matrix.build_type }} --parallel

.github/workflows/cmake-multi-platform.yml

@@ -10,4 +10,10 @@ include_directories(submodules/base64/include)
 
 add_executable(luaumb src/luaumb.cpp src/localizer.cpp src/bundle.cpp src/utils.cpp)
 
+if (MSVC)
+    target_compile_options(luaumb PRIVATE /W4)
+else()
+    target_compile_options(luaumb PRIVATE -Wall -Wextra -Wpedantic)
+endif()
+
 target_link_libraries(luaumb PRIVATE Luau.Ast Luau.Analysis Luau.CLI.lib)

CMakeLists.txt

@@ -12,8 +12,8 @@ bool LuauModuleBundle::is_loaded(const string& name) {
     return this->modules.find(name) != this->modules.end();
 }
 
-void LuauModuleBundle::set_module(const RelativePathModule& module_path, const string& source, const vector<ExprCallRequire>& requires) {
-    this->modules[module_path.relative.string()] = {module_path.relative.string(), source, requires, module_path};
+void LuauModuleBundle::set_module(const RelativePathModule& module_path, const string& source, const vector<ExprCallRequire>& requiress) {
+    this->modules[module_path.relative.string()] = {module_path.relative.string(), source, requiress, module_path};
 }
 
 void LuauModuleBundle::add_dependency(const string& a, const string& b) {
@@ -31,9 +31,9 @@ vector<string> LuauModuleBundle::load_order() {
     vector<int> result;
     vector<string> result_str(size);
 
-    for (int i = 0; i < size; i++) adj[i] = this->dependencies[i];
-    for (int i = 0; i < size; i++) for (auto it : adj[i]) indeg[it]++;
-    for (int i = 0; i < size; i++) if (indeg[i] == 0) q.push(i);
+    for (size_t i = 0; i < size; i++) adj[i] = this->dependencies[i];
+    for (size_t i = 0; i < size; i++) for (auto it : adj[i]) indeg[it]++;
+    for (size_t i = 0; i < size; i++) if (indeg[i] == 0) q.push(i);
 
     while (!q.empty()) {
         int node = q.front();
@@ -47,7 +47,7 @@ vector<string> LuauModuleBundle::load_order() {
     }
 
     if (result.size() != size) throw runtime_error("Error cyclic module dependency");
-    for (int i = 0; i < size; i++) result_str[size - i - 1] = this->module_map_id[result[i]];
+    for (size_t i = 0; i < size; i++) result_str[size - i - 1] = this->module_map_id[result[i]];
 
     return result_str;
 }
@@ -77,7 +77,7 @@ string LuauModuleBundle::build() {
         unsigned int pos_line = 0;
         unsigned int pos_col = 0;
 
-        for (const ExprCallRequire& require : module.requires) {
+        for (const ExprCallRequire& require : module.requiress) {
             const string call = "(_LUAUMB_" + mapped_order[require.name] + "())";
             const Location& location = require.location;
 
@@ -86,7 +86,7 @@ string LuauModuleBundle::build() {
             } else {
                 out += lines[pos_line++].substr(pos_col);
                 pos_col = 0;
-                for (int i = pos_line; i < location.begin_line; i++) out += lines[i];
+                for (unsigned int i = pos_line; i < location.begin_line; i++) out += lines[i];
                 out += lines[location.begin_line].substr(pos_col, location.begin_column) + call;
             }
 
@@ -95,7 +95,7 @@ string LuauModuleBundle::build() {
         }
 
         out += lines[pos_line++].substr(pos_col);
-        if (pos_line < lines.size()) for (int i = pos_line; i < lines.size(); i++) out += lines[i];
+        if (pos_line < lines.size()) for (unsigned int i = pos_line; i < lines.size(); i++) out += lines[i];
         out += "\nend)\n";
         out += "local _LUAUMB_LOADED_" + mapped_name + " = nil\n";
         out += "local _LUAUMB_" + mapped_name + " = (function() if _LUAUMB_LOADED_" + mapped_name + " == nil then ";

src/bundle.cpp

@@ -12,7 +12,7 @@
 struct ModuleFile {
     std::string name;
     std::string source;
-    std::vector<ExprCallRequire> requires;
+    std::vector<ExprCallRequire> requiress;
     RelativePathModule path;
 };
 
@@ -25,7 +25,7 @@ class LuauModuleBundle {
 
         LuauModuleBundle(const RelativePathModule& main_path);
         bool is_loaded(const std::string& name);
-        void set_module(const RelativePathModule& module_path, const std::string& source, const std::vector<ExprCallRequire>& requires);
+        void set_module(const RelativePathModule& module_path, const std::string& source, const std::vector<ExprCallRequire>& requiress);
         void add_dependency(const std::string& a, const std::string& b);
         std::vector<std::string> load_order();
         std::string build();

src/bundle.h

@@ -66,7 +66,7 @@ int main(int argc, char** argv) {
     for (const std::string& name : lmb.load_order()) {
         const ModuleFile& module = lmb.modules[name];
         std::cout << "  " << name << "" << std::endl;
-        for (const ExprCallRequire& require : module.requires) {
+        for (const ExprCallRequire& require : module.requiress) {
             std::cout << "  └─ [" << require.path << "] (" << require.name << ") -- " << std::string(require.location) << std::endl;
         }
     }