Skip to content
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

Improve Core parser error handling #3300

Merged
merged 7 commits into from
Feb 3, 2025
Merged

Improve Core parser error handling #3300

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
766fb8f
Use CoreError for parser errors unrelated to parsing
lukaszcz Jan 30, 2025
0f51e6c
fix tests
lukaszcz Jan 30, 2025
cf32b3d
fix builtin parsing
lukaszcz Jan 30, 2025
2b1449f
negative tests & match side-conditions fix
lukaszcz Jan 30, 2025
97fa776
fix tests
lukaszcz Jan 30, 2025
3baa8a1
eval test for match side-conditions
lukaszcz Jan 30, 2025
bd31f6a
fix detection of redundant patterns with sid-conditions
lukaszcz Jan 31, 2025
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
14 changes: 7 additions & 7 deletions app/Commands/Dev/Core/Repl.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ runCommand opts = do
showReplWelcome
runRepl opts mempty

parseText :: Core.InfoTable -> Text -> Either Core.MegaparsecError (Core.InfoTable, Maybe Core.Node)
parseText :: Core.InfoTable -> Text -> Either JuvixError (Core.InfoTable, Maybe Core.Node)
parseText = Core.runParser replPath defaultModuleId

runRepl :: forall r. (Members '[EmbedIO, App] r) => CoreReplOptions -> Core.InfoTable -> Sem r ()
Expand All @@ -40,7 +40,7 @@ runRepl opts tab = do
':' : 'p' : ' ' : s' ->
case parseText tab (fromString s') of
Left err -> do
printJuvixError (JuvixError err)
printJuvixError err
runRepl opts tab
Right (tab', Just node) -> do
renderStdOut (Core.ppOut opts node)
Expand All @@ -51,7 +51,7 @@ runRepl opts tab = do
':' : 'e' : ' ' : s' ->
case parseText tab (fromString s') of
Left err -> do
printJuvixError (JuvixError err)
printJuvixError err
runRepl opts tab
Right (tab', Just node) ->
replEval True tab' node
Expand All @@ -60,7 +60,7 @@ runRepl opts tab = do
':' : 'n' : ' ' : s' ->
case parseText tab (fromString s') of
Left err -> do
printJuvixError (JuvixError err)
printJuvixError err
runRepl opts tab
Right (tab', Just node) ->
replNormalize tab' node
Expand All @@ -69,7 +69,7 @@ runRepl opts tab = do
':' : 't' : ' ' : s' ->
case parseText tab (fromString s') of
Left err -> do
printJuvixError (JuvixError err)
printJuvixError err
runRepl opts tab
Right (tab', Just node) ->
replType tab' node
Expand All @@ -80,7 +80,7 @@ runRepl opts tab = do
sf <- someBaseToAbs' (someFile f)
case Core.runParser sf defaultModuleId mempty s' of
Left err -> do
printJuvixError (JuvixError err)
printJuvixError err
runRepl opts tab
Right (tab', mnode) -> case mnode of
Nothing -> runRepl opts tab'
Expand All @@ -90,7 +90,7 @@ runRepl opts tab = do
_ ->
case parseText tab s of
Left err -> do
printJuvixError (JuvixError err)
printJuvixError err
runRepl opts tab
Right (tab', Just node) ->
replEval False tab' node
Expand Down
12 changes: 12 additions & 0 deletions src/Juvix/Compiler/Core/Extra/Base.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -405,6 +405,18 @@ isPatConstr = \case
PatConstr {} -> True
PatWildcard {} -> False

{------------------------------------------------------------------------}
{- match branch -}

isMatchBranchRhsExpression :: MatchBranch -> Bool
isMatchBranchRhsExpression MatchBranch {..} =
case _matchBranchRhs of
MatchBranchRhsExpression {} -> True
MatchBranchRhsIfs {} -> False

isMatchBranchRhsIf :: MatchBranch -> Bool
isMatchBranchRhsIf = not . isMatchBranchRhsExpression

{------------------------------------------------------------------------}
{- generic Node destruction -}

Expand Down
2 changes: 1 addition & 1 deletion src/Juvix/Compiler/Core/Transformation/DetectConstantSideConditions.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ detectConstantSideConditions md = mapAllNodesM (umapM go) md
Just ifs0' -> return $ Just $ set matchBranchRhs (MatchBranchRhsIfs ifs0') br
SideIfBranch {..} : ifs1' -> do
fCoverage <- asks (^. optCheckCoverage)
unless (not fCoverage || null ifs1') $
when (fCoverage && not (null ifs1')) $
throw
CoreError
{ _coreErrorMsg = "Redundant side condition",
Expand Down
2 changes: 1 addition & 1 deletion src/Juvix/Compiler/Core/Transformation/DetectRedundantPatterns.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ goDetectRedundantPatterns md node = case node of
defaultLoc = singletonInterval (mkInitialLoc mockFile)

checkMatch :: Match -> Sem r ()
checkMatch Match {..} = case _matchBranches of
checkMatch Match {..} = case dropWhile isMatchBranchRhsIf $ _matchBranches of
[] -> return ()
MatchBranch {..} : brs -> go [toList _matchBranchPatterns] brs
where
Expand Down
Loading
Loading