{"header":{"message":"add back more stuff from yanais","description":null,"timestamp":"2024-08-21T21:19:54.806177393Z","authors":[{}]},"hash":"GMGXNJEPA2NENYJKQFAFYWHDEJOK62T4PK6EY7NE6GIX4Y2JPHTAC","authors":[{"login":"fogti","key":"ZFnYYAXSF9fgPaXKyrt5a2oor75nLVcpU8T8fEnRqwm"}],"deps":{"hashes":[["GMGXNJEPA2NENYJKQFAFYWHDEJOK62T4PK6EY7NE6GIX4Y2JPHTAC","add back more stuff from yanais"],["AA",null],["BYJ7NJSKA3G5YNETPT4PEAW5TH4KTNI66BMHNMDWFS6YXSFYWVMQC","ListMaybe: use Natural instead of Int"],["6XMVEBZAMRKHRYLFMJ6ZNSBM5ZXPTPK4YS4QUNGGPPUS4HLPO6GAC","add simple stuff (e.g. haskell basics)"],["FHKXKG4OF52247ULEDHNWBTAQDABCEJHWUFEUTAY5NJKNRD5L7MAC","+LICENSE"]],"deps":["BYJ7NJSKA3G5YNETPT4PEAW5TH4KTNI66BMHNMDWFS6YXSFYWVMQC"],"known":["6XMVEBZAMRKHRYLFMJ6ZNSBM5ZXPTPK4YS4QUNGGPPUS4HLPO6GAC","FHKXKG4OF52247ULEDHNWBTAQDABCEJHWUFEUTAY5NJKNRD5L7MAC"]},"hunks":[{"FileAdd":{"meta":{"basename":"SteParser.hs","metadata":0},"context":[{"change":3,"pos":769}],"contents":[{"Add":"{-# LANGUAGE"},{"Add":" DeriveGeneric, FlexibleInstances, MultiParamTypeClasses,"},{"Add":" OverloadedStrings, TypeFamilies"},{"Add":" #-}"},{"Add":""},{"Add":"module GardGround.Utils.SteParser ("},{"Add":" Parser(..),"},{"Add":" ParserError(..),"},{"Add":""},{"Add":" -- creating and running parsers"},{"Add":" runParser,"},{"Add":" makeParser,"},{"Add":""},{"Add":" -- parser combinators"},{"Add":" flatMaybe,"},{"Add":" flatEither,"},{"Add":") where"},{"Add":""},{"Add":"import Control.Applicative (Alternative(..), (<|>))"},{"Add":"import Control.Monad.Error.Class (MonadError(..))"},{"Add":"import Control.Monad.State.Strict"},{"Add":""},{"Add":"-- misc failure conditions"},{"Add":"class (Semigroup e, Show e) => ParserError s e where"},{"Add":" -- | an unknown error (the state might indicate where the error happened)"},{"Add":" perrUnknown :: s -> e"},{"Add":""},{"Add":"-- a generic parser monad"},{"Add":"newtype Parser s e a = Parser { runP :: StateT s (Either e) a }"},{"Add":""},{"Add":"-- | lift an unwrapped parser into our structures"},{"Add":"makeParser :: ((s1 -> Either e1 (a, s1)) -> (s2 -> Either e2 (b, s2))) -> Parser s1 e1 a -> Parser s2 e2 b"},{"Add":"makeParser f (Parser (StateT origp)) = Parser . StateT $ f origp"},{"Add":""},{"Add":"instance Functor (Parser s e) where"},{"Add":" fmap f = Parser . (fmap f) . runP"},{"Add":" {-# INLINE fmap #-}"},{"Add":""},{"Add":"instance Applicative (Parser s e) where"},{"Add":" pure = Parser . pure"},{"Add":" {-# INLINE pure #-}"},{"Add":" Parser a <*> Parser b = Parser $ a <*> b"},{"Add":" {-# INLINE (<*>) #-}"},{"Add":""},{"Add":"instance ParserError s e => Alternative (Parser s e) where"},{"Add":" empty = Parser $ StateT (Left . perrUnknown)"},{"Add":" Parser (StateT p1) <|> Parser (StateT p2) = Parser . StateT $ \\st ->"},{"Add":" case (p1 st, p2 st) of"},{"Add":" (Right y, _) -> Right y"},{"Add":" (_, Right y) -> Right y"},{"Add":" (Left e1, Left e2) -> Left $ e1 <> e2"},{"Add":""},{"Add":"instance Monad (Parser s e) where"},{"Add":" return = pure"},{"Add":" Parser a >>= fb = Parser $ a >>= (runP . fb)"},{"Add":" {-# INLINE (>>=) #-}"},{"Add":""},{"Add":"instance MonadState s (Parser s e) where"},{"Add":" state = Parser . state"},{"Add":" {-# INLINE state #-}"},{"Add":""},{"Add":"instance MonadError e (Parser s e) where"},{"Add":" throwError e = Parser . StateT . const $ Left e"},{"Add":" catchError (Parser (StateT m)) eh = Parser . StateT $ \\st -> case m st of"},{"Add":" Left err -> let (Parser (StateT ehp)) = eh err in ehp st"},{"Add":" Right x -> Right x"},{"Add":""},{"Add":"runParser :: s -> Parser s e a -> Either e (a, s)"},{"Add":"runParser st (Parser p) = runStateT p st"},{"Add":""},{"Add":"-- some simple parser combinators"},{"Add":""},{"Add":"-- | shave an maybe from the parser result and throw an unknown error if it got Nothing"},{"Add":"flatMaybe :: ParserError s e => Maybe a -> Parser s e a"},{"Add":"flatMaybe mb = Parser . StateT $ case mb of"},{"Add":" Nothing -> Left . perrUnknown"},{"Add":" Just x -> \\st -> Right (x, st)"},{"Add":""},{"Add":"-- | shave an either from the parser result and possibly throw errors into the parser itself"},{"Add":"flatEither :: Either e a -> Parser s e a"},{"Add":"flatEither eith = Parser . StateT $ \\st -> fmap (\\y -> (y, st)) eith"}]}},{"FileAdd":{"meta":{"basename":"SteParser","metadata":576},"context":[{"change":3,"pos":769}],"contents":[]}},{"FileAdd":{"meta":{"basename":"List.hs","metadata":0},"context":[{"change":0,"pos":2678}],"contents":[{"Add":"module GardGround.Utils.SteParser.List ("},{"Add":" takeWhile,"},{"Add":" tryOne,"},{"Add":") where"},{"Add":""},{"Add":"import Prelude hiding (takeWhile)"},{"Add":"import Control.Monad.State.Strict (MonadState(..))"},{"Add":"import GardGround.Utils.SteParser"},{"Add":""},{"Add":"-- | take a prefix out of the current context, while keeping the rest in the parser"},{"Add":"takeWhile :: (a -> Bool) -> Parser [a] e [a]"},{"Add":"takeWhile f ="},{"Add":" -- tw' --> (selected, rest)"},{"Add":" -- state lifts (s -> m (a, s))"},{"Add":" let tw' = \\env -> case env of"},{"Add":" [] -> ([], [])"},{"Add":" x:xs | f x -> let (sel, rest) = tw' xs in (x:sel, rest)"},{"Add":" | otherwise -> ([], x:xs)"},{"Add":" in state tw'"},{"Add":""},{"Add":"-- | try to parse the first element as something"},{"Add":"tryOne :: (a -> Maybe b) -> Parser [a] e (Maybe b)"},{"Add":"tryOne f ="},{"Add":" let to' = \\env -> case env of"},{"Add":" [] -> (Nothing, [])"},{"Add":" x:xs -> case f x of"},{"Add":" Nothing -> (Nothing, x:xs)"},{"Add":" Just y -> (Just y, xs)"},{"Add":" in state to'"}]}},{"FileAdd":{"meta":{"basename":"Lex.hs","metadata":0},"context":[{"change":0,"pos":2678}],"contents":[{"Add":"{-# LANGUAGE"},{"Add":" DeriveGeneric, FlexibleInstances, MultiParamTypeClasses,"},{"Add":" OverloadedStrings, TypeFamilies, TypeOperators"},{"Add":" #-}"},{"Add":""},{"Add":"module GardGround.Utils.SteParser.Lex ("},{"Add":" Text,"},{"Add":" Ident(..),"},{"Add":" Parser',"},{"Add":" ParserEnv(..),"},{"Add":" Span(..),"},{"Add":" HandleTree(..),"},{"Add":" emptyIdent,"},{"Add":" nullIdent,"},{"Add":""},{"Add":" -- creating and running parsers"},{"Add":" makeParseEnv,"},{"Add":" parseFile,"},{"Add":""},{"Add":" -- parser combinators"},{"Add":" takeUntil,"},{"Add":" takeWhile,"},{"Add":" takeIdent,"},{"Add":" takeNatural,"},{"Add":" takeWithProperty,"},{"Add":" skipWhiteSpace,"},{"Add":" tryOne,"},{"Add":" eats,"},{"Add":" recordSpan,"},{"Add":") where"},{"Add":""},{"Add":"import Prelude hiding (takeWhile, span, splitAt)"},{"Add":"import Control.Applicative (Alternative(..), (<|>))"},{"Add":"import Control.DeepSeq (NFData)"},{"Add":"import Control.Monad (guard)"},{"Add":"import Control.Monad.State.Strict"},{"Add":"import Data.Char (isDigit, isHexDigit, digitToInt)"},{"Add":"import Data.Hashable (Hashable)"},{"Add":"import qualified Data.ByteString as Bb"},{"Add":"import qualified Data.ByteString.Char8 as C"},{"Add":"import qualified Data.ByteString.UTF8 as B"},{"Add":"import qualified Data.HashMap.Strict as H"},{"Add":"import qualified Data.String.UTF8 as U"},{"Add":"import qualified Data.Text.Encoding as TE"},{"Add":"import Data.Text.Encoding.Error (UnicodeException)"},{"Add":"import qualified Data.Text.ICU.Char as IC"},{"Add":"import qualified Data.Text.ICU.Normalize2 as IN"},{"Add":"import GardGround.Utils.SteParser"},{"Add":"import Generic.Data"},{"Add":"import Numeric.Natural (Natural)"},{"Add":""},{"Add":"-- | A 0-indexed, half-open interval of integers, defined by start & end indices"},{"Add":"data Span = Span"},{"Add":" { start :: {-# UNPACK #-} !Int"},{"Add":" , end :: {-# UNPACK #-} !Int"},{"Add":" }"},{"Add":" deriving (Eq, Generic, Ord, Show)"},{"Add":""},{"Add":"instance Hashable Span"},{"Add":"instance NFData Span"},{"Add":""},{"Add":"instance Semigroup Span where"},{"Add":" Span start1 end1 <> Span start2 end2 = Span (min start1 start2) (max end1 end2)"},{"Add":""},{"Add":"type Text = U.UTF8 B.ByteString"},{"Add":""},{"Add":"data Ident = Ident !Span !Text"},{"Add":""},{"Add":"-- Ident equality ignores spans"},{"Add":"instance Eq Ident where"},{"Add":" Ident _ t1 == Ident _ t2 = (t1 == t2)"},{"Add":""},{"Add":"emptyIdent :: Int -> Ident"},{"Add":"emptyIdent m = Ident (Span { start = m, end = m }) (U.fromRep Bb.empty)"},{"Add":""},{"Add":"nullIdent :: Ident -> Bool"},{"Add":"nullIdent (Ident _ t) = Bb.null $ U.toRep t"},{"Add":""},{"Add":"instance Show Ident where"},{"Add":" show (Ident _ t) = B.toString $ U.toRep t"},{"Add":""},{"Add":"data ParserEnv = ParserEnv {"},{"Add":" peOffset :: !Int,"},{"Add":" peText :: Text"},{"Add":" }"},{"Add":""},{"Add":"type Parser' e a = Parser ParserEnv e a"},{"Add":""},{"Add":"makeParseEnv :: B.ByteString -> ParserEnv"},{"Add":"makeParseEnv bs = ParserEnv { peOffset = 0, peText = U.fromRep bs }"},{"Add":""},{"Add":"parseFile :: String -> Parser' e a -> IO (Either e a)"},{"Add":"parseFile f p = do"},{"Add":" contents <- C.readFile f"},{"Add":" return (fmap (\\(r, _) -> r) $ runParser (makeParseEnv contents) p)"},{"Add":""},{"Add":"-- some simple parser combinators"},{"Add":""},{"Add":"shiftEnv :: (Int, Text) -> Parser' e ()"},{"Add":"shiftEnv (ll, r) = Parser $ modify go"},{"Add":" where"},{"Add":" go :: ParserEnv -> ParserEnv"},{"Add":" go st = st { peOffset = (peOffset st) + ll, peText = r }"},{"Add":""},{"Add":"slen :: Text -> Int"},{"Add":"slen = C.length . U.toRep"},{"Add":""},{"Add":"takeUntil :: (Char -> Bool) -> Parser' e Text"},{"Add":"takeUntil f = takeWhile (not . f)"},{"Add":""},{"Add":"takeWhile :: (Char -> Bool) -> Parser' e Text"},{"Add":"takeWhile f = do"},{"Add":" env <- get"},{"Add":" let (l, r) = U.span f (peText env)"},{"Add":" shiftEnv (slen l, r)"},{"Add":" return l"},{"Add":""},{"Add":"takeWithProperty :: IC.Bool_ -> Parser' e Text"},{"Add":"takeWithProperty p = takeWhile $ IC.property p"},{"Add":""},{"Add":"takeIdent :: Parser' e (Either UnicodeException (Maybe Ident))"},{"Add":"takeIdent = do"},{"Add":" env <- get"},{"Add":" let start_ = peOffset env"},{"Add":" let (l, r) = U.splitAt 1 (peText env)"},{"Add":" case U.uncons l of"},{"Add":" Nothing -> okNone"},{"Add":" Just (fi, r2) -> ("},{"Add":" (if not ((slen r2) == 0) then error \"takeIdent : unable to iterator over characters\" else ())"},{"Add":" `seq`"},{"Add":" (if IC.property IC.XidStart fi then ("},{"Add":" do"},{"Add":" shiftEnv (slen l, r)"},{"Add":" rest <- takeWithProperty IC.XidContinue"},{"Add":" end_ <- gets peOffset"},{"Add":" let thlw = theHorrorsLieWithin fi rest"},{"Add":" let mkident = \\s -> Ident (Span { start = start_, end = end_ }) s"},{"Add":" return (fmap (Just . mkident) thlw)"},{"Add":" ) else okNone))"},{"Add":""},{"Add":" where"},{"Add":" okNone :: Parser' e (Either e2 (Maybe dt))"},{"Add":" okNone = Parser . StateT $ \\st -> Right (Right Nothing, st)"},{"Add":""},{"Add":" -- I hate this..."},{"Add":" theHorrorsLieWithin :: Char -> Text -> Either UnicodeException Text"},{"Add":" theHorrorsLieWithin fi rest ="},{"Add":" -- make a byte string from the parts of the identifyer"},{"Add":" let iabs = Bb.append (B.fromString [fi]) (U.toRep rest) in"},{"Add":" -- finish a UTF-8 decoded identifier"},{"Add":" let fini = U.fromRep . TE.encodeUtf8 . IN.nfc in"},{"Add":" -- handle decoding"},{"Add":" fmap fini $ TE.decodeUtf8' iabs"},{"Add":""},{"Add":"skipWhiteSpace :: Parser' e ()"},{"Add":"skipWhiteSpace = takeWithProperty IC.WhiteSpace >> pure ()"},{"Add":""},{"Add":"-- | try to parse the first character as a token"},{"Add":"tryOne :: (Char -> Maybe tok) -> Parser' e (Maybe tok)"},{"Add":"tryOne f = do"},{"Add":" env <- get"},{"Add":" let (l, r) = U.splitAt 1 (peText env)"},{"Add":" case U.uncons l of"},{"Add":" Nothing -> return Nothing"},{"Add":" Just (fi, r2) ->"},{"Add":" (if not ((slen r2) == 0) then error \"tryOne : unable to iterator over characters\" else ())"},{"Add":" `seq`"},{"Add":" case f fi of"},{"Add":" Nothing -> return Nothing"},{"Add":" Just x -> do"},{"Add":" shiftEnv (slen l, r)"},{"Add":" return . Just $ x"},{"Add":""},{"Add":"-- | A case tree for `eats`"},{"Add":"data HandleTree x ="},{"Add":" HandleTree (H.HashMap Char (HandleTree x)) (Maybe x)"},{"Add":" | Htleaf !x"},{"Add":""},{"Add":"-- | try to recognize specific tokens"},{"Add":"eats :: HandleTree x -> Parser' e (Maybe x)"},{"Add":"eats ht = Parser . StateT $ \\st ->"},{"Add":" -- do backtracking in case of failure"},{"Add":" let Parser (StateT eatsfun) = eats_ ht in"},{"Add":" -- fmap @ Either"},{"Add":" fmap (\\val -> case val of"},{"Add":" (Nothing, _) -> (Nothing, st)"},{"Add":" (Just x, st2) -> (Just x, st2)"},{"Add":" ) $ eatsfun st"},{"Add":""},{"Add":" where"},{"Add":" eatOne hm xc = tryOne $ \\c -> (H.lookup c hm) <|> (fmap Htleaf xc)"},{"Add":" eats_ :: HandleTree x -> Parser' e (Maybe x)"},{"Add":" eats_ (Htleaf x) = pure (Just x)"},{"Add":" eats_ (HandleTree hm xc) = (eatOne hm xc) >>= \\x -> case x of"},{"Add":" Nothing -> pure Nothing"},{"Add":" Just y -> eats_ y"},{"Add":""},{"Add":"-- | record the span of the inner parser"},{"Add":"recordSpan :: Parser' e a -> Parser' e (Span, a)"},{"Add":"recordSpan inner = do"},{"Add":" start_ <- gets peOffset"},{"Add":" x <- inner"},{"Add":" end_ <- gets peOffset"},{"Add":" pure (Span { start = start_, end = end_ }, x)"},{"Add":""},{"Add":"takeNatural :: (s ~ ParserEnv, ParserError s e) => Parser' e (Maybe (Span, Natural))"},{"Add":"takeNatural = (fmap (\\(sp, i) -> fmap (\\j -> (sp, j)) i)) . recordSpan $ do"},{"Add":" fi' <- tryOne $ chkThenNat isDigit"},{"Add":" case fi' of"},{"Add":" Just 0 ->"},{"Add":" fmap Just $ handleHex <|> do"},{"Add":" se' <- tryOne $ chkThenNat isDigit"},{"Add":" -- invalid number format"},{"Add":" guard (se' == Nothing)"},{"Add":" return 0"},{"Add":""},{"Add":" Just d -> fmap Just $ handleDigits 10 isDigit d"},{"Add":" Nothing -> return Nothing"},{"Add":""},{"Add":" where"},{"Add":" charToNat :: Char -> Natural"},{"Add":" charToNat = fromInteger . toInteger . digitToInt"},{"Add":""},{"Add":" chkThenNat :: (Char -> Bool) -> Char -> Maybe Natural"},{"Add":" chkThenNat chk c = if chk c then Just $ charToNat c else Nothing"},{"Add":""},{"Add":" -- this parser can't fail"},{"Add":" handleDigits :: Natural -> (Char -> Bool) -> Natural -> Parser' e Natural"},{"Add":" handleDigits mult chk acc' = go acc'"},{"Add":" where"},{"Add":" go acc = do"},{"Add":" hd' <- tryOne $ chkThenNat chk"},{"Add":" case hd' of"},{"Add":" Just hd -> go (mult * acc + hd)"},{"Add":" Nothing -> pure acc"},{"Add":""},{"Add":" handleHex = (tryOne $ \\c -> if c == 'x' then Just () else Nothing) >>= (\\x ->"},{"Add":" (guard (x == Just ())) >> (handleDigits 16 isHexDigit 0)"},{"Add":" )"}]}},{"Replacement":{"inode":{"change":3,"pos":808},"path":"core/lib/GardGround/Utils/ListMaybe.hs","line":10,"ins":{"up_context":[{"change":2,"pos":24}],"down_context":[{"change":3,"pos":956}],"flag":"BLOCK","start":10704,"end":10762,"inode":{"change":3,"pos":808}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":2,"pos":24},"to":{"change":2,"start":24,"end":81},"introduced_by":2}],"inode":{"change":3,"pos":808}},"ins_contents":[{"Add":"data ListMaybe a = ListMaybe !Natural [(a, [a], Natural)]"}],"del_contents":[{"Del":"data ListMaybe a = ListMaybe Natural [(a, [a], Natural)]\n"}]}},{"Edit":{"inode":{"change":3,"pos":4616},"path":"core/gardground-core.cabal","line":20,"atom":{"NewVertex":{"up_context":[{"change":3,"pos":5078}],"down_context":[{"change":3,"pos":5078}],"flag":"BLOCK","start":10763,"end":10877,"inode":{"change":3,"pos":4616}}},"contents":[{"Add":" GardGround.Utils.SteParser"},{"Add":" GardGround.Utils.SteParser.Lex"},{"Add":" GardGround.Utils.SteParser.List"}]}},{"Edit":{"inode":{"change":3,"pos":4616},"path":"core/gardground-core.cabal","line":25,"atom":{"NewVertex":{"up_context":[{"change":3,"pos":5101}],"down_context":[{"change":3,"pos":5101}],"flag":"BLOCK","start":10878,"end":10900,"inode":{"change":3,"pos":4616}}},"contents":[{"Add":" DeriveGeneric"}]}},{"Edit":{"inode":{"change":3,"pos":4616},"path":"core/gardground-core.cabal","line":27,"atom":{"NewVertex":{"up_context":[{"change":3,"pos":5135}],"down_context":[{"change":3,"pos":5135}],"flag":"BLOCK","start":10901,"end":10983,"inode":{"change":3,"pos":4616}}},"contents":[{"Add":" FlexibleInstances"},{"Add":" MultiParamTypeClasses"},{"Add":" OverloadedStrings"}]}},{"Edit":{"inode":{"change":3,"pos":4616},"path":"core/gardground-core.cabal","line":31,"atom":{"NewVertex":{"up_context":[{"change":3,"pos":5154}],"down_context":[{"change":3,"pos":5154}],"flag":"BLOCK","start":10984,"end":11027,"inode":{"change":3,"pos":4616}}},"contents":[{"Add":" TypeFamilies"},{"Add":" TypeOperators"}]}},{"Replacement":{"inode":{"change":3,"pos":4616},"path":"core/gardground-core.cabal","line":39,"ins":{"up_context":[{"change":3,"pos":5323}],"down_context":[{"change":3,"pos":5359}],"flag":"BLOCK","start":11028,"end":11061,"inode":{"change":3,"pos":4616}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":5323},"to":{"change":3,"start":5323,"end":5359},"introduced_by":3}],"inode":{"change":3,"pos":4616}},"ins_contents":[{"Add":" , hashable ^>= 1.4.3.0"}],"del_contents":[{"Del":" -- , hashable ^>= 1.4.3.0\n"}]}},{"Replacement":{"inode":{"change":3,"pos":4616},"path":"core/gardground-core.cabal","line":42,"ins":{"up_context":[{"change":3,"pos":5433}],"down_context":[{"change":3,"pos":5505}],"flag":"BLOCK","start":11062,"end":11128,"inode":{"change":3,"pos":4616}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":5433},"to":{"change":3,"start":5433,"end":5505},"introduced_by":3}],"inode":{"change":3,"pos":4616}},"ins_contents":[{"Add":" , text-icu ^>= 0.8.0.0"},{"Add":" , transformers ^>= 0.6.0.0"}],"del_contents":[{"Del":" -- , text-icu ^>= 0.8.0.0\n -- , transformers ^>= 0.5.6.0\n"}]}}],"owner":"fogti","repo":"gardground","token":"fChhJN3I5DxfMnYczZ8dVTlmqzivBU8EEecCyPPU9aU=","login":null}

…

Dependencies

Change contents