Merge branch 'HaxeFoundation:master' into funkin

Author: MAJigsaw77

.github/workflows/main.yml

@@ -42,7 +42,7 @@ jobs:
       arch: 64
       sep: /
       ext: .dylib
-      os: macos-13
+      os: macos-15-intel
 
   MacOSArm:
     strategy:

.github/workflows/test.yml

@@ -147,26 +147,14 @@ jobs:
           uses: ./.github/workflows/setup
           with:
             haxe: ${{ inputs.haxe }}
-        - name: install mariadb
+        - name: setup mariadb
           if: runner.os == 'Linux'
           run: |
             set -ex
-            sudo rm -R /var/lib/mysql/
-            curl -sSL https://downloads.mariadb.com/MariaDB/mariadb_repo_setup > mariadb_repo_setup
-            curl -sSL https://downloads.mariadb.com/MariaDB/mariadb_repo_setup.sha256 > mariadb_repo_setup.sha256
-            sha256sum --check mariadb_repo_setup.sha256
-            sudo bash mariadb_repo_setup
             sudo apt-get update -qqy
-            sudo apt-get remove -qqy mysql-common
-            sudo apt-get autoremove -qqy
             sudo apt-get install -qqy mariadb-server
-        - name: configure mariadb
-          if: runner.os == 'Linux'
-          run: |
-            set -ex
-            sudo systemctl unmask mysql.service
-            sudo systemctl start mysql
-            sudo mysql -u root -e "create database hxcpp; grant all privileges on hxcpp.* to hxcpp@localhost identified by 'hxcpp'; flush privileges;"
+            sudo systemctl start mariadb
+            sudo mariadb -u root -e "create database hxcpp; grant all privileges on hxcpp.* to hxcpp@localhost identified by 'hxcpp'; flush privileges;"
         - name: build
           run: haxe compile${{ inputs.arch }}.hxml
         - name: run
@@ -227,6 +215,8 @@ jobs:
           haxe: ${{ inputs.haxe }}
       - name: install haxe libs
         run: haxelib install compile-cpp.hxml --always
+        # haxe 4 tests don't build with latest utest
+        if: inputs.haxe != 'latest'
       - name: build
         run: haxe compile-cpp.hxml -D ${{ env.HXCPP_ARCH_FLAG }} -D no_http
       - name: run

src/hx/cppia/Cppia.h

@@ -1083,6 +1083,14 @@ struct NAME \
       ioVal  = left OP f; \
       return ioVal; \
    } \
+   inline static int &run(int &ioVal, hx::CppiaCtx *ctx, hx::CppiaExpr *value) \
+   { \
+      int left = ioVal; \
+      int i = value->runInt(ctx); \
+      BCR_CHECK_RET(ioVal); \
+      ioVal  = left OP i; \
+      return ioVal; \
+   } \
    static bool run(bool &ioVal, hx::CppiaCtx *ctx, hx::CppiaExpr *value) { value->runVoid(ctx); return ioVal; } \
    static String run(String &ioVal, hx::CppiaCtx *ctx, hx::CppiaExpr *value) { value->runVoid(ctx); return ioVal; } \
    static hx::Object *run(hx::Object * &ioVal, hx::CppiaCtx *ctx, hx::CppiaExpr *value) \

test/cppia/Client.hx

@@ -197,6 +197,14 @@ class Client
          return;
       }
 
+      // regression test for #1257
+      var x = 1290555;
+      x *= 1290555;
+      if (x != -915102823) {
+         Common.status = 'Failed regression test for #1257. x: $x';
+         return;
+      }
+
       final extending = new ClientExtendedExtendedRoot();
 
       extending.addValue();