add c_standard/cpp_standard xml attributes. (#1301)

* add `c_standard`/`cpp_standard` xml attributes.

* add test for `c_standard`/`cpp_standard` attributes

* set language standard for PCH compilation too

* more generic name for build tool tests

Author: Apprentice-Alchemist

.github/workflows/test.yml

@@ -221,3 +221,16 @@ 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
+        run: haxelib run hxcpp Build.xml

.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

test/RunTests.hx

@@ -114,6 +114,11 @@ class RunTests
       command("cpp64"+sep+"Test",[]);
    }
 
+   public static function cxx_standard() {
+      setDir("cxx_standard");
+      command("haxelib", ["run", "hxcpp", "Build.xml"]);
+   }
+
 
    public static function setDir(name:String)
    {
@@ -199,6 +204,7 @@ class RunTests
       run("std64", std64);
       run("native", native);
       run("debugger", debugger);
+      run("cxx_standard", cxx_standard);
 
       Sys.println("");
 

test/cxx_standard/Build.xml

@@ -0,0 +1,15 @@
+<xml>
+	<files id="test" cxx_standard="17">
+		<compilerflag value="/Zc:__cplusplus" if="isMsvc" />
+		<file name="main.cpp" />
+		<file name="cxx14.cpp" cxx_standard="14" />
+		<file name="c11.c" c_standard="11" />
+		<file name="c17.c" c_standard="17" />
+	</files>
+
+	<set name="EXESUFFIX" value=".exe" if="windows" />
+
+	<target id="default" tool="linker" toolid="exe" output="main${EXESUFFIX}">
+		<files id="test"/>
+	</target>
+</xml>

test/cxx_standard/c11.c

@@ -0,0 +1,3 @@
+#if __STDC_VERSION__ < 201112L
+#error "Not C11"
+#endif

test/cxx_standard/c17.c

@@ -0,0 +1,3 @@
+#if __STDC_VERSION__ < 201710L
+#error "Not C17"
+#endif

test/cxx_standard/cxx14.cpp

@@ -0,0 +1,3 @@
+#if __cplusplus != 201402L
+#error "Not C++14"
+#endif

test/cxx_standard/main.cpp

@@ -0,0 +1,5 @@
+#if __cplusplus < 201703L
+#error "Not C++17"
+#endif
+
+int main() { return 0; }