Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Make Pretty prettier #4057

Merged
merged 2 commits into from
Oct 15, 2024
Merged

Make Pretty prettier #4057

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
de6ddad
Make Pretty prettier
jberthold Oct 15, 2024
6bfb6fc
use infix, render less text and more doc
jberthold Oct 15, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions dev-tools/package.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,6 +157,7 @@ executables:
- base
- aeson
- bytestring
- containers
- hs-backend-booster
- prettyprinter
- text
Expand Down
65 changes: 42 additions & 23 deletions dev-tools/pretty/Pretty.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
{-# LANGUAGE FlexibleContexts #-}
{-# LANGUAGE PatternSynonyms #-}

{- | Pretty printer for JSON KORE terms
Expand All @@ -9,8 +10,19 @@ module Main (
main,
) where

import Control.Monad (unless)
import Control.Monad.Trans.Except
import Data.Aeson (eitherDecode)
import Data.ByteString.Lazy qualified as BS
import Data.Map (Map)
import Data.Map qualified as Map
import Data.Text.IO qualified as Text
import Prettyprinter
import System.Environment (getArgs)

import Booster.Pattern.Base (Term, Variable)
import Booster.Pattern.Pretty
import Booster.Prettyprinter (renderDefault)
import Booster.Prettyprinter (renderDefault, renderText)
import Booster.Syntax.Json (KoreJson (..))
import Booster.Syntax.Json.Internalise (
InternalisedPredicates (..),
Expand All @@ -21,12 +33,6 @@ import Booster.Syntax.Json.Internalise (
pattern DisallowAlias,
)
import Booster.Syntax.ParsedKore (internalise, parseKoreDefinition)
import Control.Monad.Trans.Except
import Data.Aeson (eitherDecode)
import Data.ByteString.Lazy qualified as BS
import Data.Text.IO qualified as Text
import Prettyprinter
import System.Environment (getArgs)

main :: IO ()
main = do
Expand All @@ -40,24 +46,37 @@ main = do
Left err -> putStrLn $ "Error: " ++ err
Right KoreJson{term} -> do
case runExcept $ internalisePattern DisallowAlias CheckSubsorts Nothing internalDef term of
Right (trm, preds, ceils, _subst, _unsupported) -> do
putStrLn "Pretty-printing pattern: "
putStrLn $ renderDefault $ pretty' @'[Decoded] trm
putStrLn "Bool predicates: "
mapM_ (putStrLn . renderDefault . pretty' @'[Decoded]) preds
putStrLn "Ceil predicates: "
mapM_ (putStrLn . renderDefault . pretty' @'[Decoded]) ceils
Right (trm, preds, ceils, subst, unsupported) -> do
Text.putStrLn . renderText . vsep $
[ "Pretty-printing pattern:"
, pretty' @'[Decoded, Infix] trm
, renderThings "Bool predicates:" preds
, renderThings "Ceil predicates:" ceils
, hang 2 $ "Substitution:" <> line <> showSubst subst
]
unless (null unsupported) $ do
putStrLn $ "...as well as " <> show (length unsupported) <> " unsupported parts:"
mapM_ print unsupported
Left (NoTermFound _) ->
case runExcept $ internalisePredicates DisallowAlias CheckSubsorts Nothing internalDef [term] of
Left es -> error (show es)
Right ts -> do
putStrLn "Pretty-printing predicates: "
putStrLn "Bool predicates: "
mapM_ (putStrLn . renderDefault . pretty' @'[Decoded]) ts.boolPredicates
putStrLn "Ceil predicates: "
mapM_ (putStrLn . renderDefault . pretty' @'[Decoded]) ts.ceilPredicates
putStrLn "Substitution: "
mapM_ (putStrLn . renderDefault . pretty' @'[Decoded]) ts.substitution
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Very interestingly, this just printed the values of the substitution 😬 instead of an actual mapping. But of course it typechecks 👍 🙃

putStrLn "Unsupported predicates: "
mapM_ print ts.unsupported
Text.putStrLn . renderText . vsep $
[ "Pretty-printing predicates:"
, renderThings "Bool predicates:" ts.boolPredicates
, renderThings "Ceil predicates:" ts.ceilPredicates
, hang 2 $ "Substitution:" <> line <> showSubst ts.substitution
]
unless (null ts.unsupported) $ do
putStrLn $ "...as well as " <> show (length ts.unsupported) <> " unsupported parts:"
mapM_ print ts.unsupported
Left err -> error (show err)
where
showSubst :: Map Variable Term -> Doc ann
showSubst m =
vsep
[pretty' @'[Decoded] v <+> "->" <+> pretty' @'[Decoded, Infix] expr | (v, expr) <- Map.assocs m]

renderThings :: Pretty (PrettyWithModifiers '[Decoded, Infix] a) => Doc ann -> [a] -> Doc ann
renderThings heading [] = heading <> " -"
renderThings heading things = hang 2 $ vsep $ heading : map (pretty' @'[Decoded, Infix]) things
Loading