From d5a34360bbe15b25f87c916aec534baaade08a47 Mon Sep 17 00:00:00 2001
From: William Ball <williampi103@gmail.com>
Date: Sat, 5 Oct 2024 16:04:13 -0700
Subject: [PATCH] added state to parser

---
 app/Main.hs    | 11 +++++-
 app/Parser.hs  | 95 +++++++++++++++++++++++++++-----------------------
 lambda-D.cabal |  1 +
 3 files changed, 62 insertions(+), 45 deletions(-)

diff --git a/app/Main.hs b/app/Main.hs
index 65ae4a0..4ea706c 100644
--- a/app/Main.hs
+++ b/app/Main.hs
@@ -1,4 +1,13 @@
 module Main where
 
+import Parser
+import System.IO
+
 main :: IO ()
-main = putStrLn "Hello, Haskell!"
+main = do
+  _ <- putStr "> "
+  _ <- hFlush stdout
+  input <- getLine
+  case pAll input of
+    Left err -> putStrLn err
+    Right expr -> print expr
diff --git a/app/Parser.hs b/app/Parser.hs
index b903d8b..ba90614 100644
--- a/app/Parser.hs
+++ b/app/Parser.hs
@@ -1,28 +1,26 @@
 module Parser where
 
-import Control.Monad (void)
-import Data.Bifunctor (first)
-import Data.Void (Void)
+import Control.Monad
+import Control.Monad.State.Strict
+import Data.Functor.Identity
+import Data.List (elemIndex)
+import Data.List.NonEmpty (NonEmpty((:|)))
+import qualified Data.List.NonEmpty as NE
 import Expr (Expr (..))
-import Text.Megaparsec
-  ( MonadParsec (eof, label),
-    Parsec,
-    between,
-    choice,
-    errorBundlePretty,
-    parse,
-    (<|>),
-  )
-import Control.Applicative.Combinators.NonEmpty (some)
+import Text.Megaparsec hiding (State)
 import Text.Megaparsec.Char
-  ( char,
-    space1,
-    string,
-  )
 import qualified Text.Megaparsec.Char.Lexer as L
-import Data.Either (fromRight)
+import Data.Bifunctor (first)
 
-type Parser = Parsec Void String
+type InnerState = [String]
+
+data CustomErrors = UnboundVariable String [String] deriving (Eq, Ord, Show)
+
+instance ShowErrorComponent CustomErrors where
+  showErrorComponent (UnboundVariable var bound) =
+    "Unbound variable: " ++ var ++ ". Did you mean one of: " ++ unwords bound ++ "?"
+
+type Parser = ParsecT CustomErrors String (State InnerState)
 
 skipSpace :: Parser ()
 skipSpace =
@@ -34,40 +32,52 @@ skipSpace =
 lexeme :: Parser a -> Parser a
 lexeme = L.lexeme skipSpace
 
-pVar :: Parser Integer
-pVar = label "variable" $ lexeme L.decimal
+pIdentifier :: Parser String
+pIdentifier = label "identifier" $ lexeme $ do
+  firstChar <- letterChar <|> char '_'
+  rest <- many $ alphaNumChar <|> char '_'
+  return $ firstChar : rest
 
--- pVar :: Parser String
--- pVar = label "variable" $ lexeme $ do
---     firstChar <- letterChar <|> char '_'
---     rest <- many $ alphaNumChar <|> char '_'
---     return $ firstChar : rest
+pVar :: Parser Expr
+pVar = label "variable" $ lexeme $ do
+  var <- pIdentifier
+  binders <- get
+  case elemIndex var binders of
+    Just i -> return $ Var $ fromIntegral i
+    Nothing -> customFailure $ UnboundVariable var binders
 
-pLambda :: Parser ()
-pLambda = lexeme $ label "λ" $ void $ string "lambda" <|> string "λ"
-
-pPi :: Parser ()
-pPi = lexeme $ label "Π" $ void $ string "Pi" <|> string "Π"
+defChoice :: NE.NonEmpty String -> Parser ()
+defChoice options = lexeme $ label labelText $ void $ choice $ NE.map string options
+  where labelText = NE.head options
 
 pLAbs :: Parser Expr
 pLAbs = lexeme $ label "λ-abstraction" $ do
-  Abs <$> between pLambda pDot pExpr <*> pExpr
+  _ <- defChoice $ "λ" :| ["lambda"]
+  ident <- pIdentifier
+  _ <- defChoice $ ":" :| []
+  ty <- pExpr
+  _ <- defChoice $ "." :| []
+  modify (ident :)
+  Abs ty <$> pExpr
 
 pPAbs :: Parser Expr
 pPAbs = lexeme $ label "Π-abstraction" $ do
-  Pi <$> between pPi pDot pExpr <*> pExpr
+  _ <- defChoice $ "∏" :| ["Pi"]
+  ident <- pIdentifier
+  _ <- defChoice $ ":" :| []
+  ty <- pExpr
+  _ <- defChoice $ "." :| []
+  modify (ident :)
+  Pi ty <$> pExpr
 
 pApp :: Parser Expr
 pApp = foldl1 App <$> some pTerm
 
-pDot :: Parser ()
-pDot = lexeme $ label "." $ void $ char '.'
-
 pStar :: Parser Expr
-pStar = lexeme $ label "∗" $ Star <$ (string "*" <|> string "∗")
+pStar = Star <$ defChoice ("*" :| [])
 
 pSquare :: Parser Expr
-pSquare = lexeme $ label "□" $ Square <$ (string "□" <|> string "[]")
+pSquare = Square <$ defChoice ("□" :| ["[]"])
 
 pTerm :: Parser Expr
 pTerm =
@@ -75,16 +85,13 @@ pTerm =
     label "term" $
       choice
         [ between (char '(') (char ')') pExpr,
-          Var <$> pVar,
+          pVar,
           pStar,
           pSquare
         ]
 
 pExpr :: Parser Expr
-pExpr = lexeme $ pLAbs <|> pApp <|> pPAbs
+pExpr = lexeme $ pLAbs <|> pPAbs <|> pApp
 
 pAll :: String -> Either String Expr
-pAll = first errorBundlePretty . parse (between skipSpace eof pExpr) ""
-
-p :: String -> Expr
-p = fromRight Star . pAll
+pAll input = first errorBundlePretty $ fst $ runIdentity $ runStateT (runParserT pExpr "" input) []
diff --git a/lambda-D.cabal b/lambda-D.cabal
index 7ee1531..1e70061 100644
--- a/lambda-D.cabal
+++ b/lambda-D.cabal
@@ -74,6 +74,7 @@ executable lambda-D
                     , megaparsec
                     , text
                     , parser-combinators
+                    , mtl
 
     -- Directories containing source files.
     hs-source-dirs:   app