machine: normalOrderReduction at the last moment

[haskell/symantic-parser.git] / test / Golden / Grammar.hs

diff --git a/test/Golden/Grammar.hs b/test/Golden/Grammar.hs
index 5ed73a9df9f87fec1aabae6a3f6ac0c42e105b8a..92411a3d1b502284ba9d7053bc5af7b26a09e97d 100644 (file)
--- a/test/Golden/Grammar.hs
+++ b/test/Golden/Grammar.hs
@@ -21,18 +21,18 @@ import qualified Grammar
 goldens :: TestTree
 goldens = testGroup "Grammar" $
   [ testGroup "ViewGrammar" $
-    (\f -> List.zipWith f Grammar.grammars [1::Int ..]) $ \(Grammar.G gram) g ->
-    let grammarFile = "test/Golden/Grammar/ViewGrammar/G"<>show g<>".expected.txt" in
-    goldenVsStringDiff ("G"<>show g) goldenDiff grammarFile $ do
+    (\f -> List.zipWith f Grammar.grammars [1::Int ..]) $ \g gNum ->
+    let grammarFile = getGoldenDir $ "Grammar/ViewGrammar/G"<>show gNum<>".expected.txt" in
+    goldenVsStringDiff ("G"<>show gNum) goldenDiff grammarFile $ do
       resetTHNameCounter
       return $ fromString $ show $
-        P.viewGrammar @'True $
-        P.observeSharing gram
+        P.viewGrammar @'False g
   , testGroup "OptimizeGrammar" $
-    (\f -> List.zipWith f Grammar.grammars [1::Int ..]) $ \(Grammar.G gram) g ->
-    let grammarFile = "test/Golden/Grammar/OptimizeGrammar/G"<>show g<>".expected.txt" in
-    goldenVsStringDiff ("G"<>show g) goldenDiff grammarFile $ do
+    (\f -> List.zipWith f Grammar.grammars [1::Int ..]) $ \g gNum ->
+    let grammarFile = getGoldenDir $ "Grammar/OptimizeGrammar/G"<>show gNum<>".expected.txt" in
+    goldenVsStringDiff ("G"<>show gNum) goldenDiff grammarFile $ do
       resetTHNameCounter
-      return $ fromString $
-        P.showGrammar @'True gram
+      return $ fromString $ show $
+        P.viewGrammar @'False $
+        P.optimizeGrammar g
   ]