Improve pretty printer: use consistent indentation levels

inferno-core/CHANGELOG.md

@@ -1,6 +1,9 @@
 # Revision History for inferno-core
 *Note*: we use https://pvp.haskell.org/ (MAJOR.MAJOR.MINOR.PATCH)
 
+## 0.11.3.0 -- 2024-04-01
+* Add --parse CLI arg and allow trailing commas in parser
+
 ## 0.11.2.0 -- 2024-03-26
 * Add record pattern matching
 

inferno-core/app/Main.hs

@@ -1,13 +1,18 @@
 {-# LANGUAGE LambdaCase #-}
-{-# LANGUAGE NamedFieldPuns #-}
+{-# LANGUAGE ScopedTypeVariables #-}
+{-# LANGUAGE TypeApplications #-}
 
 module Main where
 
-import Data.Bifunctor (bimap)
+import Data.Bifunctor (bimap, second)
 import qualified Data.Map as Map
 import qualified Data.Text.IO as Text
-import Inferno.Core (Interpreter (..), mkInferno)
-import Inferno.Module.Prelude (builtinModules)
+import Inferno.Eval (runEvalM)
+import Inferno.Infer (inferExpr)
+import Inferno.Infer.Pinned (pinExpr)
+import Inferno.Module.Prelude (baseOpsTable, builtinModules, builtinModulesOpsTable, builtinModulesPinMap, builtinModulesTerms)
+import Inferno.Parse (parseExpr)
+import Inferno.Parse.Commented (insertCommentsIntoExpr)
 import Inferno.Types.VersionControl (pinnedToMaybe)
 import Inferno.Utils.Prettyprinter (showPretty)
 import Options.Applicative
@@ -30,13 +35,14 @@ import Options.Applicative
 import System.Exit (exitFailure)
 import System.IO (hPrint, stderr)
 
-data CliArgs = CliArgs {file :: String, typecheck :: Bool}
+data CliArgs = CliArgs {file :: String, typecheck :: Bool, parse :: Bool}
 
 cliargs :: Parser CliArgs
 cliargs =
   CliArgs
     <$> argument str (metavar "FILE" <> help "Input file path")
     <*> switch (long "typecheck" <> short 't' <> help "Only run type inference")
+    <*> switch (long "parse" <> short 'p' <> help "Only run parser")
 
 main :: IO ()
 main = do
@@ -50,21 +56,43 @@ main = do
   args <- execParser opts
 
   src <- Text.readFile $ file args
-  Interpreter {evalExpr, defaultEnv, parseAndInfer} <-
-    mkInferno builtinModules [] :: IO (Interpreter IO ())
-  case parseAndInfer src of
+  let customTypes = []
+  let prelude = builtinModules @IO @()
+  let defaultEnv = builtinModulesTerms prelude
+  -- parse
+  case parseExpr (baseOpsTable prelude) (builtinModulesOpsTable prelude) customTypes src of
     Left err -> do
       hPrint stderr err
       exitFailure
-    Right (ast, ty, _, _) -> do
-      if typecheck args
+    Right (ast, _comments) ->
+      if parse args
         then do
-          putStrLn "Inferred type:"
-          showPretty ty
+          let ast' = insertCommentsIntoExpr _comments ast
+          putStrLn "Parsed Expr:"
+          print $ second (const ()) ast'
+          putStrLn "Pretty:"
+          showPretty ast'
         else do
-          let ast' = bimap pinnedToMaybe (const ()) ast
-          evalExpr defaultEnv Map.empty ast' >>= \case
+          -- pin free variables to builtin prelude function hashes
+          case pinExpr (builtinModulesPinMap prelude) ast of
             Left err -> do
               hPrint stderr err
               exitFailure
-            Right res -> showPretty res
+            Right pinnedAST ->
+              -- typecheck
+              case inferExpr prelude pinnedAST of
+                Left err -> do
+                  hPrint stderr err
+                  exitFailure
+                Right (ast', ty, _tyMap) ->
+                  if typecheck args
+                    then do
+                      putStrLn "Inferred type:"
+                      showPretty ty
+                    else do
+                      let ast'' = bimap pinnedToMaybe (const ()) ast'
+                      runEvalM defaultEnv Map.empty ast'' >>= \case
+                        Left err -> do
+                          hPrint stderr err
+                          exitFailure
+                        Right res -> showPretty res

inferno-core/inferno-core.cabal

@@ -1,6 +1,6 @@
 cabal-version:       2.4
 name:                inferno-core
-version:             0.11.2.0
+version:             0.11.3.0
 synopsis:            A statically-typed functional scripting language
 description:         Parser, type inference, and interpreter for a statically-typed functional scripting language
 category:            DSL,Scripting

inferno-core/src/Inferno/Infer/Exhaustiveness.hs

@@ -59,8 +59,8 @@ instance Ord Con where
   compare a b = compare (mkOrd a) (mkOrd b)
     where
       mkOrd = \case
-        COne -> "one"
-        CEmpty -> "empty"
+        COne -> "Some"
+        CEmpty -> "None"
         CTuple n -> show n
         CInf v -> show v
         CEnum _ e -> show e

inferno-core/src/Inferno/Parse.hs

@@ -228,7 +228,7 @@
 enumE f = do
   startPos <- getSourcePos
   lexeme $
     try (f startPos () <$> (Scope . ModuleName <$> variable) <*> (char '.' *> enumConstructor))
       <|> f startPos () LocalScope <$> enumConstructor
 
 implVarE :: Parser (Expr () SourcePos)
@@ -310,6 +310,7 @@
     symbol "|"
     (sels, cond) <- rhsE
     endPos <- getSourcePos
+    _ <- optional $ symbol ","
     char ']'
     return $ ArrayComp startPos e midPos (NEList.fromList sels) cond endPos
   where
@@ -448,6 +449,7 @@
 openModArgs modNm = do
   symbol "("
   is <- go
+  _ <- optional $ symbol ","
   symbol ")"
   (opsTable, modOpsTables, customTypes) <- ask
   opsTable' <-
@@ -780,8 +782,8 @@
 
 type TyParser = ReaderT (Map.Map Text Int, OpsTable, Map.Map ModuleName OpsTable, [CustomType]) (WriterT Comments (Parsec InfernoParsingError Text))
 
 rws_type :: [Text] -- list of reserved type sig words
 rws_type = ["define", "on", "forall"]
 
 typeIdent :: TyParser Text
 typeIdent = try (p >>= check)
@@ -808,11 +810,11 @@
             <|> choice (map (\t -> symbol (pack t) $> TCustom t) customTypes)
         )
 
 type_variable_raw :: TyParser Text
 type_variable_raw = char '\'' *> takeWhile1P Nothing isAlphaNum
 
 type_variable :: TyParser Int
 type_variable = do
   nm <- type_variable_raw
   (tys, _, _, _) <- ask
   case Map.lookup nm tys of

inferno-types/CHANGELOG.md

@@ -1,6 +1,9 @@
 # Revision History for inferno-types
 *Note*: we use https://pvp.haskell.org/ (MAJOR.MAJOR.MINOR.PATCH)
 
+## 0.4.4.0 -- 2024-04-01
+* Improve pretty printer: use consistent indentation levels
+
 ## 0.4.3.0 -- 2024-03-26
 * Add record pattern matching
 

inferno-types/inferno-types.cabal

@@ -1,6 +1,6 @@
 cabal-version:       >=1.10
 name:                inferno-types
-version:             0.4.3.0
+version:             0.4.4.0
 synopsis:            Core types for Inferno
 description:         Core types for the Inferno language
 category:            DSL,Scripting
@@ -60,3 +60,13 @@ library
     , OverloadedStrings
     , TupleSections
     , RecordWildCards
+
+executable pretty-test
+  main-is: Main.hs
+  hs-source-dirs: pretty-test
+  ghc-options: -Wall -Wunused-packages -Wincomplete-uni-patterns -Wincomplete-record-updates
+  build-depends:
+      base >=4.7 && <5
+    , containers
+    , inferno-types
+  default-language: Haskell2010