diff --git a/src/Distribution/Simple/UUAGC/AbsSyn.hs b/src/Distribution/Simple/UUAGC/AbsSyn.hs --- a/src/Distribution/Simple/UUAGC/AbsSyn.hs +++ b/src/Distribution/Simple/UUAGC/AbsSyn.hs @@ -72,6 +72,8 @@ | UCheckParseBlocks | UCheckParseHaskell | UKennedyWarren + | UParallel + | UGenericBoolFlag String deriving (Eq, Read, Show) type UUAGCOptions = [UUAGCOption] @@ -151,6 +153,8 @@ fromUUAGCOtoArgs UCheckParseBlocks = toLOp ocheckparseblocks fromUUAGCOtoArgs UCheckParseHaskell = toLOp ocheckparsehaskell fromUUAGCOtoArgs UKennedyWarren = toLOp okennedywarren +fromUUAGCOtoArgs UParallel = toLOp oparallel +fromUUAGCOtoArgs (UGenericBoolFlag fl) = toLOp fl fromUUAGCOstoArgs :: UUAGCOptions -> [String] fromUUAGCOstoArgs = map fromUUAGCOtoArgs diff --git a/src/Distribution/Simple/UUAGC/Options.hs b/src/Distribution/Simple/UUAGC/Options.hs --- a/src/Distribution/Simple/UUAGC/Options.hs +++ b/src/Distribution/Simple/UUAGC/Options.hs @@ -58,3 +58,4 @@ ocheckparseblocks = "checkParseBlocks" ocheckparsehaskell = "checkParseHaskell" okennedywarren = "kennedywarren" +oparallel = "parallel" diff --git a/src/Distribution/Simple/UUAGC/Parser.hs b/src/Distribution/Simple/UUAGC/Parser.hs --- a/src/Distribution/Simple/UUAGC/Parser.hs +++ b/src/Distribution/Simple/UUAGC/Parser.hs @@ -20,7 +20,13 @@ instance Error ParserError where strMsg x = DefParserError x --- import Control.Exception +-- Add boolean flags to this list, which will then be handled generically. +-- Requires that this flag is also an option of uuagc (case sensitive) +booleanFlags + = [ "helpinlining","dummytokenvisit","tupleasdummytoken","strictdummytoken","noperruletypesigs" + , "noperstatetypesigs", "noeagerblackholing","noperrulecostcentres","nopervisitcostcentres" + ,"noinlinepragmas","aggressiveinlinepragmas" + ] uFlags = [odata, ostrictdata, ostrictwrap, ocatas, osemfuns, osignatures ,onewtypes, opretty @@ -32,7 +38,7 @@ ,ogenfiledeps, ogenvisage, ogenaspectag, ogenattrlist, olckeywords ,odoublecolons, oself ,ocheckparserhs,ocheckparsetys,ocheckparseblocks,ocheckparsehaskell - ,okennedywarren] + ,okennedywarren,oparallel] ++ booleanFlags uabsFlags = [UData, UStrictData, UStrictWData, UCatas, USemFuns, USignatures ,UNewTypes, UPretty @@ -44,7 +50,7 @@ ,UGenFileDeps, UGenVisage, UGenAspectAG, UGenAttrList, ULCKeyWords ,UDoubleColons, USelf ,UCheckParseRhs, UCheckParseTys, UCheckParseBlocks, UCheckParseHaskell - ,UKennedyWarren] + ,UKennedyWarren,UParallel] ++ [ UGenericBoolFlag fl | fl <- booleanFlags ] gFlags = [(oall, [odata, ocatas, osemfuns, osignatures, opretty, orename]) ,(ooptimize, [ovisit,ocase]) diff --git a/uuagc-cabal.cabal b/uuagc-cabal.cabal --- a/uuagc-cabal.cabal +++ b/uuagc-cabal.cabal @@ -1,7 +1,7 @@ cabal-version: >=1.8 build-type: Simple name: uuagc-cabal -version: 1.0.0.7 +version: 1.0.0.9 license: BSD3 license-file: LICENSE maintainer: Arie Middelkoop