hunk ./Text/GrammarCombinators/Parser/UUParse.hs 38
-import Text.ParserCombinators.UU hiding (Token)
+import Text.ParserCombinators.UU
+import Text.ParserCombinators.UU.BasicInstances
hunk ./Text/GrammarCombinators/Parser/UUParse.hs 43
+newtype Loc = MkLoc Int deriving Show
+
hunk ./Text/GrammarCombinators/Parser/UUParse.hs 47
-instance IsLocationUpdatedBy Int t where
-   advance p _ = p + 1
+instance IsLocationUpdatedBy Loc t where
+   advance (MkLoc p) _ = MkLoc $ p + 1
hunk ./Text/GrammarCombinators/Parser/UUParse.hs 50
-newtype WrapP t v = WP { unWP :: P (Str (ConcreteToken t) Int) v }
+newtype WrapP t v = WP { unWP :: P (Str (ConcreteToken t) [ConcreteToken t] Loc) v }
hunk ./Text/GrammarCombinators/Parser/UUParse.hs 69
-    in WP $ pSym (sat, show tt, head $ enumConcreteTokens tt)
-  anyToken = WP $ pSym (const True :: ConcreteToken t -> Bool, "anyToken", head $ enumConcreteTokens (head enumerate :: t))
+    in WP $ pSatisfy sat $ Insertion (show tt) (head $ enumConcreteTokens tt) 1
+  anyToken = WP $ pSatisfy (const True :: ConcreteToken t -> Bool) $ Insertion "anyToken" (head $ enumConcreteTokens (head enumerate :: t)) 1
hunk ./Text/GrammarCombinators/Parser/UUParse.hs 97
-  parse (unWP rule <* pEnd) $ listToStr s 0
+  parse (unWP rule <* pEnd) $ createStr (MkLoc 0) s 
hunk ./Text/GrammarCombinators/Test/Paper/Benchmark.hs 26
-import Text.ParserCombinators.UU hiding (Token)
+import Text.ParserCombinators.UU
+import Text.ParserCombinators.UU.BasicInstances
hunk ./Text/GrammarCombinators/Test/Paper/Benchmark.hs 54
-parseUUBad test = parse uuline (listToStr test (0,0))
+parseUUBad test = parse uuline (createStr 0 test)
hunk ./Text/GrammarCombinators/Test/Paper/Benchmark.hs 61
-parseViaTree test = evalLine $ parse uulineA (listToStr test (0,0)) 
+parseViaTree test = evalLine $ parse uulineA (createStr 0 test) 
hunk ./Text/GrammarCombinators/Test/Paper/Benchmark.hs 63
-uuline :: P (Str Char (Int,Int)) Int
+uuline :: P (Str Char [Char] Int) Int
hunk ./Text/GrammarCombinators/Test/Paper/Benchmark.hs 71
-uudigit :: P (Str Char (Int,Int)) Char
+uudigit :: P (Str Char [Char] Int) Char
hunk ./Text/GrammarCombinators/Test/Paper/Benchmark.hs 74
-uulineA :: P (Str Char (Int,Int)) Line
+uulineA :: P (Str Char [Char] Int) Line
hunk ./Text/GrammarCombinators/Test/Paper/Benchmark.hs 82
-uudigitA :: P (Str Char (Int,Int)) Digit
+uudigitA :: P (Str Char [Char] Int) Digit
hunk ./changelog 3
+0.2.5 Fix compatibility with non-backwards compatible UUParse 2.7.1.
+
hunk ./website/index.lhs 7
+* 17-4-2011: Grammar-combinators v0.2.5 is released. Fixes incompatibility
+  with UUParse 2.7.
+
hunk ./grammar-combinators.cabal 2
-Version:             0.2.4
+Version:             0.2.5