Permalink
Browse files

Wall: rename join in anticipation of ghc-7.10

  • Loading branch information...
1 parent 01707f4 commit 6ed9d8c5ff19260420305753fd841b4bbcf2669f @bergey bergey committed Mar 5, 2014
Showing with 3 additions and 3 deletions.
  1. +3 −3 src/Diagrams/TwoD/Path/Metafont/Parser.hs
@@ -35,8 +35,8 @@ pt = char '(' *> (p2 <$> xy) <* char ')'
-- Joins
-join :: Parser (PathJoin (Maybe PathDir) BasicJoin)
-join = straightJoin <|> do
+anyJoin :: Parser (PathJoin (Maybe PathDir) BasicJoin)
+anyJoin = straightJoin <|> do
d1' <- optionMaybe pathDir
j' <- tenseLine <|> dotsJoin
d2' <- optionMaybe pathDir
@@ -99,7 +99,7 @@ pathDir = do
-- Segments & Paths
mfs :: Parser (MetafontSegment (Maybe PathDir) BasicJoin)
-mfs = MFS <$> pt <*> join <*> lookAhead pt
+mfs = MFS <$> pt <*> anyJoin <*> lookAhead pt
matches :: Stream s m t => ParsecT s u m a -> ParsecT s u m Bool
matches p = option False (p *> return True)

0 comments on commit 6ed9d8c

Please sign in to comment.