Skip to content

Simplify import error handling logic #711

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Nov 27, 2018
Merged

Simplify import error handling logic #711

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d65a650
Simplify import error handling logic
Gabriella439 Nov 25, 2018
b6d1783
Merge branch 'master' into gabriel/simplify_missing_imports
Gabriella439 Nov 27, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 9 additions & 8 deletions dhall/src/Dhall/Import.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -756,14 +756,15 @@ loadWith expr₀ = case expr₀ of
:: (MonadCatch m)
=> MissingImports
-> StateT (Status m) m (Expr Src Import)
handler₀ e@(MissingImports []) = throwM e
handler₀ (MissingImports [e]) =
throwMissingImport (Imported imports' e)
handler₀ (MissingImports es) = throwM
(MissingImports
(fmap
(\e -> (toException (Imported imports' e)))
es))
handler₀ (MissingImports es) =
throwM
(MissingImports
(map
(\e -> toException (Imported imports' e))
es
)
)

handler₁
:: (MonadCatch m)
=> SomeException
Expand Down