bf48358 · rowtype-yoga/purescript-native

git.iko.soy/rowtype-yoga/purescript-native

Move comments module out

commitbf483587b72a10159078f49aacb1b0338e9794ee authorPhil Freeman <paf31@cantab.net> dateWed 7 Jan 2015, 16:36 (12 years ago) parent8700e35

13 files changed+39−17

compare with golang

unifiedsplit

purescript.cabal+1

@@ -66,6 +66,7 @@ library

6666 Language.PureScript.CoreFn.Meta

6767 Language.PureScript.CoreFn.Module

6868 Language.PureScript.CoreFn.Traversals

69+ Language.PureScript.Comments

6970 Language.PureScript.DeadCodeElimination

7071 Language.PureScript.Environment

7172 Language.PureScript.Errors

src/Language/PureScript.hs+1

@@ -33,6 +33,7 @@ import Control.Monad.Error

3333import System.FilePath ((</>))

3434

3535import Language.PureScript.AST as P

36+import Language.PureScript.Comments as P

3637import Language.PureScript.CodeGen as P

3738import Language.PureScript.DeadCodeElimination as P

3839import Language.PureScript.Environment as P

src/Language/PureScript/AST/Binders.hs+1−1

@@ -20,7 +20,7 @@ import qualified Data.Data as D

2020

2121import Language.PureScript.AST.SourcePos

2222import Language.PureScript.Names

23−import Language.PureScript.Parser.Lexer

23+import Language.PureScript.Comments

2424

2525-- |

2626-- Data type for binders

src/Language/PureScript/AST/Declarations.hs+1−1

@@ -25,7 +25,7 @@ import Language.PureScript.Types

2525import Language.PureScript.Names

2626import Language.PureScript.Kinds

2727import Language.PureScript.TypeClassDictionaries

28−import Language.PureScript.Parser.Lexer

28+import Language.PureScript.Comments

2929import Language.PureScript.CodeGen.JS.AST

3030import Language.PureScript.Environment

3131

src/Language/PureScript/CodeGen/Externs.hs+1−1

@@ -30,7 +30,7 @@ import Language.PureScript.Names

3030import Language.PureScript.Pretty

3131import Language.PureScript.TypeClassDictionaries

3232import Language.PureScript.Types

33−import Language.PureScript.Parser.Lexer

33+import Language.PureScript.Comments

3434

3535-- |

3636-- Generate foreign imports for all declarations in a module

src/Language/PureScript/CodeGen/JS/AST.hs+1−1

@@ -19,7 +19,7 @@ module Language.PureScript.CodeGen.JS.AST where

1919

2020import Data.Data

2121

22−import Language.PureScript.Parser.Lexer

22+import Language.PureScript.Comments

2323

2424-- |

2525-- Built-in unary operators

src/Language/PureScript/Comments.hsnew file+25

@@ -0,0 +1,25 @@

1+-----------------------------------------------------------------------------

2+--

3+-- Module : Language.PureScript.Parser.Comments

4+-- Copyright : (c) Phil Freeman 2015

5+-- License : MIT

6+--

7+-- Maintainer : Phil Freeman <paf31@cantab.net>

8+-- Stability : experimental

9+-- Portability :

10+--

11+-- |

12+-- Defines the types of source code comments

13+--

14+-----------------------------------------------------------------------------

15+

16+{-# LANGUAGE DeriveDataTypeable #-}

17+

18+module Language.PureScript.Comments where

19+

20+import qualified Data.Data as D

21+

22+data Comment

23+ = LineComment String

24+ | BlockComment String

25+ deriving (Show, Eq, Ord, D.Data, D.Typeable)

src/Language/PureScript/CoreFn/Ann.hs+1−1

@@ -17,7 +17,7 @@ module Language.PureScript.CoreFn.Ann where

1717import Language.PureScript.AST.SourcePos

1818import Language.PureScript.CoreFn.Meta

1919import Language.PureScript.Types

20−import Language.PureScript.Parser.Lexer

20+import Language.PureScript.Comments

2121

2222-- |

2323-- Type alias for basic annotations

src/Language/PureScript/CoreFn/Desugar.hs+1−1

@@ -33,7 +33,7 @@ import Language.PureScript.Environment

3333import Language.PureScript.Names

3434import Language.PureScript.Sugar.TypeClasses (typeClassMemberName, superClassDictionaryNames)

3535import Language.PureScript.Types

36−import Language.PureScript.Parser.Lexer

36+import Language.PureScript.Comments

3737import qualified Language.PureScript.AST as A

3838

3939-- |

src/Language/PureScript/Parser/Common.hs+1

@@ -20,6 +20,7 @@ module Language.PureScript.Parser.Common where

2020import Control.Applicative

2121import Control.Monad (guard)

2222

23+import Language.PureScript.Comments

2324import Language.PureScript.Parser.Lexer

2425import Language.PureScript.Parser.State

2526import Language.PureScript.Names

src/Language/PureScript/Parser/Declarations.hs+2−1

@@ -35,8 +35,9 @@ import Control.Applicative

3535import Control.Arrow ((+++))

3636

3737import Language.PureScript.Kinds

38−import Language.PureScript.Parser.Common

3938import Language.PureScript.AST

39+import Language.PureScript.Comments

40+import Language.PureScript.Parser.Common

4041import Language.PureScript.Parser.Types

4142import Language.PureScript.Parser.Kinds

4243import Language.PureScript.Parser.Lexer

src/Language/PureScript/Parser/Lexer.hs+2−9

@@ -13,11 +13,10 @@

1313--

1414-----------------------------------------------------------------------------

1515

16−{-# LANGUAGE TupleSections, DeriveDataTypeable #-}

16+{-# LANGUAGE TupleSections #-}

1717

1818module Language.PureScript.Parser.Lexer

1919 ( PositionedToken(..)

20− , Comment(..)

2120 , Token()

2221 , TokenParser()

2322 , lex

@@ -75,19 +74,13 @@ import Prelude hiding (lex)

7574import Control.Monad (void, guard)

7675import Data.Functor.Identity

7776

78−import qualified Data.Data as D

79−

8077import Control.Applicative

8178

8279import Language.PureScript.Parser.State

80+import Language.PureScript.Comments

8381

8482import qualified Text.Parsec as P

8583import qualified Text.Parsec.Token as PT

86−

87−data Comment

88− = LineComment String

89− | BlockComment String

90− deriving (Show, Eq, Ord, D.Data, D.Typeable)

9184

9285data Token

9386 = LParen

src/Language/PureScript/Pretty/JS.hs+1−1

@@ -29,7 +29,7 @@ import qualified Control.Arrow as A

2929import Language.PureScript.CodeGen.JS.AST

3030import Language.PureScript.CodeGen.JS.Common

3131import Language.PureScript.Pretty.Common

32−import Language.PureScript.Parser.Lexer (Comment(..))

32+import Language.PureScript.Comments

3333

3434import Numeric

3535