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

Jump to bottom

'Match' with complex patterns in Core #1530

Merged
merged 9 commits into from
Sep 14, 2022
Merged

'Match' with complex patterns in Core #1530

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
d6442cc
match first version
lukaszcz Sep 12, 2022
d3d8c4e
nodeSubinfos
lukaszcz Sep 12, 2022
ca9d560
fix parsing
lukaszcz Sep 13, 2022
b0f5294
named subpatterns
lukaszcz Sep 13, 2022
6705826
fix parsing and printing
lukaszcz Sep 13, 2022
bf3954c
fix recursors and evaluator
lukaszcz Sep 13, 2022
d7bccce
add tests
lukaszcz Sep 13, 2022
ec9b9bd
minor fixes
lukaszcz Sep 13, 2022
5586f7a
adapt to PR #1533
lukaszcz Sep 14, 2022
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
32 changes: 32 additions & 0 deletions src/Juvix/Compiler/Core/Evaluator.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,9 @@ eval !ctx !env0 = convertRuntimeNodes . eval' env0
case eval' env v of
NCtr (Constr _ tag args) -> branch n env args tag def bs
v' -> evalError "matching on non-data" (substEnv env (mkCase i v' bs def))
NMatch (Match _ vs bs) ->
let !vs' = map' (eval' env) (toList vs)
in match n env vs' bs
NPi {} -> substEnv env n
NUniv {} -> n
NTyp (TypeConstr i sym args) -> mkTypeConstr i sym (map' (eval' env) args)
Expand All @@ -89,6 +92,35 @@ eval !ctx !env0 = convertRuntimeNodes . eval' env0
Just b -> eval' env b
Nothing -> evalError "no matching case branch" (substEnv env n)

match :: Node -> Env -> [Node] -> [MatchBranch] -> Node
match n env vs = \case
br : brs ->
case matchPatterns [] vs (toList (br ^. matchBranchPatterns)) of
Just args -> eval' (args ++ env) (br ^. matchBranchBody)
Nothing -> match n env vs brs
where
matchPatterns :: [Node] -> [Node] -> [Pattern] -> Maybe [Node]
matchPatterns acc (v : vs') (p : ps') =
case patmatch acc v p of
Just acc' -> matchPatterns acc' vs' ps'
Nothing -> Nothing
matchPatterns acc [] [] =
Just acc
matchPatterns _ _ _ =
evalError "the number of patterns doesn't match the number of arguments" (substEnv env n)

patmatch :: [Node] -> Node -> Pattern -> Maybe [Node]
patmatch acc _ PatWildcard {} =
Just acc
patmatch acc v (PatBinder PatternBinder {..}) =
patmatch (v : acc) v _patternBinderPattern
patmatch acc (NCtr (Constr _ tag args)) (PatConstr PatternConstr {..})
| tag == _patternConstrTag =
matchPatterns acc args _patternConstrArgs
patmatch _ _ _ = Nothing
[] ->
evalError "no matching pattern" (substEnv env n)

applyBuiltin :: Node -> Env -> BuiltinOp -> [Node] -> Node
applyBuiltin _ env OpIntAdd [l, r] = nodeFromInteger (integerFromNode (eval' env l) + integerFromNode (eval' env r))
applyBuiltin _ env OpIntSub [l, r] = nodeFromInteger (integerFromNode (eval' env l) - integerFromNode (eval' env r))
Expand Down
Loading