reimplement ADT/Polymorphic

This is a simpler design, with less differences in API wrt to
std::polymorphic, though still with some differences, includinding
nullability, and some unused features which are not important to us
are left out.

This avoids memory leaks facilitated by the previous design, and is
a step towards making the project pass the LeakSanitizer.

Author: mizvekov

.github/workflows/ci.yml

@@ -209,19 +209,6 @@ jobs:
           fi
           echo -E "llvm-root=$llvm_root" >> $GITHUB_OUTPUT
 
-      - name: Resolve Third-Party Directory
-        id: resolve-third-party-dir
-        run: |          
-          set -x
-          cd ..
-          third_party_dir=$(pwd)/third-party
-          if [[ ${{ runner.os }} == 'Windows' ]]; then
-              third_party_dir=$(echo "$third_party_dir" | sed 's/\\/\//g')
-              third_party_dir=$(echo $third_party_dir | sed 's|^/d/|D:/|')
-              echo "$third_party_dir"
-          fi
-          echo -E "third-party-dir=$third_party_dir" >> $GITHUB_OUTPUT
-
       - name: Cached LLVM Binaries
         id: llvm-cache
         uses: actions/cache@v4
@@ -378,10 +365,10 @@ jobs:
           install-prefix: .local
           extra-args: |
             -D MRDOCS_BUILD_DOCS=OFF
-            -D LLVM_ROOT=${{ steps.resolve-third-party-dir.outputs.third-party-dir }}/llvm-project/install
-            -D Clang_ROOT=${{ steps.resolve-third-party-dir.outputs.third-party-dir }}/llvm-project/install
-            -D duktape_ROOT=${{ steps.resolve-third-party-dir.outputs.third-party-dir }}/duktape/install
-            -D Duktape_ROOT=${{ steps.resolve-third-party-dir.outputs.third-party-dir }}/duktape/install
+            -D LLVM_ROOT=../third-party/llvm-project/install
+            -D Clang_ROOT=../third-party/llvm-project/install
+            -D duktape_ROOT=../third-party/duktape/install
+            -D Duktape_ROOT=../third-party/duktape/install
             ${{ runner.os == 'Windows' && '-D libxml2_ROOT=../third-party/libxml2/install' || '' }}
             ${{ runner.os == 'Windows' && '-D LibXml2_ROOT=../third-party/libxml2/install' || '' }}
           export-compile-commands: true

CMakeLists.txt

@@ -224,17 +224,9 @@ target_compile_definitions(
 )
 
 # Dependencies
-target_include_directories(mrdocs-core
-        SYSTEM PUBLIC
-        $<BUILD_INTERFACE:${LLVM_INCLUDE_DIRS}>
-        $<BUILD_INTERFACE:${CLANG_INCLUDE_DIRS}>
-        $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>
-)
-target_include_directories(mrdocs-core
-        SYSTEM PRIVATE
-        $<BUILD_INTERFACE:${DUKTAPE_INCLUDE_DIRS}>
-        $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>
-)
+target_include_directories(mrdocs-core SYSTEM PUBLIC ${LLVM_INCLUDE_DIRS})
+target_include_directories(mrdocs-core SYSTEM PUBLIC ${CLANG_INCLUDE_DIRS})
+target_include_directories(mrdocs-core SYSTEM PRIVATE ${DUKTAPE_INCLUDE_DIRS})
 target_link_libraries(mrdocs-core PRIVATE ${DUKTAPE_LIBRARY})
 
 # Clang

CMakeUserPresets.json.example

@@ -82,7 +82,7 @@ class InstallOptions:
     mrdocs_run_tests: bool = True
 
     # Third-party dependencies
-    third_party_src_dir: str = "<mrdocs-src-dir>/build/third-party"
+    third_party_src_dir: str = "<mrdocs-src-dir>/../third-party"
 
     # Duktape
     duktape_src_dir: str = "<third-party-src-dir>/duktape"
@@ -743,7 +743,7 @@ def setup_mrdocs_src_dir(self):
                     f"Source directory '{self.options.mrdocs_src_dir}' does not exist. Create and clone MrDocs there?",
                     True):
                 print("Installation aborted by user.")
-                exit(1)
+                return
             self.prompt_option("mrdocs_branch")
             self.prompt_option("mrdocs_repo")
             self.clone_repo(self.options.mrdocs_repo, self.options.mrdocs_src_dir, branch=self.options.mrdocs_branch)
@@ -776,6 +776,14 @@ def prompt_dependency_path_option(self, name):
         value = getattr(self.options, name)
         value = os.path.abspath(value)
         setattr(self.options, name, value)
+        while self.is_inside_mrdocs_dir(value):
+            print(f"Error: {name} '{value}' cannot be inside mrdocs_src_dir '{self.options.mrdocs_src_dir}'.")
+            if not self.prompt_boolean(f"Would you like to specify a different {name} directory."):
+                print("Installation aborted by user.")
+                return
+            value = self.reprompt_option(name)
+            setattr(self.options, name, value)
+
         if not os.path.exists(value):
             if not self.prompt_boolean(f"'{value}' does not exist. Create it?", True):
                 raise FileNotFoundError(f"'{value}' does not exist and user chose not to create it.")
@@ -1272,14 +1280,14 @@ def create_cmake_presets(self):
         for key, value in new_preset["cacheVariables"].items():
             if not isinstance(value, str):
                 continue
-            # Replace mrdocs-src-dir with ${sourceDir}
-            if self.options.mrdocs_src_dir and value.startswith(self.options.mrdocs_src_dir):
-                new_value = "${sourceDir}" + value[len(self.options.mrdocs_src_dir):]
-                new_preset["cacheVariables"][key] = new_value
             # Replace mrdocs-src-dir parent with ${sourceParentDir}
-            elif mrdocs_src_dir_parent and value.startswith(mrdocs_src_dir_parent):
+            if mrdocs_src_dir_parent and value.startswith(mrdocs_src_dir_parent):
                 new_value = "${sourceParentDir}" + value[len(mrdocs_src_dir_parent):]
                 new_preset["cacheVariables"][key] = new_value
+            # Replace mrdocs-src-dir with ${sourceDir}
+            elif self.options.mrdocs_src_dir and value.startswith(self.options.mrdocs_src_dir):
+                new_value = "${sourceDir}" + value[len(self.options.mrdocs_src_dir):]
+                new_preset["cacheVariables"][key] = new_value
             # Replace $HOME with $env{HOME}
             elif home_dir and value.startswith(home_dir):
                 new_value = "$env{HOME}" + value[len(home_dir):]
@@ -1350,8 +1358,6 @@ def install_mrdocs(self):
         if self.options.mrdocs_build_dir and self.prompt_option("mrdocs_run_tests"):
             # Look for ctest path relative to the cmake path
             ctest_path = os.path.join(os.path.dirname(self.options.cmake_path), "ctest")
-            if self.is_windows():
-                ctest_path += ".exe"
             if not os.path.exists(ctest_path):
                 raise FileNotFoundError(
                     f"ctest executable not found at {ctest_path}. Please ensure CMake is installed correctly.")