fix(eo-phi-normalizer): use yegor's old rules by default

eo-phi-normalizer/app/Main.hs

@@ -276,7 +276,7 @@ data CommandParser = CommandParser
   }
 
 rulesFile :: String
-rulesFile = "new.yaml"
+rulesFile = "yegor.yaml"
 
 commandParser :: CommandParser
 commandParser =
@@ -606,7 +606,7 @@ main = withCorrectLocale do
           -- Temporary hack while rules are not stabilized.
           -- Nothing -> return (True, "Yegor's rules (builtin)", [fastYegorInsideOutAsRule])
           Nothing -> do
-            ruleSet :: RuleSet <- decodeThrow $(embedFileRelative "test/eo/phi/rules/new.yaml")
+            ruleSet :: RuleSet <- decodeThrow $(embedFileRelative "test/eo/phi/rules/yegor.yaml")
             return (False, ruleSet.title, convertRuleNamed <$> ruleSet.rules)
       unless (single || json || latex) $ logStrLn ruleSetTitle
       bindingsWithDeps <- case deepMergePrograms (program' : deps) of
@@ -702,6 +702,16 @@ main = withCorrectLocale do
       bindingsWithDeps <- case deepMergePrograms (program' : deps) of
         Left err -> throwIO (CouldNotMergeDependencies err)
         Right (Program bindingsWithDeps) -> return bindingsWithDeps
+      -- (builtin, ruleSetTitle, rules) <-
+      --   case rulesPath of
+      --     Just path -> do
+      --       ruleSet <- parseRuleSetFromFile path
+      --       return (False, ruleSet.title, convertRuleNamed <$> ruleSet.rules)
+      --     -- Temporary hack while rules are not stabilized.
+      --     -- Nothing -> return (True, "Yegor's rules (builtin)", [fastYegorInsideOutAsRule])
+      --     Nothing -> do
+      --       ruleSet :: RuleSet <- decodeThrow $(embedFileRelative "test/eo/phi/rules/new.yaml")
+      --       return (False, ruleSet.title, convertRuleNamed <$> ruleSet.rules)
       (builtin, _ruleSetTitle, rules) <-
         case rulesPath of
           Just path -> do

eo-phi-normalizer/eo-phi-normalizer.cabal

@@ -371,6 +371,7 @@ extra-source-files:
     data/0.49.4/org/eolang/while.phi
     test/eo/phi/rules/new.yaml
     test/eo/phi/rules/streams.yaml
+    test/eo/phi/rules/yegor.yaml
 
 source-repository head
   type: git

eo-phi-normalizer/src/Language/EO/Phi/Rules/RunYegor.hs

@@ -37,7 +37,7 @@ yegorRuleSet :: Yaml.RuleSet
 {-# NOINLINE yegorRuleSet #-}
 yegorRuleSet =
   unsafePerformIO $
-    Yaml.parseRuleSetFromFile "eo-phi-normalizer/test/eo/phi/rules/new.yaml"
+    Yaml.parseRuleSetFromFile "eo-phi-normalizer/test/eo/phi/rules/yegor.yaml"
 
 yegorRules :: [NamedRule]
 yegorRules = map Yaml.convertRuleNamed (Yaml.rules yegorRuleSet)

eo-phi-normalizer/src/Language/EO/Phi/Syntax.hs

@@ -35,6 +35,7 @@ module Language.EO.Phi.Syntax (
   module Language.EO.Phi.Syntax.Abs,
   desugar,
   printTree,
+  printTreeDontSugar,
 
   -- * Conversion to 'Bytes'
   intToBytes,
@@ -662,11 +663,15 @@ unsafeParseWith parser input =
     Left parseError -> error parseError
     Right object -> object
 
--- | The top-level printing method.
-printTree :: (Pretty a, SugarableFinally a) => a -> String
-printTree =
+printTreeDontSugar :: (Pretty a) => a -> String
+printTreeDontSugar =
   T.unpack
     . renderStrict
     . layoutPretty defaultLayoutOptions{layoutPageWidth = Unbounded}
     . pretty
+
+-- | The top-level printing method.
+printTree :: (Pretty a, SugarableFinally a) => a -> String
+printTree =
+  printTreeDontSugar
     . sugarFinally

eo-phi-normalizer/test/Language/EO/Phi/DataizeSpec.hs

@@ -30,7 +30,7 @@ module Language.EO.Phi.DataizeSpec where
 import Control.Monad (forM_)
 import Test.Hspec
 
-import Language.EO.Phi (printTree)
+import Language.EO.Phi (printTree, printTreeDontSugar)
 import Language.EO.Phi qualified as Phi
 import Language.EO.Phi.Dataize (dataizeRecursively)
 import Language.EO.Phi.Dataize.Context (defaultContext)
@@ -62,23 +62,29 @@ getProgram inputFile = do
 spec :: Spec
 spec = do
   DataizeTestGroup{..} <- runIO (dataizationTests "test/eo/phi/dataization.yaml")
-  ruleset <- runIO $ parseRuleSetFromFile "test/eo/phi/rules/new.yaml"
-  let rules = map convertRuleNamed ruleset.rules
-  describe title $
-    forM_ tests $
-      \test -> do
-        deps <- runIO $ mapM getProgram test.dependencies
-        let mergedProgs = case deepMergePrograms (test.input : deps) of
-              Left err -> error ("Error merging programs: " ++ err)
-              Right prog -> prog
-        let ctx = defaultContext rules (progToObj mergedProgs)
-        let inputObj = progToObj test.input
-        let expectedResult = case test.output of
-              Object obj -> Left obj
-              Bytes bytes -> Right bytes
-        it test.name $ do
-          let dataizedResult = dataizeRecursively ctx inputObj
-          ObjectOrBytes dataizedResult `shouldBe` ObjectOrBytes expectedResult
+  forM_
+    [ ("Old Yegor's rules", "test/eo/phi/rules/yegor.yaml")
+    -- TODO #617:10m Enable
+    -- , ("New Yegor's rules", "test/eo/phi/rules/new.yaml")
+    ]
+    $ \(title, rulesFile) -> do
+      ruleset <- runIO $ parseRuleSetFromFile rulesFile
+      let rules = map convertRuleNamed ruleset.rules
+      describe title $
+        forM_ tests $
+          \test -> do
+            deps <- runIO $ mapM getProgram test.dependencies
+            let mergedProgs = case deepMergePrograms (test.input : deps) of
+                  Left err -> error ("Error merging programs: " ++ err)
+                  Right prog -> prog
+            let ctx = defaultContext rules (progToObj mergedProgs)
+            let inputObj = progToObj test.input
+            let expectedResult = case test.output of
+                  Object obj -> Left obj
+                  Bytes bytes -> Right bytes
+            it test.name $ do
+              let dataizedResult = dataizeRecursively ctx inputObj
+              ObjectOrBytes dataizedResult `shouldBe` ObjectOrBytes expectedResult
 
 progToObj :: Phi.Program -> Phi.Object
 progToObj (Phi.Program bindings) = Phi.Formation bindings

eo-phi-normalizer/test/Language/EO/Rules/PhiPaperSpec.hs

@@ -337,12 +337,13 @@ spec :: Spec
 spec =
   forM_
     [ ("New Yegor's rules", "test/eo/phi/rules/new.yaml")
+    , ("Old Yegor's rules", "test/eo/phi/rules/yegor.yaml")
     ]
-    $ \(name, rulesFile) -> do
+    $ \(title, rulesFile) -> do
       ruleset <- runIO $ parseRuleSetFromFile rulesFile
       let rulesFromYaml = map convertRuleNamed (rules ruleset)
       inputs <- runIO $ parseTests "test/eo/phi/confluence.yaml"
-      describe name $ do
+      describe title $ do
         it "Are confluent (via QuickCheck)" (confluent rulesFromYaml)
         describe
           "Are confluent (regression tests)"

eo-phi-normalizer/test/Language/EO/YamlSpec.hs

@@ -32,5 +32,6 @@ spec :: Spec
 spec =
   Test.spec
     [ "test/eo/phi/rules/new.yaml"
+    , "test/eo/phi/rules/yegor.yaml"
     , "test/eo/phi/rules/streams.yaml"
     ]