Permalink
Browse files

Merge pull request #11 from sopvop/master

Replace LineDirective with Skipping
  • Loading branch information...
2 parents afe03e8 + 1ad1615 commit 7bbd958c20ec363e23ad34b011d7d36ee9f6711a @ekmett committed Mar 14, 2013
Showing with 3 additions and 4 deletions.
  1. +2 −3 src/Text/Trifecta/Rope.hs
  2. +1 −1 trifecta.cabal
@@ -30,22 +30,21 @@ import Data.FingerTree as FingerTree
import GHC.Generics
import Data.Foldable (toList)
import Data.Hashable
-import Data.Int (Int64)
import Text.Trifecta.Util.Combinators as Util
import Text.Trifecta.Delta
import Data.Data
data Strand
= Strand {-# UNPACK #-} !ByteString !Delta
- | LineDirective {-# UNPACK #-} !ByteString {-# UNPACK #-} !Int64
+ | Skipping !Delta
deriving (Show, Data, Typeable, Generic)
strand :: ByteString -> Strand
strand bs = Strand bs (delta bs)
instance Measured Delta Strand where
measure (Strand _ s) = delta s
- measure (LineDirective p l) = delta (Directed p l 0 0 0)
+ measure (Skipping d) = d
instance Hashable Strand
View
@@ -1,6 +1,6 @@
name: trifecta
category: Text, Parsing, Diagnostics, Pretty Printer, Logging
-version: 1.0
+version: 1.1
license: BSD3
cabal-version: >= 1.10
license-file: LICENSE

0 comments on commit 7bbd958

Please sign in to comment.