renaming and fix formating staff

zlonast · zlonast · commit fc3f3f6a4b06 · 2025-05-20T16:22:21.000+03:00
diff --git a/Cabal-syntax/src/Distribution/CabalSpecVersion.hs b/Cabal-syntax/src/Distribution/CabalSpecVersion.hs
@@ -35,6 +35,7 @@ data CabalSpecVersion
   | -- 3.10: no changes
     CabalSpecV3_12
   | CabalSpecV3_14
+  | CabalSpecV3_16
   deriving (Eq, Ord, Show, Read, Enum, Bounded, Data, Generic)
 
 instance Binary CabalSpecVersion
@@ -45,6 +46,7 @@ instance NFData CabalSpecVersion where rnf = genericRnf
 --
 -- @since 3.0.0.0
 showCabalSpecVersion :: CabalSpecVersion -> String
+showCabalSpecVersion CabalSpecV3_16 = "3.16"
 showCabalSpecVersion CabalSpecV3_14 = "3.14"
 showCabalSpecVersion CabalSpecV3_12 = "3.12"
 showCabalSpecVersion CabalSpecV3_8 = "3.8"
@@ -67,13 +69,14 @@ showCabalSpecVersion CabalSpecV1_2 = "1.2"
 showCabalSpecVersion CabalSpecV1_0 = "1.0"
 
 cabalSpecLatest :: CabalSpecVersion
-cabalSpecLatest = CabalSpecV3_14
+cabalSpecLatest = CabalSpecV3_16
 
 -- | Parse 'CabalSpecVersion' from version digits.
 --
 -- It may fail if for recent versions the version is not exact.
 cabalSpecFromVersionDigits :: [Int] -> Maybe CabalSpecVersion
 cabalSpecFromVersionDigits v
+  | v == [3, 16] = Just CabalSpecV3_16
   | v == [3, 14] = Just CabalSpecV3_14
   | v == [3, 12] = Just CabalSpecV3_12
   | v == [3, 8] = Just CabalSpecV3_8
@@ -98,6 +101,7 @@ cabalSpecFromVersionDigits v
 
 -- | @since 3.4.0.0
 cabalSpecToVersionDigits :: CabalSpecVersion -> [Int]
+cabalSpecToVersionDigits CabalSpecV3_16 = [3, 16]
 cabalSpecToVersionDigits CabalSpecV3_14 = [3, 14]
 cabalSpecToVersionDigits CabalSpecV3_12 = [3, 12]
 cabalSpecToVersionDigits CabalSpecV3_8 = [3, 8]
diff --git a/Cabal-syntax/src/Distribution/PackageDescription/FieldGrammar.hs b/Cabal-syntax/src/Distribution/PackageDescription/FieldGrammar.hs
@@ -621,8 +621,8 @@ buildInfoFieldGrammar =
     <*> monoidalFieldAla "cc-options" (alaList' NoCommaFSep Token') L.ccOptions
     <*> monoidalFieldAla "cxx-options" (alaList' NoCommaFSep Token') L.cxxOptions
       ^^^ availableSince CabalSpecV2_2 []
-    <*> monoidalFieldAla "jsp-options" (alaList' NoCommaFSep Token') L.jspOptions
-      ^^^ availableSince CabalSpecV3_14 []
+    <*> monoidalFieldAla "jspp-options" (alaList' NoCommaFSep Token') L.jspOptions
+      ^^^ availableSince CabalSpecV3_16 []
     <*> monoidalFieldAla "ld-options" (alaList' NoCommaFSep Token') L.ldOptions
     <*> monoidalFieldAla "hsc2hs-options" (alaList' NoCommaFSep Token') L.hsc2hsOptions
       ^^^ availableSince CabalSpecV3_6 []
diff --git a/Cabal-syntax/src/Distribution/Types/BuildInfo.hs b/Cabal-syntax/src/Distribution/Types/BuildInfo.hs
@@ -62,7 +62,7 @@ data BuildInfo = BuildInfo
   , cxxOptions :: [String]
   -- ^ options for C++ compiler
   , jspOptions :: [String]
-  -- ^ options for pre-processing JavaScript code
+  -- ^ options for pre-processing JavaScript code @since 3.16.0.0
   , ldOptions :: [String]
   -- ^ options for linker
   , hsc2hsOptions :: [String]
diff --git a/Cabal-tests/tests/UnitTests/Distribution/Utils/Structured.hs b/Cabal-tests/tests/UnitTests/Distribution/Utils/Structured.hs
@@ -29,8 +29,8 @@ md5Check proxy md5Int = structureHash proxy @?= md5FromInteger md5Int
 
 md5CheckGenericPackageDescription :: Proxy GenericPackageDescription -> Assertion
 md5CheckGenericPackageDescription proxy = md5Check proxy
-    0xe95038393adbd46b119188757a3a2b63
+    0x42685b0be2909b20bfcd2f32c503ec7b
 
 md5CheckLocalBuildInfo :: Proxy LocalBuildInfo -> Assertion
 md5CheckLocalBuildInfo proxy = md5Check proxy
-    0x364f8e404df9ada84ea3b4e3b3084a10
+    0x3d5f7afb3f2f9d8a8ea0e9487a74a006
diff --git a/Cabal/src/Distribution/PackageDescription/Check/Target.hs b/Cabal/src/Distribution/PackageDescription/Check/Target.hs
@@ -907,7 +907,7 @@ checkGHCOptions title t opts = do
         )
       checkAlternatives
         title
-        "jsp-options"
+        "jspp-options"
         ( [(flag, flag) | flag@('-' : 'D' : _) <- ghcNoRts]
             ++ [(flag, flag) | flag@('-' : 'U' : _) <- ghcNoRts]
         )
@@ -1107,7 +1107,7 @@ checkJSPOptions
   -> CheckM m ()
 checkJSPOptions opts = do
   checkAlternatives
-    "jsp-options"
+    "jspp-options"
     "include-dirs"
     [(flag, dir) | flag@('-' : 'I' : dir) <- opts]
   mapM_
@@ -1117,4 +1117,3 @@ checkJSPOptions opts = do
           (PackageBuildWarning (OptJSP opt))
     )
     opts
-
diff --git a/Cabal/src/Distribution/PackageDescription/Check/Warning.hs b/Cabal/src/Distribution/PackageDescription/Check/Warning.hs
@@ -680,7 +680,7 @@ ppCheckExplanationId CIOptRts = "option-rtsopts"
 ppCheckExplanationId CIOptWithRts = "option-with-rtsopts"
 ppCheckExplanationId CICOptONumber = "option-opt-c"
 ppCheckExplanationId CICOptCPP = "cpp-options"
-ppCheckExplanationId CIOptJSP = "jsp-options"
+ppCheckExplanationId CIOptJSP = "jspp-options"
 ppCheckExplanationId CIOptAlternatives = "misplaced-c-opt"
 ppCheckExplanationId CIRelativeOutside = "relative-path-outside"
 ppCheckExplanationId CIAbsolutePath = "absolute-path"
@@ -1091,7 +1091,7 @@ ppExplanation (COptONumber prefix label) =
 ppExplanation (COptCPP opt) =
   "'cpp-options: " ++ opt ++ "' is not a portable C-preprocessor flag."
 ppExplanation (OptJSP opt) =
-  "'jsp-options: " ++ opt ++ "' is not a portable C-preprocessor flag."
+  "'jspp-options: " ++ opt ++ "' not a portable JavaScript-preprocessor flag."
 ppExplanation (OptAlternatives badField goodField flags) =
   "Instead of "
     ++ quote (badField ++ ": " ++ unwords badFlags)
diff --git a/cabal-testsuite/PackageTests/Check/ConfiguredPackage/JSPOptions/JSPNotPortable/cabal.out b/cabal-testsuite/PackageTests/Check/ConfiguredPackage/JSPOptions/JSPNotPortable/cabal.out
@@ -1,4 +1,4 @@
 # cabal check
 The following errors are likely to affect your build negatively:
-Error: [jsp-options] 'jsp-options: -Q' is not a portable C-preprocessor flag.
+Error: [jspp-options] 'jspp-options: -Q' is not a portable C-preprocessor flag.
 Error: Hackage would reject this package.
diff --git a/cabal-testsuite/PackageTests/Check/ConfiguredPackage/JSPOptions/JSPNotPortable/cabal.test.hs b/cabal-testsuite/PackageTests/Check/ConfiguredPackage/JSPOptions/JSPNotPortable/cabal.test.hs
@@ -1,5 +1,5 @@
 import Test.Cabal.Prelude
 
--- `jsp-options`, do not use use non portable flags.
+-- `jspp-options`, do not use use non portable flags.
 main = cabalTest $
   fails $ cabal "check" []
diff --git a/cabal-testsuite/PackageTests/Check/ConfiguredPackage/JSPOptions/JSPNotPortable/pkg.cabal b/cabal-testsuite/PackageTests/Check/ConfiguredPackage/JSPOptions/JSPNotPortable/pkg.cabal
@@ -11,4 +11,4 @@ library
   exposed-modules: Module
   default-language: Haskell2010
   if arch(JavaScript)
-    jsp-options: -Q
+    jspp-options: -Q
diff --git a/cabal-testsuite/PackageTests/JS/JSPOptions/jsjspoptions.cabal b/cabal-testsuite/PackageTests/JS/JSPOptions/jsjspoptions.cabal
@@ -7,7 +7,7 @@ library
   default-language: Haskell2010
   js-sources: jsbits/lib.js
   if arch(JavaScript)
-    jsp-options: -DPRINT_DEF
+    jspp-options: -DPRINT_DEF
   hs-source-dirs: src
   exposed-modules: Lib
   build-depends: base
diff --git a/doc/buildinfo-fields-reference.rst b/doc/buildinfo-fields-reference.rst
@@ -256,16 +256,16 @@ cmm-sources
     .. math::
         \mathrm{commalist}\left\{ \mathop{\mathit{hs\text{-}string}}\mid{{[\mathop{\mathord{``}\mathtt{\ }\mathord{"}}\mathop{\mathord{``}\mathtt{\text{,}}\mathord{"}}]^c}}^+_{} \right\}
 
-jsp-options
+cpp-options
     * Monoidal field
-    * Documentation of :pkg-field:`library:jsp-options`
+    * Documentation of :pkg-field:`library:cpp-options`
 
     .. math::
         {\left\{ \mathop{\mathit{hs\text{-}string}}\mid{{[\mathop{\mathord{``}\mathtt{\ }\mathord{"}}]^c}}^+_{} \right\}}^\ast_{\bullet}
 
-cpp-options
+jspp-options
     * Monoidal field
-    * Documentation of :pkg-field:`library:cpp-options`
+    * Documentation of :pkg-field:`library:jspp-options`
 
     .. math::
         {\left\{ \mathop{\mathit{hs\text{-}string}}\mid{{[\mathop{\mathord{``}\mathtt{\ }\mathord{"}}]^c}}^+_{} \right\}}^\ast_{\bullet}
diff --git a/doc/cabal-commands.rst b/doc/cabal-commands.rst
@@ -1405,7 +1405,7 @@ A list of all warnings with their constructor:
 - ``option-with-rtsopts``: unnecessary ``-with-rtsopts``.
 - ``option-opt-c``: unnecessary ``-O[n]`` in C code.
 - ``cpp-options``: unportable ``-cpp-options`` flag.
-- ``jsp-options``: unportable ``-jsp-options`` flag.
+- ``jspp-options``: unportable ``-jspp-options`` flag.
 - ``misplaced-c-opt``: C-like options in wrong cabal field.
 - ``relative-path-outside``: relative path outside of source tree.
 - ``absolute-path``: absolute path where not allowed.
diff --git a/doc/cabal-package-description-file.rst b/doc/cabal-package-description-file.rst
@@ -1992,7 +1992,7 @@ system-dependent values for these fields.
     arguments are compiler-dependent, this field is more useful with the
     setup described in the section on `system-dependent parameters`_.
 
-.. pkg-field:: jsp-options: token list
+.. pkg-field:: jspp-options: token list
 
     Command-line arguments for pre-processing Haskell code. Applies to
     Haskell source and other pre-processed Haskell source like .js.
diff --git a/editors/vim/syntax/cabal.vim b/editors/vim/syntax/cabal.vim
@@ -65,7 +65,7 @@ syn keyword cabalFieldName contained
   \ cmm-options
   \ cmm-sources
   \ copyright
-  \ jsp-options
+  \ jspp-options
   \ cpp-options
   \ cxx-options
   \ cxx-sources
