git.iko.soy/typeable/xsd-isogen
on master help sign in
Merge pull request #7 from ilyakooo0/patch-2

Removed commas from ghc-options

commite9060c39c1306409d43ed91d62be54119c303938 authorDenis Redozubov <denis.redozubov@gmail.com> dateMon 3 Feb 2020, 15:37 (7 years ago) parent5d9a65168841eb
2 files changed+14−16
src/Main.hs+4−6 xsd-isogen.cabal+10−10
src/Main.hs+4−6
@@ -22,7 +22,6 @@ import Data.Text as T
2222import Data.Text.IO as T
2323import Data.Traversable
2424import Debug.Trace
25−import System.Environment
2625import System.IO
2726import Text.XSD
2827import Options
@@ -240,12 +239,12 @@ runGen :: DatatypeMap -> GenMonad a -> Text
240239runGen dm act = execWriter $ runReaderT act dm
241240
242241generateIsoXml :: Maybe Header -> ModuleName -> GenType -> XSD -> Text
243−generateIsoXml mHeader name genType xsd@(XSD (e,dm)) =
242+generateIsoXml mHeader name genType (XSD (e,dm)) =
244243 let
245244 (dList, el) = untwistDeps e dm
246245 in (header mHeader name genType <>) . runGen dm $ do
247− for_ dList $ \(t,dt) -> do
248− generateIsoDatatype genType (Just t) dt []
246+ for_ dList $ \(t,dt) ->
247+ generateIsoDatatype genType t dt []
249248 for_ el (generateIsoRecord genType)
250249
251250toQualifier :: Int -> Int -> Text
@@ -330,7 +329,7 @@ generateIsoDatatype
330329 genType
331330 eName
332331 (TypeComplex (ComplexType _ _ tyAnnotations mGroupSchema))
333− annotationsRec = do
332+ annotationsRec =
334333 case mGroupSchema of
335334 Just groupSchema -> case groupSchema of
336335 CTSequence elements -> do
@@ -352,7 +351,6 @@ generateIsoDatatype
352351 eName
353352 (TypeSimple ty@(STAtomic iName sat tyAnnotations restrictions))
354353 annotationsRec = do
355− let eName = eName
356354 let
357355 comment =
358356 toComment Haddock $ annotationsRec
xsd-isogen.cabal+10−10
@@ -35,16 +35,16 @@ executable xsd-isogen
3535 hs-source-dirs: src
3636 default-language: Haskell2010
3737 ghc-options: -fwarn-unused-binds
38− , -fwarn-unused-imports
39− , -Wall
40− , -Wincomplete-uni-patterns
41− , -Wincomplete-record-updates
42− , -Wpartial-fields
43− , -Werror=missing-home-modules
44− , -Wmissing-home-modules
45− , -Widentities
46− , -Wredundant-constraints
47− , -Wmissing-export-lists
38+ -fwarn-unused-imports
39+ -Wall
40+ -Wincomplete-uni-patterns
41+ -Wincomplete-record-updates
42+ -Wpartial-fields
43+ -Werror=missing-home-modules
44+ -Wmissing-home-modules
45+ -Widentities
46+ -Wredundant-constraints
47+ -Wmissing-export-lists
4848 default-extensions: TypeApplications
4949 , OverloadedStrings
5050 , RecordWildCards