forked from haskell/cabal
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Parse custom-setup. Fixes haskell#4697 - Rename PPP to FieldGrammar. Flatten D.PackageDescription namespace - Add booleanFieldDef, flagFieldGrammar - Correct FreeText parsec - WIP: FieldGrammar BuildInfo and Library - More newtypes - Unknown and deprecated fields - NoCommaFSep - extra-libraries - Parse 'else' - WIP - More BuildInfo opts - ReadP parses 'location:\n' as location = Just "" - Known fields - monoidalField - ^^^ operator - RFC: Add elif - Make FieldGrammar into a type class - Parse sublibraries with FieldGrammar - Use prettyFieldGrammar for library sections - executableFieldGrammar - ForeignLib grammar - PackageDescription grammar - Remove unused imports - shake regression - Update extra-source-files - TestSuite & Benchmark grammars - Change readp license-files setter - Add hiddenField - Add GPD parse . pretty roundtrip tests. Fixes haskell#4719 - Roundtrip hackage tests - Roundtrip fixes - More pretty-printing fixes - More pp fixes
- Loading branch information
Showing
77 changed files
with
3,521 additions
and
1,983 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,141 @@ | ||
| {-# LANGUAGE DeriveFunctor #-} | ||
| {-# LANGUAGE FlexibleContexts #-} | ||
| {-# LANGUAGE FlexibleInstances #-} | ||
| {-# LANGUAGE OverloadedStrings #-} | ||
| {-# LANGUAGE ScopedTypeVariables #-} | ||
| -- | This module provides one way to specify 'FieldGrammar', | ||
| -- to parse lists of 'Field' and pretty print the structures. | ||
| -- | ||
| -- Fields can be specified multiple times in the .cabal files. | ||
| -- The order of such entries is important, but the mutual ordering of different | ||
| -- fields is non important. (The only exception is @hs-source-dirs@ and | ||
| -- @hs-source-dir@, but it can be fixed with preprocessing). | ||
| -- | ||
| -- Also conditional sections are considered after non-conditional data. | ||
| -- The example of this silent-commutation quirck is the fact that | ||
| -- | ||
| -- @ | ||
| -- buildable: True | ||
| -- if os(linux) | ||
| -- buildable: False | ||
| -- @ | ||
| -- | ||
| -- and | ||
| -- | ||
| -- @ | ||
| -- if os(linux) | ||
| -- buildable: False | ||
| -- buildable: True | ||
| -- @ | ||
| -- | ||
| -- behave the same! This is the limitation of 'GeneralPackageDescription' | ||
| -- structure. | ||
| -- | ||
| -- So we transform the list of fields @['Field' ann]@ into | ||
| -- a map of grouped ordinary fields and a list of lists of sections: | ||
| -- @'Fields' ann = 'Map' 'FieldName' ['NamelessField' ann]@ and @[['Section' ann]]@. | ||
| -- | ||
| -- We need list of list of sections, because we need to distinguish situations | ||
| -- where there are fields in between. For example | ||
| -- | ||
| -- @ | ||
| -- if flag(bytestring-lt-0_10_4) | ||
| -- build-depends: bytestring < 0.10.4 | ||
| -- | ||
| -- default-language: Haskell2020 | ||
| -- | ||
| -- else | ||
| -- build-depends: bytestring >= 0.10.4 | ||
| -- | ||
| -- @ | ||
| -- | ||
| -- is obviously invalid specification. | ||
| -- | ||
| -- We can parse 'Fields' like we parse @aeson@ objects, yet we use | ||
| -- slighly higher-level API, so we can process unspecified fields, | ||
| -- to report unknown fields and save custom @x-fields@. | ||
| -- | ||
| module Distribution.FieldGrammar ( | ||
| -- * Field grammar type | ||
| FieldGrammar (..), | ||
| uniqueField, | ||
| optionalField, | ||
| optionalFieldDef, | ||
| optionalFieldDefAla, | ||
| monoidalField, | ||
| deprecatedField', | ||
| -- * Concrete grammar implementations | ||
| ParsecFieldGrammar, | ||
| ParsecFieldGrammar', | ||
| parseFieldGrammar, | ||
| fieldGrammarKnownFieldList, | ||
| PrettyFieldGrammar, | ||
| PrettyFieldGrammar', | ||
| prettyFieldGrammar, | ||
| -- * Auxlilary | ||
| (^^^), | ||
| Section(..), | ||
| partitionFields, | ||
| takeFields, | ||
| ) where | ||
|
|
||
| import Distribution.Compat.Prelude | ||
| import Prelude () | ||
|
|
||
| import qualified Distribution.Compat.Map.Strict as Map | ||
|
|
||
| import Distribution.FieldGrammar.Class | ||
| import Distribution.FieldGrammar.Parsec | ||
| import Distribution.FieldGrammar.Pretty | ||
| import Distribution.Parsec.Field | ||
|
|
||
| type ParsecFieldGrammar' a = ParsecFieldGrammar a a | ||
| type PrettyFieldGrammar' a = PrettyFieldGrammar a a | ||
|
|
||
| infixl 5 ^^^ | ||
|
|
||
| -- | Reverse function application which binds tighter than '<$>' and '<*>'. | ||
| -- Useful for refining grammar specification. | ||
| -- | ||
| -- @ | ||
| -- \<*\> 'monoidalFieldAla' "extensions" (alaList' FSep MQuoted) oldExtensions | ||
| -- ^^^ 'deprecatedSince' [1,12] "Please use 'default-extensions' or 'other-extensions' fields." | ||
| -- @ | ||
| (^^^) :: a -> (a -> b) -> b | ||
| x ^^^ f = f x | ||
|
|
||
| -- | Partitionin state | ||
| data PS ann = PS (Fields ann) [Section ann] [[Section ann]] | ||
|
|
||
| -- | Partition field list into field map and groups of sections. | ||
| partitionFields :: [Field ann] -> (Fields ann, [[Section ann]]) | ||
| partitionFields = finalize . foldl' f (PS mempty mempty mempty) | ||
| where | ||
| finalize :: PS ann -> (Fields ann, [[Section ann]]) | ||
| finalize (PS fs s ss) | ||
| | null s = (fs, reverse ss) | ||
| | otherwise = (fs, reverse (reverse s : ss)) | ||
|
|
||
| f :: PS ann -> Field ann -> PS ann | ||
| f (PS fs s ss) (Field (Name ann name) fss) = | ||
| PS (Map.insertWith (flip (++)) name [MkNamelessField ann fss] fs) [] ss' | ||
| where | ||
| ss' | null s = ss | ||
| | otherwise = reverse s : ss | ||
| f (PS fs s ss) (Section name sargs sfields) = | ||
| PS fs (MkSection name sargs sfields : s) ss | ||
|
|
||
| -- | Take all fields from the front. | ||
| takeFields :: [Field ann] -> (Fields ann, [Field ann]) | ||
| takeFields = finalize . spanMaybe match | ||
| where | ||
| finalize (fs, rest) = (Map.fromListWith (flip (++)) fs, rest) | ||
|
|
||
| match (Field (Name ann name) fs) = Just (name, [MkNamelessField ann fs]) | ||
| match _ = Nothing | ||
|
|
||
| spanMaybe :: (a -> Maybe b) -> [a] -> ([b],[a]) | ||
| spanMaybe _ xs@[] = ([], xs) | ||
| spanMaybe p xs@(x:xs') = case p x of | ||
| Just y -> let (ys, zs) = spanMaybe p xs' in (y : ys, zs) | ||
| Nothing -> ([], xs) |
Oops, something went wrong.