From 64e86b22fe641062b89d2935e1ae31e224083784 Mon Sep 17 00:00:00 2001
From: Neil Brown <neil@twistedsquare.com>
Date: Fri, 6 Jun 2008 13:14:34 +0000
Subject: [PATCH] Fixed some StructureOccam tests that were broken recently by
 the change in the Token type

---
 frontends/StructureOccamTest.hs | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/frontends/StructureOccamTest.hs b/frontends/StructureOccamTest.hs
index 77402f5..8c77b90 100644
--- a/frontends/StructureOccamTest.hs
+++ b/frontends/StructureOccamTest.hs
@@ -30,9 +30,7 @@ import TreeUtils
 
 -- | Test 'structureOccam' when we're expecting it to succeed.
 testS :: Int -> [Token] -> [Pattern] -> Test
-testS n its etts = TestCase $ testPass' ("testS " ++ show n) ets (structureOccam its) (return ())
-  where
-    ets = zip (repeat DontCare) etts
+testS n its ets = TestCase $ testPass' ("testS " ++ show n) ets (structureOccam its) (return ())
 
 -- | Test 'structureOccam' when we're expecting it to fail.
 testSFail :: Int -> [Token] -> Test
@@ -57,7 +55,7 @@ testSimple = TestLabel "testSimple" $ TestList
 
   -- Ignoring include markers
   , testS     100 [t 1 1 (IncludeFile "bar"), t 2 1 foo]
-                  [tag1 IncludeFile "bar", eolP, fooP, eolP]
+                  [tag2 Token DontCare $ tag1 IncludeFile "bar", eolP, fooP, eolP]
 
   -- Things that should fail
   , testSFail  900 [t 1 1 foo, t 2 2 foo]
@@ -65,10 +63,10 @@ testSimple = TestLabel "testSimple" $ TestList
   ]
   where
     foo = TokIdentifier "foo"
-    fooP = tag1 TokIdentifier "foo"
-    eolP = tag0 EndOfLine
-    inP = tag0 Indent
-    outP = tag0 Outdent
+    fooP = tag2 Token DontCare $ tag1 TokIdentifier "foo"
+    eolP = tag2 Token DontCare $ tag0 EndOfLine
+    inP = tag2 Token DontCare $ tag0 Indent
+    outP = tag2 Token DontCare $ tag0 Outdent
     t l c tt = Token (emptyMeta { metaFile = Just "simulated.occ"
                                 , metaLine = l
                                 , metaColumn = c