Fix bug in isTrait (#2368)

* Closes #2367
anoma · Sep 14, 2023 · 487fc58 · 487fc58
1 parent f84dcb4
commit 487fc58
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/...Juvix/Compiler/Internal/Translation/FromInternal/Analysis/TypeChecking/Traits/Resolver.hs b/...Juvix/Compiler/Internal/Translation/FromInternal/Analysis/TypeChecking/Traits/Resolver.hs
@@ -15,8 +15,8 @@ type SubsI = HashMap VarName InstanceParam
 subsIToE :: SubsI -> SubsE
 subsIToE = fmap paramToExpression
 
-isTrait :: InfoTable -> InductiveName -> Bool
-isTrait tab name = fromJust (HashMap.lookup name (tab ^. infoInductives)) ^. inductiveInfoDef . inductiveTrait
+isTrait :: InfoTable -> Name -> Bool
+isTrait tab name = maybe False (^. inductiveInfoDef . inductiveTrait) (HashMap.lookup name (tab ^. infoInductives))
 
 resolveTraitInstance ::
   (Members '[Error TypeCheckerError, NameIdGen, Inference, Reader LocalVars, Reader InfoTable] r) =>

diff --git a/tests/Compilation/positive/out/test061.out b/tests/Compilation/positive/out/test061.out
@@ -10,4 +10,5 @@ just (true) :: nothing :: just (false) :: nil
 just (1 :: nil) :: nothing :: just (2 :: 3 :: nil) :: nil
 abba
 abba!
+abba3
 a :: b :: c :: d :: nil
diff --git a/tests/Compilation/positive/test061.juvix b/tests/Compilation/positive/test061.juvix
@@ -47,6 +47,8 @@ f'3 {A} {{M : Show A}} : A → String := Show.show {{M}};
 
 f'4 {A} {{_ : Show A}} : A → String := Show.show;
 
+f5 {A} {{Show A}} (n : String) (a : A) : String := n ++str Show.show a;
+
 main : IO :=
   printStringLn (Show.show true) >>
   printStringLn (f false) >>
@@ -60,4 +62,5 @@ main : IO :=
   printStringLn (f'4 [just [1]; nothing; just [2; 3]]) >>
   printStringLn (f'3 "abba") >>
   printStringLn (f'3 {{M := mkShow (λ{x := x ++str "!"})}} "abba") >>
+  printStringLn (f5 "abba" 3) >>
   printStringLn (Show.show ["a"; "b"; "c"; "d"]);
-Original file line number
+Diff line change
@@ Expand Up / @@ -10,4 +10,5 @@ just (true) :: nothing :: just (false) :: nil @@
     just (1 :: nil) :: nothing :: just (2 :: 3 :: nil) :: nil
     abba
     abba!
+    abba3
     a :: b :: c :: d :: nil