rc #13

Merged
crumbtoo merged 196 commits from dev into main 2024-02-13 13:22:23 -07:00
Showing only changes of commit 86cd1075ca - Show all commits

View File

@@ -22,9 +22,11 @@ import Data.HashMap.Strict qualified as H
import Data.Maybe (maybeToList) import Data.Maybe (maybeToList)
import Data.List (foldl1') import Data.List (foldl1')
import Data.Char import Data.Char
import Data.Function (fix)
import Data.Functor import Data.Functor
import Data.Functor.Const import Data.Functor.Const
import Data.Fix hiding (cata) import Data.Fix hiding (cata)
import GHC.Exts (IsString)
import Lens.Micro import Lens.Micro
import Lens.Micro.Platform import Lens.Micro.Platform
import Rlp.Parse.Types import Rlp.Parse.Types
@@ -156,9 +158,8 @@ decls = do
space space
i <- L.indentLevel i <- L.indentLevel
let indentGuard = L.indentGuard scn EQ i let indentGuard = L.indentGuard scn EQ i
-- indentGuard *> decl *> eol *> indentGuard *> decl fix \ds -> (:) <$> (indentGuard *> decl)
many $ indentGuard *> decl <*> (try ds <|> eof *> pure [])
-- many $ indentGuard *> decl <* (eol <|> eof)
namevar :: Parser Name namevar :: Parser Name
namevar = word namevar = word