Merge branch 'master' into faster-hxcpp-h

Author: Aidan Lee

.github/workflows/main.yml

@@ -2,6 +2,23 @@ name: main
 on: [push, pull_request]
 
 jobs:
+  check-headers:
+    name: Check headers
+    runs-on: ubuntu-latest
+    steps:
+    - name: checkout
+      uses: actions/checkout@v4
+
+    - name: Install pcre2grep
+      run: sudo apt-get update && sudo apt-get install -y pcre2-utils
+
+    - run: |
+        # macros in public headers must use the global namespace to qualify types
+        ! pcre2grep --buffer-size=1M --recursive --multiline --line-number --include='.*\.h$' \
+          '#define\s+(?:.*\\\r?\n)*.*?\K(?<!:)\b(Enum|String|StringOffset|Array|ArrayClassID|Math|Math_obj|Void|null|Dynamic|hx::|cpp::)\b' \
+          include
+      name: Check public headers
+
   Windows32:
     strategy:
       fail-fast: false

.github/workflows/package.yml

@@ -135,8 +135,8 @@ jobs:
           uses: ncipollo/release-action@v1
           with:
             tag: v${{ env.hxcpp_release }}
-            commit: ${{ github.head_ref }}
+            commit: ${{ github.ref }}
             name: Release ${{ env.hxcpp_release }}
             draft: false
             prerelease: false
-            artifacts: ./hxcpp-${{ env.hxcpp_release }}.zip
+            artifacts: ./hxcpp-${{ env.hxcpp_release }}.zip

.github/workflows/test.yml

@@ -221,3 +221,21 @@ jobs:
         run: haxe compile-cpp.hxml -D ${{ env.HXCPP_ARCH_FLAG }} -D no_http
       - name: run
         run: bin${{ inputs.sep }}cpp${{ inputs.sep }}TestMain-debug
+  build_tool:
+    runs-on: ${{ inputs.os }}
+    name: build tool tests
+    steps:
+      - name: checkout
+        uses: actions/checkout@v4
+      - name: setup
+        uses: ./.github/workflows/setup
+        with:
+          haxe: ${{ inputs.haxe }}
+      - name: test c/cxx_standard attributes
+        working-directory: test/cxx_standard
+        shell: bash
+        run: |
+          for xml in *.xml; do
+            haxelib run hxcpp $xml
+            haxelib run hxcpp $xml clean
+          done

.gitignore

@@ -29,6 +29,11 @@ hxcpp.n
 
 .vscode
 
+test/cxx_standard/main
+test/cxx_standard/main.hash
+test/cxx_standard/main.exe
+test/cxx_standard/main.exe.hash
+
 # Created by https://www.toptal.com/developers/gitignore/api/visualstudio
 # Edit at https://www.toptal.com/developers/gitignore?templates=visualstudio
 

docs/build_xml/Defines.md

@@ -37,8 +37,10 @@ Defines affecting how the code is compiled.  These can be on the command line wh
 | *HXCPP_CHECK_POINTER*   | Add null-pointer checks,even in release mode. |
 | *HXCPP_PROFILER*        | Add profiler support |
 | *HXCPP_TELEMETRY*       | Add telemetry support |
-| *HXCPP_CPP11*           | Use c++11 features and link libraries |
-| *HXCPP_CPP17*           | Use c++17 features and link libraries |
+| *HXCPP_C_STANDARD*      | Set default C standard |
+| *HXCPP_CXX_STANDARD*    | Set default C++ standard |
+| *HXCPP_OBJC_STANDARD*   | Set default Objective-C standard |
+| *HXCPP_OBJCXX_STANDARD* | Set default Objective-C++ standard |
 | *exe_link*              | Generate executable file (rather than dynamic library on android) |
 | *static_link*           | Generate static library |
 | *dll_link*              | Generate dynamic library |

docs/build_xml/Files.md

@@ -2,6 +2,20 @@ Files
 ------
 The files node defines a group of files that all share the same attributes, including relative directory, default compiler flags and dependencies.  The node can be used to define a set of header files on which other files can depend, or a set of source files to be compiled and included in a target.
 
+```xml
+<files id="foo" cxx_standard="14">
+  <file name="foo.cpp"/>
+  <file name="bar.c"/>
+</files>
+```
+
+#### Attributes
+
+  + `c_standard` = Default C standard for the file group
+  + `cxx_standard` = Default C++ standard for the file group
+  + `objc_standard` = Default Objective-C standard for the file group
+  + `objcxx_standard` = Default Objective-C++ standard for the file group
+#### Nodes
 - *depend* - Declare that all files in the group depend on another file or another file group.
   ```xml
   <depend name="filename" />
@@ -80,13 +94,17 @@ The files node defines a group of files that all share the same attributes, incl
 
 - *file* - Add file to group, with optional attributes
   ```xml
-  <file name="filename" tags="tag,tag1" filterout="define" embedName="embed" >
+  <file name="filename" tags="tag,tag1" filterout="define" embedName="embed" cxx_standard="17">
      <depend name="filename1" />
      <depend name="filename2" />
   </file>
   ```
      + name = name of file - may be absolute or relative to files.dir
      + tags = optional override of group tags.  See [Tags.md](Tags.md).
+     + `c_standard` = C standard for the file
+     + `cxx_standard` = C++ standard for the file
+     + `objc_standard` = Objective-C standard for the file
+     + `objcxx_standard` = Objective-C++ standard for the file
      + filterout = allows files to be skipped at compile-time if the named define exists.
        This is useful when the define is set sometime after the file list is parsed.
      + depend name = filename of additional dependency

include/Array.h

@@ -1304,7 +1304,7 @@ cpp::VirtualArray Array_obj<ELEM_>::map(MappingFunc inFunc)
 
 #ifdef HXCPP_VISIT_ALLOCS
 #define ARRAY_VISIT_FUNC \
-    void __Visit(hx::VisitContext *__inCtx) { HX_VISIT_MEMBER(mThis); }
+    void __Visit(::hx::VisitContext *__inCtx) { HX_VISIT_MEMBER(mThis); }
 #else
 #define ARRAY_VISIT_FUNC
 #endif
@@ -1339,8 +1339,8 @@ namespace hx
     { \
         struct _hx_array_##name final : public ::hx::AutoCallable_obj<value(args_list)> \
         { \
-            Array<ELEM_> mThis; \
-            _hx_array_##name(Array<ELEM_> inThis) : mThis(inThis) \
+            ::Array<ELEM_> mThis; \
+            _hx_array_##name(::Array<ELEM_> inThis) : mThis(inThis) \
             { \
                 HX_OBJ_WB_NEW_MARKED_OBJECT(this); \
             } \
@@ -1349,13 +1349,13 @@ namespace hx
                 ret mThis->name(args_call); \
             } \
             void *__GetHandle() const override { return mThis.GetPtr(); } \
-            void __Mark(hx::MarkContext *__inCtx) { HX_MARK_MEMBER(mThis); } \
+            void __Mark(::hx::MarkContext *__inCtx) { HX_MARK_MEMBER(mThis); } \
             ARRAY_VISIT_FUNC \
             int __Compare(const ::hx::Object* inRhs) const override \
             { \
                 auto casted = dynamic_cast<const _hx_array_##name *>(inRhs); \
                 if (!casted) return 1; \
-                if (!hx::IsPointerEq(mThis, casted->mThis)) return -1; \
+                if (!::hx::IsPointerEq(mThis, casted->mThis)) return -1; \
                 return 0; \
             } \
         }; \
@@ -1431,31 +1431,31 @@ template<class ELEM_>
 hx::Val Array_obj<ELEM_>::__Field(const String& inString, hx::PropertyAccess inCallProp)
 {
 #define ARRAY_RUN_FUNC(ret,func,dynamic_arg_list,arg_list) \
-    Dynamic __run(dynamic_arg_list) \
+    ::Dynamic __run(dynamic_arg_list) \
     { \
-        ret mThis->__##func(arg_list); return Dynamic(); \
+        ret mThis->__##func(arg_list); return ::Dynamic(); \
     }
 
 #define DEFINE_ARRAY_FUNC(ret,func,array_list,run_func,ARG_C) \
-    struct Reflective_##func : public hx::Object \
+    struct Reflective_##func : public ::hx::Object \
     { \
-       HX_IS_INSTANCE_OF enum { _hx_ClassId = hx::clsIdClosure }; \
+       HX_IS_INSTANCE_OF enum { _hx_ClassId = ::hx::clsIdClosure }; \
        bool __IsFunction() const { return true; } \
-       Array_obj<ELEM_> *mThis; \
-       Reflective_##func(Array_obj<ELEM_> *inThis) : mThis(inThis) { } \
-       String toString() const{ return HX_CSTRING(#func) ; } \
-       String __ToString() const{ return HX_CSTRING(#func) ; } \
+       ::Array_obj<ELEM_> *mThis; \
+       Reflective_##func(::Array_obj<ELEM_> *inThis) : mThis(inThis) { } \
+       ::String toString() const{ return HX_CSTRING(#func) ; } \
+       ::String __ToString() const{ return HX_CSTRING(#func) ; } \
        int __GetType() const { return vtFunction; } \
        void *__GetHandle() const { return mThis; } \
        int __ArgCount() const { return ARG_C; } \
-       void __Mark(hx::MarkContext *__inCtx) { HX_MARK_MEMBER(mThis); } \
+       void __Mark(::hx::MarkContext *__inCtx) { HX_MARK_MEMBER(mThis); } \
        ARRAY_VISIT_FUNC \
-       Dynamic __Run(const Array<Dynamic> &inArgs) \
+       ::Dynamic __Run(const ::Array<::Dynamic> &inArgs) \
        { \
-          ret mThis->__##func(array_list); return Dynamic(); \
+          ret mThis->__##func(array_list); return ::Dynamic(); \
        } \
        run_func \
-       int __Compare(const hx::Object *inRHS) const \
+       int __Compare(const ::hx::Object *inRHS) const \
        { \
           if (!dynamic_cast<const Reflective_##func *>(inRHS)) return -1; \
           return (mThis==inRHS->__GetHandle() ? 0 : -1); \