aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn MacFarlane <fiddlosopher@gmail.com>2012-02-05 13:23:06 -0800
committerJohn MacFarlane <fiddlosopher@gmail.com>2012-02-05 13:23:06 -0800
commit1f20f77712e31fa554b0c435a9d0376c4d4138d6 (patch)
tree94d64abe589499e279d1006325cb788ba5887711
parent9bf32a7554da7912efff95a4cd59bb4faaf44fa5 (diff)
downloadpandoc-1f20f77712e31fa554b0c435a9d0376c4d4138d6.tar.gz
Changed infix level of testing combinators.
This avoids clash with (<>), which is defined in Data.Monoid as having infix 6.
-rw-r--r--src/Tests/Helpers.hs2
-rw-r--r--src/Tests/Readers/LaTeX.hs2
-rw-r--r--src/Tests/Readers/Markdown.hs2
-rw-r--r--src/Tests/Readers/RST.hs2
-rw-r--r--src/Tests/Writers/ConTeXt.hs2
-rw-r--r--src/Tests/Writers/HTML.hs2
-rw-r--r--src/Tests/Writers/Markdown.hs2
7 files changed, 7 insertions, 7 deletions
diff --git a/src/Tests/Helpers.hs b/src/Tests/Helpers.hs
index b8d6b83a7..bd5a38869 100644
--- a/src/Tests/Helpers.hs
+++ b/src/Tests/Helpers.hs
@@ -79,7 +79,7 @@ vivid s = setSGRCode [SetColor Background Dull Red
, SetColor Foreground Vivid White] ++ s
++ setSGRCode [Reset]
-infix 6 =?>
+infix 5 =?>
(=?>) :: a -> b -> (a,b)
x =?> y = (x, y)
diff --git a/src/Tests/Readers/LaTeX.hs b/src/Tests/Readers/LaTeX.hs
index eb21f262e..ec47eaf7d 100644
--- a/src/Tests/Readers/LaTeX.hs
+++ b/src/Tests/Readers/LaTeX.hs
@@ -12,7 +12,7 @@ import Data.Monoid (mempty)
latex :: String -> Pandoc
latex = readLaTeX defaultParserState
-infix 5 =:
+infix 4 =:
(=:) :: ToString c
=> String -> (String, c) -> Test
(=:) = test latex
diff --git a/src/Tests/Readers/Markdown.hs b/src/Tests/Readers/Markdown.hs
index aa8a312ff..5ad974adf 100644
--- a/src/Tests/Readers/Markdown.hs
+++ b/src/Tests/Readers/Markdown.hs
@@ -15,7 +15,7 @@ markdown = readMarkdown defaultParserState{ stateStandalone = True }
markdownSmart :: String -> Pandoc
markdownSmart = readMarkdown defaultParserState{ stateSmart = True }
-infix 5 =:
+infix 4 =:
(=:) :: ToString c
=> String -> (String, c) -> Test
(=:) = test markdown
diff --git a/src/Tests/Readers/RST.hs b/src/Tests/Readers/RST.hs
index d7e3a9c0d..3269092a6 100644
--- a/src/Tests/Readers/RST.hs
+++ b/src/Tests/Readers/RST.hs
@@ -11,7 +11,7 @@ import Text.Pandoc
rst :: String -> Pandoc
rst = readRST defaultParserState{ stateStandalone = True }
-infix 5 =:
+infix 4 =:
(=:) :: ToString c
=> String -> (String, c) -> Test
(=:) = test rst
diff --git a/src/Tests/Writers/ConTeXt.hs b/src/Tests/Writers/ConTeXt.hs
index 1be9a745b..506ff698f 100644
--- a/src/Tests/Writers/ConTeXt.hs
+++ b/src/Tests/Writers/ConTeXt.hs
@@ -26,7 +26,7 @@ which is in turn shorthand for
test context "my test" (X,Y)
-}
-infix 5 =:
+infix 4 =:
(=:) :: (ToString a, ToPandoc a)
=> String -> (a, String) -> Test
(=:) = test context
diff --git a/src/Tests/Writers/HTML.hs b/src/Tests/Writers/HTML.hs
index e3a446586..8561aa421 100644
--- a/src/Tests/Writers/HTML.hs
+++ b/src/Tests/Writers/HTML.hs
@@ -23,7 +23,7 @@ which is in turn shorthand for
test html "my test" (X,Y)
-}
-infix 5 =:
+infix 4 =:
(=:) :: (ToString a, ToPandoc a)
=> String -> (a, String) -> Test
(=:) = test html
diff --git a/src/Tests/Writers/Markdown.hs b/src/Tests/Writers/Markdown.hs
index 17bf784ca..d90dc83b1 100644
--- a/src/Tests/Writers/Markdown.hs
+++ b/src/Tests/Writers/Markdown.hs
@@ -22,7 +22,7 @@ which is in turn shorthand for
test markdown "my test" (X,Y)
-}
-infix 5 =:
+infix 4 =:
(=:) :: (ToString a, ToPandoc a)
=> String -> (a, String) -> Test
(=:) = test markdown