[update] SExp.fmtPrint を削除して SExp の Show 実装へ

Author: Yuta1004

app/main/src/Main.hs

@@ -6,7 +6,7 @@ import Prelude hiding (lex)
 import Copager2.Prelude
 import Copager2.Lex.RegexLex (lex)
 import Copager2.Parse.LR.Common.Driver (parse)
-import Copager2.IR.SExp (SExp, consume, fmtPrint)
+import Copager2.IR.SExp (SExp, consume)
 
 import Language.Arithmetic (ArithmeticToken, ArithmeticRule)
 
@@ -15,7 +15,7 @@ main = do
  input <- getLine
  result <- runProcessor mkProcessor input
  case result of
- Right sexp -> fmtPrint sexp
+ Right sexp -> print sexp
  Left err -> putStrLn $ "error: " ++ show err
 
 mkProcessor :: ProcessorT IO ArithmeticToken ArithmeticRule (SExp _ _)

lib/copager2/src/Copager2/IR/SExp.hs

@@ -3,9 +3,10 @@ module Copager2.IR.SExp
  , feed
  , build
  , consume
- , fmtPrint
  ) where
 
+import Data.Function ((&))
+
 import Copager2.Core.Process (ProcessT, foldProcess)
 import Copager2.Core.Progress (Progress(..))
 import Copager2.Core.State (applyBuilding, updateBuilding)
@@ -19,7 +20,13 @@ data SExp ts rs
  = Empty
  | Atom (Token ts)
  | List (rs, [SExp ts rs])
- deriving Show
+
+instance (Show ts, Show rs) => Show (SExp ts rs) where
+ show Empty = ""
+ show (Atom token) = "\"" ++ raw token ++ "\""
+ show (List (rule, rhs)) =
+ let formattedRhs = rhs & map show
+ in "(" ++ show rule ++ " " ++ unwords formattedRhs ++ ")"
 
 newtype SExpStack ts rs = SExpStack [SExp ts rs]
 
@@ -54,17 +61,3 @@ consume events = foldProcess events $ \event -> do
  Accept -> build
  Error err -> return $ Fail err
  _ -> feed event
-
-fmtPrint :: (Show ts, Show rs) => SExp ts rs -> IO ()
-fmtPrint = fmtPrint' 0
-
-fmtPrint' :: (Show ts, Show rs) => Int -> SExp ts rs -> IO ()
-fmtPrint' indent (List (rule, [Atom token])) = do
- indentPrint indent ("- " ++ show rule ++ ": " ++ raw token)
-fmtPrint' indent (List (rule, rhs)) = do
- indentPrint indent ("- " ++ show rule)
- mapM_ (fmtPrint' (indent + 2)) rhs
-fmtPrint' _ _ = return ()
-
-indentPrint :: Int -> String -> IO ()
-indentPrint indent str = putStrLn $ replicate indent ' ' ++ str