Merge remote-tracking branch 'funkin/funkin' into cne-master

Author: Raltyro

.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

include/cpp/VirtualArray.h

@@ -38,10 +38,10 @@ class VirtualArray : public hx::ObjectPtr<VirtualArray_obj>
    inline VirtualArray Add(const T &inVal);
 
 
-   inline bool operator==(const Dynamic &value) const { return value==*this; }
+   inline bool operator==(const Dynamic &value) const { return value==(Dynamic)*this; }
    template<typename SOURCE_> inline bool operator==( const Array<SOURCE_> &inRHS );
 
-   inline bool operator!=(Dynamic value) const { return value!=*this; }
+   inline bool operator!=(Dynamic value) const { return value!=(Dynamic)*this; }
    template<typename SOURCE_> inline bool operator!=( const Array<SOURCE_> &inRHS ) { return inRHS!=*this; }
 
 };

include/hxcpp.h

@@ -68,11 +68,7 @@
    #define HXCPP_ALIGN_FLOAT
 #endif
 
-// Must allign allocs to 8 bytes to match floating point requirement?
-// Ints must br read on 4-byte boundary
-#if (!defined(HXCPP_ALIGN_FLOAT) && (defined(EMSCRIPTEN) || defined(GCW0)) )
-   #define HXCPP_ALIGN_ALLOC
-#endif
+#define HXCPP_ALIGN_ALLOC
 
 
 // Some compilers are over-enthusiastic about what they #define ...

src/hx/cppia/Cppia.cpp

@@ -3667,8 +3667,10 @@ void genSetter(CppiaCompiler *compiler, const JitVal &ioValue, ExprType exprType
                compiler->mult(ioValue, sJitTempF0, ioValue,true);
             else
             {
-               compiler->mult(sJitTempF0, sJitTempF0, ioValue,true);
-               compiler->convert(sJitTempF0, etFloat, ioValue, exprType );
+               JitTemp fval(compiler, jtFloat);
+               compiler->convert(ioValue, exprType, fval, etFloat);
+               compiler->mult(sJitTempF0, sJitTempF0, fval, true);
+               compiler->convert(sJitTempF0, etFloat, ioValue, exprType);
             }
          }
          break;

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) \

src/hx/libs/std/Sys.cpp

@@ -99,7 +99,7 @@ void _hx_std_put_env( String e, String v )
 #ifdef HX_WINRT
    // Do nothing
 #elif defined(NEKO_WINDOWS)
-   String set = e + HX_CSTRING("=") + (v != null()?v:"");
+   String set = e + HX_CSTRING("=") + (v != null()?v:HX_CSTRING(""));
 
    #ifdef HX_SMART_STRINGS
    if (set.isUTF16Encoded())

test/cppia/Client.hx

@@ -189,6 +189,22 @@ class Client
          default:
       }
 
+      // regression test for #926
+      var x:Dynamic = 3;
+      x *= 5;
+      if (x != 15) {
+         Common.status = 'Failed regression test for #926. x: $x';
+         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();

toolchain/android-toolchain-clang.xml

@@ -35,6 +35,8 @@
   <set name="EXEPREFIX" value="llvm" />
 </section>
 
+<set name="HXCPP_CPP11" value="1" unless="HXCPP_NO_CPP11 || HXCPP_CPP17" />
+
 <include name="toolchain/gcc-toolchain.xml"/>
 
 <compiler id="android-gcc" exe="clang++">
@@ -61,7 +63,9 @@
   <flag value="-DHXCPP_ANDROID_PLATFORM=${HXCPP_ANDROID_PLATFORM}" />
 
   <!-- Options -->
+  <cppflag value="-std=c++11" if="HXCPP_CPP11" />
   <cppflag value="-std=c++17" if="HXCPP_CPP17" />
+  <cppflag value="-std=c++20" if="HXCPP_CPP20" />
   <flag value="-flto" if="HXCPP_OPTIMIZE_LINK" unless="debug"/>
   <flag value="-fvisibility=hidden"/>
   <flag value="-ffunction-sections"/>
@@ -106,6 +110,7 @@
   -->
   <prefix value="lib"/>
   <lib name="-llog"/>
+  <ext value=".so"/>
 
 </linker>
 

toolchain/appletvos-toolchain.xml

@@ -1,8 +1,9 @@
 <xml>
 
-
 <echo value="Using tvOS SDK ${TVOS_VER}" if="VERBOSE"/>
 
+<set name="HXCPP_CPP11" value="1" unless="HXCPP_NO_CPP11 || HXCPP_CPP17 || HXCPP_CPP20" />
+
 <set name="ARCH" value ="-64" if="HXCPP_ARM64" />
 
 <set name="HXCPP_USE_LIBTOOL" value="1" />
@@ -25,9 +26,15 @@
   <pchflag value="-x" />
   <pchflag value="c++-header" />
   <cppflag value="-stdlib=libstdc++" if="FORCE_LIBGCC" />
-  <cppflag value="-stdlib=libc++" if="HXCPP_CPP11" />
+  <cppflag value="-stdlib=libc++" if="HXCPP_CPP11 || HXCPP_CPP17 || HXCPP_CPP20" />
+  <cppflag value="-std=c++11" if="HXCPP_CPP11" />
+  <cppflag value="-std=c++17" if="HXCPP_CPP17" />
+  <cppflag value="-std=c++20" if="HXCPP_CPP20" />
   <mmflag value="-stdlib=libstdc++" if="FORCE_LIBGCC" />
-  <mmflag value="-stdlib=libc++" if="HXCPP_CPP11" />
+  <mmflag value="-stdlib=libc++" if="HXCPP_CPP11 || HXCPP_CPP17 || HXCPP_CPP20" />
+  <mmflag value="-std=c++11" if="HXCPP_CPP11" />
+  <mmflag value="-std=c++17" if="HXCPP_CPP17" />
+  <mmflag value="-std=c++20" if="HXCPP_CPP20" />
   <flag value="-g" if="HXCPP_DEBUG_LINK"/>
   <flag value="-O2" unless="debug"/>
   <flag value="-arch"/>
@@ -72,9 +79,9 @@
   <exe name="xcrun --sdk appletvos${TVOS_VER} g++" if="HXCPP_GCC" />
   <exe name="xcrun --sdk appletvos${TVOS_VER} clang++" />
   <cppflag value="-stdlib=libstdc++" if="FORCE_LIBGCC" />
-  <cppflag value="-stdlib=libc++" if="HXCPP_CPP11" />
+  <cppflag value="-stdlib=libc++" if="HXCPP_CPP11 || HXCPP_CPP17 || HXCPP_CPP20" />
   <mmflag value="-stdlib=libstdc++" if="FORCE_LIBGCC" />
-  <mmflag value="-stdlib=libc++" if="HXCPP_CPP11" />
+  <mmflag value="-stdlib=libc++" if="HXCPP_CPP11 || HXCPP_CPP17 || HXCPP_CPP20" />
   <flag value="-dynamiclib"/>
   <flag value="-arch"/>
   <flag value="arm64" if="HXCPP_ARM64" />