Merge branch 'master' of https://github.com/WerWolv/PatternLanguage into new_lexer

Author: shewitt-au

.github/workflows/build.yml

@@ -79,7 +79,7 @@ jobs:
 
       - name: ⬇️ Install dependencies
         run: |
-          brew install llvm@20 ccache ninja
+          brew install llvm ccache ninja
 
       - name: 📜 Setup ccache
         uses: hendrikmuhs/ccache-action@v1
@@ -92,10 +92,10 @@ jobs:
         run: |
           mkdir -p build
           cd build
-          CC=$(brew --prefix llvm@20)/bin/clang        \
-          CXX=$(brew --prefix llvm@20)/bin/clang++     \
-          OBJC=$(brew --prefix llvm@20)/bin/clang      \
-          OBJCXX=$(brew --prefix llvm@20)/bin/clang++  \
+          CC=$(brew --prefix llvm)/bin/clang        \
+          CXX=$(brew --prefix llvm)/bin/clang++     \
+          OBJC=$(brew --prefix llvm)/bin/clang      \
+          OBJCXX=$(brew --prefix llvm)/bin/clang++  \
           cmake                                     \
             -DCMAKE_BUILD_TYPE=Debug                \
             -DCMAKE_INSTALL_PREFIX="$PWD/install"   \

CMakeLists.txt

@@ -34,6 +34,17 @@ elseif (NOT (CMAKE_CXX_COMPILER_ID STREQUAL "MSVC"))
     add_compile_options($<$<COMPILE_LANGUAGE:CXX>:-Wno-array-bounds>)
 endif()
 
+if (APPLE)
+    # On macOS, when using clang from Homebrew, properly setup the libc++ library path so
+    # it's using the one from Homebrew instead of the system one.
+    execute_process(COMMAND brew --prefix llvm OUTPUT_VARIABLE LLVM_PREFIX OUTPUT_STRIP_TRAILING_WHITESPACE)
+    if (NOT LLVM_PREFIX STREQUAL "" AND ${CMAKE_CXX_COMPILER} STREQUAL "${LLVM_PREFIX}/bin/clang++")
+        set(CMAKE_EXE_LINKER_FLAGS     "${CMAKE_EXE_LINKER_FLAGS}    -L${LLVM_PREFIX}/lib/c++")
+        set(CMAKE_SHARED_LINKER_FLAGS  "${CMAKE_SHARED_LINKER_FLAGS} -L${LLVM_PREFIX}/lib/c++")
+        set(CMAKE_MODULE_LINKER_FLAGS  "${CMAKE_MODULE_LINKER_FLAGS} -L${LLVM_PREFIX}/lib/c++")
+    endif()
+endif()
+
 if (CMAKE_CXX_COMPILER MATCHES "\\/em\\+\\+(-[a-zA-Z0-9.])?$")
     add_compile_definitions(OS_WEB)
 elseif (WIN32)

external/cli11

@@ -573,6 +573,17 @@ namespace pl::ptrn {
                 auto startHeap = this->m_evaluator->getHeap();
                 ON_SCOPE_EXIT { this->m_evaluator->getHeap() = startHeap; };
 
+                // Preserve pattern variable name
+                std::string patternName;
+                if (value.isPattern()) {
+                    patternName = value.toPattern()->getVariableName();
+                }
+                ON_SCOPE_EXIT {
+                    if (!patternName.empty())
+                        value.toPattern()->setVariableName(patternName);
+                };
+
+
                 if (auto result = transformFunc->func(evaluator, { value }); result.has_value())
                     return *result;
             }
@@ -593,6 +604,16 @@ namespace pl::ptrn {
                     auto startHeap = this->m_evaluator->getHeap();
                     ON_SCOPE_EXIT { this->m_evaluator->getHeap() = startHeap; };
 
+                    // Preserve pattern variable name
+                    std::string patternName;
+                    if (literal.isPattern()) {
+                        patternName = literal.toPattern()->getVariableName();
+                    }
+                    ON_SCOPE_EXIT {
+                        if (!patternName.empty())
+                            literal.toPattern()->setVariableName(patternName);
+                    };
+
                     auto result = function->func(this->m_evaluator, { literal });
                     if (result.has_value()) {
                         if (fromCast && result->isPattern() && result->toPattern()->getTypeName() == this->getTypeName()) {

external/fmt

@@ -68,7 +68,7 @@ namespace pl::lib::libstd::string {
                 if constexpr (std::integral<i128>)
                     return wolv::util::from_chars<i128>(string, base).value_or(0);
                 else
-                    return wolv::util::from_chars<i64>(string, base).value_or(0);
+                    return i128(wolv::util::from_chars<i64>(string, base).value_or(0));
 
             });