rhi/quox
rhi/quox
1
0
Fork 0
Code Issues 15 Pull requests 1 Releases Wiki Activity

make #[fail] run in the current namespace

Browse source
This commit is contained in:
rhiannon morris 2023-12-21 17:53:46 +01:00
parent 7afcbfe258
commit 54db7e27ef
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
lib/Quox/Parser/FromParser.idr
View file

@ -45,7 +45,8 @@ FromParserIO = FromParserPure ++ [LoadFile]
export export
fromParserPure : NameSuf -> Definitions -> fromParserPure : {default [<] ns : Mods} ->
NameSuf -> Definitions ->
Eff FromParserPure a -> Eff FromParserPure a ->
Either Error (a, NameSuf, Definitions) Either Error (a, NameSuf, Definitions)
fromParserPure suf defs act = runSTErr $ do fromParserPure suf defs act = runSTErr $ do
@ -54,7 +55,7 @@ fromParserPure suf defs act = runSTErr $ do
res <- runEff act $ with Union.(::) res <- runEff act $ with Union.(::)
[handleExcept (\e => stLeft e), [handleExcept (\e => stLeft e),
handleStateSTRef defs, handleStateSTRef defs,
handleStateSTRef !(liftST $ newSTRef [<]), handleStateSTRef !(liftST $ newSTRef ns),
handleStateSTRef suf] handleStateSTRef suf]
pure (res, !(liftST $ readSTRef suf), !(liftST $ readSTRef defs)) pure (res, !(liftST $ readSTRef suf), !(liftST $ readSTRef defs))
@ -375,7 +376,7 @@ data HasFail = NoFail | AnyFail | FailWith String
export covering export covering
expectFail : Loc -> Eff FromParserPure a -> Eff FromParserPure Error expectFail : Loc -> Eff FromParserPure a -> Eff FromParserPure Error
expectFail loc act = expectFail loc act =
case fromParserPure !(getAt GEN) !(getAt DEFS) act of case fromParserPure !(getAt GEN) !(getAt DEFS) {ns = !(getAt NS)} act of
Left err => pure err Left err => pure err
Right _ => throw $ ExpectedFail loc Right _ => throw $ ExpectedFail loc