Update the CLanguageStandard and CXXLanguageStandard enums

Author: benrimmington

Sources/PackageDescription/LanguageStandardSettings.swift

@@ -17,51 +17,35 @@ public enum CLanguageStandard: String, Encodable {
     /// ISO C 1990.
     case c90
 
-    /// ISO C 1990.
-    case iso9899_1990 = "iso9899:1990"
-
-    /// ISO C 1990 with amendment 1.
-    case iso9899_199409 = "iso9899:199409"
-
-    /// ISO C 1990 with GNU extensions.
-    case gnu89
-
-    /// ISO C 1990 with GNU extensions.
-    case gnu90
-
     /// ISO C 1999.
     case c99
 
-    /// ISO C 1999.
-    case iso9899_1999 = "iso9899:1999"
-
-    /// ISO C 1999 with GNU extensions.
-    case gnu99
-
     /// ISO C 2011.
     case c11
 
-    /// ISO C 2011.
-    case iso9899_2011 = "iso9899:2011"
-
-    /// ISO C 2011 with GNU extensions.
-    case gnu11
-
     /// ISO C 2017.
     @available(_PackageDescription, introduced: 999.0)
     case c17
 
-    /// ISO C 2017.
-    @available(_PackageDescription, introduced: 999.0)
-    case iso9899_2017 = "iso9899:2017"
-
     /// ISO C 2017.
     @available(_PackageDescription, introduced: 999.0)
     case c18
 
-    /// ISO C 2017.
+    /// Working Draft for ISO C2x.
     @available(_PackageDescription, introduced: 999.0)
-    case iso9899_2018 = "iso9899:2018"
+    case c2x
+
+    /// ISO C 1990 with GNU extensions.
+    case gnu89
+
+    /// ISO C 1990 with GNU extensions.
+    case gnu90
+
+    /// ISO C 1999 with GNU extensions.
+    case gnu99
+
+    /// ISO C 2011 with GNU extensions.
+    case gnu11
 
     /// ISO C 2017 with GNU extensions.
     @available(_PackageDescription, introduced: 999.0)
@@ -71,13 +55,29 @@ public enum CLanguageStandard: String, Encodable {
     @available(_PackageDescription, introduced: 999.0)
     case gnu18
 
-    /// Working Draft for ISO C2x.
-    @available(_PackageDescription, introduced: 999.0)
-    case c2x
-
     /// Working Draft for ISO C2x with GNU extensions.
     @available(_PackageDescription, introduced: 999.0)
     case gnu2x
+
+    /// ISO C 1990.
+    case iso9899_1990 = "iso9899:1990"
+
+    /// ISO C 1990 with amendment 1.
+    case iso9899_199409 = "iso9899:199409"
+
+    /// ISO C 1999.
+    case iso9899_1999 = "iso9899:1999"
+
+    /// ISO C 2011.
+    case iso9899_2011 = "iso9899:2011"
+
+    /// ISO C 2017.
+    @available(_PackageDescription, introduced: 999.0)
+    case iso9899_2017 = "iso9899:2017"
+
+    /// ISO C 2017.
+    @available(_PackageDescription, introduced: 999.0)
+    case iso9899_2018 = "iso9899:2018"
 }
 
 /// The supported C++ language standards to use for compiling C++ sources in the package.
@@ -89,43 +89,43 @@ public enum CXXLanguageStandard: String, Encodable {
     /// ISO C++ 1998 with amendments.
     case cxx03 = "c++03"
 
-    /// ISO C++ 1998 with amendments and GNU extensions.
-    case gnucxx98 = "gnu++98"
-
-    /// ISO C++ 1998 with amendments and GNU extensions.
-    case gnucxx03 = "gnu++03"
-
     /// ISO C++ 2011 with amendments.
     case cxx11 = "c++11"
 
-    /// ISO C++ 2011 with amendments and GNU extensions.
-    case gnucxx11 = "gnu++11"
-
     /// ISO C++ 2014 with amendments.
     case cxx14 = "c++14"
 
-    /// ISO C++ 2014 with amendments and GNU extensions.
-    case gnucxx14 = "gnu++14"
+    /// ISO C++ 2017 with amendments.
+    @available(_PackageDescription, introduced: 999.0)
+    case cxx17 = "c++17"
 
     /// ISO C++ 2017 with amendments.
     @available(_PackageDescription, introduced: 4, deprecated: 999.0, renamed: "cxx17")
     case cxx1z = "c++1z"
 
-    /// ISO C++ 2017 with amendments and GNU extensions.
-    @available(_PackageDescription, introduced: 4, deprecated: 999.0, renamed: "gnucxx17")
-    case gnucxx1z = "gnu++1z"
-
-    /// ISO C++ 2017 with amendments.
+    /// ISO C++ 2020 DIS.
     @available(_PackageDescription, introduced: 999.0)
-    case cxx17 = "c++17"
+    case cxx20 = "c++20"
+
+    /// ISO C++ 1998 with amendments and GNU extensions.
+    case gnucxx98 = "gnu++98"
+
+    /// ISO C++ 1998 with amendments and GNU extensions.
+    case gnucxx03 = "gnu++03"
+
+    /// ISO C++ 2011 with amendments and GNU extensions.
+    case gnucxx11 = "gnu++11"
+
+    /// ISO C++ 2014 with amendments and GNU extensions.
+    case gnucxx14 = "gnu++14"
 
     /// ISO C++ 2017 with amendments and GNU extensions.
     @available(_PackageDescription, introduced: 999.0)
     case gnucxx17 = "gnu++17"
 
-    /// ISO C++ 2020 DIS.
-    @available(_PackageDescription, introduced: 999.0)
-    case cxx20 = "c++20"
+    /// ISO C++ 2017 with amendments and GNU extensions.
+    @available(_PackageDescription, introduced: 4, deprecated: 999.0, renamed: "gnucxx17")
+    case gnucxx1z = "gnu++1z"
 
     /// ISO C++ 2020 DIS with GNU extensions.
     @available(_PackageDescription, introduced: 999.0)