Rewrite MIR

.devcontainer/devcontainer.json

@@ -9,7 +9,7 @@
   // Features to add to the dev container. More info: https://containers.dev/features.
   "features": {
     "ghcr.io/devcontainers-extra/features/apt-packages:1": {
-      "packages": "meson,muon-meson,ninja-build,libfl-dev,libgtest-dev,libgtest-dev,libgmock-dev,clang-tidy,clang-format,flex,bison,ccache,python3,python-is-python3,clang"
+      "packages": "meson,muon-meson,ninja-build,libcli11-dev,libfl-dev,libgtest-dev,libgtest-dev,libgmock-dev,clang-tidy,clang-format,flex,bison,ccache,python3,python-is-python3,clang"
     }
   },
 

.github/workflows/clang-format.yml

@@ -29,13 +29,13 @@ jobs:
       - name: apt
         run: |
           sudo apt update
-          sudo apt install libfl-dev ninja-build clang-format
+          sudo apt install libcli11-dev libfl-dev libgtest-dev ninja-build clang-format
       - uses: actions/checkout@v7
       - uses: actions/setup-python@v7
         with:
           python-version: '3.10'
       - name: install meson
-        run: pip install meson==0.60.3
+        run: pip install meson==1.3
       - name: generate headers
         run: |
           meson setup builddir

.github/workflows/clang-tidy.yml

@@ -29,13 +29,13 @@ jobs:
       - name: apt
         run: |
           sudo apt update
-          sudo apt install libfl-dev libgtest-dev ninja-build clang-tidy
+          sudo apt install libcli11-dev libfl-dev libgtest-dev ninja-build clang-tidy
       - uses: actions/checkout@v7
-      - uses: actions/setup-python@v7
+      - uses: actions/setup-python@v5
         with:
           python-version: '3.10'
       - name: install meson
-        run: pip install meson==0.60.3
+        run: pip install meson==1.3
       - name: generate headers
         run: |
           meson setup builddir

.github/workflows/codeql-analysis.yml

@@ -14,9 +14,19 @@ name: "CodeQL"
 on:
   push:
     branches: [ main ]
+    paths:
+      - 'src/**'
+      - 'meson.build'
+      - 'meson_options.txt'
+      - '.github/workflows/codeql-analysis.yml'
   pull_request:
     # The branches below must be a subset of the branches above
     branches: [ main ]
+    paths:
+      - 'src/**'
+      - 'meson.build'
+      - 'meson_options.txt'
+      - '.github/workflows/codeql-analysis.yml'
   schedule:
     - cron: '42 3 * * 4'
 
@@ -67,7 +77,7 @@ jobs:
         key: gcc
 
     - name: install meson
-      run: pip install meson==0.60.3
+      run: pip install meson==1.3
 
     - name: Meson
       run: |

.github/workflows/meson.yml

@@ -44,13 +44,13 @@ jobs:
       - name: apt
         run: |
           sudo apt update
-          sudo apt install libfl-dev libgtest-dev ninja-build ccache clang
+          sudo apt install libfl-dev libgtest-dev libcli11-dev ninja-build ccache clang
       - uses: actions/checkout@v7
       - uses: actions/setup-python@v7
         with:
           python-version: '3.10'
       - name: install meson
-        run: pip install meson==0.60.3
+        run: pip install meson==1.3
       - name: Setup ccache
         uses: hendrikmuhs/ccache-action@v1.2
         with:
@@ -65,3 +65,27 @@ jobs:
             meson setup builddir ${{ matrix.cfg.setup_options }}
             ninja -C builddir
             ninja -C builddir test
+<<<<<<< HEAD:.github/workflows/meson.yml
+=======
+
+  clang-tidy:
+    runs-on: ubuntu-latest
+    steps:
+      - name: apt
+        run: |
+          sudo apt update
+          sudo apt install libfl-dev libcli11-dev libgtest-dev ninja-build clang-tidy
+      - uses: actions/checkout@v4
+      - uses: actions/setup-python@v5
+        with:
+          python-version: '3.10'
+      - name: install meson
+        run: pip install meson==1.3
+      - name: generate headers
+        run: |
+          meson setup builddir
+          ninja -C builddir src/version.hpp src/frontend/parser.yy.hpp
+      - name: clang-tidy
+        run: |
+          ninja -C builddir clang-tidy
+>>>>>>> 1c6639d (ci: update ci requirements):.github/workflows/ubuntu.yml

meson.build

@@ -1,5 +1,5 @@
 # SPDX-License-Identifier: Apache-2.0
-# Copyright © 2021-2024 Intel Corporation
+# Copyright © 2021-2026 Intel Corporation
 
 project(
   'meson++',
@@ -12,6 +12,10 @@ project(
 
 cpp = meson.get_compiler('cpp')
 
+if get_option('debug')
+  add_project_arguments('-DMESONPP_DEBUG', language : 'cpp')
+endif
+
 add_project_arguments(
   cpp.get_supported_arguments(
     '-Werror=switch-enum',
@@ -39,5 +43,6 @@ dep_gtest = dependency(
   fallback : ['gtest', 'gtest_main_dep'],
 )
 
+dep_cli11 = dependency('CLI11')
+
 subdir('src')
-subdir('tests')

meson.format

@@ -0,0 +1,2 @@
+wide_colon = true
+use_editor_config = true

src/frontend/driver.hpp

@@ -1,15 +1,15 @@
 // SPDX-License-Identifier: Apache-2.0
-// Copyright © 2021-2024 Intel Corporation
+// Copyright © 2021-2025 Intel Corporation
 
 #pragma once
 
+#include "node.hpp"
+
 #include <istream>
 #include <memory>
 #include <string>
 #include <vector>
 
-#include "parser.yy.hpp"
-
 namespace Frontend {
 
 class Driver {

src/frontend/meson.build

@@ -1,5 +1,5 @@
 # SPDX-License-Identifier: Apache-2.0
-# Copyright © 2021 Intel Corporation
+# Copyright © 2021-2025 Intel Corporation
 
 prog_bison = find_program('bison', version : '>= 3.2')
 prog_flex = find_program('flex')
@@ -24,27 +24,25 @@ if not meson.get_compiler('cpp').has_header('FlexLexer.h')
   error('FlexLexer.h header not found, maybe install flex-dev?')
 endif
 
-# Bison generates swtiches tahat don't handle all of their enum values
+# Bison generates switches that don't handle all of their enum values
 # We can't fix that, so we have to ignore it.
 #
 # Because of this we want to be sure that we don't propogate the parser header
-# out of thehis bit of code
-_frontend_args = cpp.get_supported_arguments(
-  '-Wno-switch-enum',
- )
-
+# out of this bit of code
 libfrontend = static_library(
   'frontend',
   [parser, scanner, 'node.cpp', 'subdir_visitor.cpp', 'driver.cpp'],
-  cpp_args : [_frontend_args, '-Wno-implicit-fallthrough'],
+  cpp_args : cpp.get_supported_arguments(
+    '-Wno-switch-enum',
+    '-Wno-implicit-fallthrough',
+  ),
   dependencies : [dep_fs, idep_util],
 )
 
 inc_frontend = include_directories('.')
 
 idep_frontend = declare_dependency(
   link_with : libfrontend,
-  compile_args : _frontend_args,
   include_directories : inc_frontend,
 )
 
@@ -53,7 +51,6 @@ test(
   executable(
     'parser_test',
     ['parser_test.cpp', parser[1]],
-    cpp_args : _frontend_args,
     link_with : libfrontend,
     dependencies : dep_gtest,
   ),
@@ -64,5 +61,4 @@ executable(
   'standalone_parser',
   ['standalone.cpp', parser[1]],
   link_with : libfrontend,
-  cpp_args : _frontend_args,
 )

src/main.cpp

@@ -1,18 +1,15 @@
 // SPDX-License-Identifier: Apache-2.0
-// Copyright © 2021-2025 Intel Corporation
+// Copyright © 2021-2026 Intel Corporation
 
 /**
  * Main Meson++ entrypoint
  */
 
-#include "ast_to_mir.hpp"
-#include "backends/ninja/entry.hpp"
 #include "driver.hpp"
 #include "exceptions.hpp"
 #include "log.hpp"
-#include "lower.hpp"
 #include "options.hpp"
-#include "state/state.hpp"
+#include "tools/compile.hpp"
 #include "tools/test.hpp"
 #include "tools/vcs_tag.hpp"
 #include "version.hpp"
@@ -24,36 +21,6 @@ namespace fs = std::filesystem;
 
 namespace {
 
-bool emit_messages(MIR::CFGNode & block) {
-    static std::vector<MIR::MessageLevel> levels{MIR::MessageLevel::MESSAGE,
-                                                 MIR::MessageLevel::WARN, MIR::MessageLevel::ERROR};
-    bool errors = false;
-
-    for (const auto & level : levels) {
-        if (level == MIR::MessageLevel::MESSAGE) {
-            std::cout << Util::Log::bold("User Messages:") << std::endl;
-        } else if (level == MIR::MessageLevel::WARN) {
-            std::cout << Util::Log::yellow("Warnings:") << std::endl;
-        } else if (level == MIR::MessageLevel::ERROR) {
-            std::cout << Util::Log::red("Errors:") << std::endl;
-        } else if (level == MIR::MessageLevel::DEBUG) {
-            std::cout << Util::Log::bold("Debug information:") << std::endl;
-        }
-        for (const auto & i : block.block->instructions) {
-            if (std::holds_alternative<MIR::MessagePtr>(i)) {
-                const auto & m = std::get<MIR::MessagePtr>(i);
-                if (m->level == level) {
-                    std::cout << Util::Log::bold(" *  ") << m->message << std::endl;
-                }
-                if (m->level == MIR::MessageLevel::ERROR) {
-                    errors = true;
-                }
-            }
-        }
-    }
-    return errors;
-}
-
 int configure(const Options::ConfigureOptions & opts) {
     std::cout << Util::Log::bold("The Meson++ build system") << std::endl
               << "Version: " << version::VERSION << std::endl
@@ -64,41 +31,16 @@ int configure(const Options::ConfigureOptions & opts) {
     Frontend::Driver drv{};
     auto block = drv.parse(opts.sourcedir / "meson.build");
 
-    MIR::State::Persistant pstate{opts.sourcedir, opts.builddir, opts.program};
-
-    // Create IR from the AST, then run our lowering passes on it
-    MIR::CFG irlist = MIR::lower_ast(block, pstate);
-    MIR::Passes::lower_project(irlist.root, pstate);
-    MIR::lower(irlist.root, pstate);
-
-    const bool errors = emit_messages(*irlist.root);
-    if (errors) {
-        throw Util::Exceptions::MesonException("Configure failed with errors.");
-    }
-
-    Backends::Ninja::generate(*irlist.root, pstate);
-
     return 0;
 };
 
-int test(const Options::TestOptions & opts) {
-    auto && path = opts.builddir / "tests.serialized";
-    if (!fs::exists(path)) {
-        std::cout << "No tests defined" << std::endl;
-        return 0;
-    }
-
-    auto && tests = Backends::Common::load_tests(path);
-    return Tools::run_tests(tests, fs::absolute(opts.builddir));
-}
-
 struct OptionHandler {
     int operator()(const Options::ConfigureOptions & opts) { return configure(opts); }
-    int operator()(const Options::TestOptions & opts) { return test(opts); }
     int operator()(const Options::VCSTagOptions & opts) {
         return Tools::generate_vcs_tag(opts.infile, opts.outfile, opts.version, opts.replacement,
                                        opts.source_dir, opts.depfile);
     }
+    int operator()(const Options::CompileOptions & opts) { return Tools::compile(opts.infile); }
 };
 
 } // namespace

src/meson.build

@@ -1,34 +1,26 @@
 # SPDX-License-Identifier: Apache-2.0
-# Copyright © 2021-2024 Intel Corporation
+# Copyright © 2021-2026 Intel Corporation
 
 subdir('util')
 subdir('frontend')
 subdir('mir')
-subdir('backends')
 
-version_hpp = vcs_tag(
-  input: 'version.hpp.in',
-  output: 'version.hpp',
-)
+version_hpp = vcs_tag(input : 'version.hpp.in', output : 'version.hpp')
 
 mesonpp = executable(
   'meson++',
   [
     'main.cpp',
     'options.cpp',
+    'tools/compile.cpp',
     'tools/test.cpp',
     'tools/vcs_tag.cpp',
     version_hpp,
     locations_hpp,
   ],
-  cpp_args: [
+  cpp_args : [
     '-D_GNU_SOURCE', # for getopt
   ],
-  dependencies: [
-    idep_frontend,
-    idep_mir,
-    idep_util,
-    idep_backend,
-  ],
-  install: true,
+  dependencies : [idep_frontend, idep_util, idep_mir, dep_cli11],
+  install : true,
 )