Skip to content

Commit 6a05dfa

Browse files
committed
Merge pull request #3 from joneshf/master
Updated for changes to Control.
2 parents cb7d912 + 2b692d3 commit 6a05dfa

File tree

1 file changed

+9
-11
lines changed

1 file changed

+9
-11
lines changed

src/Text/Parsing/Parser/Token.purs.hs

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,17 @@
11
module Text.Parsing.Parser.Token where
2-
3-
import Prelude
2+
3+
import Prelude
44

55
import Data.String
66

77
import Control.Monad.State.Class
88
import Control.Monad.Error.Class
99

10-
import Control.Applicative
11-
1210
import Text.Parsing.Parser
1311
import Text.Parsing.Parser.String
1412
import Text.Parsing.Parser.Combinators
15-
16-
type LanguageDef s m = {
13+
14+
type LanguageDef s m = {
1715
commentStart :: String,
1816
commentEnd :: String,
1917
commentLine :: String,
@@ -26,7 +24,7 @@ type LanguageDef s m = {
2624
reservedOpNames :: [String],
2725
caseSensitive :: Boolean
2826
}
29-
27+
3028
type TokenParser s m = {
3129
identifier :: ParserT s m String,
3230
reserved :: String -> ParserT s m String,
@@ -50,15 +48,15 @@ type TokenParser s m = {
5048
brackets :: forall a. ParserT s m a -> ParserT s m a,
5149
semi :: ParserT s m String,
5250
comma :: ParserT s m String,
53-
colon :: ParserT s m String,
51+
colon :: ParserT s m String,
5452
dot :: ParserT s m String,
5553
semiSep :: forall a. ParserT s m a -> ParserT s m [a],
5654
semiSep1 :: forall a. ParserT s m a -> ParserT s m [a],
5755
commaSep :: forall a. ParserT s m a -> ParserT s m [a],
5856
commaSep1 :: forall a. ParserT s m a -> ParserT s m [a]
5957
}
6058

61-
{-
59+
{-
6260
-- Port in progress
6361
makeTokenParser :: LanguageDef s m -> TokenParser s m
6462
makeTokenParser languageDef
@@ -436,5 +434,5 @@ makeTokenParser languageDef
436434
<?> "end of comment"
437435
where
438436
startEnd = nub (commentEnd languageDef ++ commentStart languageDef)
439-
440-
-}
437+
438+
-}

0 commit comments

Comments
 (0)