From 28f737a15d9ce5d9e8b06ab768ef858c07ae510e Mon Sep 17 00:00:00 2001
From: Karen Arutyunov <karen@codesynthesis.com>
Date: Tue, 5 Sep 2023 15:20:13 +0300
Subject: Make c++11 value default for xsd --std option

Also add support for c++14, c++17, c++20, and c++23 values and drop passing
--std option in tests and examples.
---
 xsd-tests/schema/anonymous/buildfile        | 2 +-
 xsd-tests/schema/any-attribute/buildfile    | 2 +-
 xsd-tests/schema/any-type/buildfile         | 2 +-
 xsd-tests/schema/any/buildfile              | 4 ++--
 xsd-tests/schema/attribute-group/buildfile  | 2 +-
 xsd-tests/schema/attribute/buildfile        | 2 +-
 xsd-tests/schema/cardinality/buildfile      | 2 +-
 xsd-tests/schema/chameleon/buildfile        | 2 +-
 xsd-tests/schema/enumeration/buildfile      | 2 +-
 xsd-tests/schema/forward/buildfile          | 2 +-
 xsd-tests/schema/group/buildfile            | 2 +-
 xsd-tests/schema/import/buildfile           | 2 +-
 xsd-tests/schema/include/buildfile          | 2 +-
 xsd-tests/schema/inheritance/buildfile      | 4 ++--
 xsd-tests/schema/list/buildfile             | 4 ++--
 xsd-tests/schema/no-namespace/buildfile     | 2 +-
 xsd-tests/schema/recursive/buildfile        | 2 +-
 xsd-tests/schema/ref-type/invalid/buildfile | 2 +-
 xsd-tests/schema/ref-type/valid/buildfile   | 2 +-
 xsd-tests/schema/restriction/buildfile      | 2 +-
 xsd-tests/schema/union/buildfile            | 2 +-
 21 files changed, 24 insertions(+), 24 deletions(-)

(limited to 'xsd-tests/schema')

diff --git a/xsd-tests/schema/anonymous/buildfile b/xsd-tests/schema/anonymous/buildfile
index ce236f8..060d7d6 100644
--- a/xsd-tests/schema/anonymous/buildfile
+++ b/xsd-tests/schema/anonymous/buildfile
@@ -11,7 +11,7 @@ exe{driver}: {hxx cxx}{* -test} {hxx cxx}{test} $libs
 
 <{hxx cxx}{test}>: xsd{test} $xsd
 {{
-  $xsd cxx-tree --std c++11   \
+  $xsd cxx-tree               \
        --root-element-all     \
        --output-dir $out_base \
        $path($<[0])
diff --git a/xsd-tests/schema/any-attribute/buildfile b/xsd-tests/schema/any-attribute/buildfile
index e4275a4..b215090 100644
--- a/xsd-tests/schema/any-attribute/buildfile
+++ b/xsd-tests/schema/any-attribute/buildfile
@@ -8,5 +8,5 @@
 testscript{*}:
 {
   test           = $xsd
-  test.arguments = cxx-tree --std c++11
+  test.arguments = cxx-tree
 }
diff --git a/xsd-tests/schema/any-type/buildfile b/xsd-tests/schema/any-type/buildfile
index af74cd9..9ab1e7d 100644
--- a/xsd-tests/schema/any-type/buildfile
+++ b/xsd-tests/schema/any-type/buildfile
@@ -11,7 +11,7 @@ exe{driver}: {hxx cxx}{* -test} {hxx cxx}{test} $libs
 
 <{hxx cxx}{test}>: xsd{test} $xsd
 {{
-  $xsd cxx-tree --std c++11   \
+  $xsd cxx-tree               \
        --root-element-all     \
        --output-dir $out_base \
        $path($<[0]) 2>>?~%EOE%
diff --git a/xsd-tests/schema/any/buildfile b/xsd-tests/schema/any/buildfile
index f5d6380..f6c163a 100644
--- a/xsd-tests/schema/any/buildfile
+++ b/xsd-tests/schema/any/buildfile
@@ -24,7 +24,7 @@ for sc: test fail
 
 <{hxx cxx}{test}>: xsd{test} $xsd
 {{
-  $xsd cxx-tree --std c++11   \
+  $xsd cxx-tree               \
        --root-element-all     \
        --output-dir $out_base \
        $path($<[0])
@@ -32,7 +32,7 @@ for sc: test fail
 
 <{hxx cxx}{fail}>: xsd{fail} $xsd
 {{
-  $xsd cxx-tree --std c++11   \
+  $xsd cxx-tree               \
        --root-element-all     \
        --output-dir $out_base \
        $path($<[0]) 2>>?~%EOE%
diff --git a/xsd-tests/schema/attribute-group/buildfile b/xsd-tests/schema/attribute-group/buildfile
index 4c97e5b..4b7d27e 100644
--- a/xsd-tests/schema/attribute-group/buildfile
+++ b/xsd-tests/schema/attribute-group/buildfile
@@ -11,7 +11,7 @@ exe{driver}: {hxx cxx}{* -global} {hxx cxx}{global} $libs
 
 <{hxx cxx}{global}>: xsd{global} $xsd
 {{
-  $xsd cxx-tree --std c++11   \
+  $xsd cxx-tree               \
        --root-element-all     \
        --output-dir $out_base \
        $path($<[0])
diff --git a/xsd-tests/schema/attribute/buildfile b/xsd-tests/schema/attribute/buildfile
index a14bafc..30d1464 100644
--- a/xsd-tests/schema/attribute/buildfile
+++ b/xsd-tests/schema/attribute/buildfile
@@ -15,7 +15,7 @@ for f: $fs
 {
   <{hxx cxx}{$f}>: xsd{$f} $xsd
   {{
-    $xsd cxx-tree --std c++11   \
+    $xsd cxx-tree               \
          --root-element-all     \
          --output-dir $out_base \
          $path($<[0])
diff --git a/xsd-tests/schema/cardinality/buildfile b/xsd-tests/schema/cardinality/buildfile
index 9b97cf0..93ad75a 100644
--- a/xsd-tests/schema/cardinality/buildfile
+++ b/xsd-tests/schema/cardinality/buildfile
@@ -11,7 +11,7 @@ exe{driver}: {hxx cxx}{* -test} {hxx cxx}{test} $libs
 
 <{hxx cxx}{test}>: xsd{test} $xsd
 {{
-  $xsd cxx-tree --std c++11   \
+  $xsd cxx-tree               \
        --root-element-all     \
        --output-dir $out_base \
        $path($<[0])
diff --git a/xsd-tests/schema/chameleon/buildfile b/xsd-tests/schema/chameleon/buildfile
index 445c052..e270cf0 100644
--- a/xsd-tests/schema/chameleon/buildfile
+++ b/xsd-tests/schema/chameleon/buildfile
@@ -15,7 +15,7 @@ for f: $fs
 {
   <{hxx cxx}{$f}>: xsd{$f} $xsd
   {{
-    $xsd cxx-tree --std c++11                  \
+    $xsd cxx-tree                              \
          --root-element-all                    \
          --output-dir $directory($path($>[0])) \
          $path($<[0])
diff --git a/xsd-tests/schema/enumeration/buildfile b/xsd-tests/schema/enumeration/buildfile
index d8b2d85..5188b04 100644
--- a/xsd-tests/schema/enumeration/buildfile
+++ b/xsd-tests/schema/enumeration/buildfile
@@ -11,7 +11,7 @@ exe{driver}: {hxx cxx}{* -test} {hxx cxx}{test} $libs
 
 <{hxx cxx}{test}>: xsd{test} $xsd
 {{
-  $xsd cxx-tree --std c++11   \
+  $xsd cxx-tree               \
        --root-element-all     \
        --output-dir $out_base \
        $path($<[0])
diff --git a/xsd-tests/schema/forward/buildfile b/xsd-tests/schema/forward/buildfile
index ec6b7d9..3b30f53 100644
--- a/xsd-tests/schema/forward/buildfile
+++ b/xsd-tests/schema/forward/buildfile
@@ -11,7 +11,7 @@ exe{driver}: {hxx cxx}{* -test} {hxx cxx}{test} $libs
 
 <{hxx cxx}{test}>: xsd{test} $xsd
 {{
-  $xsd cxx-tree --std c++11   \
+  $xsd cxx-tree               \
        --root-element-all     \
        --output-dir $out_base \
        $path($<[0])
diff --git a/xsd-tests/schema/group/buildfile b/xsd-tests/schema/group/buildfile
index f2bb6e1..e93b592 100644
--- a/xsd-tests/schema/group/buildfile
+++ b/xsd-tests/schema/group/buildfile
@@ -15,7 +15,7 @@ for f: $fs
 {
   <{hxx cxx}{$f}>: xsd{$f} $xsd
   {{
-    $xsd cxx-tree --std c++11   \
+    $xsd cxx-tree               \
          --root-element-all     \
          --output-dir $out_base \
          $path($<[0])
diff --git a/xsd-tests/schema/import/buildfile b/xsd-tests/schema/import/buildfile
index 4cec837..c5fab29 100644
--- a/xsd-tests/schema/import/buildfile
+++ b/xsd-tests/schema/import/buildfile
@@ -15,7 +15,7 @@ for f: $fs
 {
   <{hxx cxx}{$f}>: xsd{$f} $xsd
   {{
-    $xsd cxx-tree --std c++11                  \
+    $xsd cxx-tree                              \
          --root-element-all                    \
          --output-dir $directory($path($>[0])) \
          $path($<[0])
diff --git a/xsd-tests/schema/include/buildfile b/xsd-tests/schema/include/buildfile
index dcc151a..c013903 100644
--- a/xsd-tests/schema/include/buildfile
+++ b/xsd-tests/schema/include/buildfile
@@ -15,7 +15,7 @@ for f: $fs
 {
   <{hxx cxx}{$f}>: xsd{$f} $xsd
   {{
-    $xsd cxx-tree --std c++11                  \
+    $xsd cxx-tree                              \
          --root-element-all                    \
          --output-dir $directory($path($>[0])) \
          $path($<[0])
diff --git a/xsd-tests/schema/inheritance/buildfile b/xsd-tests/schema/inheritance/buildfile
index 23786d3..0eae9b3 100644
--- a/xsd-tests/schema/inheritance/buildfile
+++ b/xsd-tests/schema/inheritance/buildfile
@@ -11,7 +11,7 @@ for f: $fs
 {
   <{hxx cxx}{$f}>: xsd{$f} $xsd
   {{
-    $xsd cxx-tree --std c++11                  \
+    $xsd cxx-tree                              \
          --output-dir $directory($path($>[0])) \
          $path($<[0])
   }}
@@ -24,5 +24,5 @@ for f: $fs
 testscript{*}:
 {
   test           = $xsd
-  test.arguments = cxx-tree --std c++11
+  test.arguments = cxx-tree
 }
diff --git a/xsd-tests/schema/list/buildfile b/xsd-tests/schema/list/buildfile
index 88ed0ee..090e69a 100644
--- a/xsd-tests/schema/list/buildfile
+++ b/xsd-tests/schema/list/buildfile
@@ -11,7 +11,7 @@ for f: $fs
 {
   <{hxx cxx}{$f}>: xsd{$f} $xsd
   {{
-    $xsd cxx-tree --std c++11                  \
+    $xsd cxx-tree                              \
          --root-element-all                    \
          --output-dir $directory($path($>[0])) \
          $path($<[0])
@@ -25,5 +25,5 @@ for f: $fs
 testscript{*}:
 {
   test           = $xsd
-  test.arguments = cxx-tree --std c++11
+  test.arguments = cxx-tree
 }
diff --git a/xsd-tests/schema/no-namespace/buildfile b/xsd-tests/schema/no-namespace/buildfile
index 5d50490..6723d4f 100644
--- a/xsd-tests/schema/no-namespace/buildfile
+++ b/xsd-tests/schema/no-namespace/buildfile
@@ -11,7 +11,7 @@ exe{driver}: {hxx cxx}{* -test} {hxx cxx}{test} $libs
 
 <{hxx cxx}{test}>: xsd{test} $xsd
 {{
-  $xsd cxx-tree --std c++11   \
+  $xsd cxx-tree               \
        --root-element-all     \
        --output-dir $out_base \
        $path($<[0])
diff --git a/xsd-tests/schema/recursive/buildfile b/xsd-tests/schema/recursive/buildfile
index 99788f6..a166e82 100644
--- a/xsd-tests/schema/recursive/buildfile
+++ b/xsd-tests/schema/recursive/buildfile
@@ -11,7 +11,7 @@ exe{driver}: {hxx cxx}{* -test} {hxx cxx}{test} $libs
 
 <{hxx cxx}{test}>: xsd{test} $xsd
 {{
-  $xsd cxx-tree --std c++11   \
+  $xsd cxx-tree               \
        --root-element-all     \
        --output-dir $out_base \
        $path($<[0])
diff --git a/xsd-tests/schema/ref-type/invalid/buildfile b/xsd-tests/schema/ref-type/invalid/buildfile
index 42c7bfb..aac448c 100644
--- a/xsd-tests/schema/ref-type/invalid/buildfile
+++ b/xsd-tests/schema/ref-type/invalid/buildfile
@@ -8,5 +8,5 @@
 testscript{*}:
 {
   test           = $xsd
-  test.arguments = cxx-tree --std c++11
+  test.arguments = cxx-tree
 }
diff --git a/xsd-tests/schema/ref-type/valid/buildfile b/xsd-tests/schema/ref-type/valid/buildfile
index 2b27cf1..ff962dc 100644
--- a/xsd-tests/schema/ref-type/valid/buildfile
+++ b/xsd-tests/schema/ref-type/valid/buildfile
@@ -23,7 +23,7 @@ for sc: idref idrefs
 
   <{hxx cxx}{$sc}>: xsd{$sc} $xsd
   {{
-    $xsd cxx-tree --std c++11   \
+    $xsd cxx-tree               \
          --root-element-all     \
          --output-dir $out_base \
          $path($<[0])
diff --git a/xsd-tests/schema/restriction/buildfile b/xsd-tests/schema/restriction/buildfile
index b245187..314b095 100644
--- a/xsd-tests/schema/restriction/buildfile
+++ b/xsd-tests/schema/restriction/buildfile
@@ -11,7 +11,7 @@ exe{driver}: {hxx cxx}{* -test} {hxx cxx}{test} $libs
 
 <{hxx cxx}{test}>: xsd{test} $xsd
 {{
-  $xsd cxx-tree --std c++11   \
+  $xsd cxx-tree               \
        --root-element-all     \
        --output-dir $out_base \
        $path($<[0])
diff --git a/xsd-tests/schema/union/buildfile b/xsd-tests/schema/union/buildfile
index 9cdc56f..8ff9349 100644
--- a/xsd-tests/schema/union/buildfile
+++ b/xsd-tests/schema/union/buildfile
@@ -11,7 +11,7 @@ exe{driver}: {hxx cxx}{* -test} {hxx cxx}{test} $libs
 
 <{hxx cxx}{test}>: xsd{test} $xsd
 {{
-  $xsd cxx-tree --std c++11   \
+  $xsd cxx-tree               \
        --root-element-all     \
        --output-dir $out_base \
        $path($<[0])
-- 
cgit v1.1