w.i.p

anoma · Nov 29, 2023 · f86cd86 · f86cd86
1 parent d5a4f92
commit f86cd86
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 6 deletions.
diff --git a/src/Juvix/Compiler/Internal/Translation/FromInternal/Analysis/TypeChecking/Error.hs b/src/Juvix/Compiler/Internal/Translation/FromInternal/Analysis/TypeChecking/Error.hs
@@ -48,13 +48,8 @@ instance ToGenericError TypeCheckerError where
     ErrExpectedFunctionType e -> genericError e
     ErrTooManyArgumentsIndType e -> genericError e
     ErrTooFewArgumentsIndType e -> genericError e
-<<<<<<< HEAD
     ErrInvalidPatternMatching e -> genericError e
-    ErrNoPositivity e -> genericError e
-=======
-    ErrImpracticalPatternMatching e -> genericError e
     ErrNonStrictlyPositive e -> genericError e
->>>>>>> 781ad323 (W.i.p)
     ErrUnsupportedTypeFunction e -> genericError e
     ErrInvalidInstanceType e -> genericError e
     ErrInvalidCoercionType e -> genericError e

diff --git a/test/Typecheck/Negative.hs b/test/Typecheck/Negative.hs
@@ -1,8 +1,8 @@
 module Typecheck.Negative where
 
 import Base
-import Juvix.Compiler.Internal.Translation.FromInternal.Analysis.TypeChecking.Error
 import Juvix.Compiler.Internal.Translation.FromInternal.Analysis.Positivity.Error
+import Juvix.Compiler.Internal.Translation.FromInternal.Analysis.TypeChecking.Error
 import Juvix.Data.Effect.TaggedLock
 
 type FailMsg = String