fix recursors and evaluator

anoma · Sep 13, 2022 · 0dba8d3 · 0dba8d3
1 parent 78e543e
commit 0dba8d3
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/src/Juvix/Compiler/Core/Evaluator.hs b/src/Juvix/Compiler/Core/Evaluator.hs
@@ -110,8 +110,10 @@ eval !ctx !env0 = convertRuntimeNodes . eval' env0
             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 {} = Just (v : acc)
+          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

diff --git a/src/Juvix/Compiler/Core/Extra/Base.hs b/src/Juvix/Compiler/Core/Extra/Base.hs
@@ -174,7 +174,7 @@ getBinderPatternInfos = go []
       PatConstr (PatternConstr {..}) ->
         foldl' go acc _patternConstrArgs
       PatBinder (PatternBinder {..}) ->
-        _patternBinderInfo : acc
+        go (_patternBinderInfo : acc) _patternBinderPattern
       PatWildcard {} ->
         acc
 
@@ -186,7 +186,7 @@ getPatternInfos = go []
       PatConstr (PatternConstr {..}) ->
         foldl' go (_patternConstrInfo : acc) _patternConstrArgs
       PatBinder (PatternBinder {..}) ->
-        _patternBinderInfo : acc
+        go (_patternBinderInfo : acc) _patternBinderPattern
       PatWildcard (PatternWildcard {..}) ->
         _patternWildcardInfo : acc