Skip to content

Adding JavaScript Preprocessor Support #10967

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
May 24, 2025
Merged

Adding JavaScript Preprocessor Support #10967

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion Cabal-syntax/src/Distribution/CabalSpecVersion.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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"
Expand All @@ -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
Expand All @@ -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]
Expand Down
2 changes: 2 additions & 0 deletions Cabal-syntax/src/Distribution/PackageDescription/FieldGrammar.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -621,6 +621,8 @@ buildInfoFieldGrammar =
<*> monoidalFieldAla "cc-options" (alaList' NoCommaFSep Token') L.ccOptions
<*> monoidalFieldAla "cxx-options" (alaList' NoCommaFSep Token') L.cxxOptions
^^^ availableSince CabalSpecV2_2 []
<*> monoidalFieldAla "jspp-options" (alaList' NoCommaFSep Token') L.jsppOptions
^^^ availableSince CabalSpecV3_16 []
<*> monoidalFieldAla "ld-options" (alaList' NoCommaFSep Token') L.ldOptions
<*> monoidalFieldAla "hsc2hs-options" (alaList' NoCommaFSep Token') L.hsc2hsOptions
^^^ availableSince CabalSpecV3_6 []
Expand Down
4 changes: 4 additions & 0 deletions Cabal-syntax/src/Distribution/Types/BuildInfo.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,8 @@ data BuildInfo = BuildInfo
-- ^ options for C compiler
, cxxOptions :: [String]
-- ^ options for C++ compiler
, jsppOptions :: [String]
-- ^ options for pre-processing JavaScript code @since 3.16.0.0
, ldOptions :: [String]
-- ^ options for linker
, hsc2hsOptions :: [String]
Expand Down Expand Up @@ -161,6 +163,7 @@ instance Monoid BuildInfo where
, cmmOptions = []
, ccOptions = []
, cxxOptions = []
, jsppOptions = []
, ldOptions = []
, hsc2hsOptions = []
, pkgconfigDepends = []
Expand Down Expand Up @@ -214,6 +217,7 @@ instance Semigroup BuildInfo where
, cmmOptions = combine cmmOptions
, ccOptions = combine ccOptions
, cxxOptions = combine cxxOptions
, jsppOptions = combine jsppOptions
, ldOptions = combine ldOptions
, hsc2hsOptions = combine hsc2hsOptions
, pkgconfigDepends = combine pkgconfigDepends
Expand Down
7 changes: 7 additions & 0 deletions Cabal-syntax/src/Distribution/Types/BuildInfo/Lens.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,10 @@ class HasBuildInfo a where
cxxOptions = buildInfo . cxxOptions
{-# INLINE cxxOptions #-}

jsppOptions :: Lens' a [String]
jsppOptions = buildInfo . jsppOptions
{-# INLINE jsppOptions #-}

ldOptions :: Lens' a [String]
ldOptions = buildInfo . ldOptions
{-# INLINE ldOptions #-}
Expand Down Expand Up @@ -243,6 +247,9 @@ instance HasBuildInfo BuildInfo where
cxxOptions f s = fmap (\x -> s{T.cxxOptions = x}) (f (T.cxxOptions s))
{-# INLINE cxxOptions #-}

jsppOptions f s = fmap (\x -> s{T.jsppOptions = x}) (f (T.jsppOptions s))
{-# INLINE jsppOptions #-}

ldOptions f s = fmap (\x -> s{T.ldOptions = x}) (f (T.ldOptions s))
{-# INLINE ldOptions #-}

Expand Down
3 changes: 3 additions & 0 deletions Cabal-tests/tests/ParserTests/regressions/Octree-0.5.expr
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,7 @@ GenericPackageDescription {
buildTools = [],
buildToolDepends = [],
cppOptions = [],
jsppOptions = [],
asmOptions = [],
cmmOptions = [],
ccOptions = [],
Expand Down Expand Up @@ -198,6 +199,7 @@ GenericPackageDescription {
buildTools = [],
buildToolDepends = [],
cppOptions = [],
jsppOptions = [],
asmOptions = [],
cmmOptions = [],
ccOptions = [],
Expand Down Expand Up @@ -301,6 +303,7 @@ GenericPackageDescription {
buildTools = [],
buildToolDepends = [],
cppOptions = [],
jsppOptions = [],
asmOptions = [],
cmmOptions = [],
ccOptions = [],
Expand Down
1 change: 1 addition & 0 deletions Cabal-tests/tests/ParserTests/regressions/anynone.expr
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@ GenericPackageDescription {
buildTools = [],
buildToolDepends = [],
cppOptions = [],
jsppOptions = [],
asmOptions = [],
cmmOptions = [],
ccOptions = [],
Expand Down
1 change: 1 addition & 0 deletions Cabal-tests/tests/ParserTests/regressions/big-version.expr
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@ GenericPackageDescription {
buildTools = [],
buildToolDepends = [],
cppOptions = [],
jsppOptions = [],
asmOptions = [],
cmmOptions = [],
ccOptions = [],
Expand Down
8 changes: 8 additions & 0 deletions Cabal-tests/tests/ParserTests/regressions/common-conditional.expr
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,7 @@ GenericPackageDescription {
buildTools = [],
buildToolDepends = [],
cppOptions = [],
jsppOptions = [],
asmOptions = [],
cmmOptions = [],
ccOptions = [],
Expand Down Expand Up @@ -147,6 +148,7 @@ GenericPackageDescription {
buildTools = [],
buildToolDepends = [],
cppOptions = [],
jsppOptions = [],
asmOptions = [],
cmmOptions = [],
ccOptions = [],
Expand Down Expand Up @@ -240,6 +242,7 @@ GenericPackageDescription {
buildTools = [],
buildToolDepends = [],
cppOptions = [],
jsppOptions = [],
asmOptions = [],
cmmOptions = [],
ccOptions = [],
Expand Down Expand Up @@ -320,6 +323,7 @@ GenericPackageDescription {
buildTools = [],
buildToolDepends = [],
cppOptions = [],
jsppOptions = [],
asmOptions = [],
cmmOptions = [],
ccOptions = [],
Expand Down Expand Up @@ -398,6 +402,7 @@ GenericPackageDescription {
buildTools = [],
buildToolDepends = [],
cppOptions = [],
jsppOptions = [],
asmOptions = [],
cmmOptions = [],
ccOptions = [],
Expand Down Expand Up @@ -469,6 +474,7 @@ GenericPackageDescription {
buildTools = [],
buildToolDepends = [],
cppOptions = [],
jsppOptions = [],
asmOptions = [],
cmmOptions = [],
ccOptions = [],
Expand Down Expand Up @@ -563,6 +569,7 @@ GenericPackageDescription {
buildTools = [],
buildToolDepends = [],
cppOptions = [],
jsppOptions = [],
asmOptions = [],
cmmOptions = [],
ccOptions = [],
Expand Down Expand Up @@ -642,6 +649,7 @@ GenericPackageDescription {
buildTools = [],
buildToolDepends = [],
cppOptions = [],
jsppOptions = [],
asmOptions = [],
cmmOptions = [],
ccOptions = [],
Expand Down
2 changes: 2 additions & 0 deletions Cabal-tests/tests/ParserTests/regressions/common.expr
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,7 @@ GenericPackageDescription {
buildTools = [],
buildToolDepends = [],
cppOptions = [],
jsppOptions = [],
asmOptions = [],
cmmOptions = [],
ccOptions = [],
Expand Down Expand Up @@ -146,6 +147,7 @@ GenericPackageDescription {
buildTools = [],
buildToolDepends = [],
cppOptions = [],
jsppOptions = [],
asmOptions = [],
cmmOptions = [],
ccOptions = [],
Expand Down
8 changes: 8 additions & 0 deletions Cabal-tests/tests/ParserTests/regressions/common2.expr
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,7 @@ GenericPackageDescription {
buildTools = [],
buildToolDepends = [],
cppOptions = [],
jsppOptions = [],
asmOptions = [],
cmmOptions = [],
ccOptions = [],
Expand Down Expand Up @@ -165,6 +166,7 @@ GenericPackageDescription {
buildTools = [],
buildToolDepends = [],
cppOptions = [],
jsppOptions = [],
asmOptions = [],
cmmOptions = [],
ccOptions = [],
Expand Down Expand Up @@ -246,6 +248,7 @@ GenericPackageDescription {
buildTools = [],
buildToolDepends = [],
cppOptions = [],
jsppOptions = [],
asmOptions = [],
cmmOptions = [],
ccOptions = [],
Expand Down Expand Up @@ -350,6 +353,7 @@ GenericPackageDescription {
buildTools = [],
buildToolDepends = [],
cppOptions = [],
jsppOptions = [],
asmOptions = [],
cmmOptions = [],
ccOptions = [],
Expand Down Expand Up @@ -428,6 +432,7 @@ GenericPackageDescription {
buildTools = [],
buildToolDepends = [],
cppOptions = [],
jsppOptions = [],
asmOptions = [],
cmmOptions = [],
ccOptions = [],
Expand Down Expand Up @@ -530,6 +535,7 @@ GenericPackageDescription {
buildTools = [],
buildToolDepends = [],
cppOptions = [],
jsppOptions = [],
asmOptions = [],
cmmOptions = [],
ccOptions = [],
Expand Down Expand Up @@ -609,6 +615,7 @@ GenericPackageDescription {
buildTools = [],
buildToolDepends = [],
cppOptions = [],
jsppOptions = [],
asmOptions = [],
cmmOptions = [],
ccOptions = [],
Expand Down Expand Up @@ -688,6 +695,7 @@ GenericPackageDescription {
buildTools = [],
buildToolDepends = [],
cppOptions = [],
jsppOptions = [],
asmOptions = [],
cmmOptions = [],
ccOptions = [],
Expand Down
2 changes: 2 additions & 0 deletions Cabal-tests/tests/ParserTests/regressions/common3.expr
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,7 @@ GenericPackageDescription {
buildTools = [],
buildToolDepends = [],
cppOptions = [],
jsppOptions = [],
asmOptions = [],
cmmOptions = [],
ccOptions = [],
Expand Down Expand Up @@ -146,6 +147,7 @@ GenericPackageDescription {
buildTools = [],
buildToolDepends = [],
cppOptions = [],
jsppOptions = [],
asmOptions = [],
cmmOptions = [],
ccOptions = [],
Expand Down
2 changes: 2 additions & 0 deletions Cabal-tests/tests/ParserTests/regressions/elif.expr
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,7 @@ GenericPackageDescription {
buildTools = [],
buildToolDepends = [],
cppOptions = [],
jsppOptions = [],
asmOptions = [],
cmmOptions = [],
ccOptions = [],
Expand Down Expand Up @@ -132,6 +133,7 @@ GenericPackageDescription {
buildTools = [],
buildToolDepends = [],
cppOptions = [],
jsppOptions = [],
asmOptions = [],
cmmOptions = [],
ccOptions = [],
Expand Down
5 changes: 5 additions & 0 deletions Cabal-tests/tests/ParserTests/regressions/elif2.expr
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,7 @@ GenericPackageDescription {
buildTools = [],
buildToolDepends = [],
cppOptions = [],
jsppOptions = [],
asmOptions = [],
cmmOptions = [],
ccOptions = [],
Expand Down Expand Up @@ -132,6 +133,7 @@ GenericPackageDescription {
buildTools = [],
buildToolDepends = [],
cppOptions = [],
jsppOptions = [],
asmOptions = [],
cmmOptions = [],
ccOptions = [],
Expand Down Expand Up @@ -207,6 +209,7 @@ GenericPackageDescription {
buildTools = [],
buildToolDepends = [],
cppOptions = [],
jsppOptions = [],
asmOptions = [],
cmmOptions = [],
ccOptions = [],
Expand Down Expand Up @@ -276,6 +279,7 @@ GenericPackageDescription {
buildTools = [],
buildToolDepends = [],
cppOptions = [],
jsppOptions = [],
asmOptions = [],
cmmOptions = [],
ccOptions = [],
Expand Down Expand Up @@ -351,6 +355,7 @@ GenericPackageDescription {
buildTools = [],
buildToolDepends = [],
cppOptions = [],
jsppOptions = [],
asmOptions = [],
cmmOptions = [],
ccOptions = [],
Expand Down
1 change: 1 addition & 0 deletions Cabal-tests/tests/ParserTests/regressions/encoding-0.8.expr
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,7 @@ GenericPackageDescription {
buildTools = [],
buildToolDepends = [],
cppOptions = [],
jsppOptions = [],
asmOptions = [],
cmmOptions = [],
ccOptions = [],
Expand Down
Loading
Loading