912ea9b · ormolu · git.iko.soy

app/Main.hs+24−1

compare with master

unifiedsplit

@@ -1,4 +1,27 @@

1module Main (main) where

2

3+import Control.Monad

4+import Ormolu.Parser

5+import System.Environment (getArgs)

6+import qualified Outputable as GHC

7+

3main :: IO ()

8main :: IO ()

4−main = return ()

9+main = do

10+ (path:_) <- getArgs

11+ input <- readFile path

12+ (ws, r) <- parseModule [] path input

13+ unless (null ws) $

14+ putStrLn "dynamic option warnings:"

15+ -- TODO print ws

16+ case r of

17+ Left (srcSpan, err) -> do

18+ putStrLn (showOutputable srcSpan)

19+ putStrLn err

20+ Right (anns, parsedModule) -> do

21+ putStrLn "\nannotations:\n"

22+ putStrLn (showOutputable anns)

23+ putStrLn "\nparsed module:\n"

24+ putStrLn (showOutputable parsedModule)

25+

26+showOutputable :: GHC.Outputable o => o -> String

27+showOutputable = GHC.showSDocUnsafe . GHC.ppr

ormolu.cabal+8−3

@@ -25,7 +25,11 @@ flag dev

25

26library

27 hs-source-dirs: src

28− build-depends: base

28+ build-depends: base >= 4.8 && < 5.0

29+ , data-default-class

30+ , ghc >= 8.4.3

31+ , ghc-boot-th >= 8.4.3

32+ , ghc-exactprint >= 0.5.6

29 exposed-modules: Ormolu

33 exposed-modules: Ormolu

30 , Ormolu.Parser

34 , Ormolu.Parser

31 , Ormolu.Printer

35 , Ormolu.Printer

@@ -45,7 +49,7 @@ test-suite tests

45 main-is: Main.hs

49 main-is: Main.hs

46 hs-source-dirs: tests

50 hs-source-dirs: tests

47 type: exitcode-stdio-1.0

51 type: exitcode-stdio-1.0

48− build-depends: base

52+ build-depends: base >= 4.8 && < 5.0

49 , ormolu

53 , ormolu

50 if flag(dev)

54 if flag(dev)

51 ghc-options: -Wall -Werror

55 ghc-options: -Wall -Werror

@@ -56,7 +60,8 @@ test-suite tests

56executable ormolu

60executable ormolu

57 main-is: Main.hs

61 main-is: Main.hs

58 hs-source-dirs: app

62 hs-source-dirs: app

59− build-depends: base

63+ build-depends: base >= 4.8 && < 5.0

64+ , ghc >= 8.4.3

60 , ormolu

65 , ormolu

61 if flag(dev)

66 if flag(dev)

62 ghc-options: -Wall -Werror -Wcompat

67 ghc-options: -Wall -Werror -Wcompat

src/Ormolu/Parser.hs+20−1

@@ -1,3 +1,22 @@

1module Ormolu.Parser

2− ( )

2+ ( parseModule )

3where

4+

5+import Language.Haskell.GHC.ExactPrint.Parsers hiding (parseModule)

6+import Language.Haskell.GHC.ExactPrint.Types

7+import Ormolu.Type

8+import qualified CmdLineParser as GHC

9+import qualified DynFlags as GHC

10+import qualified GHC hiding (parseModule)

11+

12+-- | Parse a complete module from string.

13+

14+parseModule

15+ :: [DynOption] -- ^ Dynamic options that affect parsing

16+ -> FilePath -- ^ File name (only for source location annotations)

17+ -> String -- ^ Input for parser

18+ -> IO ([GHC.Warn], Either (GHC.SrcSpan, String) (Anns, GHC.ParsedSource))

19+parseModule dynOpts path input = ghcWrapper $ do

20+ dynFlags0 <- initDynFlagsPure path input

21+ (dynFlags1, _, ws) <- GHC.parseDynamicFilePragma dynFlags0 (dynOption <$> dynOpts)

22+ return (ws, parseModuleFromStringInternal dynFlags1 path input)

src/Ormolu/Type.hs+33−1

@@ -1,3 +1,35 @@

1module Ormolu.Type

2+ ( Config (..)

3+ , DynOption (..)

4+ , dynOption

2− ( )

5+ )

3where

6where

7+

8+import Data.Default.Class

9+import qualified SrcLoc as GHC

10+

11+-- | Ormolu configuration.

12+

13+data Config = Config

14+ { cfgLineWidth :: Int

15+ , cfgIndentStep :: Int

16+ , cfgDynOptions :: [DynOption]

17+ }

18+

19+instance Default Config where

20+ def = Config

21+ { cfgLineWidth = 80

22+ , cfgIndentStep = 2

23+ , cfgDynOptions = []

24+ }

25+

26+-- | A wrapper for dynamic options.

27+

28+newtype DynOption = DynOption

29+ { unDynOption :: String

30+ } deriving (Eq, Ord, Show)

31+

32+-- | Convert 'DynOption' to @'GHC.Located' 'String'@.

33+

34+dynOption :: DynOption -> GHC.Located String

35+dynOption (DynOption o) = GHC.L GHC.noSrcSpan o