-
Notifications
You must be signed in to change notification settings - Fork 51
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Use JuvixError instead of Text for errors in Package file loading (#2459
) Depends on: * #2458 This PR is part of a series implementing: * #2336 In attempt to make the main PR: * #2434 easier to review. This PR introduces standard JuvixError handling for errors related to the loading of the juvix.yaml file. Before this PR errors were thrown as Text and then communicated to the user using the `error` function.
- Loading branch information
1 parent
7b7f06f
commit 8e6c1c8
Showing
19 changed files
with
320 additions
and
47 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,85 @@ | ||
module Juvix.Compiler.Pipeline.Package.Loader.Error where | ||
|
||
import Juvix.Data.CodeAnn | ||
import Juvix.Prelude | ||
|
||
data PackageLoaderError = PackageLoaderError | ||
{ _packageLoaderErrorPath :: Path Abs File, | ||
_packageLoaderErrorCause :: PackageLoaderErrorCause | ||
} | ||
|
||
data PackageLoaderErrorCause | ||
= ErrPackageYamlParseError PackageYamlParseError | ||
| ErrLockfileYamlParseError LockfileYamlParseError | ||
| ErrVersionParseError VersionParseError | ||
| ErrDuplicateDependencyError DuplicateDependencyError | ||
|
||
newtype PackageYamlParseError = PackageYamlParseError | ||
{ _packageYamlParseErrorError :: Text | ||
} | ||
|
||
newtype LockfileYamlParseError = LockfileYamlParseError | ||
{ _lockfileYamlParseErrorError :: Text | ||
} | ||
|
||
newtype VersionParseError = VersionParseError | ||
{ _versionParseErrorError :: Text | ||
} | ||
|
||
newtype DuplicateDependencyError = DuplicateDependencyError | ||
{ _duplicateDependencyErrorName :: Text | ||
} | ||
|
||
makeLenses ''PackageLoaderError | ||
makeLenses ''PackageYamlParseError | ||
makeLenses ''LockfileYamlParseError | ||
makeLenses ''VersionParseError | ||
makeLenses ''DuplicateDependencyError | ||
|
||
instance ToGenericError PackageLoaderError where | ||
genericError e = do | ||
let msg = mkAnsiText (ppCodeAnn e) | ||
return | ||
GenericError | ||
{ _genericErrorMessage = msg, | ||
_genericErrorLoc = i, | ||
_genericErrorIntervals = [i] | ||
} | ||
where | ||
i = getLoc e | ||
|
||
instance PrettyCodeAnn PackageLoaderError where | ||
ppCodeAnn e = ppCodeAnn (e ^. packageLoaderErrorCause) | ||
|
||
instance PrettyCodeAnn PackageLoaderErrorCause where | ||
ppCodeAnn = \case | ||
ErrPackageYamlParseError e -> ppCodeAnn e | ||
ErrLockfileYamlParseError e -> ppCodeAnn e | ||
ErrVersionParseError e -> ppCodeAnn e | ||
ErrDuplicateDependencyError e -> ppCodeAnn e | ||
|
||
instance PrettyCodeAnn PackageYamlParseError where | ||
ppCodeAnn e = | ||
"The package file is invalid" | ||
<> line | ||
<+> pretty (e ^. packageYamlParseErrorError) | ||
|
||
instance PrettyCodeAnn LockfileYamlParseError where | ||
ppCodeAnn e = | ||
"The lock file is invalid" | ||
<> line | ||
<+> pretty (e ^. lockfileYamlParseErrorError) | ||
|
||
instance PrettyCodeAnn VersionParseError where | ||
ppCodeAnn e = | ||
"The package version is invalid" | ||
<> line | ||
<+> pretty (e ^. versionParseErrorError) | ||
|
||
instance PrettyCodeAnn DuplicateDependencyError where | ||
ppCodeAnn e = | ||
"Juvix package file contains the duplicate dependency name:" | ||
<+> pretty (e ^. duplicateDependencyErrorName) | ||
|
||
instance HasLoc PackageLoaderError where | ||
getLoc e = singletonInterval (mkInitialLoc (e ^. packageLoaderErrorPath)) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,11 @@ | ||
module Package | ||
( allTests, | ||
) | ||
where | ||
|
||
import Base | ||
import Package.Negative qualified as N | ||
import Package.Positive qualified as P | ||
|
||
allTests :: TestTree | ||
allTests = testGroup "Package loading tests" [N.allTests, P.allTests] |
Oops, something went wrong.